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-05-24 23:42+0800\n"
139 "PO-Revision-Date: 2016-06-06 23:05+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:1238
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:1395
209 msgid "prepend prefix to each pathname in the archive"
210 msgstr "为归档中每个路径名加上前缀"
212 #: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548
213 #: builtin/blame.c:2549 builtin/config.c:60 builtin/fast-export.c:987
214 #: builtin/fast-export.c:989 builtin/grep.c:722 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:82
249 #: builtin/submodule--helper.c:776
253 #: archive.c:452 builtin/archive.c:91
254 msgid "retrieve the archive from remote repository <repo>"
255 msgstr "从远程仓库(<仓库>)提取归档文件"
257 #: archive.c:453 builtin/archive.c:92 builtin/notes.c:482
261 #: archive.c:454 builtin/archive.c:93
262 msgid "path to the remote git-upload-archive command"
263 msgstr "远程 git-upload-archive 命令的路径"
267 "Negative patterns are ignored in git attributes\n"
268 "Use '\\!' for literal leading exclamation."
270 "负值模版在 git attributes 中被忽略\n"
271 "当字符串确实要以感叹号开始时,使用 '\\!'。"
277 "After fixing the error cause you may try to fix up\n"
278 "the remote tracking information by invoking\n"
279 "\"git branch --set-upstream-to=%s%s%s\"."
282 "在修复错误后,您可以尝试修改远程跟踪分支,通过执行命令\n"
283 "\"git branch --set-upstream-to=%s%s%s\" 。"
287 msgid "Not setting branch %s as its own upstream."
288 msgstr "未设置分支 %s 作为它自己的上游。"
292 msgid "Branch %s set up to track remote branch %s from %s by rebasing."
293 msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"
297 msgid "Branch %s set up to track remote branch %s from %s."
298 msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"
302 msgid "Branch %s set up to track local branch %s by rebasing."
303 msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"
307 msgid "Branch %s set up to track local branch %s."
308 msgstr "分支 %s 设置为跟踪本地分支 %s。"
312 msgid "Branch %s set up to track remote ref %s by rebasing."
313 msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"
317 msgid "Branch %s set up to track remote ref %s."
318 msgstr "分支 %s 设置为跟踪远程引用 %s。"
322 msgid "Branch %s set up to track local ref %s by rebasing."
323 msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"
327 msgid "Branch %s set up to track local ref %s."
328 msgstr "分支 %s 设置为跟踪本地引用 %s。"
331 msgid "Unable to write upstream branch configuration"
336 msgid "Not tracking: ambiguous information for ref %s"
337 msgstr "未跟踪:引用 %s 有歧义"
341 msgid "'%s' is not a valid branch name."
342 msgstr "'%s' 不是一个有效的分支名称。"
346 msgid "A branch named '%s' already exists."
347 msgstr "一个分支名 '%s' 已经存在。"
350 msgid "Cannot force update the current branch."
355 msgid "Cannot setup tracking information; starting point '%s' is not a branch."
356 msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
360 msgid "the requested upstream branch '%s' does not exist"
361 msgstr "请求的上游分支 '%s' 不存在"
366 "If you are planning on basing your work on an upstream\n"
367 "branch that already exists at the remote, you may need to\n"
368 "run \"git fetch\" to retrieve it.\n"
370 "If you are planning to push out a new local branch that\n"
371 "will track its remote counterpart, you may want to use\n"
372 "\"git push -u\" to set the upstream config as you push."
375 "如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
376 "您可能需要执行 \"git fetch\" 来获取分支。\n"
378 "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
379 "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
383 msgid "Not a valid object name: '%s'."
384 msgstr "不是一个有效的对象名:'%s'。"
388 msgid "Ambiguous object name: '%s'."
389 msgstr "歧义的对象名:'%s'。"
393 msgid "Not a valid branch point: '%s'."
394 msgstr "无效的分支点:'%s'。"
398 msgid "'%s' is already checked out at '%s'"
399 msgstr "'%s' 已经检出到 '%s'"
403 msgid "HEAD of working tree %s is not updated"
404 msgstr "工作区 %s 的 HEAD 指向没有被更新"
408 msgid "'%s' does not look like a v2 bundle file"
409 msgstr "'%s' 不像是一个 v2 版本的包文件"
413 msgid "unrecognized header: %s%s (%d)"
414 msgstr "未能识别的包头:%s%s (%d)"
416 #: bundle.c:87 builtin/commit.c:777
418 msgid "could not open '%s'"
422 msgid "Repository lacks these prerequisite commits:"
423 msgstr "仓库中缺少这些必备的提交:"
425 #: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073
426 #: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340
427 #: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875
428 #: builtin/merge.c:361 builtin/shortlog.c:170
429 msgid "revision walk setup failed"
434 msgid "The bundle contains this ref:"
435 msgid_plural "The bundle contains these %d refs:"
436 msgstr[0] "这个包中含有这个引用:"
437 msgstr[1] "这个包中含有 %d 个引用:"
440 msgid "The bundle records a complete history."
441 msgstr "这个包记录一个完整历史。"
445 msgid "The bundle requires this ref:"
446 msgid_plural "The bundle requires these %d refs:"
447 msgstr[0] "这个包需要这个引用:"
448 msgstr[1] "这个包需要 %d 个引用:"
451 msgid "Could not spawn pack-objects"
452 msgstr "不能生成 pack-objects 进程"
455 msgid "pack-objects died"
456 msgstr "pack-objects 终止"
459 msgid "rev-list died"
464 msgid "ref '%s' is excluded by the rev-list options"
465 msgstr "引用 '%s' 被 rev-list 选项排除"
467 #: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273
469 msgid "unrecognized argument: %s"
473 msgid "Refusing to create empty bundle."
478 msgid "cannot create '%s'"
482 msgid "index-pack died"
483 msgstr "index-pack 终止"
487 msgid "invalid color value: %.*s"
490 #: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504
493 msgid "could not parse %s"
498 msgid "%s %s is not a commit!"
499 msgstr "%s %s 不是一个提交!"
501 #: compat/obstack.c:406 compat/obstack.c:408
502 msgid "memory exhausted"
505 #: config.c:475 config.c:477
507 msgid "bad config line %d in %s %s"
508 msgstr "%2$s %3$s 出错于第 %1$d 行"
512 msgid "bad numeric config value '%s' for '%s' in %s %s: %s"
513 msgstr "%3$s %4$s 中配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %5$s"
517 msgid "bad numeric config value '%s' for '%s': %s"
518 msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %3$s"
522 msgid "failed to expand user dir in: '%s'"
523 msgstr "无法扩展 '%s' 中的用户目录"
525 #: config.c:761 config.c:772
527 msgid "bad zlib compression level %d"
528 msgstr "错误的 zlib 压缩级别 %d"
532 msgid "invalid mode for object creation: %s"
533 msgstr "无效的对象创建模式:%s"
536 msgid "unable to parse command-line config"
540 msgid "unknown error occured while reading the configuration files"
541 msgstr "在读取配置文件时遇到未知错误"
545 msgid "unable to parse '%s' from command-line config"
546 msgstr "无法解析命令行配置中的 '%s'"
550 msgid "bad config variable '%s' in file '%s' at line %d"
551 msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
555 msgid "%s has multiple values"
560 msgid "could not set '%s' to '%s'"
561 msgstr "不能设置 '%s' 为 '%s'"
565 msgid "could not unset '%s'"
569 msgid "Could not run 'git rev-list'"
570 msgstr "不能执行 'git rev-list'"
573 msgid "failed write to rev-list"
574 msgstr "无法写入 rev-list"
577 msgid "failed to close rev-list's stdin"
578 msgstr "无法关闭 rev-list 的标准输入"
581 msgid "in the future"
586 msgid "%lu second ago"
587 msgid_plural "%lu seconds ago"
593 msgid "%lu minute ago"
594 msgid_plural "%lu minutes ago"
601 msgid_plural "%lu hours ago"
608 msgid_plural "%lu days ago"
615 msgid_plural "%lu weeks ago"
621 msgid "%lu month ago"
622 msgid_plural "%lu months ago"
629 msgid_plural "%lu years"
633 #. TRANSLATORS: "%s" is "<n> years"
636 msgid "%s, %lu month ago"
637 msgid_plural "%s, %lu months ago"
638 msgstr[0] "%s %lu 个月前"
639 msgstr[1] "%s %lu 个月前"
641 #: date.c:154 date.c:159
644 msgid_plural "%lu years ago"
648 #: diffcore-order.c:24
650 msgid "failed to read orderfile '%s'"
651 msgstr "无法读取排序文件 '%s'"
653 #: diffcore-rename.c:538
654 msgid "Performing inexact rename detection"
655 msgstr "正在进行非精确的重命名检测"
660 msgid " Failed to parse dirstat cut-off percentage '%s'\n"
661 msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
666 msgid " Unknown dirstat parameter '%s'\n"
667 msgstr " 未知的 dirstat 参数 '%s'\n"
671 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
672 msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
677 "Found errors in 'diff.dirstat' config variable:\n"
680 "发现配置变量 'diff.dirstat' 中的错误:\n"
685 msgid "external diff died, stopping at %s"
686 msgstr "外部 diff 退出,停止在 %s"
689 msgid "--follow requires exactly one pathspec"
690 msgstr "--follow 参数后只跟一个 pathspec"
695 "Failed to parse --dirstat/-X option parameter:\n"
698 "无法解析 --dirstat/-X 选项的参数:\n"
703 msgid "Failed to parse --submodule option parameter: '%s'"
704 msgstr "无法解析 --submodule 选项的参数:'%s'"
707 msgid "failed to get kernel name and information"
711 msgid "Untracked cache is disabled on this system or location."
712 msgstr "缓存未跟踪文件在本系统或位置中被禁用。"
714 #: gpg-interface.c:166 gpg-interface.c:235
715 msgid "could not run gpg."
718 #: gpg-interface.c:178
719 msgid "gpg did not accept the data"
722 #: gpg-interface.c:189
723 msgid "gpg failed to sign the data"
726 #: gpg-interface.c:222
728 msgid "could not create temporary file '%s'"
729 msgstr "不能创建临时文件 '%s'"
731 #: gpg-interface.c:224
733 msgid "failed writing detached signature to '%s'"
734 msgstr "无法将分离式签名写入 '%s'"
738 msgid "'%s': unable to read %s"
739 msgstr "'%s':无法读取 %s"
741 #: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
743 msgid "failed to stat '%s'"
744 msgstr "无法枚举 '%s' 状态"
748 msgid "'%s': short read"
753 msgid "available git commands in '%s'"
754 msgstr "在 '%s' 下可用的 git 命令"
757 msgid "git commands available from elsewhere on your $PATH"
758 msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
761 msgid "These are common Git commands used in various situations:"
762 msgstr "这些是各种场合常见的 Git 命令:"
767 "'%s' appears to be a git command, but we were not\n"
768 "able to execute it. Maybe git-%s is broken?"
770 "'%s' 像是一个 git 命令,但却无法运行。\n"
774 msgid "Uh oh. Your system reports no Git commands at all."
775 msgstr "唉呀,您的系统中未发现 Git 命令。"
780 "WARNING: You called a Git command named '%s', which does not exist.\n"
781 "Continuing under the assumption that you meant '%s'"
783 "警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
788 msgid "in %0.1f seconds automatically..."
789 msgstr "在 %0.1f 秒钟后自动运行..."
793 msgid "git: '%s' is not a git command. See 'git --help'."
794 msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
796 #: help.c:404 help.c:464
802 "Did you mean one of these?"
818 "Unable to create '%s.lock': %s.\n"
820 "Another git process seems to be running in this repository, e.g.\n"
821 "an editor opened by 'git commit'. Please make sure all processes\n"
822 "are terminated then try again. If it still fails, a git process\n"
823 "may have crashed in this repository earlier:\n"
824 "remove the file manually to continue."
826 "无法创建 '%s.lock':%s。\n"
828 "似乎另外一个 git 进程在这个仓库中运行,例如:'git commit' 命令打\n"
829 "开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错,\n"
830 "可能之前有一个 git 进程在这个仓库中异常退出:\n"
835 msgid "Unable to create '%s.lock': %s"
836 msgstr "不能创建 '%s.lock':%s"
839 msgid "failed to read the cache"
842 #: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375
843 #: builtin/checkout.c:586 builtin/clone.c:732
844 msgid "unable to write new index file"
847 #: merge-recursive.c:189
849 msgid "(bad commit)\n"
852 #: merge-recursive.c:209
854 msgid "addinfo_cache failed for path '%s'"
855 msgstr "为路径 '%s' addinfo_cache 失败"
857 #: merge-recursive.c:270
858 msgid "error building trees"
861 #: merge-recursive.c:689
863 msgid "failed to create path '%s'%s"
864 msgstr "无法创建路径 '%s'%s"
866 #: merge-recursive.c:700
868 msgid "Removing %s to make room for subdirectory\n"
869 msgstr "删除 %s 以便为子目录留出空间\n"
871 #: merge-recursive.c:714 merge-recursive.c:735
872 msgid ": perhaps a D/F conflict?"
873 msgstr ":可能是一个目录/文件冲突?"
875 #: merge-recursive.c:725
877 msgid "refusing to lose untracked file at '%s'"
878 msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
880 #: merge-recursive.c:765
882 msgid "cannot read object %s '%s'"
883 msgstr "不能读取对象 %s '%s'"
885 #: merge-recursive.c:767
887 msgid "blob expected for %s '%s'"
888 msgstr "%s '%s' 应为数据对象"
890 #: merge-recursive.c:790 builtin/clone.c:376
892 msgid "failed to open '%s'"
895 #: merge-recursive.c:798
897 msgid "failed to symlink '%s'"
898 msgstr "无法创建符号链接 '%s'"
900 #: merge-recursive.c:801
902 msgid "do not know what to do with %06o %s '%s'"
903 msgstr "不知道如何处理 %06o %s '%s'"
905 #: merge-recursive.c:939
906 msgid "Failed to execute internal merge"
909 #: merge-recursive.c:943
911 msgid "Unable to add %s to database"
912 msgstr "不能添加 %s 至对象库"
914 #: merge-recursive.c:959
915 msgid "unsupported object type in the tree"
916 msgstr "在树中有不支持的对象类型"
918 #: merge-recursive.c:1034 merge-recursive.c:1048
921 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
924 "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
927 #: merge-recursive.c:1040 merge-recursive.c:1053
930 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
933 "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
936 #: merge-recursive.c:1094
940 #: merge-recursive.c:1094
944 #: merge-recursive.c:1150
946 msgid "%s is a directory in %s adding as %s instead"
947 msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
949 #: merge-recursive.c:1172
952 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
953 "\"->\"%s\" in \"%s\"%s"
955 "冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
956 "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
958 #: merge-recursive.c:1177
959 msgid " (left unresolved)"
962 #: merge-recursive.c:1231
964 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
966 "冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
969 #: merge-recursive.c:1261
971 msgid "Renaming %s to %s and %s to %s instead"
972 msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
974 #: merge-recursive.c:1460
976 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
977 msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
979 #: merge-recursive.c:1470
981 msgid "Adding merged %s"
984 #: merge-recursive.c:1475 merge-recursive.c:1677
986 msgid "Adding as %s instead"
989 #: merge-recursive.c:1526
991 msgid "cannot read object %s"
994 #: merge-recursive.c:1529
996 msgid "object %s is not a blob"
997 msgstr "对象 %s 不是一个数据对象"
999 #: merge-recursive.c:1581
1003 #: merge-recursive.c:1581
1007 #: merge-recursive.c:1591
1011 #: merge-recursive.c:1598
1015 #: merge-recursive.c:1632
1017 msgid "Skipped %s (merged same as existing)"
1018 msgstr "略过 %s(已经做过相同合并)"
1020 #: merge-recursive.c:1646
1022 msgid "Auto-merging %s"
1025 #: merge-recursive.c:1650 git-submodule.sh:941
1029 #: merge-recursive.c:1651
1031 msgid "CONFLICT (%s): Merge conflict in %s"
1032 msgstr "冲突(%s):合并冲突于 %s"
1034 #: merge-recursive.c:1737
1039 #: merge-recursive.c:1762
1040 msgid "file/directory"
1043 #: merge-recursive.c:1768
1044 msgid "directory/file"
1047 #: merge-recursive.c:1773
1049 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
1050 msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
1052 #: merge-recursive.c:1781
1057 #: merge-recursive.c:1798
1058 msgid "Fatal merge failure, shouldn't happen."
1059 msgstr "严重的合并错误,不应发生。"
1061 #: merge-recursive.c:1817
1062 msgid "Already up-to-date!"
1065 #: merge-recursive.c:1826
1067 msgid "merging of trees %s and %s failed"
1068 msgstr "无法合并树 %s 和 %s"
1070 #: merge-recursive.c:1856
1072 msgid "Unprocessed path??? %s"
1073 msgstr "未处理的路径??? %s"
1075 #: merge-recursive.c:1904
1079 #: merge-recursive.c:1917
1081 msgid "found %u common ancestor:"
1082 msgid_plural "found %u common ancestors:"
1083 msgstr[0] "发现 %u 个共同祖先:"
1084 msgstr[1] "发现 %u 个共同祖先:"
1086 #: merge-recursive.c:1954
1087 msgid "merge returned no commit"
1090 #: merge-recursive.c:2011
1092 msgid "Could not parse object '%s'"
1093 msgstr "不能解析对象 '%s'"
1095 #: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831
1096 msgid "Unable to write index."
1100 msgid "Cannot commit uninitialized/unreferenced notes tree"
1101 msgstr "不能提交未初始化/未引用的注解树"
1103 #: notes-utils.c:100
1105 msgid "Bad notes.rewriteMode value: '%s'"
1106 msgstr "坏的 notes.rewriteMode 值:'%s'"
1108 #: notes-utils.c:110
1110 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
1111 msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
1113 #. TRANSLATORS: The first %s is the name of the
1114 #. environment variable, the second %s is its value
1115 #: notes-utils.c:137
1117 msgid "Bad %s value: '%s'"
1118 msgstr "坏的 %s 值:'%s'"
1122 msgid "unable to parse object: %s"
1125 #: parse-options.c:572
1129 #: parse-options.c:590
1134 #. TRANSLATORS: the colon here should align with the
1135 #. one in "usage: %s" translation
1136 #: parse-options.c:594
1141 # 译者:为保证在输出中对齐,注意调整句中空格!
1142 #: parse-options.c:597
1147 #: parse-options.c:631
1151 #: parse-options-cb.c:108
1153 msgid "malformed object name '%s'"
1154 msgstr "非法的对象名 '%s'"
1158 msgid "Could not make %s writable by group"
1159 msgstr "不能设置 %s 为组可写"
1162 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
1163 msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
1167 "global 'literal' pathspec setting is incompatible with all other global "
1169 msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
1172 msgid "invalid parameter for pathspec magic 'prefix'"
1173 msgstr "路径规格包含无效的神奇前缀"
1177 msgid "Invalid pathspec magic '%.*s' in '%s'"
1178 msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
1182 msgid "Missing ')' at the end of pathspec magic in '%s'"
1183 msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
1187 msgid "Unimplemented pathspec magic '%c' in '%s'"
1188 msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
1192 msgid "%s: 'literal' and 'glob' are incompatible"
1193 msgstr "%s:'literal' 和 'glob' 不兼容"
1197 msgid "%s: '%s' is outside repository"
1198 msgstr "%s:'%s' 在仓库之外"
1202 msgid "Pathspec '%s' is in submodule '%.*s'"
1203 msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
1207 msgid "%s: pathspec magic not supported by this command: %s"
1208 msgstr "%s:路径规格神奇前缀不被此命令支持:%s"
1212 msgid "pathspec '%s' is beyond a symbolic link"
1213 msgstr "路径规格 '%s' 位于符号链接中"
1217 "There is nothing to exclude from by :(exclude) patterns.\n"
1218 "Perhaps you forgot to add either ':/' or '.' ?"
1220 "没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"
1224 msgid "unable to parse --pretty format"
1225 msgstr "不能解析 --pretty 格式"
1231 #: read-cache.c:1281
1234 "index.version set, but the value is invalid.\n"
1237 "设置了 index.version,但是取值无效。\n"
1240 #: read-cache.c:1291
1243 "GIT_INDEX_VERSION set, but the value is invalid.\n"
1246 "设置了 GIT_INDEX_VERSION,但是取值无效。\n"
1249 #: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985
1250 #: builtin/merge.c:995
1252 msgid "Could not open '%s' for writing"
1253 msgstr "无法打开 '%s' 进行写入"
1255 #: refs/files-backend.c:2243
1257 msgid "could not delete reference %s: %s"
1258 msgstr "无法删除引用 %s:%s"
1260 #: refs/files-backend.c:2246
1262 msgid "could not delete references: %s"
1265 #: refs/files-backend.c:2255
1267 msgid "could not remove reference %s"
1272 msgid "expected format: %%(color:<color>)"
1273 msgstr "期望的格式:%%(color:<color>)"
1277 msgid "unrecognized color: %%(color:%s)"
1278 msgstr "未能识别的颜色:%%(color:%s)"
1282 msgid "unrecognized format: %%(%s)"
1283 msgstr "未能识别的格式:%%(%s)"
1287 msgid "%%(body) does not take arguments"
1288 msgstr "%%(body) 不带参数"
1292 msgid "%%(subject) does not take arguments"
1293 msgstr "%%(subject) 不带参数"
1297 msgid "positive value expected contents:lines=%s"
1298 msgstr "要为 contents:lines=%s 提供一个正数"
1302 msgid "unrecognized %%(contents) argument: %s"
1303 msgstr "未能识别的 %%(contents) 参数:%s"
1307 msgid "unrecognized %%(objectname) argument: %s"
1308 msgstr "未能识别的 %%(objectname) 参数:%s"
1312 msgid "expected format: %%(align:<width>,<position>)"
1313 msgstr "期望的格式:%%(align:<width>,<position>)"
1317 msgid "unrecognized position:%s"
1322 msgid "unrecognized width:%s"
1327 msgid "unrecognized %%(align) argument: %s"
1328 msgstr "未能识别的 %%(align) 参数:%s"
1332 msgid "positive width expected with the %%(align) atom"
1333 msgstr "元素 %%(align) 需要一个正数的宽度"
1337 msgid "malformed field name: %.*s"
1338 msgstr "非法的字段名:%.*s"
1342 msgid "unknown field name: %.*s"
1343 msgstr "未知的字段名:%.*s"
1347 msgid "format: %%(end) atom used without corresponding atom"
1348 msgstr "格式:使用了 %%(end) 元素却没有它的对应元素"
1352 msgid "malformed format string %s"
1353 msgstr "非法的格式化字符串 %s"
1356 msgid ":strip= requires a positive integer argument"
1357 msgstr ":strip= 需要一个正整型参数"
1361 msgid "ref '%s' does not have %ld components to :strip"
1362 msgstr "引用 '%s' 未提供用于 :strip 的 %ld 个组件"
1364 #: ref-filter.c:1046
1366 msgid "unknown %.*s format %s"
1367 msgstr "未知的 %.*s 格式 %s"
1369 #: ref-filter.c:1066 ref-filter.c:1097
1371 msgid "missing object %s for %s"
1372 msgstr "缺失 %2$s 的对象 %1$s"
1374 #: ref-filter.c:1069 ref-filter.c:1100
1376 msgid "parse_object_buffer failed on %s for %s"
1377 msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
1379 #: ref-filter.c:1311
1381 msgid "malformed object at '%s'"
1382 msgstr "非法的对象于 '%s'"
1384 #: ref-filter.c:1373
1386 msgid "ignoring ref with broken name %s"
1387 msgstr "忽略带有错误名称 %s 的引用"
1389 #: ref-filter.c:1378
1391 msgid "ignoring broken ref %s"
1394 #: ref-filter.c:1651
1396 msgid "format: %%(end) atom missing"
1397 msgstr "格式:缺少 %%(end) 元素"
1399 #: ref-filter.c:1705
1401 msgid "malformed object name %s"
1406 msgid "Cannot fetch both %s and %s to %s"
1407 msgstr "不能同时获取 %s 和 %s 至 %s"
1411 msgid "%s usually tracks %s, not %s"
1412 msgstr "%s 通常跟踪 %s,而非 %s"
1416 msgid "%s tracks both %s and %s"
1417 msgstr "%s 同时跟踪 %s 和 %s"
1420 msgid "Internal error"
1423 #: remote.c:1678 remote.c:1721
1424 msgid "HEAD does not point to a branch"
1425 msgstr "HEAD 没有指向一个分支"
1429 msgid "no such branch: '%s'"
1434 msgid "no upstream configured for branch '%s'"
1435 msgstr "尚未给分支 '%s' 设置上游"
1439 msgid "upstream branch '%s' not stored as a remote-tracking branch"
1440 msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
1444 msgid "push destination '%s' on remote '%s' has no local tracking branch"
1445 msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
1449 msgid "branch '%s' has no remote for pushing"
1450 msgstr "分支 '%s' 没有设置要推送的远程服务器"
1454 msgid "push refspecs for '%s' do not include '%s'"
1455 msgstr "向 '%s' 推送引用规格未包含 '%s'"
1458 msgid "push has no destination (push.default is 'nothing')"
1459 msgstr "推送无目标(push.default 是 'nothing')"
1462 msgid "cannot resolve 'simple' push to a single destination"
1463 msgstr "无法解析 'simple' 推送至一个单独的目标"
1467 msgid "Your branch is based on '%s', but the upstream is gone.\n"
1468 msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
1471 msgid " (use \"git branch --unset-upstream\" to fixup)\n"
1472 msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n"
1476 msgid "Your branch is up-to-date with '%s'.\n"
1477 msgstr "您的分支与上游分支 '%s' 一致。\n"
1481 msgid "Your branch is ahead of '%s' by %d commit.\n"
1482 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
1483 msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
1484 msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
1487 msgid " (use \"git push\" to publish your local commits)\n"
1488 msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
1492 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
1494 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
1495 msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
1496 msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
1500 msgid " (use \"git pull\" to update your local branch)\n"
1501 msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
1506 "Your branch and '%s' have diverged,\n"
1507 "and have %d and %d different commit each, respectively.\n"
1509 "Your branch and '%s' have diverged,\n"
1510 "and have %d and %d different commits each, respectively.\n"
1512 "您的分支和 '%s' 出现了偏离,\n"
1513 "并且分别有 %d 和 %d 处不同的提交。\n"
1515 "您的分支和 '%s' 出现了偏离,\n"
1516 "并且分别有 %d 和 %d 处不同的提交。\n"
1520 msgid " (use \"git pull\" to merge the remote branch into yours)\n"
1521 msgstr " (使用 \"git pull\" 来合并远程分支)\n"
1524 msgid "your current branch appears to be broken"
1525 msgstr "您的当前分支好像被损坏"
1529 msgid "your current branch '%s' does not have any commits yet"
1530 msgstr "您的当前分支 '%s' 尚无任何提交"
1533 msgid "--first-parent is incompatible with --bisect"
1534 msgstr "--first-parent 与 --bisect 不兼容"
1537 msgid "open /dev/null failed"
1538 msgstr "不能打开 /dev/null"
1542 msgid "dup2(%d,%d) failed"
1543 msgstr "不能调用 dup2(%d,%d)"
1546 msgid "failed to sign the push certificate"
1550 msgid "the receiving end does not support --signed push"
1555 "not sending a push certificate since the receiving end does not support --"
1557 msgstr "未发送推送证书,因为接收端不支持签名推送"
1560 msgid "the receiving end does not support --atomic push"
1565 "after resolving the conflicts, mark the corrected paths\n"
1566 "with 'git add <paths>' or 'git rm <paths>'"
1568 "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
1573 "after resolving the conflicts, mark the corrected paths\n"
1574 "with 'git add <paths>' or 'git rm <paths>'\n"
1575 "and commit the result with 'git commit'"
1577 "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
1578 "对修正后的文件做标记,然后用 'git commit' 提交"
1580 #: sequencer.c:190 sequencer.c:833 sequencer.c:912
1582 msgid "Could not write to %s"
1587 msgid "Error wrapping up %s"
1591 msgid "Your local changes would be overwritten by cherry-pick."
1592 msgstr "您的本地修改将被拣选操作覆盖。"
1595 msgid "Your local changes would be overwritten by revert."
1596 msgstr "您的本地修改将被还原操作覆盖。"
1599 msgid "Commit your changes or stash them to proceed."
1600 msgstr "提交您的修改或保存进度后再继续。"
1602 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
1605 msgid "%s: Unable to write new index file"
1606 msgstr "%s:无法写入新索引文件"
1609 msgid "Could not resolve HEAD commit\n"
1610 msgstr "不能解析 HEAD 提交\n"
1613 msgid "Unable to update cache tree\n"
1618 msgid "Could not parse commit %s\n"
1619 msgstr "不能解析提交 %s\n"
1623 msgid "Could not parse parent commit %s\n"
1624 msgstr "不能解析父提交 %s\n"
1627 msgid "Your index file is unmerged."
1628 msgstr "您的索引文件未完成合并。"
1632 msgid "Commit %s is a merge but no -m option was given."
1633 msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
1637 msgid "Commit %s does not have parent %d"
1638 msgstr "提交 %s 没有父提交 %d"
1642 msgid "Mainline was specified but commit %s is not a merge."
1643 msgstr "指定了主线但提交 %s 不是一个合并。"
1645 #. TRANSLATORS: The first %s will be "revert" or
1646 #. "cherry-pick", the second %s a SHA1
1649 msgid "%s: cannot parse parent commit %s"
1650 msgstr "%s:不能解析父提交 %s"
1654 msgid "Cannot get commit message for %s"
1655 msgstr "不能得到 %s 的提交说明"
1659 msgid "could not revert %s... %s"
1660 msgstr "不能还原 %s... %s"
1664 msgid "could not apply %s... %s"
1665 msgstr "不能应用 %s... %s"
1668 msgid "empty commit set passed"
1673 msgid "git %s: failed to read the index"
1674 msgstr "git %s:无法读取索引"
1678 msgid "git %s: failed to refresh the index"
1679 msgstr "git %s:无法刷新索引"
1683 msgid "Cannot %s during a %s"
1684 msgstr "无法 %s 在一个 %s 过程中"
1688 msgid "Could not parse line %d."
1689 msgstr "不能解析第 %d 行。"
1692 msgid "No commits parsed."
1697 msgid "Could not open %s"
1702 msgid "Could not read %s."
1707 msgid "Unusable instruction sheet: %s"
1712 msgid "Invalid key: %s"
1715 #: sequencer.c:785 builtin/pull.c:50 builtin/pull.c:52
1717 msgid "Invalid value for %s: %s"
1722 msgid "Malformed options sheet: %s"
1726 msgid "a cherry-pick or revert is already in progress"
1727 msgstr "一个拣选或还原操作已在进行"
1730 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
1731 msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
1735 msgid "Could not create sequencer directory %s"
1736 msgstr "不能创建序列目录 %s"
1738 #: sequencer.c:835 sequencer.c:916
1740 msgid "Error wrapping up %s."
1743 #: sequencer.c:854 sequencer.c:986
1744 msgid "no cherry-pick or revert in progress"
1745 msgstr "拣选或还原操作并未进行"
1748 msgid "cannot resolve HEAD"
1752 msgid "cannot abort from a branch yet to be born"
1753 msgstr "不能从尚未建立的分支终止"
1755 #: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851
1757 msgid "cannot open %s"
1762 msgid "cannot read %s: %s"
1766 msgid "unexpected end of file"
1771 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
1772 msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
1776 msgid "Could not format %s."
1781 msgid "%s: can't cherry-pick a %s"
1782 msgstr "%s:不能拣选一个%s"
1786 msgid "%s: bad revision"
1790 msgid "Can't revert as initial commit"
1794 msgid "Can't cherry-pick into empty head"
1799 msgid "failed to read %s"
1804 msgid "Expected git repo version <= %d, found %d"
1805 msgstr "期望 git 仓库版本 <= %d,却得到 %d"
1808 msgid "unknown repository extensions found:"
1812 msgid "offset before end of packfile (broken .idx?)"
1813 msgstr "偏移量在包文件结束之前(损坏的 .idx?)"
1817 msgid "offset before start of pack index for %s (corrupt index?)"
1818 msgstr "偏移量在 %s 的包索引开始之前(损坏的索引?)"
1822 msgid "offset beyond end of pack index for %s (truncated index?)"
1823 msgstr "偏移量越过了 %s 的包索引的结尾(被截断的索引?)"
1827 "Git normally never creates a ref that ends with 40 hex characters\n"
1828 "because it will be ignored when you just specify 40-hex. These refs\n"
1829 "may be created by mistake. For example,\n"
1831 " git checkout -b $br $(git rev-parse ...)\n"
1833 "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
1834 "examine these refs and maybe delete them. Turn this message off by\n"
1835 "running \"git config advice.objectNameWarning false\""
1837 "Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n"
1838 "十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n"
1840 " git checkout -b $br $(git rev-parse ...)\n"
1842 "当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n"
1843 "可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
1846 #: submodule.c:64 submodule.c:98
1847 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
1848 msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
1850 #: submodule.c:68 submodule.c:102
1852 msgid "Could not find section in .gitmodules where path=%s"
1853 msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
1857 msgid "Could not update .gitmodules entry %s"
1858 msgstr "不能更新 .gitmodules 条目 %s"
1862 msgid "Could not remove .gitmodules entry for %s"
1863 msgstr "无法移除 %s 的 .gitmodules 条目"
1866 msgid "staging updated .gitmodules failed"
1867 msgstr "将更新后 .gitmodules 添加暂存区失败"
1870 msgid "negative values not allowed for submodule.fetchJobs"
1871 msgstr "submodule.fetchJobs 不允许为负值"
1873 #: submodule-config.c:355
1875 msgid "invalid value for %s"
1880 msgid "running trailer command '%s' failed"
1881 msgstr "执行 trailer 命令 '%s' 失败"
1883 #: trailer.c:492 trailer.c:496 trailer.c:500 trailer.c:554 trailer.c:558
1886 msgid "unknown value '%s' for key '%s'"
1887 msgstr "键 '%2$s' 的未知取值 '%1$s'"
1889 #: trailer.c:544 trailer.c:549 builtin/remote.c:289
1891 msgid "more than one %s"
1896 msgid "empty trailer token in trailer '%.*s'"
1897 msgstr "签名 '%.*s' 的键为空"
1901 msgid "could not read input file '%s'"
1902 msgstr "不能读取输入文件 '%s'"
1905 msgid "could not read from stdin"
1908 #: trailer.c:857 builtin/am.c:42
1910 msgid "could not stat %s"
1911 msgstr "不能获取 %s 的文件状态"
1915 msgid "file %s is not a regular file"
1916 msgstr "文件 %s 不是一个正规文件"
1920 msgid "file %s is not writable by user"
1921 msgstr "文件 %s 用户不可写"
1924 msgid "could not open temporary file"
1929 msgid "could not rename temporary file to %s"
1930 msgstr "不能重命名临时文件为 %s"
1932 #: transport-helper.c:1041
1934 msgid "Could not read ref %s"
1937 #: unpack-trees.c:64
1940 "Your local changes to the following files would be overwritten by checkout:\n"
1941 "%%sPlease commit your changes or stash them before you can switch branches."
1943 "您对下列文件的本地修改将被检出操作覆盖:\n"
1944 "%%s请在切换分支前提交您的修改或者保存进度。"
1946 #: unpack-trees.c:66
1949 "Your local changes to the following files would be overwritten by checkout:\n"
1952 "您对下列文件的本地修改将被检出操作覆盖:\n"
1955 #: unpack-trees.c:69
1958 "Your local changes to the following files would be overwritten by merge:\n"
1959 "%%sPlease commit your changes or stash them before you can merge."
1961 "您对下列文件的本地修改将被合并操作覆盖:\n"
1962 "%%s请在合并前提交您的修改或者保存进度。"
1964 #: unpack-trees.c:71
1967 "Your local changes to the following files would be overwritten by merge:\n"
1970 "您对下列文件的本地修改将被合并操作覆盖:\n"
1973 #: unpack-trees.c:74
1976 "Your local changes to the following files would be overwritten by %s:\n"
1977 "%%sPlease commit your changes or stash them before you can %s."
1979 "您对下列文件的本地修改将被 %s 覆盖:\n"
1980 "%%s请在 %s 之前提交您的修改或者保存进度。"
1982 #: unpack-trees.c:76
1985 "Your local changes to the following files would be overwritten by %s:\n"
1988 "您对下列文件的本地修改将被 %s 覆盖:\n"
1991 #: unpack-trees.c:81
1994 "Updating the following directories would lose untracked files in it:\n"
1997 "更新如下目录将会丢失其中未跟踪的文件:\n"
2000 #: unpack-trees.c:85
2003 "The following untracked working tree files would be removed by checkout:\n"
2004 "%%sPlease move or remove them before you can switch branches."
2006 "工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
2009 #: unpack-trees.c:87
2012 "The following untracked working tree files would be removed by checkout:\n"
2015 "工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
2018 #: unpack-trees.c:90
2021 "The following untracked working tree files would be removed by merge:\n"
2022 "%%sPlease move or remove them before you can merge."
2024 "工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
2027 #: unpack-trees.c:92
2030 "The following untracked working tree files would be removed by merge:\n"
2033 "工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
2036 #: unpack-trees.c:95
2039 "The following untracked working tree files would be removed by %s:\n"
2040 "%%sPlease move or remove them before you can %s."
2042 "工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
2045 #: unpack-trees.c:97
2048 "The following untracked working tree files would be removed by %s:\n"
2051 "工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
2054 #: unpack-trees.c:102
2057 "The following untracked working tree files would be overwritten by "
2059 "%%sPlease move or remove them before you can switch branches."
2061 "工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
2064 #: unpack-trees.c:104
2067 "The following untracked working tree files would be overwritten by "
2071 "工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
2074 #: unpack-trees.c:107
2077 "The following untracked working tree files would be overwritten by merge:\n"
2078 "%%sPlease move or remove them before you can merge."
2080 "工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
2083 #: unpack-trees.c:109
2086 "The following untracked working tree files would be overwritten by merge:\n"
2089 "工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
2092 #: unpack-trees.c:112
2095 "The following untracked working tree files would be overwritten by %s:\n"
2096 "%%sPlease move or remove them before you can %s."
2098 "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
2101 #: unpack-trees.c:114
2104 "The following untracked working tree files would be overwritten by %s:\n"
2107 "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
2110 #: unpack-trees.c:121
2112 msgid "Entry '%s' overlaps with '%s'. Cannot bind."
2113 msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"
2115 #: unpack-trees.c:124
2118 "Cannot update sparse checkout: the following entries are not up-to-date:\n"
2121 "无法更新稀疏检出:如下条目不是最新:\n"
2124 #: unpack-trees.c:126
2127 "The following Working tree files would be overwritten by sparse checkout "
2131 "工作区中下列文件将会因为稀疏检出而被覆盖:\n"
2134 #: unpack-trees.c:128
2137 "The following Working tree files would be removed by sparse checkout "
2141 "工作区中下列文件将会因为稀疏检出而被删除:\n"
2144 #: unpack-trees.c:205
2149 #: unpack-trees.c:237
2150 msgid "Checking out files"
2154 msgid "invalid URL scheme name or missing '://' suffix"
2155 msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
2157 #: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
2159 msgid "invalid %XX escape sequence"
2160 msgstr "无效的 %XX 转义序列"
2163 msgid "missing host and scheme is not 'file:'"
2164 msgstr "缺失主机名且 URL 方案不是 'file:'"
2167 msgid "a 'file:' URL may not have a port number"
2168 msgstr "一个 'file:' URL 不应该包含端口号"
2171 msgid "invalid characters in host name"
2172 msgstr "主机名中包含无效的字符"
2174 #: urlmatch.c:244 urlmatch.c:255
2175 msgid "invalid port number"
2179 msgid "invalid '..' path segment"
2180 msgstr "无效的 '..' 路径片段"
2182 #: wrapper.c:222 wrapper.c:381
2184 msgid "could not open '%s' for reading and writing"
2185 msgstr "无法打开 '%s' 进行读写"
2187 #: wrapper.c:224 wrapper.c:383 builtin/am.c:779
2189 msgid "could not open '%s' for writing"
2190 msgstr "无法打开 '%s' 进行写入"
2192 #: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772
2193 #: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086
2194 #: builtin/pull.c:407
2196 msgid "could not open '%s' for reading"
2197 msgstr "无法打开 '%s' 进行读取"
2199 #: wrapper.c:594 wrapper.c:615
2201 msgid "unable to access '%s'"
2205 msgid "unable to get current working directory"
2210 msgid "could not open %s for writing"
2213 #: wrapper.c:661 builtin/am.c:410
2215 msgid "could not write to %s"
2220 msgid "could not close %s"
2224 msgid "Unmerged paths:"
2228 #: wt-status.c:177 wt-status.c:204
2230 msgid " (use \"git reset %s <file>...\" to unstage)"
2231 msgstr " (使用 \"git reset %s <文件>...\" 以取消暂存)"
2234 #: wt-status.c:179 wt-status.c:206
2235 msgid " (use \"git rm --cached <file>...\" to unstage)"
2236 msgstr " (使用 \"git rm --cached <文件>...\" 以取消暂存)"
2240 msgid " (use \"git add <file>...\" to mark resolution)"
2241 msgstr " (使用 \"git add <文件>...\" 标记解决方案)"
2244 #: wt-status.c:185 wt-status.c:189
2245 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
2246 msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)"
2250 msgid " (use \"git rm <file>...\" to mark resolution)"
2251 msgstr " (使用 \"git rm <文件>...\" 标记解决方案)"
2253 #: wt-status.c:198 wt-status.c:881
2254 msgid "Changes to be committed:"
2257 #: wt-status.c:216 wt-status.c:890
2258 msgid "Changes not staged for commit:"
2259 msgstr "尚未暂存以备提交的变更:"
2263 msgid " (use \"git add <file>...\" to update what will be committed)"
2264 msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)"
2268 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
2269 msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)"
2274 " (use \"git checkout -- <file>...\" to discard changes in working directory)"
2275 msgstr " (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)"
2279 msgid " (commit or discard the untracked or modified content in submodules)"
2280 msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
2285 msgid " (use \"git %s <file>...\" to include in what will be committed)"
2286 msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)"
2289 msgid "both deleted:"
2293 msgid "added by us:"
2297 msgid "deleted by them:"
2301 msgid "added by them:"
2305 msgid "deleted by us:"
2313 msgid "both modified:"
2318 msgid "bug: unhandled unmerged status %x"
2319 msgstr "bug:无法处理的未合并状态 %x"
2353 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
2355 msgid "new commits, "
2358 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
2360 msgid "modified content, "
2363 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
2365 msgid "untracked content, "
2370 msgid "bug: unhandled diff status %c"
2371 msgstr "bug:无法处理的差异状态 %c"
2374 msgid "Submodules changed but not updated:"
2375 msgstr "子模组已修改但尚未更新:"
2378 msgid "Submodule changes to be committed:"
2383 "Do not touch the line above.\n"
2384 "Everything below will be removed."
2390 msgid "You have unmerged paths."
2395 msgid " (fix conflicts and run \"git commit\")"
2396 msgstr " (解决冲突并运行 \"git commit\")"
2399 msgid "All conflicts fixed but you are still merging."
2400 msgstr "所有冲突已解决但您仍处于合并中。"
2404 msgid " (use \"git commit\" to conclude merge)"
2405 msgstr " (使用 \"git commit\" 结束合并)"
2408 msgid "You are in the middle of an am session."
2409 msgstr "您正处于 am 操作过程中。"
2412 msgid "The current patch is empty."
2417 msgid " (fix conflicts and then run \"git am --continue\")"
2418 msgstr " (解决冲突,然后运行 \"git am --continue\")"
2422 msgid " (use \"git am --skip\" to skip this patch)"
2423 msgstr " (使用 \"git am --skip\" 跳过此补丁)"
2427 msgid " (use \"git am --abort\" to restore the original branch)"
2428 msgstr " (使用 \"git am --abort\" 恢复原有分支)"
2431 msgid "No commands done."
2436 msgid "Last command done (%d command done):"
2437 msgid_plural "Last commands done (%d commands done):"
2438 msgstr[0] "最后一条命令已完成(%d 条命令被执行):"
2439 msgstr[1] "最后的命令已完成(%d 条命令被执行):"
2443 msgid " (see more in file %s)"
2444 msgstr " (更多参见文件 %s)"
2447 msgid "No commands remaining."
2452 msgid "Next command to do (%d remaining command):"
2453 msgid_plural "Next commands to do (%d remaining commands):"
2454 msgstr[0] "接下来要执行的命令(剩余 %d 条命令):"
2455 msgstr[1] "接下来要执行的命令(剩余 %d 条命令):"
2459 msgid " (use \"git rebase --edit-todo\" to view and edit)"
2460 msgstr " (使用 \"git rebase --edit-todo\" 来查看和编辑)"
2464 msgid "You are currently rebasing branch '%s' on '%s'."
2465 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
2468 msgid "You are currently rebasing."
2473 msgid " (fix conflicts and then run \"git rebase --continue\")"
2474 msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
2478 msgid " (use \"git rebase --skip\" to skip this patch)"
2479 msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
2483 msgid " (use \"git rebase --abort\" to check out the original branch)"
2484 msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
2488 msgid " (all conflicts fixed: run \"git rebase --continue\")"
2489 msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
2494 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
2495 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
2498 msgid "You are currently splitting a commit during a rebase."
2499 msgstr "您在执行变基操作时拆分提交。"
2503 msgid " (Once your working directory is clean, run \"git rebase --continue\")"
2504 msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
2508 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
2509 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
2512 msgid "You are currently editing a commit during a rebase."
2513 msgstr "您在执行变基操作时编辑提交。"
2517 msgid " (use \"git commit --amend\" to amend the current commit)"
2518 msgstr " (使用 \"git commit --amend\" 修补当前提交)"
2523 " (use \"git rebase --continue\" once you are satisfied with your changes)"
2524 msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
2528 msgid "You are currently cherry-picking commit %s."
2529 msgstr "您在执行拣选提交 %s 的操作。"
2533 msgid " (fix conflicts and run \"git cherry-pick --continue\")"
2534 msgstr " (解决冲突并运行 \"git cherry-pick --continue\")"
2538 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
2539 msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")"
2543 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
2544 msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
2548 msgid "You are currently reverting commit %s."
2549 msgstr "您在执行反转提交 %s 的操作。"
2553 msgid " (fix conflicts and run \"git revert --continue\")"
2554 msgstr " (解决冲突并运行 \"git revert --continue\")"
2558 msgid " (all conflicts fixed: run \"git revert --continue\")"
2559 msgstr " (所有冲突已解决:运行 \"git revert --continue\")"
2563 msgid " (use \"git revert --abort\" to cancel the revert operation)"
2564 msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
2568 msgid "You are currently bisecting, started from branch '%s'."
2569 msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
2572 msgid "You are currently bisecting."
2573 msgstr "您在执行二分查找操作。"
2577 msgid " (use \"git bisect reset\" to get back to the original branch)"
2578 msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
2585 msgid "interactive rebase in progress; onto "
2586 msgstr "交互式变基操作正在进行中;至 "
2589 msgid "rebase in progress; onto "
2590 msgstr "变基操作正在进行中;至 "
2593 msgid "HEAD detached at "
2597 msgid "HEAD detached from "
2601 msgid "Not currently on any branch."
2605 msgid "Initial commit"
2609 msgid "Untracked files"
2613 msgid "Ignored files"
2619 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
2620 "may speed it up, but you have to be careful not to forget to add\n"
2621 "new files yourself (see 'git help status')."
2623 "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
2624 "但您需要小心不要忘了添加新文件(参见 'git help status')。"
2628 msgid "Untracked files not listed%s"
2629 msgstr "未跟踪的文件没有列出%s"
2631 # 译者:中文字符串拼接,可删除前导空格
2633 msgid " (use -u option to show untracked files)"
2634 msgstr "(使用 -u 参数显示未跟踪的文件)"
2642 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
2643 msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
2647 msgid "no changes added to commit\n"
2653 "nothing added to commit but untracked files present (use \"git add\" to "
2655 msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
2659 msgid "nothing added to commit but untracked files present\n"
2660 msgstr "提交为空,但是存在尚未跟踪的文件\n"
2662 # 译者:中文字符串拼接,可删除前导空格
2665 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
2666 msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
2668 #: wt-status.c:1550 wt-status.c:1555
2670 msgid "nothing to commit\n"
2673 # 译者:中文字符串拼接,可删除前导空格
2676 msgid "nothing to commit (use -u to show untracked files)\n"
2677 msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
2679 # 译者:中文字符串拼接,可删除前导空格
2682 msgid "nothing to commit, working directory clean\n"
2683 msgstr "无文件要提交,干净的工作区\n"
2687 msgid "Initial commit on "
2691 msgid "HEAD (no branch)"
2699 #: wt-status.c:1699 wt-status.c:1707
2703 #: wt-status.c:1702 wt-status.c:1705
2707 #: compat/precompose_utf8.c:57 builtin/clone.c:415
2709 msgid "failed to unlink '%s'"
2713 msgid "git add [<options>] [--] <pathspec>..."
2714 msgstr "git add [<选项>] [--] <路径规格>..."
2718 msgid "unexpected diff status %c"
2721 #: builtin/add.c:70 builtin/commit.c:280
2722 msgid "updating files failed"
2727 msgid "remove '%s'\n"
2730 #: builtin/add.c:134
2731 msgid "Unstaged changes after refreshing the index:"
2732 msgstr "刷新索引之后尚未被暂存的变更:"
2734 #: builtin/add.c:194 builtin/rev-parse.c:811
2735 msgid "Could not read the index"
2738 #: builtin/add.c:205
2740 msgid "Could not open '%s' for writing."
2741 msgstr "无法打开 '%s' 进行写入。"
2743 #: builtin/add.c:209
2744 msgid "Could not write patch"
2747 #: builtin/add.c:212
2748 msgid "editing patch failed"
2751 #: builtin/add.c:215
2753 msgid "Could not stat '%s'"
2754 msgstr "不能查看文件状态 '%s'"
2756 #: builtin/add.c:217
2757 msgid "Empty patch. Aborted."
2760 #: builtin/add.c:222
2762 msgid "Could not apply '%s'"
2765 #: builtin/add.c:232
2766 msgid "The following paths are ignored by one of your .gitignore files:\n"
2767 msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
2769 #: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111
2770 #: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511
2771 #: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162
2775 #: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19
2776 #: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557
2777 #: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114
2781 #: builtin/add.c:252
2782 msgid "interactive picking"
2785 #: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286
2786 msgid "select hunks interactively"
2789 #: builtin/add.c:254
2790 msgid "edit current diff and apply"
2793 #: builtin/add.c:255
2794 msgid "allow adding otherwise ignored files"
2797 #: builtin/add.c:256
2798 msgid "update tracked files"
2801 #: builtin/add.c:257
2802 msgid "record only the fact that the path will be added later"
2803 msgstr "只记录,该路径稍后再添加"
2805 #: builtin/add.c:258
2806 msgid "add changes from all tracked and untracked files"
2807 msgstr "添加所有改变的已跟踪文件和未跟踪文件"
2809 #: builtin/add.c:261
2810 msgid "ignore paths removed in the working tree (same as --no-all)"
2811 msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
2813 #: builtin/add.c:263
2814 msgid "don't add, only refresh the index"
2817 #: builtin/add.c:264
2818 msgid "just skip files which cannot be added because of errors"
2819 msgstr "跳过因出错不能添加的文件"
2821 #: builtin/add.c:265
2822 msgid "check if - even missing - files are ignored in dry run"
2823 msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
2825 #: builtin/add.c:287
2827 msgid "Use -f if you really want to add them.\n"
2828 msgstr "使用 -f 参数如果您确实要添加它们。\n"
2830 #: builtin/add.c:294
2831 msgid "adding files failed"
2834 #: builtin/add.c:330
2835 msgid "-A and -u are mutually incompatible"
2836 msgstr "-A 和 -u 选项互斥"
2838 #: builtin/add.c:337
2839 msgid "Option --ignore-missing can only be used together with --dry-run"
2840 msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
2842 #: builtin/add.c:352
2844 msgid "Nothing specified, nothing added.\n"
2845 msgstr "没有指定文件,也没有文件被添加。\n"
2847 #: builtin/add.c:353
2849 msgid "Maybe you wanted to say 'git add .'?\n"
2850 msgstr "也许您想要执行 'git add .'?\n"
2852 #: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914
2853 #: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
2854 #: builtin/submodule--helper.c:240
2855 msgid "index file corrupt"
2858 #: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430
2859 msgid "Unable to write new index file"
2862 #: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089
2864 msgid "could not read '%s'"
2868 msgid "could not parse author script"
2873 msgid "'%s' was deleted by the applypatch-msg hook"
2874 msgstr "'%s' 被 applypatch-msg 钩子删除"
2876 #: builtin/am.c:548 builtin/notes.c:300
2878 msgid "Malformed input line: '%s'."
2879 msgstr "非法的输入行:'%s'。"
2881 #: builtin/am.c:585 builtin/notes.c:315
2883 msgid "Failed to copy notes from '%s' to '%s'"
2884 msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
2887 msgid "fseek failed"
2892 msgid "could not parse patch '%s'"
2893 msgstr "无法解析补丁 '%s'"
2896 msgid "Only one StGIT patch series can be applied at once"
2897 msgstr "一次只能有一个 StGIT 补丁队列被应用"
2900 msgid "invalid timestamp"
2903 #: builtin/am.c:903 builtin/am.c:911
2904 msgid "invalid Date line"
2908 msgid "invalid timezone offset"
2912 msgid "Patch format detection failed."
2915 #: builtin/am.c:1000 builtin/clone.c:380
2917 msgid "failed to create directory '%s'"
2918 msgstr "无法创建目录 '%s'"
2920 #: builtin/am.c:1004
2921 msgid "Failed to split patches."
2924 #: builtin/am.c:1136 builtin/commit.c:365
2925 msgid "unable to write index file"
2928 #: builtin/am.c:1187
2930 msgid "When you have resolved this problem, run \"%s --continue\"."
2931 msgstr "当您解决这一问题,执行 \"%s --continue\"。"
2933 #: builtin/am.c:1188
2935 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
2936 msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。"
2938 #: builtin/am.c:1189
2940 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
2941 msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。"
2943 #: builtin/am.c:1327
2944 msgid "Patch is empty. Was it split wrong?"
2945 msgstr "补丁为空。是不是切分错误?"
2947 #: builtin/am.c:1401 builtin/log.c:1516
2949 msgid "invalid ident line: %s"
2950 msgstr "包含无效的身份标识:%s"
2952 #: builtin/am.c:1428
2954 msgid "unable to parse commit %s"
2957 #: builtin/am.c:1630
2958 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
2959 msgstr "仓库缺乏必要的数据对象以进行三方合并。"
2961 #: builtin/am.c:1632
2962 msgid "Using index info to reconstruct a base tree..."
2963 msgstr "使用索引来重建一个(三方合并的)基础目录树..."
2965 #: builtin/am.c:1651
2967 "Did you hand edit your patch?\n"
2968 "It does not apply to blobs recorded in its index."
2973 #: builtin/am.c:1657
2974 msgid "Falling back to patching base and 3-way merge..."
2975 msgstr "回落到基础版本上打补丁及进行三方合并..."
2977 #: builtin/am.c:1672
2978 msgid "Failed to merge in the changes."
2981 #: builtin/am.c:1696 builtin/merge.c:636
2982 msgid "git write-tree failed to write a tree"
2983 msgstr "git write-tree 无法写入一树对象"
2985 #: builtin/am.c:1703
2986 msgid "applying to an empty history"
2989 #: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841
2990 #: builtin/merge.c:866
2991 msgid "failed to write commit object"
2994 #: builtin/am.c:1748 builtin/am.c:1752
2996 msgid "cannot resume: %s does not exist."
2997 msgstr "无法继续:%s 不存在。"
2999 #: builtin/am.c:1768
3000 msgid "cannot be interactive without stdin connected to a terminal."
3001 msgstr "标准输入没有和终端关联,不能进行交互式操作。"
3003 #: builtin/am.c:1773
3004 msgid "Commit Body is:"
3008 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
3009 #. in your translation. The program will only accept English
3010 #. input at this point.
3012 #: builtin/am.c:1783
3013 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
3014 msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:"
3016 #: builtin/am.c:1833
3018 msgid "Dirty index: cannot apply patches (dirty: %s)"
3019 msgstr "脏索引:不能应用补丁(脏文件:%s)"
3021 #: builtin/am.c:1868 builtin/am.c:1940
3023 msgid "Applying: %.*s"
3026 #: builtin/am.c:1884
3027 msgid "No changes -- Patch already applied."
3028 msgstr "没有变更 —— 补丁已经应用过。"
3030 #: builtin/am.c:1892
3032 msgid "Patch failed at %s %.*s"
3033 msgstr "打补丁失败于 %s %.*s"
3035 #: builtin/am.c:1898
3037 msgid "The copy of the patch that failed is found in: %s"
3038 msgstr "失败的补丁文件副本位于:%s"
3040 #: builtin/am.c:1943
3042 "No changes - did you forget to use 'git add'?\n"
3043 "If there is nothing left to stage, chances are that something else\n"
3044 "already introduced the same changes; you might want to skip this patch."
3046 "没有变更 —— 您是不是忘了执行 'git add'?\n"
3047 "如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
3050 #: builtin/am.c:1950
3052 "You still have unmerged paths in your index.\n"
3053 "Did you forget to use 'git add'?"
3056 "您是否忘了执行 'git add'?"
3058 #: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308
3059 #: builtin/reset.c:316
3061 msgid "Could not parse object '%s'."
3062 msgstr "不能解析对象 '%s'。"
3064 #: builtin/am.c:2110
3065 msgid "failed to clean index"
3068 #: builtin/am.c:2144
3070 "You seem to have moved HEAD since the last 'am' failure.\n"
3071 "Not rewinding to ORIG_HEAD"
3072 msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
3074 #: builtin/am.c:2205
3076 msgid "Invalid value for --patch-format: %s"
3077 msgstr "无效的 --patch-format 值:%s"
3079 #: builtin/am.c:2238
3080 msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
3081 msgstr "git am [<选项>] [(<mbox>|<Maildir>)...]"
3083 #: builtin/am.c:2239
3084 msgid "git am [<options>] (--continue | --skip | --abort)"
3085 msgstr "git am [<选项>] (--continue | --skip | --abort)"
3087 #: builtin/am.c:2245
3088 msgid "run interactively"
3091 #: builtin/am.c:2247
3092 msgid "historical option -- no-op"
3093 msgstr "老的参数 —— 无作用"
3095 #: builtin/am.c:2249
3096 msgid "allow fall back on 3way merging if needed"
3097 msgstr "如果必要,允许使用三方合并。"
3099 #: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57
3100 #: builtin/repack.c:171
3104 #: builtin/am.c:2252
3105 msgid "add a Signed-off-by line to the commit message"
3106 msgstr "在提交说明中添加一个 Signed-off-by 签名"
3108 #: builtin/am.c:2255
3109 msgid "recode into utf8 (default)"
3110 msgstr "使用 utf8 字符集(默认)"
3112 #: builtin/am.c:2257
3113 msgid "pass -k flag to git-mailinfo"
3114 msgstr "向 git-mailinfo 传递 -k 参数"
3116 #: builtin/am.c:2259
3117 msgid "pass -b flag to git-mailinfo"
3118 msgstr "向 git-mailinfo 传递 -b 参数"
3120 #: builtin/am.c:2261
3121 msgid "pass -m flag to git-mailinfo"
3122 msgstr "向 git-mailinfo 传递 -m 参数"
3124 #: builtin/am.c:2263
3125 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
3126 msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数"
3128 #: builtin/am.c:2266
3129 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
3130 msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置"
3132 #: builtin/am.c:2269
3133 msgid "strip everything before a scissors line"
3134 msgstr "丢弃裁切线前的所有内容"
3136 #: builtin/am.c:2270 builtin/apply.c:4546
3140 #: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280
3141 #: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292
3142 #: builtin/am.c:2298
3143 msgid "pass it through git-apply"
3144 msgstr "传递给 git-apply"
3146 #: builtin/am.c:2279 builtin/apply.c:4570
3150 #: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508
3151 #: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95
3152 #: builtin/pull.c:179 builtin/submodule--helper.c:277
3153 #: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485
3154 #: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767
3155 #: builtin/submodule--helper.c:770
3159 #: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
3160 #: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134
3161 #: builtin/pull.c:193 builtin/repack.c:178 builtin/repack.c:182
3162 #: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340
3163 #: parse-options.h:132 parse-options.h:134 parse-options.h:244
3167 #: builtin/am.c:2291 builtin/apply.c:4514
3171 #: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438
3172 #: builtin/tag.c:372
3176 #: builtin/am.c:2295
3177 msgid "format the patch(es) are in"
3180 #: builtin/am.c:2301
3181 msgid "override error message when patch failure occurs"
3182 msgstr "打补丁失败时显示的错误信息"
3184 #: builtin/am.c:2303
3185 msgid "continue applying patches after resolving a conflict"
3186 msgstr "冲突解决后继续应用补丁"
3188 #: builtin/am.c:2306
3189 msgid "synonyms for --continue"
3190 msgstr "和 --continue 同义"
3192 #: builtin/am.c:2309
3193 msgid "skip the current patch"
3196 #: builtin/am.c:2312
3197 msgid "restore the original branch and abort the patching operation."
3198 msgstr "恢复原始分支并终止打补丁操作。"
3200 #: builtin/am.c:2316
3201 msgid "lie about committer date"
3202 msgstr "将作者日期作为提交日期"
3204 #: builtin/am.c:2318
3205 msgid "use current timestamp for author date"
3206 msgstr "用当前时间作为作者日期"
3208 #: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228
3209 #: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355
3213 #: builtin/am.c:2321
3214 msgid "GPG-sign commits"
3215 msgstr "使用 GPG 签名提交"
3217 #: builtin/am.c:2324
3218 msgid "(internal use for git-rebase)"
3219 msgstr "(内部使用,用于 git-rebase)"
3221 #: builtin/am.c:2339
3223 "The -b/--binary option has been a no-op for long time, and\n"
3224 "it will be removed. Please do not use it anymore."
3226 "参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n"
3229 #: builtin/am.c:2346
3230 msgid "failed to read the index"
3233 #: builtin/am.c:2361
3235 msgid "previous rebase directory %s still exists but mbox given."
3236 msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。"
3238 #: builtin/am.c:2385
3241 "Stray %s directory found.\n"
3242 "Use \"git am --abort\" to remove it."
3245 "使用 \"git am --abort\" 删除它。"
3247 #: builtin/am.c:2391
3248 msgid "Resolve operation not in progress, we are not resuming."
3249 msgstr "解决操作未进行,我们不会继续。"
3251 #: builtin/apply.c:59
3252 msgid "git apply [<options>] [<patch>...]"
3253 msgstr "git apply [<选项>] [<补丁>...]"
3255 #: builtin/apply.c:111
3257 msgid "unrecognized whitespace option '%s'"
3258 msgstr "未能识别的空白字符选项 '%s'"
3260 #: builtin/apply.c:126
3262 msgid "unrecognized whitespace ignore option '%s'"
3263 msgstr "未能识别的空白字符忽略选项 '%s'"
3265 #: builtin/apply.c:818
3267 msgid "Cannot prepare timestamp regexp %s"
3268 msgstr "无法准备时间戳正则表达式 %s"
3270 #: builtin/apply.c:827
3272 msgid "regexec returned %d for input: %s"
3273 msgstr "regexec 返回 %d,输入为:%s"
3275 #: builtin/apply.c:908
3277 msgid "unable to find filename in patch at line %d"
3278 msgstr "不能在补丁的第 %d 行找到文件名"
3280 #: builtin/apply.c:937
3282 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
3283 msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
3285 #: builtin/apply.c:942
3287 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
3288 msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
3290 #: builtin/apply.c:943
3292 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
3293 msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
3295 #: builtin/apply.c:949
3297 msgid "git apply: bad git-diff - expected /dev/null on line %d"
3298 msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
3300 #: builtin/apply.c:1406
3302 msgid "recount: unexpected line: %.*s"
3303 msgstr "recount:意外的行:%.*s"
3305 #: builtin/apply.c:1463
3307 msgid "patch fragment without header at line %d: %.*s"
3308 msgstr "第 %d 行的补丁片段没有头信息:%.*s"
3310 #: builtin/apply.c:1480
3313 "git diff header lacks filename information when removing %d leading pathname "
3314 "component (line %d)"
3316 "git diff header lacks filename information when removing %d leading pathname "
3317 "components (line %d)"
3318 msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
3319 msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
3321 #: builtin/apply.c:1646
3322 msgid "new file depends on old contents"
3325 #: builtin/apply.c:1648
3326 msgid "deleted file still has contents"
3329 #: builtin/apply.c:1674
3331 msgid "corrupt patch at line %d"
3332 msgstr "补丁在第 %d 行损坏"
3334 #: builtin/apply.c:1710
3336 msgid "new file %s depends on old contents"
3337 msgstr "新文件 %s 依赖旧内容"
3339 #: builtin/apply.c:1712
3341 msgid "deleted file %s still has contents"
3342 msgstr "删除的文件 %s 仍有内容"
3344 #: builtin/apply.c:1715
3346 msgid "** warning: file %s becomes empty but is not deleted"
3347 msgstr "** 警告:文件 %s 成为空文件但并未删除"
3349 #: builtin/apply.c:1861
3351 msgid "corrupt binary patch at line %d: %.*s"
3352 msgstr "二进制补丁在第 %d 行损坏:%.*s"
3354 #: builtin/apply.c:1895
3356 msgid "unrecognized binary patch at line %d"
3357 msgstr "未能识别的二进制补丁位于第 %d 行"
3359 #: builtin/apply.c:2048
3361 msgid "patch with only garbage at line %d"
3362 msgstr "补丁文件的第 %d 行只有垃圾数据"
3364 #: builtin/apply.c:2138
3366 msgid "unable to read symlink %s"
3367 msgstr "无法读取符号链接 %s"
3369 #: builtin/apply.c:2142
3371 msgid "unable to open or read %s"
3374 #: builtin/apply.c:2775
3376 msgid "invalid start of line: '%c'"
3377 msgstr "无效的行首字符:'%c'"
3379 #: builtin/apply.c:2894
3381 msgid "Hunk #%d succeeded at %d (offset %d line)."
3382 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
3383 msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
3384 msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
3386 #: builtin/apply.c:2906
3388 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
3389 msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
3391 #: builtin/apply.c:2912
3394 "while searching for:\n"
3400 #: builtin/apply.c:2932
3402 msgid "missing binary patch data for '%s'"
3403 msgstr "缺失 '%s' 的二进制补丁数据"
3405 #: builtin/apply.c:3033
3407 msgid "binary patch does not apply to '%s'"
3408 msgstr "二进制补丁未应用到 '%s'"
3410 #: builtin/apply.c:3039
3412 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
3413 msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
3415 #: builtin/apply.c:3060
3417 msgid "patch failed: %s:%ld"
3418 msgstr "打补丁失败:%s:%ld"
3420 #: builtin/apply.c:3184
3422 msgid "cannot checkout %s"
3425 #: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285
3427 msgid "read of %s failed"
3430 #: builtin/apply.c:3237
3432 msgid "reading from '%s' beyond a symbolic link"
3433 msgstr "读取位于符号链接中的 '%s'"
3435 #: builtin/apply.c:3265 builtin/apply.c:3487
3437 msgid "path %s has been renamed/deleted"
3438 msgstr "路径 %s 已经被重命名/删除"
3440 #: builtin/apply.c:3346 builtin/apply.c:3501
3442 msgid "%s: does not exist in index"
3445 #: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515
3450 #: builtin/apply.c:3355 builtin/apply.c:3509
3452 msgid "%s: does not match index"
3455 #: builtin/apply.c:3457
3456 msgid "removal patch leaves file contents"
3457 msgstr "移除补丁仍留下了文件内容"
3459 #: builtin/apply.c:3526
3461 msgid "%s: wrong type"
3464 #: builtin/apply.c:3528
3466 msgid "%s has type %o, expected %o"
3467 msgstr "%s 的类型是 %o,应为 %o"
3469 #: builtin/apply.c:3687 builtin/apply.c:3689
3471 msgid "invalid path '%s'"
3474 #: builtin/apply.c:3744
3476 msgid "%s: already exists in index"
3477 msgstr "%s:已经存在于索引中"
3479 #: builtin/apply.c:3747
3481 msgid "%s: already exists in working directory"
3482 msgstr "%s:已经存在于工作区中"
3484 #: builtin/apply.c:3767
3486 msgid "new mode (%o) of %s does not match old mode (%o)"
3487 msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
3489 #: builtin/apply.c:3772
3491 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
3492 msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
3494 #: builtin/apply.c:3792
3496 msgid "affected file '%s' is beyond a symbolic link"
3497 msgstr "受影响的文件 '%s' 位于符号链接中"
3499 #: builtin/apply.c:3796
3501 msgid "%s: patch does not apply"
3504 #: builtin/apply.c:3810
3506 msgid "Checking patch %s..."
3509 #: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135
3511 msgid "make_cache_entry failed for path '%s'"
3512 msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
3514 #: builtin/apply.c:4046
3516 msgid "unable to remove %s from index"
3517 msgstr "不能从索引中移除 %s"
3519 #: builtin/apply.c:4075
3521 msgid "corrupt patch for submodule %s"
3522 msgstr "子模组 %s 损坏的补丁"
3524 #: builtin/apply.c:4079
3526 msgid "unable to stat newly created file '%s'"
3527 msgstr "不能枚举新建文件 '%s' 的状态"
3529 #: builtin/apply.c:4084
3531 msgid "unable to create backing store for newly created file %s"
3532 msgstr "不能为新建文件 %s 创建后端存储"
3534 #: builtin/apply.c:4087 builtin/apply.c:4195
3536 msgid "unable to add cache entry for %s"
3537 msgstr "无法为 %s 添加缓存条目"
3539 #: builtin/apply.c:4120
3541 msgid "closing file '%s'"
3544 #: builtin/apply.c:4169
3546 msgid "unable to write file '%s' mode %o"
3547 msgstr "不能写文件 '%s' 权限 %o"
3549 #: builtin/apply.c:4256
3551 msgid "Applied patch %s cleanly."
3554 #: builtin/apply.c:4264
3555 msgid "internal error"
3558 #: builtin/apply.c:4267
3560 msgid "Applying patch %%s with %d reject..."
3561 msgid_plural "Applying patch %%s with %d rejects..."
3562 msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
3563 msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
3565 #: builtin/apply.c:4277
3567 msgid "truncating .rej filename to %.*s.rej"
3568 msgstr "截短 .rej 文件名为 %.*s.rej"
3570 #: builtin/apply.c:4285
3572 msgid "cannot open %s: %s"
3575 #: builtin/apply.c:4298
3577 msgid "Hunk #%d applied cleanly."
3578 msgstr "第 #%d 个片段成功应用。"
3580 #: builtin/apply.c:4301
3582 msgid "Rejected hunk #%d."
3583 msgstr "拒绝第 #%d 个片段。"
3585 #: builtin/apply.c:4387
3587 msgid "Skipped patch '%s'."
3590 #: builtin/apply.c:4395
3591 msgid "unrecognized input"
3594 #: builtin/apply.c:4406
3595 msgid "unable to read index file"
3598 #: builtin/apply.c:4509
3599 msgid "don't apply changes matching the given path"
3600 msgstr "不要应用与给出路径向匹配的变更"
3602 #: builtin/apply.c:4512
3603 msgid "apply changes matching the given path"
3604 msgstr "应用与给出路径向匹配的变更"
3606 #: builtin/apply.c:4515
3607 msgid "remove <num> leading slashes from traditional diff paths"
3608 msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
3610 #: builtin/apply.c:4518
3611 msgid "ignore additions made by the patch"
3612 msgstr "忽略补丁中的添加的文件"
3614 #: builtin/apply.c:4520
3615 msgid "instead of applying the patch, output diffstat for the input"
3616 msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
3618 #: builtin/apply.c:4524
3619 msgid "show number of added and deleted lines in decimal notation"
3620 msgstr "以十进制数显示添加和删除的行数"
3622 #: builtin/apply.c:4526
3623 msgid "instead of applying the patch, output a summary for the input"
3624 msgstr "不应用补丁,而是显示输入的概要"
3626 #: builtin/apply.c:4528
3627 msgid "instead of applying the patch, see if the patch is applicable"
3628 msgstr "不应用补丁,而是查看补丁是否可应用"
3630 #: builtin/apply.c:4530
3631 msgid "make sure the patch is applicable to the current index"
3632 msgstr "确认补丁可以应用到当前索引"
3634 #: builtin/apply.c:4532
3635 msgid "apply a patch without touching the working tree"
3636 msgstr "应用补丁而不修改工作区"
3638 #: builtin/apply.c:4534
3639 msgid "accept a patch that touches outside the working area"
3640 msgstr "接受修改工作区之外文件的补丁"
3642 #: builtin/apply.c:4536
3643 msgid "also apply the patch (use with --stat/--summary/--check)"
3644 msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
3646 #: builtin/apply.c:4538
3647 msgid "attempt three-way merge if a patch does not apply"
3648 msgstr "如果一个补丁不能应用则尝试三方合并"
3650 #: builtin/apply.c:4540
3651 msgid "build a temporary index based on embedded index information"
3652 msgstr "创建一个临时索引基于嵌入的索引信息"
3654 #: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425
3655 msgid "paths are separated with NUL character"
3656 msgstr "路径以 NUL 字符分隔"
3658 #: builtin/apply.c:4545
3659 msgid "ensure at least <n> lines of context match"
3660 msgstr "确保至少匹配 <n> 行上下文"
3662 #: builtin/apply.c:4547
3663 msgid "detect new or modified lines that have whitespace errors"
3664 msgstr "检查新增和修改的行中间的空白字符滥用"
3666 #: builtin/apply.c:4550 builtin/apply.c:4553
3667 msgid "ignore changes in whitespace when finding context"
3668 msgstr "查找上下文时忽略空白字符的变更"
3670 #: builtin/apply.c:4556
3671 msgid "apply the patch in reverse"
3674 #: builtin/apply.c:4558
3675 msgid "don't expect at least one line of context"
3678 #: builtin/apply.c:4560
3679 msgid "leave the rejected hunks in corresponding *.rej files"
3680 msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
3682 #: builtin/apply.c:4562
3683 msgid "allow overlapping hunks"
3686 #: builtin/apply.c:4565
3687 msgid "tolerate incorrectly detected missing new-line at the end of file"
3688 msgstr "允许不正确的文件末尾换行符"
3690 #: builtin/apply.c:4568
3691 msgid "do not trust the line counts in the hunk headers"
3692 msgstr "不信任补丁片段的头信息中的行号"
3694 #: builtin/apply.c:4571
3695 msgid "prepend <root> to all filenames"
3696 msgstr "为所有文件名前添加 <根目录>"
3698 #: builtin/apply.c:4593
3699 msgid "--3way outside a repository"
3700 msgstr "--3way 在一个仓库之外"
3702 #: builtin/apply.c:4601
3703 msgid "--index outside a repository"
3704 msgstr "--index 在一个仓库之外"
3706 #: builtin/apply.c:4604
3707 msgid "--cached outside a repository"
3708 msgstr "--cached 在一个仓库之外"
3710 #: builtin/apply.c:4623
3712 msgid "can't open patch '%s'"
3713 msgstr "不能打开补丁 '%s'"
3715 #: builtin/apply.c:4637
3717 msgid "squelched %d whitespace error"
3718 msgid_plural "squelched %d whitespace errors"
3719 msgstr[0] "抑制下仍有 %d 个空白字符误用"
3720 msgstr[1] "抑制下仍有 %d 个空白字符误用"
3722 #: builtin/apply.c:4643 builtin/apply.c:4653
3724 msgid "%d line adds whitespace errors."
3725 msgid_plural "%d lines add whitespace errors."
3726 msgstr[0] "%d 行有空白字符误用。"
3727 msgstr[1] "%d 行有空白字符误用。"
3729 #: builtin/archive.c:17
3731 msgid "could not create archive file '%s'"
3732 msgstr "不能创建归档文件 '%s'"
3734 #: builtin/archive.c:20
3735 msgid "could not redirect output"
3738 #: builtin/archive.c:37
3739 msgid "git archive: Remote with no URL"
3740 msgstr "git archive:未提供远程 URL"
3742 #: builtin/archive.c:58
3743 msgid "git archive: expected ACK/NAK, got EOF"
3744 msgstr "git archive:应为 ACK/NACK,却得到 EOF"
3746 #: builtin/archive.c:61
3748 msgid "git archive: NACK %s"
3749 msgstr "git archive:NACK %s"
3751 #: builtin/archive.c:63
3753 msgid "remote error: %s"
3756 #: builtin/archive.c:64
3757 msgid "git archive: protocol error"
3758 msgstr "git archive:协议错误"
3760 #: builtin/archive.c:68
3761 msgid "git archive: expected a flush"
3762 msgstr "git archive:应为刷新"
3764 #: builtin/bisect--helper.c:7
3765 msgid "git bisect--helper --next-all [--no-checkout]"
3766 msgstr "git bisect--helper --next-all [--no-checkout]"
3768 #: builtin/bisect--helper.c:17
3769 msgid "perform 'git bisect next'"
3770 msgstr "执行 'git bisect next'"
3772 #: builtin/bisect--helper.c:19
3773 msgid "update BISECT_HEAD instead of checking out the current commit"
3774 msgstr "更新 BISECT_HEAD 而非检出当前提交"
3776 #: builtin/blame.c:33
3777 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
3778 msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
3780 #: builtin/blame.c:38
3781 msgid "<rev-opts> are documented in git-rev-list(1)"
3782 msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
3784 #: builtin/blame.c:1782
3785 msgid "Blaming lines"
3788 #: builtin/blame.c:2531
3789 msgid "Show blame entries as we find them, incrementally"
3790 msgstr "增量式地显示发现的 blame 条目"
3792 #: builtin/blame.c:2532
3793 msgid "Show blank SHA-1 for boundary commits (Default: off)"
3794 msgstr "边界提交显示空的 SHA-1(默认:关闭)"
3796 #: builtin/blame.c:2533
3797 msgid "Do not treat root commits as boundaries (Default: off)"
3798 msgstr "不把根提交作为边界(默认:关闭)"
3800 #: builtin/blame.c:2534
3801 msgid "Show work cost statistics"
3804 #: builtin/blame.c:2535
3805 msgid "Force progress reporting"
3808 #: builtin/blame.c:2536
3809 msgid "Show output score for blame entries"
3810 msgstr "显示判断 blame 条目位移的得分诊断信息"
3812 #: builtin/blame.c:2537
3813 msgid "Show original filename (Default: auto)"
3814 msgstr "显示原始文件名(默认:自动)"
3816 #: builtin/blame.c:2538
3817 msgid "Show original linenumber (Default: off)"
3818 msgstr "显示原始的行号(默认:关闭)"
3820 #: builtin/blame.c:2539
3821 msgid "Show in a format designed for machine consumption"
3822 msgstr "显示为一个适合机器读取的格式"
3824 #: builtin/blame.c:2540
3825 msgid "Show porcelain format with per-line commit information"
3826 msgstr "为每一行显示机器适用的提交信息"
3828 #: builtin/blame.c:2541
3829 msgid "Use the same output mode as git-annotate (Default: off)"
3830 msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
3832 #: builtin/blame.c:2542
3833 msgid "Show raw timestamp (Default: off)"
3834 msgstr "显示原始时间戳(默认:关闭)"
3836 #: builtin/blame.c:2543
3837 msgid "Show long commit SHA1 (Default: off)"
3838 msgstr "显示长的 SHA1 提交号(默认:关闭)"
3840 #: builtin/blame.c:2544
3841 msgid "Suppress author name and timestamp (Default: off)"
3842 msgstr "隐藏作者名字和时间戳(默认:关闭)"
3844 #: builtin/blame.c:2545
3845 msgid "Show author email instead of name (Default: off)"
3846 msgstr "显示作者的邮箱而不是名字(默认:关闭)"
3848 #: builtin/blame.c:2546
3849 msgid "Ignore whitespace differences"
3852 #: builtin/blame.c:2547
3853 msgid "Spend extra cycles to find better match"
3854 msgstr "花费额外的循环来找到更好的匹配"
3856 #: builtin/blame.c:2548
3857 msgid "Use revisions from <file> instead of calling git-rev-list"
3858 msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
3860 #: builtin/blame.c:2549
3861 msgid "Use <file>'s contents as the final image"
3862 msgstr "使用 <文件> 的内容作为最终的图片"
3864 #: builtin/blame.c:2550 builtin/blame.c:2551
3868 #: builtin/blame.c:2550
3869 msgid "Find line copies within and across files"
3870 msgstr "找到文件内及跨文件的行拷贝"
3872 #: builtin/blame.c:2551
3873 msgid "Find line movements within and across files"
3874 msgstr "找到文件内及跨文件的行移动"
3876 #: builtin/blame.c:2552
3880 #: builtin/blame.c:2552
3881 msgid "Process only line range n,m, counting from 1"
3882 msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
3884 #. TRANSLATORS: This string is used to tell us the maximum
3885 #. display width for a relative timestamp in "git blame"
3886 #. output. For C locale, "4 years, 11 months ago", which
3887 #. takes 22 places, is the longest among various forms of
3888 #. relative timestamps, but your language may need more or
3889 #. fewer display columns.
3890 #: builtin/blame.c:2641
3891 msgid "4 years, 11 months ago"
3894 #: builtin/branch.c:26
3895 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
3896 msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
3898 #: builtin/branch.c:27
3899 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
3900 msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
3902 #: builtin/branch.c:28
3903 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
3904 msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
3906 #: builtin/branch.c:29
3907 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
3908 msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
3910 #: builtin/branch.c:30
3911 msgid "git branch [<options>] [-r | -a] [--points-at]"
3912 msgstr "git branch [<选项>] [-r | -a] [--points-at]"
3914 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
3915 #: builtin/branch.c:143
3918 "deleting branch '%s' that has been merged to\n"
3919 " '%s', but not yet merged to HEAD."
3921 "将要删除的分支 '%s' 已经被合并到\n"
3924 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
3925 #: builtin/branch.c:147
3928 "not deleting branch '%s' that is not yet merged to\n"
3929 " '%s', even though it is merged to HEAD."
3931 "并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
3932 " 然而却尚未被合并到分支 '%s' 。"
3934 #: builtin/branch.c:161
3936 msgid "Couldn't look up commit object for '%s'"
3937 msgstr "无法查询 '%s' 指向的提交对象"
3939 #: builtin/branch.c:165
3942 "The branch '%s' is not fully merged.\n"
3943 "If you are sure you want to delete it, run 'git branch -D %s'."
3946 "如果您确认要删除它,执行 'git branch -D %s'。"
3948 #: builtin/branch.c:178
3949 msgid "Update of config-file failed"
3950 msgstr "无法更新 config 文件"
3952 #: builtin/branch.c:206
3953 msgid "cannot use -a with -d"
3954 msgstr "不能将 -a 和 -d 同时使用"
3956 #: builtin/branch.c:212
3957 msgid "Couldn't look up commit object for HEAD"
3958 msgstr "无法查询 HEAD 指向的提交对象"
3960 #: builtin/branch.c:226
3962 msgid "Cannot delete branch '%s' checked out at '%s'"
3963 msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。"
3965 #: builtin/branch.c:241
3967 msgid "remote-tracking branch '%s' not found."
3968 msgstr "未能找到远程跟踪分支 '%s'。"
3970 #: builtin/branch.c:242
3972 msgid "branch '%s' not found."
3973 msgstr "分支 '%s' 未发现。"
3975 #: builtin/branch.c:257
3977 msgid "Error deleting remote-tracking branch '%s'"
3978 msgstr "无法删除远程跟踪分支 '%s'"
3980 #: builtin/branch.c:258
3982 msgid "Error deleting branch '%s'"
3983 msgstr "无法删除分支 '%s'"
3985 #: builtin/branch.c:265
3987 msgid "Deleted remote-tracking branch %s (was %s).\n"
3988 msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n"
3990 #: builtin/branch.c:266
3992 msgid "Deleted branch %s (was %s).\n"
3993 msgstr "已删除分支 %s(曾为 %s)。\n"
3995 #: builtin/branch.c:309
4000 #: builtin/branch.c:314
4005 #: builtin/branch.c:319
4007 msgid "[%s: behind %d]"
4010 #: builtin/branch.c:321
4015 #: builtin/branch.c:325
4017 msgid "[%s: ahead %d]"
4020 #: builtin/branch.c:327
4025 #: builtin/branch.c:330
4027 msgid "[%s: ahead %d, behind %d]"
4028 msgstr "[%s:领先 %d,落后 %d]"
4030 #: builtin/branch.c:333
4032 msgid "[ahead %d, behind %d]"
4033 msgstr "[领先 %d,落后 %d]"
4035 #: builtin/branch.c:346
4036 msgid " **** invalid ref ****"
4037 msgstr " **** 无效引用 ****"
4039 #: builtin/branch.c:372
4041 msgid "(no branch, rebasing %s)"
4042 msgstr "(非分支,正变基 %s)"
4044 #: builtin/branch.c:375
4046 msgid "(no branch, bisect started on %s)"
4047 msgstr "(非分支,二分查找开始于 %s)"
4049 #. TRANSLATORS: make sure this matches
4050 #. "HEAD detached at " in wt-status.c
4051 #: builtin/branch.c:381
4053 msgid "(HEAD detached at %s)"
4054 msgstr "(头指针分离于 %s)"
4056 #. TRANSLATORS: make sure this matches
4057 #. "HEAD detached from " in wt-status.c
4058 #: builtin/branch.c:386
4060 msgid "(HEAD detached from %s)"
4061 msgstr "(头指针分离自 %s)"
4063 #: builtin/branch.c:390
4067 #: builtin/branch.c:541
4069 msgid "Branch %s is being rebased at %s"
4070 msgstr "分支 %s 正被变基到 %s"
4072 #: builtin/branch.c:545
4074 msgid "Branch %s is being bisected at %s"
4075 msgstr "分支 %s 正被二分查找于 %s"
4077 #: builtin/branch.c:560
4078 msgid "cannot rename the current branch while not on any."
4079 msgstr "无法重命名当前分支因为不处于任何分支上。"
4081 #: builtin/branch.c:570
4083 msgid "Invalid branch name: '%s'"
4084 msgstr "无效的分支名:'%s'"
4086 #: builtin/branch.c:587
4087 msgid "Branch rename failed"
4090 #: builtin/branch.c:591
4092 msgid "Renamed a misnamed branch '%s' away"
4093 msgstr "重命名掉一个错误命名的旧分支 '%s'"
4095 #: builtin/branch.c:594
4097 msgid "Branch renamed to %s, but HEAD is not updated!"
4098 msgstr "分支重命名为 %s,但 HEAD 没有更新!"
4100 #: builtin/branch.c:601
4101 msgid "Branch is renamed, but update of config-file failed"
4102 msgstr "分支被重命名,但更新 config 文件失败"
4104 #: builtin/branch.c:623
4105 msgid "could not write branch description template"
4108 #: builtin/branch.c:651
4109 msgid "Generic options"
4112 #: builtin/branch.c:653
4113 msgid "show hash and subject, give twice for upstream branch"
4114 msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
4116 #: builtin/branch.c:654
4117 msgid "suppress informational messages"
4120 #: builtin/branch.c:655
4121 msgid "set up tracking mode (see git-pull(1))"
4122 msgstr "设置跟踪模式(参见 git-pull(1))"
4124 #: builtin/branch.c:657
4125 msgid "change upstream info"
4128 #: builtin/branch.c:659
4132 #: builtin/branch.c:659
4133 msgid "change the upstream info"
4136 #: builtin/branch.c:661
4137 msgid "use colored output"
4140 #: builtin/branch.c:662
4141 msgid "act on remote-tracking branches"
4144 #: builtin/branch.c:664 builtin/branch.c:665
4145 msgid "print only branches that contain the commit"
4146 msgstr "只打印包含该提交的分支"
4148 #: builtin/branch.c:668
4149 msgid "Specific git-branch actions:"
4150 msgstr "具体的 git-branch 动作:"
4152 #: builtin/branch.c:669
4153 msgid "list both remote-tracking and local branches"
4154 msgstr "列出远程跟踪及本地分支"
4156 #: builtin/branch.c:671
4157 msgid "delete fully merged branch"
4160 #: builtin/branch.c:672
4161 msgid "delete branch (even if not merged)"
4162 msgstr "删除分支(即使没有合并)"
4164 #: builtin/branch.c:673
4165 msgid "move/rename a branch and its reflog"
4166 msgstr "移动/重命名一个分支,以及它的引用日志"
4168 #: builtin/branch.c:674
4169 msgid "move/rename a branch, even if target exists"
4170 msgstr "移动/重命名一个分支,即使目标已存在"
4172 #: builtin/branch.c:675
4173 msgid "list branch names"
4176 #: builtin/branch.c:676
4177 msgid "create the branch's reflog"
4180 #: builtin/branch.c:678
4181 msgid "edit the description for the branch"
4184 #: builtin/branch.c:679
4185 msgid "force creation, move/rename, deletion"
4186 msgstr "强制创建、移动/重命名、删除"
4188 #: builtin/branch.c:680
4189 msgid "print only branches that are merged"
4192 #: builtin/branch.c:681
4193 msgid "print only branches that are not merged"
4196 #: builtin/branch.c:682
4197 msgid "list branches in columns"
4200 #: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366
4204 #: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367
4205 msgid "field name to sort on"
4208 #: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401
4209 #: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567
4210 #: builtin/tag.c:369
4214 #: builtin/branch.c:687
4215 msgid "print only branches of the object"
4216 msgstr "只打印指向该对象的分支"
4218 #: builtin/branch.c:705
4219 msgid "Failed to resolve HEAD as a valid ref."
4220 msgstr "无法将 HEAD 解析为有效引用。"
4222 #: builtin/branch.c:709 builtin/clone.c:707
4223 msgid "HEAD not found below refs/heads!"
4224 msgstr "HEAD 没有位于 /refs/heads 之下!"
4226 #: builtin/branch.c:729
4227 msgid "--column and --verbose are incompatible"
4228 msgstr "--column 和 --verbose 不兼容"
4230 #: builtin/branch.c:740 builtin/branch.c:782
4231 msgid "branch name required"
4234 #: builtin/branch.c:758
4235 msgid "Cannot give description to detached HEAD"
4236 msgstr "不能向分离头指针提供描述"
4238 #: builtin/branch.c:763
4239 msgid "cannot edit description of more than one branch"
4240 msgstr "不能为一个以上的分支编辑描述"
4242 #: builtin/branch.c:770
4244 msgid "No commit on branch '%s' yet."
4245 msgstr "分支 '%s' 尚无提交。"
4247 #: builtin/branch.c:773
4249 msgid "No branch named '%s'."
4252 #: builtin/branch.c:788
4253 msgid "too many branches for a rename operation"
4254 msgstr "为重命名操作提供了太多的分支名"
4256 #: builtin/branch.c:793
4257 msgid "too many branches to set new upstream"
4258 msgstr "为设置新上游提供了太多的分支名"
4260 #: builtin/branch.c:797
4263 "could not set upstream of HEAD to %s when it does not point to any branch."
4264 msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
4266 #: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843
4268 msgid "no such branch '%s'"
4271 #: builtin/branch.c:804
4273 msgid "branch '%s' does not exist"
4274 msgstr "分支 '%s' 不存在"
4276 #: builtin/branch.c:816
4277 msgid "too many branches to unset upstream"
4278 msgstr "为取消上游设置操作提供了太多的分支名"
4280 #: builtin/branch.c:820
4281 msgid "could not unset upstream of HEAD when it does not point to any branch."
4282 msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
4284 #: builtin/branch.c:826
4286 msgid "Branch '%s' has no upstream information"
4287 msgstr "分支 '%s' 没有上游信息"
4289 #: builtin/branch.c:840
4290 msgid "it does not make sense to create 'HEAD' manually"
4291 msgstr "手工创建 'HEAD' 没有意义"
4293 #: builtin/branch.c:846
4294 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
4295 msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
4297 #: builtin/branch.c:849
4300 "The --set-upstream flag is deprecated and will be removed. Consider using --"
4301 "track or --set-upstream-to\n"
4303 "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
4305 #: builtin/branch.c:866
4309 "If you wanted to make '%s' track '%s', do this:\n"
4313 "如果你想用 '%s' 跟踪 '%s', 这么做:\n"
4316 #: builtin/bundle.c:51
4318 msgid "%s is okay\n"
4321 #: builtin/bundle.c:64
4322 msgid "Need a repository to create a bundle."
4323 msgstr "需要一个仓库来创建包。"
4325 #: builtin/bundle.c:68
4326 msgid "Need a repository to unbundle."
4329 #: builtin/cat-file.c:428
4331 "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
4332 "<type>|--textconv) <object>"
4334 "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|<类型"
4335 ">|--textconv) <对象>"
4337 #: builtin/cat-file.c:429
4338 msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
4339 msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]"
4341 #: builtin/cat-file.c:466
4342 msgid "<type> can be one of: blob, tree, commit, tag"
4343 msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
4345 #: builtin/cat-file.c:467
4346 msgid "show object type"
4349 #: builtin/cat-file.c:468
4350 msgid "show object size"
4353 #: builtin/cat-file.c:470
4354 msgid "exit with zero when there's no error"
4355 msgstr "当没有错误时退出并返回零"
4357 #: builtin/cat-file.c:471
4358 msgid "pretty-print object's content"
4361 #: builtin/cat-file.c:473
4362 msgid "for blob objects, run textconv on object's content"
4363 msgstr "对于数据对象,对其内容执行 textconv"
4365 #: builtin/cat-file.c:475
4366 msgid "allow -s and -t to work with broken/corrupt objects"
4367 msgstr "允许 -s 和 -t 对损坏的对象生效"
4369 #: builtin/cat-file.c:476
4370 msgid "buffer --batch output"
4371 msgstr "缓冲 --batch 的输出"
4373 #: builtin/cat-file.c:478
4374 msgid "show info and content of objects fed from the standard input"
4375 msgstr "显示从标准输入提供的对象的信息和内容"
4377 #: builtin/cat-file.c:481
4378 msgid "show info about objects fed from the standard input"
4379 msgstr "显示从标准输入提供的对象的信息"
4381 #: builtin/cat-file.c:484
4382 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
4383 msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)"
4385 #: builtin/cat-file.c:486
4386 msgid "show all objects with --batch or --batch-check"
4387 msgstr "使用 --batch 或 --batch-check 参数显示所有对象"
4389 #: builtin/check-attr.c:11
4390 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
4391 msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
4393 #: builtin/check-attr.c:12
4394 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
4395 msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]"
4397 #: builtin/check-attr.c:19
4398 msgid "report all attributes set on file"
4399 msgstr "报告设置在文件上的所有属性"
4401 #: builtin/check-attr.c:20
4402 msgid "use .gitattributes only from the index"
4403 msgstr "只使用索引中的 .gitattributes"
4405 #: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:97
4406 msgid "read file names from stdin"
4409 #: builtin/check-attr.c:23 builtin/check-ignore.c:24
4410 msgid "terminate input and output records by a NUL character"
4411 msgstr "输入和输出的记录使用 NUL 字符终结"
4413 #: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325
4414 msgid "suppress progress reporting"
4417 #: builtin/check-ignore.c:26
4418 msgid "show non-matching input paths"
4421 #: builtin/check-ignore.c:28
4422 msgid "ignore index when checking"
4425 #: builtin/check-ignore.c:154
4426 msgid "cannot specify pathnames with --stdin"
4427 msgstr "不能同时指定路径及 --stdin 参数"
4429 #: builtin/check-ignore.c:157
4430 msgid "-z only makes sense with --stdin"
4431 msgstr "-z 需要和 --stdin 参数共用才有意义"
4433 #: builtin/check-ignore.c:159
4434 msgid "no path specified"
4437 #: builtin/check-ignore.c:163
4438 msgid "--quiet is only valid with a single pathname"
4439 msgstr "参数 --quiet 只在提供一个路径名时有效"
4441 #: builtin/check-ignore.c:165
4442 msgid "cannot have both --quiet and --verbose"
4443 msgstr "不能同时提供 --quiet 和 --verbose 参数"
4445 #: builtin/check-ignore.c:168
4446 msgid "--non-matching is only valid with --verbose"
4447 msgstr "--non-matching 选项只在使用 --verbose 时有效"
4449 #: builtin/check-mailmap.c:8
4450 msgid "git check-mailmap [<options>] <contact>..."
4451 msgstr "git check-mailmap [<选项>] <联系地址>..."
4453 #: builtin/check-mailmap.c:13
4454 msgid "also read contacts from stdin"
4455 msgstr "还从标准输入读取联系地址"
4457 #: builtin/check-mailmap.c:24
4459 msgid "unable to parse contact: %s"
4460 msgstr "不能解析联系地址:%s"
4462 #: builtin/check-mailmap.c:47
4463 msgid "no contacts specified"
4466 #: builtin/checkout-index.c:127
4467 msgid "git checkout-index [<options>] [--] [<file>...]"
4468 msgstr "git checkout-index [<选项>] [--] [<文件>...]"
4470 #: builtin/checkout-index.c:144
4471 msgid "stage should be between 1 and 3 or all"
4472 msgstr "索引值应该取值 1 到 3 或者 all"
4474 #: builtin/checkout-index.c:160
4475 msgid "check out all files in the index"
4478 #: builtin/checkout-index.c:161
4479 msgid "force overwrite of existing files"
4482 #: builtin/checkout-index.c:163
4483 msgid "no warning for existing files and files not in index"
4484 msgstr "存在或不在索引中的文件都没有警告"
4486 #: builtin/checkout-index.c:165
4487 msgid "don't checkout new files"
4490 #: builtin/checkout-index.c:167
4491 msgid "update stat information in the index file"
4492 msgstr "更新索引中文件的状态信息"
4494 #: builtin/checkout-index.c:171
4495 msgid "read list of paths from the standard input"
4496 msgstr "从标准输入读取路径列表"
4498 #: builtin/checkout-index.c:173
4499 msgid "write the content to temporary files"
4502 #: builtin/checkout-index.c:174 builtin/column.c:30
4503 #: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494
4504 #: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500
4505 #: builtin/submodule--helper.c:774
4509 #: builtin/checkout-index.c:175
4510 msgid "when creating files, prepend <string>"
4511 msgstr "在创建文件时,在前面加上 <字符串>"
4513 #: builtin/checkout-index.c:177
4514 msgid "copy out the files from named stage"
4515 msgstr "从指定暂存区中拷出文件"
4517 #: builtin/checkout.c:25
4518 msgid "git checkout [<options>] <branch>"
4519 msgstr "git checkout [<选项>] <分支>"
4521 #: builtin/checkout.c:26
4522 msgid "git checkout [<options>] [<branch>] -- <file>..."
4523 msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
4525 #: builtin/checkout.c:134 builtin/checkout.c:167
4527 msgid "path '%s' does not have our version"
4528 msgstr "路径 '%s' 没有我们的版本"
4530 #: builtin/checkout.c:136 builtin/checkout.c:169
4532 msgid "path '%s' does not have their version"
4533 msgstr "路径 '%s' 没有他们的版本"
4535 #: builtin/checkout.c:152
4537 msgid "path '%s' does not have all necessary versions"
4538 msgstr "路径 '%s' 没有全部必须的版本"
4540 #: builtin/checkout.c:196
4542 msgid "path '%s' does not have necessary versions"
4543 msgstr "路径 '%s' 没有必须的版本"
4545 #: builtin/checkout.c:213
4547 msgid "path '%s': cannot merge"
4548 msgstr "path '%s':无法合并"
4550 #: builtin/checkout.c:230
4552 msgid "Unable to add merge result for '%s'"
4553 msgstr "无法为 '%s' 添加合并结果"
4555 #: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
4556 #: builtin/checkout.c:259
4558 msgid "'%s' cannot be used with updating paths"
4559 msgstr "'%s' 不能在更新路径时使用"
4561 #: builtin/checkout.c:262 builtin/checkout.c:265
4563 msgid "'%s' cannot be used with %s"
4564 msgstr "'%s' 不能和 %s 同时使用"
4566 #: builtin/checkout.c:268
4568 msgid "Cannot update paths and switch to branch '%s' at the same time."
4569 msgstr "不能同时更新路径并切换到分支'%s'。"
4571 #: builtin/checkout.c:279 builtin/checkout.c:473
4572 msgid "corrupt index file"
4575 #: builtin/checkout.c:339 builtin/checkout.c:346
4577 msgid "path '%s' is unmerged"
4578 msgstr "路径 '%s' 未合并"
4580 #: builtin/checkout.c:495
4581 msgid "you need to resolve your current index first"
4582 msgstr "您需要先解决当前索引的冲突"
4584 #: builtin/checkout.c:622
4586 msgid "Can not do reflog for '%s': %s\n"
4587 msgstr "不能对 '%s' 执行 reflog 操作:%s\n"
4589 #: builtin/checkout.c:660
4590 msgid "HEAD is now at"
4593 #: builtin/checkout.c:664 builtin/clone.c:661
4594 msgid "unable to update HEAD"
4597 #: builtin/checkout.c:668
4599 msgid "Reset branch '%s'\n"
4600 msgstr "重置分支 '%s'\n"
4602 #: builtin/checkout.c:671
4604 msgid "Already on '%s'\n"
4605 msgstr "已经位于 '%s'\n"
4607 #: builtin/checkout.c:675
4609 msgid "Switched to and reset branch '%s'\n"
4610 msgstr "切换并重置分支 '%s'\n"
4612 #: builtin/checkout.c:677 builtin/checkout.c:1067
4614 msgid "Switched to a new branch '%s'\n"
4615 msgstr "切换到一个新分支 '%s'\n"
4617 #: builtin/checkout.c:679
4619 msgid "Switched to branch '%s'\n"
4620 msgstr "切换到分支 '%s'\n"
4623 #: builtin/checkout.c:731
4625 msgid " ... and %d more.\n"
4626 msgstr " ... 及其它 %d 个。\n"
4628 #: builtin/checkout.c:737
4631 "Warning: you are leaving %d commit behind, not connected to\n"
4632 "any of your branches:\n"
4636 "Warning: you are leaving %d commits behind, not connected to\n"
4637 "any of your branches:\n"
4641 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
4645 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
4649 #: builtin/checkout.c:756
4652 "If you want to keep it by creating a new branch, this may be a good time\n"
4655 " git branch <new-branch-name> %s\n"
4658 "If you want to keep them by creating a new branch, this may be a good time\n"
4661 " git branch <new-branch-name> %s\n"
4664 "如果您想要通过创建新分支保存它,这可能是一个好时候。\n"
4667 " git branch <新分支名> %s\n"
4670 "如果您想要通过创建新分支保存它们,这可能是一个好时候。\n"
4673 " git branch <新分支名> %s\n"
4676 #: builtin/checkout.c:792
4677 msgid "internal error in revision walk"
4678 msgstr "在版本遍历时遇到内部错误"
4680 #: builtin/checkout.c:796
4681 msgid "Previous HEAD position was"
4682 msgstr "之前的 HEAD 位置是"
4684 #: builtin/checkout.c:823 builtin/checkout.c:1062
4685 msgid "You are on a branch yet to be born"
4686 msgstr "您位于一个尚未初始化的分支"
4688 #: builtin/checkout.c:968
4690 msgid "only one reference expected, %d given."
4691 msgstr "只要一个引用,却给出了 %d 个"
4693 #: builtin/checkout.c:1008 builtin/worktree.c:212
4695 msgid "invalid reference: %s"
4698 #: builtin/checkout.c:1037
4700 msgid "reference is not a tree: %s"
4703 #: builtin/checkout.c:1076
4704 msgid "paths cannot be used with switching branches"
4705 msgstr "路径不能和切换分支同时使用"
4707 #: builtin/checkout.c:1079 builtin/checkout.c:1083
4709 msgid "'%s' cannot be used with switching branches"
4710 msgstr "'%s' 不能和切换分支同时使用"
4712 #: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095
4713 #: builtin/checkout.c:1098
4715 msgid "'%s' cannot be used with '%s'"
4716 msgstr "'%s' 不能和 '%s' 同时使用"
4718 #: builtin/checkout.c:1103
4720 msgid "Cannot switch branch to a non-commit '%s'"
4721 msgstr "不能切换分支到一个非提交 '%s'"
4723 #: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88
4724 #: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323
4725 #: builtin/worktree.c:325
4729 #: builtin/checkout.c:1137
4730 msgid "create and checkout a new branch"
4731 msgstr "创建并检出一个新的分支"
4733 #: builtin/checkout.c:1139
4734 msgid "create/reset and checkout a branch"
4735 msgstr "创建/重置并检出一个分支"
4737 #: builtin/checkout.c:1140
4738 msgid "create reflog for new branch"
4739 msgstr "为新的分支创建引用日志"
4741 #: builtin/checkout.c:1141
4742 msgid "detach the HEAD at named commit"
4743 msgstr "成为指向该提交的分离头指针"
4745 #: builtin/checkout.c:1142
4746 msgid "set upstream info for new branch"
4747 msgstr "为新的分支设置上游信息"
4749 #: builtin/checkout.c:1144
4753 #: builtin/checkout.c:1144
4754 msgid "new unparented branch"
4757 #: builtin/checkout.c:1145
4758 msgid "checkout our version for unmerged files"
4759 msgstr "对尚未合并的文件检出我们的版本"
4761 #: builtin/checkout.c:1147
4762 msgid "checkout their version for unmerged files"
4763 msgstr "对尚未合并的文件检出他们的版本"
4765 #: builtin/checkout.c:1149
4766 msgid "force checkout (throw away local modifications)"
4767 msgstr "强制检出(丢弃本地修改)"
4769 #: builtin/checkout.c:1150
4770 msgid "perform a 3-way merge with the new branch"
4771 msgstr "和新的分支执行三方合并"
4773 #: builtin/checkout.c:1151 builtin/merge.c:230
4774 msgid "update ignored files (default)"
4775 msgstr "更新忽略的文件(默认)"
4777 #: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250
4781 #: builtin/checkout.c:1153
4782 msgid "conflict style (merge or diff3)"
4783 msgstr "冲突输出风格(merge 或 diff3)"
4785 #: builtin/checkout.c:1156
4786 msgid "do not limit pathspecs to sparse entries only"
4787 msgstr "对路径不做稀疏检出的限制"
4789 #: builtin/checkout.c:1158
4790 msgid "second guess 'git checkout <no-such-branch>'"
4791 msgstr "二次猜测'git checkout <无此分支>'"
4793 #: builtin/checkout.c:1160
4794 msgid "do not check if another worktree is holding the given ref"
4795 msgstr "不检查指定的引用是否被其他工作区所占用"
4797 #: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116
4798 #: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526
4799 #: builtin/send-pack.c:168
4800 msgid "force progress reporting"
4803 #: builtin/checkout.c:1192
4804 msgid "-b, -B and --orphan are mutually exclusive"
4805 msgstr "-b、-B 和 --orphan 是互斥的"
4807 #: builtin/checkout.c:1209
4808 msgid "--track needs a branch name"
4809 msgstr "--track 需要一个分支名"
4811 #: builtin/checkout.c:1214
4812 msgid "Missing branch name; try -b"
4813 msgstr "缺少分支名;尝试 -b"
4815 #: builtin/checkout.c:1250
4816 msgid "invalid path specification"
4819 #: builtin/checkout.c:1257
4822 "Cannot update paths and switch to branch '%s' at the same time.\n"
4823 "Did you intend to checkout '%s' which can not be resolved as commit?"
4825 "不能同时更新路径并切换到分支'%s'。\n"
4826 "您是想要检出 '%s' 但其未能解析为提交么?"
4828 #: builtin/checkout.c:1262
4830 msgid "git checkout: --detach does not take a path argument '%s'"
4831 msgstr "git checkout:--detach 不能接收路径参数 '%s'"
4833 #: builtin/checkout.c:1266
4835 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
4836 "checking out of the index."
4838 "git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
4840 #: builtin/clean.c:25
4842 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
4844 "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
4846 #: builtin/clean.c:29
4848 msgid "Removing %s\n"
4851 #: builtin/clean.c:30
4853 msgid "Would remove %s\n"
4856 #: builtin/clean.c:31
4858 msgid "Skipping repository %s\n"
4861 #: builtin/clean.c:32
4863 msgid "Would skip repository %s\n"
4866 #: builtin/clean.c:33
4868 msgid "failed to remove %s"
4871 #: builtin/clean.c:291
4874 "1 - select a numbered item\n"
4875 "foo - select item based on unique prefix\n"
4876 " - (empty) select nothing"
4880 "foo - 通过标题选择一个选项\n"
4883 #: builtin/clean.c:295
4886 "1 - select a single item\n"
4887 "3-5 - select a range of items\n"
4888 "2-3,6-9 - select multiple ranges\n"
4889 "foo - select item based on unique prefix\n"
4890 "-... - unselect specified items\n"
4891 "* - choose all items\n"
4892 " - (empty) finish selecting"
4896 "3-5 - 选择一个范围内的所有选项\n"
4897 "2-3,6-9 - 选择多个范围内的所有选项\n"
4898 "foo - 通过标题选择一个选项\n"
4903 #: builtin/clean.c:511
4908 #: builtin/clean.c:653
4910 msgid "Input ignore patterns>> "
4911 msgstr "输入模版以排除条目>> "
4913 #: builtin/clean.c:690
4915 msgid "WARNING: Cannot find items matched by: %s"
4916 msgstr "警告:无法找到和 %s 匹配的条目"
4918 #: builtin/clean.c:711
4919 msgid "Select items to delete"
4922 #. TRANSLATORS: Make sure to keep [y/N] as is
4923 #: builtin/clean.c:752
4925 msgid "Remove %s [y/N]? "
4926 msgstr "删除 %s [y/N]?"
4928 #: builtin/clean.c:777
4932 #: builtin/clean.c:785
4934 "clean - start cleaning\n"
4935 "filter by pattern - exclude items from deletion\n"
4936 "select by numbers - select items to be deleted by numbers\n"
4937 "ask each - confirm each deletion (like \"rm -i\")\n"
4938 "quit - stop cleaning\n"
4939 "help - this screen\n"
4940 "? - help for prompt selection"
4943 "filter by pattern - 通过模版排除要删除的条目\n"
4944 "select by numbers - 通过数字选择要删除的条目\n"
4945 "ask each - 针对删除逐一询问(就像 \"rm -i\")\n"
4948 "? - 显示如何在提示符下选择的帮助"
4950 #: builtin/clean.c:812
4951 msgid "*** Commands ***"
4954 #: builtin/clean.c:813
4958 #: builtin/clean.c:821
4959 msgid "Would remove the following item:"
4960 msgid_plural "Would remove the following items:"
4961 msgstr[0] "将删除如下条目:"
4962 msgstr[1] "将删除如下条目:"
4964 #: builtin/clean.c:838
4965 msgid "No more files to clean, exiting."
4966 msgstr "没有要清理的文件,退出。"
4968 #: builtin/clean.c:869
4969 msgid "do not print names of files removed"
4972 #: builtin/clean.c:871
4976 #: builtin/clean.c:872
4977 msgid "interactive cleaning"
4980 #: builtin/clean.c:874
4981 msgid "remove whole directories"
4984 #: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724
4985 #: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182
4989 #: builtin/clean.c:876
4990 msgid "add <pattern> to ignore rules"
4991 msgstr "添加 <模式> 到忽略规则"
4993 #: builtin/clean.c:877
4994 msgid "remove ignored files, too"
4997 #: builtin/clean.c:879
4998 msgid "remove only ignored files"
5001 #: builtin/clean.c:897
5002 msgid "-x and -X cannot be used together"
5003 msgstr "-x 和 -X 不能同时使用"
5005 #: builtin/clean.c:901
5007 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
5010 "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
5012 #: builtin/clean.c:904
5014 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
5017 "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
5019 #: builtin/clone.c:37
5020 msgid "git clone [<options>] [--] <repo> [<dir>]"
5021 msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
5023 #: builtin/clone.c:62
5024 msgid "don't create a checkout"
5027 #: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473
5028 msgid "create a bare repository"
5031 #: builtin/clone.c:67
5032 msgid "create a mirror repository (implies bare)"
5033 msgstr "创建一个镜像仓库(也是纯仓库)"
5035 #: builtin/clone.c:69
5036 msgid "to clone from a local repository"
5039 #: builtin/clone.c:71
5040 msgid "don't use local hardlinks, always copy"
5041 msgstr "不使用本地硬链接,始终复制"
5043 #: builtin/clone.c:73
5044 msgid "setup as shared repository"
5047 #: builtin/clone.c:75 builtin/clone.c:77
5048 msgid "initialize submodules in the clone"
5051 #: builtin/clone.c:79
5052 msgid "number of submodules cloned in parallel"
5053 msgstr "并发克隆的子模组的数量"
5055 #: builtin/clone.c:80 builtin/init-db.c:470
5056 msgid "template-directory"
5059 #: builtin/clone.c:81 builtin/init-db.c:471
5060 msgid "directory from which templates will be used"
5063 #: builtin/clone.c:83 builtin/submodule--helper.c:498
5064 #: builtin/submodule--helper.c:777
5065 msgid "reference repository"
5068 #: builtin/clone.c:85
5069 msgid "use --reference only while cloning"
5070 msgstr "仅在克隆时参考 --reference 指向的本地仓库"
5072 #: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
5076 #: builtin/clone.c:87
5077 msgid "use <name> instead of 'origin' to track upstream"
5078 msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
5080 #: builtin/clone.c:89
5081 msgid "checkout <branch> instead of the remote's HEAD"
5082 msgstr "检出 <分支> 而不是远程 HEAD"
5084 #: builtin/clone.c:91
5085 msgid "path to git-upload-pack on the remote"
5086 msgstr "远程 git-upload-pack 路径"
5088 #: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667
5089 #: builtin/pull.c:201
5093 #: builtin/clone.c:93
5094 msgid "create a shallow clone of that depth"
5095 msgstr "创建一个指定深度的浅克隆"
5097 #: builtin/clone.c:95
5098 msgid "clone only one branch, HEAD or --branch"
5099 msgstr "只克隆一个分支、HEAD 或 --branch"
5101 #: builtin/clone.c:97
5102 msgid "any cloned submodules will be shallow"
5103 msgstr "子模组将以浅下载模式克隆"
5105 #: builtin/clone.c:98 builtin/init-db.c:479
5109 #: builtin/clone.c:99 builtin/init-db.c:480
5110 msgid "separate git dir from working tree"
5111 msgstr "git目录和工作区分离"
5113 #: builtin/clone.c:100
5117 #: builtin/clone.c:101
5118 msgid "set config inside the new repository"
5119 msgstr "在新仓库中设置配置信息"
5121 #: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536
5122 msgid "use IPv4 addresses only"
5123 msgstr "只使用 IPv4 地址"
5125 #: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538
5126 msgid "use IPv6 addresses only"
5127 msgstr "只使用 IPv6 地址"
5129 #: builtin/clone.c:241
5131 "No directory name could be guessed.\n"
5132 "Please specify a directory on the command line"
5137 #: builtin/clone.c:307
5139 msgid "reference repository '%s' as a linked checkout is not supported yet."
5140 msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
5142 #: builtin/clone.c:309
5144 msgid "reference repository '%s' is not a local repository."
5145 msgstr "参考仓库 '%s' 不是一个本地仓库。"
5147 #: builtin/clone.c:314
5149 msgid "reference repository '%s' is shallow"
5150 msgstr "参考仓库 '%s' 是一个浅克隆"
5152 #: builtin/clone.c:317
5154 msgid "reference repository '%s' is grafted"
5155 msgstr "参考仓库 '%s' 已被嫁接"
5157 #: builtin/clone.c:384
5159 msgid "%s exists and is not a directory"
5160 msgstr "%s 存在且不是一个目录"
5162 #: builtin/clone.c:398
5164 msgid "failed to stat %s\n"
5165 msgstr "无法枚举 %s 状态\n"
5167 #: builtin/clone.c:420
5169 msgid "failed to create link '%s'"
5170 msgstr "无法创建链接 '%s'"
5172 #: builtin/clone.c:424
5174 msgid "failed to copy file to '%s'"
5175 msgstr "无法拷贝文件至 '%s'"
5177 #: builtin/clone.c:449 builtin/clone.c:633
5182 #: builtin/clone.c:461
5184 "Clone succeeded, but checkout failed.\n"
5185 "You can inspect what was checked out with 'git status'\n"
5186 "and retry the checkout with 'git checkout -f HEAD'\n"
5189 "您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
5190 "'git checkout -f HEAD' 重试\n"
5192 #: builtin/clone.c:538
5194 msgid "Could not find remote branch %s to clone."
5195 msgstr "不能发现要克隆的远程分支 %s。"
5197 #: builtin/clone.c:628
5199 msgid "Checking connectivity... "
5202 #: builtin/clone.c:631
5203 msgid "remote did not send all necessary objects"
5204 msgstr "远程没有发送所有必须的对象"
5206 #: builtin/clone.c:649
5208 msgid "unable to update %s"
5211 #: builtin/clone.c:698
5212 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
5213 msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
5215 #: builtin/clone.c:729
5216 msgid "unable to checkout working tree"
5219 #: builtin/clone.c:767
5220 msgid "unable to write parameters to config file"
5221 msgstr "无法将参数写入配置文件"
5223 #: builtin/clone.c:830
5224 msgid "cannot repack to clean up"
5225 msgstr "无法执行 repack 来清理"
5227 #: builtin/clone.c:832
5228 msgid "cannot unlink temporary alternates file"
5229 msgstr "无法删除临时的 alternates 文件"
5231 #: builtin/clone.c:864 builtin/receive-pack.c:1731
5232 msgid "Too many arguments."
5235 #: builtin/clone.c:868
5236 msgid "You must specify a repository to clone."
5237 msgstr "您必须指定一个仓库来克隆。"
5239 #: builtin/clone.c:879
5241 msgid "--bare and --origin %s options are incompatible."
5242 msgstr "--bare 和 --origin %s 选项不兼容。"
5244 #: builtin/clone.c:882
5245 msgid "--bare and --separate-git-dir are incompatible."
5246 msgstr "--bare 和 --separate-git-dir 选项不兼容。"
5248 #: builtin/clone.c:895
5250 msgid "repository '%s' does not exist"
5251 msgstr "仓库 '%s' 不存在"
5253 #: builtin/clone.c:901 builtin/fetch.c:1174
5255 msgid "depth %s is not a positive number"
5256 msgstr "深度 %s 不是一个正数"
5258 #: builtin/clone.c:911
5260 msgid "destination path '%s' already exists and is not an empty directory."
5261 msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
5263 #: builtin/clone.c:921
5265 msgid "working tree '%s' already exists."
5266 msgstr "工作区 '%s' 已经存在。"
5268 #: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547
5269 #: builtin/worktree.c:220 builtin/worktree.c:247
5271 msgid "could not create leading directories of '%s'"
5272 msgstr "不能为 '%s' 创建先导目录"
5274 #: builtin/clone.c:939
5276 msgid "could not create work tree dir '%s'"
5277 msgstr "不能创建工作区目录 '%s'"
5279 #: builtin/clone.c:957
5281 msgid "Cloning into bare repository '%s'...\n"
5282 msgstr "克隆到纯仓库 '%s'...\n"
5284 #: builtin/clone.c:959
5286 msgid "Cloning into '%s'...\n"
5287 msgstr "正克隆到 '%s'...\n"
5289 #: builtin/clone.c:998
5290 msgid "--depth is ignored in local clones; use file:// instead."
5291 msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
5293 #: builtin/clone.c:1001
5294 msgid "source repository is shallow, ignoring --local"
5295 msgstr "源仓库是浅克隆,忽略 --local"
5297 #: builtin/clone.c:1006
5298 msgid "--local is ignored"
5299 msgstr "--local 被忽略"
5301 #: builtin/clone.c:1010
5303 msgid "Don't know how to clone %s"
5306 #: builtin/clone.c:1059 builtin/clone.c:1067
5308 msgid "Remote branch %s not found in upstream %s"
5309 msgstr "远程分支 %s 在上游 %s 未发现"
5311 #: builtin/clone.c:1070
5312 msgid "You appear to have cloned an empty repository."
5313 msgstr "您似乎克隆了一个空仓库。"
5315 #: builtin/column.c:9
5316 msgid "git column [<options>]"
5317 msgstr "git column [<选项>]"
5319 #: builtin/column.c:26
5320 msgid "lookup config vars"
5323 #: builtin/column.c:27 builtin/column.c:28
5324 msgid "layout to use"
5327 #: builtin/column.c:29
5328 msgid "Maximum width"
5331 #: builtin/column.c:30
5332 msgid "Padding space on left border"
5335 #: builtin/column.c:31
5336 msgid "Padding space on right border"
5339 #: builtin/column.c:32
5340 msgid "Padding space between columns"
5343 #: builtin/column.c:51
5344 msgid "--command must be the first argument"
5345 msgstr "--command 必须是第一个参数"
5347 #: builtin/commit.c:38
5348 msgid "git commit [<options>] [--] <pathspec>..."
5349 msgstr "git commit [<选项>] [--] <路径规格>..."
5351 #: builtin/commit.c:43
5352 msgid "git status [<options>] [--] <pathspec>..."
5353 msgstr "git status [<选项>] [--] <路径规格>..."
5355 #: builtin/commit.c:48
5357 "Your name and email address were configured automatically based\n"
5358 "on your username and hostname. Please check that they are accurate.\n"
5359 "You can suppress this message by setting them explicitly. Run the\n"
5360 "following command and follow the instructions in your editor to edit\n"
5361 "your configuration file:\n"
5363 " git config --global --edit\n"
5365 "After doing this, you may fix the identity used for this commit with:\n"
5367 " git commit --amend --reset-author\n"
5369 "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
5370 "与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
5373 " git config --global --edit\n"
5375 "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
5377 " git commit --amend --reset-author\n"
5379 #: builtin/commit.c:61
5381 "Your name and email address were configured automatically based\n"
5382 "on your username and hostname. Please check that they are accurate.\n"
5383 "You can suppress this message by setting them explicitly:\n"
5385 " git config --global user.name \"Your Name\"\n"
5386 " git config --global user.email you@example.com\n"
5388 "After doing this, you may fix the identity used for this commit with:\n"
5390 " git commit --amend --reset-author\n"
5392 "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
5393 "与否。您可以对其进行设置以免再出现本提示信息:\n"
5395 " git config --global user.name \"Your Name\"\n"
5396 " git config --global user.email you@example.com\n"
5398 "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
5400 " git commit --amend --reset-author\n"
5402 #: builtin/commit.c:73
5404 "You asked to amend the most recent commit, but doing so would make\n"
5405 "it empty. You can repeat your command with --allow-empty, or you can\n"
5406 "remove the commit entirely with \"git reset HEAD^\".\n"
5408 "您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
5409 "--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
5411 #: builtin/commit.c:78
5413 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
5414 "If you wish to commit it anyway, use:\n"
5416 " git commit --allow-empty\n"
5419 "之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
5422 " git commit --allow-empty\n"
5425 #: builtin/commit.c:85
5426 msgid "Otherwise, please use 'git reset'\n"
5427 msgstr "否则,请使用命令 'git reset'\n"
5429 #: builtin/commit.c:88
5431 "If you wish to skip this commit, use:\n"
5435 "Then \"git cherry-pick --continue\" will resume cherry-picking\n"
5436 "the remaining commits.\n"
5438 "如果您想跳过这个提交,使用命令:\n"
5442 "然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
5445 #: builtin/commit.c:307
5446 msgid "failed to unpack HEAD tree object"
5447 msgstr "无法解包 HEAD 树对象"
5449 #: builtin/commit.c:348
5450 msgid "unable to create temporary index"
5453 #: builtin/commit.c:354
5454 msgid "interactive add failed"
5457 #: builtin/commit.c:367
5458 msgid "unable to update temporary index"
5461 #: builtin/commit.c:369
5462 msgid "Failed to update main cache tree"
5465 #: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465
5466 msgid "unable to write new_index file"
5467 msgstr "无法写 new_index 文件"
5469 #: builtin/commit.c:447
5470 msgid "cannot do a partial commit during a merge."
5471 msgstr "在合并过程中不能做部分提交。"
5473 #: builtin/commit.c:449
5474 msgid "cannot do a partial commit during a cherry-pick."
5475 msgstr "在拣选过程中不能做部分提交。"
5477 #: builtin/commit.c:458
5478 msgid "cannot read the index"
5481 #: builtin/commit.c:477
5482 msgid "unable to write temporary index file"
5485 #: builtin/commit.c:582
5487 msgid "commit '%s' lacks author header"
5488 msgstr "提交 '%s' 缺少作者信息"
5490 #: builtin/commit.c:584
5492 msgid "commit '%s' has malformed author line"
5493 msgstr "提交 '%s' 有非法的作者信息"
5495 #: builtin/commit.c:603
5496 msgid "malformed --author parameter"
5497 msgstr "非法的 --author 参数"
5499 #: builtin/commit.c:611
5501 msgid "invalid date format: %s"
5504 #: builtin/commit.c:655
5506 "unable to select a comment character that is not used\n"
5507 "in the current commit message"
5508 msgstr "无法选择一个未被当前提交说明使用的注释字符"
5510 #: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091
5512 msgid "could not lookup commit %s"
5515 #: builtin/commit.c:704 builtin/shortlog.c:285
5517 msgid "(reading log message from standard input)\n"
5518 msgstr "(正从标准输入中读取日志信息)\n"
5520 #: builtin/commit.c:706
5521 msgid "could not read log from standard input"
5522 msgstr "不能从标准输入中读取日志信息"
5524 #: builtin/commit.c:710
5526 msgid "could not read log file '%s'"
5527 msgstr "不能读取日志文件 '%s'"
5529 #: builtin/commit.c:737 builtin/commit.c:745
5530 msgid "could not read SQUASH_MSG"
5531 msgstr "不能读取 SQUASH_MSG"
5533 #: builtin/commit.c:742
5534 msgid "could not read MERGE_MSG"
5535 msgstr "不能读取 MERGE_MSG"
5537 #: builtin/commit.c:796
5538 msgid "could not write commit template"
5541 #: builtin/commit.c:814
5545 "It looks like you may be committing a merge.\n"
5546 "If this is not correct, please remove the file\n"
5551 "似乎您正在做一个合并提交。如果不对,请删除文件\n"
5555 #: builtin/commit.c:819
5559 "It looks like you may be committing a cherry-pick.\n"
5560 "If this is not correct, please remove the file\n"
5565 "似乎您正在做一个拣选提交。如果不对,请删除文件\n"
5569 #: builtin/commit.c:832
5572 "Please enter the commit message for your changes. Lines starting\n"
5573 "with '%c' will be ignored, and an empty message aborts the commit.\n"
5575 "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
5578 #: builtin/commit.c:839
5581 "Please enter the commit message for your changes. Lines starting\n"
5582 "with '%c' will be kept; you may remove them yourself if you want to.\n"
5583 "An empty message aborts the commit.\n"
5585 "请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
5586 "也可以删除它们。一个空的提交说明将会终止提交。\n"
5588 # 译者:为保证在输出中对齐,注意调整句中空格!
5589 #: builtin/commit.c:859
5591 msgid "%sAuthor: %.*s <%.*s>"
5592 msgstr "%s作者: %.*s <%.*s>"
5594 # 译者:为保证在输出中对齐,注意调整句中空格!
5595 #: builtin/commit.c:867
5600 # 译者:为保证在输出中对齐,注意调整句中空格!
5601 #: builtin/commit.c:874
5603 msgid "%sCommitter: %.*s <%.*s>"
5604 msgstr "%s提交者:%.*s <%.*s>"
5606 #: builtin/commit.c:892
5607 msgid "Cannot read index"
5610 #: builtin/commit.c:949
5611 msgid "Error building trees"
5614 #: builtin/commit.c:964 builtin/tag.c:266
5616 msgid "Please supply the message using either -m or -F option.\n"
5617 msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
5619 #: builtin/commit.c:1066
5621 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
5622 msgstr "--author '%s' 不是 'Name <email>' 格式,且未能在现有作者中找到匹配"
5624 #: builtin/commit.c:1081 builtin/commit.c:1321
5626 msgid "Invalid untracked files mode '%s'"
5627 msgstr "无效的未追踪文件参数 '%s'"
5629 #: builtin/commit.c:1118
5630 msgid "--long and -z are incompatible"
5631 msgstr "--long 和 -z 选项不兼容"
5633 #: builtin/commit.c:1148
5634 msgid "Using both --reset-author and --author does not make sense"
5635 msgstr "同时使用 --reset-author 和 --author 没有意义"
5637 #: builtin/commit.c:1157
5638 msgid "You have nothing to amend."
5641 #: builtin/commit.c:1160
5642 msgid "You are in the middle of a merge -- cannot amend."
5643 msgstr "您正处于一个合并过程中 -- 无法修补提交。"
5645 #: builtin/commit.c:1162
5646 msgid "You are in the middle of a cherry-pick -- cannot amend."
5647 msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
5649 #: builtin/commit.c:1165
5650 msgid "Options --squash and --fixup cannot be used together"
5651 msgstr "选项 --squash 和 --fixup 不能同时使用"
5653 #: builtin/commit.c:1175
5654 msgid "Only one of -c/-C/-F/--fixup can be used."
5655 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
5657 #: builtin/commit.c:1177
5658 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
5659 msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
5661 #: builtin/commit.c:1185
5662 msgid "--reset-author can be used only with -C, -c or --amend."
5663 msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
5665 #: builtin/commit.c:1202
5666 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
5667 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
5669 #: builtin/commit.c:1204
5670 msgid "No paths with --include/--only does not make sense."
5671 msgstr "参数 --include/--only 不跟路径没有意义。"
5673 #: builtin/commit.c:1206
5674 msgid "Clever... amending the last one with dirty index."
5675 msgstr "聪明... 用脏索引修补最后一个提交。"
5677 #: builtin/commit.c:1208
5678 msgid "Explicit paths specified without -i or -o; assuming --only paths..."
5679 msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..."
5681 #: builtin/commit.c:1220 builtin/tag.c:474
5683 msgid "Invalid cleanup mode %s"
5686 #: builtin/commit.c:1225
5687 msgid "Paths with -a does not make sense."
5688 msgstr "路径和 -a 选项同时使用没有意义。"
5690 #: builtin/commit.c:1335 builtin/commit.c:1621
5691 msgid "show status concisely"
5694 #: builtin/commit.c:1337 builtin/commit.c:1623
5695 msgid "show branch information"
5698 #: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512
5699 #: builtin/worktree.c:437
5700 msgid "machine-readable output"
5703 #: builtin/commit.c:1342 builtin/commit.c:1627
5704 msgid "show status in long format (default)"
5705 msgstr "以长格式显示状态(默认)"
5707 #: builtin/commit.c:1345 builtin/commit.c:1630
5708 msgid "terminate entries with NUL"
5709 msgstr "条目以 NUL 字符结尾"
5711 #: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981
5712 #: builtin/fast-export.c:984 builtin/tag.c:353
5716 #: builtin/commit.c:1348 builtin/commit.c:1633
5717 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
5718 msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
5720 #: builtin/commit.c:1351
5721 msgid "show ignored files"
5724 #: builtin/commit.c:1352 parse-options.h:155
5728 #: builtin/commit.c:1353
5730 "ignore changes to submodules, optional when: all, dirty, untracked. "
5733 "忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
5735 #: builtin/commit.c:1355
5736 msgid "list untracked files in columns"
5737 msgstr "以列的方式显示未跟踪的文件"
5739 #: builtin/commit.c:1441
5740 msgid "couldn't look up newly created commit"
5743 #: builtin/commit.c:1443
5744 msgid "could not parse newly created commit"
5747 #: builtin/commit.c:1488
5748 msgid "detached HEAD"
5751 # 译者:中文字符串拼接,可删除前导空格
5752 #: builtin/commit.c:1491
5753 msgid " (root-commit)"
5756 #: builtin/commit.c:1591
5757 msgid "suppress summary after successful commit"
5758 msgstr "提交成功后不显示概述信息"
5760 #: builtin/commit.c:1592
5761 msgid "show diff in commit message template"
5762 msgstr "在提交说明模板里显示差异"
5764 #: builtin/commit.c:1594
5765 msgid "Commit message options"
5768 #: builtin/commit.c:1595 builtin/tag.c:351
5769 msgid "read message from file"
5772 #: builtin/commit.c:1596
5776 #: builtin/commit.c:1596
5777 msgid "override author for commit"
5780 #: builtin/commit.c:1597 builtin/gc.c:326
5784 #: builtin/commit.c:1597
5785 msgid "override date for commit"
5788 #: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395
5789 #: builtin/notes.c:558 builtin/tag.c:349
5793 #: builtin/commit.c:1598
5794 msgid "commit message"
5797 #: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601
5798 #: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79
5802 #: builtin/commit.c:1599
5803 msgid "reuse and edit message from specified commit"
5804 msgstr "重用并编辑指定提交的提交说明"
5806 #: builtin/commit.c:1600
5807 msgid "reuse message from specified commit"
5808 msgstr "重用指定提交的提交说明"
5810 #: builtin/commit.c:1601
5811 msgid "use autosquash formatted message to fixup specified commit"
5812 msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
5814 #: builtin/commit.c:1602
5815 msgid "use autosquash formatted message to squash specified commit"
5816 msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
5818 #: builtin/commit.c:1603
5819 msgid "the commit is authored by me now (used with -C/-c/--amend)"
5820 msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
5822 #: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86
5823 msgid "add Signed-off-by:"
5824 msgstr "添加 Signed-off-by: 签名"
5826 #: builtin/commit.c:1605
5827 msgid "use specified template file"
5830 #: builtin/commit.c:1606
5831 msgid "force edit of commit"
5834 # 译者:可选值,不能翻译(或是原文中笔误,应为 mode)
5835 #: builtin/commit.c:1607
5839 #: builtin/commit.c:1607 builtin/tag.c:354
5840 msgid "how to strip spaces and #comments from message"
5841 msgstr "设置如何删除提交说明里的空格和#注释"
5843 #: builtin/commit.c:1608
5844 msgid "include status in commit message template"
5845 msgstr "在提交说明模板里包含状态信息"
5847 #: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165
5848 #: builtin/revert.c:93
5849 msgid "GPG sign commit"
5852 #: builtin/commit.c:1613
5853 msgid "Commit contents options"
5856 #: builtin/commit.c:1614
5857 msgid "commit all changed files"
5860 #: builtin/commit.c:1615
5861 msgid "add specified files to index for commit"
5862 msgstr "添加指定的文件到索引区等待提交"
5864 #: builtin/commit.c:1616
5865 msgid "interactively add files"
5868 #: builtin/commit.c:1617
5869 msgid "interactively add changes"
5872 #: builtin/commit.c:1618
5873 msgid "commit only specified files"
5876 #: builtin/commit.c:1619
5877 msgid "bypass pre-commit hook"
5878 msgstr "绕过 pre-commit 钩子"
5880 #: builtin/commit.c:1620
5881 msgid "show what would be committed"
5884 #: builtin/commit.c:1631
5885 msgid "amend previous commit"
5888 #: builtin/commit.c:1632
5889 msgid "bypass post-rewrite hook"
5890 msgstr "绕过 post-rewrite 钩子"
5892 #: builtin/commit.c:1637
5893 msgid "ok to record an empty change"
5896 #: builtin/commit.c:1639
5897 msgid "ok to record a change with an empty message"
5900 #: builtin/commit.c:1668
5901 msgid "could not parse HEAD commit"
5902 msgstr "不能解析 HEAD 提交"
5904 #: builtin/commit.c:1718
5906 msgid "Corrupt MERGE_HEAD file (%s)"
5907 msgstr "损坏的 MERGE_HEAD 文件(%s)"
5909 #: builtin/commit.c:1725
5910 msgid "could not read MERGE_MODE"
5911 msgstr "不能读取 MERGE_MODE"
5913 #: builtin/commit.c:1744
5915 msgid "could not read commit message: %s"
5916 msgstr "不能读取提交说明:%s"
5918 #: builtin/commit.c:1755
5920 msgid "Aborting commit; you did not edit the message.\n"
5921 msgstr "终止提交;您未更改来自模版的提交说明。\n"
5923 #: builtin/commit.c:1760
5925 msgid "Aborting commit due to empty commit message.\n"
5926 msgstr "终止提交因为提交说明为空。\n"
5928 #: builtin/commit.c:1808
5930 "Repository has been updated, but unable to write\n"
5931 "new_index file. Check that disk is not full and quota is\n"
5932 "not exceeded, and then \"git reset HEAD\" to recover."
5934 "仓库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
5935 "或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
5937 #: builtin/config.c:9
5938 msgid "git config [<options>]"
5939 msgstr "git config [<选项>]"
5941 #: builtin/config.c:56
5942 msgid "Config file location"
5945 #: builtin/config.c:57
5946 msgid "use global config file"
5949 #: builtin/config.c:58
5950 msgid "use system config file"
5953 #: builtin/config.c:59
5954 msgid "use repository config file"
5957 #: builtin/config.c:60
5958 msgid "use given config file"
5961 #: builtin/config.c:61
5965 #: builtin/config.c:61
5966 msgid "read config from given blob object"
5967 msgstr "从给定的数据对象读取配置"
5969 #: builtin/config.c:62
5973 #: builtin/config.c:63
5974 msgid "get value: name [value-regex]"
5975 msgstr "获取值:name [value-regex]"
5977 #: builtin/config.c:64
5978 msgid "get all values: key [value-regex]"
5979 msgstr "获得所有的值:key [value-regex]"
5981 #: builtin/config.c:65
5982 msgid "get values for regexp: name-regex [value-regex]"
5983 msgstr "根据正则表达式获得值:name-regex [value-regex]"
5985 #: builtin/config.c:66
5986 msgid "get value specific for the URL: section[.var] URL"
5987 msgstr "获得 URL 取值:section[.var] URL"
5989 #: builtin/config.c:67
5990 msgid "replace all matching variables: name value [value_regex]"
5991 msgstr "替换所有匹配的变量:name value [value_regex]"
5993 #: builtin/config.c:68
5994 msgid "add a new variable: name value"
5995 msgstr "添加一个新的变量:name value"
5997 #: builtin/config.c:69
5998 msgid "remove a variable: name [value-regex]"
5999 msgstr "删除一个变量:name [value-regex]"
6001 #: builtin/config.c:70
6002 msgid "remove all matches: name [value-regex]"
6003 msgstr "删除所有匹配项:name [value-regex]"
6005 #: builtin/config.c:71
6006 msgid "rename section: old-name new-name"
6007 msgstr "重命名小节:old-name new-name"
6009 #: builtin/config.c:72
6010 msgid "remove a section: name"
6011 msgstr "删除一个小节:name"
6013 #: builtin/config.c:73
6017 #: builtin/config.c:74
6018 msgid "open an editor"
6021 #: builtin/config.c:75
6022 msgid "find the color configured: slot [default]"
6023 msgstr "获得配置的颜色:配置 [默认]"
6025 #: builtin/config.c:76
6026 msgid "find the color setting: slot [stdout-is-tty]"
6027 msgstr "获得颜色设置:配置 [stdout-is-tty]"
6029 #: builtin/config.c:77
6033 #: builtin/config.c:78
6034 msgid "value is \"true\" or \"false\""
6035 msgstr "值是 \"true\" 或 \"false\""
6037 #: builtin/config.c:79
6038 msgid "value is decimal number"
6041 #: builtin/config.c:80
6042 msgid "value is --bool or --int"
6043 msgstr "值是 --bool or --int"
6045 #: builtin/config.c:81
6046 msgid "value is a path (file or directory name)"
6047 msgstr "值是一个路径(文件或目录名)"
6049 #: builtin/config.c:82
6053 #: builtin/config.c:83
6054 msgid "terminate values with NUL byte"
6055 msgstr "终止值是 NUL 字节"
6057 #: builtin/config.c:84
6058 msgid "show variable names only"
6061 #: builtin/config.c:85
6062 msgid "respect include directives on lookup"
6063 msgstr "查询时参照 include 指令递归查找"
6065 #: builtin/config.c:86
6066 msgid "show origin of config (file, standard input, blob, command line)"
6067 msgstr "显示配置的来源(文件、标准输入、数据对象,或命令行)"
6069 #: builtin/config.c:328
6070 msgid "unable to parse default color value"
6073 #: builtin/config.c:472
6076 "# This is Git's per-user configuration file.\n"
6078 "# Please adapt and uncomment the following lines:\n"
6082 "# This is Git's per-user configuration file.\n"
6084 "# Please adapt and uncomment the following lines:\n"
6088 #: builtin/config.c:614
6090 msgid "cannot create configuration file %s"
6091 msgstr "不能创建配置文件 %s"
6093 #: builtin/count-objects.c:77
6094 msgid "git count-objects [-v] [-H | --human-readable]"
6095 msgstr "git count-objects [-v] [-H | --human-readable]"
6097 #: builtin/count-objects.c:87
6098 msgid "print sizes in human readable format"
6099 msgstr "以用户可读的格式显示大小"
6101 #: builtin/describe.c:17
6102 msgid "git describe [<options>] [<commit-ish>...]"
6103 msgstr "git describe [<选项>] [<提交号>...]"
6105 #: builtin/describe.c:18
6106 msgid "git describe [<options>] --dirty"
6107 msgstr "git describe [<选项>] --dirty"
6109 #: builtin/describe.c:217
6111 msgid "annotated tag %s not available"
6114 #: builtin/describe.c:221
6116 msgid "annotated tag %s has no embedded name"
6117 msgstr "附注标签 %s 没有嵌入名称"
6119 #: builtin/describe.c:223
6121 msgid "tag '%s' is really '%s' here"
6122 msgstr "标签 '%s' 的确是在 '%s'"
6124 #: builtin/describe.c:250 builtin/log.c:465
6126 msgid "Not a valid object name %s"
6127 msgstr "不是一个有效的对象名 %s"
6129 #: builtin/describe.c:253
6131 msgid "%s is not a valid '%s' object"
6132 msgstr "%s 不是一个有效的 '%s' 对象"
6134 #: builtin/describe.c:270
6136 msgid "no tag exactly matches '%s'"
6137 msgstr "没有标签准确匹配 '%s'"
6139 #: builtin/describe.c:272
6141 msgid "searching to describe %s\n"
6144 #: builtin/describe.c:319
6146 msgid "finished search at %s\n"
6149 #: builtin/describe.c:346
6152 "No annotated tags can describe '%s'.\n"
6153 "However, there were unannotated tags: try --tags."
6156 "然而,存在未附注标签:尝试 --tags。"
6158 #: builtin/describe.c:350
6161 "No tags can describe '%s'.\n"
6162 "Try --always, or create some tags."
6165 "尝试 --always,或者创建一些标签。"
6167 #: builtin/describe.c:371
6169 msgid "traversed %lu commits\n"
6170 msgstr "已遍历 %lu 个提交\n"
6172 #: builtin/describe.c:374
6175 "more than %i tags found; listed %i most recent\n"
6176 "gave up search at %s\n"
6178 "发现多于 %i 个标签,列出最近的 %i 个\n"
6181 #: builtin/describe.c:396
6182 msgid "find the tag that comes after the commit"
6185 #: builtin/describe.c:397
6186 msgid "debug search strategy on stderr"
6187 msgstr "在标准错误上调试搜索策略"
6189 #: builtin/describe.c:398
6193 #: builtin/describe.c:399
6194 msgid "use any tag, even unannotated"
6195 msgstr "使用任意标签,即使未附带注释"
6197 #: builtin/describe.c:400
6198 msgid "always use long format"
6201 #: builtin/describe.c:401
6202 msgid "only follow first parent"
6205 #: builtin/describe.c:404
6206 msgid "only output exact matches"
6209 #: builtin/describe.c:406
6210 msgid "consider <n> most recent tags (default: 10)"
6211 msgstr "考虑最近 <n> 个标签(默认:10)"
6213 #: builtin/describe.c:408
6214 msgid "only consider tags matching <pattern>"
6215 msgstr "只考虑匹配 <模式> 的标签"
6217 #: builtin/describe.c:410 builtin/name-rev.c:321
6218 msgid "show abbreviated commit object as fallback"
6219 msgstr "显示简写的提交号作为后备"
6221 #: builtin/describe.c:411
6225 #: builtin/describe.c:412
6226 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
6227 msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")"
6229 #: builtin/describe.c:430
6230 msgid "--long is incompatible with --abbrev=0"
6231 msgstr "--long 与 --abbrev=0 不兼容"
6233 #: builtin/describe.c:456
6234 msgid "No names found, cannot describe anything."
6235 msgstr "没有发现名称,无法描述任何东西。"
6237 #: builtin/describe.c:476
6238 msgid "--dirty is incompatible with commit-ishes"
6239 msgstr "--dirty 不能与提交同时使用"
6241 #: builtin/diff.c:86
6243 msgid "'%s': not a regular file or symlink"
6244 msgstr "'%s':不是一个正规文件或符号链接"
6246 #: builtin/diff.c:237
6248 msgid "invalid option: %s"
6251 #: builtin/diff.c:360
6252 msgid "Not a git repository"
6253 msgstr "不是一个 git 仓库"
6255 #: builtin/diff.c:403
6257 msgid "invalid object '%s' given."
6258 msgstr "提供了无效对象 '%s'。"
6260 #: builtin/diff.c:412
6262 msgid "more than two blobs given: '%s'"
6263 msgstr "提供了超过两个数据对象:'%s'"
6265 #: builtin/diff.c:419
6267 msgid "unhandled object '%s' given."
6268 msgstr "无法处理的对象 '%s'。"
6270 #: builtin/fast-export.c:25
6271 msgid "git fast-export [rev-list-opts]"
6272 msgstr "git fast-export [rev-list-opts]"
6274 #: builtin/fast-export.c:980
6275 msgid "show progress after <n> objects"
6276 msgstr "在 <n> 个对象之后显示进度"
6278 #: builtin/fast-export.c:982
6279 msgid "select handling of signed tags"
6282 #: builtin/fast-export.c:985
6283 msgid "select handling of tags that tag filtered objects"
6284 msgstr "选择当标签指向被过滤对象时该标签的处理方式"
6286 #: builtin/fast-export.c:988
6287 msgid "Dump marks to this file"
6290 #: builtin/fast-export.c:990
6291 msgid "Import marks from this file"
6294 #: builtin/fast-export.c:992
6295 msgid "Fake a tagger when tags lack one"
6296 msgstr "当标签缺少标记者字段时,假装提供一个"
6298 #: builtin/fast-export.c:994
6299 msgid "Output full tree for each commit"
6302 #: builtin/fast-export.c:996
6303 msgid "Use the done feature to terminate the stream"
6304 msgstr "使用 done 功能来终止流"
6306 #: builtin/fast-export.c:997
6307 msgid "Skip output of blob data"
6310 #: builtin/fast-export.c:998
6314 #: builtin/fast-export.c:999
6315 msgid "Apply refspec to exported refs"
6316 msgstr "对导出的引用应用引用规格"
6318 #: builtin/fast-export.c:1000
6319 msgid "anonymize output"
6322 #: builtin/fetch.c:20
6323 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
6324 msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
6326 #: builtin/fetch.c:21
6327 msgid "git fetch [<options>] <group>"
6328 msgstr "git fetch [<选项>] <组>"
6330 #: builtin/fetch.c:22
6331 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
6332 msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
6334 #: builtin/fetch.c:23
6335 msgid "git fetch --all [<options>]"
6336 msgstr "git fetch --all [<选项>]"
6338 #: builtin/fetch.c:92 builtin/pull.c:174
6339 msgid "fetch from all remotes"
6342 #: builtin/fetch.c:94 builtin/pull.c:177
6343 msgid "append to .git/FETCH_HEAD instead of overwriting"
6344 msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
6346 #: builtin/fetch.c:96 builtin/pull.c:180
6347 msgid "path to upload pack on remote end"
6350 #: builtin/fetch.c:97 builtin/pull.c:182
6351 msgid "force overwrite of local branch"
6354 #: builtin/fetch.c:99
6355 msgid "fetch from multiple remotes"
6358 #: builtin/fetch.c:101 builtin/pull.c:184
6359 msgid "fetch all tags and associated objects"
6360 msgstr "抓取所有的标签和关联对象"
6362 #: builtin/fetch.c:103
6363 msgid "do not fetch all tags (--no-tags)"
6364 msgstr "不抓取任何标签(--no-tags)"
6366 #: builtin/fetch.c:105
6367 msgid "number of submodules fetched in parallel"
6370 #: builtin/fetch.c:107 builtin/pull.c:187
6371 msgid "prune remote-tracking branches no longer on remote"
6372 msgstr "清除远程已经不存在的分支的跟踪分支"
6375 #: builtin/fetch.c:108 builtin/pull.c:190
6379 #: builtin/fetch.c:109 builtin/pull.c:191
6380 msgid "control recursive fetching of submodules"
6383 #: builtin/fetch.c:113 builtin/pull.c:199
6384 msgid "keep downloaded pack"
6387 #: builtin/fetch.c:115
6388 msgid "allow updating of HEAD ref"
6389 msgstr "允许更新 HEAD 引用"
6391 #: builtin/fetch.c:118 builtin/pull.c:202
6392 msgid "deepen history of shallow clone"
6395 #: builtin/fetch.c:120 builtin/pull.c:205
6396 msgid "convert to a complete repository"
6399 #: builtin/fetch.c:122 builtin/log.c:1399
6403 #: builtin/fetch.c:123
6404 msgid "prepend this to submodule path output"
6405 msgstr "在子模组路径输出的前面加上此目录"
6407 #: builtin/fetch.c:126
6408 msgid "default mode for recursion"
6411 #: builtin/fetch.c:128 builtin/pull.c:208
6412 msgid "accept refs that update .git/shallow"
6413 msgstr "接受更新 .git/shallow 的引用"
6415 #: builtin/fetch.c:129 builtin/pull.c:210
6419 #: builtin/fetch.c:130 builtin/pull.c:211
6420 msgid "specify fetch refmap"
6421 msgstr "指定获取操作的引用映射"
6423 #: builtin/fetch.c:386
6424 msgid "Couldn't find remote ref HEAD"
6425 msgstr "无法发现远程 HEAD 引用"
6427 #: builtin/fetch.c:466
6429 msgid "object %s not found"
6432 #: builtin/fetch.c:471
6433 msgid "[up to date]"
6436 #: builtin/fetch.c:485
6438 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
6439 msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)"
6441 #: builtin/fetch.c:486 builtin/fetch.c:574
6445 #: builtin/fetch.c:497
6446 msgid "[tag update]"
6450 #: builtin/fetch.c:499 builtin/fetch.c:534 builtin/fetch.c:552
6451 msgid " (unable to update local ref)"
6452 msgstr " (不能更新本地引用)"
6454 #: builtin/fetch.c:517
6458 #: builtin/fetch.c:520
6459 msgid "[new branch]"
6462 #: builtin/fetch.c:523
6466 #: builtin/fetch.c:569
6467 msgid "unable to update local ref"
6470 #: builtin/fetch.c:569
6471 msgid "forced update"
6474 #: builtin/fetch.c:576
6475 msgid "(non-fast-forward)"
6478 #: builtin/fetch.c:619
6480 msgid "%s did not send all necessary objects\n"
6481 msgstr "%s 未发送所有必须的对象\n"
6483 #: builtin/fetch.c:637
6485 msgid "reject %s because shallow roots are not allowed to be updated"
6486 msgstr "拒绝 %s 因为浅克隆不允许被更新"
6488 #: builtin/fetch.c:724 builtin/fetch.c:816
6493 #: builtin/fetch.c:735
6496 "some local refs could not be updated; try running\n"
6497 " 'git remote prune %s' to remove any old, conflicting branches"
6499 "一些本地引用不能被更新;尝试运行\n"
6500 " 'git remote prune %s' 来删除旧的、有冲突的分支"
6503 #: builtin/fetch.c:787
6505 msgid " (%s will become dangling)"
6506 msgstr " (%s 将成为摇摆状态)"
6509 #: builtin/fetch.c:788
6511 msgid " (%s has become dangling)"
6512 msgstr " (%s 已成为摇摆状态)"
6514 #: builtin/fetch.c:820
6518 #: builtin/fetch.c:821 builtin/remote.c:1025
6522 #: builtin/fetch.c:841
6524 msgid "Refusing to fetch into current branch %s of non-bare repository"
6525 msgstr "拒绝获取到非纯仓库的当前分支 %s"
6527 #: builtin/fetch.c:860
6529 msgid "Option \"%s\" value \"%s\" is not valid for %s"
6530 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
6532 #: builtin/fetch.c:863
6534 msgid "Option \"%s\" is ignored for %s\n"
6535 msgstr "选项 \"%s\" 为 %s 所忽略\n"
6537 #: builtin/fetch.c:920
6539 msgid "Don't know how to fetch from %s"
6540 msgstr "不知道如何从 %s 获取"
6542 #: builtin/fetch.c:1080
6544 msgid "Fetching %s\n"
6547 #: builtin/fetch.c:1082 builtin/remote.c:96
6549 msgid "Could not fetch %s"
6552 #: builtin/fetch.c:1100
6554 "No remote repository specified. Please, specify either a URL or a\n"
6555 "remote name from which new revisions should be fetched."
6556 msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。"
6558 #: builtin/fetch.c:1123
6559 msgid "You need to specify a tag name."
6560 msgstr "您需要指定一个标签名称。"
6562 #: builtin/fetch.c:1165
6563 msgid "--depth and --unshallow cannot be used together"
6564 msgstr "--depth 和 --unshallow 不能同时使用"
6566 #: builtin/fetch.c:1167
6567 msgid "--unshallow on a complete repository does not make sense"
6568 msgstr "对于一个完整的仓库,参数 --unshallow 没有意义"
6570 #: builtin/fetch.c:1187
6571 msgid "fetch --all does not take a repository argument"
6572 msgstr "fetch --all 不能带一个仓库参数"
6574 #: builtin/fetch.c:1189
6575 msgid "fetch --all does not make sense with refspecs"
6576 msgstr "fetch --all 带引用规格没有任何意义"
6578 #: builtin/fetch.c:1200
6580 msgid "No such remote or remote group: %s"
6581 msgstr "没有这样的远程或远程组:%s"
6583 #: builtin/fetch.c:1208
6584 msgid "Fetching a group and specifying refspecs does not make sense"
6585 msgstr "获取组并指定引用规格没有意义"
6587 #: builtin/fmt-merge-msg.c:14
6589 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
6590 msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
6592 #: builtin/fmt-merge-msg.c:667
6593 msgid "populate log with at most <n> entries from shortlog"
6594 msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
6596 #: builtin/fmt-merge-msg.c:670
6597 msgid "alias for --log (deprecated)"
6598 msgstr "参数 --log 的别名(已弃用)"
6600 #: builtin/fmt-merge-msg.c:673
6604 #: builtin/fmt-merge-msg.c:674
6605 msgid "use <text> as start of message"
6606 msgstr "使用 <文本> 作为提交说明的开始"
6608 #: builtin/fmt-merge-msg.c:675
6609 msgid "file to read from"
6612 #: builtin/for-each-ref.c:9
6613 msgid "git for-each-ref [<options>] [<pattern>]"
6614 msgstr "git for-each-ref [<选项>] [<模式>]"
6616 #: builtin/for-each-ref.c:10
6617 msgid "git for-each-ref [--points-at <object>]"
6618 msgstr "git for-each-ref [--points-at <对象>]"
6620 #: builtin/for-each-ref.c:11
6621 msgid "git for-each-ref [(--merged | --no-merged) [<object>]]"
6622 msgstr "git for-each-ref [(--merged | --no-merged) [<对象>]]"
6624 #: builtin/for-each-ref.c:12
6625 msgid "git for-each-ref [--contains [<object>]]"
6626 msgstr "git for-each-ref [--contains [<对象>]]"
6628 #: builtin/for-each-ref.c:27
6629 msgid "quote placeholders suitably for shells"
6630 msgstr "引用占位符适用于 shells"
6632 #: builtin/for-each-ref.c:29
6633 msgid "quote placeholders suitably for perl"
6634 msgstr "引用占位符适用于 perl"
6636 #: builtin/for-each-ref.c:31
6637 msgid "quote placeholders suitably for python"
6638 msgstr "引用占位符适用于 python"
6640 #: builtin/for-each-ref.c:33
6641 msgid "quote placeholders suitably for Tcl"
6642 msgstr "引用占位符适用于 Tcl"
6644 #: builtin/for-each-ref.c:36
6645 msgid "show only <n> matched refs"
6646 msgstr "只显示 <n> 个匹配的引用"
6648 #: builtin/for-each-ref.c:37 builtin/tag.c:372
6649 msgid "format to use for the output"
6652 #: builtin/for-each-ref.c:41
6653 msgid "print only refs which points at the given object"
6654 msgstr "只打印指向给定对象的引用"
6656 #: builtin/for-each-ref.c:43
6657 msgid "print only refs that are merged"
6660 #: builtin/for-each-ref.c:44
6661 msgid "print only refs that are not merged"
6664 #: builtin/for-each-ref.c:45
6665 msgid "print only refs which contain the commit"
6666 msgstr "只打印包含该提交的引用"
6668 #: builtin/fsck.c:156 builtin/prune.c:140
6669 msgid "Checking connectivity"
6672 #: builtin/fsck.c:486
6673 msgid "Checking object directories"
6676 #: builtin/fsck.c:552
6677 msgid "git fsck [<options>] [<object>...]"
6678 msgstr "git fsck [<选项>] [<对象>...]"
6680 #: builtin/fsck.c:558
6681 msgid "show unreachable objects"
6684 #: builtin/fsck.c:559
6685 msgid "show dangling objects"
6688 #: builtin/fsck.c:560
6692 #: builtin/fsck.c:561
6693 msgid "report root nodes"
6696 #: builtin/fsck.c:562
6697 msgid "make index objects head nodes"
6698 msgstr "将索引亦作为检查的头节点"
6700 #: builtin/fsck.c:563
6701 msgid "make reflogs head nodes (default)"
6702 msgstr "将引用日志作为检查的头节点(默认)"
6704 #: builtin/fsck.c:564
6705 msgid "also consider packs and alternate objects"
6708 #: builtin/fsck.c:565
6709 msgid "check only connectivity"
6712 #: builtin/fsck.c:566
6713 msgid "enable more strict checking"
6716 #: builtin/fsck.c:568
6717 msgid "write dangling objects in .git/lost-found"
6718 msgstr "将摇摆对象写入 .git/lost-found 中"
6720 #: builtin/fsck.c:569 builtin/prune.c:107
6721 msgid "show progress"
6724 #: builtin/fsck.c:630
6725 msgid "Checking objects"
6729 msgid "git gc [<options>]"
6730 msgstr "git gc [<选项>]"
6734 msgid "Invalid %s: '%s'"
6739 msgid "insanely long object directory %.*s"
6740 msgstr "不正常的长对象目录 %.*s"
6745 "The last gc run reported the following. Please correct the root cause\n"
6747 "Automatic cleanup will not be performed until the file is removed.\n"
6751 "最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n"
6752 "在该文件被删除之前,自动清理将不会执行。\n"
6757 msgid "prune unreferenced objects"
6761 msgid "be more thorough (increased runtime)"
6762 msgstr "更彻底(增加运行时间)"
6765 msgid "enable auto-gc mode"
6769 msgid "force running gc even if there may be another gc running"
6770 msgstr "强制执行 gc 即使另外一个 gc 正在执行"
6774 msgid "Auto packing the repository in background for optimum performance.\n"
6775 msgstr "自动在后台执行仓库打包以求最佳性能。\n"
6779 msgid "Auto packing the repository for optimum performance.\n"
6780 msgstr "自动打包仓库以求最佳性能。\n"
6784 msgid "See \"git help gc\" for manual housekeeping.\n"
6785 msgstr "手工维护参见 \"git help gc\"。\n"
6790 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
6792 "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> (如果不是,使用 --force)"
6796 "There are too many unreachable loose objects; run 'git prune' to remove them."
6797 msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
6799 #: builtin/grep.c:23
6800 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
6801 msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
6803 #: builtin/grep.c:219
6805 msgid "grep: failed to create thread: %s"
6806 msgstr "grep:无法创建线程:%s"
6808 #: builtin/grep.c:277
6810 msgid "invalid number of threads specified (%d) for %s"
6811 msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
6813 #: builtin/grep.c:452 builtin/grep.c:487
6815 msgid "unable to read tree (%s)"
6818 #: builtin/grep.c:502
6820 msgid "unable to grep from object of type %s"
6821 msgstr "无法抓取来自于 %s 类型的对象"
6823 #: builtin/grep.c:560
6825 msgid "switch `%c' expects a numerical value"
6826 msgstr "开关 `%c' 期望一个数字值"
6828 #: builtin/grep.c:577
6830 msgid "cannot open '%s'"
6833 #: builtin/grep.c:646
6834 msgid "search in index instead of in the work tree"
6835 msgstr "在索引区搜索而不是在工作区"
6837 #: builtin/grep.c:648
6838 msgid "find in contents not managed by git"
6839 msgstr "在未被 git 管理的内容中查找"
6841 # 译者:中文字符串拼接,可删除前导空格
6842 #: builtin/grep.c:650
6843 msgid "search in both tracked and untracked files"
6844 msgstr "在跟踪和未跟踪的文件中搜索"
6846 #: builtin/grep.c:652
6847 msgid "ignore files specified via '.gitignore'"
6848 msgstr "忽略 '.gitignore' 包含的文件"
6850 #: builtin/grep.c:655
6851 msgid "show non-matching lines"
6854 #: builtin/grep.c:657
6855 msgid "case insensitive matching"
6858 #: builtin/grep.c:659
6859 msgid "match patterns only at word boundaries"
6862 #: builtin/grep.c:661
6863 msgid "process binary files as text"
6864 msgstr "把二进制文件当做文本处理"
6866 #: builtin/grep.c:663
6867 msgid "don't match patterns in binary files"
6868 msgstr "不在二进制文件中匹配模式"
6870 #: builtin/grep.c:666
6871 msgid "process binary files with textconv filters"
6872 msgstr "用 textconv 过滤器处理二进制文件"
6874 #: builtin/grep.c:668
6875 msgid "descend at most <depth> levels"
6876 msgstr "最多以指定的深度向下寻找"
6878 #: builtin/grep.c:672
6879 msgid "use extended POSIX regular expressions"
6880 msgstr "使用扩展的 POSIX 正则表达式"
6882 #: builtin/grep.c:675
6883 msgid "use basic POSIX regular expressions (default)"
6884 msgstr "使用基本的 POSIX 正则表达式(默认)"
6886 #: builtin/grep.c:678
6887 msgid "interpret patterns as fixed strings"
6888 msgstr "把模式解析为固定的字符串"
6890 #: builtin/grep.c:681
6891 msgid "use Perl-compatible regular expressions"
6892 msgstr "使用 Perl 兼容的正则表达式"
6894 #: builtin/grep.c:684
6895 msgid "show line numbers"
6898 #: builtin/grep.c:685
6899 msgid "don't show filenames"
6902 #: builtin/grep.c:686
6903 msgid "show filenames"
6906 #: builtin/grep.c:688
6907 msgid "show filenames relative to top directory"
6908 msgstr "显示相对于顶级目录的文件名"
6910 #: builtin/grep.c:690
6911 msgid "show only filenames instead of matching lines"
6912 msgstr "只显示文件名而不显示匹配的行"
6914 #: builtin/grep.c:692
6915 msgid "synonym for --files-with-matches"
6916 msgstr "和 --files-with-matches 同义"
6918 #: builtin/grep.c:695
6919 msgid "show only the names of files without match"
6922 #: builtin/grep.c:697
6923 msgid "print NUL after filenames"
6924 msgstr "在文件名后输出 NUL 字符"
6926 #: builtin/grep.c:699
6927 msgid "show the number of matches instead of matching lines"
6928 msgstr "显示总匹配行数,而不显示匹配的行"
6930 #: builtin/grep.c:700
6931 msgid "highlight matches"
6934 #: builtin/grep.c:702
6935 msgid "print empty line between matches from different files"
6936 msgstr "在不同文件的匹配项之间打印空行"
6938 #: builtin/grep.c:704
6939 msgid "show filename only once above matches from same file"
6940 msgstr "只在同一文件的匹配项的上面显示一次文件名"
6942 #: builtin/grep.c:707
6943 msgid "show <n> context lines before and after matches"
6944 msgstr "显示匹配项前后的 <n> 行上下文"
6946 #: builtin/grep.c:710
6947 msgid "show <n> context lines before matches"
6948 msgstr "显示匹配项前 <n> 行上下文"
6950 #: builtin/grep.c:712
6951 msgid "show <n> context lines after matches"
6952 msgstr "显示匹配项后 <n> 行上下文"
6954 #: builtin/grep.c:714
6955 msgid "use <n> worker threads"
6956 msgstr "使用 <n> 个工作线程"
6958 #: builtin/grep.c:715
6959 msgid "shortcut for -C NUM"
6962 #: builtin/grep.c:718
6963 msgid "show a line with the function name before matches"
6964 msgstr "在匹配的前面显示一行函数名"
6966 #: builtin/grep.c:720
6967 msgid "show the surrounding function"
6968 msgstr "显示所在函数的前后内容"
6970 #: builtin/grep.c:723
6971 msgid "read patterns from file"
6974 #: builtin/grep.c:725
6975 msgid "match <pattern>"
6978 #: builtin/grep.c:727
6979 msgid "combine patterns specified with -e"
6980 msgstr "组合用 -e 参数设定的模式"
6982 #: builtin/grep.c:739
6983 msgid "indicate hit with exit status without output"
6984 msgstr "不输出,而用退出码标识命中状态"
6986 #: builtin/grep.c:741
6987 msgid "show only matches from files that match all patterns"
6988 msgstr "只显示匹配所有模式的文件中的匹配"
6990 #: builtin/grep.c:743
6991 msgid "show parse tree for grep expression"
6992 msgstr "显示 grep 表达式的解析树"
6994 #: builtin/grep.c:747
6998 #: builtin/grep.c:747
6999 msgid "show matching files in the pager"
7002 #: builtin/grep.c:750
7003 msgid "allow calling of grep(1) (ignored by this build)"
7004 msgstr "允许调用 grep(1)(本次构建忽略)"
7006 #: builtin/grep.c:813
7007 msgid "no pattern given."
7010 #: builtin/grep.c:845 builtin/index-pack.c:1477
7012 msgid "invalid number of threads specified (%d)"
7013 msgstr "指定的线程数无效(%d)"
7015 #: builtin/grep.c:875
7016 msgid "--open-files-in-pager only works on the worktree"
7017 msgstr "--open-files-in-pager 仅用于工作区"
7019 #: builtin/grep.c:901
7020 msgid "--cached or --untracked cannot be used with --no-index."
7021 msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
7023 #: builtin/grep.c:906
7024 msgid "--no-index or --untracked cannot be used with revs."
7025 msgstr "--no-index 或 --untracked 不能和版本同时使用。"
7027 #: builtin/grep.c:909
7028 msgid "--[no-]exclude-standard cannot be used for tracked contents."
7029 msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
7031 #: builtin/grep.c:917
7032 msgid "both --cached and trees are given."
7033 msgstr "同时给出了 --cached 和树对象。"
7035 #: builtin/hash-object.c:81
7037 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
7040 "git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
7043 #: builtin/hash-object.c:82
7044 msgid "git hash-object --stdin-paths"
7045 msgstr "git hash-object --stdin-paths"
7047 #: builtin/hash-object.c:93
7051 #: builtin/hash-object.c:93
7055 #: builtin/hash-object.c:94
7056 msgid "write the object into the object database"
7059 #: builtin/hash-object.c:96
7060 msgid "read the object from stdin"
7063 #: builtin/hash-object.c:98
7064 msgid "store file as is without filters"
7065 msgstr "原样存储文件不使用过滤器"
7067 #: builtin/hash-object.c:99
7069 "just hash any random garbage to create corrupt objects for debugging Git"
7070 msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
7072 #: builtin/hash-object.c:100
7073 msgid "process file as it were from this path"
7074 msgstr "处理文件并假设其来自于此路径"
7076 #: builtin/help.c:41
7077 msgid "print all available commands"
7080 #: builtin/help.c:42
7081 msgid "print list of useful guides"
7084 #: builtin/help.c:43
7085 msgid "show man page"
7088 #: builtin/help.c:44
7089 msgid "show manual in web browser"
7090 msgstr "在 web 浏览器中显示手册"
7092 #: builtin/help.c:46
7093 msgid "show info page"
7096 #: builtin/help.c:52
7097 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
7098 msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
7100 #: builtin/help.c:64
7102 msgid "unrecognized help format '%s'"
7103 msgstr "未能识别的帮助格式 '%s'"
7105 #: builtin/help.c:91
7106 msgid "Failed to start emacsclient."
7107 msgstr "无法启动 emacsclient。"
7109 #: builtin/help.c:104
7110 msgid "Failed to parse emacsclient version."
7111 msgstr "无法解析 emacsclient 版本。"
7113 #: builtin/help.c:112
7115 msgid "emacsclient version '%d' too old (< 22)."
7116 msgstr "emacsclient 版本 '%d' 太老(< 22)。"
7118 #: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
7120 msgid "failed to exec '%s'"
7123 #: builtin/help.c:205
7126 "'%s': path for unsupported man viewer.\n"
7127 "Please consider using 'man.<tool>.cmd' instead."
7129 "'%s':不支持的 man 手册查看器的路径。\n"
7130 "请使用 'man.<工具>.cmd'。"
7132 #: builtin/help.c:217
7135 "'%s': cmd for supported man viewer.\n"
7136 "Please consider using 'man.<tool>.path' instead."
7138 "'%s': 支持的 man 手册查看器命令。\n"
7139 "请使用 'man.<工具>.path'。"
7141 #: builtin/help.c:334
7143 msgid "'%s': unknown man viewer."
7144 msgstr "'%s':未知的 man 查看器。"
7146 #: builtin/help.c:351
7147 msgid "no man viewer handled the request"
7148 msgstr "没有 man 查看器处理此请求"
7150 #: builtin/help.c:359
7151 msgid "no info viewer handled the request"
7152 msgstr "没有 info 查看器处理此请求"
7154 #: builtin/help.c:408
7155 msgid "Defining attributes per path"
7158 #: builtin/help.c:409
7159 msgid "Everyday Git With 20 Commands Or So"
7160 msgstr "每一天 Git 常用的约 20 条命令"
7162 #: builtin/help.c:410
7163 msgid "A Git glossary"
7166 #: builtin/help.c:411
7167 msgid "Specifies intentionally untracked files to ignore"
7170 #: builtin/help.c:412
7171 msgid "Defining submodule properties"
7174 #: builtin/help.c:413
7175 msgid "Specifying revisions and ranges for Git"
7176 msgstr "指定 Git 的版本和版本范围"
7178 #: builtin/help.c:414
7179 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
7180 msgstr "一个 Git 教程(针对 1.5.1 或更新版本)"
7182 #: builtin/help.c:415
7183 msgid "An overview of recommended workflows with Git"
7184 msgstr "Git 推荐的工作流概览"
7186 #: builtin/help.c:427
7187 msgid "The common Git guides are:\n"
7188 msgstr "最常用的 Git 向导有:\n"
7190 #: builtin/help.c:448 builtin/help.c:465
7195 #: builtin/help.c:481
7197 msgid "`git %s' is aliased to `%s'"
7198 msgstr "`git %s' 是 `%s' 的别名"
7200 #: builtin/index-pack.c:152
7202 msgid "unable to open %s"
7205 #: builtin/index-pack.c:202
7207 msgid "object type mismatch at %s"
7208 msgstr "%s 的对象类型不匹配"
7210 #: builtin/index-pack.c:222
7212 msgid "did not receive expected object %s"
7213 msgstr "未能获取期望的对象 %s"
7215 #: builtin/index-pack.c:225
7217 msgid "object %s: expected type %s, found %s"
7218 msgstr "对象 %s:期待类型 %s,却是 %s"
7220 #: builtin/index-pack.c:267
7222 msgid "cannot fill %d byte"
7223 msgid_plural "cannot fill %d bytes"
7224 msgstr[0] "无法填充 %d 字节"
7225 msgstr[1] "无法填充 %d 字节"
7227 #: builtin/index-pack.c:277
7229 msgstr "过早的文件结束符(EOF)"
7231 #: builtin/index-pack.c:278
7232 msgid "read error on input"
7235 #: builtin/index-pack.c:290
7236 msgid "used more bytes than were available"
7239 #: builtin/index-pack.c:297
7240 msgid "pack too large for current definition of off_t"
7241 msgstr "包太大超过了当前 off_t 的定义"
7243 #: builtin/index-pack.c:313
7245 msgid "unable to create '%s'"
7248 #: builtin/index-pack.c:318
7250 msgid "cannot open packfile '%s'"
7251 msgstr "无法打开包文件 '%s'"
7253 #: builtin/index-pack.c:332
7254 msgid "pack signature mismatch"
7257 #: builtin/index-pack.c:334
7259 msgid "pack version %<PRIu32> unsupported"
7260 msgstr "不支持包版本 %<PRIu32>"
7262 #: builtin/index-pack.c:352
7264 msgid "pack has bad object at offset %lu: %s"
7265 msgstr "包中有错误的对象位于 %lu:%s"
7267 #: builtin/index-pack.c:473
7269 msgid "inflate returned %d"
7272 #: builtin/index-pack.c:522
7273 msgid "offset value overflow for delta base object"
7274 msgstr "偏移值覆盖了 delta 基准对象"
7276 #: builtin/index-pack.c:530
7277 msgid "delta base offset is out of bound"
7278 msgstr "delta 基准偏移越界"
7280 #: builtin/index-pack.c:538
7282 msgid "unknown object type %d"
7285 #: builtin/index-pack.c:569
7286 msgid "cannot pread pack file"
7289 #: builtin/index-pack.c:571
7291 msgid "premature end of pack file, %lu byte missing"
7292 msgid_plural "premature end of pack file, %lu bytes missing"
7293 msgstr[0] "包文件过早结束,缺少 %lu 字节"
7294 msgstr[1] "包文件过早结束,缺少 %lu 字节"
7296 #: builtin/index-pack.c:597
7297 msgid "serious inflate inconsistency"
7300 #: builtin/index-pack.c:743 builtin/index-pack.c:749 builtin/index-pack.c:772
7301 #: builtin/index-pack.c:806 builtin/index-pack.c:815
7303 msgid "SHA1 COLLISION FOUND WITH %s !"
7304 msgstr "发现 %s 出现 SHA1 冲突!"
7306 #: builtin/index-pack.c:746 builtin/pack-objects.c:162
7307 #: builtin/pack-objects.c:254
7309 msgid "unable to read %s"
7312 #: builtin/index-pack.c:812
7314 msgid "cannot read existing object %s"
7315 msgstr "不能读取现存对象 %s"
7317 #: builtin/index-pack.c:826
7319 msgid "invalid blob object %s"
7322 #: builtin/index-pack.c:840
7327 #: builtin/index-pack.c:843
7328 msgid "Error in object"
7331 #: builtin/index-pack.c:845
7333 msgid "Not all child objects of %s are reachable"
7334 msgstr "%s 的所有子对象并非都可达"
7336 #: builtin/index-pack.c:917 builtin/index-pack.c:948
7337 msgid "failed to apply delta"
7340 #: builtin/index-pack.c:1118
7341 msgid "Receiving objects"
7344 #: builtin/index-pack.c:1118
7345 msgid "Indexing objects"
7348 #: builtin/index-pack.c:1150
7349 msgid "pack is corrupted (SHA1 mismatch)"
7350 msgstr "包冲突(SHA1 不匹配)"
7352 #: builtin/index-pack.c:1155
7353 msgid "cannot fstat packfile"
7356 #: builtin/index-pack.c:1158
7357 msgid "pack has junk at the end"
7360 #: builtin/index-pack.c:1169
7361 msgid "confusion beyond insanity in parse_pack_objects()"
7362 msgstr "parse_pack_objects() 中遇到不可理喻的问题"
7364 #: builtin/index-pack.c:1194
7365 msgid "Resolving deltas"
7368 #: builtin/index-pack.c:1205
7370 msgid "unable to create thread: %s"
7373 #: builtin/index-pack.c:1247
7374 msgid "confusion beyond insanity"
7377 #: builtin/index-pack.c:1253
7379 msgid "completed with %d local object"
7380 msgid_plural "completed with %d local objects"
7381 msgstr[0] "完成 %d 个本地对象"
7382 msgstr[1] "完成 %d 个本地对象"
7384 #: builtin/index-pack.c:1265
7386 msgid "Unexpected tail checksum for %s (disk corruption?)"
7387 msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
7389 #: builtin/index-pack.c:1269
7391 msgid "pack has %d unresolved delta"
7392 msgid_plural "pack has %d unresolved deltas"
7393 msgstr[0] "包有 %d 个未解决的 delta"
7394 msgstr[1] "包有 %d 个未解决的 delta"
7396 #: builtin/index-pack.c:1293
7398 msgid "unable to deflate appended object (%d)"
7399 msgstr "不能压缩附加对象(%d)"
7401 #: builtin/index-pack.c:1369
7403 msgid "local object %s is corrupt"
7404 msgstr "本地对象 %s 已损坏"
7406 #: builtin/index-pack.c:1393
7407 msgid "error while closing pack file"
7410 #: builtin/index-pack.c:1406
7412 msgid "cannot write keep file '%s'"
7413 msgstr "无法写保留文件 '%s'"
7415 #: builtin/index-pack.c:1414
7417 msgid "cannot close written keep file '%s'"
7418 msgstr "无法关闭保留文件 '%s'"
7420 #: builtin/index-pack.c:1427
7421 msgid "cannot store pack file"
7424 #: builtin/index-pack.c:1438
7425 msgid "cannot store index file"
7428 #: builtin/index-pack.c:1471
7430 msgid "bad pack.indexversion=%<PRIu32>"
7431 msgstr "坏的 pack.indexversion=%<PRIu32>"
7433 #: builtin/index-pack.c:1481 builtin/index-pack.c:1678
7435 msgid "no threads support, ignoring %s"
7436 msgstr "没有线程支持,忽略 %s"
7438 #: builtin/index-pack.c:1540
7440 msgid "Cannot open existing pack file '%s'"
7441 msgstr "无法打开现存包文件 '%s'"
7443 #: builtin/index-pack.c:1542
7445 msgid "Cannot open existing pack idx file for '%s'"
7446 msgstr "无法为 %s 打开包索引文件"
7448 #: builtin/index-pack.c:1589
7450 msgid "non delta: %d object"
7451 msgid_plural "non delta: %d objects"
7452 msgstr[0] "非 delta:%d 个对象"
7453 msgstr[1] "非 delta:%d 个对象"
7455 #: builtin/index-pack.c:1596
7457 msgid "chain length = %d: %lu object"
7458 msgid_plural "chain length = %d: %lu objects"
7459 msgstr[0] "链长 = %d: %lu 对象"
7460 msgstr[1] "链长 = %d: %lu 对象"
7462 #: builtin/index-pack.c:1609
7464 msgid "packfile name '%s' does not end with '.pack'"
7465 msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
7467 #: builtin/index-pack.c:1638
7468 msgid "Cannot come back to cwd"
7471 #: builtin/index-pack.c:1690 builtin/index-pack.c:1693
7472 #: builtin/index-pack.c:1705 builtin/index-pack.c:1709
7477 #: builtin/index-pack.c:1723
7478 msgid "--fix-thin cannot be used without --stdin"
7479 msgstr "--fix-thin 不能和 --stdin 同时使用"
7481 #: builtin/index-pack.c:1731
7482 msgid "--verify with no packfile name given"
7483 msgstr "--verify 没有提供包文件名参数"
7485 #: builtin/init-db.c:55
7487 msgid "cannot stat '%s'"
7488 msgstr "不能枚举 '%s' 状态"
7490 #: builtin/init-db.c:61
7492 msgid "cannot stat template '%s'"
7493 msgstr "不能枚举模版 '%s' 状态"
7495 #: builtin/init-db.c:66
7497 msgid "cannot opendir '%s'"
7498 msgstr "不能打开目录 '%s'"
7500 #: builtin/init-db.c:77
7502 msgid "cannot readlink '%s'"
7503 msgstr "不能读取链接 '%s'"
7505 #: builtin/init-db.c:79
7507 msgid "cannot symlink '%s' '%s'"
7508 msgstr "不能自 '%s' 到 '%s' 创建符号链接"
7510 #: builtin/init-db.c:85
7512 msgid "cannot copy '%s' to '%s'"
7513 msgstr "不能拷贝 '%s' 至 '%s'"
7515 #: builtin/init-db.c:89
7517 msgid "ignoring template %s"
7520 #: builtin/init-db.c:120
7522 msgid "templates not found %s"
7525 #: builtin/init-db.c:135
7527 msgid "not copying templates from '%s': %s"
7528 msgstr "没有从 '%s' 复制模版:%s"
7530 #: builtin/init-db.c:312 builtin/init-db.c:315
7532 msgid "%s already exists"
7535 #: builtin/init-db.c:344
7537 msgid "unable to handle file type %d"
7538 msgstr "不能处理 %d 类型的文件"
7540 #: builtin/init-db.c:347
7542 msgid "unable to move %s to %s"
7543 msgstr "不能移动 %s 至 %s"
7545 #. TRANSLATORS: The first '%s' is either "Reinitialized
7546 #. existing" or "Initialized empty", the second " shared" or
7547 #. "", and the last '%s%s' is the verbatim directory name.
7548 #: builtin/init-db.c:403
7550 msgid "%s%s Git repository in %s%s\n"
7551 msgstr "%s%s Git 仓库于 %s%s\n"
7553 #: builtin/init-db.c:404
7554 msgid "Reinitialized existing"
7557 #: builtin/init-db.c:404
7558 msgid "Initialized empty"
7561 # 译者:中文字符串拼接,可删除前导空格
7562 #: builtin/init-db.c:405
7566 #: builtin/init-db.c:452
7568 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
7569 "shared[=<permissions>]] [<directory>]"
7571 "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
7574 #: builtin/init-db.c:475
7578 #: builtin/init-db.c:476
7579 msgid "specify that the git repository is to be shared amongst several users"
7580 msgstr "指定 git 仓库是多个用户之间共享的"
7582 #: builtin/init-db.c:510 builtin/init-db.c:515
7584 msgid "cannot mkdir %s"
7587 #: builtin/init-db.c:519
7589 msgid "cannot chdir to %s"
7592 #: builtin/init-db.c:540
7595 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
7597 msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)"
7599 #: builtin/init-db.c:568
7601 msgid "Cannot access work tree '%s'"
7602 msgstr "不能访问工作区 '%s'"
7604 #: builtin/interpret-trailers.c:15
7606 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
7607 "<token>[(=|:)<value>])...] [<file>...]"
7609 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值"
7612 #: builtin/interpret-trailers.c:26
7613 msgid "edit files in place"
7616 #: builtin/interpret-trailers.c:27
7617 msgid "trim empty trailers"
7620 #: builtin/interpret-trailers.c:28
7624 #: builtin/interpret-trailers.c:29
7625 msgid "trailer(s) to add"
7628 #: builtin/interpret-trailers.c:42
7629 msgid "no input file given for in-place editing"
7630 msgstr "没有给出要原位编辑的文件"
7633 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
7634 msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
7637 msgid "git show [<options>] <object>..."
7638 msgstr "git show [<选项>] <对象>..."
7642 msgid "invalid --decorate option: %s"
7643 msgstr "无效的 --decorate 选项:%s"
7645 #: builtin/log.c:137
7646 msgid "suppress diff output"
7649 #: builtin/log.c:138
7653 #: builtin/log.c:139
7654 msgid "Use mail map file"
7657 #: builtin/log.c:140
7658 msgid "decorate options"
7661 #: builtin/log.c:143
7662 msgid "Process line range n,m in file, counting from 1"
7663 msgstr "处理文件中第 n 到 m 之间的行,从 1 开始"
7665 #: builtin/log.c:239
7667 msgid "Final output: %d %s\n"
7668 msgstr "最终输出:%d %s\n"
7670 #: builtin/log.c:471
7672 msgid "git show %s: bad file"
7673 msgstr "git show %s: 损坏的文件"
7675 #: builtin/log.c:485 builtin/log.c:578
7677 msgid "Could not read object %s"
7680 #: builtin/log.c:602
7682 msgid "Unknown type: %d"
7685 #: builtin/log.c:722
7686 msgid "format.headers without value"
7687 msgstr "format.headers 没有值"
7689 #: builtin/log.c:812
7690 msgid "name of output directory is too long"
7693 #: builtin/log.c:827
7695 msgid "Cannot open patch file %s"
7696 msgstr "无法打开补丁文件 %s"
7698 #: builtin/log.c:841
7699 msgid "Need exactly one range."
7702 #: builtin/log.c:851
7703 msgid "Not a range."
7706 #: builtin/log.c:957
7707 msgid "Cover letter needs email format"
7710 #: builtin/log.c:1036
7712 msgid "insane in-reply-to: %s"
7713 msgstr "不正常的 in-reply-to:%s"
7715 #: builtin/log.c:1064
7716 msgid "git format-patch [<options>] [<since> | <revision-range>]"
7717 msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
7719 #: builtin/log.c:1109
7720 msgid "Two output directories?"
7723 #: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871
7725 msgid "Unknown commit %s"
7728 #: builtin/log.c:1226 builtin/notes.c:253 builtin/notes.c:304
7729 #: builtin/notes.c:306 builtin/notes.c:369 builtin/notes.c:424
7730 #: builtin/notes.c:510 builtin/notes.c:515 builtin/notes.c:593
7731 #: builtin/notes.c:656 builtin/notes.c:881 builtin/tag.c:455
7733 msgid "Failed to resolve '%s' as a valid ref."
7734 msgstr "无法解析 '%s' 为一个有效引用。"
7736 #: builtin/log.c:1231
7737 msgid "Could not find exact merge base."
7738 msgstr "不能找到准确的合并基线。"
7740 #: builtin/log.c:1235
7742 "Failed to get upstream, if you want to record base commit automatically,\n"
7743 "please use git branch --set-upstream-to to track a remote branch.\n"
7744 "Or you could specify base commit by --base=<base-commit-id> manually."
7746 "无法得到上游地址,如果你想自动记录基线提交,请使用命令\n"
7747 "git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n"
7748 "参数 --base=<base-commit-id> 手动指定一个基线提交。"
7750 #: builtin/log.c:1255
7751 msgid "Failed to find exact merge base"
7752 msgstr "无法找到准确的合并基线"
7754 #: builtin/log.c:1266
7755 msgid "base commit should be the ancestor of revision list"
7756 msgstr "基线提交应该是版本列表的祖先"
7758 #: builtin/log.c:1270
7759 msgid "base commit shouldn't be in revision list"
7760 msgstr "基线提交不应该出现在版本列表中"
7762 #: builtin/log.c:1319
7763 msgid "cannot get patch id"
7766 #: builtin/log.c:1377
7767 msgid "use [PATCH n/m] even with a single patch"
7768 msgstr "使用 [PATCH n/m],即使只有一个补丁"
7770 #: builtin/log.c:1380
7771 msgid "use [PATCH] even with multiple patches"
7772 msgstr "使用 [PATCH],即使有多个补丁"
7774 #: builtin/log.c:1384
7775 msgid "print patches to standard out"
7778 #: builtin/log.c:1386
7779 msgid "generate a cover letter"
7782 #: builtin/log.c:1388
7783 msgid "use simple number sequence for output file names"
7784 msgstr "使用简单的数字序列作为输出文件名"
7786 #: builtin/log.c:1389
7790 #: builtin/log.c:1390
7791 msgid "use <sfx> instead of '.patch'"
7792 msgstr "使用 <后缀> 代替 '.patch'"
7794 #: builtin/log.c:1392
7795 msgid "start numbering patches at <n> instead of 1"
7796 msgstr "补丁以 <n> 开始编号,而不是1"
7798 #: builtin/log.c:1394
7799 msgid "mark the series as Nth re-roll"
7800 msgstr "标记补丁系列是第几次重制"
7802 #: builtin/log.c:1396
7803 msgid "Use [<prefix>] instead of [PATCH]"
7804 msgstr "使用 [<前缀>] 代替 [PATCH]"
7806 #: builtin/log.c:1399
7807 msgid "store resulting files in <dir>"
7808 msgstr "把结果文件存储在 <目录>"
7810 #: builtin/log.c:1402
7811 msgid "don't strip/add [PATCH]"
7812 msgstr "不删除/添加 [PATCH]"
7814 #: builtin/log.c:1405
7815 msgid "don't output binary diffs"
7818 #: builtin/log.c:1407
7819 msgid "output all-zero hash in From header"
7820 msgstr "在 From 头信息中输出全为零的哈希值"
7822 #: builtin/log.c:1409
7823 msgid "don't include a patch matching a commit upstream"
7824 msgstr "不包含已在上游提交中的补丁"
7826 #: builtin/log.c:1411
7827 msgid "show patch format instead of default (patch + stat)"
7828 msgstr "显示纯补丁格式而非默认的(补丁+状态)"
7830 #: builtin/log.c:1413
7834 #: builtin/log.c:1414
7838 #: builtin/log.c:1415
7839 msgid "add email header"
7842 #: builtin/log.c:1416 builtin/log.c:1418
7846 #: builtin/log.c:1416
7847 msgid "add To: header"
7850 #: builtin/log.c:1418
7851 msgid "add Cc: header"
7854 #: builtin/log.c:1420
7858 #: builtin/log.c:1421
7859 msgid "set From address to <ident> (or committer ident if absent)"
7860 msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)"
7862 #: builtin/log.c:1423
7866 #: builtin/log.c:1424
7867 msgid "make first mail a reply to <message-id>"
7868 msgstr "使第一封邮件作为对 <邮件标识> 的回复"
7870 #: builtin/log.c:1425 builtin/log.c:1428
7874 #: builtin/log.c:1426
7875 msgid "attach the patch"
7878 #: builtin/log.c:1429
7879 msgid "inline the patch"
7882 #: builtin/log.c:1433
7883 msgid "enable message threading, styles: shallow, deep"
7884 msgstr "启用邮件线索,风格:浅,深"
7886 #: builtin/log.c:1435
7890 #: builtin/log.c:1436
7891 msgid "add a signature"
7894 #: builtin/log.c:1437
7898 #: builtin/log.c:1438
7899 msgid "add prerequisite tree info to the patch series"
7900 msgstr "为补丁列表添加前置树信息"
7902 #: builtin/log.c:1440
7903 msgid "add a signature from a file"
7906 #: builtin/log.c:1441
7907 msgid "don't print the patch filenames"
7910 #: builtin/log.c:1531
7911 msgid "-n and -k are mutually exclusive."
7912 msgstr "-n 和 -k 互斥。"
7914 #: builtin/log.c:1533
7915 msgid "--subject-prefix and -k are mutually exclusive."
7916 msgstr "--subject-prefix 和 -k 互斥。"
7918 #: builtin/log.c:1541
7919 msgid "--name-only does not make sense"
7920 msgstr "--name-only 无意义"
7922 #: builtin/log.c:1543
7923 msgid "--name-status does not make sense"
7924 msgstr "--name-status 无意义"
7926 #: builtin/log.c:1545
7927 msgid "--check does not make sense"
7928 msgstr "--check 无意义"
7930 #: builtin/log.c:1573
7931 msgid "standard output, or directory, which one?"
7932 msgstr "标准输出或目录,哪一个?"
7934 #: builtin/log.c:1575
7936 msgid "Could not create directory '%s'"
7937 msgstr "不能创建目录 '%s'"
7939 #: builtin/log.c:1672
7941 msgid "unable to read signature file '%s'"
7942 msgstr "无法读取签名文件 '%s'"
7944 #: builtin/log.c:1743
7945 msgid "Failed to create output files"
7948 #: builtin/log.c:1792
7949 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
7950 msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
7952 #: builtin/log.c:1846
7955 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
7956 msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n"
7958 #: builtin/ls-files.c:378
7959 msgid "git ls-files [<options>] [<file>...]"
7960 msgstr "git ls-files [<选项>] [<文件>...]"
7962 #: builtin/ls-files.c:427
7963 msgid "identify the file status with tags"
7966 #: builtin/ls-files.c:429
7967 msgid "use lowercase letters for 'assume unchanged' files"
7968 msgstr "使用小写字母表示 '假设未改变的' 文件"
7970 #: builtin/ls-files.c:431
7971 msgid "show cached files in the output (default)"
7972 msgstr "显示缓存的文件(默认)"
7974 #: builtin/ls-files.c:433
7975 msgid "show deleted files in the output"
7978 #: builtin/ls-files.c:435
7979 msgid "show modified files in the output"
7982 #: builtin/ls-files.c:437
7983 msgid "show other files in the output"
7986 #: builtin/ls-files.c:439
7987 msgid "show ignored files in the output"
7990 #: builtin/ls-files.c:442
7991 msgid "show staged contents' object name in the output"
7992 msgstr "显示暂存区内容的对象名称"
7994 #: builtin/ls-files.c:444
7995 msgid "show files on the filesystem that need to be removed"
7996 msgstr "显示文件系统需要删除的文件"
7998 #: builtin/ls-files.c:446
7999 msgid "show 'other' directories' names only"
8000 msgstr "只显示“其他”目录的名称"
8002 #: builtin/ls-files.c:448
8003 msgid "show line endings of files"
8006 #: builtin/ls-files.c:450
8007 msgid "don't show empty directories"
8010 #: builtin/ls-files.c:453
8011 msgid "show unmerged files in the output"
8014 #: builtin/ls-files.c:455
8015 msgid "show resolve-undo information"
8016 msgstr "显示 resolve-undo 信息"
8018 #: builtin/ls-files.c:457
8019 msgid "skip files matching pattern"
8022 #: builtin/ls-files.c:460
8023 msgid "exclude patterns are read from <file>"
8024 msgstr "从 <文件> 中读取排除模式"
8026 #: builtin/ls-files.c:463
8027 msgid "read additional per-directory exclude patterns in <file>"
8028 msgstr "从 <文件> 读取额外的每个目录的排除模式"
8030 #: builtin/ls-files.c:465
8031 msgid "add the standard git exclusions"
8032 msgstr "添加标准的 git 排除"
8034 #: builtin/ls-files.c:468
8035 msgid "make the output relative to the project top directory"
8036 msgstr "显示相对于顶级目录的文件名"
8038 #: builtin/ls-files.c:471
8039 msgid "if any <file> is not in the index, treat this as an error"
8040 msgstr "如果任何 <文件> 都不在索引区,视为错误"
8042 #: builtin/ls-files.c:472
8046 #: builtin/ls-files.c:473
8047 msgid "pretend that paths removed since <tree-ish> are still present"
8048 msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
8050 #: builtin/ls-files.c:475
8051 msgid "show debugging data"
8054 #: builtin/ls-remote.c:7
8056 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
8057 " [-q | --quiet] [--exit-code] [--get-url]\n"
8058 " [--symref] [<repository> [<refs>...]]"
8060 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
8061 " [-q | --quiet] [--exit-code] [--get-url]\n"
8062 " [--symref] [<仓库> [<引用>...]]"
8064 #: builtin/ls-remote.c:50
8065 msgid "do not print remote URL"
8068 #: builtin/ls-remote.c:51 builtin/ls-remote.c:53
8072 #: builtin/ls-remote.c:52 builtin/ls-remote.c:54
8073 msgid "path of git-upload-pack on the remote host"
8074 msgstr "远程主机上的 git-upload-pack 路径"
8076 #: builtin/ls-remote.c:56
8077 msgid "limit to tags"
8080 #: builtin/ls-remote.c:57
8081 msgid "limit to heads"
8084 #: builtin/ls-remote.c:58
8085 msgid "do not show peeled tags"
8088 #: builtin/ls-remote.c:60
8089 msgid "take url.<base>.insteadOf into account"
8090 msgstr "参考 url.<base>.insteadOf 设置"
8092 #: builtin/ls-remote.c:62
8093 msgid "exit with exit code 2 if no matching refs are found"
8094 msgstr "若未找到匹配的引用则以退出码2退出"
8096 #: builtin/ls-remote.c:64
8097 msgid "show underlying ref in addition to the object pointed by it"
8098 msgstr "除了显示指向的对象外,显示指向的引用名"
8100 #: builtin/ls-tree.c:28
8101 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
8102 msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
8104 #: builtin/ls-tree.c:128
8105 msgid "only show trees"
8108 #: builtin/ls-tree.c:130
8109 msgid "recurse into subtrees"
8112 #: builtin/ls-tree.c:132
8113 msgid "show trees when recursing"
8116 #: builtin/ls-tree.c:135
8117 msgid "terminate entries with NUL byte"
8118 msgstr "条目以 NUL 字符终止"
8120 #: builtin/ls-tree.c:136
8121 msgid "include object size"
8124 #: builtin/ls-tree.c:138 builtin/ls-tree.c:140
8125 msgid "list only filenames"
8128 #: builtin/ls-tree.c:143
8129 msgid "use full path names"
8132 #: builtin/ls-tree.c:145
8133 msgid "list entire tree; not just current directory (implies --full-name)"
8134 msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
8136 #: builtin/merge.c:45
8137 msgid "git merge [<options>] [<commit>...]"
8138 msgstr "git merge [<选项>] [<提交>...]"
8140 #: builtin/merge.c:46
8141 msgid "git merge [<options>] <msg> HEAD <commit>"
8142 msgstr "git merge [<选项>] <说明> HEAD <提交>"
8144 #: builtin/merge.c:47
8145 msgid "git merge --abort"
8146 msgstr "git merge --abort"
8148 #: builtin/merge.c:101
8149 msgid "switch `m' requires a value"
8150 msgstr "开关 `m' 需要一个值"
8152 #: builtin/merge.c:138
8154 msgid "Could not find merge strategy '%s'.\n"
8155 msgstr "不能找到合并策略 '%s'。\n"
8157 #: builtin/merge.c:139
8159 msgid "Available strategies are:"
8162 #: builtin/merge.c:144
8164 msgid "Available custom strategies are:"
8167 #: builtin/merge.c:194 builtin/pull.c:126
8168 msgid "do not show a diffstat at the end of the merge"
8169 msgstr "在合并的最后不显示差异统计"
8171 #: builtin/merge.c:197 builtin/pull.c:129
8172 msgid "show a diffstat at the end of the merge"
8173 msgstr "在合并的最后显示差异统计"
8175 #: builtin/merge.c:198 builtin/pull.c:132
8176 msgid "(synonym to --stat)"
8177 msgstr "(和 --stat 同义)"
8179 #: builtin/merge.c:200 builtin/pull.c:135
8180 msgid "add (at most <n>) entries from shortlog to merge commit message"
8181 msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
8183 #: builtin/merge.c:203 builtin/pull.c:138
8184 msgid "create a single commit instead of doing a merge"
8185 msgstr "创建一个单独的提交而不是做一次合并"
8187 #: builtin/merge.c:205 builtin/pull.c:141
8188 msgid "perform a commit if the merge succeeds (default)"
8189 msgstr "如果合并成功,执行一次提交(默认)"
8191 #: builtin/merge.c:207 builtin/pull.c:144
8192 msgid "edit message before committing"
8195 #: builtin/merge.c:208
8196 msgid "allow fast-forward (default)"
8199 #: builtin/merge.c:210 builtin/pull.c:150
8200 msgid "abort if fast-forward is not possible"
8201 msgstr "如果不能快进就放弃合并"
8203 #: builtin/merge.c:214
8204 msgid "Verify that the named commit has a valid GPG signature"
8205 msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
8207 #: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157
8208 #: builtin/revert.c:89
8212 #: builtin/merge.c:216 builtin/pull.c:158
8213 msgid "merge strategy to use"
8216 #: builtin/merge.c:217 builtin/pull.c:161
8217 msgid "option=value"
8218 msgstr "option=value"
8220 #: builtin/merge.c:218 builtin/pull.c:162
8221 msgid "option for selected merge strategy"
8224 #: builtin/merge.c:220
8225 msgid "merge commit message (for a non-fast-forward merge)"
8226 msgstr "合并的提交说明(针对非快进式合并)"
8228 #: builtin/merge.c:224
8229 msgid "abort the current in-progress merge"
8230 msgstr "放弃当前正在进行的合并"
8232 #: builtin/merge.c:226 builtin/pull.c:169
8233 msgid "allow merging unrelated histories"
8236 #: builtin/merge.c:254
8237 msgid "could not run stash."
8240 #: builtin/merge.c:259
8241 msgid "stash failed"
8244 #: builtin/merge.c:264
8246 msgid "not a valid object: %s"
8247 msgstr "不是一个有效对象:%s"
8249 #: builtin/merge.c:283 builtin/merge.c:300
8250 msgid "read-tree failed"
8254 #: builtin/merge.c:330
8255 msgid " (nothing to squash)"
8258 #: builtin/merge.c:343
8260 msgid "Squash commit -- not updating HEAD\n"
8261 msgstr "压缩提交 -- 未更新 HEAD\n"
8263 #: builtin/merge.c:347 builtin/merge.c:767 builtin/merge.c:987
8264 #: builtin/merge.c:1000
8266 msgid "Could not write to '%s'"
8269 #: builtin/merge.c:375
8270 msgid "Writing SQUASH_MSG"
8271 msgstr "写入 SQUASH_MSG"
8273 #: builtin/merge.c:377
8274 msgid "Finishing SQUASH_MSG"
8275 msgstr "完成 SQUASH_MSG"
8277 #: builtin/merge.c:400
8279 msgid "No merge message -- not updating HEAD\n"
8280 msgstr "无合并信息 -- 未更新 HEAD\n"
8282 #: builtin/merge.c:451
8284 msgid "'%s' does not point to a commit"
8285 msgstr "'%s' 没有指向一个提交"
8287 #: builtin/merge.c:541
8289 msgid "Bad branch.%s.mergeoptions string: %s"
8290 msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
8292 #: builtin/merge.c:660
8293 msgid "Not handling anything other than two heads merge."
8294 msgstr "不能处理两个头合并之外的任何操作。"
8296 #: builtin/merge.c:674
8298 msgid "Unknown option for merge-recursive: -X%s"
8299 msgstr "merge-recursive 的未知选项:-X%s"
8301 #: builtin/merge.c:687
8303 msgid "unable to write %s"
8306 #: builtin/merge.c:776
8308 msgid "Could not read from '%s'"
8309 msgstr "不能从 '%s' 读取"
8311 #: builtin/merge.c:785
8313 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
8314 msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
8316 #: builtin/merge.c:791
8319 "Please enter a commit message to explain why this merge is necessary,\n"
8320 "especially if it merges an updated upstream into a topic branch.\n"
8322 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
8325 "请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
8328 "以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
8330 #: builtin/merge.c:815
8331 msgid "Empty commit message."
8334 #: builtin/merge.c:835
8336 msgid "Wonderful.\n"
8339 #: builtin/merge.c:890
8341 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
8342 msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
8344 #: builtin/merge.c:906
8346 msgid "'%s' is not a commit"
8347 msgstr "'%s' 不是一个提交"
8349 #: builtin/merge.c:947
8350 msgid "No current branch."
8353 #: builtin/merge.c:949
8354 msgid "No remote for the current branch."
8355 msgstr "当前分支没有对应的远程仓库。"
8357 #: builtin/merge.c:951
8358 msgid "No default upstream defined for the current branch."
8359 msgstr "当前分支没有定义默认的上游分支。"
8361 #: builtin/merge.c:956
8363 msgid "No remote-tracking branch for %s from %s"
8364 msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
8366 #: builtin/merge.c:1091
8368 msgid "could not close '%s'"
8371 #: builtin/merge.c:1219
8372 msgid "There is no merge to abort (MERGE_HEAD missing)."
8373 msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
8375 #: builtin/merge.c:1235
8377 "You have not concluded your merge (MERGE_HEAD exists).\n"
8378 "Please, commit your changes before you merge."
8380 "您尚未结束您的合并(存在 MERGE_HEAD)。\n"
8383 #: builtin/merge.c:1242
8385 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
8386 "Please, commit your changes before you merge."
8388 "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
8391 #: builtin/merge.c:1245
8392 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
8393 msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
8395 #: builtin/merge.c:1254
8396 msgid "You cannot combine --squash with --no-ff."
8397 msgstr "您不能将 --squash 与 --no-ff 同时使用。"
8399 #: builtin/merge.c:1262
8400 msgid "No commit specified and merge.defaultToUpstream not set."
8401 msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
8403 #: builtin/merge.c:1279
8404 msgid "Squash commit into empty head not supported yet"
8405 msgstr "尚不支持到空分支的压缩提交"
8407 #: builtin/merge.c:1281
8408 msgid "Non-fast-forward commit does not make sense into an empty head"
8409 msgstr "到空分支的非快进式提交没有意义"
8411 #: builtin/merge.c:1286
8413 msgid "%s - not something we can merge"
8416 #: builtin/merge.c:1288
8417 msgid "Can merge only exactly one commit into empty head"
8418 msgstr "只能将一个提交合并到空分支上"
8420 #: builtin/merge.c:1344
8422 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
8423 msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
8425 #: builtin/merge.c:1347
8427 msgid "Commit %s has a bad GPG signature allegedly by %s."
8428 msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
8430 #: builtin/merge.c:1350
8432 msgid "Commit %s does not have a GPG signature."
8433 msgstr "提交 %s 没有一个 GPG 签名。"
8435 #: builtin/merge.c:1353
8437 msgid "Commit %s has a good GPG signature by %s\n"
8438 msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
8440 #: builtin/merge.c:1415
8441 msgid "refusing to merge unrelated histories"
8444 #: builtin/merge.c:1439
8446 msgid "Updating %s..%s\n"
8447 msgstr "更新 %s..%s\n"
8449 #: builtin/merge.c:1476
8451 msgid "Trying really trivial in-index merge...\n"
8452 msgstr "尝试非常小的索引内合并...\n"
8454 #: builtin/merge.c:1483
8459 #: builtin/merge.c:1515
8460 msgid "Not possible to fast-forward, aborting."
8463 #: builtin/merge.c:1538 builtin/merge.c:1617
8465 msgid "Rewinding the tree to pristine...\n"
8466 msgstr "将树回滚至原始状态...\n"
8468 #: builtin/merge.c:1542
8470 msgid "Trying merge strategy %s...\n"
8471 msgstr "尝试合并策略 %s...\n"
8473 #: builtin/merge.c:1608
8475 msgid "No merge strategy handled the merge.\n"
8476 msgstr "没有合并策略处理此合并。\n"
8478 #: builtin/merge.c:1610
8480 msgid "Merge with strategy %s failed.\n"
8481 msgstr "使用策略 %s 合并失败。\n"
8483 #: builtin/merge.c:1619
8485 msgid "Using the %s to prepare resolving by hand.\n"
8486 msgstr "使用 %s 以准备手工解决。\n"
8488 #: builtin/merge.c:1631
8490 msgid "Automatic merge went well; stopped before committing as requested\n"
8491 msgstr "自动合并进展顺利,按要求在提交前停止\n"
8493 #: builtin/merge-base.c:29
8494 msgid "git merge-base [-a | --all] <commit> <commit>..."
8495 msgstr "git merge-base [-a | --all] <提交> <提交>..."
8497 #: builtin/merge-base.c:30
8498 msgid "git merge-base [-a | --all] --octopus <commit>..."
8499 msgstr "git merge-base [-a | --all] --octopus <提交>..."
8501 #: builtin/merge-base.c:31
8502 msgid "git merge-base --independent <commit>..."
8503 msgstr "git merge-base --independent <提交>..."
8505 #: builtin/merge-base.c:32
8506 msgid "git merge-base --is-ancestor <commit> <commit>"
8507 msgstr "git merge-base --is-ancestor <提交> <提交>"
8509 #: builtin/merge-base.c:33
8510 msgid "git merge-base --fork-point <ref> [<commit>]"
8511 msgstr "git merge-base --fork-point <引用> [<提交>]"
8513 #: builtin/merge-base.c:214
8514 msgid "output all common ancestors"
8517 #: builtin/merge-base.c:216
8518 msgid "find ancestors for a single n-way merge"
8519 msgstr "查找一个多路合并的祖先提交"
8521 #: builtin/merge-base.c:218
8522 msgid "list revs not reachable from others"
8523 msgstr "显示不能被其他访问到的版本"
8525 #: builtin/merge-base.c:220
8526 msgid "is the first one ancestor of the other?"
8527 msgstr "第一个是其他的祖先提交么?"
8529 #: builtin/merge-base.c:222
8530 msgid "find where <commit> forked from reflog of <ref>"
8531 msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处"
8533 #: builtin/merge-file.c:8
8535 "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
8536 "<orig-file> <file2>"
8538 "git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文"
8541 #: builtin/merge-file.c:33
8542 msgid "send results to standard output"
8545 #: builtin/merge-file.c:34
8546 msgid "use a diff3 based merge"
8547 msgstr "使用基于 diff3 的合并"
8549 #: builtin/merge-file.c:35
8550 msgid "for conflicts, use our version"
8551 msgstr "如果冲突,使用我们的版本"
8553 #: builtin/merge-file.c:37
8554 msgid "for conflicts, use their version"
8555 msgstr "如果冲突,使用他们的版本"
8557 #: builtin/merge-file.c:39
8558 msgid "for conflicts, use a union version"
8559 msgstr "如果冲突,使用联合版本"
8561 #: builtin/merge-file.c:42
8562 msgid "for conflicts, use this marker size"
8563 msgstr "如果冲突,使用指定长度的标记"
8565 #: builtin/merge-file.c:43
8566 msgid "do not warn about conflicts"
8569 #: builtin/merge-file.c:45
8570 msgid "set labels for file1/orig-file/file2"
8571 msgstr "为 文件1/初始文件/文件2 设置标签"
8573 #: builtin/mktree.c:65
8574 msgid "git mktree [-z] [--missing] [--batch]"
8575 msgstr "git mktree [-z] [--missing] [--batch]"
8577 #: builtin/mktree.c:152
8578 msgid "input is NUL terminated"
8579 msgstr "输入以 NUL 字符终止"
8581 #: builtin/mktree.c:153 builtin/write-tree.c:24
8582 msgid "allow missing objects"
8585 #: builtin/mktree.c:154
8586 msgid "allow creation of more than one tree"
8590 msgid "git mv [<options>] <source>... <destination>"
8591 msgstr "git mv [<选项>] <源>... <目标>"
8595 msgid "Directory %s is in index and no submodule?"
8596 msgstr "目录 %s 在索引中并且不是子模组?"
8598 #: builtin/mv.c:72 builtin/rm.c:317
8599 msgid "Please stage your changes to .gitmodules or stash them to proceed"
8600 msgstr "请将您的修改暂存到 .gitmodules 中或保存进度后再继续"
8604 msgid "%.*s is in index"
8608 msgid "force move/rename even if target exists"
8609 msgstr "强制移动/重命令,即使目标存在"
8612 msgid "skip move/rename errors"
8617 msgid "destination '%s' is not a directory"
8618 msgstr "目标 '%s' 不是一个目录"
8622 msgid "Checking rename of '%s' to '%s'\n"
8623 msgstr "检查 '%s' 到 '%s' 的重命名\n"
8630 msgid "can not move directory into itself"
8634 msgid "cannot move directory over file"
8638 msgid "source directory is empty"
8642 msgid "not under version control"
8646 msgid "destination exists"
8651 msgid "overwriting '%s'"
8655 msgid "Cannot overwrite"
8659 msgid "multiple sources for the same target"
8663 msgid "destination directory does not exist"
8668 msgid "%s, source=%s, destination=%s"
8669 msgstr "%s,源=%s,目标=%s"
8673 msgid "Renaming %s to %s\n"
8674 msgstr "重命名 %s 至 %s\n"
8676 #: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365
8678 msgid "renaming '%s' failed"
8679 msgstr "重命名 '%s' 失败"
8681 #: builtin/name-rev.c:258
8682 msgid "git name-rev [<options>] <commit>..."
8683 msgstr "git name-rev [<选项>] <提交>..."
8685 #: builtin/name-rev.c:259
8686 msgid "git name-rev [<options>] --all"
8687 msgstr "git name-rev [<选项>] --all"
8689 #: builtin/name-rev.c:260
8690 msgid "git name-rev [<options>] --stdin"
8691 msgstr "git name-rev [<选项>] --stdin"
8693 #: builtin/name-rev.c:312
8694 msgid "print only names (no SHA-1)"
8695 msgstr "只打印名称(无 SHA-1)"
8697 #: builtin/name-rev.c:313
8698 msgid "only use tags to name the commits"
8701 #: builtin/name-rev.c:315
8702 msgid "only use refs matching <pattern>"
8703 msgstr "只使用和 <模式> 相匹配的引用"
8705 #: builtin/name-rev.c:317
8706 msgid "list all commits reachable from all refs"
8707 msgstr "列出可以从所有引用访问的提交"
8709 #: builtin/name-rev.c:318
8710 msgid "read from stdin"
8713 #: builtin/name-rev.c:319
8714 msgid "allow to print `undefined` names (default)"
8715 msgstr "允许打印 `未定义` 的名称(默认)"
8717 #: builtin/name-rev.c:325
8718 msgid "dereference tags in the input (internal use)"
8719 msgstr "反向解析输入中的标签(内部使用)"
8721 #: builtin/notes.c:25
8722 msgid "git notes [--ref <notes-ref>] [list [<object>]]"
8723 msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
8725 #: builtin/notes.c:26
8727 "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
8728 "| (-c | -C) <object>] [<object>]"
8730 "git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
8731 "| (-c | -C) <对象>] [<对象>]"
8733 #: builtin/notes.c:27
8734 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
8735 msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
8737 #: builtin/notes.c:28
8739 "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
8740 "(-c | -C) <object>] [<object>]"
8742 "git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
8743 "(-c | -C) <对象>] [<对象>]"
8745 #: builtin/notes.c:29
8746 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
8747 msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
8749 #: builtin/notes.c:30
8750 msgid "git notes [--ref <notes-ref>] show [<object>]"
8751 msgstr "git notes [--ref <注解引用>] show [<对象>]"
8753 #: builtin/notes.c:31
8755 "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
8756 msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
8758 #: builtin/notes.c:32
8759 msgid "git notes merge --commit [-v | -q]"
8760 msgstr "git notes merge --commit [-v | -q]"
8762 #: builtin/notes.c:33
8763 msgid "git notes merge --abort [-v | -q]"
8764 msgstr "git notes merge --abort [-v | -q]"
8766 #: builtin/notes.c:34
8767 msgid "git notes [--ref <notes-ref>] remove [<object>...]"
8768 msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
8770 #: builtin/notes.c:35
8771 msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
8772 msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
8774 #: builtin/notes.c:36
8775 msgid "git notes [--ref <notes-ref>] get-ref"
8776 msgstr "git notes [--ref <注解引用>] get-ref"
8778 #: builtin/notes.c:41
8779 msgid "git notes [list [<object>]]"
8780 msgstr "git notes [list [<对象>]]"
8782 #: builtin/notes.c:46
8783 msgid "git notes add [<options>] [<object>]"
8784 msgstr "git notes add [<选项>] [<对象>]"
8786 #: builtin/notes.c:51
8787 msgid "git notes copy [<options>] <from-object> <to-object>"
8788 msgstr "git notes copy [<选项>] <源对象> <目标对象>"
8790 #: builtin/notes.c:52
8791 msgid "git notes copy --stdin [<from-object> <to-object>]..."
8792 msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
8794 #: builtin/notes.c:57
8795 msgid "git notes append [<options>] [<object>]"
8796 msgstr "git notes append [<选项>] [<对象>]"
8798 #: builtin/notes.c:62
8799 msgid "git notes edit [<object>]"
8800 msgstr "git notes edit [<对象>]"
8802 #: builtin/notes.c:67
8803 msgid "git notes show [<object>]"
8804 msgstr "git notes show [<对象>]"
8806 #: builtin/notes.c:72
8807 msgid "git notes merge [<options>] <notes-ref>"
8808 msgstr "git notes merge [<选项>] <注解引用>"
8810 #: builtin/notes.c:73
8811 msgid "git notes merge --commit [<options>]"
8812 msgstr "git notes merge --commit [<选项>]"
8814 #: builtin/notes.c:74
8815 msgid "git notes merge --abort [<options>]"
8816 msgstr "git notes merge --abort [<选项>]"
8818 #: builtin/notes.c:79
8819 msgid "git notes remove [<object>]"
8820 msgstr "git notes remove [<对象>]"
8822 #: builtin/notes.c:84
8823 msgid "git notes prune [<options>]"
8824 msgstr "git notes prune [<选项>]"
8826 #: builtin/notes.c:89
8827 msgid "git notes get-ref"
8828 msgstr "git notes get-ref"
8830 #: builtin/notes.c:147
8832 msgid "unable to start 'show' for object '%s'"
8833 msgstr "不能为对象 '%s' 开始 'show'"
8835 #: builtin/notes.c:151
8836 msgid "could not read 'show' output"
8837 msgstr "不能读取 'show' 的输出"
8839 #: builtin/notes.c:159
8841 msgid "failed to finish 'show' for object '%s'"
8842 msgstr "无法为对象 '%s' 完成 'show'"
8844 #: builtin/notes.c:174 builtin/tag.c:248
8846 msgid "could not create file '%s'"
8847 msgstr "不能创建文件 '%s'"
8849 #: builtin/notes.c:193
8850 msgid "Please supply the note contents using either -m or -F option"
8851 msgstr "请通过 -m 或 -F 选项为注解提供内容"
8853 #: builtin/notes.c:202
8854 msgid "unable to write note object"
8857 #: builtin/notes.c:204
8859 msgid "The note contents have been left in %s"
8860 msgstr "注解内容被留在 %s 中"
8862 #: builtin/notes.c:232 builtin/tag.c:439
8864 msgid "cannot read '%s'"
8867 #: builtin/notes.c:234 builtin/tag.c:442
8869 msgid "could not open or read '%s'"
8870 msgstr "不能打开或读取 '%s'"
8872 #: builtin/notes.c:256
8874 msgid "Failed to read object '%s'."
8875 msgstr "无法读取对象 '%s'。"
8877 #: builtin/notes.c:260
8879 msgid "Cannot read note data from non-blob object '%s'."
8880 msgstr "不能从非数据对象 '%s' 中读取注解数据"
8882 #: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493
8883 #: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649
8884 #: builtin/notes.c:946
8885 msgid "too many parameters"
8888 #: builtin/notes.c:375 builtin/notes.c:662
8890 msgid "No note found for object %s."
8891 msgstr "未发现对象 %s 的注解。"
8893 #: builtin/notes.c:396 builtin/notes.c:559
8894 msgid "note contents as a string"
8895 msgstr "注解内容作为一个字符串"
8897 #: builtin/notes.c:399 builtin/notes.c:562
8898 msgid "note contents in a file"
8901 #: builtin/notes.c:402 builtin/notes.c:565
8902 msgid "reuse and edit specified note object"
8903 msgstr "重用和编辑指定的注解对象"
8905 #: builtin/notes.c:405 builtin/notes.c:568
8906 msgid "reuse specified note object"
8909 #: builtin/notes.c:408 builtin/notes.c:571
8910 msgid "allow storing empty note"
8913 #: builtin/notes.c:409 builtin/notes.c:480
8914 msgid "replace existing notes"
8917 #: builtin/notes.c:434
8920 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
8922 msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
8924 #: builtin/notes.c:449 builtin/notes.c:528
8926 msgid "Overwriting existing notes for object %s\n"
8927 msgstr "覆盖对象 %s 现存注解\n"
8929 #: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886
8931 msgid "Removing note for object %s\n"
8932 msgstr "删除对象 %s 的注解\n"
8934 #: builtin/notes.c:481
8935 msgid "read objects from stdin"
8938 #: builtin/notes.c:483
8939 msgid "load rewriting config for <command> (implies --stdin)"
8940 msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
8942 #: builtin/notes.c:501
8943 msgid "too few parameters"
8946 #: builtin/notes.c:522
8949 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
8951 msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
8953 #: builtin/notes.c:534
8955 msgid "Missing notes on source object %s. Cannot copy."
8956 msgstr "源对象 %s 缺少注解。不能拷贝。"
8958 #: builtin/notes.c:586
8961 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
8962 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
8964 "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
8965 "请换用 'git notes add -f -m/-F/-c/-C'。\n"
8967 #: builtin/notes.c:768
8968 msgid "General options"
8971 #: builtin/notes.c:770
8972 msgid "Merge options"
8975 #: builtin/notes.c:772
8977 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
8979 msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
8981 #: builtin/notes.c:774
8982 msgid "Committing unmerged notes"
8985 #: builtin/notes.c:776
8986 msgid "finalize notes merge by committing unmerged notes"
8987 msgstr "通过提交未合并的注解来完成注解合并"
8989 #: builtin/notes.c:778
8990 msgid "Aborting notes merge resolution"
8993 #: builtin/notes.c:780
8994 msgid "abort notes merge"
8997 #: builtin/notes.c:857
8999 msgid "A notes merge into %s is already in-progress at %s"
9000 msgstr "一个到 %s 的注解合并已经在 %s 执行中"
9002 #: builtin/notes.c:884
9004 msgid "Object %s has no note\n"
9005 msgstr "对象 %s 没有注解\n"
9007 #: builtin/notes.c:896
9008 msgid "attempt to remove non-existent note is not an error"
9009 msgstr "尝试删除不存在的注解不是一个错误"
9011 #: builtin/notes.c:899
9012 msgid "read object names from the standard input"
9013 msgstr "从标准输入读取对象名称"
9015 #: builtin/notes.c:980
9019 #: builtin/notes.c:981
9020 msgid "use notes from <notes-ref>"
9021 msgstr "从 <注解引用> 使用注解"
9023 #: builtin/notes.c:1016 builtin/remote.c:1628
9025 msgid "Unknown subcommand: %s"
9028 #: builtin/pack-objects.c:28
9030 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
9031 msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]"
9033 #: builtin/pack-objects.c:29
9035 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
9036 msgstr "git pack-objects [<选项>...] <base-name> [< <引用列表> | < <对象列表>]"
9038 #: builtin/pack-objects.c:175 builtin/pack-objects.c:178
9040 msgid "deflate error (%d)"
9043 #: builtin/pack-objects.c:763
9044 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
9045 msgstr "禁用 bitmap 写入,因为 pack.packSizeLimit 设置使得包被切分为多个"
9047 #: builtin/pack-objects.c:776
9048 msgid "Writing objects"
9051 #: builtin/pack-objects.c:1017
9052 msgid "disabling bitmap writing, as some objects are not being packed"
9053 msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
9055 #: builtin/pack-objects.c:2177
9056 msgid "Compressing objects"
9059 #: builtin/pack-objects.c:2563
9061 msgid "unsupported index version %s"
9062 msgstr "不支持的索引版本 %s"
9064 #: builtin/pack-objects.c:2567
9066 msgid "bad index version '%s'"
9067 msgstr "坏的索引版本 '%s'"
9069 #: builtin/pack-objects.c:2597
9070 msgid "do not show progress meter"
9073 #: builtin/pack-objects.c:2599
9074 msgid "show progress meter"
9077 #: builtin/pack-objects.c:2601
9078 msgid "show progress meter during object writing phase"
9079 msgstr "在对象写入阶段显示进度表"
9081 #: builtin/pack-objects.c:2604
9082 msgid "similar to --all-progress when progress meter is shown"
9083 msgstr "当进度表显示时类似于 --all-progress"
9085 #: builtin/pack-objects.c:2605
9086 msgid "version[,offset]"
9089 #: builtin/pack-objects.c:2606
9090 msgid "write the pack index file in the specified idx format version"
9091 msgstr "用指定的 idx 格式版本来写包索引文件"
9093 #: builtin/pack-objects.c:2609
9094 msgid "maximum size of each output pack file"
9097 #: builtin/pack-objects.c:2611
9098 msgid "ignore borrowed objects from alternate object store"
9099 msgstr "忽略从备用对象存储里借用对象"
9101 #: builtin/pack-objects.c:2613
9102 msgid "ignore packed objects"
9105 #: builtin/pack-objects.c:2615
9106 msgid "limit pack window by objects"
9109 #: builtin/pack-objects.c:2617
9110 msgid "limit pack window by memory in addition to object limit"
9111 msgstr "除对象数量限制外设置打包窗口的内存限制"
9113 #: builtin/pack-objects.c:2619
9114 msgid "maximum length of delta chain allowed in the resulting pack"
9115 msgstr "打包允许的 delta 链的最大长度"
9117 #: builtin/pack-objects.c:2621
9118 msgid "reuse existing deltas"
9119 msgstr "重用已存在的 deltas"
9121 #: builtin/pack-objects.c:2623
9122 msgid "reuse existing objects"
9125 #: builtin/pack-objects.c:2625
9126 msgid "use OFS_DELTA objects"
9127 msgstr "使用 OFS_DELTA 对象"
9129 #: builtin/pack-objects.c:2627
9130 msgid "use threads when searching for best delta matches"
9131 msgstr "使用线程查询最佳 delta 匹配"
9133 #: builtin/pack-objects.c:2629
9134 msgid "do not create an empty pack output"
9137 #: builtin/pack-objects.c:2631
9138 msgid "read revision arguments from standard input"
9139 msgstr "从标准输入读取版本号参数"
9141 #: builtin/pack-objects.c:2633
9142 msgid "limit the objects to those that are not yet packed"
9143 msgstr "限制那些尚未打包的对象"
9145 #: builtin/pack-objects.c:2636
9146 msgid "include objects reachable from any reference"
9147 msgstr "包括可以从任何引用访问到的对象"
9149 #: builtin/pack-objects.c:2639
9150 msgid "include objects referred by reflog entries"
9151 msgstr "包括被引用日志引用到的对象"
9153 #: builtin/pack-objects.c:2642
9154 msgid "include objects referred to by the index"
9155 msgstr "包括被索引引用到的对象"
9157 #: builtin/pack-objects.c:2645
9158 msgid "output pack to stdout"
9161 #: builtin/pack-objects.c:2647
9162 msgid "include tag objects that refer to objects to be packed"
9163 msgstr "包括那些引用了待打包对象的标签对象"
9165 #: builtin/pack-objects.c:2649
9166 msgid "keep unreachable objects"
9169 #: builtin/pack-objects.c:2650 parse-options.h:142
9173 #: builtin/pack-objects.c:2651
9174 msgid "unpack unreachable objects newer than <time>"
9175 msgstr "将比给定 <时间> 新的无法访问的对象解包"
9177 #: builtin/pack-objects.c:2654
9178 msgid "create thin packs"
9181 #: builtin/pack-objects.c:2656
9182 msgid "create packs suitable for shallow fetches"
9183 msgstr "创建适合浅克隆仓库获取的包"
9185 #: builtin/pack-objects.c:2658
9186 msgid "ignore packs that have companion .keep file"
9187 msgstr "忽略配有 .keep 文件的包"
9189 #: builtin/pack-objects.c:2660
9190 msgid "pack compression level"
9193 #: builtin/pack-objects.c:2662
9194 msgid "do not hide commits by grafts"
9197 #: builtin/pack-objects.c:2664
9198 msgid "use a bitmap index if available to speed up counting objects"
9199 msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
9201 #: builtin/pack-objects.c:2666
9202 msgid "write a bitmap index together with the pack index"
9203 msgstr "在建立包索引的同时创建 bitmap 索引"
9205 #: builtin/pack-objects.c:2757
9206 msgid "Counting objects"
9209 #: builtin/pack-refs.c:6
9210 msgid "git pack-refs [<options>]"
9211 msgstr "git pack-refs [<选项>]"
9213 #: builtin/pack-refs.c:14
9214 msgid "pack everything"
9217 #: builtin/pack-refs.c:15
9218 msgid "prune loose refs (default)"
9219 msgstr "清除松散的引用(默认)"
9221 #: builtin/prune-packed.c:7
9222 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
9223 msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
9225 #: builtin/prune-packed.c:40
9226 msgid "Removing duplicate objects"
9229 #: builtin/prune.c:11
9230 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
9231 msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
9233 #: builtin/prune.c:105 builtin/worktree.c:125
9234 msgid "do not remove, show only"
9237 #: builtin/prune.c:106 builtin/worktree.c:126
9238 msgid "report pruned objects"
9241 #: builtin/prune.c:109 builtin/worktree.c:128
9242 msgid "expire objects older than <time>"
9243 msgstr "使早于给定时间的对象过期"
9245 #: builtin/prune.c:123
9246 msgid "cannot prune in a precious-objects repo"
9247 msgstr "不能在珍品仓库中执行清理操作"
9249 #: builtin/pull.c:72
9250 msgid "git pull [<options>] [<repository> [<refspec>...]]"
9251 msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
9253 #: builtin/pull.c:120
9254 msgid "Options related to merging"
9257 #: builtin/pull.c:123
9258 msgid "incorporate changes by rebasing rather than merging"
9259 msgstr "使用变基操作取代合并操作以合入修改"
9261 #: builtin/pull.c:147 builtin/revert.c:105
9262 msgid "allow fast-forward"
9265 #: builtin/pull.c:153
9266 msgid "verify that the named commit has a valid GPG signature"
9267 msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
9269 #: builtin/pull.c:156
9270 msgid "automatically stash/stash pop before and after rebase"
9271 msgstr "自动在变基操作前后执行 stash/stash pop"
9273 #: builtin/pull.c:172
9274 msgid "Options related to fetching"
9277 #: builtin/pull.c:194
9278 msgid "number of submodules pulled in parallel"
9279 msgstr "并发拉取的子模组的数量"
9281 #: builtin/pull.c:283
9283 msgid "Invalid value for pull.ff: %s"
9284 msgstr "pull.ff 的取值无效:%s"
9286 #: builtin/pull.c:379
9287 msgid "Cannot pull with rebase: You have unstaged changes."
9288 msgstr "无法通过变基方式拉取:您有未暂存的变更。"
9290 #: builtin/pull.c:385
9291 msgid "Additionally, your index contains uncommitted changes."
9292 msgstr "而且您的索引中包含未提交的变更。"
9294 #: builtin/pull.c:387
9295 msgid "Cannot pull with rebase: Your index contains uncommitted changes."
9296 msgstr "无法通过变基方式拉取:您的索引中包含未提交的变更。"
9298 #: builtin/pull.c:463
9300 "There is no candidate for rebasing against among the refs that you just "
9302 msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
9304 #: builtin/pull.c:465
9306 "There are no candidates for merging among the refs that you just fetched."
9307 msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
9309 #: builtin/pull.c:466
9311 "Generally this means that you provided a wildcard refspec which had no\n"
9312 "matches on the remote end."
9313 msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
9315 #: builtin/pull.c:469
9318 "You asked to pull from the remote '%s', but did not specify\n"
9319 "a branch. Because this is not the default configured remote\n"
9320 "for your current branch, you must specify a branch on the command line."
9322 "您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n"
9323 "分支默认的远程仓库,您必须在命令行中指定一个分支名。"
9325 #: builtin/pull.c:474 git-parse-remote.sh:73
9326 msgid "You are not currently on a branch."
9327 msgstr "您当前不在一个分支上。"
9329 #: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79
9330 msgid "Please specify which branch you want to rebase against."
9331 msgstr "请指定您要变基到哪一个分支。"
9333 #: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82
9334 msgid "Please specify which branch you want to merge with."
9335 msgstr "请指定您要合并哪一个分支。"
9337 #: builtin/pull.c:479 builtin/pull.c:494
9338 msgid "See git-pull(1) for details."
9339 msgstr "详见 git-pull(1)。"
9341 #: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496
9342 #: git-parse-remote.sh:64
9346 #: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501
9347 #: git-parse-remote.sh:65
9351 #: builtin/pull.c:489 git-parse-remote.sh:75
9352 msgid "There is no tracking information for the current branch."
9353 msgstr "当前分支没有跟踪信息。"
9355 #: builtin/pull.c:498 git-parse-remote.sh:95
9357 "If you wish to set tracking information for this branch you can do so with:"
9358 msgstr "如果您想要为此分支创建跟踪信息,您可以执行:"
9360 #: builtin/pull.c:503
9363 "Your configuration specifies to merge with the ref '%s'\n"
9364 "from the remote, but no such ref was fetched."
9366 "您的配置中指定要合并远程的引用 '%s',\n"
9369 #: builtin/pull.c:864
9370 msgid "--[no-]autostash option is only valid with --rebase."
9371 msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。"
9373 #: builtin/pull.c:872
9374 msgid "Updating an unborn branch with changes added to the index."
9375 msgstr "更新尚未诞生的分支,变更添加至索引。"
9377 #: builtin/pull.c:900
9380 "fetch updated the current branch head.\n"
9381 "fast-forwarding your working tree from\n"
9384 "fetch 更新了当前的分支。快进您的工作区\n"
9387 #: builtin/pull.c:905
9390 "Cannot fast-forward your working tree.\n"
9391 "After making sure that you saved anything precious from\n"
9394 "$ git reset --hard\n"
9397 "您当前的工作区无法执行快进操作。\n"
9400 "以确认所有有用的数据均已保存。然后执行下面的命令\n"
9401 "$ git reset --hard\n"
9404 #: builtin/pull.c:920
9405 msgid "Cannot merge multiple branches into empty head."
9406 msgstr "无法将多个分支合并到空分支。"
9408 #: builtin/pull.c:924
9409 msgid "Cannot rebase onto multiple branches."
9412 #: builtin/push.c:16
9413 msgid "git push [<options>] [<repository> [<refspec>...]]"
9414 msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
9416 #: builtin/push.c:89
9417 msgid "tag shorthand without <tag>"
9418 msgstr "标签后面未提供 <标签> 参数"
9420 #: builtin/push.c:99
9421 msgid "--delete only accepts plain target ref names"
9422 msgstr "--delete 只接受简单的目标引用名"
9424 #: builtin/push.c:143
9427 "To choose either option permanently, see push.default in 'git help config'."
9430 "为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
9432 #: builtin/push.c:146
9435 "The upstream branch of your current branch does not match\n"
9436 "the name of your current branch. To push to the upstream branch\n"
9437 "on the remote, use\n"
9439 " git push %s HEAD:%s\n"
9441 "To push to the branch of the same name on the remote, use\n"
9446 "如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
9449 " git push %s HEAD:%s\n"
9456 #: builtin/push.c:161
9459 "You are not currently on a branch.\n"
9460 "To push the history leading to the current (detached HEAD)\n"
9463 " git push %s HEAD:<name-of-remote-branch>\n"
9466 "现在为推送当前(分离头指针)的历史,使用\n"
9468 " git push %s HEAD:<远程分支名字>\n"
9470 #: builtin/push.c:175
9473 "The current branch %s has no upstream branch.\n"
9474 "To push the current branch and set the remote as upstream, use\n"
9476 " git push --set-upstream %s %s\n"
9478 "当前分支 %s 没有对应的上游分支。\n"
9479 "为推送当前分支并建立与远程上游的跟踪,使用\n"
9481 " git push --set-upstream %s %s\n"
9483 #: builtin/push.c:183
9485 msgid "The current branch %s has multiple upstream branches, refusing to push."
9486 msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
9488 #: builtin/push.c:186
9491 "You are pushing to remote '%s', which is not the upstream of\n"
9492 "your current branch '%s', without telling me what to push\n"
9493 "to update which remote branch."
9495 "您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
9496 "而没有告诉我要推送什么、更新哪个远程分支。"
9498 #: builtin/push.c:242
9500 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
9501 msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。"
9503 #: builtin/push.c:249
9505 "Updates were rejected because the tip of your current branch is behind\n"
9506 "its remote counterpart. Integrate the remote changes (e.g.\n"
9507 "'git pull ...') before pushing again.\n"
9508 "See the 'Note about fast-forwards' in 'git push --help' for details."
9510 "更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
9511 "再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
9512 "'git push --help' 中的 'Note about fast-forwards' 小节。"
9514 #: builtin/push.c:255
9516 "Updates were rejected because a pushed branch tip is behind its remote\n"
9517 "counterpart. Check out this branch and integrate the remote changes\n"
9518 "(e.g. 'git pull ...') before pushing again.\n"
9519 "See the 'Note about fast-forwards' in 'git push --help' for details."
9521 "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
9522 "检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
9523 "'git push --help' 中的 'Note about fast-forwards' 小节。"
9525 #: builtin/push.c:261
9527 "Updates were rejected because the remote contains work that you do\n"
9528 "not have locally. This is usually caused by another repository pushing\n"
9529 "to the same ref. You may want to first integrate the remote changes\n"
9530 "(e.g., 'git pull ...') before pushing again.\n"
9531 "See the 'Note about fast-forwards' in 'git push --help' for details."
9533 "更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n"
9534 "一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
9535 "(如 'git pull ...')。\n"
9536 "详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
9538 #: builtin/push.c:268
9539 msgid "Updates were rejected because the tag already exists in the remote."
9540 msgstr "更新被拒绝,因为该标签在远程已经存在。"
9542 #: builtin/push.c:271
9544 "You cannot update a remote ref that points at a non-commit object,\n"
9545 "or update a remote ref to make it point at a non-commit object,\n"
9546 "without using the '--force' option.\n"
9548 "如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
9549 "也不能更新远程引用让其指向一个非提交对象。\n"
9551 #: builtin/push.c:331
9553 msgid "Pushing to %s\n"
9556 #: builtin/push.c:335
9558 msgid "failed to push some refs to '%s'"
9559 msgstr "无法推送一些引用到 '%s'"
9561 #: builtin/push.c:365
9563 msgid "bad repository '%s'"
9566 #: builtin/push.c:366
9568 "No configured push destination.\n"
9569 "Either specify the URL from the command-line or configure a remote "
9570 "repository using\n"
9572 " git remote add <name> <url>\n"
9574 "and then push using the remote name\n"
9576 " git push <name>\n"
9579 "或通过命令行指定 URL,或用下面命令配置一个远程仓库\n"
9581 " git remote add <名称> <地址>\n"
9587 #: builtin/push.c:381
9588 msgid "--all and --tags are incompatible"
9589 msgstr "--all 和 --tags 不兼容"
9591 #: builtin/push.c:382
9592 msgid "--all can't be combined with refspecs"
9593 msgstr "--all 不能和引用规格同时使用"
9595 #: builtin/push.c:387
9596 msgid "--mirror and --tags are incompatible"
9597 msgstr "--mirror 和 --tags 不兼容"
9599 #: builtin/push.c:388
9600 msgid "--mirror can't be combined with refspecs"
9601 msgstr "--mirror 不能和引用规格同时使用"
9603 #: builtin/push.c:393
9604 msgid "--all and --mirror are incompatible"
9605 msgstr "--all 和 --mirror 不兼容"
9607 #: builtin/push.c:505
9611 #: builtin/push.c:506 builtin/send-pack.c:161
9612 msgid "push all refs"
9615 #: builtin/push.c:507 builtin/send-pack.c:163
9616 msgid "mirror all refs"
9619 #: builtin/push.c:509
9623 #: builtin/push.c:510
9624 msgid "push tags (can't be used with --all or --mirror)"
9625 msgstr "推送标签(不能使用 --all or --mirror)"
9627 #: builtin/push.c:513 builtin/send-pack.c:164
9628 msgid "force updates"
9631 #: builtin/push.c:515 builtin/send-pack.c:175
9632 msgid "refname>:<expect"
9635 #: builtin/push.c:516 builtin/send-pack.c:176
9636 msgid "require old value of ref to be at this value"
9637 msgstr "要求引用旧的取值为设定值"
9639 #: builtin/push.c:519
9640 msgid "control recursive pushing of submodules"
9643 #: builtin/push.c:521 builtin/send-pack.c:169
9644 msgid "use thin pack"
9647 #: builtin/push.c:522 builtin/push.c:523 builtin/send-pack.c:158
9648 #: builtin/send-pack.c:159
9649 msgid "receive pack program"
9652 #: builtin/push.c:524
9653 msgid "set upstream for git pull/status"
9654 msgstr "设置 git pull/status 的上游"
9656 #: builtin/push.c:527
9657 msgid "prune locally removed refs"
9660 #: builtin/push.c:529
9661 msgid "bypass pre-push hook"
9662 msgstr "绕过 pre-push 钩子"
9664 #: builtin/push.c:530
9665 msgid "push missing but relevant tags"
9668 #: builtin/push.c:533 builtin/send-pack.c:166
9669 msgid "GPG sign the push"
9670 msgstr "用 GPG 为推送签名"
9672 #: builtin/push.c:535 builtin/send-pack.c:170
9673 msgid "request atomic transaction on remote side"
9676 #: builtin/push.c:549
9677 msgid "--delete is incompatible with --all, --mirror and --tags"
9678 msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
9680 #: builtin/push.c:551
9681 msgid "--delete doesn't make sense without any refs"
9682 msgstr "--delete 未接任何引用没有意义"
9684 #: builtin/read-tree.c:37
9686 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
9687 "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
9688 "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
9690 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-"
9691 "u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
9692 "index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])"
9694 #: builtin/read-tree.c:110
9695 msgid "write resulting index to <file>"
9696 msgstr "将索引结果写入 <文件>"
9698 #: builtin/read-tree.c:113
9699 msgid "only empty the index"
9702 #: builtin/read-tree.c:115
9706 #: builtin/read-tree.c:117
9707 msgid "perform a merge in addition to a read"
9708 msgstr "读取之余再执行一个合并"
9710 #: builtin/read-tree.c:119
9711 msgid "3-way merge if no file level merging required"
9712 msgstr "如果没有文件级合并需要,执行三方合并"
9714 #: builtin/read-tree.c:121
9715 msgid "3-way merge in presence of adds and removes"
9716 msgstr "存在添加和删除时,也执行三方合并"
9718 #: builtin/read-tree.c:123
9719 msgid "same as -m, but discard unmerged entries"
9720 msgstr "类似于 -m,但丢弃未合并的条目"
9722 #: builtin/read-tree.c:124
9723 msgid "<subdirectory>/"
9726 #: builtin/read-tree.c:125
9727 msgid "read the tree into the index under <subdirectory>/"
9728 msgstr "读取树对象到索引的 <子目录>/ 下"
9730 #: builtin/read-tree.c:128
9731 msgid "update working tree with merge result"
9732 msgstr "用合并的结果更新工作区"
9734 #: builtin/read-tree.c:130
9738 #: builtin/read-tree.c:131
9739 msgid "allow explicitly ignored files to be overwritten"
9740 msgstr "允许忽略文件中设定的文件可以被覆盖"
9742 #: builtin/read-tree.c:134
9743 msgid "don't check the working tree after merging"
9746 #: builtin/read-tree.c:135
9747 msgid "don't update the index or the work tree"
9750 #: builtin/read-tree.c:137
9751 msgid "skip applying sparse checkout filter"
9752 msgstr "跳过应用稀疏检出过滤器"
9754 #: builtin/read-tree.c:139
9755 msgid "debug unpack-trees"
9756 msgstr "调试 unpack-trees"
9758 #: builtin/receive-pack.c:25
9759 msgid "git receive-pack <git-dir>"
9760 msgstr "git receive-pack <git-dir>"
9762 #: builtin/receive-pack.c:1719
9766 #: builtin/receive-pack.c:1733
9767 msgid "You must specify a directory."
9770 #: builtin/reflog.c:423
9772 msgid "'%s' for '%s' is not a valid timestamp"
9773 msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
9775 #: builtin/reflog.c:540 builtin/reflog.c:545
9777 msgid "'%s' is not a valid timestamp"
9778 msgstr "'%s' 不是一个有效的时间戳"
9780 #: builtin/remote.c:12
9781 msgid "git remote [-v | --verbose]"
9782 msgstr "git remote [-v | --verbose]"
9784 #: builtin/remote.c:13
9786 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
9787 "mirror=<fetch|push>] <name> <url>"
9789 "git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
9790 "mirror=<fetch|push>] <名称> <地址>"
9792 #: builtin/remote.c:14 builtin/remote.c:34
9793 msgid "git remote rename <old> <new>"
9794 msgstr "git remote rename <旧名称> <新名称>"
9796 #: builtin/remote.c:15 builtin/remote.c:39
9797 msgid "git remote remove <name>"
9798 msgstr "git remote remove <名称>"
9800 #: builtin/remote.c:16 builtin/remote.c:44
9801 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
9802 msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
9804 #: builtin/remote.c:17
9805 msgid "git remote [-v | --verbose] show [-n] <name>"
9806 msgstr "git remote [-v | --verbose] show [-n] <名称>"
9808 #: builtin/remote.c:18
9809 msgid "git remote prune [-n | --dry-run] <name>"
9810 msgstr "git remote prune [-n | --dry-run] <名称>"
9812 #: builtin/remote.c:19
9814 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
9815 msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
9817 #: builtin/remote.c:20
9818 msgid "git remote set-branches [--add] <name> <branch>..."
9819 msgstr "git remote set-branches [--add] <名称> <分支>..."
9821 #: builtin/remote.c:21 builtin/remote.c:70
9822 msgid "git remote get-url [--push] [--all] <name>"
9823 msgstr "git remote get-url [--push] [--all] <名称>"
9825 #: builtin/remote.c:22 builtin/remote.c:75
9826 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
9827 msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
9829 #: builtin/remote.c:23 builtin/remote.c:76
9830 msgid "git remote set-url --add <name> <newurl>"
9831 msgstr "git remote set-url --add <名称> <新的地址>"
9833 #: builtin/remote.c:24 builtin/remote.c:77
9834 msgid "git remote set-url --delete <name> <url>"
9835 msgstr "git remote set-url --delete <名称> <地址>"
9837 #: builtin/remote.c:29
9838 msgid "git remote add [<options>] <name> <url>"
9839 msgstr "git remote add [<选项>] <名称> <地址>"
9841 #: builtin/remote.c:49
9842 msgid "git remote set-branches <name> <branch>..."
9843 msgstr "git remote set-branches <名称> <分支>..."
9845 #: builtin/remote.c:50
9846 msgid "git remote set-branches --add <name> <branch>..."
9847 msgstr "git remote set-branches --add <名称> <分支>..."
9849 #: builtin/remote.c:55
9850 msgid "git remote show [<options>] <name>"
9851 msgstr "git remote show [<选项>] <名称>"
9853 #: builtin/remote.c:60
9854 msgid "git remote prune [<options>] <name>"
9855 msgstr "git remote prune [<选项>] <名称>"
9857 #: builtin/remote.c:65
9858 msgid "git remote update [<options>] [<group> | <remote>]..."
9859 msgstr "git remote update [<选项>] [<组> | <远程>]..."
9861 #: builtin/remote.c:94
9866 #: builtin/remote.c:126
9868 "--mirror is dangerous and deprecated; please\n"
9869 "\t use --mirror=fetch or --mirror=push instead"
9871 "--mirror 选项危险且过时,请使用 --mirror=fetch\n"
9872 "\t 或 --mirror=push"
9874 #: builtin/remote.c:143
9876 msgid "unknown mirror argument: %s"
9879 #: builtin/remote.c:159
9880 msgid "fetch the remote branches"
9883 #: builtin/remote.c:161
9884 msgid "import all tags and associated objects when fetching"
9885 msgstr "抓取时导入所有的标签和关联对象"
9887 #: builtin/remote.c:164
9888 msgid "or do not fetch any tag at all (--no-tags)"
9889 msgstr "或不抓取任何标签(--no-tags)"
9891 #: builtin/remote.c:166
9892 msgid "branch(es) to track"
9895 #: builtin/remote.c:167
9896 msgid "master branch"
9899 #: builtin/remote.c:168
9903 #: builtin/remote.c:169
9904 msgid "set up remote as a mirror to push to or fetch from"
9905 msgstr "把远程设置为用以推送或抓取的镜像"
9907 #: builtin/remote.c:181
9908 msgid "specifying a master branch makes no sense with --mirror"
9909 msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
9911 #: builtin/remote.c:183
9912 msgid "specifying branches to track makes sense only with fetch mirrors"
9913 msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
9915 #: builtin/remote.c:190 builtin/remote.c:633
9917 msgid "remote %s already exists."
9918 msgstr "远程 %s 已经存在。"
9920 #: builtin/remote.c:194 builtin/remote.c:637
9922 msgid "'%s' is not a valid remote name"
9923 msgstr "'%s' 不是一个有效的远程名称"
9925 #: builtin/remote.c:234
9927 msgid "Could not setup master '%s'"
9928 msgstr "无法设置 master '%s'"
9930 #: builtin/remote.c:336
9932 msgid "Could not get fetch map for refspec %s"
9933 msgstr "无法得到引用规格 %s 的获取列表"
9935 #: builtin/remote.c:437 builtin/remote.c:445
9939 #: builtin/remote.c:449
9943 #: builtin/remote.c:626 builtin/remote.c:761 builtin/remote.c:858
9945 msgid "No such remote: %s"
9948 #: builtin/remote.c:643
9950 msgid "Could not rename config section '%s' to '%s'"
9951 msgstr "不能重命名配置小节 '%s' 到 '%s'"
9953 #: builtin/remote.c:663
9956 "Not updating non-default fetch refspec\n"
9958 "\tPlease update the configuration manually if necessary."
9964 #: builtin/remote.c:699
9966 msgid "deleting '%s' failed"
9969 #: builtin/remote.c:733
9971 msgid "creating '%s' failed"
9974 #: builtin/remote.c:796
9976 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
9977 "to delete it, use:"
9979 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
9980 "to delete them, use:"
9981 msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
9982 msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
9984 #: builtin/remote.c:810
9986 msgid "Could not remove config section '%s'"
9987 msgstr "不能移除配置小节 '%s'"
9989 #: builtin/remote.c:911
9991 msgid " new (next fetch will store in remotes/%s)"
9992 msgstr " 新的(下一次获取将存储于 remotes/%s)"
9994 #: builtin/remote.c:914
9998 #: builtin/remote.c:916
9999 msgid " stale (use 'git remote prune' to remove)"
10000 msgstr " 过时(使用 'git remote prune' 来移除)"
10002 #: builtin/remote.c:918
10006 #: builtin/remote.c:959
10008 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
10009 msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
10011 #: builtin/remote.c:967
10013 msgid "rebases interactively onto remote %s"
10014 msgstr "交互式变基到远程 %s"
10016 #: builtin/remote.c:971
10018 msgid " merges with remote %s"
10019 msgstr " 与远程 %s 合并"
10021 #: builtin/remote.c:972
10022 msgid " and with remote"
10025 #: builtin/remote.c:974
10027 msgid "merges with remote %s"
10030 #: builtin/remote.c:975
10031 msgid " and with remote"
10034 #: builtin/remote.c:1021
10038 #: builtin/remote.c:1024
10042 #: builtin/remote.c:1028
10046 #: builtin/remote.c:1031
10047 msgid "fast-forwardable"
10050 #: builtin/remote.c:1034
10051 msgid "local out of date"
10054 #: builtin/remote.c:1041
10056 msgid " %-*s forces to %-*s (%s)"
10057 msgstr " %-*s 强制推送至 %-*s (%s)"
10059 #: builtin/remote.c:1044
10061 msgid " %-*s pushes to %-*s (%s)"
10062 msgstr " %-*s 推送至 %-*s (%s)"
10064 #: builtin/remote.c:1048
10066 msgid " %-*s forces to %s"
10067 msgstr " %-*s 强制推送至 %s"
10069 #: builtin/remote.c:1051
10071 msgid " %-*s pushes to %s"
10072 msgstr " %-*s 推送至 %s"
10074 #: builtin/remote.c:1119
10075 msgid "do not query remotes"
10078 #: builtin/remote.c:1146
10080 msgid "* remote %s"
10083 #: builtin/remote.c:1147
10085 msgid " Fetch URL: %s"
10088 #: builtin/remote.c:1148 builtin/remote.c:1301
10092 #. TRANSLATORS: the colon ':' should align with
10093 #. the one in " Fetch URL: %s" translation
10094 #: builtin/remote.c:1159 builtin/remote.c:1161
10096 msgid " Push URL: %s"
10099 #: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167
10101 msgid " HEAD branch: %s"
10102 msgstr " HEAD 分支:%s"
10104 #: builtin/remote.c:1169
10107 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
10108 msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
10110 #: builtin/remote.c:1181
10112 msgid " Remote branch:%s"
10113 msgid_plural " Remote branches:%s"
10114 msgstr[0] " 远程分支:%s"
10115 msgstr[1] " 远程分支:%s"
10117 # 译者:中文字符串拼接,可删除前导空格
10118 #: builtin/remote.c:1184 builtin/remote.c:1211
10119 msgid " (status not queried)"
10122 #: builtin/remote.c:1193
10123 msgid " Local branch configured for 'git pull':"
10124 msgid_plural " Local branches configured for 'git pull':"
10125 msgstr[0] " 为 'git pull' 配置的本地分支:"
10126 msgstr[1] " 为 'git pull' 配置的本地分支:"
10128 #: builtin/remote.c:1201
10129 msgid " Local refs will be mirrored by 'git push'"
10130 msgstr " 本地引用将在 'git push' 时被镜像"
10132 #: builtin/remote.c:1208
10134 msgid " Local ref configured for 'git push'%s:"
10135 msgid_plural " Local refs configured for 'git push'%s:"
10136 msgstr[0] " 为 'git push' 配置的本地引用%s:"
10137 msgstr[1] " 为 'git push' 配置的本地引用%s:"
10139 #: builtin/remote.c:1229
10140 msgid "set refs/remotes/<name>/HEAD according to remote"
10141 msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
10143 #: builtin/remote.c:1231
10144 msgid "delete refs/remotes/<name>/HEAD"
10145 msgstr "删除 refs/remotes/<名称>/HEAD"
10147 #: builtin/remote.c:1246
10148 msgid "Cannot determine remote HEAD"
10149 msgstr "无法确定远程 HEAD"
10151 #: builtin/remote.c:1248
10152 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
10153 msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
10155 #: builtin/remote.c:1258
10157 msgid "Could not delete %s"
10160 #: builtin/remote.c:1266
10162 msgid "Not a valid ref: %s"
10163 msgstr "不是一个有效引用:%s"
10165 #: builtin/remote.c:1268
10167 msgid "Could not setup %s"
10171 #: builtin/remote.c:1286
10173 msgid " %s will become dangling!"
10174 msgstr " %s 将成为摇摆状态!"
10177 #: builtin/remote.c:1287
10179 msgid " %s has become dangling!"
10180 msgstr " %s 已成为摇摆状态!"
10182 #: builtin/remote.c:1297
10187 #: builtin/remote.c:1298
10192 #: builtin/remote.c:1314
10194 msgid " * [would prune] %s"
10195 msgstr " * [将删除] %s"
10197 #: builtin/remote.c:1317
10199 msgid " * [pruned] %s"
10200 msgstr " * [已删除] %s"
10202 #: builtin/remote.c:1362
10203 msgid "prune remotes after fetching"
10206 #: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
10208 msgid "No such remote '%s'"
10209 msgstr "没有此远程 '%s'"
10211 #: builtin/remote.c:1441
10215 #: builtin/remote.c:1448
10216 msgid "no remote specified"
10219 #: builtin/remote.c:1465
10220 msgid "query push URLs rather than fetch URLs"
10221 msgstr "查询推送 URL 地址,而非获取 URL 地址"
10223 #: builtin/remote.c:1467
10224 msgid "return all URLs"
10225 msgstr "返回所有 URL 地址"
10227 #: builtin/remote.c:1495
10229 msgid "no URLs configured for remote '%s'"
10230 msgstr "没有给远程仓库 '%s' 设定 URL"
10232 #: builtin/remote.c:1521
10233 msgid "manipulate push URLs"
10236 #: builtin/remote.c:1523
10240 #: builtin/remote.c:1525
10241 msgid "delete URLs"
10244 #: builtin/remote.c:1532
10245 msgid "--add --delete doesn't make sense"
10246 msgstr "--add --delete 无意义"
10248 #: builtin/remote.c:1573
10250 msgid "Invalid old URL pattern: %s"
10251 msgstr "无效的旧 URL 匹配模版:%s"
10253 #: builtin/remote.c:1581
10255 msgid "No such URL found: %s"
10256 msgstr "未找到此 URL:%s"
10258 #: builtin/remote.c:1583
10259 msgid "Will not delete all non-push URLs"
10260 msgstr "将不会删除所有非推送 URL 地址"
10262 #: builtin/remote.c:1597
10263 msgid "be verbose; must be placed before a subcommand"
10264 msgstr "冗长输出;必须置于子命令之前"
10266 #: builtin/repack.c:17
10267 msgid "git repack [<options>]"
10268 msgstr "git repack [<选项>]"
10270 #: builtin/repack.c:159
10271 msgid "pack everything in a single pack"
10272 msgstr "所有内容打包到一个包文件中"
10274 #: builtin/repack.c:161
10275 msgid "same as -a, and turn unreachable objects loose"
10276 msgstr "和 -a 相同,并将不可达的对象设为松散对象"
10278 #: builtin/repack.c:164
10279 msgid "remove redundant packs, and run git-prune-packed"
10280 msgstr "删除多余的包,运行 git-prune-packed"
10282 #: builtin/repack.c:166
10283 msgid "pass --no-reuse-delta to git-pack-objects"
10284 msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
10286 #: builtin/repack.c:168
10287 msgid "pass --no-reuse-object to git-pack-objects"
10288 msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
10290 #: builtin/repack.c:170
10291 msgid "do not run git-update-server-info"
10292 msgstr "不运行 git-update-server-info"
10294 #: builtin/repack.c:173
10295 msgid "pass --local to git-pack-objects"
10296 msgstr "向 git-pack-objects 传递参数 --local"
10298 #: builtin/repack.c:175
10299 msgid "write bitmap index"
10300 msgstr "写 bitmap 索引"
10302 #: builtin/repack.c:176
10303 msgid "approxidate"
10306 #: builtin/repack.c:177
10307 msgid "with -A, do not loosen objects older than this"
10308 msgstr "使用 -A,不要将早于给定时间的对象过期"
10310 #: builtin/repack.c:179
10311 msgid "size of the window used for delta compression"
10312 msgstr "用于增量压缩的窗口值"
10314 #: builtin/repack.c:180 builtin/repack.c:184
10318 #: builtin/repack.c:181
10319 msgid "same as the above, but limit memory size instead of entries count"
10320 msgstr "和上面的相似,但限制内存大小而非条目数"
10322 #: builtin/repack.c:183
10323 msgid "limits the maximum delta depth"
10326 #: builtin/repack.c:185
10327 msgid "maximum size of each packfile"
10328 msgstr "每个包文件的最大尺寸"
10330 #: builtin/repack.c:187
10331 msgid "repack objects in packs marked with .keep"
10332 msgstr "对标记为 .keep 的包中的对象重新打包"
10334 #: builtin/repack.c:197
10335 msgid "cannot delete packs in a precious-objects repo"
10336 msgstr "不能删除珍品仓库中的打包文件"
10338 #: builtin/repack.c:381
10340 msgid "removing '%s' failed"
10341 msgstr "删除 '%s' 失败"
10343 #: builtin/replace.c:19
10344 msgid "git replace [-f] <object> <replacement>"
10345 msgstr "git replace [-f] <对象> <替换物>"
10347 #: builtin/replace.c:20
10348 msgid "git replace [-f] --edit <object>"
10349 msgstr "git replace [-f] --edit <对象>"
10351 #: builtin/replace.c:21
10352 msgid "git replace [-f] --graft <commit> [<parent>...]"
10353 msgstr "git replace [-f] --graft <提交> [<父提交>...]"
10355 #: builtin/replace.c:22
10356 msgid "git replace -d <object>..."
10357 msgstr "git replace -d <对象>..."
10359 #: builtin/replace.c:23
10360 msgid "git replace [--format=<format>] [-l [<pattern>]]"
10361 msgstr "git replace [--format=<格式>] [-l [<模式>]]"
10363 #: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
10365 msgid "Not a valid object name: '%s'"
10366 msgstr "不是一个有效的对象名:'%s'"
10368 #: builtin/replace.c:355
10370 msgid "bad mergetag in commit '%s'"
10371 msgstr "提交 '%s' 中含有损坏的合并标签"
10373 #: builtin/replace.c:357
10375 msgid "malformed mergetag in commit '%s'"
10376 msgstr "提交 '%s' 中含有非法的合并标签"
10378 #: builtin/replace.c:368
10381 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
10382 "instead of --graft"
10383 msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft"
10385 #: builtin/replace.c:401
10387 msgid "the original commit '%s' has a gpg signature."
10388 msgstr "原始提交 '%s' 中包含一个 GPG 签名"
10390 #: builtin/replace.c:402
10391 msgid "the signature will be removed in the replacement commit!"
10392 msgstr "在替换的提交中签名将被移除!"
10394 #: builtin/replace.c:408
10396 msgid "could not write replacement commit for: '%s'"
10397 msgstr "不能为 '%s' 写替换提交"
10399 #: builtin/replace.c:432
10400 msgid "list replace refs"
10403 #: builtin/replace.c:433
10404 msgid "delete replace refs"
10407 #: builtin/replace.c:434
10408 msgid "edit existing object"
10411 #: builtin/replace.c:435
10412 msgid "change a commit's parents"
10413 msgstr "修改一个提交的父提交"
10415 #: builtin/replace.c:436
10416 msgid "replace the ref if it exists"
10419 #: builtin/replace.c:437
10420 msgid "do not pretty-print contents for --edit"
10421 msgstr "不要为 --edit 操作美观显示内容"
10423 #: builtin/replace.c:438
10424 msgid "use this format"
10427 #: builtin/rerere.c:12
10428 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
10429 msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
10431 #: builtin/rerere.c:58
10432 msgid "register clean resolutions in index"
10433 msgstr "在索引中注册干净的解决方案"
10435 #: builtin/reset.c:26
10437 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
10438 msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
10440 #: builtin/reset.c:27
10441 msgid "git reset [-q] <tree-ish> [--] <paths>..."
10442 msgstr "git reset [-q] <树或提交> [--] <路径>..."
10444 #: builtin/reset.c:28
10445 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
10446 msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
10448 #: builtin/reset.c:34
10452 #: builtin/reset.c:34
10456 #: builtin/reset.c:34
10460 #: builtin/reset.c:34
10464 #: builtin/reset.c:34
10468 #: builtin/reset.c:74
10469 msgid "You do not have a valid HEAD."
10470 msgstr "您没有一个有效的 HEAD。"
10472 #: builtin/reset.c:76
10473 msgid "Failed to find tree of HEAD."
10474 msgstr "无法找到 HEAD 指向的树。"
10476 #: builtin/reset.c:82
10478 msgid "Failed to find tree of %s."
10479 msgstr "无法找到 %s 指向的树。"
10481 #: builtin/reset.c:100
10483 msgid "HEAD is now at %s"
10484 msgstr "HEAD 现在位于 %s"
10486 # 译者:汉字之间无空格,故删除%s前后空格
10487 #: builtin/reset.c:183
10489 msgid "Cannot do a %s reset in the middle of a merge."
10490 msgstr "在合并过程中不能做%s重置操作。"
10492 #: builtin/reset.c:276
10493 msgid "be quiet, only report errors"
10494 msgstr "安静模式,只报告错误"
10496 #: builtin/reset.c:278
10497 msgid "reset HEAD and index"
10498 msgstr "重置 HEAD 和索引"
10500 #: builtin/reset.c:279
10501 msgid "reset only HEAD"
10504 #: builtin/reset.c:281 builtin/reset.c:283
10505 msgid "reset HEAD, index and working tree"
10506 msgstr "重置 HEAD、索引和工作区"
10508 #: builtin/reset.c:285
10509 msgid "reset HEAD but keep local changes"
10510 msgstr "重置 HEAD 但保存本地变更"
10512 #: builtin/reset.c:288
10513 msgid "record only the fact that removed paths will be added later"
10514 msgstr "将删除的路径标记为稍后添加"
10516 #: builtin/reset.c:305
10518 msgid "Failed to resolve '%s' as a valid revision."
10519 msgstr "无法将 '%s' 解析为一个有效的版本。"
10521 #: builtin/reset.c:313
10523 msgid "Failed to resolve '%s' as a valid tree."
10524 msgstr "无法将 '%s' 解析为一个有效的树对象。"
10526 #: builtin/reset.c:322
10527 msgid "--patch is incompatible with --{hard,mixed,soft}"
10528 msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
10530 #: builtin/reset.c:331
10531 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
10532 msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。"
10534 # 译者:汉字之间无空格,故删除%s前后空格
10535 #: builtin/reset.c:333
10537 msgid "Cannot do %s reset with paths."
10538 msgstr "不能带路径进行%s重置。"
10540 # 译者:汉字之间无空格,故删除%s前后空格
10541 #: builtin/reset.c:343
10543 msgid "%s reset is not allowed in a bare repository"
10544 msgstr "不能对纯仓库进行%s重置"
10546 #: builtin/reset.c:347
10547 msgid "-N can only be used with --mixed"
10548 msgstr "-N 只能和 --mixed 同时使用"
10550 #: builtin/reset.c:364
10551 msgid "Unstaged changes after reset:"
10552 msgstr "重置后取消暂存的变更:"
10554 #: builtin/reset.c:370
10556 msgid "Could not reset index file to revision '%s'."
10557 msgstr "不能重置索引文件至版本 '%s'。"
10559 #: builtin/reset.c:374
10560 msgid "Could not write new index file."
10561 msgstr "不能写入新的索引文件。"
10563 #: builtin/rev-list.c:350
10564 msgid "rev-list does not support display of notes"
10565 msgstr "rev-list 不支持显示注解"
10567 #: builtin/rev-parse.c:358
10568 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
10569 msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
10571 #: builtin/rev-parse.c:363
10572 msgid "keep the `--` passed as an arg"
10573 msgstr "保持 `--` 作为一个参数传递"
10575 #: builtin/rev-parse.c:365
10576 msgid "stop parsing after the first non-option argument"
10577 msgstr "遇到第一个非选项参数后停止解析"
10579 #: builtin/rev-parse.c:368
10580 msgid "output in stuck long form"
10583 #: builtin/rev-parse.c:499
10585 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
10586 " or: git rev-parse --sq-quote [<arg>...]\n"
10587 " or: git rev-parse [<options>] [<arg>...]\n"
10589 "Run \"git rev-parse --parseopt -h\" for more information on the first usage."
10591 "git rev-parse --parseopt [<选项>] -- [<参数>...]\n"
10592 " 或者:git rev-parse --sq-quote [<参数>...]\n"
10593 " 或者:git rev-parse [<选项>] [<参数>...]\n"
10595 "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
10597 #: builtin/revert.c:22
10598 msgid "git revert [<options>] <commit-ish>..."
10599 msgstr "git revert [<选项>] <提交号>..."
10601 #: builtin/revert.c:23
10602 msgid "git revert <subcommand>"
10603 msgstr "git revert <子命令>"
10605 #: builtin/revert.c:28
10606 msgid "git cherry-pick [<options>] <commit-ish>..."
10607 msgstr "git cherry-pick [<选项>] <提交号>..."
10609 #: builtin/revert.c:29
10610 msgid "git cherry-pick <subcommand>"
10611 msgstr "git cherry-pick <子命令>"
10613 #: builtin/revert.c:71
10615 msgid "%s: %s cannot be used with %s"
10616 msgstr "%s:%s 不能和 %s 同时使用"
10618 #: builtin/revert.c:80
10619 msgid "end revert or cherry-pick sequence"
10622 #: builtin/revert.c:81
10623 msgid "resume revert or cherry-pick sequence"
10626 #: builtin/revert.c:82
10627 msgid "cancel revert or cherry-pick sequence"
10630 #: builtin/revert.c:83
10631 msgid "don't automatically commit"
10634 #: builtin/revert.c:84
10635 msgid "edit the commit message"
10638 #: builtin/revert.c:87
10639 msgid "parent number"
10642 #: builtin/revert.c:89
10643 msgid "merge strategy"
10646 #: builtin/revert.c:90
10650 #: builtin/revert.c:91
10651 msgid "option for merge strategy"
10654 #: builtin/revert.c:104
10655 msgid "append commit name"
10658 #: builtin/revert.c:106
10659 msgid "preserve initially empty commits"
10662 #: builtin/revert.c:107
10663 msgid "allow commits with empty messages"
10666 #: builtin/revert.c:108
10667 msgid "keep redundant, empty commits"
10668 msgstr "保持多余的、空的提交"
10670 #: builtin/revert.c:112
10671 msgid "program error"
10674 #: builtin/revert.c:197
10675 msgid "revert failed"
10678 #: builtin/revert.c:212
10679 msgid "cherry-pick failed"
10683 msgid "git rm [<options>] [--] <file>..."
10684 msgstr "git rm [<选项>] [--] <文件>..."
10688 "the following submodule (or one of its nested submodules)\n"
10689 "uses a .git directory:"
10691 "the following submodules (or one of their nested submodules)\n"
10692 "use a .git directory:"
10693 msgstr[0] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
10694 msgstr[1] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
10699 "(use 'rm -rf' if you really want to remove it including all of its history)"
10702 "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
10704 #: builtin/rm.c:230
10706 "the following file has staged content different from both the\n"
10707 "file and the HEAD:"
10709 "the following files have staged content different from both the\n"
10710 "file and the HEAD:"
10711 msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
10712 msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
10714 #: builtin/rm.c:235
10717 "(use -f to force removal)"
10722 #: builtin/rm.c:239
10723 msgid "the following file has changes staged in the index:"
10724 msgid_plural "the following files have changes staged in the index:"
10725 msgstr[0] "下列文件索引中有变更"
10726 msgstr[1] "下列文件索引中有变更"
10728 #: builtin/rm.c:243 builtin/rm.c:254
10731 "(use --cached to keep the file, or -f to force removal)"
10734 "(使用 --cached 保留本地文件,或用 -f 强制删除)"
10736 #: builtin/rm.c:251
10737 msgid "the following file has local modifications:"
10738 msgid_plural "the following files have local modifications:"
10739 msgstr[0] "如下文件有本地修改:"
10740 msgstr[1] "如下文件有本地修改:"
10742 #: builtin/rm.c:269
10743 msgid "do not list removed files"
10746 #: builtin/rm.c:270
10747 msgid "only remove from the index"
10750 #: builtin/rm.c:271
10751 msgid "override the up-to-date check"
10752 msgstr "忽略文件更新状态检查"
10754 #: builtin/rm.c:272
10755 msgid "allow recursive removal"
10758 #: builtin/rm.c:274
10759 msgid "exit with a zero status even if nothing matched"
10760 msgstr "即使没有匹配,也以零状态退出"
10762 #: builtin/rm.c:335
10764 msgid "not removing '%s' recursively without -r"
10765 msgstr "未提供 -r 选项不会递归删除 '%s'"
10767 #: builtin/rm.c:374
10769 msgid "git rm: unable to remove %s"
10770 msgstr "git rm:不能删除 %s"
10772 #: builtin/send-pack.c:18
10774 "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
10775 "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
10777 " --all and explicit <ref> specification are mutually exclusive."
10779 "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
10780 "receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n"
10781 " --all 和明确的 <引用> 互斥。"
10783 #: builtin/send-pack.c:160
10784 msgid "remote name"
10787 #: builtin/send-pack.c:171
10788 msgid "use stateless RPC protocol"
10789 msgstr "使用无状态的 RPC 协议"
10791 #: builtin/send-pack.c:172
10792 msgid "read refs from stdin"
10795 #: builtin/send-pack.c:173
10796 msgid "print status from remote helper"
10797 msgstr "打印来自远程 helper 的状态"
10799 #: builtin/shortlog.c:13
10800 msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
10801 msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
10803 #: builtin/shortlog.c:242
10804 msgid "sort output according to the number of commits per author"
10805 msgstr "根据每个作者的提交数量排序"
10807 #: builtin/shortlog.c:244
10808 msgid "Suppress commit descriptions, only provides commit count"
10809 msgstr "隐藏提交说明,只提供提交数量"
10811 #: builtin/shortlog.c:246
10812 msgid "Show the email address of each author"
10813 msgstr "显示每个作者的电子邮件地址"
10815 #: builtin/shortlog.c:247
10816 msgid "w[,i1[,i2]]"
10817 msgstr "w[,i1[,i2]]"
10819 #: builtin/shortlog.c:248
10820 msgid "Linewrap output"
10823 #: builtin/show-branch.c:10
10825 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
10826 "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
10827 "\t\t[--more=<n> | --list | --independent | --merge-base]\n"
10828 "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
10830 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
10831 "\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
10832 "\t\t[--more=<n> | --list | --independent | --merge-base]\n"
10833 "\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
10835 #: builtin/show-branch.c:14
10836 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
10837 msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]"
10839 #: builtin/show-branch.c:640
10840 msgid "show remote-tracking and local branches"
10841 msgstr "显示远程跟踪的和本地的分支"
10843 #: builtin/show-branch.c:642
10844 msgid "show remote-tracking branches"
10847 #: builtin/show-branch.c:644
10848 msgid "color '*!+-' corresponding to the branch"
10849 msgstr "着色 '*!+-' 到相应的分支"
10851 #: builtin/show-branch.c:646
10852 msgid "show <n> more commits after the common ancestor"
10853 msgstr "显示共同祖先后的 <n> 个提交"
10855 #: builtin/show-branch.c:648
10856 msgid "synonym to more=-1"
10857 msgstr "和 more=-1 同义"
10859 #: builtin/show-branch.c:649
10860 msgid "suppress naming strings"
10863 #: builtin/show-branch.c:651
10864 msgid "include the current branch"
10867 #: builtin/show-branch.c:653
10868 msgid "name commits with their object names"
10871 #: builtin/show-branch.c:655
10872 msgid "show possible merge bases"
10875 #: builtin/show-branch.c:657
10876 msgid "show refs unreachable from any other ref"
10877 msgstr "显示没有任何引用的的引用"
10879 #: builtin/show-branch.c:659
10880 msgid "show commits in topological order"
10883 #: builtin/show-branch.c:662
10884 msgid "show only commits not on the first branch"
10885 msgstr "只显示不在第一个分支上的提交"
10887 #: builtin/show-branch.c:664
10888 msgid "show merges reachable from only one tip"
10889 msgstr "显示仅一个分支可访问的合并提交"
10891 #: builtin/show-branch.c:666
10892 msgid "topologically sort, maintaining date order where possible"
10893 msgstr "拓扑方式排序,并尽可能地保持日期顺序"
10895 #: builtin/show-branch.c:669
10896 msgid "<n>[,<base>]"
10897 msgstr "<n>[,<base>]"
10899 #: builtin/show-branch.c:670
10900 msgid "show <n> most recent ref-log entries starting at base"
10901 msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
10903 #: builtin/show-ref.c:10
10905 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
10906 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
10908 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
10909 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
10911 #: builtin/show-ref.c:11
10912 msgid "git show-ref --exclude-existing[=<pattern>]"
10913 msgstr "git show-ref --exclude-existing[=<模式>]"
10915 #: builtin/show-ref.c:165
10916 msgid "only show tags (can be combined with heads)"
10917 msgstr "只显示标签(可以和头共用)"
10919 #: builtin/show-ref.c:166
10920 msgid "only show heads (can be combined with tags)"
10921 msgstr "只显示头(可以和标签共用)"
10923 #: builtin/show-ref.c:167
10924 msgid "stricter reference checking, requires exact ref path"
10925 msgstr "更严格的引用检测,需要精确的引用路径"
10927 #: builtin/show-ref.c:170 builtin/show-ref.c:172
10928 msgid "show the HEAD reference, even if it would be filtered out"
10929 msgstr "显示 HEAD 引用,即使被过滤掉"
10931 #: builtin/show-ref.c:174
10932 msgid "dereference tags into object IDs"
10933 msgstr "转换标签到对象 ID"
10935 #: builtin/show-ref.c:176
10936 msgid "only show SHA1 hash using <n> digits"
10937 msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
10939 #: builtin/show-ref.c:180
10940 msgid "do not print results to stdout (useful with --verify)"
10941 msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
10943 #: builtin/show-ref.c:182
10944 msgid "show refs from stdin that aren't in local repository"
10945 msgstr "显示从标准输入中读入的不在本地仓库中的引用"
10947 #: builtin/stripspace.c:17
10948 msgid "git stripspace [-s | --strip-comments]"
10949 msgstr "git stripspace [-s | --strip-comments]"
10951 #: builtin/stripspace.c:18
10952 msgid "git stripspace [-c | --comment-lines]"
10953 msgstr "git stripspace [-c | --comment-lines]"
10955 #: builtin/stripspace.c:35
10956 msgid "skip and remove all lines starting with comment character"
10957 msgstr "跳过和移除所有的注释行"
10959 #: builtin/stripspace.c:38
10960 msgid "prepend comment character and space to each line"
10961 msgstr "为每一行的行首添加注释符和空格"
10963 #: builtin/submodule--helper.c:24
10965 msgid "No such ref: %s"
10966 msgstr "没有这样的引用:%s"
10968 #: builtin/submodule--helper.c:31
10970 msgid "Expecting a full ref name, got %s"
10971 msgstr "期望一个完整的引用名称,却得到 %s"
10973 #: builtin/submodule--helper.c:71
10975 msgid "cannot strip one component off url '%s'"
10976 msgstr "无法从 url '%s' 剥离一个组件"
10978 #: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405
10979 #: builtin/submodule--helper.c:486
10980 msgid "alternative anchor for relative paths"
10981 msgstr "相对路径的替代锚记(anchor)"
10983 #: builtin/submodule--helper.c:283
10984 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
10985 msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
10987 #: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340
10989 msgid "No url found for submodule path '%s' in .gitmodules"
10990 msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url"
10992 #: builtin/submodule--helper.c:366
10994 msgid "Failed to register url for submodule path '%s'"
10995 msgstr "无法为子模组 '%s' 注册 url"
10997 #: builtin/submodule--helper.c:370
10999 msgid "Submodule '%s' (%s) registered for path '%s'\n"
11000 msgstr "子模组 '%s'(%s)未对路径 '%s' 注册\n"
11003 #: builtin/submodule--helper.c:380
11005 msgid "warning: command update mode suggested for submodule '%s'\n"
11006 msgstr "警告:建议子模组 '%s' 使用命令更新模式\n"
11008 #: builtin/submodule--helper.c:387
11010 msgid "Failed to register update mode for submodule path '%s'"
11011 msgstr "无法为子模组 '%s' 注册更新模式"
11013 #: builtin/submodule--helper.c:406
11014 msgid "Suppress output for initializing a submodule"
11015 msgstr "初始化子模组时抑制输出"
11017 #: builtin/submodule--helper.c:411
11018 msgid "git submodule--helper init [<path>]"
11019 msgstr "git submodule--helper init [<路径>]"
11021 #: builtin/submodule--helper.c:432
11022 msgid "git submodule--helper name <path>"
11023 msgstr "git submodule--helper name <路径>"
11025 #: builtin/submodule--helper.c:438
11027 msgid "no submodule mapping found in .gitmodules for path '%s'"
11028 msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射"
11030 #: builtin/submodule--helper.c:489
11031 msgid "where the new submodule will be cloned to"
11032 msgstr "新的子模组将要克隆的路径"
11034 #: builtin/submodule--helper.c:492
11035 msgid "name of the new submodule"
11038 #: builtin/submodule--helper.c:495
11039 msgid "url where to clone the submodule from"
11040 msgstr "克隆子模组的 url 地址"
11042 #: builtin/submodule--helper.c:501
11043 msgid "depth for shallow clones"
11046 #: builtin/submodule--helper.c:507
11048 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
11049 "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
11050 msgstr "git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] [--name <名字>] [--depth <深度>] --url <url> --path <路径>"
11052 #: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538
11054 msgid "could not create directory '%s'"
11055 msgstr "不能创建目录 '%s'"
11057 #: builtin/submodule--helper.c:534
11059 msgid "clone of '%s' into submodule path '%s' failed"
11060 msgstr "无法克隆 '%s' 到子模组路径 '%s'"
11062 #: builtin/submodule--helper.c:550
11064 msgid "cannot open file '%s'"
11065 msgstr "无法打开文件 '%s'"
11067 #: builtin/submodule--helper.c:555
11069 msgid "could not close file %s"
11072 #: builtin/submodule--helper.c:562
11074 msgid "could not get submodule directory for '%s'"
11075 msgstr "无法得到 '%s' 的子模组目录"
11077 #: builtin/submodule--helper.c:609
11079 msgid "Submodule path '%s' not initialized"
11080 msgstr "子模组 '%s' 尚未初始化"
11082 #: builtin/submodule--helper.c:613
11083 msgid "Maybe you want to use 'update --init'?"
11084 msgstr "也许您想要执行 'update --init'?"
11086 #: builtin/submodule--helper.c:639
11088 msgid "Skipping unmerged submodule %s"
11089 msgstr "略过未合并的子模组 %s"
11091 #: builtin/submodule--helper.c:660
11093 msgid "Skipping submodule '%s'"
11094 msgstr "略过子模组 '%s'"
11096 #: builtin/submodule--helper.c:768
11097 msgid "path into the working tree"
11100 #: builtin/submodule--helper.c:771
11101 msgid "path into the working tree, across nested submodule boundaries"
11102 msgstr "工作区中的路径,递归嵌套子模组"
11104 #: builtin/submodule--helper.c:775
11105 msgid "rebase, merge, checkout or none"
11106 msgstr "rebase、merge、checkout 或 none"
11108 #: builtin/submodule--helper.c:779
11109 msgid "Create a shallow clone truncated to the specified number of revisions"
11110 msgstr "创建一个指定深度的浅克隆"
11112 #: builtin/submodule--helper.c:782
11113 msgid "parallel jobs"
11116 #: builtin/submodule--helper.c:783
11117 msgid "don't print cloning progress"
11120 #: builtin/submodule--helper.c:788
11121 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
11122 msgstr "git submodule--helper update_clone [--prefix=<路径>] [<路径>...]"
11124 #: builtin/submodule--helper.c:798
11125 msgid "bad value for update parameter"
11126 msgstr "update 参数取值错误"
11128 #: builtin/submodule--helper.c:855
11129 msgid "submodule--helper subcommand must be called with a subcommand"
11130 msgstr "submodule-helper 子命令必须由另外的子命令调用"
11132 #: builtin/submodule--helper.c:862
11134 msgid "'%s' is not a valid submodule--helper subcommand"
11135 msgstr "'%s' 不是一个有效的 submodule--helper 子命令"
11137 #: builtin/symbolic-ref.c:7
11138 msgid "git symbolic-ref [<options>] <name> [<ref>]"
11139 msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
11141 #: builtin/symbolic-ref.c:8
11142 msgid "git symbolic-ref -d [-q] <name>"
11143 msgstr "git symbolic-ref -d [-q] <名称>"
11145 #: builtin/symbolic-ref.c:40
11146 msgid "suppress error message for non-symbolic (detached) refs"
11147 msgstr "不显示非符号(分离的)引用的错误信息"
11149 #: builtin/symbolic-ref.c:41
11150 msgid "delete symbolic ref"
11153 #: builtin/symbolic-ref.c:42
11154 msgid "shorten ref output"
11157 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
11161 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
11162 msgid "reason of the update"
11165 #: builtin/tag.c:23
11167 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
11170 "git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]"
11172 #: builtin/tag.c:24
11173 msgid "git tag -d <tagname>..."
11174 msgstr "git tag -d <标签名>..."
11176 #: builtin/tag.c:25
11178 "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
11179 "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
11181 "git tag -l [-n[<数字>]] [--contains <提交>] [--points-at <对象>]\n"
11182 "\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]"
11184 #: builtin/tag.c:27
11185 msgid "git tag -v <tagname>..."
11186 msgstr "git tag -v <标签名>..."
11188 #: builtin/tag.c:81
11190 msgid "tag name too long: %.*s..."
11191 msgstr "标签名称太长:%.*s..."
11193 #: builtin/tag.c:86
11195 msgid "tag '%s' not found."
11196 msgstr "未发现标签 '%s'。"
11198 #: builtin/tag.c:101
11200 msgid "Deleted tag '%s' (was %s)\n"
11201 msgstr "已删除标签 '%s'(曾为 %s)\n"
11203 #: builtin/tag.c:117
11207 "Write a message for tag:\n"
11209 "Lines starting with '%c' will be ignored.\n"
11214 "以 '%c' 开头的行将被忽略。\n"
11216 #: builtin/tag.c:121
11220 "Write a message for tag:\n"
11222 "Lines starting with '%c' will be kept; you may remove them yourself if you "
11228 "以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
11230 #: builtin/tag.c:199
11231 msgid "unable to sign the tag"
11234 #: builtin/tag.c:201
11235 msgid "unable to write tag file"
11238 #: builtin/tag.c:226
11239 msgid "bad object type."
11242 #: builtin/tag.c:239
11243 msgid "tag header too big."
11246 #: builtin/tag.c:275
11247 msgid "no tag message?"
11250 #: builtin/tag.c:281
11252 msgid "The tag message has been left in %s\n"
11253 msgstr "标签说明被保留在 %s\n"
11255 #: builtin/tag.c:339
11256 msgid "list tag names"
11259 #: builtin/tag.c:341
11260 msgid "print <n> lines of each tag message"
11261 msgstr "每个标签信息打印 <n> 行"
11263 #: builtin/tag.c:343
11264 msgid "delete tags"
11267 #: builtin/tag.c:344
11268 msgid "verify tags"
11271 #: builtin/tag.c:346
11272 msgid "Tag creation options"
11275 #: builtin/tag.c:348
11276 msgid "annotated tag, needs a message"
11277 msgstr "附注标签,需要一个说明"
11279 #: builtin/tag.c:350
11280 msgid "tag message"
11283 #: builtin/tag.c:352
11284 msgid "annotated and GPG-signed tag"
11285 msgstr "附注并附加 GPG 签名的标签"
11287 #: builtin/tag.c:356
11288 msgid "use another key to sign the tag"
11289 msgstr "使用另外的私钥签名该标签"
11291 #: builtin/tag.c:357
11292 msgid "replace the tag if exists"
11293 msgstr "如果存在,替换现有的标签"
11295 #: builtin/tag.c:358 builtin/update-ref.c:368
11296 msgid "create a reflog"
11299 #: builtin/tag.c:360
11300 msgid "Tag listing options"
11303 #: builtin/tag.c:361
11304 msgid "show tag list in columns"
11305 msgstr "以列的方式显示标签列表"
11307 #: builtin/tag.c:362 builtin/tag.c:363
11308 msgid "print only tags that contain the commit"
11309 msgstr "只打印包含提交的标签"
11311 #: builtin/tag.c:364
11312 msgid "print only tags that are merged"
11313 msgstr "只打印已经合并的标签"
11315 #: builtin/tag.c:365
11316 msgid "print only tags that are not merged"
11317 msgstr "只打印尚未合并的标签"
11319 #: builtin/tag.c:370
11320 msgid "print only tags of the object"
11323 #: builtin/tag.c:399
11324 msgid "--column and -n are incompatible"
11325 msgstr "--column 和 -n 不兼容"
11327 #: builtin/tag.c:419
11328 msgid "-n option is only allowed with -l."
11329 msgstr "-n 选项只允许和 -l 同时使用。"
11331 #: builtin/tag.c:421
11332 msgid "--contains option is only allowed with -l."
11333 msgstr "--contains 选项只允许和 -l 同时使用。"
11335 #: builtin/tag.c:423
11336 msgid "--points-at option is only allowed with -l."
11337 msgstr "--points-at 选项只允许和 -l 同时使用。"
11339 #: builtin/tag.c:425
11340 msgid "--merged and --no-merged option are only allowed with -l"
11341 msgstr "选项 --merged 和 --no-merged 只能和 -l 共用"
11343 #: builtin/tag.c:433
11344 msgid "only one -F or -m option is allowed."
11345 msgstr "只允许一个 -F 或 -m 选项。"
11347 #: builtin/tag.c:452
11348 msgid "too many params"
11351 #: builtin/tag.c:458
11353 msgid "'%s' is not a valid tag name."
11354 msgstr "'%s' 不是一个有效的标签名称。"
11356 #: builtin/tag.c:463
11358 msgid "tag '%s' already exists"
11359 msgstr "标签 '%s' 已存在"
11361 #: builtin/tag.c:491
11363 msgid "Updated tag '%s' (was %s)\n"
11364 msgstr "已更新标签 '%s'(曾为 %s)\n"
11366 #: builtin/unpack-objects.c:490
11367 msgid "Unpacking objects"
11370 #: builtin/update-index.c:79
11372 msgid "failed to create directory %s"
11375 #: builtin/update-index.c:85
11377 msgid "failed to stat %s"
11378 msgstr "无法枚举 %s 状态"
11380 #: builtin/update-index.c:95
11382 msgid "failed to create file %s"
11385 #: builtin/update-index.c:103
11387 msgid "failed to delete file %s"
11390 #: builtin/update-index.c:110 builtin/update-index.c:212
11392 msgid "failed to delete directory %s"
11395 #: builtin/update-index.c:133
11397 msgid "Testing mtime in '%s' "
11398 msgstr "在 '%s' 中测试 mtime "
11400 #: builtin/update-index.c:145
11401 msgid "directory stat info does not change after adding a new file"
11402 msgstr "添加一个新文件后,目录的状态信息未改变"
11404 #: builtin/update-index.c:158
11405 msgid "directory stat info does not change after adding a new directory"
11406 msgstr "添加一个新目录后,目录的状态信息未改变"
11408 #: builtin/update-index.c:171
11409 msgid "directory stat info changes after updating a file"
11410 msgstr "更新一个文件后,目录的状态信息被修改"
11412 #: builtin/update-index.c:182
11413 msgid "directory stat info changes after adding a file inside subdirectory"
11414 msgstr "在子目录中添加文件后,目录的状态信息被修改"
11416 #: builtin/update-index.c:193
11417 msgid "directory stat info does not change after deleting a file"
11418 msgstr "删除一个文件后,目录的状态信息未改变"
11420 #: builtin/update-index.c:206
11421 msgid "directory stat info does not change after deleting a directory"
11422 msgstr "删除一个目录后,目录的状态信息未改变"
11424 #: builtin/update-index.c:213
11428 #: builtin/update-index.c:575
11429 msgid "git update-index [<options>] [--] [<file>...]"
11430 msgstr "git update-index [<选项>] [--] [<文件>...]"
11432 #: builtin/update-index.c:930
11433 msgid "continue refresh even when index needs update"
11434 msgstr "当索引需要更新时继续刷新"
11436 #: builtin/update-index.c:933
11437 msgid "refresh: ignore submodules"
11440 #: builtin/update-index.c:936
11441 msgid "do not ignore new files"
11444 #: builtin/update-index.c:938
11445 msgid "let files replace directories and vice-versa"
11446 msgstr "让文件替换目录(反之亦然)"
11448 #: builtin/update-index.c:940
11449 msgid "notice files missing from worktree"
11450 msgstr "通知文件从工作区丢失"
11452 #: builtin/update-index.c:942
11453 msgid "refresh even if index contains unmerged entries"
11454 msgstr "即使索引区包含未合并的条目也执行刷新"
11456 #: builtin/update-index.c:945
11457 msgid "refresh stat information"
11460 #: builtin/update-index.c:949
11461 msgid "like --refresh, but ignore assume-unchanged setting"
11462 msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
11464 #: builtin/update-index.c:953
11465 msgid "<mode>,<object>,<path>"
11466 msgstr "<存取模式>,<对象>,<路径>"
11468 #: builtin/update-index.c:954
11469 msgid "add the specified entry to the index"
11470 msgstr "添加指定的条目到索引区"
11472 #: builtin/update-index.c:958
11476 #: builtin/update-index.c:959
11477 msgid "override the executable bit of the listed files"
11478 msgstr "覆盖列表里文件的可执行位"
11480 #: builtin/update-index.c:963
11481 msgid "mark files as \"not changing\""
11482 msgstr "把文件标记为 \"没有变更\""
11484 #: builtin/update-index.c:966
11485 msgid "clear assumed-unchanged bit"
11486 msgstr "清除 assumed-unchanged 位"
11488 #: builtin/update-index.c:969
11489 msgid "mark files as \"index-only\""
11490 msgstr "把文件标记为 \"仅索引\""
11492 #: builtin/update-index.c:972
11493 msgid "clear skip-worktree bit"
11494 msgstr "清除 skip-worktree 位"
11496 #: builtin/update-index.c:975
11497 msgid "add to index only; do not add content to object database"
11498 msgstr "只添加到索引区;不添加对象到对象库"
11500 #: builtin/update-index.c:977
11501 msgid "remove named paths even if present in worktree"
11502 msgstr "即使存在工作区里,也删除路径"
11504 #: builtin/update-index.c:979
11505 msgid "with --stdin: input lines are terminated by null bytes"
11506 msgstr "携带 --stdin:输入的行以 null 字符终止"
11508 #: builtin/update-index.c:981
11509 msgid "read list of paths to be updated from standard input"
11510 msgstr "从标准输入中读取需要更新的路径列表"
11512 #: builtin/update-index.c:985
11513 msgid "add entries from standard input to the index"
11514 msgstr "从标准输入添加条目到索引区"
11516 #: builtin/update-index.c:989
11517 msgid "repopulate stages #2 and #3 for the listed paths"
11518 msgstr "为指定文件重新生成第2和第3暂存区"
11520 #: builtin/update-index.c:993
11521 msgid "only update entries that differ from HEAD"
11522 msgstr "只更新与 HEAD 不同的条目"
11524 #: builtin/update-index.c:997
11525 msgid "ignore files missing from worktree"
11526 msgstr "忽略工作区丢失的文件"
11528 #: builtin/update-index.c:1000
11529 msgid "report actions to standard output"
11532 #: builtin/update-index.c:1002
11533 msgid "(for porcelains) forget saved unresolved conflicts"
11534 msgstr "(for porcelains) 忘记保存的未解决的冲突"
11536 #: builtin/update-index.c:1006
11537 msgid "write index in this format"
11538 msgstr "以这种格式写入索引区"
11540 #: builtin/update-index.c:1008
11541 msgid "enable or disable split index"
11544 #: builtin/update-index.c:1010
11545 msgid "enable/disable untracked cache"
11546 msgstr "启用/禁用对未跟踪文件的缓存"
11548 #: builtin/update-index.c:1012
11549 msgid "test if the filesystem supports untracked cache"
11550 msgstr "测试文件系统是否支持未跟踪文件缓存"
11552 #: builtin/update-index.c:1014
11553 msgid "enable untracked cache without testing the filesystem"
11554 msgstr "无需检测文件系统,启用对未跟踪文件的缓存"
11556 #: builtin/update-index.c:1134
11557 msgid "Untracked cache disabled"
11558 msgstr "缓存未跟踪文件被禁用"
11560 #: builtin/update-index.c:1146
11562 msgid "Untracked cache enabled for '%s'"
11563 msgstr "缓存未跟踪文件在 '%s' 启用"
11565 #: builtin/update-ref.c:9
11566 msgid "git update-ref [<options>] -d <refname> [<old-val>]"
11567 msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
11569 #: builtin/update-ref.c:10
11570 msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
11571 msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]"
11573 #: builtin/update-ref.c:11
11574 msgid "git update-ref [<options>] --stdin [-z]"
11575 msgstr "git update-ref [<选项>] --stdin [-z]"
11577 #: builtin/update-ref.c:363
11578 msgid "delete the reference"
11581 #: builtin/update-ref.c:365
11582 msgid "update <refname> not the one it points to"
11583 msgstr "更新 <引用名> 本身而不是它指向的引用"
11585 #: builtin/update-ref.c:366
11586 msgid "stdin has NUL-terminated arguments"
11587 msgstr "标准输入有以 NUL 字符终止的参数"
11589 #: builtin/update-ref.c:367
11590 msgid "read updates from stdin"
11593 #: builtin/update-server-info.c:6
11594 msgid "git update-server-info [--force]"
11595 msgstr "git update-server-info [--force]"
11597 #: builtin/update-server-info.c:14
11598 msgid "update the info files from scratch"
11599 msgstr "从头开始更新文件信息"
11601 #: builtin/verify-commit.c:17
11602 msgid "git verify-commit [-v | --verbose] <commit>..."
11603 msgstr "git verify-commit [-v | --verbose] <提交>..."
11605 #: builtin/verify-commit.c:72
11606 msgid "print commit contents"
11609 #: builtin/verify-commit.c:73 builtin/verify-tag.c:35
11610 msgid "print raw gpg status output"
11611 msgstr "打印原始 gpg 状态输出"
11613 #: builtin/verify-pack.c:54
11614 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
11615 msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
11617 #: builtin/verify-pack.c:64
11621 #: builtin/verify-pack.c:66
11622 msgid "show statistics only"
11625 #: builtin/verify-tag.c:17
11626 msgid "git verify-tag [-v | --verbose] <tag>..."
11627 msgstr "git verify-tag [-v | --verbose] <标签>..."
11629 #: builtin/verify-tag.c:34
11630 msgid "print tag contents"
11633 #: builtin/worktree.c:15
11634 msgid "git worktree add [<options>] <path> [<branch>]"
11635 msgstr "git worktree add [<选项>] <路径> [<分支>]"
11637 #: builtin/worktree.c:16
11638 msgid "git worktree prune [<options>]"
11639 msgstr "git worktree prune [<选项>]"
11641 #: builtin/worktree.c:17
11642 msgid "git worktree list [<options>]"
11643 msgstr "git worktree list [<选项>]"
11645 #: builtin/worktree.c:40
11647 msgid "Removing worktrees/%s: not a valid directory"
11648 msgstr "删除工作区/%s:不是一个有效的目录"
11650 #: builtin/worktree.c:46
11652 msgid "Removing worktrees/%s: gitdir file does not exist"
11653 msgstr "删除 worktrees/%s:gitdir 文件不存在"
11655 #: builtin/worktree.c:51
11657 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
11658 msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)"
11660 #: builtin/worktree.c:62
11662 msgid "Removing worktrees/%s: invalid gitdir file"
11663 msgstr "删除 worktrees/%s:无效的 gitdir 文件"
11665 #: builtin/worktree.c:78
11667 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
11668 msgstr "删除 worktrees/%s:gitdir 文件的指向不存在"
11670 #: builtin/worktree.c:113
11672 msgid "failed to remove '%s'"
11675 #: builtin/worktree.c:202
11677 msgid "'%s' already exists"
11680 #: builtin/worktree.c:234
11682 msgid "could not create directory of '%s'"
11683 msgstr "不能创建目录 '%s'"
11685 #: builtin/worktree.c:270
11687 msgid "Preparing %s (identifier %s)"
11688 msgstr "准备 %s (标识符 %s)"
11690 #: builtin/worktree.c:322
11691 msgid "checkout <branch> even if already checked out in other worktree"
11692 msgstr "检出分支 <branch> 即使已经被检出到其它工作区"
11694 #: builtin/worktree.c:324
11695 msgid "create a new branch"
11698 #: builtin/worktree.c:326
11699 msgid "create or reset a branch"
11702 #: builtin/worktree.c:327
11703 msgid "detach HEAD at named commit"
11704 msgstr "HEAD 从指定的提交分离"
11706 #: builtin/worktree.c:328
11707 msgid "populate the new working tree"
11710 #: builtin/worktree.c:336
11711 msgid "-b, -B, and --detach are mutually exclusive"
11712 msgstr "-b、-B 和 --detach 是互斥的"
11714 #: builtin/write-tree.c:13
11715 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
11716 msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
11718 #: builtin/write-tree.c:26
11722 #: builtin/write-tree.c:27
11723 msgid "write tree object for a subdirectory <prefix>"
11724 msgstr "将 <前缀> 子目录内容写到一个树对象"
11726 #: builtin/write-tree.c:30
11727 msgid "only useful for debugging"
11730 #: credential-cache--daemon.c:271
11731 msgid "print debugging messages to stderr"
11732 msgstr "调试信息输出到标准错误"
11736 "'git help -a' and 'git help -g' list available subcommands and some\n"
11737 "concept guides. See 'git help <command>' or 'git help <concept>'\n"
11738 "to read about a specific subcommand or concept."
11740 "命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
11741 "查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
11745 msgid "Public key pinning not supported with cURL < 7.44.0"
11746 msgstr "不支持公钥文件锁定,因为 cURL < 7.44.0"
11749 msgid "start a working area (see also: git help tutorial)"
11750 msgstr "开始一个工作区(参见:git help tutorial)"
11752 #: common-cmds.h:10
11753 msgid "work on the current change (see also: git help everyday)"
11754 msgstr "在当前变更上工作(参见:git help everyday)"
11756 #: common-cmds.h:11
11757 msgid "examine the history and state (see also: git help revisions)"
11758 msgstr "检查历史和状态(参见:git help revisions)"
11760 #: common-cmds.h:12
11761 msgid "grow, mark and tweak your common history"
11762 msgstr "扩展、标记和调校您的历史记录"
11764 #: common-cmds.h:13
11765 msgid "collaborate (see also: git help workflows)"
11766 msgstr "协同(参见:git help workflows)"
11768 #: common-cmds.h:17
11769 msgid "Add file contents to the index"
11772 #: common-cmds.h:18
11773 msgid "Use binary search to find the commit that introduced a bug"
11774 msgstr "通过二分查找定位引入 bug 的提交"
11776 #: common-cmds.h:19
11777 msgid "List, create, or delete branches"
11778 msgstr "列出、创建或删除分支"
11780 #: common-cmds.h:20
11781 msgid "Switch branches or restore working tree files"
11782 msgstr "切换分支或恢复工作区文件"
11784 #: common-cmds.h:21
11785 msgid "Clone a repository into a new directory"
11786 msgstr "克隆一个仓库到一个新目录"
11788 #: common-cmds.h:22
11789 msgid "Record changes to the repository"
11792 #: common-cmds.h:23
11793 msgid "Show changes between commits, commit and working tree, etc"
11794 msgstr "显示提交之间、提交和工作区之间等的差异"
11796 #: common-cmds.h:24
11797 msgid "Download objects and refs from another repository"
11798 msgstr "从另外一个仓库下载对象和引用"
11800 #: common-cmds.h:25
11801 msgid "Print lines matching a pattern"
11804 #: common-cmds.h:26
11805 msgid "Create an empty Git repository or reinitialize an existing one"
11806 msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库"
11808 #: common-cmds.h:27
11809 msgid "Show commit logs"
11812 #: common-cmds.h:28
11813 msgid "Join two or more development histories together"
11814 msgstr "合并两个或更多开发历史"
11816 #: common-cmds.h:29
11817 msgid "Move or rename a file, a directory, or a symlink"
11818 msgstr "移动或重命名一个文件、目录或符号链接"
11820 #: common-cmds.h:30
11821 msgid "Fetch from and integrate with another repository or a local branch"
11822 msgstr "获取并整合另外的仓库或一个本地分支"
11824 #: common-cmds.h:31
11825 msgid "Update remote refs along with associated objects"
11826 msgstr "更新远程引用和相关的对象"
11828 #: common-cmds.h:32
11829 msgid "Reapply commits on top of another base tip"
11830 msgstr "在另一个分支上重新应用提交"
11832 #: common-cmds.h:33
11833 msgid "Reset current HEAD to the specified state"
11834 msgstr "重置当前 HEAD 到指定状态"
11836 #: common-cmds.h:34
11837 msgid "Remove files from the working tree and from the index"
11838 msgstr "从工作区和索引中删除文件"
11840 #: common-cmds.h:35
11841 msgid "Show various types of objects"
11844 #: common-cmds.h:36
11845 msgid "Show the working tree status"
11848 #: common-cmds.h:37
11849 msgid "Create, list, delete or verify a tag object signed with GPG"
11850 msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象"
11852 #: parse-options.h:145
11853 msgid "expiry-date"
11856 #: parse-options.h:160
11857 msgid "no-op (backward compatibility)"
11860 #: parse-options.h:237
11861 msgid "be more verbose"
11864 #: parse-options.h:239
11865 msgid "be more quiet"
11868 #: parse-options.h:245
11869 msgid "use <n> digits to display SHA-1s"
11870 msgstr "用 <n> 位数字显示 SHA-1 哈希值"
11873 msgid "update the index with reused conflict resolution if possible"
11874 msgstr "如果可能,重用冲突解决更新索引"
11876 #: git-bisect.sh:55
11877 msgid "You need to start by \"git bisect start\""
11878 msgstr "您需要执行 \"git bisect start\" 来开始"
11881 #. TRANSLATORS: Make sure to include [Y] and [n] in your
11882 #. translation. The program will only accept English input
11884 #: git-bisect.sh:61
11885 msgid "Do you want me to do it for you [Y/n]? "
11886 msgstr "您想让我为您这样做么[Y/n]? "
11888 #: git-bisect.sh:122
11890 msgid "unrecognised option: '$arg'"
11891 msgstr "未能识别的选项:'$arg'"
11893 #: git-bisect.sh:126
11895 msgid "'$arg' does not appear to be a valid revision"
11896 msgstr "'$arg' 看起来不像是一个有效的版本"
11898 #: git-bisect.sh:155
11899 msgid "Bad HEAD - I need a HEAD"
11900 msgstr "坏的 HEAD - 我需要一个 HEAD"
11902 #: git-bisect.sh:168
11905 "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
11906 msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。"
11908 #: git-bisect.sh:178
11909 msgid "won't bisect on cg-seek'ed tree"
11910 msgstr "不会在做了 cg-seek 的树上做二分查找"
11912 #: git-bisect.sh:182
11913 msgid "Bad HEAD - strange symbolic ref"
11914 msgstr "坏的 HEAD - 奇怪的符号引用"
11916 #: git-bisect.sh:234
11918 msgid "Bad bisect_write argument: $state"
11919 msgstr "坏的 bisect_write 参数:$state"
11921 #: git-bisect.sh:263
11923 msgid "Bad rev input: $arg"
11924 msgstr "输入坏的版本:$arg"
11926 #: git-bisect.sh:278
11927 msgid "Please call 'bisect_state' with at least one argument."
11928 msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
11930 #: git-bisect.sh:290
11932 msgid "Bad rev input: $rev"
11933 msgstr "输入坏的版本:$rev"
11935 #: git-bisect.sh:299
11937 msgid "'git bisect $TERM_BAD' can take only one argument."
11938 msgstr "'git bisect $TERM_BAD' 只能带一个参数。"
11940 #: git-bisect.sh:322
11942 msgid "Warning: bisecting only with a $TERM_BAD commit."
11943 msgstr "警告:在仅有一个坏($TERM_BAD)提交下进行二分查找。"
11946 #. TRANSLATORS: Make sure to include [Y] and [n] in your
11947 #. translation. The program will only accept English input
11949 #: git-bisect.sh:328
11950 msgid "Are you sure [Y/n]? "
11951 msgstr "您确认么[Y/n]? "
11953 #: git-bisect.sh:340
11956 "You need to give me at least one $bad_syn and one $good_syn revision.\n"
11957 "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
11959 "您需要给我至少一个好版本和一个坏版本。\n"
11960 "(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
11962 #: git-bisect.sh:343
11965 "You need to start by \"git bisect start\".\n"
11966 "You then need to give me at least one $good_syn and one $bad_syn revision.\n"
11967 "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
11969 "您需要执行 \"git bisect start\" 来开始。\n"
11970 "然后需要提供我至少一个好版本和一个坏版本。\n"
11971 "(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
11973 #: git-bisect.sh:414 git-bisect.sh:546
11974 msgid "We are not bisecting."
11975 msgstr "我们没有在二分查找。"
11977 #: git-bisect.sh:421
11979 msgid "'$invalid' is not a valid commit"
11980 msgstr "'$invalid' 不是一个有效的提交"
11982 #: git-bisect.sh:430
11985 "Could not check out original HEAD '$branch'.\n"
11986 "Try 'git bisect reset <commit>'."
11988 "不能检出原始 HEAD '$branch'。\n"
11989 "尝试 'git bisect reset <提交>'。"
11991 #: git-bisect.sh:458
11992 msgid "No logfile given"
11995 #: git-bisect.sh:459
11997 msgid "cannot read $file for replaying"
11998 msgstr "不能读取 $file 来重放"
12000 #: git-bisect.sh:480
12001 msgid "?? what are you talking about?"
12004 #: git-bisect.sh:492
12006 msgid "running $command"
12007 msgstr "运行 $command"
12009 #: git-bisect.sh:499
12012 "bisect run failed:\n"
12013 "exit code $res from '$command' is < 0 or >= 128"
12016 "命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
12018 #: git-bisect.sh:525
12019 msgid "bisect run cannot continue any more"
12020 msgstr "二分查找不能继续运行"
12022 #: git-bisect.sh:531
12025 "bisect run failed:\n"
12026 "'bisect_state $state' exited with error code $res"
12029 "'bisect_state $state' 退出码为 $res"
12031 #: git-bisect.sh:538
12032 msgid "bisect run success"
12035 #: git-bisect.sh:565
12036 msgid "please use two different terms"
12037 msgstr "请使用两个不同的术语"
12039 #: git-bisect.sh:575
12041 msgid "'$term' is not a valid term"
12042 msgstr "'$term' 不是一个有效的名称"
12044 #: git-bisect.sh:578
12046 msgid "can't use the builtin command '$term' as a term"
12047 msgstr "不能使用内置命令 '$term' 作为术语"
12049 #: git-bisect.sh:587 git-bisect.sh:593
12051 msgid "can't change the meaning of term '$term'"
12052 msgstr "不能修改术语 '$term' 的含义"
12054 #: git-bisect.sh:606
12056 msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
12057 msgstr "无效的命令:您当前正处于一个 $TERM_BAD/$TERM_GOOD 二分查找。"
12059 #: git-bisect.sh:636
12060 msgid "no terms defined"
12063 #: git-bisect.sh:653
12066 "invalid argument $arg for 'git bisect terms'.\n"
12067 "Supported options are: --term-good|--term-old and --term-bad|--term-new."
12069 "参数 $arg 对命令 'git bisect terms' 无效。\n"
12070 "支持的选项有:--term-good|--term-old 和 --term-bad|--term-new。"
12072 #: git-rebase.sh:57
12074 "When you have resolved this problem, run \"git rebase --continue\".\n"
12075 "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
12076 "To check out the original branch and stop rebasing, run \"git rebase --abort"
12079 "当您解决了此问题后,执行 \"git rebase --continue\"。\n"
12080 "如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
12081 "要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
12083 #: git-rebase.sh:168
12084 msgid "Applied autostash."
12085 msgstr "成功应用 autostash。"
12087 #: git-rebase.sh:171
12089 msgid "Cannot store $stash_sha1"
12090 msgstr "无法保存 $stash_sha1"
12092 #: git-rebase.sh:172
12094 "Applying autostash resulted in conflicts.\n"
12095 "Your changes are safe in the stash.\n"
12096 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
12098 "应用 autostash 导致冲突。\n"
12099 "您的修改安全地保存在 stash 中。\n"
12100 "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
12102 #: git-rebase.sh:211
12103 msgid "The pre-rebase hook refused to rebase."
12104 msgstr "钩子 pre-rebase 拒绝变基操作。"
12106 #: git-rebase.sh:216
12107 msgid "It looks like git-am is in progress. Cannot rebase."
12108 msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
12110 #: git-rebase.sh:357
12111 msgid "No rebase in progress?"
12112 msgstr "没有正在进行的变基?"
12114 #: git-rebase.sh:368
12115 msgid "The --edit-todo action can only be used during interactive rebase."
12116 msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
12118 #: git-rebase.sh:375
12119 msgid "Cannot read HEAD"
12122 #: git-rebase.sh:378
12124 "You must edit all merge conflicts and then\n"
12125 "mark them as resolved using git add"
12127 "您必须编辑所有的合并冲突,然后通过 git add\n"
12130 #: git-rebase.sh:396
12132 msgid "Could not move back to $head_name"
12133 msgstr "无法移回 $head_name"
12135 #: git-rebase.sh:415
12138 "It seems that there is already a $state_dir_base directory, and\n"
12139 "I wonder if you are in the middle of another rebase. If that is the\n"
12140 "case, please try\n"
12141 "\t$cmd_live_rebase\n"
12142 "If that is not the case, please\n"
12143 "\t$cmd_clear_stale_rebase\n"
12144 "and run me again. I am stopping in case you still have something\n"
12147 "好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n"
12149 "\t$cmd_live_rebase\n"
12151 "\t$cmd_clear_stale_rebase\n"
12152 "然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。"
12154 #: git-rebase.sh:466
12156 msgid "invalid upstream $upstream_name"
12157 msgstr "无效的上游 $upstream_name"
12159 #: git-rebase.sh:490
12161 msgid "$onto_name: there are more than one merge bases"
12162 msgstr "$onto_name: 有一个以上的合并基准"
12164 #: git-rebase.sh:493 git-rebase.sh:497
12166 msgid "$onto_name: there is no merge base"
12167 msgstr "$onto_name: 没有合并基准"
12169 #: git-rebase.sh:502
12171 msgid "Does not point to a valid commit: $onto_name"
12172 msgstr "没有指向一个有效的提交:$onto_name"
12174 #: git-rebase.sh:525
12176 msgid "fatal: no such branch: $branch_name"
12177 msgstr "严重错误:无此分支:$branch_name"
12179 #: git-rebase.sh:558
12180 msgid "Cannot autostash"
12181 msgstr "无法 autostash"
12183 #: git-rebase.sh:563
12185 msgid "Created autostash: $stash_abbrev"
12186 msgstr "创建了 autostash: $stash_abbrev"
12188 #: git-rebase.sh:567
12189 msgid "Please commit or stash them."
12190 msgstr "请提交或为它们保存进度。"
12192 #: git-rebase.sh:587
12194 msgid "Current branch $branch_name is up to date."
12195 msgstr "当前分支 $branch_name 是最新的。"
12197 #: git-rebase.sh:591
12199 msgid "Current branch $branch_name is up to date, rebase forced."
12200 msgstr "当前分支 $branch_name 是最新的,强制变基。"
12202 #: git-rebase.sh:602
12204 msgid "Changes from $mb to $onto:"
12205 msgstr "变更从 $mb 到 $onto:"
12207 #: git-rebase.sh:611
12208 msgid "First, rewinding head to replay your work on top of it..."
12209 msgstr "首先,回退分支以便在上面重放您的工作..."
12211 #: git-rebase.sh:621
12213 msgid "Fast-forwarded $branch_name to $onto_name."
12214 msgstr "快进 $branch_name 至 $onto_name。"
12217 msgid "git stash clear with parameters is unimplemented"
12218 msgstr "git stash clear 不支持参数"
12221 msgid "You do not have the initial commit yet"
12225 msgid "Cannot save the current index state"
12226 msgstr "无法保存当前索引状态"
12228 #: git-stash.sh:124 git-stash.sh:137
12229 msgid "Cannot save the current worktree state"
12230 msgstr "无法保存当前工作区状态"
12232 #: git-stash.sh:141
12233 msgid "No changes selected"
12236 #: git-stash.sh:144
12237 msgid "Cannot remove temporary index (can't happen)"
12238 msgstr "无法删除临时索引(不应发生)"
12240 #: git-stash.sh:157
12241 msgid "Cannot record working tree state"
12244 #: git-stash.sh:189
12246 msgid "Cannot update $ref_stash with $w_commit"
12247 msgstr "无法用 $w_commit 更新 $ref_stash"
12249 #. TRANSLATORS: $option is an invalid option, like
12250 #. `--blah-blah'. The 7 spaces at the beginning of the
12251 #. second line correspond to "error: ". So you should line
12252 #. up the second line with however many characters the
12253 #. translation of "error: " takes in your language. E.g. in
12254 #. English this is:
12256 #. $ git stash save --blah-blah 2>&1 | head -n 2
12257 #. error: unknown option for 'stash save': --blah-blah
12258 #. To provide a message, use git stash save -- '--blah-blah'
12259 #: git-stash.sh:239
12262 "error: unknown option for 'stash save': $option\n"
12263 " To provide a message, use git stash save -- '$option'"
12265 "错误:'stash save' 的未知选项:$option\n"
12266 " 要提供一个描述信息,使用 git stash save -- '$option'"
12268 #: git-stash.sh:260
12269 msgid "No local changes to save"
12270 msgstr "没有要保存的本地修改"
12272 #: git-stash.sh:264
12273 msgid "Cannot initialize stash"
12274 msgstr "无法初始化 stash"
12276 #: git-stash.sh:268
12277 msgid "Cannot save the current status"
12280 #: git-stash.sh:286
12281 msgid "Cannot remove worktree changes"
12284 #: git-stash.sh:405
12286 msgid "unknown option: $opt"
12287 msgstr "未知选项: $opt"
12289 #: git-stash.sh:415
12290 msgid "No stash found."
12291 msgstr "未发现 stash。"
12293 #: git-stash.sh:422
12295 msgid "Too many revisions specified: $REV"
12296 msgstr "指定了太多的版本:$REV"
12298 #: git-stash.sh:428
12300 msgid "$reference is not a valid reference"
12301 msgstr "$reference 不是一个有效的引用"
12303 #: git-stash.sh:456
12305 msgid "'$args' is not a stash-like commit"
12306 msgstr "'$args' 不是 stash 样提交"
12308 #: git-stash.sh:467
12310 msgid "'$args' is not a stash reference"
12311 msgstr "'$args' 不是一个 stash 引用"
12313 #: git-stash.sh:475
12314 msgid "unable to refresh index"
12317 #: git-stash.sh:479
12318 msgid "Cannot apply a stash in the middle of a merge"
12319 msgstr "无法在合并过程中恢复进度"
12321 #: git-stash.sh:487
12322 msgid "Conflicts in index. Try without --index."
12323 msgstr "索引中有冲突。尝试不使用 --index。"
12325 #: git-stash.sh:489
12326 msgid "Could not save index tree"
12329 #: git-stash.sh:523
12330 msgid "Cannot unstage modified files"
12331 msgstr "无法将修改的文件取消暂存"
12333 #: git-stash.sh:538
12334 msgid "Index was not unstashed."
12335 msgstr "索引的进度没有被恢复。"
12337 #: git-stash.sh:561
12339 msgid "Dropped ${REV} ($s)"
12340 msgstr "丢弃了 ${REV} ($s)"
12342 #: git-stash.sh:562
12344 msgid "${REV}: Could not drop stash entry"
12345 msgstr "${REV}:不能丢弃进度条目"
12347 #: git-stash.sh:570
12348 msgid "No branch name specified"
12351 #: git-stash.sh:642
12352 msgid "(To restore them type \"git stash apply\")"
12353 msgstr "(为恢复数据输入 \"git stash apply\")"
12355 #: git-submodule.sh:219
12356 msgid "Relative path can only be used from the toplevel of the working tree"
12357 msgstr "只能在工作区的顶级目录中使用相对路径"
12359 #: git-submodule.sh:229
12361 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
12362 msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
12364 #: git-submodule.sh:246
12366 msgid "'$sm_path' already exists in the index"
12367 msgstr "'$sm_path' 已经存在于索引中"
12369 #: git-submodule.sh:250
12372 "The following path is ignored by one of your .gitignore files:\n"
12374 "Use -f if you really want to add it."
12376 "以下路径被您的一个 .gitignore 文件所忽略:\n"
12378 "如果您确实想添加它,使用 -f 参数。"
12380 #: git-submodule.sh:268
12382 msgid "Adding existing repo at '$sm_path' to the index"
12383 msgstr "添加位于 '$sm_path' 的现存仓库到索引"
12385 #: git-submodule.sh:270
12387 msgid "'$sm_path' already exists and is not a valid git repo"
12388 msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库"
12390 #: git-submodule.sh:278
12392 msgid "A git directory for '$sm_name' is found locally with remote(s):"
12393 msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:"
12395 #: git-submodule.sh:280
12398 "If you want to reuse this local git directory instead of cloning again from"
12399 msgstr "如果您想重用此本地 git 目录而不是重新克隆自"
12401 #: git-submodule.sh:282
12404 "use the '--force' option. If the local git directory is not the correct repo"
12405 msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的仓库"
12407 #: git-submodule.sh:283
12410 "or you are unsure what this means choose another name with the '--name' "
12412 msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。"
12414 #: git-submodule.sh:285
12416 msgid "Reactivating local git directory for submodule '$sm_name'."
12417 msgstr "激活本地 git 目录到子模组 '$sm_name'。"
12419 #: git-submodule.sh:297
12421 msgid "Unable to checkout submodule '$sm_path'"
12422 msgstr "不能检出子模组 '$sm_path'"
12424 #: git-submodule.sh:302
12426 msgid "Failed to add submodule '$sm_path'"
12427 msgstr "无法添加子模组 '$sm_path'"
12429 #: git-submodule.sh:311
12431 msgid "Failed to register submodule '$sm_path'"
12432 msgstr "无法注册子模组 '$sm_path'"
12434 #: git-submodule.sh:355
12436 msgid "Entering '$displaypath'"
12437 msgstr "正在进入 '$displaypath'"
12439 #: git-submodule.sh:375
12441 msgid "Stopping at '$displaypath'; script returned non-zero status."
12442 msgstr "停止于 '$displaypath';脚本返回非零值。"
12444 #: git-submodule.sh:448
12446 msgid "pathspec and --all are incompatible"
12447 msgstr "pathspec 和 --all 不兼容"
12449 #: git-submodule.sh:453
12451 msgid "Use '--all' if you really want to deinitialize all submodules"
12452 msgstr "如果您确实想要对所有子模组执行取消初始化,请使用 '--all'"
12454 #: git-submodule.sh:470
12456 msgid "Submodule work tree '$displaypath' contains a .git directory"
12457 msgstr "子模组工作区 '$displaypath' 包含一个 .git 目录"
12459 #: git-submodule.sh:471
12462 "(use 'rm -rf' if you really want to remove it including all of its history)"
12463 msgstr "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
12465 #: git-submodule.sh:477
12468 "Submodule work tree '$displaypath' contains local modifications; use '-f' to "
12470 msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们"
12472 #: git-submodule.sh:480
12474 msgid "Cleared directory '$displaypath'"
12475 msgstr "已清除目录 '$displaypath'"
12477 #: git-submodule.sh:481
12479 msgid "Could not remove submodule work tree '$displaypath'"
12480 msgstr "无法移除子模组工作区 '$displaypath'"
12482 #: git-submodule.sh:484
12484 msgid "Could not create empty submodule directory '$displaypath'"
12485 msgstr "不能创建空的子模组目录 '$displaypath'"
12487 #: git-submodule.sh:493
12489 msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
12490 msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
12492 #: git-submodule.sh:635
12494 msgid "Unable to find current revision in submodule path '$displaypath'"
12495 msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
12497 #: git-submodule.sh:644
12499 msgid "Unable to fetch in submodule path '$sm_path'"
12500 msgstr "无法在子模组路径 '$sm_path' 中获取"
12502 #: git-submodule.sh:667
12504 msgid "Unable to fetch in submodule path '$displaypath'"
12505 msgstr "无法在子模组路径 '$displaypath' 中获取"
12507 #: git-submodule.sh:680
12509 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
12510 msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
12512 #: git-submodule.sh:681
12514 msgid "Submodule path '$displaypath': checked out '$sha1'"
12515 msgstr "子模组路径 '$displaypath':检出 '$sha1'"
12517 #: git-submodule.sh:685
12519 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
12520 msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
12522 #: git-submodule.sh:686
12524 msgid "Submodule path '$displaypath': rebased into '$sha1'"
12525 msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
12527 #: git-submodule.sh:691
12529 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
12530 msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
12532 #: git-submodule.sh:692
12534 msgid "Submodule path '$displaypath': merged in '$sha1'"
12535 msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
12537 #: git-submodule.sh:697
12539 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
12540 msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败"
12542 #: git-submodule.sh:698
12544 msgid "Submodule path '$displaypath': '$command $sha1'"
12545 msgstr "子模组 '$displaypath':'$command $sha1'"
12547 #: git-submodule.sh:729
12549 msgid "Failed to recurse into submodule path '$displaypath'"
12550 msgstr "无法递归进子模组路径 '$displaypath'"
12552 #: git-submodule.sh:837
12553 msgid "The --cached option cannot be used with the --files option"
12554 msgstr "选项 --cached 不能和选项 --files 同时使用"
12556 #: git-submodule.sh:889
12558 msgid "unexpected mode $mod_dst"
12559 msgstr "意外的模式 $mod_dst"
12562 #: git-submodule.sh:909
12564 msgid " Warn: $display_name doesn't contain commit $sha1_src"
12565 msgstr " 警告:$display_name 未包含提交 $sha1_src"
12568 #: git-submodule.sh:912
12570 msgid " Warn: $display_name doesn't contain commit $sha1_dst"
12571 msgstr " 警告:$display_name 未包含提交 $sha1_dst"
12574 #: git-submodule.sh:915
12576 msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
12577 msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
12579 #: git-submodule.sh:940
12583 #: git-submodule.sh:1059
12585 msgid "Failed to recurse into submodule path '$sm_path'"
12586 msgstr "无法递归进子模组路径 '$sm_path'"
12588 #: git-submodule.sh:1123
12590 msgid "Synchronizing submodule url for '$displaypath'"
12591 msgstr "为 '$displaypath' 同步子模组 url"
12593 #: git-parse-remote.sh:89
12595 msgid "See git-${cmd}(1) for details."
12596 msgstr "详见 git-${cmd}(1)。"