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-07-03 10:23+0800\n"
16 "PO-Revision-Date: 2012-07-04 22:38+0800\n"
17 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
18 "Language-Team: GitHub <https://github.com/gotgit/git/>\n"
21 "Content-Type: text/plain; charset=UTF-8\n"
22 "Content-Transfer-Encoding: 8bit\n"
23 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
31 #. * Message used both when 'git commit' fails and when
32 #. * other commands doing a merge do.
36 "Fix them up in the work tree,\n"
37 "and then use 'git add/rm <file>' as\n"
38 "appropriate to mark resolution and make a commit,\n"
39 "or use 'git commit -a'."
42 "'git add/rm <file>' 标记解决方案,\n"
43 "或使用 'git commit -a'。"
47 msgid "'%s' does not look like a v2 bundle file"
48 msgstr "'%s' 不像是一个 v2 版本的包文件"
52 msgid "unrecognized header: %s%s (%d)"
53 msgstr "未能识别的包头:%s%s (%d)"
55 #: bundle.c:89 builtin/commit.c:696
57 msgid "could not open '%s'"
61 msgid "Repository lacks these prerequisite commits:"
62 msgstr "版本库缺少这些必备的提交:"
64 #: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:290
65 #: builtin/log.c:721 builtin/log.c:1310 builtin/log.c:1529 builtin/merge.c:347
66 #: builtin/shortlog.c:181
67 msgid "revision walk setup failed"
72 msgid "The bundle contains %d ref"
73 msgid_plural "The bundle contains %d refs"
74 msgstr[0] "这个包中含有 %d 个引用"
75 msgstr[1] "这个包中含有 %d 个引用"
78 msgid "The bundle records a complete history."
83 msgid "The bundle requires this ref"
84 msgid_plural "The bundle requires these %d refs"
86 msgstr[1] "这个包需要 %d 个这些引用"
92 #: bundle.c:300 builtin/log.c:1206 builtin/shortlog.c:284
94 msgid "unrecognized argument: %s"
99 msgid "ref '%s' is excluded by the rev-list options"
100 msgstr "引用 '%s' 被 rev-list 选项排除"
103 msgid "Refusing to create empty bundle."
107 msgid "Could not spawn pack-objects"
108 msgstr "不能生成 pack-objects 进程"
111 msgid "pack-objects died"
112 msgstr "pack-objects 终止"
116 msgid "cannot create '%s'"
120 msgid "index-pack died"
121 msgstr "index-pack 终止"
125 msgid "could not parse %s"
130 msgid "%s %s is not a commit!"
131 msgstr "%s %s 不是一个提交!"
133 #: compat/obstack.c:406 compat/obstack.c:408
134 msgid "memory exhausted"
138 msgid "Could not run 'git rev-list'"
139 msgstr "不能执行 'git rev-list'"
143 msgid "failed write to rev-list: %s"
144 msgstr "无法写入 rev-list:%s"
148 msgid "failed to close rev-list's stdin: %s"
149 msgstr "无法关闭 rev-list 的标准输入:%s"
152 msgid "in the future"
157 msgid "%lu second ago"
158 msgid_plural "%lu seconds ago"
164 msgid "%lu minute ago"
165 msgid_plural "%lu minutes ago"
172 msgid_plural "%lu hours ago"
179 msgid_plural "%lu days ago"
186 msgid_plural "%lu weeks ago"
192 msgid "%lu month ago"
193 msgid_plural "%lu months ago"
200 msgid_plural "%lu years"
206 msgid "%s, %lu month ago"
207 msgid_plural "%s, %lu months ago"
208 msgstr[0] "%s,%lu 个月之前"
209 msgstr[1] "%s,%lu 个月之前"
211 #: date.c:154 date.c:159
214 msgid_plural "%lu years ago"
221 msgid " Failed to parse dirstat cut-off percentage '%.*s'\n"
222 msgstr " 无法解析 dirstat 阈值 '%.*s'\n"
227 msgid " Unknown dirstat parameter '%.*s'\n"
228 msgstr " 未知 dirstat 参数 '%.*s'\n"
233 "Found errors in 'diff.dirstat' config variable:\n"
236 "发现配置变量 'diff.dirstat' 中的错误:\n"
240 msgid " 0 files changed\n"
245 msgid " %d file changed"
246 msgid_plural " %d files changed"
247 msgstr[0] " %d 个文件被修改"
248 msgstr[1] " %d 个文件被修改"
252 msgid ", %d insertion(+)"
253 msgid_plural ", %d insertions(+)"
254 msgstr[0] ",插入 %d 行(+)"
255 msgstr[1] ",插入 %d 行(+)"
259 msgid ", %d deletion(-)"
260 msgid_plural ", %d deletions(-)"
261 msgstr[0] ",删除 %d 行(-)"
262 msgstr[1] ",删除 %d 行(-)"
267 "Failed to parse --dirstat/-X option parameter:\n"
270 "无法解析 --dirstat/-X 选项的参数:\n"
273 #: gpg-interface.c:59
274 msgid "could not run gpg."
277 #: gpg-interface.c:71
278 msgid "gpg did not accept the data"
281 #: gpg-interface.c:82
282 msgid "gpg failed to sign the data"
287 msgid "'%s': unable to read %s"
288 msgstr "'%s':无法读取 %s"
297 msgid "'%s': short read %s"
298 msgstr "'%s':读取不完整 %s"
302 msgid "available git commands in '%s'"
303 msgstr "在 '%s' 下可用的 git 命令"
306 msgid "git commands available from elsewhere on your $PATH"
307 msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
312 "'%s' appears to be a git command, but we were not\n"
313 "able to execute it. Maybe git-%s is broken?"
315 "'%s' 像是一个 git 命令,但却无法运行。\n"
319 msgid "Uh oh. Your system reports no Git commands at all."
320 msgstr "唉呀,您的系统中未发现 Git 命令。"
325 "WARNING: You called a Git command named '%s', which does not exist.\n"
326 "Continuing under the assumption that you meant '%s'"
328 "警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
333 msgid "in %0.1f seconds automatically..."
334 msgstr "在 %0.1f 秒钟后自动运行..."
338 msgid "git: '%s' is not a git command. See 'git --help'."
339 msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
347 "Did you mean one of these?"
355 #: parse-options.c:493
359 #: parse-options.c:511
364 #. TRANSLATORS: the colon here should align with the
365 #. one in "usage: %s" translation
366 #: parse-options.c:515
371 # 译者:为保证在输出中对齐,注意调整句中空格!
372 #: parse-options.c:518
379 msgid "Your branch is ahead of '%s' by %d commit.\n"
380 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
381 msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
382 msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
386 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
388 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
389 msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
390 msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
395 "Your branch and '%s' have diverged,\n"
396 "and have %d and %d different commit each, respectively.\n"
398 "Your branch and '%s' have diverged,\n"
399 "and have %d and %d different commits each, respectively.\n"
401 "您的分支和 '%s' 出现了偏离,\n"
402 "并且各自分别有 %d 和 %d 处不同的提交。\n"
404 "您的分支和 '%s' 出现了偏离,\n"
405 "并且各自分别有 %d 和 %d 处不同的提交。\n"
407 #: sequencer.c:121 builtin/merge.c:865 builtin/merge.c:978
408 #: builtin/merge.c:1088 builtin/merge.c:1098
410 msgid "Could not open '%s' for writing"
411 msgstr "不能为写入打开 '%s'"
413 #: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:868
414 #: builtin/merge.c:1090 builtin/merge.c:1103
416 msgid "Could not write to '%s'"
421 "after resolving the conflicts, mark the corrected paths\n"
422 "with 'git add <paths>' or 'git rm <paths>'"
424 "冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
429 "after resolving the conflicts, mark the corrected paths\n"
430 "with 'git add <paths>' or 'git rm <paths>'\n"
431 "and commit the result with 'git commit'"
433 "冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
434 "对修正后的文件做标记,然后用 'git commit' 提交"
436 #: sequencer.c:160 sequencer.c:758 sequencer.c:841
438 msgid "Could not write to %s"
443 msgid "Error wrapping up %s"
447 msgid "Your local changes would be overwritten by cherry-pick."
448 msgstr "您的本地修改将被拣选操作覆盖。"
451 msgid "Your local changes would be overwritten by revert."
452 msgstr "您的本地修改将被还原操作覆盖。"
455 msgid "Commit your changes or stash them to proceed."
456 msgstr "提交您的修改或保存进度后再继续。"
458 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
461 msgid "%s: Unable to write new index file"
462 msgstr "%s:无法写入新索引文件"
465 msgid "Could not resolve HEAD commit\n"
466 msgstr "不能解析 HEAD 提交\n"
469 msgid "Unable to update cache tree\n"
474 msgid "Could not parse commit %s\n"
479 msgid "Could not parse parent commit %s\n"
480 msgstr "不能解析父提交 %s\n"
483 msgid "Your index file is unmerged."
484 msgstr "您的索引文件未完成合并。"
487 msgid "You do not have a valid HEAD"
488 msgstr "您没有一个有效的 HEAD"
492 msgid "Commit %s is a merge but no -m option was given."
493 msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
497 msgid "Commit %s does not have parent %d"
498 msgstr "提交 %s 没有父提交 %d"
502 msgid "Mainline was specified but commit %s is not a merge."
503 msgstr "指定了主线但提交 %s 不是一个合并。"
505 #. TRANSLATORS: The first %s will be "revert" or
506 #. "cherry-pick", the second %s a SHA1
509 msgid "%s: cannot parse parent commit %s"
510 msgstr "%s:不能解析父提交 %s"
514 msgid "Cannot get commit message for %s"
515 msgstr "不能得到 %s 的提交说明"
519 msgid "could not revert %s... %s"
520 msgstr "不能还原 %s... %s"
524 msgid "could not apply %s... %s"
525 msgstr "不能应用 %s... %s"
528 msgid "empty commit set passed"
533 msgid "git %s: failed to read the index"
534 msgstr "git %s:无法读取索引"
538 msgid "git %s: failed to refresh the index"
539 msgstr "git %s:无法刷新索引"
543 msgid "Cannot %s during a %s"
544 msgstr "无法 %s 在一个 %s 过程中"
548 msgid "Could not parse line %d."
552 msgid "No commits parsed."
557 msgid "Could not open %s"
562 msgid "Could not read %s."
567 msgid "Unusable instruction sheet: %s"
572 msgid "Invalid key: %s"
577 msgid "Invalid value for %s: %s"
582 msgid "Malformed options sheet: %s"
586 msgid "a cherry-pick or revert is already in progress"
587 msgstr "一个拣选或还原操作已在进行"
590 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
591 msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
595 msgid "Could not create sequencer directory %s"
598 #: sequencer.c:760 sequencer.c:845
600 msgid "Error wrapping up %s."
603 #: sequencer.c:779 sequencer.c:913
604 msgid "no cherry-pick or revert in progress"
605 msgstr "没有拣选或还原操作在进行"
608 msgid "cannot resolve HEAD"
612 msgid "cannot abort from a branch yet to be born"
613 msgstr "不能从尚未建立的分支终止"
615 #: sequencer.c:805 builtin/apply.c:3697
617 msgid "cannot open %s: %s"
622 msgid "cannot read %s: %s"
626 msgid "unexpected end of file"
631 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
632 msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
636 msgid "Could not format %s."
640 msgid "Can't revert as initial commit"
644 msgid "Can't cherry-pick into empty head"
648 msgid "HEAD does not point to a branch"
649 msgstr "HEAD 没有指向一个分支"
653 msgid "No such branch: '%s'"
658 msgid "No upstream configured for branch '%s'"
659 msgstr "尚未给分支 '%s' 设置上游"
663 msgid "Upstream branch '%s' not stored as a remote-tracking branch"
664 msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
668 msgid "unable to look up current user in the passwd file: %s"
669 msgstr "无法在 passwd 文件中查询到当前用户:%s"
676 msgid "Unmerged paths:"
680 #: wt-status.c:168 wt-status.c:195
682 msgid " (use \"git reset %s <file>...\" to unstage)"
683 msgstr " (使用 \"git reset %s <file>...\" 撤出暂存区)"
686 #: wt-status.c:170 wt-status.c:197
687 msgid " (use \"git rm --cached <file>...\" to unstage)"
688 msgstr " (使用 \"git rm --cached <file>...\" 撤出暂存区)"
692 msgid " (use \"git add <file>...\" to mark resolution)"
693 msgstr " (使用 \"git add <file>...\" 标记解决方案)"
696 #: wt-status.c:176 wt-status.c:180
697 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
698 msgstr " (酌情使用 \"git add/rm <file>...\" 标记解决方案)"
702 msgid " (use \"git rm <file>...\" to mark resolution)"
703 msgstr " (使用 \"git rm <file>...\" 标记解决方案)"
706 msgid "Changes to be committed:"
710 msgid "Changes not staged for commit:"
711 msgstr "尚未暂存以备提交的变更:"
715 msgid " (use \"git add <file>...\" to update what will be committed)"
716 msgstr " (使用 \"git add <file>...\" 更新要提交的内容)"
720 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
721 msgstr " (使用 \"git add/rm <file>...\" 更新要提交的内容)"
726 " (use \"git checkout -- <file>...\" to discard changes in working directory)"
727 msgstr " (使用 \"git checkout -- <file>...\" 丢弃工作区的改动)"
731 msgid " (commit or discard the untracked or modified content in submodules)"
732 msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
742 msgid " (use \"git %s <file>...\" to include in what will be committed)"
743 msgstr " (使用 \"git %s <file>...\" 以包含要提交的内容)"
750 msgid "both deleted:"
758 msgid "deleted by them:"
762 msgid "added by them:"
766 msgid "deleted by us:"
774 msgid "both modified:"
777 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
779 msgid "new commits, "
782 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
784 msgid "modified content, "
787 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
789 msgid "untracked content, "
792 # 译者:为保证在输出中对齐,注意调整句中空格!
798 # 译者:为保证在输出中对齐,注意调整句中空格!
801 msgid "copied: %s -> %s"
802 msgstr "拷贝: %s -> %s"
804 # 译者:为保证在输出中对齐,注意调整句中空格!
810 # 译者:为保证在输出中对齐,注意调整句中空格!
816 # 译者:为保证在输出中对齐,注意调整句中空格!
819 msgid "renamed: %s -> %s"
820 msgstr "重命名: %s -> %s"
822 # 译者:为保证在输出中对齐,注意调整句中空格!
825 msgid "typechange: %s"
828 # 译者:为保证在输出中对齐,注意调整句中空格!
834 # 译者:为保证在输出中对齐,注意调整句中空格!
842 msgid "bug: unhandled diff status %c"
843 msgstr "bug:未处理的差异状态 %c"
846 msgid "You have unmerged paths."
850 #: wt-status.c:789 wt-status.c:913
851 msgid " (fix conflicts and run \"git commit\")"
852 msgstr " (解决冲突并运行 \"git commit\")"
855 msgid "All conflicts fixed but you are still merging."
856 msgstr "所有冲突已解决但您仍处于合并中。"
860 msgid " (use \"git commit\" to conclude merge)"
861 msgstr " (使用 \"git commit\" 结束合并)"
864 msgid "You are in the middle of an am session."
865 msgstr "您正处于一个 am 过程中。"
868 msgid "The current patch is empty."
873 msgid " (fix conflicts and then run \"git am --resolved\")"
874 msgstr " (解决冲突,然后运行 \"git am --resolved\")"
878 msgid " (use \"git am --skip\" to skip this patch)"
879 msgstr " (使用 \"git am --skip\" 跳过此补丁)"
883 msgid " (use \"git am --abort\" to restore the original branch)"
884 msgstr " (使用 \"git am --abort\" 恢复原有分支)"
886 #: wt-status.c:874 wt-status.c:884
887 msgid "You are currently rebasing."
892 msgid " (fix conflicts and then run \"git rebase --continue\")"
893 msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
897 msgid " (use \"git rebase --skip\" to skip this patch)"
898 msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
902 msgid " (use \"git rebase --abort\" to check out the original branch)"
903 msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
907 msgid " (all conflicts fixed: run \"git rebase --continue\")"
908 msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
911 msgid "You are currently splitting a commit during a rebase."
912 msgstr "您正在变基过程中拆分一个提交。"
916 msgid " (Once your working directory is clean, run \"git rebase --continue\")"
917 msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
920 msgid "You are currently editing a commit during a rebase."
921 msgstr "您正在变基过程中编辑一个提交。"
925 msgid " (use \"git commit --amend\" to amend the current commit)"
926 msgstr " (使用 \"git commit --amend\" 修补当前提交)"
931 " (use \"git rebase --continue\" once you are satisfied with your changes)"
933 " (执行 \"git rebase --continue\" 一旦您满意您的修改)"
936 msgid "You are currently cherry-picking."
941 msgid " (all conflicts fixed: run \"git commit\")"
942 msgstr " (解决所有冲突后,执行 \"git commit\")"
945 msgid "You are currently bisecting."
950 msgid " (use \"git bisect reset\" to get back to the original branch)"
951 msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
958 msgid "Not currently on any branch."
962 msgid "Initial commit"
975 msgid "Untracked files not listed%s"
976 msgstr "未跟踪的文件没有列出%s"
980 msgid " (use -u option to show untracked files)"
981 msgstr "(使用 -u 参数显示未跟踪的文件)"
989 msgid "no changes added to commit%s\n"
990 msgstr "修改尚未加入提交%s\n"
994 msgid " (use \"git add\" and/or \"git commit -a\")"
995 msgstr "(使用 \"git add\" 和/或 \"git commit -a\")"
999 msgid "nothing added to commit but untracked files present%s\n"
1000 msgstr "空提交但存在未跟踪文件%s\n"
1002 # 译者:中文字符串拼接,可删除前导空格
1004 msgid " (use \"git add\" to track)"
1005 msgstr "(使用 \"git add\" 建立跟踪)"
1007 #: wt-status.c:1036 wt-status.c:1039 wt-status.c:1042
1009 msgid "nothing to commit%s\n"
1012 # 译者:中文字符串拼接,可删除前导空格
1014 msgid " (create/copy files and use \"git add\" to track)"
1015 msgstr "(新建/拷贝的文件使用 \"git add\" 建立跟踪)"
1017 # 译者:中文字符串拼接,可删除前导空格
1019 msgid " (use -u to show untracked files)"
1020 msgstr "(使用 -u 显示未跟踪文件)"
1022 # 译者:中文字符串拼接,可删除前导空格
1024 msgid " (working directory clean)"
1028 msgid "HEAD (no branch)"
1033 msgid "Initial commit on "
1042 #: wt-status.c:1175 wt-status.c:1178
1053 msgid "unexpected diff status %c"
1056 #: builtin/add.c:67 builtin/commit.c:226
1057 msgid "updating files failed"
1062 msgid "remove '%s'\n"
1065 #: builtin/add.c:176
1067 msgid "Path '%s' is in submodule '%.*s'"
1068 msgstr "路径 '%s' 属于模组 '%.*s'"
1070 #: builtin/add.c:192
1071 msgid "Unstaged changes after refreshing the index:"
1072 msgstr "刷新索引之后尚未被暂存的变更:"
1074 #: builtin/add.c:195 builtin/add.c:459 builtin/rm.c:186
1076 msgid "pathspec '%s' did not match any files"
1077 msgstr "路径 '%s' 未匹配任何文件"
1079 #: builtin/add.c:209
1081 msgid "'%s' is beyond a symbolic link"
1082 msgstr "'%s' 位于符号链接中"
1084 #: builtin/add.c:276
1085 msgid "Could not read the index"
1088 #: builtin/add.c:286
1090 msgid "Could not open '%s' for writing."
1091 msgstr "不能为写入打开 '%s'。"
1093 #: builtin/add.c:290
1094 msgid "Could not write patch"
1097 #: builtin/add.c:295
1099 msgid "Could not stat '%s'"
1100 msgstr "不能查看文件状态 '%s'"
1102 #: builtin/add.c:297
1103 msgid "Empty patch. Aborted."
1106 #: builtin/add.c:303
1108 msgid "Could not apply '%s'"
1111 #: builtin/add.c:312
1112 msgid "The following paths are ignored by one of your .gitignore files:\n"
1113 msgstr "下列路径被您的一个 .gitignore 文件所忽略:\n"
1115 #: builtin/add.c:352
1117 msgid "Use -f if you really want to add them.\n"
1118 msgstr "使用 -f 参数如果您确实要添加它们。\n"
1120 #: builtin/add.c:353
1121 msgid "no files added"
1124 #: builtin/add.c:359
1125 msgid "adding files failed"
1128 #: builtin/add.c:391
1129 msgid "-A and -u are mutually incompatible"
1130 msgstr "-A 和 -u 选项互斥"
1132 #: builtin/add.c:393
1133 msgid "Option --ignore-missing can only be used together with --dry-run"
1134 msgstr "选项 --ignore-missing 只能和 --dry-run 共用"
1136 #: builtin/add.c:413
1138 msgid "Nothing specified, nothing added.\n"
1139 msgstr "没有指定文件,也没有文件被添加。\n"
1141 #: builtin/add.c:414
1143 msgid "Maybe you wanted to say 'git add .'?\n"
1144 msgstr "也许您想要执行 'git add .'?\n"
1146 #: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:286 builtin/mv.c:82
1148 msgid "index file corrupt"
1151 #: builtin/add.c:480 builtin/apply.c:4108 builtin/mv.c:229 builtin/rm.c:260
1152 msgid "Unable to write new index file"
1155 #: builtin/apply.c:53
1156 msgid "git apply [options] [<patch>...]"
1157 msgstr "git apply [选项] [<补丁>...]"
1159 #: builtin/apply.c:106
1161 msgid "unrecognized whitespace option '%s'"
1162 msgstr "未能识别的空白字符选项 '%s'"
1164 #: builtin/apply.c:121
1166 msgid "unrecognized whitespace ignore option '%s'"
1167 msgstr "未能识别的空白字符忽略选项 '%s'"
1169 #: builtin/apply.c:815
1171 msgid "Cannot prepare timestamp regexp %s"
1172 msgstr "无法准备时间戳正则表达式 %s"
1174 #: builtin/apply.c:824
1176 msgid "regexec returned %d for input: %s"
1177 msgstr "regexec 返回 %d,输入为:%s"
1179 #: builtin/apply.c:905
1181 msgid "unable to find filename in patch at line %d"
1182 msgstr "不能在补丁的第 %d 行找到文件名"
1184 #: builtin/apply.c:937
1186 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
1187 msgstr "git apply:错误的 git-diff - 期望 /dev/null,但在第 %2$d 行得到 %1$s"
1189 #: builtin/apply.c:941
1191 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
1192 msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
1194 #: builtin/apply.c:942
1196 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
1197 msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
1199 #: builtin/apply.c:949
1201 msgid "git apply: bad git-diff - expected /dev/null on line %d"
1202 msgstr "git apply:错误的 git-diff - 期望 /dev/null 于第 %d 行"
1204 #: builtin/apply.c:1394
1206 msgid "recount: unexpected line: %.*s"
1207 msgstr "recount:意外的行:%.*s"
1209 #: builtin/apply.c:1451
1211 msgid "patch fragment without header at line %d: %.*s"
1212 msgstr "第 %d 行的补丁片段没有头信息:%.*s"
1214 #: builtin/apply.c:1468
1217 "git diff header lacks filename information when removing %d leading pathname "
1218 "component (line %d)"
1220 "git diff header lacks filename information when removing %d leading pathname "
1221 "components (line %d)"
1222 msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
1223 msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
1225 #: builtin/apply.c:1628
1226 msgid "new file depends on old contents"
1229 #: builtin/apply.c:1630
1230 msgid "deleted file still has contents"
1233 #: builtin/apply.c:1656
1235 msgid "corrupt patch at line %d"
1236 msgstr "补丁损坏位于第 %d 行"
1238 #: builtin/apply.c:1692
1240 msgid "new file %s depends on old contents"
1241 msgstr "新文件 %s 依赖旧内容"
1243 #: builtin/apply.c:1694
1245 msgid "deleted file %s still has contents"
1246 msgstr "删除的文件 %s 仍有内容"
1248 #: builtin/apply.c:1697
1250 msgid "** warning: file %s becomes empty but is not deleted"
1251 msgstr "** 警告:文件 %s 成为空文件但并未删除"
1253 #: builtin/apply.c:1843
1255 msgid "corrupt binary patch at line %d: %.*s"
1256 msgstr "二进制补丁在第 %d 行损坏:%.*s"
1258 #. there has to be one hunk (forward hunk)
1259 #: builtin/apply.c:1872
1261 msgid "unrecognized binary patch at line %d"
1262 msgstr "未能识别的二进制补丁位于第 %d 行"
1264 #: builtin/apply.c:1958
1266 msgid "patch with only garbage at line %d"
1267 msgstr "补丁文件的第 %d 行只有垃圾数据"
1269 #: builtin/apply.c:2048
1271 msgid "unable to read symlink %s"
1272 msgstr "无法读取符号链接 %s"
1274 #: builtin/apply.c:2052
1276 msgid "unable to open or read %s"
1279 #: builtin/apply.c:2123
1283 #: builtin/apply.c:2645
1285 msgid "invalid start of line: '%c'"
1286 msgstr "无效的行首字符:'%c'"
1288 #: builtin/apply.c:2763
1290 msgid "Hunk #%d succeeded at %d (offset %d line)."
1291 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1292 msgstr[0] "块 #%d 成功应用于 %d (偏移 %d 行)"
1293 msgstr[1] "块 #%d 成功应用于 %d (偏移 %d 行)"
1295 #: builtin/apply.c:2775
1297 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
1298 msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
1300 #: builtin/apply.c:2781
1303 "while searching for:\n"
1309 #: builtin/apply.c:2800
1311 msgid "missing binary patch data for '%s'"
1312 msgstr "缺失 '%s' 的二进制补丁数据"
1314 #: builtin/apply.c:2903
1316 msgid "binary patch does not apply to '%s'"
1317 msgstr "二进制补丁未应用到 '%s'"
1319 #: builtin/apply.c:2909
1321 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1322 msgstr "到 '%s' 的二进制补丁产生了不正确的结果(预期 %s,得到 %s)"
1324 #: builtin/apply.c:2930
1326 msgid "patch failed: %s:%ld"
1327 msgstr "打补丁失败:%s:%ld"
1329 #: builtin/apply.c:3045
1331 msgid "patch %s has been renamed/deleted"
1332 msgstr "补丁 %s 已经被重命名/删除"
1334 #: builtin/apply.c:3052 builtin/apply.c:3069
1336 msgid "read of %s failed"
1339 #: builtin/apply.c:3084
1340 msgid "removal patch leaves file contents"
1341 msgstr "移除补丁仍留下了文件内容"
1343 #: builtin/apply.c:3105
1345 msgid "%s: already exists in working directory"
1346 msgstr "%s:已经存在于工作区中"
1348 #: builtin/apply.c:3143
1350 msgid "%s: has been deleted/renamed"
1351 msgstr "%s:已经被删除/重命名"
1353 #: builtin/apply.c:3148 builtin/apply.c:3179
1358 #: builtin/apply.c:3159
1360 msgid "%s: does not exist in index"
1363 #: builtin/apply.c:3173
1365 msgid "%s: does not match index"
1368 #: builtin/apply.c:3190
1370 msgid "%s: wrong type"
1373 #: builtin/apply.c:3192
1375 msgid "%s has type %o, expected %o"
1376 msgstr "%s 的类型是 %o,预期是 %o"
1378 #: builtin/apply.c:3247
1380 msgid "%s: already exists in index"
1381 msgstr "%s:已经存在于索引中"
1383 #: builtin/apply.c:3267
1385 msgid "new mode (%o) of %s does not match old mode (%o)"
1386 msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
1388 #: builtin/apply.c:3272
1390 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1391 msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
1393 #: builtin/apply.c:3280
1395 msgid "%s: patch does not apply"
1398 #: builtin/apply.c:3293
1400 msgid "Checking patch %s..."
1403 #: builtin/apply.c:3348 builtin/checkout.c:212 builtin/reset.c:158
1405 msgid "make_cache_entry failed for path '%s'"
1406 msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
1408 #: builtin/apply.c:3491
1410 msgid "unable to remove %s from index"
1411 msgstr "不能从索引中移除 %s"
1413 #: builtin/apply.c:3518
1415 msgid "corrupt patch for subproject %s"
1416 msgstr "子项目 %s 损坏的补丁"
1418 #: builtin/apply.c:3522
1420 msgid "unable to stat newly created file '%s'"
1421 msgstr "不能枚举新建文件 '%s' 的状态"
1423 #: builtin/apply.c:3527
1425 msgid "unable to create backing store for newly created file %s"
1426 msgstr "不能为新建文件 %s 创建后端存储"
1428 #: builtin/apply.c:3530
1430 msgid "unable to add cache entry for %s"
1431 msgstr "无法为 %s 添加缓存条目"
1433 #: builtin/apply.c:3563
1435 msgid "closing file '%s'"
1438 #: builtin/apply.c:3612
1440 msgid "unable to write file '%s' mode %o"
1441 msgstr "不能写文件 '%s' 权限 %o"
1443 #: builtin/apply.c:3668
1445 msgid "Applied patch %s cleanly."
1448 #: builtin/apply.c:3676
1449 msgid "internal error"
1452 #. Say this even without --verbose
1453 #: builtin/apply.c:3679
1455 msgid "Applying patch %%s with %d reject..."
1456 msgid_plural "Applying patch %%s with %d rejects..."
1457 msgstr[0] "应用补丁 %%s 时 %d 个被拒绝..."
1458 msgstr[1] "应用补丁 %%s 时 %d 个被拒绝..."
1460 #: builtin/apply.c:3689
1462 msgid "truncating .rej filename to %.*s.rej"
1463 msgstr "截短 .rej 文件名为 %.*s.rej"
1465 #: builtin/apply.c:3710
1467 msgid "Hunk #%d applied cleanly."
1468 msgstr "第 #%d 个片段成功应用。"
1470 #: builtin/apply.c:3713
1472 msgid "Rejected hunk #%d."
1473 msgstr "拒绝第 #%d 个片段。"
1475 #: builtin/apply.c:3844
1476 msgid "unrecognized input"
1479 #: builtin/apply.c:3855
1480 msgid "unable to read index file"
1483 #: builtin/apply.c:3970 builtin/apply.c:3973
1487 #: builtin/apply.c:3971
1488 msgid "don't apply changes matching the given path"
1489 msgstr "不要应用与给出路径向匹配的变更"
1491 #: builtin/apply.c:3974
1492 msgid "apply changes matching the given path"
1493 msgstr "应用与给出路径向匹配的变更"
1495 #: builtin/apply.c:3976
1499 #: builtin/apply.c:3977
1500 msgid "remove <num> leading slashes from traditional diff paths"
1501 msgstr "从传统的 diff 路径中移除 <数字> 个前导路径"
1503 #: builtin/apply.c:3980
1504 msgid "ignore additions made by the patch"
1505 msgstr "忽略补丁中的添加的文件"
1507 #: builtin/apply.c:3982
1508 msgid "instead of applying the patch, output diffstat for the input"
1509 msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
1511 #: builtin/apply.c:3986
1512 msgid "shows number of added and deleted lines in decimal notation"
1513 msgstr "以数字方式显示添加或删除行的数量"
1515 #: builtin/apply.c:3988
1516 msgid "instead of applying the patch, output a summary for the input"
1517 msgstr "不应用补丁,而是显示输入的概要"
1519 #: builtin/apply.c:3990
1520 msgid "instead of applying the patch, see if the patch is applicable"
1521 msgstr "不应用补丁,而是查看补丁是否可应用"
1523 #: builtin/apply.c:3992
1524 msgid "make sure the patch is applicable to the current index"
1525 msgstr "确认补丁可以应用到当前索引"
1527 #: builtin/apply.c:3994
1528 msgid "apply a patch without touching the working tree"
1529 msgstr "应用补丁而不修改工作区"
1531 #: builtin/apply.c:3996
1532 msgid "also apply the patch (use with --stat/--summary/--check)"
1533 msgstr "同时应用此补丁(和 --stat/--summary/--check 共用)"
1535 #: builtin/apply.c:3998
1536 msgid "build a temporary index based on embedded index information"
1537 msgstr "创建一个临时索引基于嵌入的索引信息"
1539 #: builtin/apply.c:4000
1540 msgid "paths are separated with NUL character"
1541 msgstr "路径以 NUL 字符分隔"
1543 #: builtin/apply.c:4003
1544 msgid "ensure at least <n> lines of context match"
1545 msgstr "确保至少匹配 <n> 行上下文"
1547 #: builtin/apply.c:4004
1551 #: builtin/apply.c:4005
1552 msgid "detect new or modified lines that have whitespace errors"
1553 msgstr "检查新增和修改的行中间的空白字符滥用"
1555 #: builtin/apply.c:4008 builtin/apply.c:4011
1556 msgid "ignore changes in whitespace when finding context"
1557 msgstr "查找上下文时忽略空白字符的变更"
1559 #: builtin/apply.c:4014
1560 msgid "apply the patch in reverse"
1563 #: builtin/apply.c:4016
1564 msgid "don't expect at least one line of context"
1567 #: builtin/apply.c:4018
1568 msgid "leave the rejected hunks in corresponding *.rej files"
1569 msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
1571 #: builtin/apply.c:4020
1572 msgid "allow overlapping hunks"
1575 #: builtin/apply.c:4021
1579 #: builtin/apply.c:4023
1580 msgid "tolerate incorrectly detected missing new-line at the end of file"
1581 msgstr "宽容不正确的文件末尾换行符"
1583 #: builtin/apply.c:4026
1584 msgid "do not trust the line counts in the hunk headers"
1585 msgstr "不信任补丁片段的头信息中的行号"
1587 #: builtin/apply.c:4028
1591 #: builtin/apply.c:4029
1592 msgid "prepend <root> to all filenames"
1593 msgstr "为所有文件名前添加 <根目录>"
1595 #: builtin/apply.c:4050
1596 msgid "--index outside a repository"
1597 msgstr "--index 在一个版本库之外"
1599 #: builtin/apply.c:4053
1600 msgid "--cached outside a repository"
1601 msgstr "--cached 在一个版本库之外"
1603 #: builtin/apply.c:4069
1605 msgid "can't open patch '%s'"
1606 msgstr "不能打开补丁 '%s'"
1608 #: builtin/apply.c:4083
1610 msgid "squelched %d whitespace error"
1611 msgid_plural "squelched %d whitespace errors"
1612 msgstr[0] "抑制下仍有 %d 个空白字符误用"
1613 msgstr[1] "抑制下仍有 %d 个空白字符误用"
1615 #: builtin/apply.c:4089 builtin/apply.c:4099
1617 msgid "%d line adds whitespace errors."
1618 msgid_plural "%d lines add whitespace errors."
1619 msgstr[0] "%d 行有空白字符误用。"
1620 msgstr[1] "%d 行有空白字符误用。"
1622 #: builtin/archive.c:17
1624 msgid "could not create archive file '%s'"
1625 msgstr "不能创建归档文件 '%s'"
1627 #: builtin/archive.c:20
1628 msgid "could not redirect output"
1631 #: builtin/archive.c:37
1632 msgid "git archive: Remote with no URL"
1633 msgstr "git archive:未提供远程URL"
1635 #: builtin/archive.c:58
1636 msgid "git archive: expected ACK/NAK, got EOF"
1637 msgstr "git archive:期待ACK/NACK,却得到EOF"
1639 #: builtin/archive.c:63
1641 msgid "git archive: NACK %s"
1642 msgstr "git archive:NACK %s"
1644 #: builtin/archive.c:65
1646 msgid "remote error: %s"
1649 #: builtin/archive.c:66
1650 msgid "git archive: protocol error"
1651 msgstr "git archive:协议错误"
1653 #: builtin/archive.c:71
1654 msgid "git archive: expected a flush"
1655 msgstr "git archive:预期一个刷新"
1657 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
1658 #: builtin/branch.c:144
1661 "deleting branch '%s' that has been merged to\n"
1662 " '%s', but not yet merged to HEAD."
1664 "将要删除的分支 '%s' 已经被合并到\n"
1667 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
1668 #: builtin/branch.c:148
1671 "not deleting branch '%s' that is not yet merged to\n"
1672 " '%s', even though it is merged to HEAD."
1674 "并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
1675 " 然而却尚未被合并到分支 '%s' 。"
1677 #: builtin/branch.c:180
1678 msgid "cannot use -a with -d"
1679 msgstr "不能将 -a 和 -d 共用"
1681 #: builtin/branch.c:186
1682 msgid "Couldn't look up commit object for HEAD"
1683 msgstr "无法查询 HEAD 指向的提交对象"
1685 #: builtin/branch.c:191
1687 msgid "Cannot delete the branch '%s' which you are currently on."
1688 msgstr "无法删除您当前所在的分支 '%s'。"
1690 #: builtin/branch.c:202
1692 msgid "remote branch '%s' not found."
1693 msgstr "远程分支 '%s' 未发现。"
1695 #: builtin/branch.c:203
1697 msgid "branch '%s' not found."
1698 msgstr "分支 '%s' 未发现。"
1700 #: builtin/branch.c:210
1702 msgid "Couldn't look up commit object for '%s'"
1703 msgstr "无法查询 '%s' 指向的提交对象"
1705 #: builtin/branch.c:216
1708 "The branch '%s' is not fully merged.\n"
1709 "If you are sure you want to delete it, run 'git branch -D %s'."
1712 "如果您确认要删除它,执行 'git branch -D %s'。"
1714 #: builtin/branch.c:225
1716 msgid "Error deleting remote branch '%s'"
1717 msgstr "删除远程分支 '%s' 时出错"
1719 #: builtin/branch.c:226
1721 msgid "Error deleting branch '%s'"
1722 msgstr "删除分支 '%s' 时出错"
1724 #: builtin/branch.c:233
1726 msgid "Deleted remote branch %s (was %s).\n"
1727 msgstr "已删除远程分支 %s(曾为 %s)。\n"
1729 #: builtin/branch.c:234
1731 msgid "Deleted branch %s (was %s).\n"
1732 msgstr "已删除分支 %s(曾为 %s)。\n"
1734 #: builtin/branch.c:239
1735 msgid "Update of config-file failed"
1736 msgstr "无法更新 config 文件"
1738 #: builtin/branch.c:337
1740 msgid "branch '%s' does not point at a commit"
1741 msgstr "分支 '%s' 未指向一个提交"
1743 #: builtin/branch.c:409
1745 msgid "[%s: behind %d]"
1748 #: builtin/branch.c:411
1753 #: builtin/branch.c:415
1755 msgid "[%s: ahead %d]"
1758 #: builtin/branch.c:417
1763 #: builtin/branch.c:420
1765 msgid "[%s: ahead %d, behind %d]"
1766 msgstr "[%s:领先 %d,落后 %d]"
1768 #: builtin/branch.c:423
1770 msgid "[ahead %d, behind %d]"
1771 msgstr "[领先 %d,落后 %d]"
1773 #: builtin/branch.c:535
1777 #: builtin/branch.c:600
1778 msgid "some refs could not be read"
1781 #: builtin/branch.c:613
1782 msgid "cannot rename the current branch while not on any."
1783 msgstr "无法重命名当前分支因为不处于任何分支上。"
1785 #: builtin/branch.c:623
1787 msgid "Invalid branch name: '%s'"
1788 msgstr "无效的分支名:'%s'"
1790 #: builtin/branch.c:638
1791 msgid "Branch rename failed"
1794 #: builtin/branch.c:642
1796 msgid "Renamed a misnamed branch '%s' away"
1797 msgstr "重命名掉一个错误命名的旧分支 '%s'"
1799 #: builtin/branch.c:646
1801 msgid "Branch renamed to %s, but HEAD is not updated!"
1802 msgstr "分支重命名为 %s,但 HEAD 没有更新!"
1804 #: builtin/branch.c:653
1805 msgid "Branch is renamed, but update of config-file failed"
1806 msgstr "分支被重命名,但更新 config 文件失败"
1808 #: builtin/branch.c:668
1810 msgid "malformed object name %s"
1813 #: builtin/branch.c:692
1815 msgid "could not write branch description template: %s"
1816 msgstr "不能写分支描述模版:%s"
1818 #: builtin/branch.c:783
1819 msgid "Failed to resolve HEAD as a valid ref."
1820 msgstr "无法将 HEAD 解析为有效引用。"
1822 #: builtin/branch.c:788 builtin/clone.c:558
1823 msgid "HEAD not found below refs/heads!"
1824 msgstr "HEAD 没有位于 /refs/heads 之下!"
1826 #: builtin/branch.c:808
1827 msgid "--column and --verbose are incompatible"
1828 msgstr "--column 和 --verbose 不兼容"
1830 #: builtin/branch.c:857
1831 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
1832 msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
1834 #: builtin/bundle.c:47
1836 msgid "%s is okay\n"
1839 #: builtin/bundle.c:56
1840 msgid "Need a repository to create a bundle."
1841 msgstr "需要一个版本库来创建包。"
1843 #: builtin/bundle.c:60
1844 msgid "Need a repository to unbundle."
1845 msgstr "需要一个版本库来解包。"
1847 #: builtin/checkout.c:113 builtin/checkout.c:146
1849 msgid "path '%s' does not have our version"
1850 msgstr "路径 '%s' 没有我们的版本"
1852 #: builtin/checkout.c:115 builtin/checkout.c:148
1854 msgid "path '%s' does not have their version"
1855 msgstr "路径 '%s' 没有他们的版本"
1857 #: builtin/checkout.c:131
1859 msgid "path '%s' does not have all necessary versions"
1860 msgstr "路径 '%s' 没有全部必须的版本"
1862 #: builtin/checkout.c:175
1864 msgid "path '%s' does not have necessary versions"
1865 msgstr "路径 '%s' 没有必须的版本"
1867 #: builtin/checkout.c:192
1869 msgid "path '%s': cannot merge"
1870 msgstr "path '%s':无法合并"
1872 #: builtin/checkout.c:209
1874 msgid "Unable to add merge result for '%s'"
1875 msgstr "无法为 '%s' 添加合并结果"
1877 #: builtin/checkout.c:234 builtin/checkout.c:392
1878 msgid "corrupt index file"
1881 #: builtin/checkout.c:264 builtin/checkout.c:271
1883 msgid "path '%s' is unmerged"
1884 msgstr "路径 '%s' 未合并"
1886 #: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583
1887 #: builtin/merge.c:812
1888 msgid "unable to write new index file"
1891 #: builtin/checkout.c:319 builtin/diff.c:302 builtin/merge.c:408
1892 msgid "diff_setup_done failed"
1893 msgstr "diff_setup_done 失败"
1895 #: builtin/checkout.c:414
1896 msgid "you need to resolve your current index first"
1897 msgstr "您需要先解决当前索引的冲突"
1899 #: builtin/checkout.c:533
1901 msgid "Can not do reflog for '%s'\n"
1902 msgstr "不能对 '%s' 执行 reflog 操作\n"
1904 #: builtin/checkout.c:566
1905 msgid "HEAD is now at"
1908 #: builtin/checkout.c:573
1910 msgid "Reset branch '%s'\n"
1911 msgstr "重置分支 '%s'\n"
1913 #: builtin/checkout.c:576
1915 msgid "Already on '%s'\n"
1916 msgstr "已经位于 '%s'\n"
1918 #: builtin/checkout.c:580
1920 msgid "Switched to and reset branch '%s'\n"
1921 msgstr "切换并重置分支 '%s'\n"
1923 #: builtin/checkout.c:582
1925 msgid "Switched to a new branch '%s'\n"
1926 msgstr "切换到一个新分支 '%s'\n"
1928 #: builtin/checkout.c:584
1930 msgid "Switched to branch '%s'\n"
1931 msgstr "切换到分支 '%s'\n"
1934 #: builtin/checkout.c:640
1936 msgid " ... and %d more.\n"
1937 msgstr " ... 及其它 %d 个。\n"
1939 #. The singular version
1940 #: builtin/checkout.c:646
1943 "Warning: you are leaving %d commit behind, not connected to\n"
1944 "any of your branches:\n"
1948 "Warning: you are leaving %d commits behind, not connected to\n"
1949 "any of your branches:\n"
1953 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
1957 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
1961 #: builtin/checkout.c:664
1964 "If you want to keep them by creating a new branch, this may be a good time\n"
1967 " git branch new_branch_name %s\n"
1970 "如果您想要通过创建新分支保存他们,这可能是一个好时候。\n"
1973 " git branch new_branch_name %s\n"
1976 #: builtin/checkout.c:694
1977 msgid "internal error in revision walk"
1978 msgstr "在版本遍历时遇到内部错误"
1980 #: builtin/checkout.c:698
1981 msgid "Previous HEAD position was"
1982 msgstr "之前的 HEAD 位置是"
1984 #: builtin/checkout.c:724
1985 msgid "You are on a branch yet to be born"
1986 msgstr "您位于一个尚未初始化的分支"
1989 #: builtin/checkout.c:855
1991 msgid "invalid reference: %s"
1994 #. case (1): want a tree
1995 #: builtin/checkout.c:894
1997 msgid "reference is not a tree: %s"
2000 #: builtin/checkout.c:974
2001 msgid "-B cannot be used with -b"
2002 msgstr "-B 不能和 -b 共用"
2004 #: builtin/checkout.c:983
2005 msgid "--patch is incompatible with all other options"
2006 msgstr "--patch 选项和其他选项不兼容"
2008 #: builtin/checkout.c:986
2009 msgid "--detach cannot be used with -b/-B/--orphan"
2010 msgstr "--detach 不能和 -b/-B/--orphan 共用"
2012 #: builtin/checkout.c:988
2013 msgid "--detach cannot be used with -t"
2014 msgstr "--detach 不能和 -t 共用"
2016 #: builtin/checkout.c:994
2017 msgid "--track needs a branch name"
2018 msgstr "--track 需要一个分支名"
2020 #: builtin/checkout.c:1001
2021 msgid "Missing branch name; try -b"
2022 msgstr "缺少分支名;尝试 -b"
2024 #: builtin/checkout.c:1007
2025 msgid "--orphan and -b|-B are mutually exclusive"
2026 msgstr "--orphan 和 -b|-B 互斥"
2028 #: builtin/checkout.c:1009
2029 msgid "--orphan cannot be used with -t"
2030 msgstr "--orphan 不能和 -t 共用"
2032 #: builtin/checkout.c:1019
2033 msgid "git checkout: -f and -m are incompatible"
2034 msgstr "git checkout:-f 和 -m 不兼容"
2036 #: builtin/checkout.c:1053
2037 msgid "invalid path specification"
2040 #: builtin/checkout.c:1061
2043 "git checkout: updating paths is incompatible with switching branches.\n"
2044 "Did you intend to checkout '%s' which can not be resolved as commit?"
2046 "git checkout:更新路径和切换分支不兼容。\n"
2047 "您是想要检出 '%s' 但未能将其解析为提交么?"
2049 #: builtin/checkout.c:1063
2050 msgid "git checkout: updating paths is incompatible with switching branches."
2051 msgstr "git checkout:更新路径和切换分支不兼容。"
2053 #: builtin/checkout.c:1068
2054 msgid "git checkout: --detach does not take a path argument"
2055 msgstr "git checkout:--detach 不跟路径参数"
2057 #: builtin/checkout.c:1071
2059 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
2060 "checking out of the index."
2062 "git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
2064 #: builtin/checkout.c:1090
2065 msgid "Cannot switch branch to a non-commit."
2066 msgstr "无法切换分支到一个非提交。"
2068 #: builtin/checkout.c:1093
2069 msgid "--ours/--theirs is incompatible with switching branches."
2070 msgstr "--ours/--theirs 和切换分支不兼容。"
2072 #: builtin/clean.c:78
2073 msgid "-x and -X cannot be used together"
2074 msgstr "-x 和 -X 不能共用"
2076 #: builtin/clean.c:82
2078 "clean.requireForce set to true and neither -n nor -f given; refusing to clean"
2080 "clean.requireForce 设置为 true 且未提供 -n 或 -f 选项,拒绝执行清理动作"
2082 #: builtin/clean.c:85
2084 "clean.requireForce defaults to true and neither -n nor -f given; refusing to "
2087 "clean.requireForce 默认为 true 且未提供 -n 或 -f 选项,拒绝执行清理动作"
2089 #: builtin/clean.c:155 builtin/clean.c:176
2091 msgid "Would remove %s\n"
2094 #: builtin/clean.c:159 builtin/clean.c:179
2096 msgid "Removing %s\n"
2099 #: builtin/clean.c:162 builtin/clean.c:182
2101 msgid "failed to remove %s"
2104 #: builtin/clean.c:166
2106 msgid "Would not remove %s\n"
2109 #: builtin/clean.c:168
2111 msgid "Not removing %s\n"
2114 #: builtin/clone.c:243
2116 msgid "reference repository '%s' is not a local directory."
2117 msgstr "引用版本库 '%s' 不是一个本地目录。"
2119 #: builtin/clone.c:302
2121 msgid "failed to open '%s'"
2124 #: builtin/clone.c:306
2126 msgid "failed to create directory '%s'"
2127 msgstr "无法创建目录 '%s'"
2129 #: builtin/clone.c:308 builtin/diff.c:75
2131 msgid "failed to stat '%s'"
2132 msgstr "无法枚举 '%s' 状态"
2134 #: builtin/clone.c:310
2136 msgid "%s exists and is not a directory"
2137 msgstr "%s 存在且不是一个目录"
2139 #: builtin/clone.c:324
2141 msgid "failed to stat %s\n"
2142 msgstr "无法枚举 %s 状态\n"
2144 #: builtin/clone.c:341
2146 msgid "failed to unlink '%s'"
2149 #: builtin/clone.c:346
2151 msgid "failed to create link '%s'"
2152 msgstr "无法创建链接 '%s'"
2154 #: builtin/clone.c:350
2156 msgid "failed to copy file to '%s'"
2157 msgstr "无法拷贝文件至 '%s'"
2159 #: builtin/clone.c:373
2164 #: builtin/clone.c:440
2166 msgid "Could not find remote branch %s to clone."
2167 msgstr "不能发现要克隆的远程分支 %s。"
2169 #: builtin/clone.c:549
2170 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
2171 msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
2173 #: builtin/clone.c:639
2174 msgid "Too many arguments."
2177 #: builtin/clone.c:643
2178 msgid "You must specify a repository to clone."
2179 msgstr "您必须指定一个版本库来克隆。"
2181 #: builtin/clone.c:654
2183 msgid "--bare and --origin %s options are incompatible."
2184 msgstr "--bare 和 --origin %s 选项不兼容。"
2186 #: builtin/clone.c:668
2188 msgid "repository '%s' does not exist"
2189 msgstr "版本库 '%s' 不存在"
2191 #: builtin/clone.c:673
2192 msgid "--depth is ignored in local clones; use file:// instead."
2193 msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
2195 #: builtin/clone.c:683
2197 msgid "destination path '%s' already exists and is not an empty directory."
2198 msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
2200 #: builtin/clone.c:693
2202 msgid "working tree '%s' already exists."
2203 msgstr "工作区 '%s' 已经存在。"
2205 #: builtin/clone.c:706 builtin/clone.c:720
2207 msgid "could not create leading directories of '%s'"
2208 msgstr "不能为 '%s' 创建先导目录"
2210 #: builtin/clone.c:709
2212 msgid "could not create work tree dir '%s'."
2213 msgstr "不能为 '%s' 创建工作区目录。"
2215 #: builtin/clone.c:728
2217 msgid "Cloning into bare repository '%s'...\n"
2218 msgstr "克隆到裸版本库 '%s'...\n"
2220 #: builtin/clone.c:730
2222 msgid "Cloning into '%s'...\n"
2223 msgstr "正克隆到 '%s'...\n"
2225 #: builtin/clone.c:786
2227 msgid "Don't know how to clone %s"
2230 #: builtin/clone.c:835
2232 msgid "Remote branch %s not found in upstream %s"
2233 msgstr "远程分支 %s 在上游 %s 未发现"
2235 #: builtin/clone.c:842
2236 msgid "You appear to have cloned an empty repository."
2237 msgstr "您似乎克隆了一个空版本库。"
2239 #: builtin/column.c:51
2240 msgid "--command must be the first argument"
2241 msgstr "--command 必须是第一个参数"
2243 #: builtin/commit.c:43
2245 "Your name and email address were configured automatically based\n"
2246 "on your username and hostname. Please check that they are accurate.\n"
2247 "You can suppress this message by setting them explicitly:\n"
2249 " git config --global user.name \"Your Name\"\n"
2250 " git config --global user.email you@example.com\n"
2252 "After doing this, you may fix the identity used for this commit with:\n"
2254 " git commit --amend --reset-author\n"
2256 "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
2257 "与否。您可以通过下面的命令对其进行明确地设置以免再出现本提示信息:\n"
2259 " git config --global user.name \"Your Name\"\n"
2260 " git config --global user.email you@example.com\n"
2262 "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
2264 " git commit --amend --reset-author\n"
2266 #: builtin/commit.c:55
2268 "You asked to amend the most recent commit, but doing so would make\n"
2269 "it empty. You can repeat your command with --allow-empty, or you can\n"
2270 "remove the commit entirely with \"git reset HEAD^\".\n"
2272 "您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
2273 "--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
2275 #: builtin/commit.c:60
2277 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
2278 "If you wish to commit it anyway, use:\n"
2280 " git commit --allow-empty\n"
2282 "Otherwise, please use 'git reset'\n"
2284 "之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
2287 " git commit --allow-empty\n"
2289 "否则,请使用命令 'git reset'\n"
2291 #: builtin/commit.c:253
2292 msgid "failed to unpack HEAD tree object"
2293 msgstr "无法解包 HEAD 树对象"
2295 #: builtin/commit.c:295
2296 msgid "unable to create temporary index"
2299 #: builtin/commit.c:301
2300 msgid "interactive add failed"
2303 #: builtin/commit.c:334 builtin/commit.c:355 builtin/commit.c:405
2304 msgid "unable to write new_index file"
2305 msgstr "无法写 new_index 文件"
2307 #: builtin/commit.c:386
2308 msgid "cannot do a partial commit during a merge."
2309 msgstr "在合并过程中不能做部分提交。"
2311 #: builtin/commit.c:388
2312 msgid "cannot do a partial commit during a cherry-pick."
2313 msgstr "在拣选过程中不能做部分提交。"
2315 #: builtin/commit.c:398
2316 msgid "cannot read the index"
2319 #: builtin/commit.c:418
2320 msgid "unable to write temporary index file"
2323 #: builtin/commit.c:493 builtin/commit.c:499
2325 msgid "invalid commit: %s"
2328 #: builtin/commit.c:522
2329 msgid "malformed --author parameter"
2330 msgstr "非法的 --author 参数"
2332 #: builtin/commit.c:582
2334 msgid "Malformed ident string: '%s'"
2335 msgstr "非法的身份字符串:'%s'"
2337 #: builtin/commit.c:620 builtin/commit.c:653 builtin/commit.c:967
2339 msgid "could not lookup commit %s"
2342 #: builtin/commit.c:632 builtin/shortlog.c:296
2344 msgid "(reading log message from standard input)\n"
2345 msgstr "(正从标准输入中读取日志信息)\n"
2347 #: builtin/commit.c:634
2348 msgid "could not read log from standard input"
2349 msgstr "不能从标准输入中读取日志信息"
2351 #: builtin/commit.c:638
2353 msgid "could not read log file '%s'"
2354 msgstr "不能读取日志文件 '%s'"
2356 #: builtin/commit.c:644
2357 msgid "commit has empty message"
2360 #: builtin/commit.c:660
2361 msgid "could not read MERGE_MSG"
2362 msgstr "不能读取 MERGE_MSG"
2364 #: builtin/commit.c:664
2365 msgid "could not read SQUASH_MSG"
2366 msgstr "不能读取 SQUASH_MSG"
2368 #: builtin/commit.c:668
2370 msgid "could not read '%s'"
2373 #: builtin/commit.c:720
2374 msgid "could not write commit template"
2377 #: builtin/commit.c:731
2381 "It looks like you may be committing a merge.\n"
2382 "If this is not correct, please remove the file\n"
2387 "看起来您正在做一个合并提交。如果不对,请删除文件\n"
2391 #: builtin/commit.c:736
2395 "It looks like you may be committing a cherry-pick.\n"
2396 "If this is not correct, please remove the file\n"
2401 "看起来您正在做一个拣选提交。如果不对,请删除文件\n"
2405 #: builtin/commit.c:748
2407 "Please enter the commit message for your changes. Lines starting\n"
2408 "with '#' will be ignored, and an empty message aborts the commit.\n"
2410 "请为您的变更输入提交说明。以 '#' 开始的行将被忽略,而一个空的提交\n"
2413 #: builtin/commit.c:753
2415 "Please enter the commit message for your changes. Lines starting\n"
2416 "with '#' will be kept; you may remove them yourself if you want to.\n"
2417 "An empty message aborts the commit.\n"
2419 "请为您的变更输入提交说明。以 '#' 开始的行将被保留,您可以删除它们\n"
2420 "如果您想这样做的话。而一个空的提交说明将会终止提交。\n"
2422 # 译者:为保证在输出中对齐,注意调整句中空格!
2423 #: builtin/commit.c:766
2425 msgid "%sAuthor: %s"
2428 # 译者:为保证在输出中对齐,注意调整句中空格!
2429 #: builtin/commit.c:773
2431 msgid "%sCommitter: %s"
2434 #: builtin/commit.c:793
2435 msgid "Cannot read index"
2438 #: builtin/commit.c:830
2439 msgid "Error building trees"
2442 #: builtin/commit.c:845 builtin/tag.c:361
2444 msgid "Please supply the message using either -m or -F option.\n"
2445 msgstr "请使用 -m 或者 -F 选项提供提交说明。\n"
2447 #: builtin/commit.c:942
2449 msgid "No existing author found with '%s'"
2450 msgstr "没有找到匹配 '%s' 的作者"
2452 #: builtin/commit.c:957 builtin/commit.c:1157
2454 msgid "Invalid untracked files mode '%s'"
2455 msgstr "无效的未追踪文件参数 '%s'"
2457 #: builtin/commit.c:997
2458 msgid "Using both --reset-author and --author does not make sense"
2459 msgstr "同时使用 --reset-author 和 --author 没有意义"
2461 #: builtin/commit.c:1008
2462 msgid "You have nothing to amend."
2465 #: builtin/commit.c:1011
2466 msgid "You are in the middle of a merge -- cannot amend."
2467 msgstr "您正处于一个合并过程中 -- 无法修补提交。"
2469 #: builtin/commit.c:1013
2470 msgid "You are in the middle of a cherry-pick -- cannot amend."
2471 msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
2473 #: builtin/commit.c:1016
2474 msgid "Options --squash and --fixup cannot be used together"
2475 msgstr "选项 --squash 和 --fixup 不能共用"
2477 #: builtin/commit.c:1026
2478 msgid "Only one of -c/-C/-F/--fixup can be used."
2479 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
2481 #: builtin/commit.c:1028
2482 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
2483 msgstr "选项 -m 不能和 -c/-C/-F/--fixup 共用。"
2485 #: builtin/commit.c:1036
2486 msgid "--reset-author can be used only with -C, -c or --amend."
2487 msgstr "--reset-author 只能和 -C、-c 或 --amend 共用。"
2489 #: builtin/commit.c:1053
2490 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
2491 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
2493 #: builtin/commit.c:1055
2494 msgid "No paths with --include/--only does not make sense."
2495 msgstr "参数 --include/--only 不跟路径没有意义。"
2497 #: builtin/commit.c:1057
2498 msgid "Clever... amending the last one with dirty index."
2499 msgstr "聪明... 在索引不干净下修补最后的提交。"
2501 #: builtin/commit.c:1059
2502 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
2503 msgstr "指定了明确的路径而没有使用 -i 或 -o 选项;认为是 --only paths..."
2505 #: builtin/commit.c:1069 builtin/tag.c:577
2507 msgid "Invalid cleanup mode %s"
2510 #: builtin/commit.c:1074
2511 msgid "Paths with -a does not make sense."
2512 msgstr "路径和 -a 选项共用没有意义。"
2514 #: builtin/commit.c:1257
2515 msgid "couldn't look up newly created commit"
2518 #: builtin/commit.c:1259
2519 msgid "could not parse newly created commit"
2522 #: builtin/commit.c:1300
2523 msgid "detached HEAD"
2526 # 译者:中文字符串拼接,可删除前导空格
2527 #: builtin/commit.c:1302
2528 msgid " (root-commit)"
2531 #: builtin/commit.c:1446
2532 msgid "could not parse HEAD commit"
2533 msgstr "不能解析 HEAD 提交"
2535 #: builtin/commit.c:1484 builtin/merge.c:509
2537 msgid "could not open '%s' for reading"
2538 msgstr "不能为读入打开 '%s'"
2540 #: builtin/commit.c:1491
2542 msgid "Corrupt MERGE_HEAD file (%s)"
2543 msgstr "损坏的 MERGE_HEAD 文件(%s)"
2545 #: builtin/commit.c:1498
2546 msgid "could not read MERGE_MODE"
2547 msgstr "不能读取 MERGE_MODE"
2549 #: builtin/commit.c:1517
2551 msgid "could not read commit message: %s"
2552 msgstr "不能读取提交说明:%s"
2554 #: builtin/commit.c:1531
2556 msgid "Aborting commit; you did not edit the message.\n"
2557 msgstr "终止提交;您未更改来自模版的提交说明。\n"
2559 #: builtin/commit.c:1536
2561 msgid "Aborting commit due to empty commit message.\n"
2562 msgstr "终止提交因为提交说明为空。\n"
2564 #: builtin/commit.c:1551 builtin/merge.c:936 builtin/merge.c:961
2565 msgid "failed to write commit object"
2568 #: builtin/commit.c:1572
2569 msgid "cannot lock HEAD ref"
2570 msgstr "无法锁定 HEAD 引用"
2572 #: builtin/commit.c:1576
2573 msgid "cannot update HEAD ref"
2574 msgstr "无法更新 HEAD 引用"
2576 #: builtin/commit.c:1587
2578 "Repository has been updated, but unable to write\n"
2579 "new_index file. Check that disk is not full or quota is\n"
2580 "not exceeded, and then \"git reset HEAD\" to recover."
2582 "版本库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
2583 "或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
2585 #: builtin/describe.c:234
2587 msgid "annotated tag %s not available"
2588 msgstr "注释 tag %s 无效"
2590 #: builtin/describe.c:238
2592 msgid "annotated tag %s has no embedded name"
2593 msgstr "注释 tag %s 没有嵌入名称"
2595 #: builtin/describe.c:240
2597 msgid "tag '%s' is really '%s' here"
2598 msgstr "tag '%s' 的确是在 '%s'"
2600 #: builtin/describe.c:267
2602 msgid "Not a valid object name %s"
2603 msgstr "不是一个有效的对象名 %s"
2605 #: builtin/describe.c:270
2607 msgid "%s is not a valid '%s' object"
2608 msgstr "%s 不是一个有效的 '%s' 对象"
2610 #: builtin/describe.c:287
2612 msgid "no tag exactly matches '%s'"
2613 msgstr "没有 tag 准确匹配 '%s'"
2615 #: builtin/describe.c:289
2617 msgid "searching to describe %s\n"
2620 #: builtin/describe.c:329
2622 msgid "finished search at %s\n"
2625 #: builtin/describe.c:353
2628 "No annotated tags can describe '%s'.\n"
2629 "However, there were unannotated tags: try --tags."
2631 "没有注释 tag 能描述 '%s'。\n"
2632 "然而,有非注释 tag:尝试 --tags。"
2634 #: builtin/describe.c:357
2637 "No tags can describe '%s'.\n"
2638 "Try --always, or create some tags."
2640 "没有注释 tag 能描述 '%s'。\n"
2641 "尝试 --always,或者创建一些 tag。"
2643 #: builtin/describe.c:378
2645 msgid "traversed %lu commits\n"
2646 msgstr "已遍历 %lu 个提交\n"
2648 #: builtin/describe.c:381
2651 "more than %i tags found; listed %i most recent\n"
2652 "gave up search at %s\n"
2654 "发现多于 %i 个 tag,列出最近的 %i 个\n"
2657 #: builtin/describe.c:436
2658 msgid "--long is incompatible with --abbrev=0"
2659 msgstr "--long 与 --abbrev=0 不兼容"
2661 #: builtin/describe.c:462
2662 msgid "No names found, cannot describe anything."
2663 msgstr "没有发现名称,无法描述任何东西。"
2665 #: builtin/describe.c:482
2666 msgid "--dirty is incompatible with committishes"
2667 msgstr "--dirty 不能与提交共用"
2669 #: builtin/diff.c:77
2671 msgid "'%s': not a regular file or symlink"
2672 msgstr "'%s':不是一个正规文件或符号链接"
2674 #: builtin/diff.c:220
2676 msgid "invalid option: %s"
2679 #: builtin/diff.c:297
2680 msgid "Not a git repository"
2681 msgstr "不是一个 git 版本库"
2683 #: builtin/diff.c:341
2685 msgid "invalid object '%s' given."
2686 msgstr "提供了无效对象 '%s'。"
2688 #: builtin/diff.c:346
2690 msgid "more than %d trees given: '%s'"
2691 msgstr "提供了超过 %d 个树对象:'%s'"
2693 #: builtin/diff.c:356
2695 msgid "more than two blobs given: '%s'"
2696 msgstr "提供了超过两个 blob 对象:'%s'"
2698 #: builtin/diff.c:364
2700 msgid "unhandled object '%s' given."
2701 msgstr "提供了无法处理的对象 '%s'。"
2703 #: builtin/fetch.c:200
2704 msgid "Couldn't find remote ref HEAD"
2705 msgstr "无法发现远程 HEAD 引用"
2707 #: builtin/fetch.c:253
2709 msgid "object %s not found"
2712 #: builtin/fetch.c:259
2713 msgid "[up to date]"
2716 #: builtin/fetch.c:273
2718 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
2719 msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)"
2721 #: builtin/fetch.c:274 builtin/fetch.c:360
2725 #: builtin/fetch.c:285
2726 msgid "[tag update]"
2730 #: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340
2731 msgid " (unable to update local ref)"
2732 msgstr " (不能更新本地引用)"
2734 #: builtin/fetch.c:305
2738 #: builtin/fetch.c:308
2739 msgid "[new branch]"
2742 #: builtin/fetch.c:311
2746 #: builtin/fetch.c:356
2747 msgid "unable to update local ref"
2750 #: builtin/fetch.c:356
2751 msgid "forced update"
2754 #: builtin/fetch.c:362
2755 msgid "(non-fast-forward)"
2758 #: builtin/fetch.c:393 builtin/fetch.c:685
2760 msgid "cannot open %s: %s\n"
2761 msgstr "无法打开 %s:%s\n"
2763 #: builtin/fetch.c:402
2765 msgid "%s did not send all necessary objects\n"
2766 msgstr "%s 未发送所有必须的对象\n"
2768 #: builtin/fetch.c:488
2773 #: builtin/fetch.c:499
2776 "some local refs could not be updated; try running\n"
2777 " 'git remote prune %s' to remove any old, conflicting branches"
2779 "一些本地引用不能被更新;尝试运行\n"
2780 " 'git remote prune %s' 来删除旧的、有冲突的分支"
2783 #: builtin/fetch.c:549
2785 msgid " (%s will become dangling)"
2786 msgstr " (%s 将成为悬空状态)"
2789 #: builtin/fetch.c:550
2791 msgid " (%s has become dangling)"
2792 msgstr " (%s 已成为悬空状态)"
2794 #: builtin/fetch.c:557
2798 #: builtin/fetch.c:558 builtin/remote.c:1055
2802 #: builtin/fetch.c:675
2804 msgid "Refusing to fetch into current branch %s of non-bare repository"
2805 msgstr "拒绝获取到非裸版本库的当前分支 %s"
2807 #: builtin/fetch.c:709
2809 msgid "Don't know how to fetch from %s"
2810 msgstr "不知道如何从 %s 获取"
2812 #: builtin/fetch.c:786
2814 msgid "Option \"%s\" value \"%s\" is not valid for %s"
2815 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
2817 #: builtin/fetch.c:789
2819 msgid "Option \"%s\" is ignored for %s\n"
2820 msgstr "选项 \"%s\" 为 %s 所忽略\n"
2822 #: builtin/fetch.c:888
2824 msgid "Fetching %s\n"
2827 #: builtin/fetch.c:890 builtin/remote.c:100
2829 msgid "Could not fetch %s"
2832 #: builtin/fetch.c:907
2834 "No remote repository specified. Please, specify either a URL or a\n"
2835 "remote name from which new revisions should be fetched."
2836 msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定,用以获取新提交。"
2838 #: builtin/fetch.c:927
2839 msgid "You need to specify a tag name."
2840 msgstr "您需要指定一个 tag 名称。"
2842 #: builtin/fetch.c:979
2843 msgid "fetch --all does not take a repository argument"
2844 msgstr "fetch --all 不能带一个版本库参数"
2846 #: builtin/fetch.c:981
2847 msgid "fetch --all does not make sense with refspecs"
2848 msgstr "fetch --all 带引用表达式没有任何意义"
2850 #: builtin/fetch.c:992
2852 msgid "No such remote or remote group: %s"
2853 msgstr "没有这样的远程或远程组:%s"
2855 #: builtin/fetch.c:1000
2856 msgid "Fetching a group and specifying refspecs does not make sense"
2857 msgstr "获取组并指定引用表达式没有意义"
2861 msgid "Invalid %s: '%s'"
2862 msgstr "无效的 %s:'%s'"
2866 msgid "insanely long object directory %.*s"
2867 msgstr "不正常的长对象目录 %.*s"
2871 msgid "Auto packing the repository for optimum performance.\n"
2872 msgstr "自动打包版本库以求最佳性能。\n"
2877 "Auto packing the repository for optimum performance. You may also\n"
2878 "run \"git gc\" manually. See \"git help gc\" for more information.\n"
2880 "自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n"
2881 "参见 \"git help gc\" 以获取更多信息。\n"
2885 "There are too many unreachable loose objects; run 'git prune' to remove them."
2886 msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
2888 #: builtin/grep.c:216
2890 msgid "grep: failed to create thread: %s"
2891 msgstr "grep:无法创建线程:%s"
2893 #: builtin/grep.c:402
2895 msgid "Failed to chdir: %s"
2898 #: builtin/grep.c:478 builtin/grep.c:512
2900 msgid "unable to read tree (%s)"
2903 #: builtin/grep.c:526
2905 msgid "unable to grep from object of type %s"
2906 msgstr "无法抓取来自于 %s 类型的对象"
2908 #: builtin/grep.c:584
2910 msgid "switch `%c' expects a numerical value"
2911 msgstr "开关 `%c' 期望一个数字值"
2913 #: builtin/grep.c:601
2915 msgid "cannot open '%s'"
2918 #: builtin/grep.c:885
2919 msgid "no pattern given."
2922 #: builtin/grep.c:899
2924 msgid "bad object %s"
2927 #: builtin/grep.c:940
2928 msgid "--open-files-in-pager only works on the worktree"
2929 msgstr "--open-files-in-pager 仅用于工作区"
2931 #: builtin/grep.c:963
2932 msgid "--cached or --untracked cannot be used with --no-index."
2933 msgstr "--cached 或 --untracked 不能与 --no-index 共用。"
2935 #: builtin/grep.c:968
2936 msgid "--no-index or --untracked cannot be used with revs."
2937 msgstr "--no-index 或 --untracked 不能和版本共用。"
2939 #: builtin/grep.c:971
2940 msgid "--[no-]exclude-standard cannot be used for tracked contents."
2941 msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
2943 #: builtin/grep.c:979
2944 msgid "both --cached and trees are given."
2945 msgstr "同时给出了 --cached 和树对象。"
2947 #: builtin/help.c:63
2949 msgid "unrecognized help format '%s'"
2950 msgstr "未能识别的帮助格式 '%s'"
2952 #: builtin/help.c:91
2953 msgid "Failed to start emacsclient."
2954 msgstr "无法启动 emacsclient。"
2956 #: builtin/help.c:104
2957 msgid "Failed to parse emacsclient version."
2958 msgstr "无法解析 emacsclient 版本。"
2960 #: builtin/help.c:112
2962 msgid "emacsclient version '%d' too old (< 22)."
2963 msgstr "emacsclient 版本 '%d' 太老 (< 22)。"
2965 #: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175
2967 msgid "failed to exec '%s': %s"
2968 msgstr "无法执行 '%s':%s"
2970 #: builtin/help.c:215
2973 "'%s': path for unsupported man viewer.\n"
2974 "Please consider using 'man.<tool>.cmd' instead."
2976 "'%s':不支持的 man 手册查看器的路径。\n"
2977 "请使用 'man.<tool>.cmd'。"
2979 #: builtin/help.c:227
2982 "'%s': cmd for supported man viewer.\n"
2983 "Please consider using 'man.<tool>.path' instead."
2985 "'%s': 支持的 man 手册查看器命令。\n"
2986 "请使用 'man.<tool>.path'。"
2988 #: builtin/help.c:291
2989 msgid "The most commonly used git commands are:"
2990 msgstr "最常用的 git 命令有:"
2992 #: builtin/help.c:359
2994 msgid "'%s': unknown man viewer."
2995 msgstr "'%s':未知的 man 查看器。"
2997 #: builtin/help.c:376
2998 msgid "no man viewer handled the request"
2999 msgstr "没有 man 查看器处理此请求"
3001 #: builtin/help.c:384
3002 msgid "no info viewer handled the request"
3003 msgstr "没有 info 查看器处理此请求"
3005 #: builtin/help.c:395
3007 msgid "'%s': not a documentation directory."
3008 msgstr "'%s':不是一个文档目录。"
3010 #: builtin/help.c:436 builtin/help.c:443
3015 #: builtin/help.c:459
3017 msgid "`git %s' is aliased to `%s'"
3018 msgstr "`git %s' 是 `%s' 的别名"
3020 #: builtin/index-pack.c:170
3022 msgid "object type mismatch at %s"
3023 msgstr "%s 的对象类型不匹配"
3025 #: builtin/index-pack.c:190
3026 msgid "object of unexpected type"
3029 #: builtin/index-pack.c:227
3031 msgid "cannot fill %d byte"
3032 msgid_plural "cannot fill %d bytes"
3033 msgstr[0] "无法填充 %d 字节"
3034 msgstr[1] "无法填充 %d 字节"
3036 #: builtin/index-pack.c:237
3038 msgstr "过早的文件结束符(EOF)"
3040 #: builtin/index-pack.c:238
3041 msgid "read error on input"
3044 #: builtin/index-pack.c:250
3045 msgid "used more bytes than were available"
3048 #: builtin/index-pack.c:257
3049 msgid "pack too large for current definition of off_t"
3050 msgstr "包太大超过了当前 off_t 的定义"
3052 #: builtin/index-pack.c:273
3054 msgid "unable to create '%s'"
3057 #: builtin/index-pack.c:278
3059 msgid "cannot open packfile '%s'"
3060 msgstr "无法打开包文件 '%s'"
3062 #: builtin/index-pack.c:292
3063 msgid "pack signature mismatch"
3066 #: builtin/index-pack.c:312
3068 msgid "pack has bad object at offset %lu: %s"
3069 msgstr "包中有错误的对象位于 %lu:%s"
3071 #: builtin/index-pack.c:434
3073 msgid "inflate returned %d"
3076 #: builtin/index-pack.c:483
3077 msgid "offset value overflow for delta base object"
3078 msgstr "偏移值覆盖了 delta 基准对象"
3080 #: builtin/index-pack.c:491
3081 msgid "delta base offset is out of bound"
3082 msgstr "delta 基准偏移越界"
3084 #: builtin/index-pack.c:499
3086 msgid "unknown object type %d"
3089 #: builtin/index-pack.c:531
3090 msgid "cannot pread pack file"
3093 #: builtin/index-pack.c:533
3095 msgid "premature end of pack file, %lu byte missing"
3096 msgid_plural "premature end of pack file, %lu bytes missing"
3097 msgstr[0] "包文件过早结束,缺少 %lu 字节"
3098 msgstr[1] "包文件过早结束,缺少 %lu 字节"
3100 #: builtin/index-pack.c:555
3101 msgid "serious inflate inconsistency"
3104 #: builtin/index-pack.c:646 builtin/index-pack.c:652 builtin/index-pack.c:675
3105 #: builtin/index-pack.c:709 builtin/index-pack.c:718
3107 msgid "SHA1 COLLISION FOUND WITH %s !"
3108 msgstr "发现 %s 出现 SHA1 冲突!"
3110 #: builtin/index-pack.c:649 builtin/pack-objects.c:170
3111 #: builtin/pack-objects.c:262
3113 msgid "unable to read %s"
3116 #: builtin/index-pack.c:715
3118 msgid "cannot read existing object %s"
3119 msgstr "不能读取现存对象 %s"
3121 #: builtin/index-pack.c:729
3123 msgid "invalid blob object %s"
3124 msgstr "无效的 blob 对象 %s"
3126 #: builtin/index-pack.c:744
3131 #: builtin/index-pack.c:746
3132 msgid "Error in object"
3135 #: builtin/index-pack.c:748
3137 msgid "Not all child objects of %s are reachable"
3138 msgstr "%s 的所有子对象并非都可达"
3140 #: builtin/index-pack.c:818 builtin/index-pack.c:844
3141 msgid "failed to apply delta"
3144 #: builtin/index-pack.c:983
3145 msgid "Receiving objects"
3148 #: builtin/index-pack.c:983
3149 msgid "Indexing objects"
3152 #: builtin/index-pack.c:1009
3153 msgid "pack is corrupted (SHA1 mismatch)"
3154 msgstr "包冲突(SHA1 不匹配)"
3156 #: builtin/index-pack.c:1014
3157 msgid "cannot fstat packfile"
3160 #: builtin/index-pack.c:1017
3161 msgid "pack has junk at the end"
3164 #: builtin/index-pack.c:1028
3165 msgid "confusion beyond insanity in parse_pack_objects()"
3166 msgstr "parse_pack_objects() 中遇到不可理喻的问题"
3168 #: builtin/index-pack.c:1051
3169 msgid "Resolving deltas"
3172 #: builtin/index-pack.c:1102
3173 msgid "confusion beyond insanity"
3176 #: builtin/index-pack.c:1121
3178 msgid "pack has %d unresolved delta"
3179 msgid_plural "pack has %d unresolved deltas"
3180 msgstr[0] "包有 %d 个未解决的 delta"
3181 msgstr[1] "包有 %d 个未解决的 delta"
3183 #: builtin/index-pack.c:1146
3185 msgid "unable to deflate appended object (%d)"
3186 msgstr "不能缩小附加对象(%d)"
3188 #: builtin/index-pack.c:1225
3190 msgid "local object %s is corrupt"
3191 msgstr "本地对象 %s 已损坏"
3193 #: builtin/index-pack.c:1249
3194 msgid "error while closing pack file"
3197 #: builtin/index-pack.c:1262
3199 msgid "cannot write keep file '%s'"
3200 msgstr "无法写保留文件 '%s'"
3202 #: builtin/index-pack.c:1270
3204 msgid "cannot close written keep file '%s'"
3205 msgstr "无法关闭保留文件 '%s'"
3207 #: builtin/index-pack.c:1283
3208 msgid "cannot store pack file"
3211 #: builtin/index-pack.c:1294
3212 msgid "cannot store index file"
3215 #: builtin/index-pack.c:1395
3217 msgid "Cannot open existing pack file '%s'"
3218 msgstr "无法打开现存包文件 '%s'"
3220 #: builtin/index-pack.c:1397
3222 msgid "Cannot open existing pack idx file for '%s'"
3223 msgstr "无法为 %s 打开包索引文件"
3225 #: builtin/index-pack.c:1444
3227 msgid "non delta: %d object"
3228 msgid_plural "non delta: %d objects"
3229 msgstr[0] "非 delta:%d 个对象"
3230 msgstr[1] "非 delta:%d 个对象"
3232 #: builtin/index-pack.c:1451
3234 msgid "chain length = %d: %lu object"
3235 msgid_plural "chain length = %d: %lu objects"
3236 msgstr[0] "链长 = %d: %lu 对象"
3237 msgstr[1] "链长 = %d: %lu 对象"
3239 #: builtin/index-pack.c:1478
3240 msgid "Cannot come back to cwd"
3243 #: builtin/index-pack.c:1522 builtin/index-pack.c:1525
3244 #: builtin/index-pack.c:1537 builtin/index-pack.c:1541
3249 #: builtin/index-pack.c:1555
3250 msgid "--fix-thin cannot be used without --stdin"
3251 msgstr "--fix-thin 不能和 --stdin 共用"
3253 #: builtin/index-pack.c:1559 builtin/index-pack.c:1569
3255 msgid "packfile name '%s' does not end with '.pack'"
3256 msgstr "包名 '%s' 没有以 '.pack' 结尾"
3258 #: builtin/index-pack.c:1578
3259 msgid "--verify with no packfile name given"
3260 msgstr "--verify 没有提供包名参数"
3262 #: builtin/init-db.c:35
3264 msgid "Could not make %s writable by group"
3265 msgstr "不能设置 %s 为组可写"
3267 #: builtin/init-db.c:62
3269 msgid "insanely long template name %s"
3272 #: builtin/init-db.c:67
3274 msgid "cannot stat '%s'"
3275 msgstr "不能枚举 '%s' 状态"
3277 #: builtin/init-db.c:73
3279 msgid "cannot stat template '%s'"
3280 msgstr "不能枚举模版 '%s' 状态"
3282 #: builtin/init-db.c:80
3284 msgid "cannot opendir '%s'"
3285 msgstr "不能打开目录 '%s'"
3287 #: builtin/init-db.c:97
3289 msgid "cannot readlink '%s'"
3290 msgstr "不能读取链接 '%s'"
3292 #: builtin/init-db.c:99
3294 msgid "insanely long symlink %s"
3297 #: builtin/init-db.c:102
3299 msgid "cannot symlink '%s' '%s'"
3300 msgstr "不能自 '%s' 到 '%s' 创建符号链接"
3302 #: builtin/init-db.c:106
3304 msgid "cannot copy '%s' to '%s'"
3305 msgstr "不能拷贝 '%s' 至 '%s'"
3307 #: builtin/init-db.c:110
3309 msgid "ignoring template %s"
3312 #: builtin/init-db.c:133
3314 msgid "insanely long template path %s"
3317 #: builtin/init-db.c:141
3319 msgid "templates not found %s"
3322 #: builtin/init-db.c:154
3324 msgid "not copying templates of a wrong format version %d from '%s'"
3325 msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
3327 #: builtin/init-db.c:192
3329 msgid "insane git directory %s"
3330 msgstr "不正常的 git 目录 %s"
3332 #: builtin/init-db.c:322 builtin/init-db.c:325
3334 msgid "%s already exists"
3337 #: builtin/init-db.c:354
3339 msgid "unable to handle file type %d"
3340 msgstr "不能处理 %d 类型的文件"
3342 #: builtin/init-db.c:357
3344 msgid "unable to move %s to %s"
3345 msgstr "不能移动 %s 至 %s"
3347 #: builtin/init-db.c:362
3349 msgid "Could not create git link %s"
3350 msgstr "不能创建 git link %s"
3353 #. * TRANSLATORS: The first '%s' is either "Reinitialized
3354 #. * existing" or "Initialized empty", the second " shared" or
3355 #. * "", and the last '%s%s' is the verbatim directory name.
3357 #: builtin/init-db.c:419
3359 msgid "%s%s Git repository in %s%s\n"
3360 msgstr "%s%s Git 版本库于 %s%s\n"
3362 #: builtin/init-db.c:420
3363 msgid "Reinitialized existing"
3366 #: builtin/init-db.c:420
3367 msgid "Initialized empty"
3370 # 译者:中文字符串拼接,可删除前导空格
3371 #: builtin/init-db.c:421
3375 #: builtin/init-db.c:440
3376 msgid "cannot tell cwd"
3379 #: builtin/init-db.c:521 builtin/init-db.c:528
3381 msgid "cannot mkdir %s"
3384 #: builtin/init-db.c:532
3386 msgid "cannot chdir to %s"
3389 #: builtin/init-db.c:554
3392 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
3395 "不允许 %s(或 --work-tree=<directory>)而没有指定 %s(或 --git-"
3398 #: builtin/init-db.c:578
3399 msgid "Cannot access current working directory"
3402 #: builtin/init-db.c:585
3404 msgid "Cannot access work tree '%s'"
3405 msgstr "不能访问工作区 '%s'"
3407 #: builtin/log.c:189
3409 msgid "Final output: %d %s\n"
3410 msgstr "最终输出:%d %s\n"
3412 #: builtin/log.c:402 builtin/log.c:490
3414 msgid "Could not read object %s"
3417 #: builtin/log.c:514
3419 msgid "Unknown type: %d"
3422 #: builtin/log.c:603
3423 msgid "format.headers without value"
3424 msgstr "format.headers 没有值"
3426 #: builtin/log.c:677
3427 msgid "name of output directory is too long"
3430 #: builtin/log.c:688
3432 msgid "Cannot open patch file %s"
3433 msgstr "无法打开补丁文件 %s"
3435 #: builtin/log.c:702
3436 msgid "Need exactly one range."
3439 #: builtin/log.c:710
3440 msgid "Not a range."
3443 #: builtin/log.c:787
3444 msgid "Cover letter needs email format"
3447 #: builtin/log.c:860
3449 msgid "insane in-reply-to: %s"
3450 msgstr "不正常的 in-reply-to:%s"
3452 #: builtin/log.c:933
3453 msgid "Two output directories?"
3456 #: builtin/log.c:1154
3458 msgid "bogus committer info %s"
3459 msgstr "虚假的提交者信息 %s"
3461 #: builtin/log.c:1199
3462 msgid "-n and -k are mutually exclusive."
3463 msgstr "-n 和 -k 互斥。"
3465 #: builtin/log.c:1201
3466 msgid "--subject-prefix and -k are mutually exclusive."
3467 msgstr "--subject-prefix 和 -k 互斥。"
3469 #: builtin/log.c:1209
3470 msgid "--name-only does not make sense"
3471 msgstr "--name-only 无意义"
3473 #: builtin/log.c:1211
3474 msgid "--name-status does not make sense"
3475 msgstr "--name-status 无意义"
3477 #: builtin/log.c:1213
3478 msgid "--check does not make sense"
3479 msgstr "--check 无意义"
3481 #: builtin/log.c:1236
3482 msgid "standard output, or directory, which one?"
3483 msgstr "标准输出或目录,哪一个?"
3485 #: builtin/log.c:1238
3487 msgid "Could not create directory '%s'"
3488 msgstr "不能创建目录 '%s'"
3490 #: builtin/log.c:1391
3491 msgid "Failed to create output files"
3494 #: builtin/log.c:1495
3497 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
3498 msgstr "不能找到跟踪的远程分支,请手工指定 <upstream>。\n"
3500 #: builtin/log.c:1511 builtin/log.c:1513 builtin/log.c:1525
3502 msgid "Unknown commit %s"
3505 #: builtin/merge.c:90
3506 msgid "switch `m' requires a value"
3507 msgstr "开关 `m' 需要一个值"
3509 #: builtin/merge.c:127
3511 msgid "Could not find merge strategy '%s'.\n"
3512 msgstr "不能找到合并策略 '%s'。\n"
3514 #: builtin/merge.c:128
3516 msgid "Available strategies are:"
3519 #: builtin/merge.c:133
3521 msgid "Available custom strategies are:"
3524 #: builtin/merge.c:240
3525 msgid "could not run stash."
3528 #: builtin/merge.c:245
3529 msgid "stash failed"
3532 #: builtin/merge.c:250
3534 msgid "not a valid object: %s"
3535 msgstr "不是一个有效对象:%s"
3537 #: builtin/merge.c:269 builtin/merge.c:286
3538 msgid "read-tree failed"
3542 #: builtin/merge.c:316
3543 msgid " (nothing to squash)"
3546 #: builtin/merge.c:329
3548 msgid "Squash commit -- not updating HEAD\n"
3549 msgstr "压缩提交 -- 未更新 HEAD\n"
3551 #: builtin/merge.c:361
3552 msgid "Writing SQUASH_MSG"
3553 msgstr "写入 SQUASH_MSG"
3555 #: builtin/merge.c:363
3556 msgid "Finishing SQUASH_MSG"
3557 msgstr "完成 SQUASH_MSG"
3559 #: builtin/merge.c:386
3561 msgid "No merge message -- not updating HEAD\n"
3562 msgstr "无合并信息 -- 未更新 HEAD\n"
3564 #: builtin/merge.c:437
3566 msgid "'%s' does not point to a commit"
3567 msgstr "'%s' 没有指向一个提交"
3569 #: builtin/merge.c:536
3571 msgid "Bad branch.%s.mergeoptions string: %s"
3572 msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
3574 #: builtin/merge.c:629
3575 msgid "git write-tree failed to write a tree"
3576 msgstr "git write-tree 无法写入一树对象"
3578 #: builtin/merge.c:679
3579 msgid "failed to read the cache"
3582 #: builtin/merge.c:697
3583 msgid "Unable to write index."
3586 #: builtin/merge.c:710
3587 msgid "Not handling anything other than two heads merge."
3588 msgstr "不能处理两个头合并之外的任何操作。"
3590 #: builtin/merge.c:724
3592 msgid "Unknown option for merge-recursive: -X%s"
3593 msgstr "merge-recursive 的未知选项:-X%s"
3595 #: builtin/merge.c:738
3597 msgid "unable to write %s"
3600 #: builtin/merge.c:877
3602 msgid "Could not read from '%s'"
3603 msgstr "不能从 '%s' 读取"
3605 #: builtin/merge.c:886
3607 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
3608 msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
3610 #: builtin/merge.c:892
3612 "Please enter a commit message to explain why this merge is necessary,\n"
3613 "especially if it merges an updated upstream into a topic branch.\n"
3615 "Lines starting with '#' will be ignored, and an empty message aborts\n"
3618 "请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
3621 "以 '#' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
3623 #: builtin/merge.c:916
3624 msgid "Empty commit message."
3627 #: builtin/merge.c:928
3629 msgid "Wonderful.\n"
3632 #: builtin/merge.c:993
3634 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
3635 msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
3637 #: builtin/merge.c:1009
3639 msgid "'%s' is not a commit"
3640 msgstr "'%s' 不是一个提交"
3642 #: builtin/merge.c:1050
3643 msgid "No current branch."
3646 #: builtin/merge.c:1052
3647 msgid "No remote for the current branch."
3648 msgstr "当前分支没有对应的远程版本库。"
3650 #: builtin/merge.c:1054
3651 msgid "No default upstream defined for the current branch."
3652 msgstr "当前分支没有定义默认的上游分支。"
3654 #: builtin/merge.c:1059
3656 msgid "No remote tracking branch for %s from %s"
3657 msgstr "%s 没有来自 %s 的远程跟踪分支"
3659 #: builtin/merge.c:1146 builtin/merge.c:1303
3661 msgid "%s - not something we can merge"
3664 #: builtin/merge.c:1214
3665 msgid "There is no merge to abort (MERGE_HEAD missing)."
3666 msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
3668 #: builtin/merge.c:1230 git-pull.sh:31
3670 "You have not concluded your merge (MERGE_HEAD exists).\n"
3671 "Please, commit your changes before you can merge."
3673 "您尚未结束您的合并(存在 MERGE_HEAD)。\n"
3676 #: builtin/merge.c:1233 git-pull.sh:34
3677 msgid "You have not concluded your merge (MERGE_HEAD exists)."
3678 msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
3680 #: builtin/merge.c:1237
3682 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
3683 "Please, commit your changes before you can merge."
3685 "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
3688 #: builtin/merge.c:1240
3689 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
3690 msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
3692 #: builtin/merge.c:1249
3693 msgid "You cannot combine --squash with --no-ff."
3694 msgstr "您不能将 --squash 与 --no-ff 共用。"
3696 #: builtin/merge.c:1254
3697 msgid "You cannot combine --no-ff with --ff-only."
3698 msgstr "您不能将 --no-ff 与 --ff-only 共用。"
3700 #: builtin/merge.c:1261
3701 msgid "No commit specified and merge.defaultToUpstream not set."
3702 msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
3704 #: builtin/merge.c:1293
3705 msgid "Can merge only exactly one commit into empty head"
3706 msgstr "只能将一个提交合并到空分支上"
3708 #: builtin/merge.c:1296
3709 msgid "Squash commit into empty head not supported yet"
3710 msgstr "尚不支持到空分支的压缩提交"
3712 #: builtin/merge.c:1298
3713 msgid "Non-fast-forward commit does not make sense into an empty head"
3714 msgstr "到空分支的非快进式提交没有意义"
3716 #: builtin/merge.c:1413
3718 msgid "Updating %s..%s\n"
3719 msgstr "更新 %s..%s\n"
3721 #: builtin/merge.c:1451
3723 msgid "Trying really trivial in-index merge...\n"
3724 msgstr "尝试非常小的索引内合并...\n"
3726 #: builtin/merge.c:1458
3731 #: builtin/merge.c:1490
3732 msgid "Not possible to fast-forward, aborting."
3735 #: builtin/merge.c:1513 builtin/merge.c:1592
3737 msgid "Rewinding the tree to pristine...\n"
3738 msgstr "将树回滚至原始状态...\n"
3740 #: builtin/merge.c:1517
3742 msgid "Trying merge strategy %s...\n"
3743 msgstr "尝试合并策略 %s...\n"
3745 #: builtin/merge.c:1583
3747 msgid "No merge strategy handled the merge.\n"
3748 msgstr "没有合并策略处理此合并。\n"
3750 #: builtin/merge.c:1585
3752 msgid "Merge with strategy %s failed.\n"
3753 msgstr "使用策略 %s 合并失败。\n"
3755 #: builtin/merge.c:1594
3757 msgid "Using the %s to prepare resolving by hand.\n"
3758 msgstr "使用 %s 以准备手工解决。\n"
3760 #: builtin/merge.c:1606
3762 msgid "Automatic merge went well; stopped before committing as requested\n"
3763 msgstr "自动合并进展顺利,按要求在提交前停止\n"
3767 msgid "Checking rename of '%s' to '%s'\n"
3768 msgstr "检查 '%s' 到 '%s' 的重命名\n"
3775 msgid "can not move directory into itself"
3779 msgid "cannot move directory over file"
3784 msgid "Huh? %.*s is in index?"
3785 msgstr "嗯?%.*s 在索引中?"
3788 msgid "source directory is empty"
3792 msgid "not under version control"
3796 msgid "destination exists"
3801 msgid "overwriting '%s'"
3805 msgid "Cannot overwrite"
3809 msgid "multiple sources for the same target"
3814 msgid "%s, source=%s, destination=%s"
3815 msgstr "%s,源=%s,目标=%s"
3819 msgid "Renaming %s to %s\n"
3820 msgstr "重命名 %s 至 %s\n"
3822 #: builtin/mv.c:215 builtin/remote.c:731
3824 msgid "renaming '%s' failed"
3825 msgstr "重命名 '%s' 失败"
3827 #: builtin/notes.c:139
3829 msgid "unable to start 'show' for object '%s'"
3830 msgstr "不能为对象 '%s' 开始 'show'"
3832 #: builtin/notes.c:145
3833 msgid "can't fdopen 'show' output fd"
3834 msgstr "不能打开 'show' 输出文件句柄"
3836 #: builtin/notes.c:155
3838 msgid "failed to close pipe to 'show' for object '%s'"
3839 msgstr "无法为对象 '%s' 的 'show' 关闭管道"
3841 #: builtin/notes.c:158
3843 msgid "failed to finish 'show' for object '%s'"
3844 msgstr "无法为对象 '%s' 完成 'show'"
3846 #: builtin/notes.c:175 builtin/tag.c:347
3848 msgid "could not create file '%s'"
3849 msgstr "不能创建文件 '%s'"
3851 #: builtin/notes.c:189
3852 msgid "Please supply the note contents using either -m or -F option"
3853 msgstr "请通过 -m 或 -F 选项为注解提供内容"
3855 #: builtin/notes.c:210 builtin/notes.c:973
3857 msgid "Removing note for object %s\n"
3858 msgstr "删除对象 %s 的注解\n"
3860 #: builtin/notes.c:215
3861 msgid "unable to write note object"
3864 #: builtin/notes.c:217
3866 msgid "The note contents has been left in %s"
3867 msgstr "注解内容被留在文件 %s 中"
3869 #: builtin/notes.c:251 builtin/tag.c:542
3871 msgid "cannot read '%s'"
3874 #: builtin/notes.c:253 builtin/tag.c:545
3876 msgid "could not open or read '%s'"
3877 msgstr "不能打开或读取 '%s'"
3879 #: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447
3880 #: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644
3881 #: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766
3882 #: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:558
3884 msgid "Failed to resolve '%s' as a valid ref."
3885 msgstr "无法解析 '%s' 为一个有效引用。"
3887 #: builtin/notes.c:275
3889 msgid "Failed to read object '%s'."
3890 msgstr "无法读取对象 '%s'。"
3892 #: builtin/notes.c:299
3893 msgid "Cannot commit uninitialized/unreferenced notes tree"
3894 msgstr "不能提交未初始化/未引用的注解树"
3896 #: builtin/notes.c:340
3898 msgid "Bad notes.rewriteMode value: '%s'"
3899 msgstr "坏的 notes.rewriteMode 值:'%s'"
3901 #: builtin/notes.c:350
3903 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
3904 msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
3906 #. TRANSLATORS: The first %s is the name of the
3907 #. environment variable, the second %s is its value
3908 #: builtin/notes.c:377
3910 msgid "Bad %s value: '%s'"
3911 msgstr "坏的 %s 值:'%s'"
3913 #: builtin/notes.c:441
3915 msgid "Malformed input line: '%s'."
3916 msgstr "非法的输入行:'%s'。"
3918 #: builtin/notes.c:456
3920 msgid "Failed to copy notes from '%s' to '%s'"
3921 msgstr "无法从 '%s' 到 '%s' 拷贝注解"
3923 #: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627
3924 #: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759
3925 #: builtin/notes.c:1033
3926 msgid "too many parameters"
3929 #: builtin/notes.c:513 builtin/notes.c:772
3931 msgid "No note found for object %s."
3932 msgstr "未发现对象 %s 的注解。"
3934 #: builtin/notes.c:580
3937 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
3939 msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
3941 #: builtin/notes.c:585 builtin/notes.c:662
3943 msgid "Overwriting existing notes for object %s\n"
3944 msgstr "覆盖对象 %s 现存注解\n"
3946 #: builtin/notes.c:635
3947 msgid "too few parameters"
3950 #: builtin/notes.c:656
3953 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
3955 msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
3957 #: builtin/notes.c:668
3959 msgid "Missing notes on source object %s. Cannot copy."
3960 msgstr "源对象 %s 缺少注解。不能拷贝。"
3962 #: builtin/notes.c:717
3965 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
3966 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
3968 "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
3969 "请换用 'git notes add -f -m/-F/-c/-C'。\n"
3971 #: builtin/notes.c:971
3973 msgid "Object %s has no note\n"
3974 msgstr "对象 %s 没有注解\n"
3976 #: builtin/notes.c:1103 builtin/remote.c:1598
3978 msgid "Unknown subcommand: %s"
3981 #: builtin/pack-objects.c:183 builtin/pack-objects.c:186
3983 msgid "deflate error (%d)"
3986 #: builtin/pack-objects.c:2398
3988 msgid "unsupported index version %s"
3989 msgstr "不支持的索引版本 %s"
3991 #: builtin/pack-objects.c:2402
3993 msgid "bad index version '%s'"
3994 msgstr "坏的索引版本 '%s'"
3996 #: builtin/pack-objects.c:2425
3998 msgid "option %s does not accept negative form"
3999 msgstr "选项 %s 不接受否定格式"
4001 #: builtin/pack-objects.c:2429
4003 msgid "unable to parse value '%s' for option %s"
4004 msgstr "不能解析选项 %1$s 的值 '%2$s'"
4006 #: builtin/push.c:45
4007 msgid "tag shorthand without <tag>"
4008 msgstr "tag 简写没有跟 <tag> 参数"
4010 #: builtin/push.c:64
4011 msgid "--delete only accepts plain target ref names"
4012 msgstr "--delete 只接受简单的目标引用名"
4014 #: builtin/push.c:99
4017 "To choose either option permanently, see push.default in 'git help config'."
4020 "为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
4022 #: builtin/push.c:102
4025 "The upstream branch of your current branch does not match\n"
4026 "the name of your current branch. To push to the upstream branch\n"
4027 "on the remote, use\n"
4029 " git push %s HEAD:%s\n"
4031 "To push to the branch of the same name on the remote, use\n"
4036 "如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
4039 " git push %s HEAD:%s\n"
4046 #: builtin/push.c:121
4049 "You are not currently on a branch.\n"
4050 "To push the history leading to the current (detached HEAD)\n"
4053 " git push %s HEAD:<name-of-remote-branch>\n"
4056 "现在为推送当前(分离头指针)的历史,使用\n"
4058 " git push %s HEAD:<name-of-remote-branch>\n"
4060 #: builtin/push.c:128
4063 "The current branch %s has no upstream branch.\n"
4064 "To push the current branch and set the remote as upstream, use\n"
4066 " git push --set-upstream %s %s\n"
4068 "当前分支 %s 没有对应的上游分支。\n"
4069 "为推送当前分支并建立与远程上游的跟踪,使用\n"
4071 " git push --set-upstream %s %s\n"
4073 #: builtin/push.c:136
4075 msgid "The current branch %s has multiple upstream branches, refusing to push."
4076 msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
4078 #: builtin/push.c:139
4081 "You are pushing to remote '%s', which is not the upstream of\n"
4082 "your current branch '%s', without telling me what to push\n"
4083 "to update which remote branch."
4085 "您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
4086 "而没有告诉我要推送什么、更新哪个远程分支。"
4088 #: builtin/push.c:174
4090 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
4091 msgstr "您没有为推送指定任何引用表达式,并且 push.default 为 \"nothing\"。"
4093 #: builtin/push.c:181
4095 "Updates were rejected because the tip of your current branch is behind\n"
4096 "its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
4097 "before pushing again.\n"
4098 "See the 'Note about fast-forwards' in 'git push --help' for details."
4100 "更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
4101 "再次推送前,先与远程变更合并(如 'git pull')。详见\n"
4102 "'git push --help' 中的 'Note about fast-forwards' 小节。"
4104 #: builtin/push.c:187
4106 "Updates were rejected because a pushed branch tip is behind its remote\n"
4107 "counterpart. If you did not intend to push that branch, you may want to\n"
4108 "specify branches to push or set the 'push.default' configuration\n"
4109 "variable to 'current' or 'upstream' to push only the current branch."
4111 "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
4112 "如果您并非有意推送该分支,您可以在推送时指定要推送的分支,或者将\n"
4113 "配置变量 'push.default' 设置为 'current' 或 'upstream' 以便只推送当前分支。"
4115 #: builtin/push.c:193
4117 "Updates were rejected because a pushed branch tip is behind its remote\n"
4118 "counterpart. Check out this branch and merge the remote changes\n"
4119 "(e.g. 'git pull') before pushing again.\n"
4120 "See the 'Note about fast-forwards' in 'git push --help' for details."
4122 "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
4123 "检出该分支并与远程变更合并(如 'git pull'),然后再推送。详见\n"
4124 "'git push --help' 中的 'Note about fast-forwards' 小节。"
4126 #: builtin/push.c:233
4128 msgid "Pushing to %s\n"
4131 #: builtin/push.c:237
4133 msgid "failed to push some refs to '%s'"
4134 msgstr "无法推送一些引用到 '%s'"
4136 #: builtin/push.c:269
4138 msgid "bad repository '%s'"
4141 #: builtin/push.c:270
4143 "No configured push destination.\n"
4144 "Either specify the URL from the command-line or configure a remote "
4145 "repository using\n"
4147 " git remote add <name> <url>\n"
4149 "and then push using the remote name\n"
4151 " git push <name>\n"
4154 "或者通过命令行指定URL,或者用下面命令配置一个远程版本库\n"
4156 " git remote add <name> <url>\n"
4160 " git push <name>\n"
4162 #: builtin/push.c:285
4163 msgid "--all and --tags are incompatible"
4164 msgstr "--all 和 --tags 不兼容"
4166 #: builtin/push.c:286
4167 msgid "--all can't be combined with refspecs"
4168 msgstr "--all 不能和引用表达式共用"
4170 #: builtin/push.c:291
4171 msgid "--mirror and --tags are incompatible"
4172 msgstr "--mirror 和 --tags 不兼容"
4174 #: builtin/push.c:292
4175 msgid "--mirror can't be combined with refspecs"
4176 msgstr "--mirror 不能和引用表达式共用"
4178 #: builtin/push.c:297
4179 msgid "--all and --mirror are incompatible"
4180 msgstr "--all 和 --mirror 不兼容"
4182 #: builtin/push.c:385
4183 msgid "--delete is incompatible with --all, --mirror and --tags"
4184 msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
4186 #: builtin/push.c:387
4187 msgid "--delete doesn't make sense without any refs"
4188 msgstr "--delete 未接任何引用没有意义"
4190 #: builtin/remote.c:98
4195 #: builtin/remote.c:130
4197 "--mirror is dangerous and deprecated; please\n"
4198 "\t use --mirror=fetch or --mirror=push instead"
4200 "--mirror 选项危险且过时,请使用 --mirror=fetch\n"
4201 "\t 或 --mirror=push"
4203 #: builtin/remote.c:147
4205 msgid "unknown mirror argument: %s"
4208 #: builtin/remote.c:185
4209 msgid "specifying a master branch makes no sense with --mirror"
4210 msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
4212 #: builtin/remote.c:187
4213 msgid "specifying branches to track makes sense only with fetch mirrors"
4214 msgstr "指定要跟踪的分支只在与获取镜像共用才有意义"
4216 #: builtin/remote.c:195 builtin/remote.c:646
4218 msgid "remote %s already exists."
4219 msgstr "远程 %s 已经存在。"
4221 #: builtin/remote.c:199 builtin/remote.c:650
4223 msgid "'%s' is not a valid remote name"
4224 msgstr "'%s' 不是一个有效的远程名称"
4226 #: builtin/remote.c:243
4228 msgid "Could not setup master '%s'"
4229 msgstr "无法设置 master '%s'"
4231 #: builtin/remote.c:299
4233 msgid "more than one %s"
4236 #: builtin/remote.c:339
4238 msgid "Could not get fetch map for refspec %s"
4239 msgstr "无法得到引用表达式 %s 的获取列表"
4241 #: builtin/remote.c:440 builtin/remote.c:448
4245 #: builtin/remote.c:452
4249 #: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607
4251 msgid "Could not append '%s' to '%s'"
4252 msgstr "不能添加 '%s' 至 '%s'"
4254 #: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890
4256 msgid "No such remote: %s"
4259 #: builtin/remote.c:656
4261 msgid "Could not rename config section '%s' to '%s'"
4262 msgstr "不能重命名配置小节 '%s' 到 '%s'"
4264 #: builtin/remote.c:662 builtin/remote.c:799
4266 msgid "Could not remove config section '%s'"
4267 msgstr "不能移除配置小节 '%s'"
4269 #: builtin/remote.c:677
4272 "Not updating non-default fetch refspec\n"
4274 "\tPlease update the configuration manually if necessary."
4280 #: builtin/remote.c:683
4282 msgid "Could not append '%s'"
4285 #: builtin/remote.c:694
4287 msgid "Could not set '%s'"
4290 #: builtin/remote.c:716
4292 msgid "deleting '%s' failed"
4295 #: builtin/remote.c:750
4297 msgid "creating '%s' failed"
4300 #: builtin/remote.c:764
4302 msgid "Could not remove branch %s"
4305 #: builtin/remote.c:834
4307 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
4308 "to delete it, use:"
4310 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
4311 "to delete them, use:"
4312 msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
4313 msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
4315 #: builtin/remote.c:943
4317 msgid " new (next fetch will store in remotes/%s)"
4318 msgstr " 新的(下一次获取将存储于 remotes/%s)"
4320 #: builtin/remote.c:946
4324 #: builtin/remote.c:948
4325 msgid " stale (use 'git remote prune' to remove)"
4326 msgstr " 过时(使用 'git remote prune' 来移除)"
4328 #: builtin/remote.c:950
4332 #: builtin/remote.c:991
4334 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
4335 msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
4337 #: builtin/remote.c:998
4339 msgid "rebases onto remote %s"
4342 #: builtin/remote.c:1001
4344 msgid " merges with remote %s"
4347 #: builtin/remote.c:1002
4348 msgid " and with remote"
4351 #: builtin/remote.c:1004
4353 msgid "merges with remote %s"
4356 #: builtin/remote.c:1005
4357 msgid " and with remote"
4360 #: builtin/remote.c:1051
4364 #: builtin/remote.c:1054
4368 #: builtin/remote.c:1058
4372 #: builtin/remote.c:1061
4373 msgid "fast-forwardable"
4376 #: builtin/remote.c:1064
4377 msgid "local out of date"
4380 #: builtin/remote.c:1071
4382 msgid " %-*s forces to %-*s (%s)"
4383 msgstr " %-*s 强制推送至 %-*s (%s)"
4385 #: builtin/remote.c:1074
4387 msgid " %-*s pushes to %-*s (%s)"
4388 msgstr " %-*s 推送至 %-*s (%s)"
4390 #: builtin/remote.c:1078
4392 msgid " %-*s forces to %s"
4393 msgstr " %-*s 强制推送至 %s"
4395 #: builtin/remote.c:1081
4397 msgid " %-*s pushes to %s"
4398 msgstr " %-*s 推送至 %s"
4400 #: builtin/remote.c:1118
4405 #: builtin/remote.c:1119
4407 msgid " Fetch URL: %s"
4410 #: builtin/remote.c:1120 builtin/remote.c:1285
4414 #: builtin/remote.c:1129 builtin/remote.c:1131
4416 msgid " Push URL: %s"
4419 #: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137
4421 msgid " HEAD branch: %s"
4424 #: builtin/remote.c:1139
4427 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
4428 msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
4430 #: builtin/remote.c:1151
4432 msgid " Remote branch:%s"
4433 msgid_plural " Remote branches:%s"
4434 msgstr[0] " 远程分支:%s"
4435 msgstr[1] " 远程分支:%s"
4437 # 译者:中文字符串拼接,可删除前导空格
4438 #: builtin/remote.c:1154 builtin/remote.c:1181
4439 msgid " (status not queried)"
4442 #: builtin/remote.c:1163
4443 msgid " Local branch configured for 'git pull':"
4444 msgid_plural " Local branches configured for 'git pull':"
4445 msgstr[0] " 为 'git pull' 配置的本地分支:"
4446 msgstr[1] " 为 'git pull' 配置的本地分支:"
4448 #: builtin/remote.c:1171
4449 msgid " Local refs will be mirrored by 'git push'"
4450 msgstr " 本地引用将在 'git push' 时被镜像"
4452 #: builtin/remote.c:1178
4454 msgid " Local ref configured for 'git push'%s:"
4455 msgid_plural " Local refs configured for 'git push'%s:"
4456 msgstr[0] " 为 'git push' 配置的本地引用%s:"
4457 msgstr[1] " 为 'git push' 配置的本地引用%s:"
4459 #: builtin/remote.c:1216
4460 msgid "Cannot determine remote HEAD"
4461 msgstr "无法确定远程 HEAD"
4463 #: builtin/remote.c:1218
4464 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
4465 msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
4467 #: builtin/remote.c:1228
4469 msgid "Could not delete %s"
4472 #: builtin/remote.c:1236
4474 msgid "Not a valid ref: %s"
4475 msgstr "不是一个有效引用:%s"
4477 #: builtin/remote.c:1238
4479 msgid "Could not setup %s"
4483 #: builtin/remote.c:1274
4485 msgid " %s will become dangling!"
4486 msgstr " %s 将成为悬空状态!"
4489 #: builtin/remote.c:1275
4491 msgid " %s has become dangling!"
4492 msgstr " %s 已成为悬空状态!"
4494 #: builtin/remote.c:1281
4499 #: builtin/remote.c:1282
4504 #: builtin/remote.c:1295
4506 msgid " * [would prune] %s"
4507 msgstr " * [将删除] %s"
4509 #: builtin/remote.c:1298
4511 msgid " * [pruned] %s"
4512 msgstr " * [已删除] %s"
4514 #: builtin/remote.c:1387 builtin/remote.c:1461
4516 msgid "No such remote '%s'"
4519 #: builtin/remote.c:1414
4520 msgid "no remote specified"
4523 #: builtin/remote.c:1447
4524 msgid "--add --delete doesn't make sense"
4525 msgstr "--add --delete 无意义"
4527 #: builtin/remote.c:1487
4529 msgid "Invalid old URL pattern: %s"
4530 msgstr "无效的旧URL匹配模版:%s"
4532 #: builtin/remote.c:1495
4534 msgid "No such URL found: %s"
4537 #: builtin/remote.c:1497
4538 msgid "Will not delete all non-push URLs"
4539 msgstr "将不会删除所有非推送URL地址"
4541 #: builtin/reset.c:33
4545 #: builtin/reset.c:33
4549 #: builtin/reset.c:33
4553 #: builtin/reset.c:33
4557 #: builtin/reset.c:33
4561 #: builtin/reset.c:77
4562 msgid "You do not have a valid HEAD."
4563 msgstr "您没有一个有效的 HEAD。"
4565 #: builtin/reset.c:79
4566 msgid "Failed to find tree of HEAD."
4567 msgstr "无法找到 HEAD 指向的树。"
4569 #: builtin/reset.c:85
4571 msgid "Failed to find tree of %s."
4572 msgstr "无法找到 %s 指向的树。"
4574 #: builtin/reset.c:96
4575 msgid "Could not write new index file."
4576 msgstr "不能写入新的索引文件。"
4578 #: builtin/reset.c:106
4580 msgid "HEAD is now at %s"
4581 msgstr "HEAD 现在位于 %s"
4583 #: builtin/reset.c:130
4584 msgid "Could not read index"
4587 #: builtin/reset.c:133
4588 msgid "Unstaged changes after reset:"
4589 msgstr "重置后撤出暂存区的变更:"
4591 # 译者:汉字之间无空格,故删除%s前后空格
4592 #: builtin/reset.c:223
4594 msgid "Cannot do a %s reset in the middle of a merge."
4595 msgstr "在合并过程中不能做%s重置操作。"
4597 #: builtin/reset.c:297
4599 msgid "Could not parse object '%s'."
4600 msgstr "不能解析对象 '%s'。"
4602 #: builtin/reset.c:302
4603 msgid "--patch is incompatible with --{hard,mixed,soft}"
4604 msgstr "--patch 与 --{hard,mixed,soft} 不兼容"
4606 #: builtin/reset.c:311
4607 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
4608 msgstr "--mixed 带路径已弃用,代之以 'git reset -- <paths>'。"
4610 # 译者:汉字之间无空格,故删除%s前后空格
4611 #: builtin/reset.c:313
4613 msgid "Cannot do %s reset with paths."
4614 msgstr "不能带路径进行%s重置。"
4616 # 译者:汉字之间无空格,故删除%s前后空格
4617 #: builtin/reset.c:325
4619 msgid "%s reset is not allowed in a bare repository"
4620 msgstr "不能对裸版本库进行%s重置"
4622 #: builtin/reset.c:341
4624 msgid "Could not reset index file to revision '%s'."
4625 msgstr "不能重置索引文件至版本 '%s'。"
4627 #: builtin/revert.c:70 builtin/revert.c:92
4629 msgid "%s: %s cannot be used with %s"
4630 msgstr "%s:%s 不能和 %s 共用"
4632 #: builtin/revert.c:131
4633 msgid "program error"
4636 #: builtin/revert.c:221
4637 msgid "revert failed"
4640 #: builtin/revert.c:236
4641 msgid "cherry-pick failed"
4647 "'%s' has staged content different from both the file and the HEAD\n"
4648 "(use -f to force removal)"
4650 "'%s' 暂存的内容和工作区及 HEAD 中的都不一样\n"
4656 "'%s' has changes staged in the index\n"
4657 "(use --cached to keep the file, or -f to force removal)"
4660 "(使用 --cached 保存文件,或用 -f 强制删除)"
4665 "'%s' has local modifications\n"
4666 "(use --cached to keep the file, or -f to force removal)"
4669 "(使用 --cached 保存文件,或用 -f 强制删除)"
4673 msgid "not removing '%s' recursively without -r"
4674 msgstr "未提供 -r 选项不会递归删除 '%s'"
4678 msgid "git rm: unable to remove %s"
4679 msgstr "git rm:不能删除 %s"
4681 #: builtin/shortlog.c:157
4683 msgid "Missing author: %s"
4688 msgid "malformed object at '%s'"
4689 msgstr "非法的对象于 '%s'"
4691 #: builtin/tag.c:207
4693 msgid "tag name too long: %.*s..."
4694 msgstr "tag 名字太长:%.*s..."
4696 #: builtin/tag.c:212
4698 msgid "tag '%s' not found."
4699 msgstr "tag '%s' 未发现。"
4701 #: builtin/tag.c:227
4703 msgid "Deleted tag '%s' (was %s)\n"
4704 msgstr "已删除 tag '%s'(曾为 %s)\n"
4706 #: builtin/tag.c:239
4708 msgid "could not verify the tag '%s'"
4709 msgstr "不能校验 tag '%s'"
4711 #: builtin/tag.c:249
4715 "# Write a tag message\n"
4716 "# Lines starting with '#' will be ignored.\n"
4722 "# 以 '#' 开头的行将被忽略。\n"
4725 #: builtin/tag.c:256
4729 "# Write a tag message\n"
4730 "# Lines starting with '#' will be kept; you may remove them yourself if you "
4737 "# 以 '#' 开头的行将被忽略,您可以删除它们如果您想这样做。\n"
4740 #: builtin/tag.c:298
4741 msgid "unable to sign the tag"
4744 #: builtin/tag.c:300
4745 msgid "unable to write tag file"
4748 #: builtin/tag.c:325
4749 msgid "bad object type."
4752 #: builtin/tag.c:338
4753 msgid "tag header too big."
4756 #: builtin/tag.c:370
4757 msgid "no tag message?"
4760 #: builtin/tag.c:376
4762 msgid "The tag message has been left in %s\n"
4763 msgstr "tag 说明被保留在 %s\n"
4765 #: builtin/tag.c:425
4766 msgid "switch 'points-at' requires an object"
4767 msgstr "开关 'points-at' 需要一个对象"
4769 #: builtin/tag.c:427
4771 msgid "malformed object name '%s'"
4772 msgstr "非法的对象名 '%s'"
4774 #: builtin/tag.c:506
4775 msgid "--column and -n are incompatible"
4776 msgstr "--column 和 -n 不兼容"
4778 #: builtin/tag.c:523
4779 msgid "-n option is only allowed with -l."
4780 msgstr "-n 选项只允许和 -l 共用。"
4782 #: builtin/tag.c:525
4783 msgid "--contains option is only allowed with -l."
4784 msgstr "--contains 选项只允许和 -l 共用。"
4786 #: builtin/tag.c:527
4787 msgid "--points-at option is only allowed with -l."
4788 msgstr "--points-at 选项只允许和 -l 共用。"
4790 #: builtin/tag.c:535
4791 msgid "only one -F or -m option is allowed."
4792 msgstr "只允许一个 -F 或 -m 选项。"
4794 #: builtin/tag.c:555
4795 msgid "too many params"
4798 #: builtin/tag.c:561
4800 msgid "'%s' is not a valid tag name."
4801 msgstr "'%s' 不是一个有效的tag名称。"
4803 #: builtin/tag.c:566
4805 msgid "tag '%s' already exists"
4806 msgstr "tag '%s' 已存在"
4808 #: builtin/tag.c:584
4810 msgid "%s: cannot lock the ref"
4813 #: builtin/tag.c:586
4815 msgid "%s: cannot update the ref"
4818 #: builtin/tag.c:588
4820 msgid "Updated tag '%s' (was %s)\n"
4821 msgstr "已更新tag '%s'(曾为 %s)\n"
4824 msgid "See 'git help <command>' for more information on a specific command."
4825 msgstr "参见 'git help <command>' 以获得该特定命令的详细信息。"
4827 #: parse-options.h:133 parse-options.h:235
4831 #: parse-options.h:141
4835 #: parse-options.h:149
4839 #: parse-options.h:151
4843 #: parse-options.h:156
4844 msgid "no-op (backward compatibility)"
4847 #: parse-options.h:228
4848 msgid "be more verbose"
4851 #: parse-options.h:230
4852 msgid "be more quiet"
4855 #: parse-options.h:236
4856 msgid "use <n> digits to display SHA-1s"
4857 msgstr "用 <n> 位数字显示 SHA-1 哈希值"
4860 msgid "Add file contents to the index"
4864 msgid "Find by binary search the change that introduced a bug"
4865 msgstr "通过二分查找定位引入 bug 的变更"
4868 msgid "List, create, or delete branches"
4872 msgid "Checkout a branch or paths to the working tree"
4873 msgstr "检出一个分支或路径到工作区"
4876 msgid "Clone a repository into a new directory"
4877 msgstr "克隆一个版本库到一个新目录"
4880 msgid "Record changes to the repository"
4884 msgid "Show changes between commits, commit and working tree, etc"
4885 msgstr "显示提交之间、提交和工作区之间等的差异"
4888 msgid "Download objects and refs from another repository"
4889 msgstr "从另外一个版本库下载对象和引用"
4892 msgid "Print lines matching a pattern"
4896 msgid "Create an empty git repository or reinitialize an existing one"
4897 msgstr "创建一个空的 git 版本库或者重新初始化一个"
4900 msgid "Show commit logs"
4904 msgid "Join two or more development histories together"
4905 msgstr "合并两个或更多开发历史"
4908 msgid "Move or rename a file, a directory, or a symlink"
4909 msgstr "移动或重命名一个文件、目录或符号链接"
4912 msgid "Fetch from and merge with another repository or a local branch"
4913 msgstr "获取并合并另外的版本库或一个本地分支"
4916 msgid "Update remote refs along with associated objects"
4917 msgstr "更新远程引用和相关的对象"
4920 msgid "Forward-port local commits to the updated upstream head"
4921 msgstr "本地提交转移至更新后的上游分支中"
4924 msgid "Reset current HEAD to the specified state"
4925 msgstr "重置当前HEAD到指定状态"
4928 msgid "Remove files from the working tree and from the index"
4929 msgstr "从工作区和索引中删除文件"
4932 msgid "Show various types of objects"
4936 msgid "Show the working tree status"
4940 msgid "Create, list, delete or verify a tag object signed with GPG"
4941 msgstr "创建、列出、删除或校验一个GPG签名的 tag 对象"
4944 msgid "You need to set your committer info first"
4945 msgstr "您需要先设置你的提交者信息"
4949 "You seem to have moved HEAD since the last 'am' failure.\n"
4950 "Not rewinding to ORIG_HEAD"
4951 msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
4956 "When you have resolved this problem run \"$cmdline --resolved\".\n"
4957 "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
4958 "To restore the original branch and stop patching run \"$cmdline --abort\"."
4960 "当您解决了此问题后,执行 \"$cmdline --resolved\"。\n"
4961 "如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n"
4962 "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
4965 msgid "Cannot fall back to three-way merge."
4969 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
4970 msgstr "版本库缺乏必要的 blob 数据以进行三路合并。"
4974 "Did you hand edit your patch?\n"
4975 "It does not apply to blobs recorded in its index."
4981 msgid "Falling back to patching base and 3-way merge..."
4982 msgstr "转而在基础版本上打补丁及进行三路合并..."
4985 msgid "Only one StGIT patch series can be applied at once"
4986 msgstr "一次只能有一个 StGIT 补丁队列被应用"
4990 msgid "Patch format $patch_format is not supported."
4991 msgstr "不支持 $patch_format 补丁格式。"
4994 msgid "Patch format detection failed."
4998 msgid "-d option is no longer supported. Do not use."
4999 msgstr "不再支持 -d 选项。不要使用。"
5003 msgid "previous rebase directory $dotest still exists but mbox given."
5004 msgstr "之前的变基目录 $dotest 仍然存在但给出了mbox。"
5007 msgid "Please make up your mind. --skip or --abort?"
5008 msgstr "请下决心。--skip 或是 --abort ?"
5011 msgid "Resolve operation not in progress, we are not resuming."
5012 msgstr "解决操作未进行,我们不会继续。"
5016 msgid "Dirty index: cannot apply patches (dirty: $files)"
5017 msgstr "脏的索引:不能应用补丁(脏文件:$files)"
5022 "Patch is empty. Was it split wrong?\n"
5023 "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
5024 "To restore the original branch and stop patching run \"$cmdline --abort\"."
5027 "如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n"
5028 "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
5031 msgid "Patch does not have a valid e-mail address."
5032 msgstr "补丁中没有一个有效的邮件地址。"
5035 msgid "cannot be interactive without stdin connected to a terminal."
5036 msgstr "标准输入没有和终端关联,不能进行交互式操作。"
5039 msgid "Commit Body is:"
5043 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
5044 #. in your translation. The program will only accept English
5045 #. input at this point.
5047 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
5048 msgstr "应用?[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
5052 msgid "Applying: $FIRSTLINE"
5053 msgstr "正应用:$FIRSTLINE"
5057 "No changes - did you forget to use 'git add'?\n"
5058 "If there is nothing left to stage, chances are that something else\n"
5059 "already introduced the same changes; you might want to skip this patch."
5061 "没有变更 —— 您是不是忘了执行 'git add'?\n"
5062 "如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
5067 "You still have unmerged paths in your index\n"
5068 "did you forget to use 'git add'?"
5069 msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'?"
5072 msgid "No changes -- Patch already applied."
5073 msgstr "没有变更 -- 补丁已经应用过。"
5077 msgid "Patch failed at $msgnum $FIRSTLINE"
5078 msgstr "补丁失败于 $msgnum $FIRSTLINE"
5081 msgid "applying to an empty history"
5085 msgid "You need to start by \"git bisect start\""
5086 msgstr "您需要执行 \"git bisect start\" 来开始"
5089 #. TRANSLATORS: Make sure to include [Y] and [n] in your
5090 #. translation. The program will only accept English input
5093 msgid "Do you want me to do it for you [Y/n]? "
5094 msgstr "您想让我为您这样做么[Y/n]? "
5098 msgid "unrecognised option: '$arg'"
5099 msgstr "未能识别的选项:'$arg'"
5103 msgid "'$arg' does not appear to be a valid revision"
5104 msgstr "'$arg' 看起来不像是一个有效的版本"
5106 #: git-bisect.sh:117
5107 msgid "Bad HEAD - I need a HEAD"
5108 msgstr "坏的 HEAD - 我需要一个 HEAD"
5110 #: git-bisect.sh:130
5113 "Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
5114 msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <validbranch>'。"
5116 #: git-bisect.sh:140
5117 msgid "won't bisect on seeked tree"
5118 msgstr "不会在已查找过的树上二分查找"
5120 #: git-bisect.sh:144
5121 msgid "Bad HEAD - strange symbolic ref"
5122 msgstr "坏的 HEAD - 奇怪的符号引用"
5124 #: git-bisect.sh:189
5126 msgid "Bad bisect_write argument: $state"
5127 msgstr "坏的 bisect_write 参数:$state"
5129 #: git-bisect.sh:218
5131 msgid "Bad rev input: $arg"
5132 msgstr "输入坏的版本:$arg"
5134 #: git-bisect.sh:232
5135 msgid "Please call 'bisect_state' with at least one argument."
5136 msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
5138 #: git-bisect.sh:244
5140 msgid "Bad rev input: $rev"
5141 msgstr "输入坏的版本:$rev"
5143 #: git-bisect.sh:250
5144 msgid "'git bisect bad' can take only one argument."
5145 msgstr "'git bisect bad' 只能带一个参数。"
5147 #. have bad but not good. we could bisect although
5148 #. this is less optimum.
5149 #: git-bisect.sh:273
5150 msgid "Warning: bisecting only with a bad commit."
5151 msgstr "警告:在仅有一个坏提交下进行二分查找。"
5154 #. TRANSLATORS: Make sure to include [Y] and [n] in your
5155 #. translation. The program will only accept English input
5157 #: git-bisect.sh:279
5158 msgid "Are you sure [Y/n]? "
5159 msgstr "您确认么[Y/n]? "
5161 #: git-bisect.sh:289
5163 "You need to give me at least one good and one bad revisions.\n"
5164 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
5166 "您需要给我至少一个好版本和一个坏版本。\n"
5167 "(您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。)"
5169 #: git-bisect.sh:292
5171 "You need to start by \"git bisect start\".\n"
5172 "You then need to give me at least one good and one bad revisions.\n"
5173 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
5175 "您需要执行 \"git bisect start\" 来开始。\n"
5176 "然后需要提供我至少一个好版本和一个坏版本。\n"
5177 "(您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。)"
5179 #: git-bisect.sh:347 git-bisect.sh:474
5180 msgid "We are not bisecting."
5183 #: git-bisect.sh:354
5185 msgid "'$invalid' is not a valid commit"
5186 msgstr "'$invalid' 不是一个有效的提交"
5188 #: git-bisect.sh:363
5191 "Could not check out original HEAD '$branch'.\n"
5192 "Try 'git bisect reset <commit>'."
5194 "不能检出原始 HEAD '$branch'。\n"
5195 "尝试 'git bisect reset <commit>'。"
5197 #: git-bisect.sh:390
5198 msgid "No logfile given"
5201 #: git-bisect.sh:391
5203 msgid "cannot read $file for replaying"
5204 msgstr "不能读取 $file 来重放"
5206 #: git-bisect.sh:408
5207 msgid "?? what are you talking about?"
5210 #: git-bisect.sh:420
5212 msgid "running $command"
5213 msgstr "运行 $command"
5215 #: git-bisect.sh:427
5218 "bisect run failed:\n"
5219 "exit code $res from '$command' is < 0 or >= 128"
5222 "命令 '$command' 的退出码 $res 或者小于 0 或者大于等于 128"
5224 #: git-bisect.sh:453
5225 msgid "bisect run cannot continue any more"
5228 #: git-bisect.sh:459
5231 "bisect run failed:\n"
5232 "'bisect_state $state' exited with error code $res"
5235 "'bisect_state $state' 退出码为 $res"
5237 #: git-bisect.sh:466
5238 msgid "bisect run success"
5243 "Pull is not possible because you have unmerged files.\n"
5244 "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
5245 "as appropriate to mark resolution, or use 'git commit -a'."
5247 "Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n"
5248 "然后酌情使用 'git add/rm <file>' 标记解决方案,\n"
5249 "或者使用 'git commit -a'。"
5252 msgid "Pull is not possible because you have unmerged files."
5253 msgstr "Pull 不可用,因为您尚有未合并的文件。"
5256 msgid "updating an unborn branch with changes added to the index"
5257 msgstr "更新尚未诞生的分支,变更添加至索引"
5259 #. The fetch involved updating the current branch.
5260 #. The working tree and the index file is still based on the
5261 #. $orig_head commit, but we are merging into $curr_head.
5262 #. First update the working tree to match $curr_head.
5266 "Warning: fetch updated the current branch head.\n"
5267 "Warning: fast-forwarding your working tree from\n"
5268 "Warning: commit $orig_head."
5270 "警告:fetch 更新了当前的分支。您的工作区\n"
5271 "警告:从原提交 $orig_head 快进。"
5274 msgid "Cannot merge multiple branches into empty head"
5275 msgstr "无法将多个分支合并到空分支"
5278 msgid "Cannot rebase onto multiple branches"
5282 msgid "git stash clear with parameters is unimplemented"
5283 msgstr "git stash clear 不支持参数"
5286 msgid "You do not have the initial commit yet"
5290 msgid "Cannot save the current index state"
5293 #: git-stash.sh:123 git-stash.sh:136
5294 msgid "Cannot save the current worktree state"
5295 msgstr "无法保存当前工作区状态"
5298 msgid "No changes selected"
5302 msgid "Cannot remove temporary index (can't happen)"
5303 msgstr "无法删除临时索引(不应发生)"
5306 msgid "Cannot record working tree state"
5309 #. TRANSLATORS: $option is an invalid option, like
5310 #. `--blah-blah'. The 7 spaces at the beginning of the
5311 #. second line correspond to "error: ". So you should line
5312 #. up the second line with however many characters the
5313 #. translation of "error: " takes in your language. E.g. in
5316 #. $ git stash save --blah-blah 2>&1 | head -n 2
5317 #. error: unknown option for 'stash save': --blah-blah
5318 #. To provide a message, use git stash save -- '--blah-blah'
5322 "error: unknown option for 'stash save': $option\n"
5323 " To provide a message, use git stash save -- '$option'"
5325 "错误:'stash save' 的未知选项:$option\n"
5326 " 要提供一个描述信息,使用 git stash save -- '$option'"
5329 msgid "No local changes to save"
5333 msgid "Cannot initialize stash"
5334 msgstr "无法初始化 stash"
5337 msgid "Cannot save the current status"
5341 msgid "Cannot remove worktree changes"
5345 msgid "No stash found."
5350 msgid "Too many revisions specified: $REV"
5351 msgstr "指定了太多的版本:$REV"
5355 msgid "$reference is not valid reference"
5356 msgstr "$reference 不是有效的引用"
5360 msgid "'$args' is not a stash-like commit"
5361 msgstr "'$args' 不是 stash 样提交"
5365 msgid "'$args' is not a stash reference"
5366 msgstr "'$args' 不是一个 stash 引用"
5369 msgid "unable to refresh index"
5373 msgid "Cannot apply a stash in the middle of a merge"
5374 msgstr "无法在合并过程中恢复进度"
5377 msgid "Conflicts in index. Try without --index."
5378 msgstr "索引中有冲突。尝试不使用 --index。"
5381 msgid "Could not save index tree"
5385 msgid "Cannot unstage modified files"
5389 msgid "Index was not unstashed."
5390 msgstr "索引的进度没有被恢复。"
5394 msgid "Dropped ${REV} ($s)"
5395 msgstr "丢弃了 ${REV} ($s)"
5399 msgid "${REV}: Could not drop stash entry"
5400 msgstr "${REV}:不能丢弃进度条目"
5403 msgid "No branch name specified"
5407 msgid "(To restore them type \"git stash apply\")"
5408 msgstr "(为恢复数据输入 \"git stash apply\")"
5410 #: git-submodule.sh:88
5412 msgid "cannot strip one component off url '$remoteurl'"
5413 msgstr "无法从 url '$remoteurl' 剥离一个组件"
5415 #: git-submodule.sh:145
5417 msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
5418 msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
5420 #: git-submodule.sh:186
5422 msgid "Clone of '$url' into submodule path '$sm_path' failed"
5423 msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
5425 #: git-submodule.sh:196
5427 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
5428 msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或者相反"
5430 #: git-submodule.sh:285
5432 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
5433 msgstr "版本库URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
5435 #: git-submodule.sh:302
5437 msgid "'$sm_path' already exists in the index"
5438 msgstr "'$sm_path' 已经存在于索引中"
5440 #: git-submodule.sh:306
5443 "The following path is ignored by one of your .gitignore files:\n"
5445 "Use -f if you really want to add it."
5447 "以下路径被您的一个 .gitignore 文件所忽略:\n"
5449 "如果您确实想添加它,使用 -f 参数。"
5451 #: git-submodule.sh:317
5453 msgid "Adding existing repo at '$sm_path' to the index"
5454 msgstr "添加位于 '$sm_path' 的现存版本库到索引"
5456 #: git-submodule.sh:319
5458 msgid "'$sm_path' already exists and is not a valid git repo"
5459 msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"
5461 #: git-submodule.sh:333
5463 msgid "Unable to checkout submodule '$sm_path'"
5464 msgstr "不能检出子模组 '$sm_path'"
5466 #: git-submodule.sh:338
5468 msgid "Failed to add submodule '$sm_path'"
5469 msgstr "无法添加子模组 '$sm_path'"
5471 #: git-submodule.sh:343
5473 msgid "Failed to register submodule '$sm_path'"
5474 msgstr "无法注册子模组 '$sm_path'"
5476 #: git-submodule.sh:385
5478 msgid "Entering '$prefix$sm_path'"
5479 msgstr "正在进入 '$prefix$sm_path'"
5481 #: git-submodule.sh:399
5483 msgid "Stopping at '$sm_path'; script returned non-zero status."
5484 msgstr "停止于 '$sm_path',脚本返回非零值。"
5486 #: git-submodule.sh:442
5488 msgid "No url found for submodule path '$sm_path' in .gitmodules"
5489 msgstr "在 .gitmodules 中未找到子模组路径 '$sm_path' 的 url"
5491 #: git-submodule.sh:451
5493 msgid "Failed to register url for submodule path '$sm_path'"
5494 msgstr "无法为子模组路径 '$sm_path' 注册 url"
5496 #: git-submodule.sh:453
5498 msgid "Submodule '$name' ($url) registered for path '$sm_path'"
5499 msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册"
5501 #: git-submodule.sh:461
5503 msgid "Failed to register update mode for submodule path '$sm_path'"
5504 msgstr "无法为子模组路径 '$sm_path' 注册更新模式"
5506 #: git-submodule.sh:560
5509 "Submodule path '$sm_path' not initialized\n"
5510 "Maybe you want to use 'update --init'?"
5512 "子模组路径 '$sm_path' 没有初始化\n"
5513 "也许您想用 'update --init'?"
5515 #: git-submodule.sh:573
5517 msgid "Unable to find current revision in submodule path '$sm_path'"
5518 msgstr "无法在子模组路径 '$sm_path' 中找到当前版本"
5520 #: git-submodule.sh:592
5522 msgid "Unable to fetch in submodule path '$sm_path'"
5523 msgstr "无法在子模组路径 '$sm_path' 中获取"
5525 #: git-submodule.sh:606
5527 msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
5528 msgstr "无法在子模组路径 '$sm_path' 中变基 '$sha1'"
5530 #: git-submodule.sh:607
5532 msgid "Submodule path '$sm_path': rebased into '$sha1'"
5533 msgstr "子模组路径 '$sm_path':变基至 '$sha1'"
5535 #: git-submodule.sh:612
5537 msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
5538 msgstr "无法合并 '$sha1' 到子模组路径 '$sm_path' 中"
5540 #: git-submodule.sh:613
5542 msgid "Submodule path '$sm_path': merged in '$sha1'"
5543 msgstr "子模组路径 '$sm_path':已合并入 '$sha1'"
5545 #: git-submodule.sh:618
5547 msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
5548 msgstr "无法在子模组路径 '$sm_path' 中检出 '$sha1'"
5550 #: git-submodule.sh:619
5552 msgid "Submodule path '$sm_path': checked out '$sha1'"
5553 msgstr "子模组路径 '$sm_path':检出 '$sha1'"
5555 #: git-submodule.sh:641 git-submodule.sh:964
5557 msgid "Failed to recurse into submodule path '$sm_path'"
5558 msgstr "无法递归进子模组路径 '$sm_path'"
5560 #: git-submodule.sh:749
5561 msgid "--cached cannot be used with --files"
5562 msgstr "--cached 不能和 --files 共用"
5565 #: git-submodule.sh:789
5567 msgid "unexpected mode $mod_dst"
5568 msgstr "意外的模式 $mod_dst"
5571 #: git-submodule.sh:807
5573 msgid " Warn: $name doesn't contain commit $sha1_src"
5574 msgstr " 警告:$name 未包含提交 $sha1_src"
5577 #: git-submodule.sh:810
5579 msgid " Warn: $name doesn't contain commit $sha1_dst"
5580 msgstr " 警告:$name 未包含提交 $sha1_dst"
5583 #: git-submodule.sh:813
5585 msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
5586 msgstr " 警告:$name 未包含提交 $sha1_src 和 $sha1_dst"
5588 #: git-submodule.sh:838
5592 #: git-submodule.sh:839
5596 #: git-submodule.sh:876
5597 msgid "# Submodules changed but not updated:"
5598 msgstr "# 子模组已修改但尚未更新:"
5600 #: git-submodule.sh:878
5601 msgid "# Submodule changes to be committed:"
5604 #: git-submodule.sh:1022
5606 msgid "Synchronizing submodule url for '$name'"
5607 msgstr "为 '$name' 同步子模组 url"