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-02-28 09:17+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 "could not parse %s"
52 msgid "%s %s is not a commit!"
53 msgstr "%s %s 不是一个提交!"
55 #: compat/obstack.c:406 compat/obstack.c:408
56 msgid "memory exhausted"
60 msgid "Could not run 'git rev-list'"
61 msgstr "不能执行 'git rev-list'"
65 msgid "failed write to rev-list: %s"
66 msgstr "无法写入 rev-list:%s"
70 msgid "failed to close rev-list's stdin: %s"
71 msgstr "无法关闭 rev-list 的标准输入:%s"
76 msgid " Failed to parse dirstat cut-off percentage '%.*s'\n"
77 msgstr " 无法解析 dirstat 阈值 '%.*s'\n"
82 msgid " Unknown dirstat parameter '%.*s'\n"
83 msgstr " 未知 dirstat 参数 '%.*s'\n"
88 "Found errors in 'diff.dirstat' config variable:\n"
91 "配置变量 'diff.dirstat' 出错:\n"
95 msgid " 0 files changed\n"
100 msgid " %d file changed"
101 msgid_plural " %d files changed"
102 msgstr[0] " %d 个文件被修改"
106 msgid ", %d insertion(+)"
107 msgid_plural ", %d insertions(+)"
108 msgstr[0] ",插入 %d 行(+)"
112 msgid ", %d deletion(-)"
113 msgid_plural ", %d deletions(-)"
114 msgstr[0] ",删除 %d 行(-)"
119 "Failed to parse --dirstat/-X option parameter:\n"
122 "无法解析 --dirstat/-X 选项的参数:\n"
125 #: gpg-interface.c:59
126 msgid "could not run gpg."
129 #: gpg-interface.c:71
130 msgid "gpg did not accept the data"
133 #: gpg-interface.c:82
134 msgid "gpg failed to sign the data"
139 msgid "'%s': unable to read %s"
140 msgstr "'%s':无法读取 %s"
149 msgid "'%s': short read %s"
150 msgstr "'%s':读取不完整 %s"
155 "'%s' appears to be a git command, but we were not\n"
156 "able to execute it. Maybe git-%s is broken?"
158 "'%s' 像是一个 git 命令,但却无法运行。\n"
163 msgid "Your branch is ahead of '%s' by %d commit.\n"
164 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
165 msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
169 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
171 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
172 msgstr[0] "您的分支落后 '%s' 共 %d 个提交,且可以快进。\n"
177 "Your branch and '%s' have diverged,\n"
178 "and have %d and %d different commit each, respectively.\n"
180 "Your branch and '%s' have diverged,\n"
181 "and have %d and %d different commits each, respectively.\n"
183 "您的分支和 '%s' 出现了偏离,\n"
184 "并且各自分别有 %d 和 %d 处不同的提交。\n"
186 #: sequencer.c:120 builtin/merge.c:862 builtin/merge.c:983
187 #: builtin/merge.c:1093 builtin/merge.c:1103
189 msgid "Could not open '%s' for writing"
190 msgstr "无法打开 '%s' 以写入"
192 #: sequencer.c:122 builtin/merge.c:334 builtin/merge.c:865
193 #: builtin/merge.c:1095 builtin/merge.c:1108
195 msgid "Could not write to '%s'"
200 "after resolving the conflicts, mark the corrected paths\n"
201 "with 'git add <paths>' or 'git rm <paths>'\n"
202 "and commit the result with 'git commit'"
204 "冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
205 "对修正后的文件做标记,然后用 'git commit' 提交"
207 #: sequencer.c:154 sequencer.c:680 sequencer.c:763
209 msgid "Could not write to %s"
214 msgid "Error wrapping up %s"
218 msgid "Your local changes would be overwritten by cherry-pick."
219 msgstr "您的本地修改将被拣选操作覆盖。"
222 msgid "Your local changes would be overwritten by revert."
223 msgstr "您的本地修改将被还原操作覆盖。"
226 msgid "Commit your changes or stash them to proceed."
227 msgstr "提交您的修改或保存进度后再继续。"
229 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
232 msgid "%s: Unable to write new index file"
233 msgstr "%s:无法写入新暂存区文件"
236 msgid "Your index file is unmerged."
237 msgstr "您的暂存区文件未完成合并。"
240 msgid "You do not have a valid HEAD"
241 msgstr "您没有一个有效的 HEAD"
245 msgid "Commit %s is a merge but no -m option was given."
246 msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
250 msgid "Commit %s does not have parent %d"
251 msgstr "提交 %s 没有父提交 %d"
255 msgid "Mainline was specified but commit %s is not a merge."
256 msgstr "提供了主线但提交 %s 不是一个合并。"
258 #. TRANSLATORS: The first %s will be "revert" or
259 #. "cherry-pick", the second %s a SHA1
262 msgid "%s: cannot parse parent commit %s"
263 msgstr "%s:不能解析父提交 %s"
267 msgid "Cannot get commit message for %s"
268 msgstr "不能得到 %s 的提交说明"
272 msgid "could not revert %s... %s"
273 msgstr "不能还原 %s... %s"
277 msgid "could not apply %s... %s"
278 msgstr "不能应用 %s... %s"
280 #: sequencer.c:445 sequencer.c:904 builtin/log.c:286 builtin/log.c:709
281 #: builtin/log.c:1325 builtin/log.c:1544 builtin/merge.c:348
282 #: builtin/shortlog.c:181
283 msgid "revision walk setup failed"
287 msgid "empty commit set passed"
292 msgid "git %s: failed to read the index"
293 msgstr "git %s: 无法读取暂存区"
297 msgid "git %s: failed to refresh the index"
298 msgstr "git %s: 无法刷新暂存区"
302 msgid "Cannot %s during a %s"
303 msgstr "无法 %s 在 %s 过程中"
307 msgid "Could not parse line %d."
311 msgid "No commits parsed."
316 msgid "Could not open %s"
321 msgid "Could not read %s."
326 msgid "Unusable instruction sheet: %s"
331 msgid "Invalid key: %s"
336 msgid "Invalid value for %s: %s"
341 msgid "Malformed options sheet: %s"
345 msgid "a cherry-pick or revert is already in progress"
346 msgstr "一个拣选或还原操作已在进行"
349 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
350 msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
354 msgid "Could not create sequencer directory %s"
357 #: sequencer.c:682 sequencer.c:767
359 msgid "Error wrapping up %s."
362 #: sequencer.c:701 sequencer.c:835
363 msgid "no cherry-pick or revert in progress"
364 msgstr "没有拣选或还原操作在进行"
367 msgid "cannot resolve HEAD"
371 msgid "cannot abort from a branch yet to be born"
376 msgid "cannot open %s: %s"
381 msgid "cannot read %s: %s"
385 msgid "unexpected end of file"
390 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
391 msgstr "保存预拣选提交的 HEAD 文件 '%s' 损坏"
395 msgid "Could not format %s."
399 msgid "Can't revert as initial commit"
403 msgid "Can't cherry-pick into empty head"
407 msgid "Unmerged paths:"
411 #: wt-status.c:140 wt-status.c:157
413 msgid " (use \"git reset %s <file>...\" to unstage)"
414 msgstr " (使用 \"git reset %s <file>...\" 撤出暂存区)"
417 #: wt-status.c:142 wt-status.c:159
418 msgid " (use \"git rm --cached <file>...\" to unstage)"
419 msgstr " (使用 \"git rm --cached <file>...\" 撤出暂存区)"
423 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
424 msgstr " (酌情使用 \"git add/rm <file>...\" 标记解决方案)"
427 msgid "Changes to be committed:"
431 msgid "Changes not staged for commit:"
436 msgid " (use \"git add <file>...\" to update what will be committed)"
437 msgstr " (使用 \"git add <file>...\" 更新要提交的内容)"
441 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
442 msgstr " (使用 \"git add/rm <file>...\" 更新要提交的内容)"
447 " (use \"git checkout -- <file>...\" to discard changes in working directory)"
448 msgstr " (使用 \"git checkout -- <file>...\" 丢弃工作区的改动)"
452 msgid " (commit or discard the untracked or modified content in submodules)"
453 msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
463 msgid " (use \"git %s <file>...\" to include in what will be committed)"
464 msgstr " (使用 \"git %s <file>...\" 包含到提交列表)"
471 msgid "both deleted:"
479 msgid "deleted by them:"
483 msgid "added by them:"
487 msgid "deleted by us:"
495 msgid "both modified:"
499 msgid "new commits, "
503 msgid "modified content, "
507 msgid "untracked content, "
510 # 为保证在输出中对齐,注意调整句中空格!
516 # 为保证在输出中对齐,注意调整句中空格!
519 msgid "copied: %s -> %s"
520 msgstr "拷贝: %s -> %s"
522 # 为保证在输出中对齐,注意调整句中空格!
528 # 为保证在输出中对齐,注意调整句中空格!
534 # 为保证在输出中对齐,注意调整句中空格!
537 msgid "renamed: %s -> %s"
538 msgstr "重命名: %s -> %s"
540 # 为保证在输出中对齐,注意调整句中空格!
543 msgid "typechange: %s"
546 # 为保证在输出中对齐,注意调整句中空格!
552 # 为保证在输出中对齐,注意调整句中空格!
560 msgid "bug: unhandled diff status %c"
561 msgstr "bug: 未处理的差异状态 %c"
568 msgid "Not currently on any branch."
572 msgid "Initial commit"
585 msgid "Untracked files not listed%s"
586 msgstr "未跟踪的文件没有列出%s"
590 msgid " (use -u option to show untracked files)"
591 msgstr " (使用 -u 参数显示未跟踪的文件)"
599 msgid "no changes added to commit%s\n"
600 msgstr "修改尚未加入提交%s\n"
604 msgid " (use \"git add\" and/or \"git commit -a\")"
605 msgstr " (使用 \"git add\" 和/或 \"git commit -a\")"
609 msgid "nothing added to commit but untracked files present%s\n"
610 msgstr "空提交但存在未跟踪文件%s\n"
614 msgid " (use \"git add\" to track)"
615 msgstr " (使用 \"git add\" 建立跟踪)"
617 #: wt-status.c:769 wt-status.c:772 wt-status.c:775
619 msgid "nothing to commit%s\n"
624 msgid " (create/copy files and use \"git add\" to track)"
625 msgstr " (新建/拷贝的文件使用 \"git add\" 建立跟踪)"
629 msgid " (use -u to show untracked files)"
630 msgstr " (使用 -u 显示未跟踪文件)"
634 msgid " (working directory clean)"
638 msgid "HEAD (no branch)"
643 msgid "Initial commit on "
652 #: wt-status.c:908 wt-status.c:911
663 msgid "unexpected diff status %c"
666 #: builtin/add.c:67 builtin/commit.c:298
667 msgid "updating files failed"
672 msgid "remove '%s'\n"
677 msgid "Path '%s' is in submodule '%.*s'"
678 msgstr "路径 '%s' 属于模组 '%.*s'"
681 msgid "Unstaged changes after refreshing the index:"
682 msgstr "刷新暂存区后未暂存的变更:"
684 #: builtin/add.c:195 builtin/add.c:456 builtin/rm.c:186
686 msgid "pathspec '%s' did not match any files"
687 msgstr "路径 '%s' 未匹配任何文件"
691 msgid "'%s' is beyond a symbolic link"
692 msgstr "'%s' 位于符号链接中"
695 msgid "Could not read the index"
700 msgid "Could not open '%s' for writing."
701 msgstr "无法打开 '%s' 以写入。"
704 msgid "Could not write patch"
709 msgid "Could not stat '%s'"
710 msgstr "无法查看文件状态 '%s'"
713 msgid "Empty patch. Aborted."
718 msgid "Could not apply '%s'"
722 msgid "The following paths are ignored by one of your .gitignore files:\n"
723 msgstr "下列路径被您的一个 .gitignore 文件所忽略:\n"
727 msgid "Use -f if you really want to add them.\n"
728 msgstr "使用 -f 参数如果你确实要添加它们。\n"
731 msgid "no files added"
735 msgid "adding files failed"
739 msgid "-A and -u are mutually incompatible"
740 msgstr "-A 和 -u 选项互斥"
743 msgid "Option --ignore-missing can only be used together with --dry-run"
744 msgstr "选项 --ignore-missing 只能和 --dry-run 共用"
748 msgid "Nothing specified, nothing added.\n"
749 msgstr "未提供参数,没有文件被添加。\n"
753 msgid "Maybe you wanted to say 'git add .'?\n"
754 msgstr "也许您想要执行 'git add .'?\n"
756 #: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:358 builtin/mv.c:82
758 msgid "index file corrupt"
761 #: builtin/add.c:476 builtin/mv.c:229 builtin/rm.c:260
762 msgid "Unable to write new index file"
765 #: builtin/archive.c:17
767 msgid "could not create archive file '%s'"
768 msgstr "无法创建归档文件 '%s'"
770 #: builtin/archive.c:20
771 msgid "could not redirect output"
774 #: builtin/archive.c:37
775 msgid "git archive: Remote with no URL"
776 msgstr "git archive: 未提供远程URL"
778 #: builtin/archive.c:58
779 msgid "git archive: expected ACK/NAK, got EOF"
780 msgstr "git archive: 期待ACK/NACK,却得到EOF"
782 #: builtin/archive.c:63
784 msgid "git archive: NACK %s"
785 msgstr "git archive: NACK %s"
787 #: builtin/archive.c:65
789 msgid "remote error: %s"
792 #: builtin/archive.c:66
793 msgid "git archive: protocol error"
794 msgstr "git archive: 协议错误"
796 #: builtin/archive.c:71
797 msgid "git archive: expected a flush"
798 msgstr "git archive: 预期一个刷新"
800 #: builtin/branch.c:137
803 "deleting branch '%s' that has been merged to\n"
804 " '%s', but not yet merged to HEAD."
806 "将要删除的分支 '%s' 已经被合并到\n"
809 #: builtin/branch.c:141
812 "not deleting branch '%s' that is not yet merged to\n"
813 " '%s', even though it is merged to HEAD."
815 "并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
816 " 然而却尚未被合并到分支 '%s' 。"
819 #. TRANSLATORS: This is "remote " in "remote branch '%s' not found"
820 #: builtin/branch.c:163
824 #: builtin/branch.c:171
825 msgid "cannot use -a with -d"
826 msgstr "不能将 -a 和 -d 共用"
828 #: builtin/branch.c:177
829 msgid "Couldn't look up commit object for HEAD"
830 msgstr "无法查询 HEAD 指向的提交对象"
832 #: builtin/branch.c:182
834 msgid "Cannot delete the branch '%s' which you are currently on."
835 msgstr "无法删除您当前所在的分支 '%s'。"
837 #: builtin/branch.c:192
839 msgid "%sbranch '%s' not found."
840 msgstr "%s分支 '%s' 未发现。"
842 #: builtin/branch.c:200
844 msgid "Couldn't look up commit object for '%s'"
845 msgstr "无法查询 '%s' 指向的提交对象"
847 #: builtin/branch.c:206
850 "The branch '%s' is not fully merged.\n"
851 "If you are sure you want to delete it, run 'git branch -D %s'."
854 "如果您确认要删除它,执行 'git branch -D %s'。"
856 #: builtin/branch.c:214
858 msgid "Error deleting %sbranch '%s'"
859 msgstr "删除 %s分支 '%s' 时错误"
861 #: builtin/branch.c:219
863 msgid "Deleted %sbranch %s (was %s).\n"
864 msgstr "已删除 %s分支 %s(曾为 %s)。\n"
866 #: builtin/branch.c:224
867 msgid "Update of config-file failed"
868 msgstr "无法更新 config 文件"
870 #: builtin/branch.c:322
872 msgid "branch '%s' does not point at a commit"
873 msgstr "分支 '%s' 未指向一个提交"
876 #: builtin/branch.c:394
882 #: builtin/branch.c:396
888 #: builtin/branch.c:398
890 msgid "ahead %d, behind %d] "
891 msgstr "领先 %d,落后 %d] "
893 #: builtin/branch.c:501
897 #: builtin/branch.c:562
898 msgid "some refs could not be read"
901 #: builtin/branch.c:575
902 msgid "cannot rename the current branch while not on any."
903 msgstr "无法重命名不存在的当前分支。"
905 #: builtin/branch.c:585
907 msgid "Invalid branch name: '%s'"
910 #: builtin/branch.c:600
911 msgid "Branch rename failed"
914 #: builtin/branch.c:604
916 msgid "Renamed a misnamed branch '%s' away"
917 msgstr "重命名掉一个错误命名的旧分支 '%s'"
919 #: builtin/branch.c:608
921 msgid "Branch renamed to %s, but HEAD is not updated!"
922 msgstr "分支重命名为 %s,但 HEAD 没有更新!"
924 #: builtin/branch.c:615
925 msgid "Branch is renamed, but update of config-file failed"
926 msgstr "分支被重命名,但更新 config 文件失败"
928 #: builtin/branch.c:630
930 msgid "malformed object name %s"
933 #: builtin/branch.c:654
935 msgid "could not write branch description template: %s\n"
936 msgstr "不能写分支描述模版:%s\n"
938 #: builtin/branch.c:742
939 msgid "Failed to resolve HEAD as a valid ref."
940 msgstr "无法将 HEAD 解析为有效引用。"
942 #: builtin/branch.c:747 builtin/clone.c:558
943 msgid "HEAD not found below refs/heads!"
944 msgstr "未在 /refs/heads 下发现 HEAD!"
946 #: builtin/branch.c:805
947 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
948 msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
950 #: builtin/bundle.c:47
955 #: builtin/bundle.c:56
956 msgid "Need a repository to create a bundle."
959 #: builtin/bundle.c:60
960 msgid "Need a repository to unbundle."
963 #: builtin/checkout.c:113 builtin/checkout.c:146
965 msgid "path '%s' does not have our version"
966 msgstr "路径 '%s' 没有我们的版本"
968 #: builtin/checkout.c:115 builtin/checkout.c:148
970 msgid "path '%s' does not have their version"
971 msgstr "路径 '%s' 没有他们的版本"
973 #: builtin/checkout.c:131
975 msgid "path '%s' does not have all necessary versions"
976 msgstr "路径 '%s' 没有全部必须的版本"
978 #: builtin/checkout.c:175
980 msgid "path '%s' does not have necessary versions"
981 msgstr "路径 '%s' 没有必须的版本"
983 #: builtin/checkout.c:192
985 msgid "path '%s': cannot merge"
986 msgstr "path '%s': 无法合并"
988 #: builtin/checkout.c:209
990 msgid "Unable to add merge result for '%s'"
991 msgstr "无法为 '%s' 添加合并结果"
993 #: builtin/checkout.c:212 builtin/reset.c:158
995 msgid "make_cache_entry failed for path '%s'"
996 msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
998 #: builtin/checkout.c:234 builtin/checkout.c:392
999 msgid "corrupt index file"
1002 #: builtin/checkout.c:264 builtin/checkout.c:271
1004 msgid "path '%s' is unmerged"
1005 msgstr "路径 '%s' 未合并"
1007 #: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583
1008 #: builtin/merge.c:809
1009 msgid "unable to write new index file"
1012 #: builtin/checkout.c:319 builtin/diff.c:298 builtin/merge.c:406
1013 msgid "diff_setup_done failed"
1014 msgstr "diff_setup_done 失败"
1016 #: builtin/checkout.c:414
1017 msgid "you need to resolve your current index first"
1018 msgstr "您需要先解决当前暂存区的冲突"
1020 #: builtin/checkout.c:533
1022 msgid "Can not do reflog for '%s'\n"
1023 msgstr "不能对 '%s' 保存引用日志\n"
1025 #: builtin/checkout.c:565
1026 msgid "HEAD is now at"
1029 #: builtin/checkout.c:572
1031 msgid "Reset branch '%s'\n"
1032 msgstr "重置分支 '%s'\n"
1034 #: builtin/checkout.c:575
1036 msgid "Already on '%s'\n"
1037 msgstr "已经位于 '%s'\n"
1039 #: builtin/checkout.c:579
1041 msgid "Switched to and reset branch '%s'\n"
1042 msgstr "切换并重置分支 '%s'\n"
1044 #: builtin/checkout.c:581
1046 msgid "Switched to a new branch '%s'\n"
1047 msgstr "切换到一个新分支 '%s'\n"
1049 #: builtin/checkout.c:583
1051 msgid "Switched to branch '%s'\n"
1052 msgstr "切换到分支 '%s'\n"
1055 #: builtin/checkout.c:639
1057 msgid " ... and %d more.\n"
1058 msgstr " ... 及 %d 更多。\n"
1060 #. The singular version
1061 #: builtin/checkout.c:645
1064 "Warning: you are leaving %d commit behind, not connected to\n"
1065 "any of your branches:\n"
1069 "Warning: you are leaving %d commits behind, not connected to\n"
1070 "any of your branches:\n"
1074 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
1078 #: builtin/checkout.c:663
1081 "If you want to keep them by creating a new branch, this may be a good time\n"
1084 " git branch new_branch_name %s\n"
1087 "如果您想要通过创建新分支保存他们,这可能是一个好时候。\n"
1090 " git branch new_branch_name %s\n"
1093 #: builtin/checkout.c:692
1094 msgid "internal error in revision walk"
1095 msgstr "在版本遍历时遇到内部错误"
1097 #: builtin/checkout.c:696
1098 msgid "Previous HEAD position was"
1099 msgstr "之前的 HEAD 位置是"
1101 #: builtin/checkout.c:722
1102 msgid "You are on a branch yet to be born"
1103 msgstr "您位于一个未初始化的分支"
1106 #: builtin/checkout.c:853
1108 msgid "invalid reference: %s"
1111 #. case (1): want a tree
1112 #: builtin/checkout.c:892
1114 msgid "reference is not a tree: %s"
1117 #: builtin/checkout.c:972
1118 msgid "-B cannot be used with -b"
1119 msgstr "-B 不能和 -b 共用"
1121 #: builtin/checkout.c:981
1122 msgid "--patch is incompatible with all other options"
1123 msgstr "--patch 选项和其他选项不兼容"
1125 #: builtin/checkout.c:984
1126 msgid "--detach cannot be used with -b/-B/--orphan"
1127 msgstr "--detach 不能和 -b/-B/--orphan 共用"
1129 #: builtin/checkout.c:986
1130 msgid "--detach cannot be used with -t"
1131 msgstr "--detach 不能和 -t 共用"
1133 #: builtin/checkout.c:992
1134 msgid "--track needs a branch name"
1135 msgstr "--track 需要一个分支名"
1137 #: builtin/checkout.c:999
1138 msgid "Missing branch name; try -b"
1139 msgstr "缺少分支名;尝试 -b"
1141 #: builtin/checkout.c:1005
1142 msgid "--orphan and -b|-B are mutually exclusive"
1143 msgstr "--orphan 和 -b|-B 互斥"
1145 #: builtin/checkout.c:1007
1146 msgid "--orphan cannot be used with -t"
1147 msgstr "--orphan 不能和 -t 共用"
1149 #: builtin/checkout.c:1017
1150 msgid "git checkout: -f and -m are incompatible"
1151 msgstr "git checkout: -f 和 -m 不兼容"
1153 #: builtin/checkout.c:1051
1154 msgid "invalid path specification"
1157 #: builtin/checkout.c:1059
1160 "git checkout: updating paths is incompatible with switching branches.\n"
1161 "Did you intend to checkout '%s' which can not be resolved as commit?"
1163 "git checkout: 更新路径和切换分支不兼容。\n"
1164 "您是想要检出 '%s' 但未能将其解析为提交么?"
1166 #: builtin/checkout.c:1061
1167 msgid "git checkout: updating paths is incompatible with switching branches."
1168 msgstr "git checkout: 更新路径和切换分支不兼容。"
1170 #: builtin/checkout.c:1066
1171 msgid "git checkout: --detach does not take a path argument"
1172 msgstr "git checkout: --detach 不跟路径参数"
1174 #: builtin/checkout.c:1069
1176 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
1177 "checking out of the index."
1179 "git checkout: --ours/--theirs, --force 和 --merge 不兼容当\n"
1182 #: builtin/checkout.c:1088
1183 msgid "Cannot switch branch to a non-commit."
1184 msgstr "无法切换分支到一个非提交。"
1186 #: builtin/checkout.c:1091
1187 msgid "--ours/--theirs is incompatible with switching branches."
1188 msgstr "--ours/--theirs 和切换分支不兼容。"
1190 #: builtin/clean.c:78
1191 msgid "-x and -X cannot be used together"
1192 msgstr "-x 和 -X 不能共用"
1194 #: builtin/clean.c:82
1196 "clean.requireForce set to true and neither -n nor -f given; refusing to clean"
1198 "clean.requireForce 设置为 true,若未提供 -n 或 -f 选项,拒绝执行清理动作"
1200 #: builtin/clean.c:85
1202 "clean.requireForce defaults to true and neither -n nor -f given; refusing to "
1205 "clean.requireForce 默认为 true,若未提供 -n 或 -f 选项,拒绝执行清理动作"
1207 #: builtin/clean.c:155 builtin/clean.c:176
1209 msgid "Would remove %s\n"
1212 #: builtin/clean.c:159 builtin/clean.c:179
1214 msgid "Removing %s\n"
1217 #: builtin/clean.c:162 builtin/clean.c:182
1219 msgid "failed to remove %s"
1222 #: builtin/clean.c:166
1224 msgid "Would not remove %s\n"
1227 #: builtin/clean.c:168
1229 msgid "Not removing %s\n"
1232 #: builtin/clone.c:243
1234 msgid "reference repository '%s' is not a local directory."
1235 msgstr "引用版本库 '%s' 不是一个本地目录。"
1237 #: builtin/clone.c:302
1239 msgid "failed to open '%s'"
1242 #: builtin/clone.c:306
1244 msgid "failed to create directory '%s'"
1245 msgstr "创建目录 '%s' 失败"
1247 #: builtin/clone.c:308 builtin/diff.c:75
1249 msgid "failed to stat '%s'"
1250 msgstr "枚举 '%s' 状态失败"
1252 #: builtin/clone.c:310
1254 msgid "%s exists and is not a directory"
1255 msgstr "%s 存在且不是一个目录"
1257 #: builtin/clone.c:324
1259 msgid "failed to stat %s\n"
1260 msgstr "枚举 %s 状态失败\n"
1262 #: builtin/clone.c:341
1264 msgid "failed to unlink '%s'"
1267 #: builtin/clone.c:346
1269 msgid "failed to create link '%s'"
1270 msgstr "创建链接 '%s' 失败"
1272 #: builtin/clone.c:350
1274 msgid "failed to copy file to '%s'"
1275 msgstr "拷贝文件至 '%s' 失败"
1277 #: builtin/clone.c:373
1282 #: builtin/clone.c:440
1284 msgid "Could not find remote branch %s to clone."
1285 msgstr "无法发现要克隆的远程分支 %s。"
1287 #: builtin/clone.c:549
1288 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
1289 msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
1291 #: builtin/clone.c:639
1292 msgid "Too many arguments."
1295 #: builtin/clone.c:643
1296 msgid "You must specify a repository to clone."
1297 msgstr "你必须指定一个版本库来克隆"
1299 #: builtin/clone.c:654
1301 msgid "--bare and --origin %s options are incompatible."
1302 msgstr "--bare 和 --origin %s 选项不兼容。"
1304 #: builtin/clone.c:668
1306 msgid "repository '%s' does not exist"
1307 msgstr "版本库 '%s' 不存在"
1309 #: builtin/clone.c:673
1310 msgid "--depth is ignored in local clones; use file:// instead."
1311 msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
1313 #: builtin/clone.c:683
1315 msgid "destination path '%s' already exists and is not an empty directory."
1316 msgstr "目标路径 '%s' 已经存在且不是一个空目录。"
1318 #: builtin/clone.c:693
1320 msgid "working tree '%s' already exists."
1321 msgstr "工作区 '%s' 已经存在。"
1323 #: builtin/clone.c:706 builtin/clone.c:720
1325 msgid "could not create leading directories of '%s'"
1326 msgstr "无法为 '%s' 创建目录"
1328 #: builtin/clone.c:709
1330 msgid "could not create work tree dir '%s'."
1331 msgstr "无法为 '%s' 创建工作区目录。"
1333 #: builtin/clone.c:728
1335 msgid "Cloning into bare repository '%s'...\n"
1336 msgstr "克隆到裸版本库 '%s'...\n"
1338 #: builtin/clone.c:730
1340 msgid "Cloning into '%s'...\n"
1341 msgstr "正克隆到 '%s'...\n"
1343 #: builtin/clone.c:786
1345 msgid "Don't know how to clone %s"
1348 #: builtin/clone.c:835
1350 msgid "Remote branch %s not found in upstream %s"
1351 msgstr "远程分支 %s 在上游 %s 未发现"
1353 #: builtin/clone.c:842
1354 msgid "You appear to have cloned an empty repository."
1355 msgstr "您似乎克隆了一个空版本库。"
1357 #: builtin/commit.c:42
1359 "Your name and email address were configured automatically based\n"
1360 "on your username and hostname. Please check that they are accurate.\n"
1361 "You can suppress this message by setting them explicitly:\n"
1363 " git config --global user.name \"Your Name\"\n"
1364 " git config --global user.email you@example.com\n"
1366 "After doing this, you may fix the identity used for this commit with:\n"
1368 " git commit --amend --reset-author\n"
1370 "您的姓名和邮件地址会基于您的用户名和主机地址自动配置。请检查它们\n"
1371 "正确与否。您可通过下面命令对其显式声明以避免重复出现类似提示:\n"
1373 " git config --global user.name \"Your Name\"\n"
1374 " git config --global user.email you@example.com\n"
1376 "设置完毕后,您可用下面命令来更改此次提交所使用的用户ID:\n"
1378 " git commit --amend --reset-author\n"
1380 #: builtin/commit.c:54
1382 "You asked to amend the most recent commit, but doing so would make\n"
1383 "it empty. You can repeat your command with --allow-empty, or you can\n"
1384 "remove the commit entirely with \"git reset HEAD^\".\n"
1386 "您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
1387 "--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
1389 #: builtin/commit.c:59
1391 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
1392 "If you wish to commit it anyway, use:\n"
1394 " git commit --allow-empty\n"
1396 "Otherwise, please use 'git reset'\n"
1398 "之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
1401 " git commit --allow-empty\n"
1403 "否则,请使用命令 'git reset'\n"
1405 #: builtin/commit.c:205 builtin/reset.c:33
1409 #: builtin/commit.c:208
1413 #: builtin/commit.c:325
1414 msgid "failed to unpack HEAD tree object"
1415 msgstr "解包 HEAD 树对象失败"
1417 #: builtin/commit.c:367
1418 msgid "unable to create temporary index"
1421 #: builtin/commit.c:373
1422 msgid "interactive add failed"
1425 #: builtin/commit.c:406 builtin/commit.c:427 builtin/commit.c:473
1426 msgid "unable to write new_index file"
1430 #: builtin/commit.c:457
1432 msgid "cannot do a partial commit during a %s."
1433 msgstr "在%s过程中不能做部分提交。"
1435 #: builtin/commit.c:466
1436 msgid "cannot read the index"
1439 #: builtin/commit.c:486
1440 msgid "unable to write temporary index file"
1443 #: builtin/commit.c:550 builtin/commit.c:556
1445 msgid "invalid commit: %s"
1448 #: builtin/commit.c:579
1449 msgid "malformed --author parameter"
1450 msgstr "非法的 --author 参数"
1452 #: builtin/commit.c:635
1454 msgid "Malformed ident string: '%s'"
1455 msgstr "非法的识别字串:'%s'"
1457 #: builtin/commit.c:670 builtin/commit.c:703 builtin/commit.c:1000
1459 msgid "could not lookup commit %s"
1462 #: builtin/commit.c:682 builtin/shortlog.c:296
1464 msgid "(reading log message from standard input)\n"
1465 msgstr "(正从标准输入中读取说明信息)\n"
1467 #: builtin/commit.c:684
1468 msgid "could not read log from standard input"
1469 msgstr "无法从标准输入中读取说明信息"
1471 #: builtin/commit.c:688
1473 msgid "could not read log file '%s'"
1474 msgstr "无法读取说明文件 '%s'"
1476 #: builtin/commit.c:694
1477 msgid "commit has empty message"
1480 #: builtin/commit.c:710
1481 msgid "could not read MERGE_MSG"
1482 msgstr "无法读取 MERGE_MSG"
1484 #: builtin/commit.c:714
1485 msgid "could not read SQUASH_MSG"
1486 msgstr "无法读取 SQUASH_MSG"
1488 #: builtin/commit.c:718
1490 msgid "could not read '%s'"
1493 #: builtin/commit.c:746
1495 msgid "could not open '%s'"
1498 #: builtin/commit.c:770
1499 msgid "could not write commit template"
1503 #: builtin/commit.c:783
1507 "It looks like you may be committing a %s.\n"
1508 "If this is not correct, please remove the file\n"
1519 #: builtin/commit.c:796
1520 msgid "Please enter the commit message for your changes."
1521 msgstr "请为您的修改输入提交说明。"
1523 #: builtin/commit.c:799
1526 "with '#' will be ignored, and an empty message aborts the commit.\n"
1529 "的行将被忽略,而且空提交说明将会终止提交。\n"
1532 #: builtin/commit.c:804
1535 "with '#' will be kept; you may remove them yourself if you want to.\n"
1536 "An empty message aborts the commit.\n"
1539 "的行将被保留,您可以删除它们如果您想这样做。空提交说明将会终止提交。\n"
1541 # 为保证在输出中对齐,注意调整句中空格!
1542 #: builtin/commit.c:816
1544 msgid "%sAuthor: %s"
1547 # 为保证在输出中对齐,注意调整句中空格!
1548 #: builtin/commit.c:823
1550 msgid "%sCommitter: %s"
1553 #: builtin/commit.c:843
1554 msgid "Cannot read index"
1557 #: builtin/commit.c:880
1558 msgid "Error building trees"
1561 #: builtin/commit.c:895 builtin/tag.c:357
1563 msgid "Please supply the message using either -m or -F option.\n"
1564 msgstr "请使用 -m 或者 -F 选项提供说明。\n"
1566 #: builtin/commit.c:975
1568 msgid "No existing author found with '%s'"
1569 msgstr "没有找到匹配 '%s' 的作者"
1571 #: builtin/commit.c:990 builtin/commit.c:1182
1573 msgid "Invalid untracked files mode '%s'"
1574 msgstr "无效的非追踪文件参数 '%s'"
1576 #: builtin/commit.c:1030
1577 msgid "Using both --reset-author and --author does not make sense"
1578 msgstr "同时使用 --reset-author 和 --author 没有意义"
1580 #: builtin/commit.c:1041
1581 msgid "You have nothing to amend."
1585 #: builtin/commit.c:1043
1587 msgid "You are in the middle of a %s -- cannot amend."
1588 msgstr "您正处于一个%s过程中 -- 无法修补提交。"
1590 #: builtin/commit.c:1045
1591 msgid "Options --squash and --fixup cannot be used together"
1592 msgstr "选项 --squash 和 --fixup 不能共用"
1594 #: builtin/commit.c:1055
1595 msgid "Only one of -c/-C/-F/--fixup can be used."
1596 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
1598 #: builtin/commit.c:1057
1599 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
1600 msgstr "选项 -m 不能和 -c/-C/-F/--fixup 共用。"
1602 #: builtin/commit.c:1063
1603 msgid "--reset-author can be used only with -C, -c or --amend."
1604 msgstr "--reset-author 只能和 -C, -c 或 --amend 共用。"
1606 #: builtin/commit.c:1080
1607 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
1608 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
1610 #: builtin/commit.c:1082
1611 msgid "No paths with --include/--only does not make sense."
1612 msgstr "参数 --include/--only 不跟路径没有意义。"
1614 #: builtin/commit.c:1084
1615 msgid "Clever... amending the last one with dirty index."
1616 msgstr "聪明... 在暂存区不干净下修补最后的提交。"
1618 #: builtin/commit.c:1086
1619 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
1620 msgstr "没有用 -i 或 -o 选项而显式地提供路径,认为是 --only paths..."
1622 #: builtin/commit.c:1096 builtin/tag.c:556
1624 msgid "Invalid cleanup mode %s"
1627 #: builtin/commit.c:1101
1628 msgid "Paths with -a does not make sense."
1629 msgstr "路径和 -a 选项共用没有意义。"
1631 #: builtin/commit.c:1280
1632 msgid "couldn't look up newly created commit"
1635 #: builtin/commit.c:1282
1636 msgid "could not parse newly created commit"
1639 #: builtin/commit.c:1323
1640 msgid "detached HEAD"
1644 #: builtin/commit.c:1325
1645 msgid " (root-commit)"
1648 #: builtin/commit.c:1415
1649 msgid "could not parse HEAD commit"
1650 msgstr "无法解析 HEAD 提交"
1652 #: builtin/commit.c:1452 builtin/merge.c:507
1654 msgid "could not open '%s' for reading"
1655 msgstr "无法打开 '%s' 读取"
1657 #: builtin/commit.c:1459
1659 msgid "Corrupt MERGE_HEAD file (%s)"
1660 msgstr "损坏的 MERGE_HEAD 文件 (%s)"
1662 #: builtin/commit.c:1466
1663 msgid "could not read MERGE_MODE"
1664 msgstr "无法读取 MERGE_MODE"
1666 #: builtin/commit.c:1485
1668 msgid "could not read commit message: %s"
1669 msgstr "无法读取提交说明:%s"
1671 #: builtin/commit.c:1499
1673 msgid "Aborting commit due to empty commit message.\n"
1674 msgstr "终止提交因为提交说明为空。\n"
1676 #: builtin/commit.c:1514 builtin/merge.c:933 builtin/merge.c:966
1677 msgid "failed to write commit object"
1680 #: builtin/commit.c:1535
1681 msgid "cannot lock HEAD ref"
1682 msgstr "无法锁定 HEAD 引用"
1684 #: builtin/commit.c:1539
1685 msgid "cannot update HEAD ref"
1686 msgstr "无法更新 HEAD 引用"
1688 #: builtin/commit.c:1550
1690 "Repository has been updated, but unable to write\n"
1691 "new_index file. Check that disk is not full or quota is\n"
1692 "not exceeded, and then \"git reset HEAD\" to recover."
1694 "版本库已被更新,但无法写入新暂存区文件。检查是否磁盘\n"
1695 "已满或磁盘配额耗尽,然后执行 \"git reset HEAD\" 恢复。"
1697 #: builtin/describe.c:234
1699 msgid "annotated tag %s not available"
1700 msgstr "注释 tag %s 无效"
1702 #: builtin/describe.c:238
1704 msgid "annotated tag %s has no embedded name"
1705 msgstr "注释 tag %s 没有嵌入名称"
1707 #: builtin/describe.c:240
1709 msgid "tag '%s' is really '%s' here"
1710 msgstr "tag '%s' 确是在 '%s'"
1712 #: builtin/describe.c:267
1714 msgid "Not a valid object name %s"
1715 msgstr "不是一个有效的对象名 %s"
1717 #: builtin/describe.c:270
1719 msgid "%s is not a valid '%s' object"
1720 msgstr "%s 不是一个有效的 '%s' 对象"
1722 #: builtin/describe.c:287
1724 msgid "no tag exactly matches '%s'"
1725 msgstr "没有 tag 准确匹配 '%s'"
1727 #: builtin/describe.c:289
1729 msgid "searching to describe %s\n"
1732 #: builtin/describe.c:329
1734 msgid "finished search at %s\n"
1737 #: builtin/describe.c:353
1740 "No annotated tags can describe '%s'.\n"
1741 "However, there were unannotated tags: try --tags."
1743 "没有注释 tag 能描述 '%s'。\n"
1744 "然而,有非注释 tag:尝试 --tags。"
1746 #: builtin/describe.c:357
1749 "No tags can describe '%s'.\n"
1750 "Try --always, or create some tags."
1752 "没有注释 tag 能描述 '%s'。\n"
1753 "尝试 --always,或创建一些 tag。"
1755 #: builtin/describe.c:378
1757 msgid "traversed %lu commits\n"
1758 msgstr "已遍历 %lu 个提交\n"
1760 #: builtin/describe.c:381
1763 "more than %i tags found; listed %i most recent\n"
1764 "gave up search at %s\n"
1766 "发现多于 %i 个 tag;列出最近的 %i 个\n"
1769 #: builtin/describe.c:436
1770 msgid "--long is incompatible with --abbrev=0"
1771 msgstr "--long 与 --abbrev=0 不兼容"
1773 #: builtin/describe.c:462
1774 msgid "No names found, cannot describe anything."
1775 msgstr "没有发现名称,无法描述任何东西"
1777 #: builtin/describe.c:482
1778 msgid "--dirty is incompatible with committishes"
1779 msgstr "--dirty 不能与提交共用"
1781 #: builtin/diff.c:77
1783 msgid "'%s': not a regular file or symlink"
1784 msgstr "'%s':不是一个正规文件或符号链接"
1786 #: builtin/diff.c:220
1788 msgid "invalid option: %s"
1791 #: builtin/diff.c:293
1792 msgid "Not a git repository"
1793 msgstr "不是一个 git 版本库"
1795 #: builtin/diff.c:343
1797 msgid "invalid object '%s' given."
1798 msgstr "提供了无效对象 '%s'。"
1800 #: builtin/diff.c:348
1802 msgid "more than %d trees given: '%s'"
1803 msgstr "提供了超过 %d 个树对象:'%s'"
1805 #: builtin/diff.c:358
1807 msgid "more than two blobs given: '%s'"
1808 msgstr "提供了超过两个 blob 对象:'%s'"
1810 #: builtin/diff.c:366
1812 msgid "unhandled object '%s' given."
1813 msgstr "提供了无法处理的对象 '%s'。"
1815 #: builtin/fetch.c:200
1816 msgid "Couldn't find remote ref HEAD"
1817 msgstr "无法发现远程 HEAD 引用"
1819 #: builtin/fetch.c:252
1821 msgid "object %s not found"
1824 #: builtin/fetch.c:258
1825 msgid "[up to date]"
1828 #: builtin/fetch.c:272
1830 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
1831 msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)"
1833 #: builtin/fetch.c:273 builtin/fetch.c:351
1837 #: builtin/fetch.c:284
1838 msgid "[tag update]"
1842 #: builtin/fetch.c:286 builtin/fetch.c:313 builtin/fetch.c:331
1843 msgid " (unable to update local ref)"
1844 msgstr " (不能更新本地引用)"
1846 #: builtin/fetch.c:298
1850 #: builtin/fetch.c:302
1851 msgid "[new branch]"
1854 #: builtin/fetch.c:347
1855 msgid "unable to update local ref"
1858 #: builtin/fetch.c:347
1859 msgid "forced update"
1862 #: builtin/fetch.c:353
1863 msgid "(non-fast-forward)"
1866 #: builtin/fetch.c:384 builtin/fetch.c:676
1868 msgid "cannot open %s: %s\n"
1869 msgstr "无法打开 %s:%s\n"
1871 #: builtin/fetch.c:393
1873 msgid "%s did not send all necessary objects\n"
1874 msgstr "%s 未发送所有必须的对象\n"
1876 #: builtin/fetch.c:479
1881 #: builtin/fetch.c:490
1884 "some local refs could not be updated; try running\n"
1885 " 'git remote prune %s' to remove any old, conflicting branches"
1887 "一些本地引用不能被更新;尝试运行\n"
1888 " 'git remote prune %s' 来删除旧的、有冲突的分支"
1891 #: builtin/fetch.c:540
1893 msgid " (%s will become dangling)\n"
1894 msgstr " (%s 将成为悬空状态)\n"
1897 #: builtin/fetch.c:541
1899 msgid " (%s has become dangling)\n"
1900 msgstr " (%s 已成为悬空状态)\n"
1902 #: builtin/fetch.c:548
1906 #: builtin/fetch.c:549
1910 #: builtin/fetch.c:666
1912 msgid "Refusing to fetch into current branch %s of non-bare repository"
1913 msgstr "拒绝获取到非裸版本库的当前分支 %s"
1915 #: builtin/fetch.c:700
1917 msgid "Don't know how to fetch from %s"
1918 msgstr "不知道如何从 %s 获取"
1920 #: builtin/fetch.c:777
1922 msgid "Option \"%s\" value \"%s\" is not valid for %s"
1923 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
1925 #: builtin/fetch.c:780
1927 msgid "Option \"%s\" is ignored for %s\n"
1928 msgstr "选项 \"%s\" 对于 %s 被忽略\n"
1930 #: builtin/fetch.c:879
1932 msgid "Fetching %s\n"
1935 #: builtin/fetch.c:881
1937 msgid "Could not fetch %s"
1940 #: builtin/fetch.c:898
1942 "No remote repository specified. Please, specify either a URL or a\n"
1943 "remote name from which new revisions should be fetched."
1944 msgstr "未提供远程版本库。请提供一个URL或远程版本库名,用于获取新版本。"
1946 #: builtin/fetch.c:918
1947 msgid "You need to specify a tag name."
1948 msgstr "你需要提供一个 tag 名称"
1950 #: builtin/fetch.c:970
1951 msgid "fetch --all does not take a repository argument"
1952 msgstr "fetch --all 不能带一个版本库参数"
1954 #: builtin/fetch.c:972
1955 msgid "fetch --all does not make sense with refspecs"
1956 msgstr "fetch --all 带引用表达式没有任何意义"
1958 #: builtin/fetch.c:983
1960 msgid "No such remote or remote group: %s"
1961 msgstr "没有这样的远程或远程组:%s"
1963 #: builtin/fetch.c:991
1964 msgid "Fetching a group and specifying refspecs does not make sense"
1965 msgstr "获取组并提供引用表达式没有意义"
1969 msgid "Invalid %s: '%s'"
1970 msgstr "无效的 %s:'%s'"
1973 msgid "Too many options specified"
1978 msgid "insanely long object directory %.*s"
1979 msgstr "不正常的长对象目录 %.*s"
1983 msgid "Auto packing the repository for optimum performance.\n"
1984 msgstr "自动打包版本库以求最佳性能。\n"
1989 "Auto packing the repository for optimum performance. You may also\n"
1990 "run \"git gc\" manually. See \"git help gc\" for more information.\n"
1992 "自动打包版本库以求最佳性能。你还可以\n"
1993 "手动运行 \"git gc\"。 参见 \"git help gc\" 获取更多信息。\n"
1997 "There are too many unreachable loose objects; run 'git prune' to remove them."
1998 msgstr "有太多无指向的松散对象,运行 'git prune' 删除它们。"
2000 #: builtin/grep.c:216
2002 msgid "grep: failed to create thread: %s"
2003 msgstr "grep: 无法创建线程:%s"
2005 #: builtin/grep.c:402
2007 msgid "Failed to chdir: %s"
2010 #: builtin/grep.c:478 builtin/grep.c:512
2012 msgid "unable to read tree (%s)"
2013 msgstr "无法读取代码树(%s)"
2015 #: builtin/grep.c:526
2017 msgid "unable to grep from object of type %s"
2018 msgstr "无法抓取来自于 %s 类型的对象"
2020 #: builtin/grep.c:584
2022 msgid "switch `%c' expects a numerical value"
2023 msgstr "开关 `%c' 期望一个数字值"
2025 #: builtin/grep.c:601
2027 msgid "cannot open '%s'"
2030 #: builtin/grep.c:889
2031 msgid "no pattern given."
2034 #: builtin/grep.c:903
2036 msgid "bad object %s"
2039 #: builtin/grep.c:944
2040 msgid "--open-files-in-pager only works on the worktree"
2041 msgstr "--open-files-in-pager 仅用于工作区"
2043 #: builtin/grep.c:967
2044 msgid "--cached or --untracked cannot be used with --no-index."
2045 msgstr "--cached 或 --untracked 不能与 --no-index 共用"
2047 #: builtin/grep.c:972
2048 msgid "--no-index or --untracked cannot be used with revs."
2049 msgstr "--no-index 或 --untracked 不能和版本共用。"
2051 #: builtin/grep.c:975
2052 msgid "--[no-]exclude-standard cannot be used for tracked contents."
2053 msgstr "--[no-]exclude-standard 不能用于跟踪内容。"
2055 #: builtin/grep.c:983
2056 msgid "both --cached and trees are given."
2057 msgstr "同时给出了 --cached 和树对象。"
2059 #: builtin/init-db.c:35
2061 msgid "Could not make %s writable by group"
2062 msgstr "不能设置 %s 为组可写"
2064 #: builtin/init-db.c:62
2066 msgid "insanely long template name %s"
2069 #: builtin/init-db.c:67
2071 msgid "cannot stat '%s'"
2072 msgstr "不能枚举 '%s' 状态"
2074 #: builtin/init-db.c:73
2076 msgid "cannot stat template '%s'"
2077 msgstr "不能枚举模版 '%s' 状态"
2079 #: builtin/init-db.c:80
2081 msgid "cannot opendir '%s'"
2082 msgstr "不能打开目录 '%s'"
2084 #: builtin/init-db.c:97
2086 msgid "cannot readlink '%s'"
2087 msgstr "不能读取链接 '%s'"
2089 #: builtin/init-db.c:99
2091 msgid "insanely long symlink %s"
2094 #: builtin/init-db.c:102
2096 msgid "cannot symlink '%s' '%s'"
2097 msgstr "不能创建符号链接 '%s' 到 '%s'"
2099 #: builtin/init-db.c:106
2101 msgid "cannot copy '%s' to '%s'"
2102 msgstr "不能拷贝 '%s' 至 '%s'"
2104 #: builtin/init-db.c:110
2106 msgid "ignoring template %s"
2109 #: builtin/init-db.c:133
2111 msgid "insanely long template path %s"
2114 #: builtin/init-db.c:141
2116 msgid "templates not found %s"
2119 #: builtin/init-db.c:154
2121 msgid "not copying templates of a wrong format version %d from '%s'"
2122 msgstr "未复制错误版本 %d 的模版自 '%s'"
2124 #: builtin/init-db.c:192
2126 msgid "insane git directory %s"
2127 msgstr "不正常的 git 目录 %s"
2129 #: builtin/init-db.c:322 builtin/init-db.c:325
2131 msgid "%s already exists"
2134 #: builtin/init-db.c:354
2136 msgid "unable to handle file type %d"
2137 msgstr "不能处理 %d 类型的文件"
2139 #: builtin/init-db.c:357
2141 msgid "unable to move %s to %s"
2142 msgstr "不能移动 %s 至 %s"
2144 #: builtin/init-db.c:362
2146 msgid "Could not create git link %s"
2147 msgstr "不能创建 git link %s"
2150 #. * TRANSLATORS: The first '%s' is either "Reinitialized
2151 #. * existing" or "Initialized empty", the second " shared" or
2152 #. * "", and the last '%s%s' is the verbatim directory name.
2154 #: builtin/init-db.c:419
2156 msgid "%s%s Git repository in %s%s\n"
2157 msgstr "%s%s Git 版本库于 %s%s\n"
2159 #: builtin/init-db.c:420
2160 msgid "Reinitialized existing"
2163 #: builtin/init-db.c:420
2164 msgid "Initialized empty"
2167 # 汉字字串合并,之间无空格,故删除前导空格
2168 #: builtin/init-db.c:421
2172 #: builtin/init-db.c:440
2173 msgid "cannot tell cwd"
2176 #: builtin/init-db.c:521 builtin/init-db.c:528
2178 msgid "cannot mkdir %s"
2181 #: builtin/init-db.c:532
2183 msgid "cannot chdir to %s"
2186 #: builtin/init-db.c:554
2189 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
2192 "不允许 %s(或 --work-tree=<directory>)而没有 %s(或 --git-dir=<directory>)"
2194 #: builtin/init-db.c:578
2195 msgid "Cannot access current working directory"
2198 #: builtin/init-db.c:585
2200 msgid "Cannot access work tree '%s'"
2201 msgstr "不能访问工作区 '%s'"
2203 #: builtin/log.c:185
2205 msgid "Final output: %d %s\n"
2206 msgstr "最终输出:%d %s\n"
2208 #: builtin/log.c:393 builtin/log.c:479
2210 msgid "Could not read object %s"
2213 #: builtin/log.c:503
2215 msgid "Unknown type: %d"
2218 #: builtin/log.c:592
2219 msgid "format.headers without value"
2220 msgstr "format.headers 没有值"
2222 #: builtin/log.c:665
2223 msgid "name of output directory is too long"
2226 #: builtin/log.c:676
2228 msgid "Cannot open patch file %s"
2229 msgstr "无法打开补丁文件 %s"
2231 #: builtin/log.c:690
2232 msgid "Need exactly one range."
2235 #: builtin/log.c:698
2236 msgid "Not a range."
2239 #: builtin/log.c:735
2240 msgid "Could not extract email from committer identity."
2241 msgstr "无法从提交者身份中提取邮件地址。"
2243 #: builtin/log.c:781
2244 msgid "Cover letter needs email format"
2247 #: builtin/log.c:875
2249 msgid "insane in-reply-to: %s"
2250 msgstr "不正常的 in-reply-to:%s"
2252 #: builtin/log.c:948
2253 msgid "Two output directories?"
2256 #: builtin/log.c:1169
2258 msgid "bogus committer info %s"
2259 msgstr "虚假的提交者信息 %s"
2261 #: builtin/log.c:1214
2262 msgid "-n and -k are mutually exclusive."
2263 msgstr "-n 和 -k 互斥。"
2265 #: builtin/log.c:1216
2266 msgid "--subject-prefix and -k are mutually exclusive."
2267 msgstr "--subject-prefix 和 -k 互斥。"
2269 #: builtin/log.c:1221 builtin/shortlog.c:284
2271 msgid "unrecognized argument: %s"
2274 #: builtin/log.c:1224
2275 msgid "--name-only does not make sense"
2276 msgstr "--name-only 无意义"
2278 #: builtin/log.c:1226
2279 msgid "--name-status does not make sense"
2280 msgstr "--name-status 无意义"
2282 #: builtin/log.c:1228
2283 msgid "--check does not make sense"
2284 msgstr "--check 无意义"
2286 #: builtin/log.c:1251
2287 msgid "standard output, or directory, which one?"
2288 msgstr "标准输出或目录,哪一个?"
2290 #: builtin/log.c:1253
2292 msgid "Could not create directory '%s'"
2293 msgstr "无法创建目录 '%s'"
2295 #: builtin/log.c:1406
2296 msgid "Failed to create output files"
2299 #: builtin/log.c:1510
2302 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
2303 msgstr "无法找到跟踪的远程分支,请手工提供 <upstream>。\n"
2305 #: builtin/log.c:1526 builtin/log.c:1528 builtin/log.c:1540
2307 msgid "Unknown commit %s"
2310 #: builtin/merge.c:91
2311 msgid "switch `m' requires a value"
2312 msgstr "开关 `m' 需要一个值"
2314 #: builtin/merge.c:128
2316 msgid "Could not find merge strategy '%s'.\n"
2317 msgstr "无法找到合并策略 '%s'。\n"
2319 #: builtin/merge.c:129
2321 msgid "Available strategies are:"
2324 #: builtin/merge.c:134
2326 msgid "Available custom strategies are:"
2329 #: builtin/merge.c:241
2330 msgid "could not run stash."
2333 #: builtin/merge.c:246
2334 msgid "stash failed"
2337 #: builtin/merge.c:251
2339 msgid "not a valid object: %s"
2340 msgstr "不是一个有效对象:%s"
2342 #: builtin/merge.c:270 builtin/merge.c:287
2343 msgid "read-tree failed"
2347 #: builtin/merge.c:317
2348 msgid " (nothing to squash)"
2351 #: builtin/merge.c:330
2353 msgid "Squash commit -- not updating HEAD\n"
2354 msgstr "压缩提交 -- 未更新 HEAD\n"
2356 #: builtin/merge.c:362
2357 msgid "Writing SQUASH_MSG"
2358 msgstr "写入 SQUASH_MSG"
2360 #: builtin/merge.c:364
2361 msgid "Finishing SQUASH_MSG"
2362 msgstr "完成 SQUASH_MSG"
2364 #: builtin/merge.c:386
2366 msgid "No merge message -- not updating HEAD\n"
2367 msgstr "无合并信息 -- 未更新 HEAD\n"
2369 #: builtin/merge.c:435
2371 msgid "'%s' does not point to a commit"
2372 msgstr "'%s' 没有指向一个提交"
2374 #: builtin/merge.c:534
2376 msgid "Bad branch.%s.mergeoptions string: %s"
2377 msgstr "错的 branch.%s.mergeoptions 字串:%s"
2379 #: builtin/merge.c:627
2380 msgid "git write-tree failed to write a tree"
2381 msgstr "git write-tree 无法写入一树对象"
2383 #: builtin/merge.c:677
2384 msgid "failed to read the cache"
2387 #: builtin/merge.c:694
2388 msgid "Unable to write index."
2391 #: builtin/merge.c:707
2392 msgid "Not handling anything other than two heads merge."
2393 msgstr "不能处理两个头合并之外的任何操作。"
2395 #: builtin/merge.c:721
2397 msgid "Unknown option for merge-recursive: -X%s"
2398 msgstr "merge-recursive 的未知选项:-X%s"
2400 #: builtin/merge.c:735
2402 msgid "unable to write %s"
2405 #: builtin/merge.c:874
2407 msgid "Could not read from '%s'"
2408 msgstr "不能从 '%s' 读取"
2410 #: builtin/merge.c:883
2412 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
2413 msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
2415 #: builtin/merge.c:889
2417 "Please enter a commit message to explain why this merge is necessary,\n"
2418 "especially if it merges an updated upstream into a topic branch.\n"
2420 "Lines starting with '#' will be ignored, and an empty message aborts\n"
2423 "请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
2426 "以 '#' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
2428 #: builtin/merge.c:913
2429 msgid "Empty commit message."
2432 #: builtin/merge.c:925
2434 msgid "Wonderful.\n"
2437 #: builtin/merge.c:998
2439 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
2440 msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
2442 #: builtin/merge.c:1014
2444 msgid "'%s' is not a commit"
2445 msgstr "'%s' 不是一个提交"
2447 #: builtin/merge.c:1055
2448 msgid "No current branch."
2451 #: builtin/merge.c:1057
2452 msgid "No remote for the current branch."
2453 msgstr "当前分支没有远程版本库。"
2455 #: builtin/merge.c:1059
2456 msgid "No default upstream defined for the current branch."
2457 msgstr "当前分支未定义默认上游分支。"
2459 #: builtin/merge.c:1064
2461 msgid "No remote tracking branch for %s from %s"
2462 msgstr "%s 没有来自 %s 的远程跟踪分支"
2464 #: builtin/merge.c:1186
2465 msgid "There is no merge to abort (MERGE_HEAD missing)."
2466 msgstr "没有要终止的合并(MERGE_HEAD 丢失)"
2468 #: builtin/merge.c:1202 git-pull.sh:31
2470 "You have not concluded your merge (MERGE_HEAD exists).\n"
2471 "Please, commit your changes before you can merge."
2473 "您尚未结束您的合并(存在 MERGE_HEAD)。\n"
2476 #: builtin/merge.c:1205 git-pull.sh:34
2477 msgid "You have not concluded your merge (MERGE_HEAD exists)."
2478 msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
2480 #: builtin/merge.c:1209
2482 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
2483 "Please, commit your changes before you can merge."
2485 "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
2488 #: builtin/merge.c:1212
2489 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
2490 msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
2492 #: builtin/merge.c:1221
2493 msgid "You cannot combine --squash with --no-ff."
2494 msgstr "您不能将 --squash 与 --no-ff 共用。"
2496 #: builtin/merge.c:1226
2497 msgid "You cannot combine --no-ff with --ff-only."
2498 msgstr "您不能将 --no-ff 与 --ff-only 共用。"
2500 #: builtin/merge.c:1233
2501 msgid "No commit specified and merge.defaultToUpstream not set."
2502 msgstr "未指出提交并且 merge.defaultToUpstream 未设置。"
2504 #: builtin/merge.c:1264
2505 msgid "Can merge only exactly one commit into empty head"
2506 msgstr "只可将一个提交合并到空分支上"
2508 #: builtin/merge.c:1267
2509 msgid "Squash commit into empty head not supported yet"
2510 msgstr "尚不支持到空分支的压缩提交"
2512 #: builtin/merge.c:1269
2513 msgid "Non-fast-forward commit does not make sense into an empty head"
2514 msgstr "到空分支的非快进式提交没有意义"
2516 #: builtin/merge.c:1273 builtin/merge.c:1317
2518 msgid "%s - not something we can merge"
2519 msgstr "%s - 不是我们可以合并的东西"
2521 #: builtin/merge.c:1383
2523 msgid "Updating %s..%s\n"
2524 msgstr "更新 %s..%s\n"
2526 #: builtin/merge.c:1421
2528 msgid "Trying really trivial in-index merge...\n"
2529 msgstr "尝试非常小的暂存区内合并...\n"
2531 #: builtin/merge.c:1428
2536 #: builtin/merge.c:1460
2537 msgid "Not possible to fast-forward, aborting."
2540 #: builtin/merge.c:1483 builtin/merge.c:1560
2542 msgid "Rewinding the tree to pristine...\n"
2543 msgstr "将树回滚至原始状态...\n"
2545 #: builtin/merge.c:1487
2547 msgid "Trying merge strategy %s...\n"
2548 msgstr "尝试合并策略 %s...\n"
2550 #: builtin/merge.c:1551
2552 msgid "No merge strategy handled the merge.\n"
2553 msgstr "没有合并策略处理此合并。\n"
2555 #: builtin/merge.c:1553
2557 msgid "Merge with strategy %s failed.\n"
2558 msgstr "使用策略 %s 合并失败。\n"
2560 #: builtin/merge.c:1562
2562 msgid "Using the %s to prepare resolving by hand.\n"
2563 msgstr "使用 %s 以准备手工解决。\n"
2565 #: builtin/merge.c:1573
2567 msgid "Automatic merge went well; stopped before committing as requested\n"
2568 msgstr "自动合并进展顺利,按要求在提交前停止\n"
2572 msgid "Checking rename of '%s' to '%s'\n"
2573 msgstr "检查 '%s' 到 '%s' 的重命名\n"
2580 msgid "can not move directory into itself"
2584 msgid "cannot move directory over file"
2589 msgid "Huh? %.*s is in index?"
2590 msgstr "嗯?%.*s 在暂存区中?"
2593 msgid "source directory is empty"
2597 msgid "not under version control"
2601 msgid "destination exists"
2606 msgid "overwriting '%s'"
2610 msgid "Cannot overwrite"
2614 msgid "multiple sources for the same target"
2619 msgid "%s, source=%s, destination=%s"
2620 msgstr "%s,源=%s,目标=%s"
2624 msgid "Renaming %s to %s\n"
2625 msgstr "重命名 %s 至 %s\n"
2629 msgid "renaming '%s' failed"
2630 msgstr "重命名 '%s' 失败"
2632 #: builtin/notes.c:139
2634 msgid "unable to start 'show' for object '%s'"
2635 msgstr "不能为对象 '%s' 开始 'show'"
2637 #: builtin/notes.c:145
2638 msgid "can't fdopen 'show' output fd"
2639 msgstr "不能打开 'show' 输出文件句柄"
2641 #: builtin/notes.c:155
2643 msgid "failed to close pipe to 'show' for object '%s'"
2644 msgstr "无法为对象 '%s' 的 'show' 关闭管道"
2646 #: builtin/notes.c:158
2648 msgid "failed to finish 'show' for object '%s'"
2649 msgstr "无法为对象 '%s' 完成 'show'"
2651 #: builtin/notes.c:175 builtin/tag.c:343
2653 msgid "could not create file '%s'"
2654 msgstr "不能创建文件 '%s'"
2656 #: builtin/notes.c:189
2657 msgid "Please supply the note contents using either -m or -F option"
2658 msgstr "请通过 -m 或 -F 选项为注解提供内容"
2660 #: builtin/notes.c:210 builtin/notes.c:973
2662 msgid "Removing note for object %s\n"
2663 msgstr "删除对象 %s 的注解\n"
2665 #: builtin/notes.c:215
2666 msgid "unable to write note object"
2669 #: builtin/notes.c:217
2671 msgid "The note contents has been left in %s"
2672 msgstr "注解内容被留在文件 %s 中"
2674 #: builtin/notes.c:251 builtin/tag.c:521
2676 msgid "cannot read '%s'"
2679 #: builtin/notes.c:253 builtin/tag.c:524
2681 msgid "could not open or read '%s'"
2682 msgstr "不能打开或读取 '%s'"
2684 #: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447
2685 #: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644
2686 #: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766
2687 #: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:537
2689 msgid "Failed to resolve '%s' as a valid ref."
2690 msgstr "无法解析 '%s' 为一个有效引用"
2692 #: builtin/notes.c:275
2694 msgid "Failed to read object '%s'."
2695 msgstr "无法读取对象 '%s'。"
2697 #: builtin/notes.c:299
2698 msgid "Cannot commit uninitialized/unreferenced notes tree"
2699 msgstr "不能提交未初始化/未引用的注解树"
2701 #: builtin/notes.c:340
2703 msgid "Bad notes.rewriteMode value: '%s'"
2704 msgstr "错误的 notes.rewriteMode 值:'%s'"
2706 #: builtin/notes.c:350
2708 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
2709 msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
2711 #. TRANSLATORS: The first %s is the name of the
2712 #. environment variable, the second %s is its value
2713 #: builtin/notes.c:377
2715 msgid "Bad %s value: '%s'"
2716 msgstr "错误的 %s 值:'%s'"
2718 #: builtin/notes.c:441
2720 msgid "Malformed input line: '%s'."
2721 msgstr "非法的输入行:'%s'。"
2723 #: builtin/notes.c:456
2725 msgid "Failed to copy notes from '%s' to '%s'"
2726 msgstr "无法从 '%s' 拷贝注解到 '%s'"
2728 #: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627
2729 #: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759
2730 #: builtin/notes.c:1033
2731 msgid "too many parameters"
2734 #: builtin/notes.c:513 builtin/notes.c:772
2736 msgid "No note found for object %s."
2737 msgstr "未发现对象 %s 的注解。"
2739 #: builtin/notes.c:580
2742 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
2744 msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
2746 #: builtin/notes.c:585 builtin/notes.c:662
2748 msgid "Overwriting existing notes for object %s\n"
2749 msgstr "覆盖对象 %s 现存注解\n"
2751 #: builtin/notes.c:635
2752 msgid "too few parameters"
2755 #: builtin/notes.c:656
2758 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
2760 msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
2762 #: builtin/notes.c:668
2764 msgid "Missing notes on source object %s. Cannot copy."
2765 msgstr "源对象 %s 缺少注解。不能拷贝。"
2767 #: builtin/notes.c:717
2770 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
2771 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
2773 "选项 -m/-F/-c/-C 已为 'edit' 子命令废弃。\n"
2774 "请换用 'git notes add -f -m/-F/-c/-C'。\n"
2776 #: builtin/notes.c:971
2778 msgid "Object %s has no note\n"
2779 msgstr "对象 %s 没有注解\n"
2781 #: builtin/notes.c:1103
2783 msgid "Unknown subcommand: %s"
2786 #: builtin/pack-objects.c:2310
2788 msgid "unsupported index version %s"
2789 msgstr "不支持的暂存区版本 %s"
2791 #: builtin/pack-objects.c:2314
2793 msgid "bad index version '%s'"
2794 msgstr "错误的暂存区版本 '%s'"
2796 #: builtin/pack-objects.c:2322
2798 msgid "option %s does not accept negative form"
2799 msgstr "选项 '%s' 不接受否定格式"
2801 #: builtin/pack-objects.c:2326
2803 msgid "unable to parse value '%s' for option %s"
2804 msgstr "不能解析值 '%s' 针对于选项 %s"
2806 #: builtin/push.c:44
2807 msgid "tag shorthand without <tag>"
2808 msgstr "tag 简写没有跟 <tag> 参数"
2810 #: builtin/push.c:63
2811 msgid "--delete only accepts plain target ref names"
2812 msgstr "--delete 只接受简单的引用名称"
2814 #: builtin/push.c:73
2817 "You are not currently on a branch.\n"
2818 "To push the history leading to the current (detached HEAD)\n"
2821 " git push %s HEAD:<name-of-remote-branch>\n"
2824 "现在为推送当前历史(分离头指针),使用\n"
2826 " git push %s HEAD:<name-of-remote-branch>\n"
2828 #: builtin/push.c:80
2831 "The current branch %s has no upstream branch.\n"
2832 "To push the current branch and set the remote as upstream, use\n"
2834 " git push --set-upstream %s %s\n"
2836 "当前分支 %s 没有对应的上游分支。\n"
2837 "为推送当前分支并建立与远程上游的跟踪,使用\n"
2839 " git push --set-upstream %s %s\n"
2841 #: builtin/push.c:88
2843 msgid "The current branch %s has multiple upstream branches, refusing to push."
2844 msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
2846 #: builtin/push.c:111
2848 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
2849 msgstr "您没有为推送提供任何引用表达式,并且 push.default 为 \"nothing\"。"
2851 #: builtin/push.c:131
2853 msgid "Pushing to %s\n"
2856 #: builtin/push.c:135
2858 msgid "failed to push some refs to '%s'"
2859 msgstr "无法推送一些引用到 '%s'"
2861 #: builtin/push.c:143
2864 "To prevent you from losing history, non-fast-forward updates were rejected\n"
2865 "Merge the remote changes (e.g. 'git pull') before pushing again. See the\n"
2866 "'Note about fast-forwards' section of 'git push --help' for details.\n"
2868 "为防止您丢失提交历史,禁止非快进式推送。\n"
2869 "再次推送前先与远程变更合并(如 'git pull')。详见\n"
2870 "'git push --help' 中的 'Note about fast-forwards' 小节。\n"
2872 #: builtin/push.c:160
2874 msgid "bad repository '%s'"
2875 msgstr "错误的版本库 '%s'"
2877 #: builtin/push.c:161
2879 "No configured push destination.\n"
2880 "Either specify the URL from the command-line or configure a remote "
2881 "repository using\n"
2883 " git remote add <name> <url>\n"
2885 "and then push using the remote name\n"
2887 " git push <name>\n"
2890 "或者通过命令行提供URL,或者用下面命令配置一个远程版本库\n"
2892 " git remote add <name> <url>\n"
2896 " git push <name>\n"
2898 #: builtin/push.c:176
2899 msgid "--all and --tags are incompatible"
2900 msgstr "--all 和 --tags 不兼容"
2902 #: builtin/push.c:177
2903 msgid "--all can't be combined with refspecs"
2904 msgstr "--all 不能和引用表达式共用"
2906 #: builtin/push.c:182
2907 msgid "--mirror and --tags are incompatible"
2908 msgstr "--mirror 和 --tags 不兼容"
2910 #: builtin/push.c:183
2911 msgid "--mirror can't be combined with refspecs"
2912 msgstr "--mirror 不能和引用表达式共用"
2914 #: builtin/push.c:188
2915 msgid "--all and --mirror are incompatible"
2916 msgstr "--all 和 --mirror 不兼容"
2918 #: builtin/push.c:274
2919 msgid "--delete is incompatible with --all, --mirror and --tags"
2920 msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
2922 #: builtin/push.c:276
2923 msgid "--delete doesn't make sense without any refs"
2924 msgstr "--delete 未接任何引用没有意义"
2926 #: builtin/reset.c:33
2930 #: builtin/reset.c:33
2934 #: builtin/reset.c:33
2938 #: builtin/reset.c:33
2942 #: builtin/reset.c:77
2943 msgid "You do not have a valid HEAD."
2944 msgstr "您没有一个有效的 HEAD。"
2946 #: builtin/reset.c:79
2947 msgid "Failed to find tree of HEAD."
2948 msgstr "无法找到 HEAD 指向的树。"
2950 #: builtin/reset.c:85
2952 msgid "Failed to find tree of %s."
2953 msgstr "无法找到 %s 指向的树。"
2955 #: builtin/reset.c:96
2956 msgid "Could not write new index file."
2957 msgstr "无法写入新的暂存区文件。"
2959 #: builtin/reset.c:106
2961 msgid "HEAD is now at %s"
2962 msgstr "HEAD 现在位于 %s"
2964 #: builtin/reset.c:130
2965 msgid "Could not read index"
2968 #: builtin/reset.c:133
2969 msgid "Unstaged changes after reset:"
2970 msgstr "重置后变更撤出暂存区:"
2973 #: builtin/reset.c:223
2975 msgid "Cannot do a %s reset in the middle of a merge."
2976 msgstr "在合并过程中不能做%s重置操作。"
2978 #: builtin/reset.c:297
2980 msgid "Could not parse object '%s'."
2981 msgstr "不能解析对象 '%s'。"
2983 #: builtin/reset.c:302
2984 msgid "--patch is incompatible with --{hard,mixed,soft}"
2985 msgstr "--patch 与 --{hard,mixed,soft} 不兼容"
2987 #: builtin/reset.c:311
2988 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
2989 msgstr "--mixed 带路径已弃用,代之以 'git reset -- <paths>'。"
2992 #: builtin/reset.c:313
2994 msgid "Cannot do %s reset with paths."
2995 msgstr "不能带路径进行%s重置。"
2998 #: builtin/reset.c:325
3000 msgid "%s reset is not allowed in a bare repository"
3001 msgstr "不能对裸版本库进行%s重置"
3003 #: builtin/reset.c:341
3005 msgid "Could not reset index file to revision '%s'."
3006 msgstr "不能重置暂存区至版本 '%s'。"
3008 #: builtin/revert.c:70 builtin/revert.c:91
3010 msgid "%s: %s cannot be used with %s"
3011 msgstr "%s: %s 不能和 %s 共用"
3013 #: builtin/revert.c:126
3014 msgid "program error"
3017 #: builtin/revert.c:209
3018 msgid "revert failed"
3021 #: builtin/revert.c:224
3022 msgid "cherry-pick failed"
3028 "'%s' has staged content different from both the file and the HEAD\n"
3029 "(use -f to force removal)"
3031 "'%s' 暂存的内容和工作区文件及 HEAD 中的都不一样\n"
3037 "'%s' has changes staged in the index\n"
3038 "(use --cached to keep the file, or -f to force removal)"
3041 "(使用 --cached 保存文件,或用 -f 强制删除)"
3046 "'%s' has local modifications\n"
3047 "(use --cached to keep the file, or -f to force removal)"
3050 "(使用 --cached 保存文件,或用 -f 强制删除)"
3054 msgid "not removing '%s' recursively without -r"
3055 msgstr "未提供 -r 选项不会递归删除 '%s'"
3059 msgid "git rm: unable to remove %s"
3060 msgstr "git rm:不能删除 %s"
3062 #: builtin/shortlog.c:157
3064 msgid "Missing author: %s"
3069 msgid "malformed object at '%s'"
3070 msgstr "非法的对象于 '%s'"
3072 #: builtin/tag.c:205
3074 msgid "tag name too long: %.*s..."
3075 msgstr "tag 名字太长:%.*s..."
3077 #: builtin/tag.c:210
3079 msgid "tag '%s' not found."
3080 msgstr "tag '%s' 未发现。"
3082 #: builtin/tag.c:225
3084 msgid "Deleted tag '%s' (was %s)\n"
3085 msgstr "已删除 tag '%s'(曾为 %s)\n"
3087 #: builtin/tag.c:237
3089 msgid "could not verify the tag '%s'"
3090 msgstr "不能校验 tag '%s'"
3092 #: builtin/tag.c:247
3096 "# Write a tag message\n"
3097 "# Lines starting with '#' will be ignored.\n"
3103 "# 以 '#' 开头的行将被忽略。\n"
3106 #: builtin/tag.c:254
3110 "# Write a tag message\n"
3111 "# Lines starting with '#' will be kept; you may remove them yourself if you "
3118 "# 以 '#' 开头的行将被忽略,您可以删除它们如果您想这样做。\n"
3121 #: builtin/tag.c:294
3122 msgid "unable to sign the tag"
3125 #: builtin/tag.c:296
3126 msgid "unable to write tag file"
3129 #: builtin/tag.c:321
3130 msgid "bad object type."
3133 #: builtin/tag.c:334
3134 msgid "tag header too big."
3137 #: builtin/tag.c:366
3138 msgid "no tag message?"
3141 #: builtin/tag.c:372
3143 msgid "The tag message has been left in %s\n"
3144 msgstr "tag 说明被保留在 %s\n"
3146 #: builtin/tag.c:421
3147 msgid "switch 'points-at' requires an object"
3148 msgstr "开关 'points-at' 需要一个对象"
3150 #: builtin/tag.c:423
3152 msgid "malformed object name '%s'"
3153 msgstr "非法的对象名 '%s'"
3155 #: builtin/tag.c:502
3156 msgid "-n option is only allowed with -l."
3157 msgstr "-n 选项只允许和 -l 共用。"
3159 #: builtin/tag.c:504
3160 msgid "--contains option is only allowed with -l."
3161 msgstr "--contains 选项只允许和 -l 共用。"
3163 #: builtin/tag.c:506
3164 msgid "--points-at option is only allowed with -l."
3165 msgstr "--points-at 选项只允许和 -l 共用。"
3167 #: builtin/tag.c:514
3168 msgid "only one -F or -m option is allowed."
3169 msgstr "只允许一个 -F 或 -m 选项。"
3171 #: builtin/tag.c:534
3172 msgid "too many params"
3175 #: builtin/tag.c:540
3177 msgid "'%s' is not a valid tag name."
3178 msgstr "'%s' 不是一个有效的tag名称"
3180 #: builtin/tag.c:545
3182 msgid "tag '%s' already exists"
3183 msgstr "tag '%s' 已存在"
3185 #: builtin/tag.c:563
3187 msgid "%s: cannot lock the ref"
3190 #: builtin/tag.c:565
3192 msgid "%s: cannot update the ref"
3195 #: builtin/tag.c:567
3197 msgid "Updated tag '%s' (was %s)\n"
3198 msgstr "已更新tag '%s'(曾为 %s)\n"
3201 msgid "You need to set your committer info first"
3202 msgstr "您需要先设置你的提交者信息"
3205 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
3206 msgstr "版本库缺乏必要的 blob 数据以进行三路合并。"
3210 "Did you hand edit your patch?\n"
3211 "It does not apply to blobs recorded in its index."
3217 msgid "Falling back to patching base and 3-way merge..."
3218 msgstr "转而使用补丁应用的基础版本和三路合并..."
3221 msgid "Only one StGIT patch series can be applied at once"
3222 msgstr "一次只能有一个 StGIT 补丁队列被应用"
3226 msgid "Patch format $patch_format is not supported."
3227 msgstr "不支持 $patch_format 补丁格式。"
3230 msgid "Patch format detection failed."
3234 msgid "-d option is no longer supported. Do not use."
3235 msgstr "不再支持 -d 选项。不要使用。"
3239 msgid "previous rebase directory $dotest still exists but mbox given."
3240 msgstr "之前的变基目录 $dotest 仍然存在但给出了mbox。"
3243 msgid "Please make up your mind. --skip or --abort?"
3244 msgstr "请下决心。--skip 或是 --abort ?"
3247 msgid "Resolve operation not in progress, we are not resuming."
3248 msgstr "解决操作未进行,我们不会继续。"
3252 msgid "Dirty index: cannot apply patches (dirty: $files)"
3253 msgstr "脏的暂存区:不能应用补丁(脏文件:$files)"
3256 msgid "cannot be interactive without stdin connected to a terminal."
3257 msgstr "没有和终端关联的标准输入不能进行交互式操作。"
3260 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
3261 #. in your translation. The program will only accept English
3262 #. input at this point.
3264 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
3265 msgstr "应用?[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
3269 msgid "Applying: $FIRSTLINE"
3270 msgstr "正应用:$FIRSTLINE"
3273 msgid "No changes -- Patch already applied."
3274 msgstr "没有变更 -- 补丁已经应用过。"
3277 msgid "applying to an empty history"
3281 #. TRANSLATORS: Make sure to include [Y] and [n] in your
3282 #. translation. The program will only accept English input
3285 msgid "Do you want me to do it for you [Y/n]? "
3286 msgstr "您想让我为您这样做么[Y/n]? "
3290 msgid "unrecognised option: '$arg'"
3291 msgstr "未识别的选项:'$arg'"
3295 msgid "'$arg' does not appear to be a valid revision"
3296 msgstr "'$arg' 看起来不像是一个有效的版本"
3298 #: git-bisect.sh:117
3299 msgid "Bad HEAD - I need a HEAD"
3300 msgstr "坏的 HEAD - 我需要一个 HEAD"
3302 #: git-bisect.sh:130
3305 "Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
3306 msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <validbranch>'。"
3308 #: git-bisect.sh:140
3309 msgid "won't bisect on seeked tree"
3310 msgstr "不会在已查找过的树上二分查找"
3312 #: git-bisect.sh:144
3313 msgid "Bad HEAD - strange symbolic ref"
3314 msgstr "错误的 HEAD - 奇怪的符号引用"
3316 #: git-bisect.sh:189
3318 msgid "Bad bisect_write argument: $state"
3319 msgstr "错误的bisect_write参数:$state"
3321 #: git-bisect.sh:218
3323 msgid "Bad rev input: $arg"
3324 msgstr "输入错误版本:$arg"
3326 #: git-bisect.sh:232
3327 msgid "Please call 'bisect_state' with at least one argument."
3328 msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
3330 #: git-bisect.sh:244
3332 msgid "Bad rev input: $rev"
3333 msgstr "输入坏的版本:$rev"
3335 #: git-bisect.sh:250
3336 msgid "'git bisect bad' can take only one argument."
3337 msgstr "'git bisect bad' 只能带一个参数。"
3340 #. TRANSLATORS: Make sure to include [Y] and [n] in your
3341 #. translation. The program will only accept English input
3343 #: git-bisect.sh:279
3344 msgid "Are you sure [Y/n]? "
3345 msgstr "您确认么[Y/n]? "
3347 #: git-bisect.sh:354
3349 msgid "'$invalid' is not a valid commit"
3350 msgstr "'$invalid' 不是一个有效的提交"
3352 #: git-bisect.sh:363
3355 "Could not check out original HEAD '$branch'.\n"
3356 "Try 'git bisect reset <commit>'."
3358 "不能检出原始 HEAD '$branch'。\n"
3359 "尝试 'git bisect reset <commit>'。"
3361 #: git-bisect.sh:390
3362 msgid "No logfile given"
3365 #: git-bisect.sh:391
3367 msgid "cannot read $file for replaying"
3368 msgstr "不能读取 $file 来重放"
3370 #: git-bisect.sh:408
3371 msgid "?? what are you talking about?"
3374 #: git-bisect.sh:474
3375 msgid "We are not bisecting."
3376 msgstr "我们没有进行二分查找。"
3380 "Pull is not possible because you have unmerged files.\n"
3381 "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
3382 "as appropriate to mark resolution, or use 'git commit -a'."
3384 "Pull 不可用,因为你尚有未合并的文件。请先在工作区改正文件,\n"
3385 "然后酌情使用 'git add/rm <file>' 标记解决方案,\n"
3386 "或使用 'git commit -a'。"
3389 msgid "Pull is not possible because you have unmerged files."
3390 msgstr "Pull 不可用,因为你尚有未合并的文件。"
3393 msgid "updating an unborn branch with changes added to the index"
3394 msgstr "更新尚未诞生的分支,变更添加至暂存区"
3397 msgid "Cannot merge multiple branches into empty head"
3398 msgstr "无法将多个分支合并到空分支"
3401 msgid "Cannot rebase onto multiple branches"
3405 msgid "git stash clear with parameters is unimplemented"
3406 msgstr "git stash clear 不支持参数"
3409 msgid "You do not have the initial commit yet"
3413 msgid "Cannot save the current index state"
3414 msgstr "无法保存当前暂存区状态"
3416 #: git-stash.sh:123 git-stash.sh:136
3417 msgid "Cannot save the current worktree state"
3418 msgstr "无法保存当前工作区状态"
3421 msgid "No changes selected"
3425 msgid "Cannot remove temporary index (can't happen)"
3426 msgstr "无法删除临时暂存区(不应发生)"
3429 msgid "Cannot record working tree state"
3433 msgid "No local changes to save"
3437 msgid "Cannot initialize stash"
3441 msgid "Cannot save the current status"
3445 msgid "Cannot remove worktree changes"
3449 msgid "No stash found."
3454 msgid "Too many revisions specified: $REV"
3455 msgstr "提供太多的版本:$REV"
3459 msgid "$reference is not valid reference"
3460 msgstr "$reference 不是有效的引用"
3464 msgid "'$args' is not a stash-like commit"
3465 msgstr "'$args' 不是stash样提交"
3469 msgid "'$args' is not a stash reference"
3470 msgstr "'$args' 不是一个stash引用"
3473 msgid "unable to refresh index"
3477 msgid "Cannot apply a stash in the middle of a merge"
3478 msgstr "无法在合并过程中恢复进度"
3481 msgid "Conflicts in index. Try without --index."
3482 msgstr "暂存区冲突。尝试不用 --index。"
3485 msgid "Could not save index tree"
3489 msgid "Cannot unstage modified files"
3494 msgid "Dropped ${REV} ($s)"
3495 msgstr "丢弃了 ${REV} ($s)"
3499 msgid "${REV}: Could not drop stash entry"
3500 msgstr "${REV}: 无法丢弃进度条目"
3503 msgid "No branch name specified"
3507 msgid "(To restore them type \"git stash apply\")"
3508 msgstr "(为恢复数据输入 \"git stash apply\")"
3510 #: git-submodule.sh:56
3512 msgid "cannot strip one component off url '$remoteurl'"
3513 msgstr "无法从 url '$remoteurl' 剥离一个组件"
3515 #: git-submodule.sh:108
3517 msgid "No submodule mapping found in .gitmodules for path '$path'"
3518 msgstr "未在 .gitmodules 中发现路径 '$path' 的子模组映射"
3520 #: git-submodule.sh:173
3522 msgid "Clone of '$url' into submodule path '$path' failed"
3523 msgstr "克隆 '$url' 到子模组路径 '$path' 失败"
3525 #: git-submodule.sh:247
3527 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
3528 msgstr "版本库URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
3530 #: git-submodule.sh:264
3532 msgid "'$path' already exists in the index"
3533 msgstr "'$path' 已经存在于暂存区中"
3535 #: git-submodule.sh:281
3537 msgid "'$path' already exists and is not a valid git repo"
3538 msgstr "'$path' 已存在且不是一个有效的 git 版本库"
3540 #: git-submodule.sh:295
3542 msgid "Unable to checkout submodule '$path'"
3543 msgstr "不能检出子模组 '$path'"
3545 #: git-submodule.sh:300
3547 msgid "Failed to add submodule '$path'"
3548 msgstr "无法添加子模组 '$path'"
3550 #: git-submodule.sh:305
3552 msgid "Failed to register submodule '$path'"
3553 msgstr "无法注册子模组 '$path'"
3555 #: git-submodule.sh:347
3557 msgid "Entering '$prefix$path'"
3558 msgstr "正在进入 '$prefix$path'"
3560 #: git-submodule.sh:359
3562 msgid "Stopping at '$path'; script returned non-zero status."
3563 msgstr "停止于 '$path',脚本返回非零值。"
3565 #: git-submodule.sh:401
3567 msgid "No url found for submodule path '$path' in .gitmodules"
3568 msgstr "在 .gitmodules 中未找到子模组路径 '$path' 的url"
3570 #: git-submodule.sh:410
3572 msgid "Failed to register url for submodule path '$path'"
3573 msgstr "无法为子模组路径 '$path' 注册 url"
3575 #: git-submodule.sh:418
3577 msgid "Failed to register update mode for submodule path '$path'"
3578 msgstr "无法为子模组路径 '$path' 注册更新模式"
3580 #: git-submodule.sh:420
3582 msgid "Submodule '$name' ($url) registered for path '$path'"
3583 msgstr "子模组 '$name' ($url) 已为路径 '$path' 注册"
3585 #: git-submodule.sh:519
3588 "Submodule path '$path' not initialized\n"
3589 "Maybe you want to use 'update --init'?"
3591 "子模组路径 '$path' 没有初始化\n"
3592 "也许你想用 'update --init'?"
3594 #: git-submodule.sh:532
3596 msgid "Unable to find current revision in submodule path '$path'"
3597 msgstr "无法在子模组路径 '$path' 中找到当前版本"
3599 #: git-submodule.sh:551
3601 msgid "Unable to fetch in submodule path '$path'"
3602 msgstr "无法在子模组路径 '$path' 中获取"
3604 #: git-submodule.sh:565
3606 msgid "Unable to rebase '$sha1' in submodule path '$path'"
3607 msgstr "无法在子模组路径 '$path' 中变基 '$sha1'"
3609 #: git-submodule.sh:566
3611 msgid "Submodule path '$path': rebased into '$sha1'"
3612 msgstr "子模组路径 '$path':变基至 '$sha1'"
3614 #: git-submodule.sh:571
3616 msgid "Unable to merge '$sha1' in submodule path '$path'"
3617 msgstr "无法合并 '$sha1' 到子模组路径 '$path' 中"
3619 #: git-submodule.sh:572
3621 msgid "Submodule path '$path': merged in '$sha1'"
3622 msgstr "子模组路径 '$path':已合并入 '$sha1'"
3624 #: git-submodule.sh:577
3626 msgid "Unable to checkout '$sha1' in submodule path '$path'"
3627 msgstr "无法在子模组路径 '$path' 中检出 '$sha1'"
3629 #: git-submodule.sh:578
3631 msgid "Submodule path '$path': checked out '$sha1'"
3632 msgstr "子模组路径 '$path':检出 '$sha1'"
3634 #: git-submodule.sh:600 git-submodule.sh:923
3636 msgid "Failed to recurse into submodule path '$path'"
3637 msgstr "无法递归进子模组路径 '$path'"
3639 #: git-submodule.sh:708
3644 #: git-submodule.sh:766
3646 msgid " Warn: $name doesn't contain commit $sha1_src"
3647 msgstr " 警告:$name 未包含提交 $sha1_src"
3650 #: git-submodule.sh:769
3652 msgid " Warn: $name doesn't contain commit $sha1_dst"
3653 msgstr " 警告:$name 未包含提交 $sha1_dst"
3656 #: git-submodule.sh:772
3658 msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
3659 msgstr " 警告:$name 未包含提交 $sha1_src 和 $sha1_dst"
3661 #: git-submodule.sh:797
3665 #: git-submodule.sh:798
3669 #: git-submodule.sh:969
3671 msgid "Synchronizing submodule url for '$name'"
3672 msgstr "为 '$name' 同步子模组url"