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-05-21 08:57+0800\n"
16 "PO-Revision-Date: 2012-06-01 17:40+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=1; plural=0;\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:697
57 msgid "could not open '%s'"
61 msgid "Repository lacks these prerequisite commits:"
62 msgstr "版本库缺少这些必备的提交:"
64 #: bundle.c:164 sequencer.c:533 sequencer.c:965 builtin/log.c:289
65 #: builtin/log.c:719 builtin/log.c:1335 builtin/log.c:1554 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 个引用"
78 msgid "The bundle requires this ref"
79 msgid_plural "The bundle requires these %d refs"
81 msgstr[1] "这个包需要 %d 个这些引用"
87 #: bundle.c:296 builtin/log.c:1231 builtin/shortlog.c:284
89 msgid "unrecognized argument: %s"
94 msgid "ref '%s' is excluded by the rev-list options"
95 msgstr "引用 '%s' 被 rev-list 选项排除"
98 msgid "Refusing to create empty bundle."
102 msgid "Could not spawn pack-objects"
103 msgstr "不能生成 pack-objects 进程"
106 msgid "pack-objects died"
107 msgstr "pack-objects 终止"
111 msgid "cannot create '%s'"
115 msgid "index-pack died"
116 msgstr "index-pack 终止"
120 msgid "could not parse %s"
125 msgid "%s %s is not a commit!"
126 msgstr "%s %s 不是一个提交!"
128 #: compat/obstack.c:406 compat/obstack.c:408
129 msgid "memory exhausted"
133 msgid "Could not run 'git rev-list'"
134 msgstr "不能执行 'git rev-list'"
138 msgid "failed write to rev-list: %s"
139 msgstr "无法写入 rev-list:%s"
143 msgid "failed to close rev-list's stdin: %s"
144 msgstr "无法关闭 rev-list 的标准输入:%s"
147 msgid "in the future"
152 msgid "%lu second ago"
153 msgid_plural "%lu seconds ago"
158 msgid "%lu minute ago"
159 msgid_plural "%lu minutes ago"
165 msgid_plural "%lu hours ago"
171 msgid_plural "%lu days ago"
177 msgid_plural "%lu weeks ago"
182 msgid "%lu month ago"
183 msgid_plural "%lu months ago"
189 msgid_plural "%lu years"
194 msgid "%s, %lu month ago"
195 msgid_plural "%s, %lu months ago"
196 msgstr[0] "%s,%lu 个月之前"
198 #: date.c:154 date.c:159
201 msgid_plural "%lu years ago"
207 msgid " Failed to parse dirstat cut-off percentage '%.*s'\n"
208 msgstr " 无法解析 dirstat 阈值 '%.*s'\n"
213 msgid " Unknown dirstat parameter '%.*s'\n"
214 msgstr " 未知 dirstat 参数 '%.*s'\n"
219 "Found errors in 'diff.dirstat' config variable:\n"
222 "发现配置变量 'diff.dirstat' 中的错误:\n"
226 msgid " 0 files changed\n"
231 msgid " %d file changed"
232 msgid_plural " %d files changed"
233 msgstr[0] " %d 个文件被修改"
237 msgid ", %d insertion(+)"
238 msgid_plural ", %d insertions(+)"
239 msgstr[0] ",插入 %d 行(+)"
243 msgid ", %d deletion(-)"
244 msgid_plural ", %d deletions(-)"
245 msgstr[0] ",删除 %d 行(-)"
250 "Failed to parse --dirstat/-X option parameter:\n"
253 "无法解析 --dirstat/-X 选项的参数:\n"
256 #: gpg-interface.c:59
257 msgid "could not run gpg."
260 #: gpg-interface.c:71
261 msgid "gpg did not accept the data"
264 #: gpg-interface.c:82
265 msgid "gpg failed to sign the data"
270 msgid "'%s': unable to read %s"
271 msgstr "'%s':无法读取 %s"
280 msgid "'%s': short read %s"
281 msgstr "'%s':读取不完整 %s"
285 msgid "available git commands in '%s'"
286 msgstr "在 '%s' 下可用的 git 命令"
289 msgid "git commands available from elsewhere on your $PATH"
290 msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
295 "'%s' appears to be a git command, but we were not\n"
296 "able to execute it. Maybe git-%s is broken?"
298 "'%s' 像是一个 git 命令,但却无法运行。\n"
302 msgid "Uh oh. Your system reports no Git commands at all."
303 msgstr "唉呀,您的系统中未发现 Git 命令。"
308 "WARNING: You called a Git command named '%s', which does not exist.\n"
309 "Continuing under the assumption that you meant '%s'"
311 "警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
316 msgid "in %0.1f seconds automatically..."
317 msgstr "在 %0.1f 秒钟后自动运行..."
321 msgid "git: '%s' is not a git command. See 'git --help'."
322 msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
330 "Did you mean one of these?"
338 #: parse-options.c:493
342 #: parse-options.c:511
347 #. TRANSLATORS: the colon here should align with the
348 #. one in "usage: %s" translation
349 #: parse-options.c:515
354 # 译者:为保证在输出中对齐,注意调整句中空格!
355 #: parse-options.c:518
362 msgid "Your branch is ahead of '%s' by %d commit.\n"
363 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
364 msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
368 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
370 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
371 msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
376 "Your branch and '%s' have diverged,\n"
377 "and have %d and %d different commit each, respectively.\n"
379 "Your branch and '%s' have diverged,\n"
380 "and have %d and %d different commits each, respectively.\n"
382 "您的分支和 '%s' 出现了偏离,\n"
383 "并且各自分别有 %d 和 %d 处不同的提交。\n"
385 #: sequencer.c:121 builtin/merge.c:865 builtin/merge.c:978
386 #: builtin/merge.c:1088 builtin/merge.c:1098
388 msgid "Could not open '%s' for writing"
389 msgstr "不能为写入打开 '%s'"
391 #: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:868
392 #: builtin/merge.c:1090 builtin/merge.c:1103
394 msgid "Could not write to '%s'"
399 "after resolving the conflicts, mark the corrected paths\n"
400 "with 'git add <paths>' or 'git rm <paths>'"
402 "冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
407 "after resolving the conflicts, mark the corrected paths\n"
408 "with 'git add <paths>' or 'git rm <paths>'\n"
409 "and commit the result with 'git commit'"
411 "冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
412 "对修正后的文件做标记,然后用 'git commit' 提交"
414 #: sequencer.c:160 sequencer.c:741 sequencer.c:824
416 msgid "Could not write to %s"
421 msgid "Error wrapping up %s"
425 msgid "Your local changes would be overwritten by cherry-pick."
426 msgstr "您的本地修改将被拣选操作覆盖。"
429 msgid "Your local changes would be overwritten by revert."
430 msgstr "您的本地修改将被还原操作覆盖。"
433 msgid "Commit your changes or stash them to proceed."
434 msgstr "提交您的修改或保存进度后再继续。"
436 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
439 msgid "%s: Unable to write new index file"
440 msgstr "%s:无法写入新索引文件"
443 msgid "Could not resolve HEAD commit\n"
444 msgstr "不能解析 HEAD 提交\n"
447 msgid "Unable to update cache tree\n"
452 msgid "Could not parse commit %s\n"
457 msgid "Could not parse parent commit %s\n"
458 msgstr "不能解析父提交 %s\n"
461 msgid "Your index file is unmerged."
462 msgstr "您的索引文件未完成合并。"
465 msgid "You do not have a valid HEAD"
466 msgstr "您没有一个有效的 HEAD"
470 msgid "Commit %s is a merge but no -m option was given."
471 msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
475 msgid "Commit %s does not have parent %d"
476 msgstr "提交 %s 没有父提交 %d"
480 msgid "Mainline was specified but commit %s is not a merge."
481 msgstr "指定了主线但提交 %s 不是一个合并。"
483 #. TRANSLATORS: The first %s will be "revert" or
484 #. "cherry-pick", the second %s a SHA1
487 msgid "%s: cannot parse parent commit %s"
488 msgstr "%s:不能解析父提交 %s"
492 msgid "Cannot get commit message for %s"
493 msgstr "不能得到 %s 的提交说明"
497 msgid "could not revert %s... %s"
498 msgstr "不能还原 %s... %s"
502 msgid "could not apply %s... %s"
503 msgstr "不能应用 %s... %s"
506 msgid "empty commit set passed"
511 msgid "git %s: failed to read the index"
512 msgstr "git %s:无法读取索引"
516 msgid "git %s: failed to refresh the index"
517 msgstr "git %s:无法刷新索引"
521 msgid "Cannot %s during a %s"
522 msgstr "无法 %s 在一个 %s 过程中"
526 msgid "Could not parse line %d."
530 msgid "No commits parsed."
535 msgid "Could not open %s"
540 msgid "Could not read %s."
545 msgid "Unusable instruction sheet: %s"
550 msgid "Invalid key: %s"
555 msgid "Invalid value for %s: %s"
560 msgid "Malformed options sheet: %s"
564 msgid "a cherry-pick or revert is already in progress"
565 msgstr "一个拣选或还原操作已在进行"
568 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
569 msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
573 msgid "Could not create sequencer directory %s"
576 #: sequencer.c:743 sequencer.c:828
578 msgid "Error wrapping up %s."
581 #: sequencer.c:762 sequencer.c:896
582 msgid "no cherry-pick or revert in progress"
583 msgstr "没有拣选或还原操作在进行"
586 msgid "cannot resolve HEAD"
590 msgid "cannot abort from a branch yet to be born"
591 msgstr "不能从尚未建立的分支终止"
593 #: sequencer.c:788 builtin/apply.c:3689
595 msgid "cannot open %s: %s"
600 msgid "cannot read %s: %s"
604 msgid "unexpected end of file"
609 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
610 msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
614 msgid "Could not format %s."
618 msgid "Can't revert as initial commit"
622 msgid "Can't cherry-pick into empty head"
626 msgid "HEAD does not point to a branch"
627 msgstr "HEAD 没有指向一个分支"
631 msgid "No such branch: '%s'"
636 msgid "No upstream configured for branch '%s'"
637 msgstr "尚未给分支 '%s' 设置上游"
641 msgid "Upstream branch '%s' not stored as a remote-tracking branch"
642 msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
645 msgid "Unmerged paths:"
649 #: wt-status.c:141 wt-status.c:158
651 msgid " (use \"git reset %s <file>...\" to unstage)"
652 msgstr " (使用 \"git reset %s <file>...\" 撤出暂存区)"
655 #: wt-status.c:143 wt-status.c:160
656 msgid " (use \"git rm --cached <file>...\" to unstage)"
657 msgstr " (使用 \"git rm --cached <file>...\" 撤出暂存区)"
661 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
662 msgstr " (酌情使用 \"git add/rm <file>...\" 标记解决方案)"
665 msgid "Changes to be committed:"
669 msgid "Changes not staged for commit:"
670 msgstr "尚未暂存以备提交的变更:"
674 msgid " (use \"git add <file>...\" to update what will be committed)"
675 msgstr " (使用 \"git add <file>...\" 更新要提交的内容)"
679 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
680 msgstr " (使用 \"git add/rm <file>...\" 更新要提交的内容)"
685 " (use \"git checkout -- <file>...\" to discard changes in working directory)"
686 msgstr " (使用 \"git checkout -- <file>...\" 丢弃工作区的改动)"
690 msgid " (commit or discard the untracked or modified content in submodules)"
691 msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
701 msgid " (use \"git %s <file>...\" to include in what will be committed)"
702 msgstr " (使用 \"git %s <file>...\" 以包含要提交的内容)"
709 msgid "both deleted:"
717 msgid "deleted by them:"
721 msgid "added by them:"
725 msgid "deleted by us:"
733 msgid "both modified:"
736 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
738 msgid "new commits, "
741 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
743 msgid "modified content, "
746 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
748 msgid "untracked content, "
751 # 译者:为保证在输出中对齐,注意调整句中空格!
757 # 译者:为保证在输出中对齐,注意调整句中空格!
760 msgid "copied: %s -> %s"
761 msgstr "拷贝: %s -> %s"
763 # 译者:为保证在输出中对齐,注意调整句中空格!
769 # 译者:为保证在输出中对齐,注意调整句中空格!
775 # 译者:为保证在输出中对齐,注意调整句中空格!
778 msgid "renamed: %s -> %s"
779 msgstr "重命名: %s -> %s"
781 # 译者:为保证在输出中对齐,注意调整句中空格!
784 msgid "typechange: %s"
787 # 译者:为保证在输出中对齐,注意调整句中空格!
793 # 译者:为保证在输出中对齐,注意调整句中空格!
801 msgid "bug: unhandled diff status %c"
802 msgstr "bug:未处理的差异状态 %c"
809 msgid "Not currently on any branch."
813 msgid "Initial commit"
826 msgid "Untracked files not listed%s"
827 msgstr "未跟踪的文件没有列出%s"
831 msgid " (use -u option to show untracked files)"
832 msgstr "(使用 -u 参数显示未跟踪的文件)"
840 msgid "no changes added to commit%s\n"
841 msgstr "修改尚未加入提交%s\n"
845 msgid " (use \"git add\" and/or \"git commit -a\")"
846 msgstr "(使用 \"git add\" 和/或 \"git commit -a\")"
850 msgid "nothing added to commit but untracked files present%s\n"
851 msgstr "空提交但存在未跟踪文件%s\n"
855 msgid " (use \"git add\" to track)"
856 msgstr "(使用 \"git add\" 建立跟踪)"
858 #: wt-status.c:793 wt-status.c:796 wt-status.c:799
860 msgid "nothing to commit%s\n"
865 msgid " (create/copy files and use \"git add\" to track)"
866 msgstr "(新建/拷贝的文件使用 \"git add\" 建立跟踪)"
870 msgid " (use -u to show untracked files)"
871 msgstr "(使用 -u 显示未跟踪文件)"
875 msgid " (working directory clean)"
879 msgid "HEAD (no branch)"
884 msgid "Initial commit on "
893 #: wt-status.c:932 wt-status.c:935
904 msgid "unexpected diff status %c"
907 #: builtin/add.c:67 builtin/commit.c:226
908 msgid "updating files failed"
913 msgid "remove '%s'\n"
918 msgid "Path '%s' is in submodule '%.*s'"
919 msgstr "路径 '%s' 属于模组 '%.*s'"
922 msgid "Unstaged changes after refreshing the index:"
923 msgstr "刷新索引之后尚未被暂存的变更:"
925 #: builtin/add.c:195 builtin/add.c:456 builtin/rm.c:186
927 msgid "pathspec '%s' did not match any files"
928 msgstr "路径 '%s' 未匹配任何文件"
932 msgid "'%s' is beyond a symbolic link"
933 msgstr "'%s' 位于符号链接中"
936 msgid "Could not read the index"
941 msgid "Could not open '%s' for writing."
942 msgstr "不能为写入打开 '%s'。"
945 msgid "Could not write patch"
950 msgid "Could not stat '%s'"
951 msgstr "不能查看文件状态 '%s'"
954 msgid "Empty patch. Aborted."
959 msgid "Could not apply '%s'"
963 msgid "The following paths are ignored by one of your .gitignore files:\n"
964 msgstr "下列路径被您的一个 .gitignore 文件所忽略:\n"
968 msgid "Use -f if you really want to add them.\n"
969 msgstr "使用 -f 参数如果您确实要添加它们。\n"
972 msgid "no files added"
976 msgid "adding files failed"
980 msgid "-A and -u are mutually incompatible"
981 msgstr "-A 和 -u 选项互斥"
984 msgid "Option --ignore-missing can only be used together with --dry-run"
985 msgstr "选项 --ignore-missing 只能和 --dry-run 共用"
989 msgid "Nothing specified, nothing added.\n"
990 msgstr "没有指定文件,也没有文件被添加。\n"
994 msgid "Maybe you wanted to say 'git add .'?\n"
995 msgstr "也许您想要执行 'git add .'?\n"
997 #: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:286 builtin/mv.c:82
999 msgid "index file corrupt"
1002 #: builtin/add.c:476 builtin/apply.c:4100 builtin/mv.c:229 builtin/rm.c:260
1003 msgid "Unable to write new index file"
1006 #: builtin/apply.c:53
1007 msgid "git apply [options] [<patch>...]"
1008 msgstr "git apply [选项] [<补丁>...]"
1010 #: builtin/apply.c:106
1012 msgid "unrecognized whitespace option '%s'"
1013 msgstr "未能识别的空白字符选项 '%s'"
1015 #: builtin/apply.c:121
1017 msgid "unrecognized whitespace ignore option '%s'"
1018 msgstr "未能识别的空白字符忽略选项 '%s'"
1020 #: builtin/apply.c:815
1022 msgid "Cannot prepare timestamp regexp %s"
1023 msgstr "无法准备时间戳正则表达式 %s"
1025 #: builtin/apply.c:824
1027 msgid "regexec returned %d for input: %s"
1028 msgstr "regexec 返回 %d,输入为:%s"
1030 #: builtin/apply.c:905
1032 msgid "unable to find filename in patch at line %d"
1033 msgstr "不能在补丁的第 %d 行找到文件名"
1035 #: builtin/apply.c:937
1037 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
1038 msgstr "git apply:错误的 git-diff - 期望 /dev/null,但在第 %2$d 行得到 %1$s"
1040 #: builtin/apply.c:941
1042 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
1043 msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
1045 #: builtin/apply.c:942
1047 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
1048 msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
1050 #: builtin/apply.c:949
1052 msgid "git apply: bad git-diff - expected /dev/null on line %d"
1053 msgstr "git apply:错误的 git-diff - 期望 /dev/null 于第 %d 行"
1055 #: builtin/apply.c:1394
1057 msgid "recount: unexpected line: %.*s"
1058 msgstr "recount:意外的行:%.*s"
1060 #: builtin/apply.c:1451
1062 msgid "patch fragment without header at line %d: %.*s"
1063 msgstr "第 %d 行的补丁片段没有头信息:%.*s"
1065 #: builtin/apply.c:1468
1068 "git diff header lacks filename information when removing %d leading pathname "
1069 "component (line %d)"
1071 "git diff header lacks filename information when removing %d leading pathname "
1072 "components (line %d)"
1074 "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
1076 #: builtin/apply.c:1628
1077 msgid "new file depends on old contents"
1080 #: builtin/apply.c:1630
1081 msgid "deleted file still has contents"
1084 #: builtin/apply.c:1656
1086 msgid "corrupt patch at line %d"
1087 msgstr "补丁损坏位于第 %d 行"
1089 #: builtin/apply.c:1692
1091 msgid "new file %s depends on old contents"
1092 msgstr "新文件 %s 依赖旧内容"
1094 #: builtin/apply.c:1694
1096 msgid "deleted file %s still has contents"
1097 msgstr "删除的文件 %s 仍有内容"
1099 #: builtin/apply.c:1697
1101 msgid "** warning: file %s becomes empty but is not deleted"
1102 msgstr "** 警告:文件 %s 成为空文件但并未删除"
1104 #: builtin/apply.c:1843
1106 msgid "corrupt binary patch at line %d: %.*s"
1107 msgstr "二进制补丁在第 %d 行损坏:%.*s"
1109 #. there has to be one hunk (forward hunk)
1110 #: builtin/apply.c:1872
1112 msgid "unrecognized binary patch at line %d"
1113 msgstr "未能识别的二进制补丁位于第 %d 行"
1115 #: builtin/apply.c:1958
1117 msgid "patch with only garbage at line %d"
1118 msgstr "补丁文件的第 %d 行只有垃圾数据"
1120 #: builtin/apply.c:2048
1122 msgid "unable to read symlink %s"
1123 msgstr "无法读取符号链接 %s"
1125 #: builtin/apply.c:2052
1127 msgid "unable to open or read %s"
1130 #: builtin/apply.c:2123
1134 #: builtin/apply.c:2645
1136 msgid "invalid start of line: '%c'"
1137 msgstr "无效的行首字符:'%c'"
1139 #: builtin/apply.c:2763
1141 msgid "Hunk #%d succeeded at %d (offset %d line)."
1142 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1143 msgstr[0] "块 #%d 成功应用于 %d (偏移 %d 行)"
1145 #: builtin/apply.c:2775
1147 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
1148 msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
1150 #: builtin/apply.c:2781
1153 "while searching for:\n"
1159 #: builtin/apply.c:2800
1161 msgid "missing binary patch data for '%s'"
1162 msgstr "缺失 '%s' 的二进制补丁数据"
1164 #: builtin/apply.c:2903
1166 msgid "binary patch does not apply to '%s'"
1167 msgstr "二进制补丁未应用到 '%s'"
1169 #: builtin/apply.c:2909
1171 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1172 msgstr "到 '%s' 的二进制补丁产生了不正确的结果(预期 %s,得到 %s)"
1174 #: builtin/apply.c:2930
1176 msgid "patch failed: %s:%ld"
1177 msgstr "打补丁失败:%s:%ld"
1179 #: builtin/apply.c:3045
1181 msgid "patch %s has been renamed/deleted"
1182 msgstr "补丁 %s 已经被重命名/删除"
1184 #: builtin/apply.c:3052 builtin/apply.c:3069
1186 msgid "read of %s failed"
1189 #: builtin/apply.c:3084
1190 msgid "removal patch leaves file contents"
1191 msgstr "移除补丁仍留下了文件内容"
1193 #: builtin/apply.c:3105
1195 msgid "%s: already exists in working directory"
1196 msgstr "%s:已经存在于工作区中"
1198 #: builtin/apply.c:3143
1200 msgid "%s: has been deleted/renamed"
1201 msgstr "%s:已经被删除/重命名"
1203 #: builtin/apply.c:3148 builtin/apply.c:3179
1208 #: builtin/apply.c:3159
1210 msgid "%s: does not exist in index"
1213 #: builtin/apply.c:3173
1215 msgid "%s: does not match index"
1218 #: builtin/apply.c:3190
1220 msgid "%s: wrong type"
1223 #: builtin/apply.c:3192
1225 msgid "%s has type %o, expected %o"
1226 msgstr "%s 的类型是 %o,预期是 %o"
1228 #: builtin/apply.c:3247
1230 msgid "%s: already exists in index"
1231 msgstr "%s:已经存在于索引中"
1233 #: builtin/apply.c:3266
1235 msgid "new mode (%o) of %s does not match old mode (%o)%s%s"
1236 msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)%4$s%5$s 不匹配"
1238 #: builtin/apply.c:3272
1240 msgid "%s: patch does not apply"
1243 #: builtin/apply.c:3285
1245 msgid "Checking patch %s..."
1248 #: builtin/apply.c:3340 builtin/checkout.c:212 builtin/reset.c:158
1250 msgid "make_cache_entry failed for path '%s'"
1251 msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
1253 #: builtin/apply.c:3483
1255 msgid "unable to remove %s from index"
1256 msgstr "不能从索引中移除 %s"
1258 #: builtin/apply.c:3510
1260 msgid "corrupt patch for subproject %s"
1261 msgstr "子项目 %s 损坏的补丁"
1263 #: builtin/apply.c:3514
1265 msgid "unable to stat newly created file '%s'"
1266 msgstr "不能枚举新建文件 '%s' 的状态"
1268 #: builtin/apply.c:3519
1270 msgid "unable to create backing store for newly created file %s"
1271 msgstr "不能为新建文件 %s 创建后端存储"
1273 #: builtin/apply.c:3522
1275 msgid "unable to add cache entry for %s"
1276 msgstr "无法为 %s 添加缓存条目"
1278 #: builtin/apply.c:3555
1280 msgid "closing file '%s'"
1283 #: builtin/apply.c:3604
1285 msgid "unable to write file '%s' mode %o"
1286 msgstr "不能写文件 '%s' 权限 %o"
1288 #: builtin/apply.c:3660
1290 msgid "Applied patch %s cleanly."
1293 #: builtin/apply.c:3668
1294 msgid "internal error"
1297 #. Say this even without --verbose
1298 #: builtin/apply.c:3671
1300 msgid "Applying patch %%s with %d reject..."
1301 msgid_plural "Applying patch %%s with %d rejects..."
1302 msgstr[0] "应用补丁 %%s 时 %d 个被拒绝..."
1304 #: builtin/apply.c:3681
1306 msgid "truncating .rej filename to %.*s.rej"
1307 msgstr "截短 .rej 文件名为 %.*s.rej"
1309 #: builtin/apply.c:3702
1311 msgid "Hunk #%d applied cleanly."
1312 msgstr "第 #%d 个片段成功应用。"
1314 #: builtin/apply.c:3705
1316 msgid "Rejected hunk #%d."
1317 msgstr "拒绝第 #%d 个片段。"
1319 #: builtin/apply.c:3836
1320 msgid "unrecognized input"
1323 #: builtin/apply.c:3847
1324 msgid "unable to read index file"
1327 #: builtin/apply.c:3962 builtin/apply.c:3965
1331 #: builtin/apply.c:3963
1332 msgid "don't apply changes matching the given path"
1333 msgstr "不要应用与给出路径向匹配的变更"
1335 #: builtin/apply.c:3966
1336 msgid "apply changes matching the given path"
1337 msgstr "应用与给出路径向匹配的变更"
1339 #: builtin/apply.c:3968
1343 #: builtin/apply.c:3969
1344 msgid "remove <num> leading slashes from traditional diff paths"
1345 msgstr "从传统的 diff 路径中移除 <数字> 个前导路径"
1347 #: builtin/apply.c:3972
1348 msgid "ignore additions made by the patch"
1349 msgstr "忽略补丁中的添加的文件"
1351 #: builtin/apply.c:3974
1352 msgid "instead of applying the patch, output diffstat for the input"
1353 msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
1355 #: builtin/apply.c:3978
1356 msgid "shows number of added and deleted lines in decimal notation"
1357 msgstr "以数字方式显示添加或删除行的数量"
1359 #: builtin/apply.c:3980
1360 msgid "instead of applying the patch, output a summary for the input"
1361 msgstr "不应用补丁,而是显示输入的概要"
1363 #: builtin/apply.c:3982
1364 msgid "instead of applying the patch, see if the patch is applicable"
1365 msgstr "不应用补丁,而是查看补丁是否可应用"
1367 #: builtin/apply.c:3984
1368 msgid "make sure the patch is applicable to the current index"
1369 msgstr "确认补丁可以应用到当前索引"
1371 #: builtin/apply.c:3986
1372 msgid "apply a patch without touching the working tree"
1373 msgstr "应用补丁而不修改工作区"
1375 #: builtin/apply.c:3988
1376 msgid "also apply the patch (use with --stat/--summary/--check)"
1377 msgstr "同时应用此补丁(和 --stat/--summary/--check 共用)"
1379 #: builtin/apply.c:3990
1380 msgid "build a temporary index based on embedded index information"
1381 msgstr "创建一个临时索引基于嵌入的索引信息"
1383 #: builtin/apply.c:3992
1384 msgid "paths are separated with NUL character"
1385 msgstr "路径以 NUL 字符分隔"
1387 #: builtin/apply.c:3995
1388 msgid "ensure at least <n> lines of context match"
1389 msgstr "确保至少匹配 <n> 行上下文"
1391 #: builtin/apply.c:3996
1395 #: builtin/apply.c:3997
1396 msgid "detect new or modified lines that have whitespace errors"
1397 msgstr "检查新增和修改的行中间的空白字符滥用"
1399 #: builtin/apply.c:4000 builtin/apply.c:4003
1400 msgid "ignore changes in whitespace when finding context"
1401 msgstr "查找上下文时忽略空白字符的变更"
1403 #: builtin/apply.c:4006
1404 msgid "apply the patch in reverse"
1407 #: builtin/apply.c:4008
1408 msgid "don't expect at least one line of context"
1411 #: builtin/apply.c:4010
1412 msgid "leave the rejected hunks in corresponding *.rej files"
1413 msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
1415 #: builtin/apply.c:4012
1416 msgid "allow overlapping hunks"
1419 #: builtin/apply.c:4013
1423 #: builtin/apply.c:4015
1424 msgid "tolerate incorrectly detected missing new-line at the end of file"
1425 msgstr "宽容不正确的文件末尾换行符"
1427 #: builtin/apply.c:4018
1428 msgid "do not trust the line counts in the hunk headers"
1429 msgstr "不信任补丁片段的头信息中的行号"
1431 #: builtin/apply.c:4020
1435 #: builtin/apply.c:4021
1436 msgid "prepend <root> to all filenames"
1437 msgstr "为所有文件名前添加 <根目录>"
1439 #: builtin/apply.c:4042
1440 msgid "--index outside a repository"
1441 msgstr "--index 在一个版本库之外"
1443 #: builtin/apply.c:4045
1444 msgid "--cached outside a repository"
1445 msgstr "--cached 在一个版本库之外"
1447 #: builtin/apply.c:4061
1449 msgid "can't open patch '%s'"
1450 msgstr "不能打开补丁 '%s'"
1452 #: builtin/apply.c:4075
1454 msgid "squelched %d whitespace error"
1455 msgid_plural "squelched %d whitespace errors"
1456 msgstr[0] "抑制下仍有 %d 个空白字符误用"
1458 #: builtin/apply.c:4081 builtin/apply.c:4091
1460 msgid "%d line adds whitespace errors."
1461 msgid_plural "%d lines add whitespace errors."
1462 msgstr[0] "%d 行有空白字符误用。"
1464 #: builtin/archive.c:17
1466 msgid "could not create archive file '%s'"
1467 msgstr "不能创建归档文件 '%s'"
1469 #: builtin/archive.c:20
1470 msgid "could not redirect output"
1473 #: builtin/archive.c:37
1474 msgid "git archive: Remote with no URL"
1475 msgstr "git archive:未提供远程URL"
1477 #: builtin/archive.c:58
1478 msgid "git archive: expected ACK/NAK, got EOF"
1479 msgstr "git archive:期待ACK/NACK,却得到EOF"
1481 #: builtin/archive.c:63
1483 msgid "git archive: NACK %s"
1484 msgstr "git archive:NACK %s"
1486 #: builtin/archive.c:65
1488 msgid "remote error: %s"
1491 #: builtin/archive.c:66
1492 msgid "git archive: protocol error"
1493 msgstr "git archive:协议错误"
1495 #: builtin/archive.c:71
1496 msgid "git archive: expected a flush"
1497 msgstr "git archive:预期一个刷新"
1499 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
1500 #: builtin/branch.c:144
1503 "deleting branch '%s' that has been merged to\n"
1504 " '%s', but not yet merged to HEAD."
1506 "将要删除的分支 '%s' 已经被合并到\n"
1509 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
1510 #: builtin/branch.c:148
1513 "not deleting branch '%s' that is not yet merged to\n"
1514 " '%s', even though it is merged to HEAD."
1516 "并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
1517 " 然而却尚未被合并到分支 '%s' 。"
1519 #: builtin/branch.c:180
1520 msgid "cannot use -a with -d"
1521 msgstr "不能将 -a 和 -d 共用"
1523 #: builtin/branch.c:186
1524 msgid "Couldn't look up commit object for HEAD"
1525 msgstr "无法查询 HEAD 指向的提交对象"
1527 #: builtin/branch.c:191
1529 msgid "Cannot delete the branch '%s' which you are currently on."
1530 msgstr "无法删除您当前所在的分支 '%s'。"
1532 #: builtin/branch.c:202
1533 msgid "remote branch '%s' not found."
1534 msgstr "远程分支 '%s' 未发现。"
1536 #: builtin/branch.c:203
1538 msgid "branch '%s' not found."
1539 msgstr "分支 '%s' 未发现。"
1541 #: builtin/branch.c:210
1543 msgid "Couldn't look up commit object for '%s'"
1544 msgstr "无法查询 '%s' 指向的提交对象"
1546 #: builtin/branch.c:216
1549 "The branch '%s' is not fully merged.\n"
1550 "If you are sure you want to delete it, run 'git branch -D %s'."
1553 "如果您确认要删除它,执行 'git branch -D %s'。"
1555 #: builtin/branch.c:225
1557 msgid "Error deleting remote branch '%s'"
1558 msgstr "删除远程分支 '%s' 时出错"
1560 #: builtin/branch.c:226
1562 msgid "Error deleting branch '%s'"
1563 msgstr "删除分支 '%s' 时出错"
1565 #: builtin/branch.c:233
1567 msgid "Deleted remote branch %s (was %s).\n"
1568 msgstr "已删除远程分支 %s(曾为 %s)。\n"
1570 #: builtin/branch.c:234
1572 msgid "Deleted branch %s (was %s).\n"
1573 msgstr "已删除分支 %s(曾为 %s)。\n"
1575 #: builtin/branch.c:239
1576 msgid "Update of config-file failed"
1577 msgstr "无法更新 config 文件"
1579 #: builtin/branch.c:337
1581 msgid "branch '%s' does not point at a commit"
1582 msgstr "分支 '%s' 未指向一个提交"
1584 #: builtin/branch.c:409
1586 msgid "[%s: behind %d]"
1589 #: builtin/branch.c:411
1594 #: builtin/branch.c:415
1596 msgid "[%s: ahead %d]"
1599 #: builtin/branch.c:417
1604 #: builtin/branch.c:420
1606 msgid "[%s: ahead %d, behind %d]"
1607 msgstr "[%s:领先 %d,落后 %d]"
1609 #: builtin/branch.c:423
1611 msgid "[ahead %d, behind %d]"
1612 msgstr "[领先 %d,落后 %d]"
1614 #: builtin/branch.c:535
1618 #: builtin/branch.c:600
1619 msgid "some refs could not be read"
1622 #: builtin/branch.c:613
1623 msgid "cannot rename the current branch while not on any."
1624 msgstr "无法重命名当前分支因为不处于任何分支上。"
1626 #: builtin/branch.c:623
1628 msgid "Invalid branch name: '%s'"
1629 msgstr "无效的分支名:'%s'"
1631 #: builtin/branch.c:638
1632 msgid "Branch rename failed"
1635 #: builtin/branch.c:642
1637 msgid "Renamed a misnamed branch '%s' away"
1638 msgstr "重命名掉一个错误命名的旧分支 '%s'"
1640 #: builtin/branch.c:646
1642 msgid "Branch renamed to %s, but HEAD is not updated!"
1643 msgstr "分支重命名为 %s,但 HEAD 没有更新!"
1645 #: builtin/branch.c:653
1646 msgid "Branch is renamed, but update of config-file failed"
1647 msgstr "分支被重命名,但更新 config 文件失败"
1649 #: builtin/branch.c:668
1651 msgid "malformed object name %s"
1654 #: builtin/branch.c:692
1656 msgid "could not write branch description template: %s"
1657 msgstr "不能写分支描述模版:%s"
1659 #: builtin/branch.c:783
1660 msgid "Failed to resolve HEAD as a valid ref."
1661 msgstr "无法将 HEAD 解析为有效引用。"
1663 #: builtin/branch.c:788 builtin/clone.c:558
1664 msgid "HEAD not found below refs/heads!"
1665 msgstr "HEAD 没有位于 /refs/heads 之下!"
1667 #: builtin/branch.c:808
1668 msgid "--column and --verbose are incompatible"
1669 msgstr "--column 和 --verbose 不兼容"
1671 #: builtin/branch.c:857
1672 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
1673 msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
1675 #: builtin/bundle.c:47
1677 msgid "%s is okay\n"
1680 #: builtin/bundle.c:56
1681 msgid "Need a repository to create a bundle."
1682 msgstr "需要一个版本库来创建包。"
1684 #: builtin/bundle.c:60
1685 msgid "Need a repository to unbundle."
1686 msgstr "需要一个版本库来解包。"
1688 #: builtin/checkout.c:113 builtin/checkout.c:146
1690 msgid "path '%s' does not have our version"
1691 msgstr "路径 '%s' 没有我们的版本"
1693 #: builtin/checkout.c:115 builtin/checkout.c:148
1695 msgid "path '%s' does not have their version"
1696 msgstr "路径 '%s' 没有他们的版本"
1698 #: builtin/checkout.c:131
1700 msgid "path '%s' does not have all necessary versions"
1701 msgstr "路径 '%s' 没有全部必须的版本"
1703 #: builtin/checkout.c:175
1705 msgid "path '%s' does not have necessary versions"
1706 msgstr "路径 '%s' 没有必须的版本"
1708 #: builtin/checkout.c:192
1710 msgid "path '%s': cannot merge"
1711 msgstr "path '%s':无法合并"
1713 #: builtin/checkout.c:209
1715 msgid "Unable to add merge result for '%s'"
1716 msgstr "无法为 '%s' 添加合并结果"
1718 #: builtin/checkout.c:234 builtin/checkout.c:392
1719 msgid "corrupt index file"
1722 #: builtin/checkout.c:264 builtin/checkout.c:271
1724 msgid "path '%s' is unmerged"
1725 msgstr "路径 '%s' 未合并"
1727 #: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583
1728 #: builtin/merge.c:812
1729 msgid "unable to write new index file"
1732 #: builtin/checkout.c:319 builtin/diff.c:302 builtin/merge.c:408
1733 msgid "diff_setup_done failed"
1734 msgstr "diff_setup_done 失败"
1736 #: builtin/checkout.c:414
1737 msgid "you need to resolve your current index first"
1738 msgstr "您需要先解决当前索引的冲突"
1740 #: builtin/checkout.c:533
1742 msgid "Can not do reflog for '%s'\n"
1743 msgstr "不能对 '%s' 执行 reflog 操作\n"
1745 #: builtin/checkout.c:566
1746 msgid "HEAD is now at"
1749 #: builtin/checkout.c:573
1751 msgid "Reset branch '%s'\n"
1752 msgstr "重置分支 '%s'\n"
1754 #: builtin/checkout.c:576
1756 msgid "Already on '%s'\n"
1757 msgstr "已经位于 '%s'\n"
1759 #: builtin/checkout.c:580
1761 msgid "Switched to and reset branch '%s'\n"
1762 msgstr "切换并重置分支 '%s'\n"
1764 #: builtin/checkout.c:582
1766 msgid "Switched to a new branch '%s'\n"
1767 msgstr "切换到一个新分支 '%s'\n"
1769 #: builtin/checkout.c:584
1771 msgid "Switched to branch '%s'\n"
1772 msgstr "切换到分支 '%s'\n"
1775 #: builtin/checkout.c:640
1777 msgid " ... and %d more.\n"
1778 msgstr " ... 及其它 %d 个。\n"
1780 #. The singular version
1781 #: builtin/checkout.c:646
1784 "Warning: you are leaving %d commit behind, not connected to\n"
1785 "any of your branches:\n"
1789 "Warning: you are leaving %d commits behind, not connected to\n"
1790 "any of your branches:\n"
1794 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
1798 #: builtin/checkout.c:664
1801 "If you want to keep them by creating a new branch, this may be a good time\n"
1804 " git branch new_branch_name %s\n"
1807 "如果您想要通过创建新分支保存他们,这可能是一个好时候。\n"
1810 " git branch new_branch_name %s\n"
1813 #: builtin/checkout.c:694
1814 msgid "internal error in revision walk"
1815 msgstr "在版本遍历时遇到内部错误"
1817 #: builtin/checkout.c:698
1818 msgid "Previous HEAD position was"
1819 msgstr "之前的 HEAD 位置是"
1821 #: builtin/checkout.c:724
1822 msgid "You are on a branch yet to be born"
1823 msgstr "您位于一个尚未初始化的分支"
1826 #: builtin/checkout.c:855
1828 msgid "invalid reference: %s"
1831 #. case (1): want a tree
1832 #: builtin/checkout.c:894
1834 msgid "reference is not a tree: %s"
1837 #: builtin/checkout.c:974
1838 msgid "-B cannot be used with -b"
1839 msgstr "-B 不能和 -b 共用"
1841 #: builtin/checkout.c:983
1842 msgid "--patch is incompatible with all other options"
1843 msgstr "--patch 选项和其他选项不兼容"
1845 #: builtin/checkout.c:986
1846 msgid "--detach cannot be used with -b/-B/--orphan"
1847 msgstr "--detach 不能和 -b/-B/--orphan 共用"
1849 #: builtin/checkout.c:988
1850 msgid "--detach cannot be used with -t"
1851 msgstr "--detach 不能和 -t 共用"
1853 #: builtin/checkout.c:994
1854 msgid "--track needs a branch name"
1855 msgstr "--track 需要一个分支名"
1857 #: builtin/checkout.c:1001
1858 msgid "Missing branch name; try -b"
1859 msgstr "缺少分支名;尝试 -b"
1861 #: builtin/checkout.c:1007
1862 msgid "--orphan and -b|-B are mutually exclusive"
1863 msgstr "--orphan 和 -b|-B 互斥"
1865 #: builtin/checkout.c:1009
1866 msgid "--orphan cannot be used with -t"
1867 msgstr "--orphan 不能和 -t 共用"
1869 #: builtin/checkout.c:1019
1870 msgid "git checkout: -f and -m are incompatible"
1871 msgstr "git checkout:-f 和 -m 不兼容"
1873 #: builtin/checkout.c:1053
1874 msgid "invalid path specification"
1877 #: builtin/checkout.c:1061
1880 "git checkout: updating paths is incompatible with switching branches.\n"
1881 "Did you intend to checkout '%s' which can not be resolved as commit?"
1883 "git checkout:更新路径和切换分支不兼容。\n"
1884 "您是想要检出 '%s' 但未能将其解析为提交么?"
1886 #: builtin/checkout.c:1063
1887 msgid "git checkout: updating paths is incompatible with switching branches."
1888 msgstr "git checkout:更新路径和切换分支不兼容。"
1890 #: builtin/checkout.c:1068
1891 msgid "git checkout: --detach does not take a path argument"
1892 msgstr "git checkout:--detach 不跟路径参数"
1894 #: builtin/checkout.c:1071
1896 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
1897 "checking out of the index."
1899 "git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
1901 #: builtin/checkout.c:1090
1902 msgid "Cannot switch branch to a non-commit."
1903 msgstr "无法切换分支到一个非提交。"
1905 #: builtin/checkout.c:1093
1906 msgid "--ours/--theirs is incompatible with switching branches."
1907 msgstr "--ours/--theirs 和切换分支不兼容。"
1909 #: builtin/clean.c:78
1910 msgid "-x and -X cannot be used together"
1911 msgstr "-x 和 -X 不能共用"
1913 #: builtin/clean.c:82
1915 "clean.requireForce set to true and neither -n nor -f given; refusing to clean"
1917 "clean.requireForce 设置为 true 且未提供 -n 或 -f 选项,拒绝执行清理动作"
1919 #: builtin/clean.c:85
1921 "clean.requireForce defaults to true and neither -n nor -f given; refusing to "
1924 "clean.requireForce 默认为 true 且未提供 -n 或 -f 选项,拒绝执行清理动作"
1926 #: builtin/clean.c:155 builtin/clean.c:176
1928 msgid "Would remove %s\n"
1931 #: builtin/clean.c:159 builtin/clean.c:179
1933 msgid "Removing %s\n"
1936 #: builtin/clean.c:162 builtin/clean.c:182
1938 msgid "failed to remove %s"
1941 #: builtin/clean.c:166
1943 msgid "Would not remove %s\n"
1946 #: builtin/clean.c:168
1948 msgid "Not removing %s\n"
1951 #: builtin/clone.c:243
1953 msgid "reference repository '%s' is not a local directory."
1954 msgstr "引用版本库 '%s' 不是一个本地目录。"
1956 #: builtin/clone.c:302
1958 msgid "failed to open '%s'"
1961 #: builtin/clone.c:306
1963 msgid "failed to create directory '%s'"
1964 msgstr "无法创建目录 '%s'"
1966 #: builtin/clone.c:308 builtin/diff.c:75
1968 msgid "failed to stat '%s'"
1969 msgstr "无法枚举 '%s' 状态"
1971 #: builtin/clone.c:310
1973 msgid "%s exists and is not a directory"
1974 msgstr "%s 存在且不是一个目录"
1976 #: builtin/clone.c:324
1978 msgid "failed to stat %s\n"
1979 msgstr "无法枚举 %s 状态\n"
1981 #: builtin/clone.c:341
1983 msgid "failed to unlink '%s'"
1986 #: builtin/clone.c:346
1988 msgid "failed to create link '%s'"
1989 msgstr "无法创建链接 '%s'"
1991 #: builtin/clone.c:350
1993 msgid "failed to copy file to '%s'"
1994 msgstr "无法拷贝文件至 '%s'"
1996 #: builtin/clone.c:373
2001 #: builtin/clone.c:440
2003 msgid "Could not find remote branch %s to clone."
2004 msgstr "不能发现要克隆的远程分支 %s。"
2006 #: builtin/clone.c:549
2007 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
2008 msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
2010 #: builtin/clone.c:639
2011 msgid "Too many arguments."
2014 #: builtin/clone.c:643
2015 msgid "You must specify a repository to clone."
2016 msgstr "您必须指定一个版本库来克隆。"
2018 #: builtin/clone.c:654
2020 msgid "--bare and --origin %s options are incompatible."
2021 msgstr "--bare 和 --origin %s 选项不兼容。"
2023 #: builtin/clone.c:668
2025 msgid "repository '%s' does not exist"
2026 msgstr "版本库 '%s' 不存在"
2028 #: builtin/clone.c:673
2029 msgid "--depth is ignored in local clones; use file:// instead."
2030 msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
2032 #: builtin/clone.c:683
2034 msgid "destination path '%s' already exists and is not an empty directory."
2035 msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
2037 #: builtin/clone.c:693
2039 msgid "working tree '%s' already exists."
2040 msgstr "工作区 '%s' 已经存在。"
2042 #: builtin/clone.c:706 builtin/clone.c:720
2044 msgid "could not create leading directories of '%s'"
2045 msgstr "不能为 '%s' 创建先导目录"
2047 #: builtin/clone.c:709
2049 msgid "could not create work tree dir '%s'."
2050 msgstr "不能为 '%s' 创建工作区目录。"
2052 #: builtin/clone.c:728
2054 msgid "Cloning into bare repository '%s'...\n"
2055 msgstr "克隆到裸版本库 '%s'...\n"
2057 #: builtin/clone.c:730
2059 msgid "Cloning into '%s'...\n"
2060 msgstr "正克隆到 '%s'...\n"
2062 #: builtin/clone.c:786
2064 msgid "Don't know how to clone %s"
2067 #: builtin/clone.c:835
2069 msgid "Remote branch %s not found in upstream %s"
2070 msgstr "远程分支 %s 在上游 %s 未发现"
2072 #: builtin/clone.c:842
2073 msgid "You appear to have cloned an empty repository."
2074 msgstr "您似乎克隆了一个空版本库。"
2076 #: builtin/column.c:51
2077 msgid "--command must be the first argument"
2078 msgstr "--command 必须是第一个参数"
2080 #: builtin/commit.c:43
2082 "Your name and email address were configured automatically based\n"
2083 "on your username and hostname. Please check that they are accurate.\n"
2084 "You can suppress this message by setting them explicitly:\n"
2086 " git config --global user.name \"Your Name\"\n"
2087 " git config --global user.email you@example.com\n"
2089 "After doing this, you may fix the identity used for this commit with:\n"
2091 " git commit --amend --reset-author\n"
2093 "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
2094 "与否。您可以通过下面的命令对其进行明确地设置以免再出现本提示信息:\n"
2096 " git config --global user.name \"Your Name\"\n"
2097 " git config --global user.email you@example.com\n"
2099 "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
2101 " git commit --amend --reset-author\n"
2103 #: builtin/commit.c:55
2105 "You asked to amend the most recent commit, but doing so would make\n"
2106 "it empty. You can repeat your command with --allow-empty, or you can\n"
2107 "remove the commit entirely with \"git reset HEAD^\".\n"
2109 "您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
2110 "--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
2112 #: builtin/commit.c:60
2114 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
2115 "If you wish to commit it anyway, use:\n"
2117 " git commit --allow-empty\n"
2119 "Otherwise, please use 'git reset'\n"
2121 "之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
2124 " git commit --allow-empty\n"
2126 "否则,请使用命令 'git reset'\n"
2128 #: builtin/commit.c:253
2129 msgid "failed to unpack HEAD tree object"
2130 msgstr "无法解包 HEAD 树对象"
2132 #: builtin/commit.c:295
2133 msgid "unable to create temporary index"
2136 #: builtin/commit.c:301
2137 msgid "interactive add failed"
2140 #: builtin/commit.c:334 builtin/commit.c:355 builtin/commit.c:405
2141 msgid "unable to write new_index file"
2142 msgstr "无法写 new_index 文件"
2144 #: builtin/commit.c:386
2145 msgid "cannot do a partial commit during a merge."
2146 msgstr "在合并过程中不能做部分提交。"
2148 #: builtin/commit.c:388
2149 msgid "cannot do a partial commit during a cherry-pick."
2150 msgstr "在拣选过程中不能做部分提交。"
2152 #: builtin/commit.c:398
2153 msgid "cannot read the index"
2156 #: builtin/commit.c:418
2157 msgid "unable to write temporary index file"
2160 #: builtin/commit.c:493 builtin/commit.c:499
2162 msgid "invalid commit: %s"
2165 #: builtin/commit.c:522
2166 msgid "malformed --author parameter"
2167 msgstr "非法的 --author 参数"
2169 #: builtin/commit.c:583
2171 msgid "Malformed ident string: '%s'"
2172 msgstr "非法的身份字符串:'%s'"
2174 #: builtin/commit.c:621 builtin/commit.c:654 builtin/commit.c:968
2176 msgid "could not lookup commit %s"
2179 #: builtin/commit.c:633 builtin/shortlog.c:296
2181 msgid "(reading log message from standard input)\n"
2182 msgstr "(正从标准输入中读取日志信息)\n"
2184 #: builtin/commit.c:635
2185 msgid "could not read log from standard input"
2186 msgstr "不能从标准输入中读取日志信息"
2188 #: builtin/commit.c:639
2190 msgid "could not read log file '%s'"
2191 msgstr "不能读取日志文件 '%s'"
2193 #: builtin/commit.c:645
2194 msgid "commit has empty message"
2197 #: builtin/commit.c:661
2198 msgid "could not read MERGE_MSG"
2199 msgstr "不能读取 MERGE_MSG"
2201 #: builtin/commit.c:665
2202 msgid "could not read SQUASH_MSG"
2203 msgstr "不能读取 SQUASH_MSG"
2205 #: builtin/commit.c:669
2207 msgid "could not read '%s'"
2210 #: builtin/commit.c:721
2211 msgid "could not write commit template"
2214 #: builtin/commit.c:732
2218 "It looks like you may be committing a merge.\n"
2219 "If this is not correct, please remove the file\n"
2224 "看起来您正在做一个合并提交。如果不对,请删除文件\n"
2228 #: builtin/commit.c:737
2232 "It looks like you may be committing a cherry-pick.\n"
2233 "If this is not correct, please remove the file\n"
2238 "看起来您正在做一个拣选提交。如果不对,请删除文件\n"
2242 #: builtin/commit.c:749
2244 "Please enter the commit message for your changes. Lines starting\n"
2245 "with '#' will be ignored, and an empty message aborts the commit.\n"
2247 "请为您的变更输入提交说明。以 '#' 开始的行将被忽略,而一个空的提交\n"
2250 #: builtin/commit.c:754
2252 "Please enter the commit message for your changes. Lines starting\n"
2253 "with '#' will be kept; you may remove them yourself if you want to.\n"
2254 "An empty message aborts the commit.\n"
2256 "请为您的变更输入提交说明。以 '#' 开始的行将被保留,您可以删除它们\n"
2257 "如果您想这样做的话。而一个空的提交说明将会终止提交。\n"
2259 # 译者:为保证在输出中对齐,注意调整句中空格!
2260 #: builtin/commit.c:767
2262 msgid "%sAuthor: %s"
2265 # 译者:为保证在输出中对齐,注意调整句中空格!
2266 #: builtin/commit.c:774
2268 msgid "%sCommitter: %s"
2271 #: builtin/commit.c:794
2272 msgid "Cannot read index"
2275 #: builtin/commit.c:831
2276 msgid "Error building trees"
2279 #: builtin/commit.c:846 builtin/tag.c:361
2281 msgid "Please supply the message using either -m or -F option.\n"
2282 msgstr "请使用 -m 或者 -F 选项提供提交说明。\n"
2284 #: builtin/commit.c:943
2286 msgid "No existing author found with '%s'"
2287 msgstr "没有找到匹配 '%s' 的作者"
2289 #: builtin/commit.c:958 builtin/commit.c:1158
2291 msgid "Invalid untracked files mode '%s'"
2292 msgstr "无效的未追踪文件参数 '%s'"
2294 #: builtin/commit.c:998
2295 msgid "Using both --reset-author and --author does not make sense"
2296 msgstr "同时使用 --reset-author 和 --author 没有意义"
2298 #: builtin/commit.c:1009
2299 msgid "You have nothing to amend."
2302 #: builtin/commit.c:1012
2303 msgid "You are in the middle of a merge -- cannot amend."
2304 msgstr "您正处于一个合并过程中 -- 无法修补提交。"
2306 #: builtin/commit.c:1014
2307 msgid "You are in the middle of a cherry-pick -- cannot amend."
2308 msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
2310 #: builtin/commit.c:1017
2311 msgid "Options --squash and --fixup cannot be used together"
2312 msgstr "选项 --squash 和 --fixup 不能共用"
2314 #: builtin/commit.c:1027
2315 msgid "Only one of -c/-C/-F/--fixup can be used."
2316 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
2318 #: builtin/commit.c:1029
2319 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
2320 msgstr "选项 -m 不能和 -c/-C/-F/--fixup 共用。"
2322 #: builtin/commit.c:1037
2323 msgid "--reset-author can be used only with -C, -c or --amend."
2324 msgstr "--reset-author 只能和 -C、-c 或 --amend 共用。"
2326 #: builtin/commit.c:1054
2327 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
2328 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
2330 #: builtin/commit.c:1056
2331 msgid "No paths with --include/--only does not make sense."
2332 msgstr "参数 --include/--only 不跟路径没有意义。"
2334 #: builtin/commit.c:1058
2335 msgid "Clever... amending the last one with dirty index."
2336 msgstr "聪明... 在索引不干净下修补最后的提交。"
2338 #: builtin/commit.c:1060
2339 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
2340 msgstr "指定了明确的路径而没有使用 -i 或 -o 选项;认为是 --only paths..."
2342 #: builtin/commit.c:1070 builtin/tag.c:577
2344 msgid "Invalid cleanup mode %s"
2347 #: builtin/commit.c:1075
2348 msgid "Paths with -a does not make sense."
2349 msgstr "路径和 -a 选项共用没有意义。"
2351 #: builtin/commit.c:1258
2352 msgid "couldn't look up newly created commit"
2355 #: builtin/commit.c:1260
2356 msgid "could not parse newly created commit"
2359 #: builtin/commit.c:1301
2360 msgid "detached HEAD"
2363 # 译者:中文字符串拼接,可删除前导空格
2364 #: builtin/commit.c:1303
2365 msgid " (root-commit)"
2368 #: builtin/commit.c:1447
2369 msgid "could not parse HEAD commit"
2370 msgstr "不能解析 HEAD 提交"
2372 #: builtin/commit.c:1485 builtin/merge.c:509
2374 msgid "could not open '%s' for reading"
2375 msgstr "不能为读入打开 '%s'"
2377 #: builtin/commit.c:1492
2379 msgid "Corrupt MERGE_HEAD file (%s)"
2380 msgstr "损坏的 MERGE_HEAD 文件(%s)"
2382 #: builtin/commit.c:1499
2383 msgid "could not read MERGE_MODE"
2384 msgstr "不能读取 MERGE_MODE"
2386 #: builtin/commit.c:1518
2388 msgid "could not read commit message: %s"
2389 msgstr "不能读取提交说明:%s"
2391 #: builtin/commit.c:1532
2393 msgid "Aborting commit; you did not edit the message.\n"
2394 msgstr "终止提交;您未更改来自模版的提交说明。\n"
2396 #: builtin/commit.c:1537
2398 msgid "Aborting commit due to empty commit message.\n"
2399 msgstr "终止提交因为提交说明为空。\n"
2401 #: builtin/commit.c:1552 builtin/merge.c:936 builtin/merge.c:961
2402 msgid "failed to write commit object"
2405 #: builtin/commit.c:1573
2406 msgid "cannot lock HEAD ref"
2407 msgstr "无法锁定 HEAD 引用"
2409 #: builtin/commit.c:1577
2410 msgid "cannot update HEAD ref"
2411 msgstr "无法更新 HEAD 引用"
2413 #: builtin/commit.c:1588
2415 "Repository has been updated, but unable to write\n"
2416 "new_index file. Check that disk is not full or quota is\n"
2417 "not exceeded, and then \"git reset HEAD\" to recover."
2419 "版本库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
2420 "或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
2422 #: builtin/describe.c:234
2424 msgid "annotated tag %s not available"
2425 msgstr "注释 tag %s 无效"
2427 #: builtin/describe.c:238
2429 msgid "annotated tag %s has no embedded name"
2430 msgstr "注释 tag %s 没有嵌入名称"
2432 #: builtin/describe.c:240
2434 msgid "tag '%s' is really '%s' here"
2435 msgstr "tag '%s' 的确是在 '%s'"
2437 #: builtin/describe.c:267
2439 msgid "Not a valid object name %s"
2440 msgstr "不是一个有效的对象名 %s"
2442 #: builtin/describe.c:270
2444 msgid "%s is not a valid '%s' object"
2445 msgstr "%s 不是一个有效的 '%s' 对象"
2447 #: builtin/describe.c:287
2449 msgid "no tag exactly matches '%s'"
2450 msgstr "没有 tag 准确匹配 '%s'"
2452 #: builtin/describe.c:289
2454 msgid "searching to describe %s\n"
2457 #: builtin/describe.c:329
2459 msgid "finished search at %s\n"
2462 #: builtin/describe.c:353
2465 "No annotated tags can describe '%s'.\n"
2466 "However, there were unannotated tags: try --tags."
2468 "没有注释 tag 能描述 '%s'。\n"
2469 "然而,有非注释 tag:尝试 --tags。"
2471 #: builtin/describe.c:357
2474 "No tags can describe '%s'.\n"
2475 "Try --always, or create some tags."
2477 "没有注释 tag 能描述 '%s'。\n"
2478 "尝试 --always,或者创建一些 tag。"
2480 #: builtin/describe.c:378
2482 msgid "traversed %lu commits\n"
2483 msgstr "已遍历 %lu 个提交\n"
2485 #: builtin/describe.c:381
2488 "more than %i tags found; listed %i most recent\n"
2489 "gave up search at %s\n"
2491 "发现多于 %i 个 tag,列出最近的 %i 个\n"
2494 #: builtin/describe.c:436
2495 msgid "--long is incompatible with --abbrev=0"
2496 msgstr "--long 与 --abbrev=0 不兼容"
2498 #: builtin/describe.c:462
2499 msgid "No names found, cannot describe anything."
2500 msgstr "没有发现名称,无法描述任何东西。"
2502 #: builtin/describe.c:482
2503 msgid "--dirty is incompatible with committishes"
2504 msgstr "--dirty 不能与提交共用"
2506 #: builtin/diff.c:77
2508 msgid "'%s': not a regular file or symlink"
2509 msgstr "'%s':不是一个正规文件或符号链接"
2511 #: builtin/diff.c:220
2513 msgid "invalid option: %s"
2516 #: builtin/diff.c:297
2517 msgid "Not a git repository"
2518 msgstr "不是一个 git 版本库"
2520 #: builtin/diff.c:347
2522 msgid "invalid object '%s' given."
2523 msgstr "提供了无效对象 '%s'。"
2525 #: builtin/diff.c:352
2527 msgid "more than %d trees given: '%s'"
2528 msgstr "提供了超过 %d 个树对象:'%s'"
2530 #: builtin/diff.c:362
2532 msgid "more than two blobs given: '%s'"
2533 msgstr "提供了超过两个 blob 对象:'%s'"
2535 #: builtin/diff.c:370
2537 msgid "unhandled object '%s' given."
2538 msgstr "提供了无法处理的对象 '%s'。"
2540 #: builtin/fetch.c:200
2541 msgid "Couldn't find remote ref HEAD"
2542 msgstr "无法发现远程 HEAD 引用"
2544 #: builtin/fetch.c:253
2546 msgid "object %s not found"
2549 #: builtin/fetch.c:259
2550 msgid "[up to date]"
2553 #: builtin/fetch.c:273
2555 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
2556 msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)"
2558 #: builtin/fetch.c:274 builtin/fetch.c:360
2562 #: builtin/fetch.c:285
2563 msgid "[tag update]"
2567 #: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340
2568 msgid " (unable to update local ref)"
2569 msgstr " (不能更新本地引用)"
2571 #: builtin/fetch.c:305
2575 #: builtin/fetch.c:308
2576 msgid "[new branch]"
2579 #: builtin/fetch.c:311
2583 #: builtin/fetch.c:356
2584 msgid "unable to update local ref"
2587 #: builtin/fetch.c:356
2588 msgid "forced update"
2591 #: builtin/fetch.c:362
2592 msgid "(non-fast-forward)"
2595 #: builtin/fetch.c:393 builtin/fetch.c:685
2597 msgid "cannot open %s: %s\n"
2598 msgstr "无法打开 %s:%s\n"
2600 #: builtin/fetch.c:402
2602 msgid "%s did not send all necessary objects\n"
2603 msgstr "%s 未发送所有必须的对象\n"
2605 #: builtin/fetch.c:488
2610 #: builtin/fetch.c:499
2613 "some local refs could not be updated; try running\n"
2614 " 'git remote prune %s' to remove any old, conflicting branches"
2616 "一些本地引用不能被更新;尝试运行\n"
2617 " 'git remote prune %s' 来删除旧的、有冲突的分支"
2620 #: builtin/fetch.c:549
2622 msgid " (%s will become dangling)"
2623 msgstr " (%s 将成为悬空状态)"
2626 #: builtin/fetch.c:550
2628 msgid " (%s has become dangling)"
2629 msgstr " (%s 已成为悬空状态)"
2631 #: builtin/fetch.c:557
2635 #: builtin/fetch.c:558 builtin/remote.c:1055
2639 #: builtin/fetch.c:675
2641 msgid "Refusing to fetch into current branch %s of non-bare repository"
2642 msgstr "拒绝获取到非裸版本库的当前分支 %s"
2644 #: builtin/fetch.c:709
2646 msgid "Don't know how to fetch from %s"
2647 msgstr "不知道如何从 %s 获取"
2649 #: builtin/fetch.c:786
2651 msgid "Option \"%s\" value \"%s\" is not valid for %s"
2652 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
2654 #: builtin/fetch.c:789
2656 msgid "Option \"%s\" is ignored for %s\n"
2657 msgstr "选项 \"%s\" 为 %s 所忽略\n"
2659 #: builtin/fetch.c:888
2661 msgid "Fetching %s\n"
2664 #: builtin/fetch.c:890 builtin/remote.c:100
2666 msgid "Could not fetch %s"
2669 #: builtin/fetch.c:907
2671 "No remote repository specified. Please, specify either a URL or a\n"
2672 "remote name from which new revisions should be fetched."
2673 msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定,用以获取新提交。"
2675 #: builtin/fetch.c:927
2676 msgid "You need to specify a tag name."
2677 msgstr "您需要指定一个 tag 名称。"
2679 #: builtin/fetch.c:979
2680 msgid "fetch --all does not take a repository argument"
2681 msgstr "fetch --all 不能带一个版本库参数"
2683 #: builtin/fetch.c:981
2684 msgid "fetch --all does not make sense with refspecs"
2685 msgstr "fetch --all 带引用表达式没有任何意义"
2687 #: builtin/fetch.c:992
2689 msgid "No such remote or remote group: %s"
2690 msgstr "没有这样的远程或远程组:%s"
2692 #: builtin/fetch.c:1000
2693 msgid "Fetching a group and specifying refspecs does not make sense"
2694 msgstr "获取组并指定引用表达式没有意义"
2698 msgid "Invalid %s: '%s'"
2699 msgstr "无效的 %s:'%s'"
2703 msgid "insanely long object directory %.*s"
2704 msgstr "不正常的长对象目录 %.*s"
2708 msgid "Auto packing the repository for optimum performance.\n"
2709 msgstr "自动打包版本库以求最佳性能。\n"
2714 "Auto packing the repository for optimum performance. You may also\n"
2715 "run \"git gc\" manually. See \"git help gc\" for more information.\n"
2717 "自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n"
2718 "参见 \"git help gc\" 以获取更多信息。\n"
2722 "There are too many unreachable loose objects; run 'git prune' to remove them."
2723 msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
2725 #: builtin/grep.c:216
2727 msgid "grep: failed to create thread: %s"
2728 msgstr "grep:无法创建线程:%s"
2730 #: builtin/grep.c:402
2732 msgid "Failed to chdir: %s"
2735 #: builtin/grep.c:478 builtin/grep.c:512
2737 msgid "unable to read tree (%s)"
2740 #: builtin/grep.c:526
2742 msgid "unable to grep from object of type %s"
2743 msgstr "无法抓取来自于 %s 类型的对象"
2745 #: builtin/grep.c:584
2747 msgid "switch `%c' expects a numerical value"
2748 msgstr "开关 `%c' 期望一个数字值"
2750 #: builtin/grep.c:601
2752 msgid "cannot open '%s'"
2755 #: builtin/grep.c:888
2756 msgid "no pattern given."
2759 #: builtin/grep.c:902
2761 msgid "bad object %s"
2764 #: builtin/grep.c:943
2765 msgid "--open-files-in-pager only works on the worktree"
2766 msgstr "--open-files-in-pager 仅用于工作区"
2768 #: builtin/grep.c:966
2769 msgid "--cached or --untracked cannot be used with --no-index."
2770 msgstr "--cached 或 --untracked 不能与 --no-index 共用。"
2772 #: builtin/grep.c:971
2773 msgid "--no-index or --untracked cannot be used with revs."
2774 msgstr "--no-index 或 --untracked 不能和版本共用。"
2776 #: builtin/grep.c:974
2777 msgid "--[no-]exclude-standard cannot be used for tracked contents."
2778 msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
2780 #: builtin/grep.c:982
2781 msgid "both --cached and trees are given."
2782 msgstr "同时给出了 --cached 和树对象。"
2784 #: builtin/help.c:59
2786 msgid "unrecognized help format '%s'"
2787 msgstr "未能识别的帮助格式 '%s'"
2789 #: builtin/help.c:87
2790 msgid "Failed to start emacsclient."
2791 msgstr "无法启动 emacsclient。"
2793 #: builtin/help.c:100
2794 msgid "Failed to parse emacsclient version."
2795 msgstr "无法解析 emacsclient 版本。"
2797 #: builtin/help.c:108
2799 msgid "emacsclient version '%d' too old (< 22)."
2800 msgstr "emacsclient 版本 '%d' 太老 (< 22)。"
2802 #: builtin/help.c:126 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
2804 msgid "failed to exec '%s': %s"
2805 msgstr "无法执行 '%s':%s"
2807 #: builtin/help.c:211
2810 "'%s': path for unsupported man viewer.\n"
2811 "Please consider using 'man.<tool>.cmd' instead."
2813 "'%s':不支持的 man 手册查看器的路径。\n"
2814 "请使用 'man.<tool>.cmd'。"
2816 #: builtin/help.c:223
2819 "'%s': cmd for supported man viewer.\n"
2820 "Please consider using 'man.<tool>.path' instead."
2822 "'%s': 支持的 man 手册查看器命令。\n"
2823 "请使用 'man.<tool>.path'。"
2825 #: builtin/help.c:287
2826 msgid "The most commonly used git commands are:"
2827 msgstr "最常用的 git 命令有:"
2829 #: builtin/help.c:355
2831 msgid "'%s': unknown man viewer."
2832 msgstr "'%s':未知的 man 查看器。"
2834 #: builtin/help.c:372
2835 msgid "no man viewer handled the request"
2836 msgstr "没有 man 查看器处理此请求"
2838 #: builtin/help.c:380
2839 msgid "no info viewer handled the request"
2840 msgstr "没有 info 查看器处理此请求"
2842 #: builtin/help.c:391
2844 msgid "'%s': not a documentation directory."
2845 msgstr "'%s':不是一个文档目录。"
2847 #: builtin/help.c:432 builtin/help.c:439
2852 #: builtin/help.c:453
2854 msgid "`git %s' is aliased to `%s'"
2855 msgstr "`git %s' 是 `%s' 的别名"
2857 #: builtin/index-pack.c:169
2859 msgid "object type mismatch at %s"
2860 msgstr "%s 的对象类型不匹配"
2862 #: builtin/index-pack.c:189
2863 msgid "object of unexpected type"
2866 #: builtin/index-pack.c:226
2868 msgid "cannot fill %d byte"
2869 msgid_plural "cannot fill %d bytes"
2870 msgstr[0] "无法填充 %d 字节"
2872 #: builtin/index-pack.c:236
2874 msgstr "过早的文件结束符(EOF)"
2876 #: builtin/index-pack.c:237
2877 msgid "read error on input"
2880 #: builtin/index-pack.c:249
2881 msgid "used more bytes than were available"
2884 #: builtin/index-pack.c:256
2885 msgid "pack too large for current definition of off_t"
2886 msgstr "包太大超过了当前 off_t 的定义"
2888 #: builtin/index-pack.c:272
2890 msgid "unable to create '%s'"
2893 #: builtin/index-pack.c:277
2895 msgid "cannot open packfile '%s'"
2896 msgstr "无法打开包文件 '%s'"
2898 #: builtin/index-pack.c:291
2899 msgid "pack signature mismatch"
2902 #: builtin/index-pack.c:311
2904 msgid "pack has bad object at offset %lu: %s"
2905 msgstr "包中有错误的对象位于 %lu:%s"
2907 #: builtin/index-pack.c:405
2909 msgid "inflate returned %d"
2912 #: builtin/index-pack.c:450
2913 msgid "offset value overflow for delta base object"
2914 msgstr "偏移值覆盖了 delta 基准对象"
2916 #: builtin/index-pack.c:458
2917 msgid "delta base offset is out of bound"
2918 msgstr "delta 基准偏移越界"
2920 #: builtin/index-pack.c:466
2922 msgid "unknown object type %d"
2925 #: builtin/index-pack.c:495
2926 msgid "cannot pread pack file"
2929 #: builtin/index-pack.c:497
2931 msgid "premature end of pack file, %lu byte missing"
2932 msgid_plural "premature end of pack file, %lu bytes missing"
2933 msgstr[0] "包文件过早结束,缺少 %lu 字节"
2935 #: builtin/index-pack.c:510
2936 msgid "serious inflate inconsistency"
2939 #: builtin/index-pack.c:583
2941 msgid "cannot read existing object %s"
2942 msgstr "不能读取现存对象 %s"
2944 #: builtin/index-pack.c:586
2946 msgid "SHA1 COLLISION FOUND WITH %s !"
2947 msgstr "发现 %s 出现 SHA1 冲突!"
2949 #: builtin/index-pack.c:598
2951 msgid "invalid blob object %s"
2952 msgstr "无效的 blob 对象 %s"
2954 #: builtin/index-pack.c:610
2959 #: builtin/index-pack.c:612
2960 msgid "Error in object"
2963 #: builtin/index-pack.c:614
2965 msgid "Not all child objects of %s are reachable"
2966 msgstr "%s 的所有子对象并非都可达"
2968 #: builtin/index-pack.c:687 builtin/index-pack.c:713
2969 msgid "failed to apply delta"
2972 #: builtin/index-pack.c:850
2973 msgid "Receiving objects"
2976 #: builtin/index-pack.c:850
2977 msgid "Indexing objects"
2980 #: builtin/index-pack.c:872
2981 msgid "pack is corrupted (SHA1 mismatch)"
2982 msgstr "包冲突(SHA1 不匹配)"
2984 #: builtin/index-pack.c:877
2985 msgid "cannot fstat packfile"
2988 #: builtin/index-pack.c:880
2989 msgid "pack has junk at the end"
2992 #: builtin/index-pack.c:903
2993 msgid "Resolving deltas"
2996 #: builtin/index-pack.c:954
2997 msgid "confusion beyond insanity"
3000 #: builtin/index-pack.c:973
3002 msgid "pack has %d unresolved delta"
3003 msgid_plural "pack has %d unresolved deltas"
3004 msgstr[0] "包有 %d 个未解决的 delta"
3006 #: builtin/index-pack.c:998
3008 msgid "unable to deflate appended object (%d)"
3009 msgstr "不能缩小附加对象(%d)"
3011 #: builtin/index-pack.c:1077
3013 msgid "local object %s is corrupt"
3014 msgstr "本地对象 %s 已损坏"
3016 #: builtin/index-pack.c:1101
3017 msgid "error while closing pack file"
3020 #: builtin/index-pack.c:1114
3022 msgid "cannot write keep file '%s'"
3023 msgstr "无法写保留文件 '%s'"
3025 #: builtin/index-pack.c:1122
3027 msgid "cannot close written keep file '%s'"
3028 msgstr "无法关闭保留文件 '%s'"
3030 #: builtin/index-pack.c:1135
3031 msgid "cannot store pack file"
3034 #: builtin/index-pack.c:1146
3035 msgid "cannot store index file"
3038 #: builtin/index-pack.c:1247
3040 msgid "Cannot open existing pack file '%s'"
3041 msgstr "无法打开现存包文件 '%s'"
3043 #: builtin/index-pack.c:1249
3045 msgid "Cannot open existing pack idx file for '%s'"
3046 msgstr "无法为 %s 打开包索引文件"
3048 #: builtin/index-pack.c:1296
3050 msgid "non delta: %d object"
3051 msgid_plural "non delta: %d objects"
3052 msgstr[0] "非 delta:%d 个对象"
3054 #: builtin/index-pack.c:1303
3056 msgid "chain length = %d: %lu object"
3057 msgid_plural "chain length = %d: %lu objects"
3058 msgstr[0] "链长 = %d: %lu 对象"
3060 #: builtin/index-pack.c:1330
3061 msgid "Cannot come back to cwd"
3064 #: builtin/index-pack.c:1374 builtin/index-pack.c:1377
3065 #: builtin/index-pack.c:1389 builtin/index-pack.c:1393
3070 #: builtin/index-pack.c:1407
3071 msgid "--fix-thin cannot be used without --stdin"
3072 msgstr "--fix-thin 不能和 --stdin 共用"
3074 #: builtin/index-pack.c:1411 builtin/index-pack.c:1421
3076 msgid "packfile name '%s' does not end with '.pack'"
3077 msgstr "包名 '%s' 没有以 '.pack' 结尾"
3079 #: builtin/index-pack.c:1430
3080 msgid "--verify with no packfile name given"
3081 msgstr "--verify 没有提供包名参数"
3083 #: builtin/init-db.c:35
3085 msgid "Could not make %s writable by group"
3086 msgstr "不能设置 %s 为组可写"
3088 #: builtin/init-db.c:62
3090 msgid "insanely long template name %s"
3093 #: builtin/init-db.c:67
3095 msgid "cannot stat '%s'"
3096 msgstr "不能枚举 '%s' 状态"
3098 #: builtin/init-db.c:73
3100 msgid "cannot stat template '%s'"
3101 msgstr "不能枚举模版 '%s' 状态"
3103 #: builtin/init-db.c:80
3105 msgid "cannot opendir '%s'"
3106 msgstr "不能打开目录 '%s'"
3108 #: builtin/init-db.c:97
3110 msgid "cannot readlink '%s'"
3111 msgstr "不能读取链接 '%s'"
3113 #: builtin/init-db.c:99
3115 msgid "insanely long symlink %s"
3118 #: builtin/init-db.c:102
3120 msgid "cannot symlink '%s' '%s'"
3121 msgstr "不能自 '%s' 到 '%s' 创建符号链接"
3123 #: builtin/init-db.c:106
3125 msgid "cannot copy '%s' to '%s'"
3126 msgstr "不能拷贝 '%s' 至 '%s'"
3128 #: builtin/init-db.c:110
3130 msgid "ignoring template %s"
3133 #: builtin/init-db.c:133
3135 msgid "insanely long template path %s"
3138 #: builtin/init-db.c:141
3140 msgid "templates not found %s"
3143 #: builtin/init-db.c:154
3145 msgid "not copying templates of a wrong format version %d from '%s'"
3146 msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
3148 #: builtin/init-db.c:192
3150 msgid "insane git directory %s"
3151 msgstr "不正常的 git 目录 %s"
3153 #: builtin/init-db.c:322 builtin/init-db.c:325
3155 msgid "%s already exists"
3158 #: builtin/init-db.c:354
3160 msgid "unable to handle file type %d"
3161 msgstr "不能处理 %d 类型的文件"
3163 #: builtin/init-db.c:357
3165 msgid "unable to move %s to %s"
3166 msgstr "不能移动 %s 至 %s"
3168 #: builtin/init-db.c:362
3170 msgid "Could not create git link %s"
3171 msgstr "不能创建 git link %s"
3174 #. * TRANSLATORS: The first '%s' is either "Reinitialized
3175 #. * existing" or "Initialized empty", the second " shared" or
3176 #. * "", and the last '%s%s' is the verbatim directory name.
3178 #: builtin/init-db.c:419
3180 msgid "%s%s Git repository in %s%s\n"
3181 msgstr "%s%s Git 版本库于 %s%s\n"
3183 #: builtin/init-db.c:420
3184 msgid "Reinitialized existing"
3187 #: builtin/init-db.c:420
3188 msgid "Initialized empty"
3191 # 译者:中文字符串拼接,可删除前导空格
3192 #: builtin/init-db.c:421
3196 #: builtin/init-db.c:440
3197 msgid "cannot tell cwd"
3200 #: builtin/init-db.c:521 builtin/init-db.c:528
3202 msgid "cannot mkdir %s"
3205 #: builtin/init-db.c:532
3207 msgid "cannot chdir to %s"
3210 #: builtin/init-db.c:554
3213 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
3216 "不允许 %s(或 --work-tree=<directory>)而没有指定 %s(或 --git-"
3219 #: builtin/init-db.c:578
3220 msgid "Cannot access current working directory"
3223 #: builtin/init-db.c:585
3225 msgid "Cannot access work tree '%s'"
3226 msgstr "不能访问工作区 '%s'"
3228 #: builtin/log.c:188
3230 msgid "Final output: %d %s\n"
3231 msgstr "最终输出:%d %s\n"
3233 #: builtin/log.c:401 builtin/log.c:489
3235 msgid "Could not read object %s"
3238 #: builtin/log.c:513
3240 msgid "Unknown type: %d"
3243 #: builtin/log.c:602
3244 msgid "format.headers without value"
3245 msgstr "format.headers 没有值"
3247 #: builtin/log.c:675
3248 msgid "name of output directory is too long"
3251 #: builtin/log.c:686
3253 msgid "Cannot open patch file %s"
3254 msgstr "无法打开补丁文件 %s"
3256 #: builtin/log.c:700
3257 msgid "Need exactly one range."
3260 #: builtin/log.c:708
3261 msgid "Not a range."
3264 #: builtin/log.c:745
3265 msgid "Could not extract email from committer identity."
3266 msgstr "不能从提交者身份中提取邮件地址。"
3268 #: builtin/log.c:791
3269 msgid "Cover letter needs email format"
3272 #: builtin/log.c:885
3274 msgid "insane in-reply-to: %s"
3275 msgstr "不正常的 in-reply-to:%s"
3277 #: builtin/log.c:958
3278 msgid "Two output directories?"
3281 #: builtin/log.c:1179
3283 msgid "bogus committer info %s"
3284 msgstr "虚假的提交者信息 %s"
3286 #: builtin/log.c:1224
3287 msgid "-n and -k are mutually exclusive."
3288 msgstr "-n 和 -k 互斥。"
3290 #: builtin/log.c:1226
3291 msgid "--subject-prefix and -k are mutually exclusive."
3292 msgstr "--subject-prefix 和 -k 互斥。"
3294 #: builtin/log.c:1234
3295 msgid "--name-only does not make sense"
3296 msgstr "--name-only 无意义"
3298 #: builtin/log.c:1236
3299 msgid "--name-status does not make sense"
3300 msgstr "--name-status 无意义"
3302 #: builtin/log.c:1238
3303 msgid "--check does not make sense"
3304 msgstr "--check 无意义"
3306 #: builtin/log.c:1261
3307 msgid "standard output, or directory, which one?"
3308 msgstr "标准输出或目录,哪一个?"
3310 #: builtin/log.c:1263
3312 msgid "Could not create directory '%s'"
3313 msgstr "不能创建目录 '%s'"
3315 #: builtin/log.c:1416
3316 msgid "Failed to create output files"
3319 #: builtin/log.c:1520
3322 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
3323 msgstr "不能找到跟踪的远程分支,请手工指定 <upstream>。\n"
3325 #: builtin/log.c:1536 builtin/log.c:1538 builtin/log.c:1550
3327 msgid "Unknown commit %s"
3330 #: builtin/merge.c:90
3331 msgid "switch `m' requires a value"
3332 msgstr "开关 `m' 需要一个值"
3334 #: builtin/merge.c:127
3336 msgid "Could not find merge strategy '%s'.\n"
3337 msgstr "不能找到合并策略 '%s'。\n"
3339 #: builtin/merge.c:128
3341 msgid "Available strategies are:"
3344 #: builtin/merge.c:133
3346 msgid "Available custom strategies are:"
3349 #: builtin/merge.c:240
3350 msgid "could not run stash."
3353 #: builtin/merge.c:245
3354 msgid "stash failed"
3357 #: builtin/merge.c:250
3359 msgid "not a valid object: %s"
3360 msgstr "不是一个有效对象:%s"
3362 #: builtin/merge.c:269 builtin/merge.c:286
3363 msgid "read-tree failed"
3367 #: builtin/merge.c:316
3368 msgid " (nothing to squash)"
3371 #: builtin/merge.c:329
3373 msgid "Squash commit -- not updating HEAD\n"
3374 msgstr "压缩提交 -- 未更新 HEAD\n"
3376 #: builtin/merge.c:361
3377 msgid "Writing SQUASH_MSG"
3378 msgstr "写入 SQUASH_MSG"
3380 #: builtin/merge.c:363
3381 msgid "Finishing SQUASH_MSG"
3382 msgstr "完成 SQUASH_MSG"
3384 #: builtin/merge.c:386
3386 msgid "No merge message -- not updating HEAD\n"
3387 msgstr "无合并信息 -- 未更新 HEAD\n"
3389 #: builtin/merge.c:437
3391 msgid "'%s' does not point to a commit"
3392 msgstr "'%s' 没有指向一个提交"
3394 #: builtin/merge.c:536
3396 msgid "Bad branch.%s.mergeoptions string: %s"
3397 msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
3399 #: builtin/merge.c:629
3400 msgid "git write-tree failed to write a tree"
3401 msgstr "git write-tree 无法写入一树对象"
3403 #: builtin/merge.c:679
3404 msgid "failed to read the cache"
3407 #: builtin/merge.c:697
3408 msgid "Unable to write index."
3411 #: builtin/merge.c:710
3412 msgid "Not handling anything other than two heads merge."
3413 msgstr "不能处理两个头合并之外的任何操作。"
3415 #: builtin/merge.c:724
3417 msgid "Unknown option for merge-recursive: -X%s"
3418 msgstr "merge-recursive 的未知选项:-X%s"
3420 #: builtin/merge.c:738
3422 msgid "unable to write %s"
3425 #: builtin/merge.c:877
3427 msgid "Could not read from '%s'"
3428 msgstr "不能从 '%s' 读取"
3430 #: builtin/merge.c:886
3432 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
3433 msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
3435 #: builtin/merge.c:892
3437 "Please enter a commit message to explain why this merge is necessary,\n"
3438 "especially if it merges an updated upstream into a topic branch.\n"
3440 "Lines starting with '#' will be ignored, and an empty message aborts\n"
3443 "请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
3446 "以 '#' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
3448 #: builtin/merge.c:916
3449 msgid "Empty commit message."
3452 #: builtin/merge.c:928
3454 msgid "Wonderful.\n"
3457 #: builtin/merge.c:993
3459 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
3460 msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
3462 #: builtin/merge.c:1009
3464 msgid "'%s' is not a commit"
3465 msgstr "'%s' 不是一个提交"
3467 #: builtin/merge.c:1050
3468 msgid "No current branch."
3471 #: builtin/merge.c:1052
3472 msgid "No remote for the current branch."
3473 msgstr "当前分支没有对应的远程版本库。"
3475 #: builtin/merge.c:1054
3476 msgid "No default upstream defined for the current branch."
3477 msgstr "当前分支没有定义默认的上游分支。"
3479 #: builtin/merge.c:1059
3481 msgid "No remote tracking branch for %s from %s"
3482 msgstr "%s 没有来自 %s 的远程跟踪分支"
3484 #: builtin/merge.c:1146 builtin/merge.c:1303
3486 msgid "%s - not something we can merge"
3489 #: builtin/merge.c:1214
3490 msgid "There is no merge to abort (MERGE_HEAD missing)."
3491 msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
3493 #: builtin/merge.c:1230 git-pull.sh:31
3495 "You have not concluded your merge (MERGE_HEAD exists).\n"
3496 "Please, commit your changes before you can merge."
3498 "您尚未结束您的合并(存在 MERGE_HEAD)。\n"
3501 #: builtin/merge.c:1233 git-pull.sh:34
3502 msgid "You have not concluded your merge (MERGE_HEAD exists)."
3503 msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
3505 #: builtin/merge.c:1237
3507 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
3508 "Please, commit your changes before you can merge."
3510 "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
3513 #: builtin/merge.c:1240
3514 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
3515 msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
3517 #: builtin/merge.c:1249
3518 msgid "You cannot combine --squash with --no-ff."
3519 msgstr "您不能将 --squash 与 --no-ff 共用。"
3521 #: builtin/merge.c:1254
3522 msgid "You cannot combine --no-ff with --ff-only."
3523 msgstr "您不能将 --no-ff 与 --ff-only 共用。"
3525 #: builtin/merge.c:1261
3526 msgid "No commit specified and merge.defaultToUpstream not set."
3527 msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
3529 #: builtin/merge.c:1293
3530 msgid "Can merge only exactly one commit into empty head"
3531 msgstr "只能将一个提交合并到空分支上"
3533 #: builtin/merge.c:1296
3534 msgid "Squash commit into empty head not supported yet"
3535 msgstr "尚不支持到空分支的压缩提交"
3537 #: builtin/merge.c:1298
3538 msgid "Non-fast-forward commit does not make sense into an empty head"
3539 msgstr "到空分支的非快进式提交没有意义"
3541 #: builtin/merge.c:1413
3543 msgid "Updating %s..%s\n"
3544 msgstr "更新 %s..%s\n"
3546 #: builtin/merge.c:1451
3548 msgid "Trying really trivial in-index merge...\n"
3549 msgstr "尝试非常小的索引内合并...\n"
3551 #: builtin/merge.c:1458
3556 #: builtin/merge.c:1490
3557 msgid "Not possible to fast-forward, aborting."
3560 #: builtin/merge.c:1513 builtin/merge.c:1592
3562 msgid "Rewinding the tree to pristine...\n"
3563 msgstr "将树回滚至原始状态...\n"
3565 #: builtin/merge.c:1517
3567 msgid "Trying merge strategy %s...\n"
3568 msgstr "尝试合并策略 %s...\n"
3570 #: builtin/merge.c:1583
3572 msgid "No merge strategy handled the merge.\n"
3573 msgstr "没有合并策略处理此合并。\n"
3575 #: builtin/merge.c:1585
3577 msgid "Merge with strategy %s failed.\n"
3578 msgstr "使用策略 %s 合并失败。\n"
3580 #: builtin/merge.c:1594
3582 msgid "Using the %s to prepare resolving by hand.\n"
3583 msgstr "使用 %s 以准备手工解决。\n"
3585 #: builtin/merge.c:1606
3587 msgid "Automatic merge went well; stopped before committing as requested\n"
3588 msgstr "自动合并进展顺利,按要求在提交前停止\n"
3592 msgid "Checking rename of '%s' to '%s'\n"
3593 msgstr "检查 '%s' 到 '%s' 的重命名\n"
3600 msgid "can not move directory into itself"
3604 msgid "cannot move directory over file"
3609 msgid "Huh? %.*s is in index?"
3610 msgstr "嗯?%.*s 在索引中?"
3613 msgid "source directory is empty"
3617 msgid "not under version control"
3621 msgid "destination exists"
3626 msgid "overwriting '%s'"
3630 msgid "Cannot overwrite"
3634 msgid "multiple sources for the same target"
3639 msgid "%s, source=%s, destination=%s"
3640 msgstr "%s,源=%s,目标=%s"
3644 msgid "Renaming %s to %s\n"
3645 msgstr "重命名 %s 至 %s\n"
3647 #: builtin/mv.c:215 builtin/remote.c:731
3649 msgid "renaming '%s' failed"
3650 msgstr "重命名 '%s' 失败"
3652 #: builtin/notes.c:139
3654 msgid "unable to start 'show' for object '%s'"
3655 msgstr "不能为对象 '%s' 开始 'show'"
3657 #: builtin/notes.c:145
3658 msgid "can't fdopen 'show' output fd"
3659 msgstr "不能打开 'show' 输出文件句柄"
3661 #: builtin/notes.c:155
3663 msgid "failed to close pipe to 'show' for object '%s'"
3664 msgstr "无法为对象 '%s' 的 'show' 关闭管道"
3666 #: builtin/notes.c:158
3668 msgid "failed to finish 'show' for object '%s'"
3669 msgstr "无法为对象 '%s' 完成 'show'"
3671 #: builtin/notes.c:175 builtin/tag.c:347
3673 msgid "could not create file '%s'"
3674 msgstr "不能创建文件 '%s'"
3676 #: builtin/notes.c:189
3677 msgid "Please supply the note contents using either -m or -F option"
3678 msgstr "请通过 -m 或 -F 选项为注解提供内容"
3680 #: builtin/notes.c:210 builtin/notes.c:973
3682 msgid "Removing note for object %s\n"
3683 msgstr "删除对象 %s 的注解\n"
3685 #: builtin/notes.c:215
3686 msgid "unable to write note object"
3689 #: builtin/notes.c:217
3691 msgid "The note contents has been left in %s"
3692 msgstr "注解内容被留在文件 %s 中"
3694 #: builtin/notes.c:251 builtin/tag.c:542
3696 msgid "cannot read '%s'"
3699 #: builtin/notes.c:253 builtin/tag.c:545
3701 msgid "could not open or read '%s'"
3702 msgstr "不能打开或读取 '%s'"
3704 #: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447
3705 #: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644
3706 #: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766
3707 #: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:558
3709 msgid "Failed to resolve '%s' as a valid ref."
3710 msgstr "无法解析 '%s' 为一个有效引用。"
3712 #: builtin/notes.c:275
3714 msgid "Failed to read object '%s'."
3715 msgstr "无法读取对象 '%s'。"
3717 #: builtin/notes.c:299
3718 msgid "Cannot commit uninitialized/unreferenced notes tree"
3719 msgstr "不能提交未初始化/未引用的注解树"
3721 #: builtin/notes.c:340
3723 msgid "Bad notes.rewriteMode value: '%s'"
3724 msgstr "坏的 notes.rewriteMode 值:'%s'"
3726 #: builtin/notes.c:350
3728 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
3729 msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
3731 #. TRANSLATORS: The first %s is the name of the
3732 #. environment variable, the second %s is its value
3733 #: builtin/notes.c:377
3735 msgid "Bad %s value: '%s'"
3736 msgstr "坏的 %s 值:'%s'"
3738 #: builtin/notes.c:441
3740 msgid "Malformed input line: '%s'."
3741 msgstr "非法的输入行:'%s'。"
3743 #: builtin/notes.c:456
3745 msgid "Failed to copy notes from '%s' to '%s'"
3746 msgstr "无法从 '%s' 到 '%s' 拷贝注解"
3748 #: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627
3749 #: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759
3750 #: builtin/notes.c:1033
3751 msgid "too many parameters"
3754 #: builtin/notes.c:513 builtin/notes.c:772
3756 msgid "No note found for object %s."
3757 msgstr "未发现对象 %s 的注解。"
3759 #: builtin/notes.c:580
3762 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
3764 msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
3766 #: builtin/notes.c:585 builtin/notes.c:662
3768 msgid "Overwriting existing notes for object %s\n"
3769 msgstr "覆盖对象 %s 现存注解\n"
3771 #: builtin/notes.c:635
3772 msgid "too few parameters"
3775 #: builtin/notes.c:656
3778 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
3780 msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
3782 #: builtin/notes.c:668
3784 msgid "Missing notes on source object %s. Cannot copy."
3785 msgstr "源对象 %s 缺少注解。不能拷贝。"
3787 #: builtin/notes.c:717
3790 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
3791 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
3793 "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
3794 "请换用 'git notes add -f -m/-F/-c/-C'。\n"
3796 #: builtin/notes.c:971
3798 msgid "Object %s has no note\n"
3799 msgstr "对象 %s 没有注解\n"
3801 #: builtin/notes.c:1103 builtin/remote.c:1598
3803 msgid "Unknown subcommand: %s"
3806 #: builtin/pack-objects.c:2315
3808 msgid "unsupported index version %s"
3809 msgstr "不支持的索引版本 %s"
3811 #: builtin/pack-objects.c:2319
3813 msgid "bad index version '%s'"
3814 msgstr "坏的索引版本 '%s'"
3816 #: builtin/pack-objects.c:2342
3818 msgid "option %s does not accept negative form"
3819 msgstr "选项 %s 不接受否定格式"
3821 #: builtin/pack-objects.c:2346
3823 msgid "unable to parse value '%s' for option %s"
3824 msgstr "不能解析选项 %1$s 的值 '%2$s'"
3826 #: builtin/push.c:45
3827 msgid "tag shorthand without <tag>"
3828 msgstr "tag 简写没有跟 <tag> 参数"
3830 #: builtin/push.c:64
3831 msgid "--delete only accepts plain target ref names"
3832 msgstr "--delete 只接受简单的目标引用名"
3834 #: builtin/push.c:99
3837 "To choose either option permanently, see push.default in 'git help config'."
3840 "为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
3842 #: builtin/push.c:102
3845 "The upstream branch of your current branch does not match\n"
3846 "the name of your current branch. To push to the upstream branch\n"
3847 "on the remote, use\n"
3849 " git push %s HEAD:%s\n"
3851 "To push to the branch of the same name on the remote, use\n"
3856 "如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
3859 " git push %s HEAD:%s\n"
3866 #: builtin/push.c:121
3869 "You are not currently on a branch.\n"
3870 "To push the history leading to the current (detached HEAD)\n"
3873 " git push %s HEAD:<name-of-remote-branch>\n"
3876 "现在为推送当前(分离头指针)的历史,使用\n"
3878 " git push %s HEAD:<name-of-remote-branch>\n"
3880 #: builtin/push.c:128
3883 "The current branch %s has no upstream branch.\n"
3884 "To push the current branch and set the remote as upstream, use\n"
3886 " git push --set-upstream %s %s\n"
3888 "当前分支 %s 没有对应的上游分支。\n"
3889 "为推送当前分支并建立与远程上游的跟踪,使用\n"
3891 " git push --set-upstream %s %s\n"
3893 #: builtin/push.c:136
3895 msgid "The current branch %s has multiple upstream branches, refusing to push."
3896 msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
3898 #: builtin/push.c:139
3901 "You are pushing to remote '%s', which is not the upstream of\n"
3902 "your current branch '%s', without telling me what to push\n"
3903 "to update which remote branch."
3905 "您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
3906 "而没有告诉我要推送什么、更新哪个远程分支。"
3908 #: builtin/push.c:174
3910 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
3911 msgstr "您没有为推送指定任何引用表达式,并且 push.default 为 \"nothing\"。"
3913 #: builtin/push.c:181
3915 "Updates were rejected because the tip of your current branch is behind\n"
3916 "its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
3917 "before pushing again.\n"
3918 "See the 'Note about fast-forwards' in 'git push --help' for details."
3920 "更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
3921 "再次推送前,先与远程变更合并(如 'git pull')。详见\n"
3922 "'git push --help' 中的 'Note about fast-forwards' 小节。"
3924 #: builtin/push.c:187
3926 "Updates were rejected because a pushed branch tip is behind its remote\n"
3927 "counterpart. If you did not intend to push that branch, you may want to\n"
3928 "specify branches to push or set the 'push.default' configuration\n"
3929 "variable to 'current' or 'upstream' to push only the current branch."
3931 "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
3932 "如果您并非有意推送该分支,您可以在推送时指定要推送的分支,或者将\n"
3933 "配置变量 'push.default' 设置为 'current' 或 'upstream' 以便只推送当前分支。"
3935 #: builtin/push.c:193
3937 "Updates were rejected because a pushed branch tip is behind its remote\n"
3938 "counterpart. Check out this branch and merge the remote changes\n"
3939 "(e.g. 'git pull') before pushing again.\n"
3940 "See the 'Note about fast-forwards' in 'git push --help' for details."
3942 "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
3943 "检出该分支并与远程变更合并(如 'git pull'),然后再推送。详见\n"
3944 "'git push --help' 中的 'Note about fast-forwards' 小节。"
3946 #: builtin/push.c:233
3948 msgid "Pushing to %s\n"
3951 #: builtin/push.c:237
3953 msgid "failed to push some refs to '%s'"
3954 msgstr "无法推送一些引用到 '%s'"
3956 #: builtin/push.c:269
3958 msgid "bad repository '%s'"
3961 #: builtin/push.c:270
3963 "No configured push destination.\n"
3964 "Either specify the URL from the command-line or configure a remote "
3965 "repository using\n"
3967 " git remote add <name> <url>\n"
3969 "and then push using the remote name\n"
3971 " git push <name>\n"
3974 "或者通过命令行指定URL,或者用下面命令配置一个远程版本库\n"
3976 " git remote add <name> <url>\n"
3980 " git push <name>\n"
3982 #: builtin/push.c:285
3983 msgid "--all and --tags are incompatible"
3984 msgstr "--all 和 --tags 不兼容"
3986 #: builtin/push.c:286
3987 msgid "--all can't be combined with refspecs"
3988 msgstr "--all 不能和引用表达式共用"
3990 #: builtin/push.c:291
3991 msgid "--mirror and --tags are incompatible"
3992 msgstr "--mirror 和 --tags 不兼容"
3994 #: builtin/push.c:292
3995 msgid "--mirror can't be combined with refspecs"
3996 msgstr "--mirror 不能和引用表达式共用"
3998 #: builtin/push.c:297
3999 msgid "--all and --mirror are incompatible"
4000 msgstr "--all 和 --mirror 不兼容"
4002 #: builtin/push.c:385
4003 msgid "--delete is incompatible with --all, --mirror and --tags"
4004 msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
4006 #: builtin/push.c:387
4007 msgid "--delete doesn't make sense without any refs"
4008 msgstr "--delete 未接任何引用没有意义"
4010 #: builtin/remote.c:98
4015 #: builtin/remote.c:130
4017 "--mirror is dangerous and deprecated; please\n"
4018 "\t use --mirror=fetch or --mirror=push instead"
4020 "--mirror 选项危险且过时,请使用 --mirror=fetch\n"
4021 "\t 或 --mirror=push"
4023 #: builtin/remote.c:147
4025 msgid "unknown mirror argument: %s"
4028 #: builtin/remote.c:185
4029 msgid "specifying a master branch makes no sense with --mirror"
4030 msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
4032 #: builtin/remote.c:187
4033 msgid "specifying branches to track makes sense only with fetch mirrors"
4034 msgstr "指定要跟踪的分支只在与获取镜像共用才有意义"
4036 #: builtin/remote.c:195 builtin/remote.c:646
4038 msgid "remote %s already exists."
4039 msgstr "远程 %s 已经存在。"
4041 #: builtin/remote.c:199 builtin/remote.c:650
4043 msgid "'%s' is not a valid remote name"
4044 msgstr "'%s' 不是一个有效的远程名称"
4046 #: builtin/remote.c:243
4048 msgid "Could not setup master '%s'"
4049 msgstr "无法设置 master '%s'"
4051 #: builtin/remote.c:299
4053 msgid "more than one %s"
4056 #: builtin/remote.c:339
4058 msgid "Could not get fetch map for refspec %s"
4059 msgstr "无法得到引用表达式 %s 的获取列表"
4061 #: builtin/remote.c:440 builtin/remote.c:448
4065 #: builtin/remote.c:452
4069 #: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607
4071 msgid "Could not append '%s' to '%s'"
4072 msgstr "不能添加 '%s' 至 '%s'"
4074 #: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890
4076 msgid "No such remote: %s"
4079 #: builtin/remote.c:656
4081 msgid "Could not rename config section '%s' to '%s'"
4082 msgstr "不能重命名配置小节 '%s' 到 '%s'"
4084 #: builtin/remote.c:662 builtin/remote.c:799
4086 msgid "Could not remove config section '%s'"
4087 msgstr "不能移除配置小节 '%s'"
4089 #: builtin/remote.c:677
4092 "Not updating non-default fetch respec\n"
4094 "\tPlease update the configuration manually if necessary."
4100 #: builtin/remote.c:683
4102 msgid "Could not append '%s'"
4105 #: builtin/remote.c:694
4107 msgid "Could not set '%s'"
4110 #: builtin/remote.c:716
4112 msgid "deleting '%s' failed"
4115 #: builtin/remote.c:750
4117 msgid "creating '%s' failed"
4120 #: builtin/remote.c:764
4122 msgid "Could not remove branch %s"
4125 #: builtin/remote.c:834
4127 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
4128 "to delete it, use:"
4130 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
4131 "to delete them, use:"
4133 "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
4135 "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
4137 #: builtin/remote.c:943
4139 msgid " new (next fetch will store in remotes/%s)"
4140 msgstr " 新的(下一次获取将存储于 remotes/%s)"
4142 #: builtin/remote.c:946
4146 #: builtin/remote.c:948
4147 msgid " stale (use 'git remote prune' to remove)"
4148 msgstr " 过时(使用 'git remote prune' 来移除)"
4150 #: builtin/remote.c:950
4154 #: builtin/remote.c:991
4156 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
4157 msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
4159 #: builtin/remote.c:998
4161 msgid "rebases onto remote %s"
4164 #: builtin/remote.c:1001
4166 msgid " merges with remote %s"
4169 #: builtin/remote.c:1002
4170 msgid " and with remote"
4173 #: builtin/remote.c:1004
4175 msgid "merges with remote %s"
4178 #: builtin/remote.c:1005
4179 msgid " and with remote"
4182 #: builtin/remote.c:1051
4186 #: builtin/remote.c:1054
4190 #: builtin/remote.c:1058
4194 #: builtin/remote.c:1061
4195 msgid "fast-forwardable"
4198 #: builtin/remote.c:1064
4199 msgid "local out of date"
4202 #: builtin/remote.c:1071
4204 msgid " %-*s forces to %-*s (%s)"
4205 msgstr " %-*s 强制推送至 %-*s (%s)"
4207 #: builtin/remote.c:1074
4209 msgid " %-*s pushes to %-*s (%s)"
4210 msgstr " %-*s 推送至 %-*s (%s)"
4212 #: builtin/remote.c:1078
4214 msgid " %-*s forces to %s"
4215 msgstr " %-*s 强制推送至 %s"
4217 #: builtin/remote.c:1081
4219 msgid " %-*s pushes to %s"
4220 msgstr " %-*s 推送至 %s"
4222 #: builtin/remote.c:1118
4227 #: builtin/remote.c:1119
4229 msgid " Fetch URL: %s"
4232 #: builtin/remote.c:1120 builtin/remote.c:1285
4236 #: builtin/remote.c:1129 builtin/remote.c:1131
4238 msgid " Push URL: %s"
4241 #: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137
4243 msgid " HEAD branch: %s"
4246 #: builtin/remote.c:1139
4249 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
4251 " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
4253 #: builtin/remote.c:1151
4255 msgid " Remote branch:%s"
4256 msgid_plural " Remote branches:%s"
4257 msgstr[0] " 远程分支:%s"
4259 # 译者:中文字符串拼接,可删除前导空格
4260 #: builtin/remote.c:1154 builtin/remote.c:1181
4261 msgid " (status not queried)"
4264 #: builtin/remote.c:1163
4265 msgid " Local branch configured for 'git pull':"
4266 msgid_plural " Local branches configured for 'git pull':"
4267 msgstr[0] " 为 'git pull' 配置的本地分支:"
4269 #: builtin/remote.c:1171
4270 msgid " Local refs will be mirrored by 'git push'"
4271 msgstr " 本地引用将在 'git push' 时被镜像"
4273 #: builtin/remote.c:1178
4275 msgid " Local ref configured for 'git push'%s:"
4276 msgid_plural " Local refs configured for 'git push'%s:"
4277 msgstr[0] " 为 'git push' 配置的本地引用%s:"
4279 #: builtin/remote.c:1216
4280 msgid "Cannot determine remote HEAD"
4281 msgstr "无法确定远程 HEAD"
4283 #: builtin/remote.c:1218
4284 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
4285 msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
4287 #: builtin/remote.c:1228
4289 msgid "Could not delete %s"
4292 #: builtin/remote.c:1236
4294 msgid "Not a valid ref: %s"
4295 msgstr "不是一个有效引用:%s"
4297 #: builtin/remote.c:1238
4299 msgid "Could not setup %s"
4303 #: builtin/remote.c:1274
4305 msgid " %s will become dangling!"
4306 msgstr " %s 将成为悬空状态!"
4309 #: builtin/remote.c:1275
4311 msgid " %s has become dangling!"
4312 msgstr " %s 已成为悬空状态!"
4314 #: builtin/remote.c:1281
4319 #: builtin/remote.c:1282
4324 #: builtin/remote.c:1295
4326 msgid " * [would prune] %s"
4327 msgstr " * [将删除] %s"
4329 #: builtin/remote.c:1298
4331 msgid " * [pruned] %s"
4332 msgstr " * [已删除] %s"
4334 #: builtin/remote.c:1387 builtin/remote.c:1461
4336 msgid "No such remote '%s'"
4339 #: builtin/remote.c:1414
4340 msgid "no remote specified"
4343 #: builtin/remote.c:1447
4344 msgid "--add --delete doesn't make sense"
4345 msgstr "--add --delete 无意义"
4347 #: builtin/remote.c:1487
4349 msgid "Invalid old URL pattern: %s"
4350 msgstr "无效的旧URL匹配模版:%s"
4352 #: builtin/remote.c:1495
4354 msgid "No such URL found: %s"
4357 #: builtin/remote.c:1497
4358 msgid "Will not delete all non-push URLs"
4359 msgstr "将不会删除所有非推送URL地址"
4361 #: builtin/reset.c:33
4365 #: builtin/reset.c:33
4369 #: builtin/reset.c:33
4373 #: builtin/reset.c:33
4377 #: builtin/reset.c:33
4381 #: builtin/reset.c:77
4382 msgid "You do not have a valid HEAD."
4383 msgstr "您没有一个有效的 HEAD。"
4385 #: builtin/reset.c:79
4386 msgid "Failed to find tree of HEAD."
4387 msgstr "无法找到 HEAD 指向的树。"
4389 #: builtin/reset.c:85
4391 msgid "Failed to find tree of %s."
4392 msgstr "无法找到 %s 指向的树。"
4394 #: builtin/reset.c:96
4395 msgid "Could not write new index file."
4396 msgstr "不能写入新的索引文件。"
4398 #: builtin/reset.c:106
4400 msgid "HEAD is now at %s"
4401 msgstr "HEAD 现在位于 %s"
4403 #: builtin/reset.c:130
4404 msgid "Could not read index"
4407 #: builtin/reset.c:133
4408 msgid "Unstaged changes after reset:"
4409 msgstr "重置后撤出暂存区的变更:"
4411 # 译者:汉字之间无空格,故删除%s前后空格
4412 #: builtin/reset.c:223
4414 msgid "Cannot do a %s reset in the middle of a merge."
4415 msgstr "在合并过程中不能做%s重置操作。"
4417 #: builtin/reset.c:297
4419 msgid "Could not parse object '%s'."
4420 msgstr "不能解析对象 '%s'。"
4422 #: builtin/reset.c:302
4423 msgid "--patch is incompatible with --{hard,mixed,soft}"
4424 msgstr "--patch 与 --{hard,mixed,soft} 不兼容"
4426 #: builtin/reset.c:311
4427 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
4428 msgstr "--mixed 带路径已弃用,代之以 'git reset -- <paths>'。"
4430 # 译者:汉字之间无空格,故删除%s前后空格
4431 #: builtin/reset.c:313
4433 msgid "Cannot do %s reset with paths."
4434 msgstr "不能带路径进行%s重置。"
4436 # 译者:汉字之间无空格,故删除%s前后空格
4437 #: builtin/reset.c:325
4439 msgid "%s reset is not allowed in a bare repository"
4440 msgstr "不能对裸版本库进行%s重置"
4442 #: builtin/reset.c:341
4444 msgid "Could not reset index file to revision '%s'."
4445 msgstr "不能重置索引文件至版本 '%s'。"
4447 #: builtin/revert.c:70 builtin/revert.c:92
4449 msgid "%s: %s cannot be used with %s"
4450 msgstr "%s:%s 不能和 %s 共用"
4452 #: builtin/revert.c:131
4453 msgid "program error"
4456 #: builtin/revert.c:221
4457 msgid "revert failed"
4460 #: builtin/revert.c:236
4461 msgid "cherry-pick failed"
4467 "'%s' has staged content different from both the file and the HEAD\n"
4468 "(use -f to force removal)"
4470 "'%s' 暂存的内容和工作区及 HEAD 中的都不一样\n"
4476 "'%s' has changes staged in the index\n"
4477 "(use --cached to keep the file, or -f to force removal)"
4480 "(使用 --cached 保存文件,或用 -f 强制删除)"
4485 "'%s' has local modifications\n"
4486 "(use --cached to keep the file, or -f to force removal)"
4489 "(使用 --cached 保存文件,或用 -f 强制删除)"
4493 msgid "not removing '%s' recursively without -r"
4494 msgstr "未提供 -r 选项不会递归删除 '%s'"
4498 msgid "git rm: unable to remove %s"
4499 msgstr "git rm:不能删除 %s"
4501 #: builtin/shortlog.c:157
4503 msgid "Missing author: %s"
4508 msgid "malformed object at '%s'"
4509 msgstr "非法的对象于 '%s'"
4511 #: builtin/tag.c:207
4513 msgid "tag name too long: %.*s..."
4514 msgstr "tag 名字太长:%.*s..."
4516 #: builtin/tag.c:212
4518 msgid "tag '%s' not found."
4519 msgstr "tag '%s' 未发现。"
4521 #: builtin/tag.c:227
4523 msgid "Deleted tag '%s' (was %s)\n"
4524 msgstr "已删除 tag '%s'(曾为 %s)\n"
4526 #: builtin/tag.c:239
4528 msgid "could not verify the tag '%s'"
4529 msgstr "不能校验 tag '%s'"
4531 #: builtin/tag.c:249
4535 "# Write a tag message\n"
4536 "# Lines starting with '#' will be ignored.\n"
4542 "# 以 '#' 开头的行将被忽略。\n"
4545 #: builtin/tag.c:256
4549 "# Write a tag message\n"
4550 "# Lines starting with '#' will be kept; you may remove them yourself if you "
4557 "# 以 '#' 开头的行将被忽略,您可以删除它们如果您想这样做。\n"
4560 #: builtin/tag.c:298
4561 msgid "unable to sign the tag"
4564 #: builtin/tag.c:300
4565 msgid "unable to write tag file"
4568 #: builtin/tag.c:325
4569 msgid "bad object type."
4572 #: builtin/tag.c:338
4573 msgid "tag header too big."
4576 #: builtin/tag.c:370
4577 msgid "no tag message?"
4580 #: builtin/tag.c:376
4582 msgid "The tag message has been left in %s\n"
4583 msgstr "tag 说明被保留在 %s\n"
4585 #: builtin/tag.c:425
4586 msgid "switch 'points-at' requires an object"
4587 msgstr "开关 'points-at' 需要一个对象"
4589 #: builtin/tag.c:427
4591 msgid "malformed object name '%s'"
4592 msgstr "非法的对象名 '%s'"
4594 #: builtin/tag.c:506
4595 msgid "--column and -n are incompatible"
4596 msgstr "--column 和 -n 不兼容"
4598 #: builtin/tag.c:523
4599 msgid "-n option is only allowed with -l."
4600 msgstr "-n 选项只允许和 -l 共用。"
4602 #: builtin/tag.c:525
4603 msgid "--contains option is only allowed with -l."
4604 msgstr "--contains 选项只允许和 -l 共用。"
4606 #: builtin/tag.c:527
4607 msgid "--points-at option is only allowed with -l."
4608 msgstr "--points-at 选项只允许和 -l 共用。"
4610 #: builtin/tag.c:535
4611 msgid "only one -F or -m option is allowed."
4612 msgstr "只允许一个 -F 或 -m 选项。"
4614 #: builtin/tag.c:555
4615 msgid "too many params"
4618 #: builtin/tag.c:561
4620 msgid "'%s' is not a valid tag name."
4621 msgstr "'%s' 不是一个有效的tag名称。"
4623 #: builtin/tag.c:566
4625 msgid "tag '%s' already exists"
4626 msgstr "tag '%s' 已存在"
4628 #: builtin/tag.c:584
4630 msgid "%s: cannot lock the ref"
4633 #: builtin/tag.c:586
4635 msgid "%s: cannot update the ref"
4638 #: builtin/tag.c:588
4640 msgid "Updated tag '%s' (was %s)\n"
4641 msgstr "已更新tag '%s'(曾为 %s)\n"
4644 msgid "See 'git help <command>' for more information on a specific command."
4645 msgstr "参见 'git help <command>' 以获得该特定命令的详细信息。"
4647 #: parse-options.h:133 parse-options.h:235
4651 #: parse-options.h:141
4655 #: parse-options.h:149
4659 #: parse-options.h:151
4663 #: parse-options.h:156
4664 msgid "no-op (backward compatibility)"
4667 #: parse-options.h:228
4668 msgid "be more verbose"
4671 #: parse-options.h:230
4672 msgid "be more quiet"
4675 #: parse-options.h:236
4676 msgid "use <n> digits to display SHA-1s"
4677 msgstr "用 <n> 位数字显示 SHA-1 哈希值"
4680 msgid "Add file contents to the index"
4684 msgid "Find by binary search the change that introduced a bug"
4685 msgstr "通过二分查找定位引入 bug 的变更"
4688 msgid "List, create, or delete branches"
4692 msgid "Checkout a branch or paths to the working tree"
4693 msgstr "检出一个分支或路径到工作区"
4696 msgid "Clone a repository into a new directory"
4697 msgstr "克隆一个版本库到一个新目录"
4700 msgid "Record changes to the repository"
4704 msgid "Show changes between commits, commit and working tree, etc"
4705 msgstr "显示提交之间、提交和工作区之间等的差异"
4708 msgid "Download objects and refs from another repository"
4709 msgstr "从另外一个版本库下载对象和引用"
4712 msgid "Print lines matching a pattern"
4716 msgid "Create an empty git repository or reinitialize an existing one"
4717 msgstr "创建一个空的 git 版本库或者重新初始化一个"
4720 msgid "Show commit logs"
4724 msgid "Join two or more development histories together"
4725 msgstr "合并两个或更多开发历史"
4728 msgid "Move or rename a file, a directory, or a symlink"
4729 msgstr "移动或重命名一个文件、目录或符号链接"
4732 msgid "Fetch from and merge with another repository or a local branch"
4733 msgstr "获取并合并另外的版本库或一个本地分支"
4736 msgid "Update remote refs along with associated objects"
4737 msgstr "更新远程引用和相关的对象"
4740 msgid "Forward-port local commits to the updated upstream head"
4741 msgstr "本地提交转移至更新后的上游分支中"
4744 msgid "Reset current HEAD to the specified state"
4745 msgstr "重置当前HEAD到指定状态"
4748 msgid "Remove files from the working tree and from the index"
4749 msgstr "从工作区和索引中删除文件"
4752 msgid "Show various types of objects"
4756 msgid "Show the working tree status"
4760 msgid "Create, list, delete or verify a tag object signed with GPG"
4761 msgstr "创建、列出、删除或校验一个GPG签名的 tag 对象"
4764 msgid "You need to set your committer info first"
4765 msgstr "您需要先设置你的提交者信息"
4768 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
4769 msgstr "版本库缺乏必要的 blob 数据以进行三路合并。"
4773 "Did you hand edit your patch?\n"
4774 "It does not apply to blobs recorded in its index."
4780 msgid "Falling back to patching base and 3-way merge..."
4781 msgstr "回退到补丁基础版本并使用三路合并..."
4784 msgid "Only one StGIT patch series can be applied at once"
4785 msgstr "一次只能有一个 StGIT 补丁队列被应用"
4789 msgid "Patch format $patch_format is not supported."
4790 msgstr "不支持 $patch_format 补丁格式。"
4793 msgid "Patch format detection failed."
4797 msgid "-d option is no longer supported. Do not use."
4798 msgstr "不再支持 -d 选项。不要使用。"
4802 msgid "previous rebase directory $dotest still exists but mbox given."
4803 msgstr "之前的变基目录 $dotest 仍然存在但给出了mbox。"
4806 msgid "Please make up your mind. --skip or --abort?"
4807 msgstr "请下决心。--skip 或是 --abort ?"
4810 msgid "Resolve operation not in progress, we are not resuming."
4811 msgstr "解决操作未进行,我们不会继续。"
4815 msgid "Dirty index: cannot apply patches (dirty: $files)"
4816 msgstr "脏的索引:不能应用补丁(脏文件:$files)"
4819 msgid "cannot be interactive without stdin connected to a terminal."
4820 msgstr "标准输入没有和终端关联,不能进行交互式操作。"
4823 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
4824 #. in your translation. The program will only accept English
4825 #. input at this point.
4827 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
4828 msgstr "应用?[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
4832 msgid "Applying: $FIRSTLINE"
4833 msgstr "正应用:$FIRSTLINE"
4836 msgid "No changes -- Patch already applied."
4837 msgstr "没有变更 -- 补丁已经应用过。"
4840 msgid "applying to an empty history"
4844 #. TRANSLATORS: Make sure to include [Y] and [n] in your
4845 #. translation. The program will only accept English input
4848 msgid "Do you want me to do it for you [Y/n]? "
4849 msgstr "您想让我为您这样做么[Y/n]? "
4853 msgid "unrecognised option: '$arg'"
4854 msgstr "未能识别的选项:'$arg'"
4858 msgid "'$arg' does not appear to be a valid revision"
4859 msgstr "'$arg' 看起来不像是一个有效的版本"
4861 #: git-bisect.sh:117
4862 msgid "Bad HEAD - I need a HEAD"
4863 msgstr "坏的 HEAD - 我需要一个 HEAD"
4865 #: git-bisect.sh:130
4868 "Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
4869 msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <validbranch>'。"
4871 #: git-bisect.sh:140
4872 msgid "won't bisect on seeked tree"
4873 msgstr "不会在已查找过的树上二分查找"
4875 #: git-bisect.sh:144
4876 msgid "Bad HEAD - strange symbolic ref"
4877 msgstr "坏的 HEAD - 奇怪的符号引用"
4879 #: git-bisect.sh:189
4881 msgid "Bad bisect_write argument: $state"
4882 msgstr "坏的 bisect_write 参数:$state"
4884 #: git-bisect.sh:218
4886 msgid "Bad rev input: $arg"
4887 msgstr "输入坏的版本:$arg"
4889 #: git-bisect.sh:232
4890 msgid "Please call 'bisect_state' with at least one argument."
4891 msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
4893 #: git-bisect.sh:244
4895 msgid "Bad rev input: $rev"
4896 msgstr "输入坏的版本:$rev"
4898 #: git-bisect.sh:250
4899 msgid "'git bisect bad' can take only one argument."
4900 msgstr "'git bisect bad' 只能带一个参数。"
4903 #. TRANSLATORS: Make sure to include [Y] and [n] in your
4904 #. translation. The program will only accept English input
4906 #: git-bisect.sh:279
4907 msgid "Are you sure [Y/n]? "
4908 msgstr "您确认么[Y/n]? "
4910 #: git-bisect.sh:354
4912 msgid "'$invalid' is not a valid commit"
4913 msgstr "'$invalid' 不是一个有效的提交"
4915 #: git-bisect.sh:363
4918 "Could not check out original HEAD '$branch'.\n"
4919 "Try 'git bisect reset <commit>'."
4921 "不能检出原始 HEAD '$branch'。\n"
4922 "尝试 'git bisect reset <commit>'。"
4924 #: git-bisect.sh:390
4925 msgid "No logfile given"
4928 #: git-bisect.sh:391
4930 msgid "cannot read $file for replaying"
4931 msgstr "不能读取 $file 来重放"
4933 #: git-bisect.sh:408
4934 msgid "?? what are you talking about?"
4937 #: git-bisect.sh:474
4938 msgid "We are not bisecting."
4943 "Pull is not possible because you have unmerged files.\n"
4944 "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
4945 "as appropriate to mark resolution, or use 'git commit -a'."
4947 "Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n"
4948 "然后酌情使用 'git add/rm <file>' 标记解决方案,\n"
4949 "或者使用 'git commit -a'。"
4952 msgid "Pull is not possible because you have unmerged files."
4953 msgstr "Pull 不可用,因为您尚有未合并的文件。"
4956 msgid "updating an unborn branch with changes added to the index"
4957 msgstr "更新尚未诞生的分支,变更添加至索引"
4960 msgid "Cannot merge multiple branches into empty head"
4961 msgstr "无法将多个分支合并到空分支"
4964 msgid "Cannot rebase onto multiple branches"
4968 msgid "git stash clear with parameters is unimplemented"
4969 msgstr "git stash clear 不支持参数"
4972 msgid "You do not have the initial commit yet"
4976 msgid "Cannot save the current index state"
4979 #: git-stash.sh:123 git-stash.sh:136
4980 msgid "Cannot save the current worktree state"
4981 msgstr "无法保存当前工作区状态"
4984 msgid "No changes selected"
4988 msgid "Cannot remove temporary index (can't happen)"
4989 msgstr "无法删除临时索引(不应发生)"
4992 msgid "Cannot record working tree state"
4996 msgid "No local changes to save"
5000 msgid "Cannot initialize stash"
5001 msgstr "无法初始化 stash"
5004 msgid "Cannot save the current status"
5008 msgid "Cannot remove worktree changes"
5012 msgid "No stash found."
5017 msgid "Too many revisions specified: $REV"
5018 msgstr "指定了太多的版本:$REV"
5022 msgid "$reference is not valid reference"
5023 msgstr "$reference 不是有效的引用"
5027 msgid "'$args' is not a stash-like commit"
5028 msgstr "'$args' 不是 stash 样提交"
5032 msgid "'$args' is not a stash reference"
5033 msgstr "'$args' 不是一个 stash 引用"
5036 msgid "unable to refresh index"
5040 msgid "Cannot apply a stash in the middle of a merge"
5041 msgstr "无法在合并过程中恢复进度"
5044 msgid "Conflicts in index. Try without --index."
5045 msgstr "索引中有冲突。尝试不使用 --index。"
5048 msgid "Could not save index tree"
5052 msgid "Cannot unstage modified files"
5057 msgid "Dropped ${REV} ($s)"
5058 msgstr "丢弃了 ${REV} ($s)"
5062 msgid "${REV}: Could not drop stash entry"
5063 msgstr "${REV}:不能丢弃进度条目"
5066 msgid "No branch name specified"
5070 msgid "(To restore them type \"git stash apply\")"
5071 msgstr "(为恢复数据输入 \"git stash apply\")"
5073 #: git-submodule.sh:56
5075 msgid "cannot strip one component off url '$remoteurl'"
5076 msgstr "无法从 url '$remoteurl' 剥离一个组件"
5078 #: git-submodule.sh:109
5080 msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
5081 msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
5083 #: git-submodule.sh:150
5085 msgid "Clone of '$url' into submodule path '$sm_path' failed"
5086 msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
5088 #: git-submodule.sh:160
5090 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
5091 msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或者相反"
5093 #: git-submodule.sh:249
5095 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
5096 msgstr "版本库URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
5098 #: git-submodule.sh:266
5100 msgid "'$sm_path' already exists in the index"
5101 msgstr "'$sm_path' 已经存在于索引中"
5103 #: git-submodule.sh:283
5105 msgid "'$sm_path' already exists and is not a valid git repo"
5106 msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"
5108 #: git-submodule.sh:297
5110 msgid "Unable to checkout submodule '$sm_path'"
5111 msgstr "不能检出子模组 '$sm_path'"
5113 #: git-submodule.sh:302
5115 msgid "Failed to add submodule '$sm_path'"
5116 msgstr "无法添加子模组 '$sm_path'"
5118 #: git-submodule.sh:307
5120 msgid "Failed to register submodule '$sm_path'"
5121 msgstr "无法注册子模组 '$sm_path'"
5123 #: git-submodule.sh:349
5125 msgid "Entering '$prefix$sm_path'"
5126 msgstr "正在进入 '$prefix$sm_path'"
5128 #: git-submodule.sh:363
5130 msgid "Stopping at '$sm_path'; script returned non-zero status."
5131 msgstr "停止于 '$sm_path',脚本返回非零值。"
5133 #: git-submodule.sh:405
5135 msgid "No url found for submodule path '$sm_path' in .gitmodules"
5136 msgstr "在 .gitmodules 中未找到子模组路径 '$sm_path' 的 url"
5138 #: git-submodule.sh:414
5140 msgid "Failed to register url for submodule path '$sm_path'"
5141 msgstr "无法为子模组路径 '$sm_path' 注册 url"
5143 #: git-submodule.sh:422
5145 msgid "Failed to register update mode for submodule path '$sm_path'"
5146 msgstr "无法为子模组路径 '$sm_path' 注册更新模式"
5148 #: git-submodule.sh:424
5150 msgid "Submodule '$name' ($url) registered for path '$sm_path'"
5151 msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册"
5153 #: git-submodule.sh:523
5156 "Submodule path '$sm_path' not initialized\n"
5157 "Maybe you want to use 'update --init'?"
5159 "子模组路径 '$sm_path' 没有初始化\n"
5160 "也许您想用 'update --init'?"
5162 #: git-submodule.sh:536
5164 msgid "Unable to find current revision in submodule path '$sm_path'"
5165 msgstr "无法在子模组路径 '$sm_path' 中找到当前版本"
5167 #: git-submodule.sh:555
5169 msgid "Unable to fetch in submodule path '$sm_path'"
5170 msgstr "无法在子模组路径 '$sm_path' 中获取"
5172 #: git-submodule.sh:569
5174 msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
5175 msgstr "无法在子模组路径 '$sm_path' 中变基 '$sha1'"
5177 #: git-submodule.sh:570
5179 msgid "Submodule path '$sm_path': rebased into '$sha1'"
5180 msgstr "子模组路径 '$sm_path':变基至 '$sha1'"
5182 #: git-submodule.sh:575
5184 msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
5185 msgstr "无法合并 '$sha1' 到子模组路径 '$sm_path' 中"
5187 #: git-submodule.sh:576
5189 msgid "Submodule path '$sm_path': merged in '$sha1'"
5190 msgstr "子模组路径 '$sm_path':已合并入 '$sha1'"
5192 #: git-submodule.sh:581
5194 msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
5195 msgstr "无法在子模组路径 '$sm_path' 中检出 '$sha1'"
5197 #: git-submodule.sh:582
5199 msgid "Submodule path '$sm_path': checked out '$sha1'"
5200 msgstr "子模组路径 '$sm_path':检出 '$sha1'"
5202 #: git-submodule.sh:604 git-submodule.sh:927
5204 msgid "Failed to recurse into submodule path '$sm_path'"
5205 msgstr "无法递归进子模组路径 '$sm_path'"
5207 #: git-submodule.sh:712
5212 #: git-submodule.sh:770
5214 msgid " Warn: $name doesn't contain commit $sha1_src"
5215 msgstr " 警告:$name 未包含提交 $sha1_src"
5218 #: git-submodule.sh:773
5220 msgid " Warn: $name doesn't contain commit $sha1_dst"
5221 msgstr " 警告:$name 未包含提交 $sha1_dst"
5224 #: git-submodule.sh:776
5226 msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
5227 msgstr " 警告:$name 未包含提交 $sha1_src 和 $sha1_dst"
5229 #: git-submodule.sh:801
5233 #: git-submodule.sh:802
5237 #: git-submodule.sh:973
5239 msgid "Synchronizing submodule url for '$name'"
5240 msgstr "为 '$name' 同步子模组 url"
5242 #~ msgid "cherry-pick"
5245 #~ msgid "Please enter the commit message for your changes."
5246 #~ msgstr "请为您的修改输入提交说明。"
5248 #~ msgid "Too many options specified"
5249 #~ msgstr "指定了太多的选项"