1 # Chinese translations for Git package
3 # Copyright (C) 2012 Jiang Xin <worldhello.net AT gmail.com>
4 # This file is distributed under the same license as the Git package.
6 # - Jiang Xin <worldhello.net AT gmail.com>
7 # - Riku <lu.riku AT gmail.com>
8 # - Zhuang Ya <zhuangya AT me.com>
9 # - Lian Cheng <rhythm.mail AT gmail.com>
13 "Project-Id-Version: Git\n"
14 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
15 "POT-Creation-Date: 2012-05-21 08:57+0800\n"
16 "PO-Revision-Date: 2012-01-30 00:00+0800\n"
17 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
18 "Language-Team: GitHub <https://github.com/gotgit/git/>\n"
21 "Content-Type: text/plain; charset=UTF-8\n"
22 "Content-Transfer-Encoding: 8bit\n"
23 "Plural-Forms: nplurals=1; plural=0;\n"
31 #. * Message used both when 'git commit' fails and when
32 #. * other commands doing a merge do.
36 "Fix them up in the work tree,\n"
37 "and then use 'git add/rm <file>' as\n"
38 "appropriate to mark resolution and make a commit,\n"
39 "or use 'git commit -a'."
42 "'git add/rm <file>' 标记解决方案,\n"
43 "或使用 'git commit -a'。"
47 msgid "'%s' does not look like a v2 bundle file"
52 msgid "unrecognized header: %s%s (%d)"
55 #: bundle.c:89 builtin/commit.c:697
57 msgid "could not open '%s'"
61 msgid "Repository lacks these prerequisite commits:"
64 #: bundle.c:164 sequencer.c:533 sequencer.c:965 builtin/log.c:289
65 #: builtin/log.c:719 builtin/log.c:1335 builtin/log.c:1554 builtin/merge.c:347
66 #: builtin/shortlog.c:181
67 msgid "revision walk setup failed"
72 msgid "The bundle contains %d ref"
73 msgid_plural "The bundle contains %d refs"
78 msgid "The bundle requires this ref"
79 msgid_plural "The bundle requires these %d refs"
86 #: bundle.c:296 builtin/log.c:1231 builtin/shortlog.c:284
88 msgid "unrecognized argument: %s"
93 msgid "ref '%s' is excluded by the rev-list options"
98 msgid "Refusing to create empty bundle."
103 msgid "Could not spawn pack-objects"
107 msgid "pack-objects died"
112 msgid "cannot create '%s'"
116 msgid "index-pack died"
121 msgid "could not parse %s"
126 msgid "%s %s is not a commit!"
127 msgstr "%s %s 不是一个提交!"
129 #: compat/obstack.c:406 compat/obstack.c:408
130 msgid "memory exhausted"
134 msgid "Could not run 'git rev-list'"
135 msgstr "不能执行 'git rev-list'"
139 msgid "failed write to rev-list: %s"
140 msgstr "无法写入 rev-list:%s"
144 msgid "failed to close rev-list's stdin: %s"
145 msgstr "无法关闭 rev-list 的标准输入:%s"
148 msgid "in the future"
153 msgid "%lu second ago"
154 msgid_plural "%lu seconds ago"
159 msgid "%lu minute ago"
160 msgid_plural "%lu minutes ago"
166 msgid_plural "%lu hours ago"
172 msgid_plural "%lu days ago"
178 msgid_plural "%lu weeks ago"
183 msgid "%lu month ago"
184 msgid_plural "%lu months ago"
190 msgid_plural "%lu years"
195 msgid "%s, %lu month ago"
196 msgid_plural "%s, %lu months ago"
199 #: date.c:154 date.c:159
202 msgid_plural "%lu years ago"
208 msgid " Failed to parse dirstat cut-off percentage '%.*s'\n"
209 msgstr " 无法解析 dirstat 阈值 '%.*s'\n"
214 msgid " Unknown dirstat parameter '%.*s'\n"
215 msgstr " 未知 dirstat 参数 '%.*s'\n"
220 "Found errors in 'diff.dirstat' config variable:\n"
223 "发现配置变量 'diff.dirstat' 中的错误:\n"
227 msgid " 0 files changed\n"
232 msgid " %d file changed"
233 msgid_plural " %d files changed"
234 msgstr[0] " %d 个文件被修改"
238 msgid ", %d insertion(+)"
239 msgid_plural ", %d insertions(+)"
240 msgstr[0] ",插入 %d 行(+)"
244 msgid ", %d deletion(-)"
245 msgid_plural ", %d deletions(-)"
246 msgstr[0] ",删除 %d 行(-)"
251 "Failed to parse --dirstat/-X option parameter:\n"
254 "无法解析 --dirstat/-X 选项的参数:\n"
257 #: gpg-interface.c:59
258 msgid "could not run gpg."
261 #: gpg-interface.c:71
262 msgid "gpg did not accept the data"
265 #: gpg-interface.c:82
266 msgid "gpg failed to sign the data"
271 msgid "'%s': unable to read %s"
272 msgstr "'%s':无法读取 %s"
281 msgid "'%s': short read %s"
282 msgstr "'%s':读取不完整 %s"
286 msgid "available git commands in '%s'"
290 msgid "git commands available from elsewhere on your $PATH"
296 "'%s' appears to be a git command, but we were not\n"
297 "able to execute it. Maybe git-%s is broken?"
299 "'%s' 像是一个 git 命令,但却无法运行。\n"
303 msgid "Uh oh. Your system reports no Git commands at all."
309 "WARNING: You called a Git command named '%s', which does not exist.\n"
310 "Continuing under the assumption that you meant '%s'"
315 msgid "in %0.1f seconds automatically..."
320 msgid "git: '%s' is not a git command. See 'git --help'."
329 "Did you mean one of these?"
332 #: parse-options.c:493
336 #: parse-options.c:511
341 #. TRANSLATORS: the colon here should align with the
342 #. one in "usage: %s" translation
343 #: parse-options.c:515
348 # 译者:为保证在输出中对齐,注意调整句中空格!
349 #: parse-options.c:518
356 msgid "Your branch is ahead of '%s' by %d commit.\n"
357 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
358 msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
362 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
364 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
365 msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
370 "Your branch and '%s' have diverged,\n"
371 "and have %d and %d different commit each, respectively.\n"
373 "Your branch and '%s' have diverged,\n"
374 "and have %d and %d different commits each, respectively.\n"
376 "您的分支和 '%s' 出现了偏离,\n"
377 "并且各自分别有 %d 和 %d 处不同的提交。\n"
379 #: sequencer.c:121 builtin/merge.c:865 builtin/merge.c:978
380 #: builtin/merge.c:1088 builtin/merge.c:1098
382 msgid "Could not open '%s' for writing"
383 msgstr "不能为写入打开 '%s'"
385 #: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:868
386 #: builtin/merge.c:1090 builtin/merge.c:1103
388 msgid "Could not write to '%s'"
393 "after resolving the conflicts, mark the corrected paths\n"
394 "with 'git add <paths>' or 'git rm <paths>'"
396 "冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
401 "after resolving the conflicts, mark the corrected paths\n"
402 "with 'git add <paths>' or 'git rm <paths>'\n"
403 "and commit the result with 'git commit'"
405 "冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
406 "对修正后的文件做标记,然后用 'git commit' 提交"
408 #: sequencer.c:160 sequencer.c:741 sequencer.c:824
410 msgid "Could not write to %s"
415 msgid "Error wrapping up %s"
419 msgid "Your local changes would be overwritten by cherry-pick."
420 msgstr "您的本地修改将被拣选操作覆盖。"
423 msgid "Your local changes would be overwritten by revert."
424 msgstr "您的本地修改将被还原操作覆盖。"
427 msgid "Commit your changes or stash them to proceed."
428 msgstr "提交您的修改或保存进度后再继续。"
430 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
433 msgid "%s: Unable to write new index file"
434 msgstr "%s:无法写入新索引文件"
438 msgid "Could not resolve HEAD commit\n"
439 msgstr "不能解析 HEAD 提交"
443 msgid "Unable to update cache tree\n"
448 msgid "Could not parse commit %s\n"
449 msgstr "不能解析 HEAD 提交"
453 msgid "Could not parse parent commit %s\n"
454 msgstr "%s:不能解析父提交 %s"
457 msgid "Your index file is unmerged."
458 msgstr "您的索引文件未完成合并。"
461 msgid "You do not have a valid HEAD"
462 msgstr "您没有一个有效的 HEAD"
466 msgid "Commit %s is a merge but no -m option was given."
467 msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
471 msgid "Commit %s does not have parent %d"
472 msgstr "提交 %s 没有父提交 %d"
476 msgid "Mainline was specified but commit %s is not a merge."
477 msgstr "指定了主线但提交 %s 不是一个合并。"
479 #. TRANSLATORS: The first %s will be "revert" or
480 #. "cherry-pick", the second %s a SHA1
483 msgid "%s: cannot parse parent commit %s"
484 msgstr "%s:不能解析父提交 %s"
488 msgid "Cannot get commit message for %s"
489 msgstr "不能得到 %s 的提交说明"
493 msgid "could not revert %s... %s"
494 msgstr "不能还原 %s... %s"
498 msgid "could not apply %s... %s"
499 msgstr "不能应用 %s... %s"
502 msgid "empty commit set passed"
507 msgid "git %s: failed to read the index"
508 msgstr "git %s:无法读取索引"
512 msgid "git %s: failed to refresh the index"
513 msgstr "git %s:无法刷新索引"
517 msgid "Cannot %s during a %s"
518 msgstr "无法 %s 在一个 %s 过程中"
522 msgid "Could not parse line %d."
526 msgid "No commits parsed."
531 msgid "Could not open %s"
536 msgid "Could not read %s."
541 msgid "Unusable instruction sheet: %s"
546 msgid "Invalid key: %s"
551 msgid "Invalid value for %s: %s"
556 msgid "Malformed options sheet: %s"
560 msgid "a cherry-pick or revert is already in progress"
561 msgstr "一个拣选或还原操作已在进行"
564 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
565 msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
569 msgid "Could not create sequencer directory %s"
572 #: sequencer.c:743 sequencer.c:828
574 msgid "Error wrapping up %s."
577 #: sequencer.c:762 sequencer.c:896
578 msgid "no cherry-pick or revert in progress"
579 msgstr "没有拣选或还原操作在进行"
582 msgid "cannot resolve HEAD"
586 msgid "cannot abort from a branch yet to be born"
587 msgstr "不能从尚未建立的分支终止"
589 #: sequencer.c:788 builtin/apply.c:3689
591 msgid "cannot open %s: %s"
596 msgid "cannot read %s: %s"
600 msgid "unexpected end of file"
605 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
606 msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
610 msgid "Could not format %s."
614 msgid "Can't revert as initial commit"
618 msgid "Can't cherry-pick into empty head"
622 msgid "HEAD does not point to a branch"
623 msgstr "HEAD 没有指向一个分支"
627 msgid "No such branch: '%s'"
632 msgid "No upstream configured for branch '%s'"
633 msgstr "尚未给分支 '%s' 设置上游"
637 msgid "Upstream branch '%s' not stored as a remote-tracking branch"
638 msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
641 msgid "Unmerged paths:"
645 #: wt-status.c:141 wt-status.c:158
647 msgid " (use \"git reset %s <file>...\" to unstage)"
648 msgstr " (使用 \"git reset %s <file>...\" 撤出暂存区)"
651 #: wt-status.c:143 wt-status.c:160
652 msgid " (use \"git rm --cached <file>...\" to unstage)"
653 msgstr " (使用 \"git rm --cached <file>...\" 撤出暂存区)"
657 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
658 msgstr " (酌情使用 \"git add/rm <file>...\" 标记解决方案)"
661 msgid "Changes to be committed:"
665 msgid "Changes not staged for commit:"
666 msgstr "尚未暂存以备提交的变更:"
670 msgid " (use \"git add <file>...\" to update what will be committed)"
671 msgstr " (使用 \"git add <file>...\" 更新要提交的内容)"
675 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
676 msgstr " (使用 \"git add/rm <file>...\" 更新要提交的内容)"
681 " (use \"git checkout -- <file>...\" to discard changes in working directory)"
682 msgstr " (使用 \"git checkout -- <file>...\" 丢弃工作区的改动)"
686 msgid " (commit or discard the untracked or modified content in submodules)"
687 msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
697 msgid " (use \"git %s <file>...\" to include in what will be committed)"
698 msgstr " (使用 \"git %s <file>...\" 以包含要提交的内容)"
705 msgid "both deleted:"
713 msgid "deleted by them:"
717 msgid "added by them:"
721 msgid "deleted by us:"
729 msgid "both modified:"
732 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
734 msgid "new commits, "
737 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
739 msgid "modified content, "
742 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
744 msgid "untracked content, "
747 # 译者:为保证在输出中对齐,注意调整句中空格!
753 # 译者:为保证在输出中对齐,注意调整句中空格!
756 msgid "copied: %s -> %s"
757 msgstr "拷贝: %s -> %s"
759 # 译者:为保证在输出中对齐,注意调整句中空格!
765 # 译者:为保证在输出中对齐,注意调整句中空格!
771 # 译者:为保证在输出中对齐,注意调整句中空格!
774 msgid "renamed: %s -> %s"
775 msgstr "重命名: %s -> %s"
777 # 译者:为保证在输出中对齐,注意调整句中空格!
780 msgid "typechange: %s"
783 # 译者:为保证在输出中对齐,注意调整句中空格!
789 # 译者:为保证在输出中对齐,注意调整句中空格!
797 msgid "bug: unhandled diff status %c"
798 msgstr "bug:未处理的差异状态 %c"
805 msgid "Not currently on any branch."
809 msgid "Initial commit"
822 msgid "Untracked files not listed%s"
823 msgstr "未跟踪的文件没有列出%s"
827 msgid " (use -u option to show untracked files)"
828 msgstr "(使用 -u 参数显示未跟踪的文件)"
836 msgid "no changes added to commit%s\n"
837 msgstr "修改尚未加入提交%s\n"
841 msgid " (use \"git add\" and/or \"git commit -a\")"
842 msgstr "(使用 \"git add\" 和/或 \"git commit -a\")"
846 msgid "nothing added to commit but untracked files present%s\n"
847 msgstr "空提交但存在未跟踪文件%s\n"
851 msgid " (use \"git add\" to track)"
852 msgstr "(使用 \"git add\" 建立跟踪)"
854 #: wt-status.c:793 wt-status.c:796 wt-status.c:799
856 msgid "nothing to commit%s\n"
861 msgid " (create/copy files and use \"git add\" to track)"
862 msgstr "(新建/拷贝的文件使用 \"git add\" 建立跟踪)"
866 msgid " (use -u to show untracked files)"
867 msgstr "(使用 -u 显示未跟踪文件)"
871 msgid " (working directory clean)"
875 msgid "HEAD (no branch)"
880 msgid "Initial commit on "
889 #: wt-status.c:932 wt-status.c:935
900 msgid "unexpected diff status %c"
903 #: builtin/add.c:67 builtin/commit.c:226
904 msgid "updating files failed"
909 msgid "remove '%s'\n"
914 msgid "Path '%s' is in submodule '%.*s'"
915 msgstr "路径 '%s' 属于模组 '%.*s'"
918 msgid "Unstaged changes after refreshing the index:"
919 msgstr "刷新索引之后尚未被暂存的变更:"
921 #: builtin/add.c:195 builtin/add.c:456 builtin/rm.c:186
923 msgid "pathspec '%s' did not match any files"
924 msgstr "路径 '%s' 未匹配任何文件"
928 msgid "'%s' is beyond a symbolic link"
929 msgstr "'%s' 位于符号链接中"
932 msgid "Could not read the index"
937 msgid "Could not open '%s' for writing."
938 msgstr "不能为写入打开 '%s'。"
941 msgid "Could not write patch"
946 msgid "Could not stat '%s'"
947 msgstr "不能查看文件状态 '%s'"
950 msgid "Empty patch. Aborted."
955 msgid "Could not apply '%s'"
959 msgid "The following paths are ignored by one of your .gitignore files:\n"
960 msgstr "下列路径被您的一个 .gitignore 文件所忽略:\n"
964 msgid "Use -f if you really want to add them.\n"
965 msgstr "使用 -f 参数如果您确实要添加它们。\n"
968 msgid "no files added"
972 msgid "adding files failed"
976 msgid "-A and -u are mutually incompatible"
977 msgstr "-A 和 -u 选项互斥"
980 msgid "Option --ignore-missing can only be used together with --dry-run"
981 msgstr "选项 --ignore-missing 只能和 --dry-run 共用"
985 msgid "Nothing specified, nothing added.\n"
986 msgstr "没有指定文件,也没有文件被添加。\n"
990 msgid "Maybe you wanted to say 'git add .'?\n"
991 msgstr "也许您想要执行 'git add .'?\n"
993 #: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:286 builtin/mv.c:82
995 msgid "index file corrupt"
998 #: builtin/add.c:476 builtin/apply.c:4100 builtin/mv.c:229 builtin/rm.c:260
999 msgid "Unable to write new index file"
1002 #: builtin/apply.c:53
1003 msgid "git apply [options] [<patch>...]"
1006 #: builtin/apply.c:106
1008 msgid "unrecognized whitespace option '%s'"
1009 msgstr "未识别的选项:'$arg'"
1011 #: builtin/apply.c:121
1013 msgid "unrecognized whitespace ignore option '%s'"
1014 msgstr "未识别的选项:'$arg'"
1016 #: builtin/apply.c:815
1018 msgid "Cannot prepare timestamp regexp %s"
1021 #: builtin/apply.c:824
1023 msgid "regexec returned %d for input: %s"
1026 #: builtin/apply.c:905
1028 msgid "unable to find filename in patch at line %d"
1029 msgstr "不能处理 %d 类型的文件"
1031 #: builtin/apply.c:937
1033 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
1036 #: builtin/apply.c:941
1038 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
1041 #: builtin/apply.c:942
1043 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
1046 #: builtin/apply.c:949
1048 msgid "git apply: bad git-diff - expected /dev/null on line %d"
1051 #: builtin/apply.c:1394
1053 msgid "recount: unexpected line: %.*s"
1056 #: builtin/apply.c:1451
1058 msgid "patch fragment without header at line %d: %.*s"
1061 #: builtin/apply.c:1468
1064 "git diff header lacks filename information when removing %d leading pathname "
1065 "component (line %d)"
1067 "git diff header lacks filename information when removing %d leading pathname "
1068 "components (line %d)"
1071 #: builtin/apply.c:1628
1072 msgid "new file depends on old contents"
1075 #: builtin/apply.c:1630
1076 msgid "deleted file still has contents"
1079 #: builtin/apply.c:1656
1081 msgid "corrupt patch at line %d"
1084 #: builtin/apply.c:1692
1086 msgid "new file %s depends on old contents"
1089 #: builtin/apply.c:1694
1091 msgid "deleted file %s still has contents"
1094 #: builtin/apply.c:1697
1096 msgid "** warning: file %s becomes empty but is not deleted"
1099 #: builtin/apply.c:1843
1101 msgid "corrupt binary patch at line %d: %.*s"
1104 #. there has to be one hunk (forward hunk)
1105 #: builtin/apply.c:1872
1107 msgid "unrecognized binary patch at line %d"
1110 #: builtin/apply.c:1958
1112 msgid "patch with only garbage at line %d"
1115 #: builtin/apply.c:2048
1117 msgid "unable to read symlink %s"
1120 #: builtin/apply.c:2052
1122 msgid "unable to open or read %s"
1123 msgstr "不能打开或读取 '%s'"
1125 #: builtin/apply.c:2123
1129 #: builtin/apply.c:2645
1131 msgid "invalid start of line: '%c'"
1134 #: builtin/apply.c:2763
1136 msgid "Hunk #%d succeeded at %d (offset %d line)."
1137 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1140 #: builtin/apply.c:2775
1142 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
1145 #: builtin/apply.c:2781
1148 "while searching for:\n"
1152 #: builtin/apply.c:2800
1154 msgid "missing binary patch data for '%s'"
1157 #: builtin/apply.c:2903
1159 msgid "binary patch does not apply to '%s'"
1162 #: builtin/apply.c:2909
1164 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1167 #: builtin/apply.c:2930
1169 msgid "patch failed: %s:%ld"
1172 #: builtin/apply.c:3045
1174 msgid "patch %s has been renamed/deleted"
1177 #: builtin/apply.c:3052 builtin/apply.c:3069
1179 msgid "read of %s failed"
1180 msgstr "重命名 '%s' 失败"
1182 #: builtin/apply.c:3084
1183 msgid "removal patch leaves file contents"
1186 #: builtin/apply.c:3105
1188 msgid "%s: already exists in working directory"
1189 msgstr "%s 存在且不是一个目录"
1191 #: builtin/apply.c:3143
1193 msgid "%s: has been deleted/renamed"
1196 #: builtin/apply.c:3148 builtin/apply.c:3179
1201 #: builtin/apply.c:3159
1203 msgid "%s: does not exist in index"
1206 #: builtin/apply.c:3173
1208 msgid "%s: does not match index"
1211 #: builtin/apply.c:3190
1213 msgid "%s: wrong type"
1216 #: builtin/apply.c:3192
1218 msgid "%s has type %o, expected %o"
1221 #: builtin/apply.c:3247
1223 msgid "%s: already exists in index"
1226 #: builtin/apply.c:3266
1228 msgid "new mode (%o) of %s does not match old mode (%o)%s%s"
1231 #: builtin/apply.c:3272
1233 msgid "%s: patch does not apply"
1236 #: builtin/apply.c:3285
1238 msgid "Checking patch %s..."
1241 #: builtin/apply.c:3340 builtin/checkout.c:212 builtin/reset.c:158
1243 msgid "make_cache_entry failed for path '%s'"
1244 msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
1246 #: builtin/apply.c:3483
1248 msgid "unable to remove %s from index"
1249 msgstr "不能移动 %s 至 %s"
1251 #: builtin/apply.c:3510
1253 msgid "corrupt patch for subproject %s"
1256 #: builtin/apply.c:3514
1258 msgid "unable to stat newly created file '%s'"
1259 msgstr "不能创建文件 '%s'"
1261 #: builtin/apply.c:3519
1263 msgid "unable to create backing store for newly created file %s"
1266 #: builtin/apply.c:3522
1268 msgid "unable to add cache entry for %s"
1269 msgstr "无法为 '%s' 添加合并结果"
1271 #: builtin/apply.c:3555
1273 msgid "closing file '%s'"
1274 msgstr "正克隆到 '%s'...\n"
1276 #: builtin/apply.c:3604
1278 msgid "unable to write file '%s' mode %o"
1281 #: builtin/apply.c:3660
1283 msgid "Applied patch %s cleanly."
1286 #: builtin/apply.c:3668
1288 msgid "internal error"
1289 msgstr "在版本遍历时遇到内部错误"
1291 #. Say this even without --verbose
1292 #: builtin/apply.c:3671
1294 msgid "Applying patch %%s with %d reject..."
1295 msgid_plural "Applying patch %%s with %d rejects..."
1298 #: builtin/apply.c:3681
1300 msgid "truncating .rej filename to %.*s.rej"
1303 #: builtin/apply.c:3702
1305 msgid "Hunk #%d applied cleanly."
1308 #: builtin/apply.c:3705
1310 msgid "Rejected hunk #%d."
1313 #: builtin/apply.c:3836
1315 msgid "unrecognized input"
1318 #: builtin/apply.c:3847
1320 msgid "unable to read index file"
1323 #: builtin/apply.c:3962 builtin/apply.c:3965
1327 #: builtin/apply.c:3963
1328 msgid "don't apply changes matching the given path"
1331 #: builtin/apply.c:3966
1332 msgid "apply changes matching the given path"
1335 #: builtin/apply.c:3968
1339 #: builtin/apply.c:3969
1340 msgid "remove <num> leading slashes from traditional diff paths"
1343 #: builtin/apply.c:3972
1344 msgid "ignore additions made by the patch"
1347 #: builtin/apply.c:3974
1348 msgid "instead of applying the patch, output diffstat for the input"
1351 #: builtin/apply.c:3978
1352 msgid "shows number of added and deleted lines in decimal notation"
1355 #: builtin/apply.c:3980
1356 msgid "instead of applying the patch, output a summary for the input"
1359 #: builtin/apply.c:3982
1360 msgid "instead of applying the patch, see if the patch is applicable"
1363 #: builtin/apply.c:3984
1364 msgid "make sure the patch is applicable to the current index"
1367 #: builtin/apply.c:3986
1368 msgid "apply a patch without touching the working tree"
1371 #: builtin/apply.c:3988
1372 msgid "also apply the patch (use with --stat/--summary/--check)"
1375 #: builtin/apply.c:3990
1376 msgid "build a temporary index based on embedded index information"
1379 #: builtin/apply.c:3992
1380 msgid "paths are separated with NUL character"
1383 #: builtin/apply.c:3995
1384 msgid "ensure at least <n> lines of context match"
1387 #: builtin/apply.c:3996
1391 #: builtin/apply.c:3997
1392 msgid "detect new or modified lines that have whitespace errors"
1395 #: builtin/apply.c:4000 builtin/apply.c:4003
1396 msgid "ignore changes in whitespace when finding context"
1399 #: builtin/apply.c:4006
1400 msgid "apply the patch in reverse"
1403 #: builtin/apply.c:4008
1404 msgid "don't expect at least one line of context"
1407 #: builtin/apply.c:4010
1408 msgid "leave the rejected hunks in corresponding *.rej files"
1411 #: builtin/apply.c:4012
1412 msgid "allow overlapping hunks"
1415 #: builtin/apply.c:4013
1419 #: builtin/apply.c:4015
1420 msgid "tolerate incorrectly detected missing new-line at the end of file"
1423 #: builtin/apply.c:4018
1424 msgid "do not trust the line counts in the hunk headers"
1427 #: builtin/apply.c:4020
1431 #: builtin/apply.c:4021
1432 msgid "prepend <root> to all filenames"
1435 #: builtin/apply.c:4042
1437 msgid "--index outside a repository"
1438 msgstr "不是一个 git 版本库"
1440 #: builtin/apply.c:4045
1442 msgid "--cached outside a repository"
1443 msgstr "不是一个 git 版本库"
1445 #: builtin/apply.c:4061
1447 msgid "can't open patch '%s'"
1450 #: builtin/apply.c:4075
1452 msgid "squelched %d whitespace error"
1453 msgid_plural "squelched %d whitespace errors"
1456 #: builtin/apply.c:4081 builtin/apply.c:4091
1458 msgid "%d line adds whitespace errors."
1459 msgid_plural "%d lines add whitespace errors."
1462 #: builtin/archive.c:17
1464 msgid "could not create archive file '%s'"
1465 msgstr "不能创建归档文件 '%s'"
1467 #: builtin/archive.c:20
1468 msgid "could not redirect output"
1471 #: builtin/archive.c:37
1472 msgid "git archive: Remote with no URL"
1473 msgstr "git archive:未提供远程URL"
1475 #: builtin/archive.c:58
1476 msgid "git archive: expected ACK/NAK, got EOF"
1477 msgstr "git archive:期待ACK/NACK,却得到EOF"
1479 #: builtin/archive.c:63
1481 msgid "git archive: NACK %s"
1482 msgstr "git archive:NACK %s"
1484 #: builtin/archive.c:65
1486 msgid "remote error: %s"
1489 #: builtin/archive.c:66
1490 msgid "git archive: protocol error"
1491 msgstr "git archive:协议错误"
1493 #: builtin/archive.c:71
1494 msgid "git archive: expected a flush"
1495 msgstr "git archive:预期一个刷新"
1497 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
1498 #: builtin/branch.c:144
1501 "deleting branch '%s' that has been merged to\n"
1502 " '%s', but not yet merged to HEAD."
1504 "将要删除的分支 '%s' 已经被合并到\n"
1507 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
1508 #: builtin/branch.c:148
1511 "not deleting branch '%s' that is not yet merged to\n"
1512 " '%s', even though it is merged to HEAD."
1514 "并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
1515 " 然而却尚未被合并到分支 '%s' 。"
1517 #: builtin/branch.c:180
1518 msgid "cannot use -a with -d"
1519 msgstr "不能将 -a 和 -d 共用"
1521 #: builtin/branch.c:186
1522 msgid "Couldn't look up commit object for HEAD"
1523 msgstr "无法查询 HEAD 指向的提交对象"
1525 #: builtin/branch.c:191
1527 msgid "Cannot delete the branch '%s' which you are currently on."
1528 msgstr "无法删除您当前所在的分支 '%s'。"
1530 #: builtin/branch.c:202
1532 msgid "remote branch '%s' not found."
1533 msgstr "%s分支 '%s' 未发现。"
1535 #: builtin/branch.c:203
1537 msgid "branch '%s' not found."
1538 msgstr "%s分支 '%s' 未发现。"
1540 #: builtin/branch.c:210
1542 msgid "Couldn't look up commit object for '%s'"
1543 msgstr "无法查询 '%s' 指向的提交对象"
1545 #: builtin/branch.c:216
1548 "The branch '%s' is not fully merged.\n"
1549 "If you are sure you want to delete it, run 'git branch -D %s'."
1552 "如果您确认要删除它,执行 'git branch -D %s'。"
1554 #: builtin/branch.c:225
1556 msgid "Error deleting remote branch '%s'"
1557 msgstr "删除 %s分支 '%s' 时出错"
1559 #: builtin/branch.c:226
1561 msgid "Error deleting branch '%s'"
1562 msgstr "删除 %s分支 '%s' 时出错"
1564 #: builtin/branch.c:233
1566 msgid "Deleted remote branch %s (was %s).\n"
1567 msgstr "已删除 %s分支 %s(曾为 %s)。\n"
1569 #: builtin/branch.c:234
1571 msgid "Deleted branch %s (was %s).\n"
1572 msgstr "已删除 %s分支 %s(曾为 %s)。\n"
1574 #: builtin/branch.c:239
1575 msgid "Update of config-file failed"
1576 msgstr "无法更新 config 文件"
1578 #: builtin/branch.c:337
1580 msgid "branch '%s' does not point at a commit"
1581 msgstr "分支 '%s' 未指向一个提交"
1584 #: builtin/branch.c:409
1586 msgid "[%s: behind %d]"
1590 #: builtin/branch.c:411
1596 #: builtin/branch.c:415
1598 msgid "[%s: ahead %d]"
1602 #: builtin/branch.c:417
1608 #: builtin/branch.c:420
1610 msgid "[%s: ahead %d, behind %d]"
1611 msgstr "领先 %d,落后 %d] "
1614 #: builtin/branch.c:423
1616 msgid "[ahead %d, behind %d]"
1617 msgstr "领先 %d,落后 %d] "
1619 #: builtin/branch.c:535
1623 #: builtin/branch.c:600
1624 msgid "some refs could not be read"
1627 #: builtin/branch.c:613
1628 msgid "cannot rename the current branch while not on any."
1629 msgstr "无法重命名当前分支因为不处于任何分支上。"
1631 #: builtin/branch.c:623
1633 msgid "Invalid branch name: '%s'"
1634 msgstr "无效的分支名:'%s'"
1636 #: builtin/branch.c:638
1637 msgid "Branch rename failed"
1640 #: builtin/branch.c:642
1642 msgid "Renamed a misnamed branch '%s' away"
1643 msgstr "重命名掉一个错误命名的旧分支 '%s'"
1645 #: builtin/branch.c:646
1647 msgid "Branch renamed to %s, but HEAD is not updated!"
1648 msgstr "分支重命名为 %s,但 HEAD 没有更新!"
1650 #: builtin/branch.c:653
1651 msgid "Branch is renamed, but update of config-file failed"
1652 msgstr "分支被重命名,但更新 config 文件失败"
1654 #: builtin/branch.c:668
1656 msgid "malformed object name %s"
1659 #: builtin/branch.c:692
1661 msgid "could not write branch description template: %s"
1662 msgstr "不能写分支描述模版:%s\n"
1664 #: builtin/branch.c:783
1665 msgid "Failed to resolve HEAD as a valid ref."
1666 msgstr "无法将 HEAD 解析为有效引用。"
1668 #: builtin/branch.c:788 builtin/clone.c:558
1669 msgid "HEAD not found below refs/heads!"
1670 msgstr "HEAD 没有位于 /refs/heads 之下!"
1672 #: builtin/branch.c:808
1674 msgid "--column and --verbose are incompatible"
1675 msgstr "--all 和 --mirror 不兼容"
1677 #: builtin/branch.c:857
1678 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
1679 msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
1681 #: builtin/bundle.c:47
1683 msgid "%s is okay\n"
1686 #: builtin/bundle.c:56
1687 msgid "Need a repository to create a bundle."
1688 msgstr "需要一个版本库来创建包。"
1690 #: builtin/bundle.c:60
1691 msgid "Need a repository to unbundle."
1692 msgstr "需要一个版本库来解包。"
1694 #: builtin/checkout.c:113 builtin/checkout.c:146
1696 msgid "path '%s' does not have our version"
1697 msgstr "路径 '%s' 没有我们的版本"
1699 #: builtin/checkout.c:115 builtin/checkout.c:148
1701 msgid "path '%s' does not have their version"
1702 msgstr "路径 '%s' 没有他们的版本"
1704 #: builtin/checkout.c:131
1706 msgid "path '%s' does not have all necessary versions"
1707 msgstr "路径 '%s' 没有全部必须的版本"
1709 #: builtin/checkout.c:175
1711 msgid "path '%s' does not have necessary versions"
1712 msgstr "路径 '%s' 没有必须的版本"
1714 #: builtin/checkout.c:192
1716 msgid "path '%s': cannot merge"
1717 msgstr "path '%s':无法合并"
1719 #: builtin/checkout.c:209
1721 msgid "Unable to add merge result for '%s'"
1722 msgstr "无法为 '%s' 添加合并结果"
1724 #: builtin/checkout.c:234 builtin/checkout.c:392
1725 msgid "corrupt index file"
1728 #: builtin/checkout.c:264 builtin/checkout.c:271
1730 msgid "path '%s' is unmerged"
1731 msgstr "路径 '%s' 未合并"
1733 #: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583
1734 #: builtin/merge.c:812
1735 msgid "unable to write new index file"
1738 #: builtin/checkout.c:319 builtin/diff.c:302 builtin/merge.c:408
1739 msgid "diff_setup_done failed"
1740 msgstr "diff_setup_done 失败"
1742 #: builtin/checkout.c:414
1743 msgid "you need to resolve your current index first"
1744 msgstr "您需要先解决当前索引的冲突"
1746 #: builtin/checkout.c:533
1748 msgid "Can not do reflog for '%s'\n"
1749 msgstr "不能对 '%s' 执行 reflog 操作\n"
1751 #: builtin/checkout.c:566
1752 msgid "HEAD is now at"
1755 #: builtin/checkout.c:573
1757 msgid "Reset branch '%s'\n"
1758 msgstr "重置分支 '%s'\n"
1760 #: builtin/checkout.c:576
1762 msgid "Already on '%s'\n"
1763 msgstr "已经位于 '%s'\n"
1765 #: builtin/checkout.c:580
1767 msgid "Switched to and reset branch '%s'\n"
1768 msgstr "切换并重置分支 '%s'\n"
1770 #: builtin/checkout.c:582
1772 msgid "Switched to a new branch '%s'\n"
1773 msgstr "切换到一个新分支 '%s'\n"
1775 #: builtin/checkout.c:584
1777 msgid "Switched to branch '%s'\n"
1778 msgstr "切换到分支 '%s'\n"
1781 #: builtin/checkout.c:640
1783 msgid " ... and %d more.\n"
1784 msgstr " ... 及其它 %d 个。\n"
1786 #. The singular version
1787 #: builtin/checkout.c:646
1790 "Warning: you are leaving %d commit behind, not connected to\n"
1791 "any of your branches:\n"
1795 "Warning: you are leaving %d commits behind, not connected to\n"
1796 "any of your branches:\n"
1800 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
1804 #: builtin/checkout.c:664
1807 "If you want to keep them by creating a new branch, this may be a good time\n"
1810 " git branch new_branch_name %s\n"
1813 "如果您想要通过创建新分支保存他们,这可能是一个好时候。\n"
1816 " git branch new_branch_name %s\n"
1819 #: builtin/checkout.c:694
1820 msgid "internal error in revision walk"
1821 msgstr "在版本遍历时遇到内部错误"
1823 #: builtin/checkout.c:698
1824 msgid "Previous HEAD position was"
1825 msgstr "之前的 HEAD 位置是"
1827 #: builtin/checkout.c:724
1828 msgid "You are on a branch yet to be born"
1829 msgstr "您位于一个尚未初始化的分支"
1832 #: builtin/checkout.c:855
1834 msgid "invalid reference: %s"
1837 #. case (1): want a tree
1838 #: builtin/checkout.c:894
1840 msgid "reference is not a tree: %s"
1843 #: builtin/checkout.c:974
1844 msgid "-B cannot be used with -b"
1845 msgstr "-B 不能和 -b 共用"
1847 #: builtin/checkout.c:983
1848 msgid "--patch is incompatible with all other options"
1849 msgstr "--patch 选项和其他选项不兼容"
1851 #: builtin/checkout.c:986
1852 msgid "--detach cannot be used with -b/-B/--orphan"
1853 msgstr "--detach 不能和 -b/-B/--orphan 共用"
1855 #: builtin/checkout.c:988
1856 msgid "--detach cannot be used with -t"
1857 msgstr "--detach 不能和 -t 共用"
1859 #: builtin/checkout.c:994
1860 msgid "--track needs a branch name"
1861 msgstr "--track 需要一个分支名"
1863 #: builtin/checkout.c:1001
1864 msgid "Missing branch name; try -b"
1865 msgstr "缺少分支名;尝试 -b"
1867 #: builtin/checkout.c:1007
1868 msgid "--orphan and -b|-B are mutually exclusive"
1869 msgstr "--orphan 和 -b|-B 互斥"
1871 #: builtin/checkout.c:1009
1872 msgid "--orphan cannot be used with -t"
1873 msgstr "--orphan 不能和 -t 共用"
1875 #: builtin/checkout.c:1019
1876 msgid "git checkout: -f and -m are incompatible"
1877 msgstr "git checkout:-f 和 -m 不兼容"
1879 #: builtin/checkout.c:1053
1880 msgid "invalid path specification"
1883 #: builtin/checkout.c:1061
1886 "git checkout: updating paths is incompatible with switching branches.\n"
1887 "Did you intend to checkout '%s' which can not be resolved as commit?"
1889 "git checkout:更新路径和切换分支不兼容。\n"
1890 "您是想要检出 '%s' 但未能将其解析为提交么?"
1892 #: builtin/checkout.c:1063
1893 msgid "git checkout: updating paths is incompatible with switching branches."
1894 msgstr "git checkout:更新路径和切换分支不兼容。"
1896 #: builtin/checkout.c:1068
1897 msgid "git checkout: --detach does not take a path argument"
1898 msgstr "git checkout:--detach 不跟路径参数"
1900 #: builtin/checkout.c:1071
1902 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
1903 "checking out of the index."
1905 "git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
1907 #: builtin/checkout.c:1090
1908 msgid "Cannot switch branch to a non-commit."
1909 msgstr "无法切换分支到一个非提交。"
1911 #: builtin/checkout.c:1093
1912 msgid "--ours/--theirs is incompatible with switching branches."
1913 msgstr "--ours/--theirs 和切换分支不兼容。"
1915 #: builtin/clean.c:78
1916 msgid "-x and -X cannot be used together"
1917 msgstr "-x 和 -X 不能共用"
1919 #: builtin/clean.c:82
1921 "clean.requireForce set to true and neither -n nor -f given; refusing to clean"
1923 "clean.requireForce 设置为 true 且未提供 -n 或 -f 选项,拒绝执行清理动作"
1925 #: builtin/clean.c:85
1927 "clean.requireForce defaults to true and neither -n nor -f given; refusing to "
1930 "clean.requireForce 默认为 true 且未提供 -n 或 -f 选项,拒绝执行清理动作"
1932 #: builtin/clean.c:155 builtin/clean.c:176
1934 msgid "Would remove %s\n"
1937 #: builtin/clean.c:159 builtin/clean.c:179
1939 msgid "Removing %s\n"
1942 #: builtin/clean.c:162 builtin/clean.c:182
1944 msgid "failed to remove %s"
1947 #: builtin/clean.c:166
1949 msgid "Would not remove %s\n"
1952 #: builtin/clean.c:168
1954 msgid "Not removing %s\n"
1957 #: builtin/clone.c:243
1959 msgid "reference repository '%s' is not a local directory."
1960 msgstr "引用版本库 '%s' 不是一个本地目录。"
1962 #: builtin/clone.c:302
1964 msgid "failed to open '%s'"
1967 #: builtin/clone.c:306
1969 msgid "failed to create directory '%s'"
1970 msgstr "无法创建目录 '%s'"
1972 #: builtin/clone.c:308 builtin/diff.c:75
1974 msgid "failed to stat '%s'"
1975 msgstr "无法枚举 '%s' 状态"
1977 #: builtin/clone.c:310
1979 msgid "%s exists and is not a directory"
1980 msgstr "%s 存在且不是一个目录"
1982 #: builtin/clone.c:324
1984 msgid "failed to stat %s\n"
1985 msgstr "无法枚举 %s 状态\n"
1987 #: builtin/clone.c:341
1989 msgid "failed to unlink '%s'"
1992 #: builtin/clone.c:346
1994 msgid "failed to create link '%s'"
1995 msgstr "无法创建链接 '%s'"
1997 #: builtin/clone.c:350
1999 msgid "failed to copy file to '%s'"
2000 msgstr "无法拷贝文件至 '%s'"
2002 #: builtin/clone.c:373
2007 #: builtin/clone.c:440
2009 msgid "Could not find remote branch %s to clone."
2010 msgstr "不能发现要克隆的远程分支 %s。"
2012 #: builtin/clone.c:549
2013 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
2014 msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
2016 #: builtin/clone.c:639
2017 msgid "Too many arguments."
2020 #: builtin/clone.c:643
2021 msgid "You must specify a repository to clone."
2022 msgstr "您必须指定一个版本库来克隆。"
2024 #: builtin/clone.c:654
2026 msgid "--bare and --origin %s options are incompatible."
2027 msgstr "--bare 和 --origin %s 选项不兼容。"
2029 #: builtin/clone.c:668
2031 msgid "repository '%s' does not exist"
2032 msgstr "版本库 '%s' 不存在"
2034 #: builtin/clone.c:673
2035 msgid "--depth is ignored in local clones; use file:// instead."
2036 msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
2038 #: builtin/clone.c:683
2040 msgid "destination path '%s' already exists and is not an empty directory."
2041 msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
2043 #: builtin/clone.c:693
2045 msgid "working tree '%s' already exists."
2046 msgstr "工作区 '%s' 已经存在。"
2048 #: builtin/clone.c:706 builtin/clone.c:720
2050 msgid "could not create leading directories of '%s'"
2051 msgstr "不能为 '%s' 创建先导目录"
2053 #: builtin/clone.c:709
2055 msgid "could not create work tree dir '%s'."
2056 msgstr "不能为 '%s' 创建工作区目录。"
2058 #: builtin/clone.c:728
2060 msgid "Cloning into bare repository '%s'...\n"
2061 msgstr "克隆到裸版本库 '%s'...\n"
2063 #: builtin/clone.c:730
2065 msgid "Cloning into '%s'...\n"
2066 msgstr "正克隆到 '%s'...\n"
2068 #: builtin/clone.c:786
2070 msgid "Don't know how to clone %s"
2073 #: builtin/clone.c:835
2075 msgid "Remote branch %s not found in upstream %s"
2076 msgstr "远程分支 %s 在上游 %s 未发现"
2078 #: builtin/clone.c:842
2079 msgid "You appear to have cloned an empty repository."
2080 msgstr "您似乎克隆了一个空版本库。"
2082 #: builtin/column.c:51
2083 msgid "--command must be the first argument"
2086 #: builtin/commit.c:43
2088 "Your name and email address were configured automatically based\n"
2089 "on your username and hostname. Please check that they are accurate.\n"
2090 "You can suppress this message by setting them explicitly:\n"
2092 " git config --global user.name \"Your Name\"\n"
2093 " git config --global user.email you@example.com\n"
2095 "After doing this, you may fix the identity used for this commit with:\n"
2097 " git commit --amend --reset-author\n"
2099 "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
2100 "与否。您可以通过下面的命令对其进行明确地设置以免再出现本提示信息:\n"
2102 " git config --global user.name \"Your Name\"\n"
2103 " git config --global user.email you@example.com\n"
2105 "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
2107 " git commit --amend --reset-author\n"
2109 #: builtin/commit.c:55
2111 "You asked to amend the most recent commit, but doing so would make\n"
2112 "it empty. You can repeat your command with --allow-empty, or you can\n"
2113 "remove the commit entirely with \"git reset HEAD^\".\n"
2115 "您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
2116 "--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
2118 #: builtin/commit.c:60
2120 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
2121 "If you wish to commit it anyway, use:\n"
2123 " git commit --allow-empty\n"
2125 "Otherwise, please use 'git reset'\n"
2127 "之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
2130 " git commit --allow-empty\n"
2132 "否则,请使用命令 'git reset'\n"
2134 #: builtin/commit.c:253
2135 msgid "failed to unpack HEAD tree object"
2136 msgstr "无法解包 HEAD 树对象"
2138 #: builtin/commit.c:295
2139 msgid "unable to create temporary index"
2142 #: builtin/commit.c:301
2143 msgid "interactive add failed"
2146 #: builtin/commit.c:334 builtin/commit.c:355 builtin/commit.c:405
2147 msgid "unable to write new_index file"
2148 msgstr "无法写 new_index 文件"
2150 # 译者:%s若翻为中文,前后不需要空格
2151 #: builtin/commit.c:386
2153 msgid "cannot do a partial commit during a merge."
2154 msgstr "在%s过程中不能做部分提交。"
2156 # 译者:%s若翻为中文,前后不需要空格
2157 #: builtin/commit.c:388
2159 msgid "cannot do a partial commit during a cherry-pick."
2160 msgstr "在%s过程中不能做部分提交。"
2162 #: builtin/commit.c:398
2163 msgid "cannot read the index"
2166 #: builtin/commit.c:418
2167 msgid "unable to write temporary index file"
2170 #: builtin/commit.c:493 builtin/commit.c:499
2172 msgid "invalid commit: %s"
2175 #: builtin/commit.c:522
2176 msgid "malformed --author parameter"
2177 msgstr "非法的 --author 参数"
2179 #: builtin/commit.c:583
2181 msgid "Malformed ident string: '%s'"
2182 msgstr "非法的身份字符串:'%s'"
2184 #: builtin/commit.c:621 builtin/commit.c:654 builtin/commit.c:968
2186 msgid "could not lookup commit %s"
2189 #: builtin/commit.c:633 builtin/shortlog.c:296
2191 msgid "(reading log message from standard input)\n"
2192 msgstr "(正从标准输入中读取日志信息)\n"
2194 #: builtin/commit.c:635
2195 msgid "could not read log from standard input"
2196 msgstr "不能从标准输入中读取日志信息"
2198 #: builtin/commit.c:639
2200 msgid "could not read log file '%s'"
2201 msgstr "不能读取日志文件 '%s'"
2203 #: builtin/commit.c:645
2204 msgid "commit has empty message"
2207 #: builtin/commit.c:661
2208 msgid "could not read MERGE_MSG"
2209 msgstr "不能读取 MERGE_MSG"
2211 #: builtin/commit.c:665
2212 msgid "could not read SQUASH_MSG"
2213 msgstr "不能读取 SQUASH_MSG"
2215 #: builtin/commit.c:669
2217 msgid "could not read '%s'"
2220 #: builtin/commit.c:721
2221 msgid "could not write commit template"
2224 # 译者:%s若翻为中文,前后不需要空格
2225 #: builtin/commit.c:732
2229 "It looks like you may be committing a merge.\n"
2230 "If this is not correct, please remove the file\n"
2240 # 译者:%s若翻为中文,前后不需要空格
2241 #: builtin/commit.c:737
2245 "It looks like you may be committing a cherry-pick.\n"
2246 "If this is not correct, please remove the file\n"
2256 # 译者:中文字符串拼接,可删除前导空格
2257 #: builtin/commit.c:749
2260 "Please enter the commit message for your changes. Lines starting\n"
2261 "with '#' will be ignored, and an empty message aborts the commit.\n"
2264 "的行将被忽略,并且空的提交说明将会中止提交。\n"
2266 # 译者:中文字符串拼接,可删除前导空格
2267 #: builtin/commit.c:754
2270 "Please enter the commit message for your changes. Lines starting\n"
2271 "with '#' will be kept; you may remove them yourself if you want to.\n"
2272 "An empty message aborts the commit.\n"
2275 "的行将被保留,您可以删除它们如果您想这样做的话。空的提交说明将会\n"
2278 # 译者:为保证在输出中对齐,注意调整句中空格!
2279 #: builtin/commit.c:767
2281 msgid "%sAuthor: %s"
2284 # 译者:为保证在输出中对齐,注意调整句中空格!
2285 #: builtin/commit.c:774
2287 msgid "%sCommitter: %s"
2290 #: builtin/commit.c:794
2291 msgid "Cannot read index"
2294 #: builtin/commit.c:831
2295 msgid "Error building trees"
2298 #: builtin/commit.c:846 builtin/tag.c:361
2300 msgid "Please supply the message using either -m or -F option.\n"
2301 msgstr "请使用 -m 或者 -F 选项提供提交说明。\n"
2303 #: builtin/commit.c:943
2305 msgid "No existing author found with '%s'"
2306 msgstr "没有找到匹配 '%s' 的作者"
2308 #: builtin/commit.c:958 builtin/commit.c:1158
2310 msgid "Invalid untracked files mode '%s'"
2311 msgstr "无效的未追踪文件参数 '%s'"
2313 #: builtin/commit.c:998
2314 msgid "Using both --reset-author and --author does not make sense"
2315 msgstr "同时使用 --reset-author 和 --author 没有意义"
2317 #: builtin/commit.c:1009
2318 msgid "You have nothing to amend."
2321 # 译者:%s若翻为中文,前后不需要空格
2322 #: builtin/commit.c:1012
2324 msgid "You are in the middle of a merge -- cannot amend."
2325 msgstr "您正处于一个%s的过程中 -- 无法修补提交。"
2327 # 译者:%s若翻为中文,前后不需要空格
2328 #: builtin/commit.c:1014
2330 msgid "You are in the middle of a cherry-pick -- cannot amend."
2331 msgstr "您正处于一个%s的过程中 -- 无法修补提交。"
2333 #: builtin/commit.c:1017
2334 msgid "Options --squash and --fixup cannot be used together"
2335 msgstr "选项 --squash 和 --fixup 不能共用"
2337 #: builtin/commit.c:1027
2338 msgid "Only one of -c/-C/-F/--fixup can be used."
2339 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
2341 #: builtin/commit.c:1029
2342 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
2343 msgstr "选项 -m 不能和 -c/-C/-F/--fixup 共用。"
2345 #: builtin/commit.c:1037
2346 msgid "--reset-author can be used only with -C, -c or --amend."
2347 msgstr "--reset-author 只能和 -C、-c 或 --amend 共用。"
2349 #: builtin/commit.c:1054
2350 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
2351 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
2353 #: builtin/commit.c:1056
2354 msgid "No paths with --include/--only does not make sense."
2355 msgstr "参数 --include/--only 不跟路径没有意义。"
2357 #: builtin/commit.c:1058
2358 msgid "Clever... amending the last one with dirty index."
2359 msgstr "聪明... 在索引不干净下修补最后的提交。"
2361 #: builtin/commit.c:1060
2362 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
2363 msgstr "指定了明确的路径而没有使用 -i 或 -o 选项;认为是 --only paths..."
2365 #: builtin/commit.c:1070 builtin/tag.c:577
2367 msgid "Invalid cleanup mode %s"
2370 #: builtin/commit.c:1075
2371 msgid "Paths with -a does not make sense."
2372 msgstr "路径和 -a 选项共用没有意义。"
2374 #: builtin/commit.c:1258
2375 msgid "couldn't look up newly created commit"
2378 #: builtin/commit.c:1260
2379 msgid "could not parse newly created commit"
2382 #: builtin/commit.c:1301
2383 msgid "detached HEAD"
2386 # 译者:中文字符串拼接,可删除前导空格
2387 #: builtin/commit.c:1303
2388 msgid " (root-commit)"
2391 #: builtin/commit.c:1447
2392 msgid "could not parse HEAD commit"
2393 msgstr "不能解析 HEAD 提交"
2395 #: builtin/commit.c:1485 builtin/merge.c:509
2397 msgid "could not open '%s' for reading"
2398 msgstr "不能为读入打开 '%s'"
2400 #: builtin/commit.c:1492
2402 msgid "Corrupt MERGE_HEAD file (%s)"
2403 msgstr "损坏的 MERGE_HEAD 文件(%s)"
2405 #: builtin/commit.c:1499
2406 msgid "could not read MERGE_MODE"
2407 msgstr "不能读取 MERGE_MODE"
2409 #: builtin/commit.c:1518
2411 msgid "could not read commit message: %s"
2412 msgstr "不能读取提交说明:%s"
2414 #: builtin/commit.c:1532
2416 msgid "Aborting commit; you did not edit the message.\n"
2417 msgstr "终止提交;您未更改来自模版的提交说明。\n"
2419 #: builtin/commit.c:1537
2421 msgid "Aborting commit due to empty commit message.\n"
2422 msgstr "终止提交因为提交说明为空。\n"
2424 #: builtin/commit.c:1552 builtin/merge.c:936 builtin/merge.c:961
2425 msgid "failed to write commit object"
2428 #: builtin/commit.c:1573
2429 msgid "cannot lock HEAD ref"
2430 msgstr "无法锁定 HEAD 引用"
2432 #: builtin/commit.c:1577
2433 msgid "cannot update HEAD ref"
2434 msgstr "无法更新 HEAD 引用"
2436 #: builtin/commit.c:1588
2438 "Repository has been updated, but unable to write\n"
2439 "new_index file. Check that disk is not full or quota is\n"
2440 "not exceeded, and then \"git reset HEAD\" to recover."
2442 "版本库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
2443 "或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
2445 #: builtin/describe.c:234
2447 msgid "annotated tag %s not available"
2448 msgstr "注释 tag %s 无效"
2450 #: builtin/describe.c:238
2452 msgid "annotated tag %s has no embedded name"
2453 msgstr "注释 tag %s 没有嵌入名称"
2455 #: builtin/describe.c:240
2457 msgid "tag '%s' is really '%s' here"
2458 msgstr "tag '%s' 的确是在 '%s'"
2460 #: builtin/describe.c:267
2462 msgid "Not a valid object name %s"
2463 msgstr "不是一个有效的对象名 %s"
2465 #: builtin/describe.c:270
2467 msgid "%s is not a valid '%s' object"
2468 msgstr "%s 不是一个有效的 '%s' 对象"
2470 #: builtin/describe.c:287
2472 msgid "no tag exactly matches '%s'"
2473 msgstr "没有 tag 准确匹配 '%s'"
2475 #: builtin/describe.c:289
2477 msgid "searching to describe %s\n"
2480 #: builtin/describe.c:329
2482 msgid "finished search at %s\n"
2485 #: builtin/describe.c:353
2488 "No annotated tags can describe '%s'.\n"
2489 "However, there were unannotated tags: try --tags."
2491 "没有注释 tag 能描述 '%s'。\n"
2492 "然而,有非注释 tag:尝试 --tags。"
2494 #: builtin/describe.c:357
2497 "No tags can describe '%s'.\n"
2498 "Try --always, or create some tags."
2500 "没有注释 tag 能描述 '%s'。\n"
2501 "尝试 --always,或者创建一些 tag。"
2503 #: builtin/describe.c:378
2505 msgid "traversed %lu commits\n"
2506 msgstr "已遍历 %lu 个提交\n"
2508 #: builtin/describe.c:381
2511 "more than %i tags found; listed %i most recent\n"
2512 "gave up search at %s\n"
2514 "发现多于 %i 个 tag,列出最近的 %i 个\n"
2517 #: builtin/describe.c:436
2518 msgid "--long is incompatible with --abbrev=0"
2519 msgstr "--long 与 --abbrev=0 不兼容"
2521 #: builtin/describe.c:462
2522 msgid "No names found, cannot describe anything."
2523 msgstr "没有发现名称,无法描述任何东西。"
2525 #: builtin/describe.c:482
2526 msgid "--dirty is incompatible with committishes"
2527 msgstr "--dirty 不能与提交共用"
2529 #: builtin/diff.c:77
2531 msgid "'%s': not a regular file or symlink"
2532 msgstr "'%s':不是一个正规文件或符号链接"
2534 #: builtin/diff.c:220
2536 msgid "invalid option: %s"
2539 #: builtin/diff.c:297
2540 msgid "Not a git repository"
2541 msgstr "不是一个 git 版本库"
2543 #: builtin/diff.c:347
2545 msgid "invalid object '%s' given."
2546 msgstr "提供了无效对象 '%s'。"
2548 #: builtin/diff.c:352
2550 msgid "more than %d trees given: '%s'"
2551 msgstr "提供了超过 %d 个树对象:'%s'"
2553 #: builtin/diff.c:362
2555 msgid "more than two blobs given: '%s'"
2556 msgstr "提供了超过两个 blob 对象:'%s'"
2558 #: builtin/diff.c:370
2560 msgid "unhandled object '%s' given."
2561 msgstr "提供了无法处理的对象 '%s'。"
2563 #: builtin/fetch.c:200
2564 msgid "Couldn't find remote ref HEAD"
2565 msgstr "无法发现远程 HEAD 引用"
2567 #: builtin/fetch.c:253
2569 msgid "object %s not found"
2572 #: builtin/fetch.c:259
2573 msgid "[up to date]"
2576 #: builtin/fetch.c:273
2578 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
2579 msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)"
2581 #: builtin/fetch.c:274 builtin/fetch.c:360
2585 #: builtin/fetch.c:285
2586 msgid "[tag update]"
2590 #: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340
2591 msgid " (unable to update local ref)"
2592 msgstr " (不能更新本地引用)"
2594 #: builtin/fetch.c:305
2598 #: builtin/fetch.c:308
2599 msgid "[new branch]"
2602 #: builtin/fetch.c:311
2606 #: builtin/fetch.c:356
2607 msgid "unable to update local ref"
2610 #: builtin/fetch.c:356
2611 msgid "forced update"
2614 #: builtin/fetch.c:362
2615 msgid "(non-fast-forward)"
2618 #: builtin/fetch.c:393 builtin/fetch.c:685
2620 msgid "cannot open %s: %s\n"
2621 msgstr "无法打开 %s:%s\n"
2623 #: builtin/fetch.c:402
2625 msgid "%s did not send all necessary objects\n"
2626 msgstr "%s 未发送所有必须的对象\n"
2628 #: builtin/fetch.c:488
2633 #: builtin/fetch.c:499
2636 "some local refs could not be updated; try running\n"
2637 " 'git remote prune %s' to remove any old, conflicting branches"
2639 "一些本地引用不能被更新;尝试运行\n"
2640 " 'git remote prune %s' 来删除旧的、有冲突的分支"
2643 #: builtin/fetch.c:549
2645 msgid " (%s will become dangling)"
2646 msgstr " (%s 将成为悬空状态)\n"
2649 #: builtin/fetch.c:550
2651 msgid " (%s has become dangling)"
2652 msgstr " (%s 已成为悬空状态)\n"
2654 #: builtin/fetch.c:557
2658 #: builtin/fetch.c:558 builtin/remote.c:1055
2662 #: builtin/fetch.c:675
2664 msgid "Refusing to fetch into current branch %s of non-bare repository"
2665 msgstr "拒绝获取到非裸版本库的当前分支 %s"
2667 #: builtin/fetch.c:709
2669 msgid "Don't know how to fetch from %s"
2670 msgstr "不知道如何从 %s 获取"
2672 #: builtin/fetch.c:786
2674 msgid "Option \"%s\" value \"%s\" is not valid for %s"
2675 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
2677 #: builtin/fetch.c:789
2679 msgid "Option \"%s\" is ignored for %s\n"
2680 msgstr "选项 \"%s\" 对于 %s 被忽略\n"
2682 #: builtin/fetch.c:888
2684 msgid "Fetching %s\n"
2687 #: builtin/fetch.c:890 builtin/remote.c:100
2689 msgid "Could not fetch %s"
2692 #: builtin/fetch.c:907
2694 "No remote repository specified. Please, specify either a URL or a\n"
2695 "remote name from which new revisions should be fetched."
2696 msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定,用以获取新提交。"
2698 #: builtin/fetch.c:927
2699 msgid "You need to specify a tag name."
2700 msgstr "您需要指定一个 tag 名称。"
2702 #: builtin/fetch.c:979
2703 msgid "fetch --all does not take a repository argument"
2704 msgstr "fetch --all 不能带一个版本库参数"
2706 #: builtin/fetch.c:981
2707 msgid "fetch --all does not make sense with refspecs"
2708 msgstr "fetch --all 带引用表达式没有任何意义"
2710 #: builtin/fetch.c:992
2712 msgid "No such remote or remote group: %s"
2713 msgstr "没有这样的远程或远程组:%s"
2715 #: builtin/fetch.c:1000
2716 msgid "Fetching a group and specifying refspecs does not make sense"
2717 msgstr "获取组并指定引用表达式没有意义"
2721 msgid "Invalid %s: '%s'"
2722 msgstr "无效的 %s:'%s'"
2726 msgid "insanely long object directory %.*s"
2727 msgstr "不正常的长对象目录 %.*s"
2731 msgid "Auto packing the repository for optimum performance.\n"
2732 msgstr "自动打包版本库以求最佳性能。\n"
2737 "Auto packing the repository for optimum performance. You may also\n"
2738 "run \"git gc\" manually. See \"git help gc\" for more information.\n"
2740 "自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n"
2741 "参见 \"git help gc\" 以获取更多信息。\n"
2745 "There are too many unreachable loose objects; run 'git prune' to remove them."
2746 msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
2748 #: builtin/grep.c:216
2750 msgid "grep: failed to create thread: %s"
2751 msgstr "grep:无法创建线程:%s"
2753 #: builtin/grep.c:402
2755 msgid "Failed to chdir: %s"
2758 #: builtin/grep.c:478 builtin/grep.c:512
2760 msgid "unable to read tree (%s)"
2763 #: builtin/grep.c:526
2765 msgid "unable to grep from object of type %s"
2766 msgstr "无法抓取来自于 %s 类型的对象"
2768 #: builtin/grep.c:584
2770 msgid "switch `%c' expects a numerical value"
2771 msgstr "开关 `%c' 期望一个数字值"
2773 #: builtin/grep.c:601
2775 msgid "cannot open '%s'"
2778 #: builtin/grep.c:888
2779 msgid "no pattern given."
2782 #: builtin/grep.c:902
2784 msgid "bad object %s"
2787 #: builtin/grep.c:943
2788 msgid "--open-files-in-pager only works on the worktree"
2789 msgstr "--open-files-in-pager 仅用于工作区"
2791 #: builtin/grep.c:966
2792 msgid "--cached or --untracked cannot be used with --no-index."
2793 msgstr "--cached 或 --untracked 不能与 --no-index 共用。"
2795 #: builtin/grep.c:971
2796 msgid "--no-index or --untracked cannot be used with revs."
2797 msgstr "--no-index 或 --untracked 不能和版本共用。"
2799 #: builtin/grep.c:974
2800 msgid "--[no-]exclude-standard cannot be used for tracked contents."
2801 msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
2803 #: builtin/grep.c:982
2804 msgid "both --cached and trees are given."
2805 msgstr "同时给出了 --cached 和树对象。"
2807 #: builtin/help.c:59
2809 msgid "unrecognized help format '%s'"
2812 #: builtin/help.c:87
2814 msgid "Failed to start emacsclient."
2815 msgstr "无法枚举 %s 状态\n"
2817 #: builtin/help.c:100
2819 msgid "Failed to parse emacsclient version."
2820 msgstr "无法读取对象 '%s'。"
2822 #: builtin/help.c:108
2824 msgid "emacsclient version '%d' too old (< 22)."
2827 #: builtin/help.c:126 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
2829 msgid "failed to exec '%s': %s"
2832 #: builtin/help.c:211
2835 "'%s': path for unsupported man viewer.\n"
2836 "Please consider using 'man.<tool>.cmd' instead."
2839 #: builtin/help.c:223
2842 "'%s': cmd for supported man viewer.\n"
2843 "Please consider using 'man.<tool>.path' instead."
2846 #: builtin/help.c:287
2847 msgid "The most commonly used git commands are:"
2850 #: builtin/help.c:355
2852 msgid "'%s': unknown man viewer."
2855 #: builtin/help.c:372
2857 msgid "no man viewer handled the request"
2858 msgstr "没有合并策略处理此合并。\n"
2860 #: builtin/help.c:380
2861 msgid "no info viewer handled the request"
2864 #: builtin/help.c:391
2866 msgid "'%s': not a documentation directory."
2869 #: builtin/help.c:432 builtin/help.c:439
2874 #: builtin/help.c:453
2876 msgid "`git %s' is aliased to `%s'"
2879 #: builtin/index-pack.c:169
2881 msgid "object type mismatch at %s"
2884 #: builtin/index-pack.c:189
2885 msgid "object of unexpected type"
2888 #: builtin/index-pack.c:226
2890 msgid "cannot fill %d byte"
2891 msgid_plural "cannot fill %d bytes"
2892 msgstr[0] "无法获知当前路径"
2894 #: builtin/index-pack.c:236
2898 #: builtin/index-pack.c:237
2899 msgid "read error on input"
2902 #: builtin/index-pack.c:249
2903 msgid "used more bytes than were available"
2906 #: builtin/index-pack.c:256
2907 msgid "pack too large for current definition of off_t"
2910 #: builtin/index-pack.c:272
2912 msgid "unable to create '%s'"
2915 #: builtin/index-pack.c:277
2917 msgid "cannot open packfile '%s'"
2918 msgstr "无法打开补丁文件 %s"
2920 #: builtin/index-pack.c:291
2921 msgid "pack signature mismatch"
2924 #: builtin/index-pack.c:311
2926 msgid "pack has bad object at offset %lu: %s"
2929 #: builtin/index-pack.c:405
2931 msgid "inflate returned %d"
2934 #: builtin/index-pack.c:450
2935 msgid "offset value overflow for delta base object"
2938 #: builtin/index-pack.c:458
2939 msgid "delta base offset is out of bound"
2942 #: builtin/index-pack.c:466
2944 msgid "unknown object type %d"
2947 #: builtin/index-pack.c:495
2949 msgid "cannot pread pack file"
2950 msgstr "无法打开补丁文件 %s"
2952 #: builtin/index-pack.c:497
2954 msgid "premature end of pack file, %lu byte missing"
2955 msgid_plural "premature end of pack file, %lu bytes missing"
2958 #: builtin/index-pack.c:510
2959 msgid "serious inflate inconsistency"
2962 #: builtin/index-pack.c:583
2964 msgid "cannot read existing object %s"
2967 #: builtin/index-pack.c:586
2969 msgid "SHA1 COLLISION FOUND WITH %s !"
2972 #: builtin/index-pack.c:598
2974 msgid "invalid blob object %s"
2975 msgstr "不是一个有效对象:%s"
2977 #: builtin/index-pack.c:610
2982 #: builtin/index-pack.c:612
2983 msgid "Error in object"
2986 #: builtin/index-pack.c:614
2988 msgid "Not all child objects of %s are reachable"
2991 #: builtin/index-pack.c:687 builtin/index-pack.c:713
2993 msgid "failed to apply delta"
2994 msgstr "无法拷贝文件至 '%s'"
2996 #: builtin/index-pack.c:850
2998 msgid "Receiving objects"
2999 msgstr "删除对象 %s 的注解\n"
3001 #: builtin/index-pack.c:850
3003 msgid "Indexing objects"
3006 #: builtin/index-pack.c:872
3007 msgid "pack is corrupted (SHA1 mismatch)"
3010 #: builtin/index-pack.c:877
3012 msgid "cannot fstat packfile"
3013 msgstr "不能枚举模版 '%s' 状态"
3015 #: builtin/index-pack.c:880
3016 msgid "pack has junk at the end"
3019 #: builtin/index-pack.c:903
3021 msgid "Resolving deltas"
3024 #: builtin/index-pack.c:954
3025 msgid "confusion beyond insanity"
3028 #: builtin/index-pack.c:973
3030 msgid "pack has %d unresolved delta"
3031 msgid_plural "pack has %d unresolved deltas"
3034 #: builtin/index-pack.c:998
3036 msgid "unable to deflate appended object (%d)"
3039 #: builtin/index-pack.c:1077
3041 msgid "local object %s is corrupt"
3044 #: builtin/index-pack.c:1101
3045 msgid "error while closing pack file"
3048 #: builtin/index-pack.c:1114
3050 msgid "cannot write keep file '%s'"
3051 msgstr "不能枚举模版 '%s' 状态"
3053 #: builtin/index-pack.c:1122
3055 msgid "cannot close written keep file '%s'"
3056 msgstr "不能枚举模版 '%s' 状态"
3058 #: builtin/index-pack.c:1135
3060 msgid "cannot store pack file"
3061 msgstr "无法打开补丁文件 %s"
3063 #: builtin/index-pack.c:1146
3065 msgid "cannot store index file"
3068 #: builtin/index-pack.c:1247
3070 msgid "Cannot open existing pack file '%s'"
3071 msgstr "无法打开补丁文件 %s"
3073 #: builtin/index-pack.c:1249
3075 msgid "Cannot open existing pack idx file for '%s'"
3076 msgstr "无法打开补丁文件 %s"
3078 #: builtin/index-pack.c:1296
3080 msgid "non delta: %d object"
3081 msgid_plural "non delta: %d objects"
3082 msgstr[0] "不是一个有效对象:%s"
3084 #: builtin/index-pack.c:1303
3086 msgid "chain length = %d: %lu object"
3087 msgid_plural "chain length = %d: %lu objects"
3090 #: builtin/index-pack.c:1330
3091 msgid "Cannot come back to cwd"
3094 #: builtin/index-pack.c:1374 builtin/index-pack.c:1377
3095 #: builtin/index-pack.c:1389 builtin/index-pack.c:1393
3100 #: builtin/index-pack.c:1407
3102 msgid "--fix-thin cannot be used without --stdin"
3103 msgstr "--orphan 不能和 -t 共用"
3105 #: builtin/index-pack.c:1411 builtin/index-pack.c:1421
3107 msgid "packfile name '%s' does not end with '.pack'"
3110 #: builtin/index-pack.c:1430
3111 msgid "--verify with no packfile name given"
3114 #: builtin/init-db.c:35
3116 msgid "Could not make %s writable by group"
3117 msgstr "不能设置 %s 为组可写"
3119 #: builtin/init-db.c:62
3121 msgid "insanely long template name %s"
3124 #: builtin/init-db.c:67
3126 msgid "cannot stat '%s'"
3127 msgstr "不能枚举 '%s' 状态"
3129 #: builtin/init-db.c:73
3131 msgid "cannot stat template '%s'"
3132 msgstr "不能枚举模版 '%s' 状态"
3134 #: builtin/init-db.c:80
3136 msgid "cannot opendir '%s'"
3137 msgstr "不能打开目录 '%s'"
3139 #: builtin/init-db.c:97
3141 msgid "cannot readlink '%s'"
3142 msgstr "不能读取链接 '%s'"
3144 #: builtin/init-db.c:99
3146 msgid "insanely long symlink %s"
3149 #: builtin/init-db.c:102
3151 msgid "cannot symlink '%s' '%s'"
3152 msgstr "不能自 '%s' 到 '%s' 创建符号链接"
3154 #: builtin/init-db.c:106
3156 msgid "cannot copy '%s' to '%s'"
3157 msgstr "不能拷贝 '%s' 至 '%s'"
3159 #: builtin/init-db.c:110
3161 msgid "ignoring template %s"
3164 #: builtin/init-db.c:133
3166 msgid "insanely long template path %s"
3169 #: builtin/init-db.c:141
3171 msgid "templates not found %s"
3174 #: builtin/init-db.c:154
3176 msgid "not copying templates of a wrong format version %d from '%s'"
3177 msgstr "未复制错误版本 %d 的模版自 '%s'"
3179 #: builtin/init-db.c:192
3181 msgid "insane git directory %s"
3182 msgstr "不正常的 git 目录 %s"
3184 #: builtin/init-db.c:322 builtin/init-db.c:325
3186 msgid "%s already exists"
3189 #: builtin/init-db.c:354
3191 msgid "unable to handle file type %d"
3192 msgstr "不能处理 %d 类型的文件"
3194 #: builtin/init-db.c:357
3196 msgid "unable to move %s to %s"
3197 msgstr "不能移动 %s 至 %s"
3199 #: builtin/init-db.c:362
3201 msgid "Could not create git link %s"
3202 msgstr "不能创建 git link %s"
3205 #. * TRANSLATORS: The first '%s' is either "Reinitialized
3206 #. * existing" or "Initialized empty", the second " shared" or
3207 #. * "", and the last '%s%s' is the verbatim directory name.
3209 #: builtin/init-db.c:419
3211 msgid "%s%s Git repository in %s%s\n"
3212 msgstr "%s%s Git 版本库于 %s%s\n"
3214 #: builtin/init-db.c:420
3215 msgid "Reinitialized existing"
3218 #: builtin/init-db.c:420
3219 msgid "Initialized empty"
3222 # 译者:中文字符串拼接,可删除前导空格
3223 #: builtin/init-db.c:421
3227 #: builtin/init-db.c:440
3228 msgid "cannot tell cwd"
3231 #: builtin/init-db.c:521 builtin/init-db.c:528
3233 msgid "cannot mkdir %s"
3236 #: builtin/init-db.c:532
3238 msgid "cannot chdir to %s"
3241 #: builtin/init-db.c:554
3244 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
3247 "不允许 %s(或 --work-tree=<directory>)而没有指定 %s(或 --git-"
3250 #: builtin/init-db.c:578
3251 msgid "Cannot access current working directory"
3254 #: builtin/init-db.c:585
3256 msgid "Cannot access work tree '%s'"
3257 msgstr "不能访问工作区 '%s'"
3259 #: builtin/log.c:188
3261 msgid "Final output: %d %s\n"
3262 msgstr "最终输出:%d %s\n"
3264 #: builtin/log.c:401 builtin/log.c:489
3266 msgid "Could not read object %s"
3269 #: builtin/log.c:513
3271 msgid "Unknown type: %d"
3274 #: builtin/log.c:602
3275 msgid "format.headers without value"
3276 msgstr "format.headers 没有值"
3278 #: builtin/log.c:675
3279 msgid "name of output directory is too long"
3282 #: builtin/log.c:686
3284 msgid "Cannot open patch file %s"
3285 msgstr "无法打开补丁文件 %s"
3287 #: builtin/log.c:700
3288 msgid "Need exactly one range."
3291 #: builtin/log.c:708
3292 msgid "Not a range."
3295 #: builtin/log.c:745
3296 msgid "Could not extract email from committer identity."
3297 msgstr "不能从提交者身份中提取邮件地址。"
3299 #: builtin/log.c:791
3300 msgid "Cover letter needs email format"
3303 #: builtin/log.c:885
3305 msgid "insane in-reply-to: %s"
3306 msgstr "不正常的 in-reply-to:%s"
3308 #: builtin/log.c:958
3309 msgid "Two output directories?"
3312 #: builtin/log.c:1179
3314 msgid "bogus committer info %s"
3315 msgstr "虚假的提交者信息 %s"
3317 #: builtin/log.c:1224
3318 msgid "-n and -k are mutually exclusive."
3319 msgstr "-n 和 -k 互斥。"
3321 #: builtin/log.c:1226
3322 msgid "--subject-prefix and -k are mutually exclusive."
3323 msgstr "--subject-prefix 和 -k 互斥。"
3325 #: builtin/log.c:1234
3326 msgid "--name-only does not make sense"
3327 msgstr "--name-only 无意义"
3329 #: builtin/log.c:1236
3330 msgid "--name-status does not make sense"
3331 msgstr "--name-status 无意义"
3333 #: builtin/log.c:1238
3334 msgid "--check does not make sense"
3335 msgstr "--check 无意义"
3337 #: builtin/log.c:1261
3338 msgid "standard output, or directory, which one?"
3339 msgstr "标准输出或目录,哪一个?"
3341 #: builtin/log.c:1263
3343 msgid "Could not create directory '%s'"
3344 msgstr "不能创建目录 '%s'"
3346 #: builtin/log.c:1416
3347 msgid "Failed to create output files"
3350 #: builtin/log.c:1520
3353 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
3354 msgstr "不能找到跟踪的远程分支,请手工指定 <upstream>。\n"
3356 #: builtin/log.c:1536 builtin/log.c:1538 builtin/log.c:1550
3358 msgid "Unknown commit %s"
3361 #: builtin/merge.c:90
3362 msgid "switch `m' requires a value"
3363 msgstr "开关 `m' 需要一个值"
3365 #: builtin/merge.c:127
3367 msgid "Could not find merge strategy '%s'.\n"
3368 msgstr "不能找到合并策略 '%s'。\n"
3370 #: builtin/merge.c:128
3372 msgid "Available strategies are:"
3375 #: builtin/merge.c:133
3377 msgid "Available custom strategies are:"
3380 #: builtin/merge.c:240
3381 msgid "could not run stash."
3384 #: builtin/merge.c:245
3385 msgid "stash failed"
3388 #: builtin/merge.c:250
3390 msgid "not a valid object: %s"
3391 msgstr "不是一个有效对象:%s"
3393 #: builtin/merge.c:269 builtin/merge.c:286
3394 msgid "read-tree failed"
3398 #: builtin/merge.c:316
3399 msgid " (nothing to squash)"
3402 #: builtin/merge.c:329
3404 msgid "Squash commit -- not updating HEAD\n"
3405 msgstr "压缩提交 -- 未更新 HEAD\n"
3407 #: builtin/merge.c:361
3408 msgid "Writing SQUASH_MSG"
3409 msgstr "写入 SQUASH_MSG"
3411 #: builtin/merge.c:363
3412 msgid "Finishing SQUASH_MSG"
3413 msgstr "完成 SQUASH_MSG"
3415 #: builtin/merge.c:386
3417 msgid "No merge message -- not updating HEAD\n"
3418 msgstr "无合并信息 -- 未更新 HEAD\n"
3420 #: builtin/merge.c:437
3422 msgid "'%s' does not point to a commit"
3423 msgstr "'%s' 没有指向一个提交"
3425 #: builtin/merge.c:536
3427 msgid "Bad branch.%s.mergeoptions string: %s"
3428 msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
3430 #: builtin/merge.c:629
3431 msgid "git write-tree failed to write a tree"
3432 msgstr "git write-tree 无法写入一树对象"
3434 #: builtin/merge.c:679
3435 msgid "failed to read the cache"
3438 #: builtin/merge.c:697
3439 msgid "Unable to write index."
3442 #: builtin/merge.c:710
3443 msgid "Not handling anything other than two heads merge."
3444 msgstr "不能处理两个头合并之外的任何操作。"
3446 #: builtin/merge.c:724
3448 msgid "Unknown option for merge-recursive: -X%s"
3449 msgstr "merge-recursive 的未知选项:-X%s"
3451 #: builtin/merge.c:738
3453 msgid "unable to write %s"
3456 #: builtin/merge.c:877
3458 msgid "Could not read from '%s'"
3459 msgstr "不能从 '%s' 读取"
3461 #: builtin/merge.c:886
3463 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
3464 msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
3466 #: builtin/merge.c:892
3468 "Please enter a commit message to explain why this merge is necessary,\n"
3469 "especially if it merges an updated upstream into a topic branch.\n"
3471 "Lines starting with '#' will be ignored, and an empty message aborts\n"
3474 "请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
3477 "以 '#' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
3479 #: builtin/merge.c:916
3480 msgid "Empty commit message."
3483 #: builtin/merge.c:928
3485 msgid "Wonderful.\n"
3488 #: builtin/merge.c:993
3490 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
3491 msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
3493 #: builtin/merge.c:1009
3495 msgid "'%s' is not a commit"
3496 msgstr "'%s' 不是一个提交"
3498 #: builtin/merge.c:1050
3499 msgid "No current branch."
3502 #: builtin/merge.c:1052
3503 msgid "No remote for the current branch."
3504 msgstr "当前分支没有对应的远程版本库。"
3506 #: builtin/merge.c:1054
3507 msgid "No default upstream defined for the current branch."
3508 msgstr "当前分支没有定义默认的上游分支。"
3510 #: builtin/merge.c:1059
3512 msgid "No remote tracking branch for %s from %s"
3513 msgstr "%s 没有来自 %s 的远程跟踪分支"
3515 #: builtin/merge.c:1146 builtin/merge.c:1303
3517 msgid "%s - not something we can merge"
3520 #: builtin/merge.c:1214
3521 msgid "There is no merge to abort (MERGE_HEAD missing)."
3522 msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
3524 #: builtin/merge.c:1230 git-pull.sh:31
3526 "You have not concluded your merge (MERGE_HEAD exists).\n"
3527 "Please, commit your changes before you can merge."
3529 "您尚未结束您的合并(存在 MERGE_HEAD)。\n"
3532 #: builtin/merge.c:1233 git-pull.sh:34
3533 msgid "You have not concluded your merge (MERGE_HEAD exists)."
3534 msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
3536 #: builtin/merge.c:1237
3538 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
3539 "Please, commit your changes before you can merge."
3541 "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
3544 #: builtin/merge.c:1240
3545 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
3546 msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
3548 #: builtin/merge.c:1249
3549 msgid "You cannot combine --squash with --no-ff."
3550 msgstr "您不能将 --squash 与 --no-ff 共用。"
3552 #: builtin/merge.c:1254
3553 msgid "You cannot combine --no-ff with --ff-only."
3554 msgstr "您不能将 --no-ff 与 --ff-only 共用。"
3556 #: builtin/merge.c:1261
3557 msgid "No commit specified and merge.defaultToUpstream not set."
3558 msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
3560 #: builtin/merge.c:1293
3561 msgid "Can merge only exactly one commit into empty head"
3562 msgstr "只能将一个提交合并到空分支上"
3564 #: builtin/merge.c:1296
3565 msgid "Squash commit into empty head not supported yet"
3566 msgstr "尚不支持到空分支的压缩提交"
3568 #: builtin/merge.c:1298
3569 msgid "Non-fast-forward commit does not make sense into an empty head"
3570 msgstr "到空分支的非快进式提交没有意义"
3572 #: builtin/merge.c:1413
3574 msgid "Updating %s..%s\n"
3575 msgstr "更新 %s..%s\n"
3577 #: builtin/merge.c:1451
3579 msgid "Trying really trivial in-index merge...\n"
3580 msgstr "尝试非常小的索引内合并...\n"
3582 #: builtin/merge.c:1458
3587 #: builtin/merge.c:1490
3588 msgid "Not possible to fast-forward, aborting."
3591 #: builtin/merge.c:1513 builtin/merge.c:1592
3593 msgid "Rewinding the tree to pristine...\n"
3594 msgstr "将树回滚至原始状态...\n"
3596 #: builtin/merge.c:1517
3598 msgid "Trying merge strategy %s...\n"
3599 msgstr "尝试合并策略 %s...\n"
3601 #: builtin/merge.c:1583
3603 msgid "No merge strategy handled the merge.\n"
3604 msgstr "没有合并策略处理此合并。\n"
3606 #: builtin/merge.c:1585
3608 msgid "Merge with strategy %s failed.\n"
3609 msgstr "使用策略 %s 合并失败。\n"
3611 #: builtin/merge.c:1594
3613 msgid "Using the %s to prepare resolving by hand.\n"
3614 msgstr "使用 %s 以准备手工解决。\n"
3616 #: builtin/merge.c:1606
3618 msgid "Automatic merge went well; stopped before committing as requested\n"
3619 msgstr "自动合并进展顺利,按要求在提交前停止\n"
3623 msgid "Checking rename of '%s' to '%s'\n"
3624 msgstr "检查 '%s' 到 '%s' 的重命名\n"
3631 msgid "can not move directory into itself"
3635 msgid "cannot move directory over file"
3640 msgid "Huh? %.*s is in index?"
3641 msgstr "嗯?%.*s 在索引中?"
3644 msgid "source directory is empty"
3648 msgid "not under version control"
3652 msgid "destination exists"
3657 msgid "overwriting '%s'"
3661 msgid "Cannot overwrite"
3665 msgid "multiple sources for the same target"
3670 msgid "%s, source=%s, destination=%s"
3671 msgstr "%s,源=%s,目标=%s"
3675 msgid "Renaming %s to %s\n"
3676 msgstr "重命名 %s 至 %s\n"
3678 #: builtin/mv.c:215 builtin/remote.c:731
3680 msgid "renaming '%s' failed"
3681 msgstr "重命名 '%s' 失败"
3683 #: builtin/notes.c:139
3685 msgid "unable to start 'show' for object '%s'"
3686 msgstr "不能为对象 '%s' 开始 'show'"
3688 #: builtin/notes.c:145
3689 msgid "can't fdopen 'show' output fd"
3690 msgstr "不能打开 'show' 输出文件句柄"
3692 #: builtin/notes.c:155
3694 msgid "failed to close pipe to 'show' for object '%s'"
3695 msgstr "无法为对象 '%s' 的 'show' 关闭管道"
3697 #: builtin/notes.c:158
3699 msgid "failed to finish 'show' for object '%s'"
3700 msgstr "无法为对象 '%s' 完成 'show'"
3702 #: builtin/notes.c:175 builtin/tag.c:347
3704 msgid "could not create file '%s'"
3705 msgstr "不能创建文件 '%s'"
3707 #: builtin/notes.c:189
3708 msgid "Please supply the note contents using either -m or -F option"
3709 msgstr "请通过 -m 或 -F 选项为注解提供内容"
3711 #: builtin/notes.c:210 builtin/notes.c:973
3713 msgid "Removing note for object %s\n"
3714 msgstr "删除对象 %s 的注解\n"
3716 #: builtin/notes.c:215
3717 msgid "unable to write note object"
3720 #: builtin/notes.c:217
3722 msgid "The note contents has been left in %s"
3723 msgstr "注解内容被留在文件 %s 中"
3725 #: builtin/notes.c:251 builtin/tag.c:542
3727 msgid "cannot read '%s'"
3730 #: builtin/notes.c:253 builtin/tag.c:545
3732 msgid "could not open or read '%s'"
3733 msgstr "不能打开或读取 '%s'"
3735 #: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447
3736 #: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644
3737 #: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766
3738 #: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:558
3740 msgid "Failed to resolve '%s' as a valid ref."
3741 msgstr "无法解析 '%s' 为一个有效引用。"
3743 #: builtin/notes.c:275
3745 msgid "Failed to read object '%s'."
3746 msgstr "无法读取对象 '%s'。"
3748 #: builtin/notes.c:299
3749 msgid "Cannot commit uninitialized/unreferenced notes tree"
3750 msgstr "不能提交未初始化/未引用的注解树"
3752 #: builtin/notes.c:340
3754 msgid "Bad notes.rewriteMode value: '%s'"
3755 msgstr "坏的 notes.rewriteMode 值:'%s'"
3757 #: builtin/notes.c:350
3759 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
3760 msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
3762 #. TRANSLATORS: The first %s is the name of the
3763 #. environment variable, the second %s is its value
3764 #: builtin/notes.c:377
3766 msgid "Bad %s value: '%s'"
3767 msgstr "坏的 %s 值:'%s'"
3769 #: builtin/notes.c:441
3771 msgid "Malformed input line: '%s'."
3772 msgstr "非法的输入行:'%s'。"
3774 #: builtin/notes.c:456
3776 msgid "Failed to copy notes from '%s' to '%s'"
3777 msgstr "无法从 '%s' 到 '%s' 拷贝注解"
3779 #: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627
3780 #: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759
3781 #: builtin/notes.c:1033
3782 msgid "too many parameters"
3785 #: builtin/notes.c:513 builtin/notes.c:772
3787 msgid "No note found for object %s."
3788 msgstr "未发现对象 %s 的注解。"
3790 #: builtin/notes.c:580
3793 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
3795 msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
3797 #: builtin/notes.c:585 builtin/notes.c:662
3799 msgid "Overwriting existing notes for object %s\n"
3800 msgstr "覆盖对象 %s 现存注解\n"
3802 #: builtin/notes.c:635
3803 msgid "too few parameters"
3806 #: builtin/notes.c:656
3809 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
3811 msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
3813 #: builtin/notes.c:668
3815 msgid "Missing notes on source object %s. Cannot copy."
3816 msgstr "源对象 %s 缺少注解。不能拷贝。"
3818 #: builtin/notes.c:717
3821 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
3822 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
3824 "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
3825 "请换用 'git notes add -f -m/-F/-c/-C'。\n"
3827 #: builtin/notes.c:971
3829 msgid "Object %s has no note\n"
3830 msgstr "对象 %s 没有注解\n"
3832 #: builtin/notes.c:1103 builtin/remote.c:1598
3834 msgid "Unknown subcommand: %s"
3837 #: builtin/pack-objects.c:2315
3839 msgid "unsupported index version %s"
3840 msgstr "不支持的索引版本 %s"
3842 #: builtin/pack-objects.c:2319
3844 msgid "bad index version '%s'"
3845 msgstr "坏的索引版本 '%s'"
3847 #: builtin/pack-objects.c:2342
3849 msgid "option %s does not accept negative form"
3850 msgstr "选项 %s 不接受否定格式"
3852 #: builtin/pack-objects.c:2346
3854 msgid "unable to parse value '%s' for option %s"
3855 msgstr "不能解析值 '%s' 针对于选项 %s"
3857 #: builtin/push.c:45
3858 msgid "tag shorthand without <tag>"
3859 msgstr "tag 简写没有跟 <tag> 参数"
3861 #: builtin/push.c:64
3862 msgid "--delete only accepts plain target ref names"
3863 msgstr "--delete 只接受简单的目标引用名"
3865 #: builtin/push.c:99
3868 "To choose either option permanently, see push.default in 'git help config'."
3871 #: builtin/push.c:102
3874 "The upstream branch of your current branch does not match\n"
3875 "the name of your current branch. To push to the upstream branch\n"
3876 "on the remote, use\n"
3878 " git push %s HEAD:%s\n"
3880 "To push to the branch of the same name on the remote, use\n"
3886 #: builtin/push.c:121
3889 "You are not currently on a branch.\n"
3890 "To push the history leading to the current (detached HEAD)\n"
3893 " git push %s HEAD:<name-of-remote-branch>\n"
3896 "现在为推送当前(分离头指针)的历史,使用\n"
3898 " git push %s HEAD:<name-of-remote-branch>\n"
3900 #: builtin/push.c:128
3903 "The current branch %s has no upstream branch.\n"
3904 "To push the current branch and set the remote as upstream, use\n"
3906 " git push --set-upstream %s %s\n"
3908 "当前分支 %s 没有对应的上游分支。\n"
3909 "为推送当前分支并建立与远程上游的跟踪,使用\n"
3911 " git push --set-upstream %s %s\n"
3913 #: builtin/push.c:136
3915 msgid "The current branch %s has multiple upstream branches, refusing to push."
3916 msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
3918 #: builtin/push.c:139
3921 "You are pushing to remote '%s', which is not the upstream of\n"
3922 "your current branch '%s', without telling me what to push\n"
3923 "to update which remote branch."
3925 "您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
3926 "而没有告诉我要推送什么、更新哪个远程分支。"
3928 #: builtin/push.c:174
3930 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
3931 msgstr "您没有为推送指定任何引用表达式,并且 push.default 为 \"nothing\"。"
3933 #: builtin/push.c:181
3935 "Updates were rejected because the tip of your current branch is behind\n"
3936 "its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
3937 "before pushing again.\n"
3938 "See the 'Note about fast-forwards' in 'git push --help' for details."
3940 "更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
3941 "再次推送前,先与远程变更合并(如 'git pull')。详见\n"
3942 "'git push --help' 中的 'Note about fast-forwards' 小节。"
3944 #: builtin/push.c:187
3946 "Updates were rejected because a pushed branch tip is behind its remote\n"
3947 "counterpart. If you did not intend to push that branch, you may want to\n"
3948 "specify branches to push or set the 'push.default' configuration\n"
3949 "variable to 'current' or 'upstream' to push only the current branch."
3951 "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
3952 "如果您并非有意推送该分支,您可以在推送时指定要推送的分支,或者将\n"
3953 "配置变量 'push.default' 设置为 'current' 或 'upstream' 以便只推送当前分支。"
3955 #: builtin/push.c:193
3957 "Updates were rejected because a pushed branch tip is behind its remote\n"
3958 "counterpart. Check out this branch and merge the remote changes\n"
3959 "(e.g. 'git pull') before pushing again.\n"
3960 "See the 'Note about fast-forwards' in 'git push --help' for details."
3962 "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
3963 "检出该分支并与远程变更合并(如 'git pull'),然后再推送。详见\n"
3964 "'git push --help' 中的 'Note about fast-forwards' 小节。"
3966 #: builtin/push.c:233
3968 msgid "Pushing to %s\n"
3971 #: builtin/push.c:237
3973 msgid "failed to push some refs to '%s'"
3974 msgstr "无法推送一些引用到 '%s'"
3976 #: builtin/push.c:269
3978 msgid "bad repository '%s'"
3981 #: builtin/push.c:270
3983 "No configured push destination.\n"
3984 "Either specify the URL from the command-line or configure a remote "
3985 "repository using\n"
3987 " git remote add <name> <url>\n"
3989 "and then push using the remote name\n"
3991 " git push <name>\n"
3994 "或者通过命令行指定URL,或者用下面命令配置一个远程版本库\n"
3996 " git remote add <name> <url>\n"
4000 " git push <name>\n"
4002 #: builtin/push.c:285
4003 msgid "--all and --tags are incompatible"
4004 msgstr "--all 和 --tags 不兼容"
4006 #: builtin/push.c:286
4007 msgid "--all can't be combined with refspecs"
4008 msgstr "--all 不能和引用表达式共用"
4010 #: builtin/push.c:291
4011 msgid "--mirror and --tags are incompatible"
4012 msgstr "--mirror 和 --tags 不兼容"
4014 #: builtin/push.c:292
4015 msgid "--mirror can't be combined with refspecs"
4016 msgstr "--mirror 不能和引用表达式共用"
4018 #: builtin/push.c:297
4019 msgid "--all and --mirror are incompatible"
4020 msgstr "--all 和 --mirror 不兼容"
4022 #: builtin/push.c:385
4023 msgid "--delete is incompatible with --all, --mirror and --tags"
4024 msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
4026 #: builtin/push.c:387
4027 msgid "--delete doesn't make sense without any refs"
4028 msgstr "--delete 未接任何引用没有意义"
4030 #: builtin/remote.c:98
4033 msgstr "更新 %s..%s\n"
4035 #: builtin/remote.c:130
4037 "--mirror is dangerous and deprecated; please\n"
4038 "\t use --mirror=fetch or --mirror=push instead"
4041 #: builtin/remote.c:147
4043 msgid "unknown mirror argument: %s"
4046 #: builtin/remote.c:185
4047 msgid "specifying a master branch makes no sense with --mirror"
4050 #: builtin/remote.c:187
4051 msgid "specifying branches to track makes sense only with fetch mirrors"
4054 #: builtin/remote.c:195 builtin/remote.c:646
4056 msgid "remote %s already exists."
4059 #: builtin/remote.c:199 builtin/remote.c:650
4061 msgid "'%s' is not a valid remote name"
4062 msgstr "'%s' 不是一个有效的tag名称。"
4064 #: builtin/remote.c:243
4066 msgid "Could not setup master '%s'"
4067 msgstr "不能查看文件状态 '%s'"
4069 #: builtin/remote.c:299
4071 msgid "more than one %s"
4072 msgstr "提供了超过两个 blob 对象:'%s'"
4074 #: builtin/remote.c:339
4076 msgid "Could not get fetch map for refspec %s"
4079 #: builtin/remote.c:440 builtin/remote.c:448
4083 #: builtin/remote.c:452
4088 #: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607
4090 msgid "Could not append '%s' to '%s'"
4093 #: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890
4095 msgid "No such remote: %s"
4096 msgstr "没有这样的远程或远程组:%s"
4098 #: builtin/remote.c:656
4100 msgid "Could not rename config section '%s' to '%s'"
4101 msgstr "不能创建目录 '%s'"
4103 #: builtin/remote.c:662 builtin/remote.c:799
4105 msgid "Could not remove config section '%s'"
4106 msgstr "不能创建目录 '%s'"
4108 #: builtin/remote.c:677
4111 "Not updating non-default fetch respec\n"
4113 "\tPlease update the configuration manually if necessary."
4116 #: builtin/remote.c:683
4118 msgid "Could not append '%s'"
4121 #: builtin/remote.c:694
4123 msgid "Could not set '%s'"
4124 msgstr "不能查看文件状态 '%s'"
4126 #: builtin/remote.c:716
4128 msgid "deleting '%s' failed"
4129 msgstr "重命名 '%s' 失败"
4131 #: builtin/remote.c:750
4133 msgid "creating '%s' failed"
4134 msgstr "重命名 '%s' 失败"
4136 #: builtin/remote.c:764
4138 msgid "Could not remove branch %s"
4141 #: builtin/remote.c:834
4143 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
4144 "to delete it, use:"
4146 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
4147 "to delete them, use:"
4150 #: builtin/remote.c:943
4152 msgid " new (next fetch will store in remotes/%s)"
4155 #: builtin/remote.c:946
4160 #: builtin/remote.c:948
4161 msgid " stale (use 'git remote prune' to remove)"
4164 #: builtin/remote.c:950
4168 #: builtin/remote.c:991
4170 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
4173 #: builtin/remote.c:998
4175 msgid "rebases onto remote %s"
4178 #: builtin/remote.c:1001
4180 msgid " merges with remote %s"
4181 msgstr "使用策略 %s 合并失败。\n"
4183 #: builtin/remote.c:1002
4184 msgid " and with remote"
4187 #: builtin/remote.c:1004
4189 msgid "merges with remote %s"
4190 msgstr "使用策略 %s 合并失败。\n"
4192 #: builtin/remote.c:1005
4193 msgid " and with remote"
4196 #: builtin/remote.c:1051
4200 #: builtin/remote.c:1054
4205 #: builtin/remote.c:1058
4210 #: builtin/remote.c:1061
4212 msgid "fast-forwardable"
4215 #: builtin/remote.c:1064
4216 msgid "local out of date"
4219 #: builtin/remote.c:1071
4221 msgid " %-*s forces to %-*s (%s)"
4224 #: builtin/remote.c:1074
4226 msgid " %-*s pushes to %-*s (%s)"
4229 #: builtin/remote.c:1078
4231 msgid " %-*s forces to %s"
4234 #: builtin/remote.c:1081
4236 msgid " %-*s pushes to %s"
4239 # 译者:汉字之间无空格,故删除尾部空格
4240 #: builtin/remote.c:1118
4245 #: builtin/remote.c:1119
4247 msgid " Fetch URL: %s"
4250 #: builtin/remote.c:1120 builtin/remote.c:1285
4254 #: builtin/remote.c:1129 builtin/remote.c:1131
4256 msgid " Push URL: %s"
4259 #: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137
4261 msgid " HEAD branch: %s"
4264 #: builtin/remote.c:1139
4267 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
4270 #: builtin/remote.c:1151
4272 msgid " Remote branch:%s"
4273 msgid_plural " Remote branches:%s"
4274 msgstr[0] "重置分支 '%s'\n"
4276 #: builtin/remote.c:1154 builtin/remote.c:1181
4277 msgid " (status not queried)"
4280 #: builtin/remote.c:1163
4281 msgid " Local branch configured for 'git pull':"
4282 msgid_plural " Local branches configured for 'git pull':"
4285 #: builtin/remote.c:1171
4286 msgid " Local refs will be mirrored by 'git push'"
4289 #: builtin/remote.c:1178
4291 msgid " Local ref configured for 'git push'%s:"
4292 msgid_plural " Local refs configured for 'git push'%s:"
4293 msgstr[0] "尚未给分支 '%s' 设置上游"
4295 #: builtin/remote.c:1216
4297 msgid "Cannot determine remote HEAD"
4300 #: builtin/remote.c:1218
4301 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
4304 #: builtin/remote.c:1228
4306 msgid "Could not delete %s"
4309 #: builtin/remote.c:1236
4311 msgid "Not a valid ref: %s"
4312 msgstr "不是一个有效对象:%s"
4314 #: builtin/remote.c:1238
4316 msgid "Could not setup %s"
4320 #: builtin/remote.c:1274
4322 msgid " %s will become dangling!"
4323 msgstr " (%s 将成为悬空状态)\n"
4326 #: builtin/remote.c:1275
4328 msgid " %s has become dangling!"
4329 msgstr " (%s 已成为悬空状态)\n"
4331 #: builtin/remote.c:1281
4336 #: builtin/remote.c:1282
4341 #: builtin/remote.c:1295
4343 msgid " * [would prune] %s"
4346 #: builtin/remote.c:1298
4348 msgid " * [pruned] %s"
4351 #: builtin/remote.c:1387 builtin/remote.c:1461
4353 msgid "No such remote '%s'"
4356 #: builtin/remote.c:1414
4358 msgid "no remote specified"
4361 #: builtin/remote.c:1447
4363 msgid "--add --delete doesn't make sense"
4364 msgstr "--name-only 无意义"
4366 #: builtin/remote.c:1487
4368 msgid "Invalid old URL pattern: %s"
4371 #: builtin/remote.c:1495
4373 msgid "No such URL found: %s"
4376 #: builtin/remote.c:1497
4377 msgid "Will not delete all non-push URLs"
4380 #: builtin/reset.c:33
4384 #: builtin/reset.c:33
4388 #: builtin/reset.c:33
4392 #: builtin/reset.c:33
4396 #: builtin/reset.c:33
4400 #: builtin/reset.c:77
4401 msgid "You do not have a valid HEAD."
4402 msgstr "您没有一个有效的 HEAD。"
4404 #: builtin/reset.c:79
4405 msgid "Failed to find tree of HEAD."
4406 msgstr "无法找到 HEAD 指向的树。"
4408 #: builtin/reset.c:85
4410 msgid "Failed to find tree of %s."
4411 msgstr "无法找到 %s 指向的树。"
4413 #: builtin/reset.c:96
4414 msgid "Could not write new index file."
4415 msgstr "不能写入新的索引文件。"
4417 #: builtin/reset.c:106
4419 msgid "HEAD is now at %s"
4420 msgstr "HEAD 现在位于 %s"
4422 #: builtin/reset.c:130
4423 msgid "Could not read index"
4426 #: builtin/reset.c:133
4427 msgid "Unstaged changes after reset:"
4428 msgstr "重置后撤出暂存区的变更:"
4430 # 译者:汉字之间无空格,故删除%s前后空格
4431 #: builtin/reset.c:223
4433 msgid "Cannot do a %s reset in the middle of a merge."
4434 msgstr "在合并过程中不能做%s重置操作。"
4436 #: builtin/reset.c:297
4438 msgid "Could not parse object '%s'."
4439 msgstr "不能解析对象 '%s'。"
4441 #: builtin/reset.c:302
4442 msgid "--patch is incompatible with --{hard,mixed,soft}"
4443 msgstr "--patch 与 --{hard,mixed,soft} 不兼容"
4445 #: builtin/reset.c:311
4446 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
4447 msgstr "--mixed 带路径已弃用,代之以 'git reset -- <paths>'。"
4449 # 译者:汉字之间无空格,故删除%s前后空格
4450 #: builtin/reset.c:313
4452 msgid "Cannot do %s reset with paths."
4453 msgstr "不能带路径进行%s重置。"
4455 # 译者:汉字之间无空格,故删除%s前后空格
4456 #: builtin/reset.c:325
4458 msgid "%s reset is not allowed in a bare repository"
4459 msgstr "不能对裸版本库进行%s重置"
4461 #: builtin/reset.c:341
4463 msgid "Could not reset index file to revision '%s'."
4464 msgstr "不能重置索引文件至版本 '%s'。"
4466 #: builtin/revert.c:70 builtin/revert.c:92
4468 msgid "%s: %s cannot be used with %s"
4469 msgstr "%s:%s 不能和 %s 共用"
4471 #: builtin/revert.c:131
4472 msgid "program error"
4475 #: builtin/revert.c:221
4476 msgid "revert failed"
4479 #: builtin/revert.c:236
4480 msgid "cherry-pick failed"
4486 "'%s' has staged content different from both the file and the HEAD\n"
4487 "(use -f to force removal)"
4489 "'%s' 暂存的内容和工作区及 HEAD 中的都不一样\n"
4495 "'%s' has changes staged in the index\n"
4496 "(use --cached to keep the file, or -f to force removal)"
4499 "(使用 --cached 保存文件,或用 -f 强制删除)"
4504 "'%s' has local modifications\n"
4505 "(use --cached to keep the file, or -f to force removal)"
4508 "(使用 --cached 保存文件,或用 -f 强制删除)"
4512 msgid "not removing '%s' recursively without -r"
4513 msgstr "未提供 -r 选项不会递归删除 '%s'"
4517 msgid "git rm: unable to remove %s"
4518 msgstr "git rm:不能删除 %s"
4520 #: builtin/shortlog.c:157
4522 msgid "Missing author: %s"
4527 msgid "malformed object at '%s'"
4528 msgstr "非法的对象于 '%s'"
4530 #: builtin/tag.c:207
4532 msgid "tag name too long: %.*s..."
4533 msgstr "tag 名字太长:%.*s..."
4535 #: builtin/tag.c:212
4537 msgid "tag '%s' not found."
4538 msgstr "tag '%s' 未发现。"
4540 #: builtin/tag.c:227
4542 msgid "Deleted tag '%s' (was %s)\n"
4543 msgstr "已删除 tag '%s'(曾为 %s)\n"
4545 #: builtin/tag.c:239
4547 msgid "could not verify the tag '%s'"
4548 msgstr "不能校验 tag '%s'"
4550 #: builtin/tag.c:249
4554 "# Write a tag message\n"
4555 "# Lines starting with '#' will be ignored.\n"
4561 "# 以 '#' 开头的行将被忽略。\n"
4564 #: builtin/tag.c:256
4568 "# Write a tag message\n"
4569 "# Lines starting with '#' will be kept; you may remove them yourself if you "
4576 "# 以 '#' 开头的行将被忽略,您可以删除它们如果您想这样做。\n"
4579 #: builtin/tag.c:298
4580 msgid "unable to sign the tag"
4583 #: builtin/tag.c:300
4584 msgid "unable to write tag file"
4587 #: builtin/tag.c:325
4588 msgid "bad object type."
4591 #: builtin/tag.c:338
4592 msgid "tag header too big."
4595 #: builtin/tag.c:370
4596 msgid "no tag message?"
4599 #: builtin/tag.c:376
4601 msgid "The tag message has been left in %s\n"
4602 msgstr "tag 说明被保留在 %s\n"
4604 #: builtin/tag.c:425
4605 msgid "switch 'points-at' requires an object"
4606 msgstr "开关 'points-at' 需要一个对象"
4608 #: builtin/tag.c:427
4610 msgid "malformed object name '%s'"
4611 msgstr "非法的对象名 '%s'"
4613 #: builtin/tag.c:506
4615 msgid "--column and -n are incompatible"
4616 msgstr "--all 和 --tags 不兼容"
4618 #: builtin/tag.c:523
4619 msgid "-n option is only allowed with -l."
4620 msgstr "-n 选项只允许和 -l 共用。"
4622 #: builtin/tag.c:525
4623 msgid "--contains option is only allowed with -l."
4624 msgstr "--contains 选项只允许和 -l 共用。"
4626 #: builtin/tag.c:527
4627 msgid "--points-at option is only allowed with -l."
4628 msgstr "--points-at 选项只允许和 -l 共用。"
4630 #: builtin/tag.c:535
4631 msgid "only one -F or -m option is allowed."
4632 msgstr "只允许一个 -F 或 -m 选项。"
4634 #: builtin/tag.c:555
4635 msgid "too many params"
4638 #: builtin/tag.c:561
4640 msgid "'%s' is not a valid tag name."
4641 msgstr "'%s' 不是一个有效的tag名称。"
4643 #: builtin/tag.c:566
4645 msgid "tag '%s' already exists"
4646 msgstr "tag '%s' 已存在"
4648 #: builtin/tag.c:584
4650 msgid "%s: cannot lock the ref"
4653 #: builtin/tag.c:586
4655 msgid "%s: cannot update the ref"
4658 #: builtin/tag.c:588
4660 msgid "Updated tag '%s' (was %s)\n"
4661 msgstr "已更新tag '%s'(曾为 %s)\n"
4664 msgid "See 'git help <command>' for more information on a specific command."
4667 #: parse-options.h:133 parse-options.h:235
4671 #: parse-options.h:141
4675 #: parse-options.h:149
4680 #: parse-options.h:151
4684 #: parse-options.h:156
4685 msgid "no-op (backward compatibility)"
4688 #: parse-options.h:228
4689 msgid "be more verbose"
4692 #: parse-options.h:230
4693 msgid "be more quiet"
4696 #: parse-options.h:236
4697 msgid "use <n> digits to display SHA-1s"
4701 msgid "Add file contents to the index"
4705 msgid "Find by binary search the change that introduced a bug"
4710 msgid "List, create, or delete branches"
4714 msgid "Checkout a branch or paths to the working tree"
4719 msgid "Clone a repository into a new directory"
4720 msgstr "引用版本库 '%s' 不是一个本地目录。"
4724 msgid "Record changes to the repository"
4725 msgstr "不是一个 git 版本库"
4728 msgid "Show changes between commits, commit and working tree, etc"
4732 msgid "Download objects and refs from another repository"
4736 msgid "Print lines matching a pattern"
4740 msgid "Create an empty git repository or reinitialize an existing one"
4745 msgid "Show commit logs"
4749 msgid "Join two or more development histories together"
4753 msgid "Move or rename a file, a directory, or a symlink"
4757 msgid "Fetch from and merge with another repository or a local branch"
4761 msgid "Update remote refs along with associated objects"
4765 msgid "Forward-port local commits to the updated upstream head"
4769 msgid "Reset current HEAD to the specified state"
4773 msgid "Remove files from the working tree and from the index"
4777 msgid "Show various types of objects"
4782 msgid "Show the working tree status"
4786 msgid "Create, list, delete or verify a tag object signed with GPG"
4790 msgid "You need to set your committer info first"
4791 msgstr "您需要先设置你的提交者信息"
4794 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
4795 msgstr "版本库缺乏必要的 blob 数据以进行三路合并。"
4799 "Did you hand edit your patch?\n"
4800 "It does not apply to blobs recorded in its index."
4806 msgid "Falling back to patching base and 3-way merge..."
4807 msgstr "回退到补丁基础版本并使用三路合并..."
4810 msgid "Only one StGIT patch series can be applied at once"
4811 msgstr "一次只能有一个 StGIT 补丁队列被应用"
4815 msgid "Patch format $patch_format is not supported."
4816 msgstr "不支持 $patch_format 补丁格式。"
4819 msgid "Patch format detection failed."
4823 msgid "-d option is no longer supported. Do not use."
4824 msgstr "不再支持 -d 选项。不要使用。"
4828 msgid "previous rebase directory $dotest still exists but mbox given."
4829 msgstr "之前的变基目录 $dotest 仍然存在但给出了mbox。"
4832 msgid "Please make up your mind. --skip or --abort?"
4833 msgstr "请下决心。--skip 或是 --abort ?"
4836 msgid "Resolve operation not in progress, we are not resuming."
4837 msgstr "解决操作未进行,我们不会继续。"
4841 msgid "Dirty index: cannot apply patches (dirty: $files)"
4842 msgstr "脏的索引:不能应用补丁(脏文件:$files)"
4845 msgid "cannot be interactive without stdin connected to a terminal."
4846 msgstr "标准输入没有和终端关联,不能进行交互式操作。"
4849 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
4850 #. in your translation. The program will only accept English
4851 #. input at this point.
4853 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
4854 msgstr "应用?[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
4858 msgid "Applying: $FIRSTLINE"
4859 msgstr "正应用:$FIRSTLINE"
4862 msgid "No changes -- Patch already applied."
4863 msgstr "没有变更 -- 补丁已经应用过。"
4866 msgid "applying to an empty history"
4870 #. TRANSLATORS: Make sure to include [Y] and [n] in your
4871 #. translation. The program will only accept English input
4874 msgid "Do you want me to do it for you [Y/n]? "
4875 msgstr "您想让我为您这样做么[Y/n]? "
4879 msgid "unrecognised option: '$arg'"
4880 msgstr "未识别的选项:'$arg'"
4884 msgid "'$arg' does not appear to be a valid revision"
4885 msgstr "'$arg' 看起来不像是一个有效的版本"
4887 #: git-bisect.sh:117
4888 msgid "Bad HEAD - I need a HEAD"
4889 msgstr "坏的 HEAD - 我需要一个 HEAD"
4891 #: git-bisect.sh:130
4894 "Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
4895 msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <validbranch>'。"
4897 #: git-bisect.sh:140
4898 msgid "won't bisect on seeked tree"
4899 msgstr "不会在已查找过的树上二分查找"
4901 #: git-bisect.sh:144
4902 msgid "Bad HEAD - strange symbolic ref"
4903 msgstr "坏的 HEAD - 奇怪的符号引用"
4905 #: git-bisect.sh:189
4907 msgid "Bad bisect_write argument: $state"
4908 msgstr "坏的 bisect_write 参数:$state"
4910 #: git-bisect.sh:218
4912 msgid "Bad rev input: $arg"
4913 msgstr "输入坏的版本:$arg"
4915 #: git-bisect.sh:232
4916 msgid "Please call 'bisect_state' with at least one argument."
4917 msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
4919 #: git-bisect.sh:244
4921 msgid "Bad rev input: $rev"
4922 msgstr "输入坏的版本:$rev"
4924 #: git-bisect.sh:250
4925 msgid "'git bisect bad' can take only one argument."
4926 msgstr "'git bisect bad' 只能带一个参数。"
4929 #. TRANSLATORS: Make sure to include [Y] and [n] in your
4930 #. translation. The program will only accept English input
4932 #: git-bisect.sh:279
4933 msgid "Are you sure [Y/n]? "
4934 msgstr "您确认么[Y/n]? "
4936 #: git-bisect.sh:354
4938 msgid "'$invalid' is not a valid commit"
4939 msgstr "'$invalid' 不是一个有效的提交"
4941 #: git-bisect.sh:363
4944 "Could not check out original HEAD '$branch'.\n"
4945 "Try 'git bisect reset <commit>'."
4947 "不能检出原始 HEAD '$branch'。\n"
4948 "尝试 'git bisect reset <commit>'。"
4950 #: git-bisect.sh:390
4951 msgid "No logfile given"
4954 #: git-bisect.sh:391
4956 msgid "cannot read $file for replaying"
4957 msgstr "不能读取 $file 来重放"
4959 #: git-bisect.sh:408
4960 msgid "?? what are you talking about?"
4963 #: git-bisect.sh:474
4964 msgid "We are not bisecting."
4969 "Pull is not possible because you have unmerged files.\n"
4970 "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
4971 "as appropriate to mark resolution, or use 'git commit -a'."
4973 "Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n"
4974 "然后酌情使用 'git add/rm <file>' 标记解决方案,\n"
4975 "或者使用 'git commit -a'。"
4978 msgid "Pull is not possible because you have unmerged files."
4979 msgstr "Pull 不可用,因为您尚有未合并的文件。"
4982 msgid "updating an unborn branch with changes added to the index"
4983 msgstr "更新尚未诞生的分支,变更添加至索引"
4986 msgid "Cannot merge multiple branches into empty head"
4987 msgstr "无法将多个分支合并到空分支"
4990 msgid "Cannot rebase onto multiple branches"
4994 msgid "git stash clear with parameters is unimplemented"
4995 msgstr "git stash clear 不支持参数"
4998 msgid "You do not have the initial commit yet"
5002 msgid "Cannot save the current index state"
5005 #: git-stash.sh:123 git-stash.sh:136
5006 msgid "Cannot save the current worktree state"
5007 msgstr "无法保存当前工作区状态"
5010 msgid "No changes selected"
5014 msgid "Cannot remove temporary index (can't happen)"
5015 msgstr "无法删除临时索引(不应发生)"
5018 msgid "Cannot record working tree state"
5022 msgid "No local changes to save"
5026 msgid "Cannot initialize stash"
5027 msgstr "无法初始化 stash"
5030 msgid "Cannot save the current status"
5034 msgid "Cannot remove worktree changes"
5038 msgid "No stash found."
5043 msgid "Too many revisions specified: $REV"
5044 msgstr "指定了太多的版本:$REV"
5048 msgid "$reference is not valid reference"
5049 msgstr "$reference 不是有效的引用"
5053 msgid "'$args' is not a stash-like commit"
5054 msgstr "'$args' 不是 stash 样提交"
5058 msgid "'$args' is not a stash reference"
5059 msgstr "'$args' 不是一个 stash 引用"
5062 msgid "unable to refresh index"
5066 msgid "Cannot apply a stash in the middle of a merge"
5067 msgstr "无法在合并过程中恢复进度"
5070 msgid "Conflicts in index. Try without --index."
5071 msgstr "索引中有冲突。尝试不使用 --index。"
5074 msgid "Could not save index tree"
5078 msgid "Cannot unstage modified files"
5083 msgid "Dropped ${REV} ($s)"
5084 msgstr "丢弃了 ${REV} ($s)"
5088 msgid "${REV}: Could not drop stash entry"
5089 msgstr "${REV}:不能丢弃进度条目"
5092 msgid "No branch name specified"
5096 msgid "(To restore them type \"git stash apply\")"
5097 msgstr "(为恢复数据输入 \"git stash apply\")"
5099 #: git-submodule.sh:56
5101 msgid "cannot strip one component off url '$remoteurl'"
5102 msgstr "无法从 url '$remoteurl' 剥离一个组件"
5104 #: git-submodule.sh:109
5106 msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
5107 msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
5109 #: git-submodule.sh:150
5111 msgid "Clone of '$url' into submodule path '$sm_path' failed"
5112 msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
5114 #: git-submodule.sh:160
5116 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
5117 msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或者相反"
5119 #: git-submodule.sh:249
5121 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
5122 msgstr "版本库URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
5124 #: git-submodule.sh:266
5126 msgid "'$sm_path' already exists in the index"
5127 msgstr "'$sm_path' 已经存在于索引中"
5129 #: git-submodule.sh:283
5131 msgid "'$sm_path' already exists and is not a valid git repo"
5132 msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"
5134 #: git-submodule.sh:297
5136 msgid "Unable to checkout submodule '$sm_path'"
5137 msgstr "不能检出子模组 '$sm_path'"
5139 #: git-submodule.sh:302
5141 msgid "Failed to add submodule '$sm_path'"
5142 msgstr "无法添加子模组 '$sm_path'"
5144 #: git-submodule.sh:307
5146 msgid "Failed to register submodule '$sm_path'"
5147 msgstr "无法注册子模组 '$sm_path'"
5149 #: git-submodule.sh:349
5151 msgid "Entering '$prefix$sm_path'"
5152 msgstr "正在进入 '$prefix$sm_path'"
5154 #: git-submodule.sh:363
5156 msgid "Stopping at '$sm_path'; script returned non-zero status."
5157 msgstr "停止于 '$sm_path',脚本返回非零值。"
5159 #: git-submodule.sh:405
5161 msgid "No url found for submodule path '$sm_path' in .gitmodules"
5162 msgstr "在 .gitmodules 中未找到子模组路径 '$sm_path' 的 url"
5164 #: git-submodule.sh:414
5166 msgid "Failed to register url for submodule path '$sm_path'"
5167 msgstr "无法为子模组路径 '$sm_path' 注册 url"
5169 #: git-submodule.sh:422
5171 msgid "Failed to register update mode for submodule path '$sm_path'"
5172 msgstr "无法为子模组路径 '$sm_path' 注册更新模式"
5174 #: git-submodule.sh:424
5176 msgid "Submodule '$name' ($url) registered for path '$sm_path'"
5177 msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册"
5179 #: git-submodule.sh:523
5182 "Submodule path '$sm_path' not initialized\n"
5183 "Maybe you want to use 'update --init'?"
5185 "子模组路径 '$sm_path' 没有初始化\n"
5186 "也许您想用 'update --init'?"
5188 #: git-submodule.sh:536
5190 msgid "Unable to find current revision in submodule path '$sm_path'"
5191 msgstr "无法在子模组路径 '$sm_path' 中找到当前版本"
5193 #: git-submodule.sh:555
5195 msgid "Unable to fetch in submodule path '$sm_path'"
5196 msgstr "无法在子模组路径 '$sm_path' 中获取"
5198 #: git-submodule.sh:569
5200 msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
5201 msgstr "无法在子模组路径 '$sm_path' 中变基 '$sha1'"
5203 #: git-submodule.sh:570
5205 msgid "Submodule path '$sm_path': rebased into '$sha1'"
5206 msgstr "子模组路径 '$sm_path':变基至 '$sha1'"
5208 #: git-submodule.sh:575
5210 msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
5211 msgstr "无法合并 '$sha1' 到子模组路径 '$sm_path' 中"
5213 #: git-submodule.sh:576
5215 msgid "Submodule path '$sm_path': merged in '$sha1'"
5216 msgstr "子模组路径 '$sm_path':已合并入 '$sha1'"
5218 #: git-submodule.sh:581
5220 msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
5221 msgstr "无法在子模组路径 '$sm_path' 中检出 '$sha1'"
5223 #: git-submodule.sh:582
5225 msgid "Submodule path '$sm_path': checked out '$sha1'"
5226 msgstr "子模组路径 '$sm_path':检出 '$sha1'"
5228 #: git-submodule.sh:604 git-submodule.sh:927
5230 msgid "Failed to recurse into submodule path '$sm_path'"
5231 msgstr "无法递归进子模组路径 '$sm_path'"
5233 #: git-submodule.sh:712
5238 #: git-submodule.sh:770
5240 msgid " Warn: $name doesn't contain commit $sha1_src"
5241 msgstr " 警告:$name 未包含提交 $sha1_src"
5244 #: git-submodule.sh:773
5246 msgid " Warn: $name doesn't contain commit $sha1_dst"
5247 msgstr " 警告:$name 未包含提交 $sha1_dst"
5250 #: git-submodule.sh:776
5252 msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
5253 msgstr " 警告:$name 未包含提交 $sha1_src 和 $sha1_dst"
5255 #: git-submodule.sh:801
5259 #: git-submodule.sh:802
5263 #: git-submodule.sh:973
5265 msgid "Synchronizing submodule url for '$name'"
5266 msgstr "为 '$name' 同步子模组 url"
5268 #~ msgid "cherry-pick"
5271 #~ msgid "Please enter the commit message for your changes."
5272 #~ msgstr "请为您的修改输入提交说明。"
5274 #~ msgid "Too many options specified"
5275 #~ msgstr "指定了太多的选项"