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 # - Riku <lu.riku AT gmail.com>
8 # - Zhuang Ya <zhuangya AT me.com>
9 # - Lian Cheng <rhythm.mail AT gmail.com>
13 "Project-Id-Version: Git\n"
14 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
15 "POT-Creation-Date: 2013-01-25 12:33+0800\n"
16 "PO-Revision-Date: 2013-02-09 00:47+0800\n"
17 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
18 "Language-Team: GitHub <https://github.com/gotgit/git/>\n"
21 "Content-Type: text/plain; charset=UTF-8\n"
22 "Content-Transfer-Encoding: 8bit\n"
23 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
31 #. * Message used both when 'git commit' fails and when
32 #. * other commands doing a merge do.
36 "Fix them up in the work tree,\n"
37 "and then use 'git add/rm <file>' as\n"
38 "appropriate to mark resolution and make a commit,\n"
39 "or use 'git commit -a'."
42 "'git add/rm <file>' 标记解决方案,\n"
43 "或使用 'git commit -a'。"
46 msgid "git archive [options] <tree-ish> [<path>...]"
47 msgstr "git archive [选项] <树或提交> [<路径>...]"
50 msgid "git archive --list"
51 msgstr "git archive --list"
55 "git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]"
57 "git archive --remote <版本库> [--exec <命令>] [选项] <树或提交> [<路径>...]"
60 msgid "git archive --remote <repo> [--exec <cmd>] --list"
61 msgstr "git archive --remote <版本库> [--exec <命令>] --list"
68 msgid "archive format"
71 #: archive.c:324 builtin/log.c:1115
76 msgid "prepend prefix to each pathname in the archive"
77 msgstr "为归档中每个路径名加上前缀"
79 #: archive.c:326 builtin/archive.c:91 builtin/blame.c:2380
80 #: builtin/blame.c:2381 builtin/config.c:55 builtin/fast-export.c:653
81 #: builtin/fast-export.c:655 builtin/grep.c:715 builtin/hash-object.c:77
82 #: builtin/ls-files.c:494 builtin/ls-files.c:497 builtin/notes.c:540
83 #: builtin/notes.c:697 builtin/read-tree.c:107 parse-options.h:149
87 #: archive.c:327 builtin/archive.c:92
88 msgid "write the archive to this file"
92 msgid "read .gitattributes in working directory"
93 msgstr "读取工作区中的 .gitattributes"
96 msgid "report archived files on stderr"
104 msgid "compress faster"
108 msgid "compress better"
112 msgid "list supported archive formats"
115 #: archive.c:345 builtin/archive.c:93 builtin/clone.c:85
119 #: archive.c:346 builtin/archive.c:94
120 msgid "retrieve the archive from remote repository <repo>"
121 msgstr "从远程版本库(<版本库>)提取归档文件"
123 #: archive.c:347 builtin/archive.c:95 builtin/notes.c:619
127 #: archive.c:348 builtin/archive.c:96
128 msgid "path to the remote git-upload-archive command"
129 msgstr "远程 git-upload-archive 命令的路径"
133 "Negative patterns are forbidden in git attributes\n"
134 "Use '\\!' for literal leading exclamation."
136 "在 git attributes 中不允许使用负值模版\n"
137 "当字符串确实要以感叹号开始时,使用 '\\!'。"
141 msgid "'%s' does not look like a v2 bundle file"
142 msgstr "'%s' 不像是一个 v2 版本的包文件"
146 msgid "unrecognized header: %s%s (%d)"
147 msgstr "未能识别的包头:%s%s (%d)"
149 #: bundle.c:89 builtin/commit.c:674
151 msgid "could not open '%s'"
155 msgid "Repository lacks these prerequisite commits:"
156 msgstr "版本库缺少这些必备的提交:"
158 #: bundle.c:164 sequencer.c:566 sequencer.c:998 builtin/log.c:299
159 #: builtin/log.c:751 builtin/log.c:1358 builtin/log.c:1574 builtin/merge.c:347
160 #: builtin/shortlog.c:157
161 msgid "revision walk setup failed"
166 msgid "The bundle contains %d ref"
167 msgid_plural "The bundle contains %d refs"
168 msgstr[0] "这个包中含有 %d 个引用"
169 msgstr[1] "这个包中含有 %d 个引用"
172 msgid "The bundle records a complete history."
173 msgstr "这个包记录一个完整历史。"
177 msgid "The bundle requires this ref"
178 msgid_plural "The bundle requires these %d refs"
179 msgstr[0] "这个包需要这个引用"
180 msgstr[1] "这个包需要 %d 个这些引用"
183 msgid "rev-list died"
186 #: bundle.c:300 builtin/log.c:1254 builtin/shortlog.c:260
188 msgid "unrecognized argument: %s"
193 msgid "ref '%s' is excluded by the rev-list options"
194 msgstr "引用 '%s' 被 rev-list 选项排除"
197 msgid "Refusing to create empty bundle."
201 msgid "Could not spawn pack-objects"
202 msgstr "不能生成 pack-objects 进程"
205 msgid "pack-objects died"
206 msgstr "pack-objects 终止"
210 msgid "cannot create '%s'"
214 msgid "index-pack died"
215 msgstr "index-pack 终止"
219 msgid "could not parse %s"
224 msgid "%s %s is not a commit!"
225 msgstr "%s %s 不是一个提交!"
227 #: compat/obstack.c:406 compat/obstack.c:408
228 msgid "memory exhausted"
232 msgid "Could not run 'git rev-list'"
233 msgstr "不能执行 'git rev-list'"
237 msgid "failed write to rev-list: %s"
238 msgstr "无法写入 rev-list:%s"
242 msgid "failed to close rev-list's stdin: %s"
243 msgstr "无法关闭 rev-list 的标准输入:%s"
246 msgid "in the future"
251 msgid "%lu second ago"
252 msgid_plural "%lu seconds ago"
258 msgid "%lu minute ago"
259 msgid_plural "%lu minutes ago"
266 msgid_plural "%lu hours ago"
273 msgid_plural "%lu days ago"
280 msgid_plural "%lu weeks ago"
286 msgid "%lu month ago"
287 msgid_plural "%lu months ago"
294 msgid_plural "%lu years"
300 msgid "%s, %lu month ago"
301 msgid_plural "%s, %lu months ago"
302 msgstr[0] "%s,%lu 个月之前"
303 msgstr[1] "%s,%lu 个月之前"
305 #: date.c:154 date.c:159
308 msgid_plural "%lu years ago"
315 msgid " Failed to parse dirstat cut-off percentage '%s'\n"
316 msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
321 msgid " Unknown dirstat parameter '%s'\n"
322 msgstr " 未知的 dirstat 参数 '%s'\n"
326 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
327 msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
332 "Found errors in 'diff.dirstat' config variable:\n"
335 "发现配置变量 'diff.dirstat' 中的错误:\n"
341 "Failed to parse --dirstat/-X option parameter:\n"
344 "无法解析 --dirstat/-X 选项的参数:\n"
349 msgid "Failed to parse --submodule option parameter: '%s'"
350 msgstr "无法解析 --submodule 选项的参数:'%s'"
352 #: gpg-interface.c:59
353 msgid "could not run gpg."
356 #: gpg-interface.c:71
357 msgid "gpg did not accept the data"
360 #: gpg-interface.c:82
361 msgid "gpg failed to sign the data"
366 msgid "'%s': unable to read %s"
367 msgstr "'%s':无法读取 %s"
376 msgid "'%s': short read %s"
377 msgstr "'%s':读取不完整 %s"
381 msgid "available git commands in '%s'"
382 msgstr "在 '%s' 下可用的 git 命令"
385 msgid "git commands available from elsewhere on your $PATH"
386 msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
391 "'%s' appears to be a git command, but we were not\n"
392 "able to execute it. Maybe git-%s is broken?"
394 "'%s' 像是一个 git 命令,但却无法运行。\n"
398 msgid "Uh oh. Your system reports no Git commands at all."
399 msgstr "唉呀,您的系统中未发现 Git 命令。"
404 "WARNING: You called a Git command named '%s', which does not exist.\n"
405 "Continuing under the assumption that you meant '%s'"
407 "警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
412 msgid "in %0.1f seconds automatically..."
413 msgstr "在 %0.1f 秒钟后自动运行..."
417 msgid "git: '%s' is not a git command. See 'git --help'."
418 msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
426 "Did you mean one of these?"
435 msgid "failed to read the cache"
438 #: merge.c:110 builtin/checkout.c:333 builtin/checkout.c:534
439 #: builtin/clone.c:586
440 msgid "unable to write new index file"
443 #: merge-recursive.c:190
445 msgid "(bad commit)\n"
448 #: merge-recursive.c:206
450 msgid "addinfo_cache failed for path '%s'"
451 msgstr "为路径 '%s' addinfo_cache 失败"
453 #: merge-recursive.c:268
454 msgid "error building trees"
457 #: merge-recursive.c:672
459 msgid "failed to create path '%s'%s"
460 msgstr "无法创建路径 '%s'%s"
462 #: merge-recursive.c:683
464 msgid "Removing %s to make room for subdirectory\n"
465 msgstr "删除 %s 以便为子目录留出空间\n"
467 #. something else exists
468 #. .. but not some other error (who really cares what?)
469 #: merge-recursive.c:697 merge-recursive.c:718
470 msgid ": perhaps a D/F conflict?"
471 msgstr ":可能是一个目录/文件冲突?"
473 #: merge-recursive.c:708
475 msgid "refusing to lose untracked file at '%s'"
476 msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
478 #: merge-recursive.c:748
480 msgid "cannot read object %s '%s'"
481 msgstr "不能读取对象 %s '%s'"
483 #: merge-recursive.c:750
485 msgid "blob expected for %s '%s'"
486 msgstr "%s '%s' 应为数据(blob)对象"
488 #: merge-recursive.c:773 builtin/clone.c:302
490 msgid "failed to open '%s'"
493 #: merge-recursive.c:781
495 msgid "failed to symlink '%s'"
496 msgstr "无法创建符号链接 '%s'"
498 #: merge-recursive.c:784
500 msgid "do not know what to do with %06o %s '%s'"
501 msgstr "不知道如何处理 %06o %s '%s'"
503 #: merge-recursive.c:922
504 msgid "Failed to execute internal merge"
507 #: merge-recursive.c:926
509 msgid "Unable to add %s to database"
510 msgstr "不能添加 %s 至对象库"
512 #: merge-recursive.c:942
513 msgid "unsupported object type in the tree"
514 msgstr "在树中有不支持的对象类型"
516 #: merge-recursive.c:1021 merge-recursive.c:1035
519 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
522 "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
525 #: merge-recursive.c:1027 merge-recursive.c:1040
528 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
531 "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
534 #: merge-recursive.c:1081
538 #: merge-recursive.c:1081
542 #: merge-recursive.c:1137
544 msgid "%s is a directory in %s adding as %s instead"
545 msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
547 #: merge-recursive.c:1159
550 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
551 "\"->\"%s\" in \"%s\"%s"
553 "冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
554 "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
556 #: merge-recursive.c:1164
557 msgid " (left unresolved)"
560 #: merge-recursive.c:1218
562 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
564 "冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
567 #: merge-recursive.c:1248
569 msgid "Renaming %s to %s and %s to %s instead"
570 msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
572 #: merge-recursive.c:1447
574 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
575 msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
577 #: merge-recursive.c:1457
579 msgid "Adding merged %s"
582 #: merge-recursive.c:1462 merge-recursive.c:1660
584 msgid "Adding as %s instead"
587 #: merge-recursive.c:1513
589 msgid "cannot read object %s"
592 #: merge-recursive.c:1516
594 msgid "object %s is not a blob"
595 msgstr "对象 %s 不是一个数据(blob)对象"
597 #: merge-recursive.c:1564
601 #: merge-recursive.c:1564
605 #: merge-recursive.c:1574
609 #: merge-recursive.c:1581
613 #: merge-recursive.c:1615
615 msgid "Skipped %s (merged same as existing)"
616 msgstr "略过 %s(已经做过相同合并)"
618 #: merge-recursive.c:1629
620 msgid "Auto-merging %s"
623 #: merge-recursive.c:1633 git-submodule.sh:942
627 #: merge-recursive.c:1634
629 msgid "CONFLICT (%s): Merge conflict in %s"
630 msgstr "冲突(%s):合并冲突于 %s"
632 #: merge-recursive.c:1724
637 #: merge-recursive.c:1749
638 msgid "file/directory"
641 #: merge-recursive.c:1755
642 msgid "directory/file"
645 #: merge-recursive.c:1760
647 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
648 msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
650 #: merge-recursive.c:1770
655 #: merge-recursive.c:1787
656 msgid "Fatal merge failure, shouldn't happen."
657 msgstr "严重的合并错误,不应发生。"
659 #: merge-recursive.c:1806
660 msgid "Already up-to-date!"
663 #: merge-recursive.c:1815
665 msgid "merging of trees %s and %s failed"
666 msgstr "无法合并树 %s 和 %s"
668 #: merge-recursive.c:1845
670 msgid "Unprocessed path??? %s"
671 msgstr "未处理的路径??? %s"
673 #: merge-recursive.c:1890
677 #: merge-recursive.c:1903
679 msgid "found %u common ancestor:"
680 msgid_plural "found %u common ancestors:"
681 msgstr[0] "发现 %u 个共同祖先:"
682 msgstr[1] "发现 %u 个共同祖先:"
684 #: merge-recursive.c:1940
685 msgid "merge returned no commit"
688 #: merge-recursive.c:1997
690 msgid "Could not parse object '%s'"
693 #: merge-recursive.c:2009 builtin/merge.c:643
694 msgid "Unable to write index."
697 #: parse-options.c:485
701 #: parse-options.c:503
706 #. TRANSLATORS: the colon here should align with the
707 #. one in "usage: %s" translation
708 #: parse-options.c:507
713 # 译者:为保证在输出中对齐,注意调整句中空格!
714 #: parse-options.c:510
721 msgid "Your branch is ahead of '%s' by %d commit.\n"
722 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
723 msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
724 msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
727 msgid " (use \"git push\" to publish your local commits)\n"
728 msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
732 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
734 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
735 msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
736 msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
740 msgid " (use \"git pull\" to update your local branch)\n"
741 msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
746 "Your branch and '%s' have diverged,\n"
747 "and have %d and %d different commit each, respectively.\n"
749 "Your branch and '%s' have diverged,\n"
750 "and have %d and %d different commits each, respectively.\n"
752 "您的分支和 '%s' 出现了偏离,\n"
753 "并且分别有 %d 和 %d 处不同的提交。\n"
755 "您的分支和 '%s' 出现了偏离,\n"
756 "并且分别有 %d 和 %d 处不同的提交。\n"
760 msgid " (use \"git pull\" to merge the remote branch into yours)\n"
761 msgstr " (使用 \"git pull\" 来合并远程分支)\n"
763 #: sequencer.c:123 builtin/merge.c:761 builtin/merge.c:875 builtin/merge.c:985
764 #: builtin/merge.c:995
766 msgid "Could not open '%s' for writing"
767 msgstr "不能为写入打开 '%s'"
769 #: sequencer.c:125 builtin/merge.c:333 builtin/merge.c:764 builtin/merge.c:987
770 #: builtin/merge.c:1000
772 msgid "Could not write to '%s'"
777 "after resolving the conflicts, mark the corrected paths\n"
778 "with 'git add <paths>' or 'git rm <paths>'"
780 "冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
785 "after resolving the conflicts, mark the corrected paths\n"
786 "with 'git add <paths>' or 'git rm <paths>'\n"
787 "and commit the result with 'git commit'"
789 "冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
790 "对修正后的文件做标记,然后用 'git commit' 提交"
792 #: sequencer.c:162 sequencer.c:774 sequencer.c:857
794 msgid "Could not write to %s"
799 msgid "Error wrapping up %s"
803 msgid "Your local changes would be overwritten by cherry-pick."
804 msgstr "您的本地修改将被拣选操作覆盖。"
807 msgid "Your local changes would be overwritten by revert."
808 msgstr "您的本地修改将被还原操作覆盖。"
811 msgid "Commit your changes or stash them to proceed."
812 msgstr "提交您的修改或保存进度后再继续。"
814 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
817 msgid "%s: Unable to write new index file"
818 msgstr "%s:无法写入新索引文件"
821 msgid "Could not resolve HEAD commit\n"
822 msgstr "不能解析 HEAD 提交\n"
825 msgid "Unable to update cache tree\n"
830 msgid "Could not parse commit %s\n"
835 msgid "Could not parse parent commit %s\n"
836 msgstr "不能解析父提交 %s\n"
839 msgid "Your index file is unmerged."
840 msgstr "您的索引文件未完成合并。"
844 msgid "Commit %s is a merge but no -m option was given."
845 msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
849 msgid "Commit %s does not have parent %d"
850 msgstr "提交 %s 没有父提交 %d"
854 msgid "Mainline was specified but commit %s is not a merge."
855 msgstr "指定了主线但提交 %s 不是一个合并。"
857 #. TRANSLATORS: The first %s will be "revert" or
858 #. "cherry-pick", the second %s a SHA1
861 msgid "%s: cannot parse parent commit %s"
862 msgstr "%s:不能解析父提交 %s"
866 msgid "Cannot get commit message for %s"
867 msgstr "不能得到 %s 的提交说明"
871 msgid "could not revert %s... %s"
872 msgstr "不能还原 %s... %s"
876 msgid "could not apply %s... %s"
877 msgstr "不能应用 %s... %s"
880 msgid "empty commit set passed"
885 msgid "git %s: failed to read the index"
886 msgstr "git %s:无法读取索引"
890 msgid "git %s: failed to refresh the index"
891 msgstr "git %s:无法刷新索引"
895 msgid "Cannot %s during a %s"
896 msgstr "无法 %s 在一个 %s 过程中"
900 msgid "Could not parse line %d."
904 msgid "No commits parsed."
909 msgid "Could not open %s"
914 msgid "Could not read %s."
919 msgid "Unusable instruction sheet: %s"
924 msgid "Invalid key: %s"
929 msgid "Invalid value for %s: %s"
934 msgid "Malformed options sheet: %s"
938 msgid "a cherry-pick or revert is already in progress"
939 msgstr "一个拣选或还原操作已在进行"
942 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
943 msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
947 msgid "Could not create sequencer directory %s"
950 #: sequencer.c:776 sequencer.c:861
952 msgid "Error wrapping up %s."
955 #: sequencer.c:795 sequencer.c:929
956 msgid "no cherry-pick or revert in progress"
960 msgid "cannot resolve HEAD"
964 msgid "cannot abort from a branch yet to be born"
965 msgstr "不能从尚未建立的分支终止"
967 #: sequencer.c:821 builtin/apply.c:4016
969 msgid "cannot open %s: %s"
974 msgid "cannot read %s: %s"
978 msgid "unexpected end of file"
983 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
984 msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
988 msgid "Could not format %s."
992 msgid "Can't revert as initial commit"
996 msgid "Can't cherry-pick into empty head"
1000 msgid "HEAD does not point to a branch"
1001 msgstr "HEAD 没有指向一个分支"
1005 msgid "No such branch: '%s'"
1010 msgid "No upstream configured for branch '%s'"
1011 msgstr "尚未给分支 '%s' 设置上游"
1015 msgid "Upstream branch '%s' not stored as a remote-tracking branch"
1016 msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
1020 msgid "unable to access '%s': %s"
1021 msgstr "不能访问 '%s':%s"
1025 msgid "unable to access '%s'"
1030 msgid "unable to look up current user in the passwd file: %s"
1031 msgstr "无法在口令文件中查询到当前用户:%s"
1034 msgid "no such user"
1038 msgid "Unmerged paths:"
1042 #: wt-status.c:167 wt-status.c:194
1044 msgid " (use \"git reset %s <file>...\" to unstage)"
1045 msgstr " (使用 \"git reset %s <file>...\" 撤出暂存区)"
1048 #: wt-status.c:169 wt-status.c:196
1049 msgid " (use \"git rm --cached <file>...\" to unstage)"
1050 msgstr " (使用 \"git rm --cached <file>...\" 撤出暂存区)"
1054 msgid " (use \"git add <file>...\" to mark resolution)"
1055 msgstr " (使用 \"git add <file>...\" 标记解决方案)"
1058 #: wt-status.c:175 wt-status.c:179
1059 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
1060 msgstr " (酌情使用 \"git add/rm <file>...\" 标记解决方案)"
1064 msgid " (use \"git rm <file>...\" to mark resolution)"
1065 msgstr " (使用 \"git rm <file>...\" 标记解决方案)"
1068 msgid "Changes to be committed:"
1072 msgid "Changes not staged for commit:"
1073 msgstr "尚未暂存以备提交的变更:"
1077 msgid " (use \"git add <file>...\" to update what will be committed)"
1078 msgstr " (使用 \"git add <file>...\" 更新要提交的内容)"
1082 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
1083 msgstr " (使用 \"git add/rm <file>...\" 更新要提交的内容)"
1088 " (use \"git checkout -- <file>...\" to discard changes in working directory)"
1089 msgstr " (使用 \"git checkout -- <file>...\" 丢弃工作区的改动)"
1093 msgid " (commit or discard the untracked or modified content in submodules)"
1094 msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
1099 msgid " (use \"git %s <file>...\" to include in what will be committed)"
1100 msgstr " (使用 \"git %s <file>...\" 以包含要提交的内容)"
1107 msgid "both deleted:"
1111 msgid "added by us:"
1115 msgid "deleted by them:"
1119 msgid "added by them:"
1123 msgid "deleted by us:"
1131 msgid "both modified:"
1134 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1136 msgid "new commits, "
1139 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1141 msgid "modified content, "
1144 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1146 msgid "untracked content, "
1149 # 译者:为保证在输出中对齐,注意调整句中空格!
1152 msgid "new file: %s"
1155 # 译者:为保证在输出中对齐,注意调整句中空格!
1158 msgid "copied: %s -> %s"
1159 msgstr "拷贝: %s -> %s"
1161 # 译者:为保证在输出中对齐,注意调整句中空格!
1167 # 译者:为保证在输出中对齐,注意调整句中空格!
1170 msgid "modified: %s"
1173 # 译者:为保证在输出中对齐,注意调整句中空格!
1176 msgid "renamed: %s -> %s"
1177 msgstr "重命名: %s -> %s"
1179 # 译者:为保证在输出中对齐,注意调整句中空格!
1182 msgid "typechange: %s"
1185 # 译者:为保证在输出中对齐,注意调整句中空格!
1191 # 译者:为保证在输出中对齐,注意调整句中空格!
1194 msgid "unmerged: %s"
1199 msgid "bug: unhandled diff status %c"
1200 msgstr "bug:未处理的差异状态 %c"
1203 msgid "You have unmerged paths."
1207 #: wt-status.c:790 wt-status.c:914
1208 msgid " (fix conflicts and run \"git commit\")"
1209 msgstr " (解决冲突并运行 \"git commit\")"
1212 msgid "All conflicts fixed but you are still merging."
1213 msgstr "所有冲突已解决但您仍处于合并中。"
1217 msgid " (use \"git commit\" to conclude merge)"
1218 msgstr " (使用 \"git commit\" 结束合并)"
1221 msgid "You are in the middle of an am session."
1222 msgstr "您正处于一个 am 过程中。"
1225 msgid "The current patch is empty."
1230 msgid " (fix conflicts and then run \"git am --resolved\")"
1231 msgstr " (解决冲突,然后运行 \"git am --resolved\")"
1235 msgid " (use \"git am --skip\" to skip this patch)"
1236 msgstr " (使用 \"git am --skip\" 跳过此补丁)"
1240 msgid " (use \"git am --abort\" to restore the original branch)"
1241 msgstr " (使用 \"git am --abort\" 恢复原有分支)"
1243 #: wt-status.c:875 wt-status.c:885
1244 msgid "You are currently rebasing."
1249 msgid " (fix conflicts and then run \"git rebase --continue\")"
1250 msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
1254 msgid " (use \"git rebase --skip\" to skip this patch)"
1255 msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
1259 msgid " (use \"git rebase --abort\" to check out the original branch)"
1260 msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
1264 msgid " (all conflicts fixed: run \"git rebase --continue\")"
1265 msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
1268 msgid "You are currently splitting a commit during a rebase."
1269 msgstr "您正在变基过程中拆分一个提交。"
1273 msgid " (Once your working directory is clean, run \"git rebase --continue\")"
1274 msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
1277 msgid "You are currently editing a commit during a rebase."
1278 msgstr "您正在变基过程中编辑一个提交。"
1282 msgid " (use \"git commit --amend\" to amend the current commit)"
1283 msgstr " (使用 \"git commit --amend\" 修补当前提交)"
1288 " (use \"git rebase --continue\" once you are satisfied with your changes)"
1289 msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
1292 msgid "You are currently cherry-picking."
1297 msgid " (all conflicts fixed: run \"git commit\")"
1298 msgstr " (解决所有冲突后,执行 \"git commit\")"
1301 msgid "You are currently bisecting."
1306 msgid " (use \"git bisect reset\" to get back to the original branch)"
1307 msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
1314 msgid "Not currently on any branch."
1318 msgid "Initial commit"
1322 msgid "Untracked files"
1326 msgid "Ignored files"
1331 msgid "Untracked files not listed%s"
1332 msgstr "未跟踪的文件没有列出%s"
1334 # 译者:中文字符串拼接,可删除前导空格
1336 msgid " (use -u option to show untracked files)"
1337 msgstr "(使用 -u 参数显示未跟踪的文件)"
1343 # 译者:中文字符串拼接,可删除前导空格
1346 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
1347 msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
1351 msgid "no changes added to commit\n"
1357 "nothing added to commit but untracked files present (use \"git add\" to "
1359 msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
1363 msgid "nothing added to commit but untracked files present\n"
1364 msgstr "提交为空,但是存在尚未跟踪的文件\n"
1366 # 译者:中文字符串拼接,可删除前导空格
1369 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
1370 msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
1372 #: wt-status.c:1045 wt-status.c:1050
1374 msgid "nothing to commit\n"
1377 # 译者:中文字符串拼接,可删除前导空格
1380 msgid "nothing to commit (use -u to show untracked files)\n"
1381 msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
1383 # 译者:中文字符串拼接,可删除前导空格
1386 msgid "nothing to commit, working directory clean\n"
1387 msgstr "无文件要提交,干净的工作区\n"
1390 msgid "HEAD (no branch)"
1395 msgid "Initial commit on "
1404 #: wt-status.c:1184 wt-status.c:1187
1414 msgid "git add [options] [--] <filepattern>..."
1415 msgstr "git add [选项] [--] <filepattern>..."
1419 msgid "unexpected diff status %c"
1422 #: builtin/add.c:67 builtin/commit.c:231
1423 msgid "updating files failed"
1428 msgid "remove '%s'\n"
1431 #: builtin/add.c:176
1433 msgid "Path '%s' is in submodule '%.*s'"
1434 msgstr "路径 '%s' 属于模组 '%.*s'"
1436 #: builtin/add.c:192
1437 msgid "Unstaged changes after refreshing the index:"
1438 msgstr "刷新索引之后尚未被暂存的变更:"
1440 #: builtin/add.c:195 builtin/add.c:460 builtin/rm.c:275
1442 msgid "pathspec '%s' did not match any files"
1443 msgstr "路径 '%s' 未匹配任何文件"
1445 #: builtin/add.c:209
1447 msgid "'%s' is beyond a symbolic link"
1448 msgstr "'%s' 位于符号链接中"
1450 #: builtin/add.c:276
1451 msgid "Could not read the index"
1454 #: builtin/add.c:286
1456 msgid "Could not open '%s' for writing."
1457 msgstr "不能打开 '%s' 以写入。"
1459 #: builtin/add.c:290
1460 msgid "Could not write patch"
1463 #: builtin/add.c:295
1465 msgid "Could not stat '%s'"
1466 msgstr "不能查看文件状态 '%s'"
1468 #: builtin/add.c:297
1469 msgid "Empty patch. Aborted."
1472 #: builtin/add.c:303
1474 msgid "Could not apply '%s'"
1477 #: builtin/add.c:313
1478 msgid "The following paths are ignored by one of your .gitignore files:\n"
1479 msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
1481 #: builtin/add.c:319 builtin/clean.c:160 builtin/fetch.c:78 builtin/mv.c:63
1482 #: builtin/prune-packed.c:76 builtin/push.c:396 builtin/remote.c:1253
1487 #: builtin/add.c:320 builtin/apply.c:4365 builtin/commit.c:1160
1488 #: builtin/count-objects.c:82 builtin/fsck.c:613 builtin/log.c:1522
1489 #: builtin/mv.c:62 builtin/read-tree.c:112
1493 #: builtin/add.c:322
1494 msgid "interactive picking"
1497 #: builtin/add.c:323 builtin/checkout.c:1031 builtin/reset.c:258
1498 msgid "select hunks interactively"
1501 #: builtin/add.c:324
1502 msgid "edit current diff and apply"
1505 #: builtin/add.c:325
1506 msgid "allow adding otherwise ignored files"
1509 #: builtin/add.c:326
1510 msgid "update tracked files"
1513 #: builtin/add.c:327
1514 msgid "record only the fact that the path will be added later"
1515 msgstr "只记录,该路径稍后再添加"
1517 #: builtin/add.c:328
1518 msgid "add changes from all tracked and untracked files"
1519 msgstr "添加所有改变的已跟踪文件和未跟踪文件"
1521 #: builtin/add.c:329
1522 msgid "don't add, only refresh the index"
1525 #: builtin/add.c:330
1526 msgid "just skip files which cannot be added because of errors"
1527 msgstr "跳过因出错不能添加的文件"
1529 #: builtin/add.c:331
1530 msgid "check if - even missing - files are ignored in dry run"
1531 msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
1533 #: builtin/add.c:353
1535 msgid "Use -f if you really want to add them.\n"
1536 msgstr "使用 -f 参数如果您确实要添加它们。\n"
1538 #: builtin/add.c:354
1539 msgid "no files added"
1542 #: builtin/add.c:360
1543 msgid "adding files failed"
1546 #: builtin/add.c:392
1547 msgid "-A and -u are mutually incompatible"
1548 msgstr "-A 和 -u 选项互斥"
1550 #: builtin/add.c:394
1551 msgid "Option --ignore-missing can only be used together with --dry-run"
1552 msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
1554 #: builtin/add.c:414
1556 msgid "Nothing specified, nothing added.\n"
1557 msgstr "没有指定文件,也没有文件被添加。\n"
1559 #: builtin/add.c:415
1561 msgid "Maybe you wanted to say 'git add .'?\n"
1562 msgstr "也许您想要执行 'git add .'?\n"
1564 #: builtin/add.c:421 builtin/clean.c:203 builtin/commit.c:291 builtin/mv.c:82
1566 msgid "index file corrupt"
1569 #: builtin/add.c:481 builtin/apply.c:4461 builtin/mv.c:229 builtin/rm.c:370
1570 msgid "Unable to write new index file"
1573 #: builtin/apply.c:57
1574 msgid "git apply [options] [<patch>...]"
1575 msgstr "git apply [选项] [<补丁>...]"
1577 #: builtin/apply.c:110
1579 msgid "unrecognized whitespace option '%s'"
1580 msgstr "未能识别的空白字符选项 '%s'"
1582 #: builtin/apply.c:125
1584 msgid "unrecognized whitespace ignore option '%s'"
1585 msgstr "未能识别的空白字符忽略选项 '%s'"
1587 #: builtin/apply.c:823
1589 msgid "Cannot prepare timestamp regexp %s"
1590 msgstr "无法准备时间戳正则表达式 %s"
1592 #: builtin/apply.c:832
1594 msgid "regexec returned %d for input: %s"
1595 msgstr "regexec 返回 %d,输入为:%s"
1597 #: builtin/apply.c:913
1599 msgid "unable to find filename in patch at line %d"
1600 msgstr "不能在补丁的第 %d 行找到文件名"
1602 #: builtin/apply.c:945
1604 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
1605 msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
1607 #: builtin/apply.c:949
1609 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
1610 msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
1612 #: builtin/apply.c:950
1614 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
1615 msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
1617 #: builtin/apply.c:957
1619 msgid "git apply: bad git-diff - expected /dev/null on line %d"
1620 msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
1622 #: builtin/apply.c:1420
1624 msgid "recount: unexpected line: %.*s"
1625 msgstr "recount:意外的行:%.*s"
1627 #: builtin/apply.c:1477
1629 msgid "patch fragment without header at line %d: %.*s"
1630 msgstr "第 %d 行的补丁片段没有头信息:%.*s"
1632 #: builtin/apply.c:1494
1635 "git diff header lacks filename information when removing %d leading pathname "
1636 "component (line %d)"
1638 "git diff header lacks filename information when removing %d leading pathname "
1639 "components (line %d)"
1640 msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
1641 msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
1643 #: builtin/apply.c:1654
1644 msgid "new file depends on old contents"
1647 #: builtin/apply.c:1656
1648 msgid "deleted file still has contents"
1651 #: builtin/apply.c:1682
1653 msgid "corrupt patch at line %d"
1654 msgstr "补丁在第 %d 行损坏"
1656 #: builtin/apply.c:1718
1658 msgid "new file %s depends on old contents"
1659 msgstr "新文件 %s 依赖旧内容"
1661 #: builtin/apply.c:1720
1663 msgid "deleted file %s still has contents"
1664 msgstr "删除的文件 %s 仍有内容"
1666 #: builtin/apply.c:1723
1668 msgid "** warning: file %s becomes empty but is not deleted"
1669 msgstr "** 警告:文件 %s 成为空文件但并未删除"
1671 #: builtin/apply.c:1869
1673 msgid "corrupt binary patch at line %d: %.*s"
1674 msgstr "二进制补丁在第 %d 行损坏:%.*s"
1676 #. there has to be one hunk (forward hunk)
1677 #: builtin/apply.c:1898
1679 msgid "unrecognized binary patch at line %d"
1680 msgstr "未能识别的二进制补丁位于第 %d 行"
1682 #: builtin/apply.c:1984
1684 msgid "patch with only garbage at line %d"
1685 msgstr "补丁文件的第 %d 行只有垃圾数据"
1687 #: builtin/apply.c:2074
1689 msgid "unable to read symlink %s"
1690 msgstr "无法读取符号链接 %s"
1692 #: builtin/apply.c:2078
1694 msgid "unable to open or read %s"
1697 #: builtin/apply.c:2682
1699 msgid "invalid start of line: '%c'"
1700 msgstr "无效的行首字符:'%c'"
1702 #: builtin/apply.c:2800
1704 msgid "Hunk #%d succeeded at %d (offset %d line)."
1705 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1706 msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
1707 msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
1709 #: builtin/apply.c:2812
1711 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
1712 msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
1714 #: builtin/apply.c:2818
1717 "while searching for:\n"
1723 #: builtin/apply.c:2837
1725 msgid "missing binary patch data for '%s'"
1726 msgstr "缺失 '%s' 的二进制补丁数据"
1728 #: builtin/apply.c:2940
1730 msgid "binary patch does not apply to '%s'"
1731 msgstr "二进制补丁未应用到 '%s'"
1733 #: builtin/apply.c:2946
1735 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1736 msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
1738 #: builtin/apply.c:2967
1740 msgid "patch failed: %s:%ld"
1741 msgstr "打补丁失败:%s:%ld"
1743 #: builtin/apply.c:3089
1745 msgid "cannot checkout %s"
1748 #: builtin/apply.c:3134 builtin/apply.c:3143 builtin/apply.c:3187
1750 msgid "read of %s failed"
1753 #: builtin/apply.c:3167 builtin/apply.c:3389
1755 msgid "path %s has been renamed/deleted"
1756 msgstr "路径 %s 已经被重命名/删除"
1758 #: builtin/apply.c:3248 builtin/apply.c:3403
1760 msgid "%s: does not exist in index"
1763 #: builtin/apply.c:3252 builtin/apply.c:3395 builtin/apply.c:3417
1768 #: builtin/apply.c:3257 builtin/apply.c:3411
1770 msgid "%s: does not match index"
1773 #: builtin/apply.c:3359
1774 msgid "removal patch leaves file contents"
1775 msgstr "移除补丁仍留下了文件内容"
1777 #: builtin/apply.c:3428
1779 msgid "%s: wrong type"
1782 #: builtin/apply.c:3430
1784 msgid "%s has type %o, expected %o"
1785 msgstr "%s 的类型是 %o,应为 %o"
1787 #: builtin/apply.c:3531
1789 msgid "%s: already exists in index"
1790 msgstr "%s:已经存在于索引中"
1792 #: builtin/apply.c:3534
1794 msgid "%s: already exists in working directory"
1795 msgstr "%s:已经存在于工作区中"
1797 #: builtin/apply.c:3554
1799 msgid "new mode (%o) of %s does not match old mode (%o)"
1800 msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
1802 #: builtin/apply.c:3559
1804 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1805 msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
1807 #: builtin/apply.c:3567
1809 msgid "%s: patch does not apply"
1812 #: builtin/apply.c:3580
1814 msgid "Checking patch %s..."
1817 #: builtin/apply.c:3635 builtin/checkout.c:215 builtin/reset.c:124
1819 msgid "make_cache_entry failed for path '%s'"
1820 msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
1822 #: builtin/apply.c:3778
1824 msgid "unable to remove %s from index"
1825 msgstr "不能从索引中移除 %s"
1827 #: builtin/apply.c:3806
1829 msgid "corrupt patch for subproject %s"
1830 msgstr "子项目 %s 损坏的补丁"
1832 #: builtin/apply.c:3810
1834 msgid "unable to stat newly created file '%s'"
1835 msgstr "不能枚举新建文件 '%s' 的状态"
1837 #: builtin/apply.c:3815
1839 msgid "unable to create backing store for newly created file %s"
1840 msgstr "不能为新建文件 %s 创建后端存储"
1842 #: builtin/apply.c:3818 builtin/apply.c:3926
1844 msgid "unable to add cache entry for %s"
1845 msgstr "无法为 %s 添加缓存条目"
1847 #: builtin/apply.c:3851
1849 msgid "closing file '%s'"
1852 #: builtin/apply.c:3900
1854 msgid "unable to write file '%s' mode %o"
1855 msgstr "不能写文件 '%s' 权限 %o"
1857 #: builtin/apply.c:3987
1859 msgid "Applied patch %s cleanly."
1862 #: builtin/apply.c:3995
1863 msgid "internal error"
1866 #. Say this even without --verbose
1867 #: builtin/apply.c:3998
1869 msgid "Applying patch %%s with %d reject..."
1870 msgid_plural "Applying patch %%s with %d rejects..."
1871 msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
1872 msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
1874 #: builtin/apply.c:4008
1876 msgid "truncating .rej filename to %.*s.rej"
1877 msgstr "截短 .rej 文件名为 %.*s.rej"
1879 #: builtin/apply.c:4029
1881 msgid "Hunk #%d applied cleanly."
1882 msgstr "第 #%d 个片段成功应用。"
1884 #: builtin/apply.c:4032
1886 msgid "Rejected hunk #%d."
1887 msgstr "拒绝第 #%d 个片段。"
1889 #: builtin/apply.c:4182
1890 msgid "unrecognized input"
1893 #: builtin/apply.c:4193
1894 msgid "unable to read index file"
1897 #: builtin/apply.c:4312 builtin/apply.c:4315 builtin/clone.c:91
1898 #: builtin/fetch.c:63
1902 #: builtin/apply.c:4313
1903 msgid "don't apply changes matching the given path"
1904 msgstr "不要应用与给出路径向匹配的变更"
1906 #: builtin/apply.c:4316
1907 msgid "apply changes matching the given path"
1908 msgstr "应用与给出路径向匹配的变更"
1910 #: builtin/apply.c:4318
1914 #: builtin/apply.c:4319
1915 msgid "remove <num> leading slashes from traditional diff paths"
1916 msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
1918 #: builtin/apply.c:4322
1919 msgid "ignore additions made by the patch"
1920 msgstr "忽略补丁中的添加的文件"
1922 #: builtin/apply.c:4324
1923 msgid "instead of applying the patch, output diffstat for the input"
1924 msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
1926 #: builtin/apply.c:4328
1927 msgid "show number of added and deleted lines in decimal notation"
1928 msgstr "以十进制数显示添加和删除的行数"
1930 #: builtin/apply.c:4330
1931 msgid "instead of applying the patch, output a summary for the input"
1932 msgstr "不应用补丁,而是显示输入的概要"
1934 #: builtin/apply.c:4332
1935 msgid "instead of applying the patch, see if the patch is applicable"
1936 msgstr "不应用补丁,而是查看补丁是否可应用"
1938 #: builtin/apply.c:4334
1939 msgid "make sure the patch is applicable to the current index"
1940 msgstr "确认补丁可以应用到当前索引"
1942 #: builtin/apply.c:4336
1943 msgid "apply a patch without touching the working tree"
1944 msgstr "应用补丁而不修改工作区"
1946 #: builtin/apply.c:4338
1947 msgid "also apply the patch (use with --stat/--summary/--check)"
1948 msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
1950 #: builtin/apply.c:4340
1951 msgid "attempt three-way merge if a patch does not apply"
1952 msgstr "如果一个补丁不能应用则尝试三路合并"
1954 #: builtin/apply.c:4342
1955 msgid "build a temporary index based on embedded index information"
1956 msgstr "创建一个临时索引基于嵌入的索引信息"
1958 #: builtin/apply.c:4344 builtin/checkout-index.c:197 builtin/ls-files.c:460
1959 msgid "paths are separated with NUL character"
1960 msgstr "路径以 NUL 字符分隔"
1962 #: builtin/apply.c:4347
1963 msgid "ensure at least <n> lines of context match"
1964 msgstr "确保至少匹配 <n> 行上下文"
1966 #: builtin/apply.c:4348
1970 #: builtin/apply.c:4349
1971 msgid "detect new or modified lines that have whitespace errors"
1972 msgstr "检查新增和修改的行中间的空白字符滥用"
1974 #: builtin/apply.c:4352 builtin/apply.c:4355
1975 msgid "ignore changes in whitespace when finding context"
1976 msgstr "查找上下文时忽略空白字符的变更"
1978 #: builtin/apply.c:4358
1979 msgid "apply the patch in reverse"
1982 #: builtin/apply.c:4360
1983 msgid "don't expect at least one line of context"
1986 #: builtin/apply.c:4362
1987 msgid "leave the rejected hunks in corresponding *.rej files"
1988 msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
1990 #: builtin/apply.c:4364
1991 msgid "allow overlapping hunks"
1994 #: builtin/apply.c:4367
1995 msgid "tolerate incorrectly detected missing new-line at the end of file"
1996 msgstr "允许不正确的文件末尾换行符"
1998 #: builtin/apply.c:4370
1999 msgid "do not trust the line counts in the hunk headers"
2000 msgstr "不信任补丁片段的头信息中的行号"
2002 #: builtin/apply.c:4372
2006 #: builtin/apply.c:4373
2007 msgid "prepend <root> to all filenames"
2008 msgstr "为所有文件名前添加 <根目录>"
2010 #: builtin/apply.c:4395
2011 msgid "--3way outside a repository"
2012 msgstr "--3way 在一个版本库之外"
2014 #: builtin/apply.c:4403
2015 msgid "--index outside a repository"
2016 msgstr "--index 在一个版本库之外"
2018 #: builtin/apply.c:4406
2019 msgid "--cached outside a repository"
2020 msgstr "--cached 在一个版本库之外"
2022 #: builtin/apply.c:4422
2024 msgid "can't open patch '%s'"
2025 msgstr "不能打开补丁 '%s'"
2027 #: builtin/apply.c:4436
2029 msgid "squelched %d whitespace error"
2030 msgid_plural "squelched %d whitespace errors"
2031 msgstr[0] "抑制下仍有 %d 个空白字符误用"
2032 msgstr[1] "抑制下仍有 %d 个空白字符误用"
2034 #: builtin/apply.c:4442 builtin/apply.c:4452
2036 msgid "%d line adds whitespace errors."
2037 msgid_plural "%d lines add whitespace errors."
2038 msgstr[0] "%d 行有空白字符误用。"
2039 msgstr[1] "%d 行有空白字符误用。"
2041 #: builtin/archive.c:17
2043 msgid "could not create archive file '%s'"
2044 msgstr "不能创建归档文件 '%s'"
2046 #: builtin/archive.c:20
2047 msgid "could not redirect output"
2050 #: builtin/archive.c:37
2051 msgid "git archive: Remote with no URL"
2052 msgstr "git archive:未提供远程URL"
2054 #: builtin/archive.c:58
2055 msgid "git archive: expected ACK/NAK, got EOF"
2056 msgstr "git archive:应为ACK/NACK,却得到EOF"
2058 #: builtin/archive.c:63
2060 msgid "git archive: NACK %s"
2061 msgstr "git archive:NACK %s"
2063 #: builtin/archive.c:65
2065 msgid "remote error: %s"
2068 #: builtin/archive.c:66
2069 msgid "git archive: protocol error"
2070 msgstr "git archive:协议错误"
2072 #: builtin/archive.c:71
2073 msgid "git archive: expected a flush"
2074 msgstr "git archive:应为刷新"
2076 #: builtin/bisect--helper.c:7
2077 msgid "git bisect--helper --next-all [--no-checkout]"
2078 msgstr "git bisect--helper --next-all [--no-checkout]"
2080 #: builtin/bisect--helper.c:17
2081 msgid "perform 'git bisect next'"
2082 msgstr "执行 'git bisect next'"
2084 #: builtin/bisect--helper.c:19
2085 msgid "update BISECT_HEAD instead of checking out the current commit"
2086 msgstr "更新 BISECT_HEAD 而非检出当前提交"
2088 #: builtin/blame.c:25
2089 msgid "git blame [options] [rev-opts] [rev] [--] file"
2090 msgstr "git blame [选项] [版本选项] [版本] [--] 文件"
2092 #: builtin/blame.c:30 builtin/shortlog.c:15
2093 msgid "[rev-opts] are documented in git-rev-list(1)"
2094 msgstr "[版本选项] 的文档记录在 git-rev-list(1) 中"
2096 #: builtin/blame.c:2364
2097 msgid "Show blame entries as we find them, incrementally"
2098 msgstr "增量式地显示发现的 blame 条目"
2100 #: builtin/blame.c:2365
2101 msgid "Show blank SHA-1 for boundary commits (Default: off)"
2102 msgstr "边界提交显示空的 SHA-1(默认:关闭)"
2104 #: builtin/blame.c:2366
2105 msgid "Do not treat root commits as boundaries (Default: off)"
2106 msgstr "不把根提交作为边界(默认:关闭)"
2108 #: builtin/blame.c:2367
2109 msgid "Show work cost statistics"
2112 #: builtin/blame.c:2368
2113 msgid "Show output score for blame entries"
2114 msgstr "显示判断 blame 条目位移的得分诊断信息"
2116 #: builtin/blame.c:2369
2117 msgid "Show original filename (Default: auto)"
2118 msgstr "显示原始文件名(默认:自动)"
2120 #: builtin/blame.c:2370
2121 msgid "Show original linenumber (Default: off)"
2122 msgstr "显示原始的行号(默认:关闭)"
2124 #: builtin/blame.c:2371
2125 msgid "Show in a format designed for machine consumption"
2126 msgstr "显示为一个适合机器读取的格式"
2128 #: builtin/blame.c:2372
2129 msgid "Show porcelain format with per-line commit information"
2130 msgstr "为每一行显示机器适用的提交信息"
2132 #: builtin/blame.c:2373
2133 msgid "Use the same output mode as git-annotate (Default: off)"
2134 msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
2136 #: builtin/blame.c:2374
2137 msgid "Show raw timestamp (Default: off)"
2138 msgstr "显示原始时间戳(默认:关闭)"
2140 #: builtin/blame.c:2375
2141 msgid "Show long commit SHA1 (Default: off)"
2142 msgstr "显示长的SHA1提交号(默认:关闭)"
2144 #: builtin/blame.c:2376
2145 msgid "Suppress author name and timestamp (Default: off)"
2146 msgstr "隐藏作者名字和时间戳(默认:关闭)"
2148 #: builtin/blame.c:2377
2149 msgid "Show author email instead of name (Default: off)"
2150 msgstr "显示作者的邮箱而不是名字(默认:关闭)"
2152 #: builtin/blame.c:2378
2153 msgid "Ignore whitespace differences"
2156 #: builtin/blame.c:2379
2157 msgid "Spend extra cycles to find better match"
2158 msgstr "花费额外的循环来找到更好的匹配"
2160 #: builtin/blame.c:2380
2161 msgid "Use revisions from <file> instead of calling git-rev-list"
2162 msgstr "使用来自 <file> 的修订集而不是调用 git-rev-list"
2164 #: builtin/blame.c:2381
2165 msgid "Use <file>'s contents as the final image"
2166 msgstr "使用 <file> 的内容作为最终的图片"
2168 #: builtin/blame.c:2382 builtin/blame.c:2383
2172 #: builtin/blame.c:2382
2173 msgid "Find line copies within and across files"
2174 msgstr "找到文件内及跨文件的行拷贝"
2176 #: builtin/blame.c:2383
2177 msgid "Find line movements within and across files"
2178 msgstr "找到文件内及跨文件的行移动"
2180 #: builtin/blame.c:2384
2184 #: builtin/blame.c:2384
2185 msgid "Process only line range n,m, counting from 1"
2186 msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
2188 #: builtin/branch.c:23
2189 msgid "git branch [options] [-r | -a] [--merged | --no-merged]"
2190 msgstr "git branch [选项] [-r | -a] [--merged | --no-merged]"
2192 #: builtin/branch.c:24
2193 msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]"
2194 msgstr "git branch [选项] [-l] [-f] <分支名> [<起始点>]"
2196 #: builtin/branch.c:25
2197 msgid "git branch [options] [-r] (-d | -D) <branchname>..."
2198 msgstr "git branch [选项] [-r] (-d | -D) <分支名>..."
2200 #: builtin/branch.c:26
2201 msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"
2202 msgstr "git branch [选项] (-m | -M) [<旧分支>] <新分支>"
2204 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
2205 #: builtin/branch.c:145
2208 "deleting branch '%s' that has been merged to\n"
2209 " '%s', but not yet merged to HEAD."
2211 "将要删除的分支 '%s' 已经被合并到\n"
2214 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
2215 #: builtin/branch.c:149
2218 "not deleting branch '%s' that is not yet merged to\n"
2219 " '%s', even though it is merged to HEAD."
2221 "并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
2222 " 然而却尚未被合并到分支 '%s' 。"
2224 #: builtin/branch.c:163
2226 msgid "Couldn't look up commit object for '%s'"
2227 msgstr "无法查询 '%s' 指向的提交对象"
2229 #: builtin/branch.c:167
2232 "The branch '%s' is not fully merged.\n"
2233 "If you are sure you want to delete it, run 'git branch -D %s'."
2236 "如果您确认要删除它,执行 'git branch -D %s'。"
2238 #: builtin/branch.c:180
2239 msgid "Update of config-file failed"
2240 msgstr "无法更新 config 文件"
2242 #: builtin/branch.c:208
2243 msgid "cannot use -a with -d"
2244 msgstr "不能将 -a 和 -d 同时使用"
2246 #: builtin/branch.c:214
2247 msgid "Couldn't look up commit object for HEAD"
2248 msgstr "无法查询 HEAD 指向的提交对象"
2250 #: builtin/branch.c:222
2252 msgid "Cannot delete the branch '%s' which you are currently on."
2253 msgstr "无法删除您当前所在的分支 '%s'。"
2255 #: builtin/branch.c:235
2257 msgid "remote branch '%s' not found."
2258 msgstr "远程分支 '%s' 未发现。"
2260 #: builtin/branch.c:236
2262 msgid "branch '%s' not found."
2263 msgstr "分支 '%s' 未发现。"
2265 #: builtin/branch.c:250
2267 msgid "Error deleting remote branch '%s'"
2268 msgstr "删除远程分支 '%s' 时出错"
2270 #: builtin/branch.c:251
2272 msgid "Error deleting branch '%s'"
2273 msgstr "删除分支 '%s' 时出错"
2275 #: builtin/branch.c:258
2277 msgid "Deleted remote branch %s (was %s).\n"
2278 msgstr "已删除远程分支 %s(曾为 %s)。\n"
2280 #: builtin/branch.c:259
2282 msgid "Deleted branch %s (was %s).\n"
2283 msgstr "已删除分支 %s(曾为 %s)。\n"
2285 #: builtin/branch.c:361
2287 msgid "branch '%s' does not point at a commit"
2288 msgstr "分支 '%s' 未指向一个提交"
2290 #: builtin/branch.c:433
2292 msgid "[%s: behind %d]"
2295 #: builtin/branch.c:435
2300 #: builtin/branch.c:439
2302 msgid "[%s: ahead %d]"
2305 #: builtin/branch.c:441
2310 #: builtin/branch.c:444
2312 msgid "[%s: ahead %d, behind %d]"
2313 msgstr "[%s:领先 %d,落后 %d]"
2315 #: builtin/branch.c:447
2317 msgid "[ahead %d, behind %d]"
2318 msgstr "[领先 %d,落后 %d]"
2320 #: builtin/branch.c:560
2324 #: builtin/branch.c:625
2325 msgid "some refs could not be read"
2328 #: builtin/branch.c:638
2329 msgid "cannot rename the current branch while not on any."
2330 msgstr "无法重命名当前分支因为不处于任何分支上。"
2332 #: builtin/branch.c:648
2334 msgid "Invalid branch name: '%s'"
2335 msgstr "无效的分支名:'%s'"
2337 #: builtin/branch.c:663
2338 msgid "Branch rename failed"
2341 #: builtin/branch.c:667
2343 msgid "Renamed a misnamed branch '%s' away"
2344 msgstr "重命名掉一个错误命名的旧分支 '%s'"
2346 #: builtin/branch.c:671
2348 msgid "Branch renamed to %s, but HEAD is not updated!"
2349 msgstr "分支重命名为 %s,但 HEAD 没有更新!"
2351 #: builtin/branch.c:678
2352 msgid "Branch is renamed, but update of config-file failed"
2353 msgstr "分支被重命名,但更新 config 文件失败"
2355 #: builtin/branch.c:693
2357 msgid "malformed object name %s"
2360 #: builtin/branch.c:717
2362 msgid "could not write branch description template: %s"
2363 msgstr "不能写分支描述模版:%s"
2365 #: builtin/branch.c:747
2366 msgid "Generic options"
2369 #: builtin/branch.c:749
2370 msgid "show hash and subject, give twice for upstream branch"
2371 msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
2373 #: builtin/branch.c:750
2374 msgid "suppress informational messages"
2377 #: builtin/branch.c:751
2378 msgid "set up tracking mode (see git-pull(1))"
2379 msgstr "设置跟踪模式(参见 git-pull(1))"
2381 #: builtin/branch.c:753
2382 msgid "change upstream info"
2385 #: builtin/branch.c:757
2386 msgid "use colored output"
2389 #: builtin/branch.c:758
2390 msgid "act on remote-tracking branches"
2393 #: builtin/branch.c:761 builtin/branch.c:767 builtin/branch.c:788
2394 #: builtin/branch.c:794 builtin/commit.c:1378 builtin/commit.c:1379
2395 #: builtin/commit.c:1380 builtin/commit.c:1381 builtin/tag.c:470
2399 #: builtin/branch.c:762 builtin/branch.c:768
2400 msgid "print only branches that contain the commit"
2401 msgstr "只打印包含该提交的分支"
2403 #: builtin/branch.c:774
2404 msgid "Specific git-branch actions:"
2405 msgstr "具体的 git-branch 动作:"
2407 #: builtin/branch.c:775
2408 msgid "list both remote-tracking and local branches"
2409 msgstr "列出远程跟踪及本地分支"
2411 #: builtin/branch.c:777
2412 msgid "delete fully merged branch"
2415 #: builtin/branch.c:778
2416 msgid "delete branch (even if not merged)"
2417 msgstr "删除分支(即使没有合并)"
2419 #: builtin/branch.c:779
2420 msgid "move/rename a branch and its reflog"
2421 msgstr "移动/重命名一个分支,以及它的引用日志"
2423 #: builtin/branch.c:780
2424 msgid "move/rename a branch, even if target exists"
2425 msgstr "移动/重命名一个分支,即使目标已存在"
2427 #: builtin/branch.c:781
2428 msgid "list branch names"
2431 #: builtin/branch.c:782
2432 msgid "create the branch's reflog"
2435 #: builtin/branch.c:784
2436 msgid "edit the description for the branch"
2439 #: builtin/branch.c:785
2440 msgid "force creation (when already exists)"
2441 msgstr "强制创建(当已经存在)"
2443 #: builtin/branch.c:788
2444 msgid "print only not merged branches"
2447 #: builtin/branch.c:794
2448 msgid "print only merged branches"
2451 #: builtin/branch.c:798
2452 msgid "list branches in columns"
2455 #: builtin/branch.c:811
2456 msgid "Failed to resolve HEAD as a valid ref."
2457 msgstr "无法将 HEAD 解析为有效引用。"
2459 #: builtin/branch.c:816 builtin/clone.c:561
2460 msgid "HEAD not found below refs/heads!"
2461 msgstr "HEAD 没有位于 /refs/heads 之下!"
2463 #: builtin/branch.c:836
2464 msgid "--column and --verbose are incompatible"
2465 msgstr "--column 和 --verbose 不兼容"
2467 #: builtin/branch.c:887
2469 msgid "branch '%s' does not exist"
2470 msgstr "分支 '%s' 不存在"
2472 #: builtin/branch.c:899
2474 msgid "Branch '%s' has no upstream information"
2475 msgstr "分支 '%s' 没有上游信息"
2477 #: builtin/branch.c:914
2478 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
2479 msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
2481 #: builtin/branch.c:917
2484 "The --set-upstream flag is deprecated and will be removed. Consider using --"
2485 "track or --set-upstream-to\n"
2487 "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
2489 #: builtin/branch.c:934
2493 "If you wanted to make '%s' track '%s', do this:\n"
2497 "如果你想用 '%s' 跟踪 '%s', 这么做:\n"
2500 #: builtin/branch.c:935
2502 msgid " git branch -d %s\n"
2503 msgstr " git branch -d %s\n"
2505 #: builtin/branch.c:936
2507 msgid " git branch --set-upstream-to %s\n"
2508 msgstr " git branch --set-upstream-to %s\n"
2510 #: builtin/bundle.c:47
2512 msgid "%s is okay\n"
2515 #: builtin/bundle.c:56
2516 msgid "Need a repository to create a bundle."
2517 msgstr "需要一个版本库来创建包。"
2519 #: builtin/bundle.c:60
2520 msgid "Need a repository to unbundle."
2521 msgstr "需要一个版本库来解包。"
2523 #: builtin/cat-file.c:247
2524 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
2525 msgstr "git cat-file (-t|-s|-e|-p|<类型>|--textconv) <对象>"
2527 #: builtin/cat-file.c:248
2528 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
2529 msgstr "git cat-file (--batch|--batch-check) < <对象列表>"
2531 #: builtin/cat-file.c:266
2532 msgid "<type> can be one of: blob, tree, commit, tag"
2533 msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
2535 #: builtin/cat-file.c:267
2536 msgid "show object type"
2539 #: builtin/cat-file.c:268
2540 msgid "show object size"
2543 #: builtin/cat-file.c:270
2544 msgid "exit with zero when there's no error"
2545 msgstr "当没有错误时退出并返回零"
2547 #: builtin/cat-file.c:271
2548 msgid "pretty-print object's content"
2551 #: builtin/cat-file.c:273
2552 msgid "for blob objects, run textconv on object's content"
2553 msgstr "对于数据(blob)对象,对其内容执行 textconv"
2555 #: builtin/cat-file.c:275
2556 msgid "show info and content of objects fed from the standard input"
2557 msgstr "显示从标准输入提供的对象的信息和内容"
2559 #: builtin/cat-file.c:278
2560 msgid "show info about objects fed from the standard input"
2561 msgstr "显示从标准输入提供的对象的信息"
2563 #: builtin/check-attr.c:11
2564 msgid "git check-attr [-a | --all | attr...] [--] pathname..."
2565 msgstr "git check-attr [-a | --all | attr...] [--] 路径名..."
2567 #: builtin/check-attr.c:12
2568 msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"
2569 msgstr "git check-attr --stdin [-z] [-a | --all | attr...] < <路径列表>"
2571 #: builtin/check-attr.c:19
2572 msgid "report all attributes set on file"
2573 msgstr "报告设置在文件上的所有属性"
2575 #: builtin/check-attr.c:20
2576 msgid "use .gitattributes only from the index"
2577 msgstr "只使用索引中的 .gitattributes"
2579 #: builtin/check-attr.c:21 builtin/hash-object.c:75
2580 msgid "read file names from stdin"
2583 #: builtin/check-attr.c:23
2584 msgid "input paths are terminated by a null character"
2585 msgstr "输入路径以null字符终止"
2587 #: builtin/checkout-index.c:126
2588 msgid "git checkout-index [options] [--] [<file>...]"
2589 msgstr "git checkout-index [选项] [--] [<文件>...]"
2591 #: builtin/checkout-index.c:187
2592 msgid "check out all files in the index"
2595 #: builtin/checkout-index.c:188
2596 msgid "force overwrite of existing files"
2599 #: builtin/checkout-index.c:190
2600 msgid "no warning for existing files and files not in index"
2601 msgstr "存在或不在索引中的文件都没有警告"
2603 #: builtin/checkout-index.c:192
2604 msgid "don't checkout new files"
2607 #: builtin/checkout-index.c:194
2608 msgid "update stat information in the index file"
2609 msgstr "更新索引中文件的状态信息"
2611 #: builtin/checkout-index.c:200
2612 msgid "read list of paths from the standard input"
2613 msgstr "从标准输入读取路径列表"
2615 #: builtin/checkout-index.c:202
2616 msgid "write the content to temporary files"
2619 #: builtin/checkout-index.c:203 builtin/column.c:30
2623 #: builtin/checkout-index.c:204
2624 msgid "when creating files, prepend <string>"
2625 msgstr "在创建文件时,在前面加上<字符串>"
2627 #: builtin/checkout-index.c:207
2628 msgid "copy out the files from named stage"
2629 msgstr "从指定暂存区中拷出文件"
2631 #: builtin/checkout.c:25
2632 msgid "git checkout [options] <branch>"
2633 msgstr "git checkout [选项] <分支>"
2635 #: builtin/checkout.c:26
2636 msgid "git checkout [options] [<branch>] -- <file>..."
2637 msgstr "git checkout [选项] [<分支>] -- <文件>..."
2639 #: builtin/checkout.c:116 builtin/checkout.c:149
2641 msgid "path '%s' does not have our version"
2642 msgstr "路径 '%s' 没有我们的版本"
2644 #: builtin/checkout.c:118 builtin/checkout.c:151
2646 msgid "path '%s' does not have their version"
2647 msgstr "路径 '%s' 没有他们的版本"
2649 #: builtin/checkout.c:134
2651 msgid "path '%s' does not have all necessary versions"
2652 msgstr "路径 '%s' 没有全部必须的版本"
2654 #: builtin/checkout.c:178
2656 msgid "path '%s' does not have necessary versions"
2657 msgstr "路径 '%s' 没有必须的版本"
2659 #: builtin/checkout.c:195
2661 msgid "path '%s': cannot merge"
2662 msgstr "path '%s':无法合并"
2664 #: builtin/checkout.c:212
2666 msgid "Unable to add merge result for '%s'"
2667 msgstr "无法为 '%s' 添加合并结果"
2669 #: builtin/checkout.c:236 builtin/checkout.c:239 builtin/checkout.c:242
2670 #: builtin/checkout.c:245
2672 msgid "'%s' cannot be used with updating paths"
2673 msgstr "'%s' 不能在更新路径时使用"
2675 #: builtin/checkout.c:248 builtin/checkout.c:251
2677 msgid "'%s' cannot be used with %s"
2678 msgstr "'%s' 不能和 %s 同时使用"
2680 #: builtin/checkout.c:254
2682 msgid "Cannot update paths and switch to branch '%s' at the same time."
2683 msgstr "不能同时更新路径并切换到分支'%s'。"
2685 #: builtin/checkout.c:265 builtin/checkout.c:426
2686 msgid "corrupt index file"
2689 #: builtin/checkout.c:295 builtin/checkout.c:302
2691 msgid "path '%s' is unmerged"
2692 msgstr "路径 '%s' 未合并"
2694 #: builtin/checkout.c:448
2695 msgid "you need to resolve your current index first"
2696 msgstr "您需要先解决当前索引的冲突"
2698 #: builtin/checkout.c:569
2700 msgid "Can not do reflog for '%s'\n"
2701 msgstr "不能对 '%s' 执行 reflog 操作\n"
2703 #: builtin/checkout.c:602
2704 msgid "HEAD is now at"
2707 #: builtin/checkout.c:609
2709 msgid "Reset branch '%s'\n"
2710 msgstr "重置分支 '%s'\n"
2712 #: builtin/checkout.c:612
2714 msgid "Already on '%s'\n"
2715 msgstr "已经位于 '%s'\n"
2717 #: builtin/checkout.c:616
2719 msgid "Switched to and reset branch '%s'\n"
2720 msgstr "切换并重置分支 '%s'\n"
2722 #: builtin/checkout.c:618 builtin/checkout.c:955
2724 msgid "Switched to a new branch '%s'\n"
2725 msgstr "切换到一个新分支 '%s'\n"
2727 #: builtin/checkout.c:620
2729 msgid "Switched to branch '%s'\n"
2730 msgstr "切换到分支 '%s'\n"
2733 #: builtin/checkout.c:676
2735 msgid " ... and %d more.\n"
2736 msgstr " ... 及其它 %d 个。\n"
2738 #. The singular version
2739 #: builtin/checkout.c:682
2742 "Warning: you are leaving %d commit behind, not connected to\n"
2743 "any of your branches:\n"
2747 "Warning: you are leaving %d commits behind, not connected to\n"
2748 "any of your branches:\n"
2752 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
2756 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
2760 #: builtin/checkout.c:700
2763 "If you want to keep them by creating a new branch, this may be a good time\n"
2766 " git branch new_branch_name %s\n"
2769 "如果您想要通过创建新分支保存他们,这可能是一个好时候。\n"
2772 " git branch new_branch_name %s\n"
2775 #: builtin/checkout.c:730
2776 msgid "internal error in revision walk"
2777 msgstr "在版本遍历时遇到内部错误"
2779 #: builtin/checkout.c:734
2780 msgid "Previous HEAD position was"
2781 msgstr "之前的 HEAD 位置是"
2783 #: builtin/checkout.c:761 builtin/checkout.c:950
2784 msgid "You are on a branch yet to be born"
2785 msgstr "您位于一个尚未初始化的分支"
2788 #: builtin/checkout.c:886
2790 msgid "invalid reference: %s"
2793 #. case (1): want a tree
2794 #: builtin/checkout.c:925
2796 msgid "reference is not a tree: %s"
2799 #: builtin/checkout.c:964
2800 msgid "paths cannot be used with switching branches"
2801 msgstr "路径不能和切换分支同时使用"
2803 #: builtin/checkout.c:967 builtin/checkout.c:971
2805 msgid "'%s' cannot be used with switching branches"
2806 msgstr "'%s' 不能和切换分支同时使用"
2808 #: builtin/checkout.c:975 builtin/checkout.c:978 builtin/checkout.c:983
2809 #: builtin/checkout.c:986
2811 msgid "'%s' cannot be used with '%s'"
2812 msgstr "'%s' 不能和 '%s' 同时使用"
2814 #: builtin/checkout.c:991
2816 msgid "Cannot switch branch to a non-commit '%s'"
2817 msgstr "不能切换分支到一个非提交 '%s'"
2819 #: builtin/checkout.c:1012 builtin/gc.c:177
2820 msgid "suppress progress reporting"
2823 #: builtin/checkout.c:1013 builtin/checkout.c:1015 builtin/clone.c:89
2824 #: builtin/remote.c:169 builtin/remote.c:171
2828 #: builtin/checkout.c:1014
2829 msgid "create and checkout a new branch"
2830 msgstr "创建并检出一个新的分支"
2832 #: builtin/checkout.c:1016
2833 msgid "create/reset and checkout a branch"
2834 msgstr "创建/重置并检出一个分支"
2836 #: builtin/checkout.c:1017
2837 msgid "create reflog for new branch"
2838 msgstr "为新的分支创建引用日志"
2840 #: builtin/checkout.c:1018
2841 msgid "detach the HEAD at named commit"
2842 msgstr "成为指向该提交的分离头指针"
2844 #: builtin/checkout.c:1019
2845 msgid "set upstream info for new branch"
2846 msgstr "为新的分支设置上游信息"
2848 #: builtin/checkout.c:1021
2852 #: builtin/checkout.c:1021
2853 msgid "new unparented branch"
2856 #: builtin/checkout.c:1022
2857 msgid "checkout our version for unmerged files"
2858 msgstr "对尚未合并的文件检出我们的版本"
2860 #: builtin/checkout.c:1024
2861 msgid "checkout their version for unmerged files"
2862 msgstr "对尚未合并的文件检出他们的版本"
2864 #: builtin/checkout.c:1026
2865 msgid "force checkout (throw away local modifications)"
2866 msgstr "强制检出(丢弃本地修改)"
2868 #: builtin/checkout.c:1027
2869 msgid "perform a 3-way merge with the new branch"
2870 msgstr "和新的分支执行三路合并"
2872 #: builtin/checkout.c:1028 builtin/merge.c:215
2873 msgid "update ignored files (default)"
2874 msgstr "更新忽略的文件(默认)"
2876 #: builtin/checkout.c:1029 builtin/log.c:1147 parse-options.h:245
2880 #: builtin/checkout.c:1030
2881 msgid "conflict style (merge or diff3)"
2882 msgstr "冲突输出风格(merge 或 diff3)"
2884 #: builtin/checkout.c:1033
2885 msgid "second guess 'git checkout no-such-branch'"
2886 msgstr "再者猜测'git checkout no-such-branch'"
2888 #: builtin/checkout.c:1057
2889 msgid "-b, -B and --orphan are mutually exclusive"
2890 msgstr "-b、-B 和 --orphan 是互斥的"
2892 #: builtin/checkout.c:1074
2893 msgid "--track needs a branch name"
2894 msgstr "--track 需要一个分支名"
2896 #: builtin/checkout.c:1081
2897 msgid "Missing branch name; try -b"
2898 msgstr "缺少分支名;尝试 -b"
2900 #: builtin/checkout.c:1116
2901 msgid "invalid path specification"
2904 #: builtin/checkout.c:1123
2907 "Cannot update paths and switch to branch '%s' at the same time.\n"
2908 "Did you intend to checkout '%s' which can not be resolved as commit?"
2910 "不能同时更新路径并切换到分支'%s'。\n"
2911 "您是想要检出 '%s' 但其未能解析为提交么?"
2913 #: builtin/checkout.c:1128
2915 msgid "git checkout: --detach does not take a path argument '%s'"
2916 msgstr "git checkout:--detach 不能接收路径参数 '%s'"
2918 #: builtin/checkout.c:1132
2920 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
2921 "checking out of the index."
2923 "git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
2925 #: builtin/clean.c:20
2926 msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
2927 msgstr "git clean [-d] [-f] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
2929 #: builtin/clean.c:24
2931 msgid "Removing %s\n"
2934 #: builtin/clean.c:25
2936 msgid "Would remove %s\n"
2939 #: builtin/clean.c:26
2941 msgid "Skipping repository %s\n"
2944 #: builtin/clean.c:27
2946 msgid "Would skip repository %s\n"
2947 msgstr "将忽略版本库 %s\n"
2949 #: builtin/clean.c:28
2951 msgid "failed to remove %s"
2954 #: builtin/clean.c:159
2955 msgid "do not print names of files removed"
2958 #: builtin/clean.c:161
2962 #: builtin/clean.c:163
2963 msgid "remove whole directories"
2966 #: builtin/clean.c:164 builtin/describe.c:413 builtin/grep.c:717
2967 #: builtin/ls-files.c:491 builtin/name-rev.c:231 builtin/show-ref.c:182
2971 #: builtin/clean.c:165
2972 msgid "add <pattern> to ignore rules"
2973 msgstr "添加<模式>到忽略规则"
2975 #: builtin/clean.c:166
2976 msgid "remove ignored files, too"
2979 #: builtin/clean.c:168
2980 msgid "remove only ignored files"
2983 #: builtin/clean.c:186
2984 msgid "-x and -X cannot be used together"
2985 msgstr "-x 和 -X 不能同时使用"
2987 #: builtin/clean.c:190
2989 "clean.requireForce set to true and neither -n nor -f given; refusing to clean"
2991 "clean.requireForce 设置为 true 且未提供 -n 或 -f 选项,拒绝执行清理动作"
2993 #: builtin/clean.c:193
2995 "clean.requireForce defaults to true and neither -n nor -f given; refusing to "
2998 "clean.requireForce 默认为 true 且未提供 -n 或 -f 选项,拒绝执行清理动作"
3000 #: builtin/clone.c:36
3001 msgid "git clone [options] [--] <repo> [<dir>]"
3002 msgstr "git clone [选项] [--] <版本库> [<路径>]"
3004 #: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:212
3005 #: builtin/push.c:407
3006 msgid "force progress reporting"
3009 #: builtin/clone.c:66
3010 msgid "don't create a checkout"
3013 #: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488
3014 msgid "create a bare repository"
3017 #: builtin/clone.c:72
3018 msgid "create a mirror repository (implies bare)"
3019 msgstr "创建一个镜像版本库(也是裸版本库)"
3021 #: builtin/clone.c:74
3022 msgid "to clone from a local repository"
3025 #: builtin/clone.c:76
3026 msgid "don't use local hardlinks, always copy"
3027 msgstr "不使用本地硬链接,始终复制"
3029 #: builtin/clone.c:78
3030 msgid "setup as shared repository"
3033 #: builtin/clone.c:80 builtin/clone.c:82
3034 msgid "initialize submodules in the clone"
3037 #: builtin/clone.c:83 builtin/init-db.c:485
3038 msgid "template-directory"
3041 #: builtin/clone.c:84 builtin/init-db.c:486
3042 msgid "directory from which templates will be used"
3045 #: builtin/clone.c:86
3046 msgid "reference repository"
3049 #: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44
3053 #: builtin/clone.c:88
3054 msgid "use <name> instead of 'origin' to track upstream"
3055 msgstr "使用<名称>而不是 'origin' 去跟踪上游"
3057 #: builtin/clone.c:90
3058 msgid "checkout <branch> instead of the remote's HEAD"
3059 msgstr "检出<分支>而不是远程HEAD"
3061 #: builtin/clone.c:92
3062 msgid "path to git-upload-pack on the remote"
3063 msgstr "远程 git-upload-pack 路径"
3065 #: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:662
3069 #: builtin/clone.c:94
3070 msgid "create a shallow clone of that depth"
3071 msgstr "创建一个指定深度的浅克隆"
3073 #: builtin/clone.c:96
3074 msgid "clone only one branch, HEAD or --branch"
3075 msgstr "只克隆一个分支、HEAD 或 --branch"
3077 #: builtin/clone.c:97 builtin/init-db.c:494
3081 #: builtin/clone.c:98 builtin/init-db.c:495
3082 msgid "separate git dir from working tree"
3083 msgstr "git目录和工作区分离"
3085 #: builtin/clone.c:99
3089 #: builtin/clone.c:100
3090 msgid "set config inside the new repository"
3091 msgstr "在新版本库中设置配置信息"
3093 #: builtin/clone.c:243
3095 msgid "reference repository '%s' is not a local directory."
3096 msgstr "引用版本库 '%s' 不是一个本地目录。"
3098 #: builtin/clone.c:306
3100 msgid "failed to create directory '%s'"
3101 msgstr "无法创建目录 '%s'"
3103 #: builtin/clone.c:308 builtin/diff.c:77
3105 msgid "failed to stat '%s'"
3106 msgstr "无法枚举 '%s' 状态"
3108 #: builtin/clone.c:310
3110 msgid "%s exists and is not a directory"
3111 msgstr "%s 存在且不是一个目录"
3113 #: builtin/clone.c:324
3115 msgid "failed to stat %s\n"
3116 msgstr "无法枚举 %s 状态\n"
3118 #: builtin/clone.c:341
3120 msgid "failed to unlink '%s'"
3123 #: builtin/clone.c:346
3125 msgid "failed to create link '%s'"
3126 msgstr "无法创建链接 '%s'"
3128 #: builtin/clone.c:350
3130 msgid "failed to copy file to '%s'"
3131 msgstr "无法拷贝文件至 '%s'"
3133 #: builtin/clone.c:373
3138 #: builtin/clone.c:443
3140 msgid "Could not find remote branch %s to clone."
3141 msgstr "不能发现要克隆的远程分支 %s。"
3143 #: builtin/clone.c:552
3144 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
3145 msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
3147 #: builtin/clone.c:690
3148 msgid "Too many arguments."
3151 #: builtin/clone.c:694
3152 msgid "You must specify a repository to clone."
3153 msgstr "您必须指定一个版本库来克隆。"
3155 #: builtin/clone.c:705
3157 msgid "--bare and --origin %s options are incompatible."
3158 msgstr "--bare 和 --origin %s 选项不兼容。"
3160 #: builtin/clone.c:708
3161 msgid "--bare and --separate-git-dir are incompatible."
3162 msgstr "--bare 和 --separate-git-dir 选项不兼容。"
3164 #: builtin/clone.c:721
3166 msgid "repository '%s' does not exist"
3167 msgstr "版本库 '%s' 不存在"
3169 #: builtin/clone.c:726
3170 msgid "--depth is ignored in local clones; use file:// instead."
3171 msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
3173 #: builtin/clone.c:736
3175 msgid "destination path '%s' already exists and is not an empty directory."
3176 msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
3178 #: builtin/clone.c:746
3180 msgid "working tree '%s' already exists."
3181 msgstr "工作区 '%s' 已经存在。"
3183 #: builtin/clone.c:759 builtin/clone.c:773
3185 msgid "could not create leading directories of '%s'"
3186 msgstr "不能为 '%s' 创建先导目录"
3188 #: builtin/clone.c:762
3190 msgid "could not create work tree dir '%s'."
3191 msgstr "不能为 '%s' 创建工作区目录。"
3193 #: builtin/clone.c:783
3195 msgid "Cloning into bare repository '%s'...\n"
3196 msgstr "克隆到裸版本库 '%s'...\n"
3198 #: builtin/clone.c:785
3200 msgid "Cloning into '%s'...\n"
3201 msgstr "正克隆到 '%s'...\n"
3203 #: builtin/clone.c:827
3205 msgid "Don't know how to clone %s"
3208 #: builtin/clone.c:876
3210 msgid "Remote branch %s not found in upstream %s"
3211 msgstr "远程分支 %s 在上游 %s 未发现"
3213 #: builtin/clone.c:883
3214 msgid "You appear to have cloned an empty repository."
3215 msgstr "您似乎克隆了一个空版本库。"
3217 #: builtin/column.c:9
3218 msgid "git column [options]"
3219 msgstr "git column [选项]"
3221 #: builtin/column.c:26
3222 msgid "lookup config vars"
3225 #: builtin/column.c:27 builtin/column.c:28
3226 msgid "layout to use"
3229 #: builtin/column.c:29
3230 msgid "Maximum width"
3233 #: builtin/column.c:30
3234 msgid "Padding space on left border"
3237 #: builtin/column.c:31
3238 msgid "Padding space on right border"
3241 #: builtin/column.c:32
3242 msgid "Padding space between columns"
3245 #: builtin/column.c:51
3246 msgid "--command must be the first argument"
3247 msgstr "--command 必须是第一个参数"
3249 #: builtin/commit.c:34
3250 msgid "git commit [options] [--] <filepattern>..."
3251 msgstr "git commit [选项] [--] <文件模式>..."
3253 #: builtin/commit.c:39
3254 msgid "git status [options] [--] <filepattern>..."
3255 msgstr "git status [选项] [--] <文件模式>..."
3257 #: builtin/commit.c:44
3259 "Your name and email address were configured automatically based\n"
3260 "on your username and hostname. Please check that they are accurate.\n"
3261 "You can suppress this message by setting them explicitly:\n"
3263 " git config --global user.name \"Your Name\"\n"
3264 " git config --global user.email you@example.com\n"
3266 "After doing this, you may fix the identity used for this commit with:\n"
3268 " git commit --amend --reset-author\n"
3270 "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
3271 "与否。您可以通过下面的命令对其进行明确地设置以免再出现本提示信息:\n"
3273 " git config --global user.name \"Your Name\"\n"
3274 " git config --global user.email you@example.com\n"
3276 "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
3278 " git commit --amend --reset-author\n"
3280 #: builtin/commit.c:56
3282 "You asked to amend the most recent commit, but doing so would make\n"
3283 "it empty. You can repeat your command with --allow-empty, or you can\n"
3284 "remove the commit entirely with \"git reset HEAD^\".\n"
3286 "您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
3287 "--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
3289 #: builtin/commit.c:61
3291 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
3292 "If you wish to commit it anyway, use:\n"
3294 " git commit --allow-empty\n"
3296 "Otherwise, please use 'git reset'\n"
3298 "之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
3301 " git commit --allow-empty\n"
3303 "否则,请使用命令 'git reset'\n"
3305 #: builtin/commit.c:258
3306 msgid "failed to unpack HEAD tree object"
3307 msgstr "无法解包 HEAD 树对象"
3309 #: builtin/commit.c:300
3310 msgid "unable to create temporary index"
3313 #: builtin/commit.c:306
3314 msgid "interactive add failed"
3317 #: builtin/commit.c:339 builtin/commit.c:360 builtin/commit.c:410
3318 msgid "unable to write new_index file"
3319 msgstr "无法写 new_index 文件"
3321 #: builtin/commit.c:391
3322 msgid "cannot do a partial commit during a merge."
3323 msgstr "在合并过程中不能做部分提交。"
3325 #: builtin/commit.c:393
3326 msgid "cannot do a partial commit during a cherry-pick."
3327 msgstr "在拣选过程中不能做部分提交。"
3329 #: builtin/commit.c:403
3330 msgid "cannot read the index"
3333 #: builtin/commit.c:423
3334 msgid "unable to write temporary index file"
3337 #: builtin/commit.c:511 builtin/commit.c:517
3339 msgid "invalid commit: %s"
3342 #: builtin/commit.c:540
3343 msgid "malformed --author parameter"
3344 msgstr "非法的 --author 参数"
3346 #: builtin/commit.c:560
3348 msgid "Malformed ident string: '%s'"
3349 msgstr "非法的身份字符串:'%s'"
3351 #: builtin/commit.c:598 builtin/commit.c:631 builtin/commit.c:954
3353 msgid "could not lookup commit %s"
3356 #: builtin/commit.c:610 builtin/shortlog.c:272
3358 msgid "(reading log message from standard input)\n"
3359 msgstr "(正从标准输入中读取日志信息)\n"
3361 #: builtin/commit.c:612
3362 msgid "could not read log from standard input"
3363 msgstr "不能从标准输入中读取日志信息"
3365 #: builtin/commit.c:616
3367 msgid "could not read log file '%s'"
3368 msgstr "不能读取日志文件 '%s'"
3370 #: builtin/commit.c:622
3371 msgid "commit has empty message"
3374 #: builtin/commit.c:638
3375 msgid "could not read MERGE_MSG"
3376 msgstr "不能读取 MERGE_MSG"
3378 #: builtin/commit.c:642
3379 msgid "could not read SQUASH_MSG"
3380 msgstr "不能读取 SQUASH_MSG"
3382 #: builtin/commit.c:646
3384 msgid "could not read '%s'"
3387 #: builtin/commit.c:707
3388 msgid "could not write commit template"
3391 #: builtin/commit.c:718
3395 "It looks like you may be committing a merge.\n"
3396 "If this is not correct, please remove the file\n"
3401 "似乎您正在做一个合并提交。如果不对,请删除文件\n"
3405 #: builtin/commit.c:723
3409 "It looks like you may be committing a cherry-pick.\n"
3410 "If this is not correct, please remove the file\n"
3415 "似乎您正在做一个拣选提交。如果不对,请删除文件\n"
3419 #: builtin/commit.c:735
3421 "Please enter the commit message for your changes. Lines starting\n"
3422 "with '#' will be ignored, and an empty message aborts the commit.\n"
3424 "请为您的变更输入提交说明。以 '#' 开始的行将被忽略,而一个空的提交\n"
3427 #: builtin/commit.c:740
3429 "Please enter the commit message for your changes. Lines starting\n"
3430 "with '#' will be kept; you may remove them yourself if you want to.\n"
3431 "An empty message aborts the commit.\n"
3433 "请为您的变更输入提交说明。以 '#' 开始的行将被保留,您可以删除它们\n"
3434 "如果您想这样做的话。而一个空的提交说明将会终止提交。\n"
3436 # 译者:为保证在输出中对齐,注意调整句中空格!
3437 #: builtin/commit.c:753
3439 msgid "%sAuthor: %s"
3442 # 译者:为保证在输出中对齐,注意调整句中空格!
3443 #: builtin/commit.c:760
3445 msgid "%sCommitter: %s"
3448 #: builtin/commit.c:780
3449 msgid "Cannot read index"
3452 #: builtin/commit.c:817
3453 msgid "Error building trees"
3456 #: builtin/commit.c:832 builtin/tag.c:361
3458 msgid "Please supply the message using either -m or -F option.\n"
3459 msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
3461 #: builtin/commit.c:929
3463 msgid "No existing author found with '%s'"
3464 msgstr "没有找到匹配 '%s' 的作者"
3466 #: builtin/commit.c:944 builtin/commit.c:1148
3468 msgid "Invalid untracked files mode '%s'"
3469 msgstr "无效的未追踪文件参数 '%s'"
3471 #: builtin/commit.c:984
3472 msgid "Using both --reset-author and --author does not make sense"
3473 msgstr "同时使用 --reset-author 和 --author 没有意义"
3475 #: builtin/commit.c:995
3476 msgid "You have nothing to amend."
3479 #: builtin/commit.c:998
3480 msgid "You are in the middle of a merge -- cannot amend."
3481 msgstr "您正处于一个合并过程中 -- 无法修补提交。"
3483 #: builtin/commit.c:1000
3484 msgid "You are in the middle of a cherry-pick -- cannot amend."
3485 msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
3487 #: builtin/commit.c:1003
3488 msgid "Options --squash and --fixup cannot be used together"
3489 msgstr "选项 --squash 和 --fixup 不能同时使用"
3491 #: builtin/commit.c:1013
3492 msgid "Only one of -c/-C/-F/--fixup can be used."
3493 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
3495 #: builtin/commit.c:1015
3496 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
3497 msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
3499 #: builtin/commit.c:1023
3500 msgid "--reset-author can be used only with -C, -c or --amend."
3501 msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
3503 #: builtin/commit.c:1040
3504 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
3505 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
3507 #: builtin/commit.c:1042
3508 msgid "No paths with --include/--only does not make sense."
3509 msgstr "参数 --include/--only 不跟路径没有意义。"
3511 #: builtin/commit.c:1044
3512 msgid "Clever... amending the last one with dirty index."
3513 msgstr "聪明... 在索引不干净下修补最后的提交。"
3515 #: builtin/commit.c:1046
3516 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
3517 msgstr "指定了明确的路径而没有使用 -i 或 -o 选项;认为是 --only paths..."
3519 #: builtin/commit.c:1056 builtin/tag.c:577
3521 msgid "Invalid cleanup mode %s"
3524 #: builtin/commit.c:1061
3525 msgid "Paths with -a does not make sense."
3526 msgstr "路径和 -a 选项同时使用没有意义。"
3528 #: builtin/commit.c:1067 builtin/commit.c:1202
3529 msgid "--long and -z are incompatible"
3530 msgstr "--long 和 -z 选项不兼容"
3532 #: builtin/commit.c:1162 builtin/commit.c:1400
3533 msgid "show status concisely"
3536 #: builtin/commit.c:1164 builtin/commit.c:1402
3537 msgid "show branch information"
3540 #: builtin/commit.c:1166 builtin/commit.c:1404 builtin/push.c:397
3541 msgid "machine-readable output"
3544 #: builtin/commit.c:1169 builtin/commit.c:1406
3545 msgid "show status in long format (default)"
3546 msgstr "以长格式显示状态(默认)"
3548 #: builtin/commit.c:1172 builtin/commit.c:1409
3549 msgid "terminate entries with NUL"
3552 #: builtin/commit.c:1174 builtin/commit.c:1412 builtin/fast-export.c:647
3553 #: builtin/fast-export.c:650 builtin/tag.c:461
3557 #: builtin/commit.c:1175 builtin/commit.c:1412
3558 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
3559 msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
3561 #: builtin/commit.c:1178
3562 msgid "show ignored files"
3565 #: builtin/commit.c:1179 parse-options.h:151
3569 #: builtin/commit.c:1180
3571 "ignore changes to submodules, optional when: all, dirty, untracked. "
3574 "忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
3576 #: builtin/commit.c:1182
3577 msgid "list untracked files in columns"
3578 msgstr "以列的方式显示未跟踪的文件"
3580 #: builtin/commit.c:1256
3581 msgid "couldn't look up newly created commit"
3584 #: builtin/commit.c:1258
3585 msgid "could not parse newly created commit"
3588 #: builtin/commit.c:1299
3589 msgid "detached HEAD"
3592 # 译者:中文字符串拼接,可删除前导空格
3593 #: builtin/commit.c:1301
3594 msgid " (root-commit)"
3597 #: builtin/commit.c:1370
3598 msgid "suppress summary after successful commit"
3599 msgstr "提交成功后不显示概述信息"
3601 #: builtin/commit.c:1371
3602 msgid "show diff in commit message template"
3603 msgstr "在提交说明模板里显示差异"
3605 #: builtin/commit.c:1373
3606 msgid "Commit message options"
3609 #: builtin/commit.c:1374 builtin/tag.c:459
3610 msgid "read message from file"
3613 #: builtin/commit.c:1375
3617 #: builtin/commit.c:1375
3618 msgid "override author for commit"
3621 #: builtin/commit.c:1376 builtin/gc.c:178
3625 #: builtin/commit.c:1376
3626 msgid "override date for commit"
3629 #: builtin/commit.c:1377 builtin/merge.c:206 builtin/notes.c:537
3630 #: builtin/notes.c:694 builtin/tag.c:457
3634 #: builtin/commit.c:1377
3635 msgid "commit message"
3638 #: builtin/commit.c:1378
3639 msgid "reuse and edit message from specified commit"
3640 msgstr "重用并编辑指定提交的提交说明"
3642 #: builtin/commit.c:1379
3643 msgid "reuse message from specified commit"
3644 msgstr "重用指定提交的提交说明"
3646 #: builtin/commit.c:1380
3647 msgid "use autosquash formatted message to fixup specified commit"
3648 msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
3650 #: builtin/commit.c:1381
3651 msgid "use autosquash formatted message to squash specified commit"
3652 msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
3654 #: builtin/commit.c:1382
3655 msgid "the commit is authored by me now (used with -C/-c/--amend)"
3656 msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
3658 #: builtin/commit.c:1383 builtin/log.c:1102 builtin/revert.c:109
3659 msgid "add Signed-off-by:"
3660 msgstr "添加 Signed-off-by: 签名"
3662 #: builtin/commit.c:1384
3663 msgid "use specified template file"
3666 #: builtin/commit.c:1385
3667 msgid "force edit of commit"
3670 # 译者:可选值,不能翻译(或是原文中笔误,应为 mode)
3671 #: builtin/commit.c:1386
3675 #: builtin/commit.c:1386 builtin/tag.c:462
3676 msgid "how to strip spaces and #comments from message"
3677 msgstr "设置如何删除提交说明里的空格和#注释"
3679 #: builtin/commit.c:1387
3680 msgid "include status in commit message template"
3681 msgstr "在提交说明模板里包含状态信息"
3683 #: builtin/commit.c:1388 builtin/merge.c:213 builtin/tag.c:463
3687 #: builtin/commit.c:1389 builtin/merge.c:214
3688 msgid "GPG sign commit"
3691 #. end commit message options
3692 #: builtin/commit.c:1392
3693 msgid "Commit contents options"
3696 #: builtin/commit.c:1393
3697 msgid "commit all changed files"
3700 #: builtin/commit.c:1394
3701 msgid "add specified files to index for commit"
3702 msgstr "添加指定的文件到索引区等待提交"
3704 #: builtin/commit.c:1395
3705 msgid "interactively add files"
3708 #: builtin/commit.c:1396
3709 msgid "interactively add changes"
3712 #: builtin/commit.c:1397
3713 msgid "commit only specified files"
3716 #: builtin/commit.c:1398
3717 msgid "bypass pre-commit hook"
3718 msgstr "绕过 pre-commit 钩子"
3720 #: builtin/commit.c:1399
3721 msgid "show what would be committed"
3724 #: builtin/commit.c:1410
3725 msgid "amend previous commit"
3728 #: builtin/commit.c:1411
3729 msgid "bypass post-rewrite hook"
3730 msgstr "绕过 post-rewrite 钩子"
3732 #: builtin/commit.c:1416
3733 msgid "ok to record an empty change"
3736 #: builtin/commit.c:1419
3737 msgid "ok to record a change with an empty message"
3740 #: builtin/commit.c:1451
3741 msgid "could not parse HEAD commit"
3742 msgstr "不能解析 HEAD 提交"
3744 #: builtin/commit.c:1489 builtin/merge.c:508
3746 msgid "could not open '%s' for reading"
3747 msgstr "不能为读入打开 '%s'"
3749 #: builtin/commit.c:1496
3751 msgid "Corrupt MERGE_HEAD file (%s)"
3752 msgstr "损坏的 MERGE_HEAD 文件(%s)"
3754 #: builtin/commit.c:1503
3755 msgid "could not read MERGE_MODE"
3756 msgstr "不能读取 MERGE_MODE"
3758 #: builtin/commit.c:1522
3760 msgid "could not read commit message: %s"
3761 msgstr "不能读取提交说明:%s"
3763 #: builtin/commit.c:1536
3765 msgid "Aborting commit; you did not edit the message.\n"
3766 msgstr "终止提交;您未更改来自模版的提交说明。\n"
3768 #: builtin/commit.c:1541
3770 msgid "Aborting commit due to empty commit message.\n"
3771 msgstr "终止提交因为提交说明为空。\n"
3773 #: builtin/commit.c:1556 builtin/merge.c:833 builtin/merge.c:858
3774 msgid "failed to write commit object"
3777 #: builtin/commit.c:1577
3778 msgid "cannot lock HEAD ref"
3779 msgstr "无法锁定 HEAD 引用"
3781 #: builtin/commit.c:1581
3782 msgid "cannot update HEAD ref"
3783 msgstr "无法更新 HEAD 引用"
3785 #: builtin/commit.c:1592
3787 "Repository has been updated, but unable to write\n"
3788 "new_index file. Check that disk is not full or quota is\n"
3789 "not exceeded, and then \"git reset HEAD\" to recover."
3791 "版本库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
3792 "或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
3794 #: builtin/config.c:7
3795 msgid "git config [options]"
3796 msgstr "git config [选项]"
3798 #: builtin/config.c:51
3799 msgid "Config file location"
3802 #: builtin/config.c:52
3803 msgid "use global config file"
3806 #: builtin/config.c:53
3807 msgid "use system config file"
3810 #: builtin/config.c:54
3811 msgid "use repository config file"
3814 #: builtin/config.c:55
3815 msgid "use given config file"
3818 #: builtin/config.c:56
3822 #: builtin/config.c:57
3823 msgid "get value: name [value-regex]"
3824 msgstr "获取值:name [value-regex]"
3826 #: builtin/config.c:58
3827 msgid "get all values: key [value-regex]"
3828 msgstr "获得所有的值:key [value-regex]"
3830 #: builtin/config.c:59
3831 msgid "get values for regexp: name-regex [value-regex]"
3832 msgstr "根据正则表达式获得值:name-regex [value-regex]"
3834 #: builtin/config.c:60
3835 msgid "replace all matching variables: name value [value_regex]"
3836 msgstr "替换所有匹配的变量:name value [value_regex]"
3838 #: builtin/config.c:61
3839 msgid "add a new variable: name value"
3840 msgstr "添加一个新的变量:name value"
3842 #: builtin/config.c:62
3843 msgid "remove a variable: name [value-regex]"
3844 msgstr "删除一个变量:name [value-regex]"
3846 #: builtin/config.c:63
3847 msgid "remove all matches: name [value-regex]"
3848 msgstr "删除所有匹配项:name [value-regex]"
3850 #: builtin/config.c:64
3851 msgid "rename section: old-name new-name"
3852 msgstr "重命名小节:old-name new-name"
3854 #: builtin/config.c:65
3855 msgid "remove a section: name"
3856 msgstr "删除一个小节:name"
3858 #: builtin/config.c:66
3862 #: builtin/config.c:67
3863 msgid "open an editor"
3866 #: builtin/config.c:68 builtin/config.c:69
3870 #: builtin/config.c:68
3871 msgid "find the color configured: [default]"
3872 msgstr "找到配置的颜色:[默认]"
3874 #: builtin/config.c:69
3875 msgid "find the color setting: [stdout-is-tty]"
3876 msgstr "找到颜色设置:[stdout-is-tty]"
3878 #: builtin/config.c:70
3882 #: builtin/config.c:71
3883 msgid "value is \"true\" or \"false\""
3884 msgstr "值是 \"true\" 或 \"false\""
3886 #: builtin/config.c:72
3887 msgid "value is decimal number"
3890 #: builtin/config.c:73
3891 msgid "value is --bool or --int"
3892 msgstr "值是 --bool or --int"
3894 #: builtin/config.c:74
3895 msgid "value is a path (file or directory name)"
3896 msgstr "值是一个路径(文件或目录名)"
3898 #: builtin/config.c:75
3902 #: builtin/config.c:76
3903 msgid "terminate values with NUL byte"
3906 #: builtin/config.c:77
3907 msgid "respect include directives on lookup"
3908 msgstr "查询时参照 include 指令递归查找"
3910 #: builtin/count-objects.c:69
3911 msgid "git count-objects [-v]"
3912 msgstr "git count-objects [-v]"
3914 #: builtin/describe.c:15
3915 msgid "git describe [options] <committish>*"
3916 msgstr "git describe [选项] <提交号>*"
3918 #: builtin/describe.c:16
3919 msgid "git describe [options] --dirty"
3920 msgstr "git describe [选项] --dirty"
3922 #: builtin/describe.c:234
3924 msgid "annotated tag %s not available"
3925 msgstr "注释 tag %s 无效"
3927 #: builtin/describe.c:238
3929 msgid "annotated tag %s has no embedded name"
3930 msgstr "注释 tag %s 没有嵌入名称"
3932 #: builtin/describe.c:240
3934 msgid "tag '%s' is really '%s' here"
3935 msgstr "tag '%s' 的确是在 '%s'"
3937 #: builtin/describe.c:267
3939 msgid "Not a valid object name %s"
3940 msgstr "不是一个有效的对象名 %s"
3942 #: builtin/describe.c:270
3944 msgid "%s is not a valid '%s' object"
3945 msgstr "%s 不是一个有效的 '%s' 对象"
3947 #: builtin/describe.c:287
3949 msgid "no tag exactly matches '%s'"
3950 msgstr "没有 tag 准确匹配 '%s'"
3952 #: builtin/describe.c:289
3954 msgid "searching to describe %s\n"
3957 #: builtin/describe.c:329
3959 msgid "finished search at %s\n"
3962 #: builtin/describe.c:353
3965 "No annotated tags can describe '%s'.\n"
3966 "However, there were unannotated tags: try --tags."
3968 "没有注释 tag 能描述 '%s'。\n"
3969 "然而,有非注释 tag:尝试 --tags。"
3971 #: builtin/describe.c:357
3974 "No tags can describe '%s'.\n"
3975 "Try --always, or create some tags."
3977 "没有注释 tag 能描述 '%s'。\n"
3978 "尝试 --always,或者创建一些 tag。"
3980 #: builtin/describe.c:378
3982 msgid "traversed %lu commits\n"
3983 msgstr "已遍历 %lu 个提交\n"
3985 #: builtin/describe.c:381
3988 "more than %i tags found; listed %i most recent\n"
3989 "gave up search at %s\n"
3991 "发现多于 %i 个 tag,列出最近的 %i 个\n"
3994 #: builtin/describe.c:403
3995 msgid "find the tag that comes after the commit"
3996 msgstr "寻找提交之后的 tag(用于描述提交)"
3998 #: builtin/describe.c:404
3999 msgid "debug search strategy on stderr"
4000 msgstr "在标准错误上调试搜索策略"
4002 #: builtin/describe.c:405
4003 msgid "use any ref in .git/refs"
4004 msgstr "使用 .git/refs 里的任意引用"
4006 #: builtin/describe.c:406
4007 msgid "use any tag in .git/refs/tags"
4008 msgstr "使用 .git/refs/tags 里的任意 tag"
4010 #: builtin/describe.c:407
4011 msgid "always use long format"
4014 #: builtin/describe.c:410
4015 msgid "only output exact matches"
4018 #: builtin/describe.c:412
4019 msgid "consider <n> most recent tags (default: 10)"
4020 msgstr "考虑最近 <n> 个 tags(默认:10)"
4022 #: builtin/describe.c:414
4023 msgid "only consider tags matching <pattern>"
4024 msgstr "只考虑匹配 <模式> 的 tags"
4026 #: builtin/describe.c:416 builtin/name-rev.c:238
4027 msgid "show abbreviated commit object as fallback"
4028 msgstr "显示简写的提交号作为后备"
4030 #: builtin/describe.c:417
4034 #: builtin/describe.c:418
4035 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
4036 msgstr "若工作区脏(有变更)在结尾添加 <标记>(默认:\"-dirty\")"
4038 #: builtin/describe.c:436
4039 msgid "--long is incompatible with --abbrev=0"
4040 msgstr "--long 与 --abbrev=0 不兼容"
4042 #: builtin/describe.c:462
4043 msgid "No names found, cannot describe anything."
4044 msgstr "没有发现名称,无法描述任何东西。"
4046 #: builtin/describe.c:482
4047 msgid "--dirty is incompatible with committishes"
4048 msgstr "--dirty 不能与提交同时使用"
4050 #: builtin/diff.c:79
4052 msgid "'%s': not a regular file or symlink"
4053 msgstr "'%s':不是一个正规文件或符号链接"
4055 #: builtin/diff.c:228
4057 msgid "invalid option: %s"
4060 #: builtin/diff.c:305
4061 msgid "Not a git repository"
4062 msgstr "不是一个 git 版本库"
4064 #: builtin/diff.c:348
4066 msgid "invalid object '%s' given."
4067 msgstr "提供了无效对象 '%s'。"
4069 #: builtin/diff.c:353
4071 msgid "more than %d trees given: '%s'"
4072 msgstr "提供了超过 %d 个树对象:'%s'"
4074 #: builtin/diff.c:363
4076 msgid "more than two blobs given: '%s'"
4077 msgstr "提供了超过两个数据(blob)对象:'%s'"
4079 #: builtin/diff.c:371
4081 msgid "unhandled object '%s' given."
4082 msgstr "提供了无法处理的对象 '%s'。"
4084 #: builtin/fast-export.c:22
4085 msgid "git fast-export [rev-list-opts]"
4086 msgstr "git fast-export [rev-list-opts]"
4088 #: builtin/fast-export.c:646
4089 msgid "show progress after <n> objects"
4090 msgstr "在 <n> 个对象之后显示进度"
4092 #: builtin/fast-export.c:648
4093 msgid "select handling of signed tags"
4094 msgstr "选择如何处理签名 tags"
4096 #: builtin/fast-export.c:651
4097 msgid "select handling of tags that tag filtered objects"
4098 msgstr "选择当 tag 指向被过滤时 tags 的处理方式"
4100 #: builtin/fast-export.c:654
4101 msgid "Dump marks to this file"
4104 #: builtin/fast-export.c:656
4105 msgid "Import marks from this file"
4108 #: builtin/fast-export.c:658
4109 msgid "Fake a tagger when tags lack one"
4110 msgstr "当 tags 缺少标记者字段时,假装提供一个"
4112 #: builtin/fast-export.c:660
4113 msgid "Output full tree for each commit"
4116 #: builtin/fast-export.c:662
4117 msgid "Use the done feature to terminate the stream"
4118 msgstr "使用 done 功能来终止流"
4120 #: builtin/fast-export.c:663
4121 msgid "Skip output of blob data"
4124 #: builtin/fetch.c:20
4125 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
4126 msgstr "git fetch [<选项>] [<版本库> [<引用表达式>...]]"
4128 #: builtin/fetch.c:21
4129 msgid "git fetch [<options>] <group>"
4130 msgstr "git fetch [<选项>] <组>"
4132 #: builtin/fetch.c:22
4133 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
4134 msgstr "git fetch --multiple [<选项>] [(<版本库> | <组>)...]"
4136 #: builtin/fetch.c:23
4137 msgid "git fetch --all [<options>]"
4138 msgstr "git fetch --all [<选项>]"
4140 #: builtin/fetch.c:60
4141 msgid "fetch from all remotes"
4144 #: builtin/fetch.c:62
4145 msgid "append to .git/FETCH_HEAD instead of overwriting"
4146 msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
4148 #: builtin/fetch.c:64
4149 msgid "path to upload pack on remote end"
4152 #: builtin/fetch.c:65
4153 msgid "force overwrite of local branch"
4156 #: builtin/fetch.c:67
4157 msgid "fetch from multiple remotes"
4160 #: builtin/fetch.c:69
4161 msgid "fetch all tags and associated objects"
4162 msgstr "抓取所有的 tags 和关联对象"
4164 #: builtin/fetch.c:71
4165 msgid "do not fetch all tags (--no-tags)"
4166 msgstr "不抓取任何 tags (--no-tags)"
4168 #: builtin/fetch.c:73
4169 msgid "prune remote-tracking branches no longer on remote"
4170 msgstr "清除远程已经不存在的分支的跟踪分支"
4173 #: builtin/fetch.c:74
4177 #: builtin/fetch.c:75
4178 msgid "control recursive fetching of submodules"
4181 #: builtin/fetch.c:79
4182 msgid "keep downloaded pack"
4185 #: builtin/fetch.c:81
4186 msgid "allow updating of HEAD ref"
4187 msgstr "允许更新 HEAD 引用"
4189 #: builtin/fetch.c:84
4190 msgid "deepen history of shallow clone"
4193 #: builtin/fetch.c:85 builtin/log.c:1119
4197 #: builtin/fetch.c:86
4198 msgid "prepend this to submodule path output"
4199 msgstr "在子模组路径输出的前面加上此目录"
4201 #: builtin/fetch.c:89
4202 msgid "default mode for recursion"
4205 #: builtin/fetch.c:201
4206 msgid "Couldn't find remote ref HEAD"
4207 msgstr "无法发现远程 HEAD 引用"
4209 #: builtin/fetch.c:254
4211 msgid "object %s not found"
4214 #: builtin/fetch.c:259
4215 msgid "[up to date]"
4218 #: builtin/fetch.c:273
4220 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
4221 msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)"
4223 #: builtin/fetch.c:274 builtin/fetch.c:360
4227 #: builtin/fetch.c:285
4228 msgid "[tag update]"
4232 #: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340
4233 msgid " (unable to update local ref)"
4234 msgstr " (不能更新本地引用)"
4236 #: builtin/fetch.c:305
4240 #: builtin/fetch.c:308
4241 msgid "[new branch]"
4244 #: builtin/fetch.c:311
4248 #: builtin/fetch.c:356
4249 msgid "unable to update local ref"
4252 #: builtin/fetch.c:356
4253 msgid "forced update"
4256 #: builtin/fetch.c:362
4257 msgid "(non-fast-forward)"
4260 #: builtin/fetch.c:393 builtin/fetch.c:685
4262 msgid "cannot open %s: %s\n"
4263 msgstr "无法打开 %s:%s\n"
4265 #: builtin/fetch.c:402
4267 msgid "%s did not send all necessary objects\n"
4268 msgstr "%s 未发送所有必须的对象\n"
4270 #: builtin/fetch.c:488
4275 #: builtin/fetch.c:499
4278 "some local refs could not be updated; try running\n"
4279 " 'git remote prune %s' to remove any old, conflicting branches"
4281 "一些本地引用不能被更新;尝试运行\n"
4282 " 'git remote prune %s' 来删除旧的、有冲突的分支"
4285 #: builtin/fetch.c:549
4287 msgid " (%s will become dangling)"
4288 msgstr " (%s 将成为摇摆状态)"
4291 #: builtin/fetch.c:550
4293 msgid " (%s has become dangling)"
4294 msgstr " (%s 已成为摇摆状态)"
4296 #: builtin/fetch.c:557
4300 #: builtin/fetch.c:558 builtin/remote.c:1055
4304 #: builtin/fetch.c:675
4306 msgid "Refusing to fetch into current branch %s of non-bare repository"
4307 msgstr "拒绝获取到非裸版本库的当前分支 %s"
4309 #: builtin/fetch.c:709
4311 msgid "Don't know how to fetch from %s"
4312 msgstr "不知道如何从 %s 获取"
4314 #: builtin/fetch.c:786
4316 msgid "Option \"%s\" value \"%s\" is not valid for %s"
4317 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
4319 #: builtin/fetch.c:789
4321 msgid "Option \"%s\" is ignored for %s\n"
4322 msgstr "选项 \"%s\" 为 %s 所忽略\n"
4324 #: builtin/fetch.c:891
4326 msgid "Fetching %s\n"
4329 #: builtin/fetch.c:893 builtin/remote.c:100
4331 msgid "Could not fetch %s"
4334 #: builtin/fetch.c:912
4336 "No remote repository specified. Please, specify either a URL or a\n"
4337 "remote name from which new revisions should be fetched."
4338 msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定,用以获取新提交。"
4340 #: builtin/fetch.c:932
4341 msgid "You need to specify a tag name."
4342 msgstr "您需要指定一个 tag 名称。"
4344 #: builtin/fetch.c:984
4345 msgid "fetch --all does not take a repository argument"
4346 msgstr "fetch --all 不能带一个版本库参数"
4348 #: builtin/fetch.c:986
4349 msgid "fetch --all does not make sense with refspecs"
4350 msgstr "fetch --all 带引用表达式没有任何意义"
4352 #: builtin/fetch.c:997
4354 msgid "No such remote or remote group: %s"
4355 msgstr "没有这样的远程或远程组:%s"
4357 #: builtin/fetch.c:1005
4358 msgid "Fetching a group and specifying refspecs does not make sense"
4359 msgstr "获取组并指定引用表达式没有意义"
4361 #: builtin/fmt-merge-msg.c:13
4362 msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
4364 "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
4366 #: builtin/fmt-merge-msg.c:659 builtin/fmt-merge-msg.c:662 builtin/grep.c:701
4367 #: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:175
4368 #: builtin/tag.c:448 parse-options.h:133 parse-options.h:239
4372 #: builtin/fmt-merge-msg.c:660
4373 msgid "populate log with at most <n> entries from shortlog"
4374 msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
4376 #: builtin/fmt-merge-msg.c:663
4377 msgid "alias for --log (deprecated)"
4378 msgstr "参数 --log 的别名(已弃用)"
4380 #: builtin/fmt-merge-msg.c:666
4384 #: builtin/fmt-merge-msg.c:667
4385 msgid "use <text> as start of message"
4386 msgstr "使用 <文本> 作为提交说明的开始"
4388 #: builtin/fmt-merge-msg.c:668
4389 msgid "file to read from"
4392 #: builtin/for-each-ref.c:979
4393 msgid "git for-each-ref [options] [<pattern>]"
4394 msgstr "git for-each-ref [选项] [<模式>]"
4396 #: builtin/for-each-ref.c:994
4397 msgid "quote placeholders suitably for shells"
4398 msgstr "引用占位符适用于 shells"
4400 #: builtin/for-each-ref.c:996
4401 msgid "quote placeholders suitably for perl"
4402 msgstr "引用占位符适用于 perl"
4404 #: builtin/for-each-ref.c:998
4405 msgid "quote placeholders suitably for python"
4406 msgstr "引用占位符适用于 python"
4408 #: builtin/for-each-ref.c:1000
4409 msgid "quote placeholders suitably for tcl"
4410 msgstr "引用占位符适用于 tcl"
4412 #: builtin/for-each-ref.c:1003
4413 msgid "show only <n> matched refs"
4414 msgstr "只显示 <n> 个匹配的引用"
4416 #: builtin/for-each-ref.c:1004
4420 #: builtin/for-each-ref.c:1004
4421 msgid "format to use for the output"
4424 #: builtin/for-each-ref.c:1005
4428 #: builtin/for-each-ref.c:1006
4429 msgid "field name to sort on"
4432 #: builtin/fsck.c:608
4433 msgid "git fsck [options] [<object>...]"
4434 msgstr "git fsck [选项] [<对象>...]"
4436 #: builtin/fsck.c:614
4437 msgid "show unreachable objects"
4440 #: builtin/fsck.c:615
4441 msgid "show dangling objects"
4444 #: builtin/fsck.c:616
4448 #: builtin/fsck.c:617
4449 msgid "report root nodes"
4452 #: builtin/fsck.c:618
4453 msgid "make index objects head nodes"
4454 msgstr "将索引亦作为检查的头节点"
4456 #: builtin/fsck.c:619
4457 msgid "make reflogs head nodes (default)"
4458 msgstr "将引用日志作为检查的头节点(默认)"
4460 #: builtin/fsck.c:620
4461 msgid "also consider packs and alternate objects"
4464 #: builtin/fsck.c:621
4465 msgid "enable more strict checking"
4468 #: builtin/fsck.c:623
4469 msgid "write dangling objects in .git/lost-found"
4470 msgstr "将摇摆对象写入 .git/lost-found 中"
4472 #: builtin/fsck.c:624 builtin/prune.c:134
4473 msgid "show progress"
4477 msgid "git gc [options]"
4478 msgstr "git gc [选项]"
4482 msgid "Invalid %s: '%s'"
4483 msgstr "无效的 %s:'%s'"
4487 msgid "insanely long object directory %.*s"
4488 msgstr "不正常的长对象目录 %.*s"
4491 msgid "prune unreferenced objects"
4495 msgid "be more thorough (increased runtime)"
4496 msgstr "更彻底(增加运行时间)"
4499 msgid "enable auto-gc mode"
4505 "Auto packing the repository for optimum performance. You may also\n"
4506 "run \"git gc\" manually. See \"git help gc\" for more information.\n"
4508 "自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n"
4509 "参见 \"git help gc\" 以获取更多信息。\n"
4513 "There are too many unreachable loose objects; run 'git prune' to remove them."
4514 msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
4516 #: builtin/grep.c:22
4517 msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"
4518 msgstr "git grep [选项] [-e] <模式> [<修订>...] [[--] <路径>...]"
4520 #: builtin/grep.c:217
4522 msgid "grep: failed to create thread: %s"
4523 msgstr "grep:无法创建线程:%s"
4525 #: builtin/grep.c:365
4527 msgid "Failed to chdir: %s"
4530 #: builtin/grep.c:443 builtin/grep.c:478
4532 msgid "unable to read tree (%s)"
4535 #: builtin/grep.c:493
4537 msgid "unable to grep from object of type %s"
4538 msgstr "无法抓取来自于 %s 类型的对象"
4540 #: builtin/grep.c:551
4542 msgid "switch `%c' expects a numerical value"
4543 msgstr "开关 `%c' 期望一个数字值"
4545 #: builtin/grep.c:568
4547 msgid "cannot open '%s'"
4550 #: builtin/grep.c:643
4551 msgid "search in index instead of in the work tree"
4552 msgstr "在索引区搜索而不是在工作区"
4554 #: builtin/grep.c:645
4555 msgid "find in contents not managed by git"
4556 msgstr "在未被 git 管理的内容中查找"
4558 # 译者:中文字符串拼接,可删除前导空格
4559 #: builtin/grep.c:647
4560 msgid "search in both tracked and untracked files"
4561 msgstr "在跟踪和未跟踪的文件中搜索"
4563 #: builtin/grep.c:649
4564 msgid "search also in ignored files"
4567 #: builtin/grep.c:652
4568 msgid "show non-matching lines"
4571 #: builtin/grep.c:654
4572 msgid "case insensitive matching"
4575 #: builtin/grep.c:656
4576 msgid "match patterns only at word boundaries"
4579 #: builtin/grep.c:658
4580 msgid "process binary files as text"
4581 msgstr "把二进制文件当做文本处理"
4583 #: builtin/grep.c:660
4584 msgid "don't match patterns in binary files"
4585 msgstr "不在二进制文件中匹配模式"
4587 #: builtin/grep.c:663
4588 msgid "descend at most <depth> levels"
4589 msgstr "最多以指定的深度向下寻找"
4591 #: builtin/grep.c:667
4592 msgid "use extended POSIX regular expressions"
4593 msgstr "使用扩展的 POSIX 正则表达式"
4595 #: builtin/grep.c:670
4596 msgid "use basic POSIX regular expressions (default)"
4597 msgstr "使用基本的 POSIX 正则表达式(默认)"
4599 #: builtin/grep.c:673
4600 msgid "interpret patterns as fixed strings"
4601 msgstr "把模式解析为固定的字符串"
4603 #: builtin/grep.c:676
4604 msgid "use Perl-compatible regular expressions"
4605 msgstr "使用 Perl 兼容的正则表达式"
4607 #: builtin/grep.c:679
4608 msgid "show line numbers"
4611 #: builtin/grep.c:680
4612 msgid "don't show filenames"
4615 #: builtin/grep.c:681
4616 msgid "show filenames"
4619 #: builtin/grep.c:683
4620 msgid "show filenames relative to top directory"
4621 msgstr "显示相对于顶级目录的文件名"
4623 #: builtin/grep.c:685
4624 msgid "show only filenames instead of matching lines"
4625 msgstr "只显示文件名而不显示匹配的行"
4627 #: builtin/grep.c:687
4628 msgid "synonym for --files-with-matches"
4629 msgstr "和 --files-with-matches 同义"
4631 #: builtin/grep.c:690
4632 msgid "show only the names of files without match"
4635 #: builtin/grep.c:692
4636 msgid "print NUL after filenames"
4637 msgstr "在文件名后输出 NUL 字符"
4639 #: builtin/grep.c:694
4640 msgid "show the number of matches instead of matching lines"
4641 msgstr "显示总匹配行数,而不显示匹配的行"
4643 #: builtin/grep.c:695
4644 msgid "highlight matches"
4647 #: builtin/grep.c:697
4648 msgid "print empty line between matches from different files"
4649 msgstr "在不同文件的匹配项之间打印空行"
4651 #: builtin/grep.c:699
4652 msgid "show filename only once above matches from same file"
4653 msgstr "只在同一文件的匹配项的上面显示一次文件名"
4655 #: builtin/grep.c:702
4656 msgid "show <n> context lines before and after matches"
4657 msgstr "显示匹配项前后的 <n> 行上下文"
4659 #: builtin/grep.c:705
4660 msgid "show <n> context lines before matches"
4661 msgstr "显示匹配项前 <n> 行上下文"
4663 #: builtin/grep.c:707
4664 msgid "show <n> context lines after matches"
4665 msgstr "显示匹配项后 <n> 行上下文"
4667 #: builtin/grep.c:708
4668 msgid "shortcut for -C NUM"
4671 #: builtin/grep.c:711
4672 msgid "show a line with the function name before matches"
4673 msgstr "在匹配的前面显示一行函数名"
4675 #: builtin/grep.c:713
4676 msgid "show the surrounding function"
4677 msgstr "显示所在函数的前后内容"
4679 #: builtin/grep.c:716
4680 msgid "read patterns from file"
4683 #: builtin/grep.c:718
4684 msgid "match <pattern>"
4687 #: builtin/grep.c:720
4688 msgid "combine patterns specified with -e"
4689 msgstr "组合用 -e 参数设定的模式"
4691 #: builtin/grep.c:732
4692 msgid "indicate hit with exit status without output"
4693 msgstr "不输出,而用退出码标识命中状态"
4695 #: builtin/grep.c:734
4696 msgid "show only matches from files that match all patterns"
4697 msgstr "只显示匹配所有模式的文件中的匹配"
4699 #: builtin/grep.c:736
4700 msgid "show parse tree for grep expression"
4701 msgstr "显示 grep 表达式的解析树"
4703 #: builtin/grep.c:740
4707 #: builtin/grep.c:740
4708 msgid "show matching files in the pager"
4711 #: builtin/grep.c:743
4712 msgid "allow calling of grep(1) (ignored by this build)"
4713 msgstr "允许调用 grep(1)(本次构建忽略)"
4715 #: builtin/grep.c:744 builtin/show-ref.c:184
4719 #: builtin/grep.c:811
4720 msgid "no pattern given."
4723 #: builtin/grep.c:825
4725 msgid "bad object %s"
4728 #: builtin/grep.c:866
4729 msgid "--open-files-in-pager only works on the worktree"
4730 msgstr "--open-files-in-pager 仅用于工作区"
4732 #: builtin/grep.c:889
4733 msgid "--cached or --untracked cannot be used with --no-index."
4734 msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
4736 #: builtin/grep.c:894
4737 msgid "--no-index or --untracked cannot be used with revs."
4738 msgstr "--no-index 或 --untracked 不能和版本同时使用。"
4740 #: builtin/grep.c:897
4741 msgid "--[no-]exclude-standard cannot be used for tracked contents."
4742 msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
4744 #: builtin/grep.c:905
4745 msgid "both --cached and trees are given."
4746 msgstr "同时给出了 --cached 和树对象。"
4748 #: builtin/hash-object.c:60
4750 "git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "
4753 "git hash-object [-t <类型>] [-w] [--path=<文件>|--no-filters] [--stdin] [--] "
4756 #: builtin/hash-object.c:61
4757 msgid "git hash-object --stdin-paths < <list-of-paths>"
4758 msgstr "git hash-object --stdin-paths < <路径列表>"
4760 #: builtin/hash-object.c:72
4764 #: builtin/hash-object.c:72
4768 #: builtin/hash-object.c:73
4769 msgid "write the object into the object database"
4772 #: builtin/hash-object.c:74
4773 msgid "read the object from stdin"
4776 #: builtin/hash-object.c:76
4777 msgid "store file as is without filters"
4778 msgstr "原样存储文件不使用过滤器"
4780 #: builtin/hash-object.c:77
4781 msgid "process file as it were from this path"
4782 msgstr "处理文件并假设其来自于此路径"
4784 #: builtin/help.c:43
4785 msgid "print all available commands"
4788 #: builtin/help.c:44
4789 msgid "show man page"
4792 #: builtin/help.c:45
4793 msgid "show manual in web browser"
4794 msgstr "在 web 浏览器中显示手册"
4796 #: builtin/help.c:47
4797 msgid "show info page"
4800 #: builtin/help.c:53
4801 msgid "git help [--all] [--man|--web|--info] [command]"
4802 msgstr "git help [--all] [--man|--web|--info] [命令]"
4804 #: builtin/help.c:65
4806 msgid "unrecognized help format '%s'"
4807 msgstr "未能识别的帮助格式 '%s'"
4809 #: builtin/help.c:93
4810 msgid "Failed to start emacsclient."
4811 msgstr "无法启动 emacsclient。"
4813 #: builtin/help.c:106
4814 msgid "Failed to parse emacsclient version."
4815 msgstr "无法解析 emacsclient 版本。"
4817 #: builtin/help.c:114
4819 msgid "emacsclient version '%d' too old (< 22)."
4820 msgstr "emacsclient 版本 '%d' 太老(< 22)。"
4822 #: builtin/help.c:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177
4824 msgid "failed to exec '%s': %s"
4825 msgstr "无法执行 '%s':%s"
4827 #: builtin/help.c:217
4830 "'%s': path for unsupported man viewer.\n"
4831 "Please consider using 'man.<tool>.cmd' instead."
4833 "'%s':不支持的 man 手册查看器的路径。\n"
4834 "请使用 'man.<tool>.cmd'。"
4836 #: builtin/help.c:229
4839 "'%s': cmd for supported man viewer.\n"
4840 "Please consider using 'man.<tool>.path' instead."
4842 "'%s': 支持的 man 手册查看器命令。\n"
4843 "请使用 'man.<tool>.path'。"
4845 #: builtin/help.c:299
4846 msgid "The most commonly used git commands are:"
4847 msgstr "最常用的 git 命令有:"
4849 #: builtin/help.c:367
4851 msgid "'%s': unknown man viewer."
4852 msgstr "'%s':未知的 man 查看器。"
4854 #: builtin/help.c:384
4855 msgid "no man viewer handled the request"
4856 msgstr "没有 man 查看器处理此请求"
4858 #: builtin/help.c:392
4859 msgid "no info viewer handled the request"
4860 msgstr "没有 info 查看器处理此请求"
4862 #: builtin/help.c:447 builtin/help.c:454
4867 #: builtin/help.c:470
4869 msgid "`git %s' is aliased to `%s'"
4870 msgstr "`git %s' 是 `%s' 的别名"
4872 #: builtin/index-pack.c:170
4874 msgid "object type mismatch at %s"
4875 msgstr "%s 的对象类型不匹配"
4877 #: builtin/index-pack.c:190
4878 msgid "object of unexpected type"
4881 #: builtin/index-pack.c:227
4883 msgid "cannot fill %d byte"
4884 msgid_plural "cannot fill %d bytes"
4885 msgstr[0] "无法填充 %d 字节"
4886 msgstr[1] "无法填充 %d 字节"
4888 #: builtin/index-pack.c:237
4890 msgstr "过早的文件结束符(EOF)"
4892 #: builtin/index-pack.c:238
4893 msgid "read error on input"
4896 #: builtin/index-pack.c:250
4897 msgid "used more bytes than were available"
4900 #: builtin/index-pack.c:257
4901 msgid "pack too large for current definition of off_t"
4902 msgstr "包太大超过了当前 off_t 的定义"
4904 #: builtin/index-pack.c:273
4906 msgid "unable to create '%s'"
4909 #: builtin/index-pack.c:278
4911 msgid "cannot open packfile '%s'"
4912 msgstr "无法打开包文件 '%s'"
4914 #: builtin/index-pack.c:292
4915 msgid "pack signature mismatch"
4918 #: builtin/index-pack.c:294
4920 msgid "pack version %<PRIu32> unsupported"
4921 msgstr "不支持包版本 %<PRIu32>"
4923 #: builtin/index-pack.c:312
4925 msgid "pack has bad object at offset %lu: %s"
4926 msgstr "包中有错误的对象位于 %lu:%s"
4928 #: builtin/index-pack.c:434
4930 msgid "inflate returned %d"
4933 #: builtin/index-pack.c:483
4934 msgid "offset value overflow for delta base object"
4935 msgstr "偏移值覆盖了 delta 基准对象"
4937 #: builtin/index-pack.c:491
4938 msgid "delta base offset is out of bound"
4939 msgstr "delta 基准偏移越界"
4941 #: builtin/index-pack.c:499
4943 msgid "unknown object type %d"
4946 #: builtin/index-pack.c:530
4947 msgid "cannot pread pack file"
4950 #: builtin/index-pack.c:532
4952 msgid "premature end of pack file, %lu byte missing"
4953 msgid_plural "premature end of pack file, %lu bytes missing"
4954 msgstr[0] "包文件过早结束,缺少 %lu 字节"
4955 msgstr[1] "包文件过早结束,缺少 %lu 字节"
4957 #: builtin/index-pack.c:558
4958 msgid "serious inflate inconsistency"
4961 #: builtin/index-pack.c:649 builtin/index-pack.c:655 builtin/index-pack.c:678
4962 #: builtin/index-pack.c:712 builtin/index-pack.c:721
4964 msgid "SHA1 COLLISION FOUND WITH %s !"
4965 msgstr "发现 %s 出现 SHA1 冲突!"
4967 #: builtin/index-pack.c:652 builtin/pack-objects.c:170
4968 #: builtin/pack-objects.c:262
4970 msgid "unable to read %s"
4973 #: builtin/index-pack.c:718
4975 msgid "cannot read existing object %s"
4976 msgstr "不能读取现存对象 %s"
4978 #: builtin/index-pack.c:732
4980 msgid "invalid blob object %s"
4981 msgstr "无效的数据(blob)对象 %s"
4983 #: builtin/index-pack.c:747
4988 #: builtin/index-pack.c:749
4989 msgid "Error in object"
4992 #: builtin/index-pack.c:751
4994 msgid "Not all child objects of %s are reachable"
4995 msgstr "%s 的所有子对象并非都可达"
4997 #: builtin/index-pack.c:821 builtin/index-pack.c:847
4998 msgid "failed to apply delta"
5001 #: builtin/index-pack.c:986
5002 msgid "Receiving objects"
5005 #: builtin/index-pack.c:986
5006 msgid "Indexing objects"
5009 #: builtin/index-pack.c:1012
5010 msgid "pack is corrupted (SHA1 mismatch)"
5011 msgstr "包冲突(SHA1 不匹配)"
5013 #: builtin/index-pack.c:1017
5014 msgid "cannot fstat packfile"
5017 #: builtin/index-pack.c:1020
5018 msgid "pack has junk at the end"
5021 #: builtin/index-pack.c:1031
5022 msgid "confusion beyond insanity in parse_pack_objects()"
5023 msgstr "parse_pack_objects() 中遇到不可理喻的问题"
5025 #: builtin/index-pack.c:1054
5026 msgid "Resolving deltas"
5029 #: builtin/index-pack.c:1064
5031 msgid "unable to create thread: %s"
5034 #: builtin/index-pack.c:1106
5035 msgid "confusion beyond insanity"
5038 #: builtin/index-pack.c:1112
5040 msgid "completed with %d local objects"
5041 msgstr "完成 %d 个本地对象"
5043 #: builtin/index-pack.c:1121
5045 msgid "Unexpected tail checksum for %s (disk corruption?)"
5046 msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
5048 #: builtin/index-pack.c:1125
5050 msgid "pack has %d unresolved delta"
5051 msgid_plural "pack has %d unresolved deltas"
5052 msgstr[0] "包有 %d 个未解决的 delta"
5053 msgstr[1] "包有 %d 个未解决的 delta"
5055 #: builtin/index-pack.c:1150
5057 msgid "unable to deflate appended object (%d)"
5058 msgstr "不能压缩附加对象(%d)"
5060 #: builtin/index-pack.c:1229
5062 msgid "local object %s is corrupt"
5063 msgstr "本地对象 %s 已损坏"
5065 #: builtin/index-pack.c:1253
5066 msgid "error while closing pack file"
5069 #: builtin/index-pack.c:1266
5071 msgid "cannot write keep file '%s'"
5072 msgstr "无法写保留文件 '%s'"
5074 #: builtin/index-pack.c:1274
5076 msgid "cannot close written keep file '%s'"
5077 msgstr "无法关闭保留文件 '%s'"
5079 #: builtin/index-pack.c:1287
5080 msgid "cannot store pack file"
5083 #: builtin/index-pack.c:1298
5084 msgid "cannot store index file"
5087 #: builtin/index-pack.c:1331
5089 msgid "bad pack.indexversion=%<PRIu32>"
5090 msgstr "坏的 pack.indexversion=%<PRIu32>"
5092 #: builtin/index-pack.c:1337
5094 msgid "invalid number of threads specified (%d)"
5095 msgstr "指定的线程数无效(%d)"
5097 #: builtin/index-pack.c:1341 builtin/index-pack.c:1514
5099 msgid "no threads support, ignoring %s"
5100 msgstr "没有线程支持,忽略 %s"
5102 #: builtin/index-pack.c:1399
5104 msgid "Cannot open existing pack file '%s'"
5105 msgstr "无法打开现存包文件 '%s'"
5107 #: builtin/index-pack.c:1401
5109 msgid "Cannot open existing pack idx file for '%s'"
5110 msgstr "无法为 %s 打开包索引文件"
5112 #: builtin/index-pack.c:1448
5114 msgid "non delta: %d object"
5115 msgid_plural "non delta: %d objects"
5116 msgstr[0] "非 delta:%d 个对象"
5117 msgstr[1] "非 delta:%d 个对象"
5119 #: builtin/index-pack.c:1455
5121 msgid "chain length = %d: %lu object"
5122 msgid_plural "chain length = %d: %lu objects"
5123 msgstr[0] "链长 = %d: %lu 对象"
5124 msgstr[1] "链长 = %d: %lu 对象"
5126 #: builtin/index-pack.c:1482
5127 msgid "Cannot come back to cwd"
5130 #: builtin/index-pack.c:1526 builtin/index-pack.c:1529
5131 #: builtin/index-pack.c:1541 builtin/index-pack.c:1545
5136 #: builtin/index-pack.c:1559
5137 msgid "--fix-thin cannot be used without --stdin"
5138 msgstr "--fix-thin 不能和 --stdin 同时使用"
5140 #: builtin/index-pack.c:1563 builtin/index-pack.c:1573
5142 msgid "packfile name '%s' does not end with '.pack'"
5143 msgstr "包名 '%s' 没有以 '.pack' 结尾"
5145 #: builtin/index-pack.c:1582
5146 msgid "--verify with no packfile name given"
5147 msgstr "--verify 没有提供包名参数"
5149 #: builtin/init-db.c:35
5151 msgid "Could not make %s writable by group"
5152 msgstr "不能设置 %s 为组可写"
5154 #: builtin/init-db.c:62
5156 msgid "insanely long template name %s"
5159 #: builtin/init-db.c:67
5161 msgid "cannot stat '%s'"
5162 msgstr "不能枚举 '%s' 状态"
5164 #: builtin/init-db.c:73
5166 msgid "cannot stat template '%s'"
5167 msgstr "不能枚举模版 '%s' 状态"
5169 #: builtin/init-db.c:80
5171 msgid "cannot opendir '%s'"
5172 msgstr "不能打开目录 '%s'"
5174 #: builtin/init-db.c:97
5176 msgid "cannot readlink '%s'"
5177 msgstr "不能读取链接 '%s'"
5179 #: builtin/init-db.c:99
5181 msgid "insanely long symlink %s"
5184 #: builtin/init-db.c:102
5186 msgid "cannot symlink '%s' '%s'"
5187 msgstr "不能自 '%s' 到 '%s' 创建符号链接"
5189 #: builtin/init-db.c:106
5191 msgid "cannot copy '%s' to '%s'"
5192 msgstr "不能拷贝 '%s' 至 '%s'"
5194 #: builtin/init-db.c:110
5196 msgid "ignoring template %s"
5199 #: builtin/init-db.c:133
5201 msgid "insanely long template path %s"
5204 #: builtin/init-db.c:141
5206 msgid "templates not found %s"
5209 #: builtin/init-db.c:154
5211 msgid "not copying templates of a wrong format version %d from '%s'"
5212 msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
5214 #: builtin/init-db.c:192
5216 msgid "insane git directory %s"
5217 msgstr "不正常的 git 目录 %s"
5219 #: builtin/init-db.c:323 builtin/init-db.c:326
5221 msgid "%s already exists"
5224 #: builtin/init-db.c:355
5226 msgid "unable to handle file type %d"
5227 msgstr "不能处理 %d 类型的文件"
5229 #: builtin/init-db.c:358
5231 msgid "unable to move %s to %s"
5232 msgstr "不能移动 %s 至 %s"
5234 #: builtin/init-db.c:363
5236 msgid "Could not create git link %s"
5237 msgstr "不能创建 git link %s"
5240 #. * TRANSLATORS: The first '%s' is either "Reinitialized
5241 #. * existing" or "Initialized empty", the second " shared" or
5242 #. * "", and the last '%s%s' is the verbatim directory name.
5244 #: builtin/init-db.c:420
5246 msgid "%s%s Git repository in %s%s\n"
5247 msgstr "%s%s Git 版本库于 %s%s\n"
5249 #: builtin/init-db.c:421
5250 msgid "Reinitialized existing"
5253 #: builtin/init-db.c:421
5254 msgid "Initialized empty"
5257 # 译者:中文字符串拼接,可删除前导空格
5258 #: builtin/init-db.c:422
5262 #: builtin/init-db.c:441
5263 msgid "cannot tell cwd"
5266 #: builtin/init-db.c:467
5268 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared"
5269 "[=<permissions>]] [directory]"
5271 "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
5274 #: builtin/init-db.c:490
5278 #: builtin/init-db.c:491
5279 msgid "specify that the git repository is to be shared amongst several users"
5280 msgstr "指定 git 版本库是多个用户之间共享的"
5282 #: builtin/init-db.c:493 builtin/prune-packed.c:77
5286 #: builtin/init-db.c:522 builtin/init-db.c:529
5288 msgid "cannot mkdir %s"
5291 #: builtin/init-db.c:533
5293 msgid "cannot chdir to %s"
5296 #: builtin/init-db.c:555
5299 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
5302 "不允许 %s(或 --work-tree=<directory>)而没有指定 %s(或 --git-"
5305 #: builtin/init-db.c:579
5306 msgid "Cannot access current working directory"
5309 #: builtin/init-db.c:586
5311 msgid "Cannot access work tree '%s'"
5312 msgstr "不能访问工作区 '%s'"
5315 msgid "git log [<options>] [<since>..<until>] [[--] <path>...]\n"
5316 msgstr "git log [<选项>] [<从>..<到>] [[--] <路径>...]\n"
5319 msgid " or: git show [options] <object>..."
5320 msgstr " 或者:git show [选项] <对象>..."
5322 #: builtin/log.c:102
5323 msgid "suppress diff output"
5326 #: builtin/log.c:103
5330 #: builtin/log.c:104
5331 msgid "Use mail map file"
5334 #: builtin/log.c:105
5335 msgid "decorate options"
5338 #: builtin/log.c:198
5340 msgid "Final output: %d %s\n"
5341 msgstr "最终输出:%d %s\n"
5343 #: builtin/log.c:419 builtin/log.c:511
5345 msgid "Could not read object %s"
5348 #: builtin/log.c:535
5350 msgid "Unknown type: %d"
5353 #: builtin/log.c:627
5354 msgid "format.headers without value"
5355 msgstr "format.headers 没有值"
5357 #: builtin/log.c:701
5358 msgid "name of output directory is too long"
5361 #: builtin/log.c:717
5363 msgid "Cannot open patch file %s"
5364 msgstr "无法打开补丁文件 %s"
5366 #: builtin/log.c:731
5367 msgid "Need exactly one range."
5370 #: builtin/log.c:739
5371 msgid "Not a range."
5374 #: builtin/log.c:812
5375 msgid "Cover letter needs email format"
5378 #: builtin/log.c:885
5380 msgid "insane in-reply-to: %s"
5381 msgstr "不正常的 in-reply-to:%s"
5383 #: builtin/log.c:913
5384 msgid "git format-patch [options] [<since> | <revision range>]"
5385 msgstr "git format-patch [选项] [<从> | <修订集范围>]"
5387 #: builtin/log.c:958
5388 msgid "Two output directories?"
5391 #: builtin/log.c:1097
5392 msgid "use [PATCH n/m] even with a single patch"
5393 msgstr "使用 [PATCH n/m],即使只有一个补丁"
5395 #: builtin/log.c:1100
5396 msgid "use [PATCH] even with multiple patches"
5397 msgstr "使用 [PATCH],即使有多个补丁"
5399 #: builtin/log.c:1104
5400 msgid "print patches to standard out"
5403 #: builtin/log.c:1106
5404 msgid "generate a cover letter"
5407 #: builtin/log.c:1108
5408 msgid "use simple number sequence for output file names"
5409 msgstr "使用简单的数字序列作为输出文件名"
5411 #: builtin/log.c:1109
5415 #: builtin/log.c:1110
5416 msgid "use <sfx> instead of '.patch'"
5417 msgstr "使用 <后缀> 代替 '.patch'"
5419 #: builtin/log.c:1112
5420 msgid "start numbering patches at <n> instead of 1"
5421 msgstr "补丁以 <n> 开始编号,而不是1"
5423 #: builtin/log.c:1114
5424 msgid "mark the series as Nth re-roll"
5425 msgstr "标记补丁系列是第几次重制"
5427 #: builtin/log.c:1116
5428 msgid "Use [<prefix>] instead of [PATCH]"
5429 msgstr "使用 [<前缀>] 代替 [PATCH]"
5431 #: builtin/log.c:1119
5432 msgid "store resulting files in <dir>"
5433 msgstr "把结果文件存储在 <dir>"
5435 #: builtin/log.c:1122
5436 msgid "don't strip/add [PATCH]"
5437 msgstr "不删除/添加 [PATCH]"
5439 #: builtin/log.c:1125
5440 msgid "don't output binary diffs"
5443 #: builtin/log.c:1127
5444 msgid "don't include a patch matching a commit upstream"
5445 msgstr "不包含已在上游提交中的补丁"
5447 #: builtin/log.c:1129
5448 msgid "show patch format instead of default (patch + stat)"
5449 msgstr "显示纯补丁格式而非默认的(补丁+状态)"
5451 #: builtin/log.c:1131
5455 #: builtin/log.c:1132
5459 #: builtin/log.c:1133
5460 msgid "add email header"
5463 #: builtin/log.c:1134 builtin/log.c:1136
5467 #: builtin/log.c:1134
5468 msgid "add To: header"
5471 #: builtin/log.c:1136
5472 msgid "add Cc: header"
5475 #: builtin/log.c:1138
5479 #: builtin/log.c:1139
5480 msgid "make first mail a reply to <message-id>"
5481 msgstr "使第一封邮件作为对 <message-id> 的回复"
5483 #: builtin/log.c:1140 builtin/log.c:1143
5487 #: builtin/log.c:1141
5488 msgid "attach the patch"
5491 #: builtin/log.c:1144
5492 msgid "inline the patch"
5495 #: builtin/log.c:1148
5496 msgid "enable message threading, styles: shallow, deep"
5497 msgstr "启用邮件线索,风格:浅,深"
5499 #: builtin/log.c:1150
5503 #: builtin/log.c:1151
5504 msgid "add a signature"
5507 #: builtin/log.c:1153
5508 msgid "don't print the patch filenames"
5511 #: builtin/log.c:1202
5513 msgid "bogus committer info %s"
5514 msgstr "虚假的提交者信息 %s"
5516 #: builtin/log.c:1247
5517 msgid "-n and -k are mutually exclusive."
5518 msgstr "-n 和 -k 互斥。"
5520 #: builtin/log.c:1249
5521 msgid "--subject-prefix and -k are mutually exclusive."
5522 msgstr "--subject-prefix 和 -k 互斥。"
5524 #: builtin/log.c:1257
5525 msgid "--name-only does not make sense"
5526 msgstr "--name-only 无意义"
5528 #: builtin/log.c:1259
5529 msgid "--name-status does not make sense"
5530 msgstr "--name-status 无意义"
5532 #: builtin/log.c:1261
5533 msgid "--check does not make sense"
5534 msgstr "--check 无意义"
5536 #: builtin/log.c:1284
5537 msgid "standard output, or directory, which one?"
5538 msgstr "标准输出或目录,哪一个?"
5540 #: builtin/log.c:1286
5542 msgid "Could not create directory '%s'"
5543 msgstr "不能创建目录 '%s'"
5545 #: builtin/log.c:1439
5546 msgid "Failed to create output files"
5549 #: builtin/log.c:1488
5550 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
5551 msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
5553 #: builtin/log.c:1543
5556 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
5557 msgstr "不能找到跟踪的远程分支,请手工指定 <upstream>。\n"
5559 #: builtin/log.c:1556 builtin/log.c:1558 builtin/log.c:1570
5561 msgid "Unknown commit %s"
5564 #: builtin/ls-files.c:408
5565 msgid "git ls-files [options] [<file>...]"
5566 msgstr "git ls-files [选项] [<文件>...]"
5568 #: builtin/ls-files.c:463
5569 msgid "identify the file status with tags"
5572 #: builtin/ls-files.c:465
5573 msgid "use lowercase letters for 'assume unchanged' files"
5574 msgstr "使用小写字母表示 '假设未改变的' 文件"
5576 #: builtin/ls-files.c:467
5577 msgid "show cached files in the output (default)"
5578 msgstr "显示缓存的文件(默认)"
5580 #: builtin/ls-files.c:469
5581 msgid "show deleted files in the output"
5584 #: builtin/ls-files.c:471
5585 msgid "show modified files in the output"
5588 #: builtin/ls-files.c:473
5589 msgid "show other files in the output"
5592 #: builtin/ls-files.c:475
5593 msgid "show ignored files in the output"
5596 #: builtin/ls-files.c:478
5597 msgid "show staged contents' object name in the output"
5598 msgstr "显示暂存区内容的对象名称"
5600 #: builtin/ls-files.c:480
5601 msgid "show files on the filesystem that need to be removed"
5602 msgstr "显示文件系统需要删除的文件"
5604 #: builtin/ls-files.c:482
5605 msgid "show 'other' directories' name only"
5606 msgstr "只显示“其他”目录的名称"
5608 #: builtin/ls-files.c:485
5609 msgid "don't show empty directories"
5612 #: builtin/ls-files.c:488
5613 msgid "show unmerged files in the output"
5616 #: builtin/ls-files.c:490
5617 msgid "show resolve-undo information"
5618 msgstr "显示 resolve-undo 信息"
5620 #: builtin/ls-files.c:492
5621 msgid "skip files matching pattern"
5624 #: builtin/ls-files.c:495
5625 msgid "exclude patterns are read from <file>"
5626 msgstr "从 <文件> 中读取排除模式"
5628 #: builtin/ls-files.c:498
5629 msgid "read additional per-directory exclude patterns in <file>"
5630 msgstr "从 <文件> 读取额外的每个目录的排除模式"
5632 #: builtin/ls-files.c:500
5633 msgid "add the standard git exclusions"
5634 msgstr "添加标准的 git 排除"
5636 #: builtin/ls-files.c:503
5637 msgid "make the output relative to the project top directory"
5638 msgstr "显示相对于顶级目录的文件名"
5640 #: builtin/ls-files.c:506
5641 msgid "if any <file> is not in the index, treat this as an error"
5642 msgstr "如果任何 <文件> 都不在索引区,视为错误"
5644 #: builtin/ls-files.c:507
5648 #: builtin/ls-files.c:508
5649 msgid "pretend that paths removed since <tree-ish> are still present"
5650 msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
5652 #: builtin/ls-files.c:510
5653 msgid "show debugging data"
5656 #: builtin/ls-tree.c:27
5657 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
5658 msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
5660 #: builtin/ls-tree.c:125
5661 msgid "only show trees"
5664 #: builtin/ls-tree.c:127
5665 msgid "recurse into subtrees"
5668 #: builtin/ls-tree.c:129
5669 msgid "show trees when recursing"
5672 #: builtin/ls-tree.c:132
5673 msgid "terminate entries with NUL byte"
5676 #: builtin/ls-tree.c:133
5677 msgid "include object size"
5680 #: builtin/ls-tree.c:135 builtin/ls-tree.c:137
5681 msgid "list only filenames"
5684 #: builtin/ls-tree.c:140
5685 msgid "use full path names"
5688 #: builtin/ls-tree.c:142
5689 msgid "list entire tree; not just current directory (implies --full-name)"
5690 msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
5692 #: builtin/merge.c:43
5693 msgid "git merge [options] [<commit>...]"
5694 msgstr "git merge [选项] [<提交>...]"
5696 #: builtin/merge.c:44
5697 msgid "git merge [options] <msg> HEAD <commit>"
5698 msgstr "git merge [选项] <说明> HEAD <提交>"
5700 #: builtin/merge.c:45
5701 msgid "git merge --abort"
5702 msgstr "git merge --abort"
5704 #: builtin/merge.c:90
5705 msgid "switch `m' requires a value"
5706 msgstr "开关 `m' 需要一个值"
5708 #: builtin/merge.c:127
5710 msgid "Could not find merge strategy '%s'.\n"
5711 msgstr "不能找到合并策略 '%s'。\n"
5713 #: builtin/merge.c:128
5715 msgid "Available strategies are:"
5718 #: builtin/merge.c:133
5720 msgid "Available custom strategies are:"
5723 #: builtin/merge.c:183
5724 msgid "do not show a diffstat at the end of the merge"
5725 msgstr "在合并的最后不显示差异统计"
5727 #: builtin/merge.c:186
5728 msgid "show a diffstat at the end of the merge"
5729 msgstr "在合并的最后显示差异统计"
5731 #: builtin/merge.c:187
5732 msgid "(synonym to --stat)"
5733 msgstr "(和 --stat 同义)"
5735 #: builtin/merge.c:189
5736 msgid "add (at most <n>) entries from shortlog to merge commit message"
5737 msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
5739 #: builtin/merge.c:192
5740 msgid "create a single commit instead of doing a merge"
5741 msgstr "创建一个单独的提交而不是做一次合并"
5743 #: builtin/merge.c:194
5744 msgid "perform a commit if the merge succeeds (default)"
5745 msgstr "如果合并成功,执行一次提交(默认)"
5747 #: builtin/merge.c:196
5748 msgid "edit message before committing"
5751 #: builtin/merge.c:198
5752 msgid "allow fast-forward (default)"
5755 #: builtin/merge.c:200
5756 msgid "abort if fast-forward is not possible"
5757 msgstr "如果不能快进就放弃合并"
5759 #: builtin/merge.c:202 builtin/notes.c:870 builtin/revert.c:112
5763 #: builtin/merge.c:203
5764 msgid "merge strategy to use"
5767 #: builtin/merge.c:204
5768 msgid "option=value"
5769 msgstr "option=value"
5771 #: builtin/merge.c:205
5772 msgid "option for selected merge strategy"
5775 #: builtin/merge.c:207
5776 msgid "merge commit message (for a non-fast-forward merge)"
5777 msgstr "合并的提交说明(针对非快进式合并)"
5779 #: builtin/merge.c:211
5780 msgid "abort the current in-progress merge"
5781 msgstr "放弃当前正在进行的合并"
5783 #: builtin/merge.c:240
5784 msgid "could not run stash."
5787 #: builtin/merge.c:245
5788 msgid "stash failed"
5791 #: builtin/merge.c:250
5793 msgid "not a valid object: %s"
5794 msgstr "不是一个有效对象:%s"
5796 #: builtin/merge.c:269 builtin/merge.c:286
5797 msgid "read-tree failed"
5801 #: builtin/merge.c:316
5802 msgid " (nothing to squash)"
5805 #: builtin/merge.c:329
5807 msgid "Squash commit -- not updating HEAD\n"
5808 msgstr "压缩提交 -- 未更新 HEAD\n"
5810 #: builtin/merge.c:361
5811 msgid "Writing SQUASH_MSG"
5812 msgstr "写入 SQUASH_MSG"
5814 #: builtin/merge.c:363
5815 msgid "Finishing SQUASH_MSG"
5816 msgstr "完成 SQUASH_MSG"
5818 #: builtin/merge.c:386
5820 msgid "No merge message -- not updating HEAD\n"
5821 msgstr "无合并信息 -- 未更新 HEAD\n"
5823 #: builtin/merge.c:436
5825 msgid "'%s' does not point to a commit"
5826 msgstr "'%s' 没有指向一个提交"
5828 #: builtin/merge.c:535
5830 msgid "Bad branch.%s.mergeoptions string: %s"
5831 msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
5833 #: builtin/merge.c:628
5834 msgid "git write-tree failed to write a tree"
5835 msgstr "git write-tree 无法写入一树对象"
5837 #: builtin/merge.c:656
5838 msgid "Not handling anything other than two heads merge."
5839 msgstr "不能处理两个头合并之外的任何操作。"
5841 #: builtin/merge.c:670
5843 msgid "Unknown option for merge-recursive: -X%s"
5844 msgstr "merge-recursive 的未知选项:-X%s"
5846 #: builtin/merge.c:684
5848 msgid "unable to write %s"
5851 #: builtin/merge.c:773
5853 msgid "Could not read from '%s'"
5854 msgstr "不能从 '%s' 读取"
5856 #: builtin/merge.c:782
5858 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
5859 msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
5861 #: builtin/merge.c:788
5863 "Please enter a commit message to explain why this merge is necessary,\n"
5864 "especially if it merges an updated upstream into a topic branch.\n"
5866 "Lines starting with '#' will be ignored, and an empty message aborts\n"
5869 "请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
5872 "以 '#' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
5874 #: builtin/merge.c:813
5875 msgid "Empty commit message."
5878 #: builtin/merge.c:825
5880 msgid "Wonderful.\n"
5883 #: builtin/merge.c:890
5885 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
5886 msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
5888 #: builtin/merge.c:906
5890 msgid "'%s' is not a commit"
5891 msgstr "'%s' 不是一个提交"
5893 #: builtin/merge.c:947
5894 msgid "No current branch."
5897 #: builtin/merge.c:949
5898 msgid "No remote for the current branch."
5899 msgstr "当前分支没有对应的远程版本库。"
5901 #: builtin/merge.c:951
5902 msgid "No default upstream defined for the current branch."
5903 msgstr "当前分支没有定义默认的上游分支。"
5905 #: builtin/merge.c:956
5907 msgid "No remote tracking branch for %s from %s"
5908 msgstr "%s 没有来自 %s 的远程跟踪分支"
5910 #: builtin/merge.c:1043 builtin/merge.c:1200
5912 msgid "%s - not something we can merge"
5915 #: builtin/merge.c:1111
5916 msgid "There is no merge to abort (MERGE_HEAD missing)."
5917 msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
5919 #: builtin/merge.c:1127 git-pull.sh:31
5921 "You have not concluded your merge (MERGE_HEAD exists).\n"
5922 "Please, commit your changes before you can merge."
5924 "您尚未结束您的合并(存在 MERGE_HEAD)。\n"
5927 #: builtin/merge.c:1130 git-pull.sh:34
5928 msgid "You have not concluded your merge (MERGE_HEAD exists)."
5929 msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
5931 #: builtin/merge.c:1134
5933 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
5934 "Please, commit your changes before you can merge."
5936 "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
5939 #: builtin/merge.c:1137
5940 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
5941 msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
5943 #: builtin/merge.c:1146
5944 msgid "You cannot combine --squash with --no-ff."
5945 msgstr "您不能将 --squash 与 --no-ff 同时使用。"
5947 #: builtin/merge.c:1151
5948 msgid "You cannot combine --no-ff with --ff-only."
5949 msgstr "您不能将 --no-ff 与 --ff-only 同时使用。"
5951 #: builtin/merge.c:1158
5952 msgid "No commit specified and merge.defaultToUpstream not set."
5953 msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
5955 #: builtin/merge.c:1190
5956 msgid "Can merge only exactly one commit into empty head"
5957 msgstr "只能将一个提交合并到空分支上"
5959 #: builtin/merge.c:1193
5960 msgid "Squash commit into empty head not supported yet"
5961 msgstr "尚不支持到空分支的压缩提交"
5963 #: builtin/merge.c:1195
5964 msgid "Non-fast-forward commit does not make sense into an empty head"
5965 msgstr "到空分支的非快进式提交没有意义"
5967 #: builtin/merge.c:1311
5969 msgid "Updating %s..%s\n"
5970 msgstr "更新 %s..%s\n"
5972 #: builtin/merge.c:1350
5974 msgid "Trying really trivial in-index merge...\n"
5975 msgstr "尝试非常小的索引内合并...\n"
5977 #: builtin/merge.c:1357
5982 #: builtin/merge.c:1389
5983 msgid "Not possible to fast-forward, aborting."
5986 #: builtin/merge.c:1412 builtin/merge.c:1491
5988 msgid "Rewinding the tree to pristine...\n"
5989 msgstr "将树回滚至原始状态...\n"
5991 #: builtin/merge.c:1416
5993 msgid "Trying merge strategy %s...\n"
5994 msgstr "尝试合并策略 %s...\n"
5996 #: builtin/merge.c:1482
5998 msgid "No merge strategy handled the merge.\n"
5999 msgstr "没有合并策略处理此合并。\n"
6001 #: builtin/merge.c:1484
6003 msgid "Merge with strategy %s failed.\n"
6004 msgstr "使用策略 %s 合并失败。\n"
6006 #: builtin/merge.c:1493
6008 msgid "Using the %s to prepare resolving by hand.\n"
6009 msgstr "使用 %s 以准备手工解决。\n"
6011 #: builtin/merge.c:1505
6013 msgid "Automatic merge went well; stopped before committing as requested\n"
6014 msgstr "自动合并进展顺利,按要求在提交前停止\n"
6016 #: builtin/merge-base.c:26
6017 msgid "git merge-base [-a|--all] <commit> <commit>..."
6018 msgstr "git merge-base [-a|--all] <提交> <提交>..."
6020 #: builtin/merge-base.c:27
6021 msgid "git merge-base [-a|--all] --octopus <commit>..."
6022 msgstr "git merge-base [-a|--all] --octopus <提交>..."
6024 #: builtin/merge-base.c:28
6025 msgid "git merge-base --independent <commit>..."
6026 msgstr "git merge-base --independent <提交>..."
6028 #: builtin/merge-base.c:29
6029 msgid "git merge-base --is-ancestor <commit> <commit>"
6030 msgstr "git merge-base --is-ancestor <提交> <提交>"
6032 #: builtin/merge-base.c:98
6033 msgid "output all common ancestors"
6036 #: builtin/merge-base.c:99
6037 msgid "find ancestors for a single n-way merge"
6038 msgstr "查找一个多路合并的祖先提交"
6040 #: builtin/merge-base.c:100
6041 msgid "list revs not reachable from others"
6042 msgstr "显示不能被其他访问到的版本"
6044 #: builtin/merge-base.c:102
6045 msgid "is the first one ancestor of the other?"
6046 msgstr "第一个是其他的祖先提交么?"
6048 #: builtin/merge-file.c:8
6050 "git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file "
6053 "git merge-file [选项] [-L name1 [-L orig [-L name2]]] file1 orig_file file2"
6055 #: builtin/merge-file.c:33
6056 msgid "send results to standard output"
6059 #: builtin/merge-file.c:34
6060 msgid "use a diff3 based merge"
6061 msgstr "使用基于 diff3 的合并"
6063 #: builtin/merge-file.c:35
6064 msgid "for conflicts, use our version"
6065 msgstr "如果冲突,使用我们的版本"
6067 #: builtin/merge-file.c:37
6068 msgid "for conflicts, use their version"
6069 msgstr "如果冲突,使用他们的版本"
6071 #: builtin/merge-file.c:39
6072 msgid "for conflicts, use a union version"
6073 msgstr "如果冲突,使用联合版本"
6075 #: builtin/merge-file.c:42
6076 msgid "for conflicts, use this marker size"
6077 msgstr "如果冲突,使用指定长度的标记"
6079 #: builtin/merge-file.c:43
6080 msgid "do not warn about conflicts"
6083 #: builtin/merge-file.c:45
6084 msgid "set labels for file1/orig_file/file2"
6085 msgstr "为 file1/orig_file/file2 设置标签"
6087 #: builtin/mktree.c:67
6088 msgid "git mktree [-z] [--missing] [--batch]"
6089 msgstr "git mktree [-z] [--missing] [--batch]"
6091 #: builtin/mktree.c:153
6092 msgid "input is NUL terminated"
6093 msgstr "输入以 NUL 字符终止"
6095 #: builtin/mktree.c:154 builtin/write-tree.c:24
6096 msgid "allow missing objects"
6099 #: builtin/mktree.c:155
6100 msgid "allow creation of more than one tree"
6104 msgid "git mv [options] <source>... <destination>"
6105 msgstr "git mv [选项] <源>... <目标>"
6108 msgid "force move/rename even if target exists"
6109 msgstr "强制移动/重命令,即使目标存在"
6112 msgid "skip move/rename errors"
6117 msgid "Checking rename of '%s' to '%s'\n"
6118 msgstr "检查 '%s' 到 '%s' 的重命名\n"
6125 msgid "can not move directory into itself"
6129 msgid "cannot move directory over file"
6134 msgid "Huh? %.*s is in index?"
6135 msgstr "嗯?%.*s 在索引中?"
6138 msgid "source directory is empty"
6142 msgid "not under version control"
6146 msgid "destination exists"
6151 msgid "overwriting '%s'"
6155 msgid "Cannot overwrite"
6159 msgid "multiple sources for the same target"
6164 msgid "%s, source=%s, destination=%s"
6165 msgstr "%s,源=%s,目标=%s"
6169 msgid "Renaming %s to %s\n"
6170 msgstr "重命名 %s 至 %s\n"
6172 #: builtin/mv.c:215 builtin/remote.c:731
6174 msgid "renaming '%s' failed"
6175 msgstr "重命名 '%s' 失败"
6177 #: builtin/name-rev.c:175
6178 msgid "git name-rev [options] <commit>..."
6179 msgstr "git name-rev [选项] <提交>..."
6181 #: builtin/name-rev.c:176
6182 msgid "git name-rev [options] --all"
6183 msgstr "git name-rev [选项] --all"
6185 #: builtin/name-rev.c:177
6186 msgid "git name-rev [options] --stdin"
6187 msgstr "git name-rev [选项] --stdin"
6189 #: builtin/name-rev.c:229
6190 msgid "print only names (no SHA-1)"
6191 msgstr "只打印名称(无 SHA-1)"
6193 #: builtin/name-rev.c:230
6194 msgid "only use tags to name the commits"
6195 msgstr "只使用 tags 来命名提交"
6197 #: builtin/name-rev.c:232
6198 msgid "only use refs matching <pattern>"
6199 msgstr "只使用和 <模式> 相匹配的引用"
6201 #: builtin/name-rev.c:234
6202 msgid "list all commits reachable from all refs"
6203 msgstr "列出可以从所有引用访问的提交"
6205 #: builtin/name-rev.c:235
6206 msgid "read from stdin"
6209 #: builtin/name-rev.c:236
6210 msgid "allow to print `undefined` names"
6211 msgstr "允许打印 `未定义` 的名称"
6213 #: builtin/notes.c:26
6214 msgid "git notes [--ref <notes_ref>] [list [<object>]]"
6215 msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
6217 #: builtin/notes.c:27
6219 "git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) "
6220 "<object>] [<object>]"
6222 "git notes [--ref <注解引用>] add [-f] [-m <说明> | -F <文件> | (-c | -C) <对"
6225 #: builtin/notes.c:28
6226 msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"
6227 msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
6229 #: builtin/notes.c:29
6231 "git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) "
6232 "<object>] [<object>]"
6234 "git notes [--ref <注解引用>] append [-m <说明> | -F <文件> | (-c | -C) <对象"
6237 #: builtin/notes.c:30
6238 msgid "git notes [--ref <notes_ref>] edit [<object>]"
6239 msgstr "git notes [--ref <注解引用>] edit [<对象>]"
6241 #: builtin/notes.c:31
6242 msgid "git notes [--ref <notes_ref>] show [<object>]"
6243 msgstr "git notes [--ref <注解引用>] show [<对象>]"
6245 #: builtin/notes.c:32
6247 "git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"
6248 msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
6250 #: builtin/notes.c:33
6251 msgid "git notes merge --commit [-v | -q]"
6252 msgstr "git notes merge --commit [-v | -q]"
6254 #: builtin/notes.c:34
6255 msgid "git notes merge --abort [-v | -q]"
6256 msgstr "git notes merge --abort [-v | -q]"
6258 #: builtin/notes.c:35
6259 msgid "git notes [--ref <notes_ref>] remove [<object>...]"
6260 msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
6262 #: builtin/notes.c:36
6263 msgid "git notes [--ref <notes_ref>] prune [-n | -v]"
6264 msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
6266 #: builtin/notes.c:37
6267 msgid "git notes [--ref <notes_ref>] get-ref"
6268 msgstr "git notes [--ref <注解引用>] get-ref"
6270 #: builtin/notes.c:42
6271 msgid "git notes [list [<object>]]"
6272 msgstr "git notes [list [<对象>]]"
6274 #: builtin/notes.c:47
6275 msgid "git notes add [<options>] [<object>]"
6276 msgstr "git notes add [<选项>] [<对象>]"
6278 #: builtin/notes.c:52
6279 msgid "git notes copy [<options>] <from-object> <to-object>"
6280 msgstr "git notes copy [<选项>] <源对象> <目标对象>"
6282 #: builtin/notes.c:53
6283 msgid "git notes copy --stdin [<from-object> <to-object>]..."
6284 msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
6286 #: builtin/notes.c:58
6287 msgid "git notes append [<options>] [<object>]"
6288 msgstr "git notes append [<选项>] [<对象>]"
6290 #: builtin/notes.c:63
6291 msgid "git notes edit [<object>]"
6292 msgstr "git notes edit [<对象>]"
6294 #: builtin/notes.c:68
6295 msgid "git notes show [<object>]"
6296 msgstr "git notes show [<对象>]"
6298 #: builtin/notes.c:73
6299 msgid "git notes merge [<options>] <notes_ref>"
6300 msgstr "git notes merge [<选项>] <注解引用>"
6302 #: builtin/notes.c:74
6303 msgid "git notes merge --commit [<options>]"
6304 msgstr "git notes merge --commit [<选项>]"
6306 #: builtin/notes.c:75
6307 msgid "git notes merge --abort [<options>]"
6308 msgstr "git notes merge --abort [<选项>]"
6310 #: builtin/notes.c:80
6311 msgid "git notes remove [<object>]"
6312 msgstr "git notes remove [<对象>]"
6314 #: builtin/notes.c:85
6315 msgid "git notes prune [<options>]"
6316 msgstr "git notes prune [<选项>]"
6318 #: builtin/notes.c:90
6319 msgid "git notes get-ref"
6320 msgstr "git notes get-ref"
6322 #: builtin/notes.c:142
6324 msgid "unable to start 'show' for object '%s'"
6325 msgstr "不能为对象 '%s' 开始 'show'"
6327 #: builtin/notes.c:148
6328 msgid "can't fdopen 'show' output fd"
6329 msgstr "不能打开 'show' 输出文件句柄"
6331 #: builtin/notes.c:158
6333 msgid "failed to close pipe to 'show' for object '%s'"
6334 msgstr "无法为对象 '%s' 的 'show' 关闭管道"
6336 #: builtin/notes.c:161
6338 msgid "failed to finish 'show' for object '%s'"
6339 msgstr "无法为对象 '%s' 完成 'show'"
6341 #: builtin/notes.c:178 builtin/tag.c:347
6343 msgid "could not create file '%s'"
6344 msgstr "不能创建文件 '%s'"
6346 #: builtin/notes.c:192
6347 msgid "Please supply the note contents using either -m or -F option"
6348 msgstr "请通过 -m 或 -F 选项为注解提供内容"
6350 #: builtin/notes.c:213 builtin/notes.c:976
6352 msgid "Removing note for object %s\n"
6353 msgstr "删除对象 %s 的注解\n"
6355 #: builtin/notes.c:218
6356 msgid "unable to write note object"
6359 #: builtin/notes.c:220
6361 msgid "The note contents has been left in %s"
6362 msgstr "注解内容被留在文件 %s 中"
6364 #: builtin/notes.c:254 builtin/tag.c:542
6366 msgid "cannot read '%s'"
6369 #: builtin/notes.c:256 builtin/tag.c:545
6371 msgid "could not open or read '%s'"
6372 msgstr "不能打开或读取 '%s'"
6374 #: builtin/notes.c:275 builtin/notes.c:448 builtin/notes.c:450
6375 #: builtin/notes.c:510 builtin/notes.c:564 builtin/notes.c:647
6376 #: builtin/notes.c:652 builtin/notes.c:727 builtin/notes.c:769
6377 #: builtin/notes.c:971 builtin/tag.c:558
6379 msgid "Failed to resolve '%s' as a valid ref."
6380 msgstr "无法解析 '%s' 为一个有效引用。"
6382 #: builtin/notes.c:278
6384 msgid "Failed to read object '%s'."
6385 msgstr "无法读取对象 '%s'。"
6387 #: builtin/notes.c:302
6388 msgid "Cannot commit uninitialized/unreferenced notes tree"
6389 msgstr "不能提交未初始化/未引用的注解树"
6391 #: builtin/notes.c:343
6393 msgid "Bad notes.rewriteMode value: '%s'"
6394 msgstr "坏的 notes.rewriteMode 值:'%s'"
6396 #: builtin/notes.c:353
6398 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
6399 msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
6401 #. TRANSLATORS: The first %s is the name of the
6402 #. environment variable, the second %s is its value
6403 #: builtin/notes.c:380
6405 msgid "Bad %s value: '%s'"
6406 msgstr "坏的 %s 值:'%s'"
6408 #: builtin/notes.c:444
6410 msgid "Malformed input line: '%s'."
6411 msgstr "非法的输入行:'%s'。"
6413 #: builtin/notes.c:459
6415 msgid "Failed to copy notes from '%s' to '%s'"
6416 msgstr "无法从 '%s' 到 '%s' 拷贝注解"
6418 #: builtin/notes.c:503 builtin/notes.c:557 builtin/notes.c:630
6419 #: builtin/notes.c:642 builtin/notes.c:715 builtin/notes.c:762
6420 #: builtin/notes.c:1036
6421 msgid "too many parameters"
6424 #: builtin/notes.c:516 builtin/notes.c:775
6426 msgid "No note found for object %s."
6427 msgstr "未发现对象 %s 的注解。"
6429 #: builtin/notes.c:538 builtin/notes.c:695
6430 msgid "note contents as a string"
6431 msgstr "注解内容作为一个字符串"
6433 #: builtin/notes.c:541 builtin/notes.c:698
6434 msgid "note contents in a file"
6437 #: builtin/notes.c:543 builtin/notes.c:546 builtin/notes.c:700
6438 #: builtin/notes.c:703 builtin/tag.c:476
6442 #: builtin/notes.c:544 builtin/notes.c:701
6443 msgid "reuse and edit specified note object"
6444 msgstr "重用和编辑指定的注解对象"
6446 #: builtin/notes.c:547 builtin/notes.c:704
6447 msgid "reuse specified note object"
6450 #: builtin/notes.c:549 builtin/notes.c:617
6451 msgid "replace existing notes"
6454 #: builtin/notes.c:583
6457 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
6459 msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
6461 #: builtin/notes.c:588 builtin/notes.c:665
6463 msgid "Overwriting existing notes for object %s\n"
6464 msgstr "覆盖对象 %s 现存注解\n"
6466 #: builtin/notes.c:618
6467 msgid "read objects from stdin"
6470 #: builtin/notes.c:620
6471 msgid "load rewriting config for <command> (implies --stdin)"
6472 msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
6474 #: builtin/notes.c:638
6475 msgid "too few parameters"
6478 #: builtin/notes.c:659
6481 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
6483 msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
6485 #: builtin/notes.c:671
6487 msgid "Missing notes on source object %s. Cannot copy."
6488 msgstr "源对象 %s 缺少注解。不能拷贝。"
6490 #: builtin/notes.c:720
6493 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
6494 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
6496 "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
6497 "请换用 'git notes add -f -m/-F/-c/-C'。\n"
6499 #: builtin/notes.c:867
6500 msgid "General options"
6503 #: builtin/notes.c:869
6504 msgid "Merge options"
6507 #: builtin/notes.c:871
6509 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
6511 msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
6513 #: builtin/notes.c:873
6514 msgid "Committing unmerged notes"
6517 #: builtin/notes.c:875
6518 msgid "finalize notes merge by committing unmerged notes"
6519 msgstr "通过提交未合并的注解来完成注解合并"
6521 #: builtin/notes.c:877
6522 msgid "Aborting notes merge resolution"
6525 #: builtin/notes.c:879
6526 msgid "abort notes merge"
6529 #: builtin/notes.c:974
6531 msgid "Object %s has no note\n"
6532 msgstr "对象 %s 没有注解\n"
6534 #: builtin/notes.c:986
6535 msgid "attempt to remove non-existent note is not an error"
6536 msgstr "尝试删除不存在的注解不是一个错误"
6538 #: builtin/notes.c:989
6539 msgid "read object names from the standard input"
6540 msgstr "从标准输入读取对象名称"
6542 #: builtin/notes.c:1070
6546 #: builtin/notes.c:1071
6547 msgid "use notes from <notes_ref>"
6548 msgstr "从 <注解引用> 使用注解"
6550 #: builtin/notes.c:1106 builtin/remote.c:1598
6552 msgid "Unknown subcommand: %s"
6555 #: builtin/pack-objects.c:23
6556 msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
6557 msgstr "git pack-objects --stdout [选项...] [< 引用列表 | < 对象列表]"
6559 #: builtin/pack-objects.c:24
6560 msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
6561 msgstr "git pack-objects [选项...] base-name [< 引用列表 | < 对象列表]"
6563 #: builtin/pack-objects.c:183 builtin/pack-objects.c:186
6565 msgid "deflate error (%d)"
6568 #: builtin/pack-objects.c:2397
6570 msgid "unsupported index version %s"
6571 msgstr "不支持的索引版本 %s"
6573 #: builtin/pack-objects.c:2401
6575 msgid "bad index version '%s'"
6576 msgstr "坏的索引版本 '%s'"
6578 #: builtin/pack-objects.c:2424
6580 msgid "option %s does not accept negative form"
6581 msgstr "选项 %s 不接受否定格式"
6583 #: builtin/pack-objects.c:2428
6585 msgid "unable to parse value '%s' for option %s"
6586 msgstr "不能解析选项 %1$s 的值 '%2$s'"
6588 #: builtin/pack-objects.c:2447
6589 msgid "do not show progress meter"
6592 #: builtin/pack-objects.c:2449
6593 msgid "show progress meter"
6596 #: builtin/pack-objects.c:2451
6597 msgid "show progress meter during object writing phase"
6598 msgstr "在对象写入阶段显示进度表"
6600 #: builtin/pack-objects.c:2454
6601 msgid "similar to --all-progress when progress meter is shown"
6602 msgstr "当进度表显示时类似于 --all-progress"
6604 #: builtin/pack-objects.c:2455
6605 msgid "version[,offset]"
6608 #: builtin/pack-objects.c:2456
6609 msgid "write the pack index file in the specified idx format version"
6610 msgstr "用指定的 idx 格式版本来写包索引文件"
6612 #: builtin/pack-objects.c:2459
6613 msgid "maximum size of each output pack file"
6616 #: builtin/pack-objects.c:2461
6617 msgid "ignore borrowed objects from alternate object store"
6618 msgstr "忽略从替代对象存储里借用对象"
6620 #: builtin/pack-objects.c:2463
6621 msgid "ignore packed objects"
6624 #: builtin/pack-objects.c:2465
6625 msgid "limit pack window by objects"
6628 #: builtin/pack-objects.c:2467
6629 msgid "limit pack window by memory in addition to object limit"
6630 msgstr "除对象数量限制外设置打包窗口的内存限制"
6632 #: builtin/pack-objects.c:2469
6633 msgid "maximum length of delta chain allowed in the resulting pack"
6634 msgstr "打包允许的 delta 链的最大长度"
6636 #: builtin/pack-objects.c:2471
6637 msgid "reuse existing deltas"
6638 msgstr "重用已存在的 deltas"
6640 #: builtin/pack-objects.c:2473
6641 msgid "reuse existing objects"
6644 #: builtin/pack-objects.c:2475
6645 msgid "use OFS_DELTA objects"
6646 msgstr "使用 OFS_DELTA 对象"
6648 #: builtin/pack-objects.c:2477
6649 msgid "use threads when searching for best delta matches"
6650 msgstr "使用线程查询最佳 delta 匹配"
6652 #: builtin/pack-objects.c:2479
6653 msgid "do not create an empty pack output"
6656 #: builtin/pack-objects.c:2481
6657 msgid "read revision arguments from standard input"
6658 msgstr "从标准输入读取修订号参数"
6660 #: builtin/pack-objects.c:2483
6661 msgid "limit the objects to those that are not yet packed"
6662 msgstr "限制那些尚未打包的对象"
6664 #: builtin/pack-objects.c:2486
6665 msgid "include objects reachable from any reference"
6666 msgstr "包括可以从任何引用访问到的对象"
6668 #: builtin/pack-objects.c:2489
6669 msgid "include objects referred by reflog entries"
6670 msgstr "包括被引用日志引用到的对象"
6672 #: builtin/pack-objects.c:2492
6673 msgid "output pack to stdout"
6676 #: builtin/pack-objects.c:2494
6677 msgid "include tag objects that refer to objects to be packed"
6678 msgstr "包括引用了打包对象的 tag"
6680 #: builtin/pack-objects.c:2496
6681 msgid "keep unreachable objects"
6684 #: builtin/pack-objects.c:2497 parse-options.h:141
6688 #: builtin/pack-objects.c:2498
6689 msgid "unpack unreachable objects newer than <time>"
6690 msgstr "将比给定 <时间> 新的无法访问的对象解包"
6692 #: builtin/pack-objects.c:2501
6693 msgid "create thin packs"
6696 #: builtin/pack-objects.c:2503
6697 msgid "ignore packs that have companion .keep file"
6698 msgstr "忽略配有 .keep 文件的包"
6700 #: builtin/pack-objects.c:2505
6701 msgid "pack compression level"
6704 #: builtin/pack-objects.c:2507
6705 msgid "do not hide commits by grafts"
6708 #: builtin/pack-refs.c:6
6709 msgid "git pack-refs [options]"
6710 msgstr "git pack-refs [选项]"
6712 #: builtin/pack-refs.c:14
6713 msgid "pack everything"
6716 #: builtin/pack-refs.c:15
6717 msgid "prune loose refs (default)"
6718 msgstr "清除松散的引用(默认)"
6720 #: builtin/prune-packed.c:7
6721 msgid "git prune-packed [-n|--dry-run] [-q|--quiet]"
6722 msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]"
6724 #: builtin/prune.c:12
6725 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
6726 msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
6728 #: builtin/prune.c:132
6729 msgid "do not remove, show only"
6732 #: builtin/prune.c:133
6733 msgid "report pruned objects"
6736 #: builtin/prune.c:136
6737 msgid "expire objects older than <time>"
6738 msgstr "使早于给定时间的对象过期"
6740 #: builtin/push.c:14
6741 msgid "git push [<options>] [<repository> [<refspec>...]]"
6742 msgstr "git push [<选项>] [<版本库> [<引用表达式>...]]"
6744 #: builtin/push.c:45
6745 msgid "tag shorthand without <tag>"
6746 msgstr "tag 简写没有跟 <tag> 参数"
6748 #: builtin/push.c:64
6749 msgid "--delete only accepts plain target ref names"
6750 msgstr "--delete 只接受简单的目标引用名"
6752 #: builtin/push.c:99
6755 "To choose either option permanently, see push.default in 'git help config'."
6758 "为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
6760 #: builtin/push.c:102
6763 "The upstream branch of your current branch does not match\n"
6764 "the name of your current branch. To push to the upstream branch\n"
6765 "on the remote, use\n"
6767 " git push %s HEAD:%s\n"
6769 "To push to the branch of the same name on the remote, use\n"
6774 "如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
6777 " git push %s HEAD:%s\n"
6784 #: builtin/push.c:121
6787 "You are not currently on a branch.\n"
6788 "To push the history leading to the current (detached HEAD)\n"
6791 " git push %s HEAD:<name-of-remote-branch>\n"
6794 "现在为推送当前(分离头指针)的历史,使用\n"
6796 " git push %s HEAD:<name-of-remote-branch>\n"
6798 #: builtin/push.c:128
6801 "The current branch %s has no upstream branch.\n"
6802 "To push the current branch and set the remote as upstream, use\n"
6804 " git push --set-upstream %s %s\n"
6806 "当前分支 %s 没有对应的上游分支。\n"
6807 "为推送当前分支并建立与远程上游的跟踪,使用\n"
6809 " git push --set-upstream %s %s\n"
6811 #: builtin/push.c:136
6813 msgid "The current branch %s has multiple upstream branches, refusing to push."
6814 msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
6816 #: builtin/push.c:139
6819 "You are pushing to remote '%s', which is not the upstream of\n"
6820 "your current branch '%s', without telling me what to push\n"
6821 "to update which remote branch."
6823 "您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
6824 "而没有告诉我要推送什么、更新哪个远程分支。"
6826 # 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
6827 #: builtin/push.c:151
6829 "push.default is unset; its implicit value is changing in\n"
6830 "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
6831 "and maintain the current behavior after the default changes, use:\n"
6833 " git config --global push.default matching\n"
6835 "To squelch this message and adopt the new behavior now, use:\n"
6837 " git config --global push.default simple\n"
6839 "See 'git help config' and search for 'push.default' for further "
6841 "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
6842 "'current' instead of 'simple' if you sometimes use older versions of Git)"
6844 "push.default 未设置,它的默认值将会在 Git 2.0 由 'matching'\n"
6845 "修改为 'simple'。若要不再显示本信息并在其默认值改变后维持当前使用习惯,\n"
6848 " git config --global push.default matching\n"
6850 "若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n"
6852 " git config --global push.default simple\n"
6854 "参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
6855 "('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n"
6856 "为保持兼容,请用 'current' 代替 'simple' 模式)"
6858 #: builtin/push.c:199
6860 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
6861 msgstr "您没有为推送指定任何引用表达式,并且 push.default 为 \"nothing\"。"
6863 #: builtin/push.c:206
6865 "Updates were rejected because the tip of your current branch is behind\n"
6866 "its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
6867 "before pushing again.\n"
6868 "See the 'Note about fast-forwards' in 'git push --help' for details."
6870 "更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
6871 "再次推送前,先与远程变更合并(如 'git pull')。详见\n"
6872 "'git push --help' 中的 'Note about fast-forwards' 小节。"
6874 #: builtin/push.c:212
6876 "Updates were rejected because a pushed branch tip is behind its remote\n"
6877 "counterpart. If you did not intend to push that branch, you may want to\n"
6878 "specify branches to push or set the 'push.default' configuration variable\n"
6879 "to 'simple', 'current' or 'upstream' to push only the current branch."
6881 "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
6882 "如果您并非有意推送该分支,您可以在推送时指定要推送的分支,或者将\n"
6883 "配置变量 'push.default' 设置为 'simple'、'current' 或 'upstream'\n"
6886 #: builtin/push.c:218
6888 "Updates were rejected because a pushed branch tip is behind its remote\n"
6889 "counterpart. Check out this branch and merge the remote changes\n"
6890 "(e.g. 'git pull') before pushing again.\n"
6891 "See the 'Note about fast-forwards' in 'git push --help' for details."
6893 "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
6894 "检出该分支并与远程变更合并(如 'git pull'),然后再推送。详见\n"
6895 "'git push --help' 中的 'Note about fast-forwards' 小节。"
6897 #: builtin/push.c:224
6899 "Updates were rejected because the destination reference already exists\n"
6901 msgstr "更新被拒绝因为目标引用在远程已经存在。"
6903 #: builtin/push.c:269
6905 msgid "Pushing to %s\n"
6908 #: builtin/push.c:273
6910 msgid "failed to push some refs to '%s'"
6911 msgstr "无法推送一些引用到 '%s'"
6913 #: builtin/push.c:302
6915 msgid "bad repository '%s'"
6918 #: builtin/push.c:303
6920 "No configured push destination.\n"
6921 "Either specify the URL from the command-line or configure a remote "
6922 "repository using\n"
6924 " git remote add <name> <url>\n"
6926 "and then push using the remote name\n"
6928 " git push <name>\n"
6931 "或通过命令行指定URL,或用下面命令配置一个远程版本库\n"
6933 " git remote add <name> <url>\n"
6937 " git push <name>\n"
6939 #: builtin/push.c:318
6940 msgid "--all and --tags are incompatible"
6941 msgstr "--all 和 --tags 不兼容"
6943 #: builtin/push.c:319
6944 msgid "--all can't be combined with refspecs"
6945 msgstr "--all 不能和引用表达式同时使用"
6947 #: builtin/push.c:324
6948 msgid "--mirror and --tags are incompatible"
6949 msgstr "--mirror 和 --tags 不兼容"
6951 #: builtin/push.c:325
6952 msgid "--mirror can't be combined with refspecs"
6953 msgstr "--mirror 不能和引用表达式同时使用"
6955 #: builtin/push.c:330
6956 msgid "--all and --mirror are incompatible"
6957 msgstr "--all 和 --mirror 不兼容"
6959 #: builtin/push.c:390
6963 #: builtin/push.c:391
6964 msgid "push all refs"
6967 #: builtin/push.c:392
6968 msgid "mirror all refs"
6971 #: builtin/push.c:394
6975 #: builtin/push.c:395
6976 msgid "push tags (can't be used with --all or --mirror)"
6977 msgstr "推送 tags(不能使用 --all or --mirror)"
6979 #: builtin/push.c:398
6980 msgid "force updates"
6983 #: builtin/push.c:399
6987 #: builtin/push.c:400
6988 msgid "control recursive pushing of submodules"
6991 #: builtin/push.c:402
6992 msgid "use thin pack"
6995 #: builtin/push.c:403 builtin/push.c:404
6996 msgid "receive pack program"
6999 #: builtin/push.c:405
7000 msgid "set upstream for git pull/status"
7001 msgstr "设置 git pull/status 的上游"
7003 #: builtin/push.c:408
7004 msgid "prune locally removed refs"
7007 #: builtin/push.c:418
7008 msgid "--delete is incompatible with --all, --mirror and --tags"
7009 msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
7011 #: builtin/push.c:420
7012 msgid "--delete doesn't make sense without any refs"
7013 msgstr "--delete 未接任何引用没有意义"
7015 #: builtin/read-tree.c:36
7017 "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
7018 "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
7019 "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
7021 "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>] [-"
7022 "u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
7023 "index-output=<文件>] (--empty | <树或提交1> [<树或提交2> [<树或提交3>]])"
7025 #: builtin/read-tree.c:108
7026 msgid "write resulting index to <file>"
7027 msgstr "将索引结果写入 <file>"
7029 #: builtin/read-tree.c:111
7030 msgid "only empty the index"
7033 #: builtin/read-tree.c:113
7037 #: builtin/read-tree.c:115
7038 msgid "perform a merge in addition to a read"
7039 msgstr "读取之余再执行一个合并"
7041 #: builtin/read-tree.c:117
7042 msgid "3-way merge if no file level merging required"
7043 msgstr "如果没有文件级合并需要,执行三路合并"
7045 #: builtin/read-tree.c:119
7046 msgid "3-way merge in presence of adds and removes"
7047 msgstr "存在添加和删除时,也执行三路合并"
7049 #: builtin/read-tree.c:121
7050 msgid "same as -m, but discard unmerged entries"
7051 msgstr "类似于 -m,但丢弃未合并的条目"
7053 #: builtin/read-tree.c:122
7054 msgid "<subdirectory>/"
7057 #: builtin/read-tree.c:123
7058 msgid "read the tree into the index under <subdirectory>/"
7059 msgstr "读取树对象到索引的 <子目录>/ 下"
7061 #: builtin/read-tree.c:126
7062 msgid "update working tree with merge result"
7063 msgstr "用合并的结果更新工作区"
7065 #: builtin/read-tree.c:128
7069 #: builtin/read-tree.c:129
7070 msgid "allow explicitly ignored files to be overwritten"
7071 msgstr "允许忽略文件中设定的文件可以被覆盖"
7073 #: builtin/read-tree.c:132
7074 msgid "don't check the working tree after merging"
7077 #: builtin/read-tree.c:133
7078 msgid "don't update the index or the work tree"
7081 #: builtin/read-tree.c:135
7082 msgid "skip applying sparse checkout filter"
7083 msgstr "跳过应用稀疏检出过滤器"
7085 #: builtin/read-tree.c:137
7086 msgid "debug unpack-trees"
7087 msgstr "调试 unpack-trees"
7089 #: builtin/remote.c:11
7090 msgid "git remote [-v | --verbose]"
7091 msgstr "git remote [-v | --verbose]"
7093 #: builtin/remote.c:12
7095 "git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--"
7096 "mirror=<fetch|push>] <name> <url>"
7098 "git remote add [-t <分支>] [-m <master>] [-f] [--tags|--no-tags] [--"
7099 "mirror=<fetch|push>] <名称> <url>"
7101 #: builtin/remote.c:13 builtin/remote.c:32
7102 msgid "git remote rename <old> <new>"
7103 msgstr "git remote rename <旧名称> <新名称>"
7105 #: builtin/remote.c:14 builtin/remote.c:37
7106 msgid "git remote remove <name>"
7107 msgstr "git remote remove <名称>"
7109 #: builtin/remote.c:15 builtin/remote.c:42
7110 msgid "git remote set-head <name> (-a | -d | <branch>)"
7111 msgstr "git remote set-head <名称> (-a | -d | <分支>)"
7113 #: builtin/remote.c:16
7114 msgid "git remote [-v | --verbose] show [-n] <name>"
7115 msgstr "git remote [-v | --verbose] show [-n] <名称>"
7117 #: builtin/remote.c:17
7118 msgid "git remote prune [-n | --dry-run] <name>"
7119 msgstr "git remote prune [-n | --dry-run] <名称>"
7121 #: builtin/remote.c:18
7123 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
7124 msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
7126 #: builtin/remote.c:19
7127 msgid "git remote set-branches [--add] <name> <branch>..."
7128 msgstr "git remote set-branches [--add] <名称> <分支>..."
7130 #: builtin/remote.c:20 builtin/remote.c:68
7131 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
7132 msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
7134 #: builtin/remote.c:21 builtin/remote.c:69
7135 msgid "git remote set-url --add <name> <newurl>"
7136 msgstr "git remote set-url --add <名称> <新的地址>"
7138 #: builtin/remote.c:22 builtin/remote.c:70
7139 msgid "git remote set-url --delete <name> <url>"
7140 msgstr "git remote set-url --delete <名称> <地址>"
7142 #: builtin/remote.c:27
7143 msgid "git remote add [<options>] <name> <url>"
7144 msgstr "git remote add [<选项>] <名称> <地址>"
7146 #: builtin/remote.c:47
7147 msgid "git remote set-branches <name> <branch>..."
7148 msgstr "git remote set-branches <名称> <分支>..."
7150 #: builtin/remote.c:48
7151 msgid "git remote set-branches --add <name> <branch>..."
7152 msgstr "git remote set-branches --add <名称> <分支>..."
7154 #: builtin/remote.c:53
7155 msgid "git remote show [<options>] <name>"
7156 msgstr "git remote show [<选项>] <名称>"
7158 #: builtin/remote.c:58
7159 msgid "git remote prune [<options>] <name>"
7160 msgstr "git remote prune [<选项>] <名称>"
7162 #: builtin/remote.c:63
7163 msgid "git remote update [<options>] [<group> | <remote>]..."
7164 msgstr "git remote update [<选项>] [<组> | <远程>]..."
7166 #: builtin/remote.c:98
7171 #: builtin/remote.c:130
7173 "--mirror is dangerous and deprecated; please\n"
7174 "\t use --mirror=fetch or --mirror=push instead"
7176 "--mirror 选项危险且过时,请使用 --mirror=fetch\n"
7177 "\t 或 --mirror=push"
7179 #: builtin/remote.c:147
7181 msgid "unknown mirror argument: %s"
7184 #: builtin/remote.c:163
7185 msgid "fetch the remote branches"
7188 #: builtin/remote.c:165
7189 msgid "import all tags and associated objects when fetching"
7190 msgstr "抓取时导入所有的 tags 和关联对象"
7192 #: builtin/remote.c:168
7193 msgid "or do not fetch any tag at all (--no-tags)"
7194 msgstr "或不抓取任何 tag(--no-tags)"
7196 #: builtin/remote.c:170
7197 msgid "branch(es) to track"
7200 #: builtin/remote.c:171
7201 msgid "master branch"
7204 #: builtin/remote.c:172
7208 #: builtin/remote.c:173
7209 msgid "set up remote as a mirror to push to or fetch from"
7210 msgstr "把远程设置为用以推送或抓取的镜像"
7212 #: builtin/remote.c:185
7213 msgid "specifying a master branch makes no sense with --mirror"
7214 msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
7216 #: builtin/remote.c:187
7217 msgid "specifying branches to track makes sense only with fetch mirrors"
7218 msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
7220 #: builtin/remote.c:195 builtin/remote.c:646
7222 msgid "remote %s already exists."
7223 msgstr "远程 %s 已经存在。"
7225 #: builtin/remote.c:199 builtin/remote.c:650
7227 msgid "'%s' is not a valid remote name"
7228 msgstr "'%s' 不是一个有效的远程名称"
7230 #: builtin/remote.c:243
7232 msgid "Could not setup master '%s'"
7233 msgstr "无法设置 master '%s'"
7235 #: builtin/remote.c:299
7237 msgid "more than one %s"
7240 #: builtin/remote.c:339
7242 msgid "Could not get fetch map for refspec %s"
7243 msgstr "无法得到引用表达式 %s 的获取列表"
7245 #: builtin/remote.c:440 builtin/remote.c:448
7249 #: builtin/remote.c:452
7253 #: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607
7255 msgid "Could not append '%s' to '%s'"
7256 msgstr "不能添加 '%s' 至 '%s'"
7258 #: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890
7260 msgid "No such remote: %s"
7263 #: builtin/remote.c:656
7265 msgid "Could not rename config section '%s' to '%s'"
7266 msgstr "不能重命名配置小节 '%s' 到 '%s'"
7268 #: builtin/remote.c:662 builtin/remote.c:799
7270 msgid "Could not remove config section '%s'"
7271 msgstr "不能移除配置小节 '%s'"
7273 #: builtin/remote.c:677
7276 "Not updating non-default fetch refspec\n"
7278 "\tPlease update the configuration manually if necessary."
7284 #: builtin/remote.c:683
7286 msgid "Could not append '%s'"
7289 #: builtin/remote.c:694
7291 msgid "Could not set '%s'"
7294 #: builtin/remote.c:716
7296 msgid "deleting '%s' failed"
7299 #: builtin/remote.c:750
7301 msgid "creating '%s' failed"
7304 #: builtin/remote.c:764
7306 msgid "Could not remove branch %s"
7309 #: builtin/remote.c:834
7311 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
7312 "to delete it, use:"
7314 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
7315 "to delete them, use:"
7316 msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
7317 msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
7319 #: builtin/remote.c:943
7321 msgid " new (next fetch will store in remotes/%s)"
7322 msgstr " 新的(下一次获取将存储于 remotes/%s)"
7324 #: builtin/remote.c:946
7328 #: builtin/remote.c:948
7329 msgid " stale (use 'git remote prune' to remove)"
7330 msgstr " 过时(使用 'git remote prune' 来移除)"
7332 #: builtin/remote.c:950
7336 #: builtin/remote.c:991
7338 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
7339 msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
7341 #: builtin/remote.c:998
7343 msgid "rebases onto remote %s"
7346 #: builtin/remote.c:1001
7348 msgid " merges with remote %s"
7351 #: builtin/remote.c:1002
7352 msgid " and with remote"
7355 #: builtin/remote.c:1004
7357 msgid "merges with remote %s"
7360 #: builtin/remote.c:1005
7361 msgid " and with remote"
7364 #: builtin/remote.c:1051
7368 #: builtin/remote.c:1054
7372 #: builtin/remote.c:1058
7376 #: builtin/remote.c:1061
7377 msgid "fast-forwardable"
7380 #: builtin/remote.c:1064
7381 msgid "local out of date"
7384 #: builtin/remote.c:1071
7386 msgid " %-*s forces to %-*s (%s)"
7387 msgstr " %-*s 强制推送至 %-*s (%s)"
7389 #: builtin/remote.c:1074
7391 msgid " %-*s pushes to %-*s (%s)"
7392 msgstr " %-*s 推送至 %-*s (%s)"
7394 #: builtin/remote.c:1078
7396 msgid " %-*s forces to %s"
7397 msgstr " %-*s 强制推送至 %s"
7399 #: builtin/remote.c:1081
7401 msgid " %-*s pushes to %s"
7402 msgstr " %-*s 推送至 %s"
7404 #: builtin/remote.c:1091
7405 msgid "do not query remotes"
7408 #: builtin/remote.c:1118
7413 #: builtin/remote.c:1119
7415 msgid " Fetch URL: %s"
7418 #: builtin/remote.c:1120 builtin/remote.c:1285
7422 #: builtin/remote.c:1129 builtin/remote.c:1131
7424 msgid " Push URL: %s"
7427 #: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137
7429 msgid " HEAD branch: %s"
7432 #: builtin/remote.c:1139
7435 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
7436 msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
7438 #: builtin/remote.c:1151
7440 msgid " Remote branch:%s"
7441 msgid_plural " Remote branches:%s"
7442 msgstr[0] " 远程分支:%s"
7443 msgstr[1] " 远程分支:%s"
7445 # 译者:中文字符串拼接,可删除前导空格
7446 #: builtin/remote.c:1154 builtin/remote.c:1181
7447 msgid " (status not queried)"
7450 #: builtin/remote.c:1163
7451 msgid " Local branch configured for 'git pull':"
7452 msgid_plural " Local branches configured for 'git pull':"
7453 msgstr[0] " 为 'git pull' 配置的本地分支:"
7454 msgstr[1] " 为 'git pull' 配置的本地分支:"
7456 #: builtin/remote.c:1171
7457 msgid " Local refs will be mirrored by 'git push'"
7458 msgstr " 本地引用将在 'git push' 时被镜像"
7460 #: builtin/remote.c:1178
7462 msgid " Local ref configured for 'git push'%s:"
7463 msgid_plural " Local refs configured for 'git push'%s:"
7464 msgstr[0] " 为 'git push' 配置的本地引用%s:"
7465 msgstr[1] " 为 'git push' 配置的本地引用%s:"
7467 #: builtin/remote.c:1199
7468 msgid "set refs/remotes/<name>/HEAD according to remote"
7469 msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
7471 #: builtin/remote.c:1201
7472 msgid "delete refs/remotes/<name>/HEAD"
7473 msgstr "删除 refs/remotes/<名称>/HEAD"
7475 #: builtin/remote.c:1216
7476 msgid "Cannot determine remote HEAD"
7477 msgstr "无法确定远程 HEAD"
7479 #: builtin/remote.c:1218
7480 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
7481 msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
7483 #: builtin/remote.c:1228
7485 msgid "Could not delete %s"
7488 #: builtin/remote.c:1236
7490 msgid "Not a valid ref: %s"
7491 msgstr "不是一个有效引用:%s"
7493 #: builtin/remote.c:1238
7495 msgid "Could not setup %s"
7499 #: builtin/remote.c:1274
7501 msgid " %s will become dangling!"
7502 msgstr " %s 将成为摇摆状态!"
7505 #: builtin/remote.c:1275
7507 msgid " %s has become dangling!"
7508 msgstr " %s 已成为摇摆状态!"
7510 #: builtin/remote.c:1281
7515 #: builtin/remote.c:1282
7520 #: builtin/remote.c:1295
7522 msgid " * [would prune] %s"
7523 msgstr " * [将删除] %s"
7525 #: builtin/remote.c:1298
7527 msgid " * [pruned] %s"
7528 msgstr " * [已删除] %s"
7530 #: builtin/remote.c:1321
7531 msgid "prune remotes after fetching"
7534 #: builtin/remote.c:1387 builtin/remote.c:1461
7536 msgid "No such remote '%s'"
7539 #: builtin/remote.c:1407
7543 #: builtin/remote.c:1414
7544 msgid "no remote specified"
7547 #: builtin/remote.c:1436
7548 msgid "manipulate push URLs"
7551 #: builtin/remote.c:1438
7555 #: builtin/remote.c:1440
7559 #: builtin/remote.c:1447
7560 msgid "--add --delete doesn't make sense"
7561 msgstr "--add --delete 无意义"
7563 #: builtin/remote.c:1487
7565 msgid "Invalid old URL pattern: %s"
7566 msgstr "无效的旧URL匹配模版:%s"
7568 #: builtin/remote.c:1495
7570 msgid "No such URL found: %s"
7573 #: builtin/remote.c:1497
7574 msgid "Will not delete all non-push URLs"
7575 msgstr "将不会删除所有非推送URL地址"
7577 #: builtin/remote.c:1569
7578 msgid "be verbose; must be placed before a subcommand"
7579 msgstr "冗长输出;必须置于子命令之前"
7581 #: builtin/replace.c:17
7582 msgid "git replace [-f] <object> <replacement>"
7583 msgstr "git replace [-f] <对象> <替换物>"
7585 #: builtin/replace.c:18
7586 msgid "git replace -d <object>..."
7587 msgstr "git replace -d <对象>..."
7589 #: builtin/replace.c:19
7590 msgid "git replace -l [<pattern>]"
7591 msgstr "git replace -l [<模式>]"
7593 #: builtin/replace.c:121
7594 msgid "list replace refs"
7597 #: builtin/replace.c:122
7598 msgid "delete replace refs"
7601 #: builtin/replace.c:123
7602 msgid "replace the ref if it exists"
7605 #: builtin/rerere.c:11
7606 msgid "git rerere [clear | forget path... | status | remaining | diff | gc]"
7607 msgstr "git rerere [clear | forget path... | status | remaining | diff | gc]"
7609 #: builtin/rerere.c:56
7610 msgid "register clean resolutions in index"
7611 msgstr "在索引中注册干净的解决方案"
7613 #: builtin/reset.c:25
7615 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
7616 msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
7618 #: builtin/reset.c:26
7619 msgid "git reset [-q] <tree-ish> [--] <paths>..."
7620 msgstr "git reset [-q] <树或提交> [--] <路径>..."
7622 #: builtin/reset.c:27
7623 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
7624 msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
7626 #: builtin/reset.c:33
7630 #: builtin/reset.c:33
7634 #: builtin/reset.c:33
7638 #: builtin/reset.c:33
7642 #: builtin/reset.c:33
7646 #: builtin/reset.c:73
7647 msgid "You do not have a valid HEAD."
7648 msgstr "您没有一个有效的 HEAD。"
7650 #: builtin/reset.c:75
7651 msgid "Failed to find tree of HEAD."
7652 msgstr "无法找到 HEAD 指向的树。"
7654 #: builtin/reset.c:81
7656 msgid "Failed to find tree of %s."
7657 msgstr "无法找到 %s 指向的树。"
7659 #: builtin/reset.c:98
7661 msgid "HEAD is now at %s"
7662 msgstr "HEAD 现在位于 %s"
7664 # 译者:汉字之间无空格,故删除%s前后空格
7665 #: builtin/reset.c:169
7667 msgid "Cannot do a %s reset in the middle of a merge."
7668 msgstr "在合并过程中不能做%s重置操作。"
7670 #: builtin/reset.c:248
7671 msgid "be quiet, only report errors"
7674 #: builtin/reset.c:250
7675 msgid "reset HEAD and index"
7676 msgstr "重置 HEAD 和索引"
7678 #: builtin/reset.c:251
7679 msgid "reset only HEAD"
7682 #: builtin/reset.c:253 builtin/reset.c:255
7683 msgid "reset HEAD, index and working tree"
7684 msgstr "重置 HEAD、索引和工作区"
7686 #: builtin/reset.c:257
7687 msgid "reset HEAD but keep local changes"
7688 msgstr "重置 HEAD 但保存本地变更"
7690 #: builtin/reset.c:275
7692 msgid "Failed to resolve '%s' as a valid revision."
7693 msgstr "无法将 '%s' 解析为一个有效的版本。"
7695 #: builtin/reset.c:278 builtin/reset.c:286
7697 msgid "Could not parse object '%s'."
7698 msgstr "不能解析对象 '%s'。"
7700 #: builtin/reset.c:283
7702 msgid "Failed to resolve '%s' as a valid tree."
7703 msgstr "无法将 '%s' 解析为一个有效的树对象。"
7705 #: builtin/reset.c:292
7706 msgid "--patch is incompatible with --{hard,mixed,soft}"
7707 msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
7709 #: builtin/reset.c:301
7710 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
7711 msgstr "--mixed 带路径已弃用,而是用 'git reset -- <paths>'。"
7713 # 译者:汉字之间无空格,故删除%s前后空格
7714 #: builtin/reset.c:303
7716 msgid "Cannot do %s reset with paths."
7717 msgstr "不能带路径进行%s重置。"
7719 # 译者:汉字之间无空格,故删除%s前后空格
7720 #: builtin/reset.c:313
7722 msgid "%s reset is not allowed in a bare repository"
7723 msgstr "不能对裸版本库进行%s重置"
7725 #: builtin/reset.c:333
7727 msgid "Could not reset index file to revision '%s'."
7728 msgstr "不能重置索引文件至版本 '%s'。"
7730 #: builtin/reset.c:339
7731 msgid "Unstaged changes after reset:"
7732 msgstr "重置后撤出暂存区的变更:"
7734 #: builtin/reset.c:344
7735 msgid "Could not write new index file."
7736 msgstr "不能写入新的索引文件。"
7738 #: builtin/rev-parse.c:339
7739 msgid "git rev-parse --parseopt [options] -- [<args>...]"
7740 msgstr "git rev-parse --parseopt [选项] -- [<参数>...]"
7742 #: builtin/rev-parse.c:344
7743 msgid "keep the `--` passed as an arg"
7744 msgstr "保持 `--` 作为一个参数传递"
7746 #: builtin/rev-parse.c:346
7747 msgid "stop parsing after the first non-option argument"
7748 msgstr "遇到第一个非选项参数后停止解析"
7750 #: builtin/rev-parse.c:464
7752 "git rev-parse --parseopt [options] -- [<args>...]\n"
7753 " or: git rev-parse --sq-quote [<arg>...]\n"
7754 " or: git rev-parse [options] [<arg>...]\n"
7756 "Run \"git rev-parse --parseopt -h\" for more information on the first usage."
7758 "git rev-parse --parseopt [选项] -- [<参数>...]\n"
7759 " 或者:git rev-parse --sq-quote [<选项>...]\n"
7760 " 或者:git rev-parse [options] [<选项>...]\n"
7762 "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
7764 #: builtin/revert.c:22
7765 msgid "git revert [options] <commit-ish>"
7766 msgstr "git revert [选项] <提交号>"
7768 #: builtin/revert.c:23
7769 msgid "git revert <subcommand>"
7770 msgstr "git revert <子命令>"
7772 #: builtin/revert.c:28
7773 msgid "git cherry-pick [options] <commit-ish>"
7774 msgstr "git cherry-pick [选项] <提交号>"
7776 #: builtin/revert.c:29
7777 msgid "git cherry-pick <subcommand>"
7778 msgstr "git cherry-pick <子命令>"
7780 #: builtin/revert.c:70 builtin/revert.c:92
7782 msgid "%s: %s cannot be used with %s"
7783 msgstr "%s:%s 不能和 %s 同时使用"
7785 #: builtin/revert.c:103
7786 msgid "end revert or cherry-pick sequence"
7789 #: builtin/revert.c:104
7790 msgid "resume revert or cherry-pick sequence"
7793 #: builtin/revert.c:105
7794 msgid "cancel revert or cherry-pick sequence"
7797 #: builtin/revert.c:106
7798 msgid "don't automatically commit"
7801 #: builtin/revert.c:107
7802 msgid "edit the commit message"
7805 #: builtin/revert.c:110
7806 msgid "parent number"
7809 #: builtin/revert.c:112
7810 msgid "merge strategy"
7813 #: builtin/revert.c:113
7817 #: builtin/revert.c:114
7818 msgid "option for merge strategy"
7821 #: builtin/revert.c:125
7822 msgid "append commit name"
7825 #: builtin/revert.c:126
7826 msgid "allow fast-forward"
7829 #: builtin/revert.c:127
7830 msgid "preserve initially empty commits"
7833 #: builtin/revert.c:128
7834 msgid "allow commits with empty messages"
7837 #: builtin/revert.c:129
7838 msgid "keep redundant, empty commits"
7841 #: builtin/revert.c:133
7842 msgid "program error"
7845 #: builtin/revert.c:223
7846 msgid "revert failed"
7849 #: builtin/revert.c:238
7850 msgid "cherry-pick failed"
7854 msgid "git rm [options] [--] <file>..."
7855 msgstr "git rm [选项] [--] <文件>..."
7857 #: builtin/rm.c:64 builtin/rm.c:186
7860 "submodule '%s' (or one of its nested submodules) uses a .git directory\n"
7861 "(use 'rm -rf' if you really want to remove it including all of its history)"
7863 "子模组 '%s'(或者它的一个嵌套子模组)使用一个 .git 目录\n"
7864 "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
7869 "'%s' has staged content different from both the file and the HEAD\n"
7870 "(use -f to force removal)"
7872 "'%s' 暂存的内容和工作区及 HEAD 中的都不一样\n"
7878 "'%s' has changes staged in the index\n"
7879 "(use --cached to keep the file, or -f to force removal)"
7882 "(使用 --cached 保存文件,或用 -f 强制删除)"
7887 "'%s' has local modifications\n"
7888 "(use --cached to keep the file, or -f to force removal)"
7891 "(使用 --cached 保存文件,或用 -f 强制删除)"
7894 msgid "do not list removed files"
7898 msgid "only remove from the index"
7902 msgid "override the up-to-date check"
7906 msgid "allow recursive removal"
7910 msgid "exit with a zero status even if nothing matched"
7911 msgstr "即使没有匹配,也以零状态退出"
7915 msgid "not removing '%s' recursively without -r"
7916 msgstr "未提供 -r 选项不会递归删除 '%s'"
7920 msgid "git rm: unable to remove %s"
7921 msgstr "git rm:不能删除 %s"
7923 #: builtin/shortlog.c:13
7924 msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]"
7925 msgstr "git shortlog [-n] [-s] [-e] [-w] [版本选项] [--] [<提交号>... ]"
7927 #: builtin/shortlog.c:133
7929 msgid "Missing author: %s"
7932 #: builtin/shortlog.c:229
7933 msgid "sort output according to the number of commits per author"
7934 msgstr "根据每个作者的提交数量排序"
7936 #: builtin/shortlog.c:231
7937 msgid "Suppress commit descriptions, only provides commit count"
7938 msgstr "隐藏提交说明,只提供提交数量"
7940 #: builtin/shortlog.c:233
7941 msgid "Show the email address of each author"
7942 msgstr "显示每个作者的电子邮件地址"
7944 #: builtin/shortlog.c:234
7946 msgstr "w[,i1[,i2]]"
7948 #: builtin/shortlog.c:235
7949 msgid "Linewrap output"
7952 #: builtin/show-branch.c:9
7954 "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
7955 "current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
7956 "independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
7959 "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
7960 "current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
7961 "independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
7964 #: builtin/show-branch.c:10
7965 msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
7966 msgstr "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
7968 #: builtin/show-branch.c:651
7969 msgid "show remote-tracking and local branches"
7970 msgstr "显示远程跟踪的和本地的分支"
7972 #: builtin/show-branch.c:653
7973 msgid "show remote-tracking branches"
7976 #: builtin/show-branch.c:655
7977 msgid "color '*!+-' corresponding to the branch"
7978 msgstr "着色 '*!+-' 到相应的分支"
7980 #: builtin/show-branch.c:657
7981 msgid "show <n> more commits after the common ancestor"
7982 msgstr "显示共同祖先后的 <n> 个提交"
7984 #: builtin/show-branch.c:659
7985 msgid "synonym to more=-1"
7986 msgstr "和 more=-1 同义"
7988 #: builtin/show-branch.c:660
7989 msgid "suppress naming strings"
7992 #: builtin/show-branch.c:662
7993 msgid "include the current branch"
7996 #: builtin/show-branch.c:664
7997 msgid "name commits with their object names"
8000 #: builtin/show-branch.c:666
8001 msgid "show possible merge bases"
8004 #: builtin/show-branch.c:668
8005 msgid "show refs unreachable from any other ref"
8006 msgstr "显示没有任何引用的的引用"
8008 #: builtin/show-branch.c:670
8009 msgid "show commits in topological order"
8012 #: builtin/show-branch.c:672
8013 msgid "show only commits not on the first branch"
8014 msgstr "只显示不在第一个分支上的提交"
8016 #: builtin/show-branch.c:674
8017 msgid "show merges reachable from only one tip"
8018 msgstr "显示仅一个分支可访问的合并提交"
8020 #: builtin/show-branch.c:676
8021 msgid "show commits where no parent comes before its children"
8022 msgstr "显示提交时以时间为序且父提交不能领先子提交"
8024 #: builtin/show-branch.c:678
8025 msgid "<n>[,<base>]"
8026 msgstr "<n>[,<base>]"
8028 #: builtin/show-branch.c:679
8029 msgid "show <n> most recent ref-log entries starting at base"
8030 msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
8032 #: builtin/show-ref.c:10
8034 "git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--hash"
8035 "[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
8037 "git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--hash"
8038 "[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
8040 #: builtin/show-ref.c:11
8041 msgid "git show-ref --exclude-existing[=pattern] < ref-list"
8042 msgstr "git show-ref --exclude-existing[=模式] < 引用列表"
8044 #: builtin/show-ref.c:165
8045 msgid "only show tags (can be combined with heads)"
8046 msgstr "只显示 tags(可以和头共用)"
8048 #: builtin/show-ref.c:166
8049 msgid "only show heads (can be combined with tags)"
8050 msgstr "只显示头(可以和 tags 共用)"
8052 #: builtin/show-ref.c:167
8053 msgid "stricter reference checking, requires exact ref path"
8054 msgstr "更严格的引用检测,需要精确的引用路径"
8056 #: builtin/show-ref.c:170 builtin/show-ref.c:172
8057 msgid "show the HEAD reference"
8060 #: builtin/show-ref.c:174
8061 msgid "dereference tags into object IDs"
8062 msgstr "转换 tags 到对象ID"
8064 #: builtin/show-ref.c:176
8065 msgid "only show SHA1 hash using <n> digits"
8066 msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
8068 #: builtin/show-ref.c:180
8069 msgid "do not print results to stdout (useful with --verify)"
8070 msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
8072 #: builtin/show-ref.c:182
8073 msgid "show refs from stdin that aren't in local repository"
8074 msgstr "显示从标准输入中读入的不在本地版本库中的引用"
8076 #: builtin/symbolic-ref.c:7
8077 msgid "git symbolic-ref [options] name [ref]"
8078 msgstr "git symbolic-ref [选项] 名称 [引用]"
8080 #: builtin/symbolic-ref.c:8
8081 msgid "git symbolic-ref -d [-q] name"
8082 msgstr "git symbolic-ref -d [-q] 名称"
8084 #: builtin/symbolic-ref.c:40
8085 msgid "suppress error message for non-symbolic (detached) refs"
8086 msgstr "不显示非符号(分离的)引用的错误信息"
8088 #: builtin/symbolic-ref.c:41
8089 msgid "delete symbolic ref"
8092 #: builtin/symbolic-ref.c:42
8093 msgid "shorten ref output"
8096 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
8100 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
8101 msgid "reason of the update"
8106 "git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]"
8108 "git tag [-a|-s|-u <key-id>] [-f] [-m <说明>|-F <文件>] <标签名> [<头>]"
8111 msgid "git tag -d <tagname>..."
8112 msgstr "git tag -d <标签名>..."
8116 "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n"
8117 "\t\t[<pattern>...]"
8119 "git tag -l [-n[<num>]] [--contains <提交>] [--points-at <对象>] \n"
8123 msgid "git tag -v <tagname>..."
8124 msgstr "git tag -v <标签名>..."
8128 msgid "malformed object at '%s'"
8129 msgstr "非法的对象于 '%s'"
8131 #: builtin/tag.c:207
8133 msgid "tag name too long: %.*s..."
8134 msgstr "tag 名字太长:%.*s..."
8136 #: builtin/tag.c:212
8138 msgid "tag '%s' not found."
8139 msgstr "tag '%s' 未发现。"
8141 #: builtin/tag.c:227
8143 msgid "Deleted tag '%s' (was %s)\n"
8144 msgstr "已删除 tag '%s'(曾为 %s)\n"
8146 #: builtin/tag.c:239
8148 msgid "could not verify the tag '%s'"
8149 msgstr "不能校验 tag '%s'"
8151 #: builtin/tag.c:249
8155 "# Write a tag message\n"
8156 "# Lines starting with '#' will be ignored.\n"
8162 "# 以 '#' 开头的行将被忽略。\n"
8165 #: builtin/tag.c:256
8169 "# Write a tag message\n"
8170 "# Lines starting with '#' will be kept; you may remove them yourself if you "
8177 "# 以 '#' 开头的行将被忽略,您可以删除它们如果您想这样做。\n"
8180 #: builtin/tag.c:298
8181 msgid "unable to sign the tag"
8184 #: builtin/tag.c:300
8185 msgid "unable to write tag file"
8188 #: builtin/tag.c:325
8189 msgid "bad object type."
8192 #: builtin/tag.c:338
8193 msgid "tag header too big."
8196 #: builtin/tag.c:370
8197 msgid "no tag message?"
8200 #: builtin/tag.c:376
8202 msgid "The tag message has been left in %s\n"
8203 msgstr "tag 说明被保留在 %s\n"
8205 #: builtin/tag.c:425
8206 msgid "switch 'points-at' requires an object"
8207 msgstr "开关 'points-at' 需要一个对象"
8209 #: builtin/tag.c:427
8211 msgid "malformed object name '%s'"
8212 msgstr "非法的对象名 '%s'"
8214 #: builtin/tag.c:447
8215 msgid "list tag names"
8218 #: builtin/tag.c:449
8219 msgid "print <n> lines of each tag message"
8220 msgstr "每个 tag 信息打印 <n> 行"
8222 #: builtin/tag.c:451
8226 #: builtin/tag.c:452
8230 #: builtin/tag.c:454
8231 msgid "Tag creation options"
8234 #: builtin/tag.c:456
8235 msgid "annotated tag, needs a message"
8236 msgstr "注解 tag,需要一个说明"
8238 #: builtin/tag.c:458
8242 #: builtin/tag.c:460
8243 msgid "annotated and GPG-signed tag"
8244 msgstr "注解并 GPG 签名的 tag"
8246 #: builtin/tag.c:464
8247 msgid "use another key to sign the tag"
8248 msgstr "使用另外的私钥签名 tag"
8250 #: builtin/tag.c:465
8251 msgid "replace the tag if exists"
8252 msgstr "如果存在,替换现有的 tag"
8254 #: builtin/tag.c:466
8255 msgid "show tag list in columns"
8256 msgstr "以列的方式显示 tag"
8258 #: builtin/tag.c:468
8259 msgid "Tag listing options"
8262 #: builtin/tag.c:471
8263 msgid "print only tags that contain the commit"
8264 msgstr "只打印包含提交的tags"
8266 #: builtin/tag.c:477
8267 msgid "print only tags of the object"
8270 #: builtin/tag.c:506
8271 msgid "--column and -n are incompatible"
8272 msgstr "--column 和 -n 不兼容"
8274 #: builtin/tag.c:523
8275 msgid "-n option is only allowed with -l."
8276 msgstr "-n 选项只允许和 -l 同时使用。"
8278 #: builtin/tag.c:525
8279 msgid "--contains option is only allowed with -l."
8280 msgstr "--contains 选项只允许和 -l 同时使用。"
8282 #: builtin/tag.c:527
8283 msgid "--points-at option is only allowed with -l."
8284 msgstr "--points-at 选项只允许和 -l 同时使用。"
8286 #: builtin/tag.c:535
8287 msgid "only one -F or -m option is allowed."
8288 msgstr "只允许一个 -F 或 -m 选项。"
8290 #: builtin/tag.c:555
8291 msgid "too many params"
8294 #: builtin/tag.c:561
8296 msgid "'%s' is not a valid tag name."
8297 msgstr "'%s' 不是一个有效的tag名称。"
8299 #: builtin/tag.c:566
8301 msgid "tag '%s' already exists"
8302 msgstr "tag '%s' 已存在"
8304 #: builtin/tag.c:584
8306 msgid "%s: cannot lock the ref"
8309 #: builtin/tag.c:586
8311 msgid "%s: cannot update the ref"
8314 #: builtin/tag.c:588
8316 msgid "Updated tag '%s' (was %s)\n"
8317 msgstr "已更新tag '%s'(曾为 %s)\n"
8319 #: builtin/update-index.c:401
8320 msgid "git update-index [options] [--] [<file>...]"
8321 msgstr "git update-index [选项] [--] [<文件>...]"
8323 #: builtin/update-index.c:718
8324 msgid "continue refresh even when index needs update"
8325 msgstr "当索引需要更新时继续刷新"
8327 #: builtin/update-index.c:721
8328 msgid "refresh: ignore submodules"
8331 #: builtin/update-index.c:724
8332 msgid "do not ignore new files"
8335 #: builtin/update-index.c:726
8336 msgid "let files replace directories and vice-versa"
8337 msgstr "让文件替换目录(反之亦然)"
8339 #: builtin/update-index.c:728
8340 msgid "notice files missing from worktree"
8343 #: builtin/update-index.c:730
8344 msgid "refresh even if index contains unmerged entries"
8345 msgstr "即使索引区包含未合并的条目也执行刷新"
8347 #: builtin/update-index.c:733
8348 msgid "refresh stat information"
8351 #: builtin/update-index.c:737
8352 msgid "like --refresh, but ignore assume-unchanged setting"
8353 msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
8355 #: builtin/update-index.c:741
8356 msgid "<mode> <object> <path>"
8357 msgstr "<mode> <object> <path>"
8359 #: builtin/update-index.c:742
8360 msgid "add the specified entry to the index"
8361 msgstr "添加指定的条目到索引区"
8363 #: builtin/update-index.c:746
8367 #: builtin/update-index.c:747
8368 msgid "override the executable bit of the listed files"
8369 msgstr "覆盖列表里文件的可执行位"
8371 #: builtin/update-index.c:751
8372 msgid "mark files as \"not changing\""
8373 msgstr "把文件标记为 \"没有变更\""
8375 #: builtin/update-index.c:754
8376 msgid "clear assumed-unchanged bit"
8377 msgstr "清除 assumed-unchanged 位"
8379 #: builtin/update-index.c:757
8380 msgid "mark files as \"index-only\""
8381 msgstr "把文件标记为 \"仅索引\""
8383 #: builtin/update-index.c:760
8384 msgid "clear skip-worktree bit"
8385 msgstr "清除 skip-worktree 位"
8387 #: builtin/update-index.c:763
8388 msgid "add to index only; do not add content to object database"
8389 msgstr "只添加到索引区;不添加对象到对象库"
8391 #: builtin/update-index.c:765
8392 msgid "remove named paths even if present in worktree"
8393 msgstr "即使存在工作区里,也删除路径"
8395 #: builtin/update-index.c:767
8396 msgid "with --stdin: input lines are terminated by null bytes"
8397 msgstr "携带 --stdin:输入的行以 null 字符终止"
8399 #: builtin/update-index.c:769
8400 msgid "read list of paths to be updated from standard input"
8401 msgstr "从标准输入中读取需要更新的路径列表"
8403 #: builtin/update-index.c:773
8404 msgid "add entries from standard input to the index"
8405 msgstr "从标准输入添加条目到索引区"
8407 #: builtin/update-index.c:777
8408 msgid "repopulate stages #2 and #3 for the listed paths"
8409 msgstr "为指定文件重新生成第2和第3暂存区"
8411 #: builtin/update-index.c:781
8412 msgid "only update entries that differ from HEAD"
8413 msgstr "只更新与 HEAD 不同的条目"
8415 #: builtin/update-index.c:785
8416 msgid "ignore files missing from worktree"
8419 #: builtin/update-index.c:788
8420 msgid "report actions to standard output"
8423 #: builtin/update-index.c:790
8424 msgid "(for porcelains) forget saved unresolved conflicts"
8425 msgstr "(for porcelains) 忘记保存的未解决的冲突"
8427 #: builtin/update-index.c:794
8428 msgid "write index in this format"
8431 #: builtin/update-ref.c:7
8432 msgid "git update-ref [options] -d <refname> [<oldval>]"
8433 msgstr "git update-ref [options] -d <引用名> [<旧值>]"
8435 #: builtin/update-ref.c:8
8436 msgid "git update-ref [options] <refname> <newval> [<oldval>]"
8437 msgstr "git update-ref [options] <引用名> <新值> [<旧值>]"
8439 #: builtin/update-ref.c:19
8440 msgid "delete the reference"
8443 #: builtin/update-ref.c:21
8444 msgid "update <refname> not the one it points to"
8445 msgstr "更新 <引用名> 本身而不是它指向的引用"
8447 #: builtin/update-server-info.c:6
8448 msgid "git update-server-info [--force]"
8449 msgstr "git update-server-info [--force]"
8451 #: builtin/update-server-info.c:14
8452 msgid "update the info files from scratch"
8455 #: builtin/verify-pack.c:56
8456 msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
8457 msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
8459 #: builtin/verify-pack.c:66
8463 #: builtin/verify-pack.c:68
8464 msgid "show statistics only"
8467 #: builtin/verify-tag.c:17
8468 msgid "git verify-tag [-v|--verbose] <tag>..."
8469 msgstr "git verify-tag [-v|--verbose] <tag>..."
8471 #: builtin/verify-tag.c:73
8472 msgid "print tag contents"
8475 #: builtin/write-tree.c:13
8476 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
8477 msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
8479 #: builtin/write-tree.c:26
8483 #: builtin/write-tree.c:27
8484 msgid "write tree object for a subdirectory <prefix>"
8485 msgstr "将 <前缀> 子目录内容写到一个树对象"
8487 #: builtin/write-tree.c:30
8488 msgid "only useful for debugging"
8492 msgid "See 'git help <command>' for more information on a specific command."
8493 msgstr "参见 'git help <command>' 以获得该特定命令的详细信息。"
8495 #: parse-options.h:156
8496 msgid "no-op (backward compatibility)"
8499 #: parse-options.h:232
8500 msgid "be more verbose"
8503 #: parse-options.h:234
8504 msgid "be more quiet"
8507 #: parse-options.h:240
8508 msgid "use <n> digits to display SHA-1s"
8509 msgstr "用 <n> 位数字显示 SHA-1 哈希值"
8512 msgid "Add file contents to the index"
8516 msgid "Find by binary search the change that introduced a bug"
8517 msgstr "通过二分查找定位引入 bug 的变更"
8520 msgid "List, create, or delete branches"
8524 msgid "Checkout a branch or paths to the working tree"
8525 msgstr "检出一个分支或路径到工作区"
8528 msgid "Clone a repository into a new directory"
8529 msgstr "克隆一个版本库到一个新目录"
8532 msgid "Record changes to the repository"
8536 msgid "Show changes between commits, commit and working tree, etc"
8537 msgstr "显示提交之间、提交和工作区之间等的差异"
8540 msgid "Download objects and refs from another repository"
8541 msgstr "从另外一个版本库下载对象和引用"
8544 msgid "Print lines matching a pattern"
8548 msgid "Create an empty git repository or reinitialize an existing one"
8549 msgstr "创建一个空的 git 版本库或重新初始化一个"
8552 msgid "Show commit logs"
8556 msgid "Join two or more development histories together"
8557 msgstr "合并两个或更多开发历史"
8560 msgid "Move or rename a file, a directory, or a symlink"
8561 msgstr "移动或重命名一个文件、目录或符号链接"
8564 msgid "Fetch from and merge with another repository or a local branch"
8565 msgstr "获取并合并另外的版本库或一个本地分支"
8568 msgid "Update remote refs along with associated objects"
8569 msgstr "更新远程引用和相关的对象"
8572 msgid "Forward-port local commits to the updated upstream head"
8573 msgstr "本地提交转移至更新后的上游分支中"
8576 msgid "Reset current HEAD to the specified state"
8577 msgstr "重置当前HEAD到指定状态"
8580 msgid "Remove files from the working tree and from the index"
8581 msgstr "从工作区和索引中删除文件"
8584 msgid "Show various types of objects"
8588 msgid "Show the working tree status"
8592 msgid "Create, list, delete or verify a tag object signed with GPG"
8593 msgstr "创建、列出、删除或校验一个GPG签名的 tag 对象"
8596 msgid "You need to set your committer info first"
8597 msgstr "您需要先设置你的提交者信息"
8601 "You seem to have moved HEAD since the last 'am' failure.\n"
8602 "Not rewinding to ORIG_HEAD"
8603 msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
8608 "When you have resolved this problem, run \"$cmdline --resolved\".\n"
8609 "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
8610 "To restore the original branch and stop patching, run \"$cmdline --abort\"."
8612 "当您解决了此问题后,执行 \"$cmdline --resolved\"。\n"
8613 "如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n"
8614 "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
8617 msgid "Cannot fall back to three-way merge."
8621 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
8622 msgstr "版本库缺乏必要的数据(blob)对象以进行三路合并。"
8625 msgid "Using index info to reconstruct a base tree..."
8626 msgstr "更新索引信息以重建基树..."
8630 "Did you hand edit your patch?\n"
8631 "It does not apply to blobs recorded in its index."
8634 "无法应用补丁到索引中的数据(blob)对象上。"
8637 msgid "Falling back to patching base and 3-way merge..."
8638 msgstr "转而在基础版本上打补丁及进行三路合并..."
8641 msgid "Failed to merge in the changes."
8645 msgid "Only one StGIT patch series can be applied at once"
8646 msgstr "一次只能有一个 StGIT 补丁队列被应用"
8650 msgid "Patch format $patch_format is not supported."
8651 msgstr "不支持 $patch_format 补丁格式。"
8654 msgid "Patch format detection failed."
8659 "The -b/--binary option has been a no-op for long time, and\n"
8660 "it will be removed. Please do not use it anymore."
8662 "参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被删除。\n"
8667 msgid "previous rebase directory $dotest still exists but mbox given."
8668 msgstr "之前的变基目录 $dotest 仍然存在但给出了mbox。"
8671 msgid "Please make up your mind. --skip or --abort?"
8672 msgstr "请下决心。--skip 或是 --abort ?"
8675 msgid "Resolve operation not in progress, we are not resuming."
8676 msgstr "解决操作未进行,我们不会继续。"
8680 msgid "Dirty index: cannot apply patches (dirty: $files)"
8681 msgstr "脏的索引:不能应用补丁(脏文件:$files)"
8686 "Patch is empty. Was it split wrong?\n"
8687 "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
8688 "To restore the original branch and stop patching run \"$cmdline --abort\"."
8691 "如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n"
8692 "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
8695 msgid "Patch does not have a valid e-mail address."
8696 msgstr "补丁中没有一个有效的邮件地址。"
8699 msgid "cannot be interactive without stdin connected to a terminal."
8700 msgstr "标准输入没有和终端关联,不能进行交互式操作。"
8703 msgid "Commit Body is:"
8707 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
8708 #. in your translation. The program will only accept English
8709 #. input at this point.
8711 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
8712 msgstr "应用?[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
8716 msgid "Applying: $FIRSTLINE"
8717 msgstr "正应用:$FIRSTLINE"
8721 "No changes - did you forget to use 'git add'?\n"
8722 "If there is nothing left to stage, chances are that something else\n"
8723 "already introduced the same changes; you might want to skip this patch."
8725 "没有变更 —— 您是不是忘了执行 'git add'?\n"
8726 "如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
8731 "You still have unmerged paths in your index\n"
8732 "did you forget to use 'git add'?"
8733 msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'?"
8736 msgid "No changes -- Patch already applied."
8737 msgstr "没有变更 -- 补丁已经应用过。"
8741 msgid "Patch failed at $msgnum $FIRSTLINE"
8742 msgstr "补丁失败于 $msgnum $FIRSTLINE"
8747 "The copy of the patch that failed is found in:\n"
8754 msgid "applying to an empty history"
8758 msgid "You need to start by \"git bisect start\""
8759 msgstr "您需要执行 \"git bisect start\" 来开始"
8762 #. TRANSLATORS: Make sure to include [Y] and [n] in your
8763 #. translation. The program will only accept English input
8766 msgid "Do you want me to do it for you [Y/n]? "
8767 msgstr "您想让我为您这样做么[Y/n]? "
8771 msgid "unrecognised option: '$arg'"
8772 msgstr "未能识别的选项:'$arg'"
8776 msgid "'$arg' does not appear to be a valid revision"
8777 msgstr "'$arg' 看起来不像是一个有效的版本"
8779 #: git-bisect.sh:117
8780 msgid "Bad HEAD - I need a HEAD"
8781 msgstr "坏的 HEAD - 我需要一个 HEAD"
8783 #: git-bisect.sh:130
8786 "Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
8787 msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <validbranch>'。"
8789 #: git-bisect.sh:140
8790 msgid "won't bisect on seeked tree"
8791 msgstr "不会在已查找过的树上二分查找"
8793 #: git-bisect.sh:144
8794 msgid "Bad HEAD - strange symbolic ref"
8795 msgstr "坏的 HEAD - 奇怪的符号引用"
8797 #: git-bisect.sh:189
8799 msgid "Bad bisect_write argument: $state"
8800 msgstr "坏的 bisect_write 参数:$state"
8802 #: git-bisect.sh:218
8804 msgid "Bad rev input: $arg"
8805 msgstr "输入坏的版本:$arg"
8807 #: git-bisect.sh:232
8808 msgid "Please call 'bisect_state' with at least one argument."
8809 msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
8811 #: git-bisect.sh:244
8813 msgid "Bad rev input: $rev"
8814 msgstr "输入坏的版本:$rev"
8816 #: git-bisect.sh:250
8817 msgid "'git bisect bad' can take only one argument."
8818 msgstr "'git bisect bad' 只能带一个参数。"
8820 #. have bad but not good. we could bisect although
8821 #. this is less optimum.
8822 #: git-bisect.sh:273
8823 msgid "Warning: bisecting only with a bad commit."
8824 msgstr "警告:在仅有一个坏提交下进行二分查找。"
8827 #. TRANSLATORS: Make sure to include [Y] and [n] in your
8828 #. translation. The program will only accept English input
8830 #: git-bisect.sh:279
8831 msgid "Are you sure [Y/n]? "
8832 msgstr "您确认么[Y/n]? "
8834 #: git-bisect.sh:289
8836 "You need to give me at least one good and one bad revisions.\n"
8837 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
8839 "您需要给我至少一个好版本和一个坏版本。\n"
8840 "(您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。)"
8842 #: git-bisect.sh:292
8844 "You need to start by \"git bisect start\".\n"
8845 "You then need to give me at least one good and one bad revisions.\n"
8846 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
8848 "您需要执行 \"git bisect start\" 来开始。\n"
8849 "然后需要提供我至少一个好版本和一个坏版本。\n"
8850 "(您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。)"
8852 #: git-bisect.sh:347 git-bisect.sh:474
8853 msgid "We are not bisecting."
8856 #: git-bisect.sh:354
8858 msgid "'$invalid' is not a valid commit"
8859 msgstr "'$invalid' 不是一个有效的提交"
8861 #: git-bisect.sh:363
8864 "Could not check out original HEAD '$branch'.\n"
8865 "Try 'git bisect reset <commit>'."
8867 "不能检出原始 HEAD '$branch'。\n"
8868 "尝试 'git bisect reset <提交>'。"
8870 #: git-bisect.sh:390
8871 msgid "No logfile given"
8874 #: git-bisect.sh:391
8876 msgid "cannot read $file for replaying"
8877 msgstr "不能读取 $file 来重放"
8879 #: git-bisect.sh:408
8880 msgid "?? what are you talking about?"
8883 #: git-bisect.sh:420
8885 msgid "running $command"
8886 msgstr "运行 $command"
8888 #: git-bisect.sh:427
8891 "bisect run failed:\n"
8892 "exit code $res from '$command' is < 0 or >= 128"
8895 "命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
8897 #: git-bisect.sh:453
8898 msgid "bisect run cannot continue any more"
8901 #: git-bisect.sh:459
8904 "bisect run failed:\n"
8905 "'bisect_state $state' exited with error code $res"
8908 "'bisect_state $state' 退出码为 $res"
8910 #: git-bisect.sh:466
8911 msgid "bisect run success"
8916 "Pull is not possible because you have unmerged files.\n"
8917 "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
8918 "as appropriate to mark resolution, or use 'git commit -a'."
8920 "Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n"
8921 "然后酌情使用 'git add/rm <file>' 标记解决方案,\n"
8922 "或者使用 'git commit -a'。"
8925 msgid "Pull is not possible because you have unmerged files."
8926 msgstr "Pull 不可用,因为您尚有未合并的文件。"
8929 msgid "updating an unborn branch with changes added to the index"
8930 msgstr "更新尚未诞生的分支,变更添加至索引"
8932 #. The fetch involved updating the current branch.
8933 #. The working tree and the index file is still based on the
8934 #. $orig_head commit, but we are merging into $curr_head.
8935 #. First update the working tree to match $curr_head.
8939 "Warning: fetch updated the current branch head.\n"
8940 "Warning: fast-forwarding your working tree from\n"
8941 "Warning: commit $orig_head."
8943 "警告:fetch 更新了当前的分支。您的工作区\n"
8944 "警告:从原提交 $orig_head 快进。"
8947 msgid "Cannot merge multiple branches into empty head"
8948 msgstr "无法将多个分支合并到空分支"
8951 msgid "Cannot rebase onto multiple branches"
8956 "When you have resolved this problem, run \"git rebase --continue\".\n"
8957 "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
8958 "To check out the original branch and stop rebasing, run \"git rebase --abort"
8961 "当您解决了此问题后,执行 \"git rebase --continue\"。\n"
8962 "如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
8963 "要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
8965 #: git-rebase.sh:160
8966 msgid "The pre-rebase hook refused to rebase."
8967 msgstr "钩子 pre-rebase 拒绝变基。"
8969 #: git-rebase.sh:165
8970 msgid "It looks like git-am is in progress. Cannot rebase."
8971 msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
8973 #: git-rebase.sh:296
8974 msgid "The --exec option must be used with the --interactive option"
8975 msgstr "选项 --exec 必须和选项 --interactive 同时使用"
8977 #: git-rebase.sh:301
8978 msgid "No rebase in progress?"
8981 #: git-rebase.sh:312
8982 msgid "The --edit-todo action can only be used during interactive rebase."
8983 msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
8985 #: git-rebase.sh:319
8986 msgid "Cannot read HEAD"
8989 #: git-rebase.sh:322
8991 "You must edit all merge conflicts and then\n"
8992 "mark them as resolved using git add"
8994 "您必须编辑所有的合并冲突,然后通过 git add\n"
8997 #: git-rebase.sh:340
8999 msgid "Could not move back to $head_name"
9000 msgstr "无法移回 $head_name"
9002 #: git-rebase.sh:359
9005 "It seems that there is already a $state_dir_base directory, and\n"
9006 "I wonder if you are in the middle of another rebase. If that is the\n"
9007 "case, please try\n"
9008 "\t$cmd_live_rebase\n"
9009 "If that is not the case, please\n"
9010 "\t$cmd_clear_stale_rebase\n"
9011 "and run me again. I am stopping in case you still have something\n"
9014 "好像已有一个 $state_dir_base 目录,我怀疑您正处于另外一个变基过程中。\n"
9016 "\t$cmd_live_rebase\n"
9018 "\t$cmd_clear_stale_rebase\n"
9019 "然后再重新执行变基。为避免您丢失重要数据,我已经停止当前操作。"
9021 #: git-rebase.sh:404
9023 msgid "invalid upstream $upstream_name"
9024 msgstr "无效的上游 $upstream_name"
9026 #: git-rebase.sh:428
9028 msgid "$onto_name: there are more than one merge bases"
9029 msgstr "$onto_name: 有一个以上的合并基准"
9031 #: git-rebase.sh:431 git-rebase.sh:435
9033 msgid "$onto_name: there is no merge base"
9034 msgstr "$onto_name: 没有合并基准"
9036 #: git-rebase.sh:440
9038 msgid "Does not point to a valid commit: $onto_name"
9039 msgstr "没有指向一个有效的提交:$onto_name"
9041 #: git-rebase.sh:463
9043 msgid "fatal: no such branch: $branch_name"
9044 msgstr "严重错误:无此分支:$branch_name"
9046 #: git-rebase.sh:483
9047 msgid "Please commit or stash them."
9048 msgstr "请提交或为它们保存进度。"
9050 #: git-rebase.sh:501
9052 msgid "Current branch $branch_name is up to date."
9053 msgstr "当前分支 $branch_name 是最新的。"
9055 #: git-rebase.sh:504
9057 msgid "Current branch $branch_name is up to date, rebase forced."
9058 msgstr "当前分支 $branch_name 是最新的,强制变基。"
9060 #: git-rebase.sh:515
9062 msgid "Changes from $mb to $onto:"
9063 msgstr "变更从 $mb 到 $onto:"
9065 #. Detach HEAD and reset the tree
9066 #: git-rebase.sh:524
9067 msgid "First, rewinding head to replay your work on top of it..."
9068 msgstr "首先,重置头指针以便在上面重放您的工作..."
9070 #: git-rebase.sh:532
9072 msgid "Fast-forwarded $branch_name to $onto_name."
9073 msgstr "快进 $branch_name 至 $onto_name。"
9076 msgid "git stash clear with parameters is unimplemented"
9077 msgstr "git stash clear 不支持参数"
9080 msgid "You do not have the initial commit yet"
9084 msgid "Cannot save the current index state"
9087 #: git-stash.sh:123 git-stash.sh:136
9088 msgid "Cannot save the current worktree state"
9089 msgstr "无法保存当前工作区状态"
9092 msgid "No changes selected"
9096 msgid "Cannot remove temporary index (can't happen)"
9097 msgstr "无法删除临时索引(不应发生)"
9100 msgid "Cannot record working tree state"
9103 #. TRANSLATORS: $option is an invalid option, like
9104 #. `--blah-blah'. The 7 spaces at the beginning of the
9105 #. second line correspond to "error: ". So you should line
9106 #. up the second line with however many characters the
9107 #. translation of "error: " takes in your language. E.g. in
9110 #. $ git stash save --blah-blah 2>&1 | head -n 2
9111 #. error: unknown option for 'stash save': --blah-blah
9112 #. To provide a message, use git stash save -- '--blah-blah'
9116 "error: unknown option for 'stash save': $option\n"
9117 " To provide a message, use git stash save -- '$option'"
9119 "错误:'stash save' 的未知选项:$option\n"
9120 " 要提供一个描述信息,使用 git stash save -- '$option'"
9123 msgid "No local changes to save"
9127 msgid "Cannot initialize stash"
9128 msgstr "无法初始化 stash"
9131 msgid "Cannot save the current status"
9135 msgid "Cannot remove worktree changes"
9139 msgid "No stash found."
9144 msgid "Too many revisions specified: $REV"
9145 msgstr "指定了太多的版本:$REV"
9149 msgid "$reference is not valid reference"
9150 msgstr "$reference 不是有效的引用"
9154 msgid "'$args' is not a stash-like commit"
9155 msgstr "'$args' 不是 stash 样提交"
9159 msgid "'$args' is not a stash reference"
9160 msgstr "'$args' 不是一个 stash 引用"
9163 msgid "unable to refresh index"
9167 msgid "Cannot apply a stash in the middle of a merge"
9168 msgstr "无法在合并过程中恢复进度"
9171 msgid "Conflicts in index. Try without --index."
9172 msgstr "索引中有冲突。尝试不使用 --index。"
9175 msgid "Could not save index tree"
9179 msgid "Cannot unstage modified files"
9183 msgid "Index was not unstashed."
9184 msgstr "索引的进度没有被恢复。"
9188 msgid "Dropped ${REV} ($s)"
9189 msgstr "丢弃了 ${REV} ($s)"
9193 msgid "${REV}: Could not drop stash entry"
9194 msgstr "${REV}:不能丢弃进度条目"
9197 msgid "No branch name specified"
9201 msgid "(To restore them type \"git stash apply\")"
9202 msgstr "(为恢复数据输入 \"git stash apply\")"
9204 #: git-submodule.sh:90
9206 msgid "cannot strip one component off url '$remoteurl'"
9207 msgstr "无法从 url '$remoteurl' 剥离一个组件"
9209 #: git-submodule.sh:195
9211 msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
9212 msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
9214 #: git-submodule.sh:238
9216 msgid "Clone of '$url' into submodule path '$sm_path' failed"
9217 msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
9219 #: git-submodule.sh:250
9221 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
9222 msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反"
9224 #: git-submodule.sh:343
9226 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
9227 msgstr "版本库URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
9229 #: git-submodule.sh:360
9231 msgid "'$sm_path' already exists in the index"
9232 msgstr "'$sm_path' 已经存在于索引中"
9234 #: git-submodule.sh:364
9237 "The following path is ignored by one of your .gitignore files:\n"
9239 "Use -f if you really want to add it."
9241 "以下路径被您的一个 .gitignore 文件所忽略:\n"
9243 "如果您确实想添加它,使用 -f 参数。"
9245 #: git-submodule.sh:382
9247 msgid "Adding existing repo at '$sm_path' to the index"
9248 msgstr "添加位于 '$sm_path' 的现存版本库到索引"
9250 #: git-submodule.sh:384
9252 msgid "'$sm_path' already exists and is not a valid git repo"
9253 msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"
9255 #: git-submodule.sh:392
9257 msgid "A git directory for '$sm_name' is found locally with remote(s):"
9258 msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程版本库:"
9260 #: git-submodule.sh:394
9263 "If you want to reuse this local git directory instead of cloning again from"
9264 msgstr "如果您想重用此本地 git 目录而不是重新克隆自"
9266 #: git-submodule.sh:396
9269 "use the '--force' option. If the local git directory is not the correct repo"
9270 msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的版本库"
9272 #: git-submodule.sh:397
9275 "or you are unsure what this means choose another name with the '--name' "
9277 msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。"
9279 #: git-submodule.sh:399
9281 msgid "Reactivating local git directory for submodule '$sm_name'."
9282 msgstr "激活本地 git 目录到子模组 '$sm_name'。"
9284 #: git-submodule.sh:411
9286 msgid "Unable to checkout submodule '$sm_path'"
9287 msgstr "不能检出子模组 '$sm_path'"
9289 #: git-submodule.sh:416
9291 msgid "Failed to add submodule '$sm_path'"
9292 msgstr "无法添加子模组 '$sm_path'"
9294 #: git-submodule.sh:425
9296 msgid "Failed to register submodule '$sm_path'"
9297 msgstr "无法注册子模组 '$sm_path'"
9299 #: git-submodule.sh:468
9301 msgid "Entering '$prefix$sm_path'"
9302 msgstr "正在进入 '$prefix$sm_path'"
9304 #: git-submodule.sh:482
9306 msgid "Stopping at '$sm_path'; script returned non-zero status."
9307 msgstr "停止于 '$sm_path',脚本返回非零值。"
9309 #: git-submodule.sh:526
9311 msgid "No url found for submodule path '$sm_path' in .gitmodules"
9312 msgstr "在 .gitmodules 中未找到子模组路径 '$sm_path' 的 url"
9314 #: git-submodule.sh:535
9316 msgid "Failed to register url for submodule path '$sm_path'"
9317 msgstr "无法为子模组路径 '$sm_path' 注册 url"
9319 #: git-submodule.sh:537
9321 msgid "Submodule '$name' ($url) registered for path '$sm_path'"
9322 msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册"
9324 #: git-submodule.sh:545
9326 msgid "Failed to register update mode for submodule path '$sm_path'"
9327 msgstr "无法为子模组路径 '$sm_path' 注册更新模式"
9329 #: git-submodule.sh:649
9332 "Submodule path '$sm_path' not initialized\n"
9333 "Maybe you want to use 'update --init'?"
9335 "子模组路径 '$sm_path' 没有初始化\n"
9336 "也许您想用 'update --init'?"
9338 #: git-submodule.sh:662
9340 msgid "Unable to find current revision in submodule path '$sm_path'"
9341 msgstr "无法在子模组路径 '$sm_path' 中找到当前版本"
9343 #: git-submodule.sh:671 git-submodule.sh:695
9345 msgid "Unable to fetch in submodule path '$sm_path'"
9346 msgstr "无法在子模组路径 '$sm_path' 中获取"
9348 #: git-submodule.sh:709
9350 msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
9351 msgstr "无法在子模组路径 '$sm_path' 中变基 '$sha1'"
9353 #: git-submodule.sh:710
9355 msgid "Submodule path '$sm_path': rebased into '$sha1'"
9356 msgstr "子模组路径 '$sm_path':变基至 '$sha1'"
9358 #: git-submodule.sh:715
9360 msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
9361 msgstr "无法合并 '$sha1' 到子模组路径 '$sm_path' 中"
9363 #: git-submodule.sh:716
9365 msgid "Submodule path '$sm_path': merged in '$sha1'"
9366 msgstr "子模组路径 '$sm_path':已合并入 '$sha1'"
9368 #: git-submodule.sh:721
9370 msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
9371 msgstr "无法在子模组路径 '$sm_path' 中检出 '$sha1'"
9373 #: git-submodule.sh:722
9375 msgid "Submodule path '$sm_path': checked out '$sha1'"
9376 msgstr "子模组路径 '$sm_path':检出 '$sha1'"
9378 #: git-submodule.sh:744 git-submodule.sh:1066
9380 msgid "Failed to recurse into submodule path '$sm_path'"
9381 msgstr "无法递归进子模组路径 '$sm_path'"
9383 #: git-submodule.sh:852
9384 msgid "The --cached option cannot be used with the --files option"
9385 msgstr "选项 --cached 不能和选项 --files 同时使用"
9388 #: git-submodule.sh:892
9390 msgid "unexpected mode $mod_dst"
9391 msgstr "意外的模式 $mod_dst"
9394 #: git-submodule.sh:910
9396 msgid " Warn: $name doesn't contain commit $sha1_src"
9397 msgstr " 警告:$name 未包含提交 $sha1_src"
9400 #: git-submodule.sh:913
9402 msgid " Warn: $name doesn't contain commit $sha1_dst"
9403 msgstr " 警告:$name 未包含提交 $sha1_dst"
9406 #: git-submodule.sh:916
9408 msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
9409 msgstr " 警告:$name 未包含提交 $sha1_src 和 $sha1_dst"
9411 #: git-submodule.sh:941
9415 #: git-submodule.sh:979
9416 msgid "# Submodules changed but not updated:"
9417 msgstr "# 子模组已修改但尚未更新:"
9419 #: git-submodule.sh:981
9420 msgid "# Submodule changes to be committed:"
9423 #: git-submodule.sh:1129
9425 msgid "Synchronizing submodule url for '$prefix$sm_path'"
9426 msgstr "为 '$prefix$sm_path' 同步子模组 url"
9431 #~ msgid " 0 files changed"
9432 #~ msgstr " 0 个文件被修改"
9434 #~ msgid " %d file changed"
9435 #~ msgid_plural " %d files changed"
9436 #~ msgstr[0] " %d 个文件被修改"
9437 #~ msgstr[1] " %d 个文件被修改"
9439 #~ msgid ", %d insertion(+)"
9440 #~ msgid_plural ", %d insertions(+)"
9441 #~ msgstr[0] ",插入 %d 行(+)"
9442 #~ msgstr[1] ",插入 %d 行(+)"
9444 #~ msgid ", %d deletion(-)"
9445 #~ msgid_plural ", %d deletions(-)"
9446 #~ msgstr[0] ",删除 %d 行(-)"
9447 #~ msgstr[1] ",删除 %d 行(-)"
9449 #~ msgid "You do not have a valid HEAD"
9450 #~ msgstr "您没有一个有效的 HEAD"
9455 #~ msgid "Would not remove %s\n"
9456 #~ msgstr "不会删除 %s\n"
9458 #~ msgid "Not removing %s\n"
9459 #~ msgstr "未删除 %s\n"
9461 #~ msgid "Auto packing the repository for optimum performance.\n"
9462 #~ msgstr "自动打包版本库以求最佳性能。\n"
9464 #~ msgid "git remote set-head <name> (-a | -d | <branch>])"
9465 #~ msgstr "git remote set-head <名称> (-a | -d | <分支>])"
9467 #~ msgid "Could not read index"
9470 # 译者:中文字符串拼接,可删除前导空格
9471 #~ msgid " (use \"git add\" to track)"
9472 #~ msgstr "(使用 \"git add\" 建立跟踪)"
9474 #~ msgid "-B cannot be used with -b"
9475 #~ msgstr "-B 不能和 -b 同时使用"
9477 #~ msgid "--patch is incompatible with all other options"
9478 #~ msgstr "--patch 选项和其他选项不兼容"
9480 #~ msgid "--detach cannot be used with -b/-B/--orphan"
9481 #~ msgstr "--detach 不能和 -b/-B/--orphan 同时使用"
9483 #~ msgid "--detach cannot be used with -t"
9484 #~ msgstr "--detach 不能和 -t 同时使用"
9486 #~ msgid "--orphan and -b|-B are mutually exclusive"
9487 #~ msgstr "--orphan 和 -b|-B 互斥"
9489 #~ msgid "--orphan cannot be used with -t"
9490 #~ msgstr "--orphan 不能和 -t 同时使用"
9492 #~ msgid "git checkout: -f and -m are incompatible"
9493 #~ msgstr "git checkout:-f 和 -m 不兼容"
9496 #~ "git checkout: updating paths is incompatible with switching branches."
9497 #~ msgstr "git checkout:更新路径和切换分支不兼容。"
9499 #~ msgid "diff setup failed"
9500 #~ msgstr "diff 设置失败"
9502 #~ msgid "merge-recursive: disk full?"
9503 #~ msgstr "merge-recursive:磁盘已满?"
9505 #~ msgid "diff_setup_done failed"
9506 #~ msgstr "diff_setup_done 失败"