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-30 09:18+0800\n"
16 "PO-Revision-Date: 2012-07-31 06:31+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:699
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:726 builtin/log.c:1316 builtin/log.c:1535 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:1212 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:494
359 #: parse-options.c:512
364 #. TRANSLATORS: the colon here should align with the
365 #. one in "usage: %s" translation
366 #: parse-options.c:516
371 # 译者:为保证在输出中对齐,注意调整句中空格!
372 #: parse-options.c:519
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:3988
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:167 wt-status.c:194
682 msgid " (use \"git reset %s <file>...\" to unstage)"
683 msgstr " (使用 \"git reset %s <file>...\" 撤出暂存区)"
686 #: wt-status.c:169 wt-status.c:196
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:175 wt-status.c:179
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:788 wt-status.c:912
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:873 wt-status.c:883
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)"
932 msgstr " (执行 \"git rebase --continue\" 一旦您满意您的修改)"
935 msgid "You are currently cherry-picking."
940 msgid " (all conflicts fixed: run \"git commit\")"
941 msgstr " (解决所有冲突后,执行 \"git commit\")"
944 msgid "You are currently bisecting."
949 msgid " (use \"git bisect reset\" to get back to the original branch)"
950 msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
957 msgid "Not currently on any branch."
961 msgid "Initial commit"
974 msgid "Untracked files not listed%s"
975 msgstr "未跟踪的文件没有列出%s"
979 msgid " (use -u option to show untracked files)"
980 msgstr "(使用 -u 参数显示未跟踪的文件)"
988 msgid "no changes added to commit%s\n"
989 msgstr "修改尚未加入提交%s\n"
993 msgid " (use \"git add\" and/or \"git commit -a\")"
994 msgstr "(使用 \"git add\" 和/或 \"git commit -a\")"
998 msgid "nothing added to commit but untracked files present%s\n"
999 msgstr "空提交但存在未跟踪文件%s\n"
1001 # 译者:中文字符串拼接,可删除前导空格
1003 msgid " (use \"git add\" to track)"
1004 msgstr "(使用 \"git add\" 建立跟踪)"
1006 #: wt-status.c:1035 wt-status.c:1038 wt-status.c:1041
1008 msgid "nothing to commit%s\n"
1011 # 译者:中文字符串拼接,可删除前导空格
1013 msgid " (create/copy files and use \"git add\" to track)"
1014 msgstr "(新建/拷贝的文件使用 \"git add\" 建立跟踪)"
1016 # 译者:中文字符串拼接,可删除前导空格
1018 msgid " (use -u to show untracked files)"
1019 msgstr "(使用 -u 显示未跟踪文件)"
1021 # 译者:中文字符串拼接,可删除前导空格
1023 msgid " (working directory clean)"
1027 msgid "HEAD (no branch)"
1032 msgid "Initial commit on "
1041 #: wt-status.c:1174 wt-status.c:1177
1052 msgid "unexpected diff status %c"
1055 #: builtin/add.c:67 builtin/commit.c:229
1056 msgid "updating files failed"
1061 msgid "remove '%s'\n"
1064 #: builtin/add.c:176
1066 msgid "Path '%s' is in submodule '%.*s'"
1067 msgstr "路径 '%s' 属于模组 '%.*s'"
1069 #: builtin/add.c:192
1070 msgid "Unstaged changes after refreshing the index:"
1071 msgstr "刷新索引之后尚未被暂存的变更:"
1073 #: builtin/add.c:195 builtin/add.c:459 builtin/rm.c:186
1075 msgid "pathspec '%s' did not match any files"
1076 msgstr "路径 '%s' 未匹配任何文件"
1078 #: builtin/add.c:209
1080 msgid "'%s' is beyond a symbolic link"
1081 msgstr "'%s' 位于符号链接中"
1083 #: builtin/add.c:276
1084 msgid "Could not read the index"
1087 #: builtin/add.c:286
1089 msgid "Could not open '%s' for writing."
1090 msgstr "不能为写入打开 '%s'。"
1092 #: builtin/add.c:290
1093 msgid "Could not write patch"
1096 #: builtin/add.c:295
1098 msgid "Could not stat '%s'"
1099 msgstr "不能查看文件状态 '%s'"
1101 #: builtin/add.c:297
1102 msgid "Empty patch. Aborted."
1105 #: builtin/add.c:303
1107 msgid "Could not apply '%s'"
1110 #: builtin/add.c:312
1111 msgid "The following paths are ignored by one of your .gitignore files:\n"
1112 msgstr "下列路径被您的一个 .gitignore 文件所忽略:\n"
1114 #: builtin/add.c:352
1116 msgid "Use -f if you really want to add them.\n"
1117 msgstr "使用 -f 参数如果您确实要添加它们。\n"
1119 #: builtin/add.c:353
1120 msgid "no files added"
1123 #: builtin/add.c:359
1124 msgid "adding files failed"
1127 #: builtin/add.c:391
1128 msgid "-A and -u are mutually incompatible"
1129 msgstr "-A 和 -u 选项互斥"
1131 #: builtin/add.c:393
1132 msgid "Option --ignore-missing can only be used together with --dry-run"
1133 msgstr "选项 --ignore-missing 只能和 --dry-run 共用"
1135 #: builtin/add.c:413
1137 msgid "Nothing specified, nothing added.\n"
1138 msgstr "没有指定文件,也没有文件被添加。\n"
1140 #: builtin/add.c:414
1142 msgid "Maybe you wanted to say 'git add .'?\n"
1143 msgstr "也许您想要执行 'git add .'?\n"
1145 #: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:289 builtin/mv.c:82
1147 msgid "index file corrupt"
1150 #: builtin/add.c:480 builtin/apply.c:4433 builtin/mv.c:229 builtin/rm.c:260
1151 msgid "Unable to write new index file"
1154 #: builtin/apply.c:57
1155 msgid "git apply [options] [<patch>...]"
1156 msgstr "git apply [选项] [<补丁>...]"
1158 #: builtin/apply.c:110
1160 msgid "unrecognized whitespace option '%s'"
1161 msgstr "未能识别的空白字符选项 '%s'"
1163 #: builtin/apply.c:125
1165 msgid "unrecognized whitespace ignore option '%s'"
1166 msgstr "未能识别的空白字符忽略选项 '%s'"
1168 #: builtin/apply.c:824
1170 msgid "Cannot prepare timestamp regexp %s"
1171 msgstr "无法准备时间戳正则表达式 %s"
1173 #: builtin/apply.c:833
1175 msgid "regexec returned %d for input: %s"
1176 msgstr "regexec 返回 %d,输入为:%s"
1178 #: builtin/apply.c:914
1180 msgid "unable to find filename in patch at line %d"
1181 msgstr "不能在补丁的第 %d 行找到文件名"
1183 #: builtin/apply.c:946
1185 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
1186 msgstr "git apply:错误的 git-diff - 期望 /dev/null,但在第 %2$d 行得到 %1$s"
1188 #: builtin/apply.c:950
1190 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
1191 msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
1193 #: builtin/apply.c:951
1195 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
1196 msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
1198 #: builtin/apply.c:958
1200 msgid "git apply: bad git-diff - expected /dev/null on line %d"
1201 msgstr "git apply:错误的 git-diff - 期望 /dev/null 于第 %d 行"
1203 #: builtin/apply.c:1403
1205 msgid "recount: unexpected line: %.*s"
1206 msgstr "recount:意外的行:%.*s"
1208 #: builtin/apply.c:1460
1210 msgid "patch fragment without header at line %d: %.*s"
1211 msgstr "第 %d 行的补丁片段没有头信息:%.*s"
1213 #: builtin/apply.c:1477
1216 "git diff header lacks filename information when removing %d leading pathname "
1217 "component (line %d)"
1219 "git diff header lacks filename information when removing %d leading pathname "
1220 "components (line %d)"
1221 msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
1222 msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
1224 #: builtin/apply.c:1637
1225 msgid "new file depends on old contents"
1228 #: builtin/apply.c:1639
1229 msgid "deleted file still has contents"
1232 #: builtin/apply.c:1665
1234 msgid "corrupt patch at line %d"
1235 msgstr "补丁损坏位于第 %d 行"
1237 #: builtin/apply.c:1701
1239 msgid "new file %s depends on old contents"
1240 msgstr "新文件 %s 依赖旧内容"
1242 #: builtin/apply.c:1703
1244 msgid "deleted file %s still has contents"
1245 msgstr "删除的文件 %s 仍有内容"
1247 #: builtin/apply.c:1706
1249 msgid "** warning: file %s becomes empty but is not deleted"
1250 msgstr "** 警告:文件 %s 成为空文件但并未删除"
1252 #: builtin/apply.c:1852
1254 msgid "corrupt binary patch at line %d: %.*s"
1255 msgstr "二进制补丁在第 %d 行损坏:%.*s"
1257 #. there has to be one hunk (forward hunk)
1258 #: builtin/apply.c:1881
1260 msgid "unrecognized binary patch at line %d"
1261 msgstr "未能识别的二进制补丁位于第 %d 行"
1263 #: builtin/apply.c:1967
1265 msgid "patch with only garbage at line %d"
1266 msgstr "补丁文件的第 %d 行只有垃圾数据"
1268 #: builtin/apply.c:2057
1270 msgid "unable to read symlink %s"
1271 msgstr "无法读取符号链接 %s"
1273 #: builtin/apply.c:2061
1275 msgid "unable to open or read %s"
1278 #: builtin/apply.c:2132
1282 #: builtin/apply.c:2654
1284 msgid "invalid start of line: '%c'"
1285 msgstr "无效的行首字符:'%c'"
1287 #: builtin/apply.c:2772
1289 msgid "Hunk #%d succeeded at %d (offset %d line)."
1290 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1291 msgstr[0] "块 #%d 成功应用于 %d (偏移 %d 行)"
1292 msgstr[1] "块 #%d 成功应用于 %d (偏移 %d 行)"
1294 #: builtin/apply.c:2784
1296 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
1297 msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
1299 #: builtin/apply.c:2790
1302 "while searching for:\n"
1308 #: builtin/apply.c:2809
1310 msgid "missing binary patch data for '%s'"
1311 msgstr "缺失 '%s' 的二进制补丁数据"
1313 #: builtin/apply.c:2912
1315 msgid "binary patch does not apply to '%s'"
1316 msgstr "二进制补丁未应用到 '%s'"
1318 #: builtin/apply.c:2918
1320 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1321 msgstr "到 '%s' 的二进制补丁产生了不正确的结果(预期 %s,得到 %s)"
1323 #: builtin/apply.c:2939
1325 msgid "patch failed: %s:%ld"
1326 msgstr "打补丁失败:%s:%ld"
1328 #: builtin/apply.c:3061
1330 msgid "cannot checkout %s"
1333 #: builtin/apply.c:3106 builtin/apply.c:3115 builtin/apply.c:3159
1335 msgid "read of %s failed"
1338 #: builtin/apply.c:3139 builtin/apply.c:3361
1340 msgid "path %s has been renamed/deleted"
1341 msgstr "路径 %s 已经被重命名/删除"
1343 #: builtin/apply.c:3220 builtin/apply.c:3375
1345 msgid "%s: does not exist in index"
1348 #: builtin/apply.c:3224 builtin/apply.c:3367 builtin/apply.c:3389
1353 #: builtin/apply.c:3229 builtin/apply.c:3383
1355 msgid "%s: does not match index"
1358 #: builtin/apply.c:3331
1359 msgid "removal patch leaves file contents"
1360 msgstr "移除补丁仍留下了文件内容"
1362 #: builtin/apply.c:3400
1364 msgid "%s: wrong type"
1367 #: builtin/apply.c:3402
1369 msgid "%s has type %o, expected %o"
1370 msgstr "%s 的类型是 %o,预期是 %o"
1372 #: builtin/apply.c:3503
1374 msgid "%s: already exists in index"
1375 msgstr "%s:已经存在于索引中"
1377 #: builtin/apply.c:3506
1379 msgid "%s: already exists in working directory"
1380 msgstr "%s:已经存在于工作区中"
1382 #: builtin/apply.c:3526
1384 msgid "new mode (%o) of %s does not match old mode (%o)"
1385 msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
1387 #: builtin/apply.c:3531
1389 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1390 msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
1392 #: builtin/apply.c:3539
1394 msgid "%s: patch does not apply"
1397 #: builtin/apply.c:3552
1399 msgid "Checking patch %s..."
1402 #: builtin/apply.c:3607 builtin/checkout.c:213 builtin/reset.c:158
1404 msgid "make_cache_entry failed for path '%s'"
1405 msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
1407 #: builtin/apply.c:3750
1409 msgid "unable to remove %s from index"
1410 msgstr "不能从索引中移除 %s"
1412 #: builtin/apply.c:3778
1414 msgid "corrupt patch for subproject %s"
1415 msgstr "子项目 %s 损坏的补丁"
1417 #: builtin/apply.c:3782
1419 msgid "unable to stat newly created file '%s'"
1420 msgstr "不能枚举新建文件 '%s' 的状态"
1422 #: builtin/apply.c:3787
1424 msgid "unable to create backing store for newly created file %s"
1425 msgstr "不能为新建文件 %s 创建后端存储"
1427 #: builtin/apply.c:3790 builtin/apply.c:3898
1429 msgid "unable to add cache entry for %s"
1430 msgstr "无法为 %s 添加缓存条目"
1432 #: builtin/apply.c:3823
1434 msgid "closing file '%s'"
1437 #: builtin/apply.c:3872
1439 msgid "unable to write file '%s' mode %o"
1440 msgstr "不能写文件 '%s' 权限 %o"
1442 #: builtin/apply.c:3959
1444 msgid "Applied patch %s cleanly."
1447 #: builtin/apply.c:3967
1448 msgid "internal error"
1451 #. Say this even without --verbose
1452 #: builtin/apply.c:3970
1454 msgid "Applying patch %%s with %d reject..."
1455 msgid_plural "Applying patch %%s with %d rejects..."
1456 msgstr[0] "应用补丁 %%s 时 %d 个被拒绝..."
1457 msgstr[1] "应用补丁 %%s 时 %d 个被拒绝..."
1459 #: builtin/apply.c:3980
1461 msgid "truncating .rej filename to %.*s.rej"
1462 msgstr "截短 .rej 文件名为 %.*s.rej"
1464 #: builtin/apply.c:4001
1466 msgid "Hunk #%d applied cleanly."
1467 msgstr "第 #%d 个片段成功应用。"
1469 #: builtin/apply.c:4004
1471 msgid "Rejected hunk #%d."
1472 msgstr "拒绝第 #%d 个片段。"
1474 #: builtin/apply.c:4154
1475 msgid "unrecognized input"
1478 #: builtin/apply.c:4165
1479 msgid "unable to read index file"
1482 #: builtin/apply.c:4284 builtin/apply.c:4287
1486 #: builtin/apply.c:4285
1487 msgid "don't apply changes matching the given path"
1488 msgstr "不要应用与给出路径向匹配的变更"
1490 #: builtin/apply.c:4288
1491 msgid "apply changes matching the given path"
1492 msgstr "应用与给出路径向匹配的变更"
1494 #: builtin/apply.c:4290
1498 #: builtin/apply.c:4291
1499 msgid "remove <num> leading slashes from traditional diff paths"
1500 msgstr "从传统的 diff 路径中移除 <数字> 个前导路径"
1502 #: builtin/apply.c:4294
1503 msgid "ignore additions made by the patch"
1504 msgstr "忽略补丁中的添加的文件"
1506 #: builtin/apply.c:4296
1507 msgid "instead of applying the patch, output diffstat for the input"
1508 msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
1510 #: builtin/apply.c:4300
1511 msgid "shows number of added and deleted lines in decimal notation"
1512 msgstr "以数字方式显示添加或删除行的数量"
1514 #: builtin/apply.c:4302
1515 msgid "instead of applying the patch, output a summary for the input"
1516 msgstr "不应用补丁,而是显示输入的概要"
1518 #: builtin/apply.c:4304
1519 msgid "instead of applying the patch, see if the patch is applicable"
1520 msgstr "不应用补丁,而是查看补丁是否可应用"
1522 #: builtin/apply.c:4306
1523 msgid "make sure the patch is applicable to the current index"
1524 msgstr "确认补丁可以应用到当前索引"
1526 #: builtin/apply.c:4308
1527 msgid "apply a patch without touching the working tree"
1528 msgstr "应用补丁而不修改工作区"
1530 #: builtin/apply.c:4310
1531 msgid "also apply the patch (use with --stat/--summary/--check)"
1532 msgstr "同时应用此补丁(和 --stat/--summary/--check 共用)"
1534 #: builtin/apply.c:4312
1535 msgid "attempt three-way merge if a patch does not apply"
1536 msgstr "如果一个补丁不能应用则尝试三路合并"
1538 #: builtin/apply.c:4314
1539 msgid "build a temporary index based on embedded index information"
1540 msgstr "创建一个临时索引基于嵌入的索引信息"
1542 #: builtin/apply.c:4316
1543 msgid "paths are separated with NUL character"
1544 msgstr "路径以 NUL 字符分隔"
1546 #: builtin/apply.c:4319
1547 msgid "ensure at least <n> lines of context match"
1548 msgstr "确保至少匹配 <n> 行上下文"
1550 #: builtin/apply.c:4320
1554 #: builtin/apply.c:4321
1555 msgid "detect new or modified lines that have whitespace errors"
1556 msgstr "检查新增和修改的行中间的空白字符滥用"
1558 #: builtin/apply.c:4324 builtin/apply.c:4327
1559 msgid "ignore changes in whitespace when finding context"
1560 msgstr "查找上下文时忽略空白字符的变更"
1562 #: builtin/apply.c:4330
1563 msgid "apply the patch in reverse"
1566 #: builtin/apply.c:4332
1567 msgid "don't expect at least one line of context"
1570 #: builtin/apply.c:4334
1571 msgid "leave the rejected hunks in corresponding *.rej files"
1572 msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
1574 #: builtin/apply.c:4336
1575 msgid "allow overlapping hunks"
1578 #: builtin/apply.c:4337
1582 #: builtin/apply.c:4339
1583 msgid "tolerate incorrectly detected missing new-line at the end of file"
1584 msgstr "宽容不正确的文件末尾换行符"
1586 #: builtin/apply.c:4342
1587 msgid "do not trust the line counts in the hunk headers"
1588 msgstr "不信任补丁片段的头信息中的行号"
1590 #: builtin/apply.c:4344
1594 #: builtin/apply.c:4345
1595 msgid "prepend <root> to all filenames"
1596 msgstr "为所有文件名前添加 <根目录>"
1598 #: builtin/apply.c:4367
1599 msgid "--3way outside a repository"
1600 msgstr "--3way 在一个版本库之外"
1602 #: builtin/apply.c:4375
1603 msgid "--index outside a repository"
1604 msgstr "--index 在一个版本库之外"
1606 #: builtin/apply.c:4378
1607 msgid "--cached outside a repository"
1608 msgstr "--cached 在一个版本库之外"
1610 #: builtin/apply.c:4394
1612 msgid "can't open patch '%s'"
1613 msgstr "不能打开补丁 '%s'"
1615 #: builtin/apply.c:4408
1617 msgid "squelched %d whitespace error"
1618 msgid_plural "squelched %d whitespace errors"
1619 msgstr[0] "抑制下仍有 %d 个空白字符误用"
1620 msgstr[1] "抑制下仍有 %d 个空白字符误用"
1622 #: builtin/apply.c:4414 builtin/apply.c:4424
1624 msgid "%d line adds whitespace errors."
1625 msgid_plural "%d lines add whitespace errors."
1626 msgstr[0] "%d 行有空白字符误用。"
1627 msgstr[1] "%d 行有空白字符误用。"
1629 #: builtin/archive.c:17
1631 msgid "could not create archive file '%s'"
1632 msgstr "不能创建归档文件 '%s'"
1634 #: builtin/archive.c:20
1635 msgid "could not redirect output"
1638 #: builtin/archive.c:37
1639 msgid "git archive: Remote with no URL"
1640 msgstr "git archive:未提供远程URL"
1642 #: builtin/archive.c:58
1643 msgid "git archive: expected ACK/NAK, got EOF"
1644 msgstr "git archive:期待ACK/NACK,却得到EOF"
1646 #: builtin/archive.c:63
1648 msgid "git archive: NACK %s"
1649 msgstr "git archive:NACK %s"
1651 #: builtin/archive.c:65
1653 msgid "remote error: %s"
1656 #: builtin/archive.c:66
1657 msgid "git archive: protocol error"
1658 msgstr "git archive:协议错误"
1660 #: builtin/archive.c:71
1661 msgid "git archive: expected a flush"
1662 msgstr "git archive:预期一个刷新"
1664 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
1665 #: builtin/branch.c:144
1668 "deleting branch '%s' that has been merged to\n"
1669 " '%s', but not yet merged to HEAD."
1671 "将要删除的分支 '%s' 已经被合并到\n"
1674 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
1675 #: builtin/branch.c:148
1678 "not deleting branch '%s' that is not yet merged to\n"
1679 " '%s', even though it is merged to HEAD."
1681 "并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
1682 " 然而却尚未被合并到分支 '%s' 。"
1684 #: builtin/branch.c:180
1685 msgid "cannot use -a with -d"
1686 msgstr "不能将 -a 和 -d 共用"
1688 #: builtin/branch.c:186
1689 msgid "Couldn't look up commit object for HEAD"
1690 msgstr "无法查询 HEAD 指向的提交对象"
1692 #: builtin/branch.c:191
1694 msgid "Cannot delete the branch '%s' which you are currently on."
1695 msgstr "无法删除您当前所在的分支 '%s'。"
1697 #: builtin/branch.c:202
1699 msgid "remote branch '%s' not found."
1700 msgstr "远程分支 '%s' 未发现。"
1702 #: builtin/branch.c:203
1704 msgid "branch '%s' not found."
1705 msgstr "分支 '%s' 未发现。"
1707 #: builtin/branch.c:210
1709 msgid "Couldn't look up commit object for '%s'"
1710 msgstr "无法查询 '%s' 指向的提交对象"
1712 #: builtin/branch.c:216
1715 "The branch '%s' is not fully merged.\n"
1716 "If you are sure you want to delete it, run 'git branch -D %s'."
1719 "如果您确认要删除它,执行 'git branch -D %s'。"
1721 #: builtin/branch.c:225
1723 msgid "Error deleting remote branch '%s'"
1724 msgstr "删除远程分支 '%s' 时出错"
1726 #: builtin/branch.c:226
1728 msgid "Error deleting branch '%s'"
1729 msgstr "删除分支 '%s' 时出错"
1731 #: builtin/branch.c:233
1733 msgid "Deleted remote branch %s (was %s).\n"
1734 msgstr "已删除远程分支 %s(曾为 %s)。\n"
1736 #: builtin/branch.c:234
1738 msgid "Deleted branch %s (was %s).\n"
1739 msgstr "已删除分支 %s(曾为 %s)。\n"
1741 #: builtin/branch.c:239
1742 msgid "Update of config-file failed"
1743 msgstr "无法更新 config 文件"
1745 #: builtin/branch.c:337
1747 msgid "branch '%s' does not point at a commit"
1748 msgstr "分支 '%s' 未指向一个提交"
1750 #: builtin/branch.c:409
1752 msgid "[%s: behind %d]"
1755 #: builtin/branch.c:411
1760 #: builtin/branch.c:415
1762 msgid "[%s: ahead %d]"
1765 #: builtin/branch.c:417
1770 #: builtin/branch.c:420
1772 msgid "[%s: ahead %d, behind %d]"
1773 msgstr "[%s:领先 %d,落后 %d]"
1775 #: builtin/branch.c:423
1777 msgid "[ahead %d, behind %d]"
1778 msgstr "[领先 %d,落后 %d]"
1780 #: builtin/branch.c:535
1784 #: builtin/branch.c:600
1785 msgid "some refs could not be read"
1788 #: builtin/branch.c:613
1789 msgid "cannot rename the current branch while not on any."
1790 msgstr "无法重命名当前分支因为不处于任何分支上。"
1792 #: builtin/branch.c:623
1794 msgid "Invalid branch name: '%s'"
1795 msgstr "无效的分支名:'%s'"
1797 #: builtin/branch.c:638
1798 msgid "Branch rename failed"
1801 #: builtin/branch.c:642
1803 msgid "Renamed a misnamed branch '%s' away"
1804 msgstr "重命名掉一个错误命名的旧分支 '%s'"
1806 #: builtin/branch.c:646
1808 msgid "Branch renamed to %s, but HEAD is not updated!"
1809 msgstr "分支重命名为 %s,但 HEAD 没有更新!"
1811 #: builtin/branch.c:653
1812 msgid "Branch is renamed, but update of config-file failed"
1813 msgstr "分支被重命名,但更新 config 文件失败"
1815 #: builtin/branch.c:668
1817 msgid "malformed object name %s"
1820 #: builtin/branch.c:692
1822 msgid "could not write branch description template: %s"
1823 msgstr "不能写分支描述模版:%s"
1825 #: builtin/branch.c:783
1826 msgid "Failed to resolve HEAD as a valid ref."
1827 msgstr "无法将 HEAD 解析为有效引用。"
1829 #: builtin/branch.c:788 builtin/clone.c:561
1830 msgid "HEAD not found below refs/heads!"
1831 msgstr "HEAD 没有位于 /refs/heads 之下!"
1833 #: builtin/branch.c:808
1834 msgid "--column and --verbose are incompatible"
1835 msgstr "--column 和 --verbose 不兼容"
1837 #: builtin/branch.c:857
1838 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
1839 msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
1841 #: builtin/bundle.c:47
1843 msgid "%s is okay\n"
1846 #: builtin/bundle.c:56
1847 msgid "Need a repository to create a bundle."
1848 msgstr "需要一个版本库来创建包。"
1850 #: builtin/bundle.c:60
1851 msgid "Need a repository to unbundle."
1852 msgstr "需要一个版本库来解包。"
1854 #: builtin/checkout.c:114 builtin/checkout.c:147
1856 msgid "path '%s' does not have our version"
1857 msgstr "路径 '%s' 没有我们的版本"
1859 #: builtin/checkout.c:116 builtin/checkout.c:149
1861 msgid "path '%s' does not have their version"
1862 msgstr "路径 '%s' 没有他们的版本"
1864 #: builtin/checkout.c:132
1866 msgid "path '%s' does not have all necessary versions"
1867 msgstr "路径 '%s' 没有全部必须的版本"
1869 #: builtin/checkout.c:176
1871 msgid "path '%s' does not have necessary versions"
1872 msgstr "路径 '%s' 没有必须的版本"
1874 #: builtin/checkout.c:193
1876 msgid "path '%s': cannot merge"
1877 msgstr "path '%s':无法合并"
1879 #: builtin/checkout.c:210
1881 msgid "Unable to add merge result for '%s'"
1882 msgstr "无法为 '%s' 添加合并结果"
1884 #: builtin/checkout.c:235 builtin/checkout.c:393
1885 msgid "corrupt index file"
1888 #: builtin/checkout.c:265 builtin/checkout.c:272
1890 msgid "path '%s' is unmerged"
1891 msgstr "路径 '%s' 未合并"
1893 #: builtin/checkout.c:303 builtin/checkout.c:499 builtin/clone.c:586
1894 #: builtin/merge.c:812
1895 msgid "unable to write new index file"
1898 #: builtin/checkout.c:320 builtin/diff.c:302 builtin/merge.c:408
1899 msgid "diff_setup_done failed"
1900 msgstr "diff_setup_done 失败"
1902 #: builtin/checkout.c:415
1903 msgid "you need to resolve your current index first"
1904 msgstr "您需要先解决当前索引的冲突"
1906 #: builtin/checkout.c:534
1908 msgid "Can not do reflog for '%s'\n"
1909 msgstr "不能对 '%s' 执行 reflog 操作\n"
1911 #: builtin/checkout.c:567
1912 msgid "HEAD is now at"
1915 #: builtin/checkout.c:574
1917 msgid "Reset branch '%s'\n"
1918 msgstr "重置分支 '%s'\n"
1920 #: builtin/checkout.c:577
1922 msgid "Already on '%s'\n"
1923 msgstr "已经位于 '%s'\n"
1925 #: builtin/checkout.c:581
1927 msgid "Switched to and reset branch '%s'\n"
1928 msgstr "切换并重置分支 '%s'\n"
1930 #: builtin/checkout.c:583
1932 msgid "Switched to a new branch '%s'\n"
1933 msgstr "切换到一个新分支 '%s'\n"
1935 #: builtin/checkout.c:585
1937 msgid "Switched to branch '%s'\n"
1938 msgstr "切换到分支 '%s'\n"
1941 #: builtin/checkout.c:641
1943 msgid " ... and %d more.\n"
1944 msgstr " ... 及其它 %d 个。\n"
1946 #. The singular version
1947 #: builtin/checkout.c:647
1950 "Warning: you are leaving %d commit behind, not connected to\n"
1951 "any of your branches:\n"
1955 "Warning: you are leaving %d commits behind, not connected to\n"
1956 "any of your branches:\n"
1960 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
1964 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
1968 #: builtin/checkout.c:665
1971 "If you want to keep them by creating a new branch, this may be a good time\n"
1974 " git branch new_branch_name %s\n"
1977 "如果您想要通过创建新分支保存他们,这可能是一个好时候。\n"
1980 " git branch new_branch_name %s\n"
1983 #: builtin/checkout.c:695
1984 msgid "internal error in revision walk"
1985 msgstr "在版本遍历时遇到内部错误"
1987 #: builtin/checkout.c:699
1988 msgid "Previous HEAD position was"
1989 msgstr "之前的 HEAD 位置是"
1991 #: builtin/checkout.c:725 builtin/checkout.c:920
1992 msgid "You are on a branch yet to be born"
1993 msgstr "您位于一个尚未初始化的分支"
1996 #: builtin/checkout.c:856
1998 msgid "invalid reference: %s"
2001 #. case (1): want a tree
2002 #: builtin/checkout.c:895
2004 msgid "reference is not a tree: %s"
2007 #: builtin/checkout.c:977
2008 msgid "-B cannot be used with -b"
2009 msgstr "-B 不能和 -b 共用"
2011 #: builtin/checkout.c:986
2012 msgid "--patch is incompatible with all other options"
2013 msgstr "--patch 选项和其他选项不兼容"
2015 #: builtin/checkout.c:989
2016 msgid "--detach cannot be used with -b/-B/--orphan"
2017 msgstr "--detach 不能和 -b/-B/--orphan 共用"
2019 #: builtin/checkout.c:991
2020 msgid "--detach cannot be used with -t"
2021 msgstr "--detach 不能和 -t 共用"
2023 #: builtin/checkout.c:997
2024 msgid "--track needs a branch name"
2025 msgstr "--track 需要一个分支名"
2027 #: builtin/checkout.c:1004
2028 msgid "Missing branch name; try -b"
2029 msgstr "缺少分支名;尝试 -b"
2031 #: builtin/checkout.c:1010
2032 msgid "--orphan and -b|-B are mutually exclusive"
2033 msgstr "--orphan 和 -b|-B 互斥"
2035 #: builtin/checkout.c:1012
2036 msgid "--orphan cannot be used with -t"
2037 msgstr "--orphan 不能和 -t 共用"
2039 #: builtin/checkout.c:1022
2040 msgid "git checkout: -f and -m are incompatible"
2041 msgstr "git checkout:-f 和 -m 不兼容"
2043 #: builtin/checkout.c:1056
2044 msgid "invalid path specification"
2047 #: builtin/checkout.c:1064
2050 "git checkout: updating paths is incompatible with switching branches.\n"
2051 "Did you intend to checkout '%s' which can not be resolved as commit?"
2053 "git checkout:更新路径和切换分支不兼容。\n"
2054 "您是想要检出 '%s' 但未能将其解析为提交么?"
2056 #: builtin/checkout.c:1066
2057 msgid "git checkout: updating paths is incompatible with switching branches."
2058 msgstr "git checkout:更新路径和切换分支不兼容。"
2060 #: builtin/checkout.c:1071
2061 msgid "git checkout: --detach does not take a path argument"
2062 msgstr "git checkout:--detach 不跟路径参数"
2064 #: builtin/checkout.c:1074
2066 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
2067 "checking out of the index."
2069 "git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
2071 #: builtin/checkout.c:1093
2072 msgid "Cannot switch branch to a non-commit."
2073 msgstr "无法切换分支到一个非提交。"
2075 #: builtin/checkout.c:1096
2076 msgid "--ours/--theirs is incompatible with switching branches."
2077 msgstr "--ours/--theirs 和切换分支不兼容。"
2079 #: builtin/clean.c:78
2080 msgid "-x and -X cannot be used together"
2081 msgstr "-x 和 -X 不能共用"
2083 #: builtin/clean.c:82
2085 "clean.requireForce set to true and neither -n nor -f given; refusing to clean"
2087 "clean.requireForce 设置为 true 且未提供 -n 或 -f 选项,拒绝执行清理动作"
2089 #: builtin/clean.c:85
2091 "clean.requireForce defaults to true and neither -n nor -f given; refusing to "
2094 "clean.requireForce 默认为 true 且未提供 -n 或 -f 选项,拒绝执行清理动作"
2096 #: builtin/clean.c:155 builtin/clean.c:176
2098 msgid "Would remove %s\n"
2101 #: builtin/clean.c:159 builtin/clean.c:179
2103 msgid "Removing %s\n"
2106 #: builtin/clean.c:162 builtin/clean.c:182
2108 msgid "failed to remove %s"
2111 #: builtin/clean.c:166
2113 msgid "Would not remove %s\n"
2116 #: builtin/clean.c:168
2118 msgid "Not removing %s\n"
2121 #: builtin/clone.c:243
2123 msgid "reference repository '%s' is not a local directory."
2124 msgstr "引用版本库 '%s' 不是一个本地目录。"
2126 #: builtin/clone.c:302
2128 msgid "failed to open '%s'"
2131 #: builtin/clone.c:306
2133 msgid "failed to create directory '%s'"
2134 msgstr "无法创建目录 '%s'"
2136 #: builtin/clone.c:308 builtin/diff.c:75
2138 msgid "failed to stat '%s'"
2139 msgstr "无法枚举 '%s' 状态"
2141 #: builtin/clone.c:310
2143 msgid "%s exists and is not a directory"
2144 msgstr "%s 存在且不是一个目录"
2146 #: builtin/clone.c:324
2148 msgid "failed to stat %s\n"
2149 msgstr "无法枚举 %s 状态\n"
2151 #: builtin/clone.c:341
2153 msgid "failed to unlink '%s'"
2156 #: builtin/clone.c:346
2158 msgid "failed to create link '%s'"
2159 msgstr "无法创建链接 '%s'"
2161 #: builtin/clone.c:350
2163 msgid "failed to copy file to '%s'"
2164 msgstr "无法拷贝文件至 '%s'"
2166 #: builtin/clone.c:373
2171 #: builtin/clone.c:443
2173 msgid "Could not find remote branch %s to clone."
2174 msgstr "不能发现要克隆的远程分支 %s。"
2176 #: builtin/clone.c:552
2177 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
2178 msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
2180 #: builtin/clone.c:642
2181 msgid "Too many arguments."
2184 #: builtin/clone.c:646
2185 msgid "You must specify a repository to clone."
2186 msgstr "您必须指定一个版本库来克隆。"
2188 #: builtin/clone.c:657
2190 msgid "--bare and --origin %s options are incompatible."
2191 msgstr "--bare 和 --origin %s 选项不兼容。"
2193 #: builtin/clone.c:671
2195 msgid "repository '%s' does not exist"
2196 msgstr "版本库 '%s' 不存在"
2198 #: builtin/clone.c:676
2199 msgid "--depth is ignored in local clones; use file:// instead."
2200 msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
2202 #: builtin/clone.c:686
2204 msgid "destination path '%s' already exists and is not an empty directory."
2205 msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
2207 #: builtin/clone.c:696
2209 msgid "working tree '%s' already exists."
2210 msgstr "工作区 '%s' 已经存在。"
2212 #: builtin/clone.c:709 builtin/clone.c:723
2214 msgid "could not create leading directories of '%s'"
2215 msgstr "不能为 '%s' 创建先导目录"
2217 #: builtin/clone.c:712
2219 msgid "could not create work tree dir '%s'."
2220 msgstr "不能为 '%s' 创建工作区目录。"
2222 #: builtin/clone.c:731
2224 msgid "Cloning into bare repository '%s'...\n"
2225 msgstr "克隆到裸版本库 '%s'...\n"
2227 #: builtin/clone.c:733
2229 msgid "Cloning into '%s'...\n"
2230 msgstr "正克隆到 '%s'...\n"
2232 #: builtin/clone.c:789
2234 msgid "Don't know how to clone %s"
2237 #: builtin/clone.c:838
2239 msgid "Remote branch %s not found in upstream %s"
2240 msgstr "远程分支 %s 在上游 %s 未发现"
2242 #: builtin/clone.c:845
2243 msgid "You appear to have cloned an empty repository."
2244 msgstr "您似乎克隆了一个空版本库。"
2246 #: builtin/column.c:51
2247 msgid "--command must be the first argument"
2248 msgstr "--command 必须是第一个参数"
2250 #: builtin/commit.c:43
2252 "Your name and email address were configured automatically based\n"
2253 "on your username and hostname. Please check that they are accurate.\n"
2254 "You can suppress this message by setting them explicitly:\n"
2256 " git config --global user.name \"Your Name\"\n"
2257 " git config --global user.email you@example.com\n"
2259 "After doing this, you may fix the identity used for this commit with:\n"
2261 " git commit --amend --reset-author\n"
2263 "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
2264 "与否。您可以通过下面的命令对其进行明确地设置以免再出现本提示信息:\n"
2266 " git config --global user.name \"Your Name\"\n"
2267 " git config --global user.email you@example.com\n"
2269 "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
2271 " git commit --amend --reset-author\n"
2273 #: builtin/commit.c:55
2275 "You asked to amend the most recent commit, but doing so would make\n"
2276 "it empty. You can repeat your command with --allow-empty, or you can\n"
2277 "remove the commit entirely with \"git reset HEAD^\".\n"
2279 "您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
2280 "--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
2282 #: builtin/commit.c:60
2284 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
2285 "If you wish to commit it anyway, use:\n"
2287 " git commit --allow-empty\n"
2289 "Otherwise, please use 'git reset'\n"
2291 "之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
2294 " git commit --allow-empty\n"
2296 "否则,请使用命令 'git reset'\n"
2298 #: builtin/commit.c:256
2299 msgid "failed to unpack HEAD tree object"
2300 msgstr "无法解包 HEAD 树对象"
2302 #: builtin/commit.c:298
2303 msgid "unable to create temporary index"
2306 #: builtin/commit.c:304
2307 msgid "interactive add failed"
2310 #: builtin/commit.c:337 builtin/commit.c:358 builtin/commit.c:408
2311 msgid "unable to write new_index file"
2312 msgstr "无法写 new_index 文件"
2314 #: builtin/commit.c:389
2315 msgid "cannot do a partial commit during a merge."
2316 msgstr "在合并过程中不能做部分提交。"
2318 #: builtin/commit.c:391
2319 msgid "cannot do a partial commit during a cherry-pick."
2320 msgstr "在拣选过程中不能做部分提交。"
2322 #: builtin/commit.c:401
2323 msgid "cannot read the index"
2326 #: builtin/commit.c:421
2327 msgid "unable to write temporary index file"
2330 #: builtin/commit.c:496 builtin/commit.c:502
2332 msgid "invalid commit: %s"
2335 #: builtin/commit.c:525
2336 msgid "malformed --author parameter"
2337 msgstr "非法的 --author 参数"
2339 #: builtin/commit.c:585
2341 msgid "Malformed ident string: '%s'"
2342 msgstr "非法的身份字符串:'%s'"
2344 #: builtin/commit.c:623 builtin/commit.c:656 builtin/commit.c:970
2346 msgid "could not lookup commit %s"
2349 #: builtin/commit.c:635 builtin/shortlog.c:296
2351 msgid "(reading log message from standard input)\n"
2352 msgstr "(正从标准输入中读取日志信息)\n"
2354 #: builtin/commit.c:637
2355 msgid "could not read log from standard input"
2356 msgstr "不能从标准输入中读取日志信息"
2358 #: builtin/commit.c:641
2360 msgid "could not read log file '%s'"
2361 msgstr "不能读取日志文件 '%s'"
2363 #: builtin/commit.c:647
2364 msgid "commit has empty message"
2367 #: builtin/commit.c:663
2368 msgid "could not read MERGE_MSG"
2369 msgstr "不能读取 MERGE_MSG"
2371 #: builtin/commit.c:667
2372 msgid "could not read SQUASH_MSG"
2373 msgstr "不能读取 SQUASH_MSG"
2375 #: builtin/commit.c:671
2377 msgid "could not read '%s'"
2380 #: builtin/commit.c:723
2381 msgid "could not write commit template"
2384 #: builtin/commit.c:734
2388 "It looks like you may be committing a merge.\n"
2389 "If this is not correct, please remove the file\n"
2394 "看起来您正在做一个合并提交。如果不对,请删除文件\n"
2398 #: builtin/commit.c:739
2402 "It looks like you may be committing a cherry-pick.\n"
2403 "If this is not correct, please remove the file\n"
2408 "看起来您正在做一个拣选提交。如果不对,请删除文件\n"
2412 #: builtin/commit.c:751
2414 "Please enter the commit message for your changes. Lines starting\n"
2415 "with '#' will be ignored, and an empty message aborts the commit.\n"
2417 "请为您的变更输入提交说明。以 '#' 开始的行将被忽略,而一个空的提交\n"
2420 #: builtin/commit.c:756
2422 "Please enter the commit message for your changes. Lines starting\n"
2423 "with '#' will be kept; you may remove them yourself if you want to.\n"
2424 "An empty message aborts the commit.\n"
2426 "请为您的变更输入提交说明。以 '#' 开始的行将被保留,您可以删除它们\n"
2427 "如果您想这样做的话。而一个空的提交说明将会终止提交。\n"
2429 # 译者:为保证在输出中对齐,注意调整句中空格!
2430 #: builtin/commit.c:769
2432 msgid "%sAuthor: %s"
2435 # 译者:为保证在输出中对齐,注意调整句中空格!
2436 #: builtin/commit.c:776
2438 msgid "%sCommitter: %s"
2441 #: builtin/commit.c:796
2442 msgid "Cannot read index"
2445 #: builtin/commit.c:833
2446 msgid "Error building trees"
2449 #: builtin/commit.c:848 builtin/tag.c:361
2451 msgid "Please supply the message using either -m or -F option.\n"
2452 msgstr "请使用 -m 或者 -F 选项提供提交说明。\n"
2454 #: builtin/commit.c:945
2456 msgid "No existing author found with '%s'"
2457 msgstr "没有找到匹配 '%s' 的作者"
2459 #: builtin/commit.c:960 builtin/commit.c:1160
2461 msgid "Invalid untracked files mode '%s'"
2462 msgstr "无效的未追踪文件参数 '%s'"
2464 #: builtin/commit.c:1000
2465 msgid "Using both --reset-author and --author does not make sense"
2466 msgstr "同时使用 --reset-author 和 --author 没有意义"
2468 #: builtin/commit.c:1011
2469 msgid "You have nothing to amend."
2472 #: builtin/commit.c:1014
2473 msgid "You are in the middle of a merge -- cannot amend."
2474 msgstr "您正处于一个合并过程中 -- 无法修补提交。"
2476 #: builtin/commit.c:1016
2477 msgid "You are in the middle of a cherry-pick -- cannot amend."
2478 msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
2480 #: builtin/commit.c:1019
2481 msgid "Options --squash and --fixup cannot be used together"
2482 msgstr "选项 --squash 和 --fixup 不能共用"
2484 #: builtin/commit.c:1029
2485 msgid "Only one of -c/-C/-F/--fixup can be used."
2486 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
2488 #: builtin/commit.c:1031
2489 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
2490 msgstr "选项 -m 不能和 -c/-C/-F/--fixup 共用。"
2492 #: builtin/commit.c:1039
2493 msgid "--reset-author can be used only with -C, -c or --amend."
2494 msgstr "--reset-author 只能和 -C、-c 或 --amend 共用。"
2496 #: builtin/commit.c:1056
2497 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
2498 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
2500 #: builtin/commit.c:1058
2501 msgid "No paths with --include/--only does not make sense."
2502 msgstr "参数 --include/--only 不跟路径没有意义。"
2504 #: builtin/commit.c:1060
2505 msgid "Clever... amending the last one with dirty index."
2506 msgstr "聪明... 在索引不干净下修补最后的提交。"
2508 #: builtin/commit.c:1062
2509 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
2510 msgstr "指定了明确的路径而没有使用 -i 或 -o 选项;认为是 --only paths..."
2512 #: builtin/commit.c:1072 builtin/tag.c:577
2514 msgid "Invalid cleanup mode %s"
2517 #: builtin/commit.c:1077
2518 msgid "Paths with -a does not make sense."
2519 msgstr "路径和 -a 选项共用没有意义。"
2521 #: builtin/commit.c:1260
2522 msgid "couldn't look up newly created commit"
2525 #: builtin/commit.c:1262
2526 msgid "could not parse newly created commit"
2529 #: builtin/commit.c:1303
2530 msgid "detached HEAD"
2533 # 译者:中文字符串拼接,可删除前导空格
2534 #: builtin/commit.c:1305
2535 msgid " (root-commit)"
2538 #: builtin/commit.c:1449
2539 msgid "could not parse HEAD commit"
2540 msgstr "不能解析 HEAD 提交"
2542 #: builtin/commit.c:1487 builtin/merge.c:509
2544 msgid "could not open '%s' for reading"
2545 msgstr "不能为读入打开 '%s'"
2547 #: builtin/commit.c:1494
2549 msgid "Corrupt MERGE_HEAD file (%s)"
2550 msgstr "损坏的 MERGE_HEAD 文件(%s)"
2552 #: builtin/commit.c:1501
2553 msgid "could not read MERGE_MODE"
2554 msgstr "不能读取 MERGE_MODE"
2556 #: builtin/commit.c:1520
2558 msgid "could not read commit message: %s"
2559 msgstr "不能读取提交说明:%s"
2561 #: builtin/commit.c:1534
2563 msgid "Aborting commit; you did not edit the message.\n"
2564 msgstr "终止提交;您未更改来自模版的提交说明。\n"
2566 #: builtin/commit.c:1539
2568 msgid "Aborting commit due to empty commit message.\n"
2569 msgstr "终止提交因为提交说明为空。\n"
2571 #: builtin/commit.c:1554 builtin/merge.c:936 builtin/merge.c:961
2572 msgid "failed to write commit object"
2575 #: builtin/commit.c:1575
2576 msgid "cannot lock HEAD ref"
2577 msgstr "无法锁定 HEAD 引用"
2579 #: builtin/commit.c:1579
2580 msgid "cannot update HEAD ref"
2581 msgstr "无法更新 HEAD 引用"
2583 #: builtin/commit.c:1590
2585 "Repository has been updated, but unable to write\n"
2586 "new_index file. Check that disk is not full or quota is\n"
2587 "not exceeded, and then \"git reset HEAD\" to recover."
2589 "版本库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
2590 "或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
2592 #: builtin/describe.c:234
2594 msgid "annotated tag %s not available"
2595 msgstr "注释 tag %s 无效"
2597 #: builtin/describe.c:238
2599 msgid "annotated tag %s has no embedded name"
2600 msgstr "注释 tag %s 没有嵌入名称"
2602 #: builtin/describe.c:240
2604 msgid "tag '%s' is really '%s' here"
2605 msgstr "tag '%s' 的确是在 '%s'"
2607 #: builtin/describe.c:267
2609 msgid "Not a valid object name %s"
2610 msgstr "不是一个有效的对象名 %s"
2612 #: builtin/describe.c:270
2614 msgid "%s is not a valid '%s' object"
2615 msgstr "%s 不是一个有效的 '%s' 对象"
2617 #: builtin/describe.c:287
2619 msgid "no tag exactly matches '%s'"
2620 msgstr "没有 tag 准确匹配 '%s'"
2622 #: builtin/describe.c:289
2624 msgid "searching to describe %s\n"
2627 #: builtin/describe.c:329
2629 msgid "finished search at %s\n"
2632 #: builtin/describe.c:353
2635 "No annotated tags can describe '%s'.\n"
2636 "However, there were unannotated tags: try --tags."
2638 "没有注释 tag 能描述 '%s'。\n"
2639 "然而,有非注释 tag:尝试 --tags。"
2641 #: builtin/describe.c:357
2644 "No tags can describe '%s'.\n"
2645 "Try --always, or create some tags."
2647 "没有注释 tag 能描述 '%s'。\n"
2648 "尝试 --always,或者创建一些 tag。"
2650 #: builtin/describe.c:378
2652 msgid "traversed %lu commits\n"
2653 msgstr "已遍历 %lu 个提交\n"
2655 #: builtin/describe.c:381
2658 "more than %i tags found; listed %i most recent\n"
2659 "gave up search at %s\n"
2661 "发现多于 %i 个 tag,列出最近的 %i 个\n"
2664 #: builtin/describe.c:436
2665 msgid "--long is incompatible with --abbrev=0"
2666 msgstr "--long 与 --abbrev=0 不兼容"
2668 #: builtin/describe.c:462
2669 msgid "No names found, cannot describe anything."
2670 msgstr "没有发现名称,无法描述任何东西。"
2672 #: builtin/describe.c:482
2673 msgid "--dirty is incompatible with committishes"
2674 msgstr "--dirty 不能与提交共用"
2676 #: builtin/diff.c:77
2678 msgid "'%s': not a regular file or symlink"
2679 msgstr "'%s':不是一个正规文件或符号链接"
2681 #: builtin/diff.c:220
2683 msgid "invalid option: %s"
2686 #: builtin/diff.c:297
2687 msgid "Not a git repository"
2688 msgstr "不是一个 git 版本库"
2690 #: builtin/diff.c:341
2692 msgid "invalid object '%s' given."
2693 msgstr "提供了无效对象 '%s'。"
2695 #: builtin/diff.c:346
2697 msgid "more than %d trees given: '%s'"
2698 msgstr "提供了超过 %d 个树对象:'%s'"
2700 #: builtin/diff.c:356
2702 msgid "more than two blobs given: '%s'"
2703 msgstr "提供了超过两个 blob 对象:'%s'"
2705 #: builtin/diff.c:364
2707 msgid "unhandled object '%s' given."
2708 msgstr "提供了无法处理的对象 '%s'。"
2710 #: builtin/fetch.c:200
2711 msgid "Couldn't find remote ref HEAD"
2712 msgstr "无法发现远程 HEAD 引用"
2714 #: builtin/fetch.c:253
2716 msgid "object %s not found"
2719 #: builtin/fetch.c:259
2720 msgid "[up to date]"
2723 #: builtin/fetch.c:273
2725 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
2726 msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)"
2728 #: builtin/fetch.c:274 builtin/fetch.c:360
2732 #: builtin/fetch.c:285
2733 msgid "[tag update]"
2737 #: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340
2738 msgid " (unable to update local ref)"
2739 msgstr " (不能更新本地引用)"
2741 #: builtin/fetch.c:305
2745 #: builtin/fetch.c:308
2746 msgid "[new branch]"
2749 #: builtin/fetch.c:311
2753 #: builtin/fetch.c:356
2754 msgid "unable to update local ref"
2757 #: builtin/fetch.c:356
2758 msgid "forced update"
2761 #: builtin/fetch.c:362
2762 msgid "(non-fast-forward)"
2765 #: builtin/fetch.c:393 builtin/fetch.c:685
2767 msgid "cannot open %s: %s\n"
2768 msgstr "无法打开 %s:%s\n"
2770 #: builtin/fetch.c:402
2772 msgid "%s did not send all necessary objects\n"
2773 msgstr "%s 未发送所有必须的对象\n"
2775 #: builtin/fetch.c:488
2780 #: builtin/fetch.c:499
2783 "some local refs could not be updated; try running\n"
2784 " 'git remote prune %s' to remove any old, conflicting branches"
2786 "一些本地引用不能被更新;尝试运行\n"
2787 " 'git remote prune %s' 来删除旧的、有冲突的分支"
2790 #: builtin/fetch.c:549
2792 msgid " (%s will become dangling)"
2793 msgstr " (%s 将成为悬空状态)"
2796 #: builtin/fetch.c:550
2798 msgid " (%s has become dangling)"
2799 msgstr " (%s 已成为悬空状态)"
2801 #: builtin/fetch.c:557
2805 #: builtin/fetch.c:558 builtin/remote.c:1055
2809 #: builtin/fetch.c:675
2811 msgid "Refusing to fetch into current branch %s of non-bare repository"
2812 msgstr "拒绝获取到非裸版本库的当前分支 %s"
2814 #: builtin/fetch.c:709
2816 msgid "Don't know how to fetch from %s"
2817 msgstr "不知道如何从 %s 获取"
2819 #: builtin/fetch.c:786
2821 msgid "Option \"%s\" value \"%s\" is not valid for %s"
2822 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
2824 #: builtin/fetch.c:789
2826 msgid "Option \"%s\" is ignored for %s\n"
2827 msgstr "选项 \"%s\" 为 %s 所忽略\n"
2829 #: builtin/fetch.c:888
2831 msgid "Fetching %s\n"
2834 #: builtin/fetch.c:890 builtin/remote.c:100
2836 msgid "Could not fetch %s"
2839 #: builtin/fetch.c:907
2841 "No remote repository specified. Please, specify either a URL or a\n"
2842 "remote name from which new revisions should be fetched."
2843 msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定,用以获取新提交。"
2845 #: builtin/fetch.c:927
2846 msgid "You need to specify a tag name."
2847 msgstr "您需要指定一个 tag 名称。"
2849 #: builtin/fetch.c:979
2850 msgid "fetch --all does not take a repository argument"
2851 msgstr "fetch --all 不能带一个版本库参数"
2853 #: builtin/fetch.c:981
2854 msgid "fetch --all does not make sense with refspecs"
2855 msgstr "fetch --all 带引用表达式没有任何意义"
2857 #: builtin/fetch.c:992
2859 msgid "No such remote or remote group: %s"
2860 msgstr "没有这样的远程或远程组:%s"
2862 #: builtin/fetch.c:1000
2863 msgid "Fetching a group and specifying refspecs does not make sense"
2864 msgstr "获取组并指定引用表达式没有意义"
2868 msgid "Invalid %s: '%s'"
2869 msgstr "无效的 %s:'%s'"
2873 msgid "insanely long object directory %.*s"
2874 msgstr "不正常的长对象目录 %.*s"
2878 msgid "Auto packing the repository for optimum performance.\n"
2879 msgstr "自动打包版本库以求最佳性能。\n"
2884 "Auto packing the repository for optimum performance. You may also\n"
2885 "run \"git gc\" manually. See \"git help gc\" for more information.\n"
2887 "自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n"
2888 "参见 \"git help gc\" 以获取更多信息。\n"
2892 "There are too many unreachable loose objects; run 'git prune' to remove them."
2893 msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
2895 #: builtin/grep.c:216
2897 msgid "grep: failed to create thread: %s"
2898 msgstr "grep:无法创建线程:%s"
2900 #: builtin/grep.c:402
2902 msgid "Failed to chdir: %s"
2905 #: builtin/grep.c:478 builtin/grep.c:512
2907 msgid "unable to read tree (%s)"
2910 #: builtin/grep.c:526
2912 msgid "unable to grep from object of type %s"
2913 msgstr "无法抓取来自于 %s 类型的对象"
2915 #: builtin/grep.c:584
2917 msgid "switch `%c' expects a numerical value"
2918 msgstr "开关 `%c' 期望一个数字值"
2920 #: builtin/grep.c:601
2922 msgid "cannot open '%s'"
2925 #: builtin/grep.c:885
2926 msgid "no pattern given."
2929 #: builtin/grep.c:899
2931 msgid "bad object %s"
2934 #: builtin/grep.c:940
2935 msgid "--open-files-in-pager only works on the worktree"
2936 msgstr "--open-files-in-pager 仅用于工作区"
2938 #: builtin/grep.c:963
2939 msgid "--cached or --untracked cannot be used with --no-index."
2940 msgstr "--cached 或 --untracked 不能与 --no-index 共用。"
2942 #: builtin/grep.c:968
2943 msgid "--no-index or --untracked cannot be used with revs."
2944 msgstr "--no-index 或 --untracked 不能和版本共用。"
2946 #: builtin/grep.c:971
2947 msgid "--[no-]exclude-standard cannot be used for tracked contents."
2948 msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
2950 #: builtin/grep.c:979
2951 msgid "both --cached and trees are given."
2952 msgstr "同时给出了 --cached 和树对象。"
2954 #: builtin/help.c:65
2956 msgid "unrecognized help format '%s'"
2957 msgstr "未能识别的帮助格式 '%s'"
2959 #: builtin/help.c:93
2960 msgid "Failed to start emacsclient."
2961 msgstr "无法启动 emacsclient。"
2963 #: builtin/help.c:106
2964 msgid "Failed to parse emacsclient version."
2965 msgstr "无法解析 emacsclient 版本。"
2967 #: builtin/help.c:114
2969 msgid "emacsclient version '%d' too old (< 22)."
2970 msgstr "emacsclient 版本 '%d' 太老 (< 22)。"
2972 #: builtin/help.c:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177
2974 msgid "failed to exec '%s': %s"
2975 msgstr "无法执行 '%s':%s"
2977 #: builtin/help.c:217
2980 "'%s': path for unsupported man viewer.\n"
2981 "Please consider using 'man.<tool>.cmd' instead."
2983 "'%s':不支持的 man 手册查看器的路径。\n"
2984 "请使用 'man.<tool>.cmd'。"
2986 #: builtin/help.c:229
2989 "'%s': cmd for supported man viewer.\n"
2990 "Please consider using 'man.<tool>.path' instead."
2992 "'%s': 支持的 man 手册查看器命令。\n"
2993 "请使用 'man.<tool>.path'。"
2995 #: builtin/help.c:299
2996 msgid "The most commonly used git commands are:"
2997 msgstr "最常用的 git 命令有:"
2999 #: builtin/help.c:367
3001 msgid "'%s': unknown man viewer."
3002 msgstr "'%s':未知的 man 查看器。"
3004 #: builtin/help.c:384
3005 msgid "no man viewer handled the request"
3006 msgstr "没有 man 查看器处理此请求"
3008 #: builtin/help.c:392
3009 msgid "no info viewer handled the request"
3010 msgstr "没有 info 查看器处理此请求"
3012 #: builtin/help.c:447 builtin/help.c:454
3017 #: builtin/help.c:470
3019 msgid "`git %s' is aliased to `%s'"
3020 msgstr "`git %s' 是 `%s' 的别名"
3022 #: builtin/index-pack.c:170
3024 msgid "object type mismatch at %s"
3025 msgstr "%s 的对象类型不匹配"
3027 #: builtin/index-pack.c:190
3028 msgid "object of unexpected type"
3031 #: builtin/index-pack.c:227
3033 msgid "cannot fill %d byte"
3034 msgid_plural "cannot fill %d bytes"
3035 msgstr[0] "无法填充 %d 字节"
3036 msgstr[1] "无法填充 %d 字节"
3038 #: builtin/index-pack.c:237
3040 msgstr "过早的文件结束符(EOF)"
3042 #: builtin/index-pack.c:238
3043 msgid "read error on input"
3046 #: builtin/index-pack.c:250
3047 msgid "used more bytes than were available"
3050 #: builtin/index-pack.c:257
3051 msgid "pack too large for current definition of off_t"
3052 msgstr "包太大超过了当前 off_t 的定义"
3054 #: builtin/index-pack.c:273
3056 msgid "unable to create '%s'"
3059 #: builtin/index-pack.c:278
3061 msgid "cannot open packfile '%s'"
3062 msgstr "无法打开包文件 '%s'"
3064 #: builtin/index-pack.c:292
3065 msgid "pack signature mismatch"
3068 #: builtin/index-pack.c:312
3070 msgid "pack has bad object at offset %lu: %s"
3071 msgstr "包中有错误的对象位于 %lu:%s"
3073 #: builtin/index-pack.c:434
3075 msgid "inflate returned %d"
3078 #: builtin/index-pack.c:483
3079 msgid "offset value overflow for delta base object"
3080 msgstr "偏移值覆盖了 delta 基准对象"
3082 #: builtin/index-pack.c:491
3083 msgid "delta base offset is out of bound"
3084 msgstr "delta 基准偏移越界"
3086 #: builtin/index-pack.c:499
3088 msgid "unknown object type %d"
3091 #: builtin/index-pack.c:530
3092 msgid "cannot pread pack file"
3095 #: builtin/index-pack.c:532
3097 msgid "premature end of pack file, %lu byte missing"
3098 msgid_plural "premature end of pack file, %lu bytes missing"
3099 msgstr[0] "包文件过早结束,缺少 %lu 字节"
3100 msgstr[1] "包文件过早结束,缺少 %lu 字节"
3102 #: builtin/index-pack.c:558
3103 msgid "serious inflate inconsistency"
3106 #: builtin/index-pack.c:649 builtin/index-pack.c:655 builtin/index-pack.c:678
3107 #: builtin/index-pack.c:712 builtin/index-pack.c:721
3109 msgid "SHA1 COLLISION FOUND WITH %s !"
3110 msgstr "发现 %s 出现 SHA1 冲突!"
3112 #: builtin/index-pack.c:652 builtin/pack-objects.c:170
3113 #: builtin/pack-objects.c:262
3115 msgid "unable to read %s"
3118 #: builtin/index-pack.c:718
3120 msgid "cannot read existing object %s"
3121 msgstr "不能读取现存对象 %s"
3123 #: builtin/index-pack.c:732
3125 msgid "invalid blob object %s"
3126 msgstr "无效的 blob 对象 %s"
3128 #: builtin/index-pack.c:747
3133 #: builtin/index-pack.c:749
3134 msgid "Error in object"
3137 #: builtin/index-pack.c:751
3139 msgid "Not all child objects of %s are reachable"
3140 msgstr "%s 的所有子对象并非都可达"
3142 #: builtin/index-pack.c:821 builtin/index-pack.c:847
3143 msgid "failed to apply delta"
3146 #: builtin/index-pack.c:986
3147 msgid "Receiving objects"
3150 #: builtin/index-pack.c:986
3151 msgid "Indexing objects"
3154 #: builtin/index-pack.c:1012
3155 msgid "pack is corrupted (SHA1 mismatch)"
3156 msgstr "包冲突(SHA1 不匹配)"
3158 #: builtin/index-pack.c:1017
3159 msgid "cannot fstat packfile"
3162 #: builtin/index-pack.c:1020
3163 msgid "pack has junk at the end"
3166 #: builtin/index-pack.c:1031
3167 msgid "confusion beyond insanity in parse_pack_objects()"
3168 msgstr "parse_pack_objects() 中遇到不可理喻的问题"
3170 #: builtin/index-pack.c:1054
3171 msgid "Resolving deltas"
3174 #: builtin/index-pack.c:1105
3175 msgid "confusion beyond insanity"
3178 #: builtin/index-pack.c:1124
3180 msgid "pack has %d unresolved delta"
3181 msgid_plural "pack has %d unresolved deltas"
3182 msgstr[0] "包有 %d 个未解决的 delta"
3183 msgstr[1] "包有 %d 个未解决的 delta"
3185 #: builtin/index-pack.c:1149
3187 msgid "unable to deflate appended object (%d)"
3188 msgstr "不能缩小附加对象(%d)"
3190 #: builtin/index-pack.c:1228
3192 msgid "local object %s is corrupt"
3193 msgstr "本地对象 %s 已损坏"
3195 #: builtin/index-pack.c:1252
3196 msgid "error while closing pack file"
3199 #: builtin/index-pack.c:1265
3201 msgid "cannot write keep file '%s'"
3202 msgstr "无法写保留文件 '%s'"
3204 #: builtin/index-pack.c:1273
3206 msgid "cannot close written keep file '%s'"
3207 msgstr "无法关闭保留文件 '%s'"
3209 #: builtin/index-pack.c:1286
3210 msgid "cannot store pack file"
3213 #: builtin/index-pack.c:1297
3214 msgid "cannot store index file"
3217 #: builtin/index-pack.c:1398
3219 msgid "Cannot open existing pack file '%s'"
3220 msgstr "无法打开现存包文件 '%s'"
3222 #: builtin/index-pack.c:1400
3224 msgid "Cannot open existing pack idx file for '%s'"
3225 msgstr "无法为 %s 打开包索引文件"
3227 #: builtin/index-pack.c:1447
3229 msgid "non delta: %d object"
3230 msgid_plural "non delta: %d objects"
3231 msgstr[0] "非 delta:%d 个对象"
3232 msgstr[1] "非 delta:%d 个对象"
3234 #: builtin/index-pack.c:1454
3236 msgid "chain length = %d: %lu object"
3237 msgid_plural "chain length = %d: %lu objects"
3238 msgstr[0] "链长 = %d: %lu 对象"
3239 msgstr[1] "链长 = %d: %lu 对象"
3241 #: builtin/index-pack.c:1481
3242 msgid "Cannot come back to cwd"
3245 #: builtin/index-pack.c:1525 builtin/index-pack.c:1528
3246 #: builtin/index-pack.c:1540 builtin/index-pack.c:1544
3251 #: builtin/index-pack.c:1558
3252 msgid "--fix-thin cannot be used without --stdin"
3253 msgstr "--fix-thin 不能和 --stdin 共用"
3255 #: builtin/index-pack.c:1562 builtin/index-pack.c:1572
3257 msgid "packfile name '%s' does not end with '.pack'"
3258 msgstr "包名 '%s' 没有以 '.pack' 结尾"
3260 #: builtin/index-pack.c:1581
3261 msgid "--verify with no packfile name given"
3262 msgstr "--verify 没有提供包名参数"
3264 #: builtin/init-db.c:35
3266 msgid "Could not make %s writable by group"
3267 msgstr "不能设置 %s 为组可写"
3269 #: builtin/init-db.c:62
3271 msgid "insanely long template name %s"
3274 #: builtin/init-db.c:67
3276 msgid "cannot stat '%s'"
3277 msgstr "不能枚举 '%s' 状态"
3279 #: builtin/init-db.c:73
3281 msgid "cannot stat template '%s'"
3282 msgstr "不能枚举模版 '%s' 状态"
3284 #: builtin/init-db.c:80
3286 msgid "cannot opendir '%s'"
3287 msgstr "不能打开目录 '%s'"
3289 #: builtin/init-db.c:97
3291 msgid "cannot readlink '%s'"
3292 msgstr "不能读取链接 '%s'"
3294 #: builtin/init-db.c:99
3296 msgid "insanely long symlink %s"
3299 #: builtin/init-db.c:102
3301 msgid "cannot symlink '%s' '%s'"
3302 msgstr "不能自 '%s' 到 '%s' 创建符号链接"
3304 #: builtin/init-db.c:106
3306 msgid "cannot copy '%s' to '%s'"
3307 msgstr "不能拷贝 '%s' 至 '%s'"
3309 #: builtin/init-db.c:110
3311 msgid "ignoring template %s"
3314 #: builtin/init-db.c:133
3316 msgid "insanely long template path %s"
3319 #: builtin/init-db.c:141
3321 msgid "templates not found %s"
3324 #: builtin/init-db.c:154
3326 msgid "not copying templates of a wrong format version %d from '%s'"
3327 msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
3329 #: builtin/init-db.c:192
3331 msgid "insane git directory %s"
3332 msgstr "不正常的 git 目录 %s"
3334 #: builtin/init-db.c:323 builtin/init-db.c:326
3336 msgid "%s already exists"
3339 #: builtin/init-db.c:355
3341 msgid "unable to handle file type %d"
3342 msgstr "不能处理 %d 类型的文件"
3344 #: builtin/init-db.c:358
3346 msgid "unable to move %s to %s"
3347 msgstr "不能移动 %s 至 %s"
3349 #: builtin/init-db.c:363
3351 msgid "Could not create git link %s"
3352 msgstr "不能创建 git link %s"
3355 #. * TRANSLATORS: The first '%s' is either "Reinitialized
3356 #. * existing" or "Initialized empty", the second " shared" or
3357 #. * "", and the last '%s%s' is the verbatim directory name.
3359 #: builtin/init-db.c:420
3361 msgid "%s%s Git repository in %s%s\n"
3362 msgstr "%s%s Git 版本库于 %s%s\n"
3364 #: builtin/init-db.c:421
3365 msgid "Reinitialized existing"
3368 #: builtin/init-db.c:421
3369 msgid "Initialized empty"
3372 # 译者:中文字符串拼接,可删除前导空格
3373 #: builtin/init-db.c:422
3377 #: builtin/init-db.c:441
3378 msgid "cannot tell cwd"
3381 #: builtin/init-db.c:522 builtin/init-db.c:529
3383 msgid "cannot mkdir %s"
3386 #: builtin/init-db.c:533
3388 msgid "cannot chdir to %s"
3391 #: builtin/init-db.c:555
3394 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
3397 "不允许 %s(或 --work-tree=<directory>)而没有指定 %s(或 --git-"
3400 #: builtin/init-db.c:579
3401 msgid "Cannot access current working directory"
3404 #: builtin/init-db.c:586
3406 msgid "Cannot access work tree '%s'"
3407 msgstr "不能访问工作区 '%s'"
3409 #: builtin/log.c:189
3411 msgid "Final output: %d %s\n"
3412 msgstr "最终输出:%d %s\n"
3414 #: builtin/log.c:403 builtin/log.c:494
3416 msgid "Could not read object %s"
3419 #: builtin/log.c:518
3421 msgid "Unknown type: %d"
3424 #: builtin/log.c:608
3425 msgid "format.headers without value"
3426 msgstr "format.headers 没有值"
3428 #: builtin/log.c:682
3429 msgid "name of output directory is too long"
3432 #: builtin/log.c:693
3434 msgid "Cannot open patch file %s"
3435 msgstr "无法打开补丁文件 %s"
3437 #: builtin/log.c:707
3438 msgid "Need exactly one range."
3441 #: builtin/log.c:715
3442 msgid "Not a range."
3445 #: builtin/log.c:792
3446 msgid "Cover letter needs email format"
3449 #: builtin/log.c:865
3451 msgid "insane in-reply-to: %s"
3452 msgstr "不正常的 in-reply-to:%s"
3454 #: builtin/log.c:938
3455 msgid "Two output directories?"
3458 #: builtin/log.c:1160
3460 msgid "bogus committer info %s"
3461 msgstr "虚假的提交者信息 %s"
3463 #: builtin/log.c:1205
3464 msgid "-n and -k are mutually exclusive."
3465 msgstr "-n 和 -k 互斥。"
3467 #: builtin/log.c:1207
3468 msgid "--subject-prefix and -k are mutually exclusive."
3469 msgstr "--subject-prefix 和 -k 互斥。"
3471 #: builtin/log.c:1215
3472 msgid "--name-only does not make sense"
3473 msgstr "--name-only 无意义"
3475 #: builtin/log.c:1217
3476 msgid "--name-status does not make sense"
3477 msgstr "--name-status 无意义"
3479 #: builtin/log.c:1219
3480 msgid "--check does not make sense"
3481 msgstr "--check 无意义"
3483 #: builtin/log.c:1242
3484 msgid "standard output, or directory, which one?"
3485 msgstr "标准输出或目录,哪一个?"
3487 #: builtin/log.c:1244
3489 msgid "Could not create directory '%s'"
3490 msgstr "不能创建目录 '%s'"
3492 #: builtin/log.c:1397
3493 msgid "Failed to create output files"
3496 #: builtin/log.c:1501
3499 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
3500 msgstr "不能找到跟踪的远程分支,请手工指定 <upstream>。\n"
3502 #: builtin/log.c:1517 builtin/log.c:1519 builtin/log.c:1531
3504 msgid "Unknown commit %s"
3507 #: builtin/merge.c:90
3508 msgid "switch `m' requires a value"
3509 msgstr "开关 `m' 需要一个值"
3511 #: builtin/merge.c:127
3513 msgid "Could not find merge strategy '%s'.\n"
3514 msgstr "不能找到合并策略 '%s'。\n"
3516 #: builtin/merge.c:128
3518 msgid "Available strategies are:"
3521 #: builtin/merge.c:133
3523 msgid "Available custom strategies are:"
3526 #: builtin/merge.c:240
3527 msgid "could not run stash."
3530 #: builtin/merge.c:245
3531 msgid "stash failed"
3534 #: builtin/merge.c:250
3536 msgid "not a valid object: %s"
3537 msgstr "不是一个有效对象:%s"
3539 #: builtin/merge.c:269 builtin/merge.c:286
3540 msgid "read-tree failed"
3544 #: builtin/merge.c:316
3545 msgid " (nothing to squash)"
3548 #: builtin/merge.c:329
3550 msgid "Squash commit -- not updating HEAD\n"
3551 msgstr "压缩提交 -- 未更新 HEAD\n"
3553 #: builtin/merge.c:361
3554 msgid "Writing SQUASH_MSG"
3555 msgstr "写入 SQUASH_MSG"
3557 #: builtin/merge.c:363
3558 msgid "Finishing SQUASH_MSG"
3559 msgstr "完成 SQUASH_MSG"
3561 #: builtin/merge.c:386
3563 msgid "No merge message -- not updating HEAD\n"
3564 msgstr "无合并信息 -- 未更新 HEAD\n"
3566 #: builtin/merge.c:437
3568 msgid "'%s' does not point to a commit"
3569 msgstr "'%s' 没有指向一个提交"
3571 #: builtin/merge.c:536
3573 msgid "Bad branch.%s.mergeoptions string: %s"
3574 msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
3576 #: builtin/merge.c:629
3577 msgid "git write-tree failed to write a tree"
3578 msgstr "git write-tree 无法写入一树对象"
3580 #: builtin/merge.c:679
3581 msgid "failed to read the cache"
3584 #: builtin/merge.c:697
3585 msgid "Unable to write index."
3588 #: builtin/merge.c:710
3589 msgid "Not handling anything other than two heads merge."
3590 msgstr "不能处理两个头合并之外的任何操作。"
3592 #: builtin/merge.c:724
3594 msgid "Unknown option for merge-recursive: -X%s"
3595 msgstr "merge-recursive 的未知选项:-X%s"
3597 #: builtin/merge.c:738
3599 msgid "unable to write %s"
3602 #: builtin/merge.c:877
3604 msgid "Could not read from '%s'"
3605 msgstr "不能从 '%s' 读取"
3607 #: builtin/merge.c:886
3609 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
3610 msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
3612 #: builtin/merge.c:892
3614 "Please enter a commit message to explain why this merge is necessary,\n"
3615 "especially if it merges an updated upstream into a topic branch.\n"
3617 "Lines starting with '#' will be ignored, and an empty message aborts\n"
3620 "请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
3623 "以 '#' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
3625 #: builtin/merge.c:916
3626 msgid "Empty commit message."
3629 #: builtin/merge.c:928
3631 msgid "Wonderful.\n"
3634 #: builtin/merge.c:993
3636 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
3637 msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
3639 #: builtin/merge.c:1009
3641 msgid "'%s' is not a commit"
3642 msgstr "'%s' 不是一个提交"
3644 #: builtin/merge.c:1050
3645 msgid "No current branch."
3648 #: builtin/merge.c:1052
3649 msgid "No remote for the current branch."
3650 msgstr "当前分支没有对应的远程版本库。"
3652 #: builtin/merge.c:1054
3653 msgid "No default upstream defined for the current branch."
3654 msgstr "当前分支没有定义默认的上游分支。"
3656 #: builtin/merge.c:1059
3658 msgid "No remote tracking branch for %s from %s"
3659 msgstr "%s 没有来自 %s 的远程跟踪分支"
3661 #: builtin/merge.c:1146 builtin/merge.c:1303
3663 msgid "%s - not something we can merge"
3666 #: builtin/merge.c:1214
3667 msgid "There is no merge to abort (MERGE_HEAD missing)."
3668 msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
3670 #: builtin/merge.c:1230 git-pull.sh:31
3672 "You have not concluded your merge (MERGE_HEAD exists).\n"
3673 "Please, commit your changes before you can merge."
3675 "您尚未结束您的合并(存在 MERGE_HEAD)。\n"
3678 #: builtin/merge.c:1233 git-pull.sh:34
3679 msgid "You have not concluded your merge (MERGE_HEAD exists)."
3680 msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
3682 #: builtin/merge.c:1237
3684 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
3685 "Please, commit your changes before you can merge."
3687 "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
3690 #: builtin/merge.c:1240
3691 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
3692 msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
3694 #: builtin/merge.c:1249
3695 msgid "You cannot combine --squash with --no-ff."
3696 msgstr "您不能将 --squash 与 --no-ff 共用。"
3698 #: builtin/merge.c:1254
3699 msgid "You cannot combine --no-ff with --ff-only."
3700 msgstr "您不能将 --no-ff 与 --ff-only 共用。"
3702 #: builtin/merge.c:1261
3703 msgid "No commit specified and merge.defaultToUpstream not set."
3704 msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
3706 #: builtin/merge.c:1293
3707 msgid "Can merge only exactly one commit into empty head"
3708 msgstr "只能将一个提交合并到空分支上"
3710 #: builtin/merge.c:1296
3711 msgid "Squash commit into empty head not supported yet"
3712 msgstr "尚不支持到空分支的压缩提交"
3714 #: builtin/merge.c:1298
3715 msgid "Non-fast-forward commit does not make sense into an empty head"
3716 msgstr "到空分支的非快进式提交没有意义"
3718 #: builtin/merge.c:1413
3720 msgid "Updating %s..%s\n"
3721 msgstr "更新 %s..%s\n"
3723 #: builtin/merge.c:1451
3725 msgid "Trying really trivial in-index merge...\n"
3726 msgstr "尝试非常小的索引内合并...\n"
3728 #: builtin/merge.c:1458
3733 #: builtin/merge.c:1490
3734 msgid "Not possible to fast-forward, aborting."
3737 #: builtin/merge.c:1513 builtin/merge.c:1592
3739 msgid "Rewinding the tree to pristine...\n"
3740 msgstr "将树回滚至原始状态...\n"
3742 #: builtin/merge.c:1517
3744 msgid "Trying merge strategy %s...\n"
3745 msgstr "尝试合并策略 %s...\n"
3747 #: builtin/merge.c:1583
3749 msgid "No merge strategy handled the merge.\n"
3750 msgstr "没有合并策略处理此合并。\n"
3752 #: builtin/merge.c:1585
3754 msgid "Merge with strategy %s failed.\n"
3755 msgstr "使用策略 %s 合并失败。\n"
3757 #: builtin/merge.c:1594
3759 msgid "Using the %s to prepare resolving by hand.\n"
3760 msgstr "使用 %s 以准备手工解决。\n"
3762 #: builtin/merge.c:1606
3764 msgid "Automatic merge went well; stopped before committing as requested\n"
3765 msgstr "自动合并进展顺利,按要求在提交前停止\n"
3769 msgid "Checking rename of '%s' to '%s'\n"
3770 msgstr "检查 '%s' 到 '%s' 的重命名\n"
3777 msgid "can not move directory into itself"
3781 msgid "cannot move directory over file"
3786 msgid "Huh? %.*s is in index?"
3787 msgstr "嗯?%.*s 在索引中?"
3790 msgid "source directory is empty"
3794 msgid "not under version control"
3798 msgid "destination exists"
3803 msgid "overwriting '%s'"
3807 msgid "Cannot overwrite"
3811 msgid "multiple sources for the same target"
3816 msgid "%s, source=%s, destination=%s"
3817 msgstr "%s,源=%s,目标=%s"
3821 msgid "Renaming %s to %s\n"
3822 msgstr "重命名 %s 至 %s\n"
3824 #: builtin/mv.c:215 builtin/remote.c:731
3826 msgid "renaming '%s' failed"
3827 msgstr "重命名 '%s' 失败"
3829 #: builtin/notes.c:139
3831 msgid "unable to start 'show' for object '%s'"
3832 msgstr "不能为对象 '%s' 开始 'show'"
3834 #: builtin/notes.c:145
3835 msgid "can't fdopen 'show' output fd"
3836 msgstr "不能打开 'show' 输出文件句柄"
3838 #: builtin/notes.c:155
3840 msgid "failed to close pipe to 'show' for object '%s'"
3841 msgstr "无法为对象 '%s' 的 'show' 关闭管道"
3843 #: builtin/notes.c:158
3845 msgid "failed to finish 'show' for object '%s'"
3846 msgstr "无法为对象 '%s' 完成 'show'"
3848 #: builtin/notes.c:175 builtin/tag.c:347
3850 msgid "could not create file '%s'"
3851 msgstr "不能创建文件 '%s'"
3853 #: builtin/notes.c:189
3854 msgid "Please supply the note contents using either -m or -F option"
3855 msgstr "请通过 -m 或 -F 选项为注解提供内容"
3857 #: builtin/notes.c:210 builtin/notes.c:973
3859 msgid "Removing note for object %s\n"
3860 msgstr "删除对象 %s 的注解\n"
3862 #: builtin/notes.c:215
3863 msgid "unable to write note object"
3866 #: builtin/notes.c:217
3868 msgid "The note contents has been left in %s"
3869 msgstr "注解内容被留在文件 %s 中"
3871 #: builtin/notes.c:251 builtin/tag.c:542
3873 msgid "cannot read '%s'"
3876 #: builtin/notes.c:253 builtin/tag.c:545
3878 msgid "could not open or read '%s'"
3879 msgstr "不能打开或读取 '%s'"
3881 #: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447
3882 #: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644
3883 #: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766
3884 #: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:558
3886 msgid "Failed to resolve '%s' as a valid ref."
3887 msgstr "无法解析 '%s' 为一个有效引用。"
3889 #: builtin/notes.c:275
3891 msgid "Failed to read object '%s'."
3892 msgstr "无法读取对象 '%s'。"
3894 #: builtin/notes.c:299
3895 msgid "Cannot commit uninitialized/unreferenced notes tree"
3896 msgstr "不能提交未初始化/未引用的注解树"
3898 #: builtin/notes.c:340
3900 msgid "Bad notes.rewriteMode value: '%s'"
3901 msgstr "坏的 notes.rewriteMode 值:'%s'"
3903 #: builtin/notes.c:350
3905 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
3906 msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
3908 #. TRANSLATORS: The first %s is the name of the
3909 #. environment variable, the second %s is its value
3910 #: builtin/notes.c:377
3912 msgid "Bad %s value: '%s'"
3913 msgstr "坏的 %s 值:'%s'"
3915 #: builtin/notes.c:441
3917 msgid "Malformed input line: '%s'."
3918 msgstr "非法的输入行:'%s'。"
3920 #: builtin/notes.c:456
3922 msgid "Failed to copy notes from '%s' to '%s'"
3923 msgstr "无法从 '%s' 到 '%s' 拷贝注解"
3925 #: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627
3926 #: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759
3927 #: builtin/notes.c:1033
3928 msgid "too many parameters"
3931 #: builtin/notes.c:513 builtin/notes.c:772
3933 msgid "No note found for object %s."
3934 msgstr "未发现对象 %s 的注解。"
3936 #: builtin/notes.c:580
3939 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
3941 msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
3943 #: builtin/notes.c:585 builtin/notes.c:662
3945 msgid "Overwriting existing notes for object %s\n"
3946 msgstr "覆盖对象 %s 现存注解\n"
3948 #: builtin/notes.c:635
3949 msgid "too few parameters"
3952 #: builtin/notes.c:656
3955 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
3957 msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
3959 #: builtin/notes.c:668
3961 msgid "Missing notes on source object %s. Cannot copy."
3962 msgstr "源对象 %s 缺少注解。不能拷贝。"
3964 #: builtin/notes.c:717
3967 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
3968 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
3970 "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
3971 "请换用 'git notes add -f -m/-F/-c/-C'。\n"
3973 #: builtin/notes.c:971
3975 msgid "Object %s has no note\n"
3976 msgstr "对象 %s 没有注解\n"
3978 #: builtin/notes.c:1103 builtin/remote.c:1598
3980 msgid "Unknown subcommand: %s"
3983 #: builtin/pack-objects.c:183 builtin/pack-objects.c:186
3985 msgid "deflate error (%d)"
3988 #: builtin/pack-objects.c:2398
3990 msgid "unsupported index version %s"
3991 msgstr "不支持的索引版本 %s"
3993 #: builtin/pack-objects.c:2402
3995 msgid "bad index version '%s'"
3996 msgstr "坏的索引版本 '%s'"
3998 #: builtin/pack-objects.c:2425
4000 msgid "option %s does not accept negative form"
4001 msgstr "选项 %s 不接受否定格式"
4003 #: builtin/pack-objects.c:2429
4005 msgid "unable to parse value '%s' for option %s"
4006 msgstr "不能解析选项 %1$s 的值 '%2$s'"
4008 #: builtin/push.c:45
4009 msgid "tag shorthand without <tag>"
4010 msgstr "tag 简写没有跟 <tag> 参数"
4012 #: builtin/push.c:64
4013 msgid "--delete only accepts plain target ref names"
4014 msgstr "--delete 只接受简单的目标引用名"
4016 #: builtin/push.c:99
4019 "To choose either option permanently, see push.default in 'git help config'."
4022 "为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
4024 #: builtin/push.c:102
4027 "The upstream branch of your current branch does not match\n"
4028 "the name of your current branch. To push to the upstream branch\n"
4029 "on the remote, use\n"
4031 " git push %s HEAD:%s\n"
4033 "To push to the branch of the same name on the remote, use\n"
4038 "如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
4041 " git push %s HEAD:%s\n"
4048 #: builtin/push.c:121
4051 "You are not currently on a branch.\n"
4052 "To push the history leading to the current (detached HEAD)\n"
4055 " git push %s HEAD:<name-of-remote-branch>\n"
4058 "现在为推送当前(分离头指针)的历史,使用\n"
4060 " git push %s HEAD:<name-of-remote-branch>\n"
4062 #: builtin/push.c:128
4065 "The current branch %s has no upstream branch.\n"
4066 "To push the current branch and set the remote as upstream, use\n"
4068 " git push --set-upstream %s %s\n"
4070 "当前分支 %s 没有对应的上游分支。\n"
4071 "为推送当前分支并建立与远程上游的跟踪,使用\n"
4073 " git push --set-upstream %s %s\n"
4075 #: builtin/push.c:136
4077 msgid "The current branch %s has multiple upstream branches, refusing to push."
4078 msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
4080 #: builtin/push.c:139
4083 "You are pushing to remote '%s', which is not the upstream of\n"
4084 "your current branch '%s', without telling me what to push\n"
4085 "to update which remote branch."
4087 "您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
4088 "而没有告诉我要推送什么、更新哪个远程分支。"
4090 #: builtin/push.c:174
4092 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
4093 msgstr "您没有为推送指定任何引用表达式,并且 push.default 为 \"nothing\"。"
4095 #: builtin/push.c:181
4097 "Updates were rejected because the tip of your current branch is behind\n"
4098 "its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
4099 "before pushing again.\n"
4100 "See the 'Note about fast-forwards' in 'git push --help' for details."
4102 "更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
4103 "再次推送前,先与远程变更合并(如 'git pull')。详见\n"
4104 "'git push --help' 中的 'Note about fast-forwards' 小节。"
4106 #: builtin/push.c:187
4108 "Updates were rejected because a pushed branch tip is behind its remote\n"
4109 "counterpart. If you did not intend to push that branch, you may want to\n"
4110 "specify branches to push or set the 'push.default' configuration\n"
4111 "variable to 'current' or 'upstream' to push only the current branch."
4113 "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
4114 "如果您并非有意推送该分支,您可以在推送时指定要推送的分支,或者将\n"
4115 "配置变量 'push.default' 设置为 'current' 或 'upstream' 以便只推送当前分支。"
4117 #: builtin/push.c:193
4119 "Updates were rejected because a pushed branch tip is behind its remote\n"
4120 "counterpart. Check out this branch and merge the remote changes\n"
4121 "(e.g. 'git pull') before pushing again.\n"
4122 "See the 'Note about fast-forwards' in 'git push --help' for details."
4124 "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
4125 "检出该分支并与远程变更合并(如 'git pull'),然后再推送。详见\n"
4126 "'git push --help' 中的 'Note about fast-forwards' 小节。"
4128 #: builtin/push.c:233
4130 msgid "Pushing to %s\n"
4133 #: builtin/push.c:237
4135 msgid "failed to push some refs to '%s'"
4136 msgstr "无法推送一些引用到 '%s'"
4138 #: builtin/push.c:269
4140 msgid "bad repository '%s'"
4143 #: builtin/push.c:270
4145 "No configured push destination.\n"
4146 "Either specify the URL from the command-line or configure a remote "
4147 "repository using\n"
4149 " git remote add <name> <url>\n"
4151 "and then push using the remote name\n"
4153 " git push <name>\n"
4156 "或者通过命令行指定URL,或者用下面命令配置一个远程版本库\n"
4158 " git remote add <name> <url>\n"
4162 " git push <name>\n"
4164 #: builtin/push.c:285
4165 msgid "--all and --tags are incompatible"
4166 msgstr "--all 和 --tags 不兼容"
4168 #: builtin/push.c:286
4169 msgid "--all can't be combined with refspecs"
4170 msgstr "--all 不能和引用表达式共用"
4172 #: builtin/push.c:291
4173 msgid "--mirror and --tags are incompatible"
4174 msgstr "--mirror 和 --tags 不兼容"
4176 #: builtin/push.c:292
4177 msgid "--mirror can't be combined with refspecs"
4178 msgstr "--mirror 不能和引用表达式共用"
4180 #: builtin/push.c:297
4181 msgid "--all and --mirror are incompatible"
4182 msgstr "--all 和 --mirror 不兼容"
4184 #: builtin/push.c:385
4185 msgid "--delete is incompatible with --all, --mirror and --tags"
4186 msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
4188 #: builtin/push.c:387
4189 msgid "--delete doesn't make sense without any refs"
4190 msgstr "--delete 未接任何引用没有意义"
4192 #: builtin/remote.c:98
4197 #: builtin/remote.c:130
4199 "--mirror is dangerous and deprecated; please\n"
4200 "\t use --mirror=fetch or --mirror=push instead"
4202 "--mirror 选项危险且过时,请使用 --mirror=fetch\n"
4203 "\t 或 --mirror=push"
4205 #: builtin/remote.c:147
4207 msgid "unknown mirror argument: %s"
4210 #: builtin/remote.c:185
4211 msgid "specifying a master branch makes no sense with --mirror"
4212 msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
4214 #: builtin/remote.c:187
4215 msgid "specifying branches to track makes sense only with fetch mirrors"
4216 msgstr "指定要跟踪的分支只在与获取镜像共用才有意义"
4218 #: builtin/remote.c:195 builtin/remote.c:646
4220 msgid "remote %s already exists."
4221 msgstr "远程 %s 已经存在。"
4223 #: builtin/remote.c:199 builtin/remote.c:650
4225 msgid "'%s' is not a valid remote name"
4226 msgstr "'%s' 不是一个有效的远程名称"
4228 #: builtin/remote.c:243
4230 msgid "Could not setup master '%s'"
4231 msgstr "无法设置 master '%s'"
4233 #: builtin/remote.c:299
4235 msgid "more than one %s"
4238 #: builtin/remote.c:339
4240 msgid "Could not get fetch map for refspec %s"
4241 msgstr "无法得到引用表达式 %s 的获取列表"
4243 #: builtin/remote.c:440 builtin/remote.c:448
4247 #: builtin/remote.c:452
4251 #: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607
4253 msgid "Could not append '%s' to '%s'"
4254 msgstr "不能添加 '%s' 至 '%s'"
4256 #: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890
4258 msgid "No such remote: %s"
4261 #: builtin/remote.c:656
4263 msgid "Could not rename config section '%s' to '%s'"
4264 msgstr "不能重命名配置小节 '%s' 到 '%s'"
4266 #: builtin/remote.c:662 builtin/remote.c:799
4268 msgid "Could not remove config section '%s'"
4269 msgstr "不能移除配置小节 '%s'"
4271 #: builtin/remote.c:677
4274 "Not updating non-default fetch refspec\n"
4276 "\tPlease update the configuration manually if necessary."
4282 #: builtin/remote.c:683
4284 msgid "Could not append '%s'"
4287 #: builtin/remote.c:694
4289 msgid "Could not set '%s'"
4292 #: builtin/remote.c:716
4294 msgid "deleting '%s' failed"
4297 #: builtin/remote.c:750
4299 msgid "creating '%s' failed"
4302 #: builtin/remote.c:764
4304 msgid "Could not remove branch %s"
4307 #: builtin/remote.c:834
4309 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
4310 "to delete it, use:"
4312 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
4313 "to delete them, use:"
4314 msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
4315 msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
4317 #: builtin/remote.c:943
4319 msgid " new (next fetch will store in remotes/%s)"
4320 msgstr " 新的(下一次获取将存储于 remotes/%s)"
4322 #: builtin/remote.c:946
4326 #: builtin/remote.c:948
4327 msgid " stale (use 'git remote prune' to remove)"
4328 msgstr " 过时(使用 'git remote prune' 来移除)"
4330 #: builtin/remote.c:950
4334 #: builtin/remote.c:991
4336 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
4337 msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
4339 #: builtin/remote.c:998
4341 msgid "rebases onto remote %s"
4344 #: builtin/remote.c:1001
4346 msgid " merges with remote %s"
4349 #: builtin/remote.c:1002
4350 msgid " and with remote"
4353 #: builtin/remote.c:1004
4355 msgid "merges with remote %s"
4358 #: builtin/remote.c:1005
4359 msgid " and with remote"
4362 #: builtin/remote.c:1051
4366 #: builtin/remote.c:1054
4370 #: builtin/remote.c:1058
4374 #: builtin/remote.c:1061
4375 msgid "fast-forwardable"
4378 #: builtin/remote.c:1064
4379 msgid "local out of date"
4382 #: builtin/remote.c:1071
4384 msgid " %-*s forces to %-*s (%s)"
4385 msgstr " %-*s 强制推送至 %-*s (%s)"
4387 #: builtin/remote.c:1074
4389 msgid " %-*s pushes to %-*s (%s)"
4390 msgstr " %-*s 推送至 %-*s (%s)"
4392 #: builtin/remote.c:1078
4394 msgid " %-*s forces to %s"
4395 msgstr " %-*s 强制推送至 %s"
4397 #: builtin/remote.c:1081
4399 msgid " %-*s pushes to %s"
4400 msgstr " %-*s 推送至 %s"
4402 #: builtin/remote.c:1118
4407 #: builtin/remote.c:1119
4409 msgid " Fetch URL: %s"
4412 #: builtin/remote.c:1120 builtin/remote.c:1285
4416 #: builtin/remote.c:1129 builtin/remote.c:1131
4418 msgid " Push URL: %s"
4421 #: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137
4423 msgid " HEAD branch: %s"
4426 #: builtin/remote.c:1139
4429 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
4430 msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
4432 #: builtin/remote.c:1151
4434 msgid " Remote branch:%s"
4435 msgid_plural " Remote branches:%s"
4436 msgstr[0] " 远程分支:%s"
4437 msgstr[1] " 远程分支:%s"
4439 # 译者:中文字符串拼接,可删除前导空格
4440 #: builtin/remote.c:1154 builtin/remote.c:1181
4441 msgid " (status not queried)"
4444 #: builtin/remote.c:1163
4445 msgid " Local branch configured for 'git pull':"
4446 msgid_plural " Local branches configured for 'git pull':"
4447 msgstr[0] " 为 'git pull' 配置的本地分支:"
4448 msgstr[1] " 为 'git pull' 配置的本地分支:"
4450 #: builtin/remote.c:1171
4451 msgid " Local refs will be mirrored by 'git push'"
4452 msgstr " 本地引用将在 'git push' 时被镜像"
4454 #: builtin/remote.c:1178
4456 msgid " Local ref configured for 'git push'%s:"
4457 msgid_plural " Local refs configured for 'git push'%s:"
4458 msgstr[0] " 为 'git push' 配置的本地引用%s:"
4459 msgstr[1] " 为 'git push' 配置的本地引用%s:"
4461 #: builtin/remote.c:1216
4462 msgid "Cannot determine remote HEAD"
4463 msgstr "无法确定远程 HEAD"
4465 #: builtin/remote.c:1218
4466 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
4467 msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
4469 #: builtin/remote.c:1228
4471 msgid "Could not delete %s"
4474 #: builtin/remote.c:1236
4476 msgid "Not a valid ref: %s"
4477 msgstr "不是一个有效引用:%s"
4479 #: builtin/remote.c:1238
4481 msgid "Could not setup %s"
4485 #: builtin/remote.c:1274
4487 msgid " %s will become dangling!"
4488 msgstr " %s 将成为悬空状态!"
4491 #: builtin/remote.c:1275
4493 msgid " %s has become dangling!"
4494 msgstr " %s 已成为悬空状态!"
4496 #: builtin/remote.c:1281
4501 #: builtin/remote.c:1282
4506 #: builtin/remote.c:1295
4508 msgid " * [would prune] %s"
4509 msgstr " * [将删除] %s"
4511 #: builtin/remote.c:1298
4513 msgid " * [pruned] %s"
4514 msgstr " * [已删除] %s"
4516 #: builtin/remote.c:1387 builtin/remote.c:1461
4518 msgid "No such remote '%s'"
4521 #: builtin/remote.c:1414
4522 msgid "no remote specified"
4525 #: builtin/remote.c:1447
4526 msgid "--add --delete doesn't make sense"
4527 msgstr "--add --delete 无意义"
4529 #: builtin/remote.c:1487
4531 msgid "Invalid old URL pattern: %s"
4532 msgstr "无效的旧URL匹配模版:%s"
4534 #: builtin/remote.c:1495
4536 msgid "No such URL found: %s"
4539 #: builtin/remote.c:1497
4540 msgid "Will not delete all non-push URLs"
4541 msgstr "将不会删除所有非推送URL地址"
4543 #: builtin/reset.c:33
4547 #: builtin/reset.c:33
4551 #: builtin/reset.c:33
4555 #: builtin/reset.c:33
4559 #: builtin/reset.c:33
4563 #: builtin/reset.c:77
4564 msgid "You do not have a valid HEAD."
4565 msgstr "您没有一个有效的 HEAD。"
4567 #: builtin/reset.c:79
4568 msgid "Failed to find tree of HEAD."
4569 msgstr "无法找到 HEAD 指向的树。"
4571 #: builtin/reset.c:85
4573 msgid "Failed to find tree of %s."
4574 msgstr "无法找到 %s 指向的树。"
4576 #: builtin/reset.c:96
4577 msgid "Could not write new index file."
4578 msgstr "不能写入新的索引文件。"
4580 #: builtin/reset.c:106
4582 msgid "HEAD is now at %s"
4583 msgstr "HEAD 现在位于 %s"
4585 #: builtin/reset.c:130
4586 msgid "Could not read index"
4589 #: builtin/reset.c:133
4590 msgid "Unstaged changes after reset:"
4591 msgstr "重置后撤出暂存区的变更:"
4593 # 译者:汉字之间无空格,故删除%s前后空格
4594 #: builtin/reset.c:223
4596 msgid "Cannot do a %s reset in the middle of a merge."
4597 msgstr "在合并过程中不能做%s重置操作。"
4599 #: builtin/reset.c:303
4601 msgid "Could not parse object '%s'."
4602 msgstr "不能解析对象 '%s'。"
4604 #: builtin/reset.c:308
4605 msgid "--patch is incompatible with --{hard,mixed,soft}"
4606 msgstr "--patch 与 --{hard,mixed,soft} 不兼容"
4608 #: builtin/reset.c:317
4609 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
4610 msgstr "--mixed 带路径已弃用,而是用 'git reset -- <paths>'。"
4612 # 译者:汉字之间无空格,故删除%s前后空格
4613 #: builtin/reset.c:319
4615 msgid "Cannot do %s reset with paths."
4616 msgstr "不能带路径进行%s重置。"
4618 # 译者:汉字之间无空格,故删除%s前后空格
4619 #: builtin/reset.c:331
4621 msgid "%s reset is not allowed in a bare repository"
4622 msgstr "不能对裸版本库进行%s重置"
4624 #: builtin/reset.c:347
4626 msgid "Could not reset index file to revision '%s'."
4627 msgstr "不能重置索引文件至版本 '%s'。"
4629 #: builtin/revert.c:70 builtin/revert.c:92
4631 msgid "%s: %s cannot be used with %s"
4632 msgstr "%s:%s 不能和 %s 共用"
4634 #: builtin/revert.c:131
4635 msgid "program error"
4638 #: builtin/revert.c:221
4639 msgid "revert failed"
4642 #: builtin/revert.c:236
4643 msgid "cherry-pick failed"
4649 "'%s' has staged content different from both the file and the HEAD\n"
4650 "(use -f to force removal)"
4652 "'%s' 暂存的内容和工作区及 HEAD 中的都不一样\n"
4658 "'%s' has changes staged in the index\n"
4659 "(use --cached to keep the file, or -f to force removal)"
4662 "(使用 --cached 保存文件,或用 -f 强制删除)"
4667 "'%s' has local modifications\n"
4668 "(use --cached to keep the file, or -f to force removal)"
4671 "(使用 --cached 保存文件,或用 -f 强制删除)"
4675 msgid "not removing '%s' recursively without -r"
4676 msgstr "未提供 -r 选项不会递归删除 '%s'"
4680 msgid "git rm: unable to remove %s"
4681 msgstr "git rm:不能删除 %s"
4683 #: builtin/shortlog.c:157
4685 msgid "Missing author: %s"
4690 msgid "malformed object at '%s'"
4691 msgstr "非法的对象于 '%s'"
4693 #: builtin/tag.c:207
4695 msgid "tag name too long: %.*s..."
4696 msgstr "tag 名字太长:%.*s..."
4698 #: builtin/tag.c:212
4700 msgid "tag '%s' not found."
4701 msgstr "tag '%s' 未发现。"
4703 #: builtin/tag.c:227
4705 msgid "Deleted tag '%s' (was %s)\n"
4706 msgstr "已删除 tag '%s'(曾为 %s)\n"
4708 #: builtin/tag.c:239
4710 msgid "could not verify the tag '%s'"
4711 msgstr "不能校验 tag '%s'"
4713 #: builtin/tag.c:249
4717 "# Write a tag message\n"
4718 "# Lines starting with '#' will be ignored.\n"
4724 "# 以 '#' 开头的行将被忽略。\n"
4727 #: builtin/tag.c:256
4731 "# Write a tag message\n"
4732 "# Lines starting with '#' will be kept; you may remove them yourself if you "
4739 "# 以 '#' 开头的行将被忽略,您可以删除它们如果您想这样做。\n"
4742 #: builtin/tag.c:298
4743 msgid "unable to sign the tag"
4746 #: builtin/tag.c:300
4747 msgid "unable to write tag file"
4750 #: builtin/tag.c:325
4751 msgid "bad object type."
4754 #: builtin/tag.c:338
4755 msgid "tag header too big."
4758 #: builtin/tag.c:370
4759 msgid "no tag message?"
4762 #: builtin/tag.c:376
4764 msgid "The tag message has been left in %s\n"
4765 msgstr "tag 说明被保留在 %s\n"
4767 #: builtin/tag.c:425
4768 msgid "switch 'points-at' requires an object"
4769 msgstr "开关 'points-at' 需要一个对象"
4771 #: builtin/tag.c:427
4773 msgid "malformed object name '%s'"
4774 msgstr "非法的对象名 '%s'"
4776 #: builtin/tag.c:506
4777 msgid "--column and -n are incompatible"
4778 msgstr "--column 和 -n 不兼容"
4780 #: builtin/tag.c:523
4781 msgid "-n option is only allowed with -l."
4782 msgstr "-n 选项只允许和 -l 共用。"
4784 #: builtin/tag.c:525
4785 msgid "--contains option is only allowed with -l."
4786 msgstr "--contains 选项只允许和 -l 共用。"
4788 #: builtin/tag.c:527
4789 msgid "--points-at option is only allowed with -l."
4790 msgstr "--points-at 选项只允许和 -l 共用。"
4792 #: builtin/tag.c:535
4793 msgid "only one -F or -m option is allowed."
4794 msgstr "只允许一个 -F 或 -m 选项。"
4796 #: builtin/tag.c:555
4797 msgid "too many params"
4800 #: builtin/tag.c:561
4802 msgid "'%s' is not a valid tag name."
4803 msgstr "'%s' 不是一个有效的tag名称。"
4805 #: builtin/tag.c:566
4807 msgid "tag '%s' already exists"
4808 msgstr "tag '%s' 已存在"
4810 #: builtin/tag.c:584
4812 msgid "%s: cannot lock the ref"
4815 #: builtin/tag.c:586
4817 msgid "%s: cannot update the ref"
4820 #: builtin/tag.c:588
4822 msgid "Updated tag '%s' (was %s)\n"
4823 msgstr "已更新tag '%s'(曾为 %s)\n"
4826 msgid "See 'git help <command>' for more information on a specific command."
4827 msgstr "参见 'git help <command>' 以获得该特定命令的详细信息。"
4829 #: parse-options.h:133 parse-options.h:235
4833 #: parse-options.h:141
4837 #: parse-options.h:149
4841 #: parse-options.h:151
4845 #: parse-options.h:156
4846 msgid "no-op (backward compatibility)"
4849 #: parse-options.h:228
4850 msgid "be more verbose"
4853 #: parse-options.h:230
4854 msgid "be more quiet"
4857 #: parse-options.h:236
4858 msgid "use <n> digits to display SHA-1s"
4859 msgstr "用 <n> 位数字显示 SHA-1 哈希值"
4862 msgid "Add file contents to the index"
4866 msgid "Find by binary search the change that introduced a bug"
4867 msgstr "通过二分查找定位引入 bug 的变更"
4870 msgid "List, create, or delete branches"
4874 msgid "Checkout a branch or paths to the working tree"
4875 msgstr "检出一个分支或路径到工作区"
4878 msgid "Clone a repository into a new directory"
4879 msgstr "克隆一个版本库到一个新目录"
4882 msgid "Record changes to the repository"
4886 msgid "Show changes between commits, commit and working tree, etc"
4887 msgstr "显示提交之间、提交和工作区之间等的差异"
4890 msgid "Download objects and refs from another repository"
4891 msgstr "从另外一个版本库下载对象和引用"
4894 msgid "Print lines matching a pattern"
4898 msgid "Create an empty git repository or reinitialize an existing one"
4899 msgstr "创建一个空的 git 版本库或者重新初始化一个"
4902 msgid "Show commit logs"
4906 msgid "Join two or more development histories together"
4907 msgstr "合并两个或更多开发历史"
4910 msgid "Move or rename a file, a directory, or a symlink"
4911 msgstr "移动或重命名一个文件、目录或符号链接"
4914 msgid "Fetch from and merge with another repository or a local branch"
4915 msgstr "获取并合并另外的版本库或一个本地分支"
4918 msgid "Update remote refs along with associated objects"
4919 msgstr "更新远程引用和相关的对象"
4922 msgid "Forward-port local commits to the updated upstream head"
4923 msgstr "本地提交转移至更新后的上游分支中"
4926 msgid "Reset current HEAD to the specified state"
4927 msgstr "重置当前HEAD到指定状态"
4930 msgid "Remove files from the working tree and from the index"
4931 msgstr "从工作区和索引中删除文件"
4934 msgid "Show various types of objects"
4938 msgid "Show the working tree status"
4942 msgid "Create, list, delete or verify a tag object signed with GPG"
4943 msgstr "创建、列出、删除或校验一个GPG签名的 tag 对象"
4946 msgid "You need to set your committer info first"
4947 msgstr "您需要先设置你的提交者信息"
4951 "You seem to have moved HEAD since the last 'am' failure.\n"
4952 "Not rewinding to ORIG_HEAD"
4953 msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
4958 "When you have resolved this problem run \"$cmdline --resolved\".\n"
4959 "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
4960 "To restore the original branch and stop patching run \"$cmdline --abort\"."
4962 "当您解决了此问题后,执行 \"$cmdline --resolved\"。\n"
4963 "如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n"
4964 "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
4967 msgid "Cannot fall back to three-way merge."
4971 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
4972 msgstr "版本库缺乏必要的 blob 数据以进行三路合并。"
4976 "Did you hand edit your patch?\n"
4977 "It does not apply to blobs recorded in its index."
4983 msgid "Falling back to patching base and 3-way merge..."
4984 msgstr "转而在基础版本上打补丁及进行三路合并..."
4987 msgid "Only one StGIT patch series can be applied at once"
4988 msgstr "一次只能有一个 StGIT 补丁队列被应用"
4992 msgid "Patch format $patch_format is not supported."
4993 msgstr "不支持 $patch_format 补丁格式。"
4996 msgid "Patch format detection failed."
5000 msgid "-d option is no longer supported. Do not use."
5001 msgstr "不再支持 -d 选项。不要使用。"
5005 msgid "previous rebase directory $dotest still exists but mbox given."
5006 msgstr "之前的变基目录 $dotest 仍然存在但给出了mbox。"
5009 msgid "Please make up your mind. --skip or --abort?"
5010 msgstr "请下决心。--skip 或是 --abort ?"
5013 msgid "Resolve operation not in progress, we are not resuming."
5014 msgstr "解决操作未进行,我们不会继续。"
5018 msgid "Dirty index: cannot apply patches (dirty: $files)"
5019 msgstr "脏的索引:不能应用补丁(脏文件:$files)"
5024 "Patch is empty. Was it split wrong?\n"
5025 "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
5026 "To restore the original branch and stop patching run \"$cmdline --abort\"."
5029 "如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n"
5030 "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
5033 msgid "Patch does not have a valid e-mail address."
5034 msgstr "补丁中没有一个有效的邮件地址。"
5037 msgid "cannot be interactive without stdin connected to a terminal."
5038 msgstr "标准输入没有和终端关联,不能进行交互式操作。"
5041 msgid "Commit Body is:"
5045 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
5046 #. in your translation. The program will only accept English
5047 #. input at this point.
5049 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
5050 msgstr "应用?[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
5054 msgid "Applying: $FIRSTLINE"
5055 msgstr "正应用:$FIRSTLINE"
5059 "No changes - did you forget to use 'git add'?\n"
5060 "If there is nothing left to stage, chances are that something else\n"
5061 "already introduced the same changes; you might want to skip this patch."
5063 "没有变更 —— 您是不是忘了执行 'git add'?\n"
5064 "如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
5069 "You still have unmerged paths in your index\n"
5070 "did you forget to use 'git add'?"
5071 msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'?"
5074 msgid "No changes -- Patch already applied."
5075 msgstr "没有变更 -- 补丁已经应用过。"
5079 msgid "Patch failed at $msgnum $FIRSTLINE"
5080 msgstr "补丁失败于 $msgnum $FIRSTLINE"
5083 msgid "applying to an empty history"
5087 msgid "You need to start by \"git bisect start\""
5088 msgstr "您需要执行 \"git bisect start\" 来开始"
5091 #. TRANSLATORS: Make sure to include [Y] and [n] in your
5092 #. translation. The program will only accept English input
5095 msgid "Do you want me to do it for you [Y/n]? "
5096 msgstr "您想让我为您这样做么[Y/n]? "
5100 msgid "unrecognised option: '$arg'"
5101 msgstr "未能识别的选项:'$arg'"
5105 msgid "'$arg' does not appear to be a valid revision"
5106 msgstr "'$arg' 看起来不像是一个有效的版本"
5108 #: git-bisect.sh:117
5109 msgid "Bad HEAD - I need a HEAD"
5110 msgstr "坏的 HEAD - 我需要一个 HEAD"
5112 #: git-bisect.sh:130
5115 "Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
5116 msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <validbranch>'。"
5118 #: git-bisect.sh:140
5119 msgid "won't bisect on seeked tree"
5120 msgstr "不会在已查找过的树上二分查找"
5122 #: git-bisect.sh:144
5123 msgid "Bad HEAD - strange symbolic ref"
5124 msgstr "坏的 HEAD - 奇怪的符号引用"
5126 #: git-bisect.sh:189
5128 msgid "Bad bisect_write argument: $state"
5129 msgstr "坏的 bisect_write 参数:$state"
5131 #: git-bisect.sh:218
5133 msgid "Bad rev input: $arg"
5134 msgstr "输入坏的版本:$arg"
5136 #: git-bisect.sh:232
5137 msgid "Please call 'bisect_state' with at least one argument."
5138 msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
5140 #: git-bisect.sh:244
5142 msgid "Bad rev input: $rev"
5143 msgstr "输入坏的版本:$rev"
5145 #: git-bisect.sh:250
5146 msgid "'git bisect bad' can take only one argument."
5147 msgstr "'git bisect bad' 只能带一个参数。"
5149 #. have bad but not good. we could bisect although
5150 #. this is less optimum.
5151 #: git-bisect.sh:273
5152 msgid "Warning: bisecting only with a bad commit."
5153 msgstr "警告:在仅有一个坏提交下进行二分查找。"
5156 #. TRANSLATORS: Make sure to include [Y] and [n] in your
5157 #. translation. The program will only accept English input
5159 #: git-bisect.sh:279
5160 msgid "Are you sure [Y/n]? "
5161 msgstr "您确认么[Y/n]? "
5163 #: git-bisect.sh:289
5165 "You need to give me at least one good and one bad revisions.\n"
5166 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
5168 "您需要给我至少一个好版本和一个坏版本。\n"
5169 "(您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。)"
5171 #: git-bisect.sh:292
5173 "You need to start by \"git bisect start\".\n"
5174 "You then need to give me at least one good and one bad revisions.\n"
5175 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
5177 "您需要执行 \"git bisect start\" 来开始。\n"
5178 "然后需要提供我至少一个好版本和一个坏版本。\n"
5179 "(您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。)"
5181 #: git-bisect.sh:347 git-bisect.sh:474
5182 msgid "We are not bisecting."
5185 #: git-bisect.sh:354
5187 msgid "'$invalid' is not a valid commit"
5188 msgstr "'$invalid' 不是一个有效的提交"
5190 #: git-bisect.sh:363
5193 "Could not check out original HEAD '$branch'.\n"
5194 "Try 'git bisect reset <commit>'."
5196 "不能检出原始 HEAD '$branch'。\n"
5197 "尝试 'git bisect reset <commit>'。"
5199 #: git-bisect.sh:390
5200 msgid "No logfile given"
5203 #: git-bisect.sh:391
5205 msgid "cannot read $file for replaying"
5206 msgstr "不能读取 $file 来重放"
5208 #: git-bisect.sh:408
5209 msgid "?? what are you talking about?"
5212 #: git-bisect.sh:420
5214 msgid "running $command"
5215 msgstr "运行 $command"
5217 #: git-bisect.sh:427
5220 "bisect run failed:\n"
5221 "exit code $res from '$command' is < 0 or >= 128"
5224 "命令 '$command' 的退出码 $res 或者小于 0 或者大于等于 128"
5226 #: git-bisect.sh:453
5227 msgid "bisect run cannot continue any more"
5230 #: git-bisect.sh:459
5233 "bisect run failed:\n"
5234 "'bisect_state $state' exited with error code $res"
5237 "'bisect_state $state' 退出码为 $res"
5239 #: git-bisect.sh:466
5240 msgid "bisect run success"
5245 "Pull is not possible because you have unmerged files.\n"
5246 "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
5247 "as appropriate to mark resolution, or use 'git commit -a'."
5249 "Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n"
5250 "然后酌情使用 'git add/rm <file>' 标记解决方案,\n"
5251 "或者使用 'git commit -a'。"
5254 msgid "Pull is not possible because you have unmerged files."
5255 msgstr "Pull 不可用,因为您尚有未合并的文件。"
5258 msgid "updating an unborn branch with changes added to the index"
5259 msgstr "更新尚未诞生的分支,变更添加至索引"
5261 #. The fetch involved updating the current branch.
5262 #. The working tree and the index file is still based on the
5263 #. $orig_head commit, but we are merging into $curr_head.
5264 #. First update the working tree to match $curr_head.
5268 "Warning: fetch updated the current branch head.\n"
5269 "Warning: fast-forwarding your working tree from\n"
5270 "Warning: commit $orig_head."
5272 "警告:fetch 更新了当前的分支。您的工作区\n"
5273 "警告:从原提交 $orig_head 快进。"
5276 msgid "Cannot merge multiple branches into empty head"
5277 msgstr "无法将多个分支合并到空分支"
5280 msgid "Cannot rebase onto multiple branches"
5284 msgid "git stash clear with parameters is unimplemented"
5285 msgstr "git stash clear 不支持参数"
5288 msgid "You do not have the initial commit yet"
5292 msgid "Cannot save the current index state"
5295 #: git-stash.sh:123 git-stash.sh:136
5296 msgid "Cannot save the current worktree state"
5297 msgstr "无法保存当前工作区状态"
5300 msgid "No changes selected"
5304 msgid "Cannot remove temporary index (can't happen)"
5305 msgstr "无法删除临时索引(不应发生)"
5308 msgid "Cannot record working tree state"
5311 #. TRANSLATORS: $option is an invalid option, like
5312 #. `--blah-blah'. The 7 spaces at the beginning of the
5313 #. second line correspond to "error: ". So you should line
5314 #. up the second line with however many characters the
5315 #. translation of "error: " takes in your language. E.g. in
5318 #. $ git stash save --blah-blah 2>&1 | head -n 2
5319 #. error: unknown option for 'stash save': --blah-blah
5320 #. To provide a message, use git stash save -- '--blah-blah'
5324 "error: unknown option for 'stash save': $option\n"
5325 " To provide a message, use git stash save -- '$option'"
5327 "错误:'stash save' 的未知选项:$option\n"
5328 " 要提供一个描述信息,使用 git stash save -- '$option'"
5331 msgid "No local changes to save"
5335 msgid "Cannot initialize stash"
5336 msgstr "无法初始化 stash"
5339 msgid "Cannot save the current status"
5343 msgid "Cannot remove worktree changes"
5347 msgid "No stash found."
5352 msgid "Too many revisions specified: $REV"
5353 msgstr "指定了太多的版本:$REV"
5357 msgid "$reference is not valid reference"
5358 msgstr "$reference 不是有效的引用"
5362 msgid "'$args' is not a stash-like commit"
5363 msgstr "'$args' 不是 stash 样提交"
5367 msgid "'$args' is not a stash reference"
5368 msgstr "'$args' 不是一个 stash 引用"
5371 msgid "unable to refresh index"
5375 msgid "Cannot apply a stash in the middle of a merge"
5376 msgstr "无法在合并过程中恢复进度"
5379 msgid "Conflicts in index. Try without --index."
5380 msgstr "索引中有冲突。尝试不使用 --index。"
5383 msgid "Could not save index tree"
5387 msgid "Cannot unstage modified files"
5391 msgid "Index was not unstashed."
5392 msgstr "索引的进度没有被恢复。"
5396 msgid "Dropped ${REV} ($s)"
5397 msgstr "丢弃了 ${REV} ($s)"
5401 msgid "${REV}: Could not drop stash entry"
5402 msgstr "${REV}:不能丢弃进度条目"
5405 msgid "No branch name specified"
5409 msgid "(To restore them type \"git stash apply\")"
5410 msgstr "(为恢复数据输入 \"git stash apply\")"
5412 #: git-submodule.sh:88
5414 msgid "cannot strip one component off url '$remoteurl'"
5415 msgstr "无法从 url '$remoteurl' 剥离一个组件"
5417 #: git-submodule.sh:145
5419 msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
5420 msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
5422 #: git-submodule.sh:189
5424 msgid "Clone of '$url' into submodule path '$sm_path' failed"
5425 msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
5427 #: git-submodule.sh:201
5429 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
5430 msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或者相反"
5432 #: git-submodule.sh:290
5434 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
5435 msgstr "版本库URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
5437 #: git-submodule.sh:307
5439 msgid "'$sm_path' already exists in the index"
5440 msgstr "'$sm_path' 已经存在于索引中"
5442 #: git-submodule.sh:311
5445 "The following path is ignored by one of your .gitignore files:\n"
5447 "Use -f if you really want to add it."
5449 "以下路径被您的一个 .gitignore 文件所忽略:\n"
5451 "如果您确实想添加它,使用 -f 参数。"
5453 #: git-submodule.sh:322
5455 msgid "Adding existing repo at '$sm_path' to the index"
5456 msgstr "添加位于 '$sm_path' 的现存版本库到索引"
5458 #: git-submodule.sh:324
5460 msgid "'$sm_path' already exists and is not a valid git repo"
5461 msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"
5463 #: git-submodule.sh:338
5465 msgid "Unable to checkout submodule '$sm_path'"
5466 msgstr "不能检出子模组 '$sm_path'"
5468 #: git-submodule.sh:343
5470 msgid "Failed to add submodule '$sm_path'"
5471 msgstr "无法添加子模组 '$sm_path'"
5473 #: git-submodule.sh:348
5475 msgid "Failed to register submodule '$sm_path'"
5476 msgstr "无法注册子模组 '$sm_path'"
5478 #: git-submodule.sh:390
5480 msgid "Entering '$prefix$sm_path'"
5481 msgstr "正在进入 '$prefix$sm_path'"
5483 #: git-submodule.sh:404
5485 msgid "Stopping at '$sm_path'; script returned non-zero status."
5486 msgstr "停止于 '$sm_path',脚本返回非零值。"
5488 #: git-submodule.sh:447
5490 msgid "No url found for submodule path '$sm_path' in .gitmodules"
5491 msgstr "在 .gitmodules 中未找到子模组路径 '$sm_path' 的 url"
5493 #: git-submodule.sh:456
5495 msgid "Failed to register url for submodule path '$sm_path'"
5496 msgstr "无法为子模组路径 '$sm_path' 注册 url"
5498 #: git-submodule.sh:458
5500 msgid "Submodule '$name' ($url) registered for path '$sm_path'"
5501 msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册"
5503 #: git-submodule.sh:466
5505 msgid "Failed to register update mode for submodule path '$sm_path'"
5506 msgstr "无法为子模组路径 '$sm_path' 注册更新模式"
5508 #: git-submodule.sh:565
5511 "Submodule path '$sm_path' not initialized\n"
5512 "Maybe you want to use 'update --init'?"
5514 "子模组路径 '$sm_path' 没有初始化\n"
5515 "也许您想用 'update --init'?"
5517 #: git-submodule.sh:578
5519 msgid "Unable to find current revision in submodule path '$sm_path'"
5520 msgstr "无法在子模组路径 '$sm_path' 中找到当前版本"
5522 #: git-submodule.sh:597
5524 msgid "Unable to fetch in submodule path '$sm_path'"
5525 msgstr "无法在子模组路径 '$sm_path' 中获取"
5527 #: git-submodule.sh:611
5529 msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
5530 msgstr "无法在子模组路径 '$sm_path' 中变基 '$sha1'"
5532 #: git-submodule.sh:612
5534 msgid "Submodule path '$sm_path': rebased into '$sha1'"
5535 msgstr "子模组路径 '$sm_path':变基至 '$sha1'"
5537 #: git-submodule.sh:617
5539 msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
5540 msgstr "无法合并 '$sha1' 到子模组路径 '$sm_path' 中"
5542 #: git-submodule.sh:618
5544 msgid "Submodule path '$sm_path': merged in '$sha1'"
5545 msgstr "子模组路径 '$sm_path':已合并入 '$sha1'"
5547 #: git-submodule.sh:623
5549 msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
5550 msgstr "无法在子模组路径 '$sm_path' 中检出 '$sha1'"
5552 #: git-submodule.sh:624
5554 msgid "Submodule path '$sm_path': checked out '$sha1'"
5555 msgstr "子模组路径 '$sm_path':检出 '$sha1'"
5557 #: git-submodule.sh:646 git-submodule.sh:969
5559 msgid "Failed to recurse into submodule path '$sm_path'"
5560 msgstr "无法递归进子模组路径 '$sm_path'"
5562 #: git-submodule.sh:754
5563 msgid "--cached cannot be used with --files"
5564 msgstr "--cached 不能和 --files 共用"
5567 #: git-submodule.sh:794
5569 msgid "unexpected mode $mod_dst"
5570 msgstr "意外的模式 $mod_dst"
5573 #: git-submodule.sh:812
5575 msgid " Warn: $name doesn't contain commit $sha1_src"
5576 msgstr " 警告:$name 未包含提交 $sha1_src"
5579 #: git-submodule.sh:815
5581 msgid " Warn: $name doesn't contain commit $sha1_dst"
5582 msgstr " 警告:$name 未包含提交 $sha1_dst"
5585 #: git-submodule.sh:818
5587 msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
5588 msgstr " 警告:$name 未包含提交 $sha1_src 和 $sha1_dst"
5590 #: git-submodule.sh:843
5594 #: git-submodule.sh:844
5598 #: git-submodule.sh:881
5599 msgid "# Submodules changed but not updated:"
5600 msgstr "# 子模组已修改但尚未更新:"
5602 #: git-submodule.sh:883
5603 msgid "# Submodule changes to be committed:"
5606 #: git-submodule.sh:1027
5608 msgid "Synchronizing submodule url for '$name'"
5609 msgstr "为 '$name' 同步子模组 url"
5611 #~ msgid "(bad commit)\n"
5614 #~ msgid "addinfo_cache failed for path '%s'"
5615 #~ msgstr "为路径 '%s' addinfo_cache 失败"
5617 #~ msgid "error building trees"
5620 #~ msgid "diff setup failed"
5621 #~ msgstr "diff 设置失败"
5623 #~ msgid "merge-recursive: disk full?"
5624 #~ msgstr "merge-recursive: 磁盘已满?"
5626 #~ msgid "failed to create path '%s'%s"
5627 #~ msgstr "无法创建路径 '%s'%s"
5629 #~ msgid "Removing %s to make room for subdirectory\n"
5630 #~ msgstr "删除 %s 以便为子目录留出空间\n"
5632 #~ msgid ": perhaps a D/F conflict?"
5633 #~ msgstr ":可能是一个 D/F 冲突?"
5635 #~ msgid "refusing to lose untracked file at '%s'"
5636 #~ msgstr "拒绝丢失 '%s' 下的未跟踪文件"
5638 #~ msgid "cannot read object %s '%s'"
5639 #~ msgstr "不能读取对象 %s '%s'"
5641 #~ msgid "blob expected for %s '%s'"
5642 #~ msgstr "%s '%s' 应为 blob"
5644 #~ msgid "failed to symlink '%s'"
5645 #~ msgstr "无法创建符号链接 '%s'"
5647 #~ msgid "do not know what to do with %06o %s '%s'"
5648 #~ msgstr "不知道如何处理 %06o %s '%s'"
5650 #~ msgid "Failed to execute internal merge"
5651 #~ msgstr "无法执行内部合并"
5653 #~ msgid "Unable to add %s to database"
5654 #~ msgstr "不能添加 %s 至对象库"
5656 #~ msgid "unsupported object type in the tree"
5657 #~ msgstr "在树中有不支持的对象类型"
5660 #~ "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s "
5663 #~ "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s "
5667 #~ "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s "
5668 #~ "left in tree at %s."
5670 #~ "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s "
5671 #~ "中的版本保留于 %8$s 中。"
5679 #~ msgid "%s is a directory in %s adding as %s instead"
5680 #~ msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
5683 #~ "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename "
5684 #~ "\"%s\"->\"%s\" in \"%s\"%s"
5686 #~ "冲突(重命名/重命名):在分支 \"%3$s\" 重命名 \"%1$s\"->\"%2$s\",在分支 "
5687 #~ "\"%6$s\" 重命名 \"%4$s\"->\"%5$s\"%7$s"
5689 #~ msgid " (left unresolved)"
5692 #~ msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
5694 #~ "冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s-"
5697 #~ msgid "Renaming %s to %s and %s to %s instead"
5698 #~ msgstr "而是重命名 %s 至 %s 以及 %s 至 %s"
5700 #~ msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
5702 #~ "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
5704 #~ msgid "Adding merged %s"
5705 #~ msgstr "添加合并后的 %s"
5707 #~ msgid "Adding as %s instead"
5708 #~ msgstr "而是以 %s 为名添加"
5710 #~ msgid "cannot read object %s"
5711 #~ msgstr "不能读取对象 %s"
5713 #~ msgid "object %s is not a blob"
5714 #~ msgstr "对象 %s 不是一个 blob"
5728 #~ msgid "Skipped %s (merged same as existing)"
5729 #~ msgstr "略过 %s(已经做过相同合并)"
5731 #~ msgid "Auto-merging %s"
5734 #~ msgid "CONFLICT (%s): Merge conflict in %s"
5735 #~ msgstr "冲突(%s):合并冲突于 %s"
5737 #~ msgid "Removing %s"
5740 #~ msgid "file/directory"
5743 #~ msgid "directory/file"
5747 #~ "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
5749 #~ "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
5751 #~ msgid "Adding %s"
5754 #~ msgid "Fatal merge failure, shouldn't happen."
5755 #~ msgstr "严重的合并错误,不应发生。"
5757 #~ msgid "Already up-to-date!"
5760 #~ msgid "merging of trees %s and %s failed"
5761 #~ msgstr "无法合并树 %s 和 %s"
5763 #~ msgid "Unprocessed path??? %s"
5764 #~ msgstr "未处理的路径??? %s"
5769 #~ msgid "found %u common ancestor(s):"
5770 #~ msgstr "发现 %u 个共同祖先:"
5772 #~ msgid "merge returned no commit"
5775 #~ msgid "Could not parse object '%s'"
5776 #~ msgstr "不能解析对象 '%s'"
5778 #~ msgid "Using index info to reconstruct a base tree..."
5779 #~ msgstr "更新索引信息以重建基树..."
5781 #~ msgid "Failed to merge in the changes."
5785 #~ "The -b option has been a no-op for long time, and\n"
5786 #~ "it will be removed. Please do not use it anymore."
5788 #~ "参数 -b 已经很长时间不做任何实质操作了,并且将被\n"
5793 #~ "When you have resolved this problem run \"git rebase --continue\".\n"
5794 #~ "If you would prefer to skip this patch, instead run \"git rebase --skip"
5796 #~ "To check out the original branch and stop rebasing run \"git rebase --"
5800 #~ "当您解决了此问题后,执行 \"git rebase --continue\"。\n"
5801 #~ "如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
5802 #~ "要恢复原分支并停止变基,执行 \"git rebase --abort\"。\n"
5804 #~ msgid "The pre-rebase hook refused to rebase."
5805 #~ msgstr "钩子 pre-rebase 拒绝变基。"
5807 #~ msgid "It looks like git-am is in progress. Cannot rebase."
5808 #~ msgstr "看起来 git-am 正在进行中。无法变基。"
5810 #~ msgid "The --exec option must be used with the --interactive option"
5811 #~ msgstr "选项 --exec 必须和选项 --interactive 共用"
5813 #~ msgid "No rebase in progress?"
5814 #~ msgstr "没有正在进行的变基?"
5816 #~ msgid "Cannot read HEAD"
5817 #~ msgstr "不能读取 HEAD"
5820 #~ "You must edit all merge conflicts and then\n"
5821 #~ "mark them as resolved using git add"
5823 #~ "您必须编辑所有的合并冲突,然后通过 git add\n"
5826 #~ msgid "Could not move back to $head_name"
5827 #~ msgstr "无法移回 $head_name"
5831 #~ "It seems that there is already a $state_dir_base directory, and\n"
5832 #~ "I wonder if you are in the middle of another rebase. If that is the\n"
5833 #~ "case, please try\n"
5834 #~ "\tgit rebase (--continue | --abort | --skip)\n"
5835 #~ "If that is not the case, please\n"
5836 #~ "\trm -fr \"$state_dir\"\n"
5837 #~ "and run me again. I am stopping in case you still have something\n"
5838 #~ "valuable there."
5841 #~ "好像已有一个 $state_dir_base 目录,并且我猜您正处于另一个变基过程\n"
5842 #~ "中。如果是这样,请尝试执行\n"
5843 #~ "\tgit rebase (--continue | --abort | --skip)\n"
5845 #~ "\trm -fr \"$state_dir\"\n"
5846 #~ "然后再执行我。我停止以免您在那儿仍有一些重要的数据。"
5848 #~ msgid "invalid upstream $upstream_name"
5849 #~ msgstr "无效的上游 $upstream_name"
5851 #~ msgid "$onto_name: there are more than one merge bases"
5852 #~ msgstr "$onto_name: 有一个以上的合并基准"
5854 #~ msgid "$onto_name: there is no merge base"
5855 #~ msgstr "$onto_name: 没有合并基准"
5857 #~ msgid "Does not point to a valid commit: $onto_name"
5858 #~ msgstr "没有指向一个有效的提交:$onto_name"
5860 #~ msgid "fatal: no such branch: $branch_name"
5861 #~ msgstr "严重:无此分支:$branch_name"
5863 #~ msgid "Please commit or stash them."
5864 #~ msgstr "请提交或为它们保存进度。"
5866 #~ msgid "Current branch $branch_name is up to date."
5867 #~ msgstr "当前分支 $branch_name 是最新的。"
5869 #~ msgid "Current branch $branch_name is up to date, rebase forced."
5870 #~ msgstr "当前分支 $branch_name 是最新的,强制变基。"
5872 #~ msgid "Changes from $mb to $onto:"
5873 #~ msgstr "变更从 $mb 到 $onto:"
5875 #~ msgid "First, rewinding head to replay your work on top of it..."
5876 #~ msgstr "首先,重置头指针以便在上面重放您的工作..."
5878 #~ msgid "Fast-forwarded $branch_name to $onto_name."
5879 #~ msgstr "快进 $branch_name 至 $onto_name。"
5881 #~ msgid "The --cached option cannot be used with the --files option"
5882 #~ msgstr "选项 --cached 不能和选项 --files 共用"
5884 #~ msgid "BUG: There are unmerged index entries:\n"
5885 #~ msgstr "BUG: 有未合并的索引条目:\n"
5887 #~ msgid "Bug in merge-recursive.c"
5888 #~ msgstr "在 merge-recursive.c 有 bug"
5890 #~ msgid "BUG: unexpected number of arguments left to parse"
5891 #~ msgstr "BUG: 参数解析后留下意外数目的参数"
5893 #~ msgid "BUG: %d %.*s\n"
5894 #~ msgstr "BUG: %d %.*s\n"
5896 #~ msgid "%s: has been deleted/renamed"
5897 #~ msgstr "%s:已经被删除/重命名"
5899 #~ msgid "'%s': not a documentation directory."
5900 #~ msgstr "'%s':不是一个文档目录。"