1 # Chinese translations for Git package
3 # Copyright (C) 2012 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: 2012-06-02 07:03+0800\n"
16 "PO-Revision-Date: 2012-06-02 17:05+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'。"
47 msgid "'%s' does not look like a v2 bundle file"
48 msgstr "'%s' 不像是一个 v2 版本的包文件"
52 msgid "unrecognized header: %s%s (%d)"
53 msgstr "未能识别的包头:%s%s (%d)"
55 #: bundle.c:89 builtin/commit.c:696
57 msgid "could not open '%s'"
61 msgid "Repository lacks these prerequisite commits:"
62 msgstr "版本库缺少这些必备的提交:"
64 #: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:289
65 #: builtin/log.c:720 builtin/log.c:1309 builtin/log.c:1528 builtin/merge.c:347
66 #: builtin/shortlog.c:181
67 msgid "revision walk setup failed"
72 msgid "The bundle contains %d ref"
73 msgid_plural "The bundle contains %d refs"
74 msgstr[0] "这个包中含有 %d 个引用"
75 msgstr[1] "这个包中含有 %d 个引用"
79 msgid "The bundle requires this ref"
80 msgid_plural "The bundle requires these %d refs"
82 msgstr[1] "这个包需要 %d 个这些引用"
88 #: bundle.c:296 builtin/log.c:1205 builtin/shortlog.c:284
90 msgid "unrecognized argument: %s"
95 msgid "ref '%s' is excluded by the rev-list options"
96 msgstr "引用 '%s' 被 rev-list 选项排除"
99 msgid "Refusing to create empty bundle."
103 msgid "Could not spawn pack-objects"
104 msgstr "不能生成 pack-objects 进程"
107 msgid "pack-objects died"
108 msgstr "pack-objects 终止"
112 msgid "cannot create '%s'"
116 msgid "index-pack died"
117 msgstr "index-pack 终止"
121 msgid "could not parse %s"
126 msgid "%s %s is not a commit!"
127 msgstr "%s %s 不是一个提交!"
129 #: compat/obstack.c:406 compat/obstack.c:408
130 msgid "memory exhausted"
134 msgid "Could not run 'git rev-list'"
135 msgstr "不能执行 'git rev-list'"
139 msgid "failed write to rev-list: %s"
140 msgstr "无法写入 rev-list:%s"
144 msgid "failed to close rev-list's stdin: %s"
145 msgstr "无法关闭 rev-list 的标准输入:%s"
148 msgid "in the future"
153 msgid "%lu second ago"
154 msgid_plural "%lu seconds ago"
160 msgid "%lu minute ago"
161 msgid_plural "%lu minutes ago"
168 msgid_plural "%lu hours ago"
175 msgid_plural "%lu days ago"
182 msgid_plural "%lu weeks ago"
188 msgid "%lu month ago"
189 msgid_plural "%lu months ago"
196 msgid_plural "%lu years"
202 msgid "%s, %lu month ago"
203 msgid_plural "%s, %lu months ago"
204 msgstr[0] "%s,%lu 个月之前"
205 msgstr[1] "%s,%lu 个月之前"
207 #: date.c:154 date.c:159
210 msgid_plural "%lu years ago"
217 msgid " Failed to parse dirstat cut-off percentage '%.*s'\n"
218 msgstr " 无法解析 dirstat 阈值 '%.*s'\n"
223 msgid " Unknown dirstat parameter '%.*s'\n"
224 msgstr " 未知 dirstat 参数 '%.*s'\n"
229 "Found errors in 'diff.dirstat' config variable:\n"
232 "发现配置变量 'diff.dirstat' 中的错误:\n"
236 msgid " 0 files changed\n"
241 msgid " %d file changed"
242 msgid_plural " %d files changed"
243 msgstr[0] " %d 个文件被修改"
244 msgstr[1] " %d 个文件被修改"
248 msgid ", %d insertion(+)"
249 msgid_plural ", %d insertions(+)"
250 msgstr[0] ",插入 %d 行(+)"
251 msgstr[1] ",插入 %d 行(+)"
255 msgid ", %d deletion(-)"
256 msgid_plural ", %d deletions(-)"
257 msgstr[0] ",删除 %d 行(-)"
258 msgstr[1] ",删除 %d 行(-)"
263 "Failed to parse --dirstat/-X option parameter:\n"
266 "无法解析 --dirstat/-X 选项的参数:\n"
269 #: gpg-interface.c:59
270 msgid "could not run gpg."
273 #: gpg-interface.c:71
274 msgid "gpg did not accept the data"
277 #: gpg-interface.c:82
278 msgid "gpg failed to sign the data"
283 msgid "'%s': unable to read %s"
284 msgstr "'%s':无法读取 %s"
293 msgid "'%s': short read %s"
294 msgstr "'%s':读取不完整 %s"
298 msgid "available git commands in '%s'"
299 msgstr "在 '%s' 下可用的 git 命令"
302 msgid "git commands available from elsewhere on your $PATH"
303 msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
308 "'%s' appears to be a git command, but we were not\n"
309 "able to execute it. Maybe git-%s is broken?"
311 "'%s' 像是一个 git 命令,但却无法运行。\n"
315 msgid "Uh oh. Your system reports no Git commands at all."
316 msgstr "唉呀,您的系统中未发现 Git 命令。"
321 "WARNING: You called a Git command named '%s', which does not exist.\n"
322 "Continuing under the assumption that you meant '%s'"
324 "警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
329 msgid "in %0.1f seconds automatically..."
330 msgstr "在 %0.1f 秒钟后自动运行..."
334 msgid "git: '%s' is not a git command. See 'git --help'."
335 msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
343 "Did you mean one of these?"
351 #: parse-options.c:493
355 #: parse-options.c:511
360 #. TRANSLATORS: the colon here should align with the
361 #. one in "usage: %s" translation
362 #: parse-options.c:515
367 # 译者:为保证在输出中对齐,注意调整句中空格!
368 #: parse-options.c:518
375 msgid "Your branch is ahead of '%s' by %d commit.\n"
376 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
377 msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
378 msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
382 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
384 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
385 msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
386 msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
391 "Your branch and '%s' have diverged,\n"
392 "and have %d and %d different commit each, respectively.\n"
394 "Your branch and '%s' have diverged,\n"
395 "and have %d and %d different commits each, respectively.\n"
397 "您的分支和 '%s' 出现了偏离,\n"
398 "并且各自分别有 %d 和 %d 处不同的提交。\n"
400 "您的分支和 '%s' 出现了偏离,\n"
401 "并且各自分别有 %d 和 %d 处不同的提交。\n"
403 #: sequencer.c:121 builtin/merge.c:865 builtin/merge.c:978
404 #: builtin/merge.c:1088 builtin/merge.c:1098
406 msgid "Could not open '%s' for writing"
407 msgstr "不能为写入打开 '%s'"
409 #: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:868
410 #: builtin/merge.c:1090 builtin/merge.c:1103
412 msgid "Could not write to '%s'"
417 "after resolving the conflicts, mark the corrected paths\n"
418 "with 'git add <paths>' or 'git rm <paths>'"
420 "冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
425 "after resolving the conflicts, mark the corrected paths\n"
426 "with 'git add <paths>' or 'git rm <paths>'\n"
427 "and commit the result with 'git commit'"
429 "冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
430 "对修正后的文件做标记,然后用 'git commit' 提交"
432 #: sequencer.c:160 sequencer.c:758 sequencer.c:841
434 msgid "Could not write to %s"
439 msgid "Error wrapping up %s"
443 msgid "Your local changes would be overwritten by cherry-pick."
444 msgstr "您的本地修改将被拣选操作覆盖。"
447 msgid "Your local changes would be overwritten by revert."
448 msgstr "您的本地修改将被还原操作覆盖。"
451 msgid "Commit your changes or stash them to proceed."
452 msgstr "提交您的修改或保存进度后再继续。"
454 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
457 msgid "%s: Unable to write new index file"
458 msgstr "%s:无法写入新索引文件"
461 msgid "Could not resolve HEAD commit\n"
462 msgstr "不能解析 HEAD 提交\n"
465 msgid "Unable to update cache tree\n"
470 msgid "Could not parse commit %s\n"
475 msgid "Could not parse parent commit %s\n"
476 msgstr "不能解析父提交 %s\n"
479 msgid "Your index file is unmerged."
480 msgstr "您的索引文件未完成合并。"
483 msgid "You do not have a valid HEAD"
484 msgstr "您没有一个有效的 HEAD"
488 msgid "Commit %s is a merge but no -m option was given."
489 msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
493 msgid "Commit %s does not have parent %d"
494 msgstr "提交 %s 没有父提交 %d"
498 msgid "Mainline was specified but commit %s is not a merge."
499 msgstr "指定了主线但提交 %s 不是一个合并。"
501 #. TRANSLATORS: The first %s will be "revert" or
502 #. "cherry-pick", the second %s a SHA1
505 msgid "%s: cannot parse parent commit %s"
506 msgstr "%s:不能解析父提交 %s"
510 msgid "Cannot get commit message for %s"
511 msgstr "不能得到 %s 的提交说明"
515 msgid "could not revert %s... %s"
516 msgstr "不能还原 %s... %s"
520 msgid "could not apply %s... %s"
521 msgstr "不能应用 %s... %s"
524 msgid "empty commit set passed"
529 msgid "git %s: failed to read the index"
530 msgstr "git %s:无法读取索引"
534 msgid "git %s: failed to refresh the index"
535 msgstr "git %s:无法刷新索引"
539 msgid "Cannot %s during a %s"
540 msgstr "无法 %s 在一个 %s 过程中"
544 msgid "Could not parse line %d."
548 msgid "No commits parsed."
553 msgid "Could not open %s"
558 msgid "Could not read %s."
563 msgid "Unusable instruction sheet: %s"
568 msgid "Invalid key: %s"
573 msgid "Invalid value for %s: %s"
578 msgid "Malformed options sheet: %s"
582 msgid "a cherry-pick or revert is already in progress"
583 msgstr "一个拣选或还原操作已在进行"
586 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
587 msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
591 msgid "Could not create sequencer directory %s"
594 #: sequencer.c:760 sequencer.c:845
596 msgid "Error wrapping up %s."
599 #: sequencer.c:779 sequencer.c:913
600 msgid "no cherry-pick or revert in progress"
601 msgstr "没有拣选或还原操作在进行"
604 msgid "cannot resolve HEAD"
608 msgid "cannot abort from a branch yet to be born"
609 msgstr "不能从尚未建立的分支终止"
611 #: sequencer.c:805 builtin/apply.c:3697
613 msgid "cannot open %s: %s"
618 msgid "cannot read %s: %s"
622 msgid "unexpected end of file"
627 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
628 msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
632 msgid "Could not format %s."
636 msgid "Can't revert as initial commit"
640 msgid "Can't cherry-pick into empty head"
644 msgid "HEAD does not point to a branch"
645 msgstr "HEAD 没有指向一个分支"
649 msgid "No such branch: '%s'"
654 msgid "No upstream configured for branch '%s'"
655 msgstr "尚未给分支 '%s' 设置上游"
659 msgid "Upstream branch '%s' not stored as a remote-tracking branch"
660 msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
664 msgid "unable to look up current user in the passwd file: %s"
665 msgstr "无法在 passwd 文件中查询到当前用户:%s"
672 msgid "Unmerged paths:"
676 #: wt-status.c:141 wt-status.c:158
678 msgid " (use \"git reset %s <file>...\" to unstage)"
679 msgstr " (使用 \"git reset %s <file>...\" 撤出暂存区)"
682 #: wt-status.c:143 wt-status.c:160
683 msgid " (use \"git rm --cached <file>...\" to unstage)"
684 msgstr " (使用 \"git rm --cached <file>...\" 撤出暂存区)"
688 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
689 msgstr " (酌情使用 \"git add/rm <file>...\" 标记解决方案)"
692 msgid "Changes to be committed:"
696 msgid "Changes not staged for commit:"
697 msgstr "尚未暂存以备提交的变更:"
701 msgid " (use \"git add <file>...\" to update what will be committed)"
702 msgstr " (使用 \"git add <file>...\" 更新要提交的内容)"
706 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
707 msgstr " (使用 \"git add/rm <file>...\" 更新要提交的内容)"
712 " (use \"git checkout -- <file>...\" to discard changes in working directory)"
713 msgstr " (使用 \"git checkout -- <file>...\" 丢弃工作区的改动)"
717 msgid " (commit or discard the untracked or modified content in submodules)"
718 msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
728 msgid " (use \"git %s <file>...\" to include in what will be committed)"
729 msgstr " (使用 \"git %s <file>...\" 以包含要提交的内容)"
736 msgid "both deleted:"
744 msgid "deleted by them:"
748 msgid "added by them:"
752 msgid "deleted by us:"
760 msgid "both modified:"
763 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
765 msgid "new commits, "
768 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
770 msgid "modified content, "
773 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
775 msgid "untracked content, "
778 # 译者:为保证在输出中对齐,注意调整句中空格!
784 # 译者:为保证在输出中对齐,注意调整句中空格!
787 msgid "copied: %s -> %s"
788 msgstr "拷贝: %s -> %s"
790 # 译者:为保证在输出中对齐,注意调整句中空格!
796 # 译者:为保证在输出中对齐,注意调整句中空格!
802 # 译者:为保证在输出中对齐,注意调整句中空格!
805 msgid "renamed: %s -> %s"
806 msgstr "重命名: %s -> %s"
808 # 译者:为保证在输出中对齐,注意调整句中空格!
811 msgid "typechange: %s"
814 # 译者:为保证在输出中对齐,注意调整句中空格!
820 # 译者:为保证在输出中对齐,注意调整句中空格!
828 msgid "bug: unhandled diff status %c"
829 msgstr "bug:未处理的差异状态 %c"
836 msgid "Not currently on any branch."
840 msgid "Initial commit"
853 msgid "Untracked files not listed%s"
854 msgstr "未跟踪的文件没有列出%s"
858 msgid " (use -u option to show untracked files)"
859 msgstr "(使用 -u 参数显示未跟踪的文件)"
867 msgid "no changes added to commit%s\n"
868 msgstr "修改尚未加入提交%s\n"
872 msgid " (use \"git add\" and/or \"git commit -a\")"
873 msgstr "(使用 \"git add\" 和/或 \"git commit -a\")"
877 msgid "nothing added to commit but untracked files present%s\n"
878 msgstr "空提交但存在未跟踪文件%s\n"
882 msgid " (use \"git add\" to track)"
883 msgstr "(使用 \"git add\" 建立跟踪)"
885 #: wt-status.c:793 wt-status.c:796 wt-status.c:799
887 msgid "nothing to commit%s\n"
892 msgid " (create/copy files and use \"git add\" to track)"
893 msgstr "(新建/拷贝的文件使用 \"git add\" 建立跟踪)"
897 msgid " (use -u to show untracked files)"
898 msgstr "(使用 -u 显示未跟踪文件)"
902 msgid " (working directory clean)"
906 msgid "HEAD (no branch)"
911 msgid "Initial commit on "
920 #: wt-status.c:932 wt-status.c:935
931 msgid "unexpected diff status %c"
934 #: builtin/add.c:67 builtin/commit.c:226
935 msgid "updating files failed"
940 msgid "remove '%s'\n"
945 msgid "Path '%s' is in submodule '%.*s'"
946 msgstr "路径 '%s' 属于模组 '%.*s'"
949 msgid "Unstaged changes after refreshing the index:"
950 msgstr "刷新索引之后尚未被暂存的变更:"
952 #: builtin/add.c:195 builtin/add.c:456 builtin/rm.c:186
954 msgid "pathspec '%s' did not match any files"
955 msgstr "路径 '%s' 未匹配任何文件"
959 msgid "'%s' is beyond a symbolic link"
960 msgstr "'%s' 位于符号链接中"
963 msgid "Could not read the index"
968 msgid "Could not open '%s' for writing."
969 msgstr "不能为写入打开 '%s'。"
972 msgid "Could not write patch"
977 msgid "Could not stat '%s'"
978 msgstr "不能查看文件状态 '%s'"
981 msgid "Empty patch. Aborted."
986 msgid "Could not apply '%s'"
990 msgid "The following paths are ignored by one of your .gitignore files:\n"
991 msgstr "下列路径被您的一个 .gitignore 文件所忽略:\n"
995 msgid "Use -f if you really want to add them.\n"
996 msgstr "使用 -f 参数如果您确实要添加它们。\n"
999 msgid "no files added"
1002 #: builtin/add.c:359
1003 msgid "adding files failed"
1006 #: builtin/add.c:391
1007 msgid "-A and -u are mutually incompatible"
1008 msgstr "-A 和 -u 选项互斥"
1010 #: builtin/add.c:393
1011 msgid "Option --ignore-missing can only be used together with --dry-run"
1012 msgstr "选项 --ignore-missing 只能和 --dry-run 共用"
1014 #: builtin/add.c:413
1016 msgid "Nothing specified, nothing added.\n"
1017 msgstr "没有指定文件,也没有文件被添加。\n"
1019 #: builtin/add.c:414
1021 msgid "Maybe you wanted to say 'git add .'?\n"
1022 msgstr "也许您想要执行 'git add .'?\n"
1024 #: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:286 builtin/mv.c:82
1026 msgid "index file corrupt"
1029 #: builtin/add.c:476 builtin/apply.c:4108 builtin/mv.c:229 builtin/rm.c:260
1030 msgid "Unable to write new index file"
1033 #: builtin/apply.c:53
1034 msgid "git apply [options] [<patch>...]"
1035 msgstr "git apply [选项] [<补丁>...]"
1037 #: builtin/apply.c:106
1039 msgid "unrecognized whitespace option '%s'"
1040 msgstr "未能识别的空白字符选项 '%s'"
1042 #: builtin/apply.c:121
1044 msgid "unrecognized whitespace ignore option '%s'"
1045 msgstr "未能识别的空白字符忽略选项 '%s'"
1047 #: builtin/apply.c:815
1049 msgid "Cannot prepare timestamp regexp %s"
1050 msgstr "无法准备时间戳正则表达式 %s"
1052 #: builtin/apply.c:824
1054 msgid "regexec returned %d for input: %s"
1055 msgstr "regexec 返回 %d,输入为:%s"
1057 #: builtin/apply.c:905
1059 msgid "unable to find filename in patch at line %d"
1060 msgstr "不能在补丁的第 %d 行找到文件名"
1062 #: builtin/apply.c:937
1064 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
1065 msgstr "git apply:错误的 git-diff - 期望 /dev/null,但在第 %2$d 行得到 %1$s"
1067 #: builtin/apply.c:941
1069 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
1070 msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
1072 #: builtin/apply.c:942
1074 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
1075 msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
1077 #: builtin/apply.c:949
1079 msgid "git apply: bad git-diff - expected /dev/null on line %d"
1080 msgstr "git apply:错误的 git-diff - 期望 /dev/null 于第 %d 行"
1082 #: builtin/apply.c:1394
1084 msgid "recount: unexpected line: %.*s"
1085 msgstr "recount:意外的行:%.*s"
1087 #: builtin/apply.c:1451
1089 msgid "patch fragment without header at line %d: %.*s"
1090 msgstr "第 %d 行的补丁片段没有头信息:%.*s"
1092 #: builtin/apply.c:1468
1095 "git diff header lacks filename information when removing %d leading pathname "
1096 "component (line %d)"
1098 "git diff header lacks filename information when removing %d leading pathname "
1099 "components (line %d)"
1100 msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
1101 msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
1103 #: builtin/apply.c:1628
1104 msgid "new file depends on old contents"
1107 #: builtin/apply.c:1630
1108 msgid "deleted file still has contents"
1111 #: builtin/apply.c:1656
1113 msgid "corrupt patch at line %d"
1114 msgstr "补丁损坏位于第 %d 行"
1116 #: builtin/apply.c:1692
1118 msgid "new file %s depends on old contents"
1119 msgstr "新文件 %s 依赖旧内容"
1121 #: builtin/apply.c:1694
1123 msgid "deleted file %s still has contents"
1124 msgstr "删除的文件 %s 仍有内容"
1126 #: builtin/apply.c:1697
1128 msgid "** warning: file %s becomes empty but is not deleted"
1129 msgstr "** 警告:文件 %s 成为空文件但并未删除"
1131 #: builtin/apply.c:1843
1133 msgid "corrupt binary patch at line %d: %.*s"
1134 msgstr "二进制补丁在第 %d 行损坏:%.*s"
1136 #. there has to be one hunk (forward hunk)
1137 #: builtin/apply.c:1872
1139 msgid "unrecognized binary patch at line %d"
1140 msgstr "未能识别的二进制补丁位于第 %d 行"
1142 #: builtin/apply.c:1958
1144 msgid "patch with only garbage at line %d"
1145 msgstr "补丁文件的第 %d 行只有垃圾数据"
1147 #: builtin/apply.c:2048
1149 msgid "unable to read symlink %s"
1150 msgstr "无法读取符号链接 %s"
1152 #: builtin/apply.c:2052
1154 msgid "unable to open or read %s"
1157 #: builtin/apply.c:2123
1161 #: builtin/apply.c:2645
1163 msgid "invalid start of line: '%c'"
1164 msgstr "无效的行首字符:'%c'"
1166 #: builtin/apply.c:2763
1168 msgid "Hunk #%d succeeded at %d (offset %d line)."
1169 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1170 msgstr[0] "块 #%d 成功应用于 %d (偏移 %d 行)"
1171 msgstr[1] "块 #%d 成功应用于 %d (偏移 %d 行)"
1173 #: builtin/apply.c:2775
1175 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
1176 msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
1178 #: builtin/apply.c:2781
1181 "while searching for:\n"
1187 #: builtin/apply.c:2800
1189 msgid "missing binary patch data for '%s'"
1190 msgstr "缺失 '%s' 的二进制补丁数据"
1192 #: builtin/apply.c:2903
1194 msgid "binary patch does not apply to '%s'"
1195 msgstr "二进制补丁未应用到 '%s'"
1197 #: builtin/apply.c:2909
1199 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1200 msgstr "到 '%s' 的二进制补丁产生了不正确的结果(预期 %s,得到 %s)"
1202 #: builtin/apply.c:2930
1204 msgid "patch failed: %s:%ld"
1205 msgstr "打补丁失败:%s:%ld"
1207 #: builtin/apply.c:3045
1209 msgid "patch %s has been renamed/deleted"
1210 msgstr "补丁 %s 已经被重命名/删除"
1212 #: builtin/apply.c:3052 builtin/apply.c:3069
1214 msgid "read of %s failed"
1217 #: builtin/apply.c:3084
1218 msgid "removal patch leaves file contents"
1219 msgstr "移除补丁仍留下了文件内容"
1221 #: builtin/apply.c:3105
1223 msgid "%s: already exists in working directory"
1224 msgstr "%s:已经存在于工作区中"
1226 #: builtin/apply.c:3143
1228 msgid "%s: has been deleted/renamed"
1229 msgstr "%s:已经被删除/重命名"
1231 #: builtin/apply.c:3148 builtin/apply.c:3179
1236 #: builtin/apply.c:3159
1238 msgid "%s: does not exist in index"
1241 #: builtin/apply.c:3173
1243 msgid "%s: does not match index"
1246 #: builtin/apply.c:3190
1248 msgid "%s: wrong type"
1251 #: builtin/apply.c:3192
1253 msgid "%s has type %o, expected %o"
1254 msgstr "%s 的类型是 %o,预期是 %o"
1256 #: builtin/apply.c:3247
1258 msgid "%s: already exists in index"
1259 msgstr "%s:已经存在于索引中"
1261 #: builtin/apply.c:3267
1263 msgid "new mode (%o) of %s does not match old mode (%o)"
1264 msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
1266 #: builtin/apply.c:3272
1268 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1269 msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
1271 #: builtin/apply.c:3280
1273 msgid "%s: patch does not apply"
1276 #: builtin/apply.c:3293
1278 msgid "Checking patch %s..."
1281 #: builtin/apply.c:3348 builtin/checkout.c:212 builtin/reset.c:158
1283 msgid "make_cache_entry failed for path '%s'"
1284 msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
1286 #: builtin/apply.c:3491
1288 msgid "unable to remove %s from index"
1289 msgstr "不能从索引中移除 %s"
1291 #: builtin/apply.c:3518
1293 msgid "corrupt patch for subproject %s"
1294 msgstr "子项目 %s 损坏的补丁"
1296 #: builtin/apply.c:3522
1298 msgid "unable to stat newly created file '%s'"
1299 msgstr "不能枚举新建文件 '%s' 的状态"
1301 #: builtin/apply.c:3527
1303 msgid "unable to create backing store for newly created file %s"
1304 msgstr "不能为新建文件 %s 创建后端存储"
1306 #: builtin/apply.c:3530
1308 msgid "unable to add cache entry for %s"
1309 msgstr "无法为 %s 添加缓存条目"
1311 #: builtin/apply.c:3563
1313 msgid "closing file '%s'"
1316 #: builtin/apply.c:3612
1318 msgid "unable to write file '%s' mode %o"
1319 msgstr "不能写文件 '%s' 权限 %o"
1321 #: builtin/apply.c:3668
1323 msgid "Applied patch %s cleanly."
1326 #: builtin/apply.c:3676
1327 msgid "internal error"
1330 #. Say this even without --verbose
1331 #: builtin/apply.c:3679
1333 msgid "Applying patch %%s with %d reject..."
1334 msgid_plural "Applying patch %%s with %d rejects..."
1335 msgstr[0] "应用补丁 %%s 时 %d 个被拒绝..."
1336 msgstr[1] "应用补丁 %%s 时 %d 个被拒绝..."
1338 #: builtin/apply.c:3689
1340 msgid "truncating .rej filename to %.*s.rej"
1341 msgstr "截短 .rej 文件名为 %.*s.rej"
1343 #: builtin/apply.c:3710
1345 msgid "Hunk #%d applied cleanly."
1346 msgstr "第 #%d 个片段成功应用。"
1348 #: builtin/apply.c:3713
1350 msgid "Rejected hunk #%d."
1351 msgstr "拒绝第 #%d 个片段。"
1353 #: builtin/apply.c:3844
1354 msgid "unrecognized input"
1357 #: builtin/apply.c:3855
1358 msgid "unable to read index file"
1361 #: builtin/apply.c:3970 builtin/apply.c:3973
1365 #: builtin/apply.c:3971
1366 msgid "don't apply changes matching the given path"
1367 msgstr "不要应用与给出路径向匹配的变更"
1369 #: builtin/apply.c:3974
1370 msgid "apply changes matching the given path"
1371 msgstr "应用与给出路径向匹配的变更"
1373 #: builtin/apply.c:3976
1377 #: builtin/apply.c:3977
1378 msgid "remove <num> leading slashes from traditional diff paths"
1379 msgstr "从传统的 diff 路径中移除 <数字> 个前导路径"
1381 #: builtin/apply.c:3980
1382 msgid "ignore additions made by the patch"
1383 msgstr "忽略补丁中的添加的文件"
1385 #: builtin/apply.c:3982
1386 msgid "instead of applying the patch, output diffstat for the input"
1387 msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
1389 #: builtin/apply.c:3986
1390 msgid "shows number of added and deleted lines in decimal notation"
1391 msgstr "以数字方式显示添加或删除行的数量"
1393 #: builtin/apply.c:3988
1394 msgid "instead of applying the patch, output a summary for the input"
1395 msgstr "不应用补丁,而是显示输入的概要"
1397 #: builtin/apply.c:3990
1398 msgid "instead of applying the patch, see if the patch is applicable"
1399 msgstr "不应用补丁,而是查看补丁是否可应用"
1401 #: builtin/apply.c:3992
1402 msgid "make sure the patch is applicable to the current index"
1403 msgstr "确认补丁可以应用到当前索引"
1405 #: builtin/apply.c:3994
1406 msgid "apply a patch without touching the working tree"
1407 msgstr "应用补丁而不修改工作区"
1409 #: builtin/apply.c:3996
1410 msgid "also apply the patch (use with --stat/--summary/--check)"
1411 msgstr "同时应用此补丁(和 --stat/--summary/--check 共用)"
1413 #: builtin/apply.c:3998
1414 msgid "build a temporary index based on embedded index information"
1415 msgstr "创建一个临时索引基于嵌入的索引信息"
1417 #: builtin/apply.c:4000
1418 msgid "paths are separated with NUL character"
1419 msgstr "路径以 NUL 字符分隔"
1421 #: builtin/apply.c:4003
1422 msgid "ensure at least <n> lines of context match"
1423 msgstr "确保至少匹配 <n> 行上下文"
1425 #: builtin/apply.c:4004
1429 #: builtin/apply.c:4005
1430 msgid "detect new or modified lines that have whitespace errors"
1431 msgstr "检查新增和修改的行中间的空白字符滥用"
1433 #: builtin/apply.c:4008 builtin/apply.c:4011
1434 msgid "ignore changes in whitespace when finding context"
1435 msgstr "查找上下文时忽略空白字符的变更"
1437 #: builtin/apply.c:4014
1438 msgid "apply the patch in reverse"
1441 #: builtin/apply.c:4016
1442 msgid "don't expect at least one line of context"
1445 #: builtin/apply.c:4018
1446 msgid "leave the rejected hunks in corresponding *.rej files"
1447 msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
1449 #: builtin/apply.c:4020
1450 msgid "allow overlapping hunks"
1453 #: builtin/apply.c:4021
1457 #: builtin/apply.c:4023
1458 msgid "tolerate incorrectly detected missing new-line at the end of file"
1459 msgstr "宽容不正确的文件末尾换行符"
1461 #: builtin/apply.c:4026
1462 msgid "do not trust the line counts in the hunk headers"
1463 msgstr "不信任补丁片段的头信息中的行号"
1465 #: builtin/apply.c:4028
1469 #: builtin/apply.c:4029
1470 msgid "prepend <root> to all filenames"
1471 msgstr "为所有文件名前添加 <根目录>"
1473 #: builtin/apply.c:4050
1474 msgid "--index outside a repository"
1475 msgstr "--index 在一个版本库之外"
1477 #: builtin/apply.c:4053
1478 msgid "--cached outside a repository"
1479 msgstr "--cached 在一个版本库之外"
1481 #: builtin/apply.c:4069
1483 msgid "can't open patch '%s'"
1484 msgstr "不能打开补丁 '%s'"
1486 #: builtin/apply.c:4083
1488 msgid "squelched %d whitespace error"
1489 msgid_plural "squelched %d whitespace errors"
1490 msgstr[0] "抑制下仍有 %d 个空白字符误用"
1491 msgstr[1] "抑制下仍有 %d 个空白字符误用"
1493 #: builtin/apply.c:4089 builtin/apply.c:4099
1495 msgid "%d line adds whitespace errors."
1496 msgid_plural "%d lines add whitespace errors."
1497 msgstr[0] "%d 行有空白字符误用。"
1498 msgstr[1] "%d 行有空白字符误用。"
1500 #: builtin/archive.c:17
1502 msgid "could not create archive file '%s'"
1503 msgstr "不能创建归档文件 '%s'"
1505 #: builtin/archive.c:20
1506 msgid "could not redirect output"
1509 #: builtin/archive.c:37
1510 msgid "git archive: Remote with no URL"
1511 msgstr "git archive:未提供远程URL"
1513 #: builtin/archive.c:58
1514 msgid "git archive: expected ACK/NAK, got EOF"
1515 msgstr "git archive:期待ACK/NACK,却得到EOF"
1517 #: builtin/archive.c:63
1519 msgid "git archive: NACK %s"
1520 msgstr "git archive:NACK %s"
1522 #: builtin/archive.c:65
1524 msgid "remote error: %s"
1527 #: builtin/archive.c:66
1528 msgid "git archive: protocol error"
1529 msgstr "git archive:协议错误"
1531 #: builtin/archive.c:71
1532 msgid "git archive: expected a flush"
1533 msgstr "git archive:预期一个刷新"
1535 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
1536 #: builtin/branch.c:144
1539 "deleting branch '%s' that has been merged to\n"
1540 " '%s', but not yet merged to HEAD."
1542 "将要删除的分支 '%s' 已经被合并到\n"
1545 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
1546 #: builtin/branch.c:148
1549 "not deleting branch '%s' that is not yet merged to\n"
1550 " '%s', even though it is merged to HEAD."
1552 "并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
1553 " 然而却尚未被合并到分支 '%s' 。"
1555 #: builtin/branch.c:180
1556 msgid "cannot use -a with -d"
1557 msgstr "不能将 -a 和 -d 共用"
1559 #: builtin/branch.c:186
1560 msgid "Couldn't look up commit object for HEAD"
1561 msgstr "无法查询 HEAD 指向的提交对象"
1563 #: builtin/branch.c:191
1565 msgid "Cannot delete the branch '%s' which you are currently on."
1566 msgstr "无法删除您当前所在的分支 '%s'。"
1568 #: builtin/branch.c:202
1570 msgid "remote branch '%s' not found."
1571 msgstr "远程分支 '%s' 未发现。"
1573 #: builtin/branch.c:203
1575 msgid "branch '%s' not found."
1576 msgstr "分支 '%s' 未发现。"
1578 #: builtin/branch.c:210
1580 msgid "Couldn't look up commit object for '%s'"
1581 msgstr "无法查询 '%s' 指向的提交对象"
1583 #: builtin/branch.c:216
1586 "The branch '%s' is not fully merged.\n"
1587 "If you are sure you want to delete it, run 'git branch -D %s'."
1590 "如果您确认要删除它,执行 'git branch -D %s'。"
1592 #: builtin/branch.c:225
1594 msgid "Error deleting remote branch '%s'"
1595 msgstr "删除远程分支 '%s' 时出错"
1597 #: builtin/branch.c:226
1599 msgid "Error deleting branch '%s'"
1600 msgstr "删除分支 '%s' 时出错"
1602 #: builtin/branch.c:233
1604 msgid "Deleted remote branch %s (was %s).\n"
1605 msgstr "已删除远程分支 %s(曾为 %s)。\n"
1607 #: builtin/branch.c:234
1609 msgid "Deleted branch %s (was %s).\n"
1610 msgstr "已删除分支 %s(曾为 %s)。\n"
1612 #: builtin/branch.c:239
1613 msgid "Update of config-file failed"
1614 msgstr "无法更新 config 文件"
1616 #: builtin/branch.c:337
1618 msgid "branch '%s' does not point at a commit"
1619 msgstr "分支 '%s' 未指向一个提交"
1621 #: builtin/branch.c:409
1623 msgid "[%s: behind %d]"
1626 #: builtin/branch.c:411
1631 #: builtin/branch.c:415
1633 msgid "[%s: ahead %d]"
1636 #: builtin/branch.c:417
1641 #: builtin/branch.c:420
1643 msgid "[%s: ahead %d, behind %d]"
1644 msgstr "[%s:领先 %d,落后 %d]"
1646 #: builtin/branch.c:423
1648 msgid "[ahead %d, behind %d]"
1649 msgstr "[领先 %d,落后 %d]"
1651 #: builtin/branch.c:535
1655 #: builtin/branch.c:600
1656 msgid "some refs could not be read"
1659 #: builtin/branch.c:613
1660 msgid "cannot rename the current branch while not on any."
1661 msgstr "无法重命名当前分支因为不处于任何分支上。"
1663 #: builtin/branch.c:623
1665 msgid "Invalid branch name: '%s'"
1666 msgstr "无效的分支名:'%s'"
1668 #: builtin/branch.c:638
1669 msgid "Branch rename failed"
1672 #: builtin/branch.c:642
1674 msgid "Renamed a misnamed branch '%s' away"
1675 msgstr "重命名掉一个错误命名的旧分支 '%s'"
1677 #: builtin/branch.c:646
1679 msgid "Branch renamed to %s, but HEAD is not updated!"
1680 msgstr "分支重命名为 %s,但 HEAD 没有更新!"
1682 #: builtin/branch.c:653
1683 msgid "Branch is renamed, but update of config-file failed"
1684 msgstr "分支被重命名,但更新 config 文件失败"
1686 #: builtin/branch.c:668
1688 msgid "malformed object name %s"
1691 #: builtin/branch.c:692
1693 msgid "could not write branch description template: %s"
1694 msgstr "不能写分支描述模版:%s"
1696 #: builtin/branch.c:783
1697 msgid "Failed to resolve HEAD as a valid ref."
1698 msgstr "无法将 HEAD 解析为有效引用。"
1700 #: builtin/branch.c:788 builtin/clone.c:558
1701 msgid "HEAD not found below refs/heads!"
1702 msgstr "HEAD 没有位于 /refs/heads 之下!"
1704 #: builtin/branch.c:808
1705 msgid "--column and --verbose are incompatible"
1706 msgstr "--column 和 --verbose 不兼容"
1708 #: builtin/branch.c:857
1709 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
1710 msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
1712 #: builtin/bundle.c:47
1714 msgid "%s is okay\n"
1717 #: builtin/bundle.c:56
1718 msgid "Need a repository to create a bundle."
1719 msgstr "需要一个版本库来创建包。"
1721 #: builtin/bundle.c:60
1722 msgid "Need a repository to unbundle."
1723 msgstr "需要一个版本库来解包。"
1725 #: builtin/checkout.c:113 builtin/checkout.c:146
1727 msgid "path '%s' does not have our version"
1728 msgstr "路径 '%s' 没有我们的版本"
1730 #: builtin/checkout.c:115 builtin/checkout.c:148
1732 msgid "path '%s' does not have their version"
1733 msgstr "路径 '%s' 没有他们的版本"
1735 #: builtin/checkout.c:131
1737 msgid "path '%s' does not have all necessary versions"
1738 msgstr "路径 '%s' 没有全部必须的版本"
1740 #: builtin/checkout.c:175
1742 msgid "path '%s' does not have necessary versions"
1743 msgstr "路径 '%s' 没有必须的版本"
1745 #: builtin/checkout.c:192
1747 msgid "path '%s': cannot merge"
1748 msgstr "path '%s':无法合并"
1750 #: builtin/checkout.c:209
1752 msgid "Unable to add merge result for '%s'"
1753 msgstr "无法为 '%s' 添加合并结果"
1755 #: builtin/checkout.c:234 builtin/checkout.c:392
1756 msgid "corrupt index file"
1759 #: builtin/checkout.c:264 builtin/checkout.c:271
1761 msgid "path '%s' is unmerged"
1762 msgstr "路径 '%s' 未合并"
1764 #: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583
1765 #: builtin/merge.c:812
1766 msgid "unable to write new index file"
1769 #: builtin/checkout.c:319 builtin/diff.c:302 builtin/merge.c:408
1770 msgid "diff_setup_done failed"
1771 msgstr "diff_setup_done 失败"
1773 #: builtin/checkout.c:414
1774 msgid "you need to resolve your current index first"
1775 msgstr "您需要先解决当前索引的冲突"
1777 #: builtin/checkout.c:533
1779 msgid "Can not do reflog for '%s'\n"
1780 msgstr "不能对 '%s' 执行 reflog 操作\n"
1782 #: builtin/checkout.c:566
1783 msgid "HEAD is now at"
1786 #: builtin/checkout.c:573
1788 msgid "Reset branch '%s'\n"
1789 msgstr "重置分支 '%s'\n"
1791 #: builtin/checkout.c:576
1793 msgid "Already on '%s'\n"
1794 msgstr "已经位于 '%s'\n"
1796 #: builtin/checkout.c:580
1798 msgid "Switched to and reset branch '%s'\n"
1799 msgstr "切换并重置分支 '%s'\n"
1801 #: builtin/checkout.c:582
1803 msgid "Switched to a new branch '%s'\n"
1804 msgstr "切换到一个新分支 '%s'\n"
1806 #: builtin/checkout.c:584
1808 msgid "Switched to branch '%s'\n"
1809 msgstr "切换到分支 '%s'\n"
1812 #: builtin/checkout.c:640
1814 msgid " ... and %d more.\n"
1815 msgstr " ... 及其它 %d 个。\n"
1817 #. The singular version
1818 #: builtin/checkout.c:646
1821 "Warning: you are leaving %d commit behind, not connected to\n"
1822 "any of your branches:\n"
1826 "Warning: you are leaving %d commits behind, not connected to\n"
1827 "any of your branches:\n"
1831 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
1835 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
1839 #: builtin/checkout.c:664
1842 "If you want to keep them by creating a new branch, this may be a good time\n"
1845 " git branch new_branch_name %s\n"
1848 "如果您想要通过创建新分支保存他们,这可能是一个好时候。\n"
1851 " git branch new_branch_name %s\n"
1854 #: builtin/checkout.c:694
1855 msgid "internal error in revision walk"
1856 msgstr "在版本遍历时遇到内部错误"
1858 #: builtin/checkout.c:698
1859 msgid "Previous HEAD position was"
1860 msgstr "之前的 HEAD 位置是"
1862 #: builtin/checkout.c:724
1863 msgid "You are on a branch yet to be born"
1864 msgstr "您位于一个尚未初始化的分支"
1867 #: builtin/checkout.c:855
1869 msgid "invalid reference: %s"
1872 #. case (1): want a tree
1873 #: builtin/checkout.c:894
1875 msgid "reference is not a tree: %s"
1878 #: builtin/checkout.c:974
1879 msgid "-B cannot be used with -b"
1880 msgstr "-B 不能和 -b 共用"
1882 #: builtin/checkout.c:983
1883 msgid "--patch is incompatible with all other options"
1884 msgstr "--patch 选项和其他选项不兼容"
1886 #: builtin/checkout.c:986
1887 msgid "--detach cannot be used with -b/-B/--orphan"
1888 msgstr "--detach 不能和 -b/-B/--orphan 共用"
1890 #: builtin/checkout.c:988
1891 msgid "--detach cannot be used with -t"
1892 msgstr "--detach 不能和 -t 共用"
1894 #: builtin/checkout.c:994
1895 msgid "--track needs a branch name"
1896 msgstr "--track 需要一个分支名"
1898 #: builtin/checkout.c:1001
1899 msgid "Missing branch name; try -b"
1900 msgstr "缺少分支名;尝试 -b"
1902 #: builtin/checkout.c:1007
1903 msgid "--orphan and -b|-B are mutually exclusive"
1904 msgstr "--orphan 和 -b|-B 互斥"
1906 #: builtin/checkout.c:1009
1907 msgid "--orphan cannot be used with -t"
1908 msgstr "--orphan 不能和 -t 共用"
1910 #: builtin/checkout.c:1019
1911 msgid "git checkout: -f and -m are incompatible"
1912 msgstr "git checkout:-f 和 -m 不兼容"
1914 #: builtin/checkout.c:1053
1915 msgid "invalid path specification"
1918 #: builtin/checkout.c:1061
1921 "git checkout: updating paths is incompatible with switching branches.\n"
1922 "Did you intend to checkout '%s' which can not be resolved as commit?"
1924 "git checkout:更新路径和切换分支不兼容。\n"
1925 "您是想要检出 '%s' 但未能将其解析为提交么?"
1927 #: builtin/checkout.c:1063
1928 msgid "git checkout: updating paths is incompatible with switching branches."
1929 msgstr "git checkout:更新路径和切换分支不兼容。"
1931 #: builtin/checkout.c:1068
1932 msgid "git checkout: --detach does not take a path argument"
1933 msgstr "git checkout:--detach 不跟路径参数"
1935 #: builtin/checkout.c:1071
1937 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
1938 "checking out of the index."
1940 "git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
1942 #: builtin/checkout.c:1090
1943 msgid "Cannot switch branch to a non-commit."
1944 msgstr "无法切换分支到一个非提交。"
1946 #: builtin/checkout.c:1093
1947 msgid "--ours/--theirs is incompatible with switching branches."
1948 msgstr "--ours/--theirs 和切换分支不兼容。"
1950 #: builtin/clean.c:78
1951 msgid "-x and -X cannot be used together"
1952 msgstr "-x 和 -X 不能共用"
1954 #: builtin/clean.c:82
1956 "clean.requireForce set to true and neither -n nor -f given; refusing to clean"
1958 "clean.requireForce 设置为 true 且未提供 -n 或 -f 选项,拒绝执行清理动作"
1960 #: builtin/clean.c:85
1962 "clean.requireForce defaults to true and neither -n nor -f given; refusing to "
1965 "clean.requireForce 默认为 true 且未提供 -n 或 -f 选项,拒绝执行清理动作"
1967 #: builtin/clean.c:155 builtin/clean.c:176
1969 msgid "Would remove %s\n"
1972 #: builtin/clean.c:159 builtin/clean.c:179
1974 msgid "Removing %s\n"
1977 #: builtin/clean.c:162 builtin/clean.c:182
1979 msgid "failed to remove %s"
1982 #: builtin/clean.c:166
1984 msgid "Would not remove %s\n"
1987 #: builtin/clean.c:168
1989 msgid "Not removing %s\n"
1992 #: builtin/clone.c:243
1994 msgid "reference repository '%s' is not a local directory."
1995 msgstr "引用版本库 '%s' 不是一个本地目录。"
1997 #: builtin/clone.c:302
1999 msgid "failed to open '%s'"
2002 #: builtin/clone.c:306
2004 msgid "failed to create directory '%s'"
2005 msgstr "无法创建目录 '%s'"
2007 #: builtin/clone.c:308 builtin/diff.c:75
2009 msgid "failed to stat '%s'"
2010 msgstr "无法枚举 '%s' 状态"
2012 #: builtin/clone.c:310
2014 msgid "%s exists and is not a directory"
2015 msgstr "%s 存在且不是一个目录"
2017 #: builtin/clone.c:324
2019 msgid "failed to stat %s\n"
2020 msgstr "无法枚举 %s 状态\n"
2022 #: builtin/clone.c:341
2024 msgid "failed to unlink '%s'"
2027 #: builtin/clone.c:346
2029 msgid "failed to create link '%s'"
2030 msgstr "无法创建链接 '%s'"
2032 #: builtin/clone.c:350
2034 msgid "failed to copy file to '%s'"
2035 msgstr "无法拷贝文件至 '%s'"
2037 #: builtin/clone.c:373
2042 #: builtin/clone.c:440
2044 msgid "Could not find remote branch %s to clone."
2045 msgstr "不能发现要克隆的远程分支 %s。"
2047 #: builtin/clone.c:549
2048 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
2049 msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
2051 #: builtin/clone.c:639
2052 msgid "Too many arguments."
2055 #: builtin/clone.c:643
2056 msgid "You must specify a repository to clone."
2057 msgstr "您必须指定一个版本库来克隆。"
2059 #: builtin/clone.c:654
2061 msgid "--bare and --origin %s options are incompatible."
2062 msgstr "--bare 和 --origin %s 选项不兼容。"
2064 #: builtin/clone.c:668
2066 msgid "repository '%s' does not exist"
2067 msgstr "版本库 '%s' 不存在"
2069 #: builtin/clone.c:673
2070 msgid "--depth is ignored in local clones; use file:// instead."
2071 msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
2073 #: builtin/clone.c:683
2075 msgid "destination path '%s' already exists and is not an empty directory."
2076 msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
2078 #: builtin/clone.c:693
2080 msgid "working tree '%s' already exists."
2081 msgstr "工作区 '%s' 已经存在。"
2083 #: builtin/clone.c:706 builtin/clone.c:720
2085 msgid "could not create leading directories of '%s'"
2086 msgstr "不能为 '%s' 创建先导目录"
2088 #: builtin/clone.c:709
2090 msgid "could not create work tree dir '%s'."
2091 msgstr "不能为 '%s' 创建工作区目录。"
2093 #: builtin/clone.c:728
2095 msgid "Cloning into bare repository '%s'...\n"
2096 msgstr "克隆到裸版本库 '%s'...\n"
2098 #: builtin/clone.c:730
2100 msgid "Cloning into '%s'...\n"
2101 msgstr "正克隆到 '%s'...\n"
2103 #: builtin/clone.c:786
2105 msgid "Don't know how to clone %s"
2108 #: builtin/clone.c:835
2110 msgid "Remote branch %s not found in upstream %s"
2111 msgstr "远程分支 %s 在上游 %s 未发现"
2113 #: builtin/clone.c:842
2114 msgid "You appear to have cloned an empty repository."
2115 msgstr "您似乎克隆了一个空版本库。"
2117 #: builtin/column.c:51
2118 msgid "--command must be the first argument"
2119 msgstr "--command 必须是第一个参数"
2121 #: builtin/commit.c:43
2123 "Your name and email address were configured automatically based\n"
2124 "on your username and hostname. Please check that they are accurate.\n"
2125 "You can suppress this message by setting them explicitly:\n"
2127 " git config --global user.name \"Your Name\"\n"
2128 " git config --global user.email you@example.com\n"
2130 "After doing this, you may fix the identity used for this commit with:\n"
2132 " git commit --amend --reset-author\n"
2134 "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
2135 "与否。您可以通过下面的命令对其进行明确地设置以免再出现本提示信息:\n"
2137 " git config --global user.name \"Your Name\"\n"
2138 " git config --global user.email you@example.com\n"
2140 "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
2142 " git commit --amend --reset-author\n"
2144 #: builtin/commit.c:55
2146 "You asked to amend the most recent commit, but doing so would make\n"
2147 "it empty. You can repeat your command with --allow-empty, or you can\n"
2148 "remove the commit entirely with \"git reset HEAD^\".\n"
2150 "您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
2151 "--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
2153 #: builtin/commit.c:60
2155 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
2156 "If you wish to commit it anyway, use:\n"
2158 " git commit --allow-empty\n"
2160 "Otherwise, please use 'git reset'\n"
2162 "之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
2165 " git commit --allow-empty\n"
2167 "否则,请使用命令 'git reset'\n"
2169 #: builtin/commit.c:253
2170 msgid "failed to unpack HEAD tree object"
2171 msgstr "无法解包 HEAD 树对象"
2173 #: builtin/commit.c:295
2174 msgid "unable to create temporary index"
2177 #: builtin/commit.c:301
2178 msgid "interactive add failed"
2181 #: builtin/commit.c:334 builtin/commit.c:355 builtin/commit.c:405
2182 msgid "unable to write new_index file"
2183 msgstr "无法写 new_index 文件"
2185 #: builtin/commit.c:386
2186 msgid "cannot do a partial commit during a merge."
2187 msgstr "在合并过程中不能做部分提交。"
2189 #: builtin/commit.c:388
2190 msgid "cannot do a partial commit during a cherry-pick."
2191 msgstr "在拣选过程中不能做部分提交。"
2193 #: builtin/commit.c:398
2194 msgid "cannot read the index"
2197 #: builtin/commit.c:418
2198 msgid "unable to write temporary index file"
2201 #: builtin/commit.c:493 builtin/commit.c:499
2203 msgid "invalid commit: %s"
2206 #: builtin/commit.c:522
2207 msgid "malformed --author parameter"
2208 msgstr "非法的 --author 参数"
2210 #: builtin/commit.c:582
2212 msgid "Malformed ident string: '%s'"
2213 msgstr "非法的身份字符串:'%s'"
2215 #: builtin/commit.c:620 builtin/commit.c:653 builtin/commit.c:967
2217 msgid "could not lookup commit %s"
2220 #: builtin/commit.c:632 builtin/shortlog.c:296
2222 msgid "(reading log message from standard input)\n"
2223 msgstr "(正从标准输入中读取日志信息)\n"
2225 #: builtin/commit.c:634
2226 msgid "could not read log from standard input"
2227 msgstr "不能从标准输入中读取日志信息"
2229 #: builtin/commit.c:638
2231 msgid "could not read log file '%s'"
2232 msgstr "不能读取日志文件 '%s'"
2234 #: builtin/commit.c:644
2235 msgid "commit has empty message"
2238 #: builtin/commit.c:660
2239 msgid "could not read MERGE_MSG"
2240 msgstr "不能读取 MERGE_MSG"
2242 #: builtin/commit.c:664
2243 msgid "could not read SQUASH_MSG"
2244 msgstr "不能读取 SQUASH_MSG"
2246 #: builtin/commit.c:668
2248 msgid "could not read '%s'"
2251 #: builtin/commit.c:720
2252 msgid "could not write commit template"
2255 #: builtin/commit.c:731
2259 "It looks like you may be committing a merge.\n"
2260 "If this is not correct, please remove the file\n"
2265 "看起来您正在做一个合并提交。如果不对,请删除文件\n"
2269 #: builtin/commit.c:736
2273 "It looks like you may be committing a cherry-pick.\n"
2274 "If this is not correct, please remove the file\n"
2279 "看起来您正在做一个拣选提交。如果不对,请删除文件\n"
2283 #: builtin/commit.c:748
2285 "Please enter the commit message for your changes. Lines starting\n"
2286 "with '#' will be ignored, and an empty message aborts the commit.\n"
2288 "请为您的变更输入提交说明。以 '#' 开始的行将被忽略,而一个空的提交\n"
2291 #: builtin/commit.c:753
2293 "Please enter the commit message for your changes. Lines starting\n"
2294 "with '#' will be kept; you may remove them yourself if you want to.\n"
2295 "An empty message aborts the commit.\n"
2297 "请为您的变更输入提交说明。以 '#' 开始的行将被保留,您可以删除它们\n"
2298 "如果您想这样做的话。而一个空的提交说明将会终止提交。\n"
2300 # 译者:为保证在输出中对齐,注意调整句中空格!
2301 #: builtin/commit.c:766
2303 msgid "%sAuthor: %s"
2306 # 译者:为保证在输出中对齐,注意调整句中空格!
2307 #: builtin/commit.c:773
2309 msgid "%sCommitter: %s"
2312 #: builtin/commit.c:793
2313 msgid "Cannot read index"
2316 #: builtin/commit.c:830
2317 msgid "Error building trees"
2320 #: builtin/commit.c:845 builtin/tag.c:361
2322 msgid "Please supply the message using either -m or -F option.\n"
2323 msgstr "请使用 -m 或者 -F 选项提供提交说明。\n"
2325 #: builtin/commit.c:942
2327 msgid "No existing author found with '%s'"
2328 msgstr "没有找到匹配 '%s' 的作者"
2330 #: builtin/commit.c:957 builtin/commit.c:1157
2332 msgid "Invalid untracked files mode '%s'"
2333 msgstr "无效的未追踪文件参数 '%s'"
2335 #: builtin/commit.c:997
2336 msgid "Using both --reset-author and --author does not make sense"
2337 msgstr "同时使用 --reset-author 和 --author 没有意义"
2339 #: builtin/commit.c:1008
2340 msgid "You have nothing to amend."
2343 #: builtin/commit.c:1011
2344 msgid "You are in the middle of a merge -- cannot amend."
2345 msgstr "您正处于一个合并过程中 -- 无法修补提交。"
2347 #: builtin/commit.c:1013
2348 msgid "You are in the middle of a cherry-pick -- cannot amend."
2349 msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
2351 #: builtin/commit.c:1016
2352 msgid "Options --squash and --fixup cannot be used together"
2353 msgstr "选项 --squash 和 --fixup 不能共用"
2355 #: builtin/commit.c:1026
2356 msgid "Only one of -c/-C/-F/--fixup can be used."
2357 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
2359 #: builtin/commit.c:1028
2360 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
2361 msgstr "选项 -m 不能和 -c/-C/-F/--fixup 共用。"
2363 #: builtin/commit.c:1036
2364 msgid "--reset-author can be used only with -C, -c or --amend."
2365 msgstr "--reset-author 只能和 -C、-c 或 --amend 共用。"
2367 #: builtin/commit.c:1053
2368 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
2369 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
2371 #: builtin/commit.c:1055
2372 msgid "No paths with --include/--only does not make sense."
2373 msgstr "参数 --include/--only 不跟路径没有意义。"
2375 #: builtin/commit.c:1057
2376 msgid "Clever... amending the last one with dirty index."
2377 msgstr "聪明... 在索引不干净下修补最后的提交。"
2379 #: builtin/commit.c:1059
2380 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
2381 msgstr "指定了明确的路径而没有使用 -i 或 -o 选项;认为是 --only paths..."
2383 #: builtin/commit.c:1069 builtin/tag.c:577
2385 msgid "Invalid cleanup mode %s"
2388 #: builtin/commit.c:1074
2389 msgid "Paths with -a does not make sense."
2390 msgstr "路径和 -a 选项共用没有意义。"
2392 #: builtin/commit.c:1257
2393 msgid "couldn't look up newly created commit"
2396 #: builtin/commit.c:1259
2397 msgid "could not parse newly created commit"
2400 #: builtin/commit.c:1300
2401 msgid "detached HEAD"
2404 # 译者:中文字符串拼接,可删除前导空格
2405 #: builtin/commit.c:1302
2406 msgid " (root-commit)"
2409 #: builtin/commit.c:1446
2410 msgid "could not parse HEAD commit"
2411 msgstr "不能解析 HEAD 提交"
2413 #: builtin/commit.c:1484 builtin/merge.c:509
2415 msgid "could not open '%s' for reading"
2416 msgstr "不能为读入打开 '%s'"
2418 #: builtin/commit.c:1491
2420 msgid "Corrupt MERGE_HEAD file (%s)"
2421 msgstr "损坏的 MERGE_HEAD 文件(%s)"
2423 #: builtin/commit.c:1498
2424 msgid "could not read MERGE_MODE"
2425 msgstr "不能读取 MERGE_MODE"
2427 #: builtin/commit.c:1517
2429 msgid "could not read commit message: %s"
2430 msgstr "不能读取提交说明:%s"
2432 #: builtin/commit.c:1531
2434 msgid "Aborting commit; you did not edit the message.\n"
2435 msgstr "终止提交;您未更改来自模版的提交说明。\n"
2437 #: builtin/commit.c:1536
2439 msgid "Aborting commit due to empty commit message.\n"
2440 msgstr "终止提交因为提交说明为空。\n"
2442 #: builtin/commit.c:1551 builtin/merge.c:936 builtin/merge.c:961
2443 msgid "failed to write commit object"
2446 #: builtin/commit.c:1572
2447 msgid "cannot lock HEAD ref"
2448 msgstr "无法锁定 HEAD 引用"
2450 #: builtin/commit.c:1576
2451 msgid "cannot update HEAD ref"
2452 msgstr "无法更新 HEAD 引用"
2454 #: builtin/commit.c:1587
2456 "Repository has been updated, but unable to write\n"
2457 "new_index file. Check that disk is not full or quota is\n"
2458 "not exceeded, and then \"git reset HEAD\" to recover."
2460 "版本库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
2461 "或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
2463 #: builtin/describe.c:234
2465 msgid "annotated tag %s not available"
2466 msgstr "注释 tag %s 无效"
2468 #: builtin/describe.c:238
2470 msgid "annotated tag %s has no embedded name"
2471 msgstr "注释 tag %s 没有嵌入名称"
2473 #: builtin/describe.c:240
2475 msgid "tag '%s' is really '%s' here"
2476 msgstr "tag '%s' 的确是在 '%s'"
2478 #: builtin/describe.c:267
2480 msgid "Not a valid object name %s"
2481 msgstr "不是一个有效的对象名 %s"
2483 #: builtin/describe.c:270
2485 msgid "%s is not a valid '%s' object"
2486 msgstr "%s 不是一个有效的 '%s' 对象"
2488 #: builtin/describe.c:287
2490 msgid "no tag exactly matches '%s'"
2491 msgstr "没有 tag 准确匹配 '%s'"
2493 #: builtin/describe.c:289
2495 msgid "searching to describe %s\n"
2498 #: builtin/describe.c:329
2500 msgid "finished search at %s\n"
2503 #: builtin/describe.c:353
2506 "No annotated tags can describe '%s'.\n"
2507 "However, there were unannotated tags: try --tags."
2509 "没有注释 tag 能描述 '%s'。\n"
2510 "然而,有非注释 tag:尝试 --tags。"
2512 #: builtin/describe.c:357
2515 "No tags can describe '%s'.\n"
2516 "Try --always, or create some tags."
2518 "没有注释 tag 能描述 '%s'。\n"
2519 "尝试 --always,或者创建一些 tag。"
2521 #: builtin/describe.c:378
2523 msgid "traversed %lu commits\n"
2524 msgstr "已遍历 %lu 个提交\n"
2526 #: builtin/describe.c:381
2529 "more than %i tags found; listed %i most recent\n"
2530 "gave up search at %s\n"
2532 "发现多于 %i 个 tag,列出最近的 %i 个\n"
2535 #: builtin/describe.c:436
2536 msgid "--long is incompatible with --abbrev=0"
2537 msgstr "--long 与 --abbrev=0 不兼容"
2539 #: builtin/describe.c:462
2540 msgid "No names found, cannot describe anything."
2541 msgstr "没有发现名称,无法描述任何东西。"
2543 #: builtin/describe.c:482
2544 msgid "--dirty is incompatible with committishes"
2545 msgstr "--dirty 不能与提交共用"
2547 #: builtin/diff.c:77
2549 msgid "'%s': not a regular file or symlink"
2550 msgstr "'%s':不是一个正规文件或符号链接"
2552 #: builtin/diff.c:220
2554 msgid "invalid option: %s"
2557 #: builtin/diff.c:297
2558 msgid "Not a git repository"
2559 msgstr "不是一个 git 版本库"
2561 #: builtin/diff.c:347
2563 msgid "invalid object '%s' given."
2564 msgstr "提供了无效对象 '%s'。"
2566 #: builtin/diff.c:352
2568 msgid "more than %d trees given: '%s'"
2569 msgstr "提供了超过 %d 个树对象:'%s'"
2571 #: builtin/diff.c:362
2573 msgid "more than two blobs given: '%s'"
2574 msgstr "提供了超过两个 blob 对象:'%s'"
2576 #: builtin/diff.c:370
2578 msgid "unhandled object '%s' given."
2579 msgstr "提供了无法处理的对象 '%s'。"
2581 #: builtin/fetch.c:200
2582 msgid "Couldn't find remote ref HEAD"
2583 msgstr "无法发现远程 HEAD 引用"
2585 #: builtin/fetch.c:253
2587 msgid "object %s not found"
2590 #: builtin/fetch.c:259
2591 msgid "[up to date]"
2594 #: builtin/fetch.c:273
2596 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
2597 msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)"
2599 #: builtin/fetch.c:274 builtin/fetch.c:360
2603 #: builtin/fetch.c:285
2604 msgid "[tag update]"
2608 #: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340
2609 msgid " (unable to update local ref)"
2610 msgstr " (不能更新本地引用)"
2612 #: builtin/fetch.c:305
2616 #: builtin/fetch.c:308
2617 msgid "[new branch]"
2620 #: builtin/fetch.c:311
2624 #: builtin/fetch.c:356
2625 msgid "unable to update local ref"
2628 #: builtin/fetch.c:356
2629 msgid "forced update"
2632 #: builtin/fetch.c:362
2633 msgid "(non-fast-forward)"
2636 #: builtin/fetch.c:393 builtin/fetch.c:685
2638 msgid "cannot open %s: %s\n"
2639 msgstr "无法打开 %s:%s\n"
2641 #: builtin/fetch.c:402
2643 msgid "%s did not send all necessary objects\n"
2644 msgstr "%s 未发送所有必须的对象\n"
2646 #: builtin/fetch.c:488
2651 #: builtin/fetch.c:499
2654 "some local refs could not be updated; try running\n"
2655 " 'git remote prune %s' to remove any old, conflicting branches"
2657 "一些本地引用不能被更新;尝试运行\n"
2658 " 'git remote prune %s' 来删除旧的、有冲突的分支"
2661 #: builtin/fetch.c:549
2663 msgid " (%s will become dangling)"
2664 msgstr " (%s 将成为悬空状态)"
2667 #: builtin/fetch.c:550
2669 msgid " (%s has become dangling)"
2670 msgstr " (%s 已成为悬空状态)"
2672 #: builtin/fetch.c:557
2676 #: builtin/fetch.c:558 builtin/remote.c:1055
2680 #: builtin/fetch.c:675
2682 msgid "Refusing to fetch into current branch %s of non-bare repository"
2683 msgstr "拒绝获取到非裸版本库的当前分支 %s"
2685 #: builtin/fetch.c:709
2687 msgid "Don't know how to fetch from %s"
2688 msgstr "不知道如何从 %s 获取"
2690 #: builtin/fetch.c:786
2692 msgid "Option \"%s\" value \"%s\" is not valid for %s"
2693 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
2695 #: builtin/fetch.c:789
2697 msgid "Option \"%s\" is ignored for %s\n"
2698 msgstr "选项 \"%s\" 为 %s 所忽略\n"
2700 #: builtin/fetch.c:888
2702 msgid "Fetching %s\n"
2705 #: builtin/fetch.c:890 builtin/remote.c:100
2707 msgid "Could not fetch %s"
2710 #: builtin/fetch.c:907
2712 "No remote repository specified. Please, specify either a URL or a\n"
2713 "remote name from which new revisions should be fetched."
2714 msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定,用以获取新提交。"
2716 #: builtin/fetch.c:927
2717 msgid "You need to specify a tag name."
2718 msgstr "您需要指定一个 tag 名称。"
2720 #: builtin/fetch.c:979
2721 msgid "fetch --all does not take a repository argument"
2722 msgstr "fetch --all 不能带一个版本库参数"
2724 #: builtin/fetch.c:981
2725 msgid "fetch --all does not make sense with refspecs"
2726 msgstr "fetch --all 带引用表达式没有任何意义"
2728 #: builtin/fetch.c:992
2730 msgid "No such remote or remote group: %s"
2731 msgstr "没有这样的远程或远程组:%s"
2733 #: builtin/fetch.c:1000
2734 msgid "Fetching a group and specifying refspecs does not make sense"
2735 msgstr "获取组并指定引用表达式没有意义"
2739 msgid "Invalid %s: '%s'"
2740 msgstr "无效的 %s:'%s'"
2744 msgid "insanely long object directory %.*s"
2745 msgstr "不正常的长对象目录 %.*s"
2749 msgid "Auto packing the repository for optimum performance.\n"
2750 msgstr "自动打包版本库以求最佳性能。\n"
2755 "Auto packing the repository for optimum performance. You may also\n"
2756 "run \"git gc\" manually. See \"git help gc\" for more information.\n"
2758 "自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n"
2759 "参见 \"git help gc\" 以获取更多信息。\n"
2763 "There are too many unreachable loose objects; run 'git prune' to remove them."
2764 msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
2766 #: builtin/grep.c:216
2768 msgid "grep: failed to create thread: %s"
2769 msgstr "grep:无法创建线程:%s"
2771 #: builtin/grep.c:402
2773 msgid "Failed to chdir: %s"
2776 #: builtin/grep.c:478 builtin/grep.c:512
2778 msgid "unable to read tree (%s)"
2781 #: builtin/grep.c:526
2783 msgid "unable to grep from object of type %s"
2784 msgstr "无法抓取来自于 %s 类型的对象"
2786 #: builtin/grep.c:584
2788 msgid "switch `%c' expects a numerical value"
2789 msgstr "开关 `%c' 期望一个数字值"
2791 #: builtin/grep.c:601
2793 msgid "cannot open '%s'"
2796 #: builtin/grep.c:885
2797 msgid "no pattern given."
2800 #: builtin/grep.c:899
2802 msgid "bad object %s"
2805 #: builtin/grep.c:940
2806 msgid "--open-files-in-pager only works on the worktree"
2807 msgstr "--open-files-in-pager 仅用于工作区"
2809 #: builtin/grep.c:963
2810 msgid "--cached or --untracked cannot be used with --no-index."
2811 msgstr "--cached 或 --untracked 不能与 --no-index 共用。"
2813 #: builtin/grep.c:968
2814 msgid "--no-index or --untracked cannot be used with revs."
2815 msgstr "--no-index 或 --untracked 不能和版本共用。"
2817 #: builtin/grep.c:971
2818 msgid "--[no-]exclude-standard cannot be used for tracked contents."
2819 msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
2821 #: builtin/grep.c:979
2822 msgid "both --cached and trees are given."
2823 msgstr "同时给出了 --cached 和树对象。"
2825 #: builtin/help.c:59
2827 msgid "unrecognized help format '%s'"
2828 msgstr "未能识别的帮助格式 '%s'"
2830 #: builtin/help.c:87
2831 msgid "Failed to start emacsclient."
2832 msgstr "无法启动 emacsclient。"
2834 #: builtin/help.c:100
2835 msgid "Failed to parse emacsclient version."
2836 msgstr "无法解析 emacsclient 版本。"
2838 #: builtin/help.c:108
2840 msgid "emacsclient version '%d' too old (< 22)."
2841 msgstr "emacsclient 版本 '%d' 太老 (< 22)。"
2843 #: builtin/help.c:126 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
2845 msgid "failed to exec '%s': %s"
2846 msgstr "无法执行 '%s':%s"
2848 #: builtin/help.c:211
2851 "'%s': path for unsupported man viewer.\n"
2852 "Please consider using 'man.<tool>.cmd' instead."
2854 "'%s':不支持的 man 手册查看器的路径。\n"
2855 "请使用 'man.<tool>.cmd'。"
2857 #: builtin/help.c:223
2860 "'%s': cmd for supported man viewer.\n"
2861 "Please consider using 'man.<tool>.path' instead."
2863 "'%s': 支持的 man 手册查看器命令。\n"
2864 "请使用 'man.<tool>.path'。"
2866 #: builtin/help.c:287
2867 msgid "The most commonly used git commands are:"
2868 msgstr "最常用的 git 命令有:"
2870 #: builtin/help.c:355
2872 msgid "'%s': unknown man viewer."
2873 msgstr "'%s':未知的 man 查看器。"
2875 #: builtin/help.c:372
2876 msgid "no man viewer handled the request"
2877 msgstr "没有 man 查看器处理此请求"
2879 #: builtin/help.c:380
2880 msgid "no info viewer handled the request"
2881 msgstr "没有 info 查看器处理此请求"
2883 #: builtin/help.c:391
2885 msgid "'%s': not a documentation directory."
2886 msgstr "'%s':不是一个文档目录。"
2888 #: builtin/help.c:432 builtin/help.c:439
2893 #: builtin/help.c:453
2895 msgid "`git %s' is aliased to `%s'"
2896 msgstr "`git %s' 是 `%s' 的别名"
2898 #: builtin/index-pack.c:169
2900 msgid "object type mismatch at %s"
2901 msgstr "%s 的对象类型不匹配"
2903 #: builtin/index-pack.c:189
2904 msgid "object of unexpected type"
2907 #: builtin/index-pack.c:226
2909 msgid "cannot fill %d byte"
2910 msgid_plural "cannot fill %d bytes"
2911 msgstr[0] "无法填充 %d 字节"
2912 msgstr[1] "无法填充 %d 字节"
2914 #: builtin/index-pack.c:236
2916 msgstr "过早的文件结束符(EOF)"
2918 #: builtin/index-pack.c:237
2919 msgid "read error on input"
2922 #: builtin/index-pack.c:249
2923 msgid "used more bytes than were available"
2926 #: builtin/index-pack.c:256
2927 msgid "pack too large for current definition of off_t"
2928 msgstr "包太大超过了当前 off_t 的定义"
2930 #: builtin/index-pack.c:272
2932 msgid "unable to create '%s'"
2935 #: builtin/index-pack.c:277
2937 msgid "cannot open packfile '%s'"
2938 msgstr "无法打开包文件 '%s'"
2940 #: builtin/index-pack.c:291
2941 msgid "pack signature mismatch"
2944 #: builtin/index-pack.c:311
2946 msgid "pack has bad object at offset %lu: %s"
2947 msgstr "包中有错误的对象位于 %lu:%s"
2949 #: builtin/index-pack.c:405
2951 msgid "inflate returned %d"
2954 #: builtin/index-pack.c:450
2955 msgid "offset value overflow for delta base object"
2956 msgstr "偏移值覆盖了 delta 基准对象"
2958 #: builtin/index-pack.c:458
2959 msgid "delta base offset is out of bound"
2960 msgstr "delta 基准偏移越界"
2962 #: builtin/index-pack.c:466
2964 msgid "unknown object type %d"
2967 #: builtin/index-pack.c:495
2968 msgid "cannot pread pack file"
2971 #: builtin/index-pack.c:497
2973 msgid "premature end of pack file, %lu byte missing"
2974 msgid_plural "premature end of pack file, %lu bytes missing"
2975 msgstr[0] "包文件过早结束,缺少 %lu 字节"
2976 msgstr[1] "包文件过早结束,缺少 %lu 字节"
2978 #: builtin/index-pack.c:510
2979 msgid "serious inflate inconsistency"
2982 #: builtin/index-pack.c:583
2984 msgid "cannot read existing object %s"
2985 msgstr "不能读取现存对象 %s"
2987 #: builtin/index-pack.c:586
2989 msgid "SHA1 COLLISION FOUND WITH %s !"
2990 msgstr "发现 %s 出现 SHA1 冲突!"
2992 #: builtin/index-pack.c:598
2994 msgid "invalid blob object %s"
2995 msgstr "无效的 blob 对象 %s"
2997 #: builtin/index-pack.c:610
3002 #: builtin/index-pack.c:612
3003 msgid "Error in object"
3006 #: builtin/index-pack.c:614
3008 msgid "Not all child objects of %s are reachable"
3009 msgstr "%s 的所有子对象并非都可达"
3011 #: builtin/index-pack.c:687 builtin/index-pack.c:713
3012 msgid "failed to apply delta"
3015 #: builtin/index-pack.c:850
3016 msgid "Receiving objects"
3019 #: builtin/index-pack.c:850
3020 msgid "Indexing objects"
3023 #: builtin/index-pack.c:872
3024 msgid "pack is corrupted (SHA1 mismatch)"
3025 msgstr "包冲突(SHA1 不匹配)"
3027 #: builtin/index-pack.c:877
3028 msgid "cannot fstat packfile"
3031 #: builtin/index-pack.c:880
3032 msgid "pack has junk at the end"
3035 #: builtin/index-pack.c:903
3036 msgid "Resolving deltas"
3039 #: builtin/index-pack.c:954
3040 msgid "confusion beyond insanity"
3043 #: builtin/index-pack.c:973
3045 msgid "pack has %d unresolved delta"
3046 msgid_plural "pack has %d unresolved deltas"
3047 msgstr[0] "包有 %d 个未解决的 delta"
3048 msgstr[1] "包有 %d 个未解决的 delta"
3050 #: builtin/index-pack.c:998
3052 msgid "unable to deflate appended object (%d)"
3053 msgstr "不能缩小附加对象(%d)"
3055 #: builtin/index-pack.c:1077
3057 msgid "local object %s is corrupt"
3058 msgstr "本地对象 %s 已损坏"
3060 #: builtin/index-pack.c:1101
3061 msgid "error while closing pack file"
3064 #: builtin/index-pack.c:1114
3066 msgid "cannot write keep file '%s'"
3067 msgstr "无法写保留文件 '%s'"
3069 #: builtin/index-pack.c:1122
3071 msgid "cannot close written keep file '%s'"
3072 msgstr "无法关闭保留文件 '%s'"
3074 #: builtin/index-pack.c:1135
3075 msgid "cannot store pack file"
3078 #: builtin/index-pack.c:1146
3079 msgid "cannot store index file"
3082 #: builtin/index-pack.c:1247
3084 msgid "Cannot open existing pack file '%s'"
3085 msgstr "无法打开现存包文件 '%s'"
3087 #: builtin/index-pack.c:1249
3089 msgid "Cannot open existing pack idx file for '%s'"
3090 msgstr "无法为 %s 打开包索引文件"
3092 #: builtin/index-pack.c:1296
3094 msgid "non delta: %d object"
3095 msgid_plural "non delta: %d objects"
3096 msgstr[0] "非 delta:%d 个对象"
3097 msgstr[1] "非 delta:%d 个对象"
3099 #: builtin/index-pack.c:1303
3101 msgid "chain length = %d: %lu object"
3102 msgid_plural "chain length = %d: %lu objects"
3103 msgstr[0] "链长 = %d: %lu 对象"
3104 msgstr[1] "链长 = %d: %lu 对象"
3106 #: builtin/index-pack.c:1330
3107 msgid "Cannot come back to cwd"
3110 #: builtin/index-pack.c:1374 builtin/index-pack.c:1377
3111 #: builtin/index-pack.c:1389 builtin/index-pack.c:1393
3116 #: builtin/index-pack.c:1407
3117 msgid "--fix-thin cannot be used without --stdin"
3118 msgstr "--fix-thin 不能和 --stdin 共用"
3120 #: builtin/index-pack.c:1411 builtin/index-pack.c:1421
3122 msgid "packfile name '%s' does not end with '.pack'"
3123 msgstr "包名 '%s' 没有以 '.pack' 结尾"
3125 #: builtin/index-pack.c:1430
3126 msgid "--verify with no packfile name given"
3127 msgstr "--verify 没有提供包名参数"
3129 #: builtin/init-db.c:35
3131 msgid "Could not make %s writable by group"
3132 msgstr "不能设置 %s 为组可写"
3134 #: builtin/init-db.c:62
3136 msgid "insanely long template name %s"
3139 #: builtin/init-db.c:67
3141 msgid "cannot stat '%s'"
3142 msgstr "不能枚举 '%s' 状态"
3144 #: builtin/init-db.c:73
3146 msgid "cannot stat template '%s'"
3147 msgstr "不能枚举模版 '%s' 状态"
3149 #: builtin/init-db.c:80
3151 msgid "cannot opendir '%s'"
3152 msgstr "不能打开目录 '%s'"
3154 #: builtin/init-db.c:97
3156 msgid "cannot readlink '%s'"
3157 msgstr "不能读取链接 '%s'"
3159 #: builtin/init-db.c:99
3161 msgid "insanely long symlink %s"
3164 #: builtin/init-db.c:102
3166 msgid "cannot symlink '%s' '%s'"
3167 msgstr "不能自 '%s' 到 '%s' 创建符号链接"
3169 #: builtin/init-db.c:106
3171 msgid "cannot copy '%s' to '%s'"
3172 msgstr "不能拷贝 '%s' 至 '%s'"
3174 #: builtin/init-db.c:110
3176 msgid "ignoring template %s"
3179 #: builtin/init-db.c:133
3181 msgid "insanely long template path %s"
3184 #: builtin/init-db.c:141
3186 msgid "templates not found %s"
3189 #: builtin/init-db.c:154
3191 msgid "not copying templates of a wrong format version %d from '%s'"
3192 msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
3194 #: builtin/init-db.c:192
3196 msgid "insane git directory %s"
3197 msgstr "不正常的 git 目录 %s"
3199 #: builtin/init-db.c:322 builtin/init-db.c:325
3201 msgid "%s already exists"
3204 #: builtin/init-db.c:354
3206 msgid "unable to handle file type %d"
3207 msgstr "不能处理 %d 类型的文件"
3209 #: builtin/init-db.c:357
3211 msgid "unable to move %s to %s"
3212 msgstr "不能移动 %s 至 %s"
3214 #: builtin/init-db.c:362
3216 msgid "Could not create git link %s"
3217 msgstr "不能创建 git link %s"
3220 #. * TRANSLATORS: The first '%s' is either "Reinitialized
3221 #. * existing" or "Initialized empty", the second " shared" or
3222 #. * "", and the last '%s%s' is the verbatim directory name.
3224 #: builtin/init-db.c:419
3226 msgid "%s%s Git repository in %s%s\n"
3227 msgstr "%s%s Git 版本库于 %s%s\n"
3229 #: builtin/init-db.c:420
3230 msgid "Reinitialized existing"
3233 #: builtin/init-db.c:420
3234 msgid "Initialized empty"
3237 # 译者:中文字符串拼接,可删除前导空格
3238 #: builtin/init-db.c:421
3242 #: builtin/init-db.c:440
3243 msgid "cannot tell cwd"
3246 #: builtin/init-db.c:521 builtin/init-db.c:528
3248 msgid "cannot mkdir %s"
3251 #: builtin/init-db.c:532
3253 msgid "cannot chdir to %s"
3256 #: builtin/init-db.c:554
3259 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
3262 "不允许 %s(或 --work-tree=<directory>)而没有指定 %s(或 --git-"
3265 #: builtin/init-db.c:578
3266 msgid "Cannot access current working directory"
3269 #: builtin/init-db.c:585
3271 msgid "Cannot access work tree '%s'"
3272 msgstr "不能访问工作区 '%s'"
3274 #: builtin/log.c:188
3276 msgid "Final output: %d %s\n"
3277 msgstr "最终输出:%d %s\n"
3279 #: builtin/log.c:401 builtin/log.c:489
3281 msgid "Could not read object %s"
3284 #: builtin/log.c:513
3286 msgid "Unknown type: %d"
3289 #: builtin/log.c:602
3290 msgid "format.headers without value"
3291 msgstr "format.headers 没有值"
3293 #: builtin/log.c:676
3294 msgid "name of output directory is too long"
3297 #: builtin/log.c:687
3299 msgid "Cannot open patch file %s"
3300 msgstr "无法打开补丁文件 %s"
3302 #: builtin/log.c:701
3303 msgid "Need exactly one range."
3306 #: builtin/log.c:709
3307 msgid "Not a range."
3310 #: builtin/log.c:786
3311 msgid "Cover letter needs email format"
3314 #: builtin/log.c:859
3316 msgid "insane in-reply-to: %s"
3317 msgstr "不正常的 in-reply-to:%s"
3319 #: builtin/log.c:932
3320 msgid "Two output directories?"
3323 #: builtin/log.c:1153
3325 msgid "bogus committer info %s"
3326 msgstr "虚假的提交者信息 %s"
3328 #: builtin/log.c:1198
3329 msgid "-n and -k are mutually exclusive."
3330 msgstr "-n 和 -k 互斥。"
3332 #: builtin/log.c:1200
3333 msgid "--subject-prefix and -k are mutually exclusive."
3334 msgstr "--subject-prefix 和 -k 互斥。"
3336 #: builtin/log.c:1208
3337 msgid "--name-only does not make sense"
3338 msgstr "--name-only 无意义"
3340 #: builtin/log.c:1210
3341 msgid "--name-status does not make sense"
3342 msgstr "--name-status 无意义"
3344 #: builtin/log.c:1212
3345 msgid "--check does not make sense"
3346 msgstr "--check 无意义"
3348 #: builtin/log.c:1235
3349 msgid "standard output, or directory, which one?"
3350 msgstr "标准输出或目录,哪一个?"
3352 #: builtin/log.c:1237
3354 msgid "Could not create directory '%s'"
3355 msgstr "不能创建目录 '%s'"
3357 #: builtin/log.c:1390
3358 msgid "Failed to create output files"
3361 #: builtin/log.c:1494
3364 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
3365 msgstr "不能找到跟踪的远程分支,请手工指定 <upstream>。\n"
3367 #: builtin/log.c:1510 builtin/log.c:1512 builtin/log.c:1524
3369 msgid "Unknown commit %s"
3372 #: builtin/merge.c:90
3373 msgid "switch `m' requires a value"
3374 msgstr "开关 `m' 需要一个值"
3376 #: builtin/merge.c:127
3378 msgid "Could not find merge strategy '%s'.\n"
3379 msgstr "不能找到合并策略 '%s'。\n"
3381 #: builtin/merge.c:128
3383 msgid "Available strategies are:"
3386 #: builtin/merge.c:133
3388 msgid "Available custom strategies are:"
3391 #: builtin/merge.c:240
3392 msgid "could not run stash."
3395 #: builtin/merge.c:245
3396 msgid "stash failed"
3399 #: builtin/merge.c:250
3401 msgid "not a valid object: %s"
3402 msgstr "不是一个有效对象:%s"
3404 #: builtin/merge.c:269 builtin/merge.c:286
3405 msgid "read-tree failed"
3409 #: builtin/merge.c:316
3410 msgid " (nothing to squash)"
3413 #: builtin/merge.c:329
3415 msgid "Squash commit -- not updating HEAD\n"
3416 msgstr "压缩提交 -- 未更新 HEAD\n"
3418 #: builtin/merge.c:361
3419 msgid "Writing SQUASH_MSG"
3420 msgstr "写入 SQUASH_MSG"
3422 #: builtin/merge.c:363
3423 msgid "Finishing SQUASH_MSG"
3424 msgstr "完成 SQUASH_MSG"
3426 #: builtin/merge.c:386
3428 msgid "No merge message -- not updating HEAD\n"
3429 msgstr "无合并信息 -- 未更新 HEAD\n"
3431 #: builtin/merge.c:437
3433 msgid "'%s' does not point to a commit"
3434 msgstr "'%s' 没有指向一个提交"
3436 #: builtin/merge.c:536
3438 msgid "Bad branch.%s.mergeoptions string: %s"
3439 msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
3441 #: builtin/merge.c:629
3442 msgid "git write-tree failed to write a tree"
3443 msgstr "git write-tree 无法写入一树对象"
3445 #: builtin/merge.c:679
3446 msgid "failed to read the cache"
3449 #: builtin/merge.c:697
3450 msgid "Unable to write index."
3453 #: builtin/merge.c:710
3454 msgid "Not handling anything other than two heads merge."
3455 msgstr "不能处理两个头合并之外的任何操作。"
3457 #: builtin/merge.c:724
3459 msgid "Unknown option for merge-recursive: -X%s"
3460 msgstr "merge-recursive 的未知选项:-X%s"
3462 #: builtin/merge.c:738
3464 msgid "unable to write %s"
3467 #: builtin/merge.c:877
3469 msgid "Could not read from '%s'"
3470 msgstr "不能从 '%s' 读取"
3472 #: builtin/merge.c:886
3474 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
3475 msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
3477 #: builtin/merge.c:892
3479 "Please enter a commit message to explain why this merge is necessary,\n"
3480 "especially if it merges an updated upstream into a topic branch.\n"
3482 "Lines starting with '#' will be ignored, and an empty message aborts\n"
3485 "请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
3488 "以 '#' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
3490 #: builtin/merge.c:916
3491 msgid "Empty commit message."
3494 #: builtin/merge.c:928
3496 msgid "Wonderful.\n"
3499 #: builtin/merge.c:993
3501 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
3502 msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
3504 #: builtin/merge.c:1009
3506 msgid "'%s' is not a commit"
3507 msgstr "'%s' 不是一个提交"
3509 #: builtin/merge.c:1050
3510 msgid "No current branch."
3513 #: builtin/merge.c:1052
3514 msgid "No remote for the current branch."
3515 msgstr "当前分支没有对应的远程版本库。"
3517 #: builtin/merge.c:1054
3518 msgid "No default upstream defined for the current branch."
3519 msgstr "当前分支没有定义默认的上游分支。"
3521 #: builtin/merge.c:1059
3523 msgid "No remote tracking branch for %s from %s"
3524 msgstr "%s 没有来自 %s 的远程跟踪分支"
3526 #: builtin/merge.c:1146 builtin/merge.c:1303
3528 msgid "%s - not something we can merge"
3531 #: builtin/merge.c:1214
3532 msgid "There is no merge to abort (MERGE_HEAD missing)."
3533 msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
3535 #: builtin/merge.c:1230 git-pull.sh:31
3537 "You have not concluded your merge (MERGE_HEAD exists).\n"
3538 "Please, commit your changes before you can merge."
3540 "您尚未结束您的合并(存在 MERGE_HEAD)。\n"
3543 #: builtin/merge.c:1233 git-pull.sh:34
3544 msgid "You have not concluded your merge (MERGE_HEAD exists)."
3545 msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
3547 #: builtin/merge.c:1237
3549 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
3550 "Please, commit your changes before you can merge."
3552 "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
3555 #: builtin/merge.c:1240
3556 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
3557 msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
3559 #: builtin/merge.c:1249
3560 msgid "You cannot combine --squash with --no-ff."
3561 msgstr "您不能将 --squash 与 --no-ff 共用。"
3563 #: builtin/merge.c:1254
3564 msgid "You cannot combine --no-ff with --ff-only."
3565 msgstr "您不能将 --no-ff 与 --ff-only 共用。"
3567 #: builtin/merge.c:1261
3568 msgid "No commit specified and merge.defaultToUpstream not set."
3569 msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
3571 #: builtin/merge.c:1293
3572 msgid "Can merge only exactly one commit into empty head"
3573 msgstr "只能将一个提交合并到空分支上"
3575 #: builtin/merge.c:1296
3576 msgid "Squash commit into empty head not supported yet"
3577 msgstr "尚不支持到空分支的压缩提交"
3579 #: builtin/merge.c:1298
3580 msgid "Non-fast-forward commit does not make sense into an empty head"
3581 msgstr "到空分支的非快进式提交没有意义"
3583 #: builtin/merge.c:1413
3585 msgid "Updating %s..%s\n"
3586 msgstr "更新 %s..%s\n"
3588 #: builtin/merge.c:1451
3590 msgid "Trying really trivial in-index merge...\n"
3591 msgstr "尝试非常小的索引内合并...\n"
3593 #: builtin/merge.c:1458
3598 #: builtin/merge.c:1490
3599 msgid "Not possible to fast-forward, aborting."
3602 #: builtin/merge.c:1513 builtin/merge.c:1592
3604 msgid "Rewinding the tree to pristine...\n"
3605 msgstr "将树回滚至原始状态...\n"
3607 #: builtin/merge.c:1517
3609 msgid "Trying merge strategy %s...\n"
3610 msgstr "尝试合并策略 %s...\n"
3612 #: builtin/merge.c:1583
3614 msgid "No merge strategy handled the merge.\n"
3615 msgstr "没有合并策略处理此合并。\n"
3617 #: builtin/merge.c:1585
3619 msgid "Merge with strategy %s failed.\n"
3620 msgstr "使用策略 %s 合并失败。\n"
3622 #: builtin/merge.c:1594
3624 msgid "Using the %s to prepare resolving by hand.\n"
3625 msgstr "使用 %s 以准备手工解决。\n"
3627 #: builtin/merge.c:1606
3629 msgid "Automatic merge went well; stopped before committing as requested\n"
3630 msgstr "自动合并进展顺利,按要求在提交前停止\n"
3634 msgid "Checking rename of '%s' to '%s'\n"
3635 msgstr "检查 '%s' 到 '%s' 的重命名\n"
3642 msgid "can not move directory into itself"
3646 msgid "cannot move directory over file"
3651 msgid "Huh? %.*s is in index?"
3652 msgstr "嗯?%.*s 在索引中?"
3655 msgid "source directory is empty"
3659 msgid "not under version control"
3663 msgid "destination exists"
3668 msgid "overwriting '%s'"
3672 msgid "Cannot overwrite"
3676 msgid "multiple sources for the same target"
3681 msgid "%s, source=%s, destination=%s"
3682 msgstr "%s,源=%s,目标=%s"
3686 msgid "Renaming %s to %s\n"
3687 msgstr "重命名 %s 至 %s\n"
3689 #: builtin/mv.c:215 builtin/remote.c:731
3691 msgid "renaming '%s' failed"
3692 msgstr "重命名 '%s' 失败"
3694 #: builtin/notes.c:139
3696 msgid "unable to start 'show' for object '%s'"
3697 msgstr "不能为对象 '%s' 开始 'show'"
3699 #: builtin/notes.c:145
3700 msgid "can't fdopen 'show' output fd"
3701 msgstr "不能打开 'show' 输出文件句柄"
3703 #: builtin/notes.c:155
3705 msgid "failed to close pipe to 'show' for object '%s'"
3706 msgstr "无法为对象 '%s' 的 'show' 关闭管道"
3708 #: builtin/notes.c:158
3710 msgid "failed to finish 'show' for object '%s'"
3711 msgstr "无法为对象 '%s' 完成 'show'"
3713 #: builtin/notes.c:175 builtin/tag.c:347
3715 msgid "could not create file '%s'"
3716 msgstr "不能创建文件 '%s'"
3718 #: builtin/notes.c:189
3719 msgid "Please supply the note contents using either -m or -F option"
3720 msgstr "请通过 -m 或 -F 选项为注解提供内容"
3722 #: builtin/notes.c:210 builtin/notes.c:973
3724 msgid "Removing note for object %s\n"
3725 msgstr "删除对象 %s 的注解\n"
3727 #: builtin/notes.c:215
3728 msgid "unable to write note object"
3731 #: builtin/notes.c:217
3733 msgid "The note contents has been left in %s"
3734 msgstr "注解内容被留在文件 %s 中"
3736 #: builtin/notes.c:251 builtin/tag.c:542
3738 msgid "cannot read '%s'"
3741 #: builtin/notes.c:253 builtin/tag.c:545
3743 msgid "could not open or read '%s'"
3744 msgstr "不能打开或读取 '%s'"
3746 #: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447
3747 #: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644
3748 #: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766
3749 #: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:558
3751 msgid "Failed to resolve '%s' as a valid ref."
3752 msgstr "无法解析 '%s' 为一个有效引用。"
3754 #: builtin/notes.c:275
3756 msgid "Failed to read object '%s'."
3757 msgstr "无法读取对象 '%s'。"
3759 #: builtin/notes.c:299
3760 msgid "Cannot commit uninitialized/unreferenced notes tree"
3761 msgstr "不能提交未初始化/未引用的注解树"
3763 #: builtin/notes.c:340
3765 msgid "Bad notes.rewriteMode value: '%s'"
3766 msgstr "坏的 notes.rewriteMode 值:'%s'"
3768 #: builtin/notes.c:350
3770 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
3771 msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
3773 #. TRANSLATORS: The first %s is the name of the
3774 #. environment variable, the second %s is its value
3775 #: builtin/notes.c:377
3777 msgid "Bad %s value: '%s'"
3778 msgstr "坏的 %s 值:'%s'"
3780 #: builtin/notes.c:441
3782 msgid "Malformed input line: '%s'."
3783 msgstr "非法的输入行:'%s'。"
3785 #: builtin/notes.c:456
3787 msgid "Failed to copy notes from '%s' to '%s'"
3788 msgstr "无法从 '%s' 到 '%s' 拷贝注解"
3790 #: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627
3791 #: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759
3792 #: builtin/notes.c:1033
3793 msgid "too many parameters"
3796 #: builtin/notes.c:513 builtin/notes.c:772
3798 msgid "No note found for object %s."
3799 msgstr "未发现对象 %s 的注解。"
3801 #: builtin/notes.c:580
3804 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
3806 msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
3808 #: builtin/notes.c:585 builtin/notes.c:662
3810 msgid "Overwriting existing notes for object %s\n"
3811 msgstr "覆盖对象 %s 现存注解\n"
3813 #: builtin/notes.c:635
3814 msgid "too few parameters"
3817 #: builtin/notes.c:656
3820 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
3822 msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
3824 #: builtin/notes.c:668
3826 msgid "Missing notes on source object %s. Cannot copy."
3827 msgstr "源对象 %s 缺少注解。不能拷贝。"
3829 #: builtin/notes.c:717
3832 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
3833 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
3835 "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
3836 "请换用 'git notes add -f -m/-F/-c/-C'。\n"
3838 #: builtin/notes.c:971
3840 msgid "Object %s has no note\n"
3841 msgstr "对象 %s 没有注解\n"
3843 #: builtin/notes.c:1103 builtin/remote.c:1598
3845 msgid "Unknown subcommand: %s"
3848 #: builtin/pack-objects.c:2337
3850 msgid "unsupported index version %s"
3851 msgstr "不支持的索引版本 %s"
3853 #: builtin/pack-objects.c:2341
3855 msgid "bad index version '%s'"
3856 msgstr "坏的索引版本 '%s'"
3858 #: builtin/pack-objects.c:2364
3860 msgid "option %s does not accept negative form"
3861 msgstr "选项 %s 不接受否定格式"
3863 #: builtin/pack-objects.c:2368
3865 msgid "unable to parse value '%s' for option %s"
3866 msgstr "不能解析选项 %1$s 的值 '%2$s'"
3868 #: builtin/push.c:45
3869 msgid "tag shorthand without <tag>"
3870 msgstr "tag 简写没有跟 <tag> 参数"
3872 #: builtin/push.c:64
3873 msgid "--delete only accepts plain target ref names"
3874 msgstr "--delete 只接受简单的目标引用名"
3876 #: builtin/push.c:99
3879 "To choose either option permanently, see push.default in 'git help config'."
3882 "为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
3884 #: builtin/push.c:102
3887 "The upstream branch of your current branch does not match\n"
3888 "the name of your current branch. To push to the upstream branch\n"
3889 "on the remote, use\n"
3891 " git push %s HEAD:%s\n"
3893 "To push to the branch of the same name on the remote, use\n"
3898 "如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
3901 " git push %s HEAD:%s\n"
3908 #: builtin/push.c:121
3911 "You are not currently on a branch.\n"
3912 "To push the history leading to the current (detached HEAD)\n"
3915 " git push %s HEAD:<name-of-remote-branch>\n"
3918 "现在为推送当前(分离头指针)的历史,使用\n"
3920 " git push %s HEAD:<name-of-remote-branch>\n"
3922 #: builtin/push.c:128
3925 "The current branch %s has no upstream branch.\n"
3926 "To push the current branch and set the remote as upstream, use\n"
3928 " git push --set-upstream %s %s\n"
3930 "当前分支 %s 没有对应的上游分支。\n"
3931 "为推送当前分支并建立与远程上游的跟踪,使用\n"
3933 " git push --set-upstream %s %s\n"
3935 #: builtin/push.c:136
3937 msgid "The current branch %s has multiple upstream branches, refusing to push."
3938 msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
3940 #: builtin/push.c:139
3943 "You are pushing to remote '%s', which is not the upstream of\n"
3944 "your current branch '%s', without telling me what to push\n"
3945 "to update which remote branch."
3947 "您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
3948 "而没有告诉我要推送什么、更新哪个远程分支。"
3950 #: builtin/push.c:174
3952 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
3953 msgstr "您没有为推送指定任何引用表达式,并且 push.default 为 \"nothing\"。"
3955 #: builtin/push.c:181
3957 "Updates were rejected because the tip of your current branch is behind\n"
3958 "its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
3959 "before pushing again.\n"
3960 "See the 'Note about fast-forwards' in 'git push --help' for details."
3962 "更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
3963 "再次推送前,先与远程变更合并(如 'git pull')。详见\n"
3964 "'git push --help' 中的 'Note about fast-forwards' 小节。"
3966 #: builtin/push.c:187
3968 "Updates were rejected because a pushed branch tip is behind its remote\n"
3969 "counterpart. If you did not intend to push that branch, you may want to\n"
3970 "specify branches to push or set the 'push.default' configuration\n"
3971 "variable to 'current' or 'upstream' to push only the current branch."
3973 "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
3974 "如果您并非有意推送该分支,您可以在推送时指定要推送的分支,或者将\n"
3975 "配置变量 'push.default' 设置为 'current' 或 'upstream' 以便只推送当前分支。"
3977 #: builtin/push.c:193
3979 "Updates were rejected because a pushed branch tip is behind its remote\n"
3980 "counterpart. Check out this branch and merge the remote changes\n"
3981 "(e.g. 'git pull') before pushing again.\n"
3982 "See the 'Note about fast-forwards' in 'git push --help' for details."
3984 "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
3985 "检出该分支并与远程变更合并(如 'git pull'),然后再推送。详见\n"
3986 "'git push --help' 中的 'Note about fast-forwards' 小节。"
3988 #: builtin/push.c:233
3990 msgid "Pushing to %s\n"
3993 #: builtin/push.c:237
3995 msgid "failed to push some refs to '%s'"
3996 msgstr "无法推送一些引用到 '%s'"
3998 #: builtin/push.c:269
4000 msgid "bad repository '%s'"
4003 #: builtin/push.c:270
4005 "No configured push destination.\n"
4006 "Either specify the URL from the command-line or configure a remote "
4007 "repository using\n"
4009 " git remote add <name> <url>\n"
4011 "and then push using the remote name\n"
4013 " git push <name>\n"
4016 "或者通过命令行指定URL,或者用下面命令配置一个远程版本库\n"
4018 " git remote add <name> <url>\n"
4022 " git push <name>\n"
4024 #: builtin/push.c:285
4025 msgid "--all and --tags are incompatible"
4026 msgstr "--all 和 --tags 不兼容"
4028 #: builtin/push.c:286
4029 msgid "--all can't be combined with refspecs"
4030 msgstr "--all 不能和引用表达式共用"
4032 #: builtin/push.c:291
4033 msgid "--mirror and --tags are incompatible"
4034 msgstr "--mirror 和 --tags 不兼容"
4036 #: builtin/push.c:292
4037 msgid "--mirror can't be combined with refspecs"
4038 msgstr "--mirror 不能和引用表达式共用"
4040 #: builtin/push.c:297
4041 msgid "--all and --mirror are incompatible"
4042 msgstr "--all 和 --mirror 不兼容"
4044 #: builtin/push.c:385
4045 msgid "--delete is incompatible with --all, --mirror and --tags"
4046 msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
4048 #: builtin/push.c:387
4049 msgid "--delete doesn't make sense without any refs"
4050 msgstr "--delete 未接任何引用没有意义"
4052 #: builtin/remote.c:98
4057 #: builtin/remote.c:130
4059 "--mirror is dangerous and deprecated; please\n"
4060 "\t use --mirror=fetch or --mirror=push instead"
4062 "--mirror 选项危险且过时,请使用 --mirror=fetch\n"
4063 "\t 或 --mirror=push"
4065 #: builtin/remote.c:147
4067 msgid "unknown mirror argument: %s"
4070 #: builtin/remote.c:185
4071 msgid "specifying a master branch makes no sense with --mirror"
4072 msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
4074 #: builtin/remote.c:187
4075 msgid "specifying branches to track makes sense only with fetch mirrors"
4076 msgstr "指定要跟踪的分支只在与获取镜像共用才有意义"
4078 #: builtin/remote.c:195 builtin/remote.c:646
4080 msgid "remote %s already exists."
4081 msgstr "远程 %s 已经存在。"
4083 #: builtin/remote.c:199 builtin/remote.c:650
4085 msgid "'%s' is not a valid remote name"
4086 msgstr "'%s' 不是一个有效的远程名称"
4088 #: builtin/remote.c:243
4090 msgid "Could not setup master '%s'"
4091 msgstr "无法设置 master '%s'"
4093 #: builtin/remote.c:299
4095 msgid "more than one %s"
4098 #: builtin/remote.c:339
4100 msgid "Could not get fetch map for refspec %s"
4101 msgstr "无法得到引用表达式 %s 的获取列表"
4103 #: builtin/remote.c:440 builtin/remote.c:448
4107 #: builtin/remote.c:452
4111 #: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607
4113 msgid "Could not append '%s' to '%s'"
4114 msgstr "不能添加 '%s' 至 '%s'"
4116 #: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890
4118 msgid "No such remote: %s"
4121 #: builtin/remote.c:656
4123 msgid "Could not rename config section '%s' to '%s'"
4124 msgstr "不能重命名配置小节 '%s' 到 '%s'"
4126 #: builtin/remote.c:662 builtin/remote.c:799
4128 msgid "Could not remove config section '%s'"
4129 msgstr "不能移除配置小节 '%s'"
4131 #: builtin/remote.c:677
4134 "Not updating non-default fetch refspec\n"
4136 "\tPlease update the configuration manually if necessary."
4142 #: builtin/remote.c:683
4144 msgid "Could not append '%s'"
4147 #: builtin/remote.c:694
4149 msgid "Could not set '%s'"
4152 #: builtin/remote.c:716
4154 msgid "deleting '%s' failed"
4157 #: builtin/remote.c:750
4159 msgid "creating '%s' failed"
4162 #: builtin/remote.c:764
4164 msgid "Could not remove branch %s"
4167 #: builtin/remote.c:834
4169 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
4170 "to delete it, use:"
4172 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
4173 "to delete them, use:"
4174 msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
4175 msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
4177 #: builtin/remote.c:943
4179 msgid " new (next fetch will store in remotes/%s)"
4180 msgstr " 新的(下一次获取将存储于 remotes/%s)"
4182 #: builtin/remote.c:946
4186 #: builtin/remote.c:948
4187 msgid " stale (use 'git remote prune' to remove)"
4188 msgstr " 过时(使用 'git remote prune' 来移除)"
4190 #: builtin/remote.c:950
4194 #: builtin/remote.c:991
4196 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
4197 msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
4199 #: builtin/remote.c:998
4201 msgid "rebases onto remote %s"
4204 #: builtin/remote.c:1001
4206 msgid " merges with remote %s"
4209 #: builtin/remote.c:1002
4210 msgid " and with remote"
4213 #: builtin/remote.c:1004
4215 msgid "merges with remote %s"
4218 #: builtin/remote.c:1005
4219 msgid " and with remote"
4222 #: builtin/remote.c:1051
4226 #: builtin/remote.c:1054
4230 #: builtin/remote.c:1058
4234 #: builtin/remote.c:1061
4235 msgid "fast-forwardable"
4238 #: builtin/remote.c:1064
4239 msgid "local out of date"
4242 #: builtin/remote.c:1071
4244 msgid " %-*s forces to %-*s (%s)"
4245 msgstr " %-*s 强制推送至 %-*s (%s)"
4247 #: builtin/remote.c:1074
4249 msgid " %-*s pushes to %-*s (%s)"
4250 msgstr " %-*s 推送至 %-*s (%s)"
4252 #: builtin/remote.c:1078
4254 msgid " %-*s forces to %s"
4255 msgstr " %-*s 强制推送至 %s"
4257 #: builtin/remote.c:1081
4259 msgid " %-*s pushes to %s"
4260 msgstr " %-*s 推送至 %s"
4262 #: builtin/remote.c:1118
4267 #: builtin/remote.c:1119
4269 msgid " Fetch URL: %s"
4272 #: builtin/remote.c:1120 builtin/remote.c:1285
4276 #: builtin/remote.c:1129 builtin/remote.c:1131
4278 msgid " Push URL: %s"
4281 #: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137
4283 msgid " HEAD branch: %s"
4286 #: builtin/remote.c:1139
4289 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
4290 msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
4292 #: builtin/remote.c:1151
4294 msgid " Remote branch:%s"
4295 msgid_plural " Remote branches:%s"
4296 msgstr[0] " 远程分支:%s"
4297 msgstr[1] " 远程分支:%s"
4299 # 译者:中文字符串拼接,可删除前导空格
4300 #: builtin/remote.c:1154 builtin/remote.c:1181
4301 msgid " (status not queried)"
4304 #: builtin/remote.c:1163
4305 msgid " Local branch configured for 'git pull':"
4306 msgid_plural " Local branches configured for 'git pull':"
4307 msgstr[0] " 为 'git pull' 配置的本地分支:"
4308 msgstr[1] " 为 'git pull' 配置的本地分支:"
4310 #: builtin/remote.c:1171
4311 msgid " Local refs will be mirrored by 'git push'"
4312 msgstr " 本地引用将在 'git push' 时被镜像"
4314 #: builtin/remote.c:1178
4316 msgid " Local ref configured for 'git push'%s:"
4317 msgid_plural " Local refs configured for 'git push'%s:"
4318 msgstr[0] " 为 'git push' 配置的本地引用%s:"
4319 msgstr[1] " 为 'git push' 配置的本地引用%s:"
4321 #: builtin/remote.c:1216
4322 msgid "Cannot determine remote HEAD"
4323 msgstr "无法确定远程 HEAD"
4325 #: builtin/remote.c:1218
4326 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
4327 msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
4329 #: builtin/remote.c:1228
4331 msgid "Could not delete %s"
4334 #: builtin/remote.c:1236
4336 msgid "Not a valid ref: %s"
4337 msgstr "不是一个有效引用:%s"
4339 #: builtin/remote.c:1238
4341 msgid "Could not setup %s"
4345 #: builtin/remote.c:1274
4347 msgid " %s will become dangling!"
4348 msgstr " %s 将成为悬空状态!"
4351 #: builtin/remote.c:1275
4353 msgid " %s has become dangling!"
4354 msgstr " %s 已成为悬空状态!"
4356 #: builtin/remote.c:1281
4361 #: builtin/remote.c:1282
4366 #: builtin/remote.c:1295
4368 msgid " * [would prune] %s"
4369 msgstr " * [将删除] %s"
4371 #: builtin/remote.c:1298
4373 msgid " * [pruned] %s"
4374 msgstr " * [已删除] %s"
4376 #: builtin/remote.c:1387 builtin/remote.c:1461
4378 msgid "No such remote '%s'"
4381 #: builtin/remote.c:1414
4382 msgid "no remote specified"
4385 #: builtin/remote.c:1447
4386 msgid "--add --delete doesn't make sense"
4387 msgstr "--add --delete 无意义"
4389 #: builtin/remote.c:1487
4391 msgid "Invalid old URL pattern: %s"
4392 msgstr "无效的旧URL匹配模版:%s"
4394 #: builtin/remote.c:1495
4396 msgid "No such URL found: %s"
4399 #: builtin/remote.c:1497
4400 msgid "Will not delete all non-push URLs"
4401 msgstr "将不会删除所有非推送URL地址"
4403 #: builtin/reset.c:33
4407 #: builtin/reset.c:33
4411 #: builtin/reset.c:33
4415 #: builtin/reset.c:33
4419 #: builtin/reset.c:33
4423 #: builtin/reset.c:77
4424 msgid "You do not have a valid HEAD."
4425 msgstr "您没有一个有效的 HEAD。"
4427 #: builtin/reset.c:79
4428 msgid "Failed to find tree of HEAD."
4429 msgstr "无法找到 HEAD 指向的树。"
4431 #: builtin/reset.c:85
4433 msgid "Failed to find tree of %s."
4434 msgstr "无法找到 %s 指向的树。"
4436 #: builtin/reset.c:96
4437 msgid "Could not write new index file."
4438 msgstr "不能写入新的索引文件。"
4440 #: builtin/reset.c:106
4442 msgid "HEAD is now at %s"
4443 msgstr "HEAD 现在位于 %s"
4445 #: builtin/reset.c:130
4446 msgid "Could not read index"
4449 #: builtin/reset.c:133
4450 msgid "Unstaged changes after reset:"
4451 msgstr "重置后撤出暂存区的变更:"
4453 # 译者:汉字之间无空格,故删除%s前后空格
4454 #: builtin/reset.c:223
4456 msgid "Cannot do a %s reset in the middle of a merge."
4457 msgstr "在合并过程中不能做%s重置操作。"
4459 #: builtin/reset.c:297
4461 msgid "Could not parse object '%s'."
4462 msgstr "不能解析对象 '%s'。"
4464 #: builtin/reset.c:302
4465 msgid "--patch is incompatible with --{hard,mixed,soft}"
4466 msgstr "--patch 与 --{hard,mixed,soft} 不兼容"
4468 #: builtin/reset.c:311
4469 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
4470 msgstr "--mixed 带路径已弃用,代之以 'git reset -- <paths>'。"
4472 # 译者:汉字之间无空格,故删除%s前后空格
4473 #: builtin/reset.c:313
4475 msgid "Cannot do %s reset with paths."
4476 msgstr "不能带路径进行%s重置。"
4478 # 译者:汉字之间无空格,故删除%s前后空格
4479 #: builtin/reset.c:325
4481 msgid "%s reset is not allowed in a bare repository"
4482 msgstr "不能对裸版本库进行%s重置"
4484 #: builtin/reset.c:341
4486 msgid "Could not reset index file to revision '%s'."
4487 msgstr "不能重置索引文件至版本 '%s'。"
4489 #: builtin/revert.c:70 builtin/revert.c:92
4491 msgid "%s: %s cannot be used with %s"
4492 msgstr "%s:%s 不能和 %s 共用"
4494 #: builtin/revert.c:131
4495 msgid "program error"
4498 #: builtin/revert.c:221
4499 msgid "revert failed"
4502 #: builtin/revert.c:236
4503 msgid "cherry-pick failed"
4509 "'%s' has staged content different from both the file and the HEAD\n"
4510 "(use -f to force removal)"
4512 "'%s' 暂存的内容和工作区及 HEAD 中的都不一样\n"
4518 "'%s' has changes staged in the index\n"
4519 "(use --cached to keep the file, or -f to force removal)"
4522 "(使用 --cached 保存文件,或用 -f 强制删除)"
4527 "'%s' has local modifications\n"
4528 "(use --cached to keep the file, or -f to force removal)"
4531 "(使用 --cached 保存文件,或用 -f 强制删除)"
4535 msgid "not removing '%s' recursively without -r"
4536 msgstr "未提供 -r 选项不会递归删除 '%s'"
4540 msgid "git rm: unable to remove %s"
4541 msgstr "git rm:不能删除 %s"
4543 #: builtin/shortlog.c:157
4545 msgid "Missing author: %s"
4550 msgid "malformed object at '%s'"
4551 msgstr "非法的对象于 '%s'"
4553 #: builtin/tag.c:207
4555 msgid "tag name too long: %.*s..."
4556 msgstr "tag 名字太长:%.*s..."
4558 #: builtin/tag.c:212
4560 msgid "tag '%s' not found."
4561 msgstr "tag '%s' 未发现。"
4563 #: builtin/tag.c:227
4565 msgid "Deleted tag '%s' (was %s)\n"
4566 msgstr "已删除 tag '%s'(曾为 %s)\n"
4568 #: builtin/tag.c:239
4570 msgid "could not verify the tag '%s'"
4571 msgstr "不能校验 tag '%s'"
4573 #: builtin/tag.c:249
4577 "# Write a tag message\n"
4578 "# Lines starting with '#' will be ignored.\n"
4584 "# 以 '#' 开头的行将被忽略。\n"
4587 #: builtin/tag.c:256
4591 "# Write a tag message\n"
4592 "# Lines starting with '#' will be kept; you may remove them yourself if you "
4599 "# 以 '#' 开头的行将被忽略,您可以删除它们如果您想这样做。\n"
4602 #: builtin/tag.c:298
4603 msgid "unable to sign the tag"
4606 #: builtin/tag.c:300
4607 msgid "unable to write tag file"
4610 #: builtin/tag.c:325
4611 msgid "bad object type."
4614 #: builtin/tag.c:338
4615 msgid "tag header too big."
4618 #: builtin/tag.c:370
4619 msgid "no tag message?"
4622 #: builtin/tag.c:376
4624 msgid "The tag message has been left in %s\n"
4625 msgstr "tag 说明被保留在 %s\n"
4627 #: builtin/tag.c:425
4628 msgid "switch 'points-at' requires an object"
4629 msgstr "开关 'points-at' 需要一个对象"
4631 #: builtin/tag.c:427
4633 msgid "malformed object name '%s'"
4634 msgstr "非法的对象名 '%s'"
4636 #: builtin/tag.c:506
4637 msgid "--column and -n are incompatible"
4638 msgstr "--column 和 -n 不兼容"
4640 #: builtin/tag.c:523
4641 msgid "-n option is only allowed with -l."
4642 msgstr "-n 选项只允许和 -l 共用。"
4644 #: builtin/tag.c:525
4645 msgid "--contains option is only allowed with -l."
4646 msgstr "--contains 选项只允许和 -l 共用。"
4648 #: builtin/tag.c:527
4649 msgid "--points-at option is only allowed with -l."
4650 msgstr "--points-at 选项只允许和 -l 共用。"
4652 #: builtin/tag.c:535
4653 msgid "only one -F or -m option is allowed."
4654 msgstr "只允许一个 -F 或 -m 选项。"
4656 #: builtin/tag.c:555
4657 msgid "too many params"
4660 #: builtin/tag.c:561
4662 msgid "'%s' is not a valid tag name."
4663 msgstr "'%s' 不是一个有效的tag名称。"
4665 #: builtin/tag.c:566
4667 msgid "tag '%s' already exists"
4668 msgstr "tag '%s' 已存在"
4670 #: builtin/tag.c:584
4672 msgid "%s: cannot lock the ref"
4675 #: builtin/tag.c:586
4677 msgid "%s: cannot update the ref"
4680 #: builtin/tag.c:588
4682 msgid "Updated tag '%s' (was %s)\n"
4683 msgstr "已更新tag '%s'(曾为 %s)\n"
4686 msgid "See 'git help <command>' for more information on a specific command."
4687 msgstr "参见 'git help <command>' 以获得该特定命令的详细信息。"
4689 #: parse-options.h:133 parse-options.h:235
4693 #: parse-options.h:141
4697 #: parse-options.h:149
4701 #: parse-options.h:151
4705 #: parse-options.h:156
4706 msgid "no-op (backward compatibility)"
4709 #: parse-options.h:228
4710 msgid "be more verbose"
4713 #: parse-options.h:230
4714 msgid "be more quiet"
4717 #: parse-options.h:236
4718 msgid "use <n> digits to display SHA-1s"
4719 msgstr "用 <n> 位数字显示 SHA-1 哈希值"
4722 msgid "Add file contents to the index"
4726 msgid "Find by binary search the change that introduced a bug"
4727 msgstr "通过二分查找定位引入 bug 的变更"
4730 msgid "List, create, or delete branches"
4734 msgid "Checkout a branch or paths to the working tree"
4735 msgstr "检出一个分支或路径到工作区"
4738 msgid "Clone a repository into a new directory"
4739 msgstr "克隆一个版本库到一个新目录"
4742 msgid "Record changes to the repository"
4746 msgid "Show changes between commits, commit and working tree, etc"
4747 msgstr "显示提交之间、提交和工作区之间等的差异"
4750 msgid "Download objects and refs from another repository"
4751 msgstr "从另外一个版本库下载对象和引用"
4754 msgid "Print lines matching a pattern"
4758 msgid "Create an empty git repository or reinitialize an existing one"
4759 msgstr "创建一个空的 git 版本库或者重新初始化一个"
4762 msgid "Show commit logs"
4766 msgid "Join two or more development histories together"
4767 msgstr "合并两个或更多开发历史"
4770 msgid "Move or rename a file, a directory, or a symlink"
4771 msgstr "移动或重命名一个文件、目录或符号链接"
4774 msgid "Fetch from and merge with another repository or a local branch"
4775 msgstr "获取并合并另外的版本库或一个本地分支"
4778 msgid "Update remote refs along with associated objects"
4779 msgstr "更新远程引用和相关的对象"
4782 msgid "Forward-port local commits to the updated upstream head"
4783 msgstr "本地提交转移至更新后的上游分支中"
4786 msgid "Reset current HEAD to the specified state"
4787 msgstr "重置当前HEAD到指定状态"
4790 msgid "Remove files from the working tree and from the index"
4791 msgstr "从工作区和索引中删除文件"
4794 msgid "Show various types of objects"
4798 msgid "Show the working tree status"
4802 msgid "Create, list, delete or verify a tag object signed with GPG"
4803 msgstr "创建、列出、删除或校验一个GPG签名的 tag 对象"
4806 msgid "You need to set your committer info first"
4807 msgstr "您需要先设置你的提交者信息"
4810 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
4811 msgstr "版本库缺乏必要的 blob 数据以进行三路合并。"
4815 "Did you hand edit your patch?\n"
4816 "It does not apply to blobs recorded in its index."
4822 msgid "Falling back to patching base and 3-way merge..."
4823 msgstr "回退到补丁基础版本并使用三路合并..."
4826 msgid "Only one StGIT patch series can be applied at once"
4827 msgstr "一次只能有一个 StGIT 补丁队列被应用"
4831 msgid "Patch format $patch_format is not supported."
4832 msgstr "不支持 $patch_format 补丁格式。"
4835 msgid "Patch format detection failed."
4839 msgid "-d option is no longer supported. Do not use."
4840 msgstr "不再支持 -d 选项。不要使用。"
4844 msgid "previous rebase directory $dotest still exists but mbox given."
4845 msgstr "之前的变基目录 $dotest 仍然存在但给出了mbox。"
4848 msgid "Please make up your mind. --skip or --abort?"
4849 msgstr "请下决心。--skip 或是 --abort ?"
4852 msgid "Resolve operation not in progress, we are not resuming."
4853 msgstr "解决操作未进行,我们不会继续。"
4857 msgid "Dirty index: cannot apply patches (dirty: $files)"
4858 msgstr "脏的索引:不能应用补丁(脏文件:$files)"
4861 msgid "cannot be interactive without stdin connected to a terminal."
4862 msgstr "标准输入没有和终端关联,不能进行交互式操作。"
4865 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
4866 #. in your translation. The program will only accept English
4867 #. input at this point.
4869 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
4870 msgstr "应用?[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
4874 msgid "Applying: $FIRSTLINE"
4875 msgstr "正应用:$FIRSTLINE"
4878 msgid "No changes -- Patch already applied."
4879 msgstr "没有变更 -- 补丁已经应用过。"
4882 msgid "applying to an empty history"
4886 #. TRANSLATORS: Make sure to include [Y] and [n] in your
4887 #. translation. The program will only accept English input
4890 msgid "Do you want me to do it for you [Y/n]? "
4891 msgstr "您想让我为您这样做么[Y/n]? "
4895 msgid "unrecognised option: '$arg'"
4896 msgstr "未能识别的选项:'$arg'"
4900 msgid "'$arg' does not appear to be a valid revision"
4901 msgstr "'$arg' 看起来不像是一个有效的版本"
4903 #: git-bisect.sh:117
4904 msgid "Bad HEAD - I need a HEAD"
4905 msgstr "坏的 HEAD - 我需要一个 HEAD"
4907 #: git-bisect.sh:130
4910 "Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
4911 msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <validbranch>'。"
4913 #: git-bisect.sh:140
4914 msgid "won't bisect on seeked tree"
4915 msgstr "不会在已查找过的树上二分查找"
4917 #: git-bisect.sh:144
4918 msgid "Bad HEAD - strange symbolic ref"
4919 msgstr "坏的 HEAD - 奇怪的符号引用"
4921 #: git-bisect.sh:189
4923 msgid "Bad bisect_write argument: $state"
4924 msgstr "坏的 bisect_write 参数:$state"
4926 #: git-bisect.sh:218
4928 msgid "Bad rev input: $arg"
4929 msgstr "输入坏的版本:$arg"
4931 #: git-bisect.sh:232
4932 msgid "Please call 'bisect_state' with at least one argument."
4933 msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
4935 #: git-bisect.sh:244
4937 msgid "Bad rev input: $rev"
4938 msgstr "输入坏的版本:$rev"
4940 #: git-bisect.sh:250
4941 msgid "'git bisect bad' can take only one argument."
4942 msgstr "'git bisect bad' 只能带一个参数。"
4945 #. TRANSLATORS: Make sure to include [Y] and [n] in your
4946 #. translation. The program will only accept English input
4948 #: git-bisect.sh:279
4949 msgid "Are you sure [Y/n]? "
4950 msgstr "您确认么[Y/n]? "
4952 #: git-bisect.sh:354
4954 msgid "'$invalid' is not a valid commit"
4955 msgstr "'$invalid' 不是一个有效的提交"
4957 #: git-bisect.sh:363
4960 "Could not check out original HEAD '$branch'.\n"
4961 "Try 'git bisect reset <commit>'."
4963 "不能检出原始 HEAD '$branch'。\n"
4964 "尝试 'git bisect reset <commit>'。"
4966 #: git-bisect.sh:390
4967 msgid "No logfile given"
4970 #: git-bisect.sh:391
4972 msgid "cannot read $file for replaying"
4973 msgstr "不能读取 $file 来重放"
4975 #: git-bisect.sh:408
4976 msgid "?? what are you talking about?"
4979 #: git-bisect.sh:474
4980 msgid "We are not bisecting."
4985 "Pull is not possible because you have unmerged files.\n"
4986 "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
4987 "as appropriate to mark resolution, or use 'git commit -a'."
4989 "Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n"
4990 "然后酌情使用 'git add/rm <file>' 标记解决方案,\n"
4991 "或者使用 'git commit -a'。"
4994 msgid "Pull is not possible because you have unmerged files."
4995 msgstr "Pull 不可用,因为您尚有未合并的文件。"
4998 msgid "updating an unborn branch with changes added to the index"
4999 msgstr "更新尚未诞生的分支,变更添加至索引"
5002 msgid "Cannot merge multiple branches into empty head"
5003 msgstr "无法将多个分支合并到空分支"
5006 msgid "Cannot rebase onto multiple branches"
5010 msgid "git stash clear with parameters is unimplemented"
5011 msgstr "git stash clear 不支持参数"
5014 msgid "You do not have the initial commit yet"
5018 msgid "Cannot save the current index state"
5021 #: git-stash.sh:123 git-stash.sh:136
5022 msgid "Cannot save the current worktree state"
5023 msgstr "无法保存当前工作区状态"
5026 msgid "No changes selected"
5030 msgid "Cannot remove temporary index (can't happen)"
5031 msgstr "无法删除临时索引(不应发生)"
5034 msgid "Cannot record working tree state"
5038 msgid "No local changes to save"
5042 msgid "Cannot initialize stash"
5043 msgstr "无法初始化 stash"
5046 msgid "Cannot save the current status"
5050 msgid "Cannot remove worktree changes"
5054 msgid "No stash found."
5059 msgid "Too many revisions specified: $REV"
5060 msgstr "指定了太多的版本:$REV"
5064 msgid "$reference is not valid reference"
5065 msgstr "$reference 不是有效的引用"
5069 msgid "'$args' is not a stash-like commit"
5070 msgstr "'$args' 不是 stash 样提交"
5074 msgid "'$args' is not a stash reference"
5075 msgstr "'$args' 不是一个 stash 引用"
5078 msgid "unable to refresh index"
5082 msgid "Cannot apply a stash in the middle of a merge"
5083 msgstr "无法在合并过程中恢复进度"
5086 msgid "Conflicts in index. Try without --index."
5087 msgstr "索引中有冲突。尝试不使用 --index。"
5090 msgid "Could not save index tree"
5094 msgid "Cannot unstage modified files"
5099 msgid "Dropped ${REV} ($s)"
5100 msgstr "丢弃了 ${REV} ($s)"
5104 msgid "${REV}: Could not drop stash entry"
5105 msgstr "${REV}:不能丢弃进度条目"
5108 msgid "No branch name specified"
5112 msgid "(To restore them type \"git stash apply\")"
5113 msgstr "(为恢复数据输入 \"git stash apply\")"
5115 #: git-submodule.sh:56
5117 msgid "cannot strip one component off url '$remoteurl'"
5118 msgstr "无法从 url '$remoteurl' 剥离一个组件"
5120 #: git-submodule.sh:109
5122 msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
5123 msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
5125 #: git-submodule.sh:150
5127 msgid "Clone of '$url' into submodule path '$sm_path' failed"
5128 msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
5130 #: git-submodule.sh:160
5132 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
5133 msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或者相反"
5135 #: git-submodule.sh:249
5137 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
5138 msgstr "版本库URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
5140 #: git-submodule.sh:266
5142 msgid "'$sm_path' already exists in the index"
5143 msgstr "'$sm_path' 已经存在于索引中"
5145 #: git-submodule.sh:283
5147 msgid "'$sm_path' already exists and is not a valid git repo"
5148 msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"
5150 #: git-submodule.sh:297
5152 msgid "Unable to checkout submodule '$sm_path'"
5153 msgstr "不能检出子模组 '$sm_path'"
5155 #: git-submodule.sh:302
5157 msgid "Failed to add submodule '$sm_path'"
5158 msgstr "无法添加子模组 '$sm_path'"
5160 #: git-submodule.sh:307
5162 msgid "Failed to register submodule '$sm_path'"
5163 msgstr "无法注册子模组 '$sm_path'"
5165 #: git-submodule.sh:349
5167 msgid "Entering '$prefix$sm_path'"
5168 msgstr "正在进入 '$prefix$sm_path'"
5170 #: git-submodule.sh:363
5172 msgid "Stopping at '$sm_path'; script returned non-zero status."
5173 msgstr "停止于 '$sm_path',脚本返回非零值。"
5175 #: git-submodule.sh:406
5177 msgid "No url found for submodule path '$sm_path' in .gitmodules"
5178 msgstr "在 .gitmodules 中未找到子模组路径 '$sm_path' 的 url"
5180 #: git-submodule.sh:415
5182 msgid "Failed to register url for submodule path '$sm_path'"
5183 msgstr "无法为子模组路径 '$sm_path' 注册 url"
5185 #: git-submodule.sh:417
5187 msgid "Submodule '$name' ($url) registered for path '$sm_path'"
5188 msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册"
5190 #: git-submodule.sh:425
5192 msgid "Failed to register update mode for submodule path '$sm_path'"
5193 msgstr "无法为子模组路径 '$sm_path' 注册更新模式"
5195 #: git-submodule.sh:524
5198 "Submodule path '$sm_path' not initialized\n"
5199 "Maybe you want to use 'update --init'?"
5201 "子模组路径 '$sm_path' 没有初始化\n"
5202 "也许您想用 'update --init'?"
5204 #: git-submodule.sh:537
5206 msgid "Unable to find current revision in submodule path '$sm_path'"
5207 msgstr "无法在子模组路径 '$sm_path' 中找到当前版本"
5209 #: git-submodule.sh:556
5211 msgid "Unable to fetch in submodule path '$sm_path'"
5212 msgstr "无法在子模组路径 '$sm_path' 中获取"
5214 #: git-submodule.sh:570
5216 msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
5217 msgstr "无法在子模组路径 '$sm_path' 中变基 '$sha1'"
5219 #: git-submodule.sh:571
5221 msgid "Submodule path '$sm_path': rebased into '$sha1'"
5222 msgstr "子模组路径 '$sm_path':变基至 '$sha1'"
5224 #: git-submodule.sh:576
5226 msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
5227 msgstr "无法合并 '$sha1' 到子模组路径 '$sm_path' 中"
5229 #: git-submodule.sh:577
5231 msgid "Submodule path '$sm_path': merged in '$sha1'"
5232 msgstr "子模组路径 '$sm_path':已合并入 '$sha1'"
5234 #: git-submodule.sh:582
5236 msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
5237 msgstr "无法在子模组路径 '$sm_path' 中检出 '$sha1'"
5239 #: git-submodule.sh:583
5241 msgid "Submodule path '$sm_path': checked out '$sha1'"
5242 msgstr "子模组路径 '$sm_path':检出 '$sha1'"
5244 #: git-submodule.sh:605 git-submodule.sh:928
5246 msgid "Failed to recurse into submodule path '$sm_path'"
5247 msgstr "无法递归进子模组路径 '$sm_path'"
5249 #: git-submodule.sh:713
5254 #: git-submodule.sh:771
5256 msgid " Warn: $name doesn't contain commit $sha1_src"
5257 msgstr " 警告:$name 未包含提交 $sha1_src"
5260 #: git-submodule.sh:774
5262 msgid " Warn: $name doesn't contain commit $sha1_dst"
5263 msgstr " 警告:$name 未包含提交 $sha1_dst"
5266 #: git-submodule.sh:777
5268 msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
5269 msgstr " 警告:$name 未包含提交 $sha1_src 和 $sha1_dst"
5271 #: git-submodule.sh:802
5275 #: git-submodule.sh:803
5279 #: git-submodule.sh:974
5281 msgid "Synchronizing submodule url for '$name'"
5282 msgstr "为 '$name' 同步子模组 url"
5284 #~ msgid "Could not extract email from committer identity."
5285 #~ msgstr "不能从提交者身份中提取邮件地址。"
5287 #~ msgid "cherry-pick"
5290 #~ msgid "Please enter the commit message for your changes."
5291 #~ msgstr "请为您的修改输入提交说明。"
5293 #~ msgid "Too many options specified"
5294 #~ msgstr "指定了太多的选项"