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-04-10 15:16+0800\n"
16 "PO-Revision-Date: 2013-04-12 09:23+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:1117
76 msgid "prepend prefix to each pathname in the archive"
77 msgstr "为归档中每个路径名加上前缀"
79 #: archive.c:326 builtin/archive.c:88 builtin/blame.c:2366
80 #: builtin/blame.c:2367 builtin/config.c:55 builtin/fast-export.c:659
81 #: builtin/fast-export.c:661 builtin/grep.c:715 builtin/hash-object.c:77
82 #: builtin/ls-files.c:497 builtin/ls-files.c:500 builtin/notes.c:536
83 #: builtin/notes.c:693 builtin/read-tree.c:107 parse-options.h:149
87 #: archive.c:327 builtin/archive.c:89
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:90 builtin/clone.c:86
119 #: archive.c:346 builtin/archive.c:91
120 msgid "retrieve the archive from remote repository <repo>"
121 msgstr "从远程版本库(<版本库>)提取归档文件"
123 #: archive.c:347 builtin/archive.c:92 builtin/notes.c:615
127 #: archive.c:348 builtin/archive.c:93
128 msgid "path to the remote git-upload-archive command"
129 msgstr "远程 git-upload-archive 命令的路径"
133 "Negative patterns are ignored in git attributes\n"
134 "Use '\\!' for literal leading exclamation."
136 "负值模版在 git attributes 中被忽略\n"
137 "当字符串确实要以感叹号开始时,使用 '\\!'。"
141 msgid "Cannot setup tracking information; starting point '%s' is not a branch."
142 msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
146 msgid "the requested upstream branch '%s' does not exist"
147 msgstr "请求的上游分支 '%s' 不存在"
152 "If you are planning on basing your work on an upstream\n"
153 "branch that already exists at the remote, you may need to\n"
154 "run \"git fetch\" to retrieve it.\n"
156 "If you are planning to push out a new local branch that\n"
157 "will track its remote counterpart, you may want to use\n"
158 "\"git push -u\" to set the upstream config as you push."
161 "如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
162 "您可能需要执行 \"git fetch\" 来获取分支。\n"
164 "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
165 "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
169 msgid "'%s' does not look like a v2 bundle file"
170 msgstr "'%s' 不像是一个 v2 版本的包文件"
174 msgid "unrecognized header: %s%s (%d)"
175 msgstr "未能识别的包头:%s%s (%d)"
177 #: bundle.c:89 builtin/commit.c:676
179 msgid "could not open '%s'"
183 msgid "Repository lacks these prerequisite commits:"
184 msgstr "版本库缺少这些必备的提交:"
186 #: bundle.c:164 sequencer.c:651 sequencer.c:1083 builtin/log.c:300
187 #: builtin/log.c:754 builtin/log.c:1350 builtin/log.c:1566 builtin/merge.c:349
188 #: builtin/shortlog.c:157
189 msgid "revision walk setup failed"
194 msgid "The bundle contains this ref:"
195 msgid_plural "The bundle contains these %d refs:"
196 msgstr[0] "这个包中含有这个引用:"
197 msgstr[1] "这个包中含有 %d 个引用:"
200 msgid "The bundle records a complete history."
201 msgstr "这个包记录一个完整历史。"
205 msgid "The bundle requires this ref:"
206 msgid_plural "The bundle requires these %d refs:"
207 msgstr[0] "这个包需要这个引用:"
208 msgstr[1] "这个包需要 %d 个引用:"
211 msgid "rev-list died"
214 #: bundle.c:300 builtin/log.c:1246 builtin/shortlog.c:260
216 msgid "unrecognized argument: %s"
221 msgid "ref '%s' is excluded by the rev-list options"
222 msgstr "引用 '%s' 被 rev-list 选项排除"
225 msgid "Refusing to create empty bundle."
229 msgid "Could not spawn pack-objects"
230 msgstr "不能生成 pack-objects 进程"
233 msgid "pack-objects died"
234 msgstr "pack-objects 终止"
238 msgid "cannot create '%s'"
242 msgid "index-pack died"
243 msgstr "index-pack 终止"
247 msgid "could not parse %s"
252 msgid "%s %s is not a commit!"
253 msgstr "%s %s 不是一个提交!"
255 #: compat/obstack.c:406 compat/obstack.c:408
256 msgid "memory exhausted"
260 msgid "Could not run 'git rev-list'"
261 msgstr "不能执行 'git rev-list'"
265 msgid "failed write to rev-list: %s"
266 msgstr "无法写入 rev-list:%s"
270 msgid "failed to close rev-list's stdin: %s"
271 msgstr "无法关闭 rev-list 的标准输入:%s"
274 msgid "in the future"
279 msgid "%lu second ago"
280 msgid_plural "%lu seconds ago"
286 msgid "%lu minute ago"
287 msgid_plural "%lu minutes ago"
294 msgid_plural "%lu hours ago"
301 msgid_plural "%lu days ago"
308 msgid_plural "%lu weeks ago"
314 msgid "%lu month ago"
315 msgid_plural "%lu months ago"
322 msgid_plural "%lu years"
328 msgid "%s, %lu month ago"
329 msgid_plural "%s, %lu months ago"
330 msgstr[0] "%s,%lu 个月之前"
331 msgstr[1] "%s,%lu 个月之前"
333 #: date.c:154 date.c:159
336 msgid_plural "%lu years ago"
343 msgid " Failed to parse dirstat cut-off percentage '%s'\n"
344 msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
349 msgid " Unknown dirstat parameter '%s'\n"
350 msgstr " 未知的 dirstat 参数 '%s'\n"
354 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
355 msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
360 "Found errors in 'diff.dirstat' config variable:\n"
363 "发现配置变量 'diff.dirstat' 中的错误:\n"
369 "Failed to parse --dirstat/-X option parameter:\n"
372 "无法解析 --dirstat/-X 选项的参数:\n"
377 msgid "Failed to parse --submodule option parameter: '%s'"
378 msgstr "无法解析 --submodule 选项的参数:'%s'"
380 #: gpg-interface.c:59 gpg-interface.c:131
381 msgid "could not run gpg."
384 #: gpg-interface.c:71
385 msgid "gpg did not accept the data"
388 #: gpg-interface.c:82
389 msgid "gpg failed to sign the data"
392 #: gpg-interface.c:115
394 msgid "could not create temporary file '%s': %s"
395 msgstr "不能创建临时文件 '%s':%s"
397 #: gpg-interface.c:118
399 msgid "failed writing detached signature to '%s': %s"
400 msgstr "无法将分离式签名写入 '%s':%s"
404 msgid "'%s': unable to read %s"
405 msgstr "'%s':无法读取 %s"
414 msgid "'%s': short read %s"
415 msgstr "'%s':读取不完整 %s"
419 msgid "available git commands in '%s'"
420 msgstr "在 '%s' 下可用的 git 命令"
423 msgid "git commands available from elsewhere on your $PATH"
424 msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
427 msgid "The most commonly used git commands are:"
428 msgstr "最常用的 git 命令有:"
433 "'%s' appears to be a git command, but we were not\n"
434 "able to execute it. Maybe git-%s is broken?"
436 "'%s' 像是一个 git 命令,但却无法运行。\n"
440 msgid "Uh oh. Your system reports no Git commands at all."
441 msgstr "唉呀,您的系统中未发现 Git 命令。"
446 "WARNING: You called a Git command named '%s', which does not exist.\n"
447 "Continuing under the assumption that you meant '%s'"
449 "警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
454 msgid "in %0.1f seconds automatically..."
455 msgstr "在 %0.1f 秒钟后自动运行..."
459 msgid "git: '%s' is not a git command. See 'git --help'."
460 msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
468 "Did you mean one of these?"
477 msgid "failed to read the cache"
480 #: merge.c:110 builtin/checkout.c:362 builtin/checkout.c:563
481 #: builtin/clone.c:635
482 msgid "unable to write new index file"
485 #: merge-recursive.c:190
487 msgid "(bad commit)\n"
490 #: merge-recursive.c:206
492 msgid "addinfo_cache failed for path '%s'"
493 msgstr "为路径 '%s' addinfo_cache 失败"
495 #: merge-recursive.c:268
496 msgid "error building trees"
499 #: merge-recursive.c:672
501 msgid "failed to create path '%s'%s"
502 msgstr "无法创建路径 '%s'%s"
504 #: merge-recursive.c:683
506 msgid "Removing %s to make room for subdirectory\n"
507 msgstr "删除 %s 以便为子目录留出空间\n"
509 #. something else exists
510 #. .. but not some other error (who really cares what?)
511 #: merge-recursive.c:697 merge-recursive.c:718
512 msgid ": perhaps a D/F conflict?"
513 msgstr ":可能是一个目录/文件冲突?"
515 #: merge-recursive.c:708
517 msgid "refusing to lose untracked file at '%s'"
518 msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
520 #: merge-recursive.c:748
522 msgid "cannot read object %s '%s'"
523 msgstr "不能读取对象 %s '%s'"
525 #: merge-recursive.c:750
527 msgid "blob expected for %s '%s'"
528 msgstr "%s '%s' 应为数据(blob)对象"
530 #: merge-recursive.c:773 builtin/clone.c:303
532 msgid "failed to open '%s'"
535 #: merge-recursive.c:781
537 msgid "failed to symlink '%s'"
538 msgstr "无法创建符号链接 '%s'"
540 #: merge-recursive.c:784
542 msgid "do not know what to do with %06o %s '%s'"
543 msgstr "不知道如何处理 %06o %s '%s'"
545 #: merge-recursive.c:922
546 msgid "Failed to execute internal merge"
549 #: merge-recursive.c:926
551 msgid "Unable to add %s to database"
552 msgstr "不能添加 %s 至对象库"
554 #: merge-recursive.c:942
555 msgid "unsupported object type in the tree"
556 msgstr "在树中有不支持的对象类型"
558 #: merge-recursive.c:1021 merge-recursive.c:1035
561 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
564 "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
567 #: merge-recursive.c:1027 merge-recursive.c:1040
570 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
573 "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
576 #: merge-recursive.c:1081
580 #: merge-recursive.c:1081
584 #: merge-recursive.c:1137
586 msgid "%s is a directory in %s adding as %s instead"
587 msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
589 #: merge-recursive.c:1159
592 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
593 "\"->\"%s\" in \"%s\"%s"
595 "冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
596 "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
598 #: merge-recursive.c:1164
599 msgid " (left unresolved)"
602 #: merge-recursive.c:1218
604 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
606 "冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
609 #: merge-recursive.c:1248
611 msgid "Renaming %s to %s and %s to %s instead"
612 msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
614 #: merge-recursive.c:1447
616 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
617 msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
619 #: merge-recursive.c:1457
621 msgid "Adding merged %s"
624 #: merge-recursive.c:1462 merge-recursive.c:1660
626 msgid "Adding as %s instead"
629 #: merge-recursive.c:1513
631 msgid "cannot read object %s"
634 #: merge-recursive.c:1516
636 msgid "object %s is not a blob"
637 msgstr "对象 %s 不是一个数据(blob)对象"
639 #: merge-recursive.c:1564
643 #: merge-recursive.c:1564
647 #: merge-recursive.c:1574
651 #: merge-recursive.c:1581
655 #: merge-recursive.c:1615
657 msgid "Skipped %s (merged same as existing)"
658 msgstr "略过 %s(已经做过相同合并)"
660 #: merge-recursive.c:1629
662 msgid "Auto-merging %s"
665 #: merge-recursive.c:1633 git-submodule.sh:1029
669 #: merge-recursive.c:1634
671 msgid "CONFLICT (%s): Merge conflict in %s"
672 msgstr "冲突(%s):合并冲突于 %s"
674 #: merge-recursive.c:1724
679 #: merge-recursive.c:1749
680 msgid "file/directory"
683 #: merge-recursive.c:1755
684 msgid "directory/file"
687 #: merge-recursive.c:1760
689 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
690 msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
692 #: merge-recursive.c:1770
697 #: merge-recursive.c:1787
698 msgid "Fatal merge failure, shouldn't happen."
699 msgstr "严重的合并错误,不应发生。"
701 #: merge-recursive.c:1806
702 msgid "Already up-to-date!"
705 #: merge-recursive.c:1815
707 msgid "merging of trees %s and %s failed"
708 msgstr "无法合并树 %s 和 %s"
710 #: merge-recursive.c:1845
712 msgid "Unprocessed path??? %s"
713 msgstr "未处理的路径??? %s"
715 #: merge-recursive.c:1890
719 #: merge-recursive.c:1903
721 msgid "found %u common ancestor:"
722 msgid_plural "found %u common ancestors:"
723 msgstr[0] "发现 %u 个共同祖先:"
724 msgstr[1] "发现 %u 个共同祖先:"
726 #: merge-recursive.c:1940
727 msgid "merge returned no commit"
730 #: merge-recursive.c:1997
732 msgid "Could not parse object '%s'"
735 #: merge-recursive.c:2009 builtin/merge.c:658
736 msgid "Unable to write index."
741 msgid "unable to parse object: %s"
744 #: parse-options.c:489
748 #: parse-options.c:507
753 #. TRANSLATORS: the colon here should align with the
754 #. one in "usage: %s" translation
755 #: parse-options.c:511
760 # 译者:为保证在输出中对齐,注意调整句中空格!
761 #: parse-options.c:514
766 #: parse-options.c:548
772 msgid "Path '%s' is in submodule '%.*s'"
773 msgstr "路径 '%s' 属于模组 '%.*s'"
777 msgid "'%s' is beyond a symbolic link"
778 msgstr "'%s' 位于符号链接中"
782 msgid "Your branch is ahead of '%s' by %d commit.\n"
783 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
784 msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
785 msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
788 msgid " (use \"git push\" to publish your local commits)\n"
789 msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
793 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
795 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
796 msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
797 msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
801 msgid " (use \"git pull\" to update your local branch)\n"
802 msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
807 "Your branch and '%s' have diverged,\n"
808 "and have %d and %d different commit each, respectively.\n"
810 "Your branch and '%s' have diverged,\n"
811 "and have %d and %d different commits each, respectively.\n"
813 "您的分支和 '%s' 出现了偏离,\n"
814 "并且分别有 %d 和 %d 处不同的提交。\n"
816 "您的分支和 '%s' 出现了偏离,\n"
817 "并且分别有 %d 和 %d 处不同的提交。\n"
821 msgid " (use \"git pull\" to merge the remote branch into yours)\n"
822 msgstr " (使用 \"git pull\" 来合并远程分支)\n"
824 #: sequencer.c:206 builtin/merge.c:776 builtin/merge.c:889 builtin/merge.c:999
825 #: builtin/merge.c:1009
827 msgid "Could not open '%s' for writing"
828 msgstr "不能为写入打开 '%s'"
830 #: sequencer.c:208 builtin/merge.c:335 builtin/merge.c:779
831 #: builtin/merge.c:1001 builtin/merge.c:1014
833 msgid "Could not write to '%s'"
838 "after resolving the conflicts, mark the corrected paths\n"
839 "with 'git add <paths>' or 'git rm <paths>'"
841 "冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
846 "after resolving the conflicts, mark the corrected paths\n"
847 "with 'git add <paths>' or 'git rm <paths>'\n"
848 "and commit the result with 'git commit'"
850 "冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
851 "对修正后的文件做标记,然后用 'git commit' 提交"
853 #: sequencer.c:245 sequencer.c:859 sequencer.c:942
855 msgid "Could not write to %s"
860 msgid "Error wrapping up %s"
864 msgid "Your local changes would be overwritten by cherry-pick."
865 msgstr "您的本地修改将被拣选操作覆盖。"
868 msgid "Your local changes would be overwritten by revert."
869 msgstr "您的本地修改将被还原操作覆盖。"
872 msgid "Commit your changes or stash them to proceed."
873 msgstr "提交您的修改或保存进度后再继续。"
875 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
878 msgid "%s: Unable to write new index file"
879 msgstr "%s:无法写入新索引文件"
882 msgid "Could not resolve HEAD commit\n"
883 msgstr "不能解析 HEAD 提交\n"
886 msgid "Unable to update cache tree\n"
891 msgid "Could not parse commit %s\n"
896 msgid "Could not parse parent commit %s\n"
897 msgstr "不能解析父提交 %s\n"
900 msgid "Your index file is unmerged."
901 msgstr "您的索引文件未完成合并。"
905 msgid "Commit %s is a merge but no -m option was given."
906 msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
910 msgid "Commit %s does not have parent %d"
911 msgstr "提交 %s 没有父提交 %d"
915 msgid "Mainline was specified but commit %s is not a merge."
916 msgstr "指定了主线但提交 %s 不是一个合并。"
918 #. TRANSLATORS: The first %s will be "revert" or
919 #. "cherry-pick", the second %s a SHA1
922 msgid "%s: cannot parse parent commit %s"
923 msgstr "%s:不能解析父提交 %s"
927 msgid "Cannot get commit message for %s"
928 msgstr "不能得到 %s 的提交说明"
932 msgid "could not revert %s... %s"
933 msgstr "不能还原 %s... %s"
937 msgid "could not apply %s... %s"
938 msgstr "不能应用 %s... %s"
941 msgid "empty commit set passed"
946 msgid "git %s: failed to read the index"
947 msgstr "git %s:无法读取索引"
951 msgid "git %s: failed to refresh the index"
952 msgstr "git %s:无法刷新索引"
956 msgid "Cannot %s during a %s"
957 msgstr "无法 %s 在一个 %s 过程中"
961 msgid "Could not parse line %d."
965 msgid "No commits parsed."
970 msgid "Could not open %s"
975 msgid "Could not read %s."
980 msgid "Unusable instruction sheet: %s"
985 msgid "Invalid key: %s"
990 msgid "Invalid value for %s: %s"
995 msgid "Malformed options sheet: %s"
999 msgid "a cherry-pick or revert is already in progress"
1000 msgstr "一个拣选或还原操作已在进行"
1003 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
1004 msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
1008 msgid "Could not create sequencer directory %s"
1009 msgstr "不能创建序列目录 %s"
1011 #: sequencer.c:861 sequencer.c:946
1013 msgid "Error wrapping up %s."
1016 #: sequencer.c:880 sequencer.c:1014
1017 msgid "no cherry-pick or revert in progress"
1018 msgstr "拣选或还原操作并未进行"
1021 msgid "cannot resolve HEAD"
1025 msgid "cannot abort from a branch yet to be born"
1026 msgstr "不能从尚未建立的分支终止"
1028 #: sequencer.c:906 builtin/apply.c:4060
1030 msgid "cannot open %s: %s"
1035 msgid "cannot read %s: %s"
1039 msgid "unexpected end of file"
1044 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
1045 msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
1049 msgid "Could not format %s."
1053 msgid "Can't revert as initial commit"
1057 msgid "Can't cherry-pick into empty head"
1061 msgid "HEAD does not point to a branch"
1062 msgstr "HEAD 没有指向一个分支"
1066 msgid "No such branch: '%s'"
1071 msgid "No upstream configured for branch '%s'"
1072 msgstr "尚未给分支 '%s' 设置上游"
1076 msgid "Upstream branch '%s' not stored as a remote-tracking branch"
1077 msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
1081 msgid "unable to access '%s': %s"
1082 msgstr "不能访问 '%s':%s"
1086 msgid "unable to access '%s'"
1091 msgid "unable to look up current user in the passwd file: %s"
1092 msgstr "无法在口令文件中查询到当前用户:%s"
1095 msgid "no such user"
1099 msgid "Unmerged paths:"
1103 #: wt-status.c:167 wt-status.c:194
1105 msgid " (use \"git reset %s <file>...\" to unstage)"
1106 msgstr " (使用 \"git reset %s <file>...\" 撤出暂存区)"
1109 #: wt-status.c:169 wt-status.c:196
1110 msgid " (use \"git rm --cached <file>...\" to unstage)"
1111 msgstr " (使用 \"git rm --cached <file>...\" 撤出暂存区)"
1115 msgid " (use \"git add <file>...\" to mark resolution)"
1116 msgstr " (使用 \"git add <file>...\" 标记解决方案)"
1119 #: wt-status.c:175 wt-status.c:179
1120 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
1121 msgstr " (酌情使用 \"git add/rm <file>...\" 标记解决方案)"
1125 msgid " (use \"git rm <file>...\" to mark resolution)"
1126 msgstr " (使用 \"git rm <file>...\" 标记解决方案)"
1129 msgid "Changes to be committed:"
1133 msgid "Changes not staged for commit:"
1134 msgstr "尚未暂存以备提交的变更:"
1138 msgid " (use \"git add <file>...\" to update what will be committed)"
1139 msgstr " (使用 \"git add <file>...\" 更新要提交的内容)"
1143 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
1144 msgstr " (使用 \"git add/rm <file>...\" 更新要提交的内容)"
1149 " (use \"git checkout -- <file>...\" to discard changes in working directory)"
1150 msgstr " (使用 \"git checkout -- <file>...\" 丢弃工作区的改动)"
1154 msgid " (commit or discard the untracked or modified content in submodules)"
1155 msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
1160 msgid " (use \"git %s <file>...\" to include in what will be committed)"
1161 msgstr " (使用 \"git %s <file>...\" 以包含要提交的内容)"
1168 msgid "both deleted:"
1172 msgid "added by us:"
1176 msgid "deleted by them:"
1180 msgid "added by them:"
1184 msgid "deleted by us:"
1192 msgid "both modified:"
1195 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1197 msgid "new commits, "
1200 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1202 msgid "modified content, "
1205 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1207 msgid "untracked content, "
1210 # 译者:为保证在输出中对齐,注意调整句中空格!
1213 msgid "new file: %s"
1216 # 译者:为保证在输出中对齐,注意调整句中空格!
1219 msgid "copied: %s -> %s"
1220 msgstr "拷贝: %s -> %s"
1222 # 译者:为保证在输出中对齐,注意调整句中空格!
1228 # 译者:为保证在输出中对齐,注意调整句中空格!
1231 msgid "modified: %s"
1234 # 译者:为保证在输出中对齐,注意调整句中空格!
1237 msgid "renamed: %s -> %s"
1238 msgstr "重命名: %s -> %s"
1240 # 译者:为保证在输出中对齐,注意调整句中空格!
1243 msgid "typechange: %s"
1246 # 译者:为保证在输出中对齐,注意调整句中空格!
1252 # 译者:为保证在输出中对齐,注意调整句中空格!
1255 msgid "unmerged: %s"
1260 msgid "bug: unhandled diff status %c"
1261 msgstr "bug:未处理的差异状态 %c"
1264 msgid "You have unmerged paths."
1268 #: wt-status.c:808 wt-status.c:960
1269 msgid " (fix conflicts and run \"git commit\")"
1270 msgstr " (解决冲突并运行 \"git commit\")"
1273 msgid "All conflicts fixed but you are still merging."
1274 msgstr "所有冲突已解决但您仍处于合并中。"
1278 msgid " (use \"git commit\" to conclude merge)"
1279 msgstr " (使用 \"git commit\" 结束合并)"
1282 msgid "You are in the middle of an am session."
1283 msgstr "您正处于一个 am 过程中。"
1286 msgid "The current patch is empty."
1291 msgid " (fix conflicts and then run \"git am --resolved\")"
1292 msgstr " (解决冲突,然后运行 \"git am --resolved\")"
1296 msgid " (use \"git am --skip\" to skip this patch)"
1297 msgstr " (使用 \"git am --skip\" 跳过此补丁)"
1301 msgid " (use \"git am --abort\" to restore the original branch)"
1302 msgstr " (使用 \"git am --abort\" 恢复原有分支)"
1304 #: wt-status.c:895 wt-status.c:912
1306 msgid "You are currently rebasing branch '%s' on '%s'."
1307 msgstr "您正在将分支 '%s' 变基到 '%s'。"
1309 #: wt-status.c:900 wt-status.c:917
1310 msgid "You are currently rebasing."
1315 msgid " (fix conflicts and then run \"git rebase --continue\")"
1316 msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
1320 msgid " (use \"git rebase --skip\" to skip this patch)"
1321 msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
1325 msgid " (use \"git rebase --abort\" to check out the original branch)"
1326 msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
1330 msgid " (all conflicts fixed: run \"git rebase --continue\")"
1331 msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
1336 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
1337 msgstr "您正在将分支 '%s' 变基到 '%s' 过程中拆分一个提交。"
1340 msgid "You are currently splitting a commit during a rebase."
1341 msgstr "您正在变基过程中拆分一个提交。"
1345 msgid " (Once your working directory is clean, run \"git rebase --continue\")"
1346 msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
1350 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
1351 msgstr "您正在将分支 '%s' 变基到 '%s' 过程中编辑一个提交。"
1354 msgid "You are currently editing a commit during a rebase."
1355 msgstr "您正在变基过程中编辑一个提交。"
1359 msgid " (use \"git commit --amend\" to amend the current commit)"
1360 msgstr " (使用 \"git commit --amend\" 修补当前提交)"
1365 " (use \"git rebase --continue\" once you are satisfied with your changes)"
1366 msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
1369 msgid "You are currently cherry-picking."
1374 msgid " (all conflicts fixed: run \"git commit\")"
1375 msgstr " (解决所有冲突后,执行 \"git commit\")"
1379 msgid "You are currently reverting commit %s."
1380 msgstr "您正在反转提交 %s 。"
1384 msgid " (fix conflicts and run \"git revert --continue\")"
1385 msgstr " (解决冲突并运行 \"git revert --continue\")"
1389 msgid " (all conflicts fixed: run \"git revert --continue\")"
1390 msgstr " (所有冲突已解决:运行 \"git revert --continue\")"
1394 msgid " (use \"git revert --abort\" to cancel the revert operation)"
1395 msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
1399 msgid "You are currently bisecting, started from branch '%s'."
1400 msgstr "您正在从分支 '%s' 开始做二分查找。"
1403 msgid "You are currently bisecting."
1408 msgid " (use \"git bisect reset\" to get back to the original branch)"
1409 msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
1416 msgid "HEAD detached at "
1420 msgid "HEAD detached from "
1424 msgid "Not currently on any branch."
1428 msgid "Initial commit"
1432 msgid "Untracked files"
1436 msgid "Ignored files"
1442 msgid "It took %.2f seconds to enumerate untracked files. 'status -uno'"
1443 msgstr "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno'"
1447 msgid "may speed it up, but you have to be careful not to forget to add"
1448 msgstr "也许能提高速度,但您需要小心不要忘了添加新文件"
1451 msgid "new files yourself (see 'git help status')."
1452 msgstr "(参见 'git help status')。"
1456 msgid "Untracked files not listed%s"
1457 msgstr "未跟踪的文件没有列出%s"
1459 # 译者:中文字符串拼接,可删除前导空格
1461 msgid " (use -u option to show untracked files)"
1462 msgstr "(使用 -u 参数显示未跟踪的文件)"
1470 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
1471 msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
1475 msgid "no changes added to commit\n"
1481 "nothing added to commit but untracked files present (use \"git add\" to "
1483 msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
1487 msgid "nothing added to commit but untracked files present\n"
1488 msgstr "提交为空,但是存在尚未跟踪的文件\n"
1490 # 译者:中文字符串拼接,可删除前导空格
1493 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
1494 msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
1496 #: wt-status.c:1266 wt-status.c:1271
1498 msgid "nothing to commit\n"
1501 # 译者:中文字符串拼接,可删除前导空格
1504 msgid "nothing to commit (use -u to show untracked files)\n"
1505 msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
1507 # 译者:中文字符串拼接,可删除前导空格
1510 msgid "nothing to commit, working directory clean\n"
1511 msgstr "无文件要提交,干净的工作区\n"
1514 msgid "HEAD (no branch)"
1519 msgid "Initial commit on "
1528 #: wt-status.c:1405 wt-status.c:1408
1537 #: compat/precompose_utf8.c:58 builtin/clone.c:342
1539 msgid "failed to unlink '%s'"
1543 msgid "git add [options] [--] <pathspec>..."
1544 msgstr "git add [选项] [--] <路径匹配>..."
1548 msgid "unexpected diff status %c"
1551 #: builtin/add.c:68 builtin/commit.c:233
1552 msgid "updating files failed"
1557 msgid "remove '%s'\n"
1560 #: builtin/add.c:148
1561 msgid "Unstaged changes after refreshing the index:"
1562 msgstr "刷新索引之后尚未被暂存的变更:"
1564 #: builtin/add.c:151 builtin/add.c:460 builtin/rm.c:275
1566 msgid "pathspec '%s' did not match any files"
1567 msgstr "路径 '%s' 未匹配任何文件"
1569 #: builtin/add.c:234
1570 msgid "Could not read the index"
1573 #: builtin/add.c:244
1575 msgid "Could not open '%s' for writing."
1576 msgstr "不能打开 '%s' 以写入。"
1578 #: builtin/add.c:248
1579 msgid "Could not write patch"
1582 #: builtin/add.c:253
1584 msgid "Could not stat '%s'"
1585 msgstr "不能查看文件状态 '%s'"
1587 #: builtin/add.c:255
1588 msgid "Empty patch. Aborted."
1591 #: builtin/add.c:261
1593 msgid "Could not apply '%s'"
1596 #: builtin/add.c:271
1597 msgid "The following paths are ignored by one of your .gitignore files:\n"
1598 msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
1600 #: builtin/add.c:277 builtin/clean.c:161 builtin/fetch.c:78 builtin/mv.c:63
1601 #: builtin/prune-packed.c:76 builtin/push.c:425 builtin/remote.c:1253
1606 #: builtin/add.c:278 builtin/apply.c:4409 builtin/check-ignore.c:19
1607 #: builtin/commit.c:1152 builtin/count-objects.c:95 builtin/fsck.c:613
1608 #: builtin/log.c:1514 builtin/mv.c:62 builtin/read-tree.c:112
1612 #: builtin/add.c:280
1613 msgid "interactive picking"
1616 #: builtin/add.c:281 builtin/checkout.c:1060 builtin/reset.c:258
1617 msgid "select hunks interactively"
1620 #: builtin/add.c:282
1621 msgid "edit current diff and apply"
1624 #: builtin/add.c:283
1625 msgid "allow adding otherwise ignored files"
1628 #: builtin/add.c:284
1629 msgid "update tracked files"
1632 #: builtin/add.c:285
1633 msgid "record only the fact that the path will be added later"
1634 msgstr "只记录,该路径稍后再添加"
1636 #: builtin/add.c:286
1637 msgid "add changes from all tracked and untracked files"
1638 msgstr "添加所有改变的已跟踪文件和未跟踪文件"
1640 #: builtin/add.c:287
1641 msgid "don't add, only refresh the index"
1644 #: builtin/add.c:288
1645 msgid "just skip files which cannot be added because of errors"
1646 msgstr "跳过因出错不能添加的文件"
1648 #: builtin/add.c:289
1649 msgid "check if - even missing - files are ignored in dry run"
1650 msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
1652 #: builtin/add.c:311
1654 msgid "Use -f if you really want to add them.\n"
1655 msgstr "使用 -f 参数如果您确实要添加它们。\n"
1657 #: builtin/add.c:312
1658 msgid "no files added"
1661 #: builtin/add.c:318
1662 msgid "adding files failed"
1665 # 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
1667 #. * To be consistent with "git add -p" and most Git
1668 #. * commands, we should default to being tree-wide, but
1669 #. * this is not the original behavior and can't be
1670 #. * changed until users trained themselves not to type
1671 #. * "git add -u" or "git add -A". For now, we warn and
1672 #. * keep the old behavior. Later, the behavior can be changed
1673 #. * to tree-wide, keeping the warning for a while, and
1674 #. * eventually we can drop the warning.
1676 #: builtin/add.c:335
1679 "The behavior of 'git add %s (or %s)' with no path argument from a\n"
1680 "subdirectory of the tree will change in Git 2.0 and should not be used "
1682 "To add content for the whole tree, run:\n"
1685 " (or git add %s :/)\n"
1687 "To restrict the command to the current directory, run:\n"
1690 " (or git add %s .)\n"
1692 "With the current Git version, the command is restricted to the current "
1695 "在 Git 2.0 版本,将不再允许在一个子目录下不带任何路径参数地执行\n"
1696 "命令 'git add %s (或 %s)'。所以不要再继续使用了。\n"
1697 "如果要添加整个目录树的内容,执行:\n"
1700 " (或 git add %s :/)\n"
1702 "如果要限制该命令只作用于当前目录,执行:\n"
1705 " (或 git add %s .)\n"
1707 "对于当前版本的 Git,这条命令只作用于当前目录。"
1709 #: builtin/add.c:381
1710 msgid "-A and -u are mutually incompatible"
1711 msgstr "-A 和 -u 选项互斥"
1713 #: builtin/add.c:383
1714 msgid "Option --ignore-missing can only be used together with --dry-run"
1715 msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
1717 #: builtin/add.c:414
1719 msgid "Nothing specified, nothing added.\n"
1720 msgstr "没有指定文件,也没有文件被添加。\n"
1722 #: builtin/add.c:415
1724 msgid "Maybe you wanted to say 'git add .'?\n"
1725 msgstr "也许您想要执行 'git add .'?\n"
1727 #: builtin/add.c:421 builtin/check-ignore.c:67 builtin/clean.c:204
1728 #: builtin/commit.c:293 builtin/mv.c:82 builtin/rm.c:235
1729 msgid "index file corrupt"
1732 #: builtin/add.c:481 builtin/apply.c:4505 builtin/mv.c:229 builtin/rm.c:370
1733 msgid "Unable to write new index file"
1736 #: builtin/apply.c:57
1737 msgid "git apply [options] [<patch>...]"
1738 msgstr "git apply [选项] [<补丁>...]"
1740 #: builtin/apply.c:110
1742 msgid "unrecognized whitespace option '%s'"
1743 msgstr "未能识别的空白字符选项 '%s'"
1745 #: builtin/apply.c:125
1747 msgid "unrecognized whitespace ignore option '%s'"
1748 msgstr "未能识别的空白字符忽略选项 '%s'"
1750 #: builtin/apply.c:823
1752 msgid "Cannot prepare timestamp regexp %s"
1753 msgstr "无法准备时间戳正则表达式 %s"
1755 #: builtin/apply.c:832
1757 msgid "regexec returned %d for input: %s"
1758 msgstr "regexec 返回 %d,输入为:%s"
1760 #: builtin/apply.c:913
1762 msgid "unable to find filename in patch at line %d"
1763 msgstr "不能在补丁的第 %d 行找到文件名"
1765 #: builtin/apply.c:945
1767 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
1768 msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
1770 #: builtin/apply.c:949
1772 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
1773 msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
1775 #: builtin/apply.c:950
1777 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
1778 msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
1780 #: builtin/apply.c:957
1782 msgid "git apply: bad git-diff - expected /dev/null on line %d"
1783 msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
1785 #: builtin/apply.c:1422
1787 msgid "recount: unexpected line: %.*s"
1788 msgstr "recount:意外的行:%.*s"
1790 #: builtin/apply.c:1479
1792 msgid "patch fragment without header at line %d: %.*s"
1793 msgstr "第 %d 行的补丁片段没有头信息:%.*s"
1795 #: builtin/apply.c:1496
1798 "git diff header lacks filename information when removing %d leading pathname "
1799 "component (line %d)"
1801 "git diff header lacks filename information when removing %d leading pathname "
1802 "components (line %d)"
1803 msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
1804 msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
1806 #: builtin/apply.c:1656
1807 msgid "new file depends on old contents"
1810 #: builtin/apply.c:1658
1811 msgid "deleted file still has contents"
1814 #: builtin/apply.c:1684
1816 msgid "corrupt patch at line %d"
1817 msgstr "补丁在第 %d 行损坏"
1819 #: builtin/apply.c:1720
1821 msgid "new file %s depends on old contents"
1822 msgstr "新文件 %s 依赖旧内容"
1824 #: builtin/apply.c:1722
1826 msgid "deleted file %s still has contents"
1827 msgstr "删除的文件 %s 仍有内容"
1829 #: builtin/apply.c:1725
1831 msgid "** warning: file %s becomes empty but is not deleted"
1832 msgstr "** 警告:文件 %s 成为空文件但并未删除"
1834 #: builtin/apply.c:1871
1836 msgid "corrupt binary patch at line %d: %.*s"
1837 msgstr "二进制补丁在第 %d 行损坏:%.*s"
1839 #. there has to be one hunk (forward hunk)
1840 #: builtin/apply.c:1900
1842 msgid "unrecognized binary patch at line %d"
1843 msgstr "未能识别的二进制补丁位于第 %d 行"
1845 #: builtin/apply.c:1986
1847 msgid "patch with only garbage at line %d"
1848 msgstr "补丁文件的第 %d 行只有垃圾数据"
1850 #: builtin/apply.c:2076
1852 msgid "unable to read symlink %s"
1853 msgstr "无法读取符号链接 %s"
1855 #: builtin/apply.c:2080
1857 msgid "unable to open or read %s"
1860 #: builtin/apply.c:2688
1862 msgid "invalid start of line: '%c'"
1863 msgstr "无效的行首字符:'%c'"
1865 #: builtin/apply.c:2806
1867 msgid "Hunk #%d succeeded at %d (offset %d line)."
1868 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1869 msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
1870 msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
1872 #: builtin/apply.c:2818
1874 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
1875 msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
1877 #: builtin/apply.c:2824
1880 "while searching for:\n"
1886 #: builtin/apply.c:2843
1888 msgid "missing binary patch data for '%s'"
1889 msgstr "缺失 '%s' 的二进制补丁数据"
1891 #: builtin/apply.c:2946
1893 msgid "binary patch does not apply to '%s'"
1894 msgstr "二进制补丁未应用到 '%s'"
1896 #: builtin/apply.c:2952
1898 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1899 msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
1901 #: builtin/apply.c:2973
1903 msgid "patch failed: %s:%ld"
1904 msgstr "打补丁失败:%s:%ld"
1906 #: builtin/apply.c:3095
1908 msgid "cannot checkout %s"
1911 #: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3193
1913 msgid "read of %s failed"
1916 #: builtin/apply.c:3173 builtin/apply.c:3395
1918 msgid "path %s has been renamed/deleted"
1919 msgstr "路径 %s 已经被重命名/删除"
1921 #: builtin/apply.c:3254 builtin/apply.c:3409
1923 msgid "%s: does not exist in index"
1926 #: builtin/apply.c:3258 builtin/apply.c:3401 builtin/apply.c:3423
1931 #: builtin/apply.c:3263 builtin/apply.c:3417
1933 msgid "%s: does not match index"
1936 #: builtin/apply.c:3365
1937 msgid "removal patch leaves file contents"
1938 msgstr "移除补丁仍留下了文件内容"
1940 #: builtin/apply.c:3434
1942 msgid "%s: wrong type"
1945 #: builtin/apply.c:3436
1947 msgid "%s has type %o, expected %o"
1948 msgstr "%s 的类型是 %o,应为 %o"
1950 #: builtin/apply.c:3537
1952 msgid "%s: already exists in index"
1953 msgstr "%s:已经存在于索引中"
1955 #: builtin/apply.c:3540
1957 msgid "%s: already exists in working directory"
1958 msgstr "%s:已经存在于工作区中"
1960 #: builtin/apply.c:3560
1962 msgid "new mode (%o) of %s does not match old mode (%o)"
1963 msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
1965 #: builtin/apply.c:3565
1967 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1968 msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
1970 #: builtin/apply.c:3573
1972 msgid "%s: patch does not apply"
1975 #: builtin/apply.c:3586
1977 msgid "Checking patch %s..."
1980 #: builtin/apply.c:3679 builtin/checkout.c:215 builtin/reset.c:124
1982 msgid "make_cache_entry failed for path '%s'"
1983 msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
1985 #: builtin/apply.c:3822
1987 msgid "unable to remove %s from index"
1988 msgstr "不能从索引中移除 %s"
1990 #: builtin/apply.c:3850
1992 msgid "corrupt patch for subproject %s"
1993 msgstr "子项目 %s 损坏的补丁"
1995 #: builtin/apply.c:3854
1997 msgid "unable to stat newly created file '%s'"
1998 msgstr "不能枚举新建文件 '%s' 的状态"
2000 #: builtin/apply.c:3859
2002 msgid "unable to create backing store for newly created file %s"
2003 msgstr "不能为新建文件 %s 创建后端存储"
2005 #: builtin/apply.c:3862 builtin/apply.c:3970
2007 msgid "unable to add cache entry for %s"
2008 msgstr "无法为 %s 添加缓存条目"
2010 #: builtin/apply.c:3895
2012 msgid "closing file '%s'"
2015 #: builtin/apply.c:3944
2017 msgid "unable to write file '%s' mode %o"
2018 msgstr "不能写文件 '%s' 权限 %o"
2020 #: builtin/apply.c:4031
2022 msgid "Applied patch %s cleanly."
2025 #: builtin/apply.c:4039
2026 msgid "internal error"
2029 #. Say this even without --verbose
2030 #: builtin/apply.c:4042
2032 msgid "Applying patch %%s with %d reject..."
2033 msgid_plural "Applying patch %%s with %d rejects..."
2034 msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
2035 msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
2037 #: builtin/apply.c:4052
2039 msgid "truncating .rej filename to %.*s.rej"
2040 msgstr "截短 .rej 文件名为 %.*s.rej"
2042 #: builtin/apply.c:4073
2044 msgid "Hunk #%d applied cleanly."
2045 msgstr "第 #%d 个片段成功应用。"
2047 #: builtin/apply.c:4076
2049 msgid "Rejected hunk #%d."
2050 msgstr "拒绝第 #%d 个片段。"
2052 #: builtin/apply.c:4226
2053 msgid "unrecognized input"
2056 #: builtin/apply.c:4237
2057 msgid "unable to read index file"
2060 #: builtin/apply.c:4356 builtin/apply.c:4359 builtin/clone.c:92
2061 #: builtin/fetch.c:63
2065 #: builtin/apply.c:4357
2066 msgid "don't apply changes matching the given path"
2067 msgstr "不要应用与给出路径向匹配的变更"
2069 #: builtin/apply.c:4360
2070 msgid "apply changes matching the given path"
2071 msgstr "应用与给出路径向匹配的变更"
2073 #: builtin/apply.c:4362
2077 #: builtin/apply.c:4363
2078 msgid "remove <num> leading slashes from traditional diff paths"
2079 msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
2081 #: builtin/apply.c:4366
2082 msgid "ignore additions made by the patch"
2083 msgstr "忽略补丁中的添加的文件"
2085 #: builtin/apply.c:4368
2086 msgid "instead of applying the patch, output diffstat for the input"
2087 msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
2089 #: builtin/apply.c:4372
2090 msgid "show number of added and deleted lines in decimal notation"
2091 msgstr "以十进制数显示添加和删除的行数"
2093 #: builtin/apply.c:4374
2094 msgid "instead of applying the patch, output a summary for the input"
2095 msgstr "不应用补丁,而是显示输入的概要"
2097 #: builtin/apply.c:4376
2098 msgid "instead of applying the patch, see if the patch is applicable"
2099 msgstr "不应用补丁,而是查看补丁是否可应用"
2101 #: builtin/apply.c:4378
2102 msgid "make sure the patch is applicable to the current index"
2103 msgstr "确认补丁可以应用到当前索引"
2105 #: builtin/apply.c:4380
2106 msgid "apply a patch without touching the working tree"
2107 msgstr "应用补丁而不修改工作区"
2109 #: builtin/apply.c:4382
2110 msgid "also apply the patch (use with --stat/--summary/--check)"
2111 msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
2113 #: builtin/apply.c:4384
2114 msgid "attempt three-way merge if a patch does not apply"
2115 msgstr "如果一个补丁不能应用则尝试三路合并"
2117 #: builtin/apply.c:4386
2118 msgid "build a temporary index based on embedded index information"
2119 msgstr "创建一个临时索引基于嵌入的索引信息"
2121 #: builtin/apply.c:4388 builtin/checkout-index.c:197 builtin/ls-files.c:463
2122 msgid "paths are separated with NUL character"
2123 msgstr "路径以 NUL 字符分隔"
2125 #: builtin/apply.c:4391
2126 msgid "ensure at least <n> lines of context match"
2127 msgstr "确保至少匹配 <n> 行上下文"
2129 #: builtin/apply.c:4392
2133 #: builtin/apply.c:4393
2134 msgid "detect new or modified lines that have whitespace errors"
2135 msgstr "检查新增和修改的行中间的空白字符滥用"
2137 #: builtin/apply.c:4396 builtin/apply.c:4399
2138 msgid "ignore changes in whitespace when finding context"
2139 msgstr "查找上下文时忽略空白字符的变更"
2141 #: builtin/apply.c:4402
2142 msgid "apply the patch in reverse"
2145 #: builtin/apply.c:4404
2146 msgid "don't expect at least one line of context"
2149 #: builtin/apply.c:4406
2150 msgid "leave the rejected hunks in corresponding *.rej files"
2151 msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
2153 #: builtin/apply.c:4408
2154 msgid "allow overlapping hunks"
2157 #: builtin/apply.c:4411
2158 msgid "tolerate incorrectly detected missing new-line at the end of file"
2159 msgstr "允许不正确的文件末尾换行符"
2161 #: builtin/apply.c:4414
2162 msgid "do not trust the line counts in the hunk headers"
2163 msgstr "不信任补丁片段的头信息中的行号"
2165 #: builtin/apply.c:4416
2169 #: builtin/apply.c:4417
2170 msgid "prepend <root> to all filenames"
2171 msgstr "为所有文件名前添加 <根目录>"
2173 #: builtin/apply.c:4439
2174 msgid "--3way outside a repository"
2175 msgstr "--3way 在一个版本库之外"
2177 #: builtin/apply.c:4447
2178 msgid "--index outside a repository"
2179 msgstr "--index 在一个版本库之外"
2181 #: builtin/apply.c:4450
2182 msgid "--cached outside a repository"
2183 msgstr "--cached 在一个版本库之外"
2185 #: builtin/apply.c:4466
2187 msgid "can't open patch '%s'"
2188 msgstr "不能打开补丁 '%s'"
2190 #: builtin/apply.c:4480
2192 msgid "squelched %d whitespace error"
2193 msgid_plural "squelched %d whitespace errors"
2194 msgstr[0] "抑制下仍有 %d 个空白字符误用"
2195 msgstr[1] "抑制下仍有 %d 个空白字符误用"
2197 #: builtin/apply.c:4486 builtin/apply.c:4496
2199 msgid "%d line adds whitespace errors."
2200 msgid_plural "%d lines add whitespace errors."
2201 msgstr[0] "%d 行有空白字符误用。"
2202 msgstr[1] "%d 行有空白字符误用。"
2204 #: builtin/archive.c:17
2206 msgid "could not create archive file '%s'"
2207 msgstr "不能创建归档文件 '%s'"
2209 #: builtin/archive.c:20
2210 msgid "could not redirect output"
2213 #: builtin/archive.c:37
2214 msgid "git archive: Remote with no URL"
2215 msgstr "git archive:未提供远程URL"
2217 #: builtin/archive.c:58
2218 msgid "git archive: expected ACK/NAK, got EOF"
2219 msgstr "git archive:应为ACK/NACK,却得到EOF"
2221 #: builtin/archive.c:61
2223 msgid "git archive: NACK %s"
2224 msgstr "git archive:NACK %s"
2226 #: builtin/archive.c:63
2228 msgid "remote error: %s"
2231 #: builtin/archive.c:64
2232 msgid "git archive: protocol error"
2233 msgstr "git archive:协议错误"
2235 #: builtin/archive.c:68
2236 msgid "git archive: expected a flush"
2237 msgstr "git archive:应为刷新"
2239 #: builtin/bisect--helper.c:7
2240 msgid "git bisect--helper --next-all [--no-checkout]"
2241 msgstr "git bisect--helper --next-all [--no-checkout]"
2243 #: builtin/bisect--helper.c:17
2244 msgid "perform 'git bisect next'"
2245 msgstr "执行 'git bisect next'"
2247 #: builtin/bisect--helper.c:19
2248 msgid "update BISECT_HEAD instead of checking out the current commit"
2249 msgstr "更新 BISECT_HEAD 而非检出当前提交"
2251 #: builtin/blame.c:25
2252 msgid "git blame [options] [rev-opts] [rev] [--] file"
2253 msgstr "git blame [选项] [版本选项] [版本] [--] 文件"
2255 #: builtin/blame.c:30 builtin/shortlog.c:15
2256 msgid "[rev-opts] are documented in git-rev-list(1)"
2257 msgstr "[版本选项] 的文档记录在 git-rev-list(1) 中"
2259 #: builtin/blame.c:2350
2260 msgid "Show blame entries as we find them, incrementally"
2261 msgstr "增量式地显示发现的 blame 条目"
2263 #: builtin/blame.c:2351
2264 msgid "Show blank SHA-1 for boundary commits (Default: off)"
2265 msgstr "边界提交显示空的 SHA-1(默认:关闭)"
2267 #: builtin/blame.c:2352
2268 msgid "Do not treat root commits as boundaries (Default: off)"
2269 msgstr "不把根提交作为边界(默认:关闭)"
2271 #: builtin/blame.c:2353
2272 msgid "Show work cost statistics"
2275 #: builtin/blame.c:2354
2276 msgid "Show output score for blame entries"
2277 msgstr "显示判断 blame 条目位移的得分诊断信息"
2279 #: builtin/blame.c:2355
2280 msgid "Show original filename (Default: auto)"
2281 msgstr "显示原始文件名(默认:自动)"
2283 #: builtin/blame.c:2356
2284 msgid "Show original linenumber (Default: off)"
2285 msgstr "显示原始的行号(默认:关闭)"
2287 #: builtin/blame.c:2357
2288 msgid "Show in a format designed for machine consumption"
2289 msgstr "显示为一个适合机器读取的格式"
2291 #: builtin/blame.c:2358
2292 msgid "Show porcelain format with per-line commit information"
2293 msgstr "为每一行显示机器适用的提交信息"
2295 #: builtin/blame.c:2359
2296 msgid "Use the same output mode as git-annotate (Default: off)"
2297 msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
2299 #: builtin/blame.c:2360
2300 msgid "Show raw timestamp (Default: off)"
2301 msgstr "显示原始时间戳(默认:关闭)"
2303 #: builtin/blame.c:2361
2304 msgid "Show long commit SHA1 (Default: off)"
2305 msgstr "显示长的SHA1提交号(默认:关闭)"
2307 #: builtin/blame.c:2362
2308 msgid "Suppress author name and timestamp (Default: off)"
2309 msgstr "隐藏作者名字和时间戳(默认:关闭)"
2311 #: builtin/blame.c:2363
2312 msgid "Show author email instead of name (Default: off)"
2313 msgstr "显示作者的邮箱而不是名字(默认:关闭)"
2315 #: builtin/blame.c:2364
2316 msgid "Ignore whitespace differences"
2319 #: builtin/blame.c:2365
2320 msgid "Spend extra cycles to find better match"
2321 msgstr "花费额外的循环来找到更好的匹配"
2323 #: builtin/blame.c:2366
2324 msgid "Use revisions from <file> instead of calling git-rev-list"
2325 msgstr "使用来自 <file> 的修订集而不是调用 git-rev-list"
2327 #: builtin/blame.c:2367
2328 msgid "Use <file>'s contents as the final image"
2329 msgstr "使用 <file> 的内容作为最终的图片"
2331 #: builtin/blame.c:2368 builtin/blame.c:2369
2335 #: builtin/blame.c:2368
2336 msgid "Find line copies within and across files"
2337 msgstr "找到文件内及跨文件的行拷贝"
2339 #: builtin/blame.c:2369
2340 msgid "Find line movements within and across files"
2341 msgstr "找到文件内及跨文件的行移动"
2343 #: builtin/blame.c:2370
2347 #: builtin/blame.c:2370
2348 msgid "Process only line range n,m, counting from 1"
2349 msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
2351 #: builtin/branch.c:24
2352 msgid "git branch [options] [-r | -a] [--merged | --no-merged]"
2353 msgstr "git branch [选项] [-r | -a] [--merged | --no-merged]"
2355 #: builtin/branch.c:25
2356 msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]"
2357 msgstr "git branch [选项] [-l] [-f] <分支名> [<起始点>]"
2359 #: builtin/branch.c:26
2360 msgid "git branch [options] [-r] (-d | -D) <branchname>..."
2361 msgstr "git branch [选项] [-r] (-d | -D) <分支名>..."
2363 #: builtin/branch.c:27
2364 msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"
2365 msgstr "git branch [选项] (-m | -M) [<旧分支>] <新分支>"
2367 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
2368 #: builtin/branch.c:146
2371 "deleting branch '%s' that has been merged to\n"
2372 " '%s', but not yet merged to HEAD."
2374 "将要删除的分支 '%s' 已经被合并到\n"
2377 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
2378 #: builtin/branch.c:150
2381 "not deleting branch '%s' that is not yet merged to\n"
2382 " '%s', even though it is merged to HEAD."
2384 "并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
2385 " 然而却尚未被合并到分支 '%s' 。"
2387 #: builtin/branch.c:164
2389 msgid "Couldn't look up commit object for '%s'"
2390 msgstr "无法查询 '%s' 指向的提交对象"
2392 #: builtin/branch.c:168
2395 "The branch '%s' is not fully merged.\n"
2396 "If you are sure you want to delete it, run 'git branch -D %s'."
2399 "如果您确认要删除它,执行 'git branch -D %s'。"
2401 #: builtin/branch.c:181
2402 msgid "Update of config-file failed"
2403 msgstr "无法更新 config 文件"
2405 #: builtin/branch.c:209
2406 msgid "cannot use -a with -d"
2407 msgstr "不能将 -a 和 -d 同时使用"
2409 #: builtin/branch.c:215
2410 msgid "Couldn't look up commit object for HEAD"
2411 msgstr "无法查询 HEAD 指向的提交对象"
2413 #: builtin/branch.c:223
2415 msgid "Cannot delete the branch '%s' which you are currently on."
2416 msgstr "无法删除您当前所在的分支 '%s'。"
2418 #: builtin/branch.c:236
2420 msgid "remote branch '%s' not found."
2421 msgstr "远程分支 '%s' 未发现。"
2423 #: builtin/branch.c:237
2425 msgid "branch '%s' not found."
2426 msgstr "分支 '%s' 未发现。"
2428 #: builtin/branch.c:251
2430 msgid "Error deleting remote branch '%s'"
2431 msgstr "删除远程分支 '%s' 时出错"
2433 #: builtin/branch.c:252
2435 msgid "Error deleting branch '%s'"
2436 msgstr "删除分支 '%s' 时出错"
2438 #: builtin/branch.c:259
2440 msgid "Deleted remote branch %s (was %s).\n"
2441 msgstr "已删除远程分支 %s(曾为 %s)。\n"
2443 #: builtin/branch.c:260
2445 msgid "Deleted branch %s (was %s).\n"
2446 msgstr "已删除分支 %s(曾为 %s)。\n"
2448 #: builtin/branch.c:362
2450 msgid "branch '%s' does not point at a commit"
2451 msgstr "分支 '%s' 未指向一个提交"
2453 #: builtin/branch.c:434
2455 msgid "[%s: behind %d]"
2458 #: builtin/branch.c:436
2463 #: builtin/branch.c:440
2465 msgid "[%s: ahead %d]"
2468 #: builtin/branch.c:442
2473 #: builtin/branch.c:445
2475 msgid "[%s: ahead %d, behind %d]"
2476 msgstr "[%s:领先 %d,落后 %d]"
2478 #: builtin/branch.c:448
2480 msgid "[ahead %d, behind %d]"
2481 msgstr "[领先 %d,落后 %d]"
2483 #: builtin/branch.c:470
2484 msgid " **** invalid ref ****"
2485 msgstr " **** 无效引用 ****"
2487 #: builtin/branch.c:562
2489 msgid "(no branch, rebasing %s)"
2490 msgstr "(非分支,正变基 %s)"
2492 #: builtin/branch.c:565
2494 msgid "(no branch, bisect started on %s)"
2495 msgstr "(非分支,二分查找开始于 %s)"
2497 #: builtin/branch.c:568
2499 msgid "(detached from %s)"
2502 #: builtin/branch.c:571
2506 #: builtin/branch.c:617
2508 msgid "object '%s' does not point to a commit"
2509 msgstr "对象 '%s' 没有指向一个提交"
2511 #: builtin/branch.c:649
2512 msgid "some refs could not be read"
2515 #: builtin/branch.c:662
2516 msgid "cannot rename the current branch while not on any."
2517 msgstr "无法重命名当前分支因为不处于任何分支上。"
2519 #: builtin/branch.c:672
2521 msgid "Invalid branch name: '%s'"
2522 msgstr "无效的分支名:'%s'"
2524 #: builtin/branch.c:687
2525 msgid "Branch rename failed"
2528 #: builtin/branch.c:691
2530 msgid "Renamed a misnamed branch '%s' away"
2531 msgstr "重命名掉一个错误命名的旧分支 '%s'"
2533 #: builtin/branch.c:695
2535 msgid "Branch renamed to %s, but HEAD is not updated!"
2536 msgstr "分支重命名为 %s,但 HEAD 没有更新!"
2538 #: builtin/branch.c:702
2539 msgid "Branch is renamed, but update of config-file failed"
2540 msgstr "分支被重命名,但更新 config 文件失败"
2542 #: builtin/branch.c:717
2544 msgid "malformed object name %s"
2547 #: builtin/branch.c:741
2549 msgid "could not write branch description template: %s"
2550 msgstr "不能写分支描述模版:%s"
2552 #: builtin/branch.c:771
2553 msgid "Generic options"
2556 #: builtin/branch.c:773
2557 msgid "show hash and subject, give twice for upstream branch"
2558 msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
2560 #: builtin/branch.c:774
2561 msgid "suppress informational messages"
2564 #: builtin/branch.c:775
2565 msgid "set up tracking mode (see git-pull(1))"
2566 msgstr "设置跟踪模式(参见 git-pull(1))"
2568 #: builtin/branch.c:777
2569 msgid "change upstream info"
2572 #: builtin/branch.c:781
2573 msgid "use colored output"
2576 #: builtin/branch.c:782
2577 msgid "act on remote-tracking branches"
2580 #: builtin/branch.c:785 builtin/branch.c:791 builtin/branch.c:812
2581 #: builtin/branch.c:818 builtin/commit.c:1368 builtin/commit.c:1369
2582 #: builtin/commit.c:1370 builtin/commit.c:1371 builtin/tag.c:468
2586 #: builtin/branch.c:786 builtin/branch.c:792
2587 msgid "print only branches that contain the commit"
2588 msgstr "只打印包含该提交的分支"
2590 #: builtin/branch.c:798
2591 msgid "Specific git-branch actions:"
2592 msgstr "具体的 git-branch 动作:"
2594 #: builtin/branch.c:799
2595 msgid "list both remote-tracking and local branches"
2596 msgstr "列出远程跟踪及本地分支"
2598 #: builtin/branch.c:801
2599 msgid "delete fully merged branch"
2602 #: builtin/branch.c:802
2603 msgid "delete branch (even if not merged)"
2604 msgstr "删除分支(即使没有合并)"
2606 #: builtin/branch.c:803
2607 msgid "move/rename a branch and its reflog"
2608 msgstr "移动/重命名一个分支,以及它的引用日志"
2610 #: builtin/branch.c:804
2611 msgid "move/rename a branch, even if target exists"
2612 msgstr "移动/重命名一个分支,即使目标已存在"
2614 #: builtin/branch.c:805
2615 msgid "list branch names"
2618 #: builtin/branch.c:806
2619 msgid "create the branch's reflog"
2622 #: builtin/branch.c:808
2623 msgid "edit the description for the branch"
2626 #: builtin/branch.c:809
2627 msgid "force creation (when already exists)"
2628 msgstr "强制创建(当已经存在)"
2630 #: builtin/branch.c:812
2631 msgid "print only not merged branches"
2634 #: builtin/branch.c:818
2635 msgid "print only merged branches"
2638 #: builtin/branch.c:822
2639 msgid "list branches in columns"
2642 #: builtin/branch.c:835
2643 msgid "Failed to resolve HEAD as a valid ref."
2644 msgstr "无法将 HEAD 解析为有效引用。"
2646 #: builtin/branch.c:840 builtin/clone.c:609
2647 msgid "HEAD not found below refs/heads!"
2648 msgstr "HEAD 没有位于 /refs/heads 之下!"
2650 #: builtin/branch.c:863
2651 msgid "--column and --verbose are incompatible"
2652 msgstr "--column 和 --verbose 不兼容"
2654 #: builtin/branch.c:869 builtin/branch.c:908
2655 msgid "branch name required"
2658 #: builtin/branch.c:884
2659 msgid "Cannot give description to detached HEAD"
2660 msgstr "不能向分离头指针提供描述"
2662 #: builtin/branch.c:889
2663 msgid "cannot edit description of more than one branch"
2664 msgstr "不能为一个以上的分支编辑描述"
2666 #: builtin/branch.c:896
2668 msgid "No commit on branch '%s' yet."
2669 msgstr "分支 '%s' 尚无提交。"
2671 #: builtin/branch.c:899
2673 msgid "No branch named '%s'."
2676 #: builtin/branch.c:914
2677 msgid "too many branches for a rename operation"
2678 msgstr "为重命名操作提供了太多的分支名"
2680 #: builtin/branch.c:919
2681 msgid "too many branches to set new upstream"
2682 msgstr "为设置新上游提供了太多的分支名"
2684 #: builtin/branch.c:923
2687 "could not set upstream of HEAD to %s when it does not point to any branch."
2688 msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
2690 #: builtin/branch.c:926 builtin/branch.c:948 builtin/branch.c:970
2692 msgid "no such branch '%s'"
2695 #: builtin/branch.c:930
2697 msgid "branch '%s' does not exist"
2698 msgstr "分支 '%s' 不存在"
2700 #: builtin/branch.c:942
2701 msgid "too many branches to unset upstream"
2702 msgstr "为取消上游设置操作提供了太多的分支名"
2704 #: builtin/branch.c:946
2705 msgid "could not unset upstream of HEAD when it does not point to any branch."
2706 msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
2708 #: builtin/branch.c:952
2710 msgid "Branch '%s' has no upstream information"
2711 msgstr "分支 '%s' 没有上游信息"
2713 #: builtin/branch.c:967
2714 msgid "it does not make sense to create 'HEAD' manually"
2715 msgstr "手工创建 'HEAD' 没有意义"
2717 #: builtin/branch.c:973
2718 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
2719 msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
2721 #: builtin/branch.c:976
2724 "The --set-upstream flag is deprecated and will be removed. Consider using --"
2725 "track or --set-upstream-to\n"
2727 "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
2729 #: builtin/branch.c:993
2733 "If you wanted to make '%s' track '%s', do this:\n"
2737 "如果你想用 '%s' 跟踪 '%s', 这么做:\n"
2740 #: builtin/branch.c:994
2742 msgid " git branch -d %s\n"
2743 msgstr " git branch -d %s\n"
2745 #: builtin/branch.c:995
2747 msgid " git branch --set-upstream-to %s\n"
2748 msgstr " git branch --set-upstream-to %s\n"
2750 #: builtin/bundle.c:47
2752 msgid "%s is okay\n"
2755 #: builtin/bundle.c:56
2756 msgid "Need a repository to create a bundle."
2757 msgstr "需要一个版本库来创建包。"
2759 #: builtin/bundle.c:60
2760 msgid "Need a repository to unbundle."
2761 msgstr "需要一个版本库来解包。"
2763 #: builtin/cat-file.c:247
2764 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
2765 msgstr "git cat-file (-t|-s|-e|-p|<类型>|--textconv) <对象>"
2767 #: builtin/cat-file.c:248
2768 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
2769 msgstr "git cat-file (--batch|--batch-check) < <对象列表>"
2771 #: builtin/cat-file.c:266
2772 msgid "<type> can be one of: blob, tree, commit, tag"
2773 msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
2775 #: builtin/cat-file.c:267
2776 msgid "show object type"
2779 #: builtin/cat-file.c:268
2780 msgid "show object size"
2783 #: builtin/cat-file.c:270
2784 msgid "exit with zero when there's no error"
2785 msgstr "当没有错误时退出并返回零"
2787 #: builtin/cat-file.c:271
2788 msgid "pretty-print object's content"
2791 #: builtin/cat-file.c:273
2792 msgid "for blob objects, run textconv on object's content"
2793 msgstr "对于数据(blob)对象,对其内容执行 textconv"
2795 #: builtin/cat-file.c:275
2796 msgid "show info and content of objects fed from the standard input"
2797 msgstr "显示从标准输入提供的对象的信息和内容"
2799 #: builtin/cat-file.c:278
2800 msgid "show info about objects fed from the standard input"
2801 msgstr "显示从标准输入提供的对象的信息"
2803 #: builtin/check-attr.c:11
2804 msgid "git check-attr [-a | --all | attr...] [--] pathname..."
2805 msgstr "git check-attr [-a | --all | attr...] [--] 路径名..."
2807 #: builtin/check-attr.c:12
2808 msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"
2809 msgstr "git check-attr --stdin [-z] [-a | --all | attr...] < <路径列表>"
2811 #: builtin/check-attr.c:19
2812 msgid "report all attributes set on file"
2813 msgstr "报告设置在文件上的所有属性"
2815 #: builtin/check-attr.c:20
2816 msgid "use .gitattributes only from the index"
2817 msgstr "只使用索引中的 .gitattributes"
2819 #: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75
2820 msgid "read file names from stdin"
2823 #: builtin/check-attr.c:23 builtin/check-ignore.c:24
2824 msgid "input paths are terminated by a null character"
2825 msgstr "输入路径以null字符终止"
2827 #: builtin/check-ignore.c:18 builtin/checkout.c:1041 builtin/gc.c:177
2828 msgid "suppress progress reporting"
2831 #: builtin/check-ignore.c:151
2832 msgid "cannot specify pathnames with --stdin"
2833 msgstr "不能同时提供路径及 --stdin 参数"
2835 #: builtin/check-ignore.c:154
2836 msgid "-z only makes sense with --stdin"
2837 msgstr "-z 需要和 --stdin 参数共用才有意义"
2839 #: builtin/check-ignore.c:156
2840 msgid "no path specified"
2843 #: builtin/check-ignore.c:160
2844 msgid "--quiet is only valid with a single pathname"
2845 msgstr "参数 --quiet 只在提供一个路径名时有效"
2847 #: builtin/check-ignore.c:162
2848 msgid "cannot have both --quiet and --verbose"
2849 msgstr "不能同时提供 --quiet 和 --verbose 参数"
2851 #: builtin/checkout-index.c:126
2852 msgid "git checkout-index [options] [--] [<file>...]"
2853 msgstr "git checkout-index [选项] [--] [<文件>...]"
2855 #: builtin/checkout-index.c:187
2856 msgid "check out all files in the index"
2859 #: builtin/checkout-index.c:188
2860 msgid "force overwrite of existing files"
2863 #: builtin/checkout-index.c:190
2864 msgid "no warning for existing files and files not in index"
2865 msgstr "存在或不在索引中的文件都没有警告"
2867 #: builtin/checkout-index.c:192
2868 msgid "don't checkout new files"
2871 #: builtin/checkout-index.c:194
2872 msgid "update stat information in the index file"
2873 msgstr "更新索引中文件的状态信息"
2875 #: builtin/checkout-index.c:200
2876 msgid "read list of paths from the standard input"
2877 msgstr "从标准输入读取路径列表"
2879 #: builtin/checkout-index.c:202
2880 msgid "write the content to temporary files"
2883 #: builtin/checkout-index.c:203 builtin/column.c:30
2887 #: builtin/checkout-index.c:204
2888 msgid "when creating files, prepend <string>"
2889 msgstr "在创建文件时,在前面加上<字符串>"
2891 #: builtin/checkout-index.c:207
2892 msgid "copy out the files from named stage"
2893 msgstr "从指定暂存区中拷出文件"
2895 #: builtin/checkout.c:25
2896 msgid "git checkout [options] <branch>"
2897 msgstr "git checkout [选项] <分支>"
2899 #: builtin/checkout.c:26
2900 msgid "git checkout [options] [<branch>] -- <file>..."
2901 msgstr "git checkout [选项] [<分支>] -- <文件>..."
2903 #: builtin/checkout.c:116 builtin/checkout.c:149
2905 msgid "path '%s' does not have our version"
2906 msgstr "路径 '%s' 没有我们的版本"
2908 #: builtin/checkout.c:118 builtin/checkout.c:151
2910 msgid "path '%s' does not have their version"
2911 msgstr "路径 '%s' 没有他们的版本"
2913 #: builtin/checkout.c:134
2915 msgid "path '%s' does not have all necessary versions"
2916 msgstr "路径 '%s' 没有全部必须的版本"
2918 #: builtin/checkout.c:178
2920 msgid "path '%s' does not have necessary versions"
2921 msgstr "路径 '%s' 没有必须的版本"
2923 #: builtin/checkout.c:195
2925 msgid "path '%s': cannot merge"
2926 msgstr "path '%s':无法合并"
2928 #: builtin/checkout.c:212
2930 msgid "Unable to add merge result for '%s'"
2931 msgstr "无法为 '%s' 添加合并结果"
2933 #: builtin/checkout.c:236 builtin/checkout.c:239 builtin/checkout.c:242
2934 #: builtin/checkout.c:245
2936 msgid "'%s' cannot be used with updating paths"
2937 msgstr "'%s' 不能在更新路径时使用"
2939 #: builtin/checkout.c:248 builtin/checkout.c:251
2941 msgid "'%s' cannot be used with %s"
2942 msgstr "'%s' 不能和 %s 同时使用"
2944 #: builtin/checkout.c:254
2946 msgid "Cannot update paths and switch to branch '%s' at the same time."
2947 msgstr "不能同时更新路径并切换到分支'%s'。"
2949 #: builtin/checkout.c:265 builtin/checkout.c:455
2950 msgid "corrupt index file"
2953 #: builtin/checkout.c:326 builtin/checkout.c:333
2955 msgid "path '%s' is unmerged"
2956 msgstr "路径 '%s' 未合并"
2958 #: builtin/checkout.c:477
2959 msgid "you need to resolve your current index first"
2960 msgstr "您需要先解决当前索引的冲突"
2962 #: builtin/checkout.c:598
2964 msgid "Can not do reflog for '%s'\n"
2965 msgstr "不能对 '%s' 执行 reflog 操作\n"
2967 #: builtin/checkout.c:631
2968 msgid "HEAD is now at"
2971 #: builtin/checkout.c:638
2973 msgid "Reset branch '%s'\n"
2974 msgstr "重置分支 '%s'\n"
2976 #: builtin/checkout.c:641
2978 msgid "Already on '%s'\n"
2979 msgstr "已经位于 '%s'\n"
2981 #: builtin/checkout.c:645
2983 msgid "Switched to and reset branch '%s'\n"
2984 msgstr "切换并重置分支 '%s'\n"
2986 #: builtin/checkout.c:647 builtin/checkout.c:984
2988 msgid "Switched to a new branch '%s'\n"
2989 msgstr "切换到一个新分支 '%s'\n"
2991 #: builtin/checkout.c:649
2993 msgid "Switched to branch '%s'\n"
2994 msgstr "切换到分支 '%s'\n"
2997 #: builtin/checkout.c:705
2999 msgid " ... and %d more.\n"
3000 msgstr " ... 及其它 %d 个。\n"
3002 #. The singular version
3003 #: builtin/checkout.c:711
3006 "Warning: you are leaving %d commit behind, not connected to\n"
3007 "any of your branches:\n"
3011 "Warning: you are leaving %d commits behind, not connected to\n"
3012 "any of your branches:\n"
3016 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
3020 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
3024 #: builtin/checkout.c:729
3027 "If you want to keep them by creating a new branch, this may be a good time\n"
3030 " git branch new_branch_name %s\n"
3033 "如果您想要通过创建新分支保存他们,这可能是一个好时候。\n"
3036 " git branch new_branch_name %s\n"
3039 #: builtin/checkout.c:759
3040 msgid "internal error in revision walk"
3041 msgstr "在版本遍历时遇到内部错误"
3043 #: builtin/checkout.c:763
3044 msgid "Previous HEAD position was"
3045 msgstr "之前的 HEAD 位置是"
3047 #: builtin/checkout.c:790 builtin/checkout.c:979
3048 msgid "You are on a branch yet to be born"
3049 msgstr "您位于一个尚未初始化的分支"
3052 #: builtin/checkout.c:915
3054 msgid "invalid reference: %s"
3057 #. case (1): want a tree
3058 #: builtin/checkout.c:954
3060 msgid "reference is not a tree: %s"
3063 #: builtin/checkout.c:993
3064 msgid "paths cannot be used with switching branches"
3065 msgstr "路径不能和切换分支同时使用"
3067 #: builtin/checkout.c:996 builtin/checkout.c:1000
3069 msgid "'%s' cannot be used with switching branches"
3070 msgstr "'%s' 不能和切换分支同时使用"
3072 #: builtin/checkout.c:1004 builtin/checkout.c:1007 builtin/checkout.c:1012
3073 #: builtin/checkout.c:1015
3075 msgid "'%s' cannot be used with '%s'"
3076 msgstr "'%s' 不能和 '%s' 同时使用"
3078 #: builtin/checkout.c:1020
3080 msgid "Cannot switch branch to a non-commit '%s'"
3081 msgstr "不能切换分支到一个非提交 '%s'"
3083 #: builtin/checkout.c:1042 builtin/checkout.c:1044 builtin/clone.c:90
3084 #: builtin/remote.c:169 builtin/remote.c:171
3088 #: builtin/checkout.c:1043
3089 msgid "create and checkout a new branch"
3090 msgstr "创建并检出一个新的分支"
3092 #: builtin/checkout.c:1045
3093 msgid "create/reset and checkout a branch"
3094 msgstr "创建/重置并检出一个分支"
3096 #: builtin/checkout.c:1046
3097 msgid "create reflog for new branch"
3098 msgstr "为新的分支创建引用日志"
3100 #: builtin/checkout.c:1047
3101 msgid "detach the HEAD at named commit"
3102 msgstr "成为指向该提交的分离头指针"
3104 #: builtin/checkout.c:1048
3105 msgid "set upstream info for new branch"
3106 msgstr "为新的分支设置上游信息"
3108 #: builtin/checkout.c:1050
3112 #: builtin/checkout.c:1050
3113 msgid "new unparented branch"
3116 #: builtin/checkout.c:1051
3117 msgid "checkout our version for unmerged files"
3118 msgstr "对尚未合并的文件检出我们的版本"
3120 #: builtin/checkout.c:1053
3121 msgid "checkout their version for unmerged files"
3122 msgstr "对尚未合并的文件检出他们的版本"
3124 #: builtin/checkout.c:1055
3125 msgid "force checkout (throw away local modifications)"
3126 msgstr "强制检出(丢弃本地修改)"
3128 #: builtin/checkout.c:1056
3129 msgid "perform a 3-way merge with the new branch"
3130 msgstr "和新的分支执行三路合并"
3132 #: builtin/checkout.c:1057 builtin/merge.c:217
3133 msgid "update ignored files (default)"
3134 msgstr "更新忽略的文件(默认)"
3136 #: builtin/checkout.c:1058 builtin/log.c:1149 parse-options.h:245
3140 #: builtin/checkout.c:1059
3141 msgid "conflict style (merge or diff3)"
3142 msgstr "冲突输出风格(merge 或 diff3)"
3144 #: builtin/checkout.c:1062
3145 msgid "second guess 'git checkout no-such-branch'"
3146 msgstr "再者猜测'git checkout no-such-branch'"
3148 #: builtin/checkout.c:1086
3149 msgid "-b, -B and --orphan are mutually exclusive"
3150 msgstr "-b、-B 和 --orphan 是互斥的"
3152 #: builtin/checkout.c:1103
3153 msgid "--track needs a branch name"
3154 msgstr "--track 需要一个分支名"
3156 #: builtin/checkout.c:1110
3157 msgid "Missing branch name; try -b"
3158 msgstr "缺少分支名;尝试 -b"
3160 #: builtin/checkout.c:1145
3161 msgid "invalid path specification"
3164 #: builtin/checkout.c:1152
3167 "Cannot update paths and switch to branch '%s' at the same time.\n"
3168 "Did you intend to checkout '%s' which can not be resolved as commit?"
3170 "不能同时更新路径并切换到分支'%s'。\n"
3171 "您是想要检出 '%s' 但其未能解析为提交么?"
3173 #: builtin/checkout.c:1157
3175 msgid "git checkout: --detach does not take a path argument '%s'"
3176 msgstr "git checkout:--detach 不能接收路径参数 '%s'"
3178 #: builtin/checkout.c:1161
3180 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
3181 "checking out of the index."
3183 "git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
3185 #: builtin/clean.c:20
3186 msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
3187 msgstr "git clean [-d] [-f] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
3189 #: builtin/clean.c:24
3191 msgid "Removing %s\n"
3194 #: builtin/clean.c:25
3196 msgid "Would remove %s\n"
3199 #: builtin/clean.c:26
3201 msgid "Skipping repository %s\n"
3204 #: builtin/clean.c:27
3206 msgid "Would skip repository %s\n"
3207 msgstr "将忽略版本库 %s\n"
3209 #: builtin/clean.c:28
3211 msgid "failed to remove %s"
3214 #: builtin/clean.c:160
3215 msgid "do not print names of files removed"
3218 #: builtin/clean.c:162
3222 #: builtin/clean.c:164
3223 msgid "remove whole directories"
3226 #: builtin/clean.c:165 builtin/describe.c:412 builtin/grep.c:717
3227 #: builtin/ls-files.c:494 builtin/name-rev.c:231 builtin/show-ref.c:182
3231 #: builtin/clean.c:166
3232 msgid "add <pattern> to ignore rules"
3233 msgstr "添加<模式>到忽略规则"
3235 #: builtin/clean.c:167
3236 msgid "remove ignored files, too"
3239 #: builtin/clean.c:169
3240 msgid "remove only ignored files"
3243 #: builtin/clean.c:187
3244 msgid "-x and -X cannot be used together"
3245 msgstr "-x 和 -X 不能同时使用"
3247 #: builtin/clean.c:191
3249 "clean.requireForce set to true and neither -n nor -f given; refusing to clean"
3251 "clean.requireForce 设置为 true 且未提供 -n 或 -f 选项,拒绝执行清理动作"
3253 #: builtin/clean.c:194
3255 "clean.requireForce defaults to true and neither -n nor -f given; refusing to "
3258 "clean.requireForce 默认为 true 且未提供 -n 或 -f 选项,拒绝执行清理动作"
3260 #: builtin/clone.c:37
3261 msgid "git clone [options] [--] <repo> [<dir>]"
3262 msgstr "git clone [选项] [--] <版本库> [<路径>]"
3264 #: builtin/clone.c:65 builtin/fetch.c:82 builtin/merge.c:214
3265 #: builtin/push.c:436
3266 msgid "force progress reporting"
3269 #: builtin/clone.c:67
3270 msgid "don't create a checkout"
3273 #: builtin/clone.c:68 builtin/clone.c:70 builtin/init-db.c:488
3274 msgid "create a bare repository"
3277 #: builtin/clone.c:73
3278 msgid "create a mirror repository (implies bare)"
3279 msgstr "创建一个镜像版本库(也是裸版本库)"
3281 #: builtin/clone.c:75
3282 msgid "to clone from a local repository"
3285 #: builtin/clone.c:77
3286 msgid "don't use local hardlinks, always copy"
3287 msgstr "不使用本地硬链接,始终复制"
3289 #: builtin/clone.c:79
3290 msgid "setup as shared repository"
3293 #: builtin/clone.c:81 builtin/clone.c:83
3294 msgid "initialize submodules in the clone"
3297 #: builtin/clone.c:84 builtin/init-db.c:485
3298 msgid "template-directory"
3301 #: builtin/clone.c:85 builtin/init-db.c:486
3302 msgid "directory from which templates will be used"
3305 #: builtin/clone.c:87
3306 msgid "reference repository"
3309 #: builtin/clone.c:88 builtin/column.c:26 builtin/merge-file.c:44
3313 #: builtin/clone.c:89
3314 msgid "use <name> instead of 'origin' to track upstream"
3315 msgstr "使用<名称>而不是 'origin' 去跟踪上游"
3317 #: builtin/clone.c:91
3318 msgid "checkout <branch> instead of the remote's HEAD"
3319 msgstr "检出<分支>而不是远程HEAD"
3321 #: builtin/clone.c:93
3322 msgid "path to git-upload-pack on the remote"
3323 msgstr "远程 git-upload-pack 路径"
3325 #: builtin/clone.c:94 builtin/fetch.c:83 builtin/grep.c:662
3329 #: builtin/clone.c:95
3330 msgid "create a shallow clone of that depth"
3331 msgstr "创建一个指定深度的浅克隆"
3333 #: builtin/clone.c:97
3334 msgid "clone only one branch, HEAD or --branch"
3335 msgstr "只克隆一个分支、HEAD 或 --branch"
3337 #: builtin/clone.c:98 builtin/init-db.c:494
3341 #: builtin/clone.c:99 builtin/init-db.c:495
3342 msgid "separate git dir from working tree"
3343 msgstr "git目录和工作区分离"
3345 #: builtin/clone.c:100
3349 #: builtin/clone.c:101
3350 msgid "set config inside the new repository"
3351 msgstr "在新版本库中设置配置信息"
3353 #: builtin/clone.c:244
3355 msgid "reference repository '%s' is not a local directory."
3356 msgstr "引用版本库 '%s' 不是一个本地目录。"
3358 #: builtin/clone.c:307
3360 msgid "failed to create directory '%s'"
3361 msgstr "无法创建目录 '%s'"
3363 #: builtin/clone.c:309 builtin/diff.c:77
3365 msgid "failed to stat '%s'"
3366 msgstr "无法枚举 '%s' 状态"
3368 #: builtin/clone.c:311
3370 msgid "%s exists and is not a directory"
3371 msgstr "%s 存在且不是一个目录"
3373 #: builtin/clone.c:325
3375 msgid "failed to stat %s\n"
3376 msgstr "无法枚举 %s 状态\n"
3378 #: builtin/clone.c:347
3380 msgid "failed to create link '%s'"
3381 msgstr "无法创建链接 '%s'"
3383 #: builtin/clone.c:351
3385 msgid "failed to copy file to '%s'"
3386 msgstr "无法拷贝文件至 '%s'"
3388 #: builtin/clone.c:374
3393 #: builtin/clone.c:387
3395 "Clone succeeded, but checkout failed.\n"
3396 "You can inspect what was checked out with 'git status'\n"
3397 "and retry the checkout with 'git checkout -f HEAD'\n"
3400 "您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
3401 "'git checkout -f HEAD' 重试\n"
3403 #: builtin/clone.c:466
3405 msgid "Could not find remote branch %s to clone."
3406 msgstr "不能发现要克隆的远程分支 %s。"
3408 #: builtin/clone.c:540
3409 msgid "remote did not send all necessary objects"
3410 msgstr "远程没有发送所有必须的对象"
3412 #: builtin/clone.c:600
3413 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
3414 msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
3416 #: builtin/clone.c:631
3417 msgid "unable to checkout working tree"
3420 #: builtin/clone.c:739
3421 msgid "Too many arguments."
3424 #: builtin/clone.c:743
3425 msgid "You must specify a repository to clone."
3426 msgstr "您必须指定一个版本库来克隆。"
3428 #: builtin/clone.c:754
3430 msgid "--bare and --origin %s options are incompatible."
3431 msgstr "--bare 和 --origin %s 选项不兼容。"
3433 #: builtin/clone.c:757
3434 msgid "--bare and --separate-git-dir are incompatible."
3435 msgstr "--bare 和 --separate-git-dir 选项不兼容。"
3437 #: builtin/clone.c:770
3439 msgid "repository '%s' does not exist"
3440 msgstr "版本库 '%s' 不存在"
3442 #: builtin/clone.c:775
3443 msgid "--depth is ignored in local clones; use file:// instead."
3444 msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
3446 #: builtin/clone.c:785
3448 msgid "destination path '%s' already exists and is not an empty directory."
3449 msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
3451 #: builtin/clone.c:795
3453 msgid "working tree '%s' already exists."
3454 msgstr "工作区 '%s' 已经存在。"
3456 #: builtin/clone.c:808 builtin/clone.c:820
3458 msgid "could not create leading directories of '%s'"
3459 msgstr "不能为 '%s' 创建先导目录"
3461 #: builtin/clone.c:811
3463 msgid "could not create work tree dir '%s'."
3464 msgstr "不能为 '%s' 创建工作区目录。"
3466 #: builtin/clone.c:830
3468 msgid "Cloning into bare repository '%s'...\n"
3469 msgstr "克隆到裸版本库 '%s'...\n"
3471 #: builtin/clone.c:832
3473 msgid "Cloning into '%s'...\n"
3474 msgstr "正克隆到 '%s'...\n"
3476 #: builtin/clone.c:867
3478 msgid "Don't know how to clone %s"
3481 #: builtin/clone.c:916
3483 msgid "Remote branch %s not found in upstream %s"
3484 msgstr "远程分支 %s 在上游 %s 未发现"
3486 #: builtin/clone.c:923
3487 msgid "You appear to have cloned an empty repository."
3488 msgstr "您似乎克隆了一个空版本库。"
3490 #: builtin/column.c:9
3491 msgid "git column [options]"
3492 msgstr "git column [选项]"
3494 #: builtin/column.c:26
3495 msgid "lookup config vars"
3498 #: builtin/column.c:27 builtin/column.c:28
3499 msgid "layout to use"
3502 #: builtin/column.c:29
3503 msgid "Maximum width"
3506 #: builtin/column.c:30
3507 msgid "Padding space on left border"
3510 #: builtin/column.c:31
3511 msgid "Padding space on right border"
3514 #: builtin/column.c:32
3515 msgid "Padding space between columns"
3518 #: builtin/column.c:51
3519 msgid "--command must be the first argument"
3520 msgstr "--command 必须是第一个参数"
3522 #: builtin/commit.c:34
3523 msgid "git commit [options] [--] <pathspec>..."
3524 msgstr "git commit [选项] [--] <路径匹配>..."
3526 #: builtin/commit.c:39
3527 msgid "git status [options] [--] <pathspec>..."
3528 msgstr "git status [选项] [--] <路径匹配>..."
3530 #: builtin/commit.c:44
3532 "Your name and email address were configured automatically based\n"
3533 "on your username and hostname. Please check that they are accurate.\n"
3534 "You can suppress this message by setting them explicitly:\n"
3536 " git config --global user.name \"Your Name\"\n"
3537 " git config --global user.email you@example.com\n"
3539 "After doing this, you may fix the identity used for this commit with:\n"
3541 " git commit --amend --reset-author\n"
3543 "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
3544 "与否。您可以通过下面的命令对其进行明确地设置以免再出现本提示信息:\n"
3546 " git config --global user.name \"Your Name\"\n"
3547 " git config --global user.email you@example.com\n"
3549 "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
3551 " git commit --amend --reset-author\n"
3553 #: builtin/commit.c:56
3555 "You asked to amend the most recent commit, but doing so would make\n"
3556 "it empty. You can repeat your command with --allow-empty, or you can\n"
3557 "remove the commit entirely with \"git reset HEAD^\".\n"
3559 "您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
3560 "--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
3562 #: builtin/commit.c:61
3564 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
3565 "If you wish to commit it anyway, use:\n"
3567 " git commit --allow-empty\n"
3569 "Otherwise, please use 'git reset'\n"
3571 "之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
3574 " git commit --allow-empty\n"
3576 "否则,请使用命令 'git reset'\n"
3578 #: builtin/commit.c:260
3579 msgid "failed to unpack HEAD tree object"
3580 msgstr "无法解包 HEAD 树对象"
3582 #: builtin/commit.c:302
3583 msgid "unable to create temporary index"
3586 #: builtin/commit.c:308
3587 msgid "interactive add failed"
3590 #: builtin/commit.c:341 builtin/commit.c:362 builtin/commit.c:412
3591 msgid "unable to write new_index file"
3592 msgstr "无法写 new_index 文件"
3594 #: builtin/commit.c:393
3595 msgid "cannot do a partial commit during a merge."
3596 msgstr "在合并过程中不能做部分提交。"
3598 #: builtin/commit.c:395
3599 msgid "cannot do a partial commit during a cherry-pick."
3600 msgstr "在拣选过程中不能做部分提交。"
3602 #: builtin/commit.c:405
3603 msgid "cannot read the index"
3606 #: builtin/commit.c:425
3607 msgid "unable to write temporary index file"
3610 #: builtin/commit.c:513 builtin/commit.c:519
3612 msgid "invalid commit: %s"
3615 #: builtin/commit.c:542
3616 msgid "malformed --author parameter"
3617 msgstr "非法的 --author 参数"
3619 #: builtin/commit.c:562
3621 msgid "Malformed ident string: '%s'"
3622 msgstr "非法的身份字符串:'%s'"
3624 #: builtin/commit.c:600 builtin/commit.c:633 builtin/commit.c:956
3626 msgid "could not lookup commit %s"
3629 #: builtin/commit.c:612 builtin/shortlog.c:272
3631 msgid "(reading log message from standard input)\n"
3632 msgstr "(正从标准输入中读取日志信息)\n"
3634 #: builtin/commit.c:614
3635 msgid "could not read log from standard input"
3636 msgstr "不能从标准输入中读取日志信息"
3638 #: builtin/commit.c:618
3640 msgid "could not read log file '%s'"
3641 msgstr "不能读取日志文件 '%s'"
3643 #: builtin/commit.c:624
3644 msgid "commit has empty message"
3647 #: builtin/commit.c:640
3648 msgid "could not read MERGE_MSG"
3649 msgstr "不能读取 MERGE_MSG"
3651 #: builtin/commit.c:644
3652 msgid "could not read SQUASH_MSG"
3653 msgstr "不能读取 SQUASH_MSG"
3655 #: builtin/commit.c:648
3657 msgid "could not read '%s'"
3660 #: builtin/commit.c:709
3661 msgid "could not write commit template"
3664 #: builtin/commit.c:720
3668 "It looks like you may be committing a merge.\n"
3669 "If this is not correct, please remove the file\n"
3674 "似乎您正在做一个合并提交。如果不对,请删除文件\n"
3678 #: builtin/commit.c:725
3682 "It looks like you may be committing a cherry-pick.\n"
3683 "If this is not correct, please remove the file\n"
3688 "似乎您正在做一个拣选提交。如果不对,请删除文件\n"
3692 #: builtin/commit.c:737
3695 "Please enter the commit message for your changes. Lines starting\n"
3696 "with '%c' will be ignored, and an empty message aborts the commit.\n"
3698 "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
3701 #: builtin/commit.c:742
3704 "Please enter the commit message for your changes. Lines starting\n"
3705 "with '%c' will be kept; you may remove them yourself if you want to.\n"
3706 "An empty message aborts the commit.\n"
3708 "请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
3709 "也可以删除它们。一个空的提交说明将会终止提交。\n"
3711 # 译者:为保证在输出中对齐,注意调整句中空格!
3712 #: builtin/commit.c:755
3714 msgid "%sAuthor: %s"
3717 # 译者:为保证在输出中对齐,注意调整句中空格!
3718 #: builtin/commit.c:762
3720 msgid "%sCommitter: %s"
3723 #: builtin/commit.c:782
3724 msgid "Cannot read index"
3727 #: builtin/commit.c:819
3728 msgid "Error building trees"
3731 #: builtin/commit.c:834 builtin/tag.c:359
3733 msgid "Please supply the message using either -m or -F option.\n"
3734 msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
3736 #: builtin/commit.c:931
3738 msgid "No existing author found with '%s'"
3739 msgstr "没有找到匹配 '%s' 的作者"
3741 #: builtin/commit.c:946 builtin/commit.c:1140
3743 msgid "Invalid untracked files mode '%s'"
3744 msgstr "无效的未追踪文件参数 '%s'"
3746 #: builtin/commit.c:976
3747 msgid "Using both --reset-author and --author does not make sense"
3748 msgstr "同时使用 --reset-author 和 --author 没有意义"
3750 #: builtin/commit.c:987
3751 msgid "You have nothing to amend."
3754 #: builtin/commit.c:990
3755 msgid "You are in the middle of a merge -- cannot amend."
3756 msgstr "您正处于一个合并过程中 -- 无法修补提交。"
3758 #: builtin/commit.c:992
3759 msgid "You are in the middle of a cherry-pick -- cannot amend."
3760 msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
3762 #: builtin/commit.c:995
3763 msgid "Options --squash and --fixup cannot be used together"
3764 msgstr "选项 --squash 和 --fixup 不能同时使用"
3766 #: builtin/commit.c:1005
3767 msgid "Only one of -c/-C/-F/--fixup can be used."
3768 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
3770 #: builtin/commit.c:1007
3771 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
3772 msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
3774 #: builtin/commit.c:1015
3775 msgid "--reset-author can be used only with -C, -c or --amend."
3776 msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
3778 #: builtin/commit.c:1032
3779 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
3780 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
3782 #: builtin/commit.c:1034
3783 msgid "No paths with --include/--only does not make sense."
3784 msgstr "参数 --include/--only 不跟路径没有意义。"
3786 #: builtin/commit.c:1036
3787 msgid "Clever... amending the last one with dirty index."
3788 msgstr "聪明... 在索引不干净下修补最后的提交。"
3790 #: builtin/commit.c:1038
3791 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
3792 msgstr "指定了明确的路径而没有使用 -i 或 -o 选项;认为是 --only paths..."
3794 #: builtin/commit.c:1048 builtin/tag.c:575
3796 msgid "Invalid cleanup mode %s"
3799 #: builtin/commit.c:1053
3800 msgid "Paths with -a does not make sense."
3801 msgstr "路径和 -a 选项同时使用没有意义。"
3803 #: builtin/commit.c:1059 builtin/commit.c:1194
3804 msgid "--long and -z are incompatible"
3805 msgstr "--long 和 -z 选项不兼容"
3807 #: builtin/commit.c:1154 builtin/commit.c:1390
3808 msgid "show status concisely"
3811 #: builtin/commit.c:1156 builtin/commit.c:1392
3812 msgid "show branch information"
3815 #: builtin/commit.c:1158 builtin/commit.c:1394 builtin/push.c:426
3816 msgid "machine-readable output"
3819 #: builtin/commit.c:1161 builtin/commit.c:1396
3820 msgid "show status in long format (default)"
3821 msgstr "以长格式显示状态(默认)"
3823 #: builtin/commit.c:1164 builtin/commit.c:1399
3824 msgid "terminate entries with NUL"
3827 #: builtin/commit.c:1166 builtin/commit.c:1402 builtin/fast-export.c:653
3828 #: builtin/fast-export.c:656 builtin/tag.c:459
3832 #: builtin/commit.c:1167 builtin/commit.c:1402
3833 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
3834 msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
3836 #: builtin/commit.c:1170
3837 msgid "show ignored files"
3840 #: builtin/commit.c:1171 parse-options.h:151
3844 #: builtin/commit.c:1172
3846 "ignore changes to submodules, optional when: all, dirty, untracked. "
3849 "忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
3851 #: builtin/commit.c:1174
3852 msgid "list untracked files in columns"
3853 msgstr "以列的方式显示未跟踪的文件"
3855 #: builtin/commit.c:1248
3856 msgid "couldn't look up newly created commit"
3859 #: builtin/commit.c:1250
3860 msgid "could not parse newly created commit"
3863 #: builtin/commit.c:1291
3864 msgid "detached HEAD"
3867 # 译者:中文字符串拼接,可删除前导空格
3868 #: builtin/commit.c:1293
3869 msgid " (root-commit)"
3872 #: builtin/commit.c:1360
3873 msgid "suppress summary after successful commit"
3874 msgstr "提交成功后不显示概述信息"
3876 #: builtin/commit.c:1361
3877 msgid "show diff in commit message template"
3878 msgstr "在提交说明模板里显示差异"
3880 #: builtin/commit.c:1363
3881 msgid "Commit message options"
3884 #: builtin/commit.c:1364 builtin/tag.c:457
3885 msgid "read message from file"
3888 #: builtin/commit.c:1365
3892 #: builtin/commit.c:1365
3893 msgid "override author for commit"
3896 #: builtin/commit.c:1366 builtin/gc.c:178
3900 #: builtin/commit.c:1366
3901 msgid "override date for commit"
3904 #: builtin/commit.c:1367 builtin/merge.c:208 builtin/notes.c:533
3905 #: builtin/notes.c:690 builtin/tag.c:455
3909 #: builtin/commit.c:1367
3910 msgid "commit message"
3913 #: builtin/commit.c:1368
3914 msgid "reuse and edit message from specified commit"
3915 msgstr "重用并编辑指定提交的提交说明"
3917 #: builtin/commit.c:1369
3918 msgid "reuse message from specified commit"
3919 msgstr "重用指定提交的提交说明"
3921 #: builtin/commit.c:1370
3922 msgid "use autosquash formatted message to fixup specified commit"
3923 msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
3925 #: builtin/commit.c:1371
3926 msgid "use autosquash formatted message to squash specified commit"
3927 msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
3929 #: builtin/commit.c:1372
3930 msgid "the commit is authored by me now (used with -C/-c/--amend)"
3931 msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
3933 #: builtin/commit.c:1373 builtin/log.c:1104 builtin/revert.c:109
3934 msgid "add Signed-off-by:"
3935 msgstr "添加 Signed-off-by: 签名"
3937 #: builtin/commit.c:1374
3938 msgid "use specified template file"
3941 #: builtin/commit.c:1375
3942 msgid "force edit of commit"
3945 # 译者:可选值,不能翻译(或是原文中笔误,应为 mode)
3946 #: builtin/commit.c:1376
3950 #: builtin/commit.c:1376 builtin/tag.c:460
3951 msgid "how to strip spaces and #comments from message"
3952 msgstr "设置如何删除提交说明里的空格和#注释"
3954 #: builtin/commit.c:1377
3955 msgid "include status in commit message template"
3956 msgstr "在提交说明模板里包含状态信息"
3958 #: builtin/commit.c:1378 builtin/merge.c:215 builtin/tag.c:461
3962 #: builtin/commit.c:1379 builtin/merge.c:216
3963 msgid "GPG sign commit"
3966 #. end commit message options
3967 #: builtin/commit.c:1382
3968 msgid "Commit contents options"
3971 #: builtin/commit.c:1383
3972 msgid "commit all changed files"
3975 #: builtin/commit.c:1384
3976 msgid "add specified files to index for commit"
3977 msgstr "添加指定的文件到索引区等待提交"
3979 #: builtin/commit.c:1385
3980 msgid "interactively add files"
3983 #: builtin/commit.c:1386
3984 msgid "interactively add changes"
3987 #: builtin/commit.c:1387
3988 msgid "commit only specified files"
3991 #: builtin/commit.c:1388
3992 msgid "bypass pre-commit hook"
3993 msgstr "绕过 pre-commit 钩子"
3995 #: builtin/commit.c:1389
3996 msgid "show what would be committed"
3999 #: builtin/commit.c:1400
4000 msgid "amend previous commit"
4003 #: builtin/commit.c:1401
4004 msgid "bypass post-rewrite hook"
4005 msgstr "绕过 post-rewrite 钩子"
4007 #: builtin/commit.c:1406
4008 msgid "ok to record an empty change"
4011 #: builtin/commit.c:1409
4012 msgid "ok to record a change with an empty message"
4015 #: builtin/commit.c:1441
4016 msgid "could not parse HEAD commit"
4017 msgstr "不能解析 HEAD 提交"
4019 #: builtin/commit.c:1479 builtin/merge.c:510
4021 msgid "could not open '%s' for reading"
4022 msgstr "不能为读入打开 '%s'"
4024 #: builtin/commit.c:1486
4026 msgid "Corrupt MERGE_HEAD file (%s)"
4027 msgstr "损坏的 MERGE_HEAD 文件(%s)"
4029 #: builtin/commit.c:1493
4030 msgid "could not read MERGE_MODE"
4031 msgstr "不能读取 MERGE_MODE"
4033 #: builtin/commit.c:1512
4035 msgid "could not read commit message: %s"
4036 msgstr "不能读取提交说明:%s"
4038 #: builtin/commit.c:1526
4040 msgid "Aborting commit; you did not edit the message.\n"
4041 msgstr "终止提交;您未更改来自模版的提交说明。\n"
4043 #: builtin/commit.c:1531
4045 msgid "Aborting commit due to empty commit message.\n"
4046 msgstr "终止提交因为提交说明为空。\n"
4048 #: builtin/commit.c:1546 builtin/merge.c:847 builtin/merge.c:872
4049 msgid "failed to write commit object"
4052 #: builtin/commit.c:1567
4053 msgid "cannot lock HEAD ref"
4054 msgstr "无法锁定 HEAD 引用"
4056 #: builtin/commit.c:1571
4057 msgid "cannot update HEAD ref"
4058 msgstr "无法更新 HEAD 引用"
4060 #: builtin/commit.c:1582
4062 "Repository has been updated, but unable to write\n"
4063 "new_index file. Check that disk is not full or quota is\n"
4064 "not exceeded, and then \"git reset HEAD\" to recover."
4066 "版本库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
4067 "或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
4069 #: builtin/config.c:7
4070 msgid "git config [options]"
4071 msgstr "git config [选项]"
4073 #: builtin/config.c:51
4074 msgid "Config file location"
4077 #: builtin/config.c:52
4078 msgid "use global config file"
4081 #: builtin/config.c:53
4082 msgid "use system config file"
4085 #: builtin/config.c:54
4086 msgid "use repository config file"
4089 #: builtin/config.c:55
4090 msgid "use given config file"
4093 #: builtin/config.c:56
4097 #: builtin/config.c:57
4098 msgid "get value: name [value-regex]"
4099 msgstr "获取值:name [value-regex]"
4101 #: builtin/config.c:58
4102 msgid "get all values: key [value-regex]"
4103 msgstr "获得所有的值:key [value-regex]"
4105 #: builtin/config.c:59
4106 msgid "get values for regexp: name-regex [value-regex]"
4107 msgstr "根据正则表达式获得值:name-regex [value-regex]"
4109 #: builtin/config.c:60
4110 msgid "replace all matching variables: name value [value_regex]"
4111 msgstr "替换所有匹配的变量:name value [value_regex]"
4113 #: builtin/config.c:61
4114 msgid "add a new variable: name value"
4115 msgstr "添加一个新的变量:name value"
4117 #: builtin/config.c:62
4118 msgid "remove a variable: name [value-regex]"
4119 msgstr "删除一个变量:name [value-regex]"
4121 #: builtin/config.c:63
4122 msgid "remove all matches: name [value-regex]"
4123 msgstr "删除所有匹配项:name [value-regex]"
4125 #: builtin/config.c:64
4126 msgid "rename section: old-name new-name"
4127 msgstr "重命名小节:old-name new-name"
4129 #: builtin/config.c:65
4130 msgid "remove a section: name"
4131 msgstr "删除一个小节:name"
4133 #: builtin/config.c:66
4137 #: builtin/config.c:67
4138 msgid "open an editor"
4141 #: builtin/config.c:68 builtin/config.c:69
4145 #: builtin/config.c:68
4146 msgid "find the color configured: [default]"
4147 msgstr "找到配置的颜色:[默认]"
4149 #: builtin/config.c:69
4150 msgid "find the color setting: [stdout-is-tty]"
4151 msgstr "找到颜色设置:[stdout-is-tty]"
4153 #: builtin/config.c:70
4157 #: builtin/config.c:71
4158 msgid "value is \"true\" or \"false\""
4159 msgstr "值是 \"true\" 或 \"false\""
4161 #: builtin/config.c:72
4162 msgid "value is decimal number"
4165 #: builtin/config.c:73
4166 msgid "value is --bool or --int"
4167 msgstr "值是 --bool or --int"
4169 #: builtin/config.c:74
4170 msgid "value is a path (file or directory name)"
4171 msgstr "值是一个路径(文件或目录名)"
4173 #: builtin/config.c:75
4177 #: builtin/config.c:76
4178 msgid "terminate values with NUL byte"
4181 #: builtin/config.c:77
4182 msgid "respect include directives on lookup"
4183 msgstr "查询时参照 include 指令递归查找"
4185 #: builtin/count-objects.c:82
4186 msgid "git count-objects [-v]"
4187 msgstr "git count-objects [-v]"
4189 #: builtin/describe.c:15
4190 msgid "git describe [options] <committish>*"
4191 msgstr "git describe [选项] <提交号>*"
4193 #: builtin/describe.c:16
4194 msgid "git describe [options] --dirty"
4195 msgstr "git describe [选项] --dirty"
4197 #: builtin/describe.c:233
4199 msgid "annotated tag %s not available"
4200 msgstr "注释 tag %s 无效"
4202 #: builtin/describe.c:237
4204 msgid "annotated tag %s has no embedded name"
4205 msgstr "注释 tag %s 没有嵌入名称"
4207 #: builtin/describe.c:239
4209 msgid "tag '%s' is really '%s' here"
4210 msgstr "tag '%s' 的确是在 '%s'"
4212 #: builtin/describe.c:266
4214 msgid "Not a valid object name %s"
4215 msgstr "不是一个有效的对象名 %s"
4217 #: builtin/describe.c:269
4219 msgid "%s is not a valid '%s' object"
4220 msgstr "%s 不是一个有效的 '%s' 对象"
4222 #: builtin/describe.c:286
4224 msgid "no tag exactly matches '%s'"
4225 msgstr "没有 tag 准确匹配 '%s'"
4227 #: builtin/describe.c:288
4229 msgid "searching to describe %s\n"
4232 #: builtin/describe.c:328
4234 msgid "finished search at %s\n"
4237 #: builtin/describe.c:352
4240 "No annotated tags can describe '%s'.\n"
4241 "However, there were unannotated tags: try --tags."
4243 "没有注释 tag 能描述 '%s'。\n"
4244 "然而,有非注释 tag:尝试 --tags。"
4246 #: builtin/describe.c:356
4249 "No tags can describe '%s'.\n"
4250 "Try --always, or create some tags."
4252 "没有注释 tag 能描述 '%s'。\n"
4253 "尝试 --always,或者创建一些 tag。"
4255 #: builtin/describe.c:377
4257 msgid "traversed %lu commits\n"
4258 msgstr "已遍历 %lu 个提交\n"
4260 #: builtin/describe.c:380
4263 "more than %i tags found; listed %i most recent\n"
4264 "gave up search at %s\n"
4266 "发现多于 %i 个 tag,列出最近的 %i 个\n"
4269 #: builtin/describe.c:402
4270 msgid "find the tag that comes after the commit"
4271 msgstr "寻找提交之后的 tag(用于描述提交)"
4273 #: builtin/describe.c:403
4274 msgid "debug search strategy on stderr"
4275 msgstr "在标准错误上调试搜索策略"
4277 #: builtin/describe.c:404
4281 #: builtin/describe.c:405
4282 msgid "use any tag, even unannotated"
4283 msgstr "使用任意 tag,即使未带注解"
4285 #: builtin/describe.c:406
4286 msgid "always use long format"
4289 #: builtin/describe.c:409
4290 msgid "only output exact matches"
4293 #: builtin/describe.c:411
4294 msgid "consider <n> most recent tags (default: 10)"
4295 msgstr "考虑最近 <n> 个 tags(默认:10)"
4297 #: builtin/describe.c:413
4298 msgid "only consider tags matching <pattern>"
4299 msgstr "只考虑匹配 <模式> 的 tags"
4301 #: builtin/describe.c:415 builtin/name-rev.c:238
4302 msgid "show abbreviated commit object as fallback"
4303 msgstr "显示简写的提交号作为后备"
4305 #: builtin/describe.c:416
4309 #: builtin/describe.c:417
4310 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
4311 msgstr "若工作区脏(有变更)在结尾添加 <标记>(默认:\"-dirty\")"
4313 #: builtin/describe.c:435
4314 msgid "--long is incompatible with --abbrev=0"
4315 msgstr "--long 与 --abbrev=0 不兼容"
4317 #: builtin/describe.c:461
4318 msgid "No names found, cannot describe anything."
4319 msgstr "没有发现名称,无法描述任何东西。"
4321 #: builtin/describe.c:481
4322 msgid "--dirty is incompatible with committishes"
4323 msgstr "--dirty 不能与提交同时使用"
4325 #: builtin/diff.c:79
4327 msgid "'%s': not a regular file or symlink"
4328 msgstr "'%s':不是一个正规文件或符号链接"
4330 #: builtin/diff.c:228
4332 msgid "invalid option: %s"
4335 #: builtin/diff.c:305
4336 msgid "Not a git repository"
4337 msgstr "不是一个 git 版本库"
4339 #: builtin/diff.c:348
4341 msgid "invalid object '%s' given."
4342 msgstr "提供了无效对象 '%s'。"
4344 #: builtin/diff.c:353
4346 msgid "more than %d trees given: '%s'"
4347 msgstr "提供了超过 %d 个树对象:'%s'"
4349 #: builtin/diff.c:363
4351 msgid "more than two blobs given: '%s'"
4352 msgstr "提供了超过两个数据(blob)对象:'%s'"
4354 #: builtin/diff.c:371
4356 msgid "unhandled object '%s' given."
4357 msgstr "提供了无法处理的对象 '%s'。"
4359 #: builtin/fast-export.c:22
4360 msgid "git fast-export [rev-list-opts]"
4361 msgstr "git fast-export [rev-list-opts]"
4363 #: builtin/fast-export.c:652
4364 msgid "show progress after <n> objects"
4365 msgstr "在 <n> 个对象之后显示进度"
4367 #: builtin/fast-export.c:654
4368 msgid "select handling of signed tags"
4369 msgstr "选择如何处理签名 tags"
4371 #: builtin/fast-export.c:657
4372 msgid "select handling of tags that tag filtered objects"
4373 msgstr "选择当 tag 指向被过滤时 tags 的处理方式"
4375 #: builtin/fast-export.c:660
4376 msgid "Dump marks to this file"
4379 #: builtin/fast-export.c:662
4380 msgid "Import marks from this file"
4383 #: builtin/fast-export.c:664
4384 msgid "Fake a tagger when tags lack one"
4385 msgstr "当 tags 缺少标记者字段时,假装提供一个"
4387 #: builtin/fast-export.c:666
4388 msgid "Output full tree for each commit"
4391 #: builtin/fast-export.c:668
4392 msgid "Use the done feature to terminate the stream"
4393 msgstr "使用 done 功能来终止流"
4395 #: builtin/fast-export.c:669
4396 msgid "Skip output of blob data"
4399 #: builtin/fetch.c:20
4400 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
4401 msgstr "git fetch [<选项>] [<版本库> [<引用表达式>...]]"
4403 #: builtin/fetch.c:21
4404 msgid "git fetch [<options>] <group>"
4405 msgstr "git fetch [<选项>] <组>"
4407 #: builtin/fetch.c:22
4408 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
4409 msgstr "git fetch --multiple [<选项>] [(<版本库> | <组>)...]"
4411 #: builtin/fetch.c:23
4412 msgid "git fetch --all [<options>]"
4413 msgstr "git fetch --all [<选项>]"
4415 #: builtin/fetch.c:60
4416 msgid "fetch from all remotes"
4419 #: builtin/fetch.c:62
4420 msgid "append to .git/FETCH_HEAD instead of overwriting"
4421 msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
4423 #: builtin/fetch.c:64
4424 msgid "path to upload pack on remote end"
4427 #: builtin/fetch.c:65
4428 msgid "force overwrite of local branch"
4431 #: builtin/fetch.c:67
4432 msgid "fetch from multiple remotes"
4435 #: builtin/fetch.c:69
4436 msgid "fetch all tags and associated objects"
4437 msgstr "抓取所有的 tags 和关联对象"
4439 #: builtin/fetch.c:71
4440 msgid "do not fetch all tags (--no-tags)"
4441 msgstr "不抓取任何 tags (--no-tags)"
4443 #: builtin/fetch.c:73
4444 msgid "prune remote-tracking branches no longer on remote"
4445 msgstr "清除远程已经不存在的分支的跟踪分支"
4448 #: builtin/fetch.c:74
4452 #: builtin/fetch.c:75
4453 msgid "control recursive fetching of submodules"
4456 #: builtin/fetch.c:79
4457 msgid "keep downloaded pack"
4460 #: builtin/fetch.c:81
4461 msgid "allow updating of HEAD ref"
4462 msgstr "允许更新 HEAD 引用"
4464 #: builtin/fetch.c:84
4465 msgid "deepen history of shallow clone"
4468 #: builtin/fetch.c:86
4469 msgid "convert to a complete repository"
4470 msgstr "转换为一个完整的版本库"
4472 #: builtin/fetch.c:88 builtin/log.c:1121
4476 #: builtin/fetch.c:89
4477 msgid "prepend this to submodule path output"
4478 msgstr "在子模组路径输出的前面加上此目录"
4480 #: builtin/fetch.c:92
4481 msgid "default mode for recursion"
4484 #: builtin/fetch.c:204
4485 msgid "Couldn't find remote ref HEAD"
4486 msgstr "无法发现远程 HEAD 引用"
4488 #: builtin/fetch.c:257
4490 msgid "object %s not found"
4493 #: builtin/fetch.c:262
4494 msgid "[up to date]"
4497 #: builtin/fetch.c:276
4499 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
4500 msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)"
4502 #: builtin/fetch.c:277 builtin/fetch.c:363
4506 #: builtin/fetch.c:288
4507 msgid "[tag update]"
4511 #: builtin/fetch.c:290 builtin/fetch.c:325 builtin/fetch.c:343
4512 msgid " (unable to update local ref)"
4513 msgstr " (不能更新本地引用)"
4515 #: builtin/fetch.c:308
4519 #: builtin/fetch.c:311
4520 msgid "[new branch]"
4523 #: builtin/fetch.c:314
4527 #: builtin/fetch.c:359
4528 msgid "unable to update local ref"
4531 #: builtin/fetch.c:359
4532 msgid "forced update"
4535 #: builtin/fetch.c:365
4536 msgid "(non-fast-forward)"
4539 #: builtin/fetch.c:396 builtin/fetch.c:688
4541 msgid "cannot open %s: %s\n"
4542 msgstr "无法打开 %s:%s\n"
4544 #: builtin/fetch.c:405
4546 msgid "%s did not send all necessary objects\n"
4547 msgstr "%s 未发送所有必须的对象\n"
4549 #: builtin/fetch.c:491
4554 #: builtin/fetch.c:502
4557 "some local refs could not be updated; try running\n"
4558 " 'git remote prune %s' to remove any old, conflicting branches"
4560 "一些本地引用不能被更新;尝试运行\n"
4561 " 'git remote prune %s' 来删除旧的、有冲突的分支"
4564 #: builtin/fetch.c:552
4566 msgid " (%s will become dangling)"
4567 msgstr " (%s 将成为摇摆状态)"
4570 #: builtin/fetch.c:553
4572 msgid " (%s has become dangling)"
4573 msgstr " (%s 已成为摇摆状态)"
4575 #: builtin/fetch.c:560
4579 #: builtin/fetch.c:561 builtin/remote.c:1055
4583 #: builtin/fetch.c:678
4585 msgid "Refusing to fetch into current branch %s of non-bare repository"
4586 msgstr "拒绝获取到非裸版本库的当前分支 %s"
4588 #: builtin/fetch.c:712
4590 msgid "Don't know how to fetch from %s"
4591 msgstr "不知道如何从 %s 获取"
4593 #: builtin/fetch.c:789
4595 msgid "Option \"%s\" value \"%s\" is not valid for %s"
4596 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
4598 #: builtin/fetch.c:792
4600 msgid "Option \"%s\" is ignored for %s\n"
4601 msgstr "选项 \"%s\" 为 %s 所忽略\n"
4603 #: builtin/fetch.c:894
4605 msgid "Fetching %s\n"
4608 #: builtin/fetch.c:896 builtin/remote.c:100
4610 msgid "Could not fetch %s"
4613 #: builtin/fetch.c:915
4615 "No remote repository specified. Please, specify either a URL or a\n"
4616 "remote name from which new revisions should be fetched."
4617 msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定,用以获取新提交。"
4619 #: builtin/fetch.c:935
4620 msgid "You need to specify a tag name."
4621 msgstr "您需要指定一个 tag 名称。"
4623 #: builtin/fetch.c:981
4624 msgid "--depth and --unshallow cannot be used together"
4625 msgstr "--depth 和 --unshallow 不能同时使用"
4627 #: builtin/fetch.c:983
4628 msgid "--unshallow on a complete repository does not make sense"
4629 msgstr "对于一个完整的版本库,参数 --unshallow 没有意义"
4631 #: builtin/fetch.c:1002
4632 msgid "fetch --all does not take a repository argument"
4633 msgstr "fetch --all 不能带一个版本库参数"
4635 #: builtin/fetch.c:1004
4636 msgid "fetch --all does not make sense with refspecs"
4637 msgstr "fetch --all 带引用表达式没有任何意义"
4639 #: builtin/fetch.c:1015
4641 msgid "No such remote or remote group: %s"
4642 msgstr "没有这样的远程或远程组:%s"
4644 #: builtin/fetch.c:1023
4645 msgid "Fetching a group and specifying refspecs does not make sense"
4646 msgstr "获取组并指定引用表达式没有意义"
4648 #: builtin/fmt-merge-msg.c:13
4649 msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
4651 "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
4653 #: builtin/fmt-merge-msg.c:659 builtin/fmt-merge-msg.c:662 builtin/grep.c:701
4654 #: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:175
4655 #: builtin/tag.c:446 parse-options.h:133 parse-options.h:239
4659 #: builtin/fmt-merge-msg.c:660
4660 msgid "populate log with at most <n> entries from shortlog"
4661 msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
4663 #: builtin/fmt-merge-msg.c:663
4664 msgid "alias for --log (deprecated)"
4665 msgstr "参数 --log 的别名(已弃用)"
4667 #: builtin/fmt-merge-msg.c:666
4671 #: builtin/fmt-merge-msg.c:667
4672 msgid "use <text> as start of message"
4673 msgstr "使用 <文本> 作为提交说明的开始"
4675 #: builtin/fmt-merge-msg.c:668
4676 msgid "file to read from"
4679 #: builtin/for-each-ref.c:979
4680 msgid "git for-each-ref [options] [<pattern>]"
4681 msgstr "git for-each-ref [选项] [<模式>]"
4683 #: builtin/for-each-ref.c:994
4684 msgid "quote placeholders suitably for shells"
4685 msgstr "引用占位符适用于 shells"
4687 #: builtin/for-each-ref.c:996
4688 msgid "quote placeholders suitably for perl"
4689 msgstr "引用占位符适用于 perl"
4691 #: builtin/for-each-ref.c:998
4692 msgid "quote placeholders suitably for python"
4693 msgstr "引用占位符适用于 python"
4695 #: builtin/for-each-ref.c:1000
4696 msgid "quote placeholders suitably for tcl"
4697 msgstr "引用占位符适用于 tcl"
4699 #: builtin/for-each-ref.c:1003
4700 msgid "show only <n> matched refs"
4701 msgstr "只显示 <n> 个匹配的引用"
4703 #: builtin/for-each-ref.c:1004
4707 #: builtin/for-each-ref.c:1004
4708 msgid "format to use for the output"
4711 #: builtin/for-each-ref.c:1005
4715 #: builtin/for-each-ref.c:1006
4716 msgid "field name to sort on"
4719 #: builtin/fsck.c:608
4720 msgid "git fsck [options] [<object>...]"
4721 msgstr "git fsck [选项] [<对象>...]"
4723 #: builtin/fsck.c:614
4724 msgid "show unreachable objects"
4727 #: builtin/fsck.c:615
4728 msgid "show dangling objects"
4731 #: builtin/fsck.c:616
4735 #: builtin/fsck.c:617
4736 msgid "report root nodes"
4739 #: builtin/fsck.c:618
4740 msgid "make index objects head nodes"
4741 msgstr "将索引亦作为检查的头节点"
4743 #: builtin/fsck.c:619
4744 msgid "make reflogs head nodes (default)"
4745 msgstr "将引用日志作为检查的头节点(默认)"
4747 #: builtin/fsck.c:620
4748 msgid "also consider packs and alternate objects"
4751 #: builtin/fsck.c:621
4752 msgid "enable more strict checking"
4755 #: builtin/fsck.c:623
4756 msgid "write dangling objects in .git/lost-found"
4757 msgstr "将摇摆对象写入 .git/lost-found 中"
4759 #: builtin/fsck.c:624 builtin/prune.c:134
4760 msgid "show progress"
4764 msgid "git gc [options]"
4765 msgstr "git gc [选项]"
4769 msgid "Invalid %s: '%s'"
4770 msgstr "无效的 %s:'%s'"
4774 msgid "insanely long object directory %.*s"
4775 msgstr "不正常的长对象目录 %.*s"
4778 msgid "prune unreferenced objects"
4782 msgid "be more thorough (increased runtime)"
4783 msgstr "更彻底(增加运行时间)"
4786 msgid "enable auto-gc mode"
4792 "Auto packing the repository for optimum performance. You may also\n"
4793 "run \"git gc\" manually. See \"git help gc\" for more information.\n"
4795 "自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n"
4796 "参见 \"git help gc\" 以获取更多信息。\n"
4800 "There are too many unreachable loose objects; run 'git prune' to remove them."
4801 msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
4803 #: builtin/grep.c:22
4804 msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"
4805 msgstr "git grep [选项] [-e] <模式> [<修订>...] [[--] <路径>...]"
4807 #: builtin/grep.c:217
4809 msgid "grep: failed to create thread: %s"
4810 msgstr "grep:无法创建线程:%s"
4812 #: builtin/grep.c:365
4814 msgid "Failed to chdir: %s"
4817 #: builtin/grep.c:443 builtin/grep.c:478
4819 msgid "unable to read tree (%s)"
4822 #: builtin/grep.c:493
4824 msgid "unable to grep from object of type %s"
4825 msgstr "无法抓取来自于 %s 类型的对象"
4827 #: builtin/grep.c:551
4829 msgid "switch `%c' expects a numerical value"
4830 msgstr "开关 `%c' 期望一个数字值"
4832 #: builtin/grep.c:568
4834 msgid "cannot open '%s'"
4837 #: builtin/grep.c:643
4838 msgid "search in index instead of in the work tree"
4839 msgstr "在索引区搜索而不是在工作区"
4841 #: builtin/grep.c:645
4842 msgid "find in contents not managed by git"
4843 msgstr "在未被 git 管理的内容中查找"
4845 # 译者:中文字符串拼接,可删除前导空格
4846 #: builtin/grep.c:647
4847 msgid "search in both tracked and untracked files"
4848 msgstr "在跟踪和未跟踪的文件中搜索"
4850 #: builtin/grep.c:649
4851 msgid "search also in ignored files"
4854 #: builtin/grep.c:652
4855 msgid "show non-matching lines"
4858 #: builtin/grep.c:654
4859 msgid "case insensitive matching"
4862 #: builtin/grep.c:656
4863 msgid "match patterns only at word boundaries"
4866 #: builtin/grep.c:658
4867 msgid "process binary files as text"
4868 msgstr "把二进制文件当做文本处理"
4870 #: builtin/grep.c:660
4871 msgid "don't match patterns in binary files"
4872 msgstr "不在二进制文件中匹配模式"
4874 #: builtin/grep.c:663
4875 msgid "descend at most <depth> levels"
4876 msgstr "最多以指定的深度向下寻找"
4878 #: builtin/grep.c:667
4879 msgid "use extended POSIX regular expressions"
4880 msgstr "使用扩展的 POSIX 正则表达式"
4882 #: builtin/grep.c:670
4883 msgid "use basic POSIX regular expressions (default)"
4884 msgstr "使用基本的 POSIX 正则表达式(默认)"
4886 #: builtin/grep.c:673
4887 msgid "interpret patterns as fixed strings"
4888 msgstr "把模式解析为固定的字符串"
4890 #: builtin/grep.c:676
4891 msgid "use Perl-compatible regular expressions"
4892 msgstr "使用 Perl 兼容的正则表达式"
4894 #: builtin/grep.c:679
4895 msgid "show line numbers"
4898 #: builtin/grep.c:680
4899 msgid "don't show filenames"
4902 #: builtin/grep.c:681
4903 msgid "show filenames"
4906 #: builtin/grep.c:683
4907 msgid "show filenames relative to top directory"
4908 msgstr "显示相对于顶级目录的文件名"
4910 #: builtin/grep.c:685
4911 msgid "show only filenames instead of matching lines"
4912 msgstr "只显示文件名而不显示匹配的行"
4914 #: builtin/grep.c:687
4915 msgid "synonym for --files-with-matches"
4916 msgstr "和 --files-with-matches 同义"
4918 #: builtin/grep.c:690
4919 msgid "show only the names of files without match"
4922 #: builtin/grep.c:692
4923 msgid "print NUL after filenames"
4924 msgstr "在文件名后输出 NUL 字符"
4926 #: builtin/grep.c:694
4927 msgid "show the number of matches instead of matching lines"
4928 msgstr "显示总匹配行数,而不显示匹配的行"
4930 #: builtin/grep.c:695
4931 msgid "highlight matches"
4934 #: builtin/grep.c:697
4935 msgid "print empty line between matches from different files"
4936 msgstr "在不同文件的匹配项之间打印空行"
4938 #: builtin/grep.c:699
4939 msgid "show filename only once above matches from same file"
4940 msgstr "只在同一文件的匹配项的上面显示一次文件名"
4942 #: builtin/grep.c:702
4943 msgid "show <n> context lines before and after matches"
4944 msgstr "显示匹配项前后的 <n> 行上下文"
4946 #: builtin/grep.c:705
4947 msgid "show <n> context lines before matches"
4948 msgstr "显示匹配项前 <n> 行上下文"
4950 #: builtin/grep.c:707
4951 msgid "show <n> context lines after matches"
4952 msgstr "显示匹配项后 <n> 行上下文"
4954 #: builtin/grep.c:708
4955 msgid "shortcut for -C NUM"
4958 #: builtin/grep.c:711
4959 msgid "show a line with the function name before matches"
4960 msgstr "在匹配的前面显示一行函数名"
4962 #: builtin/grep.c:713
4963 msgid "show the surrounding function"
4964 msgstr "显示所在函数的前后内容"
4966 #: builtin/grep.c:716
4967 msgid "read patterns from file"
4970 #: builtin/grep.c:718
4971 msgid "match <pattern>"
4974 #: builtin/grep.c:720
4975 msgid "combine patterns specified with -e"
4976 msgstr "组合用 -e 参数设定的模式"
4978 #: builtin/grep.c:732
4979 msgid "indicate hit with exit status without output"
4980 msgstr "不输出,而用退出码标识命中状态"
4982 #: builtin/grep.c:734
4983 msgid "show only matches from files that match all patterns"
4984 msgstr "只显示匹配所有模式的文件中的匹配"
4986 #: builtin/grep.c:736
4987 msgid "show parse tree for grep expression"
4988 msgstr "显示 grep 表达式的解析树"
4990 #: builtin/grep.c:740
4994 #: builtin/grep.c:740
4995 msgid "show matching files in the pager"
4998 #: builtin/grep.c:743
4999 msgid "allow calling of grep(1) (ignored by this build)"
5000 msgstr "允许调用 grep(1)(本次构建忽略)"
5002 #: builtin/grep.c:744 builtin/show-ref.c:184
5006 #: builtin/grep.c:811
5007 msgid "no pattern given."
5010 #: builtin/grep.c:866
5011 msgid "--open-files-in-pager only works on the worktree"
5012 msgstr "--open-files-in-pager 仅用于工作区"
5014 #: builtin/grep.c:889
5015 msgid "--cached or --untracked cannot be used with --no-index."
5016 msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
5018 #: builtin/grep.c:894
5019 msgid "--no-index or --untracked cannot be used with revs."
5020 msgstr "--no-index 或 --untracked 不能和版本同时使用。"
5022 #: builtin/grep.c:897
5023 msgid "--[no-]exclude-standard cannot be used for tracked contents."
5024 msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
5026 #: builtin/grep.c:905
5027 msgid "both --cached and trees are given."
5028 msgstr "同时给出了 --cached 和树对象。"
5030 #: builtin/hash-object.c:60
5032 "git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "
5035 "git hash-object [-t <类型>] [-w] [--path=<文件>|--no-filters] [--stdin] [--] "
5038 #: builtin/hash-object.c:61
5039 msgid "git hash-object --stdin-paths < <list-of-paths>"
5040 msgstr "git hash-object --stdin-paths < <路径列表>"
5042 #: builtin/hash-object.c:72
5046 #: builtin/hash-object.c:72
5050 #: builtin/hash-object.c:73
5051 msgid "write the object into the object database"
5054 #: builtin/hash-object.c:74
5055 msgid "read the object from stdin"
5058 #: builtin/hash-object.c:76
5059 msgid "store file as is without filters"
5060 msgstr "原样存储文件不使用过滤器"
5062 #: builtin/hash-object.c:77
5063 msgid "process file as it were from this path"
5064 msgstr "处理文件并假设其来自于此路径"
5066 #: builtin/help.c:42
5067 msgid "print all available commands"
5070 #: builtin/help.c:43
5071 msgid "show man page"
5074 #: builtin/help.c:44
5075 msgid "show manual in web browser"
5076 msgstr "在 web 浏览器中显示手册"
5078 #: builtin/help.c:46
5079 msgid "show info page"
5082 #: builtin/help.c:52
5083 msgid "git help [--all] [--man|--web|--info] [command]"
5084 msgstr "git help [--all] [--man|--web|--info] [命令]"
5086 #: builtin/help.c:64
5088 msgid "unrecognized help format '%s'"
5089 msgstr "未能识别的帮助格式 '%s'"
5091 #: builtin/help.c:92
5092 msgid "Failed to start emacsclient."
5093 msgstr "无法启动 emacsclient。"
5095 #: builtin/help.c:105
5096 msgid "Failed to parse emacsclient version."
5097 msgstr "无法解析 emacsclient 版本。"
5099 #: builtin/help.c:113
5101 msgid "emacsclient version '%d' too old (< 22)."
5102 msgstr "emacsclient 版本 '%d' 太老(< 22)。"
5104 #: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176
5106 msgid "failed to exec '%s': %s"
5107 msgstr "无法执行 '%s':%s"
5109 #: builtin/help.c:216
5112 "'%s': path for unsupported man viewer.\n"
5113 "Please consider using 'man.<tool>.cmd' instead."
5115 "'%s':不支持的 man 手册查看器的路径。\n"
5116 "请使用 'man.<tool>.cmd'。"
5118 #: builtin/help.c:228
5121 "'%s': cmd for supported man viewer.\n"
5122 "Please consider using 'man.<tool>.path' instead."
5124 "'%s': 支持的 man 手册查看器命令。\n"
5125 "请使用 'man.<tool>.path'。"
5127 #: builtin/help.c:349
5129 msgid "'%s': unknown man viewer."
5130 msgstr "'%s':未知的 man 查看器。"
5132 #: builtin/help.c:366
5133 msgid "no man viewer handled the request"
5134 msgstr "没有 man 查看器处理此请求"
5136 #: builtin/help.c:374
5137 msgid "no info viewer handled the request"
5138 msgstr "没有 info 查看器处理此请求"
5140 #: builtin/help.c:429 builtin/help.c:436
5145 #: builtin/help.c:452
5147 msgid "`git %s' is aliased to `%s'"
5148 msgstr "`git %s' 是 `%s' 的别名"
5150 #: builtin/index-pack.c:182
5152 msgid "object type mismatch at %s"
5153 msgstr "%s 的对象类型不匹配"
5155 #: builtin/index-pack.c:202
5156 msgid "object of unexpected type"
5159 #: builtin/index-pack.c:239
5161 msgid "cannot fill %d byte"
5162 msgid_plural "cannot fill %d bytes"
5163 msgstr[0] "无法填充 %d 字节"
5164 msgstr[1] "无法填充 %d 字节"
5166 #: builtin/index-pack.c:249
5168 msgstr "过早的文件结束符(EOF)"
5170 #: builtin/index-pack.c:250
5171 msgid "read error on input"
5174 #: builtin/index-pack.c:262
5175 msgid "used more bytes than were available"
5178 #: builtin/index-pack.c:269
5179 msgid "pack too large for current definition of off_t"
5180 msgstr "包太大超过了当前 off_t 的定义"
5182 #: builtin/index-pack.c:285
5184 msgid "unable to create '%s'"
5187 #: builtin/index-pack.c:290
5189 msgid "cannot open packfile '%s'"
5190 msgstr "无法打开包文件 '%s'"
5192 #: builtin/index-pack.c:304
5193 msgid "pack signature mismatch"
5196 #: builtin/index-pack.c:306
5198 msgid "pack version %<PRIu32> unsupported"
5199 msgstr "不支持包版本 %<PRIu32>"
5201 #: builtin/index-pack.c:324
5203 msgid "pack has bad object at offset %lu: %s"
5204 msgstr "包中有错误的对象位于 %lu:%s"
5206 #: builtin/index-pack.c:446
5208 msgid "inflate returned %d"
5211 #: builtin/index-pack.c:495
5212 msgid "offset value overflow for delta base object"
5213 msgstr "偏移值覆盖了 delta 基准对象"
5215 #: builtin/index-pack.c:503
5216 msgid "delta base offset is out of bound"
5217 msgstr "delta 基准偏移越界"
5219 #: builtin/index-pack.c:511
5221 msgid "unknown object type %d"
5224 #: builtin/index-pack.c:542
5225 msgid "cannot pread pack file"
5228 #: builtin/index-pack.c:544
5230 msgid "premature end of pack file, %lu byte missing"
5231 msgid_plural "premature end of pack file, %lu bytes missing"
5232 msgstr[0] "包文件过早结束,缺少 %lu 字节"
5233 msgstr[1] "包文件过早结束,缺少 %lu 字节"
5235 #: builtin/index-pack.c:570
5236 msgid "serious inflate inconsistency"
5239 #: builtin/index-pack.c:661 builtin/index-pack.c:667 builtin/index-pack.c:690
5240 #: builtin/index-pack.c:724 builtin/index-pack.c:733
5242 msgid "SHA1 COLLISION FOUND WITH %s !"
5243 msgstr "发现 %s 出现 SHA1 冲突!"
5245 #: builtin/index-pack.c:664 builtin/pack-objects.c:170
5246 #: builtin/pack-objects.c:262
5248 msgid "unable to read %s"
5251 #: builtin/index-pack.c:730
5253 msgid "cannot read existing object %s"
5254 msgstr "不能读取现存对象 %s"
5256 #: builtin/index-pack.c:744
5258 msgid "invalid blob object %s"
5259 msgstr "无效的数据(blob)对象 %s"
5261 #: builtin/index-pack.c:759
5266 #: builtin/index-pack.c:761
5267 msgid "Error in object"
5270 #: builtin/index-pack.c:763
5272 msgid "Not all child objects of %s are reachable"
5273 msgstr "%s 的所有子对象并非都可达"
5275 #: builtin/index-pack.c:833 builtin/index-pack.c:863
5276 msgid "failed to apply delta"
5279 #: builtin/index-pack.c:1004
5280 msgid "Receiving objects"
5283 #: builtin/index-pack.c:1004
5284 msgid "Indexing objects"
5287 #: builtin/index-pack.c:1030
5288 msgid "pack is corrupted (SHA1 mismatch)"
5289 msgstr "包冲突(SHA1 不匹配)"
5291 #: builtin/index-pack.c:1035
5292 msgid "cannot fstat packfile"
5295 #: builtin/index-pack.c:1038
5296 msgid "pack has junk at the end"
5299 #: builtin/index-pack.c:1049
5300 msgid "confusion beyond insanity in parse_pack_objects()"
5301 msgstr "parse_pack_objects() 中遇到不可理喻的问题"
5303 #: builtin/index-pack.c:1072
5304 msgid "Resolving deltas"
5307 #: builtin/index-pack.c:1082
5309 msgid "unable to create thread: %s"
5312 #: builtin/index-pack.c:1124
5313 msgid "confusion beyond insanity"
5316 #: builtin/index-pack.c:1132
5318 msgid "completed with %d local objects"
5319 msgstr "完成 %d 个本地对象"
5321 #: builtin/index-pack.c:1142
5323 msgid "Unexpected tail checksum for %s (disk corruption?)"
5324 msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
5326 #: builtin/index-pack.c:1146
5328 msgid "pack has %d unresolved delta"
5329 msgid_plural "pack has %d unresolved deltas"
5330 msgstr[0] "包有 %d 个未解决的 delta"
5331 msgstr[1] "包有 %d 个未解决的 delta"
5333 #: builtin/index-pack.c:1171
5335 msgid "unable to deflate appended object (%d)"
5336 msgstr "不能压缩附加对象(%d)"
5338 #: builtin/index-pack.c:1250
5340 msgid "local object %s is corrupt"
5341 msgstr "本地对象 %s 已损坏"
5343 #: builtin/index-pack.c:1274
5344 msgid "error while closing pack file"
5347 #: builtin/index-pack.c:1287
5349 msgid "cannot write keep file '%s'"
5350 msgstr "无法写保留文件 '%s'"
5352 #: builtin/index-pack.c:1295
5354 msgid "cannot close written keep file '%s'"
5355 msgstr "无法关闭保留文件 '%s'"
5357 #: builtin/index-pack.c:1308
5358 msgid "cannot store pack file"
5361 #: builtin/index-pack.c:1319
5362 msgid "cannot store index file"
5365 #: builtin/index-pack.c:1352
5367 msgid "bad pack.indexversion=%<PRIu32>"
5368 msgstr "坏的 pack.indexversion=%<PRIu32>"
5370 #: builtin/index-pack.c:1358
5372 msgid "invalid number of threads specified (%d)"
5373 msgstr "指定的线程数无效(%d)"
5375 #: builtin/index-pack.c:1362 builtin/index-pack.c:1535
5377 msgid "no threads support, ignoring %s"
5378 msgstr "没有线程支持,忽略 %s"
5380 #: builtin/index-pack.c:1420
5382 msgid "Cannot open existing pack file '%s'"
5383 msgstr "无法打开现存包文件 '%s'"
5385 #: builtin/index-pack.c:1422
5387 msgid "Cannot open existing pack idx file for '%s'"
5388 msgstr "无法为 %s 打开包索引文件"
5390 #: builtin/index-pack.c:1469
5392 msgid "non delta: %d object"
5393 msgid_plural "non delta: %d objects"
5394 msgstr[0] "非 delta:%d 个对象"
5395 msgstr[1] "非 delta:%d 个对象"
5397 #: builtin/index-pack.c:1476
5399 msgid "chain length = %d: %lu object"
5400 msgid_plural "chain length = %d: %lu objects"
5401 msgstr[0] "链长 = %d: %lu 对象"
5402 msgstr[1] "链长 = %d: %lu 对象"
5404 #: builtin/index-pack.c:1503
5405 msgid "Cannot come back to cwd"
5408 #: builtin/index-pack.c:1547 builtin/index-pack.c:1550
5409 #: builtin/index-pack.c:1562 builtin/index-pack.c:1566
5414 #: builtin/index-pack.c:1580
5415 msgid "--fix-thin cannot be used without --stdin"
5416 msgstr "--fix-thin 不能和 --stdin 同时使用"
5418 #: builtin/index-pack.c:1584 builtin/index-pack.c:1594
5420 msgid "packfile name '%s' does not end with '.pack'"
5421 msgstr "包名 '%s' 没有以 '.pack' 结尾"
5423 #: builtin/index-pack.c:1603
5424 msgid "--verify with no packfile name given"
5425 msgstr "--verify 没有提供包名参数"
5427 #: builtin/init-db.c:35
5429 msgid "Could not make %s writable by group"
5430 msgstr "不能设置 %s 为组可写"
5432 #: builtin/init-db.c:62
5434 msgid "insanely long template name %s"
5437 #: builtin/init-db.c:67
5439 msgid "cannot stat '%s'"
5440 msgstr "不能枚举 '%s' 状态"
5442 #: builtin/init-db.c:73
5444 msgid "cannot stat template '%s'"
5445 msgstr "不能枚举模版 '%s' 状态"
5447 #: builtin/init-db.c:80
5449 msgid "cannot opendir '%s'"
5450 msgstr "不能打开目录 '%s'"
5452 #: builtin/init-db.c:97
5454 msgid "cannot readlink '%s'"
5455 msgstr "不能读取链接 '%s'"
5457 #: builtin/init-db.c:99
5459 msgid "insanely long symlink %s"
5462 #: builtin/init-db.c:102
5464 msgid "cannot symlink '%s' '%s'"
5465 msgstr "不能自 '%s' 到 '%s' 创建符号链接"
5467 #: builtin/init-db.c:106
5469 msgid "cannot copy '%s' to '%s'"
5470 msgstr "不能拷贝 '%s' 至 '%s'"
5472 #: builtin/init-db.c:110
5474 msgid "ignoring template %s"
5477 #: builtin/init-db.c:133
5479 msgid "insanely long template path %s"
5482 #: builtin/init-db.c:141
5484 msgid "templates not found %s"
5487 #: builtin/init-db.c:154
5489 msgid "not copying templates of a wrong format version %d from '%s'"
5490 msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
5492 #: builtin/init-db.c:192
5494 msgid "insane git directory %s"
5495 msgstr "不正常的 git 目录 %s"
5497 #: builtin/init-db.c:323 builtin/init-db.c:326
5499 msgid "%s already exists"
5502 #: builtin/init-db.c:355
5504 msgid "unable to handle file type %d"
5505 msgstr "不能处理 %d 类型的文件"
5507 #: builtin/init-db.c:358
5509 msgid "unable to move %s to %s"
5510 msgstr "不能移动 %s 至 %s"
5512 #: builtin/init-db.c:363
5514 msgid "Could not create git link %s"
5515 msgstr "不能创建 git link %s"
5518 #. * TRANSLATORS: The first '%s' is either "Reinitialized
5519 #. * existing" or "Initialized empty", the second " shared" or
5520 #. * "", and the last '%s%s' is the verbatim directory name.
5522 #: builtin/init-db.c:420
5524 msgid "%s%s Git repository in %s%s\n"
5525 msgstr "%s%s Git 版本库于 %s%s\n"
5527 #: builtin/init-db.c:421
5528 msgid "Reinitialized existing"
5531 #: builtin/init-db.c:421
5532 msgid "Initialized empty"
5535 # 译者:中文字符串拼接,可删除前导空格
5536 #: builtin/init-db.c:422
5540 #: builtin/init-db.c:441
5541 msgid "cannot tell cwd"
5544 #: builtin/init-db.c:467
5546 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
5547 "shared[=<permissions>]] [directory]"
5549 "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
5552 #: builtin/init-db.c:490
5556 #: builtin/init-db.c:491
5557 msgid "specify that the git repository is to be shared amongst several users"
5558 msgstr "指定 git 版本库是多个用户之间共享的"
5560 #: builtin/init-db.c:493 builtin/prune-packed.c:77
5564 #: builtin/init-db.c:522 builtin/init-db.c:529
5566 msgid "cannot mkdir %s"
5569 #: builtin/init-db.c:533
5571 msgid "cannot chdir to %s"
5574 #: builtin/init-db.c:555
5577 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
5580 "不允许 %s(或 --work-tree=<directory>)而没有指定 %s(或 --git-"
5583 #: builtin/init-db.c:579
5584 msgid "Cannot access current working directory"
5587 #: builtin/init-db.c:586
5589 msgid "Cannot access work tree '%s'"
5590 msgstr "不能访问工作区 '%s'"
5593 msgid "git log [<options>] [<since>..<until>] [[--] <path>...]\n"
5594 msgstr "git log [<选项>] [<从>..<到>] [[--] <路径>...]\n"
5597 msgid " or: git show [options] <object>..."
5598 msgstr " 或者:git show [选项] <对象>..."
5600 #: builtin/log.c:103
5601 msgid "suppress diff output"
5604 #: builtin/log.c:104
5608 #: builtin/log.c:105
5609 msgid "Use mail map file"
5612 #: builtin/log.c:106
5613 msgid "decorate options"
5616 #: builtin/log.c:199
5618 msgid "Final output: %d %s\n"
5619 msgstr "最终输出:%d %s\n"
5621 #: builtin/log.c:422 builtin/log.c:514
5623 msgid "Could not read object %s"
5626 #: builtin/log.c:538
5628 msgid "Unknown type: %d"
5631 #: builtin/log.c:630
5632 msgid "format.headers without value"
5633 msgstr "format.headers 没有值"
5635 #: builtin/log.c:704
5636 msgid "name of output directory is too long"
5639 #: builtin/log.c:720
5641 msgid "Cannot open patch file %s"
5642 msgstr "无法打开补丁文件 %s"
5644 #: builtin/log.c:734
5645 msgid "Need exactly one range."
5648 #: builtin/log.c:742
5649 msgid "Not a range."
5652 #: builtin/log.c:815
5653 msgid "Cover letter needs email format"
5656 #: builtin/log.c:888
5658 msgid "insane in-reply-to: %s"
5659 msgstr "不正常的 in-reply-to:%s"
5661 #: builtin/log.c:916
5662 msgid "git format-patch [options] [<since> | <revision range>]"
5663 msgstr "git format-patch [选项] [<从> | <修订集范围>]"
5665 #: builtin/log.c:961
5666 msgid "Two output directories?"
5669 #: builtin/log.c:1099
5670 msgid "use [PATCH n/m] even with a single patch"
5671 msgstr "使用 [PATCH n/m],即使只有一个补丁"
5673 #: builtin/log.c:1102
5674 msgid "use [PATCH] even with multiple patches"
5675 msgstr "使用 [PATCH],即使有多个补丁"
5677 #: builtin/log.c:1106
5678 msgid "print patches to standard out"
5681 #: builtin/log.c:1108
5682 msgid "generate a cover letter"
5685 #: builtin/log.c:1110
5686 msgid "use simple number sequence for output file names"
5687 msgstr "使用简单的数字序列作为输出文件名"
5689 #: builtin/log.c:1111
5693 #: builtin/log.c:1112
5694 msgid "use <sfx> instead of '.patch'"
5695 msgstr "使用 <后缀> 代替 '.patch'"
5697 #: builtin/log.c:1114
5698 msgid "start numbering patches at <n> instead of 1"
5699 msgstr "补丁以 <n> 开始编号,而不是1"
5701 #: builtin/log.c:1116
5702 msgid "mark the series as Nth re-roll"
5703 msgstr "标记补丁系列是第几次重制"
5705 #: builtin/log.c:1118
5706 msgid "Use [<prefix>] instead of [PATCH]"
5707 msgstr "使用 [<前缀>] 代替 [PATCH]"
5709 #: builtin/log.c:1121
5710 msgid "store resulting files in <dir>"
5711 msgstr "把结果文件存储在 <dir>"
5713 #: builtin/log.c:1124
5714 msgid "don't strip/add [PATCH]"
5715 msgstr "不删除/添加 [PATCH]"
5717 #: builtin/log.c:1127
5718 msgid "don't output binary diffs"
5721 #: builtin/log.c:1129
5722 msgid "don't include a patch matching a commit upstream"
5723 msgstr "不包含已在上游提交中的补丁"
5725 #: builtin/log.c:1131
5726 msgid "show patch format instead of default (patch + stat)"
5727 msgstr "显示纯补丁格式而非默认的(补丁+状态)"
5729 #: builtin/log.c:1133
5733 #: builtin/log.c:1134
5737 #: builtin/log.c:1135
5738 msgid "add email header"
5741 #: builtin/log.c:1136 builtin/log.c:1138
5745 #: builtin/log.c:1136
5746 msgid "add To: header"
5749 #: builtin/log.c:1138
5750 msgid "add Cc: header"
5753 #: builtin/log.c:1140
5757 #: builtin/log.c:1141
5758 msgid "make first mail a reply to <message-id>"
5759 msgstr "使第一封邮件作为对 <message-id> 的回复"
5761 #: builtin/log.c:1142 builtin/log.c:1145
5765 #: builtin/log.c:1143
5766 msgid "attach the patch"
5769 #: builtin/log.c:1146
5770 msgid "inline the patch"
5773 #: builtin/log.c:1150
5774 msgid "enable message threading, styles: shallow, deep"
5775 msgstr "启用邮件线索,风格:浅,深"
5777 #: builtin/log.c:1152
5781 #: builtin/log.c:1153
5782 msgid "add a signature"
5785 #: builtin/log.c:1155
5786 msgid "don't print the patch filenames"
5789 #: builtin/log.c:1239
5790 msgid "-n and -k are mutually exclusive."
5791 msgstr "-n 和 -k 互斥。"
5793 #: builtin/log.c:1241
5794 msgid "--subject-prefix and -k are mutually exclusive."
5795 msgstr "--subject-prefix 和 -k 互斥。"
5797 #: builtin/log.c:1249
5798 msgid "--name-only does not make sense"
5799 msgstr "--name-only 无意义"
5801 #: builtin/log.c:1251
5802 msgid "--name-status does not make sense"
5803 msgstr "--name-status 无意义"
5805 #: builtin/log.c:1253
5806 msgid "--check does not make sense"
5807 msgstr "--check 无意义"
5809 #: builtin/log.c:1276
5810 msgid "standard output, or directory, which one?"
5811 msgstr "标准输出或目录,哪一个?"
5813 #: builtin/log.c:1278
5815 msgid "Could not create directory '%s'"
5816 msgstr "不能创建目录 '%s'"
5818 #: builtin/log.c:1431
5819 msgid "Failed to create output files"
5822 #: builtin/log.c:1480
5823 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
5824 msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
5826 #: builtin/log.c:1535
5829 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
5830 msgstr "不能找到跟踪的远程分支,请手工指定 <upstream>。\n"
5832 #: builtin/log.c:1548 builtin/log.c:1550 builtin/log.c:1562
5834 msgid "Unknown commit %s"
5837 #: builtin/ls-files.c:409
5838 msgid "git ls-files [options] [<file>...]"
5839 msgstr "git ls-files [选项] [<文件>...]"
5841 #: builtin/ls-files.c:466
5842 msgid "identify the file status with tags"
5845 #: builtin/ls-files.c:468
5846 msgid "use lowercase letters for 'assume unchanged' files"
5847 msgstr "使用小写字母表示 '假设未改变的' 文件"
5849 #: builtin/ls-files.c:470
5850 msgid "show cached files in the output (default)"
5851 msgstr "显示缓存的文件(默认)"
5853 #: builtin/ls-files.c:472
5854 msgid "show deleted files in the output"
5857 #: builtin/ls-files.c:474
5858 msgid "show modified files in the output"
5861 #: builtin/ls-files.c:476
5862 msgid "show other files in the output"
5865 #: builtin/ls-files.c:478
5866 msgid "show ignored files in the output"
5869 #: builtin/ls-files.c:481
5870 msgid "show staged contents' object name in the output"
5871 msgstr "显示暂存区内容的对象名称"
5873 #: builtin/ls-files.c:483
5874 msgid "show files on the filesystem that need to be removed"
5875 msgstr "显示文件系统需要删除的文件"
5877 #: builtin/ls-files.c:485
5878 msgid "show 'other' directories' name only"
5879 msgstr "只显示“其他”目录的名称"
5881 #: builtin/ls-files.c:488
5882 msgid "don't show empty directories"
5885 #: builtin/ls-files.c:491
5886 msgid "show unmerged files in the output"
5889 #: builtin/ls-files.c:493
5890 msgid "show resolve-undo information"
5891 msgstr "显示 resolve-undo 信息"
5893 #: builtin/ls-files.c:495
5894 msgid "skip files matching pattern"
5897 #: builtin/ls-files.c:498
5898 msgid "exclude patterns are read from <file>"
5899 msgstr "从 <文件> 中读取排除模式"
5901 #: builtin/ls-files.c:501
5902 msgid "read additional per-directory exclude patterns in <file>"
5903 msgstr "从 <文件> 读取额外的每个目录的排除模式"
5905 #: builtin/ls-files.c:503
5906 msgid "add the standard git exclusions"
5907 msgstr "添加标准的 git 排除"
5909 #: builtin/ls-files.c:506
5910 msgid "make the output relative to the project top directory"
5911 msgstr "显示相对于顶级目录的文件名"
5913 #: builtin/ls-files.c:509
5914 msgid "if any <file> is not in the index, treat this as an error"
5915 msgstr "如果任何 <文件> 都不在索引区,视为错误"
5917 #: builtin/ls-files.c:510
5921 #: builtin/ls-files.c:511
5922 msgid "pretend that paths removed since <tree-ish> are still present"
5923 msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
5925 #: builtin/ls-files.c:513
5926 msgid "show debugging data"
5929 #: builtin/ls-tree.c:27
5930 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
5931 msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
5933 #: builtin/ls-tree.c:125
5934 msgid "only show trees"
5937 #: builtin/ls-tree.c:127
5938 msgid "recurse into subtrees"
5941 #: builtin/ls-tree.c:129
5942 msgid "show trees when recursing"
5945 #: builtin/ls-tree.c:132
5946 msgid "terminate entries with NUL byte"
5949 #: builtin/ls-tree.c:133
5950 msgid "include object size"
5953 #: builtin/ls-tree.c:135 builtin/ls-tree.c:137
5954 msgid "list only filenames"
5957 #: builtin/ls-tree.c:140
5958 msgid "use full path names"
5961 #: builtin/ls-tree.c:142
5962 msgid "list entire tree; not just current directory (implies --full-name)"
5963 msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
5965 #: builtin/merge.c:43
5966 msgid "git merge [options] [<commit>...]"
5967 msgstr "git merge [选项] [<提交>...]"
5969 #: builtin/merge.c:44
5970 msgid "git merge [options] <msg> HEAD <commit>"
5971 msgstr "git merge [选项] <说明> HEAD <提交>"
5973 #: builtin/merge.c:45
5974 msgid "git merge --abort"
5975 msgstr "git merge --abort"
5977 #: builtin/merge.c:90
5978 msgid "switch `m' requires a value"
5979 msgstr "开关 `m' 需要一个值"
5981 #: builtin/merge.c:127
5983 msgid "Could not find merge strategy '%s'.\n"
5984 msgstr "不能找到合并策略 '%s'。\n"
5986 #: builtin/merge.c:128
5988 msgid "Available strategies are:"
5991 #: builtin/merge.c:133
5993 msgid "Available custom strategies are:"
5996 #: builtin/merge.c:183
5997 msgid "do not show a diffstat at the end of the merge"
5998 msgstr "在合并的最后不显示差异统计"
6000 #: builtin/merge.c:186
6001 msgid "show a diffstat at the end of the merge"
6002 msgstr "在合并的最后显示差异统计"
6004 #: builtin/merge.c:187
6005 msgid "(synonym to --stat)"
6006 msgstr "(和 --stat 同义)"
6008 #: builtin/merge.c:189
6009 msgid "add (at most <n>) entries from shortlog to merge commit message"
6010 msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
6012 #: builtin/merge.c:192
6013 msgid "create a single commit instead of doing a merge"
6014 msgstr "创建一个单独的提交而不是做一次合并"
6016 #: builtin/merge.c:194
6017 msgid "perform a commit if the merge succeeds (default)"
6018 msgstr "如果合并成功,执行一次提交(默认)"
6020 #: builtin/merge.c:196
6021 msgid "edit message before committing"
6024 #: builtin/merge.c:198
6025 msgid "allow fast-forward (default)"
6028 #: builtin/merge.c:200
6029 msgid "abort if fast-forward is not possible"
6030 msgstr "如果不能快进就放弃合并"
6032 #: builtin/merge.c:203
6033 msgid "Verify that the named commit has a valid GPG signature"
6034 msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
6036 #: builtin/merge.c:204 builtin/notes.c:866 builtin/revert.c:112
6040 #: builtin/merge.c:205
6041 msgid "merge strategy to use"
6044 #: builtin/merge.c:206
6045 msgid "option=value"
6046 msgstr "option=value"
6048 #: builtin/merge.c:207
6049 msgid "option for selected merge strategy"
6052 #: builtin/merge.c:209
6053 msgid "merge commit message (for a non-fast-forward merge)"
6054 msgstr "合并的提交说明(针对非快进式合并)"
6056 #: builtin/merge.c:213
6057 msgid "abort the current in-progress merge"
6058 msgstr "放弃当前正在进行的合并"
6060 #: builtin/merge.c:242
6061 msgid "could not run stash."
6064 #: builtin/merge.c:247
6065 msgid "stash failed"
6068 #: builtin/merge.c:252
6070 msgid "not a valid object: %s"
6071 msgstr "不是一个有效对象:%s"
6073 #: builtin/merge.c:271 builtin/merge.c:288
6074 msgid "read-tree failed"
6078 #: builtin/merge.c:318
6079 msgid " (nothing to squash)"
6082 #: builtin/merge.c:331
6084 msgid "Squash commit -- not updating HEAD\n"
6085 msgstr "压缩提交 -- 未更新 HEAD\n"
6087 #: builtin/merge.c:363
6088 msgid "Writing SQUASH_MSG"
6089 msgstr "写入 SQUASH_MSG"
6091 #: builtin/merge.c:365
6092 msgid "Finishing SQUASH_MSG"
6093 msgstr "完成 SQUASH_MSG"
6095 #: builtin/merge.c:388
6097 msgid "No merge message -- not updating HEAD\n"
6098 msgstr "无合并信息 -- 未更新 HEAD\n"
6100 #: builtin/merge.c:438
6102 msgid "'%s' does not point to a commit"
6103 msgstr "'%s' 没有指向一个提交"
6105 #: builtin/merge.c:550
6107 msgid "Bad branch.%s.mergeoptions string: %s"
6108 msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
6110 #: builtin/merge.c:643
6111 msgid "git write-tree failed to write a tree"
6112 msgstr "git write-tree 无法写入一树对象"
6114 #: builtin/merge.c:671
6115 msgid "Not handling anything other than two heads merge."
6116 msgstr "不能处理两个头合并之外的任何操作。"
6118 #: builtin/merge.c:685
6120 msgid "Unknown option for merge-recursive: -X%s"
6121 msgstr "merge-recursive 的未知选项:-X%s"
6123 #: builtin/merge.c:699
6125 msgid "unable to write %s"
6128 #: builtin/merge.c:788
6130 msgid "Could not read from '%s'"
6131 msgstr "不能从 '%s' 读取"
6133 #: builtin/merge.c:797
6135 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
6136 msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
6138 #: builtin/merge.c:803
6141 "Please enter a commit message to explain why this merge is necessary,\n"
6142 "especially if it merges an updated upstream into a topic branch.\n"
6144 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
6147 "请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
6150 "以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
6152 #: builtin/merge.c:827
6153 msgid "Empty commit message."
6156 #: builtin/merge.c:839
6158 msgid "Wonderful.\n"
6161 #: builtin/merge.c:904
6163 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
6164 msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
6166 #: builtin/merge.c:920
6168 msgid "'%s' is not a commit"
6169 msgstr "'%s' 不是一个提交"
6171 #: builtin/merge.c:961
6172 msgid "No current branch."
6175 #: builtin/merge.c:963
6176 msgid "No remote for the current branch."
6177 msgstr "当前分支没有对应的远程版本库。"
6179 #: builtin/merge.c:965
6180 msgid "No default upstream defined for the current branch."
6181 msgstr "当前分支没有定义默认的上游分支。"
6183 #: builtin/merge.c:970
6185 msgid "No remote tracking branch for %s from %s"
6186 msgstr "%s 没有来自 %s 的远程跟踪分支"
6188 #: builtin/merge.c:1057 builtin/merge.c:1214
6190 msgid "%s - not something we can merge"
6193 #: builtin/merge.c:1125
6194 msgid "There is no merge to abort (MERGE_HEAD missing)."
6195 msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
6197 #: builtin/merge.c:1141 git-pull.sh:31
6199 "You have not concluded your merge (MERGE_HEAD exists).\n"
6200 "Please, commit your changes before you can merge."
6202 "您尚未结束您的合并(存在 MERGE_HEAD)。\n"
6205 #: builtin/merge.c:1144 git-pull.sh:34
6206 msgid "You have not concluded your merge (MERGE_HEAD exists)."
6207 msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
6209 #: builtin/merge.c:1148
6211 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
6212 "Please, commit your changes before you can merge."
6214 "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
6217 #: builtin/merge.c:1151
6218 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
6219 msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
6221 #: builtin/merge.c:1160
6222 msgid "You cannot combine --squash with --no-ff."
6223 msgstr "您不能将 --squash 与 --no-ff 同时使用。"
6225 #: builtin/merge.c:1165
6226 msgid "You cannot combine --no-ff with --ff-only."
6227 msgstr "您不能将 --no-ff 与 --ff-only 同时使用。"
6229 #: builtin/merge.c:1172
6230 msgid "No commit specified and merge.defaultToUpstream not set."
6231 msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
6233 #: builtin/merge.c:1204
6234 msgid "Can merge only exactly one commit into empty head"
6235 msgstr "只能将一个提交合并到空分支上"
6237 #: builtin/merge.c:1207
6238 msgid "Squash commit into empty head not supported yet"
6239 msgstr "尚不支持到空分支的压缩提交"
6241 #: builtin/merge.c:1209
6242 msgid "Non-fast-forward commit does not make sense into an empty head"
6243 msgstr "到空分支的非快进式提交没有意义"
6245 #: builtin/merge.c:1265
6247 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
6248 msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
6250 #: builtin/merge.c:1268
6252 msgid "Commit %s has a bad GPG signature allegedly by %s."
6253 msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
6256 #: builtin/merge.c:1271
6258 msgid "Commit %s does not have a GPG signature."
6259 msgstr "提交 %s 没有一个 GPG 签名。"
6261 #: builtin/merge.c:1274
6263 msgid "Commit %s has a good GPG signature by %s\n"
6264 msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
6266 #: builtin/merge.c:1358
6268 msgid "Updating %s..%s\n"
6269 msgstr "更新 %s..%s\n"
6271 #: builtin/merge.c:1397
6273 msgid "Trying really trivial in-index merge...\n"
6274 msgstr "尝试非常小的索引内合并...\n"
6276 #: builtin/merge.c:1404
6281 #: builtin/merge.c:1436
6282 msgid "Not possible to fast-forward, aborting."
6285 #: builtin/merge.c:1459 builtin/merge.c:1538
6287 msgid "Rewinding the tree to pristine...\n"
6288 msgstr "将树回滚至原始状态...\n"
6290 #: builtin/merge.c:1463
6292 msgid "Trying merge strategy %s...\n"
6293 msgstr "尝试合并策略 %s...\n"
6295 #: builtin/merge.c:1529
6297 msgid "No merge strategy handled the merge.\n"
6298 msgstr "没有合并策略处理此合并。\n"
6300 #: builtin/merge.c:1531
6302 msgid "Merge with strategy %s failed.\n"
6303 msgstr "使用策略 %s 合并失败。\n"
6305 #: builtin/merge.c:1540
6307 msgid "Using the %s to prepare resolving by hand.\n"
6308 msgstr "使用 %s 以准备手工解决。\n"
6310 #: builtin/merge.c:1552
6312 msgid "Automatic merge went well; stopped before committing as requested\n"
6313 msgstr "自动合并进展顺利,按要求在提交前停止\n"
6315 #: builtin/merge-base.c:26
6316 msgid "git merge-base [-a|--all] <commit> <commit>..."
6317 msgstr "git merge-base [-a|--all] <提交> <提交>..."
6319 #: builtin/merge-base.c:27
6320 msgid "git merge-base [-a|--all] --octopus <commit>..."
6321 msgstr "git merge-base [-a|--all] --octopus <提交>..."
6323 #: builtin/merge-base.c:28
6324 msgid "git merge-base --independent <commit>..."
6325 msgstr "git merge-base --independent <提交>..."
6327 #: builtin/merge-base.c:29
6328 msgid "git merge-base --is-ancestor <commit> <commit>"
6329 msgstr "git merge-base --is-ancestor <提交> <提交>"
6331 #: builtin/merge-base.c:98
6332 msgid "output all common ancestors"
6335 #: builtin/merge-base.c:99
6336 msgid "find ancestors for a single n-way merge"
6337 msgstr "查找一个多路合并的祖先提交"
6339 #: builtin/merge-base.c:100
6340 msgid "list revs not reachable from others"
6341 msgstr "显示不能被其他访问到的版本"
6343 #: builtin/merge-base.c:102
6344 msgid "is the first one ancestor of the other?"
6345 msgstr "第一个是其他的祖先提交么?"
6347 #: builtin/merge-file.c:8
6349 "git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file "
6352 "git merge-file [选项] [-L name1 [-L orig [-L name2]]] file1 orig_file file2"
6354 #: builtin/merge-file.c:33
6355 msgid "send results to standard output"
6358 #: builtin/merge-file.c:34
6359 msgid "use a diff3 based merge"
6360 msgstr "使用基于 diff3 的合并"
6362 #: builtin/merge-file.c:35
6363 msgid "for conflicts, use our version"
6364 msgstr "如果冲突,使用我们的版本"
6366 #: builtin/merge-file.c:37
6367 msgid "for conflicts, use their version"
6368 msgstr "如果冲突,使用他们的版本"
6370 #: builtin/merge-file.c:39
6371 msgid "for conflicts, use a union version"
6372 msgstr "如果冲突,使用联合版本"
6374 #: builtin/merge-file.c:42
6375 msgid "for conflicts, use this marker size"
6376 msgstr "如果冲突,使用指定长度的标记"
6378 #: builtin/merge-file.c:43
6379 msgid "do not warn about conflicts"
6382 #: builtin/merge-file.c:45
6383 msgid "set labels for file1/orig_file/file2"
6384 msgstr "为 file1/orig_file/file2 设置标签"
6386 #: builtin/mktree.c:67
6387 msgid "git mktree [-z] [--missing] [--batch]"
6388 msgstr "git mktree [-z] [--missing] [--batch]"
6390 #: builtin/mktree.c:153
6391 msgid "input is NUL terminated"
6392 msgstr "输入以 NUL 字符终止"
6394 #: builtin/mktree.c:154 builtin/write-tree.c:24
6395 msgid "allow missing objects"
6398 #: builtin/mktree.c:155
6399 msgid "allow creation of more than one tree"
6403 msgid "git mv [options] <source>... <destination>"
6404 msgstr "git mv [选项] <源>... <目标>"
6407 msgid "force move/rename even if target exists"
6408 msgstr "强制移动/重命令,即使目标存在"
6411 msgid "skip move/rename errors"
6416 msgid "Checking rename of '%s' to '%s'\n"
6417 msgstr "检查 '%s' 到 '%s' 的重命名\n"
6424 msgid "can not move directory into itself"
6428 msgid "cannot move directory over file"
6433 msgid "Huh? %.*s is in index?"
6434 msgstr "嗯?%.*s 在索引中?"
6437 msgid "source directory is empty"
6441 msgid "not under version control"
6445 msgid "destination exists"
6450 msgid "overwriting '%s'"
6454 msgid "Cannot overwrite"
6458 msgid "multiple sources for the same target"
6463 msgid "%s, source=%s, destination=%s"
6464 msgstr "%s,源=%s,目标=%s"
6468 msgid "Renaming %s to %s\n"
6469 msgstr "重命名 %s 至 %s\n"
6471 #: builtin/mv.c:215 builtin/remote.c:731
6473 msgid "renaming '%s' failed"
6474 msgstr "重命名 '%s' 失败"
6476 #: builtin/name-rev.c:175
6477 msgid "git name-rev [options] <commit>..."
6478 msgstr "git name-rev [选项] <提交>..."
6480 #: builtin/name-rev.c:176
6481 msgid "git name-rev [options] --all"
6482 msgstr "git name-rev [选项] --all"
6484 #: builtin/name-rev.c:177
6485 msgid "git name-rev [options] --stdin"
6486 msgstr "git name-rev [选项] --stdin"
6488 #: builtin/name-rev.c:229
6489 msgid "print only names (no SHA-1)"
6490 msgstr "只打印名称(无 SHA-1)"
6492 #: builtin/name-rev.c:230
6493 msgid "only use tags to name the commits"
6494 msgstr "只使用 tags 来命名提交"
6496 #: builtin/name-rev.c:232
6497 msgid "only use refs matching <pattern>"
6498 msgstr "只使用和 <模式> 相匹配的引用"
6500 #: builtin/name-rev.c:234
6501 msgid "list all commits reachable from all refs"
6502 msgstr "列出可以从所有引用访问的提交"
6504 #: builtin/name-rev.c:235
6505 msgid "read from stdin"
6508 #: builtin/name-rev.c:236
6509 msgid "allow to print `undefined` names"
6510 msgstr "允许打印 `未定义` 的名称"
6512 #: builtin/notes.c:26
6513 msgid "git notes [--ref <notes_ref>] [list [<object>]]"
6514 msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
6516 #: builtin/notes.c:27
6518 "git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) "
6519 "<object>] [<object>]"
6521 "git notes [--ref <注解引用>] add [-f] [-m <说明> | -F <文件> | (-c | -C) <对"
6524 #: builtin/notes.c:28
6525 msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"
6526 msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
6528 #: builtin/notes.c:29
6530 "git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) "
6531 "<object>] [<object>]"
6533 "git notes [--ref <注解引用>] append [-m <说明> | -F <文件> | (-c | -C) <对象"
6536 #: builtin/notes.c:30
6537 msgid "git notes [--ref <notes_ref>] edit [<object>]"
6538 msgstr "git notes [--ref <注解引用>] edit [<对象>]"
6540 #: builtin/notes.c:31
6541 msgid "git notes [--ref <notes_ref>] show [<object>]"
6542 msgstr "git notes [--ref <注解引用>] show [<对象>]"
6544 #: builtin/notes.c:32
6546 "git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"
6547 msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
6549 #: builtin/notes.c:33
6550 msgid "git notes merge --commit [-v | -q]"
6551 msgstr "git notes merge --commit [-v | -q]"
6553 #: builtin/notes.c:34
6554 msgid "git notes merge --abort [-v | -q]"
6555 msgstr "git notes merge --abort [-v | -q]"
6557 #: builtin/notes.c:35
6558 msgid "git notes [--ref <notes_ref>] remove [<object>...]"
6559 msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
6561 #: builtin/notes.c:36
6562 msgid "git notes [--ref <notes_ref>] prune [-n | -v]"
6563 msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
6565 #: builtin/notes.c:37
6566 msgid "git notes [--ref <notes_ref>] get-ref"
6567 msgstr "git notes [--ref <注解引用>] get-ref"
6569 #: builtin/notes.c:42
6570 msgid "git notes [list [<object>]]"
6571 msgstr "git notes [list [<对象>]]"
6573 #: builtin/notes.c:47
6574 msgid "git notes add [<options>] [<object>]"
6575 msgstr "git notes add [<选项>] [<对象>]"
6577 #: builtin/notes.c:52
6578 msgid "git notes copy [<options>] <from-object> <to-object>"
6579 msgstr "git notes copy [<选项>] <源对象> <目标对象>"
6581 #: builtin/notes.c:53
6582 msgid "git notes copy --stdin [<from-object> <to-object>]..."
6583 msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
6585 #: builtin/notes.c:58
6586 msgid "git notes append [<options>] [<object>]"
6587 msgstr "git notes append [<选项>] [<对象>]"
6589 #: builtin/notes.c:63
6590 msgid "git notes edit [<object>]"
6591 msgstr "git notes edit [<对象>]"
6593 #: builtin/notes.c:68
6594 msgid "git notes show [<object>]"
6595 msgstr "git notes show [<对象>]"
6597 #: builtin/notes.c:73
6598 msgid "git notes merge [<options>] <notes_ref>"
6599 msgstr "git notes merge [<选项>] <注解引用>"
6601 #: builtin/notes.c:74
6602 msgid "git notes merge --commit [<options>]"
6603 msgstr "git notes merge --commit [<选项>]"
6605 #: builtin/notes.c:75
6606 msgid "git notes merge --abort [<options>]"
6607 msgstr "git notes merge --abort [<选项>]"
6609 #: builtin/notes.c:80
6610 msgid "git notes remove [<object>]"
6611 msgstr "git notes remove [<对象>]"
6613 #: builtin/notes.c:85
6614 msgid "git notes prune [<options>]"
6615 msgstr "git notes prune [<选项>]"
6617 #: builtin/notes.c:90
6618 msgid "git notes get-ref"
6619 msgstr "git notes get-ref"
6621 #: builtin/notes.c:139
6623 msgid "unable to start 'show' for object '%s'"
6624 msgstr "不能为对象 '%s' 开始 'show'"
6626 #: builtin/notes.c:143
6627 msgid "could not read 'show' output"
6628 msgstr "不能读取 'show' 的输出"
6630 #: builtin/notes.c:151
6632 msgid "failed to finish 'show' for object '%s'"
6633 msgstr "无法为对象 '%s' 完成 'show'"
6635 #: builtin/notes.c:169 builtin/tag.c:341
6637 msgid "could not create file '%s'"
6638 msgstr "不能创建文件 '%s'"
6640 #: builtin/notes.c:188
6641 msgid "Please supply the note contents using either -m or -F option"
6642 msgstr "请通过 -m 或 -F 选项为注解提供内容"
6644 #: builtin/notes.c:209 builtin/notes.c:972
6646 msgid "Removing note for object %s\n"
6647 msgstr "删除对象 %s 的注解\n"
6649 #: builtin/notes.c:214
6650 msgid "unable to write note object"
6653 #: builtin/notes.c:216
6655 msgid "The note contents has been left in %s"
6656 msgstr "注解内容被留在文件 %s 中"
6658 #: builtin/notes.c:250 builtin/tag.c:540
6660 msgid "cannot read '%s'"
6663 #: builtin/notes.c:252 builtin/tag.c:543
6665 msgid "could not open or read '%s'"
6666 msgstr "不能打开或读取 '%s'"
6668 #: builtin/notes.c:271 builtin/notes.c:444 builtin/notes.c:446
6669 #: builtin/notes.c:506 builtin/notes.c:560 builtin/notes.c:643
6670 #: builtin/notes.c:648 builtin/notes.c:723 builtin/notes.c:765
6671 #: builtin/notes.c:967 builtin/tag.c:556
6673 msgid "Failed to resolve '%s' as a valid ref."
6674 msgstr "无法解析 '%s' 为一个有效引用。"
6676 #: builtin/notes.c:274
6678 msgid "Failed to read object '%s'."
6679 msgstr "无法读取对象 '%s'。"
6681 #: builtin/notes.c:298
6682 msgid "Cannot commit uninitialized/unreferenced notes tree"
6683 msgstr "不能提交未初始化/未引用的注解树"
6685 #: builtin/notes.c:339
6687 msgid "Bad notes.rewriteMode value: '%s'"
6688 msgstr "坏的 notes.rewriteMode 值:'%s'"
6690 #: builtin/notes.c:349
6692 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
6693 msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
6695 #. TRANSLATORS: The first %s is the name of the
6696 #. environment variable, the second %s is its value
6697 #: builtin/notes.c:376
6699 msgid "Bad %s value: '%s'"
6700 msgstr "坏的 %s 值:'%s'"
6702 #: builtin/notes.c:440
6704 msgid "Malformed input line: '%s'."
6705 msgstr "非法的输入行:'%s'。"
6707 #: builtin/notes.c:455
6709 msgid "Failed to copy notes from '%s' to '%s'"
6710 msgstr "无法从 '%s' 到 '%s' 拷贝注解"
6712 #: builtin/notes.c:499 builtin/notes.c:553 builtin/notes.c:626
6713 #: builtin/notes.c:638 builtin/notes.c:711 builtin/notes.c:758
6714 #: builtin/notes.c:1032
6715 msgid "too many parameters"
6718 #: builtin/notes.c:512 builtin/notes.c:771
6720 msgid "No note found for object %s."
6721 msgstr "未发现对象 %s 的注解。"
6723 #: builtin/notes.c:534 builtin/notes.c:691
6724 msgid "note contents as a string"
6725 msgstr "注解内容作为一个字符串"
6727 #: builtin/notes.c:537 builtin/notes.c:694
6728 msgid "note contents in a file"
6731 #: builtin/notes.c:539 builtin/notes.c:542 builtin/notes.c:696
6732 #: builtin/notes.c:699 builtin/tag.c:474
6736 #: builtin/notes.c:540 builtin/notes.c:697
6737 msgid "reuse and edit specified note object"
6738 msgstr "重用和编辑指定的注解对象"
6740 #: builtin/notes.c:543 builtin/notes.c:700
6741 msgid "reuse specified note object"
6744 #: builtin/notes.c:545 builtin/notes.c:613
6745 msgid "replace existing notes"
6748 #: builtin/notes.c:579
6751 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
6753 msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
6755 #: builtin/notes.c:584 builtin/notes.c:661
6757 msgid "Overwriting existing notes for object %s\n"
6758 msgstr "覆盖对象 %s 现存注解\n"
6760 #: builtin/notes.c:614
6761 msgid "read objects from stdin"
6764 #: builtin/notes.c:616
6765 msgid "load rewriting config for <command> (implies --stdin)"
6766 msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
6768 #: builtin/notes.c:634
6769 msgid "too few parameters"
6772 #: builtin/notes.c:655
6775 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
6777 msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
6779 #: builtin/notes.c:667
6781 msgid "Missing notes on source object %s. Cannot copy."
6782 msgstr "源对象 %s 缺少注解。不能拷贝。"
6784 #: builtin/notes.c:716
6787 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
6788 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
6790 "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
6791 "请换用 'git notes add -f -m/-F/-c/-C'。\n"
6793 #: builtin/notes.c:863
6794 msgid "General options"
6797 #: builtin/notes.c:865
6798 msgid "Merge options"
6801 #: builtin/notes.c:867
6803 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
6805 msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
6807 #: builtin/notes.c:869
6808 msgid "Committing unmerged notes"
6811 #: builtin/notes.c:871
6812 msgid "finalize notes merge by committing unmerged notes"
6813 msgstr "通过提交未合并的注解来完成注解合并"
6815 #: builtin/notes.c:873
6816 msgid "Aborting notes merge resolution"
6819 #: builtin/notes.c:875
6820 msgid "abort notes merge"
6823 #: builtin/notes.c:970
6825 msgid "Object %s has no note\n"
6826 msgstr "对象 %s 没有注解\n"
6828 #: builtin/notes.c:982
6829 msgid "attempt to remove non-existent note is not an error"
6830 msgstr "尝试删除不存在的注解不是一个错误"
6832 #: builtin/notes.c:985
6833 msgid "read object names from the standard input"
6834 msgstr "从标准输入读取对象名称"
6836 #: builtin/notes.c:1066
6840 #: builtin/notes.c:1067
6841 msgid "use notes from <notes_ref>"
6842 msgstr "从 <注解引用> 使用注解"
6844 #: builtin/notes.c:1102 builtin/remote.c:1598
6846 msgid "Unknown subcommand: %s"
6849 #: builtin/pack-objects.c:23
6850 msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
6851 msgstr "git pack-objects --stdout [选项...] [< 引用列表 | < 对象列表]"
6853 #: builtin/pack-objects.c:24
6854 msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
6855 msgstr "git pack-objects [选项...] base-name [< 引用列表 | < 对象列表]"
6857 #: builtin/pack-objects.c:183 builtin/pack-objects.c:186
6859 msgid "deflate error (%d)"
6862 #: builtin/pack-objects.c:2397
6864 msgid "unsupported index version %s"
6865 msgstr "不支持的索引版本 %s"
6867 #: builtin/pack-objects.c:2401
6869 msgid "bad index version '%s'"
6870 msgstr "坏的索引版本 '%s'"
6872 #: builtin/pack-objects.c:2424
6874 msgid "option %s does not accept negative form"
6875 msgstr "选项 %s 不接受否定格式"
6877 #: builtin/pack-objects.c:2428
6879 msgid "unable to parse value '%s' for option %s"
6880 msgstr "不能解析选项 %1$s 的值 '%2$s'"
6882 #: builtin/pack-objects.c:2447
6883 msgid "do not show progress meter"
6886 #: builtin/pack-objects.c:2449
6887 msgid "show progress meter"
6890 #: builtin/pack-objects.c:2451
6891 msgid "show progress meter during object writing phase"
6892 msgstr "在对象写入阶段显示进度表"
6894 #: builtin/pack-objects.c:2454
6895 msgid "similar to --all-progress when progress meter is shown"
6896 msgstr "当进度表显示时类似于 --all-progress"
6898 #: builtin/pack-objects.c:2455
6899 msgid "version[,offset]"
6902 #: builtin/pack-objects.c:2456
6903 msgid "write the pack index file in the specified idx format version"
6904 msgstr "用指定的 idx 格式版本来写包索引文件"
6906 #: builtin/pack-objects.c:2459
6907 msgid "maximum size of each output pack file"
6910 #: builtin/pack-objects.c:2461
6911 msgid "ignore borrowed objects from alternate object store"
6912 msgstr "忽略从替代对象存储里借用对象"
6914 #: builtin/pack-objects.c:2463
6915 msgid "ignore packed objects"
6918 #: builtin/pack-objects.c:2465
6919 msgid "limit pack window by objects"
6922 #: builtin/pack-objects.c:2467
6923 msgid "limit pack window by memory in addition to object limit"
6924 msgstr "除对象数量限制外设置打包窗口的内存限制"
6926 #: builtin/pack-objects.c:2469
6927 msgid "maximum length of delta chain allowed in the resulting pack"
6928 msgstr "打包允许的 delta 链的最大长度"
6930 #: builtin/pack-objects.c:2471
6931 msgid "reuse existing deltas"
6932 msgstr "重用已存在的 deltas"
6934 #: builtin/pack-objects.c:2473
6935 msgid "reuse existing objects"
6938 #: builtin/pack-objects.c:2475
6939 msgid "use OFS_DELTA objects"
6940 msgstr "使用 OFS_DELTA 对象"
6942 #: builtin/pack-objects.c:2477
6943 msgid "use threads when searching for best delta matches"
6944 msgstr "使用线程查询最佳 delta 匹配"
6946 #: builtin/pack-objects.c:2479
6947 msgid "do not create an empty pack output"
6950 #: builtin/pack-objects.c:2481
6951 msgid "read revision arguments from standard input"
6952 msgstr "从标准输入读取修订号参数"
6954 #: builtin/pack-objects.c:2483
6955 msgid "limit the objects to those that are not yet packed"
6956 msgstr "限制那些尚未打包的对象"
6958 #: builtin/pack-objects.c:2486
6959 msgid "include objects reachable from any reference"
6960 msgstr "包括可以从任何引用访问到的对象"
6962 #: builtin/pack-objects.c:2489
6963 msgid "include objects referred by reflog entries"
6964 msgstr "包括被引用日志引用到的对象"
6966 #: builtin/pack-objects.c:2492
6967 msgid "output pack to stdout"
6970 #: builtin/pack-objects.c:2494
6971 msgid "include tag objects that refer to objects to be packed"
6972 msgstr "包括引用了打包对象的 tag"
6974 #: builtin/pack-objects.c:2496
6975 msgid "keep unreachable objects"
6978 #: builtin/pack-objects.c:2497 parse-options.h:141
6982 #: builtin/pack-objects.c:2498
6983 msgid "unpack unreachable objects newer than <time>"
6984 msgstr "将比给定 <时间> 新的无法访问的对象解包"
6986 #: builtin/pack-objects.c:2501
6987 msgid "create thin packs"
6990 #: builtin/pack-objects.c:2503
6991 msgid "ignore packs that have companion .keep file"
6992 msgstr "忽略配有 .keep 文件的包"
6994 #: builtin/pack-objects.c:2505
6995 msgid "pack compression level"
6998 #: builtin/pack-objects.c:2507
6999 msgid "do not hide commits by grafts"
7002 #: builtin/pack-refs.c:6
7003 msgid "git pack-refs [options]"
7004 msgstr "git pack-refs [选项]"
7006 #: builtin/pack-refs.c:14
7007 msgid "pack everything"
7010 #: builtin/pack-refs.c:15
7011 msgid "prune loose refs (default)"
7012 msgstr "清除松散的引用(默认)"
7014 #: builtin/prune-packed.c:7
7015 msgid "git prune-packed [-n|--dry-run] [-q|--quiet]"
7016 msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]"
7018 #: builtin/prune.c:12
7019 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
7020 msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
7022 #: builtin/prune.c:132
7023 msgid "do not remove, show only"
7026 #: builtin/prune.c:133
7027 msgid "report pruned objects"
7030 #: builtin/prune.c:136
7031 msgid "expire objects older than <time>"
7032 msgstr "使早于给定时间的对象过期"
7034 #: builtin/push.c:14
7035 msgid "git push [<options>] [<repository> [<refspec>...]]"
7036 msgstr "git push [<选项>] [<版本库> [<引用表达式>...]]"
7038 #: builtin/push.c:45
7039 msgid "tag shorthand without <tag>"
7040 msgstr "tag 简写没有跟 <tag> 参数"
7042 #: builtin/push.c:64
7043 msgid "--delete only accepts plain target ref names"
7044 msgstr "--delete 只接受简单的目标引用名"
7046 #: builtin/push.c:99
7049 "To choose either option permanently, see push.default in 'git help config'."
7052 "为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
7054 #: builtin/push.c:102
7057 "The upstream branch of your current branch does not match\n"
7058 "the name of your current branch. To push to the upstream branch\n"
7059 "on the remote, use\n"
7061 " git push %s HEAD:%s\n"
7063 "To push to the branch of the same name on the remote, use\n"
7068 "如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
7071 " git push %s HEAD:%s\n"
7078 #: builtin/push.c:121
7081 "You are not currently on a branch.\n"
7082 "To push the history leading to the current (detached HEAD)\n"
7085 " git push %s HEAD:<name-of-remote-branch>\n"
7088 "现在为推送当前(分离头指针)的历史,使用\n"
7090 " git push %s HEAD:<name-of-remote-branch>\n"
7092 #: builtin/push.c:128
7095 "The current branch %s has no upstream branch.\n"
7096 "To push the current branch and set the remote as upstream, use\n"
7098 " git push --set-upstream %s %s\n"
7100 "当前分支 %s 没有对应的上游分支。\n"
7101 "为推送当前分支并建立与远程上游的跟踪,使用\n"
7103 " git push --set-upstream %s %s\n"
7105 #: builtin/push.c:136
7107 msgid "The current branch %s has multiple upstream branches, refusing to push."
7108 msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
7110 #: builtin/push.c:139
7113 "You are pushing to remote '%s', which is not the upstream of\n"
7114 "your current branch '%s', without telling me what to push\n"
7115 "to update which remote branch."
7117 "您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
7118 "而没有告诉我要推送什么、更新哪个远程分支。"
7120 # 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
7121 #: builtin/push.c:151
7123 "push.default is unset; its implicit value is changing in\n"
7124 "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
7125 "and maintain the current behavior after the default changes, use:\n"
7127 " git config --global push.default matching\n"
7129 "To squelch this message and adopt the new behavior now, use:\n"
7131 " git config --global push.default simple\n"
7133 "See 'git help config' and search for 'push.default' for further "
7135 "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
7136 "'current' instead of 'simple' if you sometimes use older versions of Git)"
7138 "push.default 未设置,它的默认值将会在 Git 2.0 由 'matching'\n"
7139 "修改为 'simple'。若要不再显示本信息并在其默认值改变后维持当前使用习惯,\n"
7142 " git config --global push.default matching\n"
7144 "若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n"
7146 " git config --global push.default simple\n"
7148 "参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
7149 "('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n"
7150 "为保持兼容,请用 'current' 代替 'simple' 模式)"
7152 #: builtin/push.c:199
7154 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
7155 msgstr "您没有为推送指定任何引用表达式,并且 push.default 为 \"nothing\"。"
7157 #: builtin/push.c:206
7159 "Updates were rejected because the tip of your current branch is behind\n"
7160 "its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
7161 "before pushing again.\n"
7162 "See the 'Note about fast-forwards' in 'git push --help' for details."
7164 "更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
7165 "再次推送前,先与远程变更合并(如 'git pull')。详见\n"
7166 "'git push --help' 中的 'Note about fast-forwards' 小节。"
7168 #: builtin/push.c:212
7170 "Updates were rejected because a pushed branch tip is behind its remote\n"
7171 "counterpart. If you did not intend to push that branch, you may want to\n"
7172 "specify branches to push or set the 'push.default' configuration variable\n"
7173 "to 'simple', 'current' or 'upstream' to push only the current branch."
7175 "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
7176 "如果您并非有意推送该分支,您可以在推送时指定要推送的分支,或者将\n"
7177 "配置变量 'push.default' 设置为 'simple'、'current' 或 'upstream'\n"
7180 #: builtin/push.c:218
7182 "Updates were rejected because a pushed branch tip is behind its remote\n"
7183 "counterpart. Check out this branch and merge the remote changes\n"
7184 "(e.g. 'git pull') before pushing again.\n"
7185 "See the 'Note about fast-forwards' in 'git push --help' for details."
7187 "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
7188 "检出该分支并与远程变更合并(如 'git pull'),然后再推送。详见\n"
7189 "'git push --help' 中的 'Note about fast-forwards' 小节。"
7191 #: builtin/push.c:224
7193 "Updates were rejected because the remote contains work that you do\n"
7194 "not have locally. This is usually caused by another repository pushing\n"
7195 "to the same ref. You may want to first merge the remote changes (e.g.,\n"
7196 "'git pull') before pushing again.\n"
7197 "See the 'Note about fast-forwards' in 'git push --help' for details."
7199 "更新被拒绝,因为远程版本库包含您本地尚不存在的提交。这通常是因为另外\n"
7200 "一个版本库已推送了相同的引用。再次推送前,您可能需要先合并远程变更\n"
7202 "详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
7204 #: builtin/push.c:231
7205 msgid "Updates were rejected because the tag already exists in the remote."
7206 msgstr "更新被拒绝因为 tag 在远程已经存在。"
7208 #: builtin/push.c:234
7210 "You cannot update a remote ref that points at a non-commit object,\n"
7211 "or update a remote ref to make it point at a non-commit object,\n"
7212 "without using the '--force' option.\n"
7214 "如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
7215 "也不能更新远程引用让其指向一个非提交对象。\n"
7217 #: builtin/push.c:294
7219 msgid "Pushing to %s\n"
7222 #: builtin/push.c:298
7224 msgid "failed to push some refs to '%s'"
7225 msgstr "无法推送一些引用到 '%s'"
7227 #: builtin/push.c:331
7229 msgid "bad repository '%s'"
7232 #: builtin/push.c:332
7234 "No configured push destination.\n"
7235 "Either specify the URL from the command-line or configure a remote "
7236 "repository using\n"
7238 " git remote add <name> <url>\n"
7240 "and then push using the remote name\n"
7242 " git push <name>\n"
7245 "或通过命令行指定URL,或用下面命令配置一个远程版本库\n"
7247 " git remote add <name> <url>\n"
7251 " git push <name>\n"
7253 #: builtin/push.c:347
7254 msgid "--all and --tags are incompatible"
7255 msgstr "--all 和 --tags 不兼容"
7257 #: builtin/push.c:348
7258 msgid "--all can't be combined with refspecs"
7259 msgstr "--all 不能和引用表达式同时使用"
7261 #: builtin/push.c:353
7262 msgid "--mirror and --tags are incompatible"
7263 msgstr "--mirror 和 --tags 不兼容"
7265 #: builtin/push.c:354
7266 msgid "--mirror can't be combined with refspecs"
7267 msgstr "--mirror 不能和引用表达式同时使用"
7269 #: builtin/push.c:359
7270 msgid "--all and --mirror are incompatible"
7271 msgstr "--all 和 --mirror 不兼容"
7273 #: builtin/push.c:419
7277 #: builtin/push.c:420
7278 msgid "push all refs"
7281 #: builtin/push.c:421
7282 msgid "mirror all refs"
7285 #: builtin/push.c:423
7289 #: builtin/push.c:424
7290 msgid "push tags (can't be used with --all or --mirror)"
7291 msgstr "推送 tags(不能使用 --all or --mirror)"
7293 #: builtin/push.c:427
7294 msgid "force updates"
7297 #: builtin/push.c:428
7301 #: builtin/push.c:429
7302 msgid "control recursive pushing of submodules"
7305 #: builtin/push.c:431
7306 msgid "use thin pack"
7309 #: builtin/push.c:432 builtin/push.c:433
7310 msgid "receive pack program"
7313 #: builtin/push.c:434
7314 msgid "set upstream for git pull/status"
7315 msgstr "设置 git pull/status 的上游"
7317 #: builtin/push.c:437
7318 msgid "prune locally removed refs"
7321 #: builtin/push.c:439
7322 msgid "bypass pre-push hook"
7323 msgstr "绕过 pre-push 钩子"
7325 #: builtin/push.c:440
7326 msgid "push missing but relevant tags"
7327 msgstr "推送缺失的有关的 tags"
7329 #: builtin/push.c:450
7330 msgid "--delete is incompatible with --all, --mirror and --tags"
7331 msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
7333 #: builtin/push.c:452
7334 msgid "--delete doesn't make sense without any refs"
7335 msgstr "--delete 未接任何引用没有意义"
7337 #: builtin/read-tree.c:36
7339 "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
7340 "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
7341 "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
7343 "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>] [-"
7344 "u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
7345 "index-output=<文件>] (--empty | <树或提交1> [<树或提交2> [<树或提交3>]])"
7347 #: builtin/read-tree.c:108
7348 msgid "write resulting index to <file>"
7349 msgstr "将索引结果写入 <file>"
7351 #: builtin/read-tree.c:111
7352 msgid "only empty the index"
7355 #: builtin/read-tree.c:113
7359 #: builtin/read-tree.c:115
7360 msgid "perform a merge in addition to a read"
7361 msgstr "读取之余再执行一个合并"
7363 #: builtin/read-tree.c:117
7364 msgid "3-way merge if no file level merging required"
7365 msgstr "如果没有文件级合并需要,执行三路合并"
7367 #: builtin/read-tree.c:119
7368 msgid "3-way merge in presence of adds and removes"
7369 msgstr "存在添加和删除时,也执行三路合并"
7371 #: builtin/read-tree.c:121
7372 msgid "same as -m, but discard unmerged entries"
7373 msgstr "类似于 -m,但丢弃未合并的条目"
7375 #: builtin/read-tree.c:122
7376 msgid "<subdirectory>/"
7379 #: builtin/read-tree.c:123
7380 msgid "read the tree into the index under <subdirectory>/"
7381 msgstr "读取树对象到索引的 <子目录>/ 下"
7383 #: builtin/read-tree.c:126
7384 msgid "update working tree with merge result"
7385 msgstr "用合并的结果更新工作区"
7387 #: builtin/read-tree.c:128
7391 #: builtin/read-tree.c:129
7392 msgid "allow explicitly ignored files to be overwritten"
7393 msgstr "允许忽略文件中设定的文件可以被覆盖"
7395 #: builtin/read-tree.c:132
7396 msgid "don't check the working tree after merging"
7399 #: builtin/read-tree.c:133
7400 msgid "don't update the index or the work tree"
7403 #: builtin/read-tree.c:135
7404 msgid "skip applying sparse checkout filter"
7405 msgstr "跳过应用稀疏检出过滤器"
7407 #: builtin/read-tree.c:137
7408 msgid "debug unpack-trees"
7409 msgstr "调试 unpack-trees"
7411 #: builtin/remote.c:11
7412 msgid "git remote [-v | --verbose]"
7413 msgstr "git remote [-v | --verbose]"
7415 #: builtin/remote.c:12
7417 "git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--"
7418 "mirror=<fetch|push>] <name> <url>"
7420 "git remote add [-t <分支>] [-m <master>] [-f] [--tags|--no-tags] [--"
7421 "mirror=<fetch|push>] <名称> <url>"
7423 #: builtin/remote.c:13 builtin/remote.c:32
7424 msgid "git remote rename <old> <new>"
7425 msgstr "git remote rename <旧名称> <新名称>"
7427 #: builtin/remote.c:14 builtin/remote.c:37
7428 msgid "git remote remove <name>"
7429 msgstr "git remote remove <名称>"
7431 #: builtin/remote.c:15 builtin/remote.c:42
7432 msgid "git remote set-head <name> (-a | -d | <branch>)"
7433 msgstr "git remote set-head <名称> (-a | -d | <分支>)"
7435 #: builtin/remote.c:16
7436 msgid "git remote [-v | --verbose] show [-n] <name>"
7437 msgstr "git remote [-v | --verbose] show [-n] <名称>"
7439 #: builtin/remote.c:17
7440 msgid "git remote prune [-n | --dry-run] <name>"
7441 msgstr "git remote prune [-n | --dry-run] <名称>"
7443 #: builtin/remote.c:18
7445 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
7446 msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
7448 #: builtin/remote.c:19
7449 msgid "git remote set-branches [--add] <name> <branch>..."
7450 msgstr "git remote set-branches [--add] <名称> <分支>..."
7452 #: builtin/remote.c:20 builtin/remote.c:68
7453 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
7454 msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
7456 #: builtin/remote.c:21 builtin/remote.c:69
7457 msgid "git remote set-url --add <name> <newurl>"
7458 msgstr "git remote set-url --add <名称> <新的地址>"
7460 #: builtin/remote.c:22 builtin/remote.c:70
7461 msgid "git remote set-url --delete <name> <url>"
7462 msgstr "git remote set-url --delete <名称> <地址>"
7464 #: builtin/remote.c:27
7465 msgid "git remote add [<options>] <name> <url>"
7466 msgstr "git remote add [<选项>] <名称> <地址>"
7468 #: builtin/remote.c:47
7469 msgid "git remote set-branches <name> <branch>..."
7470 msgstr "git remote set-branches <名称> <分支>..."
7472 #: builtin/remote.c:48
7473 msgid "git remote set-branches --add <name> <branch>..."
7474 msgstr "git remote set-branches --add <名称> <分支>..."
7476 #: builtin/remote.c:53
7477 msgid "git remote show [<options>] <name>"
7478 msgstr "git remote show [<选项>] <名称>"
7480 #: builtin/remote.c:58
7481 msgid "git remote prune [<options>] <name>"
7482 msgstr "git remote prune [<选项>] <名称>"
7484 #: builtin/remote.c:63
7485 msgid "git remote update [<options>] [<group> | <remote>]..."
7486 msgstr "git remote update [<选项>] [<组> | <远程>]..."
7488 #: builtin/remote.c:98
7493 #: builtin/remote.c:130
7495 "--mirror is dangerous and deprecated; please\n"
7496 "\t use --mirror=fetch or --mirror=push instead"
7498 "--mirror 选项危险且过时,请使用 --mirror=fetch\n"
7499 "\t 或 --mirror=push"
7501 #: builtin/remote.c:147
7503 msgid "unknown mirror argument: %s"
7506 #: builtin/remote.c:163
7507 msgid "fetch the remote branches"
7510 #: builtin/remote.c:165
7511 msgid "import all tags and associated objects when fetching"
7512 msgstr "抓取时导入所有的 tags 和关联对象"
7514 #: builtin/remote.c:168
7515 msgid "or do not fetch any tag at all (--no-tags)"
7516 msgstr "或不抓取任何 tag(--no-tags)"
7518 #: builtin/remote.c:170
7519 msgid "branch(es) to track"
7522 #: builtin/remote.c:171
7523 msgid "master branch"
7526 #: builtin/remote.c:172
7530 #: builtin/remote.c:173
7531 msgid "set up remote as a mirror to push to or fetch from"
7532 msgstr "把远程设置为用以推送或抓取的镜像"
7534 #: builtin/remote.c:185
7535 msgid "specifying a master branch makes no sense with --mirror"
7536 msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
7538 #: builtin/remote.c:187
7539 msgid "specifying branches to track makes sense only with fetch mirrors"
7540 msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
7542 #: builtin/remote.c:195 builtin/remote.c:646
7544 msgid "remote %s already exists."
7545 msgstr "远程 %s 已经存在。"
7547 #: builtin/remote.c:199 builtin/remote.c:650
7549 msgid "'%s' is not a valid remote name"
7550 msgstr "'%s' 不是一个有效的远程名称"
7552 #: builtin/remote.c:243
7554 msgid "Could not setup master '%s'"
7555 msgstr "无法设置 master '%s'"
7557 #: builtin/remote.c:299
7559 msgid "more than one %s"
7562 #: builtin/remote.c:339
7564 msgid "Could not get fetch map for refspec %s"
7565 msgstr "无法得到引用表达式 %s 的获取列表"
7567 #: builtin/remote.c:440 builtin/remote.c:448
7571 #: builtin/remote.c:452
7575 #: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607
7577 msgid "Could not append '%s' to '%s'"
7578 msgstr "不能添加 '%s' 至 '%s'"
7580 #: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890
7582 msgid "No such remote: %s"
7585 #: builtin/remote.c:656
7587 msgid "Could not rename config section '%s' to '%s'"
7588 msgstr "不能重命名配置小节 '%s' 到 '%s'"
7590 #: builtin/remote.c:662 builtin/remote.c:799
7592 msgid "Could not remove config section '%s'"
7593 msgstr "不能移除配置小节 '%s'"
7595 #: builtin/remote.c:677
7598 "Not updating non-default fetch refspec\n"
7600 "\tPlease update the configuration manually if necessary."
7606 #: builtin/remote.c:683
7608 msgid "Could not append '%s'"
7611 #: builtin/remote.c:694
7613 msgid "Could not set '%s'"
7616 #: builtin/remote.c:716
7618 msgid "deleting '%s' failed"
7621 #: builtin/remote.c:750
7623 msgid "creating '%s' failed"
7626 #: builtin/remote.c:764
7628 msgid "Could not remove branch %s"
7631 #: builtin/remote.c:834
7633 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
7634 "to delete it, use:"
7636 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
7637 "to delete them, use:"
7638 msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
7639 msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
7641 #: builtin/remote.c:943
7643 msgid " new (next fetch will store in remotes/%s)"
7644 msgstr " 新的(下一次获取将存储于 remotes/%s)"
7646 #: builtin/remote.c:946
7650 #: builtin/remote.c:948
7651 msgid " stale (use 'git remote prune' to remove)"
7652 msgstr " 过时(使用 'git remote prune' 来移除)"
7654 #: builtin/remote.c:950
7658 #: builtin/remote.c:991
7660 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
7661 msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
7663 #: builtin/remote.c:998
7665 msgid "rebases onto remote %s"
7668 #: builtin/remote.c:1001
7670 msgid " merges with remote %s"
7673 #: builtin/remote.c:1002
7674 msgid " and with remote"
7677 #: builtin/remote.c:1004
7679 msgid "merges with remote %s"
7682 #: builtin/remote.c:1005
7683 msgid " and with remote"
7686 #: builtin/remote.c:1051
7690 #: builtin/remote.c:1054
7694 #: builtin/remote.c:1058
7698 #: builtin/remote.c:1061
7699 msgid "fast-forwardable"
7702 #: builtin/remote.c:1064
7703 msgid "local out of date"
7706 #: builtin/remote.c:1071
7708 msgid " %-*s forces to %-*s (%s)"
7709 msgstr " %-*s 强制推送至 %-*s (%s)"
7711 #: builtin/remote.c:1074
7713 msgid " %-*s pushes to %-*s (%s)"
7714 msgstr " %-*s 推送至 %-*s (%s)"
7716 #: builtin/remote.c:1078
7718 msgid " %-*s forces to %s"
7719 msgstr " %-*s 强制推送至 %s"
7721 #: builtin/remote.c:1081
7723 msgid " %-*s pushes to %s"
7724 msgstr " %-*s 推送至 %s"
7726 #: builtin/remote.c:1091
7727 msgid "do not query remotes"
7730 #: builtin/remote.c:1118
7735 #: builtin/remote.c:1119
7737 msgid " Fetch URL: %s"
7740 #: builtin/remote.c:1120 builtin/remote.c:1285
7744 #: builtin/remote.c:1129 builtin/remote.c:1131
7746 msgid " Push URL: %s"
7749 #: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137
7751 msgid " HEAD branch: %s"
7754 #: builtin/remote.c:1139
7757 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
7758 msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
7760 #: builtin/remote.c:1151
7762 msgid " Remote branch:%s"
7763 msgid_plural " Remote branches:%s"
7764 msgstr[0] " 远程分支:%s"
7765 msgstr[1] " 远程分支:%s"
7767 # 译者:中文字符串拼接,可删除前导空格
7768 #: builtin/remote.c:1154 builtin/remote.c:1181
7769 msgid " (status not queried)"
7772 #: builtin/remote.c:1163
7773 msgid " Local branch configured for 'git pull':"
7774 msgid_plural " Local branches configured for 'git pull':"
7775 msgstr[0] " 为 'git pull' 配置的本地分支:"
7776 msgstr[1] " 为 'git pull' 配置的本地分支:"
7778 #: builtin/remote.c:1171
7779 msgid " Local refs will be mirrored by 'git push'"
7780 msgstr " 本地引用将在 'git push' 时被镜像"
7782 #: builtin/remote.c:1178
7784 msgid " Local ref configured for 'git push'%s:"
7785 msgid_plural " Local refs configured for 'git push'%s:"
7786 msgstr[0] " 为 'git push' 配置的本地引用%s:"
7787 msgstr[1] " 为 'git push' 配置的本地引用%s:"
7789 #: builtin/remote.c:1199
7790 msgid "set refs/remotes/<name>/HEAD according to remote"
7791 msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
7793 #: builtin/remote.c:1201
7794 msgid "delete refs/remotes/<name>/HEAD"
7795 msgstr "删除 refs/remotes/<名称>/HEAD"
7797 #: builtin/remote.c:1216
7798 msgid "Cannot determine remote HEAD"
7799 msgstr "无法确定远程 HEAD"
7801 #: builtin/remote.c:1218
7802 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
7803 msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
7805 #: builtin/remote.c:1228
7807 msgid "Could not delete %s"
7810 #: builtin/remote.c:1236
7812 msgid "Not a valid ref: %s"
7813 msgstr "不是一个有效引用:%s"
7815 #: builtin/remote.c:1238
7817 msgid "Could not setup %s"
7821 #: builtin/remote.c:1274
7823 msgid " %s will become dangling!"
7824 msgstr " %s 将成为摇摆状态!"
7827 #: builtin/remote.c:1275
7829 msgid " %s has become dangling!"
7830 msgstr " %s 已成为摇摆状态!"
7832 #: builtin/remote.c:1281
7837 #: builtin/remote.c:1282
7842 #: builtin/remote.c:1295
7844 msgid " * [would prune] %s"
7845 msgstr " * [将删除] %s"
7847 #: builtin/remote.c:1298
7849 msgid " * [pruned] %s"
7850 msgstr " * [已删除] %s"
7852 #: builtin/remote.c:1321
7853 msgid "prune remotes after fetching"
7856 #: builtin/remote.c:1387 builtin/remote.c:1461
7858 msgid "No such remote '%s'"
7861 #: builtin/remote.c:1407
7865 #: builtin/remote.c:1414
7866 msgid "no remote specified"
7869 #: builtin/remote.c:1436
7870 msgid "manipulate push URLs"
7873 #: builtin/remote.c:1438
7877 #: builtin/remote.c:1440
7881 #: builtin/remote.c:1447
7882 msgid "--add --delete doesn't make sense"
7883 msgstr "--add --delete 无意义"
7885 #: builtin/remote.c:1487
7887 msgid "Invalid old URL pattern: %s"
7888 msgstr "无效的旧URL匹配模版:%s"
7890 #: builtin/remote.c:1495
7892 msgid "No such URL found: %s"
7895 #: builtin/remote.c:1497
7896 msgid "Will not delete all non-push URLs"
7897 msgstr "将不会删除所有非推送URL地址"
7899 #: builtin/remote.c:1569
7900 msgid "be verbose; must be placed before a subcommand"
7901 msgstr "冗长输出;必须置于子命令之前"
7903 #: builtin/replace.c:17
7904 msgid "git replace [-f] <object> <replacement>"
7905 msgstr "git replace [-f] <对象> <替换物>"
7907 #: builtin/replace.c:18
7908 msgid "git replace -d <object>..."
7909 msgstr "git replace -d <对象>..."
7911 #: builtin/replace.c:19
7912 msgid "git replace -l [<pattern>]"
7913 msgstr "git replace -l [<模式>]"
7915 #: builtin/replace.c:121
7916 msgid "list replace refs"
7919 #: builtin/replace.c:122
7920 msgid "delete replace refs"
7923 #: builtin/replace.c:123
7924 msgid "replace the ref if it exists"
7927 #: builtin/rerere.c:11
7928 msgid "git rerere [clear | forget path... | status | remaining | diff | gc]"
7929 msgstr "git rerere [clear | forget path... | status | remaining | diff | gc]"
7931 #: builtin/rerere.c:56
7932 msgid "register clean resolutions in index"
7933 msgstr "在索引中注册干净的解决方案"
7935 #: builtin/reset.c:25
7937 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
7938 msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
7940 #: builtin/reset.c:26
7941 msgid "git reset [-q] <tree-ish> [--] <paths>..."
7942 msgstr "git reset [-q] <树或提交> [--] <路径>..."
7944 #: builtin/reset.c:27
7945 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
7946 msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
7948 #: builtin/reset.c:33
7952 #: builtin/reset.c:33
7956 #: builtin/reset.c:33
7960 #: builtin/reset.c:33
7964 #: builtin/reset.c:33
7968 #: builtin/reset.c:73
7969 msgid "You do not have a valid HEAD."
7970 msgstr "您没有一个有效的 HEAD。"
7972 #: builtin/reset.c:75
7973 msgid "Failed to find tree of HEAD."
7974 msgstr "无法找到 HEAD 指向的树。"
7976 #: builtin/reset.c:81
7978 msgid "Failed to find tree of %s."
7979 msgstr "无法找到 %s 指向的树。"
7981 #: builtin/reset.c:98
7983 msgid "HEAD is now at %s"
7984 msgstr "HEAD 现在位于 %s"
7986 # 译者:汉字之间无空格,故删除%s前后空格
7987 #: builtin/reset.c:169
7989 msgid "Cannot do a %s reset in the middle of a merge."
7990 msgstr "在合并过程中不能做%s重置操作。"
7992 #: builtin/reset.c:248
7993 msgid "be quiet, only report errors"
7996 #: builtin/reset.c:250
7997 msgid "reset HEAD and index"
7998 msgstr "重置 HEAD 和索引"
8000 #: builtin/reset.c:251
8001 msgid "reset only HEAD"
8004 #: builtin/reset.c:253 builtin/reset.c:255
8005 msgid "reset HEAD, index and working tree"
8006 msgstr "重置 HEAD、索引和工作区"
8008 #: builtin/reset.c:257
8009 msgid "reset HEAD but keep local changes"
8010 msgstr "重置 HEAD 但保存本地变更"
8012 #: builtin/reset.c:275
8014 msgid "Failed to resolve '%s' as a valid revision."
8015 msgstr "无法将 '%s' 解析为一个有效的版本。"
8017 #: builtin/reset.c:278 builtin/reset.c:286
8019 msgid "Could not parse object '%s'."
8020 msgstr "不能解析对象 '%s'。"
8022 #: builtin/reset.c:283
8024 msgid "Failed to resolve '%s' as a valid tree."
8025 msgstr "无法将 '%s' 解析为一个有效的树对象。"
8027 #: builtin/reset.c:292
8028 msgid "--patch is incompatible with --{hard,mixed,soft}"
8029 msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
8031 #: builtin/reset.c:301
8032 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
8033 msgstr "--mixed 带路径已弃用,而是用 'git reset -- <paths>'。"
8035 # 译者:汉字之间无空格,故删除%s前后空格
8036 #: builtin/reset.c:303
8038 msgid "Cannot do %s reset with paths."
8039 msgstr "不能带路径进行%s重置。"
8041 # 译者:汉字之间无空格,故删除%s前后空格
8042 #: builtin/reset.c:313
8044 msgid "%s reset is not allowed in a bare repository"
8045 msgstr "不能对裸版本库进行%s重置"
8047 #: builtin/reset.c:333
8049 msgid "Could not reset index file to revision '%s'."
8050 msgstr "不能重置索引文件至版本 '%s'。"
8052 #: builtin/reset.c:339
8053 msgid "Unstaged changes after reset:"
8054 msgstr "重置后撤出暂存区的变更:"
8056 #: builtin/reset.c:344
8057 msgid "Could not write new index file."
8058 msgstr "不能写入新的索引文件。"
8060 #: builtin/rev-parse.c:339
8061 msgid "git rev-parse --parseopt [options] -- [<args>...]"
8062 msgstr "git rev-parse --parseopt [选项] -- [<参数>...]"
8064 #: builtin/rev-parse.c:344
8065 msgid "keep the `--` passed as an arg"
8066 msgstr "保持 `--` 作为一个参数传递"
8068 #: builtin/rev-parse.c:346
8069 msgid "stop parsing after the first non-option argument"
8070 msgstr "遇到第一个非选项参数后停止解析"
8072 #: builtin/rev-parse.c:464
8074 "git rev-parse --parseopt [options] -- [<args>...]\n"
8075 " or: git rev-parse --sq-quote [<arg>...]\n"
8076 " or: git rev-parse [options] [<arg>...]\n"
8078 "Run \"git rev-parse --parseopt -h\" for more information on the first usage."
8080 "git rev-parse --parseopt [选项] -- [<参数>...]\n"
8081 " 或者:git rev-parse --sq-quote [<选项>...]\n"
8082 " 或者:git rev-parse [options] [<选项>...]\n"
8084 "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
8086 #: builtin/revert.c:22
8087 msgid "git revert [options] <commit-ish>"
8088 msgstr "git revert [选项] <提交号>"
8090 #: builtin/revert.c:23
8091 msgid "git revert <subcommand>"
8092 msgstr "git revert <子命令>"
8094 #: builtin/revert.c:28
8095 msgid "git cherry-pick [options] <commit-ish>"
8096 msgstr "git cherry-pick [选项] <提交号>"
8098 #: builtin/revert.c:29
8099 msgid "git cherry-pick <subcommand>"
8100 msgstr "git cherry-pick <子命令>"
8102 #: builtin/revert.c:70 builtin/revert.c:92
8104 msgid "%s: %s cannot be used with %s"
8105 msgstr "%s:%s 不能和 %s 同时使用"
8107 #: builtin/revert.c:103
8108 msgid "end revert or cherry-pick sequence"
8111 #: builtin/revert.c:104
8112 msgid "resume revert or cherry-pick sequence"
8115 #: builtin/revert.c:105
8116 msgid "cancel revert or cherry-pick sequence"
8119 #: builtin/revert.c:106
8120 msgid "don't automatically commit"
8123 #: builtin/revert.c:107
8124 msgid "edit the commit message"
8127 #: builtin/revert.c:110
8128 msgid "parent number"
8131 #: builtin/revert.c:112
8132 msgid "merge strategy"
8135 #: builtin/revert.c:113
8139 #: builtin/revert.c:114
8140 msgid "option for merge strategy"
8143 #: builtin/revert.c:125
8144 msgid "append commit name"
8147 #: builtin/revert.c:126
8148 msgid "allow fast-forward"
8151 #: builtin/revert.c:127
8152 msgid "preserve initially empty commits"
8155 #: builtin/revert.c:128
8156 msgid "allow commits with empty messages"
8159 #: builtin/revert.c:129
8160 msgid "keep redundant, empty commits"
8163 #: builtin/revert.c:133
8164 msgid "program error"
8167 #: builtin/revert.c:223
8168 msgid "revert failed"
8171 #: builtin/revert.c:238
8172 msgid "cherry-pick failed"
8176 msgid "git rm [options] [--] <file>..."
8177 msgstr "git rm [选项] [--] <文件>..."
8179 #: builtin/rm.c:64 builtin/rm.c:186
8182 "submodule '%s' (or one of its nested submodules) uses a .git directory\n"
8183 "(use 'rm -rf' if you really want to remove it including all of its history)"
8185 "子模组 '%s'(或者它的一个嵌套子模组)使用一个 .git 目录\n"
8186 "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
8191 "'%s' has staged content different from both the file and the HEAD\n"
8192 "(use -f to force removal)"
8194 "'%s' 暂存的内容和工作区及 HEAD 中的都不一样\n"
8200 "'%s' has changes staged in the index\n"
8201 "(use --cached to keep the file, or -f to force removal)"
8204 "(使用 --cached 保存文件,或用 -f 强制删除)"
8209 "'%s' has local modifications\n"
8210 "(use --cached to keep the file, or -f to force removal)"
8213 "(使用 --cached 保存文件,或用 -f 强制删除)"
8216 msgid "do not list removed files"
8220 msgid "only remove from the index"
8224 msgid "override the up-to-date check"
8228 msgid "allow recursive removal"
8232 msgid "exit with a zero status even if nothing matched"
8233 msgstr "即使没有匹配,也以零状态退出"
8237 msgid "not removing '%s' recursively without -r"
8238 msgstr "未提供 -r 选项不会递归删除 '%s'"
8242 msgid "git rm: unable to remove %s"
8243 msgstr "git rm:不能删除 %s"
8245 #: builtin/shortlog.c:13
8246 msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]"
8247 msgstr "git shortlog [-n] [-s] [-e] [-w] [版本选项] [--] [<提交号>... ]"
8249 #: builtin/shortlog.c:133
8251 msgid "Missing author: %s"
8254 #: builtin/shortlog.c:229
8255 msgid "sort output according to the number of commits per author"
8256 msgstr "根据每个作者的提交数量排序"
8258 #: builtin/shortlog.c:231
8259 msgid "Suppress commit descriptions, only provides commit count"
8260 msgstr "隐藏提交说明,只提供提交数量"
8262 #: builtin/shortlog.c:233
8263 msgid "Show the email address of each author"
8264 msgstr "显示每个作者的电子邮件地址"
8266 #: builtin/shortlog.c:234
8268 msgstr "w[,i1[,i2]]"
8270 #: builtin/shortlog.c:235
8271 msgid "Linewrap output"
8274 #: builtin/show-branch.c:9
8276 "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
8277 "current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
8278 "independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
8281 "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
8282 "current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
8283 "independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
8286 #: builtin/show-branch.c:10
8287 msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
8288 msgstr "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
8290 #: builtin/show-branch.c:651
8291 msgid "show remote-tracking and local branches"
8292 msgstr "显示远程跟踪的和本地的分支"
8294 #: builtin/show-branch.c:653
8295 msgid "show remote-tracking branches"
8298 #: builtin/show-branch.c:655
8299 msgid "color '*!+-' corresponding to the branch"
8300 msgstr "着色 '*!+-' 到相应的分支"
8302 #: builtin/show-branch.c:657
8303 msgid "show <n> more commits after the common ancestor"
8304 msgstr "显示共同祖先后的 <n> 个提交"
8306 #: builtin/show-branch.c:659
8307 msgid "synonym to more=-1"
8308 msgstr "和 more=-1 同义"
8310 #: builtin/show-branch.c:660
8311 msgid "suppress naming strings"
8314 #: builtin/show-branch.c:662
8315 msgid "include the current branch"
8318 #: builtin/show-branch.c:664
8319 msgid "name commits with their object names"
8322 #: builtin/show-branch.c:666
8323 msgid "show possible merge bases"
8326 #: builtin/show-branch.c:668
8327 msgid "show refs unreachable from any other ref"
8328 msgstr "显示没有任何引用的的引用"
8330 #: builtin/show-branch.c:670
8331 msgid "show commits in topological order"
8334 #: builtin/show-branch.c:672
8335 msgid "show only commits not on the first branch"
8336 msgstr "只显示不在第一个分支上的提交"
8338 #: builtin/show-branch.c:674
8339 msgid "show merges reachable from only one tip"
8340 msgstr "显示仅一个分支可访问的合并提交"
8342 #: builtin/show-branch.c:676
8343 msgid "show commits where no parent comes before its children"
8344 msgstr "显示提交时以时间为序且父提交不能领先子提交"
8346 #: builtin/show-branch.c:678
8347 msgid "<n>[,<base>]"
8348 msgstr "<n>[,<base>]"
8350 #: builtin/show-branch.c:679
8351 msgid "show <n> most recent ref-log entries starting at base"
8352 msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
8354 #: builtin/show-ref.c:10
8356 "git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
8357 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
8359 "git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
8360 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
8362 #: builtin/show-ref.c:11
8363 msgid "git show-ref --exclude-existing[=pattern] < ref-list"
8364 msgstr "git show-ref --exclude-existing[=模式] < 引用列表"
8366 #: builtin/show-ref.c:165
8367 msgid "only show tags (can be combined with heads)"
8368 msgstr "只显示 tags(可以和头共用)"
8370 #: builtin/show-ref.c:166
8371 msgid "only show heads (can be combined with tags)"
8372 msgstr "只显示头(可以和 tags 共用)"
8374 #: builtin/show-ref.c:167
8375 msgid "stricter reference checking, requires exact ref path"
8376 msgstr "更严格的引用检测,需要精确的引用路径"
8378 #: builtin/show-ref.c:170 builtin/show-ref.c:172
8379 msgid "show the HEAD reference"
8382 #: builtin/show-ref.c:174
8383 msgid "dereference tags into object IDs"
8384 msgstr "转换 tags 到对象ID"
8386 #: builtin/show-ref.c:176
8387 msgid "only show SHA1 hash using <n> digits"
8388 msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
8390 #: builtin/show-ref.c:180
8391 msgid "do not print results to stdout (useful with --verify)"
8392 msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
8394 #: builtin/show-ref.c:182
8395 msgid "show refs from stdin that aren't in local repository"
8396 msgstr "显示从标准输入中读入的不在本地版本库中的引用"
8398 #: builtin/symbolic-ref.c:7
8399 msgid "git symbolic-ref [options] name [ref]"
8400 msgstr "git symbolic-ref [选项] 名称 [引用]"
8402 #: builtin/symbolic-ref.c:8
8403 msgid "git symbolic-ref -d [-q] name"
8404 msgstr "git symbolic-ref -d [-q] 名称"
8406 #: builtin/symbolic-ref.c:40
8407 msgid "suppress error message for non-symbolic (detached) refs"
8408 msgstr "不显示非符号(分离的)引用的错误信息"
8410 #: builtin/symbolic-ref.c:41
8411 msgid "delete symbolic ref"
8414 #: builtin/symbolic-ref.c:42
8415 msgid "shorten ref output"
8418 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
8422 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
8423 msgid "reason of the update"
8428 "git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]"
8429 msgstr "git tag [-a|-s|-u <key-id>] [-f] [-m <说明>|-F <文件>] <标签名> [<头>]"
8432 msgid "git tag -d <tagname>..."
8433 msgstr "git tag -d <标签名>..."
8437 "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n"
8438 "\t\t[<pattern>...]"
8440 "git tag -l [-n[<num>]] [--contains <提交>] [--points-at <对象>] \n"
8444 msgid "git tag -v <tagname>..."
8445 msgstr "git tag -v <标签名>..."
8449 msgid "malformed object at '%s'"
8450 msgstr "非法的对象于 '%s'"
8452 #: builtin/tag.c:207
8454 msgid "tag name too long: %.*s..."
8455 msgstr "tag 名字太长:%.*s..."
8457 #: builtin/tag.c:212
8459 msgid "tag '%s' not found."
8460 msgstr "tag '%s' 未发现。"
8462 #: builtin/tag.c:227
8464 msgid "Deleted tag '%s' (was %s)\n"
8465 msgstr "已删除 tag '%s'(曾为 %s)\n"
8467 #: builtin/tag.c:239
8469 msgid "could not verify the tag '%s'"
8470 msgstr "不能校验 tag '%s'"
8472 #: builtin/tag.c:249
8476 "Write a tag message\n"
8477 "Lines starting with '%c' will be ignored.\n"
8481 "以 '%c' 开头的行将被忽略。\n"
8483 #: builtin/tag.c:253
8487 "Write a tag message\n"
8488 "Lines starting with '%c' will be kept; you may remove them yourself if you "
8493 "以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
8495 #: builtin/tag.c:292
8496 msgid "unable to sign the tag"
8499 #: builtin/tag.c:294
8500 msgid "unable to write tag file"
8503 #: builtin/tag.c:319
8504 msgid "bad object type."
8507 #: builtin/tag.c:332
8508 msgid "tag header too big."
8511 #: builtin/tag.c:368
8512 msgid "no tag message?"
8515 #: builtin/tag.c:374
8517 msgid "The tag message has been left in %s\n"
8518 msgstr "tag 说明被保留在 %s\n"
8520 #: builtin/tag.c:423
8521 msgid "switch 'points-at' requires an object"
8522 msgstr "开关 'points-at' 需要一个对象"
8524 #: builtin/tag.c:425
8526 msgid "malformed object name '%s'"
8527 msgstr "非法的对象名 '%s'"
8529 #: builtin/tag.c:445
8530 msgid "list tag names"
8533 #: builtin/tag.c:447
8534 msgid "print <n> lines of each tag message"
8535 msgstr "每个 tag 信息打印 <n> 行"
8537 #: builtin/tag.c:449
8541 #: builtin/tag.c:450
8545 #: builtin/tag.c:452
8546 msgid "Tag creation options"
8549 #: builtin/tag.c:454
8550 msgid "annotated tag, needs a message"
8551 msgstr "注解 tag,需要一个说明"
8553 #: builtin/tag.c:456
8557 #: builtin/tag.c:458
8558 msgid "annotated and GPG-signed tag"
8559 msgstr "注解并 GPG 签名的 tag"
8561 #: builtin/tag.c:462
8562 msgid "use another key to sign the tag"
8563 msgstr "使用另外的私钥签名 tag"
8565 #: builtin/tag.c:463
8566 msgid "replace the tag if exists"
8567 msgstr "如果存在,替换现有的 tag"
8569 #: builtin/tag.c:464
8570 msgid "show tag list in columns"
8571 msgstr "以列的方式显示 tag"
8573 #: builtin/tag.c:466
8574 msgid "Tag listing options"
8577 #: builtin/tag.c:469
8578 msgid "print only tags that contain the commit"
8579 msgstr "只打印包含提交的tags"
8581 #: builtin/tag.c:475
8582 msgid "print only tags of the object"
8585 #: builtin/tag.c:504
8586 msgid "--column and -n are incompatible"
8587 msgstr "--column 和 -n 不兼容"
8589 #: builtin/tag.c:521
8590 msgid "-n option is only allowed with -l."
8591 msgstr "-n 选项只允许和 -l 同时使用。"
8593 #: builtin/tag.c:523
8594 msgid "--contains option is only allowed with -l."
8595 msgstr "--contains 选项只允许和 -l 同时使用。"
8597 #: builtin/tag.c:525
8598 msgid "--points-at option is only allowed with -l."
8599 msgstr "--points-at 选项只允许和 -l 同时使用。"
8601 #: builtin/tag.c:533
8602 msgid "only one -F or -m option is allowed."
8603 msgstr "只允许一个 -F 或 -m 选项。"
8605 #: builtin/tag.c:553
8606 msgid "too many params"
8609 #: builtin/tag.c:559
8611 msgid "'%s' is not a valid tag name."
8612 msgstr "'%s' 不是一个有效的tag名称。"
8614 #: builtin/tag.c:564
8616 msgid "tag '%s' already exists"
8617 msgstr "tag '%s' 已存在"
8619 #: builtin/tag.c:582
8621 msgid "%s: cannot lock the ref"
8624 #: builtin/tag.c:584
8626 msgid "%s: cannot update the ref"
8629 #: builtin/tag.c:586
8631 msgid "Updated tag '%s' (was %s)\n"
8632 msgstr "已更新tag '%s'(曾为 %s)\n"
8634 #: builtin/update-index.c:401
8635 msgid "git update-index [options] [--] [<file>...]"
8636 msgstr "git update-index [选项] [--] [<文件>...]"
8638 #: builtin/update-index.c:718
8639 msgid "continue refresh even when index needs update"
8640 msgstr "当索引需要更新时继续刷新"
8642 #: builtin/update-index.c:721
8643 msgid "refresh: ignore submodules"
8646 #: builtin/update-index.c:724
8647 msgid "do not ignore new files"
8650 #: builtin/update-index.c:726
8651 msgid "let files replace directories and vice-versa"
8652 msgstr "让文件替换目录(反之亦然)"
8654 #: builtin/update-index.c:728
8655 msgid "notice files missing from worktree"
8658 #: builtin/update-index.c:730
8659 msgid "refresh even if index contains unmerged entries"
8660 msgstr "即使索引区包含未合并的条目也执行刷新"
8662 #: builtin/update-index.c:733
8663 msgid "refresh stat information"
8666 #: builtin/update-index.c:737
8667 msgid "like --refresh, but ignore assume-unchanged setting"
8668 msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
8670 #: builtin/update-index.c:741
8671 msgid "<mode> <object> <path>"
8672 msgstr "<mode> <object> <path>"
8674 #: builtin/update-index.c:742
8675 msgid "add the specified entry to the index"
8676 msgstr "添加指定的条目到索引区"
8678 #: builtin/update-index.c:746
8682 #: builtin/update-index.c:747
8683 msgid "override the executable bit of the listed files"
8684 msgstr "覆盖列表里文件的可执行位"
8686 #: builtin/update-index.c:751
8687 msgid "mark files as \"not changing\""
8688 msgstr "把文件标记为 \"没有变更\""
8690 #: builtin/update-index.c:754
8691 msgid "clear assumed-unchanged bit"
8692 msgstr "清除 assumed-unchanged 位"
8694 #: builtin/update-index.c:757
8695 msgid "mark files as \"index-only\""
8696 msgstr "把文件标记为 \"仅索引\""
8698 #: builtin/update-index.c:760
8699 msgid "clear skip-worktree bit"
8700 msgstr "清除 skip-worktree 位"
8702 #: builtin/update-index.c:763
8703 msgid "add to index only; do not add content to object database"
8704 msgstr "只添加到索引区;不添加对象到对象库"
8706 #: builtin/update-index.c:765
8707 msgid "remove named paths even if present in worktree"
8708 msgstr "即使存在工作区里,也删除路径"
8710 #: builtin/update-index.c:767
8711 msgid "with --stdin: input lines are terminated by null bytes"
8712 msgstr "携带 --stdin:输入的行以 null 字符终止"
8714 #: builtin/update-index.c:769
8715 msgid "read list of paths to be updated from standard input"
8716 msgstr "从标准输入中读取需要更新的路径列表"
8718 #: builtin/update-index.c:773
8719 msgid "add entries from standard input to the index"
8720 msgstr "从标准输入添加条目到索引区"
8722 #: builtin/update-index.c:777
8723 msgid "repopulate stages #2 and #3 for the listed paths"
8724 msgstr "为指定文件重新生成第2和第3暂存区"
8726 #: builtin/update-index.c:781
8727 msgid "only update entries that differ from HEAD"
8728 msgstr "只更新与 HEAD 不同的条目"
8730 #: builtin/update-index.c:785
8731 msgid "ignore files missing from worktree"
8734 #: builtin/update-index.c:788
8735 msgid "report actions to standard output"
8738 #: builtin/update-index.c:790
8739 msgid "(for porcelains) forget saved unresolved conflicts"
8740 msgstr "(for porcelains) 忘记保存的未解决的冲突"
8742 #: builtin/update-index.c:794
8743 msgid "write index in this format"
8746 #: builtin/update-ref.c:7
8747 msgid "git update-ref [options] -d <refname> [<oldval>]"
8748 msgstr "git update-ref [options] -d <引用名> [<旧值>]"
8750 #: builtin/update-ref.c:8
8751 msgid "git update-ref [options] <refname> <newval> [<oldval>]"
8752 msgstr "git update-ref [options] <引用名> <新值> [<旧值>]"
8754 #: builtin/update-ref.c:19
8755 msgid "delete the reference"
8758 #: builtin/update-ref.c:21
8759 msgid "update <refname> not the one it points to"
8760 msgstr "更新 <引用名> 本身而不是它指向的引用"
8762 #: builtin/update-server-info.c:6
8763 msgid "git update-server-info [--force]"
8764 msgstr "git update-server-info [--force]"
8766 #: builtin/update-server-info.c:14
8767 msgid "update the info files from scratch"
8770 #: builtin/verify-pack.c:56
8771 msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
8772 msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
8774 #: builtin/verify-pack.c:66
8778 #: builtin/verify-pack.c:68
8779 msgid "show statistics only"
8782 #: builtin/verify-tag.c:17
8783 msgid "git verify-tag [-v|--verbose] <tag>..."
8784 msgstr "git verify-tag [-v|--verbose] <tag>..."
8786 #: builtin/verify-tag.c:73
8787 msgid "print tag contents"
8790 #: builtin/write-tree.c:13
8791 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
8792 msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
8794 #: builtin/write-tree.c:26
8798 #: builtin/write-tree.c:27
8799 msgid "write tree object for a subdirectory <prefix>"
8800 msgstr "将 <前缀> 子目录内容写到一个树对象"
8802 #: builtin/write-tree.c:30
8803 msgid "only useful for debugging"
8807 msgid "See 'git help <command>' for more information on a specific command."
8808 msgstr "参见 'git help <command>' 以获得该特定命令的详细信息。"
8810 #: parse-options.h:156
8811 msgid "no-op (backward compatibility)"
8814 #: parse-options.h:232
8815 msgid "be more verbose"
8818 #: parse-options.h:234
8819 msgid "be more quiet"
8822 #: parse-options.h:240
8823 msgid "use <n> digits to display SHA-1s"
8824 msgstr "用 <n> 位数字显示 SHA-1 哈希值"
8827 msgid "Add file contents to the index"
8831 msgid "Find by binary search the change that introduced a bug"
8832 msgstr "通过二分查找定位引入 bug 的变更"
8835 msgid "List, create, or delete branches"
8839 msgid "Checkout a branch or paths to the working tree"
8840 msgstr "检出一个分支或路径到工作区"
8843 msgid "Clone a repository into a new directory"
8844 msgstr "克隆一个版本库到一个新目录"
8847 msgid "Record changes to the repository"
8851 msgid "Show changes between commits, commit and working tree, etc"
8852 msgstr "显示提交之间、提交和工作区之间等的差异"
8855 msgid "Download objects and refs from another repository"
8856 msgstr "从另外一个版本库下载对象和引用"
8859 msgid "Print lines matching a pattern"
8863 msgid "Create an empty Git repository or reinitialize an existing one"
8864 msgstr "创建一个空的 Git 版本库或重新初始化一个已存在的版本库"
8867 msgid "Show commit logs"
8871 msgid "Join two or more development histories together"
8872 msgstr "合并两个或更多开发历史"
8875 msgid "Move or rename a file, a directory, or a symlink"
8876 msgstr "移动或重命名一个文件、目录或符号链接"
8879 msgid "Fetch from and merge with another repository or a local branch"
8880 msgstr "获取并合并另外的版本库或一个本地分支"
8883 msgid "Update remote refs along with associated objects"
8884 msgstr "更新远程引用和相关的对象"
8887 msgid "Forward-port local commits to the updated upstream head"
8888 msgstr "本地提交转移至更新后的上游分支中"
8891 msgid "Reset current HEAD to the specified state"
8892 msgstr "重置当前HEAD到指定状态"
8895 msgid "Remove files from the working tree and from the index"
8896 msgstr "从工作区和索引中删除文件"
8899 msgid "Show various types of objects"
8903 msgid "Show the working tree status"
8907 msgid "Create, list, delete or verify a tag object signed with GPG"
8908 msgstr "创建、列出、删除或校验一个GPG签名的 tag 对象"
8911 msgid "You need to set your committer info first"
8912 msgstr "您需要先设置你的提交者信息"
8916 "You seem to have moved HEAD since the last 'am' failure.\n"
8917 "Not rewinding to ORIG_HEAD"
8918 msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
8923 "When you have resolved this problem, run \"$cmdline --resolved\".\n"
8924 "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
8925 "To restore the original branch and stop patching, run \"$cmdline --abort\"."
8927 "当您解决了此问题后,执行 \"$cmdline --resolved\"。\n"
8928 "如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n"
8929 "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
8932 msgid "Cannot fall back to three-way merge."
8936 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
8937 msgstr "版本库缺乏必要的数据(blob)对象以进行三路合并。"
8940 msgid "Using index info to reconstruct a base tree..."
8941 msgstr "使用索引来重建一个(三路合并的)基础目录树..."
8945 "Did you hand edit your patch?\n"
8946 "It does not apply to blobs recorded in its index."
8949 "无法应用补丁到索引中的数据(blob)对象上。"
8952 msgid "Falling back to patching base and 3-way merge..."
8953 msgstr "转而在基础版本上打补丁及进行三路合并..."
8956 msgid "Failed to merge in the changes."
8960 msgid "Only one StGIT patch series can be applied at once"
8961 msgstr "一次只能有一个 StGIT 补丁队列被应用"
8965 msgid "Patch format $patch_format is not supported."
8966 msgstr "不支持 $patch_format 补丁格式。"
8969 msgid "Patch format detection failed."
8974 "The -b/--binary option has been a no-op for long time, and\n"
8975 "it will be removed. Please do not use it anymore."
8977 "参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被删除。\n"
8982 msgid "previous rebase directory $dotest still exists but mbox given."
8983 msgstr "之前的变基目录 $dotest 仍然存在但给出了mbox。"
8986 msgid "Please make up your mind. --skip or --abort?"
8987 msgstr "请下决心。--skip 或是 --abort ?"
8990 msgid "Resolve operation not in progress, we are not resuming."
8991 msgstr "解决操作未进行,我们不会继续。"
8995 msgid "Dirty index: cannot apply patches (dirty: $files)"
8996 msgstr "脏的索引:不能应用补丁(脏文件:$files)"
9001 "Patch is empty. Was it split wrong?\n"
9002 "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
9003 "To restore the original branch and stop patching run \"$cmdline --abort\"."
9006 "如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n"
9007 "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
9010 msgid "Patch does not have a valid e-mail address."
9011 msgstr "补丁中没有一个有效的邮件地址。"
9014 msgid "cannot be interactive without stdin connected to a terminal."
9015 msgstr "标准输入没有和终端关联,不能进行交互式操作。"
9018 msgid "Commit Body is:"
9022 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
9023 #. in your translation. The program will only accept English
9024 #. input at this point.
9026 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
9027 msgstr "应用?[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
9031 msgid "Applying: $FIRSTLINE"
9032 msgstr "正应用:$FIRSTLINE"
9036 "No changes - did you forget to use 'git add'?\n"
9037 "If there is nothing left to stage, chances are that something else\n"
9038 "already introduced the same changes; you might want to skip this patch."
9040 "没有变更 —— 您是不是忘了执行 'git add'?\n"
9041 "如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
9046 "You still have unmerged paths in your index\n"
9047 "did you forget to use 'git add'?"
9048 msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'?"
9051 msgid "No changes -- Patch already applied."
9052 msgstr "没有变更 —— 补丁已经应用过。"
9056 msgid "Patch failed at $msgnum $FIRSTLINE"
9057 msgstr "补丁失败于 $msgnum $FIRSTLINE"
9062 "The copy of the patch that failed is found in:\n"
9069 msgid "applying to an empty history"
9073 msgid "You need to start by \"git bisect start\""
9074 msgstr "您需要执行 \"git bisect start\" 来开始"
9077 #. TRANSLATORS: Make sure to include [Y] and [n] in your
9078 #. translation. The program will only accept English input
9081 msgid "Do you want me to do it for you [Y/n]? "
9082 msgstr "您想让我为您这样做么[Y/n]? "
9086 msgid "unrecognised option: '$arg'"
9087 msgstr "未能识别的选项:'$arg'"
9091 msgid "'$arg' does not appear to be a valid revision"
9092 msgstr "'$arg' 看起来不像是一个有效的版本"
9094 #: git-bisect.sh:117
9095 msgid "Bad HEAD - I need a HEAD"
9096 msgstr "坏的 HEAD - 我需要一个 HEAD"
9098 #: git-bisect.sh:130
9101 "Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
9102 msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <validbranch>'。"
9104 #: git-bisect.sh:140
9105 msgid "won't bisect on seeked tree"
9106 msgstr "不会在已查找过的树上二分查找"
9108 #: git-bisect.sh:144
9109 msgid "Bad HEAD - strange symbolic ref"
9110 msgstr "坏的 HEAD - 奇怪的符号引用"
9112 #: git-bisect.sh:189
9114 msgid "Bad bisect_write argument: $state"
9115 msgstr "坏的 bisect_write 参数:$state"
9117 #: git-bisect.sh:218
9119 msgid "Bad rev input: $arg"
9120 msgstr "输入坏的版本:$arg"
9122 #: git-bisect.sh:232
9123 msgid "Please call 'bisect_state' with at least one argument."
9124 msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
9126 #: git-bisect.sh:244
9128 msgid "Bad rev input: $rev"
9129 msgstr "输入坏的版本:$rev"
9131 #: git-bisect.sh:250
9132 msgid "'git bisect bad' can take only one argument."
9133 msgstr "'git bisect bad' 只能带一个参数。"
9135 #. have bad but not good. we could bisect although
9136 #. this is less optimum.
9137 #: git-bisect.sh:273
9138 msgid "Warning: bisecting only with a bad commit."
9139 msgstr "警告:在仅有一个坏提交下进行二分查找。"
9142 #. TRANSLATORS: Make sure to include [Y] and [n] in your
9143 #. translation. The program will only accept English input
9145 #: git-bisect.sh:279
9146 msgid "Are you sure [Y/n]? "
9147 msgstr "您确认么[Y/n]? "
9149 #: git-bisect.sh:289
9151 "You need to give me at least one good and one bad revisions.\n"
9152 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
9154 "您需要给我至少一个好版本和一个坏版本。\n"
9155 "(您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。)"
9157 #: git-bisect.sh:292
9159 "You need to start by \"git bisect start\".\n"
9160 "You then need to give me at least one good and one bad revisions.\n"
9161 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
9163 "您需要执行 \"git bisect start\" 来开始。\n"
9164 "然后需要提供我至少一个好版本和一个坏版本。\n"
9165 "(您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。)"
9167 #: git-bisect.sh:347 git-bisect.sh:474
9168 msgid "We are not bisecting."
9171 #: git-bisect.sh:354
9173 msgid "'$invalid' is not a valid commit"
9174 msgstr "'$invalid' 不是一个有效的提交"
9176 #: git-bisect.sh:363
9179 "Could not check out original HEAD '$branch'.\n"
9180 "Try 'git bisect reset <commit>'."
9182 "不能检出原始 HEAD '$branch'。\n"
9183 "尝试 'git bisect reset <提交>'。"
9185 #: git-bisect.sh:390
9186 msgid "No logfile given"
9189 #: git-bisect.sh:391
9191 msgid "cannot read $file for replaying"
9192 msgstr "不能读取 $file 来重放"
9194 #: git-bisect.sh:408
9195 msgid "?? what are you talking about?"
9198 #: git-bisect.sh:420
9200 msgid "running $command"
9201 msgstr "运行 $command"
9203 #: git-bisect.sh:427
9206 "bisect run failed:\n"
9207 "exit code $res from '$command' is < 0 or >= 128"
9210 "命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
9212 #: git-bisect.sh:453
9213 msgid "bisect run cannot continue any more"
9216 #: git-bisect.sh:459
9219 "bisect run failed:\n"
9220 "'bisect_state $state' exited with error code $res"
9223 "'bisect_state $state' 退出码为 $res"
9225 #: git-bisect.sh:466
9226 msgid "bisect run success"
9231 "Pull is not possible because you have unmerged files.\n"
9232 "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
9233 "as appropriate to mark resolution, or use 'git commit -a'."
9235 "Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n"
9236 "然后酌情使用 'git add/rm <file>' 标记解决方案,\n"
9237 "或者使用 'git commit -a'。"
9240 msgid "Pull is not possible because you have unmerged files."
9241 msgstr "Pull 不可用,因为您尚有未合并的文件。"
9244 msgid "updating an unborn branch with changes added to the index"
9245 msgstr "更新尚未诞生的分支,变更添加至索引"
9247 #. The fetch involved updating the current branch.
9248 #. The working tree and the index file is still based on the
9249 #. $orig_head commit, but we are merging into $curr_head.
9250 #. First update the working tree to match $curr_head.
9254 "Warning: fetch updated the current branch head.\n"
9255 "Warning: fast-forwarding your working tree from\n"
9256 "Warning: commit $orig_head."
9258 "警告:fetch 更新了当前的分支。您的工作区\n"
9259 "警告:从原提交 $orig_head 快进。"
9262 msgid "Cannot merge multiple branches into empty head"
9263 msgstr "无法将多个分支合并到空分支"
9266 msgid "Cannot rebase onto multiple branches"
9271 "When you have resolved this problem, run \"git rebase --continue\".\n"
9272 "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
9273 "To check out the original branch and stop rebasing, run \"git rebase --abort"
9276 "当您解决了此问题后,执行 \"git rebase --continue\"。\n"
9277 "如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
9278 "要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
9280 #: git-rebase.sh:160
9281 msgid "The pre-rebase hook refused to rebase."
9282 msgstr "钩子 pre-rebase 拒绝变基。"
9284 #: git-rebase.sh:165
9285 msgid "It looks like git-am is in progress. Cannot rebase."
9286 msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
9288 #: git-rebase.sh:296
9289 msgid "The --exec option must be used with the --interactive option"
9290 msgstr "选项 --exec 必须和选项 --interactive 同时使用"
9292 #: git-rebase.sh:301
9293 msgid "No rebase in progress?"
9296 #: git-rebase.sh:312
9297 msgid "The --edit-todo action can only be used during interactive rebase."
9298 msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
9300 #: git-rebase.sh:319
9301 msgid "Cannot read HEAD"
9304 #: git-rebase.sh:322
9306 "You must edit all merge conflicts and then\n"
9307 "mark them as resolved using git add"
9309 "您必须编辑所有的合并冲突,然后通过 git add\n"
9312 #: git-rebase.sh:340
9314 msgid "Could not move back to $head_name"
9315 msgstr "无法移回 $head_name"
9317 #: git-rebase.sh:359
9320 "It seems that there is already a $state_dir_base directory, and\n"
9321 "I wonder if you are in the middle of another rebase. If that is the\n"
9322 "case, please try\n"
9323 "\t$cmd_live_rebase\n"
9324 "If that is not the case, please\n"
9325 "\t$cmd_clear_stale_rebase\n"
9326 "and run me again. I am stopping in case you still have something\n"
9329 "好像已有一个 $state_dir_base 目录,我怀疑您正处于另外一个变基过程中。\n"
9331 "\t$cmd_live_rebase\n"
9333 "\t$cmd_clear_stale_rebase\n"
9334 "然后再重新执行变基。为避免您丢失重要数据,我已经停止当前操作。"
9336 #: git-rebase.sh:404
9338 msgid "invalid upstream $upstream_name"
9339 msgstr "无效的上游 $upstream_name"
9341 #: git-rebase.sh:428
9343 msgid "$onto_name: there are more than one merge bases"
9344 msgstr "$onto_name: 有一个以上的合并基准"
9346 #: git-rebase.sh:431 git-rebase.sh:435
9348 msgid "$onto_name: there is no merge base"
9349 msgstr "$onto_name: 没有合并基准"
9351 #: git-rebase.sh:440
9353 msgid "Does not point to a valid commit: $onto_name"
9354 msgstr "没有指向一个有效的提交:$onto_name"
9356 #: git-rebase.sh:463
9358 msgid "fatal: no such branch: $branch_name"
9359 msgstr "严重错误:无此分支:$branch_name"
9361 #: git-rebase.sh:483
9362 msgid "Please commit or stash them."
9363 msgstr "请提交或为它们保存进度。"
9365 #: git-rebase.sh:501
9367 msgid "Current branch $branch_name is up to date."
9368 msgstr "当前分支 $branch_name 是最新的。"
9370 #: git-rebase.sh:504
9372 msgid "Current branch $branch_name is up to date, rebase forced."
9373 msgstr "当前分支 $branch_name 是最新的,强制变基。"
9375 #: git-rebase.sh:515
9377 msgid "Changes from $mb to $onto:"
9378 msgstr "变更从 $mb 到 $onto:"
9380 #. Detach HEAD and reset the tree
9381 #: git-rebase.sh:524
9382 msgid "First, rewinding head to replay your work on top of it..."
9383 msgstr "首先,重置头指针以便在上面重放您的工作..."
9385 #: git-rebase.sh:532
9387 msgid "Fast-forwarded $branch_name to $onto_name."
9388 msgstr "快进 $branch_name 至 $onto_name。"
9391 msgid "git stash clear with parameters is unimplemented"
9392 msgstr "git stash clear 不支持参数"
9395 msgid "You do not have the initial commit yet"
9399 msgid "Cannot save the current index state"
9402 #: git-stash.sh:123 git-stash.sh:136
9403 msgid "Cannot save the current worktree state"
9404 msgstr "无法保存当前工作区状态"
9407 msgid "No changes selected"
9411 msgid "Cannot remove temporary index (can't happen)"
9412 msgstr "无法删除临时索引(不应发生)"
9415 msgid "Cannot record working tree state"
9418 #. TRANSLATORS: $option is an invalid option, like
9419 #. `--blah-blah'. The 7 spaces at the beginning of the
9420 #. second line correspond to "error: ". So you should line
9421 #. up the second line with however many characters the
9422 #. translation of "error: " takes in your language. E.g. in
9425 #. $ git stash save --blah-blah 2>&1 | head -n 2
9426 #. error: unknown option for 'stash save': --blah-blah
9427 #. To provide a message, use git stash save -- '--blah-blah'
9431 "error: unknown option for 'stash save': $option\n"
9432 " To provide a message, use git stash save -- '$option'"
9434 "错误:'stash save' 的未知选项:$option\n"
9435 " 要提供一个描述信息,使用 git stash save -- '$option'"
9438 msgid "No local changes to save"
9442 msgid "Cannot initialize stash"
9443 msgstr "无法初始化 stash"
9446 msgid "Cannot save the current status"
9450 msgid "Cannot remove worktree changes"
9454 msgid "No stash found."
9459 msgid "Too many revisions specified: $REV"
9460 msgstr "指定了太多的版本:$REV"
9464 msgid "$reference is not valid reference"
9465 msgstr "$reference 不是有效的引用"
9469 msgid "'$args' is not a stash-like commit"
9470 msgstr "'$args' 不是 stash 样提交"
9474 msgid "'$args' is not a stash reference"
9475 msgstr "'$args' 不是一个 stash 引用"
9478 msgid "unable to refresh index"
9482 msgid "Cannot apply a stash in the middle of a merge"
9483 msgstr "无法在合并过程中恢复进度"
9486 msgid "Conflicts in index. Try without --index."
9487 msgstr "索引中有冲突。尝试不使用 --index。"
9490 msgid "Could not save index tree"
9494 msgid "Cannot unstage modified files"
9498 msgid "Index was not unstashed."
9499 msgstr "索引的进度没有被恢复。"
9503 msgid "Dropped ${REV} ($s)"
9504 msgstr "丢弃了 ${REV} ($s)"
9508 msgid "${REV}: Could not drop stash entry"
9509 msgstr "${REV}:不能丢弃进度条目"
9512 msgid "No branch name specified"
9516 msgid "(To restore them type \"git stash apply\")"
9517 msgstr "(为恢复数据输入 \"git stash apply\")"
9519 #: git-submodule.sh:91
9521 msgid "cannot strip one component off url '$remoteurl'"
9522 msgstr "无法从 url '$remoteurl' 剥离一个组件"
9524 #: git-submodule.sh:196
9526 msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
9527 msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
9529 #: git-submodule.sh:239
9531 msgid "Clone of '$url' into submodule path '$sm_path' failed"
9532 msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
9534 #: git-submodule.sh:251
9536 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
9537 msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反"
9539 #: git-submodule.sh:349
9541 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
9542 msgstr "版本库URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
9544 #: git-submodule.sh:366
9546 msgid "'$sm_path' already exists in the index"
9547 msgstr "'$sm_path' 已经存在于索引中"
9549 #: git-submodule.sh:370
9552 "The following path is ignored by one of your .gitignore files:\n"
9554 "Use -f if you really want to add it."
9556 "以下路径被您的一个 .gitignore 文件所忽略:\n"
9558 "如果您确实想添加它,使用 -f 参数。"
9560 #: git-submodule.sh:388
9562 msgid "Adding existing repo at '$sm_path' to the index"
9563 msgstr "添加位于 '$sm_path' 的现存版本库到索引"
9565 #: git-submodule.sh:390
9567 msgid "'$sm_path' already exists and is not a valid git repo"
9568 msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"
9570 #: git-submodule.sh:398
9572 msgid "A git directory for '$sm_name' is found locally with remote(s):"
9573 msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程版本库:"
9575 #: git-submodule.sh:400
9578 "If you want to reuse this local git directory instead of cloning again from"
9579 msgstr "如果您想重用此本地 git 目录而不是重新克隆自"
9581 #: git-submodule.sh:402
9584 "use the '--force' option. If the local git directory is not the correct repo"
9585 msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的版本库"
9587 #: git-submodule.sh:403
9590 "or you are unsure what this means choose another name with the '--name' "
9592 msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。"
9594 #: git-submodule.sh:405
9596 msgid "Reactivating local git directory for submodule '$sm_name'."
9597 msgstr "激活本地 git 目录到子模组 '$sm_name'。"
9599 #: git-submodule.sh:417
9601 msgid "Unable to checkout submodule '$sm_path'"
9602 msgstr "不能检出子模组 '$sm_path'"
9604 #: git-submodule.sh:422
9606 msgid "Failed to add submodule '$sm_path'"
9607 msgstr "无法添加子模组 '$sm_path'"
9609 #: git-submodule.sh:431
9611 msgid "Failed to register submodule '$sm_path'"
9612 msgstr "无法注册子模组 '$sm_path'"
9614 #: git-submodule.sh:474
9616 msgid "Entering '$prefix$sm_path'"
9617 msgstr "正在进入 '$prefix$sm_path'"
9619 #: git-submodule.sh:488
9621 msgid "Stopping at '$sm_path'; script returned non-zero status."
9622 msgstr "停止于 '$sm_path',脚本返回非零值。"
9624 #: git-submodule.sh:532
9626 msgid "No url found for submodule path '$sm_path' in .gitmodules"
9627 msgstr "在 .gitmodules 中未找到子模组路径 '$sm_path' 的 url"
9629 #: git-submodule.sh:541
9631 msgid "Failed to register url for submodule path '$sm_path'"
9632 msgstr "无法为子模组路径 '$sm_path' 注册 url"
9634 #: git-submodule.sh:543
9636 msgid "Submodule '$name' ($url) registered for path '$sm_path'"
9637 msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册"
9639 #: git-submodule.sh:551
9641 msgid "Failed to register update mode for submodule path '$sm_path'"
9642 msgstr "无法为子模组路径 '$sm_path' 注册更新模式"
9644 #: git-submodule.sh:588
9646 msgid "Use '.' if you really want to deinitialize all submodules"
9647 msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化"
9649 #: git-submodule.sh:603
9651 msgid "Submodule work tree '$sm_path' contains a .git directory"
9652 msgstr "子模组工作区 '$sm_path' 包含一个 .git 目录"
9654 #: git-submodule.sh:604
9657 "(use 'rm -rf' if you really want to remove it including all of its history)"
9658 msgstr "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
9660 #: git-submodule.sh:610
9663 "Submodule work tree '$sm_path' contains local modifications; use '-f' to "
9665 msgstr "子模组工作区 '$sm_path' 包含本地修改;使用 '-f' 丢弃它们"
9667 #: git-submodule.sh:613
9669 msgid "Cleared directory '$sm_path'"
9670 msgstr "已清除目录 '$sm_path'"
9672 #: git-submodule.sh:614
9674 msgid "Could not remove submodule work tree '$sm_path'"
9675 msgstr "无法移除子模组工作区 '$sm_path'"
9677 #: git-submodule.sh:617
9679 msgid "Could not create empty submodule directory '$sm_path'"
9680 msgstr "不能创建空的子模组目录 '$sm_path'"
9682 #: git-submodule.sh:626
9684 msgid "Submodule '$name' ($url) unregistered for path '$sm_path'"
9685 msgstr "子模组 '$name' ($url) 未对路径 '$sm_path' 注册"
9687 #: git-submodule.sh:731
9690 "Submodule path '$prefix$sm_path' not initialized\n"
9691 "Maybe you want to use 'update --init'?"
9693 "子模组路径 '$prefix$sm_path' 没有初始化\n"
9694 "也许您想用 'update --init'?"
9696 #: git-submodule.sh:744
9698 msgid "Unable to find current revision in submodule path '$prefix$sm_path'"
9699 msgstr "无法在子模组路径 '$prefix$sm_path' 中找到当前版本"
9701 #: git-submodule.sh:753
9703 msgid "Unable to fetch in submodule path '$sm_path'"
9704 msgstr "无法在子模组路径 '$sm_path' 中获取"
9706 #: git-submodule.sh:777
9708 msgid "Unable to fetch in submodule path '$prefix$sm_path'"
9709 msgstr "无法在子模组路径 '$prefix$sm_path' 中获取"
9711 #: git-submodule.sh:791
9713 msgid "Unable to rebase '$sha1' in submodule path '$prefix$sm_path'"
9714 msgstr "无法在子模组路径 '$prefix$sm_path' 中变基 '$sha1'"
9716 #: git-submodule.sh:792
9718 msgid "Submodule path '$prefix$sm_path': rebased into '$sha1'"
9719 msgstr "子模组路径 '$prefix$sm_path':变基至 '$sha1'"
9721 #: git-submodule.sh:797
9723 msgid "Unable to merge '$sha1' in submodule path '$prefix$sm_path'"
9724 msgstr "无法合并 '$sha1' 到子模组路径 '$prefix$sm_path' 中"
9726 #: git-submodule.sh:798
9728 msgid "Submodule path '$prefix$sm_path': merged in '$sha1'"
9729 msgstr "子模组路径 '$prefix$sm_path':已合并入 '$sha1'"
9731 #: git-submodule.sh:803
9733 msgid "Unable to checkout '$sha1' in submodule path '$prefix$sm_path'"
9734 msgstr "无法在子模组路径 '$prefix$sm_path' 中检出 '$sha1'"
9736 #: git-submodule.sh:804
9738 msgid "Submodule path '$prefix$sm_path': checked out '$sha1'"
9739 msgstr "子模组路径 '$prefix$sm_path':检出 '$sha1'"
9741 #: git-submodule.sh:831
9743 msgid "Failed to recurse into submodule path '$prefix$sm_path'"
9744 msgstr "无法递归进子模组路径 '$prefix$sm_path'"
9746 #: git-submodule.sh:939
9747 msgid "The --cached option cannot be used with the --files option"
9748 msgstr "选项 --cached 不能和选项 --files 同时使用"
9751 #: git-submodule.sh:979
9753 msgid "unexpected mode $mod_dst"
9754 msgstr "意外的模式 $mod_dst"
9757 #: git-submodule.sh:997
9759 msgid " Warn: $name doesn't contain commit $sha1_src"
9760 msgstr " 警告:$name 未包含提交 $sha1_src"
9763 #: git-submodule.sh:1000
9765 msgid " Warn: $name doesn't contain commit $sha1_dst"
9766 msgstr " 警告:$name 未包含提交 $sha1_dst"
9769 #: git-submodule.sh:1003
9771 msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
9772 msgstr " 警告:$name 未包含提交 $sha1_src 和 $sha1_dst"
9774 #: git-submodule.sh:1028
9778 #: git-submodule.sh:1066
9779 msgid "Submodules changed but not updated:"
9780 msgstr "子模组已修改但尚未更新:"
9782 #: git-submodule.sh:1068
9783 msgid "Submodule changes to be committed:"
9786 #: git-submodule.sh:1153
9788 msgid "Failed to recurse into submodule path '$sm_path'"
9789 msgstr "无法递归进子模组路径 '$sm_path'"
9791 #: git-submodule.sh:1216
9793 msgid "Synchronizing submodule url for '$prefix$sm_path'"
9794 msgstr "为 '$prefix$sm_path' 同步子模组 url"
9797 #~ msgid "aaaSynchronizing submodule url for '$prefix$sm_path'"
9798 #~ msgstr "为 '$prefix$sm_path' 同步子模组 url"
9800 #~ msgid "use any ref in .git/refs"
9801 #~ msgstr "使用 .git/refs 里的任意引用"
9803 #~ msgid "use any tag in .git/refs/tags"
9804 #~ msgstr "使用 .git/refs/tags 里的任意 tag"
9806 #~ msgid "bad object %s"
9809 #~ msgid "bogus committer info %s"
9810 #~ msgstr "虚假的提交者信息 %s"
9812 #~ msgid "can't fdopen 'show' output fd"
9813 #~ msgstr "不能打开 'show' 输出文件句柄"
9815 #~ msgid "failed to close pipe to 'show' for object '%s'"
9816 #~ msgstr "无法为对象 '%s' 的 'show' 关闭管道"
9818 #~ msgid " 0 files changed"
9819 #~ msgstr " 0 个文件被修改"
9821 #~ msgid " %d file changed"
9822 #~ msgid_plural " %d files changed"
9823 #~ msgstr[0] " %d 个文件被修改"
9824 #~ msgstr[1] " %d 个文件被修改"
9826 #~ msgid ", %d insertion(+)"
9827 #~ msgid_plural ", %d insertions(+)"
9828 #~ msgstr[0] ",插入 %d 行(+)"
9829 #~ msgstr[1] ",插入 %d 行(+)"
9831 #~ msgid ", %d deletion(-)"
9832 #~ msgid_plural ", %d deletions(-)"
9833 #~ msgstr[0] ",删除 %d 行(-)"
9834 #~ msgstr[1] ",删除 %d 行(-)"
9836 #~ msgid "You do not have a valid HEAD"
9837 #~ msgstr "您没有一个有效的 HEAD"
9842 #~ msgid "Would not remove %s\n"
9843 #~ msgstr "不会删除 %s\n"
9845 #~ msgid "Not removing %s\n"
9846 #~ msgstr "未删除 %s\n"
9848 #~ msgid "Auto packing the repository for optimum performance.\n"
9849 #~ msgstr "自动打包版本库以求最佳性能。\n"
9851 #~ msgid "git remote set-head <name> (-a | -d | <branch>])"
9852 #~ msgstr "git remote set-head <名称> (-a | -d | <分支>])"
9854 #~ msgid "Could not read index"
9857 # 译者:中文字符串拼接,可删除前导空格
9858 #~ msgid " (use \"git add\" to track)"
9859 #~ msgstr "(使用 \"git add\" 建立跟踪)"
9861 #~ msgid "-B cannot be used with -b"
9862 #~ msgstr "-B 不能和 -b 同时使用"
9864 #~ msgid "--patch is incompatible with all other options"
9865 #~ msgstr "--patch 选项和其他选项不兼容"
9867 #~ msgid "--detach cannot be used with -b/-B/--orphan"
9868 #~ msgstr "--detach 不能和 -b/-B/--orphan 同时使用"
9870 #~ msgid "--detach cannot be used with -t"
9871 #~ msgstr "--detach 不能和 -t 同时使用"
9873 #~ msgid "--orphan and -b|-B are mutually exclusive"
9874 #~ msgstr "--orphan 和 -b|-B 互斥"
9876 #~ msgid "--orphan cannot be used with -t"
9877 #~ msgstr "--orphan 不能和 -t 同时使用"
9879 #~ msgid "git checkout: -f and -m are incompatible"
9880 #~ msgstr "git checkout:-f 和 -m 不兼容"
9883 #~ "git checkout: updating paths is incompatible with switching branches."
9884 #~ msgstr "git checkout:更新路径和切换分支不兼容。"
9886 #~ msgid "diff setup failed"
9887 #~ msgstr "diff 设置失败"
9889 #~ msgid "merge-recursive: disk full?"
9890 #~ msgstr "merge-recursive:磁盘已满?"
9892 #~ msgid "diff_setup_done failed"
9893 #~ msgstr "diff_setup_done 失败"