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 object | 提交对象
42 # commit-ish (also committish) | 提交号
44 # core Git | 核心 Git 工具
46 # dangling object | 摇摆对象
47 # detached HEAD | 分离头指针
50 # dumb HTTP | 哑 HTTP 协议
51 # evil merge | 坏合并(合并引入了父提交没有的修改)
56 # Git archive | 仓库(对于 arch 用户)
57 # gitfile | gitfile(仓库链接文件)
60 # HEAD | HEAD(头指针,亦即当前分支)
70 # master | master(默认分支名)
73 # object database | 对象库
74 # object identifier | 对象标识符
77 # octopus | 章鱼式合并(两分支以上的合并)
78 # origin | origin(默认的远程名称)
87 # plumbing | 管件(Git 底层核心命令的别称)
88 # porcelain | 瓷件(Git 上层封装命令的别称)
98 # remote-tracking branch | 远程跟踪分支
108 # shallow repository | 浅(克隆)仓库
110 # smart HTTP | 智能 HTTP 协议
112 # stage | n. 暂存区(即索引); v. 暂存
113 # stash | n. 进度保存; v. 保存进度
119 # topic branch | 主题分支
123 # tree-ish (also treeish) | 树对象(或可以解析为一树对象)
124 # unmerged index | 未合并索引
126 # unreachable object | 不可达对象
129 # upstream branch | 上游分支
134 "Project-Id-Version: Git\n"
135 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
136 "POT-Creation-Date: 2015-07-14 07:19+0800\n"
137 "PO-Revision-Date: 2015-08-04 00:43+0800\n"
138 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
139 "Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
141 "MIME-Version: 1.0\n"
142 "Content-Type: text/plain; charset=UTF-8\n"
143 "Content-Transfer-Encoding: 8bit\n"
144 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
153 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"
154 "as appropriate to mark resolution and make a commit."
156 "请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n"
160 msgid "git archive [<options>] <tree-ish> [<path>...]"
161 msgstr "git archive [<选项>] <树或提交> [<路径>...]"
164 msgid "git archive --list"
165 msgstr "git archive --list"
169 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
171 "git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]"
174 msgid "git archive --remote <repo> [--exec <cmd>] --list"
175 msgstr "git archive --remote <仓库> [--exec <命令>] --list"
177 #: archive.c:342 builtin/add.c:137 builtin/add.c:428 builtin/rm.c:327
179 msgid "pathspec '%s' did not match any files"
180 msgstr "路径规格 '%s' 未匹配任何文件"
187 msgid "archive format"
190 #: archive.c:428 builtin/log.c:1204
195 msgid "prepend prefix to each pathname in the archive"
196 msgstr "为归档中每个路径名加上前缀"
198 #: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516
199 #: builtin/blame.c:2517 builtin/config.c:57 builtin/fast-export.c:986
200 #: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:99
201 #: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394
202 #: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:150
206 #: archive.c:431 builtin/archive.c:89
207 msgid "write the archive to this file"
211 msgid "read .gitattributes in working directory"
212 msgstr "读取工作区中的 .gitattributes"
215 msgid "report archived files on stderr"
216 msgstr "在标准错误上报告归档文件"
223 msgid "compress faster"
227 msgid "compress better"
231 msgid "list supported archive formats"
234 #: archive.c:449 builtin/archive.c:90 builtin/clone.c:77
238 #: archive.c:450 builtin/archive.c:91
239 msgid "retrieve the archive from remote repository <repo>"
240 msgstr "从远程仓库(<仓库>)提取归档文件"
242 #: archive.c:451 builtin/archive.c:92 builtin/notes.c:478
246 #: archive.c:452 builtin/archive.c:93
247 msgid "path to the remote git-upload-archive command"
248 msgstr "远程 git-upload-archive 命令的路径"
252 "Negative patterns are ignored in git attributes\n"
253 "Use '\\!' for literal leading exclamation."
255 "负值模版在 git attributes 中被忽略\n"
256 "当字符串确实要以感叹号开始时,使用 '\\!'。"
260 msgid "Not setting branch %s as its own upstream."
261 msgstr "未设置分支 %s 作为它自己的上游。"
265 msgid "Branch %s set up to track remote branch %s from %s by rebasing."
266 msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"
270 msgid "Branch %s set up to track remote branch %s from %s."
271 msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"
275 msgid "Branch %s set up to track local branch %s by rebasing."
276 msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"
280 msgid "Branch %s set up to track local branch %s."
281 msgstr "分支 %s 设置为跟踪本地分支 %s。"
285 msgid "Branch %s set up to track remote ref %s by rebasing."
286 msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"
290 msgid "Branch %s set up to track remote ref %s."
291 msgstr "分支 %s 设置为跟踪远程引用 %s。"
295 msgid "Branch %s set up to track local ref %s by rebasing."
296 msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"
300 msgid "Branch %s set up to track local ref %s."
301 msgstr "分支 %s 设置为跟踪本地引用 %s。"
305 msgid "Not tracking: ambiguous information for ref %s"
306 msgstr "未跟踪:引用 %s 有歧义"
310 msgid "'%s' is not a valid branch name."
311 msgstr "'%s' 不是一个有效的分支名称。"
315 msgid "A branch named '%s' already exists."
316 msgstr "一个分支名 '%s' 已经存在。"
319 msgid "Cannot force update the current branch."
324 msgid "Cannot setup tracking information; starting point '%s' is not a branch."
325 msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
329 msgid "the requested upstream branch '%s' does not exist"
330 msgstr "请求的上游分支 '%s' 不存在"
335 "If you are planning on basing your work on an upstream\n"
336 "branch that already exists at the remote, you may need to\n"
337 "run \"git fetch\" to retrieve it.\n"
339 "If you are planning to push out a new local branch that\n"
340 "will track its remote counterpart, you may want to use\n"
341 "\"git push -u\" to set the upstream config as you push."
344 "如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
345 "您可能需要执行 \"git fetch\" 来获取分支。\n"
347 "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
348 "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
352 msgid "Not a valid object name: '%s'."
353 msgstr "不是一个有效的对象名:'%s'。"
357 msgid "Ambiguous object name: '%s'."
358 msgstr "歧义的对象名:'%s'。"
362 msgid "Not a valid branch point: '%s'."
363 msgstr "无效的分支点:'%s'。"
367 msgid "'%s' does not look like a v2 bundle file"
368 msgstr "'%s' 不像是一个 v2 版本的包文件"
372 msgid "unrecognized header: %s%s (%d)"
373 msgstr "未能识别的包头:%s%s (%d)"
375 #: bundle.c:87 builtin/commit.c:766
377 msgid "could not open '%s'"
381 msgid "Repository lacks these prerequisite commits:"
382 msgstr "仓库中缺少这些必备的提交:"
384 #: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705
385 #: builtin/branch.c:651 builtin/commit.c:1045 builtin/log.c:330
386 #: builtin/log.c:825 builtin/log.c:1432 builtin/log.c:1666 builtin/merge.c:358
387 #: builtin/shortlog.c:158
388 msgid "revision walk setup failed"
393 msgid "The bundle contains this ref:"
394 msgid_plural "The bundle contains these %d refs:"
395 msgstr[0] "这个包中含有这个引用:"
396 msgstr[1] "这个包中含有 %d 个引用:"
399 msgid "The bundle records a complete history."
400 msgstr "这个包记录一个完整历史。"
404 msgid "The bundle requires this ref:"
405 msgid_plural "The bundle requires these %d refs:"
406 msgstr[0] "这个包需要这个引用:"
407 msgstr[1] "这个包需要 %d 个引用:"
410 msgid "Could not spawn pack-objects"
411 msgstr "不能生成 pack-objects 进程"
414 msgid "pack-objects died"
415 msgstr "pack-objects 终止"
418 msgid "rev-list died"
423 msgid "ref '%s' is excluded by the rev-list options"
424 msgstr "引用 '%s' 被 rev-list 选项排除"
426 #: bundle.c:437 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261
428 msgid "unrecognized argument: %s"
432 msgid "Refusing to create empty bundle."
437 msgid "cannot create '%s'"
441 msgid "index-pack died"
442 msgstr "index-pack 终止"
446 msgid "invalid color value: %.*s"
451 msgid "could not parse %s"
456 msgid "%s %s is not a commit!"
457 msgstr "%s %s 不是一个提交!"
459 #: compat/obstack.c:406 compat/obstack.c:408
460 msgid "memory exhausted"
463 #: config.c:474 config.c:476
465 msgid "bad config file line %d in %s"
466 msgstr "配置文件 %2$s 出错于第 %1$d 行"
470 msgid "bad numeric config value '%s' for '%s' in %s: %s"
471 msgstr "文件 %3$s 中配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %4$s"
475 msgid "bad numeric config value '%s' for '%s': %s"
476 msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %3$s"
480 msgid "failed to expand user dir in: '%s'"
481 msgstr "无法扩展 '%s' 中的用户目录"
483 #: config.c:757 config.c:768
485 msgid "bad zlib compression level %d"
486 msgstr "错误的 zlib 压缩级别 %d"
490 msgid "invalid mode for object creation: %s"
491 msgstr "无效的对象创建模式:%s"
494 msgid "unable to parse command-line config"
498 msgid "unknown error occured while reading the configuration files"
499 msgstr "在读取配置文件时遇到未知错误"
503 msgid "unable to parse '%s' from command-line config"
504 msgstr "无法解析命令行配置中的 '%s'"
508 msgid "bad config variable '%s' in file '%s' at line %d"
509 msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
513 msgid "%s has multiple values"
517 msgid "Could not run 'git rev-list'"
518 msgstr "不能执行 'git rev-list'"
522 msgid "failed write to rev-list: %s"
523 msgstr "无法写入 rev-list:%s"
527 msgid "failed to close rev-list's stdin: %s"
528 msgstr "无法关闭 rev-list 的标准输入:%s"
531 msgid "in the future"
536 msgid "%lu second ago"
537 msgid_plural "%lu seconds ago"
543 msgid "%lu minute ago"
544 msgid_plural "%lu minutes ago"
551 msgid_plural "%lu hours ago"
558 msgid_plural "%lu days ago"
565 msgid_plural "%lu weeks ago"
571 msgid "%lu month ago"
572 msgid_plural "%lu months ago"
579 msgid_plural "%lu years"
583 #. TRANSLATORS: "%s" is "<n> years"
586 msgid "%s, %lu month ago"
587 msgid_plural "%s, %lu months ago"
588 msgstr[0] "%s %lu 个月前"
589 msgstr[1] "%s %lu 个月前"
591 #: date.c:154 date.c:159
594 msgid_plural "%lu years ago"
598 #: diffcore-order.c:24
600 msgid "failed to read orderfile '%s'"
601 msgstr "无法读取排序文件 '%s'"
603 #: diffcore-rename.c:536
604 msgid "Performing inexact rename detection"
605 msgstr "正在进行非精确的重命名检测"
610 msgid " Failed to parse dirstat cut-off percentage '%s'\n"
611 msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
616 msgid " Unknown dirstat parameter '%s'\n"
617 msgstr " 未知的 dirstat 参数 '%s'\n"
621 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
622 msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
627 "Found errors in 'diff.dirstat' config variable:\n"
630 "发现配置变量 'diff.dirstat' 中的错误:\n"
635 msgid "external diff died, stopping at %s"
636 msgstr "外部 diff 退出,停止在 %s"
639 msgid "--follow requires exactly one pathspec"
640 msgstr "--follow 参数后只跟一个 pathspec"
645 "Failed to parse --dirstat/-X option parameter:\n"
648 "无法解析 --dirstat/-X 选项的参数:\n"
653 msgid "Failed to parse --submodule option parameter: '%s'"
654 msgstr "无法解析 --submodule 选项的参数:'%s'"
657 msgid "failed to get kernel name and information"
661 msgid "Untracked cache is disabled on this system."
662 msgstr "缓存未跟踪文件在本系统被禁用"
664 #: gpg-interface.c:129 gpg-interface.c:200
665 msgid "could not run gpg."
668 #: gpg-interface.c:141
669 msgid "gpg did not accept the data"
672 #: gpg-interface.c:152
673 msgid "gpg failed to sign the data"
676 #: gpg-interface.c:185
678 msgid "could not create temporary file '%s': %s"
679 msgstr "不能创建临时文件 '%s':%s"
681 #: gpg-interface.c:188
683 msgid "failed writing detached signature to '%s': %s"
684 msgstr "无法将分离式签名写入 '%s':%s"
688 msgid "'%s': unable to read %s"
689 msgstr "'%s':无法读取 %s"
698 msgid "'%s': short read %s"
699 msgstr "'%s':读取不完整 %s"
703 msgid "available git commands in '%s'"
704 msgstr "在 '%s' 下可用的 git 命令"
707 msgid "git commands available from elsewhere on your $PATH"
708 msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
711 msgid "These are common Git commands used in various situations:"
712 msgstr "这些是各种场合常见的 Git 命令:"
717 "'%s' appears to be a git command, but we were not\n"
718 "able to execute it. Maybe git-%s is broken?"
720 "'%s' 像是一个 git 命令,但却无法运行。\n"
724 msgid "Uh oh. Your system reports no Git commands at all."
725 msgstr "唉呀,您的系统中未发现 Git 命令。"
730 "WARNING: You called a Git command named '%s', which does not exist.\n"
731 "Continuing under the assumption that you meant '%s'"
733 "警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
738 msgid "in %0.1f seconds automatically..."
739 msgstr "在 %0.1f 秒钟后自动运行..."
743 msgid "git: '%s' is not a git command. See 'git --help'."
744 msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
746 #: help.c:406 help.c:466
752 "Did you mean one of these?"
766 msgid "BUG: reopen a lockfile that is still open"
767 msgstr "BUG: 重新打开一个仍打开着的锁文件"
770 msgid "BUG: reopen a lockfile that has been committed"
771 msgstr "BUG: 重新打开一个已提交的锁文件"
774 msgid "failed to read the cache"
777 #: merge.c:94 builtin/checkout.c:376 builtin/checkout.c:587
778 #: builtin/clone.c:647
779 msgid "unable to write new index file"
782 #: merge-recursive.c:189
784 msgid "(bad commit)\n"
787 #: merge-recursive.c:209
789 msgid "addinfo_cache failed for path '%s'"
790 msgstr "为路径 '%s' addinfo_cache 失败"
792 #: merge-recursive.c:270
793 msgid "error building trees"
796 #: merge-recursive.c:687
798 msgid "failed to create path '%s'%s"
799 msgstr "无法创建路径 '%s'%s"
801 #: merge-recursive.c:698
803 msgid "Removing %s to make room for subdirectory\n"
804 msgstr "删除 %s 以便为子目录留出空间\n"
806 #: merge-recursive.c:712 merge-recursive.c:733
807 msgid ": perhaps a D/F conflict?"
808 msgstr ":可能是一个目录/文件冲突?"
810 #: merge-recursive.c:723
812 msgid "refusing to lose untracked file at '%s'"
813 msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
815 #: merge-recursive.c:763
817 msgid "cannot read object %s '%s'"
818 msgstr "不能读取对象 %s '%s'"
820 #: merge-recursive.c:765
822 msgid "blob expected for %s '%s'"
823 msgstr "%s '%s' 应为数据对象"
825 #: merge-recursive.c:788 builtin/clone.c:306
827 msgid "failed to open '%s'"
830 #: merge-recursive.c:796
832 msgid "failed to symlink '%s'"
833 msgstr "无法创建符号链接 '%s'"
835 #: merge-recursive.c:799
837 msgid "do not know what to do with %06o %s '%s'"
838 msgstr "不知道如何处理 %06o %s '%s'"
840 #: merge-recursive.c:937
841 msgid "Failed to execute internal merge"
844 #: merge-recursive.c:941
846 msgid "Unable to add %s to database"
847 msgstr "不能添加 %s 至对象库"
849 #: merge-recursive.c:957
850 msgid "unsupported object type in the tree"
851 msgstr "在树中有不支持的对象类型"
853 #: merge-recursive.c:1032 merge-recursive.c:1046
856 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
859 "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
862 #: merge-recursive.c:1038 merge-recursive.c:1051
865 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
868 "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
871 #: merge-recursive.c:1092
875 #: merge-recursive.c:1092
879 #: merge-recursive.c:1148
881 msgid "%s is a directory in %s adding as %s instead"
882 msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
884 #: merge-recursive.c:1170
887 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
888 "\"->\"%s\" in \"%s\"%s"
890 "冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
891 "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
893 #: merge-recursive.c:1175
894 msgid " (left unresolved)"
897 #: merge-recursive.c:1229
899 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
901 "冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
904 #: merge-recursive.c:1259
906 msgid "Renaming %s to %s and %s to %s instead"
907 msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
909 #: merge-recursive.c:1458
911 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
912 msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
914 #: merge-recursive.c:1468
916 msgid "Adding merged %s"
919 #: merge-recursive.c:1473 merge-recursive.c:1671
921 msgid "Adding as %s instead"
924 #: merge-recursive.c:1524
926 msgid "cannot read object %s"
929 #: merge-recursive.c:1527
931 msgid "object %s is not a blob"
932 msgstr "对象 %s 不是一个数据对象"
934 #: merge-recursive.c:1575
938 #: merge-recursive.c:1575
942 #: merge-recursive.c:1585
946 #: merge-recursive.c:1592
950 #: merge-recursive.c:1626
952 msgid "Skipped %s (merged same as existing)"
953 msgstr "略过 %s(已经做过相同合并)"
955 #: merge-recursive.c:1640
957 msgid "Auto-merging %s"
960 #: merge-recursive.c:1644 git-submodule.sh:1150
964 #: merge-recursive.c:1645
966 msgid "CONFLICT (%s): Merge conflict in %s"
967 msgstr "冲突(%s):合并冲突于 %s"
969 #: merge-recursive.c:1731
974 #: merge-recursive.c:1756
975 msgid "file/directory"
978 #: merge-recursive.c:1762
979 msgid "directory/file"
982 #: merge-recursive.c:1767
984 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
985 msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
987 #: merge-recursive.c:1777
992 #: merge-recursive.c:1794
993 msgid "Fatal merge failure, shouldn't happen."
994 msgstr "严重的合并错误,不应发生。"
996 #: merge-recursive.c:1813
997 msgid "Already up-to-date!"
1000 #: merge-recursive.c:1822
1002 msgid "merging of trees %s and %s failed"
1003 msgstr "无法合并树 %s 和 %s"
1005 #: merge-recursive.c:1852
1007 msgid "Unprocessed path??? %s"
1008 msgstr "未处理的路径??? %s"
1010 #: merge-recursive.c:1900
1014 #: merge-recursive.c:1913
1016 msgid "found %u common ancestor:"
1017 msgid_plural "found %u common ancestors:"
1018 msgstr[0] "发现 %u 个共同祖先:"
1019 msgstr[1] "发现 %u 个共同祖先:"
1021 #: merge-recursive.c:1950
1022 msgid "merge returned no commit"
1025 #: merge-recursive.c:2007
1027 msgid "Could not parse object '%s'"
1028 msgstr "不能解析对象 '%s'"
1030 #: merge-recursive.c:2018 builtin/merge.c:645
1031 msgid "Unable to write index."
1035 msgid "Cannot commit uninitialized/unreferenced notes tree"
1036 msgstr "不能提交未初始化/未引用的注解树"
1040 msgid "Bad notes.rewriteMode value: '%s'"
1041 msgstr "坏的 notes.rewriteMode 值:'%s'"
1045 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
1046 msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
1048 #. TRANSLATORS: The first %s is the name of the
1049 #. environment variable, the second %s is its value
1050 #: notes-utils.c:119
1052 msgid "Bad %s value: '%s'"
1053 msgstr "坏的 %s 值:'%s'"
1057 msgid "unable to parse object: %s"
1060 #: parse-options.c:546
1064 #: parse-options.c:564
1069 #. TRANSLATORS: the colon here should align with the
1070 #. one in "usage: %s" translation
1071 #: parse-options.c:568
1076 # 译者:为保证在输出中对齐,注意调整句中空格!
1077 #: parse-options.c:571
1082 #: parse-options.c:605
1087 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
1088 msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
1092 "global 'literal' pathspec setting is incompatible with all other global "
1094 msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
1097 msgid "invalid parameter for pathspec magic 'prefix'"
1098 msgstr "路径规格包含无效的神奇前缀"
1102 msgid "Invalid pathspec magic '%.*s' in '%s'"
1103 msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
1107 msgid "Missing ')' at the end of pathspec magic in '%s'"
1108 msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
1112 msgid "Unimplemented pathspec magic '%c' in '%s'"
1113 msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
1117 msgid "%s: 'literal' and 'glob' are incompatible"
1118 msgstr "%s:'literal' 和 'glob' 不兼容"
1122 msgid "%s: '%s' is outside repository"
1123 msgstr "%s:'%s' 在仓库之外"
1127 msgid "Pathspec '%s' is in submodule '%.*s'"
1128 msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
1132 msgid "%s: pathspec magic not supported by this command: %s"
1133 msgstr "%s:路径规格神奇前缀不被此命令支持:%s"
1137 msgid "pathspec '%s' is beyond a symbolic link"
1138 msgstr "路径规格 '%s' 位于符号链接中"
1142 "There is nothing to exclude from by :(exclude) patterns.\n"
1143 "Perhaps you forgot to add either ':/' or '.' ?"
1145 "没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"
1149 msgid "unable to parse --pretty format"
1150 msgstr "不能解析 --pretty 格式"
1156 #: read-cache.c:1295
1159 "index.version set, but the value is invalid.\n"
1162 "设置了 index.version,但是取值无效。\n"
1165 #: read-cache.c:1305
1168 "GIT_INDEX_VERSION set, but the value is invalid.\n"
1171 "设置了 GIT_INDEX_VERSION,但是取值无效。\n"
1176 msgid "Cannot fetch both %s and %s to %s"
1177 msgstr "不能同时获取 %s 和 %s 至 %s"
1181 msgid "%s usually tracks %s, not %s"
1182 msgstr "%s 通常跟踪 %s,而非 %s"
1186 msgid "%s tracks both %s and %s"
1187 msgstr "%s 同时跟踪 %s 和 %s"
1190 msgid "Internal error"
1193 #: remote.c:1723 remote.c:1766
1194 msgid "HEAD does not point to a branch"
1195 msgstr "HEAD 没有指向一个分支"
1199 msgid "no such branch: '%s'"
1204 msgid "no upstream configured for branch '%s'"
1205 msgstr "尚未给分支 '%s' 设置上游"
1209 msgid "upstream branch '%s' not stored as a remote-tracking branch"
1210 msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
1214 msgid "push destination '%s' on remote '%s' has no local tracking branch"
1215 msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
1219 msgid "branch '%s' has no remote for pushing"
1220 msgstr "分支 '%s' 没有设置要推送的远程服务器"
1224 msgid "push refspecs for '%s' do not include '%s'"
1225 msgstr "向 '%s' 推送引用规格未包含 '%s'"
1228 msgid "push has no destination (push.default is 'nothing')"
1229 msgstr "推送无目标(push.default 是 'nothing')"
1232 msgid "cannot resolve 'simple' push to a single destination"
1233 msgstr "无法解析 'simple' 推送至一个单独的目标"
1237 msgid "Your branch is based on '%s', but the upstream is gone.\n"
1238 msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
1241 msgid " (use \"git branch --unset-upstream\" to fixup)\n"
1242 msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n"
1246 msgid "Your branch is up-to-date with '%s'.\n"
1247 msgstr "您的分支与上游分支 '%s' 一致。\n"
1251 msgid "Your branch is ahead of '%s' by %d commit.\n"
1252 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
1253 msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
1254 msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
1257 msgid " (use \"git push\" to publish your local commits)\n"
1258 msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
1262 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
1264 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
1265 msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
1266 msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
1270 msgid " (use \"git pull\" to update your local branch)\n"
1271 msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
1276 "Your branch and '%s' have diverged,\n"
1277 "and have %d and %d different commit each, respectively.\n"
1279 "Your branch and '%s' have diverged,\n"
1280 "and have %d and %d different commits each, respectively.\n"
1282 "您的分支和 '%s' 出现了偏离,\n"
1283 "并且分别有 %d 和 %d 处不同的提交。\n"
1285 "您的分支和 '%s' 出现了偏离,\n"
1286 "并且分别有 %d 和 %d 处不同的提交。\n"
1290 msgid " (use \"git pull\" to merge the remote branch into yours)\n"
1291 msgstr " (使用 \"git pull\" 来合并远程分支)\n"
1294 msgid "--first-parent is incompatible with --bisect"
1295 msgstr "--first-parent 与 --bisect 不兼容"
1298 msgid "open /dev/null failed"
1299 msgstr "不能打开 /dev/null"
1303 msgid "dup2(%d,%d) failed"
1304 msgstr "不能调用 dup2(%d,%d)"
1307 msgid "failed to sign the push certificate"
1311 msgid "the receiving end does not support --signed push"
1315 msgid "the receiving end does not support --atomic push"
1318 #: sequencer.c:172 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973
1319 #: builtin/merge.c:983
1321 msgid "Could not open '%s' for writing"
1322 msgstr "不能为写入打开 '%s'"
1324 #: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975
1325 #: builtin/merge.c:988
1327 msgid "Could not write to '%s'"
1332 "after resolving the conflicts, mark the corrected paths\n"
1333 "with 'git add <paths>' or 'git rm <paths>'"
1335 "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
1340 "after resolving the conflicts, mark the corrected paths\n"
1341 "with 'git add <paths>' or 'git rm <paths>'\n"
1342 "and commit the result with 'git commit'"
1344 "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
1345 "对修正后的文件做标记,然后用 'git commit' 提交"
1347 #: sequencer.c:211 sequencer.c:861 sequencer.c:944
1349 msgid "Could not write to %s"
1354 msgid "Error wrapping up %s"
1358 msgid "Your local changes would be overwritten by cherry-pick."
1359 msgstr "您的本地修改将被拣选操作覆盖。"
1362 msgid "Your local changes would be overwritten by revert."
1363 msgstr "您的本地修改将被还原操作覆盖。"
1366 msgid "Commit your changes or stash them to proceed."
1367 msgstr "提交您的修改或保存进度后再继续。"
1369 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
1372 msgid "%s: Unable to write new index file"
1373 msgstr "%s:无法写入新索引文件"
1376 msgid "Could not resolve HEAD commit\n"
1377 msgstr "不能解析 HEAD 提交\n"
1380 msgid "Unable to update cache tree\n"
1385 msgid "Could not parse commit %s\n"
1386 msgstr "不能解析提交 %s\n"
1390 msgid "Could not parse parent commit %s\n"
1391 msgstr "不能解析父提交 %s\n"
1394 msgid "Your index file is unmerged."
1395 msgstr "您的索引文件未完成合并。"
1399 msgid "Commit %s is a merge but no -m option was given."
1400 msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
1404 msgid "Commit %s does not have parent %d"
1405 msgstr "提交 %s 没有父提交 %d"
1409 msgid "Mainline was specified but commit %s is not a merge."
1410 msgstr "指定了主线但提交 %s 不是一个合并。"
1412 #. TRANSLATORS: The first %s will be "revert" or
1413 #. "cherry-pick", the second %s a SHA1
1416 msgid "%s: cannot parse parent commit %s"
1417 msgstr "%s:不能解析父提交 %s"
1421 msgid "Cannot get commit message for %s"
1422 msgstr "不能得到 %s 的提交说明"
1426 msgid "could not revert %s... %s"
1427 msgstr "不能还原 %s... %s"
1431 msgid "could not apply %s... %s"
1432 msgstr "不能应用 %s... %s"
1435 msgid "empty commit set passed"
1440 msgid "git %s: failed to read the index"
1441 msgstr "git %s:无法读取索引"
1445 msgid "git %s: failed to refresh the index"
1446 msgstr "git %s:无法刷新索引"
1450 msgid "Cannot %s during a %s"
1451 msgstr "无法 %s 在一个 %s 过程中"
1455 msgid "Could not parse line %d."
1456 msgstr "不能解析第 %d 行。"
1459 msgid "No commits parsed."
1464 msgid "Could not open %s"
1469 msgid "Could not read %s."
1474 msgid "Unusable instruction sheet: %s"
1479 msgid "Invalid key: %s"
1484 msgid "Invalid value for %s: %s"
1489 msgid "Malformed options sheet: %s"
1493 msgid "a cherry-pick or revert is already in progress"
1494 msgstr "一个拣选或还原操作已在进行"
1497 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
1498 msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
1502 msgid "Could not create sequencer directory %s"
1503 msgstr "不能创建序列目录 %s"
1505 #: sequencer.c:863 sequencer.c:948
1507 msgid "Error wrapping up %s."
1510 #: sequencer.c:882 sequencer.c:1018
1511 msgid "no cherry-pick or revert in progress"
1512 msgstr "拣选或还原操作并未进行"
1515 msgid "cannot resolve HEAD"
1519 msgid "cannot abort from a branch yet to be born"
1520 msgstr "不能从尚未建立的分支终止"
1522 #: sequencer.c:908 builtin/apply.c:4291
1524 msgid "cannot open %s: %s"
1529 msgid "cannot read %s: %s"
1533 msgid "unexpected end of file"
1538 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
1539 msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
1543 msgid "Could not format %s."
1548 msgid "%s: can't cherry-pick a %s"
1549 msgstr "%s:不能拣选一个%s"
1553 msgid "%s: bad revision"
1557 msgid "Can't revert as initial commit"
1561 msgid "Can't cherry-pick into empty head"
1566 msgid "failed to read %s"
1571 "Git normally never creates a ref that ends with 40 hex characters\n"
1572 "because it will be ignored when you just specify 40-hex. These refs\n"
1573 "may be created by mistake. For example,\n"
1575 " git checkout -b $br $(git rev-parse ...)\n"
1577 "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
1578 "examine these refs and maybe delete them. Turn this message off by\n"
1579 "running \"git config advice.objectNameWarning false\""
1581 "Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n"
1582 "十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n"
1584 " git checkout -b $br $(git rev-parse ...)\n"
1586 "当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n"
1587 "可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
1590 #: submodule.c:64 submodule.c:98
1591 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
1592 msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
1594 #: submodule.c:68 submodule.c:102
1596 msgid "Could not find section in .gitmodules where path=%s"
1597 msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
1601 msgid "Could not update .gitmodules entry %s"
1602 msgstr "不能更新 .gitmodules 条目 %s"
1606 msgid "Could not remove .gitmodules entry for %s"
1607 msgstr "无法移除 %s 的 .gitmodules 条目"
1610 msgid "staging updated .gitmodules failed"
1611 msgstr "将更新后 .gitmodules 添加暂存区失败"
1615 msgid "Could not set core.worktree in %s"
1616 msgstr "不能在 %s 中设置 core.worktree"
1618 #: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557
1621 msgid "unknown value '%s' for key '%s'"
1622 msgstr "键 '%2$s' 的未知取值 '%1$s'"
1624 #: trailer.c:543 trailer.c:548 builtin/remote.c:290
1626 msgid "more than one %s"
1631 msgid "empty trailer token in trailer '%.*s'"
1632 msgstr "签名 '%.*s' 的键为空"
1636 msgid "could not read input file '%s'"
1637 msgstr "不能读取输入文件 '%s'"
1640 msgid "could not read from stdin"
1643 #: unpack-trees.c:203
1644 msgid "Checking out files"
1648 msgid "invalid URL scheme name or missing '://' suffix"
1649 msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
1651 #: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
1653 msgid "invalid %XX escape sequence"
1654 msgstr "无效的 %XX 转义序列"
1657 msgid "missing host and scheme is not 'file:'"
1658 msgstr "缺失主机名且URL方案不是 'file:'"
1661 msgid "a 'file:' URL may not have a port number"
1662 msgstr "一个 'file:' URL 不应该包含端口号"
1665 msgid "invalid characters in host name"
1666 msgstr "主机名中包含无效的字符"
1668 #: urlmatch.c:244 urlmatch.c:255
1669 msgid "invalid port number"
1673 msgid "invalid '..' path segment"
1674 msgstr "无效的 '..' 路径片段"
1678 msgid "unable to access '%s': %s"
1679 msgstr "不能访问 '%s':%s"
1683 msgid "unable to access '%s'"
1688 msgid "unable to look up current user in the passwd file: %s"
1689 msgstr "无法在口令文件中查询到当前用户:%s"
1692 msgid "no such user"
1696 msgid "unable to get current working directory"
1701 msgid "could not open %s for writing"
1706 msgid "could not write to %s"
1711 msgid "could not close %s"
1715 msgid "Unmerged paths:"
1719 #: wt-status.c:177 wt-status.c:204
1721 msgid " (use \"git reset %s <file>...\" to unstage)"
1722 msgstr " (使用 \"git reset %s <文件>...\" 以取消暂存)"
1725 #: wt-status.c:179 wt-status.c:206
1726 msgid " (use \"git rm --cached <file>...\" to unstage)"
1727 msgstr " (使用 \"git rm --cached <文件>...\" 以取消暂存)"
1731 msgid " (use \"git add <file>...\" to mark resolution)"
1732 msgstr " (使用 \"git add <文件>...\" 标记解决方案)"
1735 #: wt-status.c:185 wt-status.c:189
1736 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
1737 msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)"
1741 msgid " (use \"git rm <file>...\" to mark resolution)"
1742 msgstr " (使用 \"git rm <文件>...\" 标记解决方案)"
1744 #: wt-status.c:198 wt-status.c:881
1745 msgid "Changes to be committed:"
1748 #: wt-status.c:216 wt-status.c:890
1749 msgid "Changes not staged for commit:"
1750 msgstr "尚未暂存以备提交的变更:"
1754 msgid " (use \"git add <file>...\" to update what will be committed)"
1755 msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)"
1759 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
1760 msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)"
1765 " (use \"git checkout -- <file>...\" to discard changes in working directory)"
1766 msgstr " (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)"
1770 msgid " (commit or discard the untracked or modified content in submodules)"
1771 msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
1776 msgid " (use \"git %s <file>...\" to include in what will be committed)"
1777 msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)"
1780 msgid "both deleted:"
1784 msgid "added by us:"
1788 msgid "deleted by them:"
1792 msgid "added by them:"
1796 msgid "deleted by us:"
1804 msgid "both modified:"
1809 msgid "bug: unhandled unmerged status %x"
1810 msgstr "bug:无法处理的未合并状态 %x"
1844 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1846 msgid "new commits, "
1849 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1851 msgid "modified content, "
1854 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1856 msgid "untracked content, "
1861 msgid "bug: unhandled diff status %c"
1862 msgstr "bug:无法处理的差异状态 %c"
1865 msgid "Submodules changed but not updated:"
1866 msgstr "子模组已修改但尚未更新:"
1869 msgid "Submodule changes to be committed:"
1874 "Do not touch the line above.\n"
1875 "Everything below will be removed."
1881 msgid "You have unmerged paths."
1886 msgid " (fix conflicts and run \"git commit\")"
1887 msgstr " (解决冲突并运行 \"git commit\")"
1890 msgid "All conflicts fixed but you are still merging."
1891 msgstr "所有冲突已解决但您仍处于合并中。"
1895 msgid " (use \"git commit\" to conclude merge)"
1896 msgstr " (使用 \"git commit\" 结束合并)"
1899 msgid "You are in the middle of an am session."
1900 msgstr "您正处于 am 操作过程中。"
1903 msgid "The current patch is empty."
1908 msgid " (fix conflicts and then run \"git am --continue\")"
1909 msgstr " (解决冲突,然后运行 \"git am --continue\")"
1913 msgid " (use \"git am --skip\" to skip this patch)"
1914 msgstr " (使用 \"git am --skip\" 跳过此补丁)"
1918 msgid " (use \"git am --abort\" to restore the original branch)"
1919 msgstr " (使用 \"git am --abort\" 恢复原有分支)"
1921 #: wt-status.c:1039 wt-status.c:1056
1923 msgid "You are currently rebasing branch '%s' on '%s'."
1924 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
1926 #: wt-status.c:1044 wt-status.c:1061
1927 msgid "You are currently rebasing."
1932 msgid " (fix conflicts and then run \"git rebase --continue\")"
1933 msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
1937 msgid " (use \"git rebase --skip\" to skip this patch)"
1938 msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
1942 msgid " (use \"git rebase --abort\" to check out the original branch)"
1943 msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
1947 msgid " (all conflicts fixed: run \"git rebase --continue\")"
1948 msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
1953 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
1954 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
1957 msgid "You are currently splitting a commit during a rebase."
1958 msgstr "您在执行变基操作时拆分提交。"
1962 msgid " (Once your working directory is clean, run \"git rebase --continue\")"
1963 msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
1967 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
1968 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
1971 msgid "You are currently editing a commit during a rebase."
1972 msgstr "您在执行变基操作时编辑提交。"
1976 msgid " (use \"git commit --amend\" to amend the current commit)"
1977 msgstr " (使用 \"git commit --amend\" 修补当前提交)"
1982 " (use \"git rebase --continue\" once you are satisfied with your changes)"
1983 msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
1987 msgid "You are currently cherry-picking commit %s."
1988 msgstr "您在执行拣选提交 %s 的操作。"
1992 msgid " (fix conflicts and run \"git cherry-pick --continue\")"
1993 msgstr " (解决冲突并运行 \"git cherry-pick --continue\")"
1997 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
1998 msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")"
2002 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
2003 msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
2007 msgid "You are currently reverting commit %s."
2008 msgstr "您在执行反转提交 %s 的操作。"
2012 msgid " (fix conflicts and run \"git revert --continue\")"
2013 msgstr " (解决冲突并运行 \"git revert --continue\")"
2017 msgid " (all conflicts fixed: run \"git revert --continue\")"
2018 msgstr " (所有冲突已解决:运行 \"git revert --continue\")"
2022 msgid " (use \"git revert --abort\" to cancel the revert operation)"
2023 msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
2027 msgid "You are currently bisecting, started from branch '%s'."
2028 msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
2031 msgid "You are currently bisecting."
2032 msgstr "您在执行二分查找操作。"
2036 msgid " (use \"git bisect reset\" to get back to the original branch)"
2037 msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
2044 msgid "rebase in progress; onto "
2045 msgstr "变基操作正在进行中;至 "
2048 msgid "HEAD detached at "
2052 msgid "HEAD detached from "
2056 msgid "Not currently on any branch."
2060 msgid "Initial commit"
2064 msgid "Untracked files"
2068 msgid "Ignored files"
2074 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
2075 "may speed it up, but you have to be careful not to forget to add\n"
2076 "new files yourself (see 'git help status')."
2078 "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
2079 "但您需要小心不要忘了添加新文件(参见 'git help status')。"
2083 msgid "Untracked files not listed%s"
2084 msgstr "未跟踪的文件没有列出%s"
2086 # 译者:中文字符串拼接,可删除前导空格
2088 msgid " (use -u option to show untracked files)"
2089 msgstr "(使用 -u 参数显示未跟踪的文件)"
2097 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
2098 msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
2102 msgid "no changes added to commit\n"
2108 "nothing added to commit but untracked files present (use \"git add\" to "
2110 msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
2114 msgid "nothing added to commit but untracked files present\n"
2115 msgstr "提交为空,但是存在尚未跟踪的文件\n"
2117 # 译者:中文字符串拼接,可删除前导空格
2120 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
2121 msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
2123 #: wt-status.c:1412 wt-status.c:1417
2125 msgid "nothing to commit\n"
2128 # 译者:中文字符串拼接,可删除前导空格
2131 msgid "nothing to commit (use -u to show untracked files)\n"
2132 msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
2134 # 译者:中文字符串拼接,可删除前导空格
2137 msgid "nothing to commit, working directory clean\n"
2138 msgstr "无文件要提交,干净的工作区\n"
2141 msgid "HEAD (no branch)"
2146 msgid "Initial commit on "
2154 #: wt-status.c:1563 wt-status.c:1571
2158 #: compat/precompose_utf8.c:55 builtin/clone.c:345
2160 msgid "failed to unlink '%s'"
2164 msgid "git add [<options>] [--] <pathspec>..."
2165 msgstr "git add [<选项>] [--] <路径规格>..."
2169 msgid "unexpected diff status %c"
2172 #: builtin/add.c:70 builtin/commit.c:277
2173 msgid "updating files failed"
2178 msgid "remove '%s'\n"
2181 #: builtin/add.c:134
2182 msgid "Unstaged changes after refreshing the index:"
2183 msgstr "刷新索引之后尚未被暂存的变更:"
2185 #: builtin/add.c:194 builtin/rev-parse.c:796
2186 msgid "Could not read the index"
2189 #: builtin/add.c:205
2191 msgid "Could not open '%s' for writing."
2192 msgstr "不能打开 '%s' 以写入。"
2194 #: builtin/add.c:209
2195 msgid "Could not write patch"
2198 #: builtin/add.c:212
2199 msgid "editing patch failed"
2202 #: builtin/add.c:215
2204 msgid "Could not stat '%s'"
2205 msgstr "不能查看文件状态 '%s'"
2207 #: builtin/add.c:217
2208 msgid "Empty patch. Aborted."
2211 #: builtin/add.c:222
2213 msgid "Could not apply '%s'"
2216 #: builtin/add.c:232
2217 msgid "The following paths are ignored by one of your .gitignore files:\n"
2218 msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
2220 #: builtin/add.c:249 builtin/clean.c:874 builtin/fetch.c:107 builtin/mv.c:110
2221 #: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1369
2226 #: builtin/add.c:250 builtin/apply.c:4580 builtin/check-ignore.c:19
2227 #: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:616
2228 #: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114
2232 #: builtin/add.c:252
2233 msgid "interactive picking"
2236 #: builtin/add.c:253 builtin/checkout.c:1221 builtin/reset.c:286
2237 msgid "select hunks interactively"
2240 #: builtin/add.c:254
2241 msgid "edit current diff and apply"
2244 #: builtin/add.c:255
2245 msgid "allow adding otherwise ignored files"
2248 #: builtin/add.c:256
2249 msgid "update tracked files"
2252 #: builtin/add.c:257
2253 msgid "record only the fact that the path will be added later"
2254 msgstr "只记录,该路径稍后再添加"
2256 #: builtin/add.c:258
2257 msgid "add changes from all tracked and untracked files"
2258 msgstr "添加所有改变的已跟踪文件和未跟踪文件"
2260 #: builtin/add.c:261
2261 msgid "ignore paths removed in the working tree (same as --no-all)"
2262 msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
2264 #: builtin/add.c:263
2265 msgid "don't add, only refresh the index"
2268 #: builtin/add.c:264
2269 msgid "just skip files which cannot be added because of errors"
2270 msgstr "跳过因出错不能添加的文件"
2272 #: builtin/add.c:265
2273 msgid "check if - even missing - files are ignored in dry run"
2274 msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
2276 #: builtin/add.c:287
2278 msgid "Use -f if you really want to add them.\n"
2279 msgstr "使用 -f 参数如果您确实要添加它们。\n"
2281 #: builtin/add.c:294
2282 msgid "adding files failed"
2285 #: builtin/add.c:330
2286 msgid "-A and -u are mutually incompatible"
2287 msgstr "-A 和 -u 选项互斥"
2289 #: builtin/add.c:337
2290 msgid "Option --ignore-missing can only be used together with --dry-run"
2291 msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
2293 #: builtin/add.c:358
2295 msgid "Nothing specified, nothing added.\n"
2296 msgstr "没有指定文件,也没有文件被添加。\n"
2298 #: builtin/add.c:359
2300 msgid "Maybe you wanted to say 'git add .'?\n"
2301 msgstr "也许您想要执行 'git add .'?\n"
2303 #: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:918
2304 #: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298
2305 msgid "index file corrupt"
2308 #: builtin/add.c:447 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430
2309 msgid "Unable to write new index file"
2312 #: builtin/apply.c:59
2313 msgid "git apply [<options>] [<patch>...]"
2314 msgstr "git apply [<选项>] [<补丁>...]"
2316 #: builtin/apply.c:112
2318 msgid "unrecognized whitespace option '%s'"
2319 msgstr "未能识别的空白字符选项 '%s'"
2321 #: builtin/apply.c:127
2323 msgid "unrecognized whitespace ignore option '%s'"
2324 msgstr "未能识别的空白字符忽略选项 '%s'"
2326 #: builtin/apply.c:822
2328 msgid "Cannot prepare timestamp regexp %s"
2329 msgstr "无法准备时间戳正则表达式 %s"
2331 #: builtin/apply.c:831
2333 msgid "regexec returned %d for input: %s"
2334 msgstr "regexec 返回 %d,输入为:%s"
2336 #: builtin/apply.c:912
2338 msgid "unable to find filename in patch at line %d"
2339 msgstr "不能在补丁的第 %d 行找到文件名"
2341 #: builtin/apply.c:944
2343 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
2344 msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
2346 #: builtin/apply.c:948
2348 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
2349 msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
2351 #: builtin/apply.c:949
2353 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
2354 msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
2356 #: builtin/apply.c:956
2358 msgid "git apply: bad git-diff - expected /dev/null on line %d"
2359 msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
2361 #: builtin/apply.c:1419
2363 msgid "recount: unexpected line: %.*s"
2364 msgstr "recount:意外的行:%.*s"
2366 #: builtin/apply.c:1476
2368 msgid "patch fragment without header at line %d: %.*s"
2369 msgstr "第 %d 行的补丁片段没有头信息:%.*s"
2371 #: builtin/apply.c:1493
2374 "git diff header lacks filename information when removing %d leading pathname "
2375 "component (line %d)"
2377 "git diff header lacks filename information when removing %d leading pathname "
2378 "components (line %d)"
2379 msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
2380 msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
2382 #: builtin/apply.c:1659
2383 msgid "new file depends on old contents"
2386 #: builtin/apply.c:1661
2387 msgid "deleted file still has contents"
2390 #: builtin/apply.c:1687
2392 msgid "corrupt patch at line %d"
2393 msgstr "补丁在第 %d 行损坏"
2395 #: builtin/apply.c:1723
2397 msgid "new file %s depends on old contents"
2398 msgstr "新文件 %s 依赖旧内容"
2400 #: builtin/apply.c:1725
2402 msgid "deleted file %s still has contents"
2403 msgstr "删除的文件 %s 仍有内容"
2405 #: builtin/apply.c:1728
2407 msgid "** warning: file %s becomes empty but is not deleted"
2408 msgstr "** 警告:文件 %s 成为空文件但并未删除"
2410 #: builtin/apply.c:1874
2412 msgid "corrupt binary patch at line %d: %.*s"
2413 msgstr "二进制补丁在第 %d 行损坏:%.*s"
2415 #: builtin/apply.c:1903
2417 msgid "unrecognized binary patch at line %d"
2418 msgstr "未能识别的二进制补丁位于第 %d 行"
2420 #: builtin/apply.c:2054
2422 msgid "patch with only garbage at line %d"
2423 msgstr "补丁文件的第 %d 行只有垃圾数据"
2425 #: builtin/apply.c:2144
2427 msgid "unable to read symlink %s"
2428 msgstr "无法读取符号链接 %s"
2430 #: builtin/apply.c:2148
2432 msgid "unable to open or read %s"
2435 #: builtin/apply.c:2781
2437 msgid "invalid start of line: '%c'"
2438 msgstr "无效的行首字符:'%c'"
2440 #: builtin/apply.c:2900
2442 msgid "Hunk #%d succeeded at %d (offset %d line)."
2443 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
2444 msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
2445 msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
2447 #: builtin/apply.c:2912
2449 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
2450 msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
2452 #: builtin/apply.c:2918
2455 "while searching for:\n"
2461 #: builtin/apply.c:2938
2463 msgid "missing binary patch data for '%s'"
2464 msgstr "缺失 '%s' 的二进制补丁数据"
2466 #: builtin/apply.c:3039
2468 msgid "binary patch does not apply to '%s'"
2469 msgstr "二进制补丁未应用到 '%s'"
2471 #: builtin/apply.c:3045
2473 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
2474 msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
2476 #: builtin/apply.c:3066
2478 msgid "patch failed: %s:%ld"
2479 msgstr "打补丁失败:%s:%ld"
2481 #: builtin/apply.c:3190
2483 msgid "cannot checkout %s"
2486 #: builtin/apply.c:3235 builtin/apply.c:3246 builtin/apply.c:3291
2488 msgid "read of %s failed"
2491 #: builtin/apply.c:3243
2493 msgid "reading from '%s' beyond a symbolic link"
2494 msgstr "读取位于符号链接中的 '%s'"
2496 #: builtin/apply.c:3271 builtin/apply.c:3493
2498 msgid "path %s has been renamed/deleted"
2499 msgstr "路径 %s 已经被重命名/删除"
2501 #: builtin/apply.c:3352 builtin/apply.c:3507
2503 msgid "%s: does not exist in index"
2506 #: builtin/apply.c:3356 builtin/apply.c:3499 builtin/apply.c:3521
2511 #: builtin/apply.c:3361 builtin/apply.c:3515
2513 msgid "%s: does not match index"
2516 #: builtin/apply.c:3463
2517 msgid "removal patch leaves file contents"
2518 msgstr "移除补丁仍留下了文件内容"
2520 #: builtin/apply.c:3532
2522 msgid "%s: wrong type"
2525 #: builtin/apply.c:3534
2527 msgid "%s has type %o, expected %o"
2528 msgstr "%s 的类型是 %o,应为 %o"
2530 #: builtin/apply.c:3693 builtin/apply.c:3695
2532 msgid "invalid path '%s'"
2535 #: builtin/apply.c:3750
2537 msgid "%s: already exists in index"
2538 msgstr "%s:已经存在于索引中"
2540 #: builtin/apply.c:3753
2542 msgid "%s: already exists in working directory"
2543 msgstr "%s:已经存在于工作区中"
2545 #: builtin/apply.c:3773
2547 msgid "new mode (%o) of %s does not match old mode (%o)"
2548 msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
2550 #: builtin/apply.c:3778
2552 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
2553 msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
2555 #: builtin/apply.c:3798
2557 msgid "affected file '%s' is beyond a symbolic link"
2558 msgstr "受影响的文件 '%s' 位于符号链接中"
2560 #: builtin/apply.c:3802
2562 msgid "%s: patch does not apply"
2565 #: builtin/apply.c:3816
2567 msgid "Checking patch %s..."
2570 #: builtin/apply.c:3909 builtin/checkout.c:233 builtin/reset.c:135
2572 msgid "make_cache_entry failed for path '%s'"
2573 msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
2575 #: builtin/apply.c:4052
2577 msgid "unable to remove %s from index"
2578 msgstr "不能从索引中移除 %s"
2580 #: builtin/apply.c:4081
2582 msgid "corrupt patch for submodule %s"
2583 msgstr "子模组 %s 损坏的补丁"
2585 #: builtin/apply.c:4085
2587 msgid "unable to stat newly created file '%s'"
2588 msgstr "不能枚举新建文件 '%s' 的状态"
2590 #: builtin/apply.c:4090
2592 msgid "unable to create backing store for newly created file %s"
2593 msgstr "不能为新建文件 %s 创建后端存储"
2595 #: builtin/apply.c:4093 builtin/apply.c:4201
2597 msgid "unable to add cache entry for %s"
2598 msgstr "无法为 %s 添加缓存条目"
2600 #: builtin/apply.c:4126
2602 msgid "closing file '%s'"
2605 #: builtin/apply.c:4175
2607 msgid "unable to write file '%s' mode %o"
2608 msgstr "不能写文件 '%s' 权限 %o"
2610 #: builtin/apply.c:4262
2612 msgid "Applied patch %s cleanly."
2615 #: builtin/apply.c:4270
2616 msgid "internal error"
2619 #: builtin/apply.c:4273
2621 msgid "Applying patch %%s with %d reject..."
2622 msgid_plural "Applying patch %%s with %d rejects..."
2623 msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
2624 msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
2626 #: builtin/apply.c:4283
2628 msgid "truncating .rej filename to %.*s.rej"
2629 msgstr "截短 .rej 文件名为 %.*s.rej"
2631 #: builtin/apply.c:4304
2633 msgid "Hunk #%d applied cleanly."
2634 msgstr "第 #%d 个片段成功应用。"
2636 #: builtin/apply.c:4307
2638 msgid "Rejected hunk #%d."
2639 msgstr "拒绝第 #%d 个片段。"
2641 #: builtin/apply.c:4397
2642 msgid "unrecognized input"
2645 #: builtin/apply.c:4408
2646 msgid "unable to read index file"
2649 #: builtin/apply.c:4525 builtin/apply.c:4528 builtin/clone.c:85
2650 #: builtin/fetch.c:92
2654 #: builtin/apply.c:4526
2655 msgid "don't apply changes matching the given path"
2656 msgstr "不要应用与给出路径向匹配的变更"
2658 #: builtin/apply.c:4529
2659 msgid "apply changes matching the given path"
2660 msgstr "应用与给出路径向匹配的变更"
2662 #: builtin/apply.c:4531
2666 #: builtin/apply.c:4532
2667 msgid "remove <num> leading slashes from traditional diff paths"
2668 msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
2670 #: builtin/apply.c:4535
2671 msgid "ignore additions made by the patch"
2672 msgstr "忽略补丁中的添加的文件"
2674 #: builtin/apply.c:4537
2675 msgid "instead of applying the patch, output diffstat for the input"
2676 msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
2678 #: builtin/apply.c:4541
2679 msgid "show number of added and deleted lines in decimal notation"
2680 msgstr "以十进制数显示添加和删除的行数"
2682 #: builtin/apply.c:4543
2683 msgid "instead of applying the patch, output a summary for the input"
2684 msgstr "不应用补丁,而是显示输入的概要"
2686 #: builtin/apply.c:4545
2687 msgid "instead of applying the patch, see if the patch is applicable"
2688 msgstr "不应用补丁,而是查看补丁是否可应用"
2690 #: builtin/apply.c:4547
2691 msgid "make sure the patch is applicable to the current index"
2692 msgstr "确认补丁可以应用到当前索引"
2694 #: builtin/apply.c:4549
2695 msgid "apply a patch without touching the working tree"
2696 msgstr "应用补丁而不修改工作区"
2698 #: builtin/apply.c:4551
2699 msgid "accept a patch that touches outside the working area"
2700 msgstr "接受修改工作区之外文件的补丁"
2702 #: builtin/apply.c:4553
2703 msgid "also apply the patch (use with --stat/--summary/--check)"
2704 msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
2706 #: builtin/apply.c:4555
2707 msgid "attempt three-way merge if a patch does not apply"
2708 msgstr "如果一个补丁不能应用则尝试三方合并"
2710 #: builtin/apply.c:4557
2711 msgid "build a temporary index based on embedded index information"
2712 msgstr "创建一个临时索引基于嵌入的索引信息"
2714 #: builtin/apply.c:4559 builtin/checkout-index.c:198 builtin/ls-files.c:412
2715 msgid "paths are separated with NUL character"
2716 msgstr "路径以 NUL 字符分隔"
2718 #: builtin/apply.c:4562
2719 msgid "ensure at least <n> lines of context match"
2720 msgstr "确保至少匹配 <n> 行上下文"
2722 #: builtin/apply.c:4563
2726 #: builtin/apply.c:4564
2727 msgid "detect new or modified lines that have whitespace errors"
2728 msgstr "检查新增和修改的行中间的空白字符滥用"
2730 #: builtin/apply.c:4567 builtin/apply.c:4570
2731 msgid "ignore changes in whitespace when finding context"
2732 msgstr "查找上下文时忽略空白字符的变更"
2734 #: builtin/apply.c:4573
2735 msgid "apply the patch in reverse"
2738 #: builtin/apply.c:4575
2739 msgid "don't expect at least one line of context"
2742 #: builtin/apply.c:4577
2743 msgid "leave the rejected hunks in corresponding *.rej files"
2744 msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
2746 #: builtin/apply.c:4579
2747 msgid "allow overlapping hunks"
2750 #: builtin/apply.c:4582
2751 msgid "tolerate incorrectly detected missing new-line at the end of file"
2752 msgstr "允许不正确的文件末尾换行符"
2754 #: builtin/apply.c:4585
2755 msgid "do not trust the line counts in the hunk headers"
2756 msgstr "不信任补丁片段的头信息中的行号"
2758 #: builtin/apply.c:4587
2762 #: builtin/apply.c:4588
2763 msgid "prepend <root> to all filenames"
2764 msgstr "为所有文件名前添加 <根目录>"
2766 #: builtin/apply.c:4610
2767 msgid "--3way outside a repository"
2768 msgstr "--3way 在一个仓库之外"
2770 #: builtin/apply.c:4618
2771 msgid "--index outside a repository"
2772 msgstr "--index 在一个仓库之外"
2774 #: builtin/apply.c:4621
2775 msgid "--cached outside a repository"
2776 msgstr "--cached 在一个仓库之外"
2778 #: builtin/apply.c:4640
2780 msgid "can't open patch '%s'"
2781 msgstr "不能打开补丁 '%s'"
2783 #: builtin/apply.c:4654
2785 msgid "squelched %d whitespace error"
2786 msgid_plural "squelched %d whitespace errors"
2787 msgstr[0] "抑制下仍有 %d 个空白字符误用"
2788 msgstr[1] "抑制下仍有 %d 个空白字符误用"
2790 #: builtin/apply.c:4660 builtin/apply.c:4670
2792 msgid "%d line adds whitespace errors."
2793 msgid_plural "%d lines add whitespace errors."
2794 msgstr[0] "%d 行有空白字符误用。"
2795 msgstr[1] "%d 行有空白字符误用。"
2797 #: builtin/archive.c:17
2799 msgid "could not create archive file '%s'"
2800 msgstr "不能创建归档文件 '%s'"
2802 #: builtin/archive.c:20
2803 msgid "could not redirect output"
2806 #: builtin/archive.c:37
2807 msgid "git archive: Remote with no URL"
2808 msgstr "git archive:未提供远程URL"
2810 #: builtin/archive.c:58
2811 msgid "git archive: expected ACK/NAK, got EOF"
2812 msgstr "git archive:应为ACK/NACK,却得到EOF"
2814 #: builtin/archive.c:61
2816 msgid "git archive: NACK %s"
2817 msgstr "git archive:NACK %s"
2819 #: builtin/archive.c:63
2821 msgid "remote error: %s"
2824 #: builtin/archive.c:64
2825 msgid "git archive: protocol error"
2826 msgstr "git archive:协议错误"
2828 #: builtin/archive.c:68
2829 msgid "git archive: expected a flush"
2830 msgstr "git archive:应为刷新"
2832 #: builtin/bisect--helper.c:7
2833 msgid "git bisect--helper --next-all [--no-checkout]"
2834 msgstr "git bisect--helper --next-all [--no-checkout]"
2836 #: builtin/bisect--helper.c:17
2837 msgid "perform 'git bisect next'"
2838 msgstr "执行 'git bisect next'"
2840 #: builtin/bisect--helper.c:19
2841 msgid "update BISECT_HEAD instead of checking out the current commit"
2842 msgstr "更新 BISECT_HEAD 而非检出当前提交"
2844 #: builtin/blame.c:31
2845 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
2846 msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
2848 #: builtin/blame.c:36
2849 msgid "<rev-opts> are documented in git-rev-list(1)"
2850 msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
2852 #: builtin/blame.c:2500
2853 msgid "Show blame entries as we find them, incrementally"
2854 msgstr "增量式地显示发现的 blame 条目"
2856 #: builtin/blame.c:2501
2857 msgid "Show blank SHA-1 for boundary commits (Default: off)"
2858 msgstr "边界提交显示空的 SHA-1(默认:关闭)"
2860 #: builtin/blame.c:2502
2861 msgid "Do not treat root commits as boundaries (Default: off)"
2862 msgstr "不把根提交作为边界(默认:关闭)"
2864 #: builtin/blame.c:2503
2865 msgid "Show work cost statistics"
2868 #: builtin/blame.c:2504
2869 msgid "Show output score for blame entries"
2870 msgstr "显示判断 blame 条目位移的得分诊断信息"
2872 #: builtin/blame.c:2505
2873 msgid "Show original filename (Default: auto)"
2874 msgstr "显示原始文件名(默认:自动)"
2876 #: builtin/blame.c:2506
2877 msgid "Show original linenumber (Default: off)"
2878 msgstr "显示原始的行号(默认:关闭)"
2880 #: builtin/blame.c:2507
2881 msgid "Show in a format designed for machine consumption"
2882 msgstr "显示为一个适合机器读取的格式"
2884 #: builtin/blame.c:2508
2885 msgid "Show porcelain format with per-line commit information"
2886 msgstr "为每一行显示机器适用的提交信息"
2888 #: builtin/blame.c:2509
2889 msgid "Use the same output mode as git-annotate (Default: off)"
2890 msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
2892 #: builtin/blame.c:2510
2893 msgid "Show raw timestamp (Default: off)"
2894 msgstr "显示原始时间戳(默认:关闭)"
2896 #: builtin/blame.c:2511
2897 msgid "Show long commit SHA1 (Default: off)"
2898 msgstr "显示长的SHA1提交号(默认:关闭)"
2900 #: builtin/blame.c:2512
2901 msgid "Suppress author name and timestamp (Default: off)"
2902 msgstr "隐藏作者名字和时间戳(默认:关闭)"
2904 #: builtin/blame.c:2513
2905 msgid "Show author email instead of name (Default: off)"
2906 msgstr "显示作者的邮箱而不是名字(默认:关闭)"
2908 #: builtin/blame.c:2514
2909 msgid "Ignore whitespace differences"
2912 #: builtin/blame.c:2515
2913 msgid "Spend extra cycles to find better match"
2914 msgstr "花费额外的循环来找到更好的匹配"
2916 #: builtin/blame.c:2516
2917 msgid "Use revisions from <file> instead of calling git-rev-list"
2918 msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
2920 #: builtin/blame.c:2517
2921 msgid "Use <file>'s contents as the final image"
2922 msgstr "使用 <文件> 的内容作为最终的图片"
2924 #: builtin/blame.c:2518 builtin/blame.c:2519
2928 #: builtin/blame.c:2518
2929 msgid "Find line copies within and across files"
2930 msgstr "找到文件内及跨文件的行拷贝"
2932 #: builtin/blame.c:2519
2933 msgid "Find line movements within and across files"
2934 msgstr "找到文件内及跨文件的行移动"
2936 #: builtin/blame.c:2520
2940 #: builtin/blame.c:2520
2941 msgid "Process only line range n,m, counting from 1"
2942 msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
2944 #. TRANSLATORS: This string is used to tell us the maximum
2945 #. display width for a relative timestamp in "git blame"
2946 #. output. For C locale, "4 years, 11 months ago", which
2947 #. takes 22 places, is the longest among various forms of
2948 #. relative timestamps, but your language may need more or
2949 #. fewer display columns.
2950 #: builtin/blame.c:2601
2951 msgid "4 years, 11 months ago"
2954 #: builtin/branch.c:24
2955 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
2956 msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
2958 #: builtin/branch.c:25
2959 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
2960 msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
2962 #: builtin/branch.c:26
2963 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
2964 msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
2966 #: builtin/branch.c:27
2967 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
2968 msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
2970 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
2971 #: builtin/branch.c:150
2974 "deleting branch '%s' that has been merged to\n"
2975 " '%s', but not yet merged to HEAD."
2977 "将要删除的分支 '%s' 已经被合并到\n"
2980 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
2981 #: builtin/branch.c:154
2984 "not deleting branch '%s' that is not yet merged to\n"
2985 " '%s', even though it is merged to HEAD."
2987 "并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
2988 " 然而却尚未被合并到分支 '%s' 。"
2990 #: builtin/branch.c:168
2992 msgid "Couldn't look up commit object for '%s'"
2993 msgstr "无法查询 '%s' 指向的提交对象"
2995 #: builtin/branch.c:172
2998 "The branch '%s' is not fully merged.\n"
2999 "If you are sure you want to delete it, run 'git branch -D %s'."
3002 "如果您确认要删除它,执行 'git branch -D %s'。"
3004 #: builtin/branch.c:185
3005 msgid "Update of config-file failed"
3006 msgstr "无法更新 config 文件"
3008 #: builtin/branch.c:213
3009 msgid "cannot use -a with -d"
3010 msgstr "不能将 -a 和 -d 同时使用"
3012 #: builtin/branch.c:219
3013 msgid "Couldn't look up commit object for HEAD"
3014 msgstr "无法查询 HEAD 指向的提交对象"
3016 #: builtin/branch.c:227
3018 msgid "Cannot delete the branch '%s' which you are currently on."
3019 msgstr "无法删除您当前所在的分支 '%s'。"
3021 #: builtin/branch.c:243
3023 msgid "remote-tracking branch '%s' not found."
3024 msgstr "未能找到远程跟踪分支 '%s'。"
3026 #: builtin/branch.c:244
3028 msgid "branch '%s' not found."
3029 msgstr "分支 '%s' 未发现。"
3031 #: builtin/branch.c:258
3033 msgid "Error deleting remote-tracking branch '%s'"
3034 msgstr "无法删除远程跟踪分支 '%s'"
3036 #: builtin/branch.c:259
3038 msgid "Error deleting branch '%s'"
3039 msgstr "无法删除分支 '%s'"
3041 #: builtin/branch.c:266
3043 msgid "Deleted remote-tracking branch %s (was %s).\n"
3044 msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n"
3046 #: builtin/branch.c:267
3048 msgid "Deleted branch %s (was %s).\n"
3049 msgstr "已删除分支 %s(曾为 %s)。\n"
3051 #: builtin/branch.c:368
3053 msgid "branch '%s' does not point at a commit"
3054 msgstr "分支 '%s' 未指向一个提交"
3056 #: builtin/branch.c:451
3061 #: builtin/branch.c:456
3066 #: builtin/branch.c:461
3068 msgid "[%s: behind %d]"
3071 #: builtin/branch.c:463
3076 #: builtin/branch.c:467
3078 msgid "[%s: ahead %d]"
3081 #: builtin/branch.c:469
3086 #: builtin/branch.c:472
3088 msgid "[%s: ahead %d, behind %d]"
3089 msgstr "[%s:领先 %d,落后 %d]"
3091 #: builtin/branch.c:475
3093 msgid "[ahead %d, behind %d]"
3094 msgstr "[领先 %d,落后 %d]"
3096 #: builtin/branch.c:488
3097 msgid " **** invalid ref ****"
3098 msgstr " **** 无效引用 ****"
3100 #: builtin/branch.c:579
3102 msgid "(no branch, rebasing %s)"
3103 msgstr "(非分支,正变基 %s)"
3105 #: builtin/branch.c:582
3107 msgid "(no branch, bisect started on %s)"
3108 msgstr "(非分支,二分查找开始于 %s)"
3110 #: builtin/branch.c:588
3112 msgid "(HEAD detached at %s)"
3113 msgstr "(头指针分离于 %s)"
3115 #: builtin/branch.c:591
3117 msgid "(HEAD detached from %s)"
3118 msgstr "(头指针分离自 %s)"
3120 #: builtin/branch.c:595
3124 #: builtin/branch.c:642
3126 msgid "object '%s' does not point to a commit"
3127 msgstr "对象 '%s' 没有指向一个提交"
3129 #: builtin/branch.c:690
3130 msgid "some refs could not be read"
3133 #: builtin/branch.c:703
3134 msgid "cannot rename the current branch while not on any."
3135 msgstr "无法重命名当前分支因为不处于任何分支上。"
3137 #: builtin/branch.c:713
3139 msgid "Invalid branch name: '%s'"
3140 msgstr "无效的分支名:'%s'"
3142 #: builtin/branch.c:728
3143 msgid "Branch rename failed"
3146 #: builtin/branch.c:732
3148 msgid "Renamed a misnamed branch '%s' away"
3149 msgstr "重命名掉一个错误命名的旧分支 '%s'"
3151 #: builtin/branch.c:736
3153 msgid "Branch renamed to %s, but HEAD is not updated!"
3154 msgstr "分支重命名为 %s,但 HEAD 没有更新!"
3156 #: builtin/branch.c:743
3157 msgid "Branch is renamed, but update of config-file failed"
3158 msgstr "分支被重命名,但更新 config 文件失败"
3160 #: builtin/branch.c:758
3162 msgid "malformed object name %s"
3165 #: builtin/branch.c:780
3167 msgid "could not write branch description template: %s"
3168 msgstr "不能写分支描述模版:%s"
3170 #: builtin/branch.c:810
3171 msgid "Generic options"
3174 #: builtin/branch.c:812
3175 msgid "show hash and subject, give twice for upstream branch"
3176 msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
3178 #: builtin/branch.c:813
3179 msgid "suppress informational messages"
3182 #: builtin/branch.c:814
3183 msgid "set up tracking mode (see git-pull(1))"
3184 msgstr "设置跟踪模式(参见 git-pull(1))"
3186 #: builtin/branch.c:816
3187 msgid "change upstream info"
3190 #: builtin/branch.c:820
3191 msgid "use colored output"
3194 #: builtin/branch.c:821
3195 msgid "act on remote-tracking branches"
3198 #: builtin/branch.c:824 builtin/branch.c:830 builtin/branch.c:851
3199 #: builtin/branch.c:857 builtin/commit.c:1581 builtin/commit.c:1582
3200 #: builtin/commit.c:1583 builtin/commit.c:1584 builtin/tag.c:616
3201 #: builtin/tag.c:622
3205 #: builtin/branch.c:825 builtin/branch.c:831
3206 msgid "print only branches that contain the commit"
3207 msgstr "只打印包含该提交的分支"
3209 #: builtin/branch.c:837
3210 msgid "Specific git-branch actions:"
3211 msgstr "具体的 git-branch 动作:"
3213 #: builtin/branch.c:838
3214 msgid "list both remote-tracking and local branches"
3215 msgstr "列出远程跟踪及本地分支"
3217 #: builtin/branch.c:840
3218 msgid "delete fully merged branch"
3221 #: builtin/branch.c:841
3222 msgid "delete branch (even if not merged)"
3223 msgstr "删除分支(即使没有合并)"
3225 #: builtin/branch.c:842
3226 msgid "move/rename a branch and its reflog"
3227 msgstr "移动/重命名一个分支,以及它的引用日志"
3229 #: builtin/branch.c:843
3230 msgid "move/rename a branch, even if target exists"
3231 msgstr "移动/重命名一个分支,即使目标已存在"
3233 #: builtin/branch.c:844
3234 msgid "list branch names"
3237 #: builtin/branch.c:845
3238 msgid "create the branch's reflog"
3241 #: builtin/branch.c:847
3242 msgid "edit the description for the branch"
3245 #: builtin/branch.c:848
3246 msgid "force creation, move/rename, deletion"
3247 msgstr "强制创建、移动/重命名、删除"
3249 #: builtin/branch.c:851
3250 msgid "print only not merged branches"
3253 #: builtin/branch.c:857
3254 msgid "print only merged branches"
3257 #: builtin/branch.c:861
3258 msgid "list branches in columns"
3261 #: builtin/branch.c:874
3262 msgid "Failed to resolve HEAD as a valid ref."
3263 msgstr "无法将 HEAD 解析为有效引用。"
3265 #: builtin/branch.c:878 builtin/clone.c:622
3266 msgid "HEAD not found below refs/heads!"
3267 msgstr "HEAD 没有位于 /refs/heads 之下!"
3269 #: builtin/branch.c:900
3270 msgid "--column and --verbose are incompatible"
3271 msgstr "--column 和 --verbose 不兼容"
3273 #: builtin/branch.c:911 builtin/branch.c:950
3274 msgid "branch name required"
3277 #: builtin/branch.c:926
3278 msgid "Cannot give description to detached HEAD"
3279 msgstr "不能向分离头指针提供描述"
3281 #: builtin/branch.c:931
3282 msgid "cannot edit description of more than one branch"
3283 msgstr "不能为一个以上的分支编辑描述"
3285 #: builtin/branch.c:938
3287 msgid "No commit on branch '%s' yet."
3288 msgstr "分支 '%s' 尚无提交。"
3290 #: builtin/branch.c:941
3292 msgid "No branch named '%s'."
3295 #: builtin/branch.c:956
3296 msgid "too many branches for a rename operation"
3297 msgstr "为重命名操作提供了太多的分支名"
3299 #: builtin/branch.c:961
3300 msgid "too many branches to set new upstream"
3301 msgstr "为设置新上游提供了太多的分支名"
3303 #: builtin/branch.c:965
3306 "could not set upstream of HEAD to %s when it does not point to any branch."
3307 msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
3309 #: builtin/branch.c:968 builtin/branch.c:990 builtin/branch.c:1011
3311 msgid "no such branch '%s'"
3314 #: builtin/branch.c:972
3316 msgid "branch '%s' does not exist"
3317 msgstr "分支 '%s' 不存在"
3319 #: builtin/branch.c:984
3320 msgid "too many branches to unset upstream"
3321 msgstr "为取消上游设置操作提供了太多的分支名"
3323 #: builtin/branch.c:988
3324 msgid "could not unset upstream of HEAD when it does not point to any branch."
3325 msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
3327 #: builtin/branch.c:994
3329 msgid "Branch '%s' has no upstream information"
3330 msgstr "分支 '%s' 没有上游信息"
3332 #: builtin/branch.c:1008
3333 msgid "it does not make sense to create 'HEAD' manually"
3334 msgstr "手工创建 'HEAD' 没有意义"
3336 #: builtin/branch.c:1014
3337 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
3338 msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
3340 #: builtin/branch.c:1017
3343 "The --set-upstream flag is deprecated and will be removed. Consider using --"
3344 "track or --set-upstream-to\n"
3346 "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
3348 #: builtin/branch.c:1034
3352 "If you wanted to make '%s' track '%s', do this:\n"
3356 "如果你想用 '%s' 跟踪 '%s', 这么做:\n"
3359 #: builtin/branch.c:1035
3361 msgid " git branch -d %s\n"
3362 msgstr " git branch -d %s\n"
3364 #: builtin/branch.c:1036
3366 msgid " git branch --set-upstream-to %s\n"
3367 msgstr " git branch --set-upstream-to %s\n"
3369 #: builtin/bundle.c:51
3371 msgid "%s is okay\n"
3374 #: builtin/bundle.c:64
3375 msgid "Need a repository to create a bundle."
3376 msgstr "需要一个仓库来创建包。"
3378 #: builtin/bundle.c:68
3379 msgid "Need a repository to unbundle."
3382 #: builtin/cat-file.c:369
3384 "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
3385 "<type>|--textconv) <object>"
3387 "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|<类型"
3388 ">|--textconv) <对象>"
3390 #: builtin/cat-file.c:370
3392 "git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-"
3395 "git cat-file (--batch | --batch-check) [--follow-symlinks] < <对象列表>"
3397 #: builtin/cat-file.c:407
3398 msgid "<type> can be one of: blob, tree, commit, tag"
3399 msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
3401 #: builtin/cat-file.c:408
3402 msgid "show object type"
3405 #: builtin/cat-file.c:409
3406 msgid "show object size"
3409 #: builtin/cat-file.c:411
3410 msgid "exit with zero when there's no error"
3411 msgstr "当没有错误时退出并返回零"
3413 #: builtin/cat-file.c:412
3414 msgid "pretty-print object's content"
3417 #: builtin/cat-file.c:414
3418 msgid "for blob objects, run textconv on object's content"
3419 msgstr "对于数据对象,对其内容执行 textconv"
3421 #: builtin/cat-file.c:416
3422 msgid "allow -s and -t to work with broken/corrupt objects"
3423 msgstr "允许 -s 和 -t 对损坏的对象生效"
3425 #: builtin/cat-file.c:418
3426 msgid "show info and content of objects fed from the standard input"
3427 msgstr "显示从标准输入提供的对象的信息和内容"
3429 #: builtin/cat-file.c:421
3430 msgid "show info about objects fed from the standard input"
3431 msgstr "显示从标准输入提供的对象的信息"
3433 #: builtin/cat-file.c:424
3434 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
3435 msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)"
3437 #: builtin/check-attr.c:11
3438 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
3439 msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
3441 #: builtin/check-attr.c:12
3442 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>"
3443 msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...] < <路径列表>"
3445 #: builtin/check-attr.c:19
3446 msgid "report all attributes set on file"
3447 msgstr "报告设置在文件上的所有属性"
3449 #: builtin/check-attr.c:20
3450 msgid "use .gitattributes only from the index"
3451 msgstr "只使用索引中的 .gitattributes"
3453 #: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:96
3454 msgid "read file names from stdin"
3457 #: builtin/check-attr.c:23 builtin/check-ignore.c:24
3458 msgid "terminate input and output records by a NUL character"
3459 msgstr "输入和输出的记录使用 NUL 字符终结"
3461 #: builtin/check-ignore.c:18 builtin/checkout.c:1202 builtin/gc.c:279
3462 msgid "suppress progress reporting"
3465 #: builtin/check-ignore.c:26
3466 msgid "show non-matching input paths"
3469 #: builtin/check-ignore.c:28
3470 msgid "ignore index when checking"
3473 #: builtin/check-ignore.c:154
3474 msgid "cannot specify pathnames with --stdin"
3475 msgstr "不能同时提供路径及 --stdin 参数"
3477 #: builtin/check-ignore.c:157
3478 msgid "-z only makes sense with --stdin"
3479 msgstr "-z 需要和 --stdin 参数共用才有意义"
3481 #: builtin/check-ignore.c:159
3482 msgid "no path specified"
3485 #: builtin/check-ignore.c:163
3486 msgid "--quiet is only valid with a single pathname"
3487 msgstr "参数 --quiet 只在提供一个路径名时有效"
3489 #: builtin/check-ignore.c:165
3490 msgid "cannot have both --quiet and --verbose"
3491 msgstr "不能同时提供 --quiet 和 --verbose 参数"
3493 #: builtin/check-ignore.c:168
3494 msgid "--non-matching is only valid with --verbose"
3495 msgstr "--non-matching 选项只在使用 --verbose 时有效"
3497 #: builtin/check-mailmap.c:8
3498 msgid "git check-mailmap [<options>] <contact>..."
3499 msgstr "git check-mailmap [<选项>] <联系地址>..."
3501 #: builtin/check-mailmap.c:13
3502 msgid "also read contacts from stdin"
3503 msgstr "还从标准输入读取联系地址"
3505 #: builtin/check-mailmap.c:24
3507 msgid "unable to parse contact: %s"
3508 msgstr "不能解析联系地址:%s"
3510 #: builtin/check-mailmap.c:47
3511 msgid "no contacts specified"
3514 #: builtin/checkout-index.c:126
3515 msgid "git checkout-index [<options>] [--] [<file>...]"
3516 msgstr "git checkout-index [<选项>] [--] [<文件>...]"
3518 #: builtin/checkout-index.c:188
3519 msgid "check out all files in the index"
3522 #: builtin/checkout-index.c:189
3523 msgid "force overwrite of existing files"
3526 #: builtin/checkout-index.c:191
3527 msgid "no warning for existing files and files not in index"
3528 msgstr "存在或不在索引中的文件都没有警告"
3530 #: builtin/checkout-index.c:193
3531 msgid "don't checkout new files"
3534 #: builtin/checkout-index.c:195
3535 msgid "update stat information in the index file"
3536 msgstr "更新索引中文件的状态信息"
3538 #: builtin/checkout-index.c:201
3539 msgid "read list of paths from the standard input"
3540 msgstr "从标准输入读取路径列表"
3542 #: builtin/checkout-index.c:203
3543 msgid "write the content to temporary files"
3546 #: builtin/checkout-index.c:204 builtin/column.c:30
3550 #: builtin/checkout-index.c:205
3551 msgid "when creating files, prepend <string>"
3552 msgstr "在创建文件时,在前面加上<字符串>"
3554 #: builtin/checkout-index.c:208
3555 msgid "copy out the files from named stage"
3556 msgstr "从指定暂存区中拷出文件"
3558 #: builtin/checkout.c:24
3559 msgid "git checkout [<options>] <branch>"
3560 msgstr "git checkout [<选项>] <分支>"
3562 #: builtin/checkout.c:25
3563 msgid "git checkout [<options>] [<branch>] -- <file>..."
3564 msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
3566 #: builtin/checkout.c:134 builtin/checkout.c:167
3568 msgid "path '%s' does not have our version"
3569 msgstr "路径 '%s' 没有我们的版本"
3571 #: builtin/checkout.c:136 builtin/checkout.c:169
3573 msgid "path '%s' does not have their version"
3574 msgstr "路径 '%s' 没有他们的版本"
3576 #: builtin/checkout.c:152
3578 msgid "path '%s' does not have all necessary versions"
3579 msgstr "路径 '%s' 没有全部必须的版本"
3581 #: builtin/checkout.c:196
3583 msgid "path '%s' does not have necessary versions"
3584 msgstr "路径 '%s' 没有必须的版本"
3586 #: builtin/checkout.c:213
3588 msgid "path '%s': cannot merge"
3589 msgstr "path '%s':无法合并"
3591 #: builtin/checkout.c:230
3593 msgid "Unable to add merge result for '%s'"
3594 msgstr "无法为 '%s' 添加合并结果"
3596 #: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
3597 #: builtin/checkout.c:260
3599 msgid "'%s' cannot be used with updating paths"
3600 msgstr "'%s' 不能在更新路径时使用"
3602 #: builtin/checkout.c:263 builtin/checkout.c:266
3604 msgid "'%s' cannot be used with %s"
3605 msgstr "'%s' 不能和 %s 同时使用"
3607 #: builtin/checkout.c:269
3609 msgid "Cannot update paths and switch to branch '%s' at the same time."
3610 msgstr "不能同时更新路径并切换到分支'%s'。"
3612 #: builtin/checkout.c:280 builtin/checkout.c:474
3613 msgid "corrupt index file"
3616 #: builtin/checkout.c:340 builtin/checkout.c:347
3618 msgid "path '%s' is unmerged"
3619 msgstr "路径 '%s' 未合并"
3621 #: builtin/checkout.c:496
3622 msgid "you need to resolve your current index first"
3623 msgstr "您需要先解决当前索引的冲突"
3625 #: builtin/checkout.c:627
3627 msgid "Can not do reflog for '%s'\n"
3628 msgstr "不能对 '%s' 执行 reflog 操作\n"
3630 #: builtin/checkout.c:663
3631 msgid "HEAD is now at"
3634 #: builtin/checkout.c:670
3636 msgid "Reset branch '%s'\n"
3637 msgstr "重置分支 '%s'\n"
3639 #: builtin/checkout.c:673
3641 msgid "Already on '%s'\n"
3642 msgstr "已经位于 '%s'\n"
3644 #: builtin/checkout.c:677
3646 msgid "Switched to and reset branch '%s'\n"
3647 msgstr "切换并重置分支 '%s'\n"
3649 #: builtin/checkout.c:679 builtin/checkout.c:1134
3651 msgid "Switched to a new branch '%s'\n"
3652 msgstr "切换到一个新分支 '%s'\n"
3654 #: builtin/checkout.c:681
3656 msgid "Switched to branch '%s'\n"
3657 msgstr "切换到分支 '%s'\n"
3660 #: builtin/checkout.c:733
3662 msgid " ... and %d more.\n"
3663 msgstr " ... 及其它 %d 个。\n"
3665 #: builtin/checkout.c:739
3668 "Warning: you are leaving %d commit behind, not connected to\n"
3669 "any of your branches:\n"
3673 "Warning: you are leaving %d commits behind, not connected to\n"
3674 "any of your branches:\n"
3678 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
3682 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
3686 #: builtin/checkout.c:758
3689 "If you want to keep it by creating a new branch, this may be a good time\n"
3692 " git branch <new-branch-name> %s\n"
3695 "If you want to keep them by creating a new branch, this may be a good time\n"
3698 " git branch <new-branch-name> %s\n"
3701 "如果您想要通过创建新分支保存它,这可能是一个好时候。\n"
3704 " git branch <新分支名> %s\n"
3707 "如果您想要通过创建新分支保存它们,这可能是一个好时候。\n"
3710 " git branch <新分支名> %s\n"
3713 #: builtin/checkout.c:794
3714 msgid "internal error in revision walk"
3715 msgstr "在版本遍历时遇到内部错误"
3717 #: builtin/checkout.c:798
3718 msgid "Previous HEAD position was"
3719 msgstr "之前的 HEAD 位置是"
3721 #: builtin/checkout.c:825 builtin/checkout.c:1129
3722 msgid "You are on a branch yet to be born"
3723 msgstr "您位于一个尚未初始化的分支"
3725 #: builtin/checkout.c:931
3727 msgid "'%s' is already checked out at '%s'"
3728 msgstr "'%s' 已经检出到 '%s'"
3730 #: builtin/checkout.c:1036
3732 msgid "only one reference expected, %d given."
3733 msgstr "只要一个引用,却给出了 %d 个"
3735 #: builtin/checkout.c:1075
3737 msgid "invalid reference: %s"
3740 #: builtin/checkout.c:1104
3742 msgid "reference is not a tree: %s"
3745 #: builtin/checkout.c:1143
3746 msgid "paths cannot be used with switching branches"
3747 msgstr "路径不能和切换分支同时使用"
3749 #: builtin/checkout.c:1146 builtin/checkout.c:1150
3751 msgid "'%s' cannot be used with switching branches"
3752 msgstr "'%s' 不能和切换分支同时使用"
3754 #: builtin/checkout.c:1154 builtin/checkout.c:1157 builtin/checkout.c:1162
3755 #: builtin/checkout.c:1165
3757 msgid "'%s' cannot be used with '%s'"
3758 msgstr "'%s' 不能和 '%s' 同时使用"
3760 #: builtin/checkout.c:1170
3762 msgid "Cannot switch branch to a non-commit '%s'"
3763 msgstr "不能切换分支到一个非提交 '%s'"
3765 #: builtin/checkout.c:1203 builtin/checkout.c:1205 builtin/clone.c:83
3766 #: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:282
3767 #: builtin/worktree.c:284
3771 #: builtin/checkout.c:1204
3772 msgid "create and checkout a new branch"
3773 msgstr "创建并检出一个新的分支"
3775 #: builtin/checkout.c:1206
3776 msgid "create/reset and checkout a branch"
3777 msgstr "创建/重置并检出一个分支"
3779 #: builtin/checkout.c:1207
3780 msgid "create reflog for new branch"
3781 msgstr "为新的分支创建引用日志"
3783 #: builtin/checkout.c:1208
3784 msgid "detach the HEAD at named commit"
3785 msgstr "成为指向该提交的分离头指针"
3787 #: builtin/checkout.c:1209
3788 msgid "set upstream info for new branch"
3789 msgstr "为新的分支设置上游信息"
3791 #: builtin/checkout.c:1211
3795 #: builtin/checkout.c:1211
3796 msgid "new unparented branch"
3799 #: builtin/checkout.c:1212
3800 msgid "checkout our version for unmerged files"
3801 msgstr "对尚未合并的文件检出我们的版本"
3803 #: builtin/checkout.c:1214
3804 msgid "checkout their version for unmerged files"
3805 msgstr "对尚未合并的文件检出他们的版本"
3807 #: builtin/checkout.c:1216
3808 msgid "force checkout (throw away local modifications)"
3809 msgstr "强制检出(丢弃本地修改)"
3811 #: builtin/checkout.c:1217
3812 msgid "perform a 3-way merge with the new branch"
3813 msgstr "和新的分支执行三方合并"
3815 #: builtin/checkout.c:1218 builtin/merge.c:227
3816 msgid "update ignored files (default)"
3817 msgstr "更新忽略的文件(默认)"
3819 #: builtin/checkout.c:1219 builtin/log.c:1239 parse-options.h:244
3823 #: builtin/checkout.c:1220
3824 msgid "conflict style (merge or diff3)"
3825 msgstr "冲突输出风格(merge 或 diff3)"
3827 #: builtin/checkout.c:1223
3828 msgid "do not limit pathspecs to sparse entries only"
3829 msgstr "对路径不做稀疏检出的限制"
3831 #: builtin/checkout.c:1225
3832 msgid "second guess 'git checkout <no-such-branch>'"
3833 msgstr "二次猜测'git checkout <无此分支>'"
3835 #: builtin/checkout.c:1227
3836 msgid "do not check if another worktree is holding the given ref"
3837 msgstr "不检查指定的引用是否被其他工作区所占用"
3839 #: builtin/checkout.c:1252
3840 msgid "-b, -B and --orphan are mutually exclusive"
3841 msgstr "-b、-B 和 --orphan 是互斥的"
3843 #: builtin/checkout.c:1269
3844 msgid "--track needs a branch name"
3845 msgstr "--track 需要一个分支名"
3847 #: builtin/checkout.c:1274
3848 msgid "Missing branch name; try -b"
3849 msgstr "缺少分支名;尝试 -b"
3851 #: builtin/checkout.c:1310
3852 msgid "invalid path specification"
3855 #: builtin/checkout.c:1317
3858 "Cannot update paths and switch to branch '%s' at the same time.\n"
3859 "Did you intend to checkout '%s' which can not be resolved as commit?"
3861 "不能同时更新路径并切换到分支'%s'。\n"
3862 "您是想要检出 '%s' 但其未能解析为提交么?"
3864 #: builtin/checkout.c:1322
3866 msgid "git checkout: --detach does not take a path argument '%s'"
3867 msgstr "git checkout:--detach 不能接收路径参数 '%s'"
3869 #: builtin/checkout.c:1326
3871 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
3872 "checking out of the index."
3874 "git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
3876 #: builtin/clean.c:26
3878 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
3880 "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
3882 #: builtin/clean.c:30
3884 msgid "Removing %s\n"
3887 #: builtin/clean.c:31
3889 msgid "Would remove %s\n"
3892 #: builtin/clean.c:32
3894 msgid "Skipping repository %s\n"
3897 #: builtin/clean.c:33
3899 msgid "Would skip repository %s\n"
3902 #: builtin/clean.c:34
3904 msgid "failed to remove %s"
3907 #: builtin/clean.c:295
3910 "1 - select a numbered item\n"
3911 "foo - select item based on unique prefix\n"
3912 " - (empty) select nothing"
3916 "foo - 通过标题选择一个选项\n"
3919 #: builtin/clean.c:299
3922 "1 - select a single item\n"
3923 "3-5 - select a range of items\n"
3924 "2-3,6-9 - select multiple ranges\n"
3925 "foo - select item based on unique prefix\n"
3926 "-... - unselect specified items\n"
3927 "* - choose all items\n"
3928 " - (empty) finish selecting"
3932 "3-5 - 选择一个范围内的所有选项\n"
3933 "2-3,6-9 - 选择多个范围内的所有选项\n"
3934 "foo - 通过标题选择一个选项\n"
3939 #: builtin/clean.c:515
3944 #: builtin/clean.c:657
3946 msgid "Input ignore patterns>> "
3947 msgstr "输入模版以排除条目>> "
3949 #: builtin/clean.c:694
3951 msgid "WARNING: Cannot find items matched by: %s"
3952 msgstr "警告:无法找到和 %s 匹配的条目"
3954 #: builtin/clean.c:715
3955 msgid "Select items to delete"
3958 #. TRANSLATORS: Make sure to keep [y/N] as is
3959 #: builtin/clean.c:756
3961 msgid "Remove %s [y/N]? "
3962 msgstr "删除 %s [y/N]?"
3964 #: builtin/clean.c:781
3968 #: builtin/clean.c:789
3970 "clean - start cleaning\n"
3971 "filter by pattern - exclude items from deletion\n"
3972 "select by numbers - select items to be deleted by numbers\n"
3973 "ask each - confirm each deletion (like \"rm -i\")\n"
3974 "quit - stop cleaning\n"
3975 "help - this screen\n"
3976 "? - help for prompt selection"
3979 "filter by pattern - 通过模版排除要删除的条目\n"
3980 "select by numbers - 通过数字选择要删除的条目\n"
3981 "ask each - 针对删除逐一询问(就像 \"rm -i\")\n"
3984 "? - 显示如何在提示符下选择的帮助"
3986 #: builtin/clean.c:816
3987 msgid "*** Commands ***"
3990 #: builtin/clean.c:817
3994 #: builtin/clean.c:825
3995 msgid "Would remove the following item:"
3996 msgid_plural "Would remove the following items:"
3997 msgstr[0] "将删除如下条目:"
3998 msgstr[1] "将删除如下条目:"
4000 #: builtin/clean.c:842
4001 msgid "No more files to clean, exiting."
4002 msgstr "没有要清理的文件,退出。"
4004 #: builtin/clean.c:873
4005 msgid "do not print names of files removed"
4008 #: builtin/clean.c:875
4012 #: builtin/clean.c:876
4013 msgid "interactive cleaning"
4016 #: builtin/clean.c:878
4017 msgid "remove whole directories"
4020 #: builtin/clean.c:879 builtin/describe.c:407 builtin/grep.c:714
4021 #: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:187
4025 #: builtin/clean.c:880
4026 msgid "add <pattern> to ignore rules"
4027 msgstr "添加<模式>到忽略规则"
4029 #: builtin/clean.c:881
4030 msgid "remove ignored files, too"
4033 #: builtin/clean.c:883
4034 msgid "remove only ignored files"
4037 #: builtin/clean.c:901
4038 msgid "-x and -X cannot be used together"
4039 msgstr "-x 和 -X 不能同时使用"
4041 #: builtin/clean.c:905
4043 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
4046 "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
4048 #: builtin/clean.c:908
4050 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
4053 "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
4055 #: builtin/clone.c:37
4056 msgid "git clone [<options>] [--] <repo> [<dir>]"
4057 msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
4059 #: builtin/clone.c:57 builtin/fetch.c:111 builtin/merge.c:224
4060 #: builtin/push.c:523
4061 msgid "force progress reporting"
4064 #: builtin/clone.c:59
4065 msgid "don't create a checkout"
4068 #: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:503
4069 msgid "create a bare repository"
4072 #: builtin/clone.c:64
4073 msgid "create a mirror repository (implies bare)"
4074 msgstr "创建一个镜像仓库(也是纯仓库)"
4076 #: builtin/clone.c:66
4077 msgid "to clone from a local repository"
4080 #: builtin/clone.c:68
4081 msgid "don't use local hardlinks, always copy"
4082 msgstr "不使用本地硬链接,始终复制"
4084 #: builtin/clone.c:70
4085 msgid "setup as shared repository"
4088 #: builtin/clone.c:72 builtin/clone.c:74
4089 msgid "initialize submodules in the clone"
4092 #: builtin/clone.c:75 builtin/init-db.c:500
4093 msgid "template-directory"
4096 #: builtin/clone.c:76 builtin/init-db.c:501
4097 msgid "directory from which templates will be used"
4100 #: builtin/clone.c:78
4101 msgid "reference repository"
4104 #: builtin/clone.c:80
4105 msgid "use --reference only while cloning"
4106 msgstr "仅在克隆时参考 --reference 指向的本地仓库"
4108 #: builtin/clone.c:81 builtin/column.c:26 builtin/merge-file.c:44
4112 #: builtin/clone.c:82
4113 msgid "use <name> instead of 'origin' to track upstream"
4114 msgstr "使用<名称>而不是 'origin' 去跟踪上游"
4116 #: builtin/clone.c:84
4117 msgid "checkout <branch> instead of the remote's HEAD"
4118 msgstr "检出<分支>而不是远程HEAD"
4120 #: builtin/clone.c:86
4121 msgid "path to git-upload-pack on the remote"
4122 msgstr "远程 git-upload-pack 路径"
4124 #: builtin/clone.c:87 builtin/fetch.c:112 builtin/grep.c:659
4128 #: builtin/clone.c:88
4129 msgid "create a shallow clone of that depth"
4130 msgstr "创建一个指定深度的浅克隆"
4132 #: builtin/clone.c:90
4133 msgid "clone only one branch, HEAD or --branch"
4134 msgstr "只克隆一个分支、HEAD 或 --branch"
4136 #: builtin/clone.c:91 builtin/init-db.c:509
4140 #: builtin/clone.c:92 builtin/init-db.c:510
4141 msgid "separate git dir from working tree"
4142 msgstr "git目录和工作区分离"
4144 #: builtin/clone.c:93
4148 #: builtin/clone.c:94
4149 msgid "set config inside the new repository"
4150 msgstr "在新仓库中设置配置信息"
4152 #: builtin/clone.c:240
4154 msgid "reference repository '%s' is not a local repository."
4155 msgstr "参考仓库 '%s' 不是一个本地仓库。"
4157 #: builtin/clone.c:244
4159 msgid "reference repository '%s' is shallow"
4160 msgstr "参考仓库 '%s' 是一个浅克隆"
4162 #: builtin/clone.c:247
4164 msgid "reference repository '%s' is grafted"
4165 msgstr "参考仓库 '%s' 已被嫁接"
4167 #: builtin/clone.c:310
4169 msgid "failed to create directory '%s'"
4170 msgstr "无法创建目录 '%s'"
4172 #: builtin/clone.c:312 builtin/diff.c:84
4174 msgid "failed to stat '%s'"
4175 msgstr "无法枚举 '%s' 状态"
4177 #: builtin/clone.c:314
4179 msgid "%s exists and is not a directory"
4180 msgstr "%s 存在且不是一个目录"
4182 #: builtin/clone.c:328
4184 msgid "failed to stat %s\n"
4185 msgstr "无法枚举 %s 状态\n"
4187 #: builtin/clone.c:350
4189 msgid "failed to create link '%s'"
4190 msgstr "无法创建链接 '%s'"
4192 #: builtin/clone.c:354
4194 msgid "failed to copy file to '%s'"
4195 msgstr "无法拷贝文件至 '%s'"
4197 #: builtin/clone.c:377 builtin/clone.c:551
4202 #: builtin/clone.c:389
4204 "Clone succeeded, but checkout failed.\n"
4205 "You can inspect what was checked out with 'git status'\n"
4206 "and retry the checkout with 'git checkout -f HEAD'\n"
4209 "您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
4210 "'git checkout -f HEAD' 重试\n"
4212 #: builtin/clone.c:466
4214 msgid "Could not find remote branch %s to clone."
4215 msgstr "不能发现要克隆的远程分支 %s。"
4217 #: builtin/clone.c:546
4219 msgid "Checking connectivity... "
4222 #: builtin/clone.c:549
4223 msgid "remote did not send all necessary objects"
4224 msgstr "远程没有发送所有必须的对象"
4226 #: builtin/clone.c:613
4227 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
4228 msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
4230 #: builtin/clone.c:644
4231 msgid "unable to checkout working tree"
4234 #: builtin/clone.c:731
4235 msgid "cannot repack to clean up"
4236 msgstr "无法执行 repack 来清理"
4238 #: builtin/clone.c:733
4239 msgid "cannot unlink temporary alternates file"
4240 msgstr "无法删除临时的 alternates 文件"
4242 #: builtin/clone.c:763
4243 msgid "Too many arguments."
4246 #: builtin/clone.c:767
4247 msgid "You must specify a repository to clone."
4248 msgstr "您必须指定一个仓库来克隆。"
4250 #: builtin/clone.c:778
4252 msgid "--bare and --origin %s options are incompatible."
4253 msgstr "--bare 和 --origin %s 选项不兼容。"
4255 #: builtin/clone.c:781
4256 msgid "--bare and --separate-git-dir are incompatible."
4257 msgstr "--bare 和 --separate-git-dir 选项不兼容。"
4259 #: builtin/clone.c:794
4261 msgid "repository '%s' does not exist"
4262 msgstr "仓库 '%s' 不存在"
4264 #: builtin/clone.c:800 builtin/fetch.c:1160
4266 msgid "depth %s is not a positive number"
4267 msgstr "深度 %s 不是一个正数"
4269 #: builtin/clone.c:810
4271 msgid "destination path '%s' already exists and is not an empty directory."
4272 msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
4274 #: builtin/clone.c:820
4276 msgid "working tree '%s' already exists."
4277 msgstr "工作区 '%s' 已经存在。"
4279 #: builtin/clone.c:835 builtin/clone.c:846 builtin/worktree.c:193
4280 #: builtin/worktree.c:220
4282 msgid "could not create leading directories of '%s'"
4283 msgstr "不能为 '%s' 创建先导目录"
4285 #: builtin/clone.c:838
4287 msgid "could not create work tree dir '%s'"
4288 msgstr "不能创建工作区目录 '%s'"
4290 #: builtin/clone.c:856
4292 msgid "Cloning into bare repository '%s'...\n"
4293 msgstr "克隆到纯仓库 '%s'...\n"
4295 #: builtin/clone.c:858
4297 msgid "Cloning into '%s'...\n"
4298 msgstr "正克隆到 '%s'...\n"
4300 #: builtin/clone.c:883
4301 msgid "--dissociate given, but there is no --reference"
4302 msgstr "提供了参数 --dissociate,但未提供 --reference"
4304 #: builtin/clone.c:900
4305 msgid "--depth is ignored in local clones; use file:// instead."
4306 msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
4308 #: builtin/clone.c:903
4309 msgid "source repository is shallow, ignoring --local"
4310 msgstr "源仓库是浅克隆,忽略 --local"
4312 #: builtin/clone.c:908
4313 msgid "--local is ignored"
4314 msgstr "--local 被忽略"
4316 #: builtin/clone.c:912
4318 msgid "Don't know how to clone %s"
4321 #: builtin/clone.c:961 builtin/clone.c:969
4323 msgid "Remote branch %s not found in upstream %s"
4324 msgstr "远程分支 %s 在上游 %s 未发现"
4326 #: builtin/clone.c:972
4327 msgid "You appear to have cloned an empty repository."
4328 msgstr "您似乎克隆了一个空仓库。"
4330 #: builtin/column.c:9
4331 msgid "git column [<options>]"
4332 msgstr "git column [<选项>]"
4334 #: builtin/column.c:26
4335 msgid "lookup config vars"
4338 #: builtin/column.c:27 builtin/column.c:28
4339 msgid "layout to use"
4342 #: builtin/column.c:29
4343 msgid "Maximum width"
4346 #: builtin/column.c:30
4347 msgid "Padding space on left border"
4350 #: builtin/column.c:31
4351 msgid "Padding space on right border"
4354 #: builtin/column.c:32
4355 msgid "Padding space between columns"
4358 #: builtin/column.c:51
4359 msgid "--command must be the first argument"
4360 msgstr "--command 必须是第一个参数"
4362 #: builtin/commit.c:37
4363 msgid "git commit [<options>] [--] <pathspec>..."
4364 msgstr "git commit [<选项>] [--] <路径规格>..."
4366 #: builtin/commit.c:42
4367 msgid "git status [<options>] [--] <pathspec>..."
4368 msgstr "git status [<选项>] [--] <路径规格>..."
4370 #: builtin/commit.c:47
4372 "Your name and email address were configured automatically based\n"
4373 "on your username and hostname. Please check that they are accurate.\n"
4374 "You can suppress this message by setting them explicitly. Run the\n"
4375 "following command and follow the instructions in your editor to edit\n"
4376 "your configuration file:\n"
4378 " git config --global --edit\n"
4380 "After doing this, you may fix the identity used for this commit with:\n"
4382 " git commit --amend --reset-author\n"
4384 "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
4385 "与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
4388 " git config --global --edit\n"
4390 "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
4392 " git commit --amend --reset-author\n"
4394 #: builtin/commit.c:60
4396 "Your name and email address were configured automatically based\n"
4397 "on your username and hostname. Please check that they are accurate.\n"
4398 "You can suppress this message by setting them explicitly:\n"
4400 " git config --global user.name \"Your Name\"\n"
4401 " git config --global user.email you@example.com\n"
4403 "After doing this, you may fix the identity used for this commit with:\n"
4405 " git commit --amend --reset-author\n"
4407 "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
4408 "与否。您可以对其进行设置以免再出现本提示信息:\n"
4410 " git config --global user.name \"Your Name\"\n"
4411 " git config --global user.email you@example.com\n"
4413 "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
4415 " git commit --amend --reset-author\n"
4417 #: builtin/commit.c:72
4419 "You asked to amend the most recent commit, but doing so would make\n"
4420 "it empty. You can repeat your command with --allow-empty, or you can\n"
4421 "remove the commit entirely with \"git reset HEAD^\".\n"
4423 "您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
4424 "--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
4426 #: builtin/commit.c:77
4428 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
4429 "If you wish to commit it anyway, use:\n"
4431 " git commit --allow-empty\n"
4434 "之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
4437 " git commit --allow-empty\n"
4440 #: builtin/commit.c:84
4441 msgid "Otherwise, please use 'git reset'\n"
4442 msgstr "否则,请使用命令 'git reset'\n"
4444 #: builtin/commit.c:87
4446 "If you wish to skip this commit, use:\n"
4450 "Then \"git cherry-pick --continue\" will resume cherry-picking\n"
4451 "the remaining commits.\n"
4453 "如果您想跳过这个提交,使用命令:\n"
4457 "然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
4460 #: builtin/commit.c:304
4461 msgid "failed to unpack HEAD tree object"
4462 msgstr "无法解包 HEAD 树对象"
4464 #: builtin/commit.c:344
4465 msgid "unable to create temporary index"
4468 #: builtin/commit.c:350
4469 msgid "interactive add failed"
4472 #: builtin/commit.c:361
4473 msgid "unable to write index file"
4476 #: builtin/commit.c:363
4477 msgid "unable to update temporary index"
4480 #: builtin/commit.c:365
4481 msgid "Failed to update main cache tree"
4484 #: builtin/commit.c:389 builtin/commit.c:414 builtin/commit.c:463
4485 msgid "unable to write new_index file"
4486 msgstr "无法写 new_index 文件"
4488 #: builtin/commit.c:445
4489 msgid "cannot do a partial commit during a merge."
4490 msgstr "在合并过程中不能做部分提交。"
4492 #: builtin/commit.c:447
4493 msgid "cannot do a partial commit during a cherry-pick."
4494 msgstr "在拣选过程中不能做部分提交。"
4496 #: builtin/commit.c:456
4497 msgid "cannot read the index"
4500 #: builtin/commit.c:475
4501 msgid "unable to write temporary index file"
4504 #: builtin/commit.c:580
4506 msgid "commit '%s' lacks author header"
4507 msgstr "提交 '%s' 缺少作者信息"
4509 #: builtin/commit.c:582
4511 msgid "commit '%s' has malformed author line"
4512 msgstr "提交 '%s' 有非法的作者信息"
4514 #: builtin/commit.c:601
4515 msgid "malformed --author parameter"
4516 msgstr "非法的 --author 参数"
4518 #: builtin/commit.c:609
4520 msgid "invalid date format: %s"
4523 #: builtin/commit.c:653
4525 "unable to select a comment character that is not used\n"
4526 "in the current commit message"
4527 msgstr "无法选择一个未被当前提交说明使用的注释字符"
4529 #: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
4531 msgid "could not lookup commit %s"
4534 #: builtin/commit.c:702 builtin/shortlog.c:273
4536 msgid "(reading log message from standard input)\n"
4537 msgstr "(正从标准输入中读取日志信息)\n"
4539 #: builtin/commit.c:704
4540 msgid "could not read log from standard input"
4541 msgstr "不能从标准输入中读取日志信息"
4543 #: builtin/commit.c:708
4545 msgid "could not read log file '%s'"
4546 msgstr "不能读取日志文件 '%s'"
4548 #: builtin/commit.c:730
4549 msgid "could not read MERGE_MSG"
4550 msgstr "不能读取 MERGE_MSG"
4552 #: builtin/commit.c:734
4553 msgid "could not read SQUASH_MSG"
4554 msgstr "不能读取 SQUASH_MSG"
4556 #: builtin/commit.c:738 builtin/merge.c:1079
4558 msgid "could not read '%s'"
4561 #: builtin/commit.c:785
4562 msgid "could not write commit template"
4565 #: builtin/commit.c:803
4569 "It looks like you may be committing a merge.\n"
4570 "If this is not correct, please remove the file\n"
4575 "似乎您正在做一个合并提交。如果不对,请删除文件\n"
4579 #: builtin/commit.c:808
4583 "It looks like you may be committing a cherry-pick.\n"
4584 "If this is not correct, please remove the file\n"
4589 "似乎您正在做一个拣选提交。如果不对,请删除文件\n"
4593 #: builtin/commit.c:821
4596 "Please enter the commit message for your changes. Lines starting\n"
4597 "with '%c' will be ignored, and an empty message aborts the commit.\n"
4599 "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
4602 #: builtin/commit.c:828
4605 "Please enter the commit message for your changes. Lines starting\n"
4606 "with '%c' will be kept; you may remove them yourself if you want to.\n"
4607 "An empty message aborts the commit.\n"
4609 "请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
4610 "也可以删除它们。一个空的提交说明将会终止提交。\n"
4612 # 译者:为保证在输出中对齐,注意调整句中空格!
4613 #: builtin/commit.c:848
4615 msgid "%sAuthor: %.*s <%.*s>"
4616 msgstr "%s作者: %.*s <%.*s>"
4618 # 译者:为保证在输出中对齐,注意调整句中空格!
4619 #: builtin/commit.c:856
4624 # 译者:为保证在输出中对齐,注意调整句中空格!
4625 #: builtin/commit.c:863
4627 msgid "%sCommitter: %.*s <%.*s>"
4628 msgstr "%s提交者:%.*s <%.*s>"
4630 #: builtin/commit.c:881
4631 msgid "Cannot read index"
4634 #: builtin/commit.c:938
4635 msgid "Error building trees"
4638 #: builtin/commit.c:953 builtin/tag.c:495
4640 msgid "Please supply the message using either -m or -F option.\n"
4641 msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
4643 #: builtin/commit.c:1055
4645 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
4646 msgstr "--author '%s' 不是 'Name <email>' 格式,且未能在现有作者中找到匹配"
4648 #: builtin/commit.c:1070 builtin/commit.c:1310
4650 msgid "Invalid untracked files mode '%s'"
4651 msgstr "无效的未追踪文件参数 '%s'"
4653 #: builtin/commit.c:1107
4654 msgid "--long and -z are incompatible"
4655 msgstr "--long 和 -z 选项不兼容"
4657 #: builtin/commit.c:1137
4658 msgid "Using both --reset-author and --author does not make sense"
4659 msgstr "同时使用 --reset-author 和 --author 没有意义"
4661 #: builtin/commit.c:1146
4662 msgid "You have nothing to amend."
4665 #: builtin/commit.c:1149
4666 msgid "You are in the middle of a merge -- cannot amend."
4667 msgstr "您正处于一个合并过程中 -- 无法修补提交。"
4669 #: builtin/commit.c:1151
4670 msgid "You are in the middle of a cherry-pick -- cannot amend."
4671 msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
4673 #: builtin/commit.c:1154
4674 msgid "Options --squash and --fixup cannot be used together"
4675 msgstr "选项 --squash 和 --fixup 不能同时使用"
4677 #: builtin/commit.c:1164
4678 msgid "Only one of -c/-C/-F/--fixup can be used."
4679 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
4681 #: builtin/commit.c:1166
4682 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
4683 msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
4685 #: builtin/commit.c:1174
4686 msgid "--reset-author can be used only with -C, -c or --amend."
4687 msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
4689 #: builtin/commit.c:1191
4690 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
4691 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
4693 #: builtin/commit.c:1193
4694 msgid "No paths with --include/--only does not make sense."
4695 msgstr "参数 --include/--only 不跟路径没有意义。"
4697 #: builtin/commit.c:1195
4698 msgid "Clever... amending the last one with dirty index."
4699 msgstr "聪明... 用脏索引修补最后一个提交。"
4701 #: builtin/commit.c:1197
4702 msgid "Explicit paths specified without -i or -o; assuming --only paths..."
4703 msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..."
4705 #: builtin/commit.c:1209 builtin/tag.c:728
4707 msgid "Invalid cleanup mode %s"
4710 #: builtin/commit.c:1214
4711 msgid "Paths with -a does not make sense."
4712 msgstr "路径和 -a 选项同时使用没有意义。"
4714 #: builtin/commit.c:1324 builtin/commit.c:1603
4715 msgid "show status concisely"
4718 #: builtin/commit.c:1326 builtin/commit.c:1605
4719 msgid "show branch information"
4722 #: builtin/commit.c:1328 builtin/commit.c:1607 builtin/push.c:509
4723 msgid "machine-readable output"
4726 #: builtin/commit.c:1331 builtin/commit.c:1609
4727 msgid "show status in long format (default)"
4728 msgstr "以长格式显示状态(默认)"
4730 #: builtin/commit.c:1334 builtin/commit.c:1612
4731 msgid "terminate entries with NUL"
4734 #: builtin/commit.c:1336 builtin/commit.c:1615 builtin/fast-export.c:980
4735 #: builtin/fast-export.c:983 builtin/tag.c:603
4739 #: builtin/commit.c:1337 builtin/commit.c:1615
4740 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
4741 msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
4743 #: builtin/commit.c:1340
4744 msgid "show ignored files"
4747 #: builtin/commit.c:1341 parse-options.h:152
4751 #: builtin/commit.c:1342
4753 "ignore changes to submodules, optional when: all, dirty, untracked. "
4756 "忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
4758 #: builtin/commit.c:1344
4759 msgid "list untracked files in columns"
4760 msgstr "以列的方式显示未跟踪的文件"
4762 #: builtin/commit.c:1430
4763 msgid "couldn't look up newly created commit"
4766 #: builtin/commit.c:1432
4767 msgid "could not parse newly created commit"
4770 #: builtin/commit.c:1477
4771 msgid "detached HEAD"
4774 # 译者:中文字符串拼接,可删除前导空格
4775 #: builtin/commit.c:1480
4776 msgid " (root-commit)"
4779 #: builtin/commit.c:1573
4780 msgid "suppress summary after successful commit"
4781 msgstr "提交成功后不显示概述信息"
4783 #: builtin/commit.c:1574
4784 msgid "show diff in commit message template"
4785 msgstr "在提交说明模板里显示差异"
4787 #: builtin/commit.c:1576
4788 msgid "Commit message options"
4791 #: builtin/commit.c:1577 builtin/tag.c:601
4792 msgid "read message from file"
4795 #: builtin/commit.c:1578
4799 #: builtin/commit.c:1578
4800 msgid "override author for commit"
4803 #: builtin/commit.c:1579 builtin/gc.c:280
4807 #: builtin/commit.c:1579
4808 msgid "override date for commit"
4811 #: builtin/commit.c:1580 builtin/merge.c:218 builtin/notes.c:391
4812 #: builtin/notes.c:554 builtin/tag.c:599
4816 #: builtin/commit.c:1580
4817 msgid "commit message"
4820 #: builtin/commit.c:1581
4821 msgid "reuse and edit message from specified commit"
4822 msgstr "重用并编辑指定提交的提交说明"
4824 #: builtin/commit.c:1582
4825 msgid "reuse message from specified commit"
4826 msgstr "重用指定提交的提交说明"
4828 #: builtin/commit.c:1583
4829 msgid "use autosquash formatted message to fixup specified commit"
4830 msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
4832 #: builtin/commit.c:1584
4833 msgid "use autosquash formatted message to squash specified commit"
4834 msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
4836 #: builtin/commit.c:1585
4837 msgid "the commit is authored by me now (used with -C/-c/--amend)"
4838 msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
4840 #: builtin/commit.c:1586 builtin/log.c:1191 builtin/revert.c:86
4841 msgid "add Signed-off-by:"
4842 msgstr "添加 Signed-off-by: 签名"
4844 #: builtin/commit.c:1587
4845 msgid "use specified template file"
4848 #: builtin/commit.c:1588
4849 msgid "force edit of commit"
4852 # 译者:可选值,不能翻译(或是原文中笔误,应为 mode)
4853 #: builtin/commit.c:1589
4857 #: builtin/commit.c:1589 builtin/tag.c:604
4858 msgid "how to strip spaces and #comments from message"
4859 msgstr "设置如何删除提交说明里的空格和#注释"
4861 #: builtin/commit.c:1590
4862 msgid "include status in commit message template"
4863 msgstr "在提交说明模板里包含状态信息"
4865 #: builtin/commit.c:1591 builtin/merge.c:225 builtin/revert.c:92
4866 #: builtin/tag.c:605
4870 #: builtin/commit.c:1592 builtin/merge.c:226 builtin/revert.c:93
4871 msgid "GPG sign commit"
4874 #: builtin/commit.c:1595
4875 msgid "Commit contents options"
4878 #: builtin/commit.c:1596
4879 msgid "commit all changed files"
4882 #: builtin/commit.c:1597
4883 msgid "add specified files to index for commit"
4884 msgstr "添加指定的文件到索引区等待提交"
4886 #: builtin/commit.c:1598
4887 msgid "interactively add files"
4890 #: builtin/commit.c:1599
4891 msgid "interactively add changes"
4894 #: builtin/commit.c:1600
4895 msgid "commit only specified files"
4898 #: builtin/commit.c:1601
4899 msgid "bypass pre-commit hook"
4900 msgstr "绕过 pre-commit 钩子"
4902 #: builtin/commit.c:1602
4903 msgid "show what would be committed"
4906 #: builtin/commit.c:1613
4907 msgid "amend previous commit"
4910 #: builtin/commit.c:1614
4911 msgid "bypass post-rewrite hook"
4912 msgstr "绕过 post-rewrite 钩子"
4914 #: builtin/commit.c:1619
4915 msgid "ok to record an empty change"
4918 #: builtin/commit.c:1621
4919 msgid "ok to record a change with an empty message"
4922 #: builtin/commit.c:1650
4923 msgid "could not parse HEAD commit"
4924 msgstr "不能解析 HEAD 提交"
4926 #: builtin/commit.c:1689 builtin/merge.c:1076
4928 msgid "could not open '%s' for reading"
4929 msgstr "不能为读入打开 '%s'"
4931 #: builtin/commit.c:1696
4933 msgid "Corrupt MERGE_HEAD file (%s)"
4934 msgstr "损坏的 MERGE_HEAD 文件(%s)"
4936 #: builtin/commit.c:1703
4937 msgid "could not read MERGE_MODE"
4938 msgstr "不能读取 MERGE_MODE"
4940 #: builtin/commit.c:1722
4942 msgid "could not read commit message: %s"
4943 msgstr "不能读取提交说明:%s"
4945 #: builtin/commit.c:1733
4947 msgid "Aborting commit; you did not edit the message.\n"
4948 msgstr "终止提交;您未更改来自模版的提交说明。\n"
4950 #: builtin/commit.c:1738
4952 msgid "Aborting commit due to empty commit message.\n"
4953 msgstr "终止提交因为提交说明为空。\n"
4955 #: builtin/commit.c:1753 builtin/merge.c:829 builtin/merge.c:854
4956 msgid "failed to write commit object"
4959 #: builtin/commit.c:1786
4961 "Repository has been updated, but unable to write\n"
4962 "new_index file. Check that disk is not full and quota is\n"
4963 "not exceeded, and then \"git reset HEAD\" to recover."
4965 "仓库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
4966 "或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
4968 #: builtin/config.c:8
4969 msgid "git config [<options>]"
4970 msgstr "git config [<选项>]"
4972 #: builtin/config.c:53
4973 msgid "Config file location"
4976 #: builtin/config.c:54
4977 msgid "use global config file"
4980 #: builtin/config.c:55
4981 msgid "use system config file"
4984 #: builtin/config.c:56
4985 msgid "use repository config file"
4988 #: builtin/config.c:57
4989 msgid "use given config file"
4992 #: builtin/config.c:58
4996 #: builtin/config.c:58
4997 msgid "read config from given blob object"
4998 msgstr "从给定的数据对象读取配置"
5000 #: builtin/config.c:59
5004 #: builtin/config.c:60
5005 msgid "get value: name [value-regex]"
5006 msgstr "获取值:name [value-regex]"
5008 #: builtin/config.c:61
5009 msgid "get all values: key [value-regex]"
5010 msgstr "获得所有的值:key [value-regex]"
5012 #: builtin/config.c:62
5013 msgid "get values for regexp: name-regex [value-regex]"
5014 msgstr "根据正则表达式获得值:name-regex [value-regex]"
5016 #: builtin/config.c:63
5017 msgid "get value specific for the URL: section[.var] URL"
5018 msgstr "获得 URL 取值:section[.var] URL"
5020 #: builtin/config.c:64
5021 msgid "replace all matching variables: name value [value_regex]"
5022 msgstr "替换所有匹配的变量:name value [value_regex]"
5024 #: builtin/config.c:65
5025 msgid "add a new variable: name value"
5026 msgstr "添加一个新的变量:name value"
5028 #: builtin/config.c:66
5029 msgid "remove a variable: name [value-regex]"
5030 msgstr "删除一个变量:name [value-regex]"
5032 #: builtin/config.c:67
5033 msgid "remove all matches: name [value-regex]"
5034 msgstr "删除所有匹配项:name [value-regex]"
5036 #: builtin/config.c:68
5037 msgid "rename section: old-name new-name"
5038 msgstr "重命名小节:old-name new-name"
5040 #: builtin/config.c:69
5041 msgid "remove a section: name"
5042 msgstr "删除一个小节:name"
5044 #: builtin/config.c:70
5048 #: builtin/config.c:71
5049 msgid "open an editor"
5052 #: builtin/config.c:72
5053 msgid "find the color configured: slot [default]"
5054 msgstr "获得配置的颜色:配置 [默认]"
5056 #: builtin/config.c:73
5057 msgid "find the color setting: slot [stdout-is-tty]"
5058 msgstr "获得颜色设置:配置 [stdout-is-tty]"
5060 #: builtin/config.c:74
5064 #: builtin/config.c:75
5065 msgid "value is \"true\" or \"false\""
5066 msgstr "值是 \"true\" 或 \"false\""
5068 #: builtin/config.c:76
5069 msgid "value is decimal number"
5072 #: builtin/config.c:77
5073 msgid "value is --bool or --int"
5074 msgstr "值是 --bool or --int"
5076 #: builtin/config.c:78
5077 msgid "value is a path (file or directory name)"
5078 msgstr "值是一个路径(文件或目录名)"
5080 #: builtin/config.c:79
5084 #: builtin/config.c:80
5085 msgid "terminate values with NUL byte"
5088 #: builtin/config.c:81
5089 msgid "respect include directives on lookup"
5090 msgstr "查询时参照 include 指令递归查找"
5092 #: builtin/config.c:316
5093 msgid "unable to parse default color value"
5096 #: builtin/config.c:457
5099 "# This is Git's per-user configuration file.\n"
5101 "# Please adapt and uncomment the following lines:\n"
5105 "# This is Git's per-user configuration file.\n"
5107 "# Please adapt and uncomment the following lines:\n"
5111 #: builtin/config.c:587
5113 msgid "cannot create configuration file %s"
5114 msgstr "不能创建配置文件 %s"
5116 #: builtin/count-objects.c:55
5117 msgid "git count-objects [-v] [-H | --human-readable]"
5118 msgstr "git count-objects [-v] [-H | --human-readable]"
5120 #: builtin/count-objects.c:65
5121 msgid "print sizes in human readable format"
5122 msgstr "以用户可读的格式显示大小"
5124 #: builtin/describe.c:17
5125 msgid "git describe [<options>] [<commit-ish>...]"
5126 msgstr "git describe [<选项>] [<提交号>...]"
5128 #: builtin/describe.c:18
5129 msgid "git describe [<options>] --dirty"
5130 msgstr "git describe [<选项>] --dirty"
5132 #: builtin/describe.c:217
5134 msgid "annotated tag %s not available"
5137 #: builtin/describe.c:221
5139 msgid "annotated tag %s has no embedded name"
5140 msgstr "附注标签 %s 没有嵌入名称"
5142 #: builtin/describe.c:223
5144 msgid "tag '%s' is really '%s' here"
5145 msgstr "标签 '%s' 的确是在 '%s'"
5147 #: builtin/describe.c:250 builtin/log.c:452
5149 msgid "Not a valid object name %s"
5150 msgstr "不是一个有效的对象名 %s"
5152 #: builtin/describe.c:253
5154 msgid "%s is not a valid '%s' object"
5155 msgstr "%s 不是一个有效的 '%s' 对象"
5157 #: builtin/describe.c:270
5159 msgid "no tag exactly matches '%s'"
5160 msgstr "没有标签准确匹配 '%s'"
5162 #: builtin/describe.c:272
5164 msgid "searching to describe %s\n"
5167 #: builtin/describe.c:319
5169 msgid "finished search at %s\n"
5172 #: builtin/describe.c:346
5175 "No annotated tags can describe '%s'.\n"
5176 "However, there were unannotated tags: try --tags."
5179 "然而,存在未附注标签:尝试 --tags。"
5181 #: builtin/describe.c:350
5184 "No tags can describe '%s'.\n"
5185 "Try --always, or create some tags."
5188 "尝试 --always,或者创建一些标签。"
5190 #: builtin/describe.c:371
5192 msgid "traversed %lu commits\n"
5193 msgstr "已遍历 %lu 个提交\n"
5195 #: builtin/describe.c:374
5198 "more than %i tags found; listed %i most recent\n"
5199 "gave up search at %s\n"
5201 "发现多于 %i 个标签,列出最近的 %i 个\n"
5204 #: builtin/describe.c:396
5205 msgid "find the tag that comes after the commit"
5208 #: builtin/describe.c:397
5209 msgid "debug search strategy on stderr"
5210 msgstr "在标准错误上调试搜索策略"
5212 #: builtin/describe.c:398
5216 #: builtin/describe.c:399
5217 msgid "use any tag, even unannotated"
5218 msgstr "使用任意标签,即使未附带注释"
5220 #: builtin/describe.c:400
5221 msgid "always use long format"
5224 #: builtin/describe.c:401
5225 msgid "only follow first parent"
5228 #: builtin/describe.c:404
5229 msgid "only output exact matches"
5232 #: builtin/describe.c:406
5233 msgid "consider <n> most recent tags (default: 10)"
5234 msgstr "考虑最近 <n> 个标签(默认:10)"
5236 #: builtin/describe.c:408
5237 msgid "only consider tags matching <pattern>"
5238 msgstr "只考虑匹配 <模式> 的标签"
5240 #: builtin/describe.c:410 builtin/name-rev.c:318
5241 msgid "show abbreviated commit object as fallback"
5242 msgstr "显示简写的提交号作为后备"
5244 #: builtin/describe.c:411
5248 #: builtin/describe.c:412
5249 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
5250 msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")"
5252 #: builtin/describe.c:430
5253 msgid "--long is incompatible with --abbrev=0"
5254 msgstr "--long 与 --abbrev=0 不兼容"
5256 #: builtin/describe.c:456
5257 msgid "No names found, cannot describe anything."
5258 msgstr "没有发现名称,无法描述任何东西。"
5260 #: builtin/describe.c:476
5261 msgid "--dirty is incompatible with commit-ishes"
5262 msgstr "--dirty 不能与提交同时使用"
5264 #: builtin/diff.c:86
5266 msgid "'%s': not a regular file or symlink"
5267 msgstr "'%s':不是一个正规文件或符号链接"
5269 #: builtin/diff.c:237
5271 msgid "invalid option: %s"
5274 #: builtin/diff.c:358
5275 msgid "Not a git repository"
5276 msgstr "不是一个 git 仓库"
5278 #: builtin/diff.c:401
5280 msgid "invalid object '%s' given."
5281 msgstr "提供了无效对象 '%s'。"
5283 #: builtin/diff.c:410
5285 msgid "more than two blobs given: '%s'"
5286 msgstr "提供了超过两个数据对象:'%s'"
5288 #: builtin/diff.c:417
5290 msgid "unhandled object '%s' given."
5291 msgstr "无法处理的对象 '%s'。"
5293 #: builtin/fast-export.c:24
5294 msgid "git fast-export [rev-list-opts]"
5295 msgstr "git fast-export [rev-list-opts]"
5297 #: builtin/fast-export.c:979
5298 msgid "show progress after <n> objects"
5299 msgstr "在 <n> 个对象之后显示进度"
5301 #: builtin/fast-export.c:981
5302 msgid "select handling of signed tags"
5305 #: builtin/fast-export.c:984
5306 msgid "select handling of tags that tag filtered objects"
5307 msgstr "选择当标签指向被过滤对象时该标签的处理方式"
5309 #: builtin/fast-export.c:987
5310 msgid "Dump marks to this file"
5313 #: builtin/fast-export.c:989
5314 msgid "Import marks from this file"
5317 #: builtin/fast-export.c:991
5318 msgid "Fake a tagger when tags lack one"
5319 msgstr "当标签缺少标记者字段时,假装提供一个"
5321 #: builtin/fast-export.c:993
5322 msgid "Output full tree for each commit"
5325 #: builtin/fast-export.c:995
5326 msgid "Use the done feature to terminate the stream"
5327 msgstr "使用 done 功能来终止流"
5329 #: builtin/fast-export.c:996
5330 msgid "Skip output of blob data"
5333 #: builtin/fast-export.c:997
5337 #: builtin/fast-export.c:998
5338 msgid "Apply refspec to exported refs"
5339 msgstr "对导出的引用应用引用规格"
5341 #: builtin/fast-export.c:999
5342 msgid "anonymize output"
5345 #: builtin/fetch.c:19
5346 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
5347 msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
5349 #: builtin/fetch.c:20
5350 msgid "git fetch [<options>] <group>"
5351 msgstr "git fetch [<选项>] <组>"
5353 #: builtin/fetch.c:21
5354 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
5355 msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
5357 #: builtin/fetch.c:22
5358 msgid "git fetch --all [<options>]"
5359 msgstr "git fetch --all [<选项>]"
5361 #: builtin/fetch.c:89
5362 msgid "fetch from all remotes"
5365 #: builtin/fetch.c:91
5366 msgid "append to .git/FETCH_HEAD instead of overwriting"
5367 msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
5369 #: builtin/fetch.c:93
5370 msgid "path to upload pack on remote end"
5373 #: builtin/fetch.c:94
5374 msgid "force overwrite of local branch"
5377 #: builtin/fetch.c:96
5378 msgid "fetch from multiple remotes"
5381 #: builtin/fetch.c:98
5382 msgid "fetch all tags and associated objects"
5383 msgstr "抓取所有的标签和关联对象"
5385 #: builtin/fetch.c:100
5386 msgid "do not fetch all tags (--no-tags)"
5387 msgstr "不抓取任何标签(--no-tags)"
5389 #: builtin/fetch.c:102
5390 msgid "prune remote-tracking branches no longer on remote"
5391 msgstr "清除远程已经不存在的分支的跟踪分支"
5394 #: builtin/fetch.c:103
5398 #: builtin/fetch.c:104
5399 msgid "control recursive fetching of submodules"
5402 #: builtin/fetch.c:108
5403 msgid "keep downloaded pack"
5406 #: builtin/fetch.c:110
5407 msgid "allow updating of HEAD ref"
5408 msgstr "允许更新 HEAD 引用"
5410 #: builtin/fetch.c:113
5411 msgid "deepen history of shallow clone"
5414 #: builtin/fetch.c:115
5415 msgid "convert to a complete repository"
5418 #: builtin/fetch.c:117 builtin/log.c:1208
5422 #: builtin/fetch.c:118
5423 msgid "prepend this to submodule path output"
5424 msgstr "在子模组路径输出的前面加上此目录"
5426 #: builtin/fetch.c:121
5427 msgid "default mode for recursion"
5430 #: builtin/fetch.c:123
5431 msgid "accept refs that update .git/shallow"
5432 msgstr "接受更新 .git/shallow 的引用"
5434 #: builtin/fetch.c:124
5438 #: builtin/fetch.c:125
5439 msgid "specify fetch refmap"
5440 msgstr "指定获取操作的引用映射"
5442 #: builtin/fetch.c:377
5443 msgid "Couldn't find remote ref HEAD"
5444 msgstr "无法发现远程 HEAD 引用"
5446 #: builtin/fetch.c:457
5448 msgid "object %s not found"
5451 #: builtin/fetch.c:462
5452 msgid "[up to date]"
5455 #: builtin/fetch.c:476
5457 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
5458 msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)"
5460 #: builtin/fetch.c:477 builtin/fetch.c:563
5464 #: builtin/fetch.c:488
5465 msgid "[tag update]"
5469 #: builtin/fetch.c:490 builtin/fetch.c:525 builtin/fetch.c:543
5470 msgid " (unable to update local ref)"
5471 msgstr " (不能更新本地引用)"
5473 #: builtin/fetch.c:508
5477 #: builtin/fetch.c:511
5478 msgid "[new branch]"
5481 #: builtin/fetch.c:514
5485 #: builtin/fetch.c:559
5486 msgid "unable to update local ref"
5489 #: builtin/fetch.c:559
5490 msgid "forced update"
5493 #: builtin/fetch.c:565
5494 msgid "(non-fast-forward)"
5497 #: builtin/fetch.c:599 builtin/fetch.c:832
5499 msgid "cannot open %s: %s\n"
5500 msgstr "无法打开 %s:%s\n"
5502 #: builtin/fetch.c:608
5504 msgid "%s did not send all necessary objects\n"
5505 msgstr "%s 未发送所有必须的对象\n"
5507 #: builtin/fetch.c:626
5509 msgid "reject %s because shallow roots are not allowed to be updated"
5510 msgstr "拒绝 %s 因为浅克隆不允许被更新"
5512 #: builtin/fetch.c:714 builtin/fetch.c:797
5517 #: builtin/fetch.c:725
5520 "some local refs could not be updated; try running\n"
5521 " 'git remote prune %s' to remove any old, conflicting branches"
5523 "一些本地引用不能被更新;尝试运行\n"
5524 " 'git remote prune %s' 来删除旧的、有冲突的分支"
5527 #: builtin/fetch.c:777
5529 msgid " (%s will become dangling)"
5530 msgstr " (%s 将成为摇摆状态)"
5533 #: builtin/fetch.c:778
5535 msgid " (%s has become dangling)"
5536 msgstr " (%s 已成为摇摆状态)"
5538 #: builtin/fetch.c:802
5542 #: builtin/fetch.c:803 builtin/remote.c:1057
5546 #: builtin/fetch.c:822
5548 msgid "Refusing to fetch into current branch %s of non-bare repository"
5549 msgstr "拒绝获取到非纯仓库的当前分支 %s"
5551 #: builtin/fetch.c:841
5553 msgid "Option \"%s\" value \"%s\" is not valid for %s"
5554 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
5556 #: builtin/fetch.c:844
5558 msgid "Option \"%s\" is ignored for %s\n"
5559 msgstr "选项 \"%s\" 为 %s 所忽略\n"
5561 #: builtin/fetch.c:900
5563 msgid "Don't know how to fetch from %s"
5564 msgstr "不知道如何从 %s 获取"
5566 #: builtin/fetch.c:1063
5568 msgid "Fetching %s\n"
5571 #: builtin/fetch.c:1065 builtin/remote.c:90
5573 msgid "Could not fetch %s"
5576 #: builtin/fetch.c:1083
5578 "No remote repository specified. Please, specify either a URL or a\n"
5579 "remote name from which new revisions should be fetched."
5580 msgstr "未指定远程仓库。请通过一个URL或远程仓库名指定,用以获取新提交。"
5582 #: builtin/fetch.c:1106
5583 msgid "You need to specify a tag name."
5584 msgstr "您需要指定一个标签名称。"
5586 #: builtin/fetch.c:1148
5587 msgid "--depth and --unshallow cannot be used together"
5588 msgstr "--depth 和 --unshallow 不能同时使用"
5590 #: builtin/fetch.c:1150
5591 msgid "--unshallow on a complete repository does not make sense"
5592 msgstr "对于一个完整的仓库,参数 --unshallow 没有意义"
5594 #: builtin/fetch.c:1173
5595 msgid "fetch --all does not take a repository argument"
5596 msgstr "fetch --all 不能带一个仓库参数"
5598 #: builtin/fetch.c:1175
5599 msgid "fetch --all does not make sense with refspecs"
5600 msgstr "fetch --all 带引用规格没有任何意义"
5602 #: builtin/fetch.c:1186
5604 msgid "No such remote or remote group: %s"
5605 msgstr "没有这样的远程或远程组:%s"
5607 #: builtin/fetch.c:1194
5608 msgid "Fetching a group and specifying refspecs does not make sense"
5609 msgstr "获取组并指定引用规格没有意义"
5611 #: builtin/fmt-merge-msg.c:13
5613 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
5614 msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
5616 #: builtin/fmt-merge-msg.c:668 builtin/fmt-merge-msg.c:671 builtin/grep.c:698
5617 #: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182
5618 #: builtin/show-branch.c:664 builtin/show-ref.c:180 builtin/tag.c:590
5619 #: parse-options.h:131 parse-options.h:238
5623 #: builtin/fmt-merge-msg.c:669
5624 msgid "populate log with at most <n> entries from shortlog"
5625 msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
5627 #: builtin/fmt-merge-msg.c:672
5628 msgid "alias for --log (deprecated)"
5629 msgstr "参数 --log 的别名(已弃用)"
5631 #: builtin/fmt-merge-msg.c:675
5635 #: builtin/fmt-merge-msg.c:676
5636 msgid "use <text> as start of message"
5637 msgstr "使用 <文本> 作为提交说明的开始"
5639 #: builtin/fmt-merge-msg.c:677
5640 msgid "file to read from"
5643 #: builtin/for-each-ref.c:687
5644 msgid "unable to parse format"
5647 #: builtin/for-each-ref.c:1083
5648 msgid "git for-each-ref [<options>] [<pattern>]"
5649 msgstr "git for-each-ref [<选项>] [<模式>]"
5651 #: builtin/for-each-ref.c:1098
5652 msgid "quote placeholders suitably for shells"
5653 msgstr "引用占位符适用于 shells"
5655 #: builtin/for-each-ref.c:1100
5656 msgid "quote placeholders suitably for perl"
5657 msgstr "引用占位符适用于 perl"
5659 #: builtin/for-each-ref.c:1102
5660 msgid "quote placeholders suitably for python"
5661 msgstr "引用占位符适用于 python"
5663 #: builtin/for-each-ref.c:1104
5664 msgid "quote placeholders suitably for Tcl"
5665 msgstr "引用占位符适用于 Tcl"
5667 #: builtin/for-each-ref.c:1107
5668 msgid "show only <n> matched refs"
5669 msgstr "只显示 <n> 个匹配的引用"
5671 #: builtin/for-each-ref.c:1108 builtin/replace.c:438
5675 #: builtin/for-each-ref.c:1108
5676 msgid "format to use for the output"
5679 #: builtin/for-each-ref.c:1109
5683 #: builtin/for-each-ref.c:1110
5684 msgid "field name to sort on"
5687 #: builtin/fsck.c:147 builtin/prune.c:137
5688 msgid "Checking connectivity"
5691 #: builtin/fsck.c:548
5692 msgid "Checking object directories"
5695 #: builtin/fsck.c:611
5696 msgid "git fsck [<options>] [<object>...]"
5697 msgstr "git fsck [<选项>] [<对象>...]"
5699 #: builtin/fsck.c:617
5700 msgid "show unreachable objects"
5703 #: builtin/fsck.c:618
5704 msgid "show dangling objects"
5707 #: builtin/fsck.c:619
5711 #: builtin/fsck.c:620
5712 msgid "report root nodes"
5715 #: builtin/fsck.c:621
5716 msgid "make index objects head nodes"
5717 msgstr "将索引亦作为检查的头节点"
5719 #: builtin/fsck.c:622
5720 msgid "make reflogs head nodes (default)"
5721 msgstr "将引用日志作为检查的头节点(默认)"
5723 #: builtin/fsck.c:623
5724 msgid "also consider packs and alternate objects"
5727 #: builtin/fsck.c:624
5728 msgid "enable more strict checking"
5731 #: builtin/fsck.c:626
5732 msgid "write dangling objects in .git/lost-found"
5733 msgstr "将摇摆对象写入 .git/lost-found 中"
5735 #: builtin/fsck.c:627 builtin/prune.c:107
5736 msgid "show progress"
5739 #: builtin/fsck.c:677
5740 msgid "Checking objects"
5744 msgid "git gc [<options>]"
5745 msgstr "git gc [<选项>]"
5749 msgid "Invalid %s: '%s'"
5754 msgid "insanely long object directory %.*s"
5755 msgstr "不正常的长对象目录 %.*s"
5758 msgid "prune unreferenced objects"
5762 msgid "be more thorough (increased runtime)"
5763 msgstr "更彻底(增加运行时间)"
5766 msgid "enable auto-gc mode"
5770 msgid "force running gc even if there may be another gc running"
5771 msgstr "强制执行 gc 即使另外一个 gc 正在执行"
5775 msgid "Auto packing the repository in background for optimum performance.\n"
5776 msgstr "自动在后台执行仓库打包以求最佳性能。\n"
5780 msgid "Auto packing the repository for optimum performance.\n"
5781 msgstr "自动打包仓库以求最佳性能。\n"
5785 msgid "See \"git help gc\" for manual housekeeping.\n"
5786 msgstr "手工维护参见 \"git help gc\"。\n"
5791 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
5793 "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> (如果不是,使用 --force)"
5797 "There are too many unreachable loose objects; run 'git prune' to remove them."
5798 msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
5800 #: builtin/grep.c:23
5801 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
5802 msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
5804 #: builtin/grep.c:218
5806 msgid "grep: failed to create thread: %s"
5807 msgstr "grep:无法创建线程:%s"
5809 #: builtin/grep.c:441 builtin/grep.c:476
5811 msgid "unable to read tree (%s)"
5814 #: builtin/grep.c:491
5816 msgid "unable to grep from object of type %s"
5817 msgstr "无法抓取来自于 %s 类型的对象"
5819 #: builtin/grep.c:547
5821 msgid "switch `%c' expects a numerical value"
5822 msgstr "开关 `%c' 期望一个数字值"
5824 #: builtin/grep.c:564
5826 msgid "cannot open '%s'"
5829 #: builtin/grep.c:638
5830 msgid "search in index instead of in the work tree"
5831 msgstr "在索引区搜索而不是在工作区"
5833 #: builtin/grep.c:640
5834 msgid "find in contents not managed by git"
5835 msgstr "在未被 git 管理的内容中查找"
5837 # 译者:中文字符串拼接,可删除前导空格
5838 #: builtin/grep.c:642
5839 msgid "search in both tracked and untracked files"
5840 msgstr "在跟踪和未跟踪的文件中搜索"
5842 #: builtin/grep.c:644
5843 msgid "ignore files specified via '.gitignore'"
5844 msgstr "忽略 '.gitignore' 包含的文件"
5846 #: builtin/grep.c:647
5847 msgid "show non-matching lines"
5850 #: builtin/grep.c:649
5851 msgid "case insensitive matching"
5854 #: builtin/grep.c:651
5855 msgid "match patterns only at word boundaries"
5858 #: builtin/grep.c:653
5859 msgid "process binary files as text"
5860 msgstr "把二进制文件当做文本处理"
5862 #: builtin/grep.c:655
5863 msgid "don't match patterns in binary files"
5864 msgstr "不在二进制文件中匹配模式"
5866 #: builtin/grep.c:658
5867 msgid "process binary files with textconv filters"
5868 msgstr "用 textconv 过滤器处理二进制文件"
5870 #: builtin/grep.c:660
5871 msgid "descend at most <depth> levels"
5872 msgstr "最多以指定的深度向下寻找"
5874 #: builtin/grep.c:664
5875 msgid "use extended POSIX regular expressions"
5876 msgstr "使用扩展的 POSIX 正则表达式"
5878 #: builtin/grep.c:667
5879 msgid "use basic POSIX regular expressions (default)"
5880 msgstr "使用基本的 POSIX 正则表达式(默认)"
5882 #: builtin/grep.c:670
5883 msgid "interpret patterns as fixed strings"
5884 msgstr "把模式解析为固定的字符串"
5886 #: builtin/grep.c:673
5887 msgid "use Perl-compatible regular expressions"
5888 msgstr "使用 Perl 兼容的正则表达式"
5890 #: builtin/grep.c:676
5891 msgid "show line numbers"
5894 #: builtin/grep.c:677
5895 msgid "don't show filenames"
5898 #: builtin/grep.c:678
5899 msgid "show filenames"
5902 #: builtin/grep.c:680
5903 msgid "show filenames relative to top directory"
5904 msgstr "显示相对于顶级目录的文件名"
5906 #: builtin/grep.c:682
5907 msgid "show only filenames instead of matching lines"
5908 msgstr "只显示文件名而不显示匹配的行"
5910 #: builtin/grep.c:684
5911 msgid "synonym for --files-with-matches"
5912 msgstr "和 --files-with-matches 同义"
5914 #: builtin/grep.c:687
5915 msgid "show only the names of files without match"
5918 #: builtin/grep.c:689
5919 msgid "print NUL after filenames"
5920 msgstr "在文件名后输出 NUL 字符"
5922 #: builtin/grep.c:691
5923 msgid "show the number of matches instead of matching lines"
5924 msgstr "显示总匹配行数,而不显示匹配的行"
5926 #: builtin/grep.c:692
5927 msgid "highlight matches"
5930 #: builtin/grep.c:694
5931 msgid "print empty line between matches from different files"
5932 msgstr "在不同文件的匹配项之间打印空行"
5934 #: builtin/grep.c:696
5935 msgid "show filename only once above matches from same file"
5936 msgstr "只在同一文件的匹配项的上面显示一次文件名"
5938 #: builtin/grep.c:699
5939 msgid "show <n> context lines before and after matches"
5940 msgstr "显示匹配项前后的 <n> 行上下文"
5942 #: builtin/grep.c:702
5943 msgid "show <n> context lines before matches"
5944 msgstr "显示匹配项前 <n> 行上下文"
5946 #: builtin/grep.c:704
5947 msgid "show <n> context lines after matches"
5948 msgstr "显示匹配项后 <n> 行上下文"
5950 #: builtin/grep.c:705
5951 msgid "shortcut for -C NUM"
5954 #: builtin/grep.c:708
5955 msgid "show a line with the function name before matches"
5956 msgstr "在匹配的前面显示一行函数名"
5958 #: builtin/grep.c:710
5959 msgid "show the surrounding function"
5960 msgstr "显示所在函数的前后内容"
5962 #: builtin/grep.c:713
5963 msgid "read patterns from file"
5966 #: builtin/grep.c:715
5967 msgid "match <pattern>"
5970 #: builtin/grep.c:717
5971 msgid "combine patterns specified with -e"
5972 msgstr "组合用 -e 参数设定的模式"
5974 #: builtin/grep.c:729
5975 msgid "indicate hit with exit status without output"
5976 msgstr "不输出,而用退出码标识命中状态"
5978 #: builtin/grep.c:731
5979 msgid "show only matches from files that match all patterns"
5980 msgstr "只显示匹配所有模式的文件中的匹配"
5982 #: builtin/grep.c:733
5983 msgid "show parse tree for grep expression"
5984 msgstr "显示 grep 表达式的解析树"
5986 #: builtin/grep.c:737
5990 #: builtin/grep.c:737
5991 msgid "show matching files in the pager"
5994 #: builtin/grep.c:740
5995 msgid "allow calling of grep(1) (ignored by this build)"
5996 msgstr "允许调用 grep(1)(本次构建忽略)"
5998 #: builtin/grep.c:741 builtin/show-ref.c:189
6002 #: builtin/grep.c:808
6003 msgid "no pattern given."
6006 #: builtin/grep.c:866
6007 msgid "--open-files-in-pager only works on the worktree"
6008 msgstr "--open-files-in-pager 仅用于工作区"
6010 #: builtin/grep.c:892
6011 msgid "--cached or --untracked cannot be used with --no-index."
6012 msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
6014 #: builtin/grep.c:897
6015 msgid "--no-index or --untracked cannot be used with revs."
6016 msgstr "--no-index 或 --untracked 不能和版本同时使用。"
6018 #: builtin/grep.c:900
6019 msgid "--[no-]exclude-standard cannot be used for tracked contents."
6020 msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
6022 #: builtin/grep.c:908
6023 msgid "both --cached and trees are given."
6024 msgstr "同时给出了 --cached 和树对象。"
6026 #: builtin/hash-object.c:80
6028 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
6031 "git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
6034 #: builtin/hash-object.c:81
6035 msgid "git hash-object --stdin-paths < <list-of-paths>"
6036 msgstr "git hash-object --stdin-paths < <路径列表>"
6038 #: builtin/hash-object.c:92 builtin/tag.c:612
6042 #: builtin/hash-object.c:92
6046 #: builtin/hash-object.c:93
6047 msgid "write the object into the object database"
6050 #: builtin/hash-object.c:95
6051 msgid "read the object from stdin"
6054 #: builtin/hash-object.c:97
6055 msgid "store file as is without filters"
6056 msgstr "原样存储文件不使用过滤器"
6058 #: builtin/hash-object.c:98
6060 "just hash any random garbage to create corrupt objects for debugging Git"
6061 msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
6063 #: builtin/hash-object.c:99
6064 msgid "process file as it were from this path"
6065 msgstr "处理文件并假设其来自于此路径"
6067 #: builtin/help.c:41
6068 msgid "print all available commands"
6071 #: builtin/help.c:42
6072 msgid "print list of useful guides"
6075 #: builtin/help.c:43
6076 msgid "show man page"
6079 #: builtin/help.c:44
6080 msgid "show manual in web browser"
6081 msgstr "在 web 浏览器中显示手册"
6083 #: builtin/help.c:46
6084 msgid "show info page"
6087 #: builtin/help.c:52
6088 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
6089 msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
6091 #: builtin/help.c:64
6093 msgid "unrecognized help format '%s'"
6094 msgstr "未能识别的帮助格式 '%s'"
6096 #: builtin/help.c:91
6097 msgid "Failed to start emacsclient."
6098 msgstr "无法启动 emacsclient。"
6100 #: builtin/help.c:104
6101 msgid "Failed to parse emacsclient version."
6102 msgstr "无法解析 emacsclient 版本。"
6104 #: builtin/help.c:112
6106 msgid "emacsclient version '%d' too old (< 22)."
6107 msgstr "emacsclient 版本 '%d' 太老(< 22)。"
6109 #: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175
6111 msgid "failed to exec '%s': %s"
6112 msgstr "无法执行 '%s':%s"
6114 #: builtin/help.c:215
6117 "'%s': path for unsupported man viewer.\n"
6118 "Please consider using 'man.<tool>.cmd' instead."
6120 "'%s':不支持的 man 手册查看器的路径。\n"
6121 "请使用 'man.<工具>.cmd'。"
6123 #: builtin/help.c:227
6126 "'%s': cmd for supported man viewer.\n"
6127 "Please consider using 'man.<tool>.path' instead."
6129 "'%s': 支持的 man 手册查看器命令。\n"
6130 "请使用 'man.<工具>.path'。"
6132 #: builtin/help.c:354
6134 msgid "'%s': unknown man viewer."
6135 msgstr "'%s':未知的 man 查看器。"
6137 #: builtin/help.c:371
6138 msgid "no man viewer handled the request"
6139 msgstr "没有 man 查看器处理此请求"
6141 #: builtin/help.c:379
6142 msgid "no info viewer handled the request"
6143 msgstr "没有 info 查看器处理此请求"
6145 #: builtin/help.c:428
6146 msgid "Defining attributes per path"
6149 #: builtin/help.c:429
6150 msgid "Everyday Git With 20 Commands Or So"
6151 msgstr "每一天 Git 常用的约 20 条命令"
6153 #: builtin/help.c:430
6154 msgid "A Git glossary"
6157 #: builtin/help.c:431
6158 msgid "Specifies intentionally untracked files to ignore"
6161 #: builtin/help.c:432
6162 msgid "Defining submodule properties"
6165 #: builtin/help.c:433
6166 msgid "Specifying revisions and ranges for Git"
6167 msgstr "指定 Git 的版本和版本范围"
6169 #: builtin/help.c:434
6170 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
6171 msgstr "一个 Git 教程(针对 1.5.1 或更新版本)"
6173 #: builtin/help.c:435
6174 msgid "An overview of recommended workflows with Git"
6175 msgstr "Git 推荐的工作流概览"
6177 #: builtin/help.c:447
6178 msgid "The common Git guides are:\n"
6179 msgstr "最常用的 Git 向导有:\n"
6181 #: builtin/help.c:468 builtin/help.c:485
6186 #: builtin/help.c:501
6188 msgid "`git %s' is aliased to `%s'"
6189 msgstr "`git %s' 是 `%s' 的别名"
6191 #: builtin/index-pack.c:151
6193 msgid "unable to open %s"
6196 #: builtin/index-pack.c:201
6198 msgid "object type mismatch at %s"
6199 msgstr "%s 的对象类型不匹配"
6201 #: builtin/index-pack.c:221
6203 msgid "did not receive expected object %s"
6204 msgstr "未能获取期望的对象 %s"
6206 #: builtin/index-pack.c:224
6208 msgid "object %s: expected type %s, found %s"
6209 msgstr "对象 %s:期待类型 %s,却是 %s"
6211 #: builtin/index-pack.c:266
6213 msgid "cannot fill %d byte"
6214 msgid_plural "cannot fill %d bytes"
6215 msgstr[0] "无法填充 %d 字节"
6216 msgstr[1] "无法填充 %d 字节"
6218 #: builtin/index-pack.c:276
6220 msgstr "过早的文件结束符(EOF)"
6222 #: builtin/index-pack.c:277
6223 msgid "read error on input"
6226 #: builtin/index-pack.c:289
6227 msgid "used more bytes than were available"
6230 #: builtin/index-pack.c:296
6231 msgid "pack too large for current definition of off_t"
6232 msgstr "包太大超过了当前 off_t 的定义"
6234 #: builtin/index-pack.c:312
6236 msgid "unable to create '%s'"
6239 #: builtin/index-pack.c:317
6241 msgid "cannot open packfile '%s'"
6242 msgstr "无法打开包文件 '%s'"
6244 #: builtin/index-pack.c:331
6245 msgid "pack signature mismatch"
6248 #: builtin/index-pack.c:333
6250 msgid "pack version %<PRIu32> unsupported"
6251 msgstr "不支持包版本 %<PRIu32>"
6253 #: builtin/index-pack.c:351
6255 msgid "pack has bad object at offset %lu: %s"
6256 msgstr "包中有错误的对象位于 %lu:%s"
6258 #: builtin/index-pack.c:472
6260 msgid "inflate returned %d"
6263 #: builtin/index-pack.c:521
6264 msgid "offset value overflow for delta base object"
6265 msgstr "偏移值覆盖了 delta 基准对象"
6267 #: builtin/index-pack.c:529
6268 msgid "delta base offset is out of bound"
6269 msgstr "delta 基准偏移越界"
6271 #: builtin/index-pack.c:537
6273 msgid "unknown object type %d"
6276 #: builtin/index-pack.c:568
6277 msgid "cannot pread pack file"
6280 #: builtin/index-pack.c:570
6282 msgid "premature end of pack file, %lu byte missing"
6283 msgid_plural "premature end of pack file, %lu bytes missing"
6284 msgstr[0] "包文件过早结束,缺少 %lu 字节"
6285 msgstr[1] "包文件过早结束,缺少 %lu 字节"
6287 #: builtin/index-pack.c:596
6288 msgid "serious inflate inconsistency"
6291 #: builtin/index-pack.c:742 builtin/index-pack.c:748 builtin/index-pack.c:771
6292 #: builtin/index-pack.c:805 builtin/index-pack.c:814
6294 msgid "SHA1 COLLISION FOUND WITH %s !"
6295 msgstr "发现 %s 出现 SHA1 冲突!"
6297 #: builtin/index-pack.c:745 builtin/pack-objects.c:162
6298 #: builtin/pack-objects.c:254
6300 msgid "unable to read %s"
6303 #: builtin/index-pack.c:811
6305 msgid "cannot read existing object %s"
6306 msgstr "不能读取现存对象 %s"
6308 #: builtin/index-pack.c:825
6310 msgid "invalid blob object %s"
6313 #: builtin/index-pack.c:839
6318 #: builtin/index-pack.c:843
6319 msgid "Error in object"
6322 #: builtin/index-pack.c:845
6324 msgid "Not all child objects of %s are reachable"
6325 msgstr "%s 的所有子对象并非都可达"
6327 #: builtin/index-pack.c:917 builtin/index-pack.c:948
6328 msgid "failed to apply delta"
6331 #: builtin/index-pack.c:1118
6332 msgid "Receiving objects"
6335 #: builtin/index-pack.c:1118
6336 msgid "Indexing objects"
6339 #: builtin/index-pack.c:1150
6340 msgid "pack is corrupted (SHA1 mismatch)"
6341 msgstr "包冲突(SHA1 不匹配)"
6343 #: builtin/index-pack.c:1155
6344 msgid "cannot fstat packfile"
6347 #: builtin/index-pack.c:1158
6348 msgid "pack has junk at the end"
6351 #: builtin/index-pack.c:1169
6352 msgid "confusion beyond insanity in parse_pack_objects()"
6353 msgstr "parse_pack_objects() 中遇到不可理喻的问题"
6355 #: builtin/index-pack.c:1194
6356 msgid "Resolving deltas"
6359 #: builtin/index-pack.c:1205
6361 msgid "unable to create thread: %s"
6364 #: builtin/index-pack.c:1247
6365 msgid "confusion beyond insanity"
6368 #: builtin/index-pack.c:1253
6370 msgid "completed with %d local objects"
6371 msgstr "完成 %d 个本地对象"
6373 #: builtin/index-pack.c:1263
6375 msgid "Unexpected tail checksum for %s (disk corruption?)"
6376 msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
6378 #: builtin/index-pack.c:1267
6380 msgid "pack has %d unresolved delta"
6381 msgid_plural "pack has %d unresolved deltas"
6382 msgstr[0] "包有 %d 个未解决的 delta"
6383 msgstr[1] "包有 %d 个未解决的 delta"
6385 #: builtin/index-pack.c:1291
6387 msgid "unable to deflate appended object (%d)"
6388 msgstr "不能压缩附加对象(%d)"
6390 #: builtin/index-pack.c:1367
6392 msgid "local object %s is corrupt"
6393 msgstr "本地对象 %s 已损坏"
6395 #: builtin/index-pack.c:1391
6396 msgid "error while closing pack file"
6399 #: builtin/index-pack.c:1404
6401 msgid "cannot write keep file '%s'"
6402 msgstr "无法写保留文件 '%s'"
6404 #: builtin/index-pack.c:1412
6406 msgid "cannot close written keep file '%s'"
6407 msgstr "无法关闭保留文件 '%s'"
6409 #: builtin/index-pack.c:1425
6410 msgid "cannot store pack file"
6413 #: builtin/index-pack.c:1436
6414 msgid "cannot store index file"
6417 #: builtin/index-pack.c:1469
6419 msgid "bad pack.indexversion=%<PRIu32>"
6420 msgstr "坏的 pack.indexversion=%<PRIu32>"
6422 #: builtin/index-pack.c:1475
6424 msgid "invalid number of threads specified (%d)"
6425 msgstr "指定的线程数无效(%d)"
6427 #: builtin/index-pack.c:1479 builtin/index-pack.c:1658
6429 msgid "no threads support, ignoring %s"
6430 msgstr "没有线程支持,忽略 %s"
6432 #: builtin/index-pack.c:1537
6434 msgid "Cannot open existing pack file '%s'"
6435 msgstr "无法打开现存包文件 '%s'"
6437 #: builtin/index-pack.c:1539
6439 msgid "Cannot open existing pack idx file for '%s'"
6440 msgstr "无法为 %s 打开包索引文件"
6442 #: builtin/index-pack.c:1586
6444 msgid "non delta: %d object"
6445 msgid_plural "non delta: %d objects"
6446 msgstr[0] "非 delta:%d 个对象"
6447 msgstr[1] "非 delta:%d 个对象"
6449 #: builtin/index-pack.c:1593
6451 msgid "chain length = %d: %lu object"
6452 msgid_plural "chain length = %d: %lu objects"
6453 msgstr[0] "链长 = %d: %lu 对象"
6454 msgstr[1] "链长 = %d: %lu 对象"
6456 #: builtin/index-pack.c:1622
6457 msgid "Cannot come back to cwd"
6460 #: builtin/index-pack.c:1670 builtin/index-pack.c:1673
6461 #: builtin/index-pack.c:1685 builtin/index-pack.c:1689
6466 #: builtin/index-pack.c:1703
6467 msgid "--fix-thin cannot be used without --stdin"
6468 msgstr "--fix-thin 不能和 --stdin 同时使用"
6470 #: builtin/index-pack.c:1707 builtin/index-pack.c:1716
6472 msgid "packfile name '%s' does not end with '.pack'"
6473 msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
6475 #: builtin/index-pack.c:1724
6476 msgid "--verify with no packfile name given"
6477 msgstr "--verify 没有提供包文件名参数"
6479 #: builtin/init-db.c:35
6481 msgid "Could not make %s writable by group"
6482 msgstr "不能设置 %s 为组可写"
6484 #: builtin/init-db.c:62
6486 msgid "insanely long template name %s"
6489 #: builtin/init-db.c:67
6491 msgid "cannot stat '%s'"
6492 msgstr "不能枚举 '%s' 状态"
6494 #: builtin/init-db.c:73
6496 msgid "cannot stat template '%s'"
6497 msgstr "不能枚举模版 '%s' 状态"
6499 #: builtin/init-db.c:80
6501 msgid "cannot opendir '%s'"
6502 msgstr "不能打开目录 '%s'"
6504 #: builtin/init-db.c:97
6506 msgid "cannot readlink '%s'"
6507 msgstr "不能读取链接 '%s'"
6509 #: builtin/init-db.c:99
6511 msgid "insanely long symlink %s"
6514 #: builtin/init-db.c:102
6516 msgid "cannot symlink '%s' '%s'"
6517 msgstr "不能自 '%s' 到 '%s' 创建符号链接"
6519 #: builtin/init-db.c:106
6521 msgid "cannot copy '%s' to '%s'"
6522 msgstr "不能拷贝 '%s' 至 '%s'"
6524 #: builtin/init-db.c:110
6526 msgid "ignoring template %s"
6529 #: builtin/init-db.c:136
6531 msgid "insanely long template path %s"
6534 #: builtin/init-db.c:144
6536 msgid "templates not found %s"
6539 #: builtin/init-db.c:157
6541 msgid "not copying templates of a wrong format version %d from '%s'"
6542 msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
6544 #: builtin/init-db.c:211
6546 msgid "insane git directory %s"
6547 msgstr "不正常的 git 目录 %s"
6549 #: builtin/init-db.c:343 builtin/init-db.c:346
6551 msgid "%s already exists"
6554 #: builtin/init-db.c:374
6556 msgid "unable to handle file type %d"
6557 msgstr "不能处理 %d 类型的文件"
6559 #: builtin/init-db.c:377
6561 msgid "unable to move %s to %s"
6562 msgstr "不能移动 %s 至 %s"
6564 #. TRANSLATORS: The first '%s' is either "Reinitialized
6565 #. existing" or "Initialized empty", the second " shared" or
6566 #. "", and the last '%s%s' is the verbatim directory name.
6567 #: builtin/init-db.c:433
6569 msgid "%s%s Git repository in %s%s\n"
6570 msgstr "%s%s Git 仓库于 %s%s\n"
6572 #: builtin/init-db.c:434
6573 msgid "Reinitialized existing"
6576 #: builtin/init-db.c:434
6577 msgid "Initialized empty"
6580 # 译者:中文字符串拼接,可删除前导空格
6581 #: builtin/init-db.c:435
6585 #: builtin/init-db.c:482
6587 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
6588 "shared[=<permissions>]] [<directory>]"
6590 "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
6593 #: builtin/init-db.c:505
6597 #: builtin/init-db.c:506
6598 msgid "specify that the git repository is to be shared amongst several users"
6599 msgstr "指定 git 仓库是多个用户之间共享的"
6601 #: builtin/init-db.c:508 builtin/prune-packed.c:57 builtin/repack.c:171
6605 #: builtin/init-db.c:540 builtin/init-db.c:545
6607 msgid "cannot mkdir %s"
6610 #: builtin/init-db.c:549
6612 msgid "cannot chdir to %s"
6615 #: builtin/init-db.c:570
6618 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
6620 msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)"
6622 #: builtin/init-db.c:598
6624 msgid "Cannot access work tree '%s'"
6625 msgstr "不能访问工作区 '%s'"
6627 #: builtin/interpret-trailers.c:15
6629 "git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] "
6632 "git interpret-trailers [--trim-empty] [(--trailer <键>[(=|:)<值>])...] [<文件"
6635 #: builtin/interpret-trailers.c:25
6636 msgid "trim empty trailers"
6639 #: builtin/interpret-trailers.c:26
6643 #: builtin/interpret-trailers.c:27
6644 msgid "trailer(s) to add"
6648 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
6649 msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
6652 msgid "git show [<options>] <object>..."
6653 msgstr "git show [<选项>] <对象>..."
6657 msgid "invalid --decorate option: %s"
6658 msgstr "无效的 --decorate 选项:%s"
6660 #: builtin/log.c:127
6661 msgid "suppress diff output"
6664 #: builtin/log.c:128
6668 #: builtin/log.c:129
6669 msgid "Use mail map file"
6672 #: builtin/log.c:130
6673 msgid "decorate options"
6676 #: builtin/log.c:133
6677 msgid "Process line range n,m in file, counting from 1"
6678 msgstr "处理文件中第 n 到 m 之间的行,从 1 开始"
6680 #: builtin/log.c:229
6682 msgid "Final output: %d %s\n"
6683 msgstr "最终输出:%d %s\n"
6685 #: builtin/log.c:458
6687 msgid "git show %s: bad file"
6688 msgstr "git show %s: 损坏的文件"
6690 #: builtin/log.c:472 builtin/log.c:564
6692 msgid "Could not read object %s"
6695 #: builtin/log.c:588
6697 msgid "Unknown type: %d"
6700 #: builtin/log.c:689
6701 msgid "format.headers without value"
6702 msgstr "format.headers 没有值"
6704 #: builtin/log.c:773
6705 msgid "name of output directory is too long"
6708 #: builtin/log.c:789
6710 msgid "Cannot open patch file %s"
6711 msgstr "无法打开补丁文件 %s"
6713 #: builtin/log.c:803
6714 msgid "Need exactly one range."
6717 #: builtin/log.c:813
6718 msgid "Not a range."
6721 #: builtin/log.c:919
6722 msgid "Cover letter needs email format"
6725 #: builtin/log.c:998
6727 msgid "insane in-reply-to: %s"
6728 msgstr "不正常的 in-reply-to:%s"
6730 #: builtin/log.c:1026
6731 msgid "git format-patch [<options>] [<since> | <revision-range>]"
6732 msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
6734 #: builtin/log.c:1071
6735 msgid "Two output directories?"
6738 #: builtin/log.c:1186
6739 msgid "use [PATCH n/m] even with a single patch"
6740 msgstr "使用 [PATCH n/m],即使只有一个补丁"
6742 #: builtin/log.c:1189
6743 msgid "use [PATCH] even with multiple patches"
6744 msgstr "使用 [PATCH],即使有多个补丁"
6746 #: builtin/log.c:1193
6747 msgid "print patches to standard out"
6750 #: builtin/log.c:1195
6751 msgid "generate a cover letter"
6754 #: builtin/log.c:1197
6755 msgid "use simple number sequence for output file names"
6756 msgstr "使用简单的数字序列作为输出文件名"
6758 #: builtin/log.c:1198
6762 #: builtin/log.c:1199
6763 msgid "use <sfx> instead of '.patch'"
6764 msgstr "使用 <后缀> 代替 '.patch'"
6766 #: builtin/log.c:1201
6767 msgid "start numbering patches at <n> instead of 1"
6768 msgstr "补丁以 <n> 开始编号,而不是1"
6770 #: builtin/log.c:1203
6771 msgid "mark the series as Nth re-roll"
6772 msgstr "标记补丁系列是第几次重制"
6774 #: builtin/log.c:1205
6775 msgid "Use [<prefix>] instead of [PATCH]"
6776 msgstr "使用 [<前缀>] 代替 [PATCH]"
6778 #: builtin/log.c:1208
6779 msgid "store resulting files in <dir>"
6780 msgstr "把结果文件存储在 <目录>"
6782 #: builtin/log.c:1211
6783 msgid "don't strip/add [PATCH]"
6784 msgstr "不删除/添加 [PATCH]"
6786 #: builtin/log.c:1214
6787 msgid "don't output binary diffs"
6790 #: builtin/log.c:1216
6791 msgid "don't include a patch matching a commit upstream"
6792 msgstr "不包含已在上游提交中的补丁"
6794 #: builtin/log.c:1218
6795 msgid "show patch format instead of default (patch + stat)"
6796 msgstr "显示纯补丁格式而非默认的(补丁+状态)"
6798 #: builtin/log.c:1220
6802 #: builtin/log.c:1221
6806 #: builtin/log.c:1222
6807 msgid "add email header"
6810 #: builtin/log.c:1223 builtin/log.c:1225
6814 #: builtin/log.c:1223
6815 msgid "add To: header"
6818 #: builtin/log.c:1225
6819 msgid "add Cc: header"
6822 #: builtin/log.c:1227
6826 #: builtin/log.c:1228
6827 msgid "set From address to <ident> (or committer ident if absent)"
6828 msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者ID做为地址)"
6830 #: builtin/log.c:1230
6834 #: builtin/log.c:1231
6835 msgid "make first mail a reply to <message-id>"
6836 msgstr "使第一封邮件作为对 <邮件标识> 的回复"
6838 #: builtin/log.c:1232 builtin/log.c:1235
6842 #: builtin/log.c:1233
6843 msgid "attach the patch"
6846 #: builtin/log.c:1236
6847 msgid "inline the patch"
6850 #: builtin/log.c:1240
6851 msgid "enable message threading, styles: shallow, deep"
6852 msgstr "启用邮件线索,风格:浅,深"
6854 #: builtin/log.c:1242
6858 #: builtin/log.c:1243
6859 msgid "add a signature"
6862 #: builtin/log.c:1245
6863 msgid "add a signature from a file"
6866 #: builtin/log.c:1246
6867 msgid "don't print the patch filenames"
6870 #: builtin/log.c:1320
6872 msgid "invalid ident line: %s"
6873 msgstr "包含无效的身份标识:%s"
6875 #: builtin/log.c:1335
6876 msgid "-n and -k are mutually exclusive."
6877 msgstr "-n 和 -k 互斥。"
6879 #: builtin/log.c:1337
6880 msgid "--subject-prefix and -k are mutually exclusive."
6881 msgstr "--subject-prefix 和 -k 互斥。"
6883 #: builtin/log.c:1345
6884 msgid "--name-only does not make sense"
6885 msgstr "--name-only 无意义"
6887 #: builtin/log.c:1347
6888 msgid "--name-status does not make sense"
6889 msgstr "--name-status 无意义"
6891 #: builtin/log.c:1349
6892 msgid "--check does not make sense"
6893 msgstr "--check 无意义"
6895 #: builtin/log.c:1372
6896 msgid "standard output, or directory, which one?"
6897 msgstr "标准输出或目录,哪一个?"
6899 #: builtin/log.c:1374
6901 msgid "Could not create directory '%s'"
6902 msgstr "不能创建目录 '%s'"
6904 #: builtin/log.c:1472
6906 msgid "unable to read signature file '%s'"
6907 msgstr "无法读取签名文件 '%s'"
6909 #: builtin/log.c:1535
6910 msgid "Failed to create output files"
6913 #: builtin/log.c:1583
6914 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
6915 msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
6917 #: builtin/log.c:1637
6920 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
6921 msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n"
6923 #: builtin/log.c:1648 builtin/log.c:1650 builtin/log.c:1662
6925 msgid "Unknown commit %s"
6928 #: builtin/ls-files.c:358
6929 msgid "git ls-files [<options>] [<file>...]"
6930 msgstr "git ls-files [<选项>] [<文件>...]"
6932 #: builtin/ls-files.c:415
6933 msgid "identify the file status with tags"
6936 #: builtin/ls-files.c:417
6937 msgid "use lowercase letters for 'assume unchanged' files"
6938 msgstr "使用小写字母表示 '假设未改变的' 文件"
6940 #: builtin/ls-files.c:419
6941 msgid "show cached files in the output (default)"
6942 msgstr "显示缓存的文件(默认)"
6944 #: builtin/ls-files.c:421
6945 msgid "show deleted files in the output"
6948 #: builtin/ls-files.c:423
6949 msgid "show modified files in the output"
6952 #: builtin/ls-files.c:425
6953 msgid "show other files in the output"
6956 #: builtin/ls-files.c:427
6957 msgid "show ignored files in the output"
6960 #: builtin/ls-files.c:430
6961 msgid "show staged contents' object name in the output"
6962 msgstr "显示暂存区内容的对象名称"
6964 #: builtin/ls-files.c:432
6965 msgid "show files on the filesystem that need to be removed"
6966 msgstr "显示文件系统需要删除的文件"
6968 #: builtin/ls-files.c:434
6969 msgid "show 'other' directories' names only"
6970 msgstr "只显示“其他”目录的名称"
6972 #: builtin/ls-files.c:437
6973 msgid "don't show empty directories"
6976 #: builtin/ls-files.c:440
6977 msgid "show unmerged files in the output"
6980 #: builtin/ls-files.c:442
6981 msgid "show resolve-undo information"
6982 msgstr "显示 resolve-undo 信息"
6984 #: builtin/ls-files.c:444
6985 msgid "skip files matching pattern"
6988 #: builtin/ls-files.c:447
6989 msgid "exclude patterns are read from <file>"
6990 msgstr "从 <文件> 中读取排除模式"
6992 #: builtin/ls-files.c:450
6993 msgid "read additional per-directory exclude patterns in <file>"
6994 msgstr "从 <文件> 读取额外的每个目录的排除模式"
6996 #: builtin/ls-files.c:452
6997 msgid "add the standard git exclusions"
6998 msgstr "添加标准的 git 排除"
7000 #: builtin/ls-files.c:455
7001 msgid "make the output relative to the project top directory"
7002 msgstr "显示相对于顶级目录的文件名"
7004 #: builtin/ls-files.c:458
7005 msgid "if any <file> is not in the index, treat this as an error"
7006 msgstr "如果任何 <文件> 都不在索引区,视为错误"
7008 #: builtin/ls-files.c:459
7012 #: builtin/ls-files.c:460
7013 msgid "pretend that paths removed since <tree-ish> are still present"
7014 msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
7016 #: builtin/ls-files.c:462
7017 msgid "show debugging data"
7020 #: builtin/ls-tree.c:28
7021 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
7022 msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
7024 #: builtin/ls-tree.c:127
7025 msgid "only show trees"
7028 #: builtin/ls-tree.c:129
7029 msgid "recurse into subtrees"
7032 #: builtin/ls-tree.c:131
7033 msgid "show trees when recursing"
7036 #: builtin/ls-tree.c:134
7037 msgid "terminate entries with NUL byte"
7040 #: builtin/ls-tree.c:135
7041 msgid "include object size"
7044 #: builtin/ls-tree.c:137 builtin/ls-tree.c:139
7045 msgid "list only filenames"
7048 #: builtin/ls-tree.c:142
7049 msgid "use full path names"
7052 #: builtin/ls-tree.c:144
7053 msgid "list entire tree; not just current directory (implies --full-name)"
7054 msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
7056 #: builtin/merge.c:45
7057 msgid "git merge [<options>] [<commit>...]"
7058 msgstr "git merge [<选项>] [<提交>...]"
7060 #: builtin/merge.c:46
7061 msgid "git merge [<options>] <msg> HEAD <commit>"
7062 msgstr "git merge [<选项>] <说明> HEAD <提交>"
7064 #: builtin/merge.c:47
7065 msgid "git merge --abort"
7066 msgstr "git merge --abort"
7068 #: builtin/merge.c:100
7069 msgid "switch `m' requires a value"
7070 msgstr "开关 `m' 需要一个值"
7072 #: builtin/merge.c:137
7074 msgid "Could not find merge strategy '%s'.\n"
7075 msgstr "不能找到合并策略 '%s'。\n"
7077 #: builtin/merge.c:138
7079 msgid "Available strategies are:"
7082 #: builtin/merge.c:143
7084 msgid "Available custom strategies are:"
7087 #: builtin/merge.c:193
7088 msgid "do not show a diffstat at the end of the merge"
7089 msgstr "在合并的最后不显示差异统计"
7091 #: builtin/merge.c:196
7092 msgid "show a diffstat at the end of the merge"
7093 msgstr "在合并的最后显示差异统计"
7095 #: builtin/merge.c:197
7096 msgid "(synonym to --stat)"
7097 msgstr "(和 --stat 同义)"
7099 #: builtin/merge.c:199
7100 msgid "add (at most <n>) entries from shortlog to merge commit message"
7101 msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
7103 #: builtin/merge.c:202
7104 msgid "create a single commit instead of doing a merge"
7105 msgstr "创建一个单独的提交而不是做一次合并"
7107 #: builtin/merge.c:204
7108 msgid "perform a commit if the merge succeeds (default)"
7109 msgstr "如果合并成功,执行一次提交(默认)"
7111 #: builtin/merge.c:206
7112 msgid "edit message before committing"
7115 #: builtin/merge.c:207
7116 msgid "allow fast-forward (default)"
7119 #: builtin/merge.c:209
7120 msgid "abort if fast-forward is not possible"
7121 msgstr "如果不能快进就放弃合并"
7123 #: builtin/merge.c:213
7124 msgid "Verify that the named commit has a valid GPG signature"
7125 msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
7127 #: builtin/merge.c:214 builtin/notes.c:753 builtin/revert.c:89
7131 #: builtin/merge.c:215
7132 msgid "merge strategy to use"
7135 #: builtin/merge.c:216
7136 msgid "option=value"
7137 msgstr "option=value"
7139 #: builtin/merge.c:217
7140 msgid "option for selected merge strategy"
7143 #: builtin/merge.c:219
7144 msgid "merge commit message (for a non-fast-forward merge)"
7145 msgstr "合并的提交说明(针对非快进式合并)"
7147 #: builtin/merge.c:223
7148 msgid "abort the current in-progress merge"
7149 msgstr "放弃当前正在进行的合并"
7151 #: builtin/merge.c:251
7152 msgid "could not run stash."
7155 #: builtin/merge.c:256
7156 msgid "stash failed"
7159 #: builtin/merge.c:261
7161 msgid "not a valid object: %s"
7162 msgstr "不是一个有效对象:%s"
7164 #: builtin/merge.c:280 builtin/merge.c:297
7165 msgid "read-tree failed"
7169 #: builtin/merge.c:327
7170 msgid " (nothing to squash)"
7173 #: builtin/merge.c:340
7175 msgid "Squash commit -- not updating HEAD\n"
7176 msgstr "压缩提交 -- 未更新 HEAD\n"
7178 #: builtin/merge.c:372
7179 msgid "Writing SQUASH_MSG"
7180 msgstr "写入 SQUASH_MSG"
7182 #: builtin/merge.c:374
7183 msgid "Finishing SQUASH_MSG"
7184 msgstr "完成 SQUASH_MSG"
7186 #: builtin/merge.c:397
7188 msgid "No merge message -- not updating HEAD\n"
7189 msgstr "无合并信息 -- 未更新 HEAD\n"
7191 #: builtin/merge.c:447
7193 msgid "'%s' does not point to a commit"
7194 msgstr "'%s' 没有指向一个提交"
7196 #: builtin/merge.c:537
7198 msgid "Bad branch.%s.mergeoptions string: %s"
7199 msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
7201 #: builtin/merge.c:632
7202 msgid "git write-tree failed to write a tree"
7203 msgstr "git write-tree 无法写入一树对象"
7205 #: builtin/merge.c:656
7206 msgid "Not handling anything other than two heads merge."
7207 msgstr "不能处理两个头合并之外的任何操作。"
7209 #: builtin/merge.c:670
7211 msgid "Unknown option for merge-recursive: -X%s"
7212 msgstr "merge-recursive 的未知选项:-X%s"
7214 #: builtin/merge.c:683
7216 msgid "unable to write %s"
7219 #: builtin/merge.c:772
7221 msgid "Could not read from '%s'"
7222 msgstr "不能从 '%s' 读取"
7224 #: builtin/merge.c:781
7226 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
7227 msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
7229 #: builtin/merge.c:787
7232 "Please enter a commit message to explain why this merge is necessary,\n"
7233 "especially if it merges an updated upstream into a topic branch.\n"
7235 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
7238 "请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
7241 "以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
7243 #: builtin/merge.c:811
7244 msgid "Empty commit message."
7247 #: builtin/merge.c:823
7249 msgid "Wonderful.\n"
7252 #: builtin/merge.c:878
7254 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
7255 msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
7257 #: builtin/merge.c:894
7259 msgid "'%s' is not a commit"
7260 msgstr "'%s' 不是一个提交"
7262 #: builtin/merge.c:935
7263 msgid "No current branch."
7266 #: builtin/merge.c:937
7267 msgid "No remote for the current branch."
7268 msgstr "当前分支没有对应的远程仓库。"
7270 #: builtin/merge.c:939
7271 msgid "No default upstream defined for the current branch."
7272 msgstr "当前分支没有定义默认的上游分支。"
7274 #: builtin/merge.c:944
7276 msgid "No remote-tracking branch for %s from %s"
7277 msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
7279 #: builtin/merge.c:1081
7281 msgid "could not close '%s'"
7284 #: builtin/merge.c:1208
7285 msgid "There is no merge to abort (MERGE_HEAD missing)."
7286 msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
7288 #: builtin/merge.c:1224
7290 "You have not concluded your merge (MERGE_HEAD exists).\n"
7291 "Please, commit your changes before you merge."
7293 "您尚未结束您的合并(存在 MERGE_HEAD)。\n"
7296 #: builtin/merge.c:1227 git-pull.sh:74
7297 msgid "You have not concluded your merge (MERGE_HEAD exists)."
7298 msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
7300 #: builtin/merge.c:1231
7302 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
7303 "Please, commit your changes before you merge."
7305 "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
7308 #: builtin/merge.c:1234
7309 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
7310 msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
7312 #: builtin/merge.c:1243
7313 msgid "You cannot combine --squash with --no-ff."
7314 msgstr "您不能将 --squash 与 --no-ff 同时使用。"
7316 #: builtin/merge.c:1251
7317 msgid "No commit specified and merge.defaultToUpstream not set."
7318 msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
7320 #: builtin/merge.c:1268
7321 msgid "Squash commit into empty head not supported yet"
7322 msgstr "尚不支持到空分支的压缩提交"
7324 #: builtin/merge.c:1270
7325 msgid "Non-fast-forward commit does not make sense into an empty head"
7326 msgstr "到空分支的非快进式提交没有意义"
7328 #: builtin/merge.c:1276
7330 msgid "%s - not something we can merge"
7333 #: builtin/merge.c:1278
7334 msgid "Can merge only exactly one commit into empty head"
7335 msgstr "只能将一个提交合并到空分支上"
7337 #: builtin/merge.c:1333
7339 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
7340 msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
7342 #: builtin/merge.c:1336
7344 msgid "Commit %s has a bad GPG signature allegedly by %s."
7345 msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
7347 #: builtin/merge.c:1339
7349 msgid "Commit %s does not have a GPG signature."
7350 msgstr "提交 %s 没有一个 GPG 签名。"
7352 #: builtin/merge.c:1342
7354 msgid "Commit %s has a good GPG signature by %s\n"
7355 msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
7357 #: builtin/merge.c:1423
7359 msgid "Updating %s..%s\n"
7360 msgstr "更新 %s..%s\n"
7362 #: builtin/merge.c:1462
7364 msgid "Trying really trivial in-index merge...\n"
7365 msgstr "尝试非常小的索引内合并...\n"
7367 #: builtin/merge.c:1469
7372 #: builtin/merge.c:1501
7373 msgid "Not possible to fast-forward, aborting."
7376 #: builtin/merge.c:1524 builtin/merge.c:1603
7378 msgid "Rewinding the tree to pristine...\n"
7379 msgstr "将树回滚至原始状态...\n"
7381 #: builtin/merge.c:1528
7383 msgid "Trying merge strategy %s...\n"
7384 msgstr "尝试合并策略 %s...\n"
7386 #: builtin/merge.c:1594
7388 msgid "No merge strategy handled the merge.\n"
7389 msgstr "没有合并策略处理此合并。\n"
7391 #: builtin/merge.c:1596
7393 msgid "Merge with strategy %s failed.\n"
7394 msgstr "使用策略 %s 合并失败。\n"
7396 #: builtin/merge.c:1605
7398 msgid "Using the %s to prepare resolving by hand.\n"
7399 msgstr "使用 %s 以准备手工解决。\n"
7401 #: builtin/merge.c:1617
7403 msgid "Automatic merge went well; stopped before committing as requested\n"
7404 msgstr "自动合并进展顺利,按要求在提交前停止\n"
7406 #: builtin/merge-base.c:29
7407 msgid "git merge-base [-a | --all] <commit> <commit>..."
7408 msgstr "git merge-base [-a | --all] <提交> <提交>..."
7410 #: builtin/merge-base.c:30
7411 msgid "git merge-base [-a | --all] --octopus <commit>..."
7412 msgstr "git merge-base [-a | --all] --octopus <提交>..."
7414 #: builtin/merge-base.c:31
7415 msgid "git merge-base --independent <commit>..."
7416 msgstr "git merge-base --independent <提交>..."
7418 #: builtin/merge-base.c:32
7419 msgid "git merge-base --is-ancestor <commit> <commit>"
7420 msgstr "git merge-base --is-ancestor <提交> <提交>"
7422 #: builtin/merge-base.c:33
7423 msgid "git merge-base --fork-point <ref> [<commit>]"
7424 msgstr "git merge-base --fork-point <引用> [<提交>]"
7426 #: builtin/merge-base.c:214
7427 msgid "output all common ancestors"
7430 #: builtin/merge-base.c:216
7431 msgid "find ancestors for a single n-way merge"
7432 msgstr "查找一个多路合并的祖先提交"
7434 #: builtin/merge-base.c:218
7435 msgid "list revs not reachable from others"
7436 msgstr "显示不能被其他访问到的版本"
7438 #: builtin/merge-base.c:220
7439 msgid "is the first one ancestor of the other?"
7440 msgstr "第一个是其他的祖先提交么?"
7442 #: builtin/merge-base.c:222
7443 msgid "find where <commit> forked from reflog of <ref>"
7444 msgstr "根据引用日志 <引用> 查找 <提交> 的派生处"
7446 #: builtin/merge-file.c:8
7448 "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
7449 "<orig-file> <file2>"
7451 "git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文"
7454 #: builtin/merge-file.c:33
7455 msgid "send results to standard output"
7458 #: builtin/merge-file.c:34
7459 msgid "use a diff3 based merge"
7460 msgstr "使用基于 diff3 的合并"
7462 #: builtin/merge-file.c:35
7463 msgid "for conflicts, use our version"
7464 msgstr "如果冲突,使用我们的版本"
7466 #: builtin/merge-file.c:37
7467 msgid "for conflicts, use their version"
7468 msgstr "如果冲突,使用他们的版本"
7470 #: builtin/merge-file.c:39
7471 msgid "for conflicts, use a union version"
7472 msgstr "如果冲突,使用联合版本"
7474 #: builtin/merge-file.c:42
7475 msgid "for conflicts, use this marker size"
7476 msgstr "如果冲突,使用指定长度的标记"
7478 #: builtin/merge-file.c:43
7479 msgid "do not warn about conflicts"
7482 #: builtin/merge-file.c:45
7483 msgid "set labels for file1/orig-file/file2"
7484 msgstr "为 文件1/初始文件/文件2 设置标签"
7486 #: builtin/mktree.c:64
7487 msgid "git mktree [-z] [--missing] [--batch]"
7488 msgstr "git mktree [-z] [--missing] [--batch]"
7490 #: builtin/mktree.c:150
7491 msgid "input is NUL terminated"
7492 msgstr "输入以 NUL 字符终止"
7494 #: builtin/mktree.c:151 builtin/write-tree.c:24
7495 msgid "allow missing objects"
7498 #: builtin/mktree.c:152
7499 msgid "allow creation of more than one tree"
7503 msgid "git mv [<options>] <source>... <destination>"
7504 msgstr "git mv [<选项>] <源>... <目标>"
7508 msgid "Directory %s is in index and no submodule?"
7509 msgstr "目录 %s 在索引中并且不是子模组?"
7512 msgid "Please stage your changes to .gitmodules or stash them to proceed"
7513 msgstr "请将您的修改暂存到 .gitmodules 中或保存进度后再继续"
7517 msgid "%.*s is in index"
7521 msgid "force move/rename even if target exists"
7522 msgstr "强制移动/重命令,即使目标存在"
7525 msgid "skip move/rename errors"
7530 msgid "destination '%s' is not a directory"
7531 msgstr "目标 '%s' 不是一个目录"
7535 msgid "Checking rename of '%s' to '%s'\n"
7536 msgstr "检查 '%s' 到 '%s' 的重命名\n"
7543 msgid "can not move directory into itself"
7547 msgid "cannot move directory over file"
7551 msgid "source directory is empty"
7555 msgid "not under version control"
7559 msgid "destination exists"
7564 msgid "overwriting '%s'"
7568 msgid "Cannot overwrite"
7572 msgid "multiple sources for the same target"
7576 msgid "destination directory does not exist"
7581 msgid "%s, source=%s, destination=%s"
7582 msgstr "%s,源=%s,目标=%s"
7586 msgid "Renaming %s to %s\n"
7587 msgstr "重命名 %s 至 %s\n"
7589 #: builtin/mv.c:256 builtin/remote.c:725 builtin/repack.c:361
7591 msgid "renaming '%s' failed"
7592 msgstr "重命名 '%s' 失败"
7594 #: builtin/name-rev.c:255
7595 msgid "git name-rev [<options>] <commit>..."
7596 msgstr "git name-rev [<选项>] <提交>..."
7598 #: builtin/name-rev.c:256
7599 msgid "git name-rev [<options>] --all"
7600 msgstr "git name-rev [<选项>] --all"
7602 #: builtin/name-rev.c:257
7603 msgid "git name-rev [<options>] --stdin"
7604 msgstr "git name-rev [<选项>] --stdin"
7606 #: builtin/name-rev.c:309
7607 msgid "print only names (no SHA-1)"
7608 msgstr "只打印名称(无 SHA-1)"
7610 #: builtin/name-rev.c:310
7611 msgid "only use tags to name the commits"
7614 #: builtin/name-rev.c:312
7615 msgid "only use refs matching <pattern>"
7616 msgstr "只使用和 <模式> 相匹配的引用"
7618 #: builtin/name-rev.c:314
7619 msgid "list all commits reachable from all refs"
7620 msgstr "列出可以从所有引用访问的提交"
7622 #: builtin/name-rev.c:315
7623 msgid "read from stdin"
7626 #: builtin/name-rev.c:316
7627 msgid "allow to print `undefined` names (default)"
7628 msgstr "允许打印 `未定义` 的名称(默认)"
7630 #: builtin/name-rev.c:322
7631 msgid "dereference tags in the input (internal use)"
7632 msgstr "反向解析输入中的标签(内部使用)"
7634 #: builtin/notes.c:24
7635 msgid "git notes [--ref <notes-ref>] [list [<object>]]"
7636 msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
7638 #: builtin/notes.c:25
7640 "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
7641 "| (-c | -C) <object>] [<object>]"
7643 "git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
7644 "| (-c | -C) <对象>] [<对象>]"
7646 #: builtin/notes.c:26
7647 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
7648 msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
7650 #: builtin/notes.c:27
7652 "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
7653 "(-c | -C) <object>] [<object>]"
7655 "git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
7656 "(-c | -C) <对象>] [<对象>]"
7658 #: builtin/notes.c:28
7659 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
7660 msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
7662 #: builtin/notes.c:29
7663 msgid "git notes [--ref <notes-ref>] show [<object>]"
7664 msgstr "git notes [--ref <注解引用>] show [<对象>]"
7666 #: builtin/notes.c:30
7668 "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
7669 msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
7671 #: builtin/notes.c:31
7672 msgid "git notes merge --commit [-v | -q]"
7673 msgstr "git notes merge --commit [-v | -q]"
7675 #: builtin/notes.c:32
7676 msgid "git notes merge --abort [-v | -q]"
7677 msgstr "git notes merge --abort [-v | -q]"
7679 #: builtin/notes.c:33
7680 msgid "git notes [--ref <notes-ref>] remove [<object>...]"
7681 msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
7683 #: builtin/notes.c:34
7684 msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
7685 msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
7687 #: builtin/notes.c:35
7688 msgid "git notes [--ref <notes-ref>] get-ref"
7689 msgstr "git notes [--ref <注解引用>] get-ref"
7691 #: builtin/notes.c:40
7692 msgid "git notes [list [<object>]]"
7693 msgstr "git notes [list [<对象>]]"
7695 #: builtin/notes.c:45
7696 msgid "git notes add [<options>] [<object>]"
7697 msgstr "git notes add [<选项>] [<对象>]"
7699 #: builtin/notes.c:50
7700 msgid "git notes copy [<options>] <from-object> <to-object>"
7701 msgstr "git notes copy [<选项>] <源对象> <目标对象>"
7703 #: builtin/notes.c:51
7704 msgid "git notes copy --stdin [<from-object> <to-object>]..."
7705 msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
7707 #: builtin/notes.c:56
7708 msgid "git notes append [<options>] [<object>]"
7709 msgstr "git notes append [<选项>] [<对象>]"
7711 #: builtin/notes.c:61
7712 msgid "git notes edit [<object>]"
7713 msgstr "git notes edit [<对象>]"
7715 #: builtin/notes.c:66
7716 msgid "git notes show [<object>]"
7717 msgstr "git notes show [<对象>]"
7719 #: builtin/notes.c:71
7720 msgid "git notes merge [<options>] <notes-ref>"
7721 msgstr "git notes merge [<选项>] <注解引用>"
7723 #: builtin/notes.c:72
7724 msgid "git notes merge --commit [<options>]"
7725 msgstr "git notes merge --commit [<选项>]"
7727 #: builtin/notes.c:73
7728 msgid "git notes merge --abort [<options>]"
7729 msgstr "git notes merge --abort [<选项>]"
7731 #: builtin/notes.c:78
7732 msgid "git notes remove [<object>]"
7733 msgstr "git notes remove [<对象>]"
7735 #: builtin/notes.c:83
7736 msgid "git notes prune [<options>]"
7737 msgstr "git notes prune [<选项>]"
7739 #: builtin/notes.c:88
7740 msgid "git notes get-ref"
7741 msgstr "git notes get-ref"
7743 #: builtin/notes.c:146
7745 msgid "unable to start 'show' for object '%s'"
7746 msgstr "不能为对象 '%s' 开始 'show'"
7748 #: builtin/notes.c:150
7749 msgid "could not read 'show' output"
7750 msgstr "不能读取 'show' 的输出"
7752 #: builtin/notes.c:158
7754 msgid "failed to finish 'show' for object '%s'"
7755 msgstr "无法为对象 '%s' 完成 'show'"
7757 #: builtin/notes.c:173 builtin/tag.c:477
7759 msgid "could not create file '%s'"
7760 msgstr "不能创建文件 '%s'"
7762 #: builtin/notes.c:192
7763 msgid "Please supply the note contents using either -m or -F option"
7764 msgstr "请通过 -m 或 -F 选项为注解提供内容"
7766 #: builtin/notes.c:201
7767 msgid "unable to write note object"
7770 #: builtin/notes.c:203
7772 msgid "The note contents have been left in %s"
7773 msgstr "注解内容被留在 %s 中"
7775 #: builtin/notes.c:231 builtin/tag.c:693
7777 msgid "cannot read '%s'"
7780 #: builtin/notes.c:233 builtin/tag.c:696
7782 msgid "could not open or read '%s'"
7783 msgstr "不能打开或读取 '%s'"
7785 #: builtin/notes.c:252 builtin/notes.c:303 builtin/notes.c:305
7786 #: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:506
7787 #: builtin/notes.c:511 builtin/notes.c:589 builtin/notes.c:652
7788 #: builtin/notes.c:854 builtin/tag.c:709
7790 msgid "Failed to resolve '%s' as a valid ref."
7791 msgstr "无法解析 '%s' 为一个有效引用。"
7793 #: builtin/notes.c:255
7795 msgid "Failed to read object '%s'."
7796 msgstr "无法读取对象 '%s'。"
7798 #: builtin/notes.c:259
7800 msgid "Cannot read note data from non-blob object '%s'."
7801 msgstr "不能从非数据对象 '%s' 中读取注解数据"
7803 #: builtin/notes.c:299
7805 msgid "Malformed input line: '%s'."
7806 msgstr "非法的输入行:'%s'。"
7808 #: builtin/notes.c:314
7810 msgid "Failed to copy notes from '%s' to '%s'"
7811 msgstr "无法从 '%s' 到 '%s' 拷贝注解"
7813 #: builtin/notes.c:358 builtin/notes.c:413 builtin/notes.c:489
7814 #: builtin/notes.c:501 builtin/notes.c:577 builtin/notes.c:645
7815 #: builtin/notes.c:919
7816 msgid "too many parameters"
7819 #: builtin/notes.c:371 builtin/notes.c:658
7821 msgid "No note found for object %s."
7822 msgstr "未发现对象 %s 的注解。"
7824 #: builtin/notes.c:392 builtin/notes.c:555
7825 msgid "note contents as a string"
7826 msgstr "注解内容作为一个字符串"
7828 #: builtin/notes.c:395 builtin/notes.c:558
7829 msgid "note contents in a file"
7832 #: builtin/notes.c:397 builtin/notes.c:400 builtin/notes.c:560
7833 #: builtin/notes.c:563 builtin/tag.c:628
7837 #: builtin/notes.c:398 builtin/notes.c:561
7838 msgid "reuse and edit specified note object"
7839 msgstr "重用和编辑指定的注解对象"
7841 #: builtin/notes.c:401 builtin/notes.c:564
7842 msgid "reuse specified note object"
7845 #: builtin/notes.c:404 builtin/notes.c:567
7846 msgid "allow storing empty note"
7849 #: builtin/notes.c:405 builtin/notes.c:476
7850 msgid "replace existing notes"
7853 #: builtin/notes.c:430
7856 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
7858 msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
7860 #: builtin/notes.c:445 builtin/notes.c:524
7862 msgid "Overwriting existing notes for object %s\n"
7863 msgstr "覆盖对象 %s 现存注解\n"
7865 #: builtin/notes.c:456 builtin/notes.c:617 builtin/notes.c:859
7867 msgid "Removing note for object %s\n"
7868 msgstr "删除对象 %s 的注解\n"
7870 #: builtin/notes.c:477
7871 msgid "read objects from stdin"
7874 #: builtin/notes.c:479
7875 msgid "load rewriting config for <command> (implies --stdin)"
7876 msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
7878 #: builtin/notes.c:497
7879 msgid "too few parameters"
7882 #: builtin/notes.c:518
7885 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
7887 msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
7889 #: builtin/notes.c:530
7891 msgid "Missing notes on source object %s. Cannot copy."
7892 msgstr "源对象 %s 缺少注解。不能拷贝。"
7894 #: builtin/notes.c:582
7897 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
7898 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
7900 "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
7901 "请换用 'git notes add -f -m/-F/-c/-C'。\n"
7903 #: builtin/notes.c:750
7904 msgid "General options"
7907 #: builtin/notes.c:752
7908 msgid "Merge options"
7911 #: builtin/notes.c:754
7913 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
7915 msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
7917 #: builtin/notes.c:756
7918 msgid "Committing unmerged notes"
7921 #: builtin/notes.c:758
7922 msgid "finalize notes merge by committing unmerged notes"
7923 msgstr "通过提交未合并的注解来完成注解合并"
7925 #: builtin/notes.c:760
7926 msgid "Aborting notes merge resolution"
7929 #: builtin/notes.c:762
7930 msgid "abort notes merge"
7933 #: builtin/notes.c:857
7935 msgid "Object %s has no note\n"
7936 msgstr "对象 %s 没有注解\n"
7938 #: builtin/notes.c:869
7939 msgid "attempt to remove non-existent note is not an error"
7940 msgstr "尝试删除不存在的注解不是一个错误"
7942 #: builtin/notes.c:872
7943 msgid "read object names from the standard input"
7944 msgstr "从标准输入读取对象名称"
7946 #: builtin/notes.c:953
7950 #: builtin/notes.c:954
7951 msgid "use notes from <notes-ref>"
7952 msgstr "从 <注解引用> 使用注解"
7954 #: builtin/notes.c:989 builtin/remote.c:1618
7956 msgid "Unknown subcommand: %s"
7959 #: builtin/pack-objects.c:28
7960 msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
7961 msgstr "git pack-objects --stdout [选项...] [< 引用列表 | < 对象列表]"
7963 #: builtin/pack-objects.c:29
7964 msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
7965 msgstr "git pack-objects [选项...] base-name [< 引用列表 | < 对象列表]"
7967 #: builtin/pack-objects.c:175 builtin/pack-objects.c:178
7969 msgid "deflate error (%d)"
7972 #: builtin/pack-objects.c:771
7973 msgid "Writing objects"
7976 #: builtin/pack-objects.c:1011
7977 msgid "disabling bitmap writing, as some objects are not being packed"
7978 msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
7980 #: builtin/pack-objects.c:2171
7981 msgid "Compressing objects"
7984 #: builtin/pack-objects.c:2568
7986 msgid "unsupported index version %s"
7987 msgstr "不支持的索引版本 %s"
7989 #: builtin/pack-objects.c:2572
7991 msgid "bad index version '%s'"
7992 msgstr "坏的索引版本 '%s'"
7994 #: builtin/pack-objects.c:2595
7996 msgid "option %s does not accept negative form"
7997 msgstr "选项 %s 不接受否定格式"
7999 #: builtin/pack-objects.c:2599
8001 msgid "unable to parse value '%s' for option %s"
8002 msgstr "不能解析选项 %1$s 的值 '%2$s'"
8004 #: builtin/pack-objects.c:2619
8005 msgid "do not show progress meter"
8008 #: builtin/pack-objects.c:2621
8009 msgid "show progress meter"
8012 #: builtin/pack-objects.c:2623
8013 msgid "show progress meter during object writing phase"
8014 msgstr "在对象写入阶段显示进度表"
8016 #: builtin/pack-objects.c:2626
8017 msgid "similar to --all-progress when progress meter is shown"
8018 msgstr "当进度表显示时类似于 --all-progress"
8020 #: builtin/pack-objects.c:2627
8021 msgid "version[,offset]"
8024 #: builtin/pack-objects.c:2628
8025 msgid "write the pack index file in the specified idx format version"
8026 msgstr "用指定的 idx 格式版本来写包索引文件"
8028 #: builtin/pack-objects.c:2631
8029 msgid "maximum size of each output pack file"
8032 #: builtin/pack-objects.c:2633
8033 msgid "ignore borrowed objects from alternate object store"
8034 msgstr "忽略从备用对象存储里借用对象"
8036 #: builtin/pack-objects.c:2635
8037 msgid "ignore packed objects"
8040 #: builtin/pack-objects.c:2637
8041 msgid "limit pack window by objects"
8044 #: builtin/pack-objects.c:2639
8045 msgid "limit pack window by memory in addition to object limit"
8046 msgstr "除对象数量限制外设置打包窗口的内存限制"
8048 #: builtin/pack-objects.c:2641
8049 msgid "maximum length of delta chain allowed in the resulting pack"
8050 msgstr "打包允许的 delta 链的最大长度"
8052 #: builtin/pack-objects.c:2643
8053 msgid "reuse existing deltas"
8054 msgstr "重用已存在的 deltas"
8056 #: builtin/pack-objects.c:2645
8057 msgid "reuse existing objects"
8060 #: builtin/pack-objects.c:2647
8061 msgid "use OFS_DELTA objects"
8062 msgstr "使用 OFS_DELTA 对象"
8064 #: builtin/pack-objects.c:2649
8065 msgid "use threads when searching for best delta matches"
8066 msgstr "使用线程查询最佳 delta 匹配"
8068 #: builtin/pack-objects.c:2651
8069 msgid "do not create an empty pack output"
8072 #: builtin/pack-objects.c:2653
8073 msgid "read revision arguments from standard input"
8074 msgstr "从标准输入读取版本号参数"
8076 #: builtin/pack-objects.c:2655
8077 msgid "limit the objects to those that are not yet packed"
8078 msgstr "限制那些尚未打包的对象"
8080 #: builtin/pack-objects.c:2658
8081 msgid "include objects reachable from any reference"
8082 msgstr "包括可以从任何引用访问到的对象"
8084 #: builtin/pack-objects.c:2661
8085 msgid "include objects referred by reflog entries"
8086 msgstr "包括被引用日志引用到的对象"
8088 #: builtin/pack-objects.c:2664
8089 msgid "include objects referred to by the index"
8090 msgstr "包括被索引引用到的对象"
8092 #: builtin/pack-objects.c:2667
8093 msgid "output pack to stdout"
8096 #: builtin/pack-objects.c:2669
8097 msgid "include tag objects that refer to objects to be packed"
8098 msgstr "包括那些引用了待打包对象的标签对象"
8100 #: builtin/pack-objects.c:2671
8101 msgid "keep unreachable objects"
8104 #: builtin/pack-objects.c:2672 parse-options.h:139
8108 #: builtin/pack-objects.c:2673
8109 msgid "unpack unreachable objects newer than <time>"
8110 msgstr "将比给定 <时间> 新的无法访问的对象解包"
8112 #: builtin/pack-objects.c:2676
8113 msgid "create thin packs"
8116 #: builtin/pack-objects.c:2678
8117 msgid "create packs suitable for shallow fetches"
8118 msgstr "创建适合浅克隆仓库获取的包"
8120 #: builtin/pack-objects.c:2680
8121 msgid "ignore packs that have companion .keep file"
8122 msgstr "忽略配有 .keep 文件的包"
8124 #: builtin/pack-objects.c:2682
8125 msgid "pack compression level"
8128 #: builtin/pack-objects.c:2684
8129 msgid "do not hide commits by grafts"
8132 #: builtin/pack-objects.c:2686
8133 msgid "use a bitmap index if available to speed up counting objects"
8134 msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
8136 #: builtin/pack-objects.c:2688
8137 msgid "write a bitmap index together with the pack index"
8138 msgstr "在建立包索引的同时创建 bitmap 索引"
8140 #: builtin/pack-objects.c:2779
8141 msgid "Counting objects"
8144 #: builtin/pack-refs.c:6
8145 msgid "git pack-refs [<options>]"
8146 msgstr "git pack-refs [<选项>]"
8148 #: builtin/pack-refs.c:14
8149 msgid "pack everything"
8152 #: builtin/pack-refs.c:15
8153 msgid "prune loose refs (default)"
8154 msgstr "清除松散的引用(默认)"
8156 #: builtin/prune-packed.c:7
8157 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
8158 msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
8160 #: builtin/prune-packed.c:40
8161 msgid "Removing duplicate objects"
8164 #: builtin/prune.c:11
8165 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
8166 msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
8168 #: builtin/prune.c:105 builtin/worktree.c:112
8169 msgid "do not remove, show only"
8172 #: builtin/prune.c:106 builtin/worktree.c:113
8173 msgid "report pruned objects"
8176 #: builtin/prune.c:109 builtin/worktree.c:115
8177 msgid "expire objects older than <time>"
8178 msgstr "使早于给定时间的对象过期"
8180 #: builtin/push.c:14
8181 msgid "git push [<options>] [<repository> [<refspec>...]]"
8182 msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
8184 #: builtin/push.c:85
8185 msgid "tag shorthand without <tag>"
8186 msgstr "标签后面未提供 <标签> 参数"
8188 #: builtin/push.c:95
8189 msgid "--delete only accepts plain target ref names"
8190 msgstr "--delete 只接受简单的目标引用名"
8192 #: builtin/push.c:139
8195 "To choose either option permanently, see push.default in 'git help config'."
8198 "为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
8200 #: builtin/push.c:142
8203 "The upstream branch of your current branch does not match\n"
8204 "the name of your current branch. To push to the upstream branch\n"
8205 "on the remote, use\n"
8207 " git push %s HEAD:%s\n"
8209 "To push to the branch of the same name on the remote, use\n"
8214 "如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
8217 " git push %s HEAD:%s\n"
8224 #: builtin/push.c:157
8227 "You are not currently on a branch.\n"
8228 "To push the history leading to the current (detached HEAD)\n"
8231 " git push %s HEAD:<name-of-remote-branch>\n"
8234 "现在为推送当前(分离头指针)的历史,使用\n"
8236 " git push %s HEAD:<远程分支名字>\n"
8238 #: builtin/push.c:171
8241 "The current branch %s has no upstream branch.\n"
8242 "To push the current branch and set the remote as upstream, use\n"
8244 " git push --set-upstream %s %s\n"
8246 "当前分支 %s 没有对应的上游分支。\n"
8247 "为推送当前分支并建立与远程上游的跟踪,使用\n"
8249 " git push --set-upstream %s %s\n"
8251 #: builtin/push.c:179
8253 msgid "The current branch %s has multiple upstream branches, refusing to push."
8254 msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
8256 #: builtin/push.c:182
8259 "You are pushing to remote '%s', which is not the upstream of\n"
8260 "your current branch '%s', without telling me what to push\n"
8261 "to update which remote branch."
8263 "您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
8264 "而没有告诉我要推送什么、更新哪个远程分支。"
8266 # 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
8267 #: builtin/push.c:205
8269 "push.default is unset; its implicit value has changed in\n"
8270 "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
8271 "and maintain the traditional behavior, use:\n"
8273 " git config --global push.default matching\n"
8275 "To squelch this message and adopt the new behavior now, use:\n"
8277 " git config --global push.default simple\n"
8279 "When push.default is set to 'matching', git will push local branches\n"
8280 "to the remote branches that already exist with the same name.\n"
8282 "Since Git 2.0, Git defaults to the more conservative 'simple'\n"
8283 "behavior, which only pushes the current branch to the corresponding\n"
8284 "remote branch that 'git pull' uses to update the current branch.\n"
8286 "See 'git help config' and search for 'push.default' for further "
8288 "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
8289 "'current' instead of 'simple' if you sometimes use older versions of Git)"
8291 "push.default 尚未设置,它的默认值在 Git 2.0 已从 'matching'\n"
8292 "变更为 'simple'。若要不再显示本信息并保持传统习惯,进行如下设置:\n"
8294 " git config --global push.default matching\n"
8296 "若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n"
8298 " git config --global push.default simple\n"
8300 "当 push.default 设置为 'matching' 后,git 将推送和远程同名的所有\n"
8303 "从 Git 2.0 开始,Git 默认采用更为保守的 'simple' 模式,只推送当前\n"
8304 "分支到远程关联的同名分支,即 'git push' 推送当前分支。\n"
8306 "参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
8307 "('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n"
8308 "为保持兼容,请用 'current' 代替 'simple')"
8310 #: builtin/push.c:272
8312 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
8313 msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。"
8315 #: builtin/push.c:279
8317 "Updates were rejected because the tip of your current branch is behind\n"
8318 "its remote counterpart. Integrate the remote changes (e.g.\n"
8319 "'git pull ...') before pushing again.\n"
8320 "See the 'Note about fast-forwards' in 'git push --help' for details."
8322 "更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
8323 "再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
8324 "'git push --help' 中的 'Note about fast-forwards' 小节。"
8326 #: builtin/push.c:285
8328 "Updates were rejected because a pushed branch tip is behind its remote\n"
8329 "counterpart. Check out this branch and integrate the remote changes\n"
8330 "(e.g. 'git pull ...') before pushing again.\n"
8331 "See the 'Note about fast-forwards' in 'git push --help' for details."
8333 "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
8334 "检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
8335 "'git push --help' 中的 'Note about fast-forwards' 小节。"
8337 #: builtin/push.c:291
8339 "Updates were rejected because the remote contains work that you do\n"
8340 "not have locally. This is usually caused by another repository pushing\n"
8341 "to the same ref. You may want to first integrate the remote changes\n"
8342 "(e.g., 'git pull ...') before pushing again.\n"
8343 "See the 'Note about fast-forwards' in 'git push --help' for details."
8345 "更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n"
8346 "一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
8347 "(如 'git pull ...')。\n"
8348 "详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
8350 #: builtin/push.c:298
8351 msgid "Updates were rejected because the tag already exists in the remote."
8352 msgstr "更新被拒绝,因为该标签在远程已经存在。"
8354 #: builtin/push.c:301
8356 "You cannot update a remote ref that points at a non-commit object,\n"
8357 "or update a remote ref to make it point at a non-commit object,\n"
8358 "without using the '--force' option.\n"
8360 "如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
8361 "也不能更新远程引用让其指向一个非提交对象。\n"
8363 #: builtin/push.c:360
8365 msgid "Pushing to %s\n"
8368 #: builtin/push.c:364
8370 msgid "failed to push some refs to '%s'"
8371 msgstr "无法推送一些引用到 '%s'"
8373 #: builtin/push.c:394
8375 msgid "bad repository '%s'"
8378 #: builtin/push.c:395
8380 "No configured push destination.\n"
8381 "Either specify the URL from the command-line or configure a remote "
8382 "repository using\n"
8384 " git remote add <name> <url>\n"
8386 "and then push using the remote name\n"
8388 " git push <name>\n"
8391 "或通过命令行指定URL,或用下面命令配置一个远程仓库\n"
8393 " git remote add <名称> <地址>\n"
8399 #: builtin/push.c:410
8400 msgid "--all and --tags are incompatible"
8401 msgstr "--all 和 --tags 不兼容"
8403 #: builtin/push.c:411
8404 msgid "--all can't be combined with refspecs"
8405 msgstr "--all 不能和引用规格同时使用"
8407 #: builtin/push.c:416
8408 msgid "--mirror and --tags are incompatible"
8409 msgstr "--mirror 和 --tags 不兼容"
8411 #: builtin/push.c:417
8412 msgid "--mirror can't be combined with refspecs"
8413 msgstr "--mirror 不能和引用规格同时使用"
8415 #: builtin/push.c:422
8416 msgid "--all and --mirror are incompatible"
8417 msgstr "--all 和 --mirror 不兼容"
8419 #: builtin/push.c:502
8423 #: builtin/push.c:503
8424 msgid "push all refs"
8427 #: builtin/push.c:504
8428 msgid "mirror all refs"
8431 #: builtin/push.c:506
8435 #: builtin/push.c:507
8436 msgid "push tags (can't be used with --all or --mirror)"
8437 msgstr "推送标签(不能使用 --all or --mirror)"
8439 #: builtin/push.c:510
8440 msgid "force updates"
8443 #: builtin/push.c:512
8444 msgid "refname>:<expect"
8447 #: builtin/push.c:513
8448 msgid "require old value of ref to be at this value"
8449 msgstr "要求引用旧的取值为设定值"
8451 #: builtin/push.c:516
8452 msgid "control recursive pushing of submodules"
8455 #: builtin/push.c:518
8456 msgid "use thin pack"
8459 #: builtin/push.c:519 builtin/push.c:520
8460 msgid "receive pack program"
8463 #: builtin/push.c:521
8464 msgid "set upstream for git pull/status"
8465 msgstr "设置 git pull/status 的上游"
8467 #: builtin/push.c:524
8468 msgid "prune locally removed refs"
8471 #: builtin/push.c:526
8472 msgid "bypass pre-push hook"
8473 msgstr "绕过 pre-push 钩子"
8475 #: builtin/push.c:527
8476 msgid "push missing but relevant tags"
8479 #: builtin/push.c:529
8480 msgid "GPG sign the push"
8481 msgstr "用 GPG 为推送签名"
8483 #: builtin/push.c:530
8484 msgid "request atomic transaction on remote side"
8487 #: builtin/push.c:539
8488 msgid "--delete is incompatible with --all, --mirror and --tags"
8489 msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
8491 #: builtin/push.c:541
8492 msgid "--delete doesn't make sense without any refs"
8493 msgstr "--delete 未接任何引用没有意义"
8495 #: builtin/read-tree.c:37
8497 "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
8498 "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
8499 "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
8501 "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>] [-"
8502 "u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
8503 "index-output=<文件>] (--empty | <树或提交1> [<树或提交2> [<树或提交3>]])"
8505 #: builtin/read-tree.c:110
8506 msgid "write resulting index to <file>"
8507 msgstr "将索引结果写入 <文件>"
8509 #: builtin/read-tree.c:113
8510 msgid "only empty the index"
8513 #: builtin/read-tree.c:115
8517 #: builtin/read-tree.c:117
8518 msgid "perform a merge in addition to a read"
8519 msgstr "读取之余再执行一个合并"
8521 #: builtin/read-tree.c:119
8522 msgid "3-way merge if no file level merging required"
8523 msgstr "如果没有文件级合并需要,执行三方合并"
8525 #: builtin/read-tree.c:121
8526 msgid "3-way merge in presence of adds and removes"
8527 msgstr "存在添加和删除时,也执行三方合并"
8529 #: builtin/read-tree.c:123
8530 msgid "same as -m, but discard unmerged entries"
8531 msgstr "类似于 -m,但丢弃未合并的条目"
8533 #: builtin/read-tree.c:124
8534 msgid "<subdirectory>/"
8537 #: builtin/read-tree.c:125
8538 msgid "read the tree into the index under <subdirectory>/"
8539 msgstr "读取树对象到索引的 <子目录>/ 下"
8541 #: builtin/read-tree.c:128
8542 msgid "update working tree with merge result"
8543 msgstr "用合并的结果更新工作区"
8545 #: builtin/read-tree.c:130
8549 #: builtin/read-tree.c:131
8550 msgid "allow explicitly ignored files to be overwritten"
8551 msgstr "允许忽略文件中设定的文件可以被覆盖"
8553 #: builtin/read-tree.c:134
8554 msgid "don't check the working tree after merging"
8557 #: builtin/read-tree.c:135
8558 msgid "don't update the index or the work tree"
8561 #: builtin/read-tree.c:137
8562 msgid "skip applying sparse checkout filter"
8563 msgstr "跳过应用稀疏检出过滤器"
8565 #: builtin/read-tree.c:139
8566 msgid "debug unpack-trees"
8567 msgstr "调试 unpack-trees"
8569 #: builtin/reflog.c:430
8571 msgid "%s' for '%s' is not a valid timestamp"
8572 msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
8574 #: builtin/reflog.c:547 builtin/reflog.c:552
8576 msgid "'%s' is not a valid timestamp"
8577 msgstr "'%s' 不是一个有效的时间戳"
8579 #: builtin/remote.c:12
8580 msgid "git remote [-v | --verbose]"
8581 msgstr "git remote [-v | --verbose]"
8583 #: builtin/remote.c:13
8585 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
8586 "mirror=<fetch|push>] <name> <url>"
8588 "git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
8589 "mirror=<fetch|push>] <名称> <地址>"
8591 #: builtin/remote.c:14 builtin/remote.c:33
8592 msgid "git remote rename <old> <new>"
8593 msgstr "git remote rename <旧名称> <新名称>"
8595 #: builtin/remote.c:15 builtin/remote.c:38
8596 msgid "git remote remove <name>"
8597 msgstr "git remote remove <名称>"
8599 #: builtin/remote.c:16 builtin/remote.c:43
8600 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
8601 msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
8603 #: builtin/remote.c:17
8604 msgid "git remote [-v | --verbose] show [-n] <name>"
8605 msgstr "git remote [-v | --verbose] show [-n] <名称>"
8607 #: builtin/remote.c:18
8608 msgid "git remote prune [-n | --dry-run] <name>"
8609 msgstr "git remote prune [-n | --dry-run] <名称>"
8611 #: builtin/remote.c:19
8613 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
8614 msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
8616 #: builtin/remote.c:20
8617 msgid "git remote set-branches [--add] <name> <branch>..."
8618 msgstr "git remote set-branches [--add] <名称> <分支>..."
8620 #: builtin/remote.c:21 builtin/remote.c:69
8621 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
8622 msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
8624 #: builtin/remote.c:22 builtin/remote.c:70
8625 msgid "git remote set-url --add <name> <newurl>"
8626 msgstr "git remote set-url --add <名称> <新的地址>"
8628 #: builtin/remote.c:23 builtin/remote.c:71
8629 msgid "git remote set-url --delete <name> <url>"
8630 msgstr "git remote set-url --delete <名称> <地址>"
8632 #: builtin/remote.c:28
8633 msgid "git remote add [<options>] <name> <url>"
8634 msgstr "git remote add [<选项>] <名称> <地址>"
8636 #: builtin/remote.c:48
8637 msgid "git remote set-branches <name> <branch>..."
8638 msgstr "git remote set-branches <名称> <分支>..."
8640 #: builtin/remote.c:49
8641 msgid "git remote set-branches --add <name> <branch>..."
8642 msgstr "git remote set-branches --add <名称> <分支>..."
8644 #: builtin/remote.c:54
8645 msgid "git remote show [<options>] <name>"
8646 msgstr "git remote show [<选项>] <名称>"
8648 #: builtin/remote.c:59
8649 msgid "git remote prune [<options>] <name>"
8650 msgstr "git remote prune [<选项>] <名称>"
8652 #: builtin/remote.c:64
8653 msgid "git remote update [<options>] [<group> | <remote>]..."
8654 msgstr "git remote update [<选项>] [<组> | <远程>]..."
8656 #: builtin/remote.c:88
8661 #: builtin/remote.c:120
8663 "--mirror is dangerous and deprecated; please\n"
8664 "\t use --mirror=fetch or --mirror=push instead"
8666 "--mirror 选项危险且过时,请使用 --mirror=fetch\n"
8667 "\t 或 --mirror=push"
8669 #: builtin/remote.c:137
8671 msgid "unknown mirror argument: %s"
8674 #: builtin/remote.c:153
8675 msgid "fetch the remote branches"
8678 #: builtin/remote.c:155
8679 msgid "import all tags and associated objects when fetching"
8680 msgstr "抓取时导入所有的标签和关联对象"
8682 #: builtin/remote.c:158
8683 msgid "or do not fetch any tag at all (--no-tags)"
8684 msgstr "或不抓取任何标签(--no-tags)"
8686 #: builtin/remote.c:160
8687 msgid "branch(es) to track"
8690 #: builtin/remote.c:161
8691 msgid "master branch"
8694 #: builtin/remote.c:162
8698 #: builtin/remote.c:163
8699 msgid "set up remote as a mirror to push to or fetch from"
8700 msgstr "把远程设置为用以推送或抓取的镜像"
8702 #: builtin/remote.c:175
8703 msgid "specifying a master branch makes no sense with --mirror"
8704 msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
8706 #: builtin/remote.c:177
8707 msgid "specifying branches to track makes sense only with fetch mirrors"
8708 msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
8710 #: builtin/remote.c:187 builtin/remote.c:640
8712 msgid "remote %s already exists."
8713 msgstr "远程 %s 已经存在。"
8715 #: builtin/remote.c:191 builtin/remote.c:644
8717 msgid "'%s' is not a valid remote name"
8718 msgstr "'%s' 不是一个有效的远程名称"
8720 #: builtin/remote.c:235
8722 msgid "Could not setup master '%s'"
8723 msgstr "无法设置 master '%s'"
8725 #: builtin/remote.c:335
8727 msgid "Could not get fetch map for refspec %s"
8728 msgstr "无法得到引用规格 %s 的获取列表"
8730 #: builtin/remote.c:436 builtin/remote.c:444
8734 #: builtin/remote.c:448
8738 #: builtin/remote.c:589 builtin/remote.c:595 builtin/remote.c:601
8740 msgid "Could not append '%s' to '%s'"
8741 msgstr "不能添加 '%s' 至 '%s'"
8743 #: builtin/remote.c:633 builtin/remote.c:792 builtin/remote.c:892
8745 msgid "No such remote: %s"
8748 #: builtin/remote.c:650
8750 msgid "Could not rename config section '%s' to '%s'"
8751 msgstr "不能重命名配置小节 '%s' 到 '%s'"
8753 #: builtin/remote.c:656 builtin/remote.c:844
8755 msgid "Could not remove config section '%s'"
8756 msgstr "不能移除配置小节 '%s'"
8758 #: builtin/remote.c:671
8761 "Not updating non-default fetch refspec\n"
8763 "\tPlease update the configuration manually if necessary."
8769 #: builtin/remote.c:677
8771 msgid "Could not append '%s'"
8774 #: builtin/remote.c:688
8776 msgid "Could not set '%s'"
8779 #: builtin/remote.c:710
8781 msgid "deleting '%s' failed"
8784 #: builtin/remote.c:744
8786 msgid "creating '%s' failed"
8789 #: builtin/remote.c:763
8791 msgid "Could not remove branch %s"
8794 #: builtin/remote.c:830
8796 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
8797 "to delete it, use:"
8799 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
8800 "to delete them, use:"
8801 msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
8802 msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
8804 #: builtin/remote.c:945
8806 msgid " new (next fetch will store in remotes/%s)"
8807 msgstr " 新的(下一次获取将存储于 remotes/%s)"
8809 #: builtin/remote.c:948
8813 #: builtin/remote.c:950
8814 msgid " stale (use 'git remote prune' to remove)"
8815 msgstr " 过时(使用 'git remote prune' 来移除)"
8817 #: builtin/remote.c:952
8821 #: builtin/remote.c:993
8823 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
8824 msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
8826 #: builtin/remote.c:1000
8828 msgid "rebases onto remote %s"
8831 #: builtin/remote.c:1003
8833 msgid " merges with remote %s"
8836 #: builtin/remote.c:1004
8837 msgid " and with remote"
8840 #: builtin/remote.c:1006
8842 msgid "merges with remote %s"
8845 #: builtin/remote.c:1007
8846 msgid " and with remote"
8849 #: builtin/remote.c:1053
8853 #: builtin/remote.c:1056
8857 #: builtin/remote.c:1060
8861 #: builtin/remote.c:1063
8862 msgid "fast-forwardable"
8865 #: builtin/remote.c:1066
8866 msgid "local out of date"
8869 #: builtin/remote.c:1073
8871 msgid " %-*s forces to %-*s (%s)"
8872 msgstr " %-*s 强制推送至 %-*s (%s)"
8874 #: builtin/remote.c:1076
8876 msgid " %-*s pushes to %-*s (%s)"
8877 msgstr " %-*s 推送至 %-*s (%s)"
8879 #: builtin/remote.c:1080
8881 msgid " %-*s forces to %s"
8882 msgstr " %-*s 强制推送至 %s"
8884 #: builtin/remote.c:1083
8886 msgid " %-*s pushes to %s"
8887 msgstr " %-*s 推送至 %s"
8889 #: builtin/remote.c:1151
8890 msgid "do not query remotes"
8893 #: builtin/remote.c:1178
8898 #: builtin/remote.c:1179
8900 msgid " Fetch URL: %s"
8903 #: builtin/remote.c:1180 builtin/remote.c:1331
8907 #: builtin/remote.c:1189 builtin/remote.c:1191
8909 msgid " Push URL: %s"
8912 #: builtin/remote.c:1193 builtin/remote.c:1195 builtin/remote.c:1197
8914 msgid " HEAD branch: %s"
8917 #: builtin/remote.c:1199
8920 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
8921 msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
8923 #: builtin/remote.c:1211
8925 msgid " Remote branch:%s"
8926 msgid_plural " Remote branches:%s"
8927 msgstr[0] " 远程分支:%s"
8928 msgstr[1] " 远程分支:%s"
8930 # 译者:中文字符串拼接,可删除前导空格
8931 #: builtin/remote.c:1214 builtin/remote.c:1241
8932 msgid " (status not queried)"
8935 #: builtin/remote.c:1223
8936 msgid " Local branch configured for 'git pull':"
8937 msgid_plural " Local branches configured for 'git pull':"
8938 msgstr[0] " 为 'git pull' 配置的本地分支:"
8939 msgstr[1] " 为 'git pull' 配置的本地分支:"
8941 #: builtin/remote.c:1231
8942 msgid " Local refs will be mirrored by 'git push'"
8943 msgstr " 本地引用将在 'git push' 时被镜像"
8945 #: builtin/remote.c:1238
8947 msgid " Local ref configured for 'git push'%s:"
8948 msgid_plural " Local refs configured for 'git push'%s:"
8949 msgstr[0] " 为 'git push' 配置的本地引用%s:"
8950 msgstr[1] " 为 'git push' 配置的本地引用%s:"
8952 #: builtin/remote.c:1259
8953 msgid "set refs/remotes/<name>/HEAD according to remote"
8954 msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
8956 #: builtin/remote.c:1261
8957 msgid "delete refs/remotes/<name>/HEAD"
8958 msgstr "删除 refs/remotes/<名称>/HEAD"
8960 #: builtin/remote.c:1276
8961 msgid "Cannot determine remote HEAD"
8962 msgstr "无法确定远程 HEAD"
8964 #: builtin/remote.c:1278
8965 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
8966 msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
8968 #: builtin/remote.c:1288
8970 msgid "Could not delete %s"
8973 #: builtin/remote.c:1296
8975 msgid "Not a valid ref: %s"
8976 msgstr "不是一个有效引用:%s"
8978 #: builtin/remote.c:1298
8980 msgid "Could not setup %s"
8984 #: builtin/remote.c:1316
8986 msgid " %s will become dangling!"
8987 msgstr " %s 将成为摇摆状态!"
8990 #: builtin/remote.c:1317
8992 msgid " %s has become dangling!"
8993 msgstr " %s 已成为摇摆状态!"
8995 #: builtin/remote.c:1327
9000 #: builtin/remote.c:1328
9005 #: builtin/remote.c:1351
9007 msgid " * [would prune] %s"
9008 msgstr " * [将删除] %s"
9010 #: builtin/remote.c:1354
9012 msgid " * [pruned] %s"
9013 msgstr " * [已删除] %s"
9015 #: builtin/remote.c:1399
9016 msgid "prune remotes after fetching"
9019 #: builtin/remote.c:1465 builtin/remote.c:1539
9021 msgid "No such remote '%s'"
9024 #: builtin/remote.c:1485
9028 #: builtin/remote.c:1492
9029 msgid "no remote specified"
9032 #: builtin/remote.c:1514
9033 msgid "manipulate push URLs"
9036 #: builtin/remote.c:1516
9040 #: builtin/remote.c:1518
9044 #: builtin/remote.c:1525
9045 msgid "--add --delete doesn't make sense"
9046 msgstr "--add --delete 无意义"
9048 #: builtin/remote.c:1565
9050 msgid "Invalid old URL pattern: %s"
9051 msgstr "无效的旧URL匹配模版:%s"
9053 #: builtin/remote.c:1573
9055 msgid "No such URL found: %s"
9058 #: builtin/remote.c:1575
9059 msgid "Will not delete all non-push URLs"
9060 msgstr "将不会删除所有非推送URL地址"
9062 #: builtin/remote.c:1589
9063 msgid "be verbose; must be placed before a subcommand"
9064 msgstr "冗长输出;必须置于子命令之前"
9066 #: builtin/repack.c:17
9067 msgid "git repack [<options>]"
9068 msgstr "git repack [<选项>]"
9070 #: builtin/repack.c:159
9071 msgid "pack everything in a single pack"
9072 msgstr "所有内容打包到一个包文件中"
9074 #: builtin/repack.c:161
9075 msgid "same as -a, and turn unreachable objects loose"
9076 msgstr "和 -a 相同,并将不可达的对象设为松散对象"
9078 #: builtin/repack.c:164
9079 msgid "remove redundant packs, and run git-prune-packed"
9080 msgstr "删除多余的包,运行 git-prune-packed"
9082 #: builtin/repack.c:166
9083 msgid "pass --no-reuse-delta to git-pack-objects"
9084 msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
9086 #: builtin/repack.c:168
9087 msgid "pass --no-reuse-object to git-pack-objects"
9088 msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
9090 #: builtin/repack.c:170
9091 msgid "do not run git-update-server-info"
9092 msgstr "不运行 git-update-server-info"
9094 #: builtin/repack.c:173
9095 msgid "pass --local to git-pack-objects"
9096 msgstr "向 git-pack-objects 传递参数 --local"
9098 #: builtin/repack.c:175
9099 msgid "write bitmap index"
9100 msgstr "写 bitmap 索引"
9102 #: builtin/repack.c:176
9106 #: builtin/repack.c:177
9107 msgid "with -A, do not loosen objects older than this"
9108 msgstr "使用 -A,不要将早于给定时间的对象过期"
9110 #: builtin/repack.c:179
9111 msgid "size of the window used for delta compression"
9114 #: builtin/repack.c:180 builtin/repack.c:184
9118 #: builtin/repack.c:181
9119 msgid "same as the above, but limit memory size instead of entries count"
9120 msgstr "和上面的相似,但限制内存大小而非条目数"
9122 #: builtin/repack.c:183
9123 msgid "limits the maximum delta depth"
9126 #: builtin/repack.c:185
9127 msgid "maximum size of each packfile"
9130 #: builtin/repack.c:187
9131 msgid "repack objects in packs marked with .keep"
9132 msgstr "对标记为 .keep 的包中的对象重新打包"
9134 #: builtin/repack.c:377
9136 msgid "removing '%s' failed"
9139 #: builtin/replace.c:19
9140 msgid "git replace [-f] <object> <replacement>"
9141 msgstr "git replace [-f] <对象> <替换物>"
9143 #: builtin/replace.c:20
9144 msgid "git replace [-f] --edit <object>"
9145 msgstr "git replace [-f] --edit <对象>"
9147 #: builtin/replace.c:21
9148 msgid "git replace [-f] --graft <commit> [<parent>...]"
9149 msgstr "git replace [-f] --graft <提交> [<父提交>...]"
9151 #: builtin/replace.c:22
9152 msgid "git replace -d <object>..."
9153 msgstr "git replace -d <对象>..."
9155 #: builtin/replace.c:23
9156 msgid "git replace [--format=<format>] [-l [<pattern>]]"
9157 msgstr "git replace [--format=<格式>] [-l [<模式>]]"
9159 #: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
9161 msgid "Not a valid object name: '%s'"
9162 msgstr "不是一个有效的对象名:'%s'"
9164 #: builtin/replace.c:355
9166 msgid "bad mergetag in commit '%s'"
9167 msgstr "提交 '%s' 中含有损坏的合并标签"
9169 #: builtin/replace.c:357
9171 msgid "malformed mergetag in commit '%s'"
9172 msgstr "提交 '%s' 中含有非法的合并标签"
9174 #: builtin/replace.c:368
9177 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
9178 "instead of --graft"
9179 msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft"
9181 #: builtin/replace.c:401
9183 msgid "the original commit '%s' has a gpg signature."
9184 msgstr "原始提交 '%s' 中包含一个 GPG 签名"
9186 #: builtin/replace.c:402
9187 msgid "the signature will be removed in the replacement commit!"
9188 msgstr "在替换的提交中签名将被移除!"
9190 #: builtin/replace.c:408
9192 msgid "could not write replacement commit for: '%s'"
9193 msgstr "不能为 '%s' 写替换提交"
9195 #: builtin/replace.c:432
9196 msgid "list replace refs"
9199 #: builtin/replace.c:433
9200 msgid "delete replace refs"
9203 #: builtin/replace.c:434
9204 msgid "edit existing object"
9207 #: builtin/replace.c:435
9208 msgid "change a commit's parents"
9211 #: builtin/replace.c:436
9212 msgid "replace the ref if it exists"
9215 #: builtin/replace.c:437
9216 msgid "do not pretty-print contents for --edit"
9217 msgstr "不要为 --edit 操作美观显示内容"
9219 #: builtin/replace.c:438
9220 msgid "use this format"
9223 #: builtin/rerere.c:12
9224 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
9225 msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
9227 #: builtin/rerere.c:57
9228 msgid "register clean resolutions in index"
9229 msgstr "在索引中注册干净的解决方案"
9231 #: builtin/reset.c:26
9233 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
9234 msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
9236 #: builtin/reset.c:27
9237 msgid "git reset [-q] <tree-ish> [--] <paths>..."
9238 msgstr "git reset [-q] <树或提交> [--] <路径>..."
9240 #: builtin/reset.c:28
9241 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
9242 msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
9244 #: builtin/reset.c:34
9248 #: builtin/reset.c:34
9252 #: builtin/reset.c:34
9256 #: builtin/reset.c:34
9260 #: builtin/reset.c:34
9264 #: builtin/reset.c:74
9265 msgid "You do not have a valid HEAD."
9266 msgstr "您没有一个有效的 HEAD。"
9268 #: builtin/reset.c:76
9269 msgid "Failed to find tree of HEAD."
9270 msgstr "无法找到 HEAD 指向的树。"
9272 #: builtin/reset.c:82
9274 msgid "Failed to find tree of %s."
9275 msgstr "无法找到 %s 指向的树。"
9277 #: builtin/reset.c:100
9279 msgid "HEAD is now at %s"
9280 msgstr "HEAD 现在位于 %s"
9282 # 译者:汉字之间无空格,故删除%s前后空格
9283 #: builtin/reset.c:183
9285 msgid "Cannot do a %s reset in the middle of a merge."
9286 msgstr "在合并过程中不能做%s重置操作。"
9288 #: builtin/reset.c:276
9289 msgid "be quiet, only report errors"
9292 #: builtin/reset.c:278
9293 msgid "reset HEAD and index"
9294 msgstr "重置 HEAD 和索引"
9296 #: builtin/reset.c:279
9297 msgid "reset only HEAD"
9300 #: builtin/reset.c:281 builtin/reset.c:283
9301 msgid "reset HEAD, index and working tree"
9302 msgstr "重置 HEAD、索引和工作区"
9304 #: builtin/reset.c:285
9305 msgid "reset HEAD but keep local changes"
9306 msgstr "重置 HEAD 但保存本地变更"
9308 #: builtin/reset.c:288
9309 msgid "record only the fact that removed paths will be added later"
9310 msgstr "将删除的路径标记为稍后添加"
9312 #: builtin/reset.c:305
9314 msgid "Failed to resolve '%s' as a valid revision."
9315 msgstr "无法将 '%s' 解析为一个有效的版本。"
9317 #: builtin/reset.c:308 builtin/reset.c:316
9319 msgid "Could not parse object '%s'."
9320 msgstr "不能解析对象 '%s'。"
9322 #: builtin/reset.c:313
9324 msgid "Failed to resolve '%s' as a valid tree."
9325 msgstr "无法将 '%s' 解析为一个有效的树对象。"
9327 #: builtin/reset.c:322
9328 msgid "--patch is incompatible with --{hard,mixed,soft}"
9329 msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
9331 #: builtin/reset.c:331
9332 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
9333 msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。"
9335 # 译者:汉字之间无空格,故删除%s前后空格
9336 #: builtin/reset.c:333
9338 msgid "Cannot do %s reset with paths."
9339 msgstr "不能带路径进行%s重置。"
9341 # 译者:汉字之间无空格,故删除%s前后空格
9342 #: builtin/reset.c:343
9344 msgid "%s reset is not allowed in a bare repository"
9345 msgstr "不能对纯仓库进行%s重置"
9347 #: builtin/reset.c:347
9348 msgid "-N can only be used with --mixed"
9349 msgstr "-N 只能和 --mixed 同时使用"
9351 #: builtin/reset.c:364
9352 msgid "Unstaged changes after reset:"
9353 msgstr "重置后取消暂存的变更:"
9355 #: builtin/reset.c:370
9357 msgid "Could not reset index file to revision '%s'."
9358 msgstr "不能重置索引文件至版本 '%s'。"
9360 #: builtin/reset.c:374
9361 msgid "Could not write new index file."
9362 msgstr "不能写入新的索引文件。"
9364 #: builtin/rev-parse.c:361
9365 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
9366 msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
9368 #: builtin/rev-parse.c:366
9369 msgid "keep the `--` passed as an arg"
9370 msgstr "保持 `--` 作为一个参数传递"
9372 #: builtin/rev-parse.c:368
9373 msgid "stop parsing after the first non-option argument"
9374 msgstr "遇到第一个非选项参数后停止解析"
9376 #: builtin/rev-parse.c:371
9377 msgid "output in stuck long form"
9380 #: builtin/rev-parse.c:499
9382 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
9383 " or: git rev-parse --sq-quote [<arg>...]\n"
9384 " or: git rev-parse [<options>] [<arg>...]\n"
9386 "Run \"git rev-parse --parseopt -h\" for more information on the first usage."
9388 "git rev-parse --parseopt [<选项>] -- [<参数>...]\n"
9389 " 或者:git rev-parse --sq-quote [<参数>...]\n"
9390 " 或者:git rev-parse [<选项>] [<参数>...]\n"
9392 "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
9394 #: builtin/revert.c:22
9395 msgid "git revert [<options>] <commit-ish>..."
9396 msgstr "git revert [<选项>] <提交号>..."
9398 #: builtin/revert.c:23
9399 msgid "git revert <subcommand>"
9400 msgstr "git revert <子命令>"
9402 #: builtin/revert.c:28
9403 msgid "git cherry-pick [<options>] <commit-ish>..."
9404 msgstr "git cherry-pick [<选项>] <提交号>..."
9406 #: builtin/revert.c:29
9407 msgid "git cherry-pick <subcommand>"
9408 msgstr "git cherry-pick <子命令>"
9410 #: builtin/revert.c:71
9412 msgid "%s: %s cannot be used with %s"
9413 msgstr "%s:%s 不能和 %s 同时使用"
9415 #: builtin/revert.c:80
9416 msgid "end revert or cherry-pick sequence"
9419 #: builtin/revert.c:81
9420 msgid "resume revert or cherry-pick sequence"
9423 #: builtin/revert.c:82
9424 msgid "cancel revert or cherry-pick sequence"
9427 #: builtin/revert.c:83
9428 msgid "don't automatically commit"
9431 #: builtin/revert.c:84
9432 msgid "edit the commit message"
9435 #: builtin/revert.c:87
9436 msgid "parent number"
9439 #: builtin/revert.c:89
9440 msgid "merge strategy"
9443 #: builtin/revert.c:90
9447 #: builtin/revert.c:91
9448 msgid "option for merge strategy"
9451 #: builtin/revert.c:104
9452 msgid "append commit name"
9455 #: builtin/revert.c:105
9456 msgid "allow fast-forward"
9459 #: builtin/revert.c:106
9460 msgid "preserve initially empty commits"
9463 #: builtin/revert.c:107
9464 msgid "allow commits with empty messages"
9467 #: builtin/revert.c:108
9468 msgid "keep redundant, empty commits"
9471 #: builtin/revert.c:112
9472 msgid "program error"
9475 #: builtin/revert.c:197
9476 msgid "revert failed"
9479 #: builtin/revert.c:212
9480 msgid "cherry-pick failed"
9484 msgid "git rm [<options>] [--] <file>..."
9485 msgstr "git rm [<选项>] [--] <文件>..."
9489 "the following submodule (or one of its nested submodules)\n"
9490 "uses a .git directory:"
9492 "the following submodules (or one of their nested submodules)\n"
9493 "use a .git directory:"
9494 msgstr[0] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
9495 msgstr[1] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
9500 "(use 'rm -rf' if you really want to remove it including all of its history)"
9503 "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
9507 "the following file has staged content different from both the\n"
9508 "file and the HEAD:"
9510 "the following files have staged content different from both the\n"
9511 "file and the HEAD:"
9512 msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
9513 msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
9518 "(use -f to force removal)"
9524 msgid "the following file has changes staged in the index:"
9525 msgid_plural "the following files have changes staged in the index:"
9526 msgstr[0] "下列文件索引中有变更"
9527 msgstr[1] "下列文件索引中有变更"
9529 #: builtin/rm.c:243 builtin/rm.c:254
9532 "(use --cached to keep the file, or -f to force removal)"
9535 "(使用 --cached 保留本地文件,或用 -f 强制删除)"
9538 msgid "the following file has local modifications:"
9539 msgid_plural "the following files have local modifications:"
9540 msgstr[0] "如下文件有本地修改:"
9541 msgstr[1] "如下文件有本地修改:"
9544 msgid "do not list removed files"
9548 msgid "only remove from the index"
9552 msgid "override the up-to-date check"
9556 msgid "allow recursive removal"
9560 msgid "exit with a zero status even if nothing matched"
9561 msgstr "即使没有匹配,也以零状态退出"
9564 msgid "Please, stage your changes to .gitmodules or stash them to proceed"
9565 msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续"
9569 msgid "not removing '%s' recursively without -r"
9570 msgstr "未提供 -r 选项不会递归删除 '%s'"
9574 msgid "git rm: unable to remove %s"
9575 msgstr "git rm:不能删除 %s"
9577 #: builtin/shortlog.c:13
9578 msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
9579 msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
9581 #: builtin/shortlog.c:131
9583 msgid "Missing author: %s"
9586 #: builtin/shortlog.c:230
9587 msgid "sort output according to the number of commits per author"
9588 msgstr "根据每个作者的提交数量排序"
9590 #: builtin/shortlog.c:232
9591 msgid "Suppress commit descriptions, only provides commit count"
9592 msgstr "隐藏提交说明,只提供提交数量"
9594 #: builtin/shortlog.c:234
9595 msgid "Show the email address of each author"
9596 msgstr "显示每个作者的电子邮件地址"
9598 #: builtin/shortlog.c:235
9600 msgstr "w[,i1[,i2]]"
9602 #: builtin/shortlog.c:236
9603 msgid "Linewrap output"
9606 #: builtin/show-branch.c:9
9608 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
9609 "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
9610 "\t\t[--more=<n> | --list | --independent | --merge-base]\n"
9611 "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
9613 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
9614 "\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
9615 "\t\t[--more=<n> | --list | --independent | --merge-base]\n"
9616 "\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
9618 #: builtin/show-branch.c:13
9619 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
9620 msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]"
9622 #: builtin/show-branch.c:659
9623 msgid "show remote-tracking and local branches"
9624 msgstr "显示远程跟踪的和本地的分支"
9626 #: builtin/show-branch.c:661
9627 msgid "show remote-tracking branches"
9630 #: builtin/show-branch.c:663
9631 msgid "color '*!+-' corresponding to the branch"
9632 msgstr "着色 '*!+-' 到相应的分支"
9634 #: builtin/show-branch.c:665
9635 msgid "show <n> more commits after the common ancestor"
9636 msgstr "显示共同祖先后的 <n> 个提交"
9638 #: builtin/show-branch.c:667
9639 msgid "synonym to more=-1"
9640 msgstr "和 more=-1 同义"
9642 #: builtin/show-branch.c:668
9643 msgid "suppress naming strings"
9646 #: builtin/show-branch.c:670
9647 msgid "include the current branch"
9650 #: builtin/show-branch.c:672
9651 msgid "name commits with their object names"
9654 #: builtin/show-branch.c:674
9655 msgid "show possible merge bases"
9658 #: builtin/show-branch.c:676
9659 msgid "show refs unreachable from any other ref"
9660 msgstr "显示没有任何引用的的引用"
9662 #: builtin/show-branch.c:678
9663 msgid "show commits in topological order"
9666 #: builtin/show-branch.c:681
9667 msgid "show only commits not on the first branch"
9668 msgstr "只显示不在第一个分支上的提交"
9670 #: builtin/show-branch.c:683
9671 msgid "show merges reachable from only one tip"
9672 msgstr "显示仅一个分支可访问的合并提交"
9674 #: builtin/show-branch.c:685
9675 msgid "topologically sort, maintaining date order where possible"
9676 msgstr "拓扑方式排序,并尽可能地保持日期顺序"
9678 #: builtin/show-branch.c:688
9679 msgid "<n>[,<base>]"
9680 msgstr "<n>[,<base>]"
9682 #: builtin/show-branch.c:689
9683 msgid "show <n> most recent ref-log entries starting at base"
9684 msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
9686 #: builtin/show-ref.c:10
9688 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
9689 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
9691 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
9692 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
9694 #: builtin/show-ref.c:11
9695 msgid "git show-ref --exclude-existing[=pattern] < ref-list"
9696 msgstr "git show-ref --exclude-existing[=模式] < 引用列表"
9698 #: builtin/show-ref.c:170
9699 msgid "only show tags (can be combined with heads)"
9700 msgstr "只显示标签(可以和头共用)"
9702 #: builtin/show-ref.c:171
9703 msgid "only show heads (can be combined with tags)"
9704 msgstr "只显示头(可以和标签共用)"
9706 #: builtin/show-ref.c:172
9707 msgid "stricter reference checking, requires exact ref path"
9708 msgstr "更严格的引用检测,需要精确的引用路径"
9710 #: builtin/show-ref.c:175 builtin/show-ref.c:177
9711 msgid "show the HEAD reference, even if it would be filtered out"
9712 msgstr "显示 HEAD 引用,即使被过滤掉"
9714 #: builtin/show-ref.c:179
9715 msgid "dereference tags into object IDs"
9718 #: builtin/show-ref.c:181
9719 msgid "only show SHA1 hash using <n> digits"
9720 msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
9722 #: builtin/show-ref.c:185
9723 msgid "do not print results to stdout (useful with --verify)"
9724 msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
9726 #: builtin/show-ref.c:187
9727 msgid "show refs from stdin that aren't in local repository"
9728 msgstr "显示从标准输入中读入的不在本地仓库中的引用"
9730 #: builtin/symbolic-ref.c:7
9731 msgid "git symbolic-ref [<options>] <name> [<ref>]"
9732 msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
9734 #: builtin/symbolic-ref.c:8
9735 msgid "git symbolic-ref -d [-q] <name>"
9736 msgstr "git symbolic-ref -d [-q] <名称>"
9738 #: builtin/symbolic-ref.c:40
9739 msgid "suppress error message for non-symbolic (detached) refs"
9740 msgstr "不显示非符号(分离的)引用的错误信息"
9742 #: builtin/symbolic-ref.c:41
9743 msgid "delete symbolic ref"
9746 #: builtin/symbolic-ref.c:42
9747 msgid "shorten ref output"
9750 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:358
9754 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:358
9755 msgid "reason of the update"
9760 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
9763 "git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]"
9766 msgid "git tag -d <tagname>..."
9767 msgstr "git tag -d <标签名>..."
9771 "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
9772 "\t\t[<pattern>...]"
9774 "git tag -l [-n[<数字>]] [--contains <提交>] [--points-at <对象>] [<模式>...]"
9777 msgid "git tag -v <tagname>..."
9778 msgstr "git tag -v <标签名>..."
9782 msgid "malformed object at '%s'"
9783 msgstr "非法的对象于 '%s'"
9785 #: builtin/tag.c:301
9787 msgid "tag name too long: %.*s..."
9788 msgstr "标签名称太长:%.*s..."
9790 #: builtin/tag.c:306
9792 msgid "tag '%s' not found."
9793 msgstr "未发现标签 '%s'。"
9795 #: builtin/tag.c:321
9797 msgid "Deleted tag '%s' (was %s)\n"
9798 msgstr "已删除标签 '%s'(曾为 %s)\n"
9800 #: builtin/tag.c:333
9802 msgid "could not verify the tag '%s'"
9803 msgstr "不能校验该标签 '%s'"
9805 #: builtin/tag.c:343
9809 "Write a message for tag:\n"
9811 "Lines starting with '%c' will be ignored.\n"
9816 "以 '%c' 开头的行将被忽略。\n"
9818 #: builtin/tag.c:347
9822 "Write a message for tag:\n"
9824 "Lines starting with '%c' will be kept; you may remove them yourself if you "
9830 "以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
9832 #: builtin/tag.c:371
9834 msgid "unsupported sort specification '%s'"
9835 msgstr "不支持的排序规格 '%s'"
9837 #: builtin/tag.c:373
9839 msgid "unsupported sort specification '%s' in variable '%s'"
9840 msgstr "不支持变量 '%2$s' 的排序规格 '%1$s'"
9842 #: builtin/tag.c:428
9843 msgid "unable to sign the tag"
9846 #: builtin/tag.c:430
9847 msgid "unable to write tag file"
9850 #: builtin/tag.c:455
9851 msgid "bad object type."
9854 #: builtin/tag.c:468
9855 msgid "tag header too big."
9858 #: builtin/tag.c:504
9859 msgid "no tag message?"
9862 #: builtin/tag.c:510
9864 msgid "The tag message has been left in %s\n"
9865 msgstr "标签说明被保留在 %s\n"
9867 #: builtin/tag.c:559
9868 msgid "switch 'points-at' requires an object"
9869 msgstr "开关 'points-at' 需要一个对象"
9871 #: builtin/tag.c:561
9873 msgid "malformed object name '%s'"
9874 msgstr "非法的对象名 '%s'"
9876 #: builtin/tag.c:589
9877 msgid "list tag names"
9880 #: builtin/tag.c:591
9881 msgid "print <n> lines of each tag message"
9882 msgstr "每个标签信息打印 <n> 行"
9884 #: builtin/tag.c:593
9888 #: builtin/tag.c:594
9892 #: builtin/tag.c:596
9893 msgid "Tag creation options"
9896 #: builtin/tag.c:598
9897 msgid "annotated tag, needs a message"
9898 msgstr "附注标签,需要一个说明"
9900 #: builtin/tag.c:600
9904 #: builtin/tag.c:602
9905 msgid "annotated and GPG-signed tag"
9906 msgstr "附注并附加 GPG 签名的标签"
9908 #: builtin/tag.c:606
9909 msgid "use another key to sign the tag"
9910 msgstr "使用另外的私钥签名该标签"
9912 #: builtin/tag.c:607
9913 msgid "replace the tag if exists"
9914 msgstr "如果存在,替换现有的标签"
9916 #: builtin/tag.c:609
9917 msgid "Tag listing options"
9920 #: builtin/tag.c:610
9921 msgid "show tag list in columns"
9922 msgstr "以列的方式显示标签列表"
9924 #: builtin/tag.c:612
9928 #: builtin/tag.c:617 builtin/tag.c:623
9929 msgid "print only tags that contain the commit"
9932 #: builtin/tag.c:629
9933 msgid "print only tags of the object"
9936 #: builtin/tag.c:655
9937 msgid "--column and -n are incompatible"
9938 msgstr "--column 和 -n 不兼容"
9940 #: builtin/tag.c:667
9941 msgid "--sort and -n are incompatible"
9942 msgstr "--sort 和 -n 不兼容"
9944 #: builtin/tag.c:674
9945 msgid "-n option is only allowed with -l."
9946 msgstr "-n 选项只允许和 -l 同时使用。"
9948 #: builtin/tag.c:676
9949 msgid "--contains option is only allowed with -l."
9950 msgstr "--contains 选项只允许和 -l 同时使用。"
9952 #: builtin/tag.c:678
9953 msgid "--points-at option is only allowed with -l."
9954 msgstr "--points-at 选项只允许和 -l 同时使用。"
9956 #: builtin/tag.c:686
9957 msgid "only one -F or -m option is allowed."
9958 msgstr "只允许一个 -F 或 -m 选项。"
9960 #: builtin/tag.c:706
9961 msgid "too many params"
9964 #: builtin/tag.c:712
9966 msgid "'%s' is not a valid tag name."
9967 msgstr "'%s' 不是一个有效的标签名称。"
9969 #: builtin/tag.c:717
9971 msgid "tag '%s' already exists"
9972 msgstr "标签 '%s' 已存在"
9974 #: builtin/tag.c:741
9976 msgid "Updated tag '%s' (was %s)\n"
9977 msgstr "已更新标签 '%s'(曾为 %s)\n"
9979 #: builtin/unpack-objects.c:489
9980 msgid "Unpacking objects"
9983 #: builtin/update-index.c:70
9985 msgid "failed to create directory %s"
9988 #: builtin/update-index.c:76
9990 msgid "failed to stat %s"
9993 #: builtin/update-index.c:86
9995 msgid "failed to create file %s"
9998 #: builtin/update-index.c:94
10000 msgid "failed to delete file %s"
10003 #: builtin/update-index.c:101 builtin/update-index.c:203
10005 msgid "failed to delete directory %s"
10008 #: builtin/update-index.c:124
10013 #: builtin/update-index.c:136
10014 msgid "directory stat info does not change after adding a new file"
10015 msgstr "添加一个新文件后,目录的状态信息未改变"
10017 #: builtin/update-index.c:149
10018 msgid "directory stat info does not change after adding a new directory"
10019 msgstr "添加一个新目录后,目录的状态信息未改变"
10021 #: builtin/update-index.c:162
10022 msgid "directory stat info changes after updating a file"
10023 msgstr "更新一个文件后,目录的状态信息被修改"
10025 #: builtin/update-index.c:173
10026 msgid "directory stat info changes after adding a file inside subdirectory"
10027 msgstr "在子目录中添加文件后,目录的状态信息被修改"
10029 #: builtin/update-index.c:184
10030 msgid "directory stat info does not change after deleting a file"
10031 msgstr "删除一个文件后,目录的状态信息未改变"
10033 #: builtin/update-index.c:197
10034 msgid "directory stat info does not change after deleting a directory"
10035 msgstr "删除一个目录后,目录的状态信息未改变"
10037 #: builtin/update-index.c:204
10041 #: builtin/update-index.c:564
10042 msgid "git update-index [<options>] [--] [<file>...]"
10043 msgstr "git update-index [<选项>] [--] [<文件>...]"
10045 #: builtin/update-index.c:918
10046 msgid "continue refresh even when index needs update"
10047 msgstr "当索引需要更新时继续刷新"
10049 #: builtin/update-index.c:921
10050 msgid "refresh: ignore submodules"
10053 #: builtin/update-index.c:924
10054 msgid "do not ignore new files"
10057 #: builtin/update-index.c:926
10058 msgid "let files replace directories and vice-versa"
10059 msgstr "让文件替换目录(反之亦然)"
10061 #: builtin/update-index.c:928
10062 msgid "notice files missing from worktree"
10063 msgstr "通知文件从工作区丢失"
10065 #: builtin/update-index.c:930
10066 msgid "refresh even if index contains unmerged entries"
10067 msgstr "即使索引区包含未合并的条目也执行刷新"
10069 #: builtin/update-index.c:933
10070 msgid "refresh stat information"
10073 #: builtin/update-index.c:937
10074 msgid "like --refresh, but ignore assume-unchanged setting"
10075 msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
10077 #: builtin/update-index.c:941
10078 msgid "<mode>,<object>,<path>"
10079 msgstr "<存取模式>,<对象>,<路径>"
10081 #: builtin/update-index.c:942
10082 msgid "add the specified entry to the index"
10083 msgstr "添加指定的条目到索引区"
10085 #: builtin/update-index.c:946
10089 #: builtin/update-index.c:947
10090 msgid "override the executable bit of the listed files"
10091 msgstr "覆盖列表里文件的可执行位"
10093 #: builtin/update-index.c:951
10094 msgid "mark files as \"not changing\""
10095 msgstr "把文件标记为 \"没有变更\""
10097 #: builtin/update-index.c:954
10098 msgid "clear assumed-unchanged bit"
10099 msgstr "清除 assumed-unchanged 位"
10101 #: builtin/update-index.c:957
10102 msgid "mark files as \"index-only\""
10103 msgstr "把文件标记为 \"仅索引\""
10105 #: builtin/update-index.c:960
10106 msgid "clear skip-worktree bit"
10107 msgstr "清除 skip-worktree 位"
10109 #: builtin/update-index.c:963
10110 msgid "add to index only; do not add content to object database"
10111 msgstr "只添加到索引区;不添加对象到对象库"
10113 #: builtin/update-index.c:965
10114 msgid "remove named paths even if present in worktree"
10115 msgstr "即使存在工作区里,也删除路径"
10117 #: builtin/update-index.c:967
10118 msgid "with --stdin: input lines are terminated by null bytes"
10119 msgstr "携带 --stdin:输入的行以 null 字符终止"
10121 #: builtin/update-index.c:969
10122 msgid "read list of paths to be updated from standard input"
10123 msgstr "从标准输入中读取需要更新的路径列表"
10125 #: builtin/update-index.c:973
10126 msgid "add entries from standard input to the index"
10127 msgstr "从标准输入添加条目到索引区"
10129 #: builtin/update-index.c:977
10130 msgid "repopulate stages #2 and #3 for the listed paths"
10131 msgstr "为指定文件重新生成第2和第3暂存区"
10133 #: builtin/update-index.c:981
10134 msgid "only update entries that differ from HEAD"
10135 msgstr "只更新与 HEAD 不同的条目"
10137 #: builtin/update-index.c:985
10138 msgid "ignore files missing from worktree"
10139 msgstr "忽略工作区丢失的文件"
10141 #: builtin/update-index.c:988
10142 msgid "report actions to standard output"
10145 #: builtin/update-index.c:990
10146 msgid "(for porcelains) forget saved unresolved conflicts"
10147 msgstr "(for porcelains) 忘记保存的未解决的冲突"
10149 #: builtin/update-index.c:994
10150 msgid "write index in this format"
10151 msgstr "以这种格式写入索引区"
10153 #: builtin/update-index.c:996
10154 msgid "enable or disable split index"
10157 #: builtin/update-index.c:998
10158 msgid "enable/disable untracked cache"
10159 msgstr "启用/禁用对未跟踪文件的缓存"
10161 #: builtin/update-index.c:1000
10162 msgid "enable untracked cache without testing the filesystem"
10163 msgstr "无需检测文件系统,启用对未跟踪文件的缓存"
10165 #: builtin/update-ref.c:9
10166 msgid "git update-ref [<options>] -d <refname> [<old-val>]"
10167 msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
10169 #: builtin/update-ref.c:10
10170 msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
10171 msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]"
10173 #: builtin/update-ref.c:11
10174 msgid "git update-ref [<options>] --stdin [-z]"
10175 msgstr "git update-ref [<选项>] --stdin [-z]"
10177 #: builtin/update-ref.c:359
10178 msgid "delete the reference"
10181 #: builtin/update-ref.c:361
10182 msgid "update <refname> not the one it points to"
10183 msgstr "更新 <引用名> 本身而不是它指向的引用"
10185 #: builtin/update-ref.c:362
10186 msgid "stdin has NUL-terminated arguments"
10187 msgstr "标准输入有以 NUL 字符终止的参数"
10189 #: builtin/update-ref.c:363
10190 msgid "read updates from stdin"
10193 #: builtin/update-server-info.c:6
10194 msgid "git update-server-info [--force]"
10195 msgstr "git update-server-info [--force]"
10197 #: builtin/update-server-info.c:14
10198 msgid "update the info files from scratch"
10199 msgstr "从头开始更新文件信息"
10201 #: builtin/verify-commit.c:17
10202 msgid "git verify-commit [-v | --verbose] <commit>..."
10203 msgstr "git verify-commit [-v | --verbose] <提交>..."
10205 #: builtin/verify-commit.c:75
10206 msgid "print commit contents"
10209 #: builtin/verify-pack.c:54
10210 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
10211 msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
10213 #: builtin/verify-pack.c:64
10217 #: builtin/verify-pack.c:66
10218 msgid "show statistics only"
10221 #: builtin/verify-tag.c:17
10222 msgid "git verify-tag [-v | --verbose] <tag>..."
10223 msgstr "git verify-tag [-v | --verbose] <标签>..."
10225 #: builtin/verify-tag.c:73
10226 msgid "print tag contents"
10229 #: builtin/worktree.c:11
10230 msgid "git worktree add [<options>] <path> <branch>"
10231 msgstr "git worktree add [<选项>] <路径> <分支>"
10233 #: builtin/worktree.c:12
10234 msgid "git worktree prune [<options>]"
10235 msgstr "git worktree prune [<选项>]"
10237 #: builtin/worktree.c:27
10239 msgid "Removing worktrees/%s: not a valid directory"
10240 msgstr "删除工作区/%s:不是一个有效的目录"
10242 #: builtin/worktree.c:33
10244 msgid "Removing worktrees/%s: gitdir file does not exist"
10245 msgstr "删除 worktrees/%s:gitdir 文件不存在"
10247 #: builtin/worktree.c:38
10249 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
10250 msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)"
10252 #: builtin/worktree.c:49
10254 msgid "Removing worktrees/%s: invalid gitdir file"
10255 msgstr "删除 worktrees/%s:无效的 gitdir 文件"
10257 #: builtin/worktree.c:65
10259 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
10260 msgstr "删除 worktrees/%s:gitdir 文件的指向不存在"
10262 #: builtin/worktree.c:100
10264 msgid "failed to remove: %s"
10267 #: builtin/worktree.c:186
10269 msgid "'%s' already exists"
10272 #: builtin/worktree.c:207
10274 msgid "could not create directory of '%s'"
10275 msgstr "不能创建目录 '%s'"
10277 #: builtin/worktree.c:241
10278 msgid "unable to resolve HEAD"
10281 #: builtin/worktree.c:249
10283 msgid "Enter %s (identifier %s)"
10284 msgstr "输入 %s (标识符 %s)"
10286 #: builtin/worktree.c:281
10287 msgid "checkout <branch> even if already checked out in other worktree"
10288 msgstr "检出分支 <branch> 即使已经被检出到其它工作区"
10290 #: builtin/worktree.c:283
10291 msgid "create a new branch"
10294 #: builtin/worktree.c:285
10295 msgid "create or reset a branch"
10298 #: builtin/worktree.c:286
10299 msgid "detach HEAD at named commit"
10300 msgstr "HEAD 从指定的提交分离"
10302 #: builtin/worktree.c:292
10303 msgid "-b and -B are mutually exclusive"
10304 msgstr "-b 和 -B 互斥"
10306 #: builtin/write-tree.c:13
10307 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
10308 msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
10310 #: builtin/write-tree.c:26
10314 #: builtin/write-tree.c:27
10315 msgid "write tree object for a subdirectory <prefix>"
10316 msgstr "将 <前缀> 子目录内容写到一个树对象"
10318 #: builtin/write-tree.c:30
10319 msgid "only useful for debugging"
10322 #: credential-cache--daemon.c:267
10323 msgid "print debugging messages to stderr"
10324 msgstr "调试信息输出到标准错误"
10328 "'git help -a' and 'git help -g' list available subcommands and some\n"
10329 "concept guides. See 'git help <command>' or 'git help <concept>'\n"
10330 "to read about a specific subcommand or concept."
10332 "命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
10333 "查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
10336 #: common-cmds.h:10
10337 msgid "start a working area (see also: git help tutorial)"
10338 msgstr "开始一个工作区(参见:git help tutorial)"
10340 #: common-cmds.h:11
10341 msgid "work on the current change (see also: git help everyday)"
10342 msgstr "在当前变更上工作(参见:git help everyday)"
10344 #: common-cmds.h:12
10345 msgid "examine the history and state (see also: git help revisions)"
10346 msgstr "检查历史和状态(参见:git help revisions)"
10348 #: common-cmds.h:13
10349 msgid "grow, mark and tweak your common history"
10350 msgstr "扩展、标记和调校您的历史记录"
10352 #: common-cmds.h:14
10353 msgid "collaborate (see also: git help workflows)"
10354 msgstr "协同(参见:git help workflows)"
10356 #: common-cmds.h:18
10357 msgid "Add file contents to the index"
10360 #: common-cmds.h:19
10361 msgid "Find by binary search the change that introduced a bug"
10362 msgstr "通过二分查找定位引入 bug 的变更"
10364 #: common-cmds.h:20
10365 msgid "List, create, or delete branches"
10366 msgstr "列出、创建或删除分支"
10368 #: common-cmds.h:21
10369 msgid "Switch branches or restore working tree files"
10370 msgstr "切换分支或恢复工作区文件"
10372 #: common-cmds.h:22
10373 msgid "Clone a repository into a new directory"
10374 msgstr "克隆一个仓库到一个新目录"
10376 #: common-cmds.h:23
10377 msgid "Record changes to the repository"
10380 #: common-cmds.h:24
10381 msgid "Show changes between commits, commit and working tree, etc"
10382 msgstr "显示提交之间、提交和工作区之间等的差异"
10384 #: common-cmds.h:25
10385 msgid "Download objects and refs from another repository"
10386 msgstr "从另外一个仓库下载对象和引用"
10388 #: common-cmds.h:26
10389 msgid "Print lines matching a pattern"
10392 #: common-cmds.h:27
10393 msgid "Create an empty Git repository or reinitialize an existing one"
10394 msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库"
10396 #: common-cmds.h:28
10397 msgid "Show commit logs"
10400 #: common-cmds.h:29
10401 msgid "Join two or more development histories together"
10402 msgstr "合并两个或更多开发历史"
10404 #: common-cmds.h:30
10405 msgid "Move or rename a file, a directory, or a symlink"
10406 msgstr "移动或重命名一个文件、目录或符号链接"
10408 #: common-cmds.h:31
10409 msgid "Fetch from and integrate with another repository or a local branch"
10410 msgstr "获取并整合另外的仓库或一个本地分支"
10412 #: common-cmds.h:32
10413 msgid "Update remote refs along with associated objects"
10414 msgstr "更新远程引用和相关的对象"
10416 #: common-cmds.h:33
10417 msgid "Forward-port local commits to the updated upstream head"
10418 msgstr "本地提交转移至更新后的上游分支中"
10420 #: common-cmds.h:34
10421 msgid "Reset current HEAD to the specified state"
10422 msgstr "重置当前HEAD到指定状态"
10424 #: common-cmds.h:35
10425 msgid "Remove files from the working tree and from the index"
10426 msgstr "从工作区和索引中删除文件"
10428 #: common-cmds.h:36
10429 msgid "Show various types of objects"
10432 #: common-cmds.h:37
10433 msgid "Show the working tree status"
10436 #: common-cmds.h:38
10437 msgid "Create, list, delete or verify a tag object signed with GPG"
10438 msgstr "创建、列出、删除或校验一个GPG签名的标签对象"
10440 #: parse-options.h:142
10441 msgid "expiry-date"
10444 #: parse-options.h:157
10445 msgid "no-op (backward compatibility)"
10448 #: parse-options.h:231
10449 msgid "be more verbose"
10452 #: parse-options.h:233
10453 msgid "be more quiet"
10456 #: parse-options.h:239
10457 msgid "use <n> digits to display SHA-1s"
10458 msgstr "用 <n> 位数字显示 SHA-1 哈希值"
10461 msgid "update the index with reused conflict resolution if possible"
10462 msgstr "如果可能,重用冲突解决更新索引"
10465 msgid "You need to set your committer info first"
10466 msgstr "您需要先设置你的提交者信息"
10470 "You seem to have moved HEAD since the last 'am' failure.\n"
10471 "Not rewinding to ORIG_HEAD"
10472 msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
10477 "When you have resolved this problem, run \"$cmdline --continue\".\n"
10478 "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
10479 "To restore the original branch and stop patching, run \"$cmdline --abort\"."
10481 "当您解决了此问题后,执行 \"$cmdline --continue\"。\n"
10482 "如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n"
10483 "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
10486 msgid "Cannot fall back to three-way merge."
10487 msgstr "无法求助于三方合并。"
10490 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
10491 msgstr "仓库缺乏必要的数据对象以进行三方合并。"
10494 msgid "Using index info to reconstruct a base tree..."
10495 msgstr "使用索引来重建一个(三方合并的)基础目录树..."
10499 "Did you hand edit your patch?\n"
10500 "It does not apply to blobs recorded in its index."
10503 "无法应用补丁到索引中的数据对象上。"
10506 msgid "Falling back to patching base and 3-way merge..."
10507 msgstr "转而在基础版本上打补丁及进行三方合并..."
10510 msgid "Failed to merge in the changes."
10514 msgid "Only one StGIT patch series can be applied at once"
10515 msgstr "一次只能有一个 StGIT 补丁队列被应用"
10519 msgid "Patch format $patch_format is not supported."
10520 msgstr "不支持 $patch_format 补丁格式。"
10523 msgid "Patch format detection failed."
10528 "The -b/--binary option has been a no-op for long time, and\n"
10529 "it will be removed. Please do not use it anymore."
10531 "参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被删除。\n"
10536 msgid "previous rebase directory $dotest still exists but mbox given."
10537 msgstr "之前的变基目录 $dotest 仍然存在,但却提供了 mbox。"
10540 msgid "Please make up your mind. --skip or --abort?"
10541 msgstr "请下决心。--skip 或是 --abort ?"
10546 "Stray $dotest directory found.\n"
10547 "Use \"git am --abort\" to remove it."
10549 "发现了错误的 $dotest 目录。\n"
10550 "使用 \"git am --abort\" 删除它。"
10553 msgid "Resolve operation not in progress, we are not resuming."
10554 msgstr "解决操作未进行,我们不会继续。"
10558 msgid "Dirty index: cannot apply patches (dirty: $files)"
10559 msgstr "脏索引:不能应用补丁(脏文件:$files)"
10564 "Patch is empty. Was it split wrong?\n"
10565 "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
10566 "To restore the original branch and stop patching run \"$cmdline --abort\"."
10569 "如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n"
10570 "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
10573 msgid "Patch does not have a valid e-mail address."
10574 msgstr "补丁中没有一个有效的邮件地址。"
10577 msgid "cannot be interactive without stdin connected to a terminal."
10578 msgstr "标准输入没有和终端关联,不能进行交互式操作。"
10581 msgid "Commit Body is:"
10585 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
10586 #. in your translation. The program will only accept English
10587 #. input at this point.
10589 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
10590 msgstr "应用?[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
10594 msgid "Applying: $FIRSTLINE"
10595 msgstr "正应用:$FIRSTLINE"
10599 "No changes - did you forget to use 'git add'?\n"
10600 "If there is nothing left to stage, chances are that something else\n"
10601 "already introduced the same changes; you might want to skip this patch."
10603 "没有变更 —— 您是不是忘了执行 'git add'?\n"
10604 "如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
10609 "You still have unmerged paths in your index\n"
10610 "did you forget to use 'git add'?"
10611 msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'?"
10614 msgid "No changes -- Patch already applied."
10615 msgstr "没有变更 —— 补丁已经应用过。"
10619 msgid "Patch failed at $msgnum $FIRSTLINE"
10620 msgstr "补丁失败于 $msgnum $FIRSTLINE"
10625 "The copy of the patch that failed is found in:\n"
10632 msgid "applying to an empty history"
10633 msgstr "正应用到一个空历史上"
10635 #: git-bisect.sh:48
10636 msgid "You need to start by \"git bisect start\""
10637 msgstr "您需要执行 \"git bisect start\" 来开始"
10640 #. TRANSLATORS: Make sure to include [Y] and [n] in your
10641 #. translation. The program will only accept English input
10643 #: git-bisect.sh:54
10644 msgid "Do you want me to do it for you [Y/n]? "
10645 msgstr "您想让我为您这样做么[Y/n]? "
10647 #: git-bisect.sh:95
10649 msgid "unrecognised option: '$arg'"
10650 msgstr "未能识别的选项:'$arg'"
10652 #: git-bisect.sh:99
10654 msgid "'$arg' does not appear to be a valid revision"
10655 msgstr "'$arg' 看起来不像是一个有效的版本"
10657 #: git-bisect.sh:117
10658 msgid "Bad HEAD - I need a HEAD"
10659 msgstr "坏的 HEAD - 我需要一个 HEAD"
10661 #: git-bisect.sh:130
10664 "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
10665 msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。"
10667 #: git-bisect.sh:140
10668 msgid "won't bisect on cg-seek'ed tree"
10669 msgstr "不会在做了 cg-seek 的树上做二分查找"
10671 #: git-bisect.sh:144
10672 msgid "Bad HEAD - strange symbolic ref"
10673 msgstr "坏的 HEAD - 奇怪的符号引用"
10675 #: git-bisect.sh:189
10677 msgid "Bad bisect_write argument: $state"
10678 msgstr "坏的 bisect_write 参数:$state"
10680 #: git-bisect.sh:218
10682 msgid "Bad rev input: $arg"
10683 msgstr "输入坏的版本:$arg"
10685 #: git-bisect.sh:232
10686 msgid "Please call 'bisect_state' with at least one argument."
10687 msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
10689 #: git-bisect.sh:244
10691 msgid "Bad rev input: $rev"
10692 msgstr "输入坏的版本:$rev"
10694 #: git-bisect.sh:253
10695 msgid "'git bisect bad' can take only one argument."
10696 msgstr "'git bisect bad' 只能带一个参数。"
10698 #: git-bisect.sh:276
10699 msgid "Warning: bisecting only with a bad commit."
10700 msgstr "警告:在仅有一个坏提交下进行二分查找。"
10703 #. TRANSLATORS: Make sure to include [Y] and [n] in your
10704 #. translation. The program will only accept English input
10706 #: git-bisect.sh:282
10707 msgid "Are you sure [Y/n]? "
10708 msgstr "您确认么[Y/n]? "
10710 #: git-bisect.sh:292
10712 "You need to give me at least one good and one bad revision.\n"
10713 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
10715 "您需要给我至少一个好版本和一个坏版本。\n"
10716 "(为此您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令。)"
10718 #: git-bisect.sh:295
10720 "You need to start by \"git bisect start\".\n"
10721 "You then need to give me at least one good and one bad revision.\n"
10722 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
10724 "您需要执行 \"git bisect start\" 来开始。\n"
10725 "然后需要提供我至少一个好版本和一个坏版本。\n"
10726 "(为此您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令。)"
10728 #: git-bisect.sh:366 git-bisect.sh:493
10729 msgid "We are not bisecting."
10730 msgstr "我们没有在二分查找。"
10732 #: git-bisect.sh:373
10734 msgid "'$invalid' is not a valid commit"
10735 msgstr "'$invalid' 不是一个有效的提交"
10737 #: git-bisect.sh:382
10740 "Could not check out original HEAD '$branch'.\n"
10741 "Try 'git bisect reset <commit>'."
10743 "不能检出原始 HEAD '$branch'。\n"
10744 "尝试 'git bisect reset <提交>'。"
10746 #: git-bisect.sh:409
10747 msgid "No logfile given"
10750 #: git-bisect.sh:410
10752 msgid "cannot read $file for replaying"
10753 msgstr "不能读取 $file 来重放"
10755 #: git-bisect.sh:427
10756 msgid "?? what are you talking about?"
10759 #: git-bisect.sh:439
10761 msgid "running $command"
10762 msgstr "运行 $command"
10764 #: git-bisect.sh:446
10767 "bisect run failed:\n"
10768 "exit code $res from '$command' is < 0 or >= 128"
10771 "命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
10773 #: git-bisect.sh:472
10774 msgid "bisect run cannot continue any more"
10775 msgstr "二分查找不能继续运行"
10777 #: git-bisect.sh:478
10780 "bisect run failed:\n"
10781 "'bisect_state $state' exited with error code $res"
10784 "'bisect_state $state' 退出码为 $res"
10786 #: git-bisect.sh:485
10787 msgid "bisect run success"
10792 "Pull is not possible because you have unmerged files.\n"
10793 "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
10794 "as appropriate to mark resolution and make a commit."
10796 "Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n"
10797 "然后酌情使用 'git add/rm <文件>' 标记解决方案,再做提交。"
10800 msgid "Pull is not possible because you have unmerged files."
10801 msgstr "Pull 不可用,因为您尚有未合并的文件。"
10805 "You have not concluded your merge (MERGE_HEAD exists).\n"
10806 "Please, commit your changes before you can merge."
10808 "您尚未结束您的合并(存在 MERGE_HEAD)。\n"
10812 msgid "updating an unborn branch with changes added to the index"
10813 msgstr "更新尚未诞生的分支,变更添加至索引"
10818 "Warning: fetch updated the current branch head.\n"
10819 "Warning: fast-forwarding your working tree from\n"
10820 "Warning: commit $orig_head."
10822 "警告:fetch 更新了当前的分支。您的工作区\n"
10823 "警告:从原提交 $orig_head 快进。"
10826 msgid "Cannot merge multiple branches into empty head"
10827 msgstr "无法将多个分支合并到空分支"
10830 msgid "Cannot rebase onto multiple branches"
10833 #: git-rebase.sh:57
10835 "When you have resolved this problem, run \"git rebase --continue\".\n"
10836 "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
10837 "To check out the original branch and stop rebasing, run \"git rebase --abort"
10840 "当您解决了此问题后,执行 \"git rebase --continue\"。\n"
10841 "如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
10842 "要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
10844 #: git-rebase.sh:165
10845 msgid "Applied autostash."
10846 msgstr "成功应用 autostash。"
10848 #: git-rebase.sh:168
10850 msgid "Cannot store $stash_sha1"
10851 msgstr "无法保存 $stash_sha1"
10853 #: git-rebase.sh:169
10855 "Applying autostash resulted in conflicts.\n"
10856 "Your changes are safe in the stash.\n"
10857 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
10859 "应用 autostash 导致冲突。\n"
10860 "您的修改安全地保存在 stash 中。\n"
10861 "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
10863 #: git-rebase.sh:208
10864 msgid "The pre-rebase hook refused to rebase."
10865 msgstr "钩子 pre-rebase 拒绝变基操作。"
10867 #: git-rebase.sh:213
10868 msgid "It looks like git-am is in progress. Cannot rebase."
10869 msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
10871 #: git-rebase.sh:351
10872 msgid "The --exec option must be used with the --interactive option"
10873 msgstr "选项 --exec 必须和选项 --interactive 同时使用"
10875 #: git-rebase.sh:356
10876 msgid "No rebase in progress?"
10877 msgstr "没有正在进行的变基?"
10879 #: git-rebase.sh:367
10880 msgid "The --edit-todo action can only be used during interactive rebase."
10881 msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
10883 #: git-rebase.sh:374
10884 msgid "Cannot read HEAD"
10887 #: git-rebase.sh:377
10889 "You must edit all merge conflicts and then\n"
10890 "mark them as resolved using git add"
10892 "您必须编辑所有的合并冲突,然后通过 git add\n"
10895 #: git-rebase.sh:395
10897 msgid "Could not move back to $head_name"
10898 msgstr "无法移回 $head_name"
10900 #: git-rebase.sh:414
10903 "It seems that there is already a $state_dir_base directory, and\n"
10904 "I wonder if you are in the middle of another rebase. If that is the\n"
10905 "case, please try\n"
10906 "\t$cmd_live_rebase\n"
10907 "If that is not the case, please\n"
10908 "\t$cmd_clear_stale_rebase\n"
10909 "and run me again. I am stopping in case you still have something\n"
10912 "好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n"
10914 "\t$cmd_live_rebase\n"
10916 "\t$cmd_clear_stale_rebase\n"
10917 "然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。"
10919 #: git-rebase.sh:465
10921 msgid "invalid upstream $upstream_name"
10922 msgstr "无效的上游 $upstream_name"
10924 #: git-rebase.sh:489
10926 msgid "$onto_name: there are more than one merge bases"
10927 msgstr "$onto_name: 有一个以上的合并基准"
10929 #: git-rebase.sh:492 git-rebase.sh:496
10931 msgid "$onto_name: there is no merge base"
10932 msgstr "$onto_name: 没有合并基准"
10934 #: git-rebase.sh:501
10936 msgid "Does not point to a valid commit: $onto_name"
10937 msgstr "没有指向一个有效的提交:$onto_name"
10939 #: git-rebase.sh:524
10941 msgid "fatal: no such branch: $branch_name"
10942 msgstr "严重错误:无此分支:$branch_name"
10944 #: git-rebase.sh:557
10945 msgid "Cannot autostash"
10946 msgstr "无法 autostash"
10948 #: git-rebase.sh:562
10950 msgid "Created autostash: $stash_abbrev"
10951 msgstr "创建了 autostash: $stash_abbrev"
10953 #: git-rebase.sh:566
10954 msgid "Please commit or stash them."
10955 msgstr "请提交或为它们保存进度。"
10957 #: git-rebase.sh:586
10959 msgid "Current branch $branch_name is up to date."
10960 msgstr "当前分支 $branch_name 是最新的。"
10962 #: git-rebase.sh:590
10964 msgid "Current branch $branch_name is up to date, rebase forced."
10965 msgstr "当前分支 $branch_name 是最新的,强制变基。"
10967 #: git-rebase.sh:601
10969 msgid "Changes from $mb to $onto:"
10970 msgstr "变更从 $mb 到 $onto:"
10972 #: git-rebase.sh:610
10973 msgid "First, rewinding head to replay your work on top of it..."
10974 msgstr "首先,回退分支以便在上面重放您的工作..."
10976 #: git-rebase.sh:620
10978 msgid "Fast-forwarded $branch_name to $onto_name."
10979 msgstr "快进 $branch_name 至 $onto_name。"
10982 msgid "git stash clear with parameters is unimplemented"
10983 msgstr "git stash clear 不支持参数"
10986 msgid "You do not have the initial commit yet"
10990 msgid "Cannot save the current index state"
10991 msgstr "无法保存当前索引状态"
10993 #: git-stash.sh:124 git-stash.sh:137
10994 msgid "Cannot save the current worktree state"
10995 msgstr "无法保存当前工作区状态"
10997 #: git-stash.sh:141
10998 msgid "No changes selected"
11001 #: git-stash.sh:144
11002 msgid "Cannot remove temporary index (can't happen)"
11003 msgstr "无法删除临时索引(不应发生)"
11005 #: git-stash.sh:157
11006 msgid "Cannot record working tree state"
11009 #: git-stash.sh:191
11011 msgid "Cannot update $ref_stash with $w_commit"
11012 msgstr "无法用 $w_commit 更新 $ref_stash"
11014 #. TRANSLATORS: $option is an invalid option, like
11015 #. `--blah-blah'. The 7 spaces at the beginning of the
11016 #. second line correspond to "error: ". So you should line
11017 #. up the second line with however many characters the
11018 #. translation of "error: " takes in your language. E.g. in
11019 #. English this is:
11021 #. $ git stash save --blah-blah 2>&1 | head -n 2
11022 #. error: unknown option for 'stash save': --blah-blah
11023 #. To provide a message, use git stash save -- '--blah-blah'
11024 #: git-stash.sh:241
11027 "error: unknown option for 'stash save': $option\n"
11028 " To provide a message, use git stash save -- '$option'"
11030 "错误:'stash save' 的未知选项:$option\n"
11031 " 要提供一个描述信息,使用 git stash save -- '$option'"
11033 #: git-stash.sh:262
11034 msgid "No local changes to save"
11035 msgstr "没有要保存的本地修改"
11037 #: git-stash.sh:266
11038 msgid "Cannot initialize stash"
11039 msgstr "无法初始化 stash"
11041 #: git-stash.sh:270
11042 msgid "Cannot save the current status"
11045 #: git-stash.sh:288
11046 msgid "Cannot remove worktree changes"
11049 #: git-stash.sh:389
11051 msgid "unknown option: $opt"
11052 msgstr "未知选项: $opt"
11054 #: git-stash.sh:399
11055 msgid "No stash found."
11056 msgstr "未发现 stash。"
11058 #: git-stash.sh:406
11060 msgid "Too many revisions specified: $REV"
11061 msgstr "指定了太多的版本:$REV"
11063 #: git-stash.sh:412
11065 msgid "$reference is not a valid reference"
11066 msgstr "$reference 不是一个有效的引用"
11068 #: git-stash.sh:440
11070 msgid "'$args' is not a stash-like commit"
11071 msgstr "'$args' 不是 stash 样提交"
11073 #: git-stash.sh:451
11075 msgid "'$args' is not a stash reference"
11076 msgstr "'$args' 不是一个 stash 引用"
11078 #: git-stash.sh:459
11079 msgid "unable to refresh index"
11082 #: git-stash.sh:463
11083 msgid "Cannot apply a stash in the middle of a merge"
11084 msgstr "无法在合并过程中恢复进度"
11086 #: git-stash.sh:471
11087 msgid "Conflicts in index. Try without --index."
11088 msgstr "索引中有冲突。尝试不使用 --index。"
11090 #: git-stash.sh:473
11091 msgid "Could not save index tree"
11094 #: git-stash.sh:507
11095 msgid "Cannot unstage modified files"
11096 msgstr "无法将修改的文件取消暂存"
11098 #: git-stash.sh:522
11099 msgid "Index was not unstashed."
11100 msgstr "索引的进度没有被恢复。"
11102 #: git-stash.sh:545
11104 msgid "Dropped ${REV} ($s)"
11105 msgstr "丢弃了 ${REV} ($s)"
11107 #: git-stash.sh:546
11109 msgid "${REV}: Could not drop stash entry"
11110 msgstr "${REV}:不能丢弃进度条目"
11112 #: git-stash.sh:554
11113 msgid "No branch name specified"
11116 #: git-stash.sh:626
11117 msgid "(To restore them type \"git stash apply\")"
11118 msgstr "(为恢复数据输入 \"git stash apply\")"
11120 #: git-submodule.sh:95
11122 msgid "cannot strip one component off url '$remoteurl'"
11123 msgstr "无法从 url '$remoteurl' 剥离一个组件"
11125 #: git-submodule.sh:237
11127 msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
11128 msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
11130 #: git-submodule.sh:287
11132 msgid "Clone of '$url' into submodule path '$sm_path' failed"
11133 msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
11135 #: git-submodule.sh:296
11137 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
11138 msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反"
11140 #: git-submodule.sh:406
11141 msgid "Relative path can only be used from the toplevel of the working tree"
11142 msgstr "只能在工作区的顶级目录中使用相对路径"
11144 #: git-submodule.sh:416
11146 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
11147 msgstr "仓库URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
11149 #: git-submodule.sh:433
11151 msgid "'$sm_path' already exists in the index"
11152 msgstr "'$sm_path' 已经存在于索引中"
11154 #: git-submodule.sh:437
11157 "The following path is ignored by one of your .gitignore files:\n"
11159 "Use -f if you really want to add it."
11161 "以下路径被您的一个 .gitignore 文件所忽略:\n"
11163 "如果您确实想添加它,使用 -f 参数。"
11165 #: git-submodule.sh:455
11167 msgid "Adding existing repo at '$sm_path' to the index"
11168 msgstr "添加位于 '$sm_path' 的现存仓库到索引"
11170 #: git-submodule.sh:457
11172 msgid "'$sm_path' already exists and is not a valid git repo"
11173 msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库"
11175 #: git-submodule.sh:465
11177 msgid "A git directory for '$sm_name' is found locally with remote(s):"
11178 msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:"
11180 #: git-submodule.sh:467
11183 "If you want to reuse this local git directory instead of cloning again from"
11184 msgstr "如果您想重用此本地 git 目录而不是重新克隆自"
11186 #: git-submodule.sh:469
11189 "use the '--force' option. If the local git directory is not the correct repo"
11190 msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的仓库"
11192 #: git-submodule.sh:470
11195 "or you are unsure what this means choose another name with the '--name' "
11197 msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。"
11199 #: git-submodule.sh:472
11201 msgid "Reactivating local git directory for submodule '$sm_name'."
11202 msgstr "激活本地 git 目录到子模组 '$sm_name'。"
11204 #: git-submodule.sh:484
11206 msgid "Unable to checkout submodule '$sm_path'"
11207 msgstr "不能检出子模组 '$sm_path'"
11209 #: git-submodule.sh:489
11211 msgid "Failed to add submodule '$sm_path'"
11212 msgstr "无法添加子模组 '$sm_path'"
11214 #: git-submodule.sh:498
11216 msgid "Failed to register submodule '$sm_path'"
11217 msgstr "无法注册子模组 '$sm_path'"
11219 #: git-submodule.sh:542
11221 msgid "Entering '$prefix$displaypath'"
11222 msgstr "正在进入 '$prefix$displaypath'"
11224 #: git-submodule.sh:562
11226 msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
11227 msgstr "停止于 '$prefix$displaypath',脚本返回非零值。"
11229 #: git-submodule.sh:608
11231 msgid "No url found for submodule path '$displaypath' in .gitmodules"
11232 msgstr "在 .gitmodules 中未找到子模组路径 '$displaypath' 的 url"
11234 #: git-submodule.sh:617
11236 msgid "Failed to register url for submodule path '$displaypath'"
11237 msgstr "无法为子模组路径 '$displaypath' 注册 url"
11239 #: git-submodule.sh:619
11241 msgid "Submodule '$name' ($url) registered for path '$displaypath'"
11242 msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
11244 #: git-submodule.sh:636
11246 msgid "Failed to register update mode for submodule path '$displaypath'"
11247 msgstr "无法为子模组路径 '$displaypath' 注册更新模式"
11249 #: git-submodule.sh:674
11251 msgid "Use '.' if you really want to deinitialize all submodules"
11252 msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化"
11254 #: git-submodule.sh:691
11256 msgid "Submodule work tree '$displaypath' contains a .git directory"
11257 msgstr "子模组工作区 '$displaypath' 包含一个 .git 目录"
11259 #: git-submodule.sh:692
11262 "(use 'rm -rf' if you really want to remove it including all of its history)"
11263 msgstr "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
11265 #: git-submodule.sh:698
11268 "Submodule work tree '$displaypath' contains local modifications; use '-f' to "
11270 msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们"
11272 #: git-submodule.sh:701
11274 msgid "Cleared directory '$displaypath'"
11275 msgstr "已清除目录 '$displaypath'"
11277 #: git-submodule.sh:702
11279 msgid "Could not remove submodule work tree '$displaypath'"
11280 msgstr "无法移除子模组工作区 '$displaypath'"
11282 #: git-submodule.sh:705
11284 msgid "Could not create empty submodule directory '$displaypath'"
11285 msgstr "不能创建空的子模组目录 '$displaypath'"
11287 #: git-submodule.sh:714
11289 msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
11290 msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
11292 #: git-submodule.sh:830
11295 "Submodule path '$displaypath' not initialized\n"
11296 "Maybe you want to use 'update --init'?"
11298 "子模组路径 '$displaypath' 没有初始化\n"
11299 "也许您想用 'update --init'?"
11301 #: git-submodule.sh:843
11303 msgid "Unable to find current revision in submodule path '$displaypath'"
11304 msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
11306 #: git-submodule.sh:852
11308 msgid "Unable to fetch in submodule path '$sm_path'"
11309 msgstr "无法在子模组路径 '$sm_path' 中获取"
11311 #: git-submodule.sh:876
11313 msgid "Unable to fetch in submodule path '$displaypath'"
11314 msgstr "无法在子模组路径 '$displaypath' 中获取"
11316 #: git-submodule.sh:890
11318 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
11319 msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
11321 #: git-submodule.sh:891
11323 msgid "Submodule path '$displaypath': checked out '$sha1'"
11324 msgstr "子模组路径 '$displaypath':检出 '$sha1'"
11326 #: git-submodule.sh:895
11328 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
11329 msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
11331 #: git-submodule.sh:896
11333 msgid "Submodule path '$displaypath': rebased into '$sha1'"
11334 msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
11336 #: git-submodule.sh:901
11338 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
11339 msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
11341 #: git-submodule.sh:902
11343 msgid "Submodule path '$displaypath': merged in '$sha1'"
11344 msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
11346 #: git-submodule.sh:907
11349 "Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
11350 msgstr "在子模组路径 '$prefix$sm_path' 中执行 '$command $sha1' 失败"
11352 #: git-submodule.sh:908
11354 msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
11355 msgstr "子模组路径 '$prefix$sm_path': '$command $sha1'"
11357 #: git-submodule.sh:938
11359 msgid "Failed to recurse into submodule path '$displaypath'"
11360 msgstr "无法递归进子模组路径 '$displaypath'"
11362 #: git-submodule.sh:1046
11363 msgid "The --cached option cannot be used with the --files option"
11364 msgstr "选项 --cached 不能和选项 --files 同时使用"
11366 #: git-submodule.sh:1098
11368 msgid "unexpected mode $mod_dst"
11369 msgstr "意外的模式 $mod_dst"
11372 #: git-submodule.sh:1118
11374 msgid " Warn: $display_name doesn't contain commit $sha1_src"
11375 msgstr " 警告:$display_name 未包含提交 $sha1_src"
11378 #: git-submodule.sh:1121
11380 msgid " Warn: $display_name doesn't contain commit $sha1_dst"
11381 msgstr " 警告:$display_name 未包含提交 $sha1_dst"
11384 #: git-submodule.sh:1124
11386 msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
11387 msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
11389 #: git-submodule.sh:1149
11393 #: git-submodule.sh:1267
11395 msgid "Failed to recurse into submodule path '$sm_path'"
11396 msgstr "无法递归进子模组路径 '$sm_path'"
11398 #: git-submodule.sh:1331
11400 msgid "Synchronizing submodule url for '$displaypath'"
11401 msgstr "为 '$displaypath' 同步子模组 url"