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: 2015-12-11 23:36+0800\n"
139 "PO-Revision-Date: 2015-12-14 22:12+0800\n"
140 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
141 "Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
143 "MIME-Version: 1.0\n"
144 "Content-Type: text/plain; charset=UTF-8\n"
145 "Content-Transfer-Encoding: 8bit\n"
146 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
155 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"
156 "as appropriate to mark resolution and make a commit."
158 "请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n"
161 #: advice.c:101 builtin/merge.c:1225
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:1228
209 msgid "prepend prefix to each pathname in the archive"
210 msgstr "为归档中每个路径名加上前缀"
212 #: archive.c:432 builtin/archive.c:88 builtin/blame.c:2535
213 #: builtin/blame.c:2536 builtin/config.c:58 builtin/fast-export.c:987
214 #: builtin/fast-export.c:989 builtin/grep.c:707 builtin/hash-object.c:99
215 #: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:395
216 #: builtin/notes.c:558 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:77
252 #: archive.c:452 builtin/archive.c:91
253 msgid "retrieve the archive from remote repository <repo>"
254 msgstr "从远程仓库(<仓库>)提取归档文件"
256 #: archive.c:453 builtin/archive.c:92 builtin/notes.c:479
260 #: archive.c:454 builtin/archive.c:93
261 msgid "path to the remote git-upload-archive command"
262 msgstr "远程 git-upload-archive 命令的路径"
266 "Negative patterns are ignored in git attributes\n"
267 "Use '\\!' for literal leading exclamation."
269 "负值模版在 git attributes 中被忽略\n"
270 "当字符串确实要以感叹号开始时,使用 '\\!'。"
274 msgid "Not setting branch %s as its own upstream."
275 msgstr "未设置分支 %s 作为它自己的上游。"
279 msgid "Branch %s set up to track remote branch %s from %s by rebasing."
280 msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"
284 msgid "Branch %s set up to track remote branch %s from %s."
285 msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"
289 msgid "Branch %s set up to track local branch %s by rebasing."
290 msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"
294 msgid "Branch %s set up to track local branch %s."
295 msgstr "分支 %s 设置为跟踪本地分支 %s。"
299 msgid "Branch %s set up to track remote ref %s by rebasing."
300 msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"
304 msgid "Branch %s set up to track remote ref %s."
305 msgstr "分支 %s 设置为跟踪远程引用 %s。"
309 msgid "Branch %s set up to track local ref %s by rebasing."
310 msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"
314 msgid "Branch %s set up to track local ref %s."
315 msgstr "分支 %s 设置为跟踪本地引用 %s。"
319 msgid "Not tracking: ambiguous information for ref %s"
320 msgstr "未跟踪:引用 %s 有歧义"
324 msgid "'%s' is not a valid branch name."
325 msgstr "'%s' 不是一个有效的分支名称。"
329 msgid "A branch named '%s' already exists."
330 msgstr "一个分支名 '%s' 已经存在。"
333 msgid "Cannot force update the current branch."
338 msgid "Cannot setup tracking information; starting point '%s' is not a branch."
339 msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
343 msgid "the requested upstream branch '%s' does not exist"
344 msgstr "请求的上游分支 '%s' 不存在"
349 "If you are planning on basing your work on an upstream\n"
350 "branch that already exists at the remote, you may need to\n"
351 "run \"git fetch\" to retrieve it.\n"
353 "If you are planning to push out a new local branch that\n"
354 "will track its remote counterpart, you may want to use\n"
355 "\"git push -u\" to set the upstream config as you push."
358 "如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
359 "您可能需要执行 \"git fetch\" 来获取分支。\n"
361 "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
362 "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
366 msgid "Not a valid object name: '%s'."
367 msgstr "不是一个有效的对象名:'%s'。"
371 msgid "Ambiguous object name: '%s'."
372 msgstr "歧义的对象名:'%s'。"
376 msgid "Not a valid branch point: '%s'."
377 msgstr "无效的分支点:'%s'。"
381 msgid "'%s' is already checked out at '%s'"
382 msgstr "'%s' 已经检出到 '%s'"
386 msgid "'%s' does not look like a v2 bundle file"
387 msgstr "'%s' 不像是一个 v2 版本的包文件"
391 msgid "unrecognized header: %s%s (%d)"
392 msgstr "未能识别的包头:%s%s (%d)"
394 #: bundle.c:87 builtin/commit.c:766
396 msgid "could not open '%s'"
400 msgid "Repository lacks these prerequisite commits:"
401 msgstr "仓库中缺少这些必备的提交:"
403 #: bundle.c:163 ref-filter.c:1372 sequencer.c:636 sequencer.c:1083
404 #: builtin/blame.c:2734 builtin/commit.c:1045 builtin/log.c:334
405 #: builtin/log.c:849 builtin/log.c:1456 builtin/log.c:1689 builtin/merge.c:358
406 #: builtin/shortlog.c:158
407 msgid "revision walk setup failed"
412 msgid "The bundle contains this ref:"
413 msgid_plural "The bundle contains these %d refs:"
414 msgstr[0] "这个包中含有这个引用:"
415 msgstr[1] "这个包中含有 %d 个引用:"
418 msgid "The bundle records a complete history."
419 msgstr "这个包记录一个完整历史。"
423 msgid "The bundle requires this ref:"
424 msgid_plural "The bundle requires these %d refs:"
425 msgstr[0] "这个包需要这个引用:"
426 msgstr[1] "这个包需要 %d 个引用:"
429 msgid "Could not spawn pack-objects"
430 msgstr "不能生成 pack-objects 进程"
433 msgid "pack-objects died"
434 msgstr "pack-objects 终止"
437 msgid "rev-list died"
442 msgid "ref '%s' is excluded by the rev-list options"
443 msgstr "引用 '%s' 被 rev-list 选项排除"
445 #: bundle.c:443 builtin/log.c:157 builtin/log.c:1366 builtin/shortlog.c:261
447 msgid "unrecognized argument: %s"
451 msgid "Refusing to create empty bundle."
456 msgid "cannot create '%s'"
460 msgid "index-pack died"
461 msgstr "index-pack 终止"
465 msgid "invalid color value: %.*s"
468 #: commit.c:40 builtin/am.c:452 builtin/am.c:488 builtin/am.c:1520
471 msgid "could not parse %s"
476 msgid "%s %s is not a commit!"
477 msgstr "%s %s 不是一个提交!"
479 #: compat/obstack.c:406 compat/obstack.c:408
480 msgid "memory exhausted"
483 #: config.c:474 config.c:476
485 msgid "bad config file line %d in %s"
486 msgstr "配置文件 %2$s 出错于第 %1$d 行"
490 msgid "bad numeric config value '%s' for '%s' in %s: %s"
491 msgstr "文件 %3$s 中配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %4$s"
495 msgid "bad numeric config value '%s' for '%s': %s"
496 msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %3$s"
500 msgid "failed to expand user dir in: '%s'"
501 msgstr "无法扩展 '%s' 中的用户目录"
503 #: config.c:757 config.c:768
505 msgid "bad zlib compression level %d"
506 msgstr "错误的 zlib 压缩级别 %d"
510 msgid "invalid mode for object creation: %s"
511 msgstr "无效的对象创建模式:%s"
514 msgid "unable to parse command-line config"
518 msgid "unknown error occured while reading the configuration files"
519 msgstr "在读取配置文件时遇到未知错误"
523 msgid "unable to parse '%s' from command-line config"
524 msgstr "无法解析命令行配置中的 '%s'"
528 msgid "bad config variable '%s' in file '%s' at line %d"
529 msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
533 msgid "%s has multiple values"
537 msgid "Could not run 'git rev-list'"
538 msgstr "不能执行 'git rev-list'"
542 msgid "failed write to rev-list: %s"
543 msgstr "无法写入 rev-list:%s"
547 msgid "failed to close rev-list's stdin: %s"
548 msgstr "无法关闭 rev-list 的标准输入:%s"
551 msgid "in the future"
556 msgid "%lu second ago"
557 msgid_plural "%lu seconds ago"
563 msgid "%lu minute ago"
564 msgid_plural "%lu minutes ago"
571 msgid_plural "%lu hours ago"
578 msgid_plural "%lu days ago"
585 msgid_plural "%lu weeks ago"
591 msgid "%lu month ago"
592 msgid_plural "%lu months ago"
599 msgid_plural "%lu years"
603 #. TRANSLATORS: "%s" is "<n> years"
606 msgid "%s, %lu month ago"
607 msgid_plural "%s, %lu months ago"
608 msgstr[0] "%s %lu 个月前"
609 msgstr[1] "%s %lu 个月前"
611 #: date.c:154 date.c:159
614 msgid_plural "%lu years ago"
618 #: diffcore-order.c:24
620 msgid "failed to read orderfile '%s'"
621 msgstr "无法读取排序文件 '%s'"
623 #: diffcore-rename.c:536
624 msgid "Performing inexact rename detection"
625 msgstr "正在进行非精确的重命名检测"
630 msgid " Failed to parse dirstat cut-off percentage '%s'\n"
631 msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
636 msgid " Unknown dirstat parameter '%s'\n"
637 msgstr " 未知的 dirstat 参数 '%s'\n"
641 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
642 msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
647 "Found errors in 'diff.dirstat' config variable:\n"
650 "发现配置变量 'diff.dirstat' 中的错误:\n"
655 msgid "external diff died, stopping at %s"
656 msgstr "外部 diff 退出,停止在 %s"
659 msgid "--follow requires exactly one pathspec"
660 msgstr "--follow 参数后只跟一个 pathspec"
665 "Failed to parse --dirstat/-X option parameter:\n"
668 "无法解析 --dirstat/-X 选项的参数:\n"
673 msgid "Failed to parse --submodule option parameter: '%s'"
674 msgstr "无法解析 --submodule 选项的参数:'%s'"
677 msgid "failed to get kernel name and information"
681 msgid "Untracked cache is disabled on this system."
682 msgstr "缓存未跟踪文件在本系统被禁用"
684 #: gpg-interface.c:166 gpg-interface.c:237
685 msgid "could not run gpg."
688 #: gpg-interface.c:178
689 msgid "gpg did not accept the data"
692 #: gpg-interface.c:189
693 msgid "gpg failed to sign the data"
696 #: gpg-interface.c:222
698 msgid "could not create temporary file '%s': %s"
699 msgstr "不能创建临时文件 '%s':%s"
701 #: gpg-interface.c:225
703 msgid "failed writing detached signature to '%s': %s"
704 msgstr "无法将分离式签名写入 '%s':%s"
708 msgid "'%s': unable to read %s"
709 msgstr "'%s':无法读取 %s"
718 msgid "'%s': short read %s"
719 msgstr "'%s':读取不完整 %s"
723 msgid "available git commands in '%s'"
724 msgstr "在 '%s' 下可用的 git 命令"
727 msgid "git commands available from elsewhere on your $PATH"
728 msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
731 msgid "These are common Git commands used in various situations:"
732 msgstr "这些是各种场合常见的 Git 命令:"
737 "'%s' appears to be a git command, but we were not\n"
738 "able to execute it. Maybe git-%s is broken?"
740 "'%s' 像是一个 git 命令,但却无法运行。\n"
744 msgid "Uh oh. Your system reports no Git commands at all."
745 msgstr "唉呀,您的系统中未发现 Git 命令。"
750 "WARNING: You called a Git command named '%s', which does not exist.\n"
751 "Continuing under the assumption that you meant '%s'"
753 "警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
758 msgid "in %0.1f seconds automatically..."
759 msgstr "在 %0.1f 秒钟后自动运行..."
763 msgid "git: '%s' is not a git command. See 'git --help'."
764 msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
766 #: help.c:406 help.c:466
772 "Did you mean one of these?"
786 msgid "failed to read the cache"
789 #: merge.c:94 builtin/am.c:2022 builtin/am.c:2057 builtin/checkout.c:376
790 #: builtin/checkout.c:587 builtin/clone.c:722
791 msgid "unable to write new index file"
794 #: merge-recursive.c:189
796 msgid "(bad commit)\n"
799 #: merge-recursive.c:209
801 msgid "addinfo_cache failed for path '%s'"
802 msgstr "为路径 '%s' addinfo_cache 失败"
804 #: merge-recursive.c:270
805 msgid "error building trees"
808 #: merge-recursive.c:686
810 msgid "failed to create path '%s'%s"
811 msgstr "无法创建路径 '%s'%s"
813 #: merge-recursive.c:697
815 msgid "Removing %s to make room for subdirectory\n"
816 msgstr "删除 %s 以便为子目录留出空间\n"
818 #: merge-recursive.c:711 merge-recursive.c:732
819 msgid ": perhaps a D/F conflict?"
820 msgstr ":可能是一个目录/文件冲突?"
822 #: merge-recursive.c:722
824 msgid "refusing to lose untracked file at '%s'"
825 msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
827 #: merge-recursive.c:762
829 msgid "cannot read object %s '%s'"
830 msgstr "不能读取对象 %s '%s'"
832 #: merge-recursive.c:764
834 msgid "blob expected for %s '%s'"
835 msgstr "%s '%s' 应为数据对象"
837 #: merge-recursive.c:787 builtin/clone.c:369
839 msgid "failed to open '%s'"
842 #: merge-recursive.c:795
844 msgid "failed to symlink '%s'"
845 msgstr "无法创建符号链接 '%s'"
847 #: merge-recursive.c:798
849 msgid "do not know what to do with %06o %s '%s'"
850 msgstr "不知道如何处理 %06o %s '%s'"
852 #: merge-recursive.c:936
853 msgid "Failed to execute internal merge"
856 #: merge-recursive.c:940
858 msgid "Unable to add %s to database"
859 msgstr "不能添加 %s 至对象库"
861 #: merge-recursive.c:956
862 msgid "unsupported object type in the tree"
863 msgstr "在树中有不支持的对象类型"
865 #: merge-recursive.c:1031 merge-recursive.c:1045
868 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
871 "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
874 #: merge-recursive.c:1037 merge-recursive.c:1050
877 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
880 "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
883 #: merge-recursive.c:1091
887 #: merge-recursive.c:1091
891 #: merge-recursive.c:1147
893 msgid "%s is a directory in %s adding as %s instead"
894 msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
896 #: merge-recursive.c:1169
899 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
900 "\"->\"%s\" in \"%s\"%s"
902 "冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
903 "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
905 #: merge-recursive.c:1174
906 msgid " (left unresolved)"
909 #: merge-recursive.c:1228
911 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
913 "冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
916 #: merge-recursive.c:1258
918 msgid "Renaming %s to %s and %s to %s instead"
919 msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
921 #: merge-recursive.c:1457
923 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
924 msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
926 #: merge-recursive.c:1467
928 msgid "Adding merged %s"
931 #: merge-recursive.c:1472 merge-recursive.c:1674
933 msgid "Adding as %s instead"
936 #: merge-recursive.c:1523
938 msgid "cannot read object %s"
941 #: merge-recursive.c:1526
943 msgid "object %s is not a blob"
944 msgstr "对象 %s 不是一个数据对象"
946 #: merge-recursive.c:1578
950 #: merge-recursive.c:1578
954 #: merge-recursive.c:1588
958 #: merge-recursive.c:1595
962 #: merge-recursive.c:1629
964 msgid "Skipped %s (merged same as existing)"
965 msgstr "略过 %s(已经做过相同合并)"
967 #: merge-recursive.c:1643
969 msgid "Auto-merging %s"
972 #: merge-recursive.c:1647 git-submodule.sh:1025
976 #: merge-recursive.c:1648
978 msgid "CONFLICT (%s): Merge conflict in %s"
979 msgstr "冲突(%s):合并冲突于 %s"
981 #: merge-recursive.c:1734
986 #: merge-recursive.c:1759
987 msgid "file/directory"
990 #: merge-recursive.c:1765
991 msgid "directory/file"
994 #: merge-recursive.c:1770
996 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
997 msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
999 #: merge-recursive.c:1780
1004 #: merge-recursive.c:1797
1005 msgid "Fatal merge failure, shouldn't happen."
1006 msgstr "严重的合并错误,不应发生。"
1008 #: merge-recursive.c:1816
1009 msgid "Already up-to-date!"
1012 #: merge-recursive.c:1825
1014 msgid "merging of trees %s and %s failed"
1015 msgstr "无法合并树 %s 和 %s"
1017 #: merge-recursive.c:1855
1019 msgid "Unprocessed path??? %s"
1020 msgstr "未处理的路径??? %s"
1022 #: merge-recursive.c:1903
1026 #: merge-recursive.c:1916
1028 msgid "found %u common ancestor:"
1029 msgid_plural "found %u common ancestors:"
1030 msgstr[0] "发现 %u 个共同祖先:"
1031 msgstr[1] "发现 %u 个共同祖先:"
1033 #: merge-recursive.c:1953
1034 msgid "merge returned no commit"
1037 #: merge-recursive.c:2010
1039 msgid "Could not parse object '%s'"
1040 msgstr "不能解析对象 '%s'"
1042 #: merge-recursive.c:2021 builtin/merge.c:645
1043 msgid "Unable to write index."
1047 msgid "Cannot commit uninitialized/unreferenced notes tree"
1048 msgstr "不能提交未初始化/未引用的注解树"
1050 #: notes-utils.c:100
1052 msgid "Bad notes.rewriteMode value: '%s'"
1053 msgstr "坏的 notes.rewriteMode 值:'%s'"
1055 #: notes-utils.c:110
1057 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
1058 msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
1060 #. TRANSLATORS: The first %s is the name of the
1061 #. environment variable, the second %s is its value
1062 #: notes-utils.c:137
1064 msgid "Bad %s value: '%s'"
1065 msgstr "坏的 %s 值:'%s'"
1069 msgid "unable to parse object: %s"
1072 #: parse-options.c:570
1076 #: parse-options.c:588
1081 #. TRANSLATORS: the colon here should align with the
1082 #. one in "usage: %s" translation
1083 #: parse-options.c:592
1088 # 译者:为保证在输出中对齐,注意调整句中空格!
1089 #: parse-options.c:595
1094 #: parse-options.c:629
1098 #: parse-options-cb.c:108
1100 msgid "malformed object name '%s'"
1101 msgstr "非法的对象名 '%s'"
1105 msgid "Could not make %s writable by group"
1106 msgstr "不能设置 %s 为组可写"
1109 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
1110 msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
1114 "global 'literal' pathspec setting is incompatible with all other global "
1116 msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
1119 msgid "invalid parameter for pathspec magic 'prefix'"
1120 msgstr "路径规格包含无效的神奇前缀"
1124 msgid "Invalid pathspec magic '%.*s' in '%s'"
1125 msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
1129 msgid "Missing ')' at the end of pathspec magic in '%s'"
1130 msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
1134 msgid "Unimplemented pathspec magic '%c' in '%s'"
1135 msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
1139 msgid "%s: 'literal' and 'glob' are incompatible"
1140 msgstr "%s:'literal' 和 'glob' 不兼容"
1144 msgid "%s: '%s' is outside repository"
1145 msgstr "%s:'%s' 在仓库之外"
1149 msgid "Pathspec '%s' is in submodule '%.*s'"
1150 msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
1154 msgid "%s: pathspec magic not supported by this command: %s"
1155 msgstr "%s:路径规格神奇前缀不被此命令支持:%s"
1159 msgid "pathspec '%s' is beyond a symbolic link"
1160 msgstr "路径规格 '%s' 位于符号链接中"
1164 "There is nothing to exclude from by :(exclude) patterns.\n"
1165 "Perhaps you forgot to add either ':/' or '.' ?"
1167 "没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"
1171 msgid "unable to parse --pretty format"
1172 msgstr "不能解析 --pretty 格式"
1178 #: read-cache.c:1281
1181 "index.version set, but the value is invalid.\n"
1184 "设置了 index.version,但是取值无效。\n"
1187 #: read-cache.c:1291
1190 "GIT_INDEX_VERSION set, but the value is invalid.\n"
1193 "设置了 GIT_INDEX_VERSION,但是取值无效。\n"
1196 #: refs.c:543 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973
1197 #: builtin/merge.c:983
1199 msgid "Could not open '%s' for writing"
1200 msgstr "无法打开 '%s' 进行写入"
1202 #: refs/files-backend.c:2359
1204 msgid "could not delete reference %s: %s"
1205 msgstr "无法删除引用 %s:%s"
1207 #: refs/files-backend.c:2362
1209 msgid "could not delete references: %s"
1212 #: refs/files-backend.c:2371
1214 msgid "could not remove reference %s"
1219 msgid "format: %%(end) atom used without corresponding atom"
1220 msgstr "格式:使用了 %%(end) 元素却没有它的对应元素"
1224 msgid "positive value expected contents:lines=%s"
1225 msgstr "要为 contents:lines=%s 提供一个正数"
1229 msgid "expected format: %%(color:<color>)"
1230 msgstr "期望的格式:%%(color:<color>)"
1233 msgid "unable to parse format"
1238 msgid "expected format: %%(align:<width>,<position>)"
1239 msgstr "期望的格式:%%(align:<width>,<position>)"
1243 msgid "improper format entered align:%s"
1244 msgstr "输入了不正确的格式 align:%s"
1248 msgid "positive width expected with the %%(align) atom"
1249 msgstr "元素 %%(align) 需要一个正数的宽度"
1251 #: ref-filter.c:1219
1253 msgid "malformed object at '%s'"
1254 msgstr "非法的对象于 '%s'"
1256 #: ref-filter.c:1561
1258 msgid "format: %%(end) atom missing"
1259 msgstr "格式:缺少 %%(end) 元素"
1261 #: ref-filter.c:1615
1263 msgid "malformed object name %s"
1268 msgid "Cannot fetch both %s and %s to %s"
1269 msgstr "不能同时获取 %s 和 %s 至 %s"
1273 msgid "%s usually tracks %s, not %s"
1274 msgstr "%s 通常跟踪 %s,而非 %s"
1278 msgid "%s tracks both %s and %s"
1279 msgstr "%s 同时跟踪 %s 和 %s"
1282 msgid "Internal error"
1285 #: remote.c:1687 remote.c:1730
1286 msgid "HEAD does not point to a branch"
1287 msgstr "HEAD 没有指向一个分支"
1291 msgid "no such branch: '%s'"
1296 msgid "no upstream configured for branch '%s'"
1297 msgstr "尚未给分支 '%s' 设置上游"
1301 msgid "upstream branch '%s' not stored as a remote-tracking branch"
1302 msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
1306 msgid "push destination '%s' on remote '%s' has no local tracking branch"
1307 msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
1311 msgid "branch '%s' has no remote for pushing"
1312 msgstr "分支 '%s' 没有设置要推送的远程服务器"
1316 msgid "push refspecs for '%s' do not include '%s'"
1317 msgstr "向 '%s' 推送引用规格未包含 '%s'"
1320 msgid "push has no destination (push.default is 'nothing')"
1321 msgstr "推送无目标(push.default 是 'nothing')"
1324 msgid "cannot resolve 'simple' push to a single destination"
1325 msgstr "无法解析 'simple' 推送至一个单独的目标"
1329 msgid "Your branch is based on '%s', but the upstream is gone.\n"
1330 msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
1333 msgid " (use \"git branch --unset-upstream\" to fixup)\n"
1334 msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n"
1338 msgid "Your branch is up-to-date with '%s'.\n"
1339 msgstr "您的分支与上游分支 '%s' 一致。\n"
1343 msgid "Your branch is ahead of '%s' by %d commit.\n"
1344 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
1345 msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
1346 msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
1349 msgid " (use \"git push\" to publish your local commits)\n"
1350 msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
1354 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
1356 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
1357 msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
1358 msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
1362 msgid " (use \"git pull\" to update your local branch)\n"
1363 msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
1368 "Your branch and '%s' have diverged,\n"
1369 "and have %d and %d different commit each, respectively.\n"
1371 "Your branch and '%s' have diverged,\n"
1372 "and have %d and %d different commits each, respectively.\n"
1374 "您的分支和 '%s' 出现了偏离,\n"
1375 "并且分别有 %d 和 %d 处不同的提交。\n"
1377 "您的分支和 '%s' 出现了偏离,\n"
1378 "并且分别有 %d 和 %d 处不同的提交。\n"
1382 msgid " (use \"git pull\" to merge the remote branch into yours)\n"
1383 msgstr " (使用 \"git pull\" 来合并远程分支)\n"
1386 msgid "your current branch appears to be broken"
1387 msgstr "您的当前分支好像被损坏"
1391 msgid "your current branch '%s' does not have any commits yet"
1392 msgstr "您的当前分支 '%s' 尚无任何提交"
1395 msgid "--first-parent is incompatible with --bisect"
1396 msgstr "--first-parent 与 --bisect 不兼容"
1399 msgid "open /dev/null failed"
1400 msgstr "不能打开 /dev/null"
1404 msgid "dup2(%d,%d) failed"
1405 msgstr "不能调用 dup2(%d,%d)"
1408 msgid "failed to sign the push certificate"
1412 msgid "the receiving end does not support --signed push"
1417 "not sending a push certificate since the receiving end does not support --"
1419 msgstr "未发送推送证书,因为接收端不支持签名推送"
1422 msgid "the receiving end does not support --atomic push"
1427 "after resolving the conflicts, mark the corrected paths\n"
1428 "with 'git add <paths>' or 'git rm <paths>'"
1430 "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
1435 "after resolving the conflicts, mark the corrected paths\n"
1436 "with 'git add <paths>' or 'git rm <paths>'\n"
1437 "and commit the result with 'git commit'"
1439 "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
1440 "对修正后的文件做标记,然后用 'git commit' 提交"
1442 #: sequencer.c:199 sequencer.c:842 sequencer.c:922
1444 msgid "Could not write to %s"
1449 msgid "Error wrapping up %s"
1453 msgid "Your local changes would be overwritten by cherry-pick."
1454 msgstr "您的本地修改将被拣选操作覆盖。"
1457 msgid "Your local changes would be overwritten by revert."
1458 msgstr "您的本地修改将被还原操作覆盖。"
1461 msgid "Commit your changes or stash them to proceed."
1462 msgstr "提交您的修改或保存进度后再继续。"
1464 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
1467 msgid "%s: Unable to write new index file"
1468 msgstr "%s:无法写入新索引文件"
1471 msgid "Could not resolve HEAD commit\n"
1472 msgstr "不能解析 HEAD 提交\n"
1475 msgid "Unable to update cache tree\n"
1480 msgid "Could not parse commit %s\n"
1481 msgstr "不能解析提交 %s\n"
1485 msgid "Could not parse parent commit %s\n"
1486 msgstr "不能解析父提交 %s\n"
1489 msgid "Your index file is unmerged."
1490 msgstr "您的索引文件未完成合并。"
1494 msgid "Commit %s is a merge but no -m option was given."
1495 msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
1499 msgid "Commit %s does not have parent %d"
1500 msgstr "提交 %s 没有父提交 %d"
1504 msgid "Mainline was specified but commit %s is not a merge."
1505 msgstr "指定了主线但提交 %s 不是一个合并。"
1507 #. TRANSLATORS: The first %s will be "revert" or
1508 #. "cherry-pick", the second %s a SHA1
1511 msgid "%s: cannot parse parent commit %s"
1512 msgstr "%s:不能解析父提交 %s"
1516 msgid "Cannot get commit message for %s"
1517 msgstr "不能得到 %s 的提交说明"
1521 msgid "could not revert %s... %s"
1522 msgstr "不能还原 %s... %s"
1526 msgid "could not apply %s... %s"
1527 msgstr "不能应用 %s... %s"
1530 msgid "empty commit set passed"
1535 msgid "git %s: failed to read the index"
1536 msgstr "git %s:无法读取索引"
1540 msgid "git %s: failed to refresh the index"
1541 msgstr "git %s:无法刷新索引"
1545 msgid "Cannot %s during a %s"
1546 msgstr "无法 %s 在一个 %s 过程中"
1550 msgid "Could not parse line %d."
1551 msgstr "不能解析第 %d 行。"
1554 msgid "No commits parsed."
1559 msgid "Could not open %s"
1564 msgid "Could not read %s."
1569 msgid "Unusable instruction sheet: %s"
1574 msgid "Invalid key: %s"
1577 #: sequencer.c:794 builtin/pull.c:47 builtin/pull.c:49
1579 msgid "Invalid value for %s: %s"
1584 msgid "Malformed options sheet: %s"
1588 msgid "a cherry-pick or revert is already in progress"
1589 msgstr "一个拣选或还原操作已在进行"
1592 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
1593 msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
1597 msgid "Could not create sequencer directory %s"
1598 msgstr "不能创建序列目录 %s"
1600 #: sequencer.c:844 sequencer.c:926
1602 msgid "Error wrapping up %s."
1605 #: sequencer.c:863 sequencer.c:996
1606 msgid "no cherry-pick or revert in progress"
1607 msgstr "拣选或还原操作并未进行"
1610 msgid "cannot resolve HEAD"
1614 msgid "cannot abort from a branch yet to be born"
1615 msgstr "不能从尚未建立的分支终止"
1617 #: sequencer.c:887 builtin/apply.c:4287
1619 msgid "cannot open %s: %s"
1624 msgid "cannot read %s: %s"
1628 msgid "unexpected end of file"
1633 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
1634 msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
1638 msgid "Could not format %s."
1643 msgid "%s: can't cherry-pick a %s"
1644 msgstr "%s:不能拣选一个%s"
1648 msgid "%s: bad revision"
1652 msgid "Can't revert as initial commit"
1656 msgid "Can't cherry-pick into empty head"
1661 msgid "failed to read %s"
1666 "Git normally never creates a ref that ends with 40 hex characters\n"
1667 "because it will be ignored when you just specify 40-hex. These refs\n"
1668 "may be created by mistake. For example,\n"
1670 " git checkout -b $br $(git rev-parse ...)\n"
1672 "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
1673 "examine these refs and maybe delete them. Turn this message off by\n"
1674 "running \"git config advice.objectNameWarning false\""
1676 "Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n"
1677 "十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n"
1679 " git checkout -b $br $(git rev-parse ...)\n"
1681 "当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n"
1682 "可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
1685 #: submodule.c:61 submodule.c:95
1686 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
1687 msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
1689 #: submodule.c:65 submodule.c:99
1691 msgid "Could not find section in .gitmodules where path=%s"
1692 msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
1696 msgid "Could not update .gitmodules entry %s"
1697 msgstr "不能更新 .gitmodules 条目 %s"
1701 msgid "Could not remove .gitmodules entry for %s"
1702 msgstr "无法移除 %s 的 .gitmodules 条目"
1705 msgid "staging updated .gitmodules failed"
1706 msgstr "将更新后 .gitmodules 添加暂存区失败"
1710 msgid "Could not set core.worktree in %s"
1711 msgstr "不能在 %s 中设置 core.worktree"
1713 #: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557
1716 msgid "unknown value '%s' for key '%s'"
1717 msgstr "键 '%2$s' 的未知取值 '%1$s'"
1719 #: trailer.c:543 trailer.c:548 builtin/remote.c:296
1721 msgid "more than one %s"
1726 msgid "empty trailer token in trailer '%.*s'"
1727 msgstr "签名 '%.*s' 的键为空"
1731 msgid "could not read input file '%s'"
1732 msgstr "不能读取输入文件 '%s'"
1735 msgid "could not read from stdin"
1738 #: transport-helper.c:1025
1740 msgid "Could not read ref %s"
1743 #: unpack-trees.c:203
1744 msgid "Checking out files"
1748 msgid "invalid URL scheme name or missing '://' suffix"
1749 msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
1751 #: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
1753 msgid "invalid %XX escape sequence"
1754 msgstr "无效的 %XX 转义序列"
1757 msgid "missing host and scheme is not 'file:'"
1758 msgstr "缺失主机名且 URL 方案不是 'file:'"
1761 msgid "a 'file:' URL may not have a port number"
1762 msgstr "一个 'file:' URL 不应该包含端口号"
1765 msgid "invalid characters in host name"
1766 msgstr "主机名中包含无效的字符"
1768 #: urlmatch.c:244 urlmatch.c:255
1769 msgid "invalid port number"
1773 msgid "invalid '..' path segment"
1774 msgstr "无效的 '..' 路径片段"
1776 #: wrapper.c:219 wrapper.c:362
1778 msgid "could not open '%s' for reading and writing"
1779 msgstr "无法打开 '%s' 进行读写"
1781 #: wrapper.c:221 wrapper.c:364
1783 msgid "could not open '%s' for writing"
1784 msgstr "无法打开 '%s' 进行写入"
1786 #: wrapper.c:223 wrapper.c:366 builtin/am.c:338 builtin/commit.c:1691
1787 #: builtin/merge.c:1074 builtin/pull.c:380
1789 msgid "could not open '%s' for reading"
1790 msgstr "无法打开 '%s' 进行读取"
1794 msgid "unable to access '%s': %s"
1795 msgstr "不能访问 '%s':%s"
1799 msgid "unable to access '%s'"
1804 msgid "unable to look up current user in the passwd file: %s"
1805 msgstr "无法在口令文件中查询到当前用户:%s"
1808 msgid "no such user"
1812 msgid "unable to get current working directory"
1817 msgid "could not open %s for writing"
1820 #: wrapper.c:658 builtin/am.c:425
1822 msgid "could not write to %s"
1827 msgid "could not close %s"
1831 msgid "Unmerged paths:"
1835 #: wt-status.c:176 wt-status.c:203
1837 msgid " (use \"git reset %s <file>...\" to unstage)"
1838 msgstr " (使用 \"git reset %s <文件>...\" 以取消暂存)"
1841 #: wt-status.c:178 wt-status.c:205
1842 msgid " (use \"git rm --cached <file>...\" to unstage)"
1843 msgstr " (使用 \"git rm --cached <文件>...\" 以取消暂存)"
1847 msgid " (use \"git add <file>...\" to mark resolution)"
1848 msgstr " (使用 \"git add <文件>...\" 标记解决方案)"
1851 #: wt-status.c:184 wt-status.c:188
1852 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
1853 msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)"
1857 msgid " (use \"git rm <file>...\" to mark resolution)"
1858 msgstr " (使用 \"git rm <文件>...\" 标记解决方案)"
1860 #: wt-status.c:197 wt-status.c:880
1861 msgid "Changes to be committed:"
1864 #: wt-status.c:215 wt-status.c:889
1865 msgid "Changes not staged for commit:"
1866 msgstr "尚未暂存以备提交的变更:"
1870 msgid " (use \"git add <file>...\" to update what will be committed)"
1871 msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)"
1875 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
1876 msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)"
1881 " (use \"git checkout -- <file>...\" to discard changes in working directory)"
1882 msgstr " (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)"
1886 msgid " (commit or discard the untracked or modified content in submodules)"
1887 msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
1892 msgid " (use \"git %s <file>...\" to include in what will be committed)"
1893 msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)"
1896 msgid "both deleted:"
1900 msgid "added by us:"
1904 msgid "deleted by them:"
1908 msgid "added by them:"
1912 msgid "deleted by us:"
1920 msgid "both modified:"
1925 msgid "bug: unhandled unmerged status %x"
1926 msgstr "bug:无法处理的未合并状态 %x"
1960 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1962 msgid "new commits, "
1965 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1967 msgid "modified content, "
1970 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1972 msgid "untracked content, "
1977 msgid "bug: unhandled diff status %c"
1978 msgstr "bug:无法处理的差异状态 %c"
1981 msgid "Submodules changed but not updated:"
1982 msgstr "子模组已修改但尚未更新:"
1985 msgid "Submodule changes to be committed:"
1990 "Do not touch the line above.\n"
1991 "Everything below will be removed."
1997 msgid "You have unmerged paths."
2002 msgid " (fix conflicts and run \"git commit\")"
2003 msgstr " (解决冲突并运行 \"git commit\")"
2006 msgid "All conflicts fixed but you are still merging."
2007 msgstr "所有冲突已解决但您仍处于合并中。"
2011 msgid " (use \"git commit\" to conclude merge)"
2012 msgstr " (使用 \"git commit\" 结束合并)"
2015 msgid "You are in the middle of an am session."
2016 msgstr "您正处于 am 操作过程中。"
2019 msgid "The current patch is empty."
2024 msgid " (fix conflicts and then run \"git am --continue\")"
2025 msgstr " (解决冲突,然后运行 \"git am --continue\")"
2029 msgid " (use \"git am --skip\" to skip this patch)"
2030 msgstr " (使用 \"git am --skip\" 跳过此补丁)"
2034 msgid " (use \"git am --abort\" to restore the original branch)"
2035 msgstr " (使用 \"git am --abort\" 恢复原有分支)"
2038 msgid "No commands done."
2043 msgid "Last command done (%d command done):"
2044 msgid_plural "Last commands done (%d commands done):"
2045 msgstr[0] "最后一条命令已完成(%d 条命令被执行):"
2046 msgstr[1] "最后的命令已完成(%d 条命令被执行):"
2050 msgid " (see more in file %s)"
2051 msgstr " (更多参见文件 %s)"
2054 msgid "No commands remaining."
2059 msgid "Next command to do (%d remaining command):"
2060 msgid_plural "Next commands to do (%d remaining commands):"
2061 msgstr[0] "接下来要执行的命令(剩余 %d 条命令):"
2062 msgstr[1] "接下来要执行的命令(剩余 %d 条命令):"
2066 msgid " (use \"git rebase --edit-todo\" to view and edit)"
2067 msgstr " (使用 \"git rebase --edit-todo\" 来查看和编辑)"
2071 msgid "You are currently rebasing branch '%s' on '%s'."
2072 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
2075 msgid "You are currently rebasing."
2080 msgid " (fix conflicts and then run \"git rebase --continue\")"
2081 msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
2085 msgid " (use \"git rebase --skip\" to skip this patch)"
2086 msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
2090 msgid " (use \"git rebase --abort\" to check out the original branch)"
2091 msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
2095 msgid " (all conflicts fixed: run \"git rebase --continue\")"
2096 msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
2101 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
2102 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
2105 msgid "You are currently splitting a commit during a rebase."
2106 msgstr "您在执行变基操作时拆分提交。"
2110 msgid " (Once your working directory is clean, run \"git rebase --continue\")"
2111 msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
2115 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
2116 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
2119 msgid "You are currently editing a commit during a rebase."
2120 msgstr "您在执行变基操作时编辑提交。"
2124 msgid " (use \"git commit --amend\" to amend the current commit)"
2125 msgstr " (使用 \"git commit --amend\" 修补当前提交)"
2130 " (use \"git rebase --continue\" once you are satisfied with your changes)"
2131 msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
2135 msgid "You are currently cherry-picking commit %s."
2136 msgstr "您在执行拣选提交 %s 的操作。"
2140 msgid " (fix conflicts and run \"git cherry-pick --continue\")"
2141 msgstr " (解决冲突并运行 \"git cherry-pick --continue\")"
2145 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
2146 msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")"
2150 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
2151 msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
2155 msgid "You are currently reverting commit %s."
2156 msgstr "您在执行反转提交 %s 的操作。"
2160 msgid " (fix conflicts and run \"git revert --continue\")"
2161 msgstr " (解决冲突并运行 \"git revert --continue\")"
2165 msgid " (all conflicts fixed: run \"git revert --continue\")"
2166 msgstr " (所有冲突已解决:运行 \"git revert --continue\")"
2170 msgid " (use \"git revert --abort\" to cancel the revert operation)"
2171 msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
2175 msgid "You are currently bisecting, started from branch '%s'."
2176 msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
2179 msgid "You are currently bisecting."
2180 msgstr "您在执行二分查找操作。"
2184 msgid " (use \"git bisect reset\" to get back to the original branch)"
2185 msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
2192 msgid "interactive rebase in progress; onto "
2193 msgstr "交互式变基操作正在进行中;至 "
2196 msgid "rebase in progress; onto "
2197 msgstr "变基操作正在进行中;至 "
2200 msgid "HEAD detached at "
2204 msgid "HEAD detached from "
2208 msgid "Not currently on any branch."
2212 msgid "Initial commit"
2216 msgid "Untracked files"
2220 msgid "Ignored files"
2226 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
2227 "may speed it up, but you have to be careful not to forget to add\n"
2228 "new files yourself (see 'git help status')."
2230 "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
2231 "但您需要小心不要忘了添加新文件(参见 'git help status')。"
2235 msgid "Untracked files not listed%s"
2236 msgstr "未跟踪的文件没有列出%s"
2238 # 译者:中文字符串拼接,可删除前导空格
2240 msgid " (use -u option to show untracked files)"
2241 msgstr "(使用 -u 参数显示未跟踪的文件)"
2249 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
2250 msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
2254 msgid "no changes added to commit\n"
2260 "nothing added to commit but untracked files present (use \"git add\" to "
2262 msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
2266 msgid "nothing added to commit but untracked files present\n"
2267 msgstr "提交为空,但是存在尚未跟踪的文件\n"
2269 # 译者:中文字符串拼接,可删除前导空格
2272 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
2273 msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
2275 #: wt-status.c:1528 wt-status.c:1533
2277 msgid "nothing to commit\n"
2280 # 译者:中文字符串拼接,可删除前导空格
2283 msgid "nothing to commit (use -u to show untracked files)\n"
2284 msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
2286 # 译者:中文字符串拼接,可删除前导空格
2289 msgid "nothing to commit, working directory clean\n"
2290 msgstr "无文件要提交,干净的工作区\n"
2294 msgid "Initial commit on "
2298 msgid "HEAD (no branch)"
2306 #: wt-status.c:1677 wt-status.c:1685
2310 #: compat/precompose_utf8.c:56 builtin/clone.c:408
2312 msgid "failed to unlink '%s'"
2316 msgid "git add [<options>] [--] <pathspec>..."
2317 msgstr "git add [<选项>] [--] <路径规格>..."
2321 msgid "unexpected diff status %c"
2324 #: builtin/add.c:70 builtin/commit.c:278
2325 msgid "updating files failed"
2330 msgid "remove '%s'\n"
2333 #: builtin/add.c:134
2334 msgid "Unstaged changes after refreshing the index:"
2335 msgstr "刷新索引之后尚未被暂存的变更:"
2337 #: builtin/add.c:194 builtin/rev-parse.c:796
2338 msgid "Could not read the index"
2341 #: builtin/add.c:205
2343 msgid "Could not open '%s' for writing."
2344 msgstr "无法打开 '%s' 进行写入。"
2346 #: builtin/add.c:209
2347 msgid "Could not write patch"
2350 #: builtin/add.c:212
2351 msgid "editing patch failed"
2354 #: builtin/add.c:215
2356 msgid "Could not stat '%s'"
2357 msgstr "不能查看文件状态 '%s'"
2359 #: builtin/add.c:217
2360 msgid "Empty patch. Aborted."
2363 #: builtin/add.c:222
2365 msgid "Could not apply '%s'"
2368 #: builtin/add.c:232
2369 msgid "The following paths are ignored by one of your .gitignore files:\n"
2370 msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
2372 #: builtin/add.c:249 builtin/clean.c:894 builtin/fetch.c:108 builtin/mv.c:110
2373 #: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:545
2374 #: builtin/remote.c:1345 builtin/rm.c:268 builtin/send-pack.c:162
2378 #: builtin/add.c:250 builtin/apply.c:4571 builtin/check-ignore.c:19
2379 #: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558
2380 #: builtin/log.c:1640 builtin/mv.c:109 builtin/read-tree.c:114
2384 #: builtin/add.c:252
2385 msgid "interactive picking"
2388 #: builtin/add.c:253 builtin/checkout.c:1153 builtin/reset.c:286
2389 msgid "select hunks interactively"
2392 #: builtin/add.c:254
2393 msgid "edit current diff and apply"
2396 #: builtin/add.c:255
2397 msgid "allow adding otherwise ignored files"
2400 #: builtin/add.c:256
2401 msgid "update tracked files"
2404 #: builtin/add.c:257
2405 msgid "record only the fact that the path will be added later"
2406 msgstr "只记录,该路径稍后再添加"
2408 #: builtin/add.c:258
2409 msgid "add changes from all tracked and untracked files"
2410 msgstr "添加所有改变的已跟踪文件和未跟踪文件"
2412 #: builtin/add.c:261
2413 msgid "ignore paths removed in the working tree (same as --no-all)"
2414 msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
2416 #: builtin/add.c:263
2417 msgid "don't add, only refresh the index"
2420 #: builtin/add.c:264
2421 msgid "just skip files which cannot be added because of errors"
2422 msgstr "跳过因出错不能添加的文件"
2424 #: builtin/add.c:265
2425 msgid "check if - even missing - files are ignored in dry run"
2426 msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
2428 #: builtin/add.c:287
2430 msgid "Use -f if you really want to add them.\n"
2431 msgstr "使用 -f 参数如果您确实要添加它们。\n"
2433 #: builtin/add.c:294
2434 msgid "adding files failed"
2437 #: builtin/add.c:330
2438 msgid "-A and -u are mutually incompatible"
2439 msgstr "-A 和 -u 选项互斥"
2441 #: builtin/add.c:337
2442 msgid "Option --ignore-missing can only be used together with --dry-run"
2443 msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
2445 #: builtin/add.c:352
2447 msgid "Nothing specified, nothing added.\n"
2448 msgstr "没有指定文件,也没有文件被添加。\n"
2450 #: builtin/add.c:353
2452 msgid "Maybe you wanted to say 'git add .'?\n"
2453 msgstr "也许您想要执行 'git add .'?\n"
2455 #: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:938
2456 #: builtin/commit.c:337 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298
2457 #: builtin/submodule--helper.c:40
2458 msgid "index file corrupt"
2461 #: builtin/add.c:439 builtin/apply.c:4669 builtin/mv.c:279 builtin/rm.c:430
2462 msgid "Unable to write new index file"
2467 msgid "could not stat %s"
2468 msgstr "不能获取 %s 的文件状态"
2470 #: builtin/am.c:271 builtin/commit.c:738 builtin/merge.c:1077
2472 msgid "could not read '%s'"
2476 msgid "could not parse author script"
2481 msgid "'%s' was deleted by the applypatch-msg hook"
2482 msgstr "'%s' 被 applypatch-msg 钩子删除"
2484 #: builtin/am.c:563 builtin/notes.c:300
2486 msgid "Malformed input line: '%s'."
2487 msgstr "非法的输入行:'%s'。"
2489 #: builtin/am.c:600 builtin/notes.c:315
2491 msgid "Failed to copy notes from '%s' to '%s'"
2492 msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
2495 msgid "fseek failed"
2498 #: builtin/am.c:787 builtin/am.c:875
2500 msgid "could not open '%s' for reading: %s"
2501 msgstr "无法打开 '%s' 进行读取:%s"
2505 msgid "could not open '%s' for writing: %s"
2506 msgstr "无法打开 '%s' 进行写入:%s"
2510 msgid "could not parse patch '%s'"
2511 msgstr "无法解析补丁 '%s'"
2514 msgid "Only one StGIT patch series can be applied at once"
2515 msgstr "一次只能有一个 StGIT 补丁队列被应用"
2518 msgid "invalid timestamp"
2521 #: builtin/am.c:919 builtin/am.c:927
2522 msgid "invalid Date line"
2526 msgid "invalid timezone offset"
2529 #: builtin/am.c:1011
2530 msgid "Patch format detection failed."
2533 #: builtin/am.c:1016 builtin/clone.c:373
2535 msgid "failed to create directory '%s'"
2536 msgstr "无法创建目录 '%s'"
2538 #: builtin/am.c:1020
2539 msgid "Failed to split patches."
2542 #: builtin/am.c:1152 builtin/commit.c:363
2543 msgid "unable to write index file"
2546 #: builtin/am.c:1203
2548 msgid "When you have resolved this problem, run \"%s --continue\"."
2549 msgstr "当您解决这一问题,执行 \"%s --continue\"。"
2551 #: builtin/am.c:1204
2553 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
2554 msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。"
2556 #: builtin/am.c:1205
2558 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
2559 msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。"
2561 #: builtin/am.c:1343
2562 msgid "Patch is empty. Was it split wrong?"
2563 msgstr "补丁为空。是不是切分错误?"
2565 #: builtin/am.c:1417 builtin/log.c:1344
2567 msgid "invalid ident line: %s"
2568 msgstr "包含无效的身份标识:%s"
2570 #: builtin/am.c:1444
2572 msgid "unable to parse commit %s"
2575 #: builtin/am.c:1646
2576 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
2577 msgstr "仓库缺乏必要的数据对象以进行三方合并。"
2579 #: builtin/am.c:1648
2580 msgid "Using index info to reconstruct a base tree..."
2581 msgstr "使用索引来重建一个(三方合并的)基础目录树..."
2583 #: builtin/am.c:1667
2585 "Did you hand edit your patch?\n"
2586 "It does not apply to blobs recorded in its index."
2591 #: builtin/am.c:1673
2592 msgid "Falling back to patching base and 3-way merge..."
2593 msgstr "回落到基础版本上打补丁及进行三方合并..."
2595 #: builtin/am.c:1688
2596 msgid "Failed to merge in the changes."
2599 #: builtin/am.c:1712 builtin/merge.c:632
2600 msgid "git write-tree failed to write a tree"
2601 msgstr "git write-tree 无法写入一树对象"
2603 #: builtin/am.c:1719
2604 msgid "applying to an empty history"
2607 #: builtin/am.c:1732 builtin/commit.c:1755 builtin/merge.c:829
2608 #: builtin/merge.c:854
2609 msgid "failed to write commit object"
2612 #: builtin/am.c:1764 builtin/am.c:1768
2614 msgid "cannot resume: %s does not exist."
2615 msgstr "无法继续:%s 不存在。"
2617 #: builtin/am.c:1784
2618 msgid "cannot be interactive without stdin connected to a terminal."
2619 msgstr "标准输入没有和终端关联,不能进行交互式操作。"
2621 #: builtin/am.c:1789
2622 msgid "Commit Body is:"
2626 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
2627 #. in your translation. The program will only accept English
2628 #. input at this point.
2630 #: builtin/am.c:1799
2631 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
2632 msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:"
2634 #: builtin/am.c:1849
2636 msgid "Dirty index: cannot apply patches (dirty: %s)"
2637 msgstr "脏索引:不能应用补丁(脏文件:%s)"
2639 #: builtin/am.c:1884 builtin/am.c:1955
2641 msgid "Applying: %.*s"
2644 #: builtin/am.c:1900
2645 msgid "No changes -- Patch already applied."
2646 msgstr "没有变更 —— 补丁已经应用过。"
2648 #: builtin/am.c:1908
2650 msgid "Patch failed at %s %.*s"
2651 msgstr "打补丁失败于 %s %.*s"
2653 #: builtin/am.c:1914
2655 msgid "The copy of the patch that failed is found in: %s"
2656 msgstr "失败的补丁文件副本位于:%s"
2658 #: builtin/am.c:1958
2660 "No changes - did you forget to use 'git add'?\n"
2661 "If there is nothing left to stage, chances are that something else\n"
2662 "already introduced the same changes; you might want to skip this patch."
2664 "没有变更 —— 您是不是忘了执行 'git add'?\n"
2665 "如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
2668 #: builtin/am.c:1965
2670 "You still have unmerged paths in your index.\n"
2671 "Did you forget to use 'git add'?"
2674 "您是否忘了执行 'git add'?"
2676 #: builtin/am.c:2073 builtin/am.c:2077 builtin/am.c:2089 builtin/reset.c:308
2677 #: builtin/reset.c:316
2679 msgid "Could not parse object '%s'."
2680 msgstr "不能解析对象 '%s'。"
2682 #: builtin/am.c:2125
2683 msgid "failed to clean index"
2686 #: builtin/am.c:2159
2688 "You seem to have moved HEAD since the last 'am' failure.\n"
2689 "Not rewinding to ORIG_HEAD"
2690 msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
2692 #: builtin/am.c:2220
2694 msgid "Invalid value for --patch-format: %s"
2695 msgstr "无效的 --patch-format 值:%s"
2697 #: builtin/am.c:2253
2698 msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
2699 msgstr "git am [<选项>] [(<mbox>|<Maildir>)...]"
2701 #: builtin/am.c:2254
2702 msgid "git am [<options>] (--continue | --skip | --abort)"
2703 msgstr "git am [<选项>] (--continue | --skip | --abort)"
2705 #: builtin/am.c:2260
2706 msgid "run interactively"
2709 #: builtin/am.c:2262
2710 msgid "historical option -- no-op"
2711 msgstr "老的参数 —— 无作用"
2713 #: builtin/am.c:2264
2714 msgid "allow fall back on 3way merging if needed"
2715 msgstr "如果必要,允许使用三方合并。"
2717 #: builtin/am.c:2265 builtin/init-db.c:474 builtin/prune-packed.c:57
2718 #: builtin/repack.c:171
2722 #: builtin/am.c:2267
2723 msgid "add a Signed-off-by line to the commit message"
2724 msgstr "在提交说明中添加一个 Signed-off-by 签名"
2726 #: builtin/am.c:2270
2727 msgid "recode into utf8 (default)"
2728 msgstr "使用 utf8 字符集(默认)"
2730 #: builtin/am.c:2272
2731 msgid "pass -k flag to git-mailinfo"
2732 msgstr "向 git-mailinfo 传递 -k 参数"
2734 #: builtin/am.c:2274
2735 msgid "pass -b flag to git-mailinfo"
2736 msgstr "向 git-mailinfo 传递 -b 参数"
2738 #: builtin/am.c:2276
2739 msgid "pass -m flag to git-mailinfo"
2740 msgstr "向 git-mailinfo 传递 -m 参数"
2742 #: builtin/am.c:2278
2743 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
2744 msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数"
2746 #: builtin/am.c:2281
2747 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
2748 msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置"
2750 #: builtin/am.c:2284
2751 msgid "strip everything before a scissors line"
2752 msgstr "丢弃裁切线前的所有内容"
2754 #: builtin/am.c:2285 builtin/apply.c:4554
2758 #: builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292 builtin/am.c:2295
2759 #: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307
2760 #: builtin/am.c:2313
2761 msgid "pass it through git-apply"
2762 msgstr "传递给 git-apply"
2764 #: builtin/am.c:2294 builtin/apply.c:4578
2768 #: builtin/am.c:2297 builtin/am.c:2300 builtin/apply.c:4516
2769 #: builtin/apply.c:4519 builtin/clone.c:85 builtin/fetch.c:93
2770 #: builtin/pull.c:167 builtin/submodule--helper.c:78
2771 #: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169
2775 #: builtin/am.c:2303 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
2776 #: builtin/grep.c:693 builtin/merge.c:198 builtin/pull.c:127
2777 #: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645
2778 #: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132
2779 #: parse-options.h:134 parse-options.h:244
2783 #: builtin/am.c:2306 builtin/apply.c:4522
2787 #: builtin/am.c:2309 builtin/for-each-ref.c:37 builtin/replace.c:438
2788 #: builtin/tag.c:372
2792 #: builtin/am.c:2310
2793 msgid "format the patch(es) are in"
2796 #: builtin/am.c:2316
2797 msgid "override error message when patch failure occurs"
2798 msgstr "打补丁失败时显示的错误信息"
2800 #: builtin/am.c:2318
2801 msgid "continue applying patches after resolving a conflict"
2802 msgstr "冲突解决后继续应用补丁"
2804 #: builtin/am.c:2321
2805 msgid "synonyms for --continue"
2806 msgstr "和 --continue 同义"
2808 #: builtin/am.c:2324
2809 msgid "skip the current patch"
2812 #: builtin/am.c:2327
2813 msgid "restore the original branch and abort the patching operation."
2814 msgstr "恢复原始分支并终止打补丁操作。"
2816 #: builtin/am.c:2331
2817 msgid "lie about committer date"
2818 msgstr "将作者日期作为提交日期"
2820 #: builtin/am.c:2333
2821 msgid "use current timestamp for author date"
2822 msgstr "用当前时间作为作者日期"
2824 #: builtin/am.c:2335 builtin/commit.c:1593 builtin/merge.c:225
2825 #: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:355
2829 #: builtin/am.c:2336
2830 msgid "GPG-sign commits"
2831 msgstr "使用 GPG 签名提交"
2833 #: builtin/am.c:2339
2834 msgid "(internal use for git-rebase)"
2835 msgstr "(内部使用,用于 git-rebase)"
2837 #: builtin/am.c:2354
2839 "The -b/--binary option has been a no-op for long time, and\n"
2840 "it will be removed. Please do not use it anymore."
2842 "参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n"
2845 #: builtin/am.c:2361
2846 msgid "failed to read the index"
2849 #: builtin/am.c:2376
2851 msgid "previous rebase directory %s still exists but mbox given."
2852 msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。"
2854 #: builtin/am.c:2400
2857 "Stray %s directory found.\n"
2858 "Use \"git am --abort\" to remove it."
2861 "使用 \"git am --abort\" 删除它。"
2863 #: builtin/am.c:2406
2864 msgid "Resolve operation not in progress, we are not resuming."
2865 msgstr "解决操作未进行,我们不会继续。"
2867 #: builtin/apply.c:59
2868 msgid "git apply [<options>] [<patch>...]"
2869 msgstr "git apply [<选项>] [<补丁>...]"
2871 #: builtin/apply.c:111
2873 msgid "unrecognized whitespace option '%s'"
2874 msgstr "未能识别的空白字符选项 '%s'"
2876 #: builtin/apply.c:126
2878 msgid "unrecognized whitespace ignore option '%s'"
2879 msgstr "未能识别的空白字符忽略选项 '%s'"
2881 #: builtin/apply.c:818
2883 msgid "Cannot prepare timestamp regexp %s"
2884 msgstr "无法准备时间戳正则表达式 %s"
2886 #: builtin/apply.c:827
2888 msgid "regexec returned %d for input: %s"
2889 msgstr "regexec 返回 %d,输入为:%s"
2891 #: builtin/apply.c:908
2893 msgid "unable to find filename in patch at line %d"
2894 msgstr "不能在补丁的第 %d 行找到文件名"
2896 #: builtin/apply.c:940
2898 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
2899 msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
2901 #: builtin/apply.c:944
2903 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
2904 msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
2906 #: builtin/apply.c:945
2908 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
2909 msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
2911 #: builtin/apply.c:952
2913 msgid "git apply: bad git-diff - expected /dev/null on line %d"
2914 msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
2916 #: builtin/apply.c:1415
2918 msgid "recount: unexpected line: %.*s"
2919 msgstr "recount:意外的行:%.*s"
2921 #: builtin/apply.c:1472
2923 msgid "patch fragment without header at line %d: %.*s"
2924 msgstr "第 %d 行的补丁片段没有头信息:%.*s"
2926 #: builtin/apply.c:1489
2929 "git diff header lacks filename information when removing %d leading pathname "
2930 "component (line %d)"
2932 "git diff header lacks filename information when removing %d leading pathname "
2933 "components (line %d)"
2934 msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
2935 msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
2937 #: builtin/apply.c:1655
2938 msgid "new file depends on old contents"
2941 #: builtin/apply.c:1657
2942 msgid "deleted file still has contents"
2945 #: builtin/apply.c:1683
2947 msgid "corrupt patch at line %d"
2948 msgstr "补丁在第 %d 行损坏"
2950 #: builtin/apply.c:1719
2952 msgid "new file %s depends on old contents"
2953 msgstr "新文件 %s 依赖旧内容"
2955 #: builtin/apply.c:1721
2957 msgid "deleted file %s still has contents"
2958 msgstr "删除的文件 %s 仍有内容"
2960 #: builtin/apply.c:1724
2962 msgid "** warning: file %s becomes empty but is not deleted"
2963 msgstr "** 警告:文件 %s 成为空文件但并未删除"
2965 #: builtin/apply.c:1870
2967 msgid "corrupt binary patch at line %d: %.*s"
2968 msgstr "二进制补丁在第 %d 行损坏:%.*s"
2970 #: builtin/apply.c:1899
2972 msgid "unrecognized binary patch at line %d"
2973 msgstr "未能识别的二进制补丁位于第 %d 行"
2975 #: builtin/apply.c:2050
2977 msgid "patch with only garbage at line %d"
2978 msgstr "补丁文件的第 %d 行只有垃圾数据"
2980 #: builtin/apply.c:2140
2982 msgid "unable to read symlink %s"
2983 msgstr "无法读取符号链接 %s"
2985 #: builtin/apply.c:2144
2987 msgid "unable to open or read %s"
2990 #: builtin/apply.c:2777
2992 msgid "invalid start of line: '%c'"
2993 msgstr "无效的行首字符:'%c'"
2995 #: builtin/apply.c:2896
2997 msgid "Hunk #%d succeeded at %d (offset %d line)."
2998 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
2999 msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
3000 msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
3002 #: builtin/apply.c:2908
3004 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
3005 msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
3007 #: builtin/apply.c:2914
3010 "while searching for:\n"
3016 #: builtin/apply.c:2934
3018 msgid "missing binary patch data for '%s'"
3019 msgstr "缺失 '%s' 的二进制补丁数据"
3021 #: builtin/apply.c:3035
3023 msgid "binary patch does not apply to '%s'"
3024 msgstr "二进制补丁未应用到 '%s'"
3026 #: builtin/apply.c:3041
3028 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
3029 msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
3031 #: builtin/apply.c:3062
3033 msgid "patch failed: %s:%ld"
3034 msgstr "打补丁失败:%s:%ld"
3036 #: builtin/apply.c:3186
3038 msgid "cannot checkout %s"
3041 #: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287
3043 msgid "read of %s failed"
3046 #: builtin/apply.c:3239
3048 msgid "reading from '%s' beyond a symbolic link"
3049 msgstr "读取位于符号链接中的 '%s'"
3051 #: builtin/apply.c:3267 builtin/apply.c:3489
3053 msgid "path %s has been renamed/deleted"
3054 msgstr "路径 %s 已经被重命名/删除"
3056 #: builtin/apply.c:3348 builtin/apply.c:3503
3058 msgid "%s: does not exist in index"
3061 #: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517
3066 #: builtin/apply.c:3357 builtin/apply.c:3511
3068 msgid "%s: does not match index"
3071 #: builtin/apply.c:3459
3072 msgid "removal patch leaves file contents"
3073 msgstr "移除补丁仍留下了文件内容"
3075 #: builtin/apply.c:3528
3077 msgid "%s: wrong type"
3080 #: builtin/apply.c:3530
3082 msgid "%s has type %o, expected %o"
3083 msgstr "%s 的类型是 %o,应为 %o"
3085 #: builtin/apply.c:3689 builtin/apply.c:3691
3087 msgid "invalid path '%s'"
3090 #: builtin/apply.c:3746
3092 msgid "%s: already exists in index"
3093 msgstr "%s:已经存在于索引中"
3095 #: builtin/apply.c:3749
3097 msgid "%s: already exists in working directory"
3098 msgstr "%s:已经存在于工作区中"
3100 #: builtin/apply.c:3769
3102 msgid "new mode (%o) of %s does not match old mode (%o)"
3103 msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
3105 #: builtin/apply.c:3774
3107 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
3108 msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
3110 #: builtin/apply.c:3794
3112 msgid "affected file '%s' is beyond a symbolic link"
3113 msgstr "受影响的文件 '%s' 位于符号链接中"
3115 #: builtin/apply.c:3798
3117 msgid "%s: patch does not apply"
3120 #: builtin/apply.c:3812
3122 msgid "Checking patch %s..."
3125 #: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135
3127 msgid "make_cache_entry failed for path '%s'"
3128 msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
3130 #: builtin/apply.c:4048
3132 msgid "unable to remove %s from index"
3133 msgstr "不能从索引中移除 %s"
3135 #: builtin/apply.c:4077
3137 msgid "corrupt patch for submodule %s"
3138 msgstr "子模组 %s 损坏的补丁"
3140 #: builtin/apply.c:4081
3142 msgid "unable to stat newly created file '%s'"
3143 msgstr "不能枚举新建文件 '%s' 的状态"
3145 #: builtin/apply.c:4086
3147 msgid "unable to create backing store for newly created file %s"
3148 msgstr "不能为新建文件 %s 创建后端存储"
3150 #: builtin/apply.c:4089 builtin/apply.c:4197
3152 msgid "unable to add cache entry for %s"
3153 msgstr "无法为 %s 添加缓存条目"
3155 #: builtin/apply.c:4122
3157 msgid "closing file '%s'"
3160 #: builtin/apply.c:4171
3162 msgid "unable to write file '%s' mode %o"
3163 msgstr "不能写文件 '%s' 权限 %o"
3165 #: builtin/apply.c:4258
3167 msgid "Applied patch %s cleanly."
3170 #: builtin/apply.c:4266
3171 msgid "internal error"
3174 #: builtin/apply.c:4269
3176 msgid "Applying patch %%s with %d reject..."
3177 msgid_plural "Applying patch %%s with %d rejects..."
3178 msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
3179 msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
3181 #: builtin/apply.c:4279
3183 msgid "truncating .rej filename to %.*s.rej"
3184 msgstr "截短 .rej 文件名为 %.*s.rej"
3186 #: builtin/apply.c:4300
3188 msgid "Hunk #%d applied cleanly."
3189 msgstr "第 #%d 个片段成功应用。"
3191 #: builtin/apply.c:4303
3193 msgid "Rejected hunk #%d."
3194 msgstr "拒绝第 #%d 个片段。"
3196 #: builtin/apply.c:4393
3197 msgid "unrecognized input"
3200 #: builtin/apply.c:4404
3201 msgid "unable to read index file"
3204 #: builtin/apply.c:4517
3205 msgid "don't apply changes matching the given path"
3206 msgstr "不要应用与给出路径向匹配的变更"
3208 #: builtin/apply.c:4520
3209 msgid "apply changes matching the given path"
3210 msgstr "应用与给出路径向匹配的变更"
3212 #: builtin/apply.c:4523
3213 msgid "remove <num> leading slashes from traditional diff paths"
3214 msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
3216 #: builtin/apply.c:4526
3217 msgid "ignore additions made by the patch"
3218 msgstr "忽略补丁中的添加的文件"
3220 #: builtin/apply.c:4528
3221 msgid "instead of applying the patch, output diffstat for the input"
3222 msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
3224 #: builtin/apply.c:4532
3225 msgid "show number of added and deleted lines in decimal notation"
3226 msgstr "以十进制数显示添加和删除的行数"
3228 #: builtin/apply.c:4534
3229 msgid "instead of applying the patch, output a summary for the input"
3230 msgstr "不应用补丁,而是显示输入的概要"
3232 #: builtin/apply.c:4536
3233 msgid "instead of applying the patch, see if the patch is applicable"
3234 msgstr "不应用补丁,而是查看补丁是否可应用"
3236 #: builtin/apply.c:4538
3237 msgid "make sure the patch is applicable to the current index"
3238 msgstr "确认补丁可以应用到当前索引"
3240 #: builtin/apply.c:4540
3241 msgid "apply a patch without touching the working tree"
3242 msgstr "应用补丁而不修改工作区"
3244 #: builtin/apply.c:4542
3245 msgid "accept a patch that touches outside the working area"
3246 msgstr "接受修改工作区之外文件的补丁"
3248 #: builtin/apply.c:4544
3249 msgid "also apply the patch (use with --stat/--summary/--check)"
3250 msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
3252 #: builtin/apply.c:4546
3253 msgid "attempt three-way merge if a patch does not apply"
3254 msgstr "如果一个补丁不能应用则尝试三方合并"
3256 #: builtin/apply.c:4548
3257 msgid "build a temporary index based on embedded index information"
3258 msgstr "创建一个临时索引基于嵌入的索引信息"
3260 #: builtin/apply.c:4550 builtin/checkout-index.c:198 builtin/ls-files.c:412
3261 msgid "paths are separated with NUL character"
3262 msgstr "路径以 NUL 字符分隔"
3264 #: builtin/apply.c:4553
3265 msgid "ensure at least <n> lines of context match"
3266 msgstr "确保至少匹配 <n> 行上下文"
3268 #: builtin/apply.c:4555
3269 msgid "detect new or modified lines that have whitespace errors"
3270 msgstr "检查新增和修改的行中间的空白字符滥用"
3272 #: builtin/apply.c:4558 builtin/apply.c:4561
3273 msgid "ignore changes in whitespace when finding context"
3274 msgstr "查找上下文时忽略空白字符的变更"
3276 #: builtin/apply.c:4564
3277 msgid "apply the patch in reverse"
3280 #: builtin/apply.c:4566
3281 msgid "don't expect at least one line of context"
3284 #: builtin/apply.c:4568
3285 msgid "leave the rejected hunks in corresponding *.rej files"
3286 msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
3288 #: builtin/apply.c:4570
3289 msgid "allow overlapping hunks"
3292 #: builtin/apply.c:4573
3293 msgid "tolerate incorrectly detected missing new-line at the end of file"
3294 msgstr "允许不正确的文件末尾换行符"
3296 #: builtin/apply.c:4576
3297 msgid "do not trust the line counts in the hunk headers"
3298 msgstr "不信任补丁片段的头信息中的行号"
3300 #: builtin/apply.c:4579
3301 msgid "prepend <root> to all filenames"
3302 msgstr "为所有文件名前添加 <根目录>"
3304 #: builtin/apply.c:4601
3305 msgid "--3way outside a repository"
3306 msgstr "--3way 在一个仓库之外"
3308 #: builtin/apply.c:4609
3309 msgid "--index outside a repository"
3310 msgstr "--index 在一个仓库之外"
3312 #: builtin/apply.c:4612
3313 msgid "--cached outside a repository"
3314 msgstr "--cached 在一个仓库之外"
3316 #: builtin/apply.c:4631
3318 msgid "can't open patch '%s'"
3319 msgstr "不能打开补丁 '%s'"
3321 #: builtin/apply.c:4645
3323 msgid "squelched %d whitespace error"
3324 msgid_plural "squelched %d whitespace errors"
3325 msgstr[0] "抑制下仍有 %d 个空白字符误用"
3326 msgstr[1] "抑制下仍有 %d 个空白字符误用"
3328 #: builtin/apply.c:4651 builtin/apply.c:4661
3330 msgid "%d line adds whitespace errors."
3331 msgid_plural "%d lines add whitespace errors."
3332 msgstr[0] "%d 行有空白字符误用。"
3333 msgstr[1] "%d 行有空白字符误用。"
3335 #: builtin/archive.c:17
3337 msgid "could not create archive file '%s'"
3338 msgstr "不能创建归档文件 '%s'"
3340 #: builtin/archive.c:20
3341 msgid "could not redirect output"
3344 #: builtin/archive.c:37
3345 msgid "git archive: Remote with no URL"
3346 msgstr "git archive:未提供远程 URL"
3348 #: builtin/archive.c:58
3349 msgid "git archive: expected ACK/NAK, got EOF"
3350 msgstr "git archive:应为 ACK/NACK,却得到 EOF"
3352 #: builtin/archive.c:61
3354 msgid "git archive: NACK %s"
3355 msgstr "git archive:NACK %s"
3357 #: builtin/archive.c:63
3359 msgid "remote error: %s"
3362 #: builtin/archive.c:64
3363 msgid "git archive: protocol error"
3364 msgstr "git archive:协议错误"
3366 #: builtin/archive.c:68
3367 msgid "git archive: expected a flush"
3368 msgstr "git archive:应为刷新"
3370 #: builtin/bisect--helper.c:7
3371 msgid "git bisect--helper --next-all [--no-checkout]"
3372 msgstr "git bisect--helper --next-all [--no-checkout]"
3374 #: builtin/bisect--helper.c:17
3375 msgid "perform 'git bisect next'"
3376 msgstr "执行 'git bisect next'"
3378 #: builtin/bisect--helper.c:19
3379 msgid "update BISECT_HEAD instead of checking out the current commit"
3380 msgstr "更新 BISECT_HEAD 而非检出当前提交"
3382 #: builtin/blame.c:32
3383 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
3384 msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
3386 #: builtin/blame.c:37
3387 msgid "<rev-opts> are documented in git-rev-list(1)"
3388 msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
3390 #: builtin/blame.c:2519
3391 msgid "Show blame entries as we find them, incrementally"
3392 msgstr "增量式地显示发现的 blame 条目"
3394 #: builtin/blame.c:2520
3395 msgid "Show blank SHA-1 for boundary commits (Default: off)"
3396 msgstr "边界提交显示空的 SHA-1(默认:关闭)"
3398 #: builtin/blame.c:2521
3399 msgid "Do not treat root commits as boundaries (Default: off)"
3400 msgstr "不把根提交作为边界(默认:关闭)"
3402 #: builtin/blame.c:2522
3403 msgid "Show work cost statistics"
3406 #: builtin/blame.c:2523
3407 msgid "Show output score for blame entries"
3408 msgstr "显示判断 blame 条目位移的得分诊断信息"
3410 #: builtin/blame.c:2524
3411 msgid "Show original filename (Default: auto)"
3412 msgstr "显示原始文件名(默认:自动)"
3414 #: builtin/blame.c:2525
3415 msgid "Show original linenumber (Default: off)"
3416 msgstr "显示原始的行号(默认:关闭)"
3418 #: builtin/blame.c:2526
3419 msgid "Show in a format designed for machine consumption"
3420 msgstr "显示为一个适合机器读取的格式"
3422 #: builtin/blame.c:2527
3423 msgid "Show porcelain format with per-line commit information"
3424 msgstr "为每一行显示机器适用的提交信息"
3426 #: builtin/blame.c:2528
3427 msgid "Use the same output mode as git-annotate (Default: off)"
3428 msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
3430 #: builtin/blame.c:2529
3431 msgid "Show raw timestamp (Default: off)"
3432 msgstr "显示原始时间戳(默认:关闭)"
3434 #: builtin/blame.c:2530
3435 msgid "Show long commit SHA1 (Default: off)"
3436 msgstr "显示长的 SHA1 提交号(默认:关闭)"
3438 #: builtin/blame.c:2531
3439 msgid "Suppress author name and timestamp (Default: off)"
3440 msgstr "隐藏作者名字和时间戳(默认:关闭)"
3442 #: builtin/blame.c:2532
3443 msgid "Show author email instead of name (Default: off)"
3444 msgstr "显示作者的邮箱而不是名字(默认:关闭)"
3446 #: builtin/blame.c:2533
3447 msgid "Ignore whitespace differences"
3450 #: builtin/blame.c:2534
3451 msgid "Spend extra cycles to find better match"
3452 msgstr "花费额外的循环来找到更好的匹配"
3454 #: builtin/blame.c:2535
3455 msgid "Use revisions from <file> instead of calling git-rev-list"
3456 msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
3458 #: builtin/blame.c:2536
3459 msgid "Use <file>'s contents as the final image"
3460 msgstr "使用 <文件> 的内容作为最终的图片"
3462 #: builtin/blame.c:2537 builtin/blame.c:2538
3466 #: builtin/blame.c:2537
3467 msgid "Find line copies within and across files"
3468 msgstr "找到文件内及跨文件的行拷贝"
3470 #: builtin/blame.c:2538
3471 msgid "Find line movements within and across files"
3472 msgstr "找到文件内及跨文件的行移动"
3474 #: builtin/blame.c:2539
3478 #: builtin/blame.c:2539
3479 msgid "Process only line range n,m, counting from 1"
3480 msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
3482 #. TRANSLATORS: This string is used to tell us the maximum
3483 #. display width for a relative timestamp in "git blame"
3484 #. output. For C locale, "4 years, 11 months ago", which
3485 #. takes 22 places, is the longest among various forms of
3486 #. relative timestamps, but your language may need more or
3487 #. fewer display columns.
3488 #: builtin/blame.c:2620
3489 msgid "4 years, 11 months ago"
3492 #: builtin/branch.c:25
3493 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
3494 msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
3496 #: builtin/branch.c:26
3497 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
3498 msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
3500 #: builtin/branch.c:27
3501 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
3502 msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
3504 #: builtin/branch.c:28
3505 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
3506 msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
3508 #: builtin/branch.c:29
3509 msgid "git branch [<options>] [-r | -a] [--points-at]"
3510 msgstr "git branch [<选项>] [-r | -a] [--points-at]"
3512 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
3513 #: builtin/branch.c:142
3516 "deleting branch '%s' that has been merged to\n"
3517 " '%s', but not yet merged to HEAD."
3519 "将要删除的分支 '%s' 已经被合并到\n"
3522 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
3523 #: builtin/branch.c:146
3526 "not deleting branch '%s' that is not yet merged to\n"
3527 " '%s', even though it is merged to HEAD."
3529 "并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
3530 " 然而却尚未被合并到分支 '%s' 。"
3532 #: builtin/branch.c:160
3534 msgid "Couldn't look up commit object for '%s'"
3535 msgstr "无法查询 '%s' 指向的提交对象"
3537 #: builtin/branch.c:164
3540 "The branch '%s' is not fully merged.\n"
3541 "If you are sure you want to delete it, run 'git branch -D %s'."
3544 "如果您确认要删除它,执行 'git branch -D %s'。"
3546 #: builtin/branch.c:177
3547 msgid "Update of config-file failed"
3548 msgstr "无法更新 config 文件"
3550 #: builtin/branch.c:205
3551 msgid "cannot use -a with -d"
3552 msgstr "不能将 -a 和 -d 同时使用"
3554 #: builtin/branch.c:211
3555 msgid "Couldn't look up commit object for HEAD"
3556 msgstr "无法查询 HEAD 指向的提交对象"
3558 #: builtin/branch.c:219
3560 msgid "Cannot delete the branch '%s' which you are currently on."
3561 msgstr "无法删除您当前所在的分支 '%s'。"
3563 #: builtin/branch.c:235
3565 msgid "remote-tracking branch '%s' not found."
3566 msgstr "未能找到远程跟踪分支 '%s'。"
3568 #: builtin/branch.c:236
3570 msgid "branch '%s' not found."
3571 msgstr "分支 '%s' 未发现。"
3573 #: builtin/branch.c:251
3575 msgid "Error deleting remote-tracking branch '%s'"
3576 msgstr "无法删除远程跟踪分支 '%s'"
3578 #: builtin/branch.c:252
3580 msgid "Error deleting branch '%s'"
3581 msgstr "无法删除分支 '%s'"
3583 #: builtin/branch.c:259
3585 msgid "Deleted remote-tracking branch %s (was %s).\n"
3586 msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n"
3588 #: builtin/branch.c:260
3590 msgid "Deleted branch %s (was %s).\n"
3591 msgstr "已删除分支 %s(曾为 %s)。\n"
3593 #: builtin/branch.c:303
3598 #: builtin/branch.c:308
3603 #: builtin/branch.c:313
3605 msgid "[%s: behind %d]"
3608 #: builtin/branch.c:315
3613 #: builtin/branch.c:319
3615 msgid "[%s: ahead %d]"
3618 #: builtin/branch.c:321
3623 #: builtin/branch.c:324
3625 msgid "[%s: ahead %d, behind %d]"
3626 msgstr "[%s:领先 %d,落后 %d]"
3628 #: builtin/branch.c:327
3630 msgid "[ahead %d, behind %d]"
3631 msgstr "[领先 %d,落后 %d]"
3633 #: builtin/branch.c:340
3634 msgid " **** invalid ref ****"
3635 msgstr " **** 无效引用 ****"
3637 #: builtin/branch.c:366
3639 msgid "(no branch, rebasing %s)"
3640 msgstr "(非分支,正变基 %s)"
3642 #: builtin/branch.c:369
3644 msgid "(no branch, bisect started on %s)"
3645 msgstr "(非分支,二分查找开始于 %s)"
3647 #: builtin/branch.c:375
3649 msgid "(HEAD detached at %s)"
3650 msgstr "(头指针分离于 %s)"
3652 #: builtin/branch.c:378
3654 msgid "(HEAD detached from %s)"
3655 msgstr "(头指针分离自 %s)"
3657 #: builtin/branch.c:382
3661 #: builtin/branch.c:524
3662 msgid "cannot rename the current branch while not on any."
3663 msgstr "无法重命名当前分支因为不处于任何分支上。"
3665 #: builtin/branch.c:534
3667 msgid "Invalid branch name: '%s'"
3668 msgstr "无效的分支名:'%s'"
3670 #: builtin/branch.c:549
3671 msgid "Branch rename failed"
3674 #: builtin/branch.c:553
3676 msgid "Renamed a misnamed branch '%s' away"
3677 msgstr "重命名掉一个错误命名的旧分支 '%s'"
3679 #: builtin/branch.c:557
3681 msgid "Branch renamed to %s, but HEAD is not updated!"
3682 msgstr "分支重命名为 %s,但 HEAD 没有更新!"
3684 #: builtin/branch.c:564
3685 msgid "Branch is renamed, but update of config-file failed"
3686 msgstr "分支被重命名,但更新 config 文件失败"
3688 #: builtin/branch.c:587
3690 msgid "could not write branch description template: %s"
3691 msgstr "不能写分支描述模版:%s"
3693 #: builtin/branch.c:616
3694 msgid "Generic options"
3697 #: builtin/branch.c:618
3698 msgid "show hash and subject, give twice for upstream branch"
3699 msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
3701 #: builtin/branch.c:619
3702 msgid "suppress informational messages"
3705 #: builtin/branch.c:620
3706 msgid "set up tracking mode (see git-pull(1))"
3707 msgstr "设置跟踪模式(参见 git-pull(1))"
3709 #: builtin/branch.c:622
3710 msgid "change upstream info"
3713 #: builtin/branch.c:626
3714 msgid "use colored output"
3717 #: builtin/branch.c:627
3718 msgid "act on remote-tracking branches"
3721 #: builtin/branch.c:629 builtin/branch.c:630
3722 msgid "print only branches that contain the commit"
3723 msgstr "只打印包含该提交的分支"
3725 #: builtin/branch.c:633
3726 msgid "Specific git-branch actions:"
3727 msgstr "具体的 git-branch 动作:"
3729 #: builtin/branch.c:634
3730 msgid "list both remote-tracking and local branches"
3731 msgstr "列出远程跟踪及本地分支"
3733 #: builtin/branch.c:636
3734 msgid "delete fully merged branch"
3737 #: builtin/branch.c:637
3738 msgid "delete branch (even if not merged)"
3739 msgstr "删除分支(即使没有合并)"
3741 #: builtin/branch.c:638
3742 msgid "move/rename a branch and its reflog"
3743 msgstr "移动/重命名一个分支,以及它的引用日志"
3745 #: builtin/branch.c:639
3746 msgid "move/rename a branch, even if target exists"
3747 msgstr "移动/重命名一个分支,即使目标已存在"
3749 #: builtin/branch.c:640
3750 msgid "list branch names"
3753 #: builtin/branch.c:641
3754 msgid "create the branch's reflog"
3757 #: builtin/branch.c:643
3758 msgid "edit the description for the branch"
3761 #: builtin/branch.c:644
3762 msgid "force creation, move/rename, deletion"
3763 msgstr "强制创建、移动/重命名、删除"
3765 #: builtin/branch.c:645
3766 msgid "print only branches that are merged"
3769 #: builtin/branch.c:646
3770 msgid "print only branches that are not merged"
3773 #: builtin/branch.c:647
3774 msgid "list branches in columns"
3777 #: builtin/branch.c:648 builtin/for-each-ref.c:38 builtin/tag.c:366
3781 #: builtin/branch.c:649 builtin/for-each-ref.c:39 builtin/tag.c:367
3782 msgid "field name to sort on"
3785 #: builtin/branch.c:651 builtin/for-each-ref.c:41 builtin/notes.c:398
3786 #: builtin/notes.c:401 builtin/notes.c:561 builtin/notes.c:564
3787 #: builtin/tag.c:369
3791 #: builtin/branch.c:652
3792 msgid "print only branches of the object"
3793 msgstr "只打印指向该对象的分支"
3795 #: builtin/branch.c:670
3796 msgid "Failed to resolve HEAD as a valid ref."
3797 msgstr "无法将 HEAD 解析为有效引用。"
3799 #: builtin/branch.c:674 builtin/clone.c:697
3800 msgid "HEAD not found below refs/heads!"
3801 msgstr "HEAD 没有位于 /refs/heads 之下!"
3803 #: builtin/branch.c:694
3804 msgid "--column and --verbose are incompatible"
3805 msgstr "--column 和 --verbose 不兼容"
3807 #: builtin/branch.c:705 builtin/branch.c:747
3808 msgid "branch name required"
3811 #: builtin/branch.c:723
3812 msgid "Cannot give description to detached HEAD"
3813 msgstr "不能向分离头指针提供描述"
3815 #: builtin/branch.c:728
3816 msgid "cannot edit description of more than one branch"
3817 msgstr "不能为一个以上的分支编辑描述"
3819 #: builtin/branch.c:735
3821 msgid "No commit on branch '%s' yet."
3822 msgstr "分支 '%s' 尚无提交。"
3824 #: builtin/branch.c:738
3826 msgid "No branch named '%s'."
3829 #: builtin/branch.c:753
3830 msgid "too many branches for a rename operation"
3831 msgstr "为重命名操作提供了太多的分支名"
3833 #: builtin/branch.c:758
3834 msgid "too many branches to set new upstream"
3835 msgstr "为设置新上游提供了太多的分支名"
3837 #: builtin/branch.c:762
3840 "could not set upstream of HEAD to %s when it does not point to any branch."
3841 msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
3843 #: builtin/branch.c:765 builtin/branch.c:787 builtin/branch.c:808
3845 msgid "no such branch '%s'"
3848 #: builtin/branch.c:769
3850 msgid "branch '%s' does not exist"
3851 msgstr "分支 '%s' 不存在"
3853 #: builtin/branch.c:781
3854 msgid "too many branches to unset upstream"
3855 msgstr "为取消上游设置操作提供了太多的分支名"
3857 #: builtin/branch.c:785
3858 msgid "could not unset upstream of HEAD when it does not point to any branch."
3859 msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
3861 #: builtin/branch.c:791
3863 msgid "Branch '%s' has no upstream information"
3864 msgstr "分支 '%s' 没有上游信息"
3866 #: builtin/branch.c:805
3867 msgid "it does not make sense to create 'HEAD' manually"
3868 msgstr "手工创建 'HEAD' 没有意义"
3870 #: builtin/branch.c:811
3871 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
3872 msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
3874 #: builtin/branch.c:814
3877 "The --set-upstream flag is deprecated and will be removed. Consider using --"
3878 "track or --set-upstream-to\n"
3880 "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
3882 #: builtin/branch.c:831
3886 "If you wanted to make '%s' track '%s', do this:\n"
3890 "如果你想用 '%s' 跟踪 '%s', 这么做:\n"
3893 #: builtin/branch.c:832
3895 msgid " git branch -d %s\n"
3896 msgstr " git branch -d %s\n"
3898 #: builtin/branch.c:833
3900 msgid " git branch --set-upstream-to %s\n"
3901 msgstr " git branch --set-upstream-to %s\n"
3903 #: builtin/bundle.c:51
3905 msgid "%s is okay\n"
3908 #: builtin/bundle.c:64
3909 msgid "Need a repository to create a bundle."
3910 msgstr "需要一个仓库来创建包。"
3912 #: builtin/bundle.c:68
3913 msgid "Need a repository to unbundle."
3916 #: builtin/cat-file.c:428
3918 "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
3919 "<type>|--textconv) <object>"
3921 "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|<类型"
3922 ">|--textconv) <对象>"
3924 #: builtin/cat-file.c:429
3925 msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
3926 msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]"
3928 #: builtin/cat-file.c:466
3929 msgid "<type> can be one of: blob, tree, commit, tag"
3930 msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
3932 #: builtin/cat-file.c:467
3933 msgid "show object type"
3936 #: builtin/cat-file.c:468
3937 msgid "show object size"
3940 #: builtin/cat-file.c:470
3941 msgid "exit with zero when there's no error"
3942 msgstr "当没有错误时退出并返回零"
3944 #: builtin/cat-file.c:471
3945 msgid "pretty-print object's content"
3948 #: builtin/cat-file.c:473
3949 msgid "for blob objects, run textconv on object's content"
3950 msgstr "对于数据对象,对其内容执行 textconv"
3952 #: builtin/cat-file.c:475
3953 msgid "allow -s and -t to work with broken/corrupt objects"
3954 msgstr "允许 -s 和 -t 对损坏的对象生效"
3956 #: builtin/cat-file.c:476
3957 msgid "buffer --batch output"
3958 msgstr "缓冲 --batch 的输出"
3960 #: builtin/cat-file.c:478
3961 msgid "show info and content of objects fed from the standard input"
3962 msgstr "显示从标准输入提供的对象的信息和内容"
3964 #: builtin/cat-file.c:481
3965 msgid "show info about objects fed from the standard input"
3966 msgstr "显示从标准输入提供的对象的信息"
3968 #: builtin/cat-file.c:484
3969 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
3970 msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)"
3972 #: builtin/cat-file.c:486
3973 msgid "show all objects with --batch or --batch-check"
3974 msgstr "使用 --batch 或 --batch-check 参数显示所有对象"
3976 #: builtin/check-attr.c:11
3977 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
3978 msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
3980 #: builtin/check-attr.c:12
3981 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
3982 msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]"
3984 #: builtin/check-attr.c:19
3985 msgid "report all attributes set on file"
3986 msgstr "报告设置在文件上的所有属性"
3988 #: builtin/check-attr.c:20
3989 msgid "use .gitattributes only from the index"
3990 msgstr "只使用索引中的 .gitattributes"
3992 #: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:96
3993 msgid "read file names from stdin"
3996 #: builtin/check-attr.c:23 builtin/check-ignore.c:24
3997 msgid "terminate input and output records by a NUL character"
3998 msgstr "输入和输出的记录使用 NUL 字符终结"
4000 #: builtin/check-ignore.c:18 builtin/checkout.c:1134 builtin/gc.c:325
4001 msgid "suppress progress reporting"
4004 #: builtin/check-ignore.c:26
4005 msgid "show non-matching input paths"
4008 #: builtin/check-ignore.c:28
4009 msgid "ignore index when checking"
4012 #: builtin/check-ignore.c:154
4013 msgid "cannot specify pathnames with --stdin"
4014 msgstr "不能同时指定路径及 --stdin 参数"
4016 #: builtin/check-ignore.c:157
4017 msgid "-z only makes sense with --stdin"
4018 msgstr "-z 需要和 --stdin 参数共用才有意义"
4020 #: builtin/check-ignore.c:159
4021 msgid "no path specified"
4024 #: builtin/check-ignore.c:163
4025 msgid "--quiet is only valid with a single pathname"
4026 msgstr "参数 --quiet 只在提供一个路径名时有效"
4028 #: builtin/check-ignore.c:165
4029 msgid "cannot have both --quiet and --verbose"
4030 msgstr "不能同时提供 --quiet 和 --verbose 参数"
4032 #: builtin/check-ignore.c:168
4033 msgid "--non-matching is only valid with --verbose"
4034 msgstr "--non-matching 选项只在使用 --verbose 时有效"
4036 #: builtin/check-mailmap.c:8
4037 msgid "git check-mailmap [<options>] <contact>..."
4038 msgstr "git check-mailmap [<选项>] <联系地址>..."
4040 #: builtin/check-mailmap.c:13
4041 msgid "also read contacts from stdin"
4042 msgstr "还从标准输入读取联系地址"
4044 #: builtin/check-mailmap.c:24
4046 msgid "unable to parse contact: %s"
4047 msgstr "不能解析联系地址:%s"
4049 #: builtin/check-mailmap.c:47
4050 msgid "no contacts specified"
4053 #: builtin/checkout-index.c:126
4054 msgid "git checkout-index [<options>] [--] [<file>...]"
4055 msgstr "git checkout-index [<选项>] [--] [<文件>...]"
4057 #: builtin/checkout-index.c:188
4058 msgid "check out all files in the index"
4061 #: builtin/checkout-index.c:189
4062 msgid "force overwrite of existing files"
4065 #: builtin/checkout-index.c:191
4066 msgid "no warning for existing files and files not in index"
4067 msgstr "存在或不在索引中的文件都没有警告"
4069 #: builtin/checkout-index.c:193
4070 msgid "don't checkout new files"
4073 #: builtin/checkout-index.c:195
4074 msgid "update stat information in the index file"
4075 msgstr "更新索引中文件的状态信息"
4077 #: builtin/checkout-index.c:201
4078 msgid "read list of paths from the standard input"
4079 msgstr "从标准输入读取路径列表"
4081 #: builtin/checkout-index.c:203
4082 msgid "write the content to temporary files"
4085 #: builtin/checkout-index.c:204 builtin/column.c:30
4086 #: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175
4087 #: builtin/submodule--helper.c:178 builtin/submodule--helper.c:181
4091 #: builtin/checkout-index.c:205
4092 msgid "when creating files, prepend <string>"
4093 msgstr "在创建文件时,在前面加上 <字符串>"
4095 #: builtin/checkout-index.c:208
4096 msgid "copy out the files from named stage"
4097 msgstr "从指定暂存区中拷出文件"
4099 #: builtin/checkout.c:25
4100 msgid "git checkout [<options>] <branch>"
4101 msgstr "git checkout [<选项>] <分支>"
4103 #: builtin/checkout.c:26
4104 msgid "git checkout [<options>] [<branch>] -- <file>..."
4105 msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
4107 #: builtin/checkout.c:134 builtin/checkout.c:167
4109 msgid "path '%s' does not have our version"
4110 msgstr "路径 '%s' 没有我们的版本"
4112 #: builtin/checkout.c:136 builtin/checkout.c:169
4114 msgid "path '%s' does not have their version"
4115 msgstr "路径 '%s' 没有他们的版本"
4117 #: builtin/checkout.c:152
4119 msgid "path '%s' does not have all necessary versions"
4120 msgstr "路径 '%s' 没有全部必须的版本"
4122 #: builtin/checkout.c:196
4124 msgid "path '%s' does not have necessary versions"
4125 msgstr "路径 '%s' 没有必须的版本"
4127 #: builtin/checkout.c:213
4129 msgid "path '%s': cannot merge"
4130 msgstr "path '%s':无法合并"
4132 #: builtin/checkout.c:230
4134 msgid "Unable to add merge result for '%s'"
4135 msgstr "无法为 '%s' 添加合并结果"
4137 #: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
4138 #: builtin/checkout.c:260
4140 msgid "'%s' cannot be used with updating paths"
4141 msgstr "'%s' 不能在更新路径时使用"
4143 #: builtin/checkout.c:263 builtin/checkout.c:266
4145 msgid "'%s' cannot be used with %s"
4146 msgstr "'%s' 不能和 %s 同时使用"
4148 #: builtin/checkout.c:269
4150 msgid "Cannot update paths and switch to branch '%s' at the same time."
4151 msgstr "不能同时更新路径并切换到分支'%s'。"
4153 #: builtin/checkout.c:280 builtin/checkout.c:474
4154 msgid "corrupt index file"
4157 #: builtin/checkout.c:340 builtin/checkout.c:347
4159 msgid "path '%s' is unmerged"
4160 msgstr "路径 '%s' 未合并"
4162 #: builtin/checkout.c:496
4163 msgid "you need to resolve your current index first"
4164 msgstr "您需要先解决当前索引的冲突"
4166 #: builtin/checkout.c:623
4168 msgid "Can not do reflog for '%s': %s\n"
4169 msgstr "不能对 '%s' 执行 reflog 操作:%s\n"
4171 #: builtin/checkout.c:661
4172 msgid "HEAD is now at"
4175 #: builtin/checkout.c:668
4177 msgid "Reset branch '%s'\n"
4178 msgstr "重置分支 '%s'\n"
4180 #: builtin/checkout.c:671
4182 msgid "Already on '%s'\n"
4183 msgstr "已经位于 '%s'\n"
4185 #: builtin/checkout.c:675
4187 msgid "Switched to and reset branch '%s'\n"
4188 msgstr "切换并重置分支 '%s'\n"
4190 #: builtin/checkout.c:677 builtin/checkout.c:1066
4192 msgid "Switched to a new branch '%s'\n"
4193 msgstr "切换到一个新分支 '%s'\n"
4195 #: builtin/checkout.c:679
4197 msgid "Switched to branch '%s'\n"
4198 msgstr "切换到分支 '%s'\n"
4201 #: builtin/checkout.c:731
4203 msgid " ... and %d more.\n"
4204 msgstr " ... 及其它 %d 个。\n"
4206 #: builtin/checkout.c:737
4209 "Warning: you are leaving %d commit behind, not connected to\n"
4210 "any of your branches:\n"
4214 "Warning: you are leaving %d commits behind, not connected to\n"
4215 "any of your branches:\n"
4219 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
4223 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
4227 #: builtin/checkout.c:756
4230 "If you want to keep it by creating a new branch, this may be a good time\n"
4233 " git branch <new-branch-name> %s\n"
4236 "If you want to keep them by creating a new branch, this may be a good time\n"
4239 " git branch <new-branch-name> %s\n"
4242 "如果您想要通过创建新分支保存它,这可能是一个好时候。\n"
4245 " git branch <新分支名> %s\n"
4248 "如果您想要通过创建新分支保存它们,这可能是一个好时候。\n"
4251 " git branch <新分支名> %s\n"
4254 #: builtin/checkout.c:792
4255 msgid "internal error in revision walk"
4256 msgstr "在版本遍历时遇到内部错误"
4258 #: builtin/checkout.c:796
4259 msgid "Previous HEAD position was"
4260 msgstr "之前的 HEAD 位置是"
4262 #: builtin/checkout.c:823 builtin/checkout.c:1061
4263 msgid "You are on a branch yet to be born"
4264 msgstr "您位于一个尚未初始化的分支"
4266 #: builtin/checkout.c:968
4268 msgid "only one reference expected, %d given."
4269 msgstr "只要一个引用,却给出了 %d 个"
4271 #: builtin/checkout.c:1007 builtin/worktree.c:213
4273 msgid "invalid reference: %s"
4276 #: builtin/checkout.c:1036
4278 msgid "reference is not a tree: %s"
4281 #: builtin/checkout.c:1075
4282 msgid "paths cannot be used with switching branches"
4283 msgstr "路径不能和切换分支同时使用"
4285 #: builtin/checkout.c:1078 builtin/checkout.c:1082
4287 msgid "'%s' cannot be used with switching branches"
4288 msgstr "'%s' 不能和切换分支同时使用"
4290 #: builtin/checkout.c:1086 builtin/checkout.c:1089 builtin/checkout.c:1094
4291 #: builtin/checkout.c:1097
4293 msgid "'%s' cannot be used with '%s'"
4294 msgstr "'%s' 不能和 '%s' 同时使用"
4296 #: builtin/checkout.c:1102
4298 msgid "Cannot switch branch to a non-commit '%s'"
4299 msgstr "不能切换分支到一个非提交 '%s'"
4301 #: builtin/checkout.c:1135 builtin/checkout.c:1137 builtin/clone.c:83
4302 #: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:320
4303 #: builtin/worktree.c:322
4307 #: builtin/checkout.c:1136
4308 msgid "create and checkout a new branch"
4309 msgstr "创建并检出一个新的分支"
4311 #: builtin/checkout.c:1138
4312 msgid "create/reset and checkout a branch"
4313 msgstr "创建/重置并检出一个分支"
4315 #: builtin/checkout.c:1139
4316 msgid "create reflog for new branch"
4317 msgstr "为新的分支创建引用日志"
4319 #: builtin/checkout.c:1140
4320 msgid "detach the HEAD at named commit"
4321 msgstr "成为指向该提交的分离头指针"
4323 #: builtin/checkout.c:1141
4324 msgid "set upstream info for new branch"
4325 msgstr "为新的分支设置上游信息"
4327 #: builtin/checkout.c:1143
4331 #: builtin/checkout.c:1143
4332 msgid "new unparented branch"
4335 #: builtin/checkout.c:1144
4336 msgid "checkout our version for unmerged files"
4337 msgstr "对尚未合并的文件检出我们的版本"
4339 #: builtin/checkout.c:1146
4340 msgid "checkout their version for unmerged files"
4341 msgstr "对尚未合并的文件检出他们的版本"
4343 #: builtin/checkout.c:1148
4344 msgid "force checkout (throw away local modifications)"
4345 msgstr "强制检出(丢弃本地修改)"
4347 #: builtin/checkout.c:1149
4348 msgid "perform a 3-way merge with the new branch"
4349 msgstr "和新的分支执行三方合并"
4351 #: builtin/checkout.c:1150 builtin/merge.c:227
4352 msgid "update ignored files (default)"
4353 msgstr "更新忽略的文件(默认)"
4355 #: builtin/checkout.c:1151 builtin/log.c:1263 parse-options.h:250
4359 #: builtin/checkout.c:1152
4360 msgid "conflict style (merge or diff3)"
4361 msgstr "冲突输出风格(merge 或 diff3)"
4363 #: builtin/checkout.c:1155
4364 msgid "do not limit pathspecs to sparse entries only"
4365 msgstr "对路径不做稀疏检出的限制"
4367 #: builtin/checkout.c:1157
4368 msgid "second guess 'git checkout <no-such-branch>'"
4369 msgstr "二次猜测'git checkout <无此分支>'"
4371 #: builtin/checkout.c:1159
4372 msgid "do not check if another worktree is holding the given ref"
4373 msgstr "不检查指定的引用是否被其他工作区所占用"
4375 #: builtin/checkout.c:1160 builtin/clone.c:57 builtin/fetch.c:112
4376 #: builtin/merge.c:224 builtin/pull.c:109 builtin/push.c:560
4377 #: builtin/send-pack.c:168
4378 msgid "force progress reporting"
4381 #: builtin/checkout.c:1191
4382 msgid "-b, -B and --orphan are mutually exclusive"
4383 msgstr "-b、-B 和 --orphan 是互斥的"
4385 #: builtin/checkout.c:1208
4386 msgid "--track needs a branch name"
4387 msgstr "--track 需要一个分支名"
4389 #: builtin/checkout.c:1213
4390 msgid "Missing branch name; try -b"
4391 msgstr "缺少分支名;尝试 -b"
4393 #: builtin/checkout.c:1249
4394 msgid "invalid path specification"
4397 #: builtin/checkout.c:1256
4400 "Cannot update paths and switch to branch '%s' at the same time.\n"
4401 "Did you intend to checkout '%s' which can not be resolved as commit?"
4403 "不能同时更新路径并切换到分支'%s'。\n"
4404 "您是想要检出 '%s' 但其未能解析为提交么?"
4406 #: builtin/checkout.c:1261
4408 msgid "git checkout: --detach does not take a path argument '%s'"
4409 msgstr "git checkout:--detach 不能接收路径参数 '%s'"
4411 #: builtin/checkout.c:1265
4413 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
4414 "checking out of the index."
4416 "git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
4418 #: builtin/clean.c:25
4420 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
4422 "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
4424 #: builtin/clean.c:29
4426 msgid "Removing %s\n"
4429 #: builtin/clean.c:30
4431 msgid "Would remove %s\n"
4434 #: builtin/clean.c:31
4436 msgid "Skipping repository %s\n"
4439 #: builtin/clean.c:32
4441 msgid "Would skip repository %s\n"
4444 #: builtin/clean.c:33
4446 msgid "failed to remove %s"
4449 #: builtin/clean.c:315
4452 "1 - select a numbered item\n"
4453 "foo - select item based on unique prefix\n"
4454 " - (empty) select nothing"
4458 "foo - 通过标题选择一个选项\n"
4461 #: builtin/clean.c:319
4464 "1 - select a single item\n"
4465 "3-5 - select a range of items\n"
4466 "2-3,6-9 - select multiple ranges\n"
4467 "foo - select item based on unique prefix\n"
4468 "-... - unselect specified items\n"
4469 "* - choose all items\n"
4470 " - (empty) finish selecting"
4474 "3-5 - 选择一个范围内的所有选项\n"
4475 "2-3,6-9 - 选择多个范围内的所有选项\n"
4476 "foo - 通过标题选择一个选项\n"
4481 #: builtin/clean.c:535
4486 #: builtin/clean.c:677
4488 msgid "Input ignore patterns>> "
4489 msgstr "输入模版以排除条目>> "
4491 #: builtin/clean.c:714
4493 msgid "WARNING: Cannot find items matched by: %s"
4494 msgstr "警告:无法找到和 %s 匹配的条目"
4496 #: builtin/clean.c:735
4497 msgid "Select items to delete"
4500 #. TRANSLATORS: Make sure to keep [y/N] as is
4501 #: builtin/clean.c:776
4503 msgid "Remove %s [y/N]? "
4504 msgstr "删除 %s [y/N]?"
4506 #: builtin/clean.c:801
4510 #: builtin/clean.c:809
4512 "clean - start cleaning\n"
4513 "filter by pattern - exclude items from deletion\n"
4514 "select by numbers - select items to be deleted by numbers\n"
4515 "ask each - confirm each deletion (like \"rm -i\")\n"
4516 "quit - stop cleaning\n"
4517 "help - this screen\n"
4518 "? - help for prompt selection"
4521 "filter by pattern - 通过模版排除要删除的条目\n"
4522 "select by numbers - 通过数字选择要删除的条目\n"
4523 "ask each - 针对删除逐一询问(就像 \"rm -i\")\n"
4526 "? - 显示如何在提示符下选择的帮助"
4528 #: builtin/clean.c:836
4529 msgid "*** Commands ***"
4532 #: builtin/clean.c:837
4536 #: builtin/clean.c:845
4537 msgid "Would remove the following item:"
4538 msgid_plural "Would remove the following items:"
4539 msgstr[0] "将删除如下条目:"
4540 msgstr[1] "将删除如下条目:"
4542 #: builtin/clean.c:862
4543 msgid "No more files to clean, exiting."
4544 msgstr "没有要清理的文件,退出。"
4546 #: builtin/clean.c:893
4547 msgid "do not print names of files removed"
4550 #: builtin/clean.c:895
4554 #: builtin/clean.c:896
4555 msgid "interactive cleaning"
4558 #: builtin/clean.c:898
4559 msgid "remove whole directories"
4562 #: builtin/clean.c:899 builtin/describe.c:407 builtin/grep.c:709
4563 #: builtin/ls-files.c:443 builtin/name-rev.c:307 builtin/show-ref.c:182
4567 #: builtin/clean.c:900
4568 msgid "add <pattern> to ignore rules"
4569 msgstr "添加 <模式> 到忽略规则"
4571 #: builtin/clean.c:901
4572 msgid "remove ignored files, too"
4575 #: builtin/clean.c:903
4576 msgid "remove only ignored files"
4579 #: builtin/clean.c:921
4580 msgid "-x and -X cannot be used together"
4581 msgstr "-x 和 -X 不能同时使用"
4583 #: builtin/clean.c:925
4585 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
4588 "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
4590 #: builtin/clean.c:928
4592 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
4595 "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
4597 #: builtin/clone.c:37
4598 msgid "git clone [<options>] [--] <repo> [<dir>]"
4599 msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
4601 #: builtin/clone.c:59
4602 msgid "don't create a checkout"
4605 #: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:469
4606 msgid "create a bare repository"
4609 #: builtin/clone.c:64
4610 msgid "create a mirror repository (implies bare)"
4611 msgstr "创建一个镜像仓库(也是纯仓库)"
4613 #: builtin/clone.c:66
4614 msgid "to clone from a local repository"
4617 #: builtin/clone.c:68
4618 msgid "don't use local hardlinks, always copy"
4619 msgstr "不使用本地硬链接,始终复制"
4621 #: builtin/clone.c:70
4622 msgid "setup as shared repository"
4625 #: builtin/clone.c:72 builtin/clone.c:74
4626 msgid "initialize submodules in the clone"
4629 #: builtin/clone.c:75 builtin/init-db.c:466
4630 msgid "template-directory"
4633 #: builtin/clone.c:76 builtin/init-db.c:467
4634 msgid "directory from which templates will be used"
4637 #: builtin/clone.c:78 builtin/submodule--helper.c:179
4638 msgid "reference repository"
4641 #: builtin/clone.c:80
4642 msgid "use --reference only while cloning"
4643 msgstr "仅在克隆时参考 --reference 指向的本地仓库"
4645 #: builtin/clone.c:81 builtin/column.c:26 builtin/merge-file.c:44
4649 #: builtin/clone.c:82
4650 msgid "use <name> instead of 'origin' to track upstream"
4651 msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
4653 #: builtin/clone.c:84
4654 msgid "checkout <branch> instead of the remote's HEAD"
4655 msgstr "检出 <分支> 而不是远程 HEAD"
4657 #: builtin/clone.c:86
4658 msgid "path to git-upload-pack on the remote"
4659 msgstr "远程 git-upload-pack 路径"
4661 #: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:654
4662 #: builtin/pull.c:186
4666 #: builtin/clone.c:88
4667 msgid "create a shallow clone of that depth"
4668 msgstr "创建一个指定深度的浅克隆"
4670 #: builtin/clone.c:90
4671 msgid "clone only one branch, HEAD or --branch"
4672 msgstr "只克隆一个分支、HEAD 或 --branch"
4674 #: builtin/clone.c:91 builtin/init-db.c:475
4678 #: builtin/clone.c:92 builtin/init-db.c:476
4679 msgid "separate git dir from working tree"
4680 msgstr "git目录和工作区分离"
4682 #: builtin/clone.c:93
4686 #: builtin/clone.c:94
4687 msgid "set config inside the new repository"
4688 msgstr "在新仓库中设置配置信息"
4690 #: builtin/clone.c:300
4692 msgid "reference repository '%s' as a linked checkout is not supported yet."
4693 msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
4695 #: builtin/clone.c:302
4697 msgid "reference repository '%s' is not a local repository."
4698 msgstr "参考仓库 '%s' 不是一个本地仓库。"
4700 #: builtin/clone.c:307
4702 msgid "reference repository '%s' is shallow"
4703 msgstr "参考仓库 '%s' 是一个浅克隆"
4705 #: builtin/clone.c:310
4707 msgid "reference repository '%s' is grafted"
4708 msgstr "参考仓库 '%s' 已被嫁接"
4710 #: builtin/clone.c:375 builtin/diff.c:84
4712 msgid "failed to stat '%s'"
4713 msgstr "无法枚举 '%s' 状态"
4715 #: builtin/clone.c:377
4717 msgid "%s exists and is not a directory"
4718 msgstr "%s 存在且不是一个目录"
4720 #: builtin/clone.c:391
4722 msgid "failed to stat %s\n"
4723 msgstr "无法枚举 %s 状态\n"
4725 #: builtin/clone.c:413
4727 msgid "failed to create link '%s'"
4728 msgstr "无法创建链接 '%s'"
4730 #: builtin/clone.c:417
4732 msgid "failed to copy file to '%s'"
4733 msgstr "无法拷贝文件至 '%s'"
4735 #: builtin/clone.c:442 builtin/clone.c:626
4740 #: builtin/clone.c:454
4742 "Clone succeeded, but checkout failed.\n"
4743 "You can inspect what was checked out with 'git status'\n"
4744 "and retry the checkout with 'git checkout -f HEAD'\n"
4747 "您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
4748 "'git checkout -f HEAD' 重试\n"
4750 #: builtin/clone.c:531
4752 msgid "Could not find remote branch %s to clone."
4753 msgstr "不能发现要克隆的远程分支 %s。"
4755 #: builtin/clone.c:621
4757 msgid "Checking connectivity... "
4760 #: builtin/clone.c:624
4761 msgid "remote did not send all necessary objects"
4762 msgstr "远程没有发送所有必须的对象"
4764 #: builtin/clone.c:688
4765 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
4766 msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
4768 #: builtin/clone.c:719
4769 msgid "unable to checkout working tree"
4772 #: builtin/clone.c:808
4773 msgid "cannot repack to clean up"
4774 msgstr "无法执行 repack 来清理"
4776 #: builtin/clone.c:810
4777 msgid "cannot unlink temporary alternates file"
4778 msgstr "无法删除临时的 alternates 文件"
4780 #: builtin/clone.c:842
4781 msgid "Too many arguments."
4784 #: builtin/clone.c:846
4785 msgid "You must specify a repository to clone."
4786 msgstr "您必须指定一个仓库来克隆。"
4788 #: builtin/clone.c:857
4790 msgid "--bare and --origin %s options are incompatible."
4791 msgstr "--bare 和 --origin %s 选项不兼容。"
4793 #: builtin/clone.c:860
4794 msgid "--bare and --separate-git-dir are incompatible."
4795 msgstr "--bare 和 --separate-git-dir 选项不兼容。"
4797 #: builtin/clone.c:873
4799 msgid "repository '%s' does not exist"
4800 msgstr "仓库 '%s' 不存在"
4802 #: builtin/clone.c:879 builtin/fetch.c:1166
4804 msgid "depth %s is not a positive number"
4805 msgstr "深度 %s 不是一个正数"
4807 #: builtin/clone.c:889
4809 msgid "destination path '%s' already exists and is not an empty directory."
4810 msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
4812 #: builtin/clone.c:899
4814 msgid "working tree '%s' already exists."
4815 msgstr "工作区 '%s' 已经存在。"
4817 #: builtin/clone.c:914 builtin/clone.c:925 builtin/submodule--helper.c:224
4818 #: builtin/worktree.c:221 builtin/worktree.c:248
4820 msgid "could not create leading directories of '%s'"
4821 msgstr "不能为 '%s' 创建先导目录"
4823 #: builtin/clone.c:917
4825 msgid "could not create work tree dir '%s'"
4826 msgstr "不能创建工作区目录 '%s'"
4828 #: builtin/clone.c:935
4830 msgid "Cloning into bare repository '%s'...\n"
4831 msgstr "克隆到纯仓库 '%s'...\n"
4833 #: builtin/clone.c:937
4835 msgid "Cloning into '%s'...\n"
4836 msgstr "正克隆到 '%s'...\n"
4838 #: builtin/clone.c:975
4839 msgid "--depth is ignored in local clones; use file:// instead."
4840 msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
4842 #: builtin/clone.c:978
4843 msgid "source repository is shallow, ignoring --local"
4844 msgstr "源仓库是浅克隆,忽略 --local"
4846 #: builtin/clone.c:983
4847 msgid "--local is ignored"
4848 msgstr "--local 被忽略"
4850 #: builtin/clone.c:987
4852 msgid "Don't know how to clone %s"
4855 #: builtin/clone.c:1036 builtin/clone.c:1044
4857 msgid "Remote branch %s not found in upstream %s"
4858 msgstr "远程分支 %s 在上游 %s 未发现"
4860 #: builtin/clone.c:1047
4861 msgid "You appear to have cloned an empty repository."
4862 msgstr "您似乎克隆了一个空仓库。"
4864 #: builtin/column.c:9
4865 msgid "git column [<options>]"
4866 msgstr "git column [<选项>]"
4868 #: builtin/column.c:26
4869 msgid "lookup config vars"
4872 #: builtin/column.c:27 builtin/column.c:28
4873 msgid "layout to use"
4876 #: builtin/column.c:29
4877 msgid "Maximum width"
4880 #: builtin/column.c:30
4881 msgid "Padding space on left border"
4884 #: builtin/column.c:31
4885 msgid "Padding space on right border"
4888 #: builtin/column.c:32
4889 msgid "Padding space between columns"
4892 #: builtin/column.c:51
4893 msgid "--command must be the first argument"
4894 msgstr "--command 必须是第一个参数"
4896 #: builtin/commit.c:38
4897 msgid "git commit [<options>] [--] <pathspec>..."
4898 msgstr "git commit [<选项>] [--] <路径规格>..."
4900 #: builtin/commit.c:43
4901 msgid "git status [<options>] [--] <pathspec>..."
4902 msgstr "git status [<选项>] [--] <路径规格>..."
4904 #: builtin/commit.c:48
4906 "Your name and email address were configured automatically based\n"
4907 "on your username and hostname. Please check that they are accurate.\n"
4908 "You can suppress this message by setting them explicitly. Run the\n"
4909 "following command and follow the instructions in your editor to edit\n"
4910 "your configuration file:\n"
4912 " git config --global --edit\n"
4914 "After doing this, you may fix the identity used for this commit with:\n"
4916 " git commit --amend --reset-author\n"
4918 "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
4919 "与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
4922 " git config --global --edit\n"
4924 "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
4926 " git commit --amend --reset-author\n"
4928 #: builtin/commit.c:61
4930 "Your name and email address were configured automatically based\n"
4931 "on your username and hostname. Please check that they are accurate.\n"
4932 "You can suppress this message by setting them explicitly:\n"
4934 " git config --global user.name \"Your Name\"\n"
4935 " git config --global user.email you@example.com\n"
4937 "After doing this, you may fix the identity used for this commit with:\n"
4939 " git commit --amend --reset-author\n"
4941 "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
4942 "与否。您可以对其进行设置以免再出现本提示信息:\n"
4944 " git config --global user.name \"Your Name\"\n"
4945 " git config --global user.email you@example.com\n"
4947 "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
4949 " git commit --amend --reset-author\n"
4951 #: builtin/commit.c:73
4953 "You asked to amend the most recent commit, but doing so would make\n"
4954 "it empty. You can repeat your command with --allow-empty, or you can\n"
4955 "remove the commit entirely with \"git reset HEAD^\".\n"
4957 "您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
4958 "--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
4960 #: builtin/commit.c:78
4962 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
4963 "If you wish to commit it anyway, use:\n"
4965 " git commit --allow-empty\n"
4968 "之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
4971 " git commit --allow-empty\n"
4974 #: builtin/commit.c:85
4975 msgid "Otherwise, please use 'git reset'\n"
4976 msgstr "否则,请使用命令 'git reset'\n"
4978 #: builtin/commit.c:88
4980 "If you wish to skip this commit, use:\n"
4984 "Then \"git cherry-pick --continue\" will resume cherry-picking\n"
4985 "the remaining commits.\n"
4987 "如果您想跳过这个提交,使用命令:\n"
4991 "然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
4994 #: builtin/commit.c:305
4995 msgid "failed to unpack HEAD tree object"
4996 msgstr "无法解包 HEAD 树对象"
4998 #: builtin/commit.c:346
4999 msgid "unable to create temporary index"
5002 #: builtin/commit.c:352
5003 msgid "interactive add failed"
5006 #: builtin/commit.c:365
5007 msgid "unable to update temporary index"
5010 #: builtin/commit.c:367
5011 msgid "Failed to update main cache tree"
5014 #: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463
5015 msgid "unable to write new_index file"
5016 msgstr "无法写 new_index 文件"
5018 #: builtin/commit.c:445
5019 msgid "cannot do a partial commit during a merge."
5020 msgstr "在合并过程中不能做部分提交。"
5022 #: builtin/commit.c:447
5023 msgid "cannot do a partial commit during a cherry-pick."
5024 msgstr "在拣选过程中不能做部分提交。"
5026 #: builtin/commit.c:456
5027 msgid "cannot read the index"
5030 #: builtin/commit.c:475
5031 msgid "unable to write temporary index file"
5034 #: builtin/commit.c:580
5036 msgid "commit '%s' lacks author header"
5037 msgstr "提交 '%s' 缺少作者信息"
5039 #: builtin/commit.c:582
5041 msgid "commit '%s' has malformed author line"
5042 msgstr "提交 '%s' 有非法的作者信息"
5044 #: builtin/commit.c:601
5045 msgid "malformed --author parameter"
5046 msgstr "非法的 --author 参数"
5048 #: builtin/commit.c:609
5050 msgid "invalid date format: %s"
5053 #: builtin/commit.c:653
5055 "unable to select a comment character that is not used\n"
5056 "in the current commit message"
5057 msgstr "无法选择一个未被当前提交说明使用的注释字符"
5059 #: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
5061 msgid "could not lookup commit %s"
5064 #: builtin/commit.c:702 builtin/shortlog.c:273
5066 msgid "(reading log message from standard input)\n"
5067 msgstr "(正从标准输入中读取日志信息)\n"
5069 #: builtin/commit.c:704
5070 msgid "could not read log from standard input"
5071 msgstr "不能从标准输入中读取日志信息"
5073 #: builtin/commit.c:708
5075 msgid "could not read log file '%s'"
5076 msgstr "不能读取日志文件 '%s'"
5078 #: builtin/commit.c:730
5079 msgid "could not read MERGE_MSG"
5080 msgstr "不能读取 MERGE_MSG"
5082 #: builtin/commit.c:734
5083 msgid "could not read SQUASH_MSG"
5084 msgstr "不能读取 SQUASH_MSG"
5086 #: builtin/commit.c:785
5087 msgid "could not write commit template"
5090 #: builtin/commit.c:803
5094 "It looks like you may be committing a merge.\n"
5095 "If this is not correct, please remove the file\n"
5100 "似乎您正在做一个合并提交。如果不对,请删除文件\n"
5104 #: builtin/commit.c:808
5108 "It looks like you may be committing a cherry-pick.\n"
5109 "If this is not correct, please remove the file\n"
5114 "似乎您正在做一个拣选提交。如果不对,请删除文件\n"
5118 #: builtin/commit.c:821
5121 "Please enter the commit message for your changes. Lines starting\n"
5122 "with '%c' will be ignored, and an empty message aborts the commit.\n"
5124 "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
5127 #: builtin/commit.c:828
5130 "Please enter the commit message for your changes. Lines starting\n"
5131 "with '%c' will be kept; you may remove them yourself if you want to.\n"
5132 "An empty message aborts the commit.\n"
5134 "请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
5135 "也可以删除它们。一个空的提交说明将会终止提交。\n"
5137 # 译者:为保证在输出中对齐,注意调整句中空格!
5138 #: builtin/commit.c:848
5140 msgid "%sAuthor: %.*s <%.*s>"
5141 msgstr "%s作者: %.*s <%.*s>"
5143 # 译者:为保证在输出中对齐,注意调整句中空格!
5144 #: builtin/commit.c:856
5149 # 译者:为保证在输出中对齐,注意调整句中空格!
5150 #: builtin/commit.c:863
5152 msgid "%sCommitter: %.*s <%.*s>"
5153 msgstr "%s提交者:%.*s <%.*s>"
5155 #: builtin/commit.c:881
5156 msgid "Cannot read index"
5159 #: builtin/commit.c:938
5160 msgid "Error building trees"
5163 #: builtin/commit.c:953 builtin/tag.c:266
5165 msgid "Please supply the message using either -m or -F option.\n"
5166 msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
5168 #: builtin/commit.c:1055
5170 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
5171 msgstr "--author '%s' 不是 'Name <email>' 格式,且未能在现有作者中找到匹配"
5173 #: builtin/commit.c:1070 builtin/commit.c:1310
5175 msgid "Invalid untracked files mode '%s'"
5176 msgstr "无效的未追踪文件参数 '%s'"
5178 #: builtin/commit.c:1107
5179 msgid "--long and -z are incompatible"
5180 msgstr "--long 和 -z 选项不兼容"
5182 #: builtin/commit.c:1137
5183 msgid "Using both --reset-author and --author does not make sense"
5184 msgstr "同时使用 --reset-author 和 --author 没有意义"
5186 #: builtin/commit.c:1146
5187 msgid "You have nothing to amend."
5190 #: builtin/commit.c:1149
5191 msgid "You are in the middle of a merge -- cannot amend."
5192 msgstr "您正处于一个合并过程中 -- 无法修补提交。"
5194 #: builtin/commit.c:1151
5195 msgid "You are in the middle of a cherry-pick -- cannot amend."
5196 msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
5198 #: builtin/commit.c:1154
5199 msgid "Options --squash and --fixup cannot be used together"
5200 msgstr "选项 --squash 和 --fixup 不能同时使用"
5202 #: builtin/commit.c:1164
5203 msgid "Only one of -c/-C/-F/--fixup can be used."
5204 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
5206 #: builtin/commit.c:1166
5207 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
5208 msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
5210 #: builtin/commit.c:1174
5211 msgid "--reset-author can be used only with -C, -c or --amend."
5212 msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
5214 #: builtin/commit.c:1191
5215 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
5216 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
5218 #: builtin/commit.c:1193
5219 msgid "No paths with --include/--only does not make sense."
5220 msgstr "参数 --include/--only 不跟路径没有意义。"
5222 #: builtin/commit.c:1195
5223 msgid "Clever... amending the last one with dirty index."
5224 msgstr "聪明... 用脏索引修补最后一个提交。"
5226 #: builtin/commit.c:1197
5227 msgid "Explicit paths specified without -i or -o; assuming --only paths..."
5228 msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..."
5230 #: builtin/commit.c:1209 builtin/tag.c:475
5232 msgid "Invalid cleanup mode %s"
5235 #: builtin/commit.c:1214
5236 msgid "Paths with -a does not make sense."
5237 msgstr "路径和 -a 选项同时使用没有意义。"
5239 #: builtin/commit.c:1324 builtin/commit.c:1605
5240 msgid "show status concisely"
5243 #: builtin/commit.c:1326 builtin/commit.c:1607
5244 msgid "show branch information"
5247 #: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:546
5248 #: builtin/worktree.c:423
5249 msgid "machine-readable output"
5252 #: builtin/commit.c:1331 builtin/commit.c:1611
5253 msgid "show status in long format (default)"
5254 msgstr "以长格式显示状态(默认)"
5256 #: builtin/commit.c:1334 builtin/commit.c:1614
5257 msgid "terminate entries with NUL"
5258 msgstr "条目以 NUL 字符结尾"
5260 #: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981
5261 #: builtin/fast-export.c:984 builtin/tag.c:353
5265 #: builtin/commit.c:1337 builtin/commit.c:1617
5266 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
5267 msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
5269 #: builtin/commit.c:1340
5270 msgid "show ignored files"
5273 #: builtin/commit.c:1341 parse-options.h:155
5277 #: builtin/commit.c:1342
5279 "ignore changes to submodules, optional when: all, dirty, untracked. "
5282 "忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
5284 #: builtin/commit.c:1344
5285 msgid "list untracked files in columns"
5286 msgstr "以列的方式显示未跟踪的文件"
5288 #: builtin/commit.c:1430
5289 msgid "couldn't look up newly created commit"
5292 #: builtin/commit.c:1432
5293 msgid "could not parse newly created commit"
5296 #: builtin/commit.c:1477
5297 msgid "detached HEAD"
5300 # 译者:中文字符串拼接,可删除前导空格
5301 #: builtin/commit.c:1480
5302 msgid " (root-commit)"
5305 #: builtin/commit.c:1575
5306 msgid "suppress summary after successful commit"
5307 msgstr "提交成功后不显示概述信息"
5309 #: builtin/commit.c:1576
5310 msgid "show diff in commit message template"
5311 msgstr "在提交说明模板里显示差异"
5313 #: builtin/commit.c:1578
5314 msgid "Commit message options"
5317 #: builtin/commit.c:1579 builtin/tag.c:351
5318 msgid "read message from file"
5321 #: builtin/commit.c:1580
5325 #: builtin/commit.c:1580
5326 msgid "override author for commit"
5329 #: builtin/commit.c:1581 builtin/gc.c:326
5333 #: builtin/commit.c:1581
5334 msgid "override date for commit"
5337 #: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:392
5338 #: builtin/notes.c:555 builtin/tag.c:349
5342 #: builtin/commit.c:1582
5343 msgid "commit message"
5346 #: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585
5347 #: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79
5351 #: builtin/commit.c:1583
5352 msgid "reuse and edit message from specified commit"
5353 msgstr "重用并编辑指定提交的提交说明"
5355 #: builtin/commit.c:1584
5356 msgid "reuse message from specified commit"
5357 msgstr "重用指定提交的提交说明"
5359 #: builtin/commit.c:1585
5360 msgid "use autosquash formatted message to fixup specified commit"
5361 msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
5363 #: builtin/commit.c:1586
5364 msgid "use autosquash formatted message to squash specified commit"
5365 msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
5367 #: builtin/commit.c:1587
5368 msgid "the commit is authored by me now (used with -C/-c/--amend)"
5369 msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
5371 #: builtin/commit.c:1588 builtin/log.c:1215 builtin/revert.c:86
5372 msgid "add Signed-off-by:"
5373 msgstr "添加 Signed-off-by: 签名"
5375 #: builtin/commit.c:1589
5376 msgid "use specified template file"
5379 #: builtin/commit.c:1590
5380 msgid "force edit of commit"
5383 # 译者:可选值,不能翻译(或是原文中笔误,应为 mode)
5384 #: builtin/commit.c:1591
5388 #: builtin/commit.c:1591 builtin/tag.c:354
5389 msgid "how to strip spaces and #comments from message"
5390 msgstr "设置如何删除提交说明里的空格和#注释"
5392 #: builtin/commit.c:1592
5393 msgid "include status in commit message template"
5394 msgstr "在提交说明模板里包含状态信息"
5396 #: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:156
5397 #: builtin/revert.c:93
5398 msgid "GPG sign commit"
5401 #: builtin/commit.c:1597
5402 msgid "Commit contents options"
5405 #: builtin/commit.c:1598
5406 msgid "commit all changed files"
5409 #: builtin/commit.c:1599
5410 msgid "add specified files to index for commit"
5411 msgstr "添加指定的文件到索引区等待提交"
5413 #: builtin/commit.c:1600
5414 msgid "interactively add files"
5417 #: builtin/commit.c:1601
5418 msgid "interactively add changes"
5421 #: builtin/commit.c:1602
5422 msgid "commit only specified files"
5425 #: builtin/commit.c:1603
5426 msgid "bypass pre-commit hook"
5427 msgstr "绕过 pre-commit 钩子"
5429 #: builtin/commit.c:1604
5430 msgid "show what would be committed"
5433 #: builtin/commit.c:1615
5434 msgid "amend previous commit"
5437 #: builtin/commit.c:1616
5438 msgid "bypass post-rewrite hook"
5439 msgstr "绕过 post-rewrite 钩子"
5441 #: builtin/commit.c:1621
5442 msgid "ok to record an empty change"
5445 #: builtin/commit.c:1623
5446 msgid "ok to record a change with an empty message"
5449 #: builtin/commit.c:1652
5450 msgid "could not parse HEAD commit"
5451 msgstr "不能解析 HEAD 提交"
5453 #: builtin/commit.c:1698
5455 msgid "Corrupt MERGE_HEAD file (%s)"
5456 msgstr "损坏的 MERGE_HEAD 文件(%s)"
5458 #: builtin/commit.c:1705
5459 msgid "could not read MERGE_MODE"
5460 msgstr "不能读取 MERGE_MODE"
5462 #: builtin/commit.c:1724
5464 msgid "could not read commit message: %s"
5465 msgstr "不能读取提交说明:%s"
5467 #: builtin/commit.c:1735
5469 msgid "Aborting commit; you did not edit the message.\n"
5470 msgstr "终止提交;您未更改来自模版的提交说明。\n"
5472 #: builtin/commit.c:1740
5474 msgid "Aborting commit due to empty commit message.\n"
5475 msgstr "终止提交因为提交说明为空。\n"
5477 #: builtin/commit.c:1788
5479 "Repository has been updated, but unable to write\n"
5480 "new_index file. Check that disk is not full and quota is\n"
5481 "not exceeded, and then \"git reset HEAD\" to recover."
5483 "仓库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
5484 "或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
5486 #: builtin/config.c:8
5487 msgid "git config [<options>]"
5488 msgstr "git config [<选项>]"
5490 #: builtin/config.c:54
5491 msgid "Config file location"
5494 #: builtin/config.c:55
5495 msgid "use global config file"
5498 #: builtin/config.c:56
5499 msgid "use system config file"
5502 #: builtin/config.c:57
5503 msgid "use repository config file"
5506 #: builtin/config.c:58
5507 msgid "use given config file"
5510 #: builtin/config.c:59
5514 #: builtin/config.c:59
5515 msgid "read config from given blob object"
5516 msgstr "从给定的数据对象读取配置"
5518 #: builtin/config.c:60
5522 #: builtin/config.c:61
5523 msgid "get value: name [value-regex]"
5524 msgstr "获取值:name [value-regex]"
5526 #: builtin/config.c:62
5527 msgid "get all values: key [value-regex]"
5528 msgstr "获得所有的值:key [value-regex]"
5530 #: builtin/config.c:63
5531 msgid "get values for regexp: name-regex [value-regex]"
5532 msgstr "根据正则表达式获得值:name-regex [value-regex]"
5534 #: builtin/config.c:64
5535 msgid "get value specific for the URL: section[.var] URL"
5536 msgstr "获得 URL 取值:section[.var] URL"
5538 #: builtin/config.c:65
5539 msgid "replace all matching variables: name value [value_regex]"
5540 msgstr "替换所有匹配的变量:name value [value_regex]"
5542 #: builtin/config.c:66
5543 msgid "add a new variable: name value"
5544 msgstr "添加一个新的变量:name value"
5546 #: builtin/config.c:67
5547 msgid "remove a variable: name [value-regex]"
5548 msgstr "删除一个变量:name [value-regex]"
5550 #: builtin/config.c:68
5551 msgid "remove all matches: name [value-regex]"
5552 msgstr "删除所有匹配项:name [value-regex]"
5554 #: builtin/config.c:69
5555 msgid "rename section: old-name new-name"
5556 msgstr "重命名小节:old-name new-name"
5558 #: builtin/config.c:70
5559 msgid "remove a section: name"
5560 msgstr "删除一个小节:name"
5562 #: builtin/config.c:71
5566 #: builtin/config.c:72
5567 msgid "open an editor"
5570 #: builtin/config.c:73
5571 msgid "find the color configured: slot [default]"
5572 msgstr "获得配置的颜色:配置 [默认]"
5574 #: builtin/config.c:74
5575 msgid "find the color setting: slot [stdout-is-tty]"
5576 msgstr "获得颜色设置:配置 [stdout-is-tty]"
5578 #: builtin/config.c:75
5582 #: builtin/config.c:76
5583 msgid "value is \"true\" or \"false\""
5584 msgstr "值是 \"true\" 或 \"false\""
5586 #: builtin/config.c:77
5587 msgid "value is decimal number"
5590 #: builtin/config.c:78
5591 msgid "value is --bool or --int"
5592 msgstr "值是 --bool or --int"
5594 #: builtin/config.c:79
5595 msgid "value is a path (file or directory name)"
5596 msgstr "值是一个路径(文件或目录名)"
5598 #: builtin/config.c:80
5602 #: builtin/config.c:81
5603 msgid "terminate values with NUL byte"
5604 msgstr "终止值是 NUL 字节"
5606 #: builtin/config.c:82
5607 msgid "show variable names only"
5610 #: builtin/config.c:83
5611 msgid "respect include directives on lookup"
5612 msgstr "查询时参照 include 指令递归查找"
5614 #: builtin/config.c:303
5615 msgid "unable to parse default color value"
5618 #: builtin/config.c:441
5621 "# This is Git's per-user configuration file.\n"
5623 "# Please adapt and uncomment the following lines:\n"
5627 "# This is Git's per-user configuration file.\n"
5629 "# Please adapt and uncomment the following lines:\n"
5633 #: builtin/config.c:575
5635 msgid "cannot create configuration file %s"
5636 msgstr "不能创建配置文件 %s"
5638 #: builtin/count-objects.c:77
5639 msgid "git count-objects [-v] [-H | --human-readable]"
5640 msgstr "git count-objects [-v] [-H | --human-readable]"
5642 #: builtin/count-objects.c:87
5643 msgid "print sizes in human readable format"
5644 msgstr "以用户可读的格式显示大小"
5646 #: builtin/describe.c:17
5647 msgid "git describe [<options>] [<commit-ish>...]"
5648 msgstr "git describe [<选项>] [<提交号>...]"
5650 #: builtin/describe.c:18
5651 msgid "git describe [<options>] --dirty"
5652 msgstr "git describe [<选项>] --dirty"
5654 #: builtin/describe.c:217
5656 msgid "annotated tag %s not available"
5659 #: builtin/describe.c:221
5661 msgid "annotated tag %s has no embedded name"
5662 msgstr "附注标签 %s 没有嵌入名称"
5664 #: builtin/describe.c:223
5666 msgid "tag '%s' is really '%s' here"
5667 msgstr "标签 '%s' 的确是在 '%s'"
5669 #: builtin/describe.c:250 builtin/log.c:459
5671 msgid "Not a valid object name %s"
5672 msgstr "不是一个有效的对象名 %s"
5674 #: builtin/describe.c:253
5676 msgid "%s is not a valid '%s' object"
5677 msgstr "%s 不是一个有效的 '%s' 对象"
5679 #: builtin/describe.c:270
5681 msgid "no tag exactly matches '%s'"
5682 msgstr "没有标签准确匹配 '%s'"
5684 #: builtin/describe.c:272
5686 msgid "searching to describe %s\n"
5689 #: builtin/describe.c:319
5691 msgid "finished search at %s\n"
5694 #: builtin/describe.c:346
5697 "No annotated tags can describe '%s'.\n"
5698 "However, there were unannotated tags: try --tags."
5701 "然而,存在未附注标签:尝试 --tags。"
5703 #: builtin/describe.c:350
5706 "No tags can describe '%s'.\n"
5707 "Try --always, or create some tags."
5710 "尝试 --always,或者创建一些标签。"
5712 #: builtin/describe.c:371
5714 msgid "traversed %lu commits\n"
5715 msgstr "已遍历 %lu 个提交\n"
5717 #: builtin/describe.c:374
5720 "more than %i tags found; listed %i most recent\n"
5721 "gave up search at %s\n"
5723 "发现多于 %i 个标签,列出最近的 %i 个\n"
5726 #: builtin/describe.c:396
5727 msgid "find the tag that comes after the commit"
5730 #: builtin/describe.c:397
5731 msgid "debug search strategy on stderr"
5732 msgstr "在标准错误上调试搜索策略"
5734 #: builtin/describe.c:398
5738 #: builtin/describe.c:399
5739 msgid "use any tag, even unannotated"
5740 msgstr "使用任意标签,即使未附带注释"
5742 #: builtin/describe.c:400
5743 msgid "always use long format"
5746 #: builtin/describe.c:401
5747 msgid "only follow first parent"
5750 #: builtin/describe.c:404
5751 msgid "only output exact matches"
5754 #: builtin/describe.c:406
5755 msgid "consider <n> most recent tags (default: 10)"
5756 msgstr "考虑最近 <n> 个标签(默认:10)"
5758 #: builtin/describe.c:408
5759 msgid "only consider tags matching <pattern>"
5760 msgstr "只考虑匹配 <模式> 的标签"
5762 #: builtin/describe.c:410 builtin/name-rev.c:314
5763 msgid "show abbreviated commit object as fallback"
5764 msgstr "显示简写的提交号作为后备"
5766 #: builtin/describe.c:411
5770 #: builtin/describe.c:412
5771 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
5772 msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")"
5774 #: builtin/describe.c:430
5775 msgid "--long is incompatible with --abbrev=0"
5776 msgstr "--long 与 --abbrev=0 不兼容"
5778 #: builtin/describe.c:456
5779 msgid "No names found, cannot describe anything."
5780 msgstr "没有发现名称,无法描述任何东西。"
5782 #: builtin/describe.c:476
5783 msgid "--dirty is incompatible with commit-ishes"
5784 msgstr "--dirty 不能与提交同时使用"
5786 #: builtin/diff.c:86
5788 msgid "'%s': not a regular file or symlink"
5789 msgstr "'%s':不是一个正规文件或符号链接"
5791 #: builtin/diff.c:237
5793 msgid "invalid option: %s"
5796 #: builtin/diff.c:358
5797 msgid "Not a git repository"
5798 msgstr "不是一个 git 仓库"
5800 #: builtin/diff.c:401
5802 msgid "invalid object '%s' given."
5803 msgstr "提供了无效对象 '%s'。"
5805 #: builtin/diff.c:410
5807 msgid "more than two blobs given: '%s'"
5808 msgstr "提供了超过两个数据对象:'%s'"
5810 #: builtin/diff.c:417
5812 msgid "unhandled object '%s' given."
5813 msgstr "无法处理的对象 '%s'。"
5815 #: builtin/fast-export.c:25
5816 msgid "git fast-export [rev-list-opts]"
5817 msgstr "git fast-export [rev-list-opts]"
5819 #: builtin/fast-export.c:980
5820 msgid "show progress after <n> objects"
5821 msgstr "在 <n> 个对象之后显示进度"
5823 #: builtin/fast-export.c:982
5824 msgid "select handling of signed tags"
5827 #: builtin/fast-export.c:985
5828 msgid "select handling of tags that tag filtered objects"
5829 msgstr "选择当标签指向被过滤对象时该标签的处理方式"
5831 #: builtin/fast-export.c:988
5832 msgid "Dump marks to this file"
5835 #: builtin/fast-export.c:990
5836 msgid "Import marks from this file"
5839 #: builtin/fast-export.c:992
5840 msgid "Fake a tagger when tags lack one"
5841 msgstr "当标签缺少标记者字段时,假装提供一个"
5843 #: builtin/fast-export.c:994
5844 msgid "Output full tree for each commit"
5847 #: builtin/fast-export.c:996
5848 msgid "Use the done feature to terminate the stream"
5849 msgstr "使用 done 功能来终止流"
5851 #: builtin/fast-export.c:997
5852 msgid "Skip output of blob data"
5855 #: builtin/fast-export.c:998
5859 #: builtin/fast-export.c:999
5860 msgid "Apply refspec to exported refs"
5861 msgstr "对导出的引用应用引用规格"
5863 #: builtin/fast-export.c:1000
5864 msgid "anonymize output"
5867 #: builtin/fetch.c:20
5868 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
5869 msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
5871 #: builtin/fetch.c:21
5872 msgid "git fetch [<options>] <group>"
5873 msgstr "git fetch [<选项>] <组>"
5875 #: builtin/fetch.c:22
5876 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
5877 msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
5879 #: builtin/fetch.c:23
5880 msgid "git fetch --all [<options>]"
5881 msgstr "git fetch --all [<选项>]"
5883 #: builtin/fetch.c:90 builtin/pull.c:162
5884 msgid "fetch from all remotes"
5887 #: builtin/fetch.c:92 builtin/pull.c:165
5888 msgid "append to .git/FETCH_HEAD instead of overwriting"
5889 msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
5891 #: builtin/fetch.c:94 builtin/pull.c:168
5892 msgid "path to upload pack on remote end"
5895 #: builtin/fetch.c:95 builtin/pull.c:170
5896 msgid "force overwrite of local branch"
5899 #: builtin/fetch.c:97
5900 msgid "fetch from multiple remotes"
5903 #: builtin/fetch.c:99 builtin/pull.c:172
5904 msgid "fetch all tags and associated objects"
5905 msgstr "抓取所有的标签和关联对象"
5907 #: builtin/fetch.c:101
5908 msgid "do not fetch all tags (--no-tags)"
5909 msgstr "不抓取任何标签(--no-tags)"
5911 #: builtin/fetch.c:103 builtin/pull.c:175
5912 msgid "prune remote-tracking branches no longer on remote"
5913 msgstr "清除远程已经不存在的分支的跟踪分支"
5916 #: builtin/fetch.c:104 builtin/pull.c:178
5920 #: builtin/fetch.c:105 builtin/pull.c:179
5921 msgid "control recursive fetching of submodules"
5924 #: builtin/fetch.c:109 builtin/pull.c:184
5925 msgid "keep downloaded pack"
5928 #: builtin/fetch.c:111
5929 msgid "allow updating of HEAD ref"
5930 msgstr "允许更新 HEAD 引用"
5932 #: builtin/fetch.c:114 builtin/pull.c:187
5933 msgid "deepen history of shallow clone"
5936 #: builtin/fetch.c:116 builtin/pull.c:190
5937 msgid "convert to a complete repository"
5940 #: builtin/fetch.c:118 builtin/log.c:1232
5944 #: builtin/fetch.c:119
5945 msgid "prepend this to submodule path output"
5946 msgstr "在子模组路径输出的前面加上此目录"
5948 #: builtin/fetch.c:122
5949 msgid "default mode for recursion"
5952 #: builtin/fetch.c:124 builtin/pull.c:193
5953 msgid "accept refs that update .git/shallow"
5954 msgstr "接受更新 .git/shallow 的引用"
5956 #: builtin/fetch.c:125 builtin/pull.c:195
5960 #: builtin/fetch.c:126 builtin/pull.c:196
5961 msgid "specify fetch refmap"
5962 msgstr "指定获取操作的引用映射"
5964 #: builtin/fetch.c:378
5965 msgid "Couldn't find remote ref HEAD"
5966 msgstr "无法发现远程 HEAD 引用"
5968 #: builtin/fetch.c:458
5970 msgid "object %s not found"
5973 #: builtin/fetch.c:463
5974 msgid "[up to date]"
5977 #: builtin/fetch.c:477
5979 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
5980 msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)"
5982 #: builtin/fetch.c:478 builtin/fetch.c:566
5986 #: builtin/fetch.c:489
5987 msgid "[tag update]"
5991 #: builtin/fetch.c:491 builtin/fetch.c:526 builtin/fetch.c:544
5992 msgid " (unable to update local ref)"
5993 msgstr " (不能更新本地引用)"
5995 #: builtin/fetch.c:509
5999 #: builtin/fetch.c:512
6000 msgid "[new branch]"
6003 #: builtin/fetch.c:515
6007 #: builtin/fetch.c:561
6008 msgid "unable to update local ref"
6011 #: builtin/fetch.c:561
6012 msgid "forced update"
6015 #: builtin/fetch.c:568
6016 msgid "(non-fast-forward)"
6019 #: builtin/fetch.c:602 builtin/fetch.c:843
6021 msgid "cannot open %s: %s\n"
6022 msgstr "无法打开 %s:%s\n"
6024 #: builtin/fetch.c:611
6026 msgid "%s did not send all necessary objects\n"
6027 msgstr "%s 未发送所有必须的对象\n"
6029 #: builtin/fetch.c:629
6031 msgid "reject %s because shallow roots are not allowed to be updated"
6032 msgstr "拒绝 %s 因为浅克隆不允许被更新"
6034 #: builtin/fetch.c:716 builtin/fetch.c:808
6039 #: builtin/fetch.c:727
6042 "some local refs could not be updated; try running\n"
6043 " 'git remote prune %s' to remove any old, conflicting branches"
6045 "一些本地引用不能被更新;尝试运行\n"
6046 " 'git remote prune %s' 来删除旧的、有冲突的分支"
6049 #: builtin/fetch.c:779
6051 msgid " (%s will become dangling)"
6052 msgstr " (%s 将成为摇摆状态)"
6055 #: builtin/fetch.c:780
6057 msgid " (%s has become dangling)"
6058 msgstr " (%s 已成为摇摆状态)"
6060 #: builtin/fetch.c:812
6064 #: builtin/fetch.c:813 builtin/remote.c:1040
6068 #: builtin/fetch.c:833
6070 msgid "Refusing to fetch into current branch %s of non-bare repository"
6071 msgstr "拒绝获取到非纯仓库的当前分支 %s"
6073 #: builtin/fetch.c:852
6075 msgid "Option \"%s\" value \"%s\" is not valid for %s"
6076 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
6078 #: builtin/fetch.c:855
6080 msgid "Option \"%s\" is ignored for %s\n"
6081 msgstr "选项 \"%s\" 为 %s 所忽略\n"
6083 #: builtin/fetch.c:911
6085 msgid "Don't know how to fetch from %s"
6086 msgstr "不知道如何从 %s 获取"
6088 #: builtin/fetch.c:1072
6090 msgid "Fetching %s\n"
6093 #: builtin/fetch.c:1074 builtin/remote.c:96
6095 msgid "Could not fetch %s"
6098 #: builtin/fetch.c:1092
6100 "No remote repository specified. Please, specify either a URL or a\n"
6101 "remote name from which new revisions should be fetched."
6102 msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。"
6104 #: builtin/fetch.c:1115
6105 msgid "You need to specify a tag name."
6106 msgstr "您需要指定一个标签名称。"
6108 #: builtin/fetch.c:1157
6109 msgid "--depth and --unshallow cannot be used together"
6110 msgstr "--depth 和 --unshallow 不能同时使用"
6112 #: builtin/fetch.c:1159
6113 msgid "--unshallow on a complete repository does not make sense"
6114 msgstr "对于一个完整的仓库,参数 --unshallow 没有意义"
6116 #: builtin/fetch.c:1179
6117 msgid "fetch --all does not take a repository argument"
6118 msgstr "fetch --all 不能带一个仓库参数"
6120 #: builtin/fetch.c:1181
6121 msgid "fetch --all does not make sense with refspecs"
6122 msgstr "fetch --all 带引用规格没有任何意义"
6124 #: builtin/fetch.c:1192
6126 msgid "No such remote or remote group: %s"
6127 msgstr "没有这样的远程或远程组:%s"
6129 #: builtin/fetch.c:1200
6130 msgid "Fetching a group and specifying refspecs does not make sense"
6131 msgstr "获取组并指定引用规格没有意义"
6133 #: builtin/fmt-merge-msg.c:14
6135 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
6136 msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
6138 #: builtin/fmt-merge-msg.c:667
6139 msgid "populate log with at most <n> entries from shortlog"
6140 msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
6142 #: builtin/fmt-merge-msg.c:670
6143 msgid "alias for --log (deprecated)"
6144 msgstr "参数 --log 的别名(已弃用)"
6146 #: builtin/fmt-merge-msg.c:673
6150 #: builtin/fmt-merge-msg.c:674
6151 msgid "use <text> as start of message"
6152 msgstr "使用 <文本> 作为提交说明的开始"
6154 #: builtin/fmt-merge-msg.c:675
6155 msgid "file to read from"
6158 #: builtin/for-each-ref.c:9
6159 msgid "git for-each-ref [<options>] [<pattern>]"
6160 msgstr "git for-each-ref [<选项>] [<模式>]"
6162 #: builtin/for-each-ref.c:10
6163 msgid "git for-each-ref [--points-at <object>]"
6164 msgstr "git for-each-ref [--points-at <对象>]"
6166 #: builtin/for-each-ref.c:11
6167 msgid "git for-each-ref [(--merged | --no-merged) [<object>]]"
6168 msgstr "git for-each-ref [(--merged | --no-merged) [<对象>]]"
6170 #: builtin/for-each-ref.c:12
6171 msgid "git for-each-ref [--contains [<object>]]"
6172 msgstr "git for-each-ref [--contains [<对象>]]"
6174 #: builtin/for-each-ref.c:27
6175 msgid "quote placeholders suitably for shells"
6176 msgstr "引用占位符适用于 shells"
6178 #: builtin/for-each-ref.c:29
6179 msgid "quote placeholders suitably for perl"
6180 msgstr "引用占位符适用于 perl"
6182 #: builtin/for-each-ref.c:31
6183 msgid "quote placeholders suitably for python"
6184 msgstr "引用占位符适用于 python"
6186 #: builtin/for-each-ref.c:33
6187 msgid "quote placeholders suitably for Tcl"
6188 msgstr "引用占位符适用于 Tcl"
6190 #: builtin/for-each-ref.c:36
6191 msgid "show only <n> matched refs"
6192 msgstr "只显示 <n> 个匹配的引用"
6194 #: builtin/for-each-ref.c:37 builtin/tag.c:372
6195 msgid "format to use for the output"
6198 #: builtin/for-each-ref.c:41
6199 msgid "print only refs which points at the given object"
6200 msgstr "只打印指向给定对象的引用"
6202 #: builtin/for-each-ref.c:43
6203 msgid "print only refs that are merged"
6206 #: builtin/for-each-ref.c:44
6207 msgid "print only refs that are not merged"
6210 #: builtin/for-each-ref.c:45
6211 msgid "print only refs which contain the commit"
6212 msgstr "只打印包含该提交的引用"
6214 #: builtin/fsck.c:156 builtin/prune.c:140
6215 msgid "Checking connectivity"
6218 #: builtin/fsck.c:486
6219 msgid "Checking object directories"
6222 #: builtin/fsck.c:553
6223 msgid "git fsck [<options>] [<object>...]"
6224 msgstr "git fsck [<选项>] [<对象>...]"
6226 #: builtin/fsck.c:559
6227 msgid "show unreachable objects"
6230 #: builtin/fsck.c:560
6231 msgid "show dangling objects"
6234 #: builtin/fsck.c:561
6238 #: builtin/fsck.c:562
6239 msgid "report root nodes"
6242 #: builtin/fsck.c:563
6243 msgid "make index objects head nodes"
6244 msgstr "将索引亦作为检查的头节点"
6246 #: builtin/fsck.c:564
6247 msgid "make reflogs head nodes (default)"
6248 msgstr "将引用日志作为检查的头节点(默认)"
6250 #: builtin/fsck.c:565
6251 msgid "also consider packs and alternate objects"
6254 #: builtin/fsck.c:566
6255 msgid "check only connectivity"
6258 #: builtin/fsck.c:567
6259 msgid "enable more strict checking"
6262 #: builtin/fsck.c:569
6263 msgid "write dangling objects in .git/lost-found"
6264 msgstr "将摇摆对象写入 .git/lost-found 中"
6266 #: builtin/fsck.c:570 builtin/prune.c:107
6267 msgid "show progress"
6270 #: builtin/fsck.c:631
6271 msgid "Checking objects"
6275 msgid "git gc [<options>]"
6276 msgstr "git gc [<选项>]"
6280 msgid "Invalid %s: '%s'"
6285 msgid "insanely long object directory %.*s"
6286 msgstr "不正常的长对象目录 %.*s"
6291 "The last gc run reported the following. Please correct the root cause\n"
6293 "Automatic cleanup will not be performed until the file is removed.\n"
6297 "最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n"
6298 "在该文件被删除之前,自动清理将不会执行。\n"
6303 msgid "prune unreferenced objects"
6307 msgid "be more thorough (increased runtime)"
6308 msgstr "更彻底(增加运行时间)"
6311 msgid "enable auto-gc mode"
6315 msgid "force running gc even if there may be another gc running"
6316 msgstr "强制执行 gc 即使另外一个 gc 正在执行"
6320 msgid "Auto packing the repository in background for optimum performance.\n"
6321 msgstr "自动在后台执行仓库打包以求最佳性能。\n"
6325 msgid "Auto packing the repository for optimum performance.\n"
6326 msgstr "自动打包仓库以求最佳性能。\n"
6330 msgid "See \"git help gc\" for manual housekeeping.\n"
6331 msgstr "手工维护参见 \"git help gc\"。\n"
6336 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
6338 "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> (如果不是,使用 --force)"
6342 "There are too many unreachable loose objects; run 'git prune' to remove them."
6343 msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
6345 #: builtin/grep.c:23
6346 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
6347 msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
6349 #: builtin/grep.c:218
6351 msgid "grep: failed to create thread: %s"
6352 msgstr "grep:无法创建线程:%s"
6354 #: builtin/grep.c:441 builtin/grep.c:476
6356 msgid "unable to read tree (%s)"
6359 #: builtin/grep.c:491
6361 msgid "unable to grep from object of type %s"
6362 msgstr "无法抓取来自于 %s 类型的对象"
6364 #: builtin/grep.c:547
6366 msgid "switch `%c' expects a numerical value"
6367 msgstr "开关 `%c' 期望一个数字值"
6369 #: builtin/grep.c:564
6371 msgid "cannot open '%s'"
6374 #: builtin/grep.c:633
6375 msgid "search in index instead of in the work tree"
6376 msgstr "在索引区搜索而不是在工作区"
6378 #: builtin/grep.c:635
6379 msgid "find in contents not managed by git"
6380 msgstr "在未被 git 管理的内容中查找"
6382 # 译者:中文字符串拼接,可删除前导空格
6383 #: builtin/grep.c:637
6384 msgid "search in both tracked and untracked files"
6385 msgstr "在跟踪和未跟踪的文件中搜索"
6387 #: builtin/grep.c:639
6388 msgid "ignore files specified via '.gitignore'"
6389 msgstr "忽略 '.gitignore' 包含的文件"
6391 #: builtin/grep.c:642
6392 msgid "show non-matching lines"
6395 #: builtin/grep.c:644
6396 msgid "case insensitive matching"
6399 #: builtin/grep.c:646
6400 msgid "match patterns only at word boundaries"
6403 #: builtin/grep.c:648
6404 msgid "process binary files as text"
6405 msgstr "把二进制文件当做文本处理"
6407 #: builtin/grep.c:650
6408 msgid "don't match patterns in binary files"
6409 msgstr "不在二进制文件中匹配模式"
6411 #: builtin/grep.c:653
6412 msgid "process binary files with textconv filters"
6413 msgstr "用 textconv 过滤器处理二进制文件"
6415 #: builtin/grep.c:655
6416 msgid "descend at most <depth> levels"
6417 msgstr "最多以指定的深度向下寻找"
6419 #: builtin/grep.c:659
6420 msgid "use extended POSIX regular expressions"
6421 msgstr "使用扩展的 POSIX 正则表达式"
6423 #: builtin/grep.c:662
6424 msgid "use basic POSIX regular expressions (default)"
6425 msgstr "使用基本的 POSIX 正则表达式(默认)"
6427 #: builtin/grep.c:665
6428 msgid "interpret patterns as fixed strings"
6429 msgstr "把模式解析为固定的字符串"
6431 #: builtin/grep.c:668
6432 msgid "use Perl-compatible regular expressions"
6433 msgstr "使用 Perl 兼容的正则表达式"
6435 #: builtin/grep.c:671
6436 msgid "show line numbers"
6439 #: builtin/grep.c:672
6440 msgid "don't show filenames"
6443 #: builtin/grep.c:673
6444 msgid "show filenames"
6447 #: builtin/grep.c:675
6448 msgid "show filenames relative to top directory"
6449 msgstr "显示相对于顶级目录的文件名"
6451 #: builtin/grep.c:677
6452 msgid "show only filenames instead of matching lines"
6453 msgstr "只显示文件名而不显示匹配的行"
6455 #: builtin/grep.c:679
6456 msgid "synonym for --files-with-matches"
6457 msgstr "和 --files-with-matches 同义"
6459 #: builtin/grep.c:682
6460 msgid "show only the names of files without match"
6463 #: builtin/grep.c:684
6464 msgid "print NUL after filenames"
6465 msgstr "在文件名后输出 NUL 字符"
6467 #: builtin/grep.c:686
6468 msgid "show the number of matches instead of matching lines"
6469 msgstr "显示总匹配行数,而不显示匹配的行"
6471 #: builtin/grep.c:687
6472 msgid "highlight matches"
6475 #: builtin/grep.c:689
6476 msgid "print empty line between matches from different files"
6477 msgstr "在不同文件的匹配项之间打印空行"
6479 #: builtin/grep.c:691
6480 msgid "show filename only once above matches from same file"
6481 msgstr "只在同一文件的匹配项的上面显示一次文件名"
6483 #: builtin/grep.c:694
6484 msgid "show <n> context lines before and after matches"
6485 msgstr "显示匹配项前后的 <n> 行上下文"
6487 #: builtin/grep.c:697
6488 msgid "show <n> context lines before matches"
6489 msgstr "显示匹配项前 <n> 行上下文"
6491 #: builtin/grep.c:699
6492 msgid "show <n> context lines after matches"
6493 msgstr "显示匹配项后 <n> 行上下文"
6495 #: builtin/grep.c:700
6496 msgid "shortcut for -C NUM"
6499 #: builtin/grep.c:703
6500 msgid "show a line with the function name before matches"
6501 msgstr "在匹配的前面显示一行函数名"
6503 #: builtin/grep.c:705
6504 msgid "show the surrounding function"
6505 msgstr "显示所在函数的前后内容"
6507 #: builtin/grep.c:708
6508 msgid "read patterns from file"
6511 #: builtin/grep.c:710
6512 msgid "match <pattern>"
6515 #: builtin/grep.c:712
6516 msgid "combine patterns specified with -e"
6517 msgstr "组合用 -e 参数设定的模式"
6519 #: builtin/grep.c:724
6520 msgid "indicate hit with exit status without output"
6521 msgstr "不输出,而用退出码标识命中状态"
6523 #: builtin/grep.c:726
6524 msgid "show only matches from files that match all patterns"
6525 msgstr "只显示匹配所有模式的文件中的匹配"
6527 #: builtin/grep.c:728
6528 msgid "show parse tree for grep expression"
6529 msgstr "显示 grep 表达式的解析树"
6531 #: builtin/grep.c:732
6535 #: builtin/grep.c:732
6536 msgid "show matching files in the pager"
6539 #: builtin/grep.c:735
6540 msgid "allow calling of grep(1) (ignored by this build)"
6541 msgstr "允许调用 grep(1)(本次构建忽略)"
6543 #: builtin/grep.c:793
6544 msgid "no pattern given."
6547 #: builtin/grep.c:851
6548 msgid "--open-files-in-pager only works on the worktree"
6549 msgstr "--open-files-in-pager 仅用于工作区"
6551 #: builtin/grep.c:877
6552 msgid "--cached or --untracked cannot be used with --no-index."
6553 msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
6555 #: builtin/grep.c:882
6556 msgid "--no-index or --untracked cannot be used with revs."
6557 msgstr "--no-index 或 --untracked 不能和版本同时使用。"
6559 #: builtin/grep.c:885
6560 msgid "--[no-]exclude-standard cannot be used for tracked contents."
6561 msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
6563 #: builtin/grep.c:893
6564 msgid "both --cached and trees are given."
6565 msgstr "同时给出了 --cached 和树对象。"
6567 #: builtin/hash-object.c:80
6569 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
6572 "git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
6575 #: builtin/hash-object.c:81
6576 msgid "git hash-object --stdin-paths"
6577 msgstr "git hash-object --stdin-paths"
6579 #: builtin/hash-object.c:92
6583 #: builtin/hash-object.c:92
6587 #: builtin/hash-object.c:93
6588 msgid "write the object into the object database"
6591 #: builtin/hash-object.c:95
6592 msgid "read the object from stdin"
6595 #: builtin/hash-object.c:97
6596 msgid "store file as is without filters"
6597 msgstr "原样存储文件不使用过滤器"
6599 #: builtin/hash-object.c:98
6601 "just hash any random garbage to create corrupt objects for debugging Git"
6602 msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
6604 #: builtin/hash-object.c:99
6605 msgid "process file as it were from this path"
6606 msgstr "处理文件并假设其来自于此路径"
6608 #: builtin/help.c:41
6609 msgid "print all available commands"
6612 #: builtin/help.c:42
6613 msgid "print list of useful guides"
6616 #: builtin/help.c:43
6617 msgid "show man page"
6620 #: builtin/help.c:44
6621 msgid "show manual in web browser"
6622 msgstr "在 web 浏览器中显示手册"
6624 #: builtin/help.c:46
6625 msgid "show info page"
6628 #: builtin/help.c:52
6629 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
6630 msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
6632 #: builtin/help.c:64
6634 msgid "unrecognized help format '%s'"
6635 msgstr "未能识别的帮助格式 '%s'"
6637 #: builtin/help.c:91
6638 msgid "Failed to start emacsclient."
6639 msgstr "无法启动 emacsclient。"
6641 #: builtin/help.c:104
6642 msgid "Failed to parse emacsclient version."
6643 msgstr "无法解析 emacsclient 版本。"
6645 #: builtin/help.c:112
6647 msgid "emacsclient version '%d' too old (< 22)."
6648 msgstr "emacsclient 版本 '%d' 太老(< 22)。"
6650 #: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
6652 msgid "failed to exec '%s': %s"
6653 msgstr "无法执行 '%s':%s"
6655 #: builtin/help.c:208
6658 "'%s': path for unsupported man viewer.\n"
6659 "Please consider using 'man.<tool>.cmd' instead."
6661 "'%s':不支持的 man 手册查看器的路径。\n"
6662 "请使用 'man.<工具>.cmd'。"
6664 #: builtin/help.c:220
6667 "'%s': cmd for supported man viewer.\n"
6668 "Please consider using 'man.<tool>.path' instead."
6670 "'%s': 支持的 man 手册查看器命令。\n"
6671 "请使用 'man.<工具>.path'。"
6673 #: builtin/help.c:337
6675 msgid "'%s': unknown man viewer."
6676 msgstr "'%s':未知的 man 查看器。"
6678 #: builtin/help.c:354
6679 msgid "no man viewer handled the request"
6680 msgstr "没有 man 查看器处理此请求"
6682 #: builtin/help.c:362
6683 msgid "no info viewer handled the request"
6684 msgstr "没有 info 查看器处理此请求"
6686 #: builtin/help.c:411
6687 msgid "Defining attributes per path"
6690 #: builtin/help.c:412
6691 msgid "Everyday Git With 20 Commands Or So"
6692 msgstr "每一天 Git 常用的约 20 条命令"
6694 #: builtin/help.c:413
6695 msgid "A Git glossary"
6698 #: builtin/help.c:414
6699 msgid "Specifies intentionally untracked files to ignore"
6702 #: builtin/help.c:415
6703 msgid "Defining submodule properties"
6706 #: builtin/help.c:416
6707 msgid "Specifying revisions and ranges for Git"
6708 msgstr "指定 Git 的版本和版本范围"
6710 #: builtin/help.c:417
6711 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
6712 msgstr "一个 Git 教程(针对 1.5.1 或更新版本)"
6714 #: builtin/help.c:418
6715 msgid "An overview of recommended workflows with Git"
6716 msgstr "Git 推荐的工作流概览"
6718 #: builtin/help.c:430
6719 msgid "The common Git guides are:\n"
6720 msgstr "最常用的 Git 向导有:\n"
6722 #: builtin/help.c:451 builtin/help.c:468
6727 #: builtin/help.c:484
6729 msgid "`git %s' is aliased to `%s'"
6730 msgstr "`git %s' 是 `%s' 的别名"
6732 #: builtin/index-pack.c:152
6734 msgid "unable to open %s"
6737 #: builtin/index-pack.c:202
6739 msgid "object type mismatch at %s"
6740 msgstr "%s 的对象类型不匹配"
6742 #: builtin/index-pack.c:222
6744 msgid "did not receive expected object %s"
6745 msgstr "未能获取期望的对象 %s"
6747 #: builtin/index-pack.c:225
6749 msgid "object %s: expected type %s, found %s"
6750 msgstr "对象 %s:期待类型 %s,却是 %s"
6752 #: builtin/index-pack.c:267
6754 msgid "cannot fill %d byte"
6755 msgid_plural "cannot fill %d bytes"
6756 msgstr[0] "无法填充 %d 字节"
6757 msgstr[1] "无法填充 %d 字节"
6759 #: builtin/index-pack.c:277
6761 msgstr "过早的文件结束符(EOF)"
6763 #: builtin/index-pack.c:278
6764 msgid "read error on input"
6767 #: builtin/index-pack.c:290
6768 msgid "used more bytes than were available"
6771 #: builtin/index-pack.c:297
6772 msgid "pack too large for current definition of off_t"
6773 msgstr "包太大超过了当前 off_t 的定义"
6775 #: builtin/index-pack.c:313
6777 msgid "unable to create '%s'"
6780 #: builtin/index-pack.c:318
6782 msgid "cannot open packfile '%s'"
6783 msgstr "无法打开包文件 '%s'"
6785 #: builtin/index-pack.c:332
6786 msgid "pack signature mismatch"
6789 #: builtin/index-pack.c:334
6791 msgid "pack version %<PRIu32> unsupported"
6792 msgstr "不支持包版本 %<PRIu32>"
6794 #: builtin/index-pack.c:352
6796 msgid "pack has bad object at offset %lu: %s"
6797 msgstr "包中有错误的对象位于 %lu:%s"
6799 #: builtin/index-pack.c:473
6801 msgid "inflate returned %d"
6804 #: builtin/index-pack.c:522
6805 msgid "offset value overflow for delta base object"
6806 msgstr "偏移值覆盖了 delta 基准对象"
6808 #: builtin/index-pack.c:530
6809 msgid "delta base offset is out of bound"
6810 msgstr "delta 基准偏移越界"
6812 #: builtin/index-pack.c:538
6814 msgid "unknown object type %d"
6817 #: builtin/index-pack.c:569
6818 msgid "cannot pread pack file"
6821 #: builtin/index-pack.c:571
6823 msgid "premature end of pack file, %lu byte missing"
6824 msgid_plural "premature end of pack file, %lu bytes missing"
6825 msgstr[0] "包文件过早结束,缺少 %lu 字节"
6826 msgstr[1] "包文件过早结束,缺少 %lu 字节"
6828 #: builtin/index-pack.c:597
6829 msgid "serious inflate inconsistency"
6832 #: builtin/index-pack.c:743 builtin/index-pack.c:749 builtin/index-pack.c:772
6833 #: builtin/index-pack.c:806 builtin/index-pack.c:815
6835 msgid "SHA1 COLLISION FOUND WITH %s !"
6836 msgstr "发现 %s 出现 SHA1 冲突!"
6838 #: builtin/index-pack.c:746 builtin/pack-objects.c:162
6839 #: builtin/pack-objects.c:254
6841 msgid "unable to read %s"
6844 #: builtin/index-pack.c:812
6846 msgid "cannot read existing object %s"
6847 msgstr "不能读取现存对象 %s"
6849 #: builtin/index-pack.c:826
6851 msgid "invalid blob object %s"
6854 #: builtin/index-pack.c:840
6859 #: builtin/index-pack.c:843
6860 msgid "Error in object"
6863 #: builtin/index-pack.c:845
6865 msgid "Not all child objects of %s are reachable"
6866 msgstr "%s 的所有子对象并非都可达"
6868 #: builtin/index-pack.c:917 builtin/index-pack.c:948
6869 msgid "failed to apply delta"
6872 #: builtin/index-pack.c:1118
6873 msgid "Receiving objects"
6876 #: builtin/index-pack.c:1118
6877 msgid "Indexing objects"
6880 #: builtin/index-pack.c:1150
6881 msgid "pack is corrupted (SHA1 mismatch)"
6882 msgstr "包冲突(SHA1 不匹配)"
6884 #: builtin/index-pack.c:1155
6885 msgid "cannot fstat packfile"
6888 #: builtin/index-pack.c:1158
6889 msgid "pack has junk at the end"
6892 #: builtin/index-pack.c:1169
6893 msgid "confusion beyond insanity in parse_pack_objects()"
6894 msgstr "parse_pack_objects() 中遇到不可理喻的问题"
6896 #: builtin/index-pack.c:1194
6897 msgid "Resolving deltas"
6900 #: builtin/index-pack.c:1205
6902 msgid "unable to create thread: %s"
6905 #: builtin/index-pack.c:1247
6906 msgid "confusion beyond insanity"
6909 #: builtin/index-pack.c:1253
6911 msgid "completed with %d local objects"
6912 msgstr "完成 %d 个本地对象"
6914 #: builtin/index-pack.c:1263
6916 msgid "Unexpected tail checksum for %s (disk corruption?)"
6917 msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
6919 #: builtin/index-pack.c:1267
6921 msgid "pack has %d unresolved delta"
6922 msgid_plural "pack has %d unresolved deltas"
6923 msgstr[0] "包有 %d 个未解决的 delta"
6924 msgstr[1] "包有 %d 个未解决的 delta"
6926 #: builtin/index-pack.c:1291
6928 msgid "unable to deflate appended object (%d)"
6929 msgstr "不能压缩附加对象(%d)"
6931 #: builtin/index-pack.c:1367
6933 msgid "local object %s is corrupt"
6934 msgstr "本地对象 %s 已损坏"
6936 #: builtin/index-pack.c:1391
6937 msgid "error while closing pack file"
6940 #: builtin/index-pack.c:1404
6942 msgid "cannot write keep file '%s'"
6943 msgstr "无法写保留文件 '%s'"
6945 #: builtin/index-pack.c:1412
6947 msgid "cannot close written keep file '%s'"
6948 msgstr "无法关闭保留文件 '%s'"
6950 #: builtin/index-pack.c:1425
6951 msgid "cannot store pack file"
6954 #: builtin/index-pack.c:1436
6955 msgid "cannot store index file"
6958 #: builtin/index-pack.c:1469
6960 msgid "bad pack.indexversion=%<PRIu32>"
6961 msgstr "坏的 pack.indexversion=%<PRIu32>"
6963 #: builtin/index-pack.c:1475
6965 msgid "invalid number of threads specified (%d)"
6966 msgstr "指定的线程数无效(%d)"
6968 #: builtin/index-pack.c:1479 builtin/index-pack.c:1663
6970 msgid "no threads support, ignoring %s"
6971 msgstr "没有线程支持,忽略 %s"
6973 #: builtin/index-pack.c:1537
6975 msgid "Cannot open existing pack file '%s'"
6976 msgstr "无法打开现存包文件 '%s'"
6978 #: builtin/index-pack.c:1539
6980 msgid "Cannot open existing pack idx file for '%s'"
6981 msgstr "无法为 %s 打开包索引文件"
6983 #: builtin/index-pack.c:1586
6985 msgid "non delta: %d object"
6986 msgid_plural "non delta: %d objects"
6987 msgstr[0] "非 delta:%d 个对象"
6988 msgstr[1] "非 delta:%d 个对象"
6990 #: builtin/index-pack.c:1593
6992 msgid "chain length = %d: %lu object"
6993 msgid_plural "chain length = %d: %lu objects"
6994 msgstr[0] "链长 = %d: %lu 对象"
6995 msgstr[1] "链长 = %d: %lu 对象"
6997 #: builtin/index-pack.c:1623
6998 msgid "Cannot come back to cwd"
7001 #: builtin/index-pack.c:1675 builtin/index-pack.c:1678
7002 #: builtin/index-pack.c:1690 builtin/index-pack.c:1694
7007 #: builtin/index-pack.c:1708
7008 msgid "--fix-thin cannot be used without --stdin"
7009 msgstr "--fix-thin 不能和 --stdin 同时使用"
7011 #: builtin/index-pack.c:1712 builtin/index-pack.c:1721
7013 msgid "packfile name '%s' does not end with '.pack'"
7014 msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
7016 #: builtin/index-pack.c:1729
7017 msgid "--verify with no packfile name given"
7018 msgstr "--verify 没有提供包文件名参数"
7020 #: builtin/init-db.c:55
7022 msgid "cannot stat '%s'"
7023 msgstr "不能枚举 '%s' 状态"
7025 #: builtin/init-db.c:61
7027 msgid "cannot stat template '%s'"
7028 msgstr "不能枚举模版 '%s' 状态"
7030 #: builtin/init-db.c:66
7032 msgid "cannot opendir '%s'"
7033 msgstr "不能打开目录 '%s'"
7035 #: builtin/init-db.c:77
7037 msgid "cannot readlink '%s'"
7038 msgstr "不能读取链接 '%s'"
7040 #: builtin/init-db.c:79
7042 msgid "cannot symlink '%s' '%s'"
7043 msgstr "不能自 '%s' 到 '%s' 创建符号链接"
7045 #: builtin/init-db.c:85
7047 msgid "cannot copy '%s' to '%s'"
7048 msgstr "不能拷贝 '%s' 至 '%s'"
7050 #: builtin/init-db.c:89
7052 msgid "ignoring template %s"
7055 #: builtin/init-db.c:118
7057 msgid "templates not found %s"
7060 #: builtin/init-db.c:131
7062 msgid "not copying templates of a wrong format version %d from '%s'"
7063 msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
7065 #: builtin/init-db.c:309 builtin/init-db.c:312
7067 msgid "%s already exists"
7070 #: builtin/init-db.c:340
7072 msgid "unable to handle file type %d"
7073 msgstr "不能处理 %d 类型的文件"
7075 #: builtin/init-db.c:343
7077 msgid "unable to move %s to %s"
7078 msgstr "不能移动 %s 至 %s"
7080 #. TRANSLATORS: The first '%s' is either "Reinitialized
7081 #. existing" or "Initialized empty", the second " shared" or
7082 #. "", and the last '%s%s' is the verbatim directory name.
7083 #: builtin/init-db.c:399
7085 msgid "%s%s Git repository in %s%s\n"
7086 msgstr "%s%s Git 仓库于 %s%s\n"
7088 #: builtin/init-db.c:400
7089 msgid "Reinitialized existing"
7092 #: builtin/init-db.c:400
7093 msgid "Initialized empty"
7096 # 译者:中文字符串拼接,可删除前导空格
7097 #: builtin/init-db.c:401
7101 #: builtin/init-db.c:448
7103 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
7104 "shared[=<permissions>]] [<directory>]"
7106 "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
7109 #: builtin/init-db.c:471
7113 #: builtin/init-db.c:472
7114 msgid "specify that the git repository is to be shared amongst several users"
7115 msgstr "指定 git 仓库是多个用户之间共享的"
7117 #: builtin/init-db.c:506 builtin/init-db.c:511
7119 msgid "cannot mkdir %s"
7122 #: builtin/init-db.c:515
7124 msgid "cannot chdir to %s"
7127 #: builtin/init-db.c:536
7130 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
7132 msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)"
7134 #: builtin/init-db.c:564
7136 msgid "Cannot access work tree '%s'"
7137 msgstr "不能访问工作区 '%s'"
7139 #: builtin/interpret-trailers.c:15
7141 "git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] "
7144 "git interpret-trailers [--trim-empty] [(--trailer <键>[(=|:)<值>])...] [<文件"
7147 #: builtin/interpret-trailers.c:25
7148 msgid "trim empty trailers"
7151 #: builtin/interpret-trailers.c:26
7155 #: builtin/interpret-trailers.c:27
7156 msgid "trailer(s) to add"
7160 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
7161 msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
7164 msgid "git show [<options>] <object>..."
7165 msgstr "git show [<选项>] <对象>..."
7169 msgid "invalid --decorate option: %s"
7170 msgstr "无效的 --decorate 选项:%s"
7172 #: builtin/log.c:131
7173 msgid "suppress diff output"
7176 #: builtin/log.c:132
7180 #: builtin/log.c:133
7181 msgid "Use mail map file"
7184 #: builtin/log.c:134
7185 msgid "decorate options"
7188 #: builtin/log.c:137
7189 msgid "Process line range n,m in file, counting from 1"
7190 msgstr "处理文件中第 n 到 m 之间的行,从 1 开始"
7192 #: builtin/log.c:233
7194 msgid "Final output: %d %s\n"
7195 msgstr "最终输出:%d %s\n"
7197 #: builtin/log.c:465
7199 msgid "git show %s: bad file"
7200 msgstr "git show %s: 损坏的文件"
7202 #: builtin/log.c:479 builtin/log.c:572
7204 msgid "Could not read object %s"
7207 #: builtin/log.c:596
7209 msgid "Unknown type: %d"
7212 #: builtin/log.c:714
7213 msgid "format.headers without value"
7214 msgstr "format.headers 没有值"
7216 #: builtin/log.c:798
7217 msgid "name of output directory is too long"
7220 #: builtin/log.c:813
7222 msgid "Cannot open patch file %s"
7223 msgstr "无法打开补丁文件 %s"
7225 #: builtin/log.c:827
7226 msgid "Need exactly one range."
7229 #: builtin/log.c:837
7230 msgid "Not a range."
7233 #: builtin/log.c:943
7234 msgid "Cover letter needs email format"
7237 #: builtin/log.c:1022
7239 msgid "insane in-reply-to: %s"
7240 msgstr "不正常的 in-reply-to:%s"
7242 #: builtin/log.c:1050
7243 msgid "git format-patch [<options>] [<since> | <revision-range>]"
7244 msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
7246 #: builtin/log.c:1095
7247 msgid "Two output directories?"
7250 #: builtin/log.c:1210
7251 msgid "use [PATCH n/m] even with a single patch"
7252 msgstr "使用 [PATCH n/m],即使只有一个补丁"
7254 #: builtin/log.c:1213
7255 msgid "use [PATCH] even with multiple patches"
7256 msgstr "使用 [PATCH],即使有多个补丁"
7258 #: builtin/log.c:1217
7259 msgid "print patches to standard out"
7262 #: builtin/log.c:1219
7263 msgid "generate a cover letter"
7266 #: builtin/log.c:1221
7267 msgid "use simple number sequence for output file names"
7268 msgstr "使用简单的数字序列作为输出文件名"
7270 #: builtin/log.c:1222
7274 #: builtin/log.c:1223
7275 msgid "use <sfx> instead of '.patch'"
7276 msgstr "使用 <后缀> 代替 '.patch'"
7278 #: builtin/log.c:1225
7279 msgid "start numbering patches at <n> instead of 1"
7280 msgstr "补丁以 <n> 开始编号,而不是1"
7282 #: builtin/log.c:1227
7283 msgid "mark the series as Nth re-roll"
7284 msgstr "标记补丁系列是第几次重制"
7286 #: builtin/log.c:1229
7287 msgid "Use [<prefix>] instead of [PATCH]"
7288 msgstr "使用 [<前缀>] 代替 [PATCH]"
7290 #: builtin/log.c:1232
7291 msgid "store resulting files in <dir>"
7292 msgstr "把结果文件存储在 <目录>"
7294 #: builtin/log.c:1235
7295 msgid "don't strip/add [PATCH]"
7296 msgstr "不删除/添加 [PATCH]"
7298 #: builtin/log.c:1238
7299 msgid "don't output binary diffs"
7302 #: builtin/log.c:1240
7303 msgid "don't include a patch matching a commit upstream"
7304 msgstr "不包含已在上游提交中的补丁"
7306 #: builtin/log.c:1242
7307 msgid "show patch format instead of default (patch + stat)"
7308 msgstr "显示纯补丁格式而非默认的(补丁+状态)"
7310 #: builtin/log.c:1244
7314 #: builtin/log.c:1245
7318 #: builtin/log.c:1246
7319 msgid "add email header"
7322 #: builtin/log.c:1247 builtin/log.c:1249
7326 #: builtin/log.c:1247
7327 msgid "add To: header"
7330 #: builtin/log.c:1249
7331 msgid "add Cc: header"
7334 #: builtin/log.c:1251
7338 #: builtin/log.c:1252
7339 msgid "set From address to <ident> (or committer ident if absent)"
7340 msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)"
7342 #: builtin/log.c:1254
7346 #: builtin/log.c:1255
7347 msgid "make first mail a reply to <message-id>"
7348 msgstr "使第一封邮件作为对 <邮件标识> 的回复"
7350 #: builtin/log.c:1256 builtin/log.c:1259
7354 #: builtin/log.c:1257
7355 msgid "attach the patch"
7358 #: builtin/log.c:1260
7359 msgid "inline the patch"
7362 #: builtin/log.c:1264
7363 msgid "enable message threading, styles: shallow, deep"
7364 msgstr "启用邮件线索,风格:浅,深"
7366 #: builtin/log.c:1266
7370 #: builtin/log.c:1267
7371 msgid "add a signature"
7374 #: builtin/log.c:1269
7375 msgid "add a signature from a file"
7378 #: builtin/log.c:1270
7379 msgid "don't print the patch filenames"
7382 #: builtin/log.c:1359
7383 msgid "-n and -k are mutually exclusive."
7384 msgstr "-n 和 -k 互斥。"
7386 #: builtin/log.c:1361
7387 msgid "--subject-prefix and -k are mutually exclusive."
7388 msgstr "--subject-prefix 和 -k 互斥。"
7390 #: builtin/log.c:1369
7391 msgid "--name-only does not make sense"
7392 msgstr "--name-only 无意义"
7394 #: builtin/log.c:1371
7395 msgid "--name-status does not make sense"
7396 msgstr "--name-status 无意义"
7398 #: builtin/log.c:1373
7399 msgid "--check does not make sense"
7400 msgstr "--check 无意义"
7402 #: builtin/log.c:1396
7403 msgid "standard output, or directory, which one?"
7404 msgstr "标准输出或目录,哪一个?"
7406 #: builtin/log.c:1398
7408 msgid "Could not create directory '%s'"
7409 msgstr "不能创建目录 '%s'"
7411 #: builtin/log.c:1495
7413 msgid "unable to read signature file '%s'"
7414 msgstr "无法读取签名文件 '%s'"
7416 #: builtin/log.c:1558
7417 msgid "Failed to create output files"
7420 #: builtin/log.c:1606
7421 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
7422 msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
7424 #: builtin/log.c:1660
7427 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
7428 msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n"
7430 #: builtin/log.c:1671 builtin/log.c:1673 builtin/log.c:1685
7432 msgid "Unknown commit %s"
7435 #: builtin/ls-files.c:358
7436 msgid "git ls-files [<options>] [<file>...]"
7437 msgstr "git ls-files [<选项>] [<文件>...]"
7439 #: builtin/ls-files.c:415
7440 msgid "identify the file status with tags"
7443 #: builtin/ls-files.c:417
7444 msgid "use lowercase letters for 'assume unchanged' files"
7445 msgstr "使用小写字母表示 '假设未改变的' 文件"
7447 #: builtin/ls-files.c:419
7448 msgid "show cached files in the output (default)"
7449 msgstr "显示缓存的文件(默认)"
7451 #: builtin/ls-files.c:421
7452 msgid "show deleted files in the output"
7455 #: builtin/ls-files.c:423
7456 msgid "show modified files in the output"
7459 #: builtin/ls-files.c:425
7460 msgid "show other files in the output"
7463 #: builtin/ls-files.c:427
7464 msgid "show ignored files in the output"
7467 #: builtin/ls-files.c:430
7468 msgid "show staged contents' object name in the output"
7469 msgstr "显示暂存区内容的对象名称"
7471 #: builtin/ls-files.c:432
7472 msgid "show files on the filesystem that need to be removed"
7473 msgstr "显示文件系统需要删除的文件"
7475 #: builtin/ls-files.c:434
7476 msgid "show 'other' directories' names only"
7477 msgstr "只显示“其他”目录的名称"
7479 #: builtin/ls-files.c:437
7480 msgid "don't show empty directories"
7483 #: builtin/ls-files.c:440
7484 msgid "show unmerged files in the output"
7487 #: builtin/ls-files.c:442
7488 msgid "show resolve-undo information"
7489 msgstr "显示 resolve-undo 信息"
7491 #: builtin/ls-files.c:444
7492 msgid "skip files matching pattern"
7495 #: builtin/ls-files.c:447
7496 msgid "exclude patterns are read from <file>"
7497 msgstr "从 <文件> 中读取排除模式"
7499 #: builtin/ls-files.c:450
7500 msgid "read additional per-directory exclude patterns in <file>"
7501 msgstr "从 <文件> 读取额外的每个目录的排除模式"
7503 #: builtin/ls-files.c:452
7504 msgid "add the standard git exclusions"
7505 msgstr "添加标准的 git 排除"
7507 #: builtin/ls-files.c:455
7508 msgid "make the output relative to the project top directory"
7509 msgstr "显示相对于顶级目录的文件名"
7511 #: builtin/ls-files.c:458
7512 msgid "if any <file> is not in the index, treat this as an error"
7513 msgstr "如果任何 <文件> 都不在索引区,视为错误"
7515 #: builtin/ls-files.c:459
7519 #: builtin/ls-files.c:460
7520 msgid "pretend that paths removed since <tree-ish> are still present"
7521 msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
7523 #: builtin/ls-files.c:462
7524 msgid "show debugging data"
7527 #: builtin/ls-tree.c:28
7528 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
7529 msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
7531 #: builtin/ls-tree.c:128
7532 msgid "only show trees"
7535 #: builtin/ls-tree.c:130
7536 msgid "recurse into subtrees"
7539 #: builtin/ls-tree.c:132
7540 msgid "show trees when recursing"
7543 #: builtin/ls-tree.c:135
7544 msgid "terminate entries with NUL byte"
7545 msgstr "条目以 NUL 字符终止"
7547 #: builtin/ls-tree.c:136
7548 msgid "include object size"
7551 #: builtin/ls-tree.c:138 builtin/ls-tree.c:140
7552 msgid "list only filenames"
7555 #: builtin/ls-tree.c:143
7556 msgid "use full path names"
7559 #: builtin/ls-tree.c:145
7560 msgid "list entire tree; not just current directory (implies --full-name)"
7561 msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
7563 #: builtin/merge.c:45
7564 msgid "git merge [<options>] [<commit>...]"
7565 msgstr "git merge [<选项>] [<提交>...]"
7567 #: builtin/merge.c:46
7568 msgid "git merge [<options>] <msg> HEAD <commit>"
7569 msgstr "git merge [<选项>] <说明> HEAD <提交>"
7571 #: builtin/merge.c:47
7572 msgid "git merge --abort"
7573 msgstr "git merge --abort"
7575 #: builtin/merge.c:100
7576 msgid "switch `m' requires a value"
7577 msgstr "开关 `m' 需要一个值"
7579 #: builtin/merge.c:137
7581 msgid "Could not find merge strategy '%s'.\n"
7582 msgstr "不能找到合并策略 '%s'。\n"
7584 #: builtin/merge.c:138
7586 msgid "Available strategies are:"
7589 #: builtin/merge.c:143
7591 msgid "Available custom strategies are:"
7594 #: builtin/merge.c:193 builtin/pull.c:119
7595 msgid "do not show a diffstat at the end of the merge"
7596 msgstr "在合并的最后不显示差异统计"
7598 #: builtin/merge.c:196 builtin/pull.c:122
7599 msgid "show a diffstat at the end of the merge"
7600 msgstr "在合并的最后显示差异统计"
7602 #: builtin/merge.c:197 builtin/pull.c:125
7603 msgid "(synonym to --stat)"
7604 msgstr "(和 --stat 同义)"
7606 #: builtin/merge.c:199 builtin/pull.c:128
7607 msgid "add (at most <n>) entries from shortlog to merge commit message"
7608 msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
7610 #: builtin/merge.c:202 builtin/pull.c:131
7611 msgid "create a single commit instead of doing a merge"
7612 msgstr "创建一个单独的提交而不是做一次合并"
7614 #: builtin/merge.c:204 builtin/pull.c:134
7615 msgid "perform a commit if the merge succeeds (default)"
7616 msgstr "如果合并成功,执行一次提交(默认)"
7618 #: builtin/merge.c:206 builtin/pull.c:137
7619 msgid "edit message before committing"
7622 #: builtin/merge.c:207
7623 msgid "allow fast-forward (default)"
7626 #: builtin/merge.c:209 builtin/pull.c:143
7627 msgid "abort if fast-forward is not possible"
7628 msgstr "如果不能快进就放弃合并"
7630 #: builtin/merge.c:213
7631 msgid "Verify that the named commit has a valid GPG signature"
7632 msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
7634 #: builtin/merge.c:214 builtin/notes.c:767 builtin/pull.c:148
7635 #: builtin/revert.c:89
7639 #: builtin/merge.c:215 builtin/pull.c:149
7640 msgid "merge strategy to use"
7643 #: builtin/merge.c:216 builtin/pull.c:152
7644 msgid "option=value"
7645 msgstr "option=value"
7647 #: builtin/merge.c:217 builtin/pull.c:153
7648 msgid "option for selected merge strategy"
7651 #: builtin/merge.c:219
7652 msgid "merge commit message (for a non-fast-forward merge)"
7653 msgstr "合并的提交说明(针对非快进式合并)"
7655 #: builtin/merge.c:223
7656 msgid "abort the current in-progress merge"
7657 msgstr "放弃当前正在进行的合并"
7659 #: builtin/merge.c:251
7660 msgid "could not run stash."
7663 #: builtin/merge.c:256
7664 msgid "stash failed"
7667 #: builtin/merge.c:261
7669 msgid "not a valid object: %s"
7670 msgstr "不是一个有效对象:%s"
7672 #: builtin/merge.c:280 builtin/merge.c:297
7673 msgid "read-tree failed"
7677 #: builtin/merge.c:327
7678 msgid " (nothing to squash)"
7681 #: builtin/merge.c:340
7683 msgid "Squash commit -- not updating HEAD\n"
7684 msgstr "压缩提交 -- 未更新 HEAD\n"
7686 #: builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975
7687 #: builtin/merge.c:988
7689 msgid "Could not write to '%s'"
7692 #: builtin/merge.c:372
7693 msgid "Writing SQUASH_MSG"
7694 msgstr "写入 SQUASH_MSG"
7696 #: builtin/merge.c:374
7697 msgid "Finishing SQUASH_MSG"
7698 msgstr "完成 SQUASH_MSG"
7700 #: builtin/merge.c:397
7702 msgid "No merge message -- not updating HEAD\n"
7703 msgstr "无合并信息 -- 未更新 HEAD\n"
7705 #: builtin/merge.c:447
7707 msgid "'%s' does not point to a commit"
7708 msgstr "'%s' 没有指向一个提交"
7710 #: builtin/merge.c:537
7712 msgid "Bad branch.%s.mergeoptions string: %s"
7713 msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
7715 #: builtin/merge.c:656
7716 msgid "Not handling anything other than two heads merge."
7717 msgstr "不能处理两个头合并之外的任何操作。"
7719 #: builtin/merge.c:670
7721 msgid "Unknown option for merge-recursive: -X%s"
7722 msgstr "merge-recursive 的未知选项:-X%s"
7724 #: builtin/merge.c:683
7726 msgid "unable to write %s"
7729 #: builtin/merge.c:772
7731 msgid "Could not read from '%s'"
7732 msgstr "不能从 '%s' 读取"
7734 #: builtin/merge.c:781
7736 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
7737 msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
7739 #: builtin/merge.c:787
7742 "Please enter a commit message to explain why this merge is necessary,\n"
7743 "especially if it merges an updated upstream into a topic branch.\n"
7745 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
7748 "请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
7751 "以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
7753 #: builtin/merge.c:811
7754 msgid "Empty commit message."
7757 #: builtin/merge.c:823
7759 msgid "Wonderful.\n"
7762 #: builtin/merge.c:878
7764 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
7765 msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
7767 #: builtin/merge.c:894
7769 msgid "'%s' is not a commit"
7770 msgstr "'%s' 不是一个提交"
7772 #: builtin/merge.c:935
7773 msgid "No current branch."
7776 #: builtin/merge.c:937
7777 msgid "No remote for the current branch."
7778 msgstr "当前分支没有对应的远程仓库。"
7780 #: builtin/merge.c:939
7781 msgid "No default upstream defined for the current branch."
7782 msgstr "当前分支没有定义默认的上游分支。"
7784 #: builtin/merge.c:944
7786 msgid "No remote-tracking branch for %s from %s"
7787 msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
7789 #: builtin/merge.c:1079
7791 msgid "could not close '%s'"
7794 #: builtin/merge.c:1206
7795 msgid "There is no merge to abort (MERGE_HEAD missing)."
7796 msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
7798 #: builtin/merge.c:1222
7800 "You have not concluded your merge (MERGE_HEAD exists).\n"
7801 "Please, commit your changes before you merge."
7803 "您尚未结束您的合并(存在 MERGE_HEAD)。\n"
7806 #: builtin/merge.c:1229
7808 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
7809 "Please, commit your changes before you merge."
7811 "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
7814 #: builtin/merge.c:1232
7815 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
7816 msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
7818 #: builtin/merge.c:1241
7819 msgid "You cannot combine --squash with --no-ff."
7820 msgstr "您不能将 --squash 与 --no-ff 同时使用。"
7822 #: builtin/merge.c:1249
7823 msgid "No commit specified and merge.defaultToUpstream not set."
7824 msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
7826 #: builtin/merge.c:1266
7827 msgid "Squash commit into empty head not supported yet"
7828 msgstr "尚不支持到空分支的压缩提交"
7830 #: builtin/merge.c:1268
7831 msgid "Non-fast-forward commit does not make sense into an empty head"
7832 msgstr "到空分支的非快进式提交没有意义"
7834 #: builtin/merge.c:1274
7836 msgid "%s - not something we can merge"
7839 #: builtin/merge.c:1276
7840 msgid "Can merge only exactly one commit into empty head"
7841 msgstr "只能将一个提交合并到空分支上"
7843 #: builtin/merge.c:1331
7845 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
7846 msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
7848 #: builtin/merge.c:1334
7850 msgid "Commit %s has a bad GPG signature allegedly by %s."
7851 msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
7853 #: builtin/merge.c:1337
7855 msgid "Commit %s does not have a GPG signature."
7856 msgstr "提交 %s 没有一个 GPG 签名。"
7858 #: builtin/merge.c:1340
7860 msgid "Commit %s has a good GPG signature by %s\n"
7861 msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
7863 #: builtin/merge.c:1423
7865 msgid "Updating %s..%s\n"
7866 msgstr "更新 %s..%s\n"
7868 #: builtin/merge.c:1460
7870 msgid "Trying really trivial in-index merge...\n"
7871 msgstr "尝试非常小的索引内合并...\n"
7873 #: builtin/merge.c:1467
7878 #: builtin/merge.c:1499
7879 msgid "Not possible to fast-forward, aborting."
7882 #: builtin/merge.c:1522 builtin/merge.c:1601
7884 msgid "Rewinding the tree to pristine...\n"
7885 msgstr "将树回滚至原始状态...\n"
7887 #: builtin/merge.c:1526
7889 msgid "Trying merge strategy %s...\n"
7890 msgstr "尝试合并策略 %s...\n"
7892 #: builtin/merge.c:1592
7894 msgid "No merge strategy handled the merge.\n"
7895 msgstr "没有合并策略处理此合并。\n"
7897 #: builtin/merge.c:1594
7899 msgid "Merge with strategy %s failed.\n"
7900 msgstr "使用策略 %s 合并失败。\n"
7902 #: builtin/merge.c:1603
7904 msgid "Using the %s to prepare resolving by hand.\n"
7905 msgstr "使用 %s 以准备手工解决。\n"
7907 #: builtin/merge.c:1615
7909 msgid "Automatic merge went well; stopped before committing as requested\n"
7910 msgstr "自动合并进展顺利,按要求在提交前停止\n"
7912 #: builtin/merge-base.c:29
7913 msgid "git merge-base [-a | --all] <commit> <commit>..."
7914 msgstr "git merge-base [-a | --all] <提交> <提交>..."
7916 #: builtin/merge-base.c:30
7917 msgid "git merge-base [-a | --all] --octopus <commit>..."
7918 msgstr "git merge-base [-a | --all] --octopus <提交>..."
7920 #: builtin/merge-base.c:31
7921 msgid "git merge-base --independent <commit>..."
7922 msgstr "git merge-base --independent <提交>..."
7924 #: builtin/merge-base.c:32
7925 msgid "git merge-base --is-ancestor <commit> <commit>"
7926 msgstr "git merge-base --is-ancestor <提交> <提交>"
7928 #: builtin/merge-base.c:33
7929 msgid "git merge-base --fork-point <ref> [<commit>]"
7930 msgstr "git merge-base --fork-point <引用> [<提交>]"
7932 #: builtin/merge-base.c:214
7933 msgid "output all common ancestors"
7936 #: builtin/merge-base.c:216
7937 msgid "find ancestors for a single n-way merge"
7938 msgstr "查找一个多路合并的祖先提交"
7940 #: builtin/merge-base.c:218
7941 msgid "list revs not reachable from others"
7942 msgstr "显示不能被其他访问到的版本"
7944 #: builtin/merge-base.c:220
7945 msgid "is the first one ancestor of the other?"
7946 msgstr "第一个是其他的祖先提交么?"
7948 #: builtin/merge-base.c:222
7949 msgid "find where <commit> forked from reflog of <ref>"
7950 msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处"
7952 #: builtin/merge-file.c:8
7954 "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
7955 "<orig-file> <file2>"
7957 "git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文"
7960 #: builtin/merge-file.c:33
7961 msgid "send results to standard output"
7964 #: builtin/merge-file.c:34
7965 msgid "use a diff3 based merge"
7966 msgstr "使用基于 diff3 的合并"
7968 #: builtin/merge-file.c:35
7969 msgid "for conflicts, use our version"
7970 msgstr "如果冲突,使用我们的版本"
7972 #: builtin/merge-file.c:37
7973 msgid "for conflicts, use their version"
7974 msgstr "如果冲突,使用他们的版本"
7976 #: builtin/merge-file.c:39
7977 msgid "for conflicts, use a union version"
7978 msgstr "如果冲突,使用联合版本"
7980 #: builtin/merge-file.c:42
7981 msgid "for conflicts, use this marker size"
7982 msgstr "如果冲突,使用指定长度的标记"
7984 #: builtin/merge-file.c:43
7985 msgid "do not warn about conflicts"
7988 #: builtin/merge-file.c:45
7989 msgid "set labels for file1/orig-file/file2"
7990 msgstr "为 文件1/初始文件/文件2 设置标签"
7992 #: builtin/mktree.c:64
7993 msgid "git mktree [-z] [--missing] [--batch]"
7994 msgstr "git mktree [-z] [--missing] [--batch]"
7996 #: builtin/mktree.c:150
7997 msgid "input is NUL terminated"
7998 msgstr "输入以 NUL 字符终止"
8000 #: builtin/mktree.c:151 builtin/write-tree.c:24
8001 msgid "allow missing objects"
8004 #: builtin/mktree.c:152
8005 msgid "allow creation of more than one tree"
8009 msgid "git mv [<options>] <source>... <destination>"
8010 msgstr "git mv [<选项>] <源>... <目标>"
8014 msgid "Directory %s is in index and no submodule?"
8015 msgstr "目录 %s 在索引中并且不是子模组?"
8018 msgid "Please stage your changes to .gitmodules or stash them to proceed"
8019 msgstr "请将您的修改暂存到 .gitmodules 中或保存进度后再继续"
8023 msgid "%.*s is in index"
8027 msgid "force move/rename even if target exists"
8028 msgstr "强制移动/重命令,即使目标存在"
8031 msgid "skip move/rename errors"
8036 msgid "destination '%s' is not a directory"
8037 msgstr "目标 '%s' 不是一个目录"
8041 msgid "Checking rename of '%s' to '%s'\n"
8042 msgstr "检查 '%s' 到 '%s' 的重命名\n"
8049 msgid "can not move directory into itself"
8053 msgid "cannot move directory over file"
8057 msgid "source directory is empty"
8061 msgid "not under version control"
8065 msgid "destination exists"
8070 msgid "overwriting '%s'"
8074 msgid "Cannot overwrite"
8078 msgid "multiple sources for the same target"
8082 msgid "destination directory does not exist"
8087 msgid "%s, source=%s, destination=%s"
8088 msgstr "%s,源=%s,目标=%s"
8092 msgid "Renaming %s to %s\n"
8093 msgstr "重命名 %s 至 %s\n"
8095 #: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:365
8097 msgid "renaming '%s' failed"
8098 msgstr "重命名 '%s' 失败"
8100 #: builtin/name-rev.c:251
8101 msgid "git name-rev [<options>] <commit>..."
8102 msgstr "git name-rev [<选项>] <提交>..."
8104 #: builtin/name-rev.c:252
8105 msgid "git name-rev [<options>] --all"
8106 msgstr "git name-rev [<选项>] --all"
8108 #: builtin/name-rev.c:253
8109 msgid "git name-rev [<options>] --stdin"
8110 msgstr "git name-rev [<选项>] --stdin"
8112 #: builtin/name-rev.c:305
8113 msgid "print only names (no SHA-1)"
8114 msgstr "只打印名称(无 SHA-1)"
8116 #: builtin/name-rev.c:306
8117 msgid "only use tags to name the commits"
8120 #: builtin/name-rev.c:308
8121 msgid "only use refs matching <pattern>"
8122 msgstr "只使用和 <模式> 相匹配的引用"
8124 #: builtin/name-rev.c:310
8125 msgid "list all commits reachable from all refs"
8126 msgstr "列出可以从所有引用访问的提交"
8128 #: builtin/name-rev.c:311
8129 msgid "read from stdin"
8132 #: builtin/name-rev.c:312
8133 msgid "allow to print `undefined` names (default)"
8134 msgstr "允许打印 `未定义` 的名称(默认)"
8136 #: builtin/name-rev.c:318
8137 msgid "dereference tags in the input (internal use)"
8138 msgstr "反向解析输入中的标签(内部使用)"
8140 #: builtin/notes.c:25
8141 msgid "git notes [--ref <notes-ref>] [list [<object>]]"
8142 msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
8144 #: builtin/notes.c:26
8146 "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
8147 "| (-c | -C) <object>] [<object>]"
8149 "git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
8150 "| (-c | -C) <对象>] [<对象>]"
8152 #: builtin/notes.c:27
8153 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
8154 msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
8156 #: builtin/notes.c:28
8158 "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
8159 "(-c | -C) <object>] [<object>]"
8161 "git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
8162 "(-c | -C) <对象>] [<对象>]"
8164 #: builtin/notes.c:29
8165 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
8166 msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
8168 #: builtin/notes.c:30
8169 msgid "git notes [--ref <notes-ref>] show [<object>]"
8170 msgstr "git notes [--ref <注解引用>] show [<对象>]"
8172 #: builtin/notes.c:31
8174 "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
8175 msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
8177 #: builtin/notes.c:32
8178 msgid "git notes merge --commit [-v | -q]"
8179 msgstr "git notes merge --commit [-v | -q]"
8181 #: builtin/notes.c:33
8182 msgid "git notes merge --abort [-v | -q]"
8183 msgstr "git notes merge --abort [-v | -q]"
8185 #: builtin/notes.c:34
8186 msgid "git notes [--ref <notes-ref>] remove [<object>...]"
8187 msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
8189 #: builtin/notes.c:35
8190 msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
8191 msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
8193 #: builtin/notes.c:36
8194 msgid "git notes [--ref <notes-ref>] get-ref"
8195 msgstr "git notes [--ref <注解引用>] get-ref"
8197 #: builtin/notes.c:41
8198 msgid "git notes [list [<object>]]"
8199 msgstr "git notes [list [<对象>]]"
8201 #: builtin/notes.c:46
8202 msgid "git notes add [<options>] [<object>]"
8203 msgstr "git notes add [<选项>] [<对象>]"
8205 #: builtin/notes.c:51
8206 msgid "git notes copy [<options>] <from-object> <to-object>"
8207 msgstr "git notes copy [<选项>] <源对象> <目标对象>"
8209 #: builtin/notes.c:52
8210 msgid "git notes copy --stdin [<from-object> <to-object>]..."
8211 msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
8213 #: builtin/notes.c:57
8214 msgid "git notes append [<options>] [<object>]"
8215 msgstr "git notes append [<选项>] [<对象>]"
8217 #: builtin/notes.c:62
8218 msgid "git notes edit [<object>]"
8219 msgstr "git notes edit [<对象>]"
8221 #: builtin/notes.c:67
8222 msgid "git notes show [<object>]"
8223 msgstr "git notes show [<对象>]"
8225 #: builtin/notes.c:72
8226 msgid "git notes merge [<options>] <notes-ref>"
8227 msgstr "git notes merge [<选项>] <注解引用>"
8229 #: builtin/notes.c:73
8230 msgid "git notes merge --commit [<options>]"
8231 msgstr "git notes merge --commit [<选项>]"
8233 #: builtin/notes.c:74
8234 msgid "git notes merge --abort [<options>]"
8235 msgstr "git notes merge --abort [<选项>]"
8237 #: builtin/notes.c:79
8238 msgid "git notes remove [<object>]"
8239 msgstr "git notes remove [<对象>]"
8241 #: builtin/notes.c:84
8242 msgid "git notes prune [<options>]"
8243 msgstr "git notes prune [<选项>]"
8245 #: builtin/notes.c:89
8246 msgid "git notes get-ref"
8247 msgstr "git notes get-ref"
8249 #: builtin/notes.c:147
8251 msgid "unable to start 'show' for object '%s'"
8252 msgstr "不能为对象 '%s' 开始 'show'"
8254 #: builtin/notes.c:151
8255 msgid "could not read 'show' output"
8256 msgstr "不能读取 'show' 的输出"
8258 #: builtin/notes.c:159
8260 msgid "failed to finish 'show' for object '%s'"
8261 msgstr "无法为对象 '%s' 完成 'show'"
8263 #: builtin/notes.c:174 builtin/tag.c:248
8265 msgid "could not create file '%s'"
8266 msgstr "不能创建文件 '%s'"
8268 #: builtin/notes.c:193
8269 msgid "Please supply the note contents using either -m or -F option"
8270 msgstr "请通过 -m 或 -F 选项为注解提供内容"
8272 #: builtin/notes.c:202
8273 msgid "unable to write note object"
8276 #: builtin/notes.c:204
8278 msgid "The note contents have been left in %s"
8279 msgstr "注解内容被留在 %s 中"
8281 #: builtin/notes.c:232 builtin/tag.c:440
8283 msgid "cannot read '%s'"
8286 #: builtin/notes.c:234 builtin/tag.c:443
8288 msgid "could not open or read '%s'"
8289 msgstr "不能打开或读取 '%s'"
8291 #: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306
8292 #: builtin/notes.c:366 builtin/notes.c:421 builtin/notes.c:507
8293 #: builtin/notes.c:512 builtin/notes.c:590 builtin/notes.c:653
8294 #: builtin/notes.c:877 builtin/tag.c:456
8296 msgid "Failed to resolve '%s' as a valid ref."
8297 msgstr "无法解析 '%s' 为一个有效引用。"
8299 #: builtin/notes.c:256
8301 msgid "Failed to read object '%s'."
8302 msgstr "无法读取对象 '%s'。"
8304 #: builtin/notes.c:260
8306 msgid "Cannot read note data from non-blob object '%s'."
8307 msgstr "不能从非数据对象 '%s' 中读取注解数据"
8309 #: builtin/notes.c:359 builtin/notes.c:414 builtin/notes.c:490
8310 #: builtin/notes.c:502 builtin/notes.c:578 builtin/notes.c:646
8311 #: builtin/notes.c:942
8312 msgid "too many parameters"
8315 #: builtin/notes.c:372 builtin/notes.c:659
8317 msgid "No note found for object %s."
8318 msgstr "未发现对象 %s 的注解。"
8320 #: builtin/notes.c:393 builtin/notes.c:556
8321 msgid "note contents as a string"
8322 msgstr "注解内容作为一个字符串"
8324 #: builtin/notes.c:396 builtin/notes.c:559
8325 msgid "note contents in a file"
8328 #: builtin/notes.c:399 builtin/notes.c:562
8329 msgid "reuse and edit specified note object"
8330 msgstr "重用和编辑指定的注解对象"
8332 #: builtin/notes.c:402 builtin/notes.c:565
8333 msgid "reuse specified note object"
8336 #: builtin/notes.c:405 builtin/notes.c:568
8337 msgid "allow storing empty note"
8340 #: builtin/notes.c:406 builtin/notes.c:477
8341 msgid "replace existing notes"
8344 #: builtin/notes.c:431
8347 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
8349 msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
8351 #: builtin/notes.c:446 builtin/notes.c:525
8353 msgid "Overwriting existing notes for object %s\n"
8354 msgstr "覆盖对象 %s 现存注解\n"
8356 #: builtin/notes.c:457 builtin/notes.c:618 builtin/notes.c:882
8358 msgid "Removing note for object %s\n"
8359 msgstr "删除对象 %s 的注解\n"
8361 #: builtin/notes.c:478
8362 msgid "read objects from stdin"
8365 #: builtin/notes.c:480
8366 msgid "load rewriting config for <command> (implies --stdin)"
8367 msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
8369 #: builtin/notes.c:498
8370 msgid "too few parameters"
8373 #: builtin/notes.c:519
8376 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
8378 msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
8380 #: builtin/notes.c:531
8382 msgid "Missing notes on source object %s. Cannot copy."
8383 msgstr "源对象 %s 缺少注解。不能拷贝。"
8385 #: builtin/notes.c:583
8388 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
8389 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
8391 "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
8392 "请换用 'git notes add -f -m/-F/-c/-C'。\n"
8394 #: builtin/notes.c:764
8395 msgid "General options"
8398 #: builtin/notes.c:766
8399 msgid "Merge options"
8402 #: builtin/notes.c:768
8404 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
8406 msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
8408 #: builtin/notes.c:770
8409 msgid "Committing unmerged notes"
8412 #: builtin/notes.c:772
8413 msgid "finalize notes merge by committing unmerged notes"
8414 msgstr "通过提交未合并的注解来完成注解合并"
8416 #: builtin/notes.c:774
8417 msgid "Aborting notes merge resolution"
8420 #: builtin/notes.c:776
8421 msgid "abort notes merge"
8424 #: builtin/notes.c:853
8426 msgid "A notes merge into %s is already in-progress at %s"
8427 msgstr "一个到 %s 的注解合并已经在 %s 执行中"
8429 #: builtin/notes.c:880
8431 msgid "Object %s has no note\n"
8432 msgstr "对象 %s 没有注解\n"
8434 #: builtin/notes.c:892
8435 msgid "attempt to remove non-existent note is not an error"
8436 msgstr "尝试删除不存在的注解不是一个错误"
8438 #: builtin/notes.c:895
8439 msgid "read object names from the standard input"
8440 msgstr "从标准输入读取对象名称"
8442 #: builtin/notes.c:976
8446 #: builtin/notes.c:977
8447 msgid "use notes from <notes-ref>"
8448 msgstr "从 <注解引用> 使用注解"
8450 #: builtin/notes.c:1012 builtin/remote.c:1647
8452 msgid "Unknown subcommand: %s"
8455 #: builtin/pack-objects.c:28
8457 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
8458 msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]"
8460 #: builtin/pack-objects.c:29
8462 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
8463 msgstr "git pack-objects [<选项>...] <base-name> [< <引用列表> | < <对象列表>]"
8465 #: builtin/pack-objects.c:175 builtin/pack-objects.c:178
8467 msgid "deflate error (%d)"
8470 #: builtin/pack-objects.c:771
8471 msgid "Writing objects"
8474 #: builtin/pack-objects.c:1011
8475 msgid "disabling bitmap writing, as some objects are not being packed"
8476 msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
8478 #: builtin/pack-objects.c:2171
8479 msgid "Compressing objects"
8482 #: builtin/pack-objects.c:2568
8484 msgid "unsupported index version %s"
8485 msgstr "不支持的索引版本 %s"
8487 #: builtin/pack-objects.c:2572
8489 msgid "bad index version '%s'"
8490 msgstr "坏的索引版本 '%s'"
8492 #: builtin/pack-objects.c:2602
8493 msgid "do not show progress meter"
8496 #: builtin/pack-objects.c:2604
8497 msgid "show progress meter"
8500 #: builtin/pack-objects.c:2606
8501 msgid "show progress meter during object writing phase"
8502 msgstr "在对象写入阶段显示进度表"
8504 #: builtin/pack-objects.c:2609
8505 msgid "similar to --all-progress when progress meter is shown"
8506 msgstr "当进度表显示时类似于 --all-progress"
8508 #: builtin/pack-objects.c:2610
8509 msgid "version[,offset]"
8512 #: builtin/pack-objects.c:2611
8513 msgid "write the pack index file in the specified idx format version"
8514 msgstr "用指定的 idx 格式版本来写包索引文件"
8516 #: builtin/pack-objects.c:2614
8517 msgid "maximum size of each output pack file"
8520 #: builtin/pack-objects.c:2616
8521 msgid "ignore borrowed objects from alternate object store"
8522 msgstr "忽略从备用对象存储里借用对象"
8524 #: builtin/pack-objects.c:2618
8525 msgid "ignore packed objects"
8528 #: builtin/pack-objects.c:2620
8529 msgid "limit pack window by objects"
8532 #: builtin/pack-objects.c:2622
8533 msgid "limit pack window by memory in addition to object limit"
8534 msgstr "除对象数量限制外设置打包窗口的内存限制"
8536 #: builtin/pack-objects.c:2624
8537 msgid "maximum length of delta chain allowed in the resulting pack"
8538 msgstr "打包允许的 delta 链的最大长度"
8540 #: builtin/pack-objects.c:2626
8541 msgid "reuse existing deltas"
8542 msgstr "重用已存在的 deltas"
8544 #: builtin/pack-objects.c:2628
8545 msgid "reuse existing objects"
8548 #: builtin/pack-objects.c:2630
8549 msgid "use OFS_DELTA objects"
8550 msgstr "使用 OFS_DELTA 对象"
8552 #: builtin/pack-objects.c:2632
8553 msgid "use threads when searching for best delta matches"
8554 msgstr "使用线程查询最佳 delta 匹配"
8556 #: builtin/pack-objects.c:2634
8557 msgid "do not create an empty pack output"
8560 #: builtin/pack-objects.c:2636
8561 msgid "read revision arguments from standard input"
8562 msgstr "从标准输入读取版本号参数"
8564 #: builtin/pack-objects.c:2638
8565 msgid "limit the objects to those that are not yet packed"
8566 msgstr "限制那些尚未打包的对象"
8568 #: builtin/pack-objects.c:2641
8569 msgid "include objects reachable from any reference"
8570 msgstr "包括可以从任何引用访问到的对象"
8572 #: builtin/pack-objects.c:2644
8573 msgid "include objects referred by reflog entries"
8574 msgstr "包括被引用日志引用到的对象"
8576 #: builtin/pack-objects.c:2647
8577 msgid "include objects referred to by the index"
8578 msgstr "包括被索引引用到的对象"
8580 #: builtin/pack-objects.c:2650
8581 msgid "output pack to stdout"
8584 #: builtin/pack-objects.c:2652
8585 msgid "include tag objects that refer to objects to be packed"
8586 msgstr "包括那些引用了待打包对象的标签对象"
8588 #: builtin/pack-objects.c:2654
8589 msgid "keep unreachable objects"
8592 #: builtin/pack-objects.c:2655 parse-options.h:142
8596 #: builtin/pack-objects.c:2656
8597 msgid "unpack unreachable objects newer than <time>"
8598 msgstr "将比给定 <时间> 新的无法访问的对象解包"
8600 #: builtin/pack-objects.c:2659
8601 msgid "create thin packs"
8604 #: builtin/pack-objects.c:2661
8605 msgid "create packs suitable for shallow fetches"
8606 msgstr "创建适合浅克隆仓库获取的包"
8608 #: builtin/pack-objects.c:2663
8609 msgid "ignore packs that have companion .keep file"
8610 msgstr "忽略配有 .keep 文件的包"
8612 #: builtin/pack-objects.c:2665
8613 msgid "pack compression level"
8616 #: builtin/pack-objects.c:2667
8617 msgid "do not hide commits by grafts"
8620 #: builtin/pack-objects.c:2669
8621 msgid "use a bitmap index if available to speed up counting objects"
8622 msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
8624 #: builtin/pack-objects.c:2671
8625 msgid "write a bitmap index together with the pack index"
8626 msgstr "在建立包索引的同时创建 bitmap 索引"
8628 #: builtin/pack-objects.c:2762
8629 msgid "Counting objects"
8632 #: builtin/pack-refs.c:6
8633 msgid "git pack-refs [<options>]"
8634 msgstr "git pack-refs [<选项>]"
8636 #: builtin/pack-refs.c:14
8637 msgid "pack everything"
8640 #: builtin/pack-refs.c:15
8641 msgid "prune loose refs (default)"
8642 msgstr "清除松散的引用(默认)"
8644 #: builtin/prune-packed.c:7
8645 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
8646 msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
8648 #: builtin/prune-packed.c:40
8649 msgid "Removing duplicate objects"
8652 #: builtin/prune.c:11
8653 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
8654 msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
8656 #: builtin/prune.c:105 builtin/worktree.c:124
8657 msgid "do not remove, show only"
8660 #: builtin/prune.c:106 builtin/worktree.c:125
8661 msgid "report pruned objects"
8664 #: builtin/prune.c:109 builtin/worktree.c:127
8665 msgid "expire objects older than <time>"
8666 msgstr "使早于给定时间的对象过期"
8668 #: builtin/prune.c:123
8669 msgid "cannot prune in a precious-objects repo"
8670 msgstr "不能在珍品仓库中执行清理操作"
8672 #: builtin/pull.c:69
8673 msgid "git pull [<options>] [<repository> [<refspec>...]]"
8674 msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
8676 #: builtin/pull.c:113
8677 msgid "Options related to merging"
8680 #: builtin/pull.c:116
8681 msgid "incorporate changes by rebasing rather than merging"
8682 msgstr "使用变基操作取代合并操作以合入修改"
8684 #: builtin/pull.c:140 builtin/revert.c:105
8685 msgid "allow fast-forward"
8688 #: builtin/pull.c:146
8689 msgid "verify that the named commit has a valid GPG signature"
8690 msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
8692 #: builtin/pull.c:160
8693 msgid "Options related to fetching"
8696 #: builtin/pull.c:268
8698 msgid "Invalid value for pull.ff: %s"
8699 msgstr "pull.ff 的取值无效:%s"
8701 #: builtin/pull.c:352
8702 msgid "Cannot pull with rebase: You have unstaged changes."
8703 msgstr "无法通过变基方式拉取:您有未暂存的变更。"
8705 #: builtin/pull.c:358
8706 msgid "Additionally, your index contains uncommitted changes."
8707 msgstr "而且您的索引中包含未提交的变更。"
8709 #: builtin/pull.c:360
8710 msgid "Cannot pull with rebase: Your index contains uncommitted changes."
8711 msgstr "无法通过变基方式拉取:您的索引中包含未提交的变更。"
8713 #: builtin/pull.c:436
8715 "There is no candidate for rebasing against among the refs that you just "
8717 msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
8719 #: builtin/pull.c:438
8721 "There are no candidates for merging among the refs that you just fetched."
8722 msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
8724 #: builtin/pull.c:439
8726 "Generally this means that you provided a wildcard refspec which had no\n"
8727 "matches on the remote end."
8728 msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
8730 #: builtin/pull.c:442
8733 "You asked to pull from the remote '%s', but did not specify\n"
8734 "a branch. Because this is not the default configured remote\n"
8735 "for your current branch, you must specify a branch on the command line."
8737 "您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n"
8738 "分支默认的远程仓库,您必须在命令行中指定一个分支名。"
8740 #: builtin/pull.c:447
8741 msgid "You are not currently on a branch."
8742 msgstr "您当前不在一个分支上。"
8744 #: builtin/pull.c:449 builtin/pull.c:464
8745 msgid "Please specify which branch you want to rebase against."
8746 msgstr "请指定您要变基到哪一个分支。"
8748 #: builtin/pull.c:451 builtin/pull.c:466
8749 msgid "Please specify which branch you want to merge with."
8750 msgstr "请指定您要合并哪一个分支。"
8752 #: builtin/pull.c:452 builtin/pull.c:467
8753 msgid "See git-pull(1) for details."
8754 msgstr "详见 git-pull(1)。"
8756 #: builtin/pull.c:462
8757 msgid "There is no tracking information for the current branch."
8758 msgstr "当前分支没有跟踪信息。"
8760 #: builtin/pull.c:471
8763 "If you wish to set tracking information for this branch you can do so with:\n"
8765 " git branch --set-upstream-to=%s/<branch> %s\n"
8767 "如果您想要为此分支创建跟踪信息,您可以执行:\n"
8769 " git branch --set-upstream-to=%s/<branch> %s\n"
8771 #: builtin/pull.c:476
8774 "Your configuration specifies to merge with the ref '%s'\n"
8775 "from the remote, but no such ref was fetched."
8777 "您的配置中指定要合并远程的引用 '%s',\n"
8780 #: builtin/pull.c:830
8781 msgid "Updating an unborn branch with changes added to the index."
8782 msgstr "更新尚未诞生的分支,变更添加至索引。"
8784 #: builtin/pull.c:859
8787 "fetch updated the current branch head.\n"
8788 "fast-forwarding your working tree from\n"
8791 "fetch 更新了当前的分支。快进您的工作区\n"
8794 #: builtin/pull.c:864
8797 "Cannot fast-forward your working tree.\n"
8798 "After making sure that you saved anything precious from\n"
8801 "$ git reset --hard\n"
8804 "您当前的工作区无法执行快进操作。\n"
8807 "以确认所有有用的数据均已保存。然后执行下面的命令\n"
8808 "$ git reset --hard\n"
8811 #: builtin/pull.c:879
8812 msgid "Cannot merge multiple branches into empty head."
8813 msgstr "无法将多个分支合并到空分支。"
8815 #: builtin/pull.c:883
8816 msgid "Cannot rebase onto multiple branches."
8819 #: builtin/push.c:15
8820 msgid "git push [<options>] [<repository> [<refspec>...]]"
8821 msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
8823 #: builtin/push.c:86
8824 msgid "tag shorthand without <tag>"
8825 msgstr "标签后面未提供 <标签> 参数"
8827 #: builtin/push.c:96
8828 msgid "--delete only accepts plain target ref names"
8829 msgstr "--delete 只接受简单的目标引用名"
8831 #: builtin/push.c:140
8834 "To choose either option permanently, see push.default in 'git help config'."
8837 "为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
8839 #: builtin/push.c:143
8842 "The upstream branch of your current branch does not match\n"
8843 "the name of your current branch. To push to the upstream branch\n"
8844 "on the remote, use\n"
8846 " git push %s HEAD:%s\n"
8848 "To push to the branch of the same name on the remote, use\n"
8853 "如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
8856 " git push %s HEAD:%s\n"
8863 #: builtin/push.c:158
8866 "You are not currently on a branch.\n"
8867 "To push the history leading to the current (detached HEAD)\n"
8870 " git push %s HEAD:<name-of-remote-branch>\n"
8873 "现在为推送当前(分离头指针)的历史,使用\n"
8875 " git push %s HEAD:<远程分支名字>\n"
8877 #: builtin/push.c:172
8880 "The current branch %s has no upstream branch.\n"
8881 "To push the current branch and set the remote as upstream, use\n"
8883 " git push --set-upstream %s %s\n"
8885 "当前分支 %s 没有对应的上游分支。\n"
8886 "为推送当前分支并建立与远程上游的跟踪,使用\n"
8888 " git push --set-upstream %s %s\n"
8890 #: builtin/push.c:180
8892 msgid "The current branch %s has multiple upstream branches, refusing to push."
8893 msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
8895 #: builtin/push.c:183
8898 "You are pushing to remote '%s', which is not the upstream of\n"
8899 "your current branch '%s', without telling me what to push\n"
8900 "to update which remote branch."
8902 "您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
8903 "而没有告诉我要推送什么、更新哪个远程分支。"
8905 # 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
8906 #: builtin/push.c:206
8908 "push.default is unset; its implicit value has changed in\n"
8909 "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
8910 "and maintain the traditional behavior, use:\n"
8912 " git config --global push.default matching\n"
8914 "To squelch this message and adopt the new behavior now, use:\n"
8916 " git config --global push.default simple\n"
8918 "When push.default is set to 'matching', git will push local branches\n"
8919 "to the remote branches that already exist with the same name.\n"
8921 "Since Git 2.0, Git defaults to the more conservative 'simple'\n"
8922 "behavior, which only pushes the current branch to the corresponding\n"
8923 "remote branch that 'git pull' uses to update the current branch.\n"
8925 "See 'git help config' and search for 'push.default' for further "
8927 "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
8928 "'current' instead of 'simple' if you sometimes use older versions of Git)"
8930 "push.default 尚未设置,它的默认值在 Git 2.0 已从 'matching'\n"
8931 "变更为 'simple'。若要不再显示本信息并保持传统习惯,进行如下设置:\n"
8933 " git config --global push.default matching\n"
8935 "若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n"
8937 " git config --global push.default simple\n"
8939 "当 push.default 设置为 'matching' 后,git 将推送和远程同名的所有\n"
8942 "从 Git 2.0 开始,Git 默认采用更为保守的 'simple' 模式,只推送当前\n"
8943 "分支到远程关联的同名分支,即 'git push' 推送当前分支。\n"
8945 "参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
8946 "('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n"
8947 "为保持兼容,请用 'current' 代替 'simple')"
8949 #: builtin/push.c:273
8951 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
8952 msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。"
8954 #: builtin/push.c:280
8956 "Updates were rejected because the tip of your current branch is behind\n"
8957 "its remote counterpart. Integrate the remote changes (e.g.\n"
8958 "'git pull ...') before pushing again.\n"
8959 "See the 'Note about fast-forwards' in 'git push --help' for details."
8961 "更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
8962 "再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
8963 "'git push --help' 中的 'Note about fast-forwards' 小节。"
8965 #: builtin/push.c:286
8967 "Updates were rejected because a pushed branch tip is behind its remote\n"
8968 "counterpart. Check out this branch and integrate the remote changes\n"
8969 "(e.g. 'git pull ...') before pushing again.\n"
8970 "See the 'Note about fast-forwards' in 'git push --help' for details."
8972 "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
8973 "检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
8974 "'git push --help' 中的 'Note about fast-forwards' 小节。"
8976 #: builtin/push.c:292
8978 "Updates were rejected because the remote contains work that you do\n"
8979 "not have locally. This is usually caused by another repository pushing\n"
8980 "to the same ref. You may want to first integrate the remote changes\n"
8981 "(e.g., 'git pull ...') before pushing again.\n"
8982 "See the 'Note about fast-forwards' in 'git push --help' for details."
8984 "更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n"
8985 "一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
8986 "(如 'git pull ...')。\n"
8987 "详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
8989 #: builtin/push.c:299
8990 msgid "Updates were rejected because the tag already exists in the remote."
8991 msgstr "更新被拒绝,因为该标签在远程已经存在。"
8993 #: builtin/push.c:302
8995 "You cannot update a remote ref that points at a non-commit object,\n"
8996 "or update a remote ref to make it point at a non-commit object,\n"
8997 "without using the '--force' option.\n"
8999 "如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
9000 "也不能更新远程引用让其指向一个非提交对象。\n"
9002 #: builtin/push.c:361
9004 msgid "Pushing to %s\n"
9007 #: builtin/push.c:365
9009 msgid "failed to push some refs to '%s'"
9010 msgstr "无法推送一些引用到 '%s'"
9012 #: builtin/push.c:395
9014 msgid "bad repository '%s'"
9017 #: builtin/push.c:396
9019 "No configured push destination.\n"
9020 "Either specify the URL from the command-line or configure a remote "
9021 "repository using\n"
9023 " git remote add <name> <url>\n"
9025 "and then push using the remote name\n"
9027 " git push <name>\n"
9030 "或通过命令行指定 URL,或用下面命令配置一个远程仓库\n"
9032 " git remote add <名称> <地址>\n"
9038 #: builtin/push.c:411
9039 msgid "--all and --tags are incompatible"
9040 msgstr "--all 和 --tags 不兼容"
9042 #: builtin/push.c:412
9043 msgid "--all can't be combined with refspecs"
9044 msgstr "--all 不能和引用规格同时使用"
9046 #: builtin/push.c:417
9047 msgid "--mirror and --tags are incompatible"
9048 msgstr "--mirror 和 --tags 不兼容"
9050 #: builtin/push.c:418
9051 msgid "--mirror can't be combined with refspecs"
9052 msgstr "--mirror 不能和引用规格同时使用"
9054 #: builtin/push.c:423
9055 msgid "--all and --mirror are incompatible"
9056 msgstr "--all 和 --mirror 不兼容"
9058 #: builtin/push.c:539
9062 #: builtin/push.c:540 builtin/send-pack.c:161
9063 msgid "push all refs"
9066 #: builtin/push.c:541 builtin/send-pack.c:163
9067 msgid "mirror all refs"
9070 #: builtin/push.c:543
9074 #: builtin/push.c:544
9075 msgid "push tags (can't be used with --all or --mirror)"
9076 msgstr "推送标签(不能使用 --all or --mirror)"
9078 #: builtin/push.c:547 builtin/send-pack.c:164
9079 msgid "force updates"
9082 #: builtin/push.c:549 builtin/send-pack.c:175
9083 msgid "refname>:<expect"
9086 #: builtin/push.c:550 builtin/send-pack.c:176
9087 msgid "require old value of ref to be at this value"
9088 msgstr "要求引用旧的取值为设定值"
9090 #: builtin/push.c:553
9091 msgid "control recursive pushing of submodules"
9094 #: builtin/push.c:555 builtin/send-pack.c:169
9095 msgid "use thin pack"
9098 #: builtin/push.c:556 builtin/push.c:557 builtin/send-pack.c:158
9099 #: builtin/send-pack.c:159
9100 msgid "receive pack program"
9103 #: builtin/push.c:558
9104 msgid "set upstream for git pull/status"
9105 msgstr "设置 git pull/status 的上游"
9107 #: builtin/push.c:561
9108 msgid "prune locally removed refs"
9111 #: builtin/push.c:563
9112 msgid "bypass pre-push hook"
9113 msgstr "绕过 pre-push 钩子"
9115 #: builtin/push.c:564
9116 msgid "push missing but relevant tags"
9119 #: builtin/push.c:567 builtin/send-pack.c:166
9120 msgid "GPG sign the push"
9121 msgstr "用 GPG 为推送签名"
9123 #: builtin/push.c:569 builtin/send-pack.c:170
9124 msgid "request atomic transaction on remote side"
9127 #: builtin/push.c:579
9128 msgid "--delete is incompatible with --all, --mirror and --tags"
9129 msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
9131 #: builtin/push.c:581
9132 msgid "--delete doesn't make sense without any refs"
9133 msgstr "--delete 未接任何引用没有意义"
9135 #: builtin/read-tree.c:37
9137 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
9138 "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
9139 "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
9141 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-"
9142 "u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
9143 "index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])"
9145 #: builtin/read-tree.c:110
9146 msgid "write resulting index to <file>"
9147 msgstr "将索引结果写入 <文件>"
9149 #: builtin/read-tree.c:113
9150 msgid "only empty the index"
9153 #: builtin/read-tree.c:115
9157 #: builtin/read-tree.c:117
9158 msgid "perform a merge in addition to a read"
9159 msgstr "读取之余再执行一个合并"
9161 #: builtin/read-tree.c:119
9162 msgid "3-way merge if no file level merging required"
9163 msgstr "如果没有文件级合并需要,执行三方合并"
9165 #: builtin/read-tree.c:121
9166 msgid "3-way merge in presence of adds and removes"
9167 msgstr "存在添加和删除时,也执行三方合并"
9169 #: builtin/read-tree.c:123
9170 msgid "same as -m, but discard unmerged entries"
9171 msgstr "类似于 -m,但丢弃未合并的条目"
9173 #: builtin/read-tree.c:124
9174 msgid "<subdirectory>/"
9177 #: builtin/read-tree.c:125
9178 msgid "read the tree into the index under <subdirectory>/"
9179 msgstr "读取树对象到索引的 <子目录>/ 下"
9181 #: builtin/read-tree.c:128
9182 msgid "update working tree with merge result"
9183 msgstr "用合并的结果更新工作区"
9185 #: builtin/read-tree.c:130
9189 #: builtin/read-tree.c:131
9190 msgid "allow explicitly ignored files to be overwritten"
9191 msgstr "允许忽略文件中设定的文件可以被覆盖"
9193 #: builtin/read-tree.c:134
9194 msgid "don't check the working tree after merging"
9197 #: builtin/read-tree.c:135
9198 msgid "don't update the index or the work tree"
9201 #: builtin/read-tree.c:137
9202 msgid "skip applying sparse checkout filter"
9203 msgstr "跳过应用稀疏检出过滤器"
9205 #: builtin/read-tree.c:139
9206 msgid "debug unpack-trees"
9207 msgstr "调试 unpack-trees"
9209 #: builtin/reflog.c:428
9211 msgid "'%s' for '%s' is not a valid timestamp"
9212 msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
9214 #: builtin/reflog.c:545 builtin/reflog.c:550
9216 msgid "'%s' is not a valid timestamp"
9217 msgstr "'%s' 不是一个有效的时间戳"
9219 #: builtin/remote.c:12
9220 msgid "git remote [-v | --verbose]"
9221 msgstr "git remote [-v | --verbose]"
9223 #: builtin/remote.c:13
9225 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
9226 "mirror=<fetch|push>] <name> <url>"
9228 "git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
9229 "mirror=<fetch|push>] <名称> <地址>"
9231 #: builtin/remote.c:14 builtin/remote.c:34
9232 msgid "git remote rename <old> <new>"
9233 msgstr "git remote rename <旧名称> <新名称>"
9235 #: builtin/remote.c:15 builtin/remote.c:39
9236 msgid "git remote remove <name>"
9237 msgstr "git remote remove <名称>"
9239 #: builtin/remote.c:16 builtin/remote.c:44
9240 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
9241 msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
9243 #: builtin/remote.c:17
9244 msgid "git remote [-v | --verbose] show [-n] <name>"
9245 msgstr "git remote [-v | --verbose] show [-n] <名称>"
9247 #: builtin/remote.c:18
9248 msgid "git remote prune [-n | --dry-run] <name>"
9249 msgstr "git remote prune [-n | --dry-run] <名称>"
9251 #: builtin/remote.c:19
9253 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
9254 msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
9256 #: builtin/remote.c:20
9257 msgid "git remote set-branches [--add] <name> <branch>..."
9258 msgstr "git remote set-branches [--add] <名称> <分支>..."
9260 #: builtin/remote.c:21 builtin/remote.c:70
9261 msgid "git remote get-url [--push] [--all] <name>"
9262 msgstr "git remote get-url [--push] [--all] <名称>"
9264 #: builtin/remote.c:22 builtin/remote.c:75
9265 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
9266 msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
9268 #: builtin/remote.c:23 builtin/remote.c:76
9269 msgid "git remote set-url --add <name> <newurl>"
9270 msgstr "git remote set-url --add <名称> <新的地址>"
9272 #: builtin/remote.c:24 builtin/remote.c:77
9273 msgid "git remote set-url --delete <name> <url>"
9274 msgstr "git remote set-url --delete <名称> <地址>"
9276 #: builtin/remote.c:29
9277 msgid "git remote add [<options>] <name> <url>"
9278 msgstr "git remote add [<选项>] <名称> <地址>"
9280 #: builtin/remote.c:49
9281 msgid "git remote set-branches <name> <branch>..."
9282 msgstr "git remote set-branches <名称> <分支>..."
9284 #: builtin/remote.c:50
9285 msgid "git remote set-branches --add <name> <branch>..."
9286 msgstr "git remote set-branches --add <名称> <分支>..."
9288 #: builtin/remote.c:55
9289 msgid "git remote show [<options>] <name>"
9290 msgstr "git remote show [<选项>] <名称>"
9292 #: builtin/remote.c:60
9293 msgid "git remote prune [<options>] <name>"
9294 msgstr "git remote prune [<选项>] <名称>"
9296 #: builtin/remote.c:65
9297 msgid "git remote update [<options>] [<group> | <remote>]..."
9298 msgstr "git remote update [<选项>] [<组> | <远程>]..."
9300 #: builtin/remote.c:94
9305 #: builtin/remote.c:126
9307 "--mirror is dangerous and deprecated; please\n"
9308 "\t use --mirror=fetch or --mirror=push instead"
9310 "--mirror 选项危险且过时,请使用 --mirror=fetch\n"
9311 "\t 或 --mirror=push"
9313 #: builtin/remote.c:143
9315 msgid "unknown mirror argument: %s"
9318 #: builtin/remote.c:159
9319 msgid "fetch the remote branches"
9322 #: builtin/remote.c:161
9323 msgid "import all tags and associated objects when fetching"
9324 msgstr "抓取时导入所有的标签和关联对象"
9326 #: builtin/remote.c:164
9327 msgid "or do not fetch any tag at all (--no-tags)"
9328 msgstr "或不抓取任何标签(--no-tags)"
9330 #: builtin/remote.c:166
9331 msgid "branch(es) to track"
9334 #: builtin/remote.c:167
9335 msgid "master branch"
9338 #: builtin/remote.c:168
9342 #: builtin/remote.c:169
9343 msgid "set up remote as a mirror to push to or fetch from"
9344 msgstr "把远程设置为用以推送或抓取的镜像"
9346 #: builtin/remote.c:181
9347 msgid "specifying a master branch makes no sense with --mirror"
9348 msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
9350 #: builtin/remote.c:183
9351 msgid "specifying branches to track makes sense only with fetch mirrors"
9352 msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
9354 #: builtin/remote.c:193 builtin/remote.c:643
9356 msgid "remote %s already exists."
9357 msgstr "远程 %s 已经存在。"
9359 #: builtin/remote.c:197 builtin/remote.c:647
9361 msgid "'%s' is not a valid remote name"
9362 msgstr "'%s' 不是一个有效的远程名称"
9364 #: builtin/remote.c:241
9366 msgid "Could not setup master '%s'"
9367 msgstr "无法设置 master '%s'"
9369 #: builtin/remote.c:341
9371 msgid "Could not get fetch map for refspec %s"
9372 msgstr "无法得到引用规格 %s 的获取列表"
9374 #: builtin/remote.c:442 builtin/remote.c:450
9378 #: builtin/remote.c:454
9382 #: builtin/remote.c:594 builtin/remote.c:600 builtin/remote.c:606
9384 msgid "Could not append '%s' to '%s'"
9385 msgstr "不能添加 '%s' 至 '%s'"
9387 #: builtin/remote.c:636 builtin/remote.c:775 builtin/remote.c:875
9389 msgid "No such remote: %s"
9392 #: builtin/remote.c:653
9394 msgid "Could not rename config section '%s' to '%s'"
9395 msgstr "不能重命名配置小节 '%s' 到 '%s'"
9397 #: builtin/remote.c:659 builtin/remote.c:827
9399 msgid "Could not remove config section '%s'"
9400 msgstr "不能移除配置小节 '%s'"
9402 #: builtin/remote.c:674
9405 "Not updating non-default fetch refspec\n"
9407 "\tPlease update the configuration manually if necessary."
9413 #: builtin/remote.c:680
9415 msgid "Could not append '%s'"
9418 #: builtin/remote.c:691
9420 msgid "Could not set '%s'"
9423 #: builtin/remote.c:713
9425 msgid "deleting '%s' failed"
9428 #: builtin/remote.c:747
9430 msgid "creating '%s' failed"
9433 #: builtin/remote.c:813
9435 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
9436 "to delete it, use:"
9438 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
9439 "to delete them, use:"
9440 msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
9441 msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
9443 #: builtin/remote.c:928
9445 msgid " new (next fetch will store in remotes/%s)"
9446 msgstr " 新的(下一次获取将存储于 remotes/%s)"
9448 #: builtin/remote.c:931
9452 #: builtin/remote.c:933
9453 msgid " stale (use 'git remote prune' to remove)"
9454 msgstr " 过时(使用 'git remote prune' 来移除)"
9456 #: builtin/remote.c:935
9460 #: builtin/remote.c:976
9462 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
9463 msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
9465 #: builtin/remote.c:983
9467 msgid "rebases onto remote %s"
9470 #: builtin/remote.c:986
9472 msgid " merges with remote %s"
9475 #: builtin/remote.c:987
9476 msgid " and with remote"
9479 #: builtin/remote.c:989
9481 msgid "merges with remote %s"
9484 #: builtin/remote.c:990
9485 msgid " and with remote"
9488 #: builtin/remote.c:1036
9492 #: builtin/remote.c:1039
9496 #: builtin/remote.c:1043
9500 #: builtin/remote.c:1046
9501 msgid "fast-forwardable"
9504 #: builtin/remote.c:1049
9505 msgid "local out of date"
9508 #: builtin/remote.c:1056
9510 msgid " %-*s forces to %-*s (%s)"
9511 msgstr " %-*s 强制推送至 %-*s (%s)"
9513 #: builtin/remote.c:1059
9515 msgid " %-*s pushes to %-*s (%s)"
9516 msgstr " %-*s 推送至 %-*s (%s)"
9518 #: builtin/remote.c:1063
9520 msgid " %-*s forces to %s"
9521 msgstr " %-*s 强制推送至 %s"
9523 #: builtin/remote.c:1066
9525 msgid " %-*s pushes to %s"
9526 msgstr " %-*s 推送至 %s"
9528 #: builtin/remote.c:1134
9529 msgid "do not query remotes"
9532 #: builtin/remote.c:1161
9537 #: builtin/remote.c:1162
9539 msgid " Fetch URL: %s"
9542 #: builtin/remote.c:1163 builtin/remote.c:1314
9546 #: builtin/remote.c:1172 builtin/remote.c:1174
9548 msgid " Push URL: %s"
9551 #: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180
9553 msgid " HEAD branch: %s"
9554 msgstr " HEAD 分支:%s"
9556 #: builtin/remote.c:1182
9559 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
9560 msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
9562 #: builtin/remote.c:1194
9564 msgid " Remote branch:%s"
9565 msgid_plural " Remote branches:%s"
9566 msgstr[0] " 远程分支:%s"
9567 msgstr[1] " 远程分支:%s"
9569 # 译者:中文字符串拼接,可删除前导空格
9570 #: builtin/remote.c:1197 builtin/remote.c:1224
9571 msgid " (status not queried)"
9574 #: builtin/remote.c:1206
9575 msgid " Local branch configured for 'git pull':"
9576 msgid_plural " Local branches configured for 'git pull':"
9577 msgstr[0] " 为 'git pull' 配置的本地分支:"
9578 msgstr[1] " 为 'git pull' 配置的本地分支:"
9580 #: builtin/remote.c:1214
9581 msgid " Local refs will be mirrored by 'git push'"
9582 msgstr " 本地引用将在 'git push' 时被镜像"
9584 #: builtin/remote.c:1221
9586 msgid " Local ref configured for 'git push'%s:"
9587 msgid_plural " Local refs configured for 'git push'%s:"
9588 msgstr[0] " 为 'git push' 配置的本地引用%s:"
9589 msgstr[1] " 为 'git push' 配置的本地引用%s:"
9591 #: builtin/remote.c:1242
9592 msgid "set refs/remotes/<name>/HEAD according to remote"
9593 msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
9595 #: builtin/remote.c:1244
9596 msgid "delete refs/remotes/<name>/HEAD"
9597 msgstr "删除 refs/remotes/<名称>/HEAD"
9599 #: builtin/remote.c:1259
9600 msgid "Cannot determine remote HEAD"
9601 msgstr "无法确定远程 HEAD"
9603 #: builtin/remote.c:1261
9604 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
9605 msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
9607 #: builtin/remote.c:1271
9609 msgid "Could not delete %s"
9612 #: builtin/remote.c:1279
9614 msgid "Not a valid ref: %s"
9615 msgstr "不是一个有效引用:%s"
9617 #: builtin/remote.c:1281
9619 msgid "Could not setup %s"
9623 #: builtin/remote.c:1299
9625 msgid " %s will become dangling!"
9626 msgstr " %s 将成为摇摆状态!"
9629 #: builtin/remote.c:1300
9631 msgid " %s has become dangling!"
9632 msgstr " %s 已成为摇摆状态!"
9634 #: builtin/remote.c:1310
9639 #: builtin/remote.c:1311
9644 #: builtin/remote.c:1327
9646 msgid " * [would prune] %s"
9647 msgstr " * [将删除] %s"
9649 #: builtin/remote.c:1330
9651 msgid " * [pruned] %s"
9652 msgstr " * [已删除] %s"
9654 #: builtin/remote.c:1375
9655 msgid "prune remotes after fetching"
9658 #: builtin/remote.c:1441 builtin/remote.c:1498 builtin/remote.c:1566
9660 msgid "No such remote '%s'"
9663 #: builtin/remote.c:1461
9667 #: builtin/remote.c:1468
9668 msgid "no remote specified"
9671 #: builtin/remote.c:1485
9672 msgid "query push URLs rather than fetch URLs"
9673 msgstr "查询推送 URL 地址,而非获取 URL 地址"
9675 #: builtin/remote.c:1487
9676 msgid "return all URLs"
9677 msgstr "返回所有 URL 地址"
9679 #: builtin/remote.c:1515
9681 msgid "no URLs configured for remote '%s'"
9682 msgstr "没有给远程仓库 '%s' 设定 URL"
9684 #: builtin/remote.c:1541
9685 msgid "manipulate push URLs"
9688 #: builtin/remote.c:1543
9692 #: builtin/remote.c:1545
9696 #: builtin/remote.c:1552
9697 msgid "--add --delete doesn't make sense"
9698 msgstr "--add --delete 无意义"
9700 #: builtin/remote.c:1592
9702 msgid "Invalid old URL pattern: %s"
9703 msgstr "无效的旧 URL 匹配模版:%s"
9705 #: builtin/remote.c:1600
9707 msgid "No such URL found: %s"
9708 msgstr "未找到此 URL:%s"
9710 #: builtin/remote.c:1602
9711 msgid "Will not delete all non-push URLs"
9712 msgstr "将不会删除所有非推送 URL 地址"
9714 #: builtin/remote.c:1616
9715 msgid "be verbose; must be placed before a subcommand"
9716 msgstr "冗长输出;必须置于子命令之前"
9718 #: builtin/repack.c:17
9719 msgid "git repack [<options>]"
9720 msgstr "git repack [<选项>]"
9722 #: builtin/repack.c:159
9723 msgid "pack everything in a single pack"
9724 msgstr "所有内容打包到一个包文件中"
9726 #: builtin/repack.c:161
9727 msgid "same as -a, and turn unreachable objects loose"
9728 msgstr "和 -a 相同,并将不可达的对象设为松散对象"
9730 #: builtin/repack.c:164
9731 msgid "remove redundant packs, and run git-prune-packed"
9732 msgstr "删除多余的包,运行 git-prune-packed"
9734 #: builtin/repack.c:166
9735 msgid "pass --no-reuse-delta to git-pack-objects"
9736 msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
9738 #: builtin/repack.c:168
9739 msgid "pass --no-reuse-object to git-pack-objects"
9740 msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
9742 #: builtin/repack.c:170
9743 msgid "do not run git-update-server-info"
9744 msgstr "不运行 git-update-server-info"
9746 #: builtin/repack.c:173
9747 msgid "pass --local to git-pack-objects"
9748 msgstr "向 git-pack-objects 传递参数 --local"
9750 #: builtin/repack.c:175
9751 msgid "write bitmap index"
9752 msgstr "写 bitmap 索引"
9754 #: builtin/repack.c:176
9758 #: builtin/repack.c:177
9759 msgid "with -A, do not loosen objects older than this"
9760 msgstr "使用 -A,不要将早于给定时间的对象过期"
9762 #: builtin/repack.c:179
9763 msgid "size of the window used for delta compression"
9766 #: builtin/repack.c:180 builtin/repack.c:184
9770 #: builtin/repack.c:181
9771 msgid "same as the above, but limit memory size instead of entries count"
9772 msgstr "和上面的相似,但限制内存大小而非条目数"
9774 #: builtin/repack.c:183
9775 msgid "limits the maximum delta depth"
9778 #: builtin/repack.c:185
9779 msgid "maximum size of each packfile"
9782 #: builtin/repack.c:187
9783 msgid "repack objects in packs marked with .keep"
9784 msgstr "对标记为 .keep 的包中的对象重新打包"
9786 #: builtin/repack.c:197
9787 msgid "cannot delete packs in a precious-objects repo"
9788 msgstr "不能删除珍品仓库中的打包文件"
9790 #: builtin/repack.c:381
9792 msgid "removing '%s' failed"
9795 #: builtin/replace.c:19
9796 msgid "git replace [-f] <object> <replacement>"
9797 msgstr "git replace [-f] <对象> <替换物>"
9799 #: builtin/replace.c:20
9800 msgid "git replace [-f] --edit <object>"
9801 msgstr "git replace [-f] --edit <对象>"
9803 #: builtin/replace.c:21
9804 msgid "git replace [-f] --graft <commit> [<parent>...]"
9805 msgstr "git replace [-f] --graft <提交> [<父提交>...]"
9807 #: builtin/replace.c:22
9808 msgid "git replace -d <object>..."
9809 msgstr "git replace -d <对象>..."
9811 #: builtin/replace.c:23
9812 msgid "git replace [--format=<format>] [-l [<pattern>]]"
9813 msgstr "git replace [--format=<格式>] [-l [<模式>]]"
9815 #: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
9817 msgid "Not a valid object name: '%s'"
9818 msgstr "不是一个有效的对象名:'%s'"
9820 #: builtin/replace.c:355
9822 msgid "bad mergetag in commit '%s'"
9823 msgstr "提交 '%s' 中含有损坏的合并标签"
9825 #: builtin/replace.c:357
9827 msgid "malformed mergetag in commit '%s'"
9828 msgstr "提交 '%s' 中含有非法的合并标签"
9830 #: builtin/replace.c:368
9833 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
9834 "instead of --graft"
9835 msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft"
9837 #: builtin/replace.c:401
9839 msgid "the original commit '%s' has a gpg signature."
9840 msgstr "原始提交 '%s' 中包含一个 GPG 签名"
9842 #: builtin/replace.c:402
9843 msgid "the signature will be removed in the replacement commit!"
9844 msgstr "在替换的提交中签名将被移除!"
9846 #: builtin/replace.c:408
9848 msgid "could not write replacement commit for: '%s'"
9849 msgstr "不能为 '%s' 写替换提交"
9851 #: builtin/replace.c:432
9852 msgid "list replace refs"
9855 #: builtin/replace.c:433
9856 msgid "delete replace refs"
9859 #: builtin/replace.c:434
9860 msgid "edit existing object"
9863 #: builtin/replace.c:435
9864 msgid "change a commit's parents"
9867 #: builtin/replace.c:436
9868 msgid "replace the ref if it exists"
9871 #: builtin/replace.c:437
9872 msgid "do not pretty-print contents for --edit"
9873 msgstr "不要为 --edit 操作美观显示内容"
9875 #: builtin/replace.c:438
9876 msgid "use this format"
9879 #: builtin/rerere.c:12
9880 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
9881 msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
9883 #: builtin/rerere.c:58
9884 msgid "register clean resolutions in index"
9885 msgstr "在索引中注册干净的解决方案"
9887 #: builtin/reset.c:26
9889 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
9890 msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
9892 #: builtin/reset.c:27
9893 msgid "git reset [-q] <tree-ish> [--] <paths>..."
9894 msgstr "git reset [-q] <树或提交> [--] <路径>..."
9896 #: builtin/reset.c:28
9897 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
9898 msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
9900 #: builtin/reset.c:34
9904 #: builtin/reset.c:34
9908 #: builtin/reset.c:34
9912 #: builtin/reset.c:34
9916 #: builtin/reset.c:34
9920 #: builtin/reset.c:74
9921 msgid "You do not have a valid HEAD."
9922 msgstr "您没有一个有效的 HEAD。"
9924 #: builtin/reset.c:76
9925 msgid "Failed to find tree of HEAD."
9926 msgstr "无法找到 HEAD 指向的树。"
9928 #: builtin/reset.c:82
9930 msgid "Failed to find tree of %s."
9931 msgstr "无法找到 %s 指向的树。"
9933 #: builtin/reset.c:100
9935 msgid "HEAD is now at %s"
9936 msgstr "HEAD 现在位于 %s"
9938 # 译者:汉字之间无空格,故删除%s前后空格
9939 #: builtin/reset.c:183
9941 msgid "Cannot do a %s reset in the middle of a merge."
9942 msgstr "在合并过程中不能做%s重置操作。"
9944 #: builtin/reset.c:276
9945 msgid "be quiet, only report errors"
9948 #: builtin/reset.c:278
9949 msgid "reset HEAD and index"
9950 msgstr "重置 HEAD 和索引"
9952 #: builtin/reset.c:279
9953 msgid "reset only HEAD"
9956 #: builtin/reset.c:281 builtin/reset.c:283
9957 msgid "reset HEAD, index and working tree"
9958 msgstr "重置 HEAD、索引和工作区"
9960 #: builtin/reset.c:285
9961 msgid "reset HEAD but keep local changes"
9962 msgstr "重置 HEAD 但保存本地变更"
9964 #: builtin/reset.c:288
9965 msgid "record only the fact that removed paths will be added later"
9966 msgstr "将删除的路径标记为稍后添加"
9968 #: builtin/reset.c:305
9970 msgid "Failed to resolve '%s' as a valid revision."
9971 msgstr "无法将 '%s' 解析为一个有效的版本。"
9973 #: builtin/reset.c:313
9975 msgid "Failed to resolve '%s' as a valid tree."
9976 msgstr "无法将 '%s' 解析为一个有效的树对象。"
9978 #: builtin/reset.c:322
9979 msgid "--patch is incompatible with --{hard,mixed,soft}"
9980 msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
9982 #: builtin/reset.c:331
9983 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
9984 msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。"
9986 # 译者:汉字之间无空格,故删除%s前后空格
9987 #: builtin/reset.c:333
9989 msgid "Cannot do %s reset with paths."
9990 msgstr "不能带路径进行%s重置。"
9992 # 译者:汉字之间无空格,故删除%s前后空格
9993 #: builtin/reset.c:343
9995 msgid "%s reset is not allowed in a bare repository"
9996 msgstr "不能对纯仓库进行%s重置"
9998 #: builtin/reset.c:347
9999 msgid "-N can only be used with --mixed"
10000 msgstr "-N 只能和 --mixed 同时使用"
10002 #: builtin/reset.c:364
10003 msgid "Unstaged changes after reset:"
10004 msgstr "重置后取消暂存的变更:"
10006 #: builtin/reset.c:370
10008 msgid "Could not reset index file to revision '%s'."
10009 msgstr "不能重置索引文件至版本 '%s'。"
10011 #: builtin/reset.c:374
10012 msgid "Could not write new index file."
10013 msgstr "不能写入新的索引文件。"
10015 #: builtin/rev-list.c:354
10016 msgid "rev-list does not support display of notes"
10017 msgstr "rev-list 不支持显示注解"
10019 #: builtin/rev-parse.c:358
10020 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
10021 msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
10023 #: builtin/rev-parse.c:363
10024 msgid "keep the `--` passed as an arg"
10025 msgstr "保持 `--` 作为一个参数传递"
10027 #: builtin/rev-parse.c:365
10028 msgid "stop parsing after the first non-option argument"
10029 msgstr "遇到第一个非选项参数后停止解析"
10031 #: builtin/rev-parse.c:368
10032 msgid "output in stuck long form"
10035 #: builtin/rev-parse.c:499
10037 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
10038 " or: git rev-parse --sq-quote [<arg>...]\n"
10039 " or: git rev-parse [<options>] [<arg>...]\n"
10041 "Run \"git rev-parse --parseopt -h\" for more information on the first usage."
10043 "git rev-parse --parseopt [<选项>] -- [<参数>...]\n"
10044 " 或者:git rev-parse --sq-quote [<参数>...]\n"
10045 " 或者:git rev-parse [<选项>] [<参数>...]\n"
10047 "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
10049 #: builtin/revert.c:22
10050 msgid "git revert [<options>] <commit-ish>..."
10051 msgstr "git revert [<选项>] <提交号>..."
10053 #: builtin/revert.c:23
10054 msgid "git revert <subcommand>"
10055 msgstr "git revert <子命令>"
10057 #: builtin/revert.c:28
10058 msgid "git cherry-pick [<options>] <commit-ish>..."
10059 msgstr "git cherry-pick [<选项>] <提交号>..."
10061 #: builtin/revert.c:29
10062 msgid "git cherry-pick <subcommand>"
10063 msgstr "git cherry-pick <子命令>"
10065 #: builtin/revert.c:71
10067 msgid "%s: %s cannot be used with %s"
10068 msgstr "%s:%s 不能和 %s 同时使用"
10070 #: builtin/revert.c:80
10071 msgid "end revert or cherry-pick sequence"
10074 #: builtin/revert.c:81
10075 msgid "resume revert or cherry-pick sequence"
10078 #: builtin/revert.c:82
10079 msgid "cancel revert or cherry-pick sequence"
10082 #: builtin/revert.c:83
10083 msgid "don't automatically commit"
10086 #: builtin/revert.c:84
10087 msgid "edit the commit message"
10090 #: builtin/revert.c:87
10091 msgid "parent number"
10094 #: builtin/revert.c:89
10095 msgid "merge strategy"
10098 #: builtin/revert.c:90
10102 #: builtin/revert.c:91
10103 msgid "option for merge strategy"
10106 #: builtin/revert.c:104
10107 msgid "append commit name"
10110 #: builtin/revert.c:106
10111 msgid "preserve initially empty commits"
10114 #: builtin/revert.c:107
10115 msgid "allow commits with empty messages"
10118 #: builtin/revert.c:108
10119 msgid "keep redundant, empty commits"
10120 msgstr "保持多余的、空的提交"
10122 #: builtin/revert.c:112
10123 msgid "program error"
10126 #: builtin/revert.c:197
10127 msgid "revert failed"
10130 #: builtin/revert.c:212
10131 msgid "cherry-pick failed"
10135 msgid "git rm [<options>] [--] <file>..."
10136 msgstr "git rm [<选项>] [--] <文件>..."
10140 "the following submodule (or one of its nested submodules)\n"
10141 "uses a .git directory:"
10143 "the following submodules (or one of their nested submodules)\n"
10144 "use a .git directory:"
10145 msgstr[0] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
10146 msgstr[1] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
10151 "(use 'rm -rf' if you really want to remove it including all of its history)"
10154 "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
10156 #: builtin/rm.c:230
10158 "the following file has staged content different from both the\n"
10159 "file and the HEAD:"
10161 "the following files have staged content different from both the\n"
10162 "file and the HEAD:"
10163 msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
10164 msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
10166 #: builtin/rm.c:235
10169 "(use -f to force removal)"
10174 #: builtin/rm.c:239
10175 msgid "the following file has changes staged in the index:"
10176 msgid_plural "the following files have changes staged in the index:"
10177 msgstr[0] "下列文件索引中有变更"
10178 msgstr[1] "下列文件索引中有变更"
10180 #: builtin/rm.c:243 builtin/rm.c:254
10183 "(use --cached to keep the file, or -f to force removal)"
10186 "(使用 --cached 保留本地文件,或用 -f 强制删除)"
10188 #: builtin/rm.c:251
10189 msgid "the following file has local modifications:"
10190 msgid_plural "the following files have local modifications:"
10191 msgstr[0] "如下文件有本地修改:"
10192 msgstr[1] "如下文件有本地修改:"
10194 #: builtin/rm.c:269
10195 msgid "do not list removed files"
10198 #: builtin/rm.c:270
10199 msgid "only remove from the index"
10202 #: builtin/rm.c:271
10203 msgid "override the up-to-date check"
10204 msgstr "忽略文件更新状态检查"
10206 #: builtin/rm.c:272
10207 msgid "allow recursive removal"
10210 #: builtin/rm.c:274
10211 msgid "exit with a zero status even if nothing matched"
10212 msgstr "即使没有匹配,也以零状态退出"
10214 #: builtin/rm.c:317
10215 msgid "Please, stage your changes to .gitmodules or stash them to proceed"
10216 msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续"
10218 #: builtin/rm.c:335
10220 msgid "not removing '%s' recursively without -r"
10221 msgstr "未提供 -r 选项不会递归删除 '%s'"
10223 #: builtin/rm.c:374
10225 msgid "git rm: unable to remove %s"
10226 msgstr "git rm:不能删除 %s"
10228 #: builtin/send-pack.c:18
10230 "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
10231 "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
10233 " --all and explicit <ref> specification are mutually exclusive."
10235 "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
10236 "receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n"
10237 " --all 和明确的 <引用> 互斥。"
10239 #: builtin/send-pack.c:160
10240 msgid "remote name"
10243 #: builtin/send-pack.c:171
10244 msgid "use stateless RPC protocol"
10245 msgstr "使用无状态的 RPC 协议"
10247 #: builtin/send-pack.c:172
10248 msgid "read refs from stdin"
10251 #: builtin/send-pack.c:173
10252 msgid "print status from remote helper"
10253 msgstr "打印来自远程 helper 的状态"
10255 #: builtin/shortlog.c:13
10256 msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
10257 msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
10259 #: builtin/shortlog.c:131
10261 msgid "Missing author: %s"
10264 #: builtin/shortlog.c:230
10265 msgid "sort output according to the number of commits per author"
10266 msgstr "根据每个作者的提交数量排序"
10268 #: builtin/shortlog.c:232
10269 msgid "Suppress commit descriptions, only provides commit count"
10270 msgstr "隐藏提交说明,只提供提交数量"
10272 #: builtin/shortlog.c:234
10273 msgid "Show the email address of each author"
10274 msgstr "显示每个作者的电子邮件地址"
10276 #: builtin/shortlog.c:235
10277 msgid "w[,i1[,i2]]"
10278 msgstr "w[,i1[,i2]]"
10280 #: builtin/shortlog.c:236
10281 msgid "Linewrap output"
10284 #: builtin/show-branch.c:10
10286 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
10287 "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
10288 "\t\t[--more=<n> | --list | --independent | --merge-base]\n"
10289 "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
10291 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
10292 "\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
10293 "\t\t[--more=<n> | --list | --independent | --merge-base]\n"
10294 "\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
10296 #: builtin/show-branch.c:14
10297 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
10298 msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]"
10300 #: builtin/show-branch.c:640
10301 msgid "show remote-tracking and local branches"
10302 msgstr "显示远程跟踪的和本地的分支"
10304 #: builtin/show-branch.c:642
10305 msgid "show remote-tracking branches"
10308 #: builtin/show-branch.c:644
10309 msgid "color '*!+-' corresponding to the branch"
10310 msgstr "着色 '*!+-' 到相应的分支"
10312 #: builtin/show-branch.c:646
10313 msgid "show <n> more commits after the common ancestor"
10314 msgstr "显示共同祖先后的 <n> 个提交"
10316 #: builtin/show-branch.c:648
10317 msgid "synonym to more=-1"
10318 msgstr "和 more=-1 同义"
10320 #: builtin/show-branch.c:649
10321 msgid "suppress naming strings"
10324 #: builtin/show-branch.c:651
10325 msgid "include the current branch"
10328 #: builtin/show-branch.c:653
10329 msgid "name commits with their object names"
10332 #: builtin/show-branch.c:655
10333 msgid "show possible merge bases"
10336 #: builtin/show-branch.c:657
10337 msgid "show refs unreachable from any other ref"
10338 msgstr "显示没有任何引用的的引用"
10340 #: builtin/show-branch.c:659
10341 msgid "show commits in topological order"
10344 #: builtin/show-branch.c:662
10345 msgid "show only commits not on the first branch"
10346 msgstr "只显示不在第一个分支上的提交"
10348 #: builtin/show-branch.c:664
10349 msgid "show merges reachable from only one tip"
10350 msgstr "显示仅一个分支可访问的合并提交"
10352 #: builtin/show-branch.c:666
10353 msgid "topologically sort, maintaining date order where possible"
10354 msgstr "拓扑方式排序,并尽可能地保持日期顺序"
10356 #: builtin/show-branch.c:669
10357 msgid "<n>[,<base>]"
10358 msgstr "<n>[,<base>]"
10360 #: builtin/show-branch.c:670
10361 msgid "show <n> most recent ref-log entries starting at base"
10362 msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
10364 #: builtin/show-ref.c:10
10366 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
10367 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
10369 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
10370 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
10372 #: builtin/show-ref.c:11
10373 msgid "git show-ref --exclude-existing[=<pattern>]"
10374 msgstr "git show-ref --exclude-existing[=<模式>]"
10376 #: builtin/show-ref.c:165
10377 msgid "only show tags (can be combined with heads)"
10378 msgstr "只显示标签(可以和头共用)"
10380 #: builtin/show-ref.c:166
10381 msgid "only show heads (can be combined with tags)"
10382 msgstr "只显示头(可以和标签共用)"
10384 #: builtin/show-ref.c:167
10385 msgid "stricter reference checking, requires exact ref path"
10386 msgstr "更严格的引用检测,需要精确的引用路径"
10388 #: builtin/show-ref.c:170 builtin/show-ref.c:172
10389 msgid "show the HEAD reference, even if it would be filtered out"
10390 msgstr "显示 HEAD 引用,即使被过滤掉"
10392 #: builtin/show-ref.c:174
10393 msgid "dereference tags into object IDs"
10394 msgstr "转换标签到对象 ID"
10396 #: builtin/show-ref.c:176
10397 msgid "only show SHA1 hash using <n> digits"
10398 msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
10400 #: builtin/show-ref.c:180
10401 msgid "do not print results to stdout (useful with --verify)"
10402 msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
10404 #: builtin/show-ref.c:182
10405 msgid "show refs from stdin that aren't in local repository"
10406 msgstr "显示从标准输入中读入的不在本地仓库中的引用"
10408 #: builtin/stripspace.c:17
10409 msgid "git stripspace [-s | --strip-comments]"
10410 msgstr "git stripspace [-s | --strip-comments]"
10412 #: builtin/stripspace.c:18
10413 msgid "git stripspace [-c | --comment-lines]"
10414 msgstr "git stripspace [-c | --comment-lines]"
10416 #: builtin/stripspace.c:35
10417 msgid "skip and remove all lines starting with comment character"
10418 msgstr "跳过和移除所有的注释行"
10420 #: builtin/stripspace.c:38
10421 msgid "prepend comment character and blank to each line"
10422 msgstr "为每一行的行首添加注释符和空格"
10424 #: builtin/submodule--helper.c:79 builtin/submodule--helper.c:167
10425 msgid "alternative anchor for relative paths"
10426 msgstr "相对路径的替代锚记(anchor)"
10428 #: builtin/submodule--helper.c:84
10429 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
10430 msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
10432 #: builtin/submodule--helper.c:114
10433 msgid "git submodule--helper name <path>"
10434 msgstr "git submodule--helper name <路径>"
10436 #: builtin/submodule--helper.c:120
10438 msgid "no submodule mapping found in .gitmodules for path '%s'"
10439 msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射"
10441 #: builtin/submodule--helper.c:170
10442 msgid "where the new submodule will be cloned to"
10443 msgstr "新的子模组将要克隆的路径"
10445 #: builtin/submodule--helper.c:173
10446 msgid "name of the new submodule"
10449 #: builtin/submodule--helper.c:176
10450 msgid "url where to clone the submodule from"
10451 msgstr "克隆子模组的 url 地址"
10453 #: builtin/submodule--helper.c:182
10454 msgid "depth for shallow clones"
10457 #: builtin/submodule--helper.c:188
10459 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
10460 "<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]"
10462 "git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
10463 "[--name <名字>] [--url <地址>][--depth <深度>] [--] [<路径>...]"
10465 #: builtin/submodule--helper.c:202 builtin/submodule--helper.c:208
10466 #: builtin/submodule--helper.c:216
10468 msgid "could not create directory '%s'"
10469 msgstr "不能创建目录 '%s'"
10471 #: builtin/submodule--helper.c:204
10473 msgid "clone of '%s' into submodule path '%s' failed"
10474 msgstr "无法克隆 '%s' 到子模组路径 '%s'"
10476 #: builtin/submodule--helper.c:227
10478 msgid "cannot open file '%s'"
10479 msgstr "无法打开文件 '%s'"
10481 #: builtin/submodule--helper.c:232
10483 msgid "could not close file %s"
10486 #: builtin/submodule--helper.c:247
10488 msgid "could not get submodule directory for '%s'"
10489 msgstr "无法得到 '%s' 的子模组目录"
10491 #: builtin/submodule--helper.c:273
10492 msgid "fatal: submodule--helper subcommand must be called with a subcommand"
10493 msgstr "严重错误:submodule-helper 子命令必须由另外的子命令调用"
10495 #: builtin/submodule--helper.c:280
10497 msgid "fatal: '%s' is not a valid submodule--helper subcommand"
10498 msgstr "严重错误:'%s' 不是一个有效的 submodule--helper 子命令"
10500 #: builtin/symbolic-ref.c:7
10501 msgid "git symbolic-ref [<options>] <name> [<ref>]"
10502 msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
10504 #: builtin/symbolic-ref.c:8
10505 msgid "git symbolic-ref -d [-q] <name>"
10506 msgstr "git symbolic-ref -d [-q] <名称>"
10508 #: builtin/symbolic-ref.c:40
10509 msgid "suppress error message for non-symbolic (detached) refs"
10510 msgstr "不显示非符号(分离的)引用的错误信息"
10512 #: builtin/symbolic-ref.c:41
10513 msgid "delete symbolic ref"
10516 #: builtin/symbolic-ref.c:42
10517 msgid "shorten ref output"
10520 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
10524 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
10525 msgid "reason of the update"
10528 #: builtin/tag.c:23
10530 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
10533 "git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]"
10535 #: builtin/tag.c:24
10536 msgid "git tag -d <tagname>..."
10537 msgstr "git tag -d <标签名>..."
10539 #: builtin/tag.c:25
10541 "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
10542 "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
10544 "git tag -l [-n[<数字>]] [--contains <提交>] [--points-at <对象>]\n"
10545 "\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]"
10547 #: builtin/tag.c:27
10548 msgid "git tag -v <tagname>..."
10549 msgstr "git tag -v <标签名>..."
10551 #: builtin/tag.c:80
10553 msgid "tag name too long: %.*s..."
10554 msgstr "标签名称太长:%.*s..."
10556 #: builtin/tag.c:85
10558 msgid "tag '%s' not found."
10559 msgstr "未发现标签 '%s'。"
10561 #: builtin/tag.c:100
10563 msgid "Deleted tag '%s' (was %s)\n"
10564 msgstr "已删除标签 '%s'(曾为 %s)\n"
10566 #: builtin/tag.c:112
10568 msgid "could not verify the tag '%s'"
10569 msgstr "不能校验该标签 '%s'"
10571 #: builtin/tag.c:122
10575 "Write a message for tag:\n"
10577 "Lines starting with '%c' will be ignored.\n"
10582 "以 '%c' 开头的行将被忽略。\n"
10584 #: builtin/tag.c:126
10588 "Write a message for tag:\n"
10590 "Lines starting with '%c' will be kept; you may remove them yourself if you "
10596 "以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
10598 #: builtin/tag.c:199
10599 msgid "unable to sign the tag"
10602 #: builtin/tag.c:201
10603 msgid "unable to write tag file"
10606 #: builtin/tag.c:226
10607 msgid "bad object type."
10610 #: builtin/tag.c:239
10611 msgid "tag header too big."
10614 #: builtin/tag.c:275
10615 msgid "no tag message?"
10618 #: builtin/tag.c:281
10620 msgid "The tag message has been left in %s\n"
10621 msgstr "标签说明被保留在 %s\n"
10623 #: builtin/tag.c:339
10624 msgid "list tag names"
10627 #: builtin/tag.c:341
10628 msgid "print <n> lines of each tag message"
10629 msgstr "每个标签信息打印 <n> 行"
10631 #: builtin/tag.c:343
10632 msgid "delete tags"
10635 #: builtin/tag.c:344
10636 msgid "verify tags"
10639 #: builtin/tag.c:346
10640 msgid "Tag creation options"
10643 #: builtin/tag.c:348
10644 msgid "annotated tag, needs a message"
10645 msgstr "附注标签,需要一个说明"
10647 #: builtin/tag.c:350
10648 msgid "tag message"
10651 #: builtin/tag.c:352
10652 msgid "annotated and GPG-signed tag"
10653 msgstr "附注并附加 GPG 签名的标签"
10655 #: builtin/tag.c:356
10656 msgid "use another key to sign the tag"
10657 msgstr "使用另外的私钥签名该标签"
10659 #: builtin/tag.c:357
10660 msgid "replace the tag if exists"
10661 msgstr "如果存在,替换现有的标签"
10663 #: builtin/tag.c:358 builtin/update-ref.c:368
10664 msgid "create a reflog"
10667 #: builtin/tag.c:360
10668 msgid "Tag listing options"
10671 #: builtin/tag.c:361
10672 msgid "show tag list in columns"
10673 msgstr "以列的方式显示标签列表"
10675 #: builtin/tag.c:362 builtin/tag.c:363
10676 msgid "print only tags that contain the commit"
10677 msgstr "只打印包含提交的标签"
10679 #: builtin/tag.c:364
10680 msgid "print only tags that are merged"
10681 msgstr "只打印已经合并的标签"
10683 #: builtin/tag.c:365
10684 msgid "print only tags that are not merged"
10685 msgstr "只打印尚未合并的标签"
10687 #: builtin/tag.c:370
10688 msgid "print only tags of the object"
10691 #: builtin/tag.c:399
10692 msgid "--column and -n are incompatible"
10693 msgstr "--column 和 -n 不兼容"
10695 #: builtin/tag.c:419
10696 msgid "-n option is only allowed with -l."
10697 msgstr "-n 选项只允许和 -l 同时使用。"
10699 #: builtin/tag.c:421
10700 msgid "--contains option is only allowed with -l."
10701 msgstr "--contains 选项只允许和 -l 同时使用。"
10703 #: builtin/tag.c:423
10704 msgid "--points-at option is only allowed with -l."
10705 msgstr "--points-at 选项只允许和 -l 同时使用。"
10707 #: builtin/tag.c:425
10708 msgid "--merged and --no-merged option are only allowed with -l"
10709 msgstr "选项 --merged 和 --no-merged 只能和 -l 共用"
10711 #: builtin/tag.c:433
10712 msgid "only one -F or -m option is allowed."
10713 msgstr "只允许一个 -F 或 -m 选项。"
10715 #: builtin/tag.c:453
10716 msgid "too many params"
10719 #: builtin/tag.c:459
10721 msgid "'%s' is not a valid tag name."
10722 msgstr "'%s' 不是一个有效的标签名称。"
10724 #: builtin/tag.c:464
10726 msgid "tag '%s' already exists"
10727 msgstr "标签 '%s' 已存在"
10729 #: builtin/tag.c:489
10731 msgid "Updated tag '%s' (was %s)\n"
10732 msgstr "已更新标签 '%s'(曾为 %s)\n"
10734 #: builtin/unpack-objects.c:490
10735 msgid "Unpacking objects"
10738 #: builtin/update-index.c:70
10740 msgid "failed to create directory %s"
10743 #: builtin/update-index.c:76
10745 msgid "failed to stat %s"
10746 msgstr "无法枚举 %s 状态"
10748 #: builtin/update-index.c:86
10750 msgid "failed to create file %s"
10753 #: builtin/update-index.c:94
10755 msgid "failed to delete file %s"
10758 #: builtin/update-index.c:101 builtin/update-index.c:203
10760 msgid "failed to delete directory %s"
10763 #: builtin/update-index.c:124
10768 #: builtin/update-index.c:136
10769 msgid "directory stat info does not change after adding a new file"
10770 msgstr "添加一个新文件后,目录的状态信息未改变"
10772 #: builtin/update-index.c:149
10773 msgid "directory stat info does not change after adding a new directory"
10774 msgstr "添加一个新目录后,目录的状态信息未改变"
10776 #: builtin/update-index.c:162
10777 msgid "directory stat info changes after updating a file"
10778 msgstr "更新一个文件后,目录的状态信息被修改"
10780 #: builtin/update-index.c:173
10781 msgid "directory stat info changes after adding a file inside subdirectory"
10782 msgstr "在子目录中添加文件后,目录的状态信息被修改"
10784 #: builtin/update-index.c:184
10785 msgid "directory stat info does not change after deleting a file"
10786 msgstr "删除一个文件后,目录的状态信息未改变"
10788 #: builtin/update-index.c:197
10789 msgid "directory stat info does not change after deleting a directory"
10790 msgstr "删除一个目录后,目录的状态信息未改变"
10792 #: builtin/update-index.c:204
10796 #: builtin/update-index.c:564
10797 msgid "git update-index [<options>] [--] [<file>...]"
10798 msgstr "git update-index [<选项>] [--] [<文件>...]"
10800 #: builtin/update-index.c:918
10801 msgid "continue refresh even when index needs update"
10802 msgstr "当索引需要更新时继续刷新"
10804 #: builtin/update-index.c:921
10805 msgid "refresh: ignore submodules"
10808 #: builtin/update-index.c:924
10809 msgid "do not ignore new files"
10812 #: builtin/update-index.c:926
10813 msgid "let files replace directories and vice-versa"
10814 msgstr "让文件替换目录(反之亦然)"
10816 #: builtin/update-index.c:928
10817 msgid "notice files missing from worktree"
10818 msgstr "通知文件从工作区丢失"
10820 #: builtin/update-index.c:930
10821 msgid "refresh even if index contains unmerged entries"
10822 msgstr "即使索引区包含未合并的条目也执行刷新"
10824 #: builtin/update-index.c:933
10825 msgid "refresh stat information"
10828 #: builtin/update-index.c:937
10829 msgid "like --refresh, but ignore assume-unchanged setting"
10830 msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
10832 #: builtin/update-index.c:941
10833 msgid "<mode>,<object>,<path>"
10834 msgstr "<存取模式>,<对象>,<路径>"
10836 #: builtin/update-index.c:942
10837 msgid "add the specified entry to the index"
10838 msgstr "添加指定的条目到索引区"
10840 #: builtin/update-index.c:946
10844 #: builtin/update-index.c:947
10845 msgid "override the executable bit of the listed files"
10846 msgstr "覆盖列表里文件的可执行位"
10848 #: builtin/update-index.c:951
10849 msgid "mark files as \"not changing\""
10850 msgstr "把文件标记为 \"没有变更\""
10852 #: builtin/update-index.c:954
10853 msgid "clear assumed-unchanged bit"
10854 msgstr "清除 assumed-unchanged 位"
10856 #: builtin/update-index.c:957
10857 msgid "mark files as \"index-only\""
10858 msgstr "把文件标记为 \"仅索引\""
10860 #: builtin/update-index.c:960
10861 msgid "clear skip-worktree bit"
10862 msgstr "清除 skip-worktree 位"
10864 #: builtin/update-index.c:963
10865 msgid "add to index only; do not add content to object database"
10866 msgstr "只添加到索引区;不添加对象到对象库"
10868 #: builtin/update-index.c:965
10869 msgid "remove named paths even if present in worktree"
10870 msgstr "即使存在工作区里,也删除路径"
10872 #: builtin/update-index.c:967
10873 msgid "with --stdin: input lines are terminated by null bytes"
10874 msgstr "携带 --stdin:输入的行以 null 字符终止"
10876 #: builtin/update-index.c:969
10877 msgid "read list of paths to be updated from standard input"
10878 msgstr "从标准输入中读取需要更新的路径列表"
10880 #: builtin/update-index.c:973
10881 msgid "add entries from standard input to the index"
10882 msgstr "从标准输入添加条目到索引区"
10884 #: builtin/update-index.c:977
10885 msgid "repopulate stages #2 and #3 for the listed paths"
10886 msgstr "为指定文件重新生成第2和第3暂存区"
10888 #: builtin/update-index.c:981
10889 msgid "only update entries that differ from HEAD"
10890 msgstr "只更新与 HEAD 不同的条目"
10892 #: builtin/update-index.c:985
10893 msgid "ignore files missing from worktree"
10894 msgstr "忽略工作区丢失的文件"
10896 #: builtin/update-index.c:988
10897 msgid "report actions to standard output"
10900 #: builtin/update-index.c:990
10901 msgid "(for porcelains) forget saved unresolved conflicts"
10902 msgstr "(for porcelains) 忘记保存的未解决的冲突"
10904 #: builtin/update-index.c:994
10905 msgid "write index in this format"
10906 msgstr "以这种格式写入索引区"
10908 #: builtin/update-index.c:996
10909 msgid "enable or disable split index"
10912 #: builtin/update-index.c:998
10913 msgid "enable/disable untracked cache"
10914 msgstr "启用/禁用对未跟踪文件的缓存"
10916 #: builtin/update-index.c:1000
10917 msgid "enable untracked cache without testing the filesystem"
10918 msgstr "无需检测文件系统,启用对未跟踪文件的缓存"
10920 #: builtin/update-ref.c:9
10921 msgid "git update-ref [<options>] -d <refname> [<old-val>]"
10922 msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
10924 #: builtin/update-ref.c:10
10925 msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
10926 msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]"
10928 #: builtin/update-ref.c:11
10929 msgid "git update-ref [<options>] --stdin [-z]"
10930 msgstr "git update-ref [<选项>] --stdin [-z]"
10932 #: builtin/update-ref.c:363
10933 msgid "delete the reference"
10936 #: builtin/update-ref.c:365
10937 msgid "update <refname> not the one it points to"
10938 msgstr "更新 <引用名> 本身而不是它指向的引用"
10940 #: builtin/update-ref.c:366
10941 msgid "stdin has NUL-terminated arguments"
10942 msgstr "标准输入有以 NUL 字符终止的参数"
10944 #: builtin/update-ref.c:367
10945 msgid "read updates from stdin"
10948 #: builtin/update-server-info.c:6
10949 msgid "git update-server-info [--force]"
10950 msgstr "git update-server-info [--force]"
10952 #: builtin/update-server-info.c:14
10953 msgid "update the info files from scratch"
10954 msgstr "从头开始更新文件信息"
10956 #: builtin/verify-commit.c:17
10957 msgid "git verify-commit [-v | --verbose] <commit>..."
10958 msgstr "git verify-commit [-v | --verbose] <提交>..."
10960 #: builtin/verify-commit.c:72
10961 msgid "print commit contents"
10964 #: builtin/verify-commit.c:73 builtin/verify-tag.c:84
10965 msgid "print raw gpg status output"
10966 msgstr "打印原始 gpg 状态输出"
10968 #: builtin/verify-pack.c:54
10969 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
10970 msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
10972 #: builtin/verify-pack.c:64
10976 #: builtin/verify-pack.c:66
10977 msgid "show statistics only"
10980 #: builtin/verify-tag.c:17
10981 msgid "git verify-tag [-v | --verbose] <tag>..."
10982 msgstr "git verify-tag [-v | --verbose] <标签>..."
10984 #: builtin/verify-tag.c:83
10985 msgid "print tag contents"
10988 #: builtin/worktree.c:15
10989 msgid "git worktree add [<options>] <path> [<branch>]"
10990 msgstr "git worktree add [<选项>] <路径> [<分支>]"
10992 #: builtin/worktree.c:16
10993 msgid "git worktree prune [<options>]"
10994 msgstr "git worktree prune [<选项>]"
10996 #: builtin/worktree.c:17
10997 msgid "git worktree list [<options>]"
10998 msgstr "git worktree list [<选项>]"
11000 #: builtin/worktree.c:39
11002 msgid "Removing worktrees/%s: not a valid directory"
11003 msgstr "删除工作区/%s:不是一个有效的目录"
11005 #: builtin/worktree.c:45
11007 msgid "Removing worktrees/%s: gitdir file does not exist"
11008 msgstr "删除 worktrees/%s:gitdir 文件不存在"
11010 #: builtin/worktree.c:50
11012 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
11013 msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)"
11015 #: builtin/worktree.c:61
11017 msgid "Removing worktrees/%s: invalid gitdir file"
11018 msgstr "删除 worktrees/%s:无效的 gitdir 文件"
11020 #: builtin/worktree.c:77
11022 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
11023 msgstr "删除 worktrees/%s:gitdir 文件的指向不存在"
11025 #: builtin/worktree.c:112
11027 msgid "failed to remove: %s"
11030 #: builtin/worktree.c:201
11032 msgid "'%s' already exists"
11035 #: builtin/worktree.c:235
11037 msgid "could not create directory of '%s'"
11038 msgstr "不能创建目录 '%s'"
11040 #: builtin/worktree.c:271
11042 msgid "Preparing %s (identifier %s)"
11043 msgstr "准备 %s (标识符 %s)"
11045 #: builtin/worktree.c:319
11046 msgid "checkout <branch> even if already checked out in other worktree"
11047 msgstr "检出分支 <branch> 即使已经被检出到其它工作区"
11049 #: builtin/worktree.c:321
11050 msgid "create a new branch"
11053 #: builtin/worktree.c:323
11054 msgid "create or reset a branch"
11057 #: builtin/worktree.c:324
11058 msgid "detach HEAD at named commit"
11059 msgstr "HEAD 从指定的提交分离"
11061 #: builtin/worktree.c:331
11062 msgid "-b, -B, and --detach are mutually exclusive"
11063 msgstr "-b、-B 和 --detach 是互斥的"
11065 #: builtin/write-tree.c:13
11066 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
11067 msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
11069 #: builtin/write-tree.c:26
11073 #: builtin/write-tree.c:27
11074 msgid "write tree object for a subdirectory <prefix>"
11075 msgstr "将 <前缀> 子目录内容写到一个树对象"
11077 #: builtin/write-tree.c:30
11078 msgid "only useful for debugging"
11081 #: credential-cache--daemon.c:255
11082 msgid "print debugging messages to stderr"
11083 msgstr "调试信息输出到标准错误"
11087 "'git help -a' and 'git help -g' list available subcommands and some\n"
11088 "concept guides. See 'git help <command>' or 'git help <concept>'\n"
11089 "to read about a specific subcommand or concept."
11091 "命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
11092 "查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
11096 msgid "start a working area (see also: git help tutorial)"
11097 msgstr "开始一个工作区(参见:git help tutorial)"
11099 #: common-cmds.h:10
11100 msgid "work on the current change (see also: git help everyday)"
11101 msgstr "在当前变更上工作(参见:git help everyday)"
11103 #: common-cmds.h:11
11104 msgid "examine the history and state (see also: git help revisions)"
11105 msgstr "检查历史和状态(参见:git help revisions)"
11107 #: common-cmds.h:12
11108 msgid "grow, mark and tweak your common history"
11109 msgstr "扩展、标记和调校您的历史记录"
11111 #: common-cmds.h:13
11112 msgid "collaborate (see also: git help workflows)"
11113 msgstr "协同(参见:git help workflows)"
11115 #: common-cmds.h:17
11116 msgid "Add file contents to the index"
11119 #: common-cmds.h:18
11120 msgid "Use binary search to find the commit that introduced a bug"
11121 msgstr "通过二分查找定位引入 bug 的提交"
11123 #: common-cmds.h:19
11124 msgid "List, create, or delete branches"
11125 msgstr "列出、创建或删除分支"
11127 #: common-cmds.h:20
11128 msgid "Switch branches or restore working tree files"
11129 msgstr "切换分支或恢复工作区文件"
11131 #: common-cmds.h:21
11132 msgid "Clone a repository into a new directory"
11133 msgstr "克隆一个仓库到一个新目录"
11135 #: common-cmds.h:22
11136 msgid "Record changes to the repository"
11139 #: common-cmds.h:23
11140 msgid "Show changes between commits, commit and working tree, etc"
11141 msgstr "显示提交之间、提交和工作区之间等的差异"
11143 #: common-cmds.h:24
11144 msgid "Download objects and refs from another repository"
11145 msgstr "从另外一个仓库下载对象和引用"
11147 #: common-cmds.h:25
11148 msgid "Print lines matching a pattern"
11151 #: common-cmds.h:26
11152 msgid "Create an empty Git repository or reinitialize an existing one"
11153 msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库"
11155 #: common-cmds.h:27
11156 msgid "Show commit logs"
11159 #: common-cmds.h:28
11160 msgid "Join two or more development histories together"
11161 msgstr "合并两个或更多开发历史"
11163 #: common-cmds.h:29
11164 msgid "Move or rename a file, a directory, or a symlink"
11165 msgstr "移动或重命名一个文件、目录或符号链接"
11167 #: common-cmds.h:30
11168 msgid "Fetch from and integrate with another repository or a local branch"
11169 msgstr "获取并整合另外的仓库或一个本地分支"
11171 #: common-cmds.h:31
11172 msgid "Update remote refs along with associated objects"
11173 msgstr "更新远程引用和相关的对象"
11175 #: common-cmds.h:32
11176 msgid "Forward-port local commits to the updated upstream head"
11177 msgstr "本地提交转移至更新后的上游分支中"
11179 #: common-cmds.h:33
11180 msgid "Reset current HEAD to the specified state"
11181 msgstr "重置当前 HEAD 到指定状态"
11183 #: common-cmds.h:34
11184 msgid "Remove files from the working tree and from the index"
11185 msgstr "从工作区和索引中删除文件"
11187 #: common-cmds.h:35
11188 msgid "Show various types of objects"
11191 #: common-cmds.h:36
11192 msgid "Show the working tree status"
11195 #: common-cmds.h:37
11196 msgid "Create, list, delete or verify a tag object signed with GPG"
11197 msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象"
11199 #: parse-options.h:145
11200 msgid "expiry-date"
11203 #: parse-options.h:160
11204 msgid "no-op (backward compatibility)"
11207 #: parse-options.h:237
11208 msgid "be more verbose"
11211 #: parse-options.h:239
11212 msgid "be more quiet"
11215 #: parse-options.h:245
11216 msgid "use <n> digits to display SHA-1s"
11217 msgstr "用 <n> 位数字显示 SHA-1 哈希值"
11220 msgid "update the index with reused conflict resolution if possible"
11221 msgstr "如果可能,重用冲突解决更新索引"
11223 #: git-bisect.sh:55
11224 msgid "You need to start by \"git bisect start\""
11225 msgstr "您需要执行 \"git bisect start\" 来开始"
11228 #. TRANSLATORS: Make sure to include [Y] and [n] in your
11229 #. translation. The program will only accept English input
11231 #: git-bisect.sh:61
11232 msgid "Do you want me to do it for you [Y/n]? "
11233 msgstr "您想让我为您这样做么[Y/n]? "
11235 #: git-bisect.sh:122
11237 msgid "unrecognised option: '$arg'"
11238 msgstr "未能识别的选项:'$arg'"
11240 #: git-bisect.sh:126
11242 msgid "'$arg' does not appear to be a valid revision"
11243 msgstr "'$arg' 看起来不像是一个有效的版本"
11245 #: git-bisect.sh:155
11246 msgid "Bad HEAD - I need a HEAD"
11247 msgstr "坏的 HEAD - 我需要一个 HEAD"
11249 #: git-bisect.sh:168
11252 "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
11253 msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。"
11255 #: git-bisect.sh:178
11256 msgid "won't bisect on cg-seek'ed tree"
11257 msgstr "不会在做了 cg-seek 的树上做二分查找"
11259 #: git-bisect.sh:182
11260 msgid "Bad HEAD - strange symbolic ref"
11261 msgstr "坏的 HEAD - 奇怪的符号引用"
11263 #: git-bisect.sh:234
11265 msgid "Bad bisect_write argument: $state"
11266 msgstr "坏的 bisect_write 参数:$state"
11268 #: git-bisect.sh:263
11270 msgid "Bad rev input: $arg"
11271 msgstr "输入坏的版本:$arg"
11273 #: git-bisect.sh:278
11274 msgid "Please call 'bisect_state' with at least one argument."
11275 msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
11277 #: git-bisect.sh:290
11279 msgid "Bad rev input: $rev"
11280 msgstr "输入坏的版本:$rev"
11282 #: git-bisect.sh:299
11284 msgid "'git bisect $TERM_BAD' can take only one argument."
11285 msgstr "'git bisect $TERM_BAD' 只能带一个参数。"
11287 #: git-bisect.sh:322
11289 msgid "Warning: bisecting only with a $TERM_BAD commit."
11290 msgstr "警告:在仅有一个坏($TERM_BAD)提交下进行二分查找。"
11293 #. TRANSLATORS: Make sure to include [Y] and [n] in your
11294 #. translation. The program will only accept English input
11296 #: git-bisect.sh:328
11297 msgid "Are you sure [Y/n]? "
11298 msgstr "您确认么[Y/n]? "
11300 #: git-bisect.sh:340
11303 "You need to give me at least one $bad_syn and one $good_syn revision.\n"
11304 "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
11306 "您需要给我至少一个好版本和一个坏版本。\n"
11307 "(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
11309 #: git-bisect.sh:343
11312 "You need to start by \"git bisect start\".\n"
11313 "You then need to give me at least one $good_syn and one $bad_syn revision.\n"
11314 "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
11316 "您需要执行 \"git bisect start\" 来开始。\n"
11317 "然后需要提供我至少一个好版本和一个坏版本。\n"
11318 "(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
11320 #: git-bisect.sh:414 git-bisect.sh:546
11321 msgid "We are not bisecting."
11322 msgstr "我们没有在二分查找。"
11324 #: git-bisect.sh:421
11326 msgid "'$invalid' is not a valid commit"
11327 msgstr "'$invalid' 不是一个有效的提交"
11329 #: git-bisect.sh:430
11332 "Could not check out original HEAD '$branch'.\n"
11333 "Try 'git bisect reset <commit>'."
11335 "不能检出原始 HEAD '$branch'。\n"
11336 "尝试 'git bisect reset <提交>'。"
11338 #: git-bisect.sh:458
11339 msgid "No logfile given"
11342 #: git-bisect.sh:459
11344 msgid "cannot read $file for replaying"
11345 msgstr "不能读取 $file 来重放"
11347 #: git-bisect.sh:480
11348 msgid "?? what are you talking about?"
11351 #: git-bisect.sh:492
11353 msgid "running $command"
11354 msgstr "运行 $command"
11356 #: git-bisect.sh:499
11359 "bisect run failed:\n"
11360 "exit code $res from '$command' is < 0 or >= 128"
11363 "命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
11365 #: git-bisect.sh:525
11366 msgid "bisect run cannot continue any more"
11367 msgstr "二分查找不能继续运行"
11369 #: git-bisect.sh:531
11372 "bisect run failed:\n"
11373 "'bisect_state $state' exited with error code $res"
11376 "'bisect_state $state' 退出码为 $res"
11378 #: git-bisect.sh:538
11379 msgid "bisect run success"
11382 #: git-bisect.sh:565
11383 msgid "please use two different terms"
11384 msgstr "请使用两个不同的术语"
11386 #: git-bisect.sh:575
11388 msgid "'$term' is not a valid term"
11389 msgstr "'$term' 不是一个有效的名称"
11391 #: git-bisect.sh:578
11393 msgid "can't use the builtin command '$term' as a term"
11394 msgstr "不能使用内置命令 '$term' 作为术语"
11396 #: git-bisect.sh:587 git-bisect.sh:593
11398 msgid "can't change the meaning of term '$term'"
11399 msgstr "不能修改术语 '$term' 的含义"
11401 #: git-bisect.sh:606
11403 msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
11404 msgstr "无效的命令:您当前正处于一个 $TERM_BAD/$TERM_GOOD 二分查找。"
11406 #: git-bisect.sh:636
11407 msgid "no terms defined"
11410 #: git-bisect.sh:653
11413 "invalid argument $arg for 'git bisect terms'.\n"
11414 "Supported options are: --term-good|--term-old and --term-bad|--term-new."
11416 "参数 $arg 对命令 'git bisect terms' 无效。\n"
11417 "支持的选项有:--term-good|--term-old 和 --term-bad|--term-new。"
11419 #: git-rebase.sh:57
11421 "When you have resolved this problem, run \"git rebase --continue\".\n"
11422 "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
11423 "To check out the original branch and stop rebasing, run \"git rebase --abort"
11426 "当您解决了此问题后,执行 \"git rebase --continue\"。\n"
11427 "如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
11428 "要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
11430 #: git-rebase.sh:165
11431 msgid "Applied autostash."
11432 msgstr "成功应用 autostash。"
11434 #: git-rebase.sh:168
11436 msgid "Cannot store $stash_sha1"
11437 msgstr "无法保存 $stash_sha1"
11439 #: git-rebase.sh:169
11441 "Applying autostash resulted in conflicts.\n"
11442 "Your changes are safe in the stash.\n"
11443 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
11445 "应用 autostash 导致冲突。\n"
11446 "您的修改安全地保存在 stash 中。\n"
11447 "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
11449 #: git-rebase.sh:208
11450 msgid "The pre-rebase hook refused to rebase."
11451 msgstr "钩子 pre-rebase 拒绝变基操作。"
11453 #: git-rebase.sh:213
11454 msgid "It looks like git-am is in progress. Cannot rebase."
11455 msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
11457 #: git-rebase.sh:354
11458 msgid "The --exec option must be used with the --interactive option"
11459 msgstr "选项 --exec 必须和选项 --interactive 同时使用"
11461 #: git-rebase.sh:359
11462 msgid "No rebase in progress?"
11463 msgstr "没有正在进行的变基?"
11465 #: git-rebase.sh:370
11466 msgid "The --edit-todo action can only be used during interactive rebase."
11467 msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
11469 #: git-rebase.sh:377
11470 msgid "Cannot read HEAD"
11473 #: git-rebase.sh:380
11475 "You must edit all merge conflicts and then\n"
11476 "mark them as resolved using git add"
11478 "您必须编辑所有的合并冲突,然后通过 git add\n"
11481 #: git-rebase.sh:398
11483 msgid "Could not move back to $head_name"
11484 msgstr "无法移回 $head_name"
11486 #: git-rebase.sh:417
11489 "It seems that there is already a $state_dir_base directory, and\n"
11490 "I wonder if you are in the middle of another rebase. If that is the\n"
11491 "case, please try\n"
11492 "\t$cmd_live_rebase\n"
11493 "If that is not the case, please\n"
11494 "\t$cmd_clear_stale_rebase\n"
11495 "and run me again. I am stopping in case you still have something\n"
11498 "好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n"
11500 "\t$cmd_live_rebase\n"
11502 "\t$cmd_clear_stale_rebase\n"
11503 "然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。"
11505 #: git-rebase.sh:468
11507 msgid "invalid upstream $upstream_name"
11508 msgstr "无效的上游 $upstream_name"
11510 #: git-rebase.sh:492
11512 msgid "$onto_name: there are more than one merge bases"
11513 msgstr "$onto_name: 有一个以上的合并基准"
11515 #: git-rebase.sh:495 git-rebase.sh:499
11517 msgid "$onto_name: there is no merge base"
11518 msgstr "$onto_name: 没有合并基准"
11520 #: git-rebase.sh:504
11522 msgid "Does not point to a valid commit: $onto_name"
11523 msgstr "没有指向一个有效的提交:$onto_name"
11525 #: git-rebase.sh:527
11527 msgid "fatal: no such branch: $branch_name"
11528 msgstr "严重错误:无此分支:$branch_name"
11530 #: git-rebase.sh:560
11531 msgid "Cannot autostash"
11532 msgstr "无法 autostash"
11534 #: git-rebase.sh:565
11536 msgid "Created autostash: $stash_abbrev"
11537 msgstr "创建了 autostash: $stash_abbrev"
11539 #: git-rebase.sh:569
11540 msgid "Please commit or stash them."
11541 msgstr "请提交或为它们保存进度。"
11543 #: git-rebase.sh:589
11545 msgid "Current branch $branch_name is up to date."
11546 msgstr "当前分支 $branch_name 是最新的。"
11548 #: git-rebase.sh:593
11550 msgid "Current branch $branch_name is up to date, rebase forced."
11551 msgstr "当前分支 $branch_name 是最新的,强制变基。"
11553 #: git-rebase.sh:604
11555 msgid "Changes from $mb to $onto:"
11556 msgstr "变更从 $mb 到 $onto:"
11558 #: git-rebase.sh:613
11559 msgid "First, rewinding head to replay your work on top of it..."
11560 msgstr "首先,回退分支以便在上面重放您的工作..."
11562 #: git-rebase.sh:623
11564 msgid "Fast-forwarded $branch_name to $onto_name."
11565 msgstr "快进 $branch_name 至 $onto_name。"
11568 msgid "git stash clear with parameters is unimplemented"
11569 msgstr "git stash clear 不支持参数"
11572 msgid "You do not have the initial commit yet"
11576 msgid "Cannot save the current index state"
11577 msgstr "无法保存当前索引状态"
11579 #: git-stash.sh:124 git-stash.sh:137
11580 msgid "Cannot save the current worktree state"
11581 msgstr "无法保存当前工作区状态"
11583 #: git-stash.sh:141
11584 msgid "No changes selected"
11587 #: git-stash.sh:144
11588 msgid "Cannot remove temporary index (can't happen)"
11589 msgstr "无法删除临时索引(不应发生)"
11591 #: git-stash.sh:157
11592 msgid "Cannot record working tree state"
11595 #: git-stash.sh:189
11597 msgid "Cannot update $ref_stash with $w_commit"
11598 msgstr "无法用 $w_commit 更新 $ref_stash"
11600 #. TRANSLATORS: $option is an invalid option, like
11601 #. `--blah-blah'. The 7 spaces at the beginning of the
11602 #. second line correspond to "error: ". So you should line
11603 #. up the second line with however many characters the
11604 #. translation of "error: " takes in your language. E.g. in
11605 #. English this is:
11607 #. $ git stash save --blah-blah 2>&1 | head -n 2
11608 #. error: unknown option for 'stash save': --blah-blah
11609 #. To provide a message, use git stash save -- '--blah-blah'
11610 #: git-stash.sh:239
11613 "error: unknown option for 'stash save': $option\n"
11614 " To provide a message, use git stash save -- '$option'"
11616 "错误:'stash save' 的未知选项:$option\n"
11617 " 要提供一个描述信息,使用 git stash save -- '$option'"
11619 #: git-stash.sh:260
11620 msgid "No local changes to save"
11621 msgstr "没有要保存的本地修改"
11623 #: git-stash.sh:264
11624 msgid "Cannot initialize stash"
11625 msgstr "无法初始化 stash"
11627 #: git-stash.sh:268
11628 msgid "Cannot save the current status"
11631 #: git-stash.sh:286
11632 msgid "Cannot remove worktree changes"
11635 #: git-stash.sh:405
11637 msgid "unknown option: $opt"
11638 msgstr "未知选项: $opt"
11640 #: git-stash.sh:415
11641 msgid "No stash found."
11642 msgstr "未发现 stash。"
11644 #: git-stash.sh:422
11646 msgid "Too many revisions specified: $REV"
11647 msgstr "指定了太多的版本:$REV"
11649 #: git-stash.sh:428
11651 msgid "$reference is not a valid reference"
11652 msgstr "$reference 不是一个有效的引用"
11654 #: git-stash.sh:456
11656 msgid "'$args' is not a stash-like commit"
11657 msgstr "'$args' 不是 stash 样提交"
11659 #: git-stash.sh:467
11661 msgid "'$args' is not a stash reference"
11662 msgstr "'$args' 不是一个 stash 引用"
11664 #: git-stash.sh:475
11665 msgid "unable to refresh index"
11668 #: git-stash.sh:479
11669 msgid "Cannot apply a stash in the middle of a merge"
11670 msgstr "无法在合并过程中恢复进度"
11672 #: git-stash.sh:487
11673 msgid "Conflicts in index. Try without --index."
11674 msgstr "索引中有冲突。尝试不使用 --index。"
11676 #: git-stash.sh:489
11677 msgid "Could not save index tree"
11680 #: git-stash.sh:523
11681 msgid "Cannot unstage modified files"
11682 msgstr "无法将修改的文件取消暂存"
11684 #: git-stash.sh:538
11685 msgid "Index was not unstashed."
11686 msgstr "索引的进度没有被恢复。"
11688 #: git-stash.sh:561
11690 msgid "Dropped ${REV} ($s)"
11691 msgstr "丢弃了 ${REV} ($s)"
11693 #: git-stash.sh:562
11695 msgid "${REV}: Could not drop stash entry"
11696 msgstr "${REV}:不能丢弃进度条目"
11698 #: git-stash.sh:570
11699 msgid "No branch name specified"
11702 #: git-stash.sh:642
11703 msgid "(To restore them type \"git stash apply\")"
11704 msgstr "(为恢复数据输入 \"git stash apply\")"
11706 #: git-submodule.sh:104
11708 msgid "cannot strip one component off url '$remoteurl'"
11709 msgstr "无法从 url '$remoteurl' 剥离一个组件"
11711 #: git-submodule.sh:281
11712 msgid "Relative path can only be used from the toplevel of the working tree"
11713 msgstr "只能在工作区的顶级目录中使用相对路径"
11715 #: git-submodule.sh:291
11717 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
11718 msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
11720 #: git-submodule.sh:308
11722 msgid "'$sm_path' already exists in the index"
11723 msgstr "'$sm_path' 已经存在于索引中"
11725 #: git-submodule.sh:312
11728 "The following path is ignored by one of your .gitignore files:\n"
11730 "Use -f if you really want to add it."
11732 "以下路径被您的一个 .gitignore 文件所忽略:\n"
11734 "如果您确实想添加它,使用 -f 参数。"
11736 #: git-submodule.sh:330
11738 msgid "Adding existing repo at '$sm_path' to the index"
11739 msgstr "添加位于 '$sm_path' 的现存仓库到索引"
11741 #: git-submodule.sh:332
11743 msgid "'$sm_path' already exists and is not a valid git repo"
11744 msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库"
11746 #: git-submodule.sh:340
11748 msgid "A git directory for '$sm_name' is found locally with remote(s):"
11749 msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:"
11751 #: git-submodule.sh:342
11754 "If you want to reuse this local git directory instead of cloning again from"
11755 msgstr "如果您想重用此本地 git 目录而不是重新克隆自"
11757 #: git-submodule.sh:344
11760 "use the '--force' option. If the local git directory is not the correct repo"
11761 msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的仓库"
11763 #: git-submodule.sh:345
11766 "or you are unsure what this means choose another name with the '--name' "
11768 msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。"
11770 #: git-submodule.sh:347
11772 msgid "Reactivating local git directory for submodule '$sm_name'."
11773 msgstr "激活本地 git 目录到子模组 '$sm_name'。"
11775 #: git-submodule.sh:359
11777 msgid "Unable to checkout submodule '$sm_path'"
11778 msgstr "不能检出子模组 '$sm_path'"
11780 #: git-submodule.sh:364
11782 msgid "Failed to add submodule '$sm_path'"
11783 msgstr "无法添加子模组 '$sm_path'"
11785 #: git-submodule.sh:373
11787 msgid "Failed to register submodule '$sm_path'"
11788 msgstr "无法注册子模组 '$sm_path'"
11790 #: git-submodule.sh:417
11792 msgid "Entering '$prefix$displaypath'"
11793 msgstr "正在进入 '$prefix$displaypath'"
11795 #: git-submodule.sh:437
11797 msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
11798 msgstr "停止于 '$prefix$displaypath',脚本返回非零值。"
11800 #: git-submodule.sh:483
11802 msgid "No url found for submodule path '$displaypath' in .gitmodules"
11803 msgstr "在 .gitmodules 中未找到子模组路径 '$displaypath' 的 url"
11805 #: git-submodule.sh:492
11807 msgid "Failed to register url for submodule path '$displaypath'"
11808 msgstr "无法为子模组路径 '$displaypath' 注册 url"
11810 #: git-submodule.sh:494
11812 msgid "Submodule '$name' ($url) registered for path '$displaypath'"
11813 msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
11815 #: git-submodule.sh:511
11817 msgid "Failed to register update mode for submodule path '$displaypath'"
11818 msgstr "无法为子模组路径 '$displaypath' 注册更新模式"
11820 #: git-submodule.sh:549
11822 msgid "Use '.' if you really want to deinitialize all submodules"
11823 msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化"
11825 #: git-submodule.sh:566
11827 msgid "Submodule work tree '$displaypath' contains a .git directory"
11828 msgstr "子模组工作区 '$displaypath' 包含一个 .git 目录"
11830 #: git-submodule.sh:567
11833 "(use 'rm -rf' if you really want to remove it including all of its history)"
11834 msgstr "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
11836 #: git-submodule.sh:573
11839 "Submodule work tree '$displaypath' contains local modifications; use '-f' to "
11841 msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们"
11843 #: git-submodule.sh:576
11845 msgid "Cleared directory '$displaypath'"
11846 msgstr "已清除目录 '$displaypath'"
11848 #: git-submodule.sh:577
11850 msgid "Could not remove submodule work tree '$displaypath'"
11851 msgstr "无法移除子模组工作区 '$displaypath'"
11853 #: git-submodule.sh:580
11855 msgid "Could not create empty submodule directory '$displaypath'"
11856 msgstr "不能创建空的子模组目录 '$displaypath'"
11858 #: git-submodule.sh:589
11860 msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
11861 msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
11863 #: git-submodule.sh:705
11866 "Submodule path '$displaypath' not initialized\n"
11867 "Maybe you want to use 'update --init'?"
11869 "子模组路径 '$displaypath' 没有初始化\n"
11870 "也许您想用 'update --init'?"
11872 #: git-submodule.sh:718
11874 msgid "Unable to find current revision in submodule path '$displaypath'"
11875 msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
11877 #: git-submodule.sh:727
11879 msgid "Unable to fetch in submodule path '$sm_path'"
11880 msgstr "无法在子模组路径 '$sm_path' 中获取"
11882 #: git-submodule.sh:751
11884 msgid "Unable to fetch in submodule path '$displaypath'"
11885 msgstr "无法在子模组路径 '$displaypath' 中获取"
11887 #: git-submodule.sh:765
11889 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
11890 msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
11892 #: git-submodule.sh:766
11894 msgid "Submodule path '$displaypath': checked out '$sha1'"
11895 msgstr "子模组路径 '$displaypath':检出 '$sha1'"
11897 #: git-submodule.sh:770
11899 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
11900 msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
11902 #: git-submodule.sh:771
11904 msgid "Submodule path '$displaypath': rebased into '$sha1'"
11905 msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
11907 #: git-submodule.sh:776
11909 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
11910 msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
11912 #: git-submodule.sh:777
11914 msgid "Submodule path '$displaypath': merged in '$sha1'"
11915 msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
11917 #: git-submodule.sh:782
11920 "Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
11921 msgstr "在子模组路径 '$prefix$sm_path' 中执行 '$command $sha1' 失败"
11923 #: git-submodule.sh:783
11925 msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
11926 msgstr "子模组路径 '$prefix$sm_path': '$command $sha1'"
11928 #: git-submodule.sh:813
11930 msgid "Failed to recurse into submodule path '$displaypath'"
11931 msgstr "无法递归进子模组路径 '$displaypath'"
11933 #: git-submodule.sh:921
11934 msgid "The --cached option cannot be used with the --files option"
11935 msgstr "选项 --cached 不能和选项 --files 同时使用"
11937 #: git-submodule.sh:973
11939 msgid "unexpected mode $mod_dst"
11940 msgstr "意外的模式 $mod_dst"
11943 #: git-submodule.sh:993
11945 msgid " Warn: $display_name doesn't contain commit $sha1_src"
11946 msgstr " 警告:$display_name 未包含提交 $sha1_src"
11949 #: git-submodule.sh:996
11951 msgid " Warn: $display_name doesn't contain commit $sha1_dst"
11952 msgstr " 警告:$display_name 未包含提交 $sha1_dst"
11955 #: git-submodule.sh:999
11957 msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
11958 msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
11960 #: git-submodule.sh:1024
11964 #: git-submodule.sh:1142
11966 msgid "Failed to recurse into submodule path '$sm_path'"
11967 msgstr "无法递归进子模组路径 '$sm_path'"
11969 #: git-submodule.sh:1206
11971 msgid "Synchronizing submodule url for '$displaypath'"
11972 msgstr "为 '$displaypath' 同步子模组 url"
11974 #~ msgid "show usage"
11977 #~ msgid "branch '%s' does not point at a commit"
11978 #~ msgstr "分支 '%s' 未指向一个提交"
11980 #~ msgid "object '%s' does not point to a commit"
11981 #~ msgstr "对象 '%s' 没有指向一个提交"
11983 #~ msgid "print only merged branches"
11984 #~ msgstr "只打印合并的分支"
11986 #~ msgid "--dissociate given, but there is no --reference"
11987 #~ msgstr "提供了参数 --dissociate,但未提供 --reference"
11989 #~ msgid "insanely long template name %s"
11990 #~ msgstr "太长的模版名 %s"
11992 #~ msgid "insanely long symlink %s"
11993 #~ msgstr "太长的符号链接 %s"
11995 #~ msgid "insanely long template path %s"
11996 #~ msgstr "太长的模版路径 %s"
11998 #~ msgid "insane git directory %s"
11999 #~ msgstr "不正常的 git 目录 %s"
12001 #~ msgid "unsupported sort specification '%s'"
12002 #~ msgstr "不支持的排序规格 '%s'"
12004 #~ msgid "unsupported sort specification '%s' in variable '%s'"
12005 #~ msgstr "不支持变量 '%2$s' 的排序规格 '%1$s'"
12007 #~ msgid "switch 'points-at' requires an object"
12008 #~ msgstr "开关 'points-at' 需要一个对象"
12010 #~ msgid "sort tags"
12013 #~ msgid "--sort and -n are incompatible"
12014 #~ msgstr "--sort 和 -n 不兼容"
12016 #~ msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
12017 #~ msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反"
12019 #~ msgid "false|true|preserve"
12020 #~ msgstr "false|true|preserve"
12022 #~ msgid "BUG: reopen a lockfile that is still open"
12023 #~ msgstr "BUG: 重新打开一个仍打开着的锁文件"
12025 #~ msgid "BUG: reopen a lockfile that has been committed"
12026 #~ msgstr "BUG: 重新打开一个已提交的锁文件"
12028 #~ msgid "option %s does not accept negative form"
12029 #~ msgstr "选项 %s 不接受否定格式"
12031 #~ msgid "unable to parse value '%s' for option %s"
12032 #~ msgstr "不能解析选项 %1$s 的值 '%2$s'"
12034 #~ msgid "unable to resolve HEAD"
12035 #~ msgstr "不能解析 HEAD"
12037 #~ msgid "-b and -B are mutually exclusive"
12038 #~ msgstr "-b 和 -B 互斥"
12040 #~ msgid "You need to set your committer info first"
12041 #~ msgstr "您需要先设置你的提交者信息"
12044 #~ "When you have resolved this problem, run \"$cmdline --continue\".\n"
12045 #~ "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
12046 #~ "To restore the original branch and stop patching, run \"$cmdline --abort"
12049 #~ "当您解决了此问题后,执行 \"$cmdline --continue\"。\n"
12050 #~ "如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n"
12051 #~ "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
12053 #~ msgid "Patch format $patch_format is not supported."
12054 #~ msgstr "不支持 $patch_format 补丁格式。"
12056 #~ msgid "Please make up your mind. --skip or --abort?"
12057 #~ msgstr "请下决心。--skip 或是 --abort ?"
12060 #~ "Patch is empty. Was it split wrong?\n"
12061 #~ "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
12062 #~ "To restore the original branch and stop patching run \"$cmdline --abort\"."
12064 #~ "补丁为空。是不是切分错误?\n"
12065 #~ "如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n"
12066 #~ "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
12068 #~ msgid "Patch does not have a valid e-mail address."
12069 #~ msgstr "补丁中没有一个有效的邮件地址。"
12071 #~ msgid "Applying: $FIRSTLINE"
12072 #~ msgstr "正应用:$FIRSTLINE"
12074 #~ msgid "Patch failed at $msgnum $FIRSTLINE"
12075 #~ msgstr "补丁失败于 $msgnum $FIRSTLINE"
12078 #~ "Pull is not possible because you have unmerged files.\n"
12079 #~ "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
12080 #~ "as appropriate to mark resolution and make a commit."
12082 #~ "Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n"
12083 #~ "然后酌情使用 'git add/rm <文件>' 标记解决方案,再做提交。"
12085 #~ msgid "Pull is not possible because you have unmerged files."
12086 #~ msgstr "Pull 不可用,因为您尚有未合并的文件。"