1 # Chinese translations for Git package
3 # Copyright (C) 2012,2013 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 # - Lian Cheng <rhythm.mail AT gmail.com>
8 # - Ray Chen <oldsharp AT gmail.com>
9 # - Riku <lu.riku AT gmail.com>
10 # - Thynson <lanxingcan AT gmail.com>
11 # - ws3389 <willsmith3389 AT gmail.com>
12 # - Wang Sheng <wangsheng2008love AT 163.com>
13 # - Yichao Yu <yyc1992 AT gmail.com>
14 # - Zhuang Ya <zhuangya AT me.com>
16 # Git glossary for Chinese translators
19 # ---------------------------------+--------------------------------------
21 # abbreviate | 简写(的 SHA-1 值)
22 # alternate object database | 备用对象库
25 # annotated tag | 附注标签
26 # bare repository | 纯仓库
41 # commit message | 提交说明
42 # commit object | 提交对象
43 # commit-ish (also committish) | 提交号
45 # core Git | 核心 Git 工具
47 # dangling object | 摇摆对象
48 # detached HEAD | 分离头指针
51 # dumb HTTP protocol | 哑 HTTP 协议
52 # evil merge | 坏合并(合并引入了父提交没有的修改)
57 # Git archive | 仓库(对于 arch 用户)
58 # gitfile | gitfile(仓库链接文件)
61 # HEAD | HEAD(头指针,亦即当前分支)
71 # master | master(默认分支名)
74 # object database | 对象库
75 # object identifier | 对象标识符
78 # octopus | 章鱼式合并(两分支以上的合并)
79 # origin | origin(默认的远程名称)
88 # plumbing | 管件(Git 底层核心命令的别称)
89 # porcelain | 瓷件(Git 上层封装命令的别称)
90 # precious-objects repo | 珍品仓库
100 # remote-tracking branch | 远程跟踪分支
109 # SHA-1 | SHA-1(安全哈希算法1)
110 # shallow repository | 浅(克隆)仓库
112 # smart HTTP protocol | 智能 HTTP 协议
114 # stage | n. 暂存区(即索引); v. 暂存
115 # stash | n. 进度保存; v. 保存进度
118 # tag | n. 标签; v. 打标签
121 # topic branch | 主题分支
125 # tree-ish (also treeish) | 树对象(或可以解析为一树对象)
126 # unmerged index | 未合并索引
128 # unreachable object | 不可达对象
131 # upstream branch | 上游分支
136 "Project-Id-Version: Git\n"
137 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
138 "POT-Creation-Date: 2017-04-23 09:54+0800\n"
139 "PO-Revision-Date: 2017-05-02 22:07+0800\n"
140 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
141 "Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
143 "MIME-Version: 1.0\n"
144 "Content-Type: text/plain; charset=UTF-8\n"
145 "Content-Transfer-Encoding: 8bit\n"
146 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
154 msgid "Cherry-picking is not possible because you have unmerged files."
155 msgstr "无法拣选,因为您有未合并的文件。"
158 msgid "Committing is not possible because you have unmerged files."
159 msgstr "无法提交,因为您有未合并的文件。"
162 msgid "Merging is not possible because you have unmerged files."
163 msgstr "无法合并,因为您有未合并的文件。"
166 msgid "Pulling is not possible because you have unmerged files."
167 msgstr "无法拉取,因为您有未合并的文件。"
170 msgid "Reverting is not possible because you have unmerged files."
171 msgstr "无法回退,因为您有未合并的文件。"
175 msgid "It is not possible to %s because you have unmerged files."
176 msgstr "无法 %s,因为您有未合并的文件。"
180 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"
181 "as appropriate to mark resolution and make a commit."
183 "请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n"
187 msgid "Exiting because of an unresolved conflict."
188 msgstr "因为存在未解决的冲突而退出。"
190 #: advice.c:114 builtin/merge.c:1185
191 msgid "You have not concluded your merge (MERGE_HEAD exists)."
192 msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
195 msgid "Please, commit your changes before merging."
196 msgstr "请在合并前先提交您的修改。"
199 msgid "Exiting because of unfinished merge."
200 msgstr "因为存在未完成的合并而退出。"
205 "Note: checking out '%s'.\n"
207 "You are in 'detached HEAD' state. You can look around, make experimental\n"
208 "changes and commit them, and you can discard any commits you make in this\n"
209 "state without impacting any branches by performing another checkout.\n"
211 "If you want to create a new branch to retain commits you create, you may\n"
212 "do so (now or later) by using -b with the checkout command again. Example:\n"
214 " git checkout -b <new-branch-name>\n"
219 "您正处于分离头指针状态。您可以查看、做试验性的修改及提交,并且您可以通过另"
221 "的检出分支操作丢弃在这个状态下所做的任何提交。\n"
223 "如果您想要通过创建分支来保留在此状态下所做的提交,您可以通过在检出命令添加\n"
224 "参数 -b 来实现(现在或稍后)。例如:\n"
226 " git checkout -b <new-branch-name>\n"
231 msgid "unrecognized whitespace option '%s'"
232 msgstr "未能识别的空白字符选项 '%s'"
236 msgid "unrecognized whitespace ignore option '%s'"
237 msgstr "未能识别的空白字符忽略选项 '%s'"
240 msgid "--reject and --3way cannot be used together."
241 msgstr "--reject 和 --3say 不能同时使用。"
244 msgid "--cached and --3way cannot be used together."
245 msgstr "--cached 和 --3way 不能同时使用。"
248 msgid "--3way outside a repository"
249 msgstr "--3way 在一个仓库之外"
252 msgid "--index outside a repository"
253 msgstr "--index 在一个仓库之外"
256 msgid "--cached outside a repository"
257 msgstr "--cached 在一个仓库之外"
261 msgid "Cannot prepare timestamp regexp %s"
262 msgstr "无法准备时间戳正则表达式 %s"
266 msgid "regexec returned %d for input: %s"
267 msgstr "regexec 返回 %d,输入为:%s"
271 msgid "unable to find filename in patch at line %d"
272 msgstr "不能在补丁的第 %d 行找到文件名"
276 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
277 msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
281 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
282 msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
286 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
287 msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
291 msgid "git apply: bad git-diff - expected /dev/null on line %d"
292 msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
296 msgid "recount: unexpected line: %.*s"
297 msgstr "recount:意外的行:%.*s"
301 msgid "patch fragment without header at line %d: %.*s"
302 msgstr "第 %d 行的补丁片段没有头信息:%.*s"
307 "git diff header lacks filename information when removing %d leading pathname "
308 "component (line %d)"
310 "git diff header lacks filename information when removing %d leading pathname "
311 "components (line %d)"
312 msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
313 msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
317 msgid "git diff header lacks filename information (line %d)"
318 msgstr "git diff 的头信息中缺乏文件名信息(第 %d 行)"
321 msgid "new file depends on old contents"
325 msgid "deleted file still has contents"
330 msgid "corrupt patch at line %d"
335 msgid "new file %s depends on old contents"
336 msgstr "新文件 %s 依赖旧内容"
340 msgid "deleted file %s still has contents"
341 msgstr "删除的文件 %s 仍有内容"
345 msgid "** warning: file %s becomes empty but is not deleted"
346 msgstr "** 警告:文件 %s 成为空文件但并未删除"
350 msgid "corrupt binary patch at line %d: %.*s"
351 msgstr "二进制补丁在第 %d 行损坏:%.*s"
355 msgid "unrecognized binary patch at line %d"
356 msgstr "未能识别的二进制补丁位于第 %d 行"
360 msgid "patch with only garbage at line %d"
361 msgstr "补丁文件的第 %d 行只有垃圾数据"
365 msgid "unable to read symlink %s"
370 msgid "unable to open or read %s"
375 msgid "invalid start of line: '%c'"
376 msgstr "无效的行首字符:'%c'"
380 msgid "Hunk #%d succeeded at %d (offset %d line)."
381 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
382 msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
383 msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
387 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
388 msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
393 "while searching for:\n"
401 msgid "missing binary patch data for '%s'"
402 msgstr "缺失 '%s' 的二进制补丁数据"
406 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
407 msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁"
411 msgid "cannot apply binary patch to '%s' without full index line"
412 msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁"
417 "the patch applies to '%s' (%s), which does not match the current contents."
418 msgstr "补丁应用到 '%s'(%s),但是和当前内容不匹配。"
422 msgid "the patch applies to an empty '%s' but it is not empty"
423 msgstr "补丁应用到空文件 '%s',但其并非空文件"
427 msgid "the necessary postimage %s for '%s' cannot be read"
428 msgstr "无法读取 '%2$s' 必须的目标文件 %1$s"
432 msgid "binary patch does not apply to '%s'"
433 msgstr "二进制补丁未应用到 '%s'"
437 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
438 msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
442 msgid "patch failed: %s:%ld"
443 msgstr "打补丁失败:%s:%ld"
447 msgid "cannot checkout %s"
450 #: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:253
452 msgid "failed to read %s"
457 msgid "reading from '%s' beyond a symbolic link"
458 msgstr "读取位于符号链接中的 '%s'"
460 #: apply.c:3418 apply.c:3658
462 msgid "path %s has been renamed/deleted"
463 msgstr "路径 %s 已经被重命名/删除"
465 #: apply.c:3501 apply.c:3672
467 msgid "%s: does not exist in index"
470 #: apply.c:3510 apply.c:3680
472 msgid "%s: does not match index"
476 msgid "repository lacks the necessary blob to fall back on 3-way merge."
477 msgstr "仓库缺乏必要的数据对象以进行三方合并。"
481 msgid "Falling back to three-way merge...\n"
482 msgstr "回落到三方合并...\n"
484 #: apply.c:3564 apply.c:3568
486 msgid "cannot read the current contents of '%s'"
487 msgstr "无法读取 '%s' 的当前内容"
491 msgid "Failed to fall back on three-way merge...\n"
492 msgstr "无法回落到三方合并...\n"
496 msgid "Applied patch to '%s' with conflicts.\n"
497 msgstr "应用补丁到 '%s' 存在冲突。\n"
501 msgid "Applied patch to '%s' cleanly.\n"
502 msgstr "成功应用补丁到 '%s'。\n"
505 msgid "removal patch leaves file contents"
506 msgstr "移除补丁仍留下了文件内容"
510 msgid "%s: wrong type"
515 msgid "%s has type %o, expected %o"
516 msgstr "%s 的类型是 %o,应为 %o"
518 #: apply.c:3850 apply.c:3852
520 msgid "invalid path '%s'"
525 msgid "%s: already exists in index"
530 msgid "%s: already exists in working directory"
531 msgstr "%s:已经存在于工作区中"
535 msgid "new mode (%o) of %s does not match old mode (%o)"
536 msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
540 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
541 msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
545 msgid "affected file '%s' is beyond a symbolic link"
546 msgstr "受影响的文件 '%s' 位于符号链接中"
550 msgid "%s: patch does not apply"
555 msgid "Checking patch %s..."
560 msgid "sha1 information is lacking or useless for submodule %s"
561 msgstr "子模组 %s 的 sha1 信息缺失或无效"
565 msgid "mode change for %s, which is not in current HEAD"
566 msgstr "%s 的模式被改变,但它不在当前 HEAD 中"
570 msgid "sha1 information is lacking or useless (%s)."
571 msgstr "sha1 信息缺失或无效(%s)。"
573 #: apply.c:4081 builtin/checkout.c:252 builtin/reset.c:135
575 msgid "make_cache_entry failed for path '%s'"
576 msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
580 msgid "could not add %s to temporary index"
581 msgstr "不能在临时索引中添加 %s"
585 msgid "could not write temporary index to %s"
586 msgstr "不能把临时索引写入到 %s"
590 msgid "unable to remove %s from index"
595 msgid "corrupt patch for submodule %s"
596 msgstr "子模组 %s 损坏的补丁"
600 msgid "unable to stat newly created file '%s'"
601 msgstr "不能枚举新建文件 '%s' 的状态"
605 msgid "unable to create backing store for newly created file %s"
606 msgstr "不能为新建文件 %s 创建后端存储"
608 #: apply.c:4288 apply.c:4432
610 msgid "unable to add cache entry for %s"
611 msgstr "无法为 %s 添加缓存条目"
615 msgid "failed to write to '%s'"
620 msgid "closing file '%s'"
625 msgid "unable to write file '%s' mode %o"
626 msgstr "不能写文件 '%s' 权限 %o"
630 msgid "Applied patch %s cleanly."
634 msgid "internal error"
639 msgid "Applying patch %%s with %d reject..."
640 msgid_plural "Applying patch %%s with %d rejects..."
641 msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
642 msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
646 msgid "truncating .rej filename to %.*s.rej"
647 msgstr "截短 .rej 文件名为 %.*s.rej"
649 #: apply.c:4531 builtin/fetch.c:739 builtin/fetch.c:988
651 msgid "cannot open %s"
656 msgid "Hunk #%d applied cleanly."
657 msgstr "第 #%d 个片段成功应用。"
661 msgid "Rejected hunk #%d."
662 msgstr "拒绝第 #%d 个片段。"
666 msgid "Skipped patch '%s'."
670 msgid "unrecognized input"
674 msgid "unable to read index file"
679 msgid "can't open patch '%s': %s"
680 msgstr "不能打开补丁 '%s':%s"
684 msgid "squelched %d whitespace error"
685 msgid_plural "squelched %d whitespace errors"
686 msgstr[0] "抑制下仍有 %d 个空白字符误用"
687 msgstr[1] "抑制下仍有 %d 个空白字符误用"
689 #: apply.c:4856 apply.c:4871
691 msgid "%d line adds whitespace errors."
692 msgid_plural "%d lines add whitespace errors."
693 msgstr[0] "%d 行有空白字符误用。"
694 msgstr[1] "%d 行有空白字符误用。"
698 msgid "%d line applied after fixing whitespace errors."
699 msgid_plural "%d lines applied after fixing whitespace errors."
700 msgstr[0] "修复空白错误后,应用了 %d 行。"
701 msgstr[1] "修复空白错误后,应用了 %d 行。"
703 #: apply.c:4880 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391
704 msgid "Unable to write new index file"
707 #: apply.c:4911 apply.c:4914 builtin/am.c:2277 builtin/am.c:2280
708 #: builtin/clone.c:113 builtin/fetch.c:98 builtin/pull.c:180
709 #: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629
710 #: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973
711 #: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161
712 #: git-add--interactive.perl:239
717 msgid "don't apply changes matching the given path"
718 msgstr "不要应用与给出路径向匹配的变更"
721 msgid "apply changes matching the given path"
722 msgstr "应用与给出路径向匹配的变更"
724 #: apply.c:4917 builtin/am.c:2286
729 msgid "remove <num> leading slashes from traditional diff paths"
730 msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
733 msgid "ignore additions made by the patch"
737 msgid "instead of applying the patch, output diffstat for the input"
738 msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
741 msgid "show number of added and deleted lines in decimal notation"
742 msgstr "以十进制数显示添加和删除的行数"
745 msgid "instead of applying the patch, output a summary for the input"
746 msgstr "不应用补丁,而是显示输入的概要"
749 msgid "instead of applying the patch, see if the patch is applicable"
750 msgstr "不应用补丁,而是查看补丁是否可应用"
753 msgid "make sure the patch is applicable to the current index"
754 msgstr "确认补丁可以应用到当前索引"
757 msgid "apply a patch without touching the working tree"
761 msgid "accept a patch that touches outside the working area"
762 msgstr "接受修改工作区之外文件的补丁"
765 msgid "also apply the patch (use with --stat/--summary/--check)"
766 msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
769 msgid "attempt three-way merge if a patch does not apply"
770 msgstr "如果一个补丁不能应用则尝试三方合并"
773 msgid "build a temporary index based on embedded index information"
774 msgstr "创建一个临时索引基于嵌入的索引信息"
776 #: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:508
777 msgid "paths are separated with NUL character"
778 msgstr "路径以 NUL 字符分隔"
781 msgid "ensure at least <n> lines of context match"
782 msgstr "确保至少匹配 <n> 行上下文"
784 #: apply.c:4949 builtin/am.c:2265
789 msgid "detect new or modified lines that have whitespace errors"
790 msgstr "检查新增和修改的行中间的空白字符滥用"
792 #: apply.c:4953 apply.c:4956
793 msgid "ignore changes in whitespace when finding context"
794 msgstr "查找上下文时忽略空白字符的变更"
797 msgid "apply the patch in reverse"
801 msgid "don't expect at least one line of context"
805 msgid "leave the rejected hunks in corresponding *.rej files"
806 msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
809 msgid "allow overlapping hunks"
812 #: apply.c:4966 builtin/add.c:267 builtin/check-ignore.c:19
813 #: builtin/commit.c:1337 builtin/count-objects.c:94 builtin/fsck.c:651
814 #: builtin/log.c:1867 builtin/mv.c:122 builtin/read-tree.c:134
819 msgid "tolerate incorrectly detected missing new-line at the end of file"
820 msgstr "允许不正确的文件末尾换行符"
823 msgid "do not trust the line counts in the hunk headers"
824 msgstr "不信任补丁片段的头信息中的行号"
826 #: apply.c:4973 builtin/am.c:2274
831 msgid "prepend <root> to all filenames"
832 msgstr "为所有文件名前添加 <根目录>"
835 msgid "git archive [<options>] <tree-ish> [<path>...]"
836 msgstr "git archive [<选项>] <树或提交> [<路径>...]"
839 msgid "git archive --list"
840 msgstr "git archive --list"
844 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
846 "git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]"
849 msgid "git archive --remote <repo> [--exec <cmd>] --list"
850 msgstr "git archive --remote <仓库> [--exec <命令>] --list"
852 #: archive.c:332 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300
854 msgid "pathspec '%s' did not match any files"
855 msgstr "路径规格 '%s' 未匹配任何文件"
862 msgid "archive format"
865 #: archive.c:418 builtin/log.c:1436
870 msgid "prepend prefix to each pathname in the archive"
871 msgstr "为归档中每个路径名加上前缀"
873 #: archive.c:420 builtin/blame.c:2598 builtin/blame.c:2599 builtin/config.c:59
874 #: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1061
875 #: builtin/hash-object.c:101 builtin/ls-files.c:542 builtin/ls-files.c:545
876 #: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:129
877 #: parse-options.h:153
881 #: archive.c:421 builtin/archive.c:89
882 msgid "write the archive to this file"
886 msgid "read .gitattributes in working directory"
887 msgstr "读取工作区中的 .gitattributes"
890 msgid "report archived files on stderr"
891 msgstr "在标准错误上报告归档文件"
898 msgid "compress faster"
902 msgid "compress better"
906 msgid "list supported archive formats"
909 #: archive.c:439 builtin/archive.c:90 builtin/clone.c:103 builtin/clone.c:106
910 #: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982
914 #: archive.c:440 builtin/archive.c:91
915 msgid "retrieve the archive from remote repository <repo>"
916 msgstr "从远程仓库(<仓库>)提取归档文件"
918 #: archive.c:441 builtin/archive.c:92 builtin/notes.c:485
922 #: archive.c:442 builtin/archive.c:93
923 msgid "path to the remote git-upload-archive command"
924 msgstr "远程 git-upload-archive 命令的路径"
927 msgid "Unexpected option --remote"
928 msgstr "未知参数 --remote"
931 msgid "Option --exec can only be used together with --remote"
932 msgstr "选项 --exec 只能和 --remote 同时使用"
935 msgid "Unexpected option --output"
936 msgstr "未知参数 --output"
940 msgid "Unknown archive format '%s'"
945 msgid "Argument not supported for format '%s': -%d"
946 msgstr "参数不支持此格式 '%s':-%d"
950 msgid "%.*s is not a valid attribute name"
951 msgstr "%.*s 不是一个有效的属性名"
955 "Negative patterns are ignored in git attributes\n"
956 "Use '\\!' for literal leading exclamation."
958 "负值模版在 git attributes 中被忽略\n"
959 "当字符串确实要以感叹号开始时,使用 '\\!'。"
963 msgid "Could not open file '%s'"
968 msgid "Badly quoted content in file '%s': %s"
969 msgstr "文件 '%s' 包含错误的引用格式:%s"
973 msgid "We cannot bisect more!\n"
974 msgstr "我们无法进行更多的二分查找!\n"
978 msgid "Not a valid commit name %s"
979 msgstr "不是一个有效的提交名 %s"
984 "The merge base %s is bad.\n"
985 "This means the bug has been fixed between %s and [%s].\n"
988 "这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"
993 "The merge base %s is new.\n"
994 "The property has changed between %s and [%s].\n"
997 "介于 %s 和 [%s] 之间的属性已经被修改。\n"
1002 "The merge base %s is %s.\n"
1003 "This means the first '%s' commit is between %s and [%s].\n"
1006 "这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"
1011 "Some %s revs are not ancestors of the %s rev.\n"
1012 "git bisect cannot work properly in this case.\n"
1013 "Maybe you mistook %s and %s revs?\n"
1015 "一些 %s 版本不是 %s 版本的祖先。\n"
1016 "这种情况下 git 二分查找无法正常工作。\n"
1017 "您可能弄错了 %s 和 %s 版本?\n"
1022 "the merge base between %s and [%s] must be skipped.\n"
1023 "So we cannot be sure the first %s commit is between %s and %s.\n"
1024 "We continue anyway."
1026 "介于 %s 和 [%s] 的合并基线一定被忽略了。\n"
1027 "所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"
1032 msgid "Bisecting: a merge base must be tested\n"
1033 msgstr "二分查找中:合并基线必须是经过测试的\n"
1037 msgid "a %s revision is needed"
1040 #: bisect.c:867 builtin/notes.c:174 builtin/tag.c:255
1042 msgid "could not create file '%s'"
1043 msgstr "不能创建文件 '%s'"
1047 msgid "could not read file '%s'"
1048 msgstr "不能读取文件 '%s'"
1051 msgid "reading bisect refs failed"
1056 msgid "%s was both %s and %s\n"
1057 msgstr "%s 同时为 %s 和 %s\n"
1062 "No testable commit found.\n"
1063 "Maybe you started with bad path parameters?\n"
1066 "可能您在运行时使用了错误的路径参数?\n"
1070 msgid "(roughly %d step)"
1071 msgid_plural "(roughly %d steps)"
1072 msgstr[0] "(大概 %d 步)"
1073 msgstr[1] "(大概 %d 步)"
1075 #. TRANSLATORS: the last %s will be replaced with
1076 #. "(roughly %d steps)" translation
1079 msgid "Bisecting: %d revision left to test after this %s\n"
1080 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
1081 msgstr[0] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n"
1082 msgstr[1] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n"
1088 "After fixing the error cause you may try to fix up\n"
1089 "the remote tracking information by invoking\n"
1090 "\"git branch --set-upstream-to=%s%s%s\"."
1093 "在修复错误后,您可以尝试修改远程跟踪分支,通过执行命令\n"
1094 "\"git branch --set-upstream-to=%s%s%s\" 。"
1098 msgid "Not setting branch %s as its own upstream."
1099 msgstr "未设置分支 %s 作为它自己的上游。"
1103 msgid "Branch %s set up to track remote branch %s from %s by rebasing."
1104 msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"
1108 msgid "Branch %s set up to track remote branch %s from %s."
1109 msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"
1113 msgid "Branch %s set up to track local branch %s by rebasing."
1114 msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"
1118 msgid "Branch %s set up to track local branch %s."
1119 msgstr "分支 %s 设置为跟踪本地分支 %s。"
1123 msgid "Branch %s set up to track remote ref %s by rebasing."
1124 msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"
1128 msgid "Branch %s set up to track remote ref %s."
1129 msgstr "分支 %s 设置为跟踪远程引用 %s。"
1133 msgid "Branch %s set up to track local ref %s by rebasing."
1134 msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"
1138 msgid "Branch %s set up to track local ref %s."
1139 msgstr "分支 %s 设置为跟踪本地引用 %s。"
1142 msgid "Unable to write upstream branch configuration"
1147 msgid "Not tracking: ambiguous information for ref %s"
1148 msgstr "未跟踪:引用 %s 有歧义"
1152 msgid "'%s' is not a valid branch name."
1153 msgstr "'%s' 不是一个有效的分支名称。"
1157 msgid "A branch named '%s' already exists."
1158 msgstr "一个分支名 '%s' 已经存在。"
1161 msgid "Cannot force update the current branch."
1162 msgstr "无法强制更新当前分支。"
1166 msgid "Cannot setup tracking information; starting point '%s' is not a branch."
1167 msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
1171 msgid "the requested upstream branch '%s' does not exist"
1172 msgstr "请求的上游分支 '%s' 不存在"
1177 "If you are planning on basing your work on an upstream\n"
1178 "branch that already exists at the remote, you may need to\n"
1179 "run \"git fetch\" to retrieve it.\n"
1181 "If you are planning to push out a new local branch that\n"
1182 "will track its remote counterpart, you may want to use\n"
1183 "\"git push -u\" to set the upstream config as you push."
1186 "如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
1187 "您可能需要执行 \"git fetch\" 来获取分支。\n"
1189 "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
1190 "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
1194 msgid "Not a valid object name: '%s'."
1195 msgstr "不是一个有效的对象名:'%s'。"
1199 msgid "Ambiguous object name: '%s'."
1200 msgstr "歧义的对象名:'%s'。"
1204 msgid "Not a valid branch point: '%s'."
1205 msgstr "无效的分支点:'%s'。"
1209 msgid "'%s' is already checked out at '%s'"
1210 msgstr "'%s' 已经检出到 '%s'"
1214 msgid "HEAD of working tree %s is not updated"
1215 msgstr "工作区 %s 的 HEAD 指向没有被更新"
1219 msgid "'%s' does not look like a v2 bundle file"
1220 msgstr "'%s' 不像是一个 v2 版本的包文件"
1224 msgid "unrecognized header: %s%s (%d)"
1225 msgstr "未能识别的包头:%s%s (%d)"
1227 #: bundle.c:87 sequencer.c:1339 sequencer.c:1760 builtin/commit.c:777
1229 msgid "could not open '%s'"
1233 msgid "Repository lacks these prerequisite commits:"
1234 msgstr "仓库中缺少这些必备的提交:"
1236 #: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2299
1237 #: builtin/blame.c:2811 builtin/commit.c:1061 builtin/log.c:353
1238 #: builtin/log.c:897 builtin/log.c:1347 builtin/log.c:1673 builtin/log.c:1916
1239 #: builtin/merge.c:359 builtin/shortlog.c:176
1240 msgid "revision walk setup failed"
1245 msgid "The bundle contains this ref:"
1246 msgid_plural "The bundle contains these %d refs:"
1247 msgstr[0] "这个包中含有这个引用:"
1248 msgstr[1] "这个包中含有 %d 个引用:"
1251 msgid "The bundle records a complete history."
1252 msgstr "这个包记录一个完整历史。"
1256 msgid "The bundle requires this ref:"
1257 msgid_plural "The bundle requires these %d refs:"
1258 msgstr[0] "这个包需要这个引用:"
1259 msgstr[1] "这个包需要 %d 个引用:"
1262 msgid "Could not spawn pack-objects"
1263 msgstr "不能生成 pack-objects 进程"
1266 msgid "pack-objects died"
1267 msgstr "pack-objects 终止"
1270 msgid "rev-list died"
1271 msgstr "rev-list 终止"
1275 msgid "ref '%s' is excluded by the rev-list options"
1276 msgstr "引用 '%s' 被 rev-list 选项排除"
1278 #: bundle.c:443 builtin/log.c:170 builtin/log.c:1579 builtin/shortlog.c:281
1280 msgid "unrecognized argument: %s"
1284 msgid "Refusing to create empty bundle."
1289 msgid "cannot create '%s'"
1293 msgid "index-pack died"
1294 msgstr "index-pack 终止"
1298 msgid "invalid color value: %.*s"
1299 msgstr "无效的颜色值:%.*s"
1301 #: commit.c:40 sequencer.c:1572 builtin/am.c:421 builtin/am.c:457
1302 #: builtin/am.c:1493 builtin/am.c:2127
1304 msgid "could not parse %s"
1309 msgid "%s %s is not a commit!"
1310 msgstr "%s %s 不是一个提交!"
1314 "Warning: commit message did not conform to UTF-8.\n"
1315 "You may want to amend it after fixing the message, or set the config\n"
1316 "variable i18n.commitencoding to the encoding your project uses.\n"
1318 "警告:提交说明不符合 UTF-8 字符编码。\n"
1319 "您可以通过修补提交来改正提交说明,或者将配置变量 i18n.commitencoding\n"
1322 #: compat/obstack.c:406 compat/obstack.c:408
1323 msgid "memory exhausted"
1327 msgid "relative config include conditionals must come from files"
1328 msgstr "包含相对路径的条件引用必须来自于文件"
1332 msgid "bad config line %d in blob %s"
1333 msgstr "数据对象 %2$s 中错误的配置行 %1$d"
1337 msgid "bad config line %d in file %s"
1338 msgstr "文件 %2$s 中错误的配置行 %1$d"
1342 msgid "bad config line %d in standard input"
1343 msgstr "标准输入中错误的配置行 %d"
1347 msgid "bad config line %d in submodule-blob %s"
1348 msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"
1352 msgid "bad config line %d in command line %s"
1353 msgstr "命令行 %2$s 中错误的配置行 %1$d"
1357 msgid "bad config line %d in %s"
1358 msgstr "在 %2$s 中错误的配置行 %1$d"
1361 msgid "out of range"
1365 msgid "invalid unit"
1370 msgid "bad numeric config value '%s' for '%s': %s"
1371 msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误:%3$s"
1375 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
1376 msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1380 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
1381 msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1385 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
1386 msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s':%3$s"
1390 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
1391 msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1395 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
1396 msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1400 msgid "bad numeric config value '%s' for '%s' in %s: %s"
1401 msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1405 msgid "failed to expand user dir in: '%s'"
1406 msgstr "无法扩展 '%s' 中的用户目录"
1408 #: config.c:1048 config.c:1059
1410 msgid "bad zlib compression level %d"
1411 msgstr "错误的 zlib 压缩级别 %d"
1415 msgid "invalid mode for object creation: %s"
1416 msgstr "无效的对象创建模式:%s"
1420 msgid "bad pack compression level %d"
1421 msgstr "错误的打包压缩级别 %d"
1424 msgid "unable to parse command-line config"
1425 msgstr "无法解析命令行中的配置"
1428 msgid "unknown error occurred while reading the configuration files"
1429 msgstr "在读取配置文件时遇到未知错误"
1433 msgid "Invalid %s: '%s'"
1438 msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
1439 msgstr "未知的 core.untrackedCache 取值 '%s',使用默认值 'keep'"
1443 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
1444 msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"
1448 msgid "unable to parse '%s' from command-line config"
1449 msgstr "无法解析命令行配置中的 '%s'"
1453 msgid "bad config variable '%s' in file '%s' at line %d"
1454 msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
1458 msgid "%s has multiple values"
1461 #: config.c:2384 config.c:2609
1463 msgid "fstat on %s failed"
1464 msgstr "在 %s 上执行 fstat 失败"
1468 msgid "could not set '%s' to '%s'"
1469 msgstr "不能设置 '%s' 为 '%s'"
1471 #: config.c:2504 builtin/remote.c:774
1473 msgid "could not unset '%s'"
1474 msgstr "不能取消设置 '%s'"
1477 msgid "The remote end hung up upon initial contact"
1478 msgstr "远端在连接发起时即挂断"
1482 "Could not read from remote repository.\n"
1484 "Please make sure you have the correct access rights\n"
1485 "and the repository exists."
1489 "请确认您有正确的访问权限并且仓库存在。"
1491 #: connected.c:63 builtin/fsck.c:190 builtin/prune.c:140
1492 msgid "Checking connectivity"
1496 msgid "Could not run 'git rev-list'"
1497 msgstr "不能执行 'git rev-list'"
1500 msgid "failed write to rev-list"
1501 msgstr "无法写入 rev-list"
1504 msgid "failed to close rev-list's stdin"
1505 msgstr "无法关闭 rev-list 的标准输入"
1510 "CRLF will be replaced by LF in %s.\n"
1511 "The file will have its original line endings in your working directory."
1513 "文件 %s 中的 CRLF 将被 LF 替换。\n"
1514 "在工作区中该文件仍保持原有的换行符。"
1518 msgid "CRLF would be replaced by LF in %s."
1519 msgstr "文件 %s 中的 CRLF 将被 LF 替换。"
1524 "LF will be replaced by CRLF in %s.\n"
1525 "The file will have its original line endings in your working directory."
1527 "文件 %s 中的 LF 将被 CRLF 替换。\n"
1528 "在工作区中该文件仍保持原有的换行符。"
1532 msgid "LF would be replaced by CRLF in %s"
1533 msgstr "文件 %s 中的 LF 将被 CRLF 替换"
1536 msgid "in the future"
1541 msgid "%lu second ago"
1542 msgid_plural "%lu seconds ago"
1548 msgid "%lu minute ago"
1549 msgid_plural "%lu minutes ago"
1555 msgid "%lu hour ago"
1556 msgid_plural "%lu hours ago"
1563 msgid_plural "%lu days ago"
1569 msgid "%lu week ago"
1570 msgid_plural "%lu weeks ago"
1576 msgid "%lu month ago"
1577 msgid_plural "%lu months ago"
1584 msgid_plural "%lu years"
1588 #. TRANSLATORS: "%s" is "<n> years"
1591 msgid "%s, %lu month ago"
1592 msgid_plural "%s, %lu months ago"
1593 msgstr[0] "%s %lu 个月前"
1594 msgstr[1] "%s %lu 个月前"
1596 #: date.c:156 date.c:161
1598 msgid "%lu year ago"
1599 msgid_plural "%lu years ago"
1603 #: diffcore-order.c:24
1605 msgid "failed to read orderfile '%s'"
1606 msgstr "无法读取排序文件 '%s'"
1608 #: diffcore-rename.c:536
1609 msgid "Performing inexact rename detection"
1610 msgstr "正在进行非精确的重命名探测"
1614 msgid "option '%s' requires a value"
1615 msgstr "选项 '%s' 需要一个值"
1620 msgid " Failed to parse dirstat cut-off percentage '%s'\n"
1621 msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
1626 msgid " Unknown dirstat parameter '%s'\n"
1627 msgstr " 未知的 dirstat 参数 '%s'\n"
1631 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
1632 msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
1637 "Found errors in 'diff.dirstat' config variable:\n"
1640 "发现配置变量 'diff.dirstat' 中的错误:\n"
1645 msgid "external diff died, stopping at %s"
1646 msgstr "外部 diff 退出,停止在 %s"
1649 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
1650 msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
1653 msgid "--follow requires exactly one pathspec"
1654 msgstr "--follow 明确要求只跟一个路径规格"
1659 "Failed to parse --dirstat/-X option parameter:\n"
1662 "无法解析 --dirstat/-X 选项的参数:\n"
1667 msgid "Failed to parse --submodule option parameter: '%s'"
1668 msgstr "无法解析 --submodule 选项的参数:'%s'"
1671 msgid "inexact rename detection was skipped due to too many files."
1672 msgstr "因为文件太多,略过不严格的重命名检查。"
1675 msgid "only found copies from modified paths due to too many files."
1676 msgstr "因为文件太多,只在修改的路径中查找拷贝。"
1681 "you may want to set your %s variable to at least %d and retry the command."
1682 msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。"
1685 msgid "failed to get kernel name and information"
1686 msgstr "无法获得内核名称和信息"
1689 msgid "Untracked cache is disabled on this system or location."
1690 msgstr "缓存未跟踪文件在本系统或位置中被禁用。"
1692 #: dir.c:2776 dir.c:2781
1694 msgid "could not create directories for %s"
1695 msgstr "不能为 %s 创建目录"
1699 msgid "could not migrate git directory from '%s' to '%s'"
1700 msgstr "不能从 '%s' 迁移 git 目录到 '%s'"
1704 msgid "could not stat file '%s'"
1705 msgstr "不能获取文件 %s 的状态"
1708 msgid "git fetch-pack: expected shallow list"
1709 msgstr "git fetch-pack:应为 shallow 列表"
1712 msgid "git fetch-pack: expected ACK/NAK, got EOF"
1713 msgstr "git fetch-pack:应为 ACK/NAK,却得到 EOF"
1717 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
1718 msgstr "git fetch-pack:应为 ACK/NAK,却得到 '%s'"
1721 msgid "--stateless-rpc requires multi_ack_detailed"
1722 msgstr "--stateless-rpc 需要 multi_ack_detailed"
1726 msgid "invalid shallow line: %s"
1727 msgstr "无效的 shallow 信息:%s"
1731 msgid "invalid unshallow line: %s"
1732 msgstr "无效的 unshallow 信息:%s"
1736 msgid "object not found: %s"
1741 msgid "error in object: %s"
1746 msgid "no shallow found: %s"
1747 msgstr "未发现 shallow:%s"
1751 msgid "expected shallow/unshallow, got %s"
1752 msgstr "应为 shallow/unshallow,却得到 %s"
1756 msgid "got %s %d %s"
1757 msgstr "得到 %s %d %s"
1761 msgid "invalid commit %s"
1768 #: fetch-pack.c:529 progress.c:235
1774 msgid "got %s (%d) %s"
1775 msgstr "得到 %s (%d) %s"
1779 msgid "Marking %s as complete"
1784 msgid "already have %s (%s)"
1788 msgid "fetch-pack: unable to fork off sideband demultiplexer"
1789 msgstr "fetch-pack:无法派生 sideband 多路输出"
1792 msgid "protocol error: bad pack header"
1797 msgid "fetch-pack: unable to fork off %s"
1798 msgstr "fetch-pack:无法派生进程 %s"
1806 msgid "error in sideband demultiplexer"
1807 msgstr "sideband 多路输出出错"
1810 msgid "Server does not support shallow clients"
1811 msgstr "服务器不支持 shalllow 客户端"
1814 msgid "Server supports multi_ack_detailed"
1815 msgstr "服务器支持 multi_ack_detailed"
1818 msgid "Server supports no-done"
1819 msgstr "服务器支持 no-done"
1822 msgid "Server supports multi_ack"
1823 msgstr "服务器支持 multi_ack"
1826 msgid "Server supports side-band-64k"
1827 msgstr "服务器支持 side-band-64k"
1830 msgid "Server supports side-band"
1831 msgstr "服务器支持 side-band"
1834 msgid "Server supports allow-tip-sha1-in-want"
1835 msgstr "服务器支持 allow-tip-sha1-in-want"
1838 msgid "Server supports allow-reachable-sha1-in-want"
1839 msgstr "服务器支持 allow-reachable-sha1-in-want"
1842 msgid "Server supports ofs-delta"
1843 msgstr "服务器支持 ofs-delta"
1847 msgid "Server version is %.*s"
1851 msgid "Server does not support --shallow-since"
1852 msgstr "服务器不支持 --shallow-since"
1855 msgid "Server does not support --shallow-exclude"
1856 msgstr "服务器不支持 --shallow-exclude"
1859 msgid "Server does not support --deepen"
1860 msgstr "服务器不支持 --deepen"
1863 msgid "no common commits"
1867 msgid "git fetch-pack: fetch failed."
1868 msgstr "git fetch-pack:获取失败。"
1870 #: fetch-pack.c:1125
1871 msgid "no matching remote head"
1874 #: fetch-pack.c:1147
1876 msgid "no such remote ref %s"
1877 msgstr "没有这样的远程引用 %s"
1879 #: fetch-pack.c:1150
1881 msgid "Server does not allow request for unadvertised object %s"
1882 msgstr "服务器不允许请求未公开的对象 %s"
1884 #: gpg-interface.c:185
1885 msgid "gpg failed to sign the data"
1886 msgstr "gpg 无法为数据签名"
1888 #: gpg-interface.c:215
1889 msgid "could not create temporary file"
1892 #: gpg-interface.c:217
1894 msgid "failed writing detached signature to '%s'"
1895 msgstr "无法将分离式签名写入 '%s'"
1899 msgid "ignore invalid color '%.*s' in log.graphColors"
1900 msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"
1904 msgid "'%s': unable to read %s"
1905 msgstr "'%s':无法读取 %s"
1907 #: grep.c:1813 builtin/clone.c:399 builtin/diff.c:81 builtin/rm.c:133
1909 msgid "failed to stat '%s'"
1910 msgstr "无法枚举 '%s' 状态"
1914 msgid "'%s': short read"
1919 msgid "available git commands in '%s'"
1920 msgstr "在 '%s' 下可用的 git 命令"
1923 msgid "git commands available from elsewhere on your $PATH"
1924 msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
1927 msgid "These are common Git commands used in various situations:"
1928 msgstr "这些是各种场合常见的 Git 命令:"
1933 "'%s' appears to be a git command, but we were not\n"
1934 "able to execute it. Maybe git-%s is broken?"
1936 "'%s' 像是一个 git 命令,但却无法运行。\n"
1940 msgid "Uh oh. Your system reports no Git commands at all."
1941 msgstr "唉呀,您的系统中未发现 Git 命令。"
1946 "WARNING: You called a Git command named '%s', which does not exist.\n"
1947 "Continuing under the assumption that you meant '%s'"
1949 "警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要运行的\n"
1954 msgid "in %0.1f seconds automatically..."
1955 msgstr "在 %0.1f 秒钟后自动运行..."
1959 msgid "git: '%s' is not a git command. See 'git --help'."
1960 msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
1962 #: help.c:414 help.c:480
1965 "Did you mean this?"
1968 "Did you mean one of these?"
1984 "*** Please tell me who you are.\n"
1988 " git config --global user.email \"you@example.com\"\n"
1989 " git config --global user.name \"Your Name\"\n"
1991 "to set your account's default identity.\n"
1992 "Omit --global to set the identity only in this repository.\n"
2000 " git config --global user.email \"you@example.com\"\n"
2001 " git config --global user.name \"Your Name\"\n"
2004 "如果仅在本仓库设置身份标识,则省略 --global 参数。\n"
2007 msgid "no email was given and auto-detection is disabled"
2008 msgstr "未提供邮件地址且自动探测引用被禁用"
2012 msgid "unable to auto-detect email address (got '%s')"
2013 msgstr "无法自动探测邮件地址(得到 '%s')"
2016 msgid "no name was given and auto-detection is disabled"
2017 msgstr "未提供姓名且自动探测被禁用"
2021 msgid "unable to auto-detect name (got '%s')"
2022 msgstr "无法自动探测姓名(得到 '%s')"
2026 msgid "empty ident name (for <%s>) not allowed"
2027 msgstr "不允许空的姓名(对于 <%s>)"
2031 msgid "name consists only of disallowed characters: %s"
2032 msgstr "姓名中仅包含禁用字符:%s"
2034 #: ident.c:417 builtin/commit.c:611
2036 msgid "invalid date format: %s"
2042 "Unable to create '%s.lock': %s.\n"
2044 "Another git process seems to be running in this repository, e.g.\n"
2045 "an editor opened by 'git commit'. Please make sure all processes\n"
2046 "are terminated then try again. If it still fails, a git process\n"
2047 "may have crashed in this repository earlier:\n"
2048 "remove the file manually to continue."
2050 "无法创建 '%s.lock':%s。\n"
2052 "似乎另外一个 git 进程在这个仓库中运行,例如:'git commit' 命令打\n"
2053 "开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错,\n"
2054 "可能之前有一个 git 进程在这个仓库中异常退出:\n"
2059 msgid "Unable to create '%s.lock': %s"
2060 msgstr "不能创建 '%s.lock':%s"
2063 msgid "failed to read the cache"
2066 #: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:393
2067 #: builtin/checkout.c:607 builtin/clone.c:749
2068 msgid "unable to write new index file"
2071 #: merge-recursive.c:209
2072 msgid "(bad commit)\n"
2075 #: merge-recursive.c:231 merge-recursive.c:239
2077 msgid "addinfo_cache failed for path '%s'"
2078 msgstr "为路径 '%s' addinfo_cache 失败"
2080 #: merge-recursive.c:303
2081 msgid "error building trees"
2084 #: merge-recursive.c:727
2086 msgid "failed to create path '%s'%s"
2087 msgstr "无法创建路径 '%s'%s"
2089 #: merge-recursive.c:738
2091 msgid "Removing %s to make room for subdirectory\n"
2092 msgstr "删除 %s 以便为子目录留出空间\n"
2094 #: merge-recursive.c:752 merge-recursive.c:771
2095 msgid ": perhaps a D/F conflict?"
2096 msgstr ":可能是一个目录/文件冲突?"
2098 #: merge-recursive.c:761
2100 msgid "refusing to lose untracked file at '%s'"
2101 msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
2103 #: merge-recursive.c:803 builtin/cat-file.c:34
2105 msgid "cannot read object %s '%s'"
2106 msgstr "不能读取对象 %s '%s'"
2108 #: merge-recursive.c:805
2110 msgid "blob expected for %s '%s'"
2111 msgstr "%s '%s' 应为数据对象"
2113 #: merge-recursive.c:829
2115 msgid "failed to open '%s': %s"
2116 msgstr "无法打开 '%s':%s"
2118 #: merge-recursive.c:840
2120 msgid "failed to symlink '%s': %s"
2121 msgstr "无法创建符号链接 '%s':%s"
2123 #: merge-recursive.c:845
2125 msgid "do not know what to do with %06o %s '%s'"
2126 msgstr "不知道如何处理 %06o %s '%s'"
2128 #: merge-recursive.c:985
2129 msgid "Failed to execute internal merge"
2132 #: merge-recursive.c:989
2134 msgid "Unable to add %s to database"
2135 msgstr "不能添加 %s 至对象库"
2137 #: merge-recursive.c:1092
2140 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
2143 "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
2146 #: merge-recursive.c:1097
2149 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
2152 "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
2155 #: merge-recursive.c:1104
2158 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
2161 "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
2164 #: merge-recursive.c:1109
2167 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
2168 "left in tree at %s."
2170 "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
2171 "%7$s 版本保留在 %9$s 中。"
2173 #: merge-recursive.c:1143
2177 #: merge-recursive.c:1143
2181 #: merge-recursive.c:1200
2183 msgid "%s is a directory in %s adding as %s instead"
2184 msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
2186 #: merge-recursive.c:1225
2189 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
2190 "\"->\"%s\" in \"%s\"%s"
2192 "冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
2193 "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
2195 #: merge-recursive.c:1230
2196 msgid " (left unresolved)"
2199 #: merge-recursive.c:1292
2201 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
2203 "冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
2206 #: merge-recursive.c:1325
2208 msgid "Renaming %s to %s and %s to %s instead"
2209 msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
2211 #: merge-recursive.c:1528
2213 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
2214 msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
2216 #: merge-recursive.c:1543
2218 msgid "Adding merged %s"
2221 #: merge-recursive.c:1550 merge-recursive.c:1780
2223 msgid "Adding as %s instead"
2224 msgstr "而是以 %s 为名添加"
2226 #: merge-recursive.c:1607
2228 msgid "cannot read object %s"
2231 #: merge-recursive.c:1610
2233 msgid "object %s is not a blob"
2234 msgstr "对象 %s 不是一个数据对象"
2236 #: merge-recursive.c:1679
2240 #: merge-recursive.c:1679
2244 #: merge-recursive.c:1689
2248 #: merge-recursive.c:1696
2252 #: merge-recursive.c:1732
2254 msgid "Skipped %s (merged same as existing)"
2255 msgstr "略过 %s(已经做过相同合并)"
2257 #: merge-recursive.c:1746
2259 msgid "Auto-merging %s"
2262 #: merge-recursive.c:1750 git-submodule.sh:944
2266 #: merge-recursive.c:1751
2268 msgid "CONFLICT (%s): Merge conflict in %s"
2269 msgstr "冲突(%s):合并冲突于 %s"
2271 #: merge-recursive.c:1845
2276 #: merge-recursive.c:1871
2277 msgid "file/directory"
2280 #: merge-recursive.c:1877
2281 msgid "directory/file"
2284 #: merge-recursive.c:1883
2286 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
2287 msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
2289 #: merge-recursive.c:1892
2294 #: merge-recursive.c:1929
2295 msgid "Already up-to-date!"
2298 #: merge-recursive.c:1938
2300 msgid "merging of trees %s and %s failed"
2301 msgstr "无法合并树 %s 和 %s"
2303 #: merge-recursive.c:2021
2307 #: merge-recursive.c:2034
2309 msgid "found %u common ancestor:"
2310 msgid_plural "found %u common ancestors:"
2311 msgstr[0] "发现 %u 个共同祖先:"
2312 msgstr[1] "发现 %u 个共同祖先:"
2314 #: merge-recursive.c:2073
2315 msgid "merge returned no commit"
2318 #: merge-recursive.c:2136
2320 msgid "Could not parse object '%s'"
2321 msgstr "不能解析对象 '%s'"
2323 #: merge-recursive.c:2150 builtin/merge.c:645 builtin/merge.c:792
2324 msgid "Unable to write index."
2327 #: notes-merge.c:273
2330 "You have not concluded your previous notes merge (%s exists).\n"
2331 "Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
2332 "commit/abort the previous merge before you start a new notes merge."
2334 "您的前一次注释合并尚未结束(存在 %s)。\n"
2335 "在开始一个新的注释合并之前,请使用 'git notes merge --commit' 或者 'git "
2336 "notes merge --abort' 来提交/终止前一次合并。"
2338 #: notes-merge.c:280
2340 msgid "You have not concluded your notes merge (%s exists)."
2341 msgstr "您尚未结束注释合并(存在 %s)。"
2344 msgid "Cannot commit uninitialized/unreferenced notes tree"
2345 msgstr "不能提交未初始化/未引用的注解树"
2347 #: notes-utils.c:100
2349 msgid "Bad notes.rewriteMode value: '%s'"
2350 msgstr "坏的 notes.rewriteMode 值:'%s'"
2352 #: notes-utils.c:110
2354 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
2355 msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
2357 #. TRANSLATORS: The first %s is the name of the
2358 #. environment variable, the second %s is its value
2359 #: notes-utils.c:137
2361 msgid "Bad %s value: '%s'"
2362 msgstr "坏的 %s 值:'%s'"
2366 msgid "unable to parse object: %s"
2369 #: parse-options.c:572
2373 #: parse-options.c:590
2378 #. TRANSLATORS: the colon here should align with the
2379 #. one in "usage: %s" translation
2380 #: parse-options.c:594
2385 # 译者:为保证在输出中对齐,注意调整句中空格!
2386 #: parse-options.c:597
2391 #: parse-options.c:631
2395 #: parse-options-cb.c:108
2397 msgid "malformed object name '%s'"
2398 msgstr "非法的对象名 '%s'"
2402 msgid "Could not make %s writable by group"
2403 msgstr "不能设置 %s 为组可写"
2406 msgid "Escape character '\\' not allowed as last character in attr value"
2407 msgstr "转义字符 '\\' 不能作为属性值的最后一个字符"
2410 msgid "Only one 'attr:' specification is allowed."
2411 msgstr "只允许一个 'attr:' 规格。"
2414 msgid "attr spec must not be empty"
2419 msgid "invalid attribute name %s"
2423 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
2424 msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
2428 "global 'literal' pathspec setting is incompatible with all other global "
2430 msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
2433 msgid "invalid parameter for pathspec magic 'prefix'"
2434 msgstr "路径规格包含无效的神奇前缀"
2438 msgid "Invalid pathspec magic '%.*s' in '%s'"
2439 msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
2443 msgid "Missing ')' at the end of pathspec magic in '%s'"
2444 msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
2448 msgid "Unimplemented pathspec magic '%c' in '%s'"
2449 msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
2451 #: pathspec.c:421 pathspec.c:443
2453 msgid "Pathspec '%s' is in submodule '%.*s'"
2454 msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
2458 msgid "%s: 'literal' and 'glob' are incompatible"
2459 msgstr "%s:'literal' 和 'glob' 不兼容"
2463 msgid "%s: '%s' is outside repository"
2464 msgstr "%s:'%s' 在仓库之外"
2468 msgid "'%s' (mnemonic: '%c')"
2469 msgstr "'%s'(助记符:'%c')"
2473 msgid "%s: pathspec magic not supported by this command: %s"
2474 msgstr "%s:路径规格神奇前缀不被此命令支持:%s"
2478 "empty strings as pathspecs will be made invalid in upcoming releases. please "
2479 "use . instead if you meant to match all paths"
2481 "在下一个版本中,使用空字符串作为路径规格将被视作非法。如果要匹配所有路径,\n"
2486 msgid "pathspec '%s' is beyond a symbolic link"
2487 msgstr "路径规格 '%s' 位于符号链接中"
2490 msgid "unable to parse --pretty format"
2491 msgstr "不能解析 --pretty 格式"
2493 #: read-cache.c:1307
2496 "index.version set, but the value is invalid.\n"
2499 "设置了 index.version,但是取值无效。\n"
2502 #: read-cache.c:1317
2505 "GIT_INDEX_VERSION set, but the value is invalid.\n"
2508 "设置了 GIT_INDEX_VERSION,但是取值无效。\n"
2511 #: read-cache.c:2232
2513 msgid "could not stat '%s"
2514 msgstr "不能获取 '%s' 的文件状态"
2516 #: read-cache.c:2245
2518 msgid "unable to open git dir: %s"
2519 msgstr "不能打开 git 目录:%s"
2521 #: read-cache.c:2257
2523 msgid "unable to unlink: %s"
2526 #: refs.c:619 builtin/merge.c:844
2528 msgid "Could not open '%s' for writing"
2529 msgstr "无法打开 '%s' 进行写入"
2531 #: refs/files-backend.c:2531
2533 msgid "could not delete reference %s: %s"
2534 msgstr "无法删除引用 %s:%s"
2536 #: refs/files-backend.c:2534
2538 msgid "could not delete references: %s"
2541 #: refs/files-backend.c:2543
2543 msgid "could not remove reference %s"
2546 #: ref-filter.c:35 wt-status.c:1780
2562 msgid "ahead %d, behind %d"
2563 msgstr "领先 %d,落后 %d"
2567 msgid "expected format: %%(color:<color>)"
2568 msgstr "期望的格式:%%(color:<color>)"
2572 msgid "unrecognized color: %%(color:%s)"
2573 msgstr "未能识别的颜色:%%(color:%s)"
2577 msgid "Integer value expected refname:lstrip=%s"
2578 msgstr "期望整数值 refname:lstrip=%s"
2582 msgid "Integer value expected refname:rstrip=%s"
2583 msgstr "期望整数值 refname:rstrip=%s"
2587 msgid "unrecognized %%(%s) argument: %s"
2588 msgstr "未能识别的 %%(%s) 参数:%s"
2592 msgid "%%(body) does not take arguments"
2593 msgstr "%%(body) 不带参数"
2597 msgid "%%(subject) does not take arguments"
2598 msgstr "%%(subject) 不带参数"
2602 msgid "%%(trailers) does not take arguments"
2603 msgstr "%%(trailers) 不带参数"
2607 msgid "positive value expected contents:lines=%s"
2608 msgstr "期望一个正数 contents:lines=%s"
2612 msgid "unrecognized %%(contents) argument: %s"
2613 msgstr "未能识别的 %%(contents) 参数:%s"
2617 msgid "positive value expected objectname:short=%s"
2618 msgstr "期望一个正数 objectname:short=%s"
2622 msgid "unrecognized %%(objectname) argument: %s"
2623 msgstr "未能识别的 %%(objectname) 参数:%s"
2627 msgid "expected format: %%(align:<width>,<position>)"
2628 msgstr "期望的格式:%%(align:<width>,<position>)"
2632 msgid "unrecognized position:%s"
2637 msgid "unrecognized width:%s"
2642 msgid "unrecognized %%(align) argument: %s"
2643 msgstr "未能识别的 %%(align) 参数:%s"
2647 msgid "positive width expected with the %%(align) atom"
2648 msgstr "元素 %%(align) 需要一个正数的宽度"
2652 msgid "unrecognized %%(if) argument: %s"
2653 msgstr "未能识别的 %%(if) 参数:%s"
2657 msgid "malformed field name: %.*s"
2658 msgstr "非法的字段名:%.*s"
2662 msgid "unknown field name: %.*s"
2663 msgstr "未知的字段名:%.*s"
2667 msgid "format: %%(if) atom used without a %%(then) atom"
2668 msgstr "格式:使用了 %%(if) 元素而没有 %%(then) 元素"
2672 msgid "format: %%(then) atom used without an %%(if) atom"
2673 msgstr "格式:使用了 %%(then) 元素而没有 %%(if) 元素"
2677 msgid "format: %%(then) atom used more than once"
2678 msgstr "格式:%%(then) 元素用了多次"
2682 msgid "format: %%(then) atom used after %%(else)"
2683 msgstr "格式:%%(then) 元素用在了 %%(else) 之后"
2687 msgid "format: %%(else) atom used without an %%(if) atom"
2688 msgstr "格式:使用了 %%(else) 元素而没有 %%(if) 元素"
2692 msgid "format: %%(else) atom used without a %%(then) atom"
2693 msgstr "格式:使用了 %%(else) 元素而没有 %%(then) 元素"
2697 msgid "format: %%(else) atom used more than once"
2698 msgstr "格式:%%(else) 元素用了多次"
2702 msgid "format: %%(end) atom used without corresponding atom"
2703 msgstr "格式:使用了 %%(end) 元素却没有它的对应元素"
2707 msgid "malformed format string %s"
2708 msgstr "非法的格式化字符串 %s"
2710 #: ref-filter.c:1247
2712 msgid "(no branch, rebasing %s)"
2713 msgstr "(非分支,正变基 %s)"
2715 #: ref-filter.c:1250
2717 msgid "(no branch, bisect started on %s)"
2718 msgstr "(非分支,二分查找开始于 %s)"
2720 #. TRANSLATORS: make sure this matches
2721 #. "HEAD detached at " in wt-status.c
2722 #: ref-filter.c:1256
2724 msgid "(HEAD detached at %s)"
2725 msgstr "(头指针分离于 %s)"
2727 #. TRANSLATORS: make sure this matches
2728 #. "HEAD detached from " in wt-status.c
2729 #: ref-filter.c:1261
2731 msgid "(HEAD detached from %s)"
2732 msgstr "(头指针分离自 %s)"
2734 #: ref-filter.c:1265
2738 #: ref-filter.c:1420 ref-filter.c:1451
2740 msgid "missing object %s for %s"
2741 msgstr "缺失 %2$s 的对象 %1$s"
2743 #: ref-filter.c:1423 ref-filter.c:1454
2745 msgid "parse_object_buffer failed on %s for %s"
2746 msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
2748 #: ref-filter.c:1692
2750 msgid "malformed object at '%s'"
2751 msgstr "非法的对象于 '%s'"
2753 #: ref-filter.c:1759
2755 msgid "ignoring ref with broken name %s"
2756 msgstr "忽略带有错误名称 %s 的引用"
2758 #: ref-filter.c:1764
2760 msgid "ignoring broken ref %s"
2763 #: ref-filter.c:2028
2765 msgid "format: %%(end) atom missing"
2766 msgstr "格式:缺少 %%(end) 元素"
2768 #: ref-filter.c:2109
2770 msgid "malformed object name %s"
2775 msgid "Cannot fetch both %s and %s to %s"
2776 msgstr "不能同时获取 %s 和 %s 至 %s"
2780 msgid "%s usually tracks %s, not %s"
2781 msgstr "%s 通常跟踪 %s,而非 %s"
2785 msgid "%s tracks both %s and %s"
2786 msgstr "%s 同时跟踪 %s 和 %s"
2789 msgid "Internal error"
2792 #: remote.c:1685 remote.c:1787
2793 msgid "HEAD does not point to a branch"
2794 msgstr "HEAD 没有指向一个分支"
2798 msgid "no such branch: '%s'"
2803 msgid "no upstream configured for branch '%s'"
2804 msgstr "尚未给分支 '%s' 设置上游"
2808 msgid "upstream branch '%s' not stored as a remote-tracking branch"
2809 msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
2813 msgid "push destination '%s' on remote '%s' has no local tracking branch"
2814 msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
2818 msgid "branch '%s' has no remote for pushing"
2819 msgstr "分支 '%s' 没有设置要推送的远程服务器"
2823 msgid "push refspecs for '%s' do not include '%s'"
2824 msgstr "向 '%s' 推送引用规格未包含 '%s'"
2827 msgid "push has no destination (push.default is 'nothing')"
2828 msgstr "推送无目标(push.default 是 'nothing')"
2831 msgid "cannot resolve 'simple' push to a single destination"
2832 msgstr "无法解析 'simple' 推送至一个单独的目标"
2836 msgid "Your branch is based on '%s', but the upstream is gone.\n"
2837 msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
2840 msgid " (use \"git branch --unset-upstream\" to fixup)\n"
2841 msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n"
2845 msgid "Your branch is up-to-date with '%s'.\n"
2846 msgstr "您的分支与上游分支 '%s' 一致。\n"
2850 msgid "Your branch is ahead of '%s' by %d commit.\n"
2851 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
2852 msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
2853 msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
2856 msgid " (use \"git push\" to publish your local commits)\n"
2857 msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
2861 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
2863 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
2864 msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
2865 msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
2869 msgid " (use \"git pull\" to update your local branch)\n"
2870 msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
2875 "Your branch and '%s' have diverged,\n"
2876 "and have %d and %d different commit each, respectively.\n"
2878 "Your branch and '%s' have diverged,\n"
2879 "and have %d and %d different commits each, respectively.\n"
2881 "您的分支和 '%s' 出现了偏离,\n"
2882 "并且分别有 %d 和 %d 处不同的提交。\n"
2884 "您的分支和 '%s' 出现了偏离,\n"
2885 "并且分别有 %d 和 %d 处不同的提交。\n"
2889 msgid " (use \"git pull\" to merge the remote branch into yours)\n"
2890 msgstr " (使用 \"git pull\" 来合并远程分支)\n"
2893 msgid "your current branch appears to be broken"
2894 msgstr "您的当前分支好像被损坏"
2898 msgid "your current branch '%s' does not have any commits yet"
2899 msgstr "您的当前分支 '%s' 尚无任何提交"
2902 msgid "--first-parent is incompatible with --bisect"
2903 msgstr "--first-parent 与 --bisect 不兼容"
2905 #: run-command.c:125
2906 msgid "open /dev/null failed"
2907 msgstr "不能打开 /dev/null"
2909 #: run-command.c:127
2911 msgid "dup2(%d,%d) failed"
2912 msgstr "不能调用 dup2(%d,%d)"
2916 msgid "unable to parse remote unpack status: %s"
2917 msgstr "不能解析远程解包状态:%s"
2921 msgid "remote unpack failed: %s"
2925 msgid "failed to sign the push certificate"
2929 msgid "the receiving end does not support --signed push"
2934 "not sending a push certificate since the receiving end does not support --"
2936 msgstr "未发送推送证书,因为接收端不支持签名推送"
2939 msgid "the receiving end does not support --atomic push"
2943 msgid "the receiving end does not support push options"
2960 msgid "Unknown action: %d"
2965 "after resolving the conflicts, mark the corrected paths\n"
2966 "with 'git add <paths>' or 'git rm <paths>'"
2968 "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
2973 "after resolving the conflicts, mark the corrected paths\n"
2974 "with 'git add <paths>' or 'git rm <paths>'\n"
2975 "and commit the result with 'git commit'"
2977 "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
2978 "对修正后的文件做标记,然后用 'git commit' 提交"
2980 #: sequencer.c:294 sequencer.c:1675
2982 msgid "could not lock '%s'"
2985 #: sequencer.c:297 sequencer.c:1553 sequencer.c:1680 sequencer.c:1694
2987 msgid "could not write to '%s'"
2992 msgid "could not write eol to '%s'"
2993 msgstr "不能将换行符写入 '%s'"
2995 #: sequencer.c:305 sequencer.c:1558 sequencer.c:1682
2997 msgid "failed to finalize '%s'."
3000 #: sequencer.c:329 sequencer.c:814 sequencer.c:1579 builtin/am.c:259
3001 #: builtin/commit.c:749 builtin/merge.c:1018
3003 msgid "could not read '%s'"
3008 msgid "your local changes would be overwritten by %s."
3009 msgstr "您的本地修改将被%s覆盖。"
3012 msgid "commit your changes or stash them to proceed."
3013 msgstr "提交您的修改或保存进度后再继续。"
3017 msgid "%s: fast-forward"
3020 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
3025 msgid "%s: Unable to write new index file"
3026 msgstr "%s:无法写入新索引文件"
3029 msgid "could not resolve HEAD commit\n"
3030 msgstr "不能解析 HEAD 提交\n"
3033 msgid "unable to update cache tree\n"
3039 "you have staged changes in your working tree\n"
3040 "If these changes are meant to be squashed into the previous commit, run:\n"
3042 " git commit --amend %s\n"
3044 "If they are meant to go into a new commit, run:\n"
3048 "In both cases, once you're done, continue with:\n"
3050 " git rebase --continue\n"
3053 "如果这些修改需要被并入前一个提交,执行:\n"
3055 " git commit --amend %s\n"
3057 "如果这些修改要形成一个新提交,执行:\n"
3061 "无论哪种情况,当您完成提交,继续执行:\n"
3063 " git rebase --continue\n"
3067 msgid "could not parse commit %s\n"
3068 msgstr "不能解析提交 %s\n"
3072 msgid "could not parse parent commit %s\n"
3073 msgstr "不能解析父提交 %s\n"
3078 "unexpected 1st line of squash message:\n"
3089 "invalid 1st line of squash message:\n"
3097 #: sequencer.c:833 sequencer.c:858
3099 msgid "This is a combination of %d commits."
3100 msgstr "这是一个 %d 个提交的组合。"
3103 msgid "need a HEAD to fixup"
3104 msgstr "需要一个 HEAD 来修复"
3107 msgid "could not read HEAD"
3111 msgid "could not read HEAD's commit message"
3112 msgstr "不能读取 HEAD 的提交说明"
3116 msgid "cannot write '%s'"
3119 #: sequencer.c:861 git-rebase--interactive.sh:445
3120 msgid "This is the 1st commit message:"
3125 msgid "could not read commit message of %s"
3126 msgstr "不能读取 %s 的提交说明"
3130 msgid "This is the commit message #%d:"
3131 msgstr "这是提交说明 #%d:"
3135 msgid "The commit message #%d will be skipped:"
3136 msgstr "提交说明 #%d 将被跳过:"
3140 msgid "unknown command: %d"
3144 msgid "your index file is unmerged."
3145 msgstr "您的索引文件未完成合并。"
3149 msgid "commit %s is a merge but no -m option was given."
3150 msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
3154 msgid "commit %s does not have parent %d"
3155 msgstr "提交 %s 没有第 %d 个父提交"
3159 msgid "mainline was specified but commit %s is not a merge."
3160 msgstr "指定了主线,但是提交 %s 不是一个合并提交。"
3164 msgid "cannot get commit message for %s"
3165 msgstr "不能得到 %s 的提交说明"
3167 #. TRANSLATORS: The first %s will be a "todo" command like
3168 #. "revert" or "pick", the second %s a SHA1.
3171 msgid "%s: cannot parse parent commit %s"
3172 msgstr "%s:不能解析父提交 %s"
3174 #: sequencer.c:1071 sequencer.c:1820
3176 msgid "could not rename '%s' to '%s'"
3177 msgstr "不能将 '%s' 重命名为 '%s'"
3181 msgid "could not revert %s... %s"
3182 msgstr "不能还原 %s... %s"
3186 msgid "could not apply %s... %s"
3187 msgstr "不能应用 %s... %s"
3190 msgid "empty commit set passed"
3195 msgid "git %s: failed to read the index"
3196 msgstr "git %s:无法读取索引"
3200 msgid "git %s: failed to refresh the index"
3201 msgstr "git %s:无法刷新索引"
3205 msgid "invalid line %d: %.*s"
3206 msgstr "无效行 %d:%.*s"
3210 msgid "cannot '%s' without a previous commit"
3211 msgstr "没有父提交的情况下不能 '%s'"
3215 msgid "could not read '%s'."
3219 msgid "please fix this using 'git rebase --edit-todo'."
3220 msgstr "请用 'git rebase --edit-todo' 来修改。"
3224 msgid "unusable instruction sheet: '%s'"
3225 msgstr "不可用的指令清单:'%s'"
3228 msgid "no commits parsed."
3232 msgid "cannot cherry-pick during a revert."
3233 msgstr "不能在回退中执行拣选。"
3236 msgid "cannot revert during a cherry-pick."
3237 msgstr "不能在拣选中执行回退。"
3241 msgid "invalid key: %s"
3246 msgid "invalid value for %s: %s"
3251 msgid "malformed options sheet: '%s'"
3252 msgstr "非法的选项清单:'%s'"
3255 msgid "a cherry-pick or revert is already in progress"
3256 msgstr "一个拣选或还原操作已在进行"
3259 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
3260 msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
3264 msgid "could not create sequencer directory '%s'"
3265 msgstr "不能创建序列目录 '%s'"
3268 msgid "could not lock HEAD"
3271 #: sequencer.c:1604 sequencer.c:2159
3272 msgid "no cherry-pick or revert in progress"
3273 msgstr "拣选或还原操作并未进行"
3276 msgid "cannot resolve HEAD"
3279 #: sequencer.c:1608 sequencer.c:1642
3280 msgid "cannot abort from a branch yet to be born"
3281 msgstr "不能从尚未建立的分支终止"
3283 #: sequencer.c:1628 builtin/grep.c:910
3285 msgid "cannot open '%s'"
3290 msgid "cannot read '%s': %s"
3291 msgstr "不能读取 '%s':%s"
3294 msgid "unexpected end of file"
3299 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
3300 msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
3303 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
3304 msgstr "您好像移动了 HEAD。未能回退,检查您的 HEAD!"
3306 #: sequencer.c:1785 sequencer.c:2058
3307 msgid "cannot read HEAD"
3310 #: sequencer.c:1825 builtin/difftool.c:616
3312 msgid "could not copy '%s' to '%s'"
3313 msgstr "不能拷贝 '%s' 至 '%s'"
3316 msgid "could not read index"
3323 "execution failed: %s\n"
3324 "%sYou can fix the problem, and then run\n"
3326 " git rebase --continue\n"
3332 " git rebase --continue\n"
3336 msgid "and made changes to the index and/or the working tree\n"
3337 msgstr "并且修改索引和/或工作区\n"
3342 "execution succeeded: %s\n"
3343 "but left changes to the index and/or the working tree\n"
3344 "Commit or stash your changes, and then run\n"
3346 " git rebase --continue\n"
3350 "但是在索引和/或工作区中存在变更\n"
3353 " git rebase --continue\n"
3356 #: sequencer.c:1913 git-rebase.sh:168
3358 msgid "Applied autostash."
3359 msgstr "成功应用 autostash。"
3363 msgid "cannot store %s"
3366 #: sequencer.c:1927 git-rebase.sh:172
3369 "Applying autostash resulted in conflicts.\n"
3370 "Your changes are safe in the stash.\n"
3371 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
3373 "应用 autostash 导致冲突。\n"
3374 "您的修改安全地保存在 stash 中。\n"
3375 "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
3379 msgid "Stopped at %s... %.*s\n"
3380 msgstr "停止在 %s... %.*s\n"
3384 msgid "unknown command %d"
3388 msgid "could not read orig-head"
3389 msgstr "不能读取 orig-head"
3392 msgid "could not read 'onto'"
3393 msgstr "不能读取 'onto'"
3397 msgid "could not update %s"
3402 msgid "could not update HEAD to %s"
3403 msgstr "不能更新 HEAD 为 %s"
3406 msgid "cannot rebase: You have unstaged changes."
3407 msgstr "不能变基:您有未暂存的变更。"
3410 msgid "could not remove CHERRY_PICK_HEAD"
3411 msgstr "不能删除 CHERRY_PICK_HEAD"
3414 msgid "cannot amend non-existing commit"
3419 msgid "invalid file: '%s'"
3424 msgid "invalid contents: '%s'"
3430 "You have uncommitted changes in your working tree. Please, commit them\n"
3431 "first and then run 'git rebase --continue' again."
3434 "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
3437 msgid "could not commit staged changes."
3442 msgid "%s: can't cherry-pick a %s"
3443 msgstr "%s:不能拣选一个%s"
3447 msgid "%s: bad revision"
3451 msgid "can't revert as initial commit"
3457 "%s: no such path in the working tree.\n"
3458 "Use 'git <command> -- <path>...' to specify paths that do not exist locally."
3461 "使用命令 'git <command> -- <path>...' 来指定本地不存在的路径。"
3466 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"
3467 "Use '--' to separate paths from revisions, like this:\n"
3468 "'git <command> [<revision>...] -- [<file>...]'"
3470 "有歧义的参数 '%s':未知的版本或路径不存在于工作区中。\n"
3471 "使用 '--' 来分隔版本和路径,例如:\n"
3472 "'git <command> [<revision>...] -- [<file>...]'"
3477 "ambiguous argument '%s': both revision and filename\n"
3478 "Use '--' to separate paths from revisions, like this:\n"
3479 "'git <command> [<revision>...] -- [<file>...]'"
3481 "有歧义的参数 '%s':可同时是版本和文件\n"
3482 "使用 '--' 来分隔版本和路径,例如:\n"
3483 "'git <command> [<revision>...] -- [<file>...]'"
3487 msgid "Expected git repo version <= %d, found %d"
3488 msgstr "期望 git 仓库版本 <= %d,却得到 %d"
3491 msgid "unknown repository extensions found:"
3496 msgid "Not a git repository (or any of the parent directories): %s"
3497 msgstr "不是一个 git 仓库(或者任何父目录):%s"
3499 #: setup.c:778 builtin/index-pack.c:1646
3500 msgid "Cannot come back to cwd"
3504 msgid "Unable to read current working directory"
3507 #: setup.c:1022 setup.c:1028
3509 msgid "Cannot change to '%s'"
3515 "Not a git repository (or any parent up to mount point %s)\n"
3516 "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
3518 "不是一个 git 仓库(或者向上递归至挂载点 %s 的任何祖先目录)\n"
3519 "停止在文件系统边界(未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM)。"
3524 "Problem with core.sharedRepository filemode value (0%.3o).\n"
3525 "The owner of files must always have read and write permissions."
3527 "参数 core.sharedRepository 的文件权限值有错(0%.3o)。\n"
3532 msgid "path '%s' does not exist"
3533 msgstr "路径 '%s' 不存在"
3537 msgid "reference repository '%s' as a linked checkout is not supported yet."
3538 msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
3542 msgid "reference repository '%s' is not a local repository."
3543 msgstr "参考仓库 '%s' 不是一个本地仓库。"
3547 msgid "reference repository '%s' is shallow"
3548 msgstr "参考仓库 '%s' 是一个浅克隆"
3552 msgid "reference repository '%s' is grafted"
3553 msgstr "参考仓库 '%s' 已被嫁接"
3556 msgid "offset before end of packfile (broken .idx?)"
3557 msgstr "偏移量在包文件结束之前(损坏的 .idx?)"
3561 msgid "offset before start of pack index for %s (corrupt index?)"
3562 msgstr "偏移量在 %s 的包索引开始之前(损坏的索引?)"
3566 msgid "offset beyond end of pack index for %s (truncated index?)"
3567 msgstr "偏移量越过了 %s 的包索引的结尾(被截断的索引?)"
3571 msgid "short SHA1 %s is ambiguous"
3572 msgstr "短 SHA1 %s 存在歧义"
3575 msgid "The candidates are:"
3580 "Git normally never creates a ref that ends with 40 hex characters\n"
3581 "because it will be ignored when you just specify 40-hex. These refs\n"
3582 "may be created by mistake. For example,\n"
3584 " git checkout -b $br $(git rev-parse ...)\n"
3586 "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
3587 "examine these refs and maybe delete them. Turn this message off by\n"
3588 "running \"git config advice.objectNameWarning false\""
3590 "Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n"
3591 "十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n"
3593 " git checkout -b $br $(git rev-parse ...)\n"
3595 "当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n"
3596 "可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
3599 #: submodule.c:67 submodule.c:101
3600 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
3601 msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
3603 #: submodule.c:71 submodule.c:105
3605 msgid "Could not find section in .gitmodules where path=%s"
3606 msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
3610 msgid "Could not update .gitmodules entry %s"
3611 msgstr "不能更新 .gitmodules 条目 %s"
3615 msgid "Could not remove .gitmodules entry for %s"
3616 msgstr "无法移除 %s 的 .gitmodules 条目"
3619 msgid "staging updated .gitmodules failed"
3620 msgstr "将更新后 .gitmodules 添加暂存区失败"
3623 msgid "negative values not allowed for submodule.fetchJobs"
3624 msgstr "submodule.fetchJobs 不允许为负值"
3628 msgid "'%s' not recognized as a git repository"
3629 msgstr "'%s' 没有识别为一个 git 仓库"
3633 msgid "could not start 'git status' in submodule '%s'"
3634 msgstr "无法在子模组 '%s' 中启动 'git status'"
3638 msgid "could not run 'git status' in submodule '%s'"
3639 msgstr "无法在子模组 '%s' 中执行 'git status'"
3643 msgid "submodule '%s' has dirty index"
3644 msgstr "子模组 '%s' 中有脏索引"
3649 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
3650 msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir"
3652 #: submodule.c:1691 submodule.c:1747
3654 msgid "could not lookup name for submodule '%s'"
3655 msgstr "不能查询子模组 '%s' 的名称"
3657 #: submodule.c:1695 builtin/submodule--helper.c:678
3658 #: builtin/submodule--helper.c:688
3660 msgid "could not create directory '%s'"
3661 msgstr "不能创建目录 '%s'"
3666 "Migrating git directory of '%s%s' from\n"
3670 "将 '%s%s' 的 git 目录从\n"
3676 msgid "could not recurse into submodule '%s'"
3677 msgstr "无法递归进子模组路径 '%s'"
3680 msgid "could not start ls-files in .."
3681 msgstr "无法在 .. 中启动 ls-files"
3684 msgid "BUG: returned path string doesn't match cwd?"
3685 msgstr "BUG:返回的路径和当前路径不匹配?"
3689 msgid "ls-tree returned unexpected return code %d"
3690 msgstr "ls-tree 返回未知返回值 %d"
3692 #: submodule-config.c:380
3694 msgid "invalid value for %s"
3699 msgid "running trailer command '%s' failed"
3700 msgstr "执行 trailer 命令 '%s' 失败"
3702 #: trailer.c:473 trailer.c:477 trailer.c:481 trailer.c:535 trailer.c:539
3705 msgid "unknown value '%s' for key '%s'"
3706 msgstr "键 '%2$s' 的未知取值 '%1$s'"
3708 #: trailer.c:525 trailer.c:530 builtin/remote.c:289
3710 msgid "more than one %s"
3715 msgid "empty trailer token in trailer '%.*s'"
3716 msgstr "签名 '%.*s' 的键为空"
3720 msgid "could not read input file '%s'"
3721 msgstr "不能读取输入文件 '%s'"
3724 msgid "could not read from stdin"
3727 #: trailer.c:949 builtin/am.c:44
3729 msgid "could not stat %s"
3730 msgstr "不能获取 %s 的状态"
3734 msgid "file %s is not a regular file"
3735 msgstr "文件 %s 不是一个正规文件"
3739 msgid "file %s is not writable by user"
3740 msgstr "文件 %s 用户不可写"
3743 msgid "could not open temporary file"
3748 msgid "could not rename temporary file to %s"
3749 msgstr "不能重命名临时文件为 %s"
3753 msgid "Would set upstream of '%s' to '%s' of '%s'\n"
3754 msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"
3758 msgid "transport: invalid depth option '%s'"
3759 msgstr "传输:无效的深度选项 '%s'"
3764 "The following submodule paths contain changes that can\n"
3765 "not be found on any remote:\n"
3766 msgstr "下列子模组路径所包含的修改在任何远程源中都找不到:\n"
3774 "\tgit push --recurse-submodules=on-demand\n"
3776 "or cd to the path and use\n"
3780 "to push them to a remote.\n"
3786 "\tgit push --recurse-submodules=on-demand\n"
3799 #: transport-helper.c:1080
3801 msgid "Could not read ref %s"
3805 msgid "too-short tree object"
3809 msgid "malformed mode in tree entry"
3810 msgstr "树对象中的条目模式错误"
3813 msgid "empty filename in tree entry"
3814 msgstr "树对象条目中空的文件名"
3817 msgid "too-short tree file"
3820 #: unpack-trees.c:104
3823 "Your local changes to the following files would be overwritten by checkout:\n"
3824 "%%sPlease commit your changes or stash them before you switch branches."
3826 "您对下列文件的本地修改将被检出操作覆盖:\n"
3827 "%%s请在切换分支前提交您的修改或者保存进度。"
3829 #: unpack-trees.c:106
3832 "Your local changes to the following files would be overwritten by checkout:\n"
3835 "您对下列文件的本地修改将被检出操作覆盖:\n"
3838 #: unpack-trees.c:109
3841 "Your local changes to the following files would be overwritten by merge:\n"
3842 "%%sPlease commit your changes or stash them before you merge."
3844 "您对下列文件的本地修改将被合并操作覆盖:\n"
3845 "%%s请在合并前提交您的修改或者保存进度。"
3847 #: unpack-trees.c:111
3850 "Your local changes to the following files would be overwritten by merge:\n"
3853 "您对下列文件的本地修改将被合并操作覆盖:\n"
3856 #: unpack-trees.c:114
3859 "Your local changes to the following files would be overwritten by %s:\n"
3860 "%%sPlease commit your changes or stash them before you %s."
3862 "您对下列文件的本地修改将被 %s 覆盖:\n"
3863 "%%s请在 %s 之前提交您的修改或者保存进度。"
3865 #: unpack-trees.c:116
3868 "Your local changes to the following files would be overwritten by %s:\n"
3871 "您对下列文件的本地修改将被 %s 覆盖:\n"
3874 #: unpack-trees.c:121
3877 "Updating the following directories would lose untracked files in them:\n"
3880 "更新如下目录将会丢失其中未跟踪的文件:\n"
3883 #: unpack-trees.c:125
3886 "The following untracked working tree files would be removed by checkout:\n"
3887 "%%sPlease move or remove them before you switch branches."
3889 "工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
3892 #: unpack-trees.c:127
3895 "The following untracked working tree files would be removed by checkout:\n"
3898 "工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
3901 #: unpack-trees.c:130
3904 "The following untracked working tree files would be removed by merge:\n"
3905 "%%sPlease move or remove them before you merge."
3907 "工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
3910 #: unpack-trees.c:132
3913 "The following untracked working tree files would be removed by merge:\n"
3916 "工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
3919 #: unpack-trees.c:135
3922 "The following untracked working tree files would be removed by %s:\n"
3923 "%%sPlease move or remove them before you %s."
3925 "工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
3928 #: unpack-trees.c:137
3931 "The following untracked working tree files would be removed by %s:\n"
3934 "工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
3937 #: unpack-trees.c:142
3940 "The following untracked working tree files would be overwritten by "
3942 "%%sPlease move or remove them before you switch branches."
3944 "工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
3947 #: unpack-trees.c:144
3950 "The following untracked working tree files would be overwritten by "
3954 "工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
3957 #: unpack-trees.c:147
3960 "The following untracked working tree files would be overwritten by merge:\n"
3961 "%%sPlease move or remove them before you merge."
3963 "工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
3966 #: unpack-trees.c:149
3969 "The following untracked working tree files would be overwritten by merge:\n"
3972 "工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
3975 #: unpack-trees.c:152
3978 "The following untracked working tree files would be overwritten by %s:\n"
3979 "%%sPlease move or remove them before you %s."
3981 "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
3984 #: unpack-trees.c:154
3987 "The following untracked working tree files would be overwritten by %s:\n"
3990 "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
3993 #: unpack-trees.c:161
3995 msgid "Entry '%s' overlaps with '%s'. Cannot bind."
3996 msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"
3998 #: unpack-trees.c:164
4001 "Cannot update sparse checkout: the following entries are not up-to-date:\n"
4004 "无法更新稀疏检出:如下条目不是最新:\n"
4007 #: unpack-trees.c:166
4010 "The following working tree files would be overwritten by sparse checkout "
4014 "工作区中下列文件将被稀疏检出更新所覆盖:\n"
4017 #: unpack-trees.c:168
4020 "The following working tree files would be removed by sparse checkout "
4024 "工作区中下列文件将被稀疏检出更新所删除:\n"
4027 #: unpack-trees.c:170
4030 "Cannot update submodule:\n"
4036 #: unpack-trees.c:247
4041 #: unpack-trees.c:272
4043 msgid "submodule update strategy not supported for submodule '%s'"
4044 msgstr "子模组 %s 不支持子模组更新策略"
4046 #: unpack-trees.c:340
4047 msgid "Checking out files"
4051 msgid "invalid URL scheme name or missing '://' suffix"
4052 msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
4054 #: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
4056 msgid "invalid %XX escape sequence"
4057 msgstr "无效的 %XX 转义序列"
4060 msgid "missing host and scheme is not 'file:'"
4061 msgstr "缺失主机名且 URL 方案不是 'file:'"
4064 msgid "a 'file:' URL may not have a port number"
4065 msgstr "一个 'file:' URL 不应该包含端口号"
4068 msgid "invalid characters in host name"
4069 msgstr "主机名中包含无效的字符"
4071 #: urlmatch.c:292 urlmatch.c:303
4072 msgid "invalid port number"
4076 msgid "invalid '..' path segment"
4077 msgstr "无效的 '..' 路径片段"
4081 msgid "failed to read '%s'"
4084 #: wrapper.c:222 wrapper.c:392
4086 msgid "could not open '%s' for reading and writing"
4087 msgstr "无法打开 '%s' 进行读写"
4089 #: wrapper.c:224 wrapper.c:394 builtin/am.c:766
4091 msgid "could not open '%s' for writing"
4092 msgstr "无法打开 '%s' 进行写入"
4094 #: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759
4095 #: builtin/am.c:847 builtin/commit.c:1700 builtin/merge.c:1015
4096 #: builtin/pull.c:341
4098 msgid "could not open '%s' for reading"
4099 msgstr "无法打开 '%s' 进行读取"
4101 #: wrapper.c:581 wrapper.c:602
4103 msgid "unable to access '%s'"
4107 msgid "unable to get current working directory"
4112 msgid "could not write to %s"
4117 msgid "could not close %s"
4121 msgid "Unmerged paths:"
4125 #: wt-status.c:178 wt-status.c:205
4127 msgid " (use \"git reset %s <file>...\" to unstage)"
4128 msgstr " (使用 \"git reset %s <文件>...\" 以取消暂存)"
4131 #: wt-status.c:180 wt-status.c:207
4132 msgid " (use \"git rm --cached <file>...\" to unstage)"
4133 msgstr " (使用 \"git rm --cached <文件>...\" 以取消暂存)"
4137 msgid " (use \"git add <file>...\" to mark resolution)"
4138 msgstr " (使用 \"git add <文件>...\" 标记解决方案)"
4141 #: wt-status.c:186 wt-status.c:190
4142 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
4143 msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)"
4147 msgid " (use \"git rm <file>...\" to mark resolution)"
4148 msgstr " (使用 \"git rm <文件>...\" 标记解决方案)"
4150 #: wt-status.c:199 wt-status.c:958
4151 msgid "Changes to be committed:"
4154 #: wt-status.c:217 wt-status.c:967
4155 msgid "Changes not staged for commit:"
4156 msgstr "尚未暂存以备提交的变更:"
4160 msgid " (use \"git add <file>...\" to update what will be committed)"
4161 msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)"
4165 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
4166 msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)"
4171 " (use \"git checkout -- <file>...\" to discard changes in working directory)"
4172 msgstr " (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)"
4176 msgid " (commit or discard the untracked or modified content in submodules)"
4177 msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
4182 msgid " (use \"git %s <file>...\" to include in what will be committed)"
4183 msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)"
4186 msgid "both deleted:"
4190 msgid "added by us:"
4194 msgid "deleted by them:"
4198 msgid "added by them:"
4202 msgid "deleted by us:"
4210 msgid "both modified:"
4245 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
4247 msgid "new commits, "
4250 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
4252 msgid "modified content, "
4255 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
4257 msgid "untracked content, "
4261 msgid "Submodules changed but not updated:"
4262 msgstr "子模组已修改但尚未更新:"
4265 msgid "Submodule changes to be committed:"
4270 "Do not touch the line above.\n"
4271 "Everything below will be removed."
4277 msgid "You have unmerged paths."
4282 msgid " (fix conflicts and run \"git commit\")"
4283 msgstr " (解决冲突并运行 \"git commit\")"
4287 msgid " (use \"git merge --abort\" to abort the merge)"
4288 msgstr " (使用 \"git merge --abort\" 终止合并)"
4291 msgid "All conflicts fixed but you are still merging."
4292 msgstr "所有冲突已解决但您仍处于合并中。"
4296 msgid " (use \"git commit\" to conclude merge)"
4297 msgstr " (使用 \"git commit\" 结束合并)"
4300 msgid "You are in the middle of an am session."
4301 msgstr "您正处于 am 操作过程中。"
4304 msgid "The current patch is empty."
4309 msgid " (fix conflicts and then run \"git am --continue\")"
4310 msgstr " (解决冲突,然后运行 \"git am --continue\")"
4314 msgid " (use \"git am --skip\" to skip this patch)"
4315 msgstr " (使用 \"git am --skip\" 跳过此补丁)"
4319 msgid " (use \"git am --abort\" to restore the original branch)"
4320 msgstr " (使用 \"git am --abort\" 恢复原有分支)"
4323 msgid "git-rebase-todo is missing."
4324 msgstr "git-rebase-todo 丢失。"
4327 msgid "No commands done."
4332 msgid "Last command done (%d command done):"
4333 msgid_plural "Last commands done (%d commands done):"
4334 msgstr[0] "最后一条命令已完成(%d 条命令被执行):"
4335 msgstr[1] "最后的命令已完成(%d 条命令被执行):"
4339 msgid " (see more in file %s)"
4340 msgstr " (更多参见文件 %s)"
4343 msgid "No commands remaining."
4348 msgid "Next command to do (%d remaining command):"
4349 msgid_plural "Next commands to do (%d remaining commands):"
4350 msgstr[0] "接下来要执行的命令(剩余 %d 条命令):"
4351 msgstr[1] "接下来要执行的命令(剩余 %d 条命令):"
4355 msgid " (use \"git rebase --edit-todo\" to view and edit)"
4356 msgstr " (使用 \"git rebase --edit-todo\" 来查看和编辑)"
4360 msgid "You are currently rebasing branch '%s' on '%s'."
4361 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
4364 msgid "You are currently rebasing."
4369 msgid " (fix conflicts and then run \"git rebase --continue\")"
4370 msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
4374 msgid " (use \"git rebase --skip\" to skip this patch)"
4375 msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
4379 msgid " (use \"git rebase --abort\" to check out the original branch)"
4380 msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
4384 msgid " (all conflicts fixed: run \"git rebase --continue\")"
4385 msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
4390 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
4391 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
4394 msgid "You are currently splitting a commit during a rebase."
4395 msgstr "您在执行变基操作时拆分提交。"
4399 msgid " (Once your working directory is clean, run \"git rebase --continue\")"
4400 msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
4404 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
4405 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
4408 msgid "You are currently editing a commit during a rebase."
4409 msgstr "您在执行变基操作时编辑提交。"
4413 msgid " (use \"git commit --amend\" to amend the current commit)"
4414 msgstr " (使用 \"git commit --amend\" 修补当前提交)"
4419 " (use \"git rebase --continue\" once you are satisfied with your changes)"
4420 msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
4424 msgid "You are currently cherry-picking commit %s."
4425 msgstr "您在执行拣选提交 %s 的操作。"
4429 msgid " (fix conflicts and run \"git cherry-pick --continue\")"
4430 msgstr " (解决冲突并运行 \"git cherry-pick --continue\")"
4434 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
4435 msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")"
4439 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
4440 msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
4444 msgid "You are currently reverting commit %s."
4445 msgstr "您在执行反转提交 %s 的操作。"
4449 msgid " (fix conflicts and run \"git revert --continue\")"
4450 msgstr " (解决冲突并运行 \"git revert --continue\")"
4454 msgid " (all conflicts fixed: run \"git revert --continue\")"
4455 msgstr " (所有冲突已解决:运行 \"git revert --continue\")"
4459 msgid " (use \"git revert --abort\" to cancel the revert operation)"
4460 msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
4464 msgid "You are currently bisecting, started from branch '%s'."
4465 msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
4468 msgid "You are currently bisecting."
4469 msgstr "您在执行二分查找操作。"
4473 msgid " (use \"git bisect reset\" to get back to the original branch)"
4474 msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
4481 msgid "interactive rebase in progress; onto "
4482 msgstr "交互式变基操作正在进行中;至 "
4485 msgid "rebase in progress; onto "
4486 msgstr "变基操作正在进行中;至 "
4489 msgid "HEAD detached at "
4493 msgid "HEAD detached from "
4497 msgid "Not currently on any branch."
4501 msgid "Initial commit"
4505 msgid "Untracked files"
4509 msgid "Ignored files"
4515 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
4516 "may speed it up, but you have to be careful not to forget to add\n"
4517 "new files yourself (see 'git help status')."
4519 "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
4520 "但您需要小心不要忘了添加新文件(参见 'git help status')。"
4524 msgid "Untracked files not listed%s"
4525 msgstr "未跟踪的文件没有列出%s"
4527 # 译者:中文字符串拼接,可删除前导空格
4529 msgid " (use -u option to show untracked files)"
4530 msgstr "(使用 -u 参数显示未跟踪的文件)"
4538 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
4539 msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
4543 msgid "no changes added to commit\n"
4549 "nothing added to commit but untracked files present (use \"git add\" to "
4551 msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
4555 msgid "nothing added to commit but untracked files present\n"
4556 msgstr "提交为空,但是存在尚未跟踪的文件\n"
4558 # 译者:中文字符串拼接,可删除前导空格
4561 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
4562 msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
4564 #: wt-status.c:1633 wt-status.c:1638
4566 msgid "nothing to commit\n"
4569 # 译者:中文字符串拼接,可删除前导空格
4572 msgid "nothing to commit (use -u to show untracked files)\n"
4573 msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
4575 # 译者:中文字符串拼接,可删除前导空格
4578 msgid "nothing to commit, working tree clean\n"
4579 msgstr "无文件要提交,干净的工作区\n"
4583 msgid "Initial commit on "
4587 msgid "HEAD (no branch)"
4591 #: wt-status.c:1782 wt-status.c:1790
4595 #: wt-status.c:1785 wt-status.c:1788
4599 #. TRANSLATORS: the action is e.g. "pull with rebase"
4602 msgid "cannot %s: You have unstaged changes."
4603 msgstr "不能%s:您有未暂存的变更。"
4606 msgid "additionally, your index contains uncommitted changes."
4607 msgstr "另外,您的索引中包含未提交的变更。"
4611 msgid "cannot %s: Your index contains uncommitted changes."
4612 msgstr "不能%s:您的索引中包含未提交的变更。"
4614 #: compat/precompose_utf8.c:57 builtin/clone.c:432
4616 msgid "failed to unlink '%s'"
4620 msgid "git add [<options>] [--] <pathspec>..."
4621 msgstr "git add [<选项>] [--] <路径规格>..."
4625 msgid "unexpected diff status %c"
4628 #: builtin/add.c:85 builtin/commit.c:291
4629 msgid "updating files failed"
4634 msgid "remove '%s'\n"
4637 #: builtin/add.c:149
4638 msgid "Unstaged changes after refreshing the index:"
4639 msgstr "刷新索引之后尚未被暂存的变更:"
4641 #: builtin/add.c:209 builtin/rev-parse.c:872
4642 msgid "Could not read the index"
4645 #: builtin/add.c:220
4647 msgid "Could not open '%s' for writing."
4648 msgstr "无法打开 '%s' 进行写入。"
4650 #: builtin/add.c:224
4651 msgid "Could not write patch"
4654 #: builtin/add.c:227
4655 msgid "editing patch failed"
4658 #: builtin/add.c:230
4660 msgid "Could not stat '%s'"
4661 msgstr "不能查看文件状态 '%s'"
4663 #: builtin/add.c:232
4664 msgid "Empty patch. Aborted."
4667 #: builtin/add.c:237
4669 msgid "Could not apply '%s'"
4672 #: builtin/add.c:247
4673 msgid "The following paths are ignored by one of your .gitignore files:\n"
4674 msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
4676 #: builtin/add.c:266 builtin/clean.c:876 builtin/fetch.c:115 builtin/mv.c:123
4677 #: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:524
4678 #: builtin/remote.c:1328 builtin/rm.c:241 builtin/send-pack.c:163
4682 #: builtin/add.c:269
4683 msgid "interactive picking"
4686 #: builtin/add.c:270 builtin/checkout.c:1177 builtin/reset.c:286
4687 msgid "select hunks interactively"
4690 #: builtin/add.c:271
4691 msgid "edit current diff and apply"
4694 #: builtin/add.c:272
4695 msgid "allow adding otherwise ignored files"
4698 #: builtin/add.c:273
4699 msgid "update tracked files"
4702 #: builtin/add.c:274
4703 msgid "record only the fact that the path will be added later"
4704 msgstr "只记录,该路径稍后再添加"
4706 #: builtin/add.c:275
4707 msgid "add changes from all tracked and untracked files"
4708 msgstr "添加所有改变的已跟踪文件和未跟踪文件"
4710 #: builtin/add.c:278
4711 msgid "ignore paths removed in the working tree (same as --no-all)"
4712 msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
4714 #: builtin/add.c:280
4715 msgid "don't add, only refresh the index"
4718 #: builtin/add.c:281
4719 msgid "just skip files which cannot be added because of errors"
4720 msgstr "跳过因出错不能添加的文件"
4722 #: builtin/add.c:282
4723 msgid "check if - even missing - files are ignored in dry run"
4724 msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
4726 #: builtin/add.c:283 builtin/update-index.c:951
4730 #: builtin/add.c:283 builtin/update-index.c:952
4731 msgid "override the executable bit of the listed files"
4732 msgstr "覆盖列表里文件的可执行位"
4734 #: builtin/add.c:305
4736 msgid "Use -f if you really want to add them.\n"
4737 msgstr "使用 -f 参数如果您确实要添加它们。\n"
4739 #: builtin/add.c:312
4740 msgid "adding files failed"
4743 #: builtin/add.c:348
4744 msgid "-A and -u are mutually incompatible"
4745 msgstr "-A 和 -u 选项互斥"
4747 #: builtin/add.c:355
4748 msgid "Option --ignore-missing can only be used together with --dry-run"
4749 msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
4751 #: builtin/add.c:359
4753 msgid "--chmod param '%s' must be either -x or +x"
4754 msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x"
4756 #: builtin/add.c:374
4758 msgid "Nothing specified, nothing added.\n"
4759 msgstr "没有指定文件,也没有文件被添加。\n"
4761 #: builtin/add.c:375
4763 msgid "Maybe you wanted to say 'git add .'?\n"
4764 msgstr "也许您想要执行 'git add .'?\n"
4766 #: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:298
4767 #: builtin/checkout.c:491 builtin/clean.c:920 builtin/commit.c:350
4768 #: builtin/mv.c:143 builtin/reset.c:235 builtin/rm.c:271
4769 #: builtin/submodule--helper.c:244
4770 msgid "index file corrupt"
4774 msgid "could not parse author script"
4779 msgid "'%s' was deleted by the applypatch-msg hook"
4780 msgstr "'%s' 被 applypatch-msg 钩子删除"
4784 msgid "Malformed input line: '%s'."
4785 msgstr "非法的输入行:'%s'。"
4789 msgid "Failed to copy notes from '%s' to '%s'"
4790 msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
4793 msgid "fseek failed"
4798 msgid "could not parse patch '%s'"
4799 msgstr "无法解析补丁 '%s'"
4802 msgid "Only one StGIT patch series can be applied at once"
4803 msgstr "一次只能有一个 StGIT 补丁队列被应用"
4806 msgid "invalid timestamp"
4809 #: builtin/am.c:890 builtin/am.c:898
4810 msgid "invalid Date line"
4814 msgid "invalid timezone offset"
4818 msgid "Patch format detection failed."
4821 #: builtin/am.c:989 builtin/clone.c:397
4823 msgid "failed to create directory '%s'"
4824 msgstr "无法创建目录 '%s'"
4827 msgid "Failed to split patches."
4830 #: builtin/am.c:1125 builtin/commit.c:376
4831 msgid "unable to write index file"
4834 #: builtin/am.c:1176
4836 msgid "When you have resolved this problem, run \"%s --continue\"."
4837 msgstr "当您解决这一问题,执行 \"%s --continue\"。"
4839 #: builtin/am.c:1177
4841 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
4842 msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。"
4844 #: builtin/am.c:1178
4846 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
4847 msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。"
4849 #: builtin/am.c:1316
4850 msgid "Patch is empty. Was it split wrong?"
4851 msgstr "补丁为空。是不是切分错误?"
4853 #: builtin/am.c:1390 builtin/log.c:1557
4855 msgid "invalid ident line: %s"
4856 msgstr "包含无效的身份标识:%s"
4858 #: builtin/am.c:1417
4860 msgid "unable to parse commit %s"
4863 #: builtin/am.c:1610
4864 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
4865 msgstr "仓库缺乏必要的数据对象以进行三方合并。"
4867 #: builtin/am.c:1612
4868 msgid "Using index info to reconstruct a base tree..."
4869 msgstr "使用索引来重建一个(三方合并的)基础目录树..."
4871 #: builtin/am.c:1631
4873 "Did you hand edit your patch?\n"
4874 "It does not apply to blobs recorded in its index."
4879 #: builtin/am.c:1637
4880 msgid "Falling back to patching base and 3-way merge..."
4881 msgstr "回落到基础版本上打补丁及进行三方合并..."
4883 #: builtin/am.c:1662
4884 msgid "Failed to merge in the changes."
4887 #: builtin/am.c:1686 builtin/merge.c:631
4888 msgid "git write-tree failed to write a tree"
4889 msgstr "git write-tree 无法写入一树对象"
4891 #: builtin/am.c:1693
4892 msgid "applying to an empty history"
4895 #: builtin/am.c:1706 builtin/commit.c:1764 builtin/merge.c:802
4896 #: builtin/merge.c:827
4897 msgid "failed to write commit object"
4900 #: builtin/am.c:1739 builtin/am.c:1743
4902 msgid "cannot resume: %s does not exist."
4903 msgstr "无法继续:%s 不存在。"
4905 #: builtin/am.c:1759
4906 msgid "cannot be interactive without stdin connected to a terminal."
4907 msgstr "标准输入没有和终端关联,不能进行交互式操作。"
4909 #: builtin/am.c:1764
4910 msgid "Commit Body is:"
4914 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
4915 #. in your translation. The program will only accept English
4916 #. input at this point.
4918 #: builtin/am.c:1774
4919 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
4920 msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:"
4922 #: builtin/am.c:1824
4924 msgid "Dirty index: cannot apply patches (dirty: %s)"
4925 msgstr "脏索引:不能应用补丁(脏文件:%s)"
4927 #: builtin/am.c:1861 builtin/am.c:1933
4929 msgid "Applying: %.*s"
4932 #: builtin/am.c:1877
4933 msgid "No changes -- Patch already applied."
4934 msgstr "没有变更 —— 补丁已经应用过。"
4936 #: builtin/am.c:1885
4938 msgid "Patch failed at %s %.*s"
4939 msgstr "打补丁失败于 %s %.*s"
4941 #: builtin/am.c:1891
4943 msgid "The copy of the patch that failed is found in: %s"
4944 msgstr "失败的补丁文件副本位于:%s"
4946 #: builtin/am.c:1936
4948 "No changes - did you forget to use 'git add'?\n"
4949 "If there is nothing left to stage, chances are that something else\n"
4950 "already introduced the same changes; you might want to skip this patch."
4952 "没有变更 —— 您是不是忘了执行 'git add'?\n"
4953 "如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
4956 #: builtin/am.c:1943
4958 "You still have unmerged paths in your index.\n"
4959 "Did you forget to use 'git add'?"
4962 "您是否忘了执行 'git add'?"
4964 #: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308
4965 #: builtin/reset.c:316
4967 msgid "Could not parse object '%s'."
4968 msgstr "不能解析对象 '%s'。"
4970 #: builtin/am.c:2103
4971 msgid "failed to clean index"
4974 #: builtin/am.c:2137
4976 "You seem to have moved HEAD since the last 'am' failure.\n"
4977 "Not rewinding to ORIG_HEAD"
4978 msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
4980 #: builtin/am.c:2200
4982 msgid "Invalid value for --patch-format: %s"
4983 msgstr "无效的 --patch-format 值:%s"
4985 #: builtin/am.c:2233
4986 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
4987 msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
4989 #: builtin/am.c:2234
4990 msgid "git am [<options>] (--continue | --skip | --abort)"
4991 msgstr "git am [<选项>] (--continue | --skip | --abort)"
4993 #: builtin/am.c:2240
4994 msgid "run interactively"
4997 #: builtin/am.c:2242
4998 msgid "historical option -- no-op"
4999 msgstr "老的参数 —— 无作用"
5001 #: builtin/am.c:2244
5002 msgid "allow fall back on 3way merging if needed"
5003 msgstr "如果必要,允许使用三方合并。"
5005 #: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57
5006 #: builtin/repack.c:178
5010 #: builtin/am.c:2247
5011 msgid "add a Signed-off-by line to the commit message"
5012 msgstr "在提交说明中添加一个 Signed-off-by 签名"
5014 #: builtin/am.c:2250
5015 msgid "recode into utf8 (default)"
5016 msgstr "使用 utf8 字符集(默认)"
5018 #: builtin/am.c:2252
5019 msgid "pass -k flag to git-mailinfo"
5020 msgstr "向 git-mailinfo 传递 -k 参数"
5022 #: builtin/am.c:2254
5023 msgid "pass -b flag to git-mailinfo"
5024 msgstr "向 git-mailinfo 传递 -b 参数"
5026 #: builtin/am.c:2256
5027 msgid "pass -m flag to git-mailinfo"
5028 msgstr "向 git-mailinfo 传递 -m 参数"
5030 #: builtin/am.c:2258
5031 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
5032 msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数"
5034 #: builtin/am.c:2261
5035 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
5036 msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置"
5038 #: builtin/am.c:2264
5039 msgid "strip everything before a scissors line"
5040 msgstr "丢弃裁切线前的所有内容"
5042 #: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275
5043 #: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287
5044 #: builtin/am.c:2293
5045 msgid "pass it through git-apply"
5046 msgstr "传递给 git-apply"
5048 #: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
5049 #: builtin/grep.c:1045 builtin/merge.c:201 builtin/pull.c:135
5050 #: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191
5051 #: builtin/show-branch.c:637 builtin/show-ref.c:169 builtin/tag.c:398
5052 #: parse-options.h:132 parse-options.h:134 parse-options.h:245
5056 #: builtin/am.c:2289 builtin/branch.c:592 builtin/for-each-ref.c:37
5057 #: builtin/replace.c:442 builtin/tag.c:433 builtin/verify-tag.c:38
5061 #: builtin/am.c:2290
5062 msgid "format the patch(es) are in"
5065 #: builtin/am.c:2296
5066 msgid "override error message when patch failure occurs"
5067 msgstr "打补丁失败时显示的错误信息"
5069 #: builtin/am.c:2298
5070 msgid "continue applying patches after resolving a conflict"
5071 msgstr "冲突解决后继续应用补丁"
5073 #: builtin/am.c:2301
5074 msgid "synonyms for --continue"
5075 msgstr "和 --continue 同义"
5077 #: builtin/am.c:2304
5078 msgid "skip the current patch"
5081 #: builtin/am.c:2307
5082 msgid "restore the original branch and abort the patching operation."
5083 msgstr "恢复原始分支并终止打补丁操作。"
5085 #: builtin/am.c:2311
5086 msgid "lie about committer date"
5087 msgstr "将作者日期作为提交日期"
5089 #: builtin/am.c:2313
5090 msgid "use current timestamp for author date"
5091 msgstr "用当前时间作为作者日期"
5093 #: builtin/am.c:2315 builtin/commit.c:1600 builtin/merge.c:232
5094 #: builtin/pull.c:165 builtin/revert.c:111 builtin/tag.c:413
5098 #: builtin/am.c:2316
5099 msgid "GPG-sign commits"
5100 msgstr "使用 GPG 签名提交"
5102 #: builtin/am.c:2319
5103 msgid "(internal use for git-rebase)"
5104 msgstr "(内部使用,用于 git-rebase)"
5106 #: builtin/am.c:2334
5108 "The -b/--binary option has been a no-op for long time, and\n"
5109 "it will be removed. Please do not use it anymore."
5111 "参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n"
5114 #: builtin/am.c:2341
5115 msgid "failed to read the index"
5118 #: builtin/am.c:2356
5120 msgid "previous rebase directory %s still exists but mbox given."
5121 msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。"
5123 #: builtin/am.c:2380
5126 "Stray %s directory found.\n"
5127 "Use \"git am --abort\" to remove it."
5130 "使用 \"git am --abort\" 删除它。"
5132 #: builtin/am.c:2386
5133 msgid "Resolve operation not in progress, we are not resuming."
5134 msgstr "解决操作未进行,我们不会继续。"
5136 #: builtin/apply.c:8
5137 msgid "git apply [<options>] [<patch>...]"
5138 msgstr "git apply [<选项>] [<补丁>...]"
5140 #: builtin/archive.c:17
5142 msgid "could not create archive file '%s'"
5143 msgstr "不能创建归档文件 '%s'"
5145 #: builtin/archive.c:20
5146 msgid "could not redirect output"
5149 #: builtin/archive.c:37
5150 msgid "git archive: Remote with no URL"
5151 msgstr "git archive:未提供远程 URL"
5153 #: builtin/archive.c:58
5154 msgid "git archive: expected ACK/NAK, got EOF"
5155 msgstr "git archive:应为 ACK/NACK,却得到 EOF"
5157 #: builtin/archive.c:61
5159 msgid "git archive: NACK %s"
5160 msgstr "git archive:NACK %s"
5162 #: builtin/archive.c:63
5164 msgid "remote error: %s"
5167 #: builtin/archive.c:64
5168 msgid "git archive: protocol error"
5169 msgstr "git archive:协议错误"
5171 #: builtin/archive.c:68
5172 msgid "git archive: expected a flush"
5173 msgstr "git archive:应有一个 flush 刷新"
5175 #: builtin/bisect--helper.c:7
5176 msgid "git bisect--helper --next-all [--no-checkout]"
5177 msgstr "git bisect--helper --next-all [--no-checkout]"
5179 #: builtin/bisect--helper.c:17
5180 msgid "perform 'git bisect next'"
5181 msgstr "执行 'git bisect next'"
5183 #: builtin/bisect--helper.c:19
5184 msgid "update BISECT_HEAD instead of checking out the current commit"
5185 msgstr "更新 BISECT_HEAD 而非检出当前提交"
5187 #: builtin/blame.c:33
5188 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
5189 msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
5191 #: builtin/blame.c:38
5192 msgid "<rev-opts> are documented in git-rev-list(1)"
5193 msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
5195 #: builtin/blame.c:1777
5196 msgid "Blaming lines"
5199 #: builtin/blame.c:2573
5200 msgid "Show blame entries as we find them, incrementally"
5201 msgstr "增量式地显示发现的 blame 条目"
5203 #: builtin/blame.c:2574
5204 msgid "Show blank SHA-1 for boundary commits (Default: off)"
5205 msgstr "边界提交显示空的 SHA-1(默认:关闭)"
5207 #: builtin/blame.c:2575
5208 msgid "Do not treat root commits as boundaries (Default: off)"
5209 msgstr "不把根提交作为边界(默认:关闭)"
5211 #: builtin/blame.c:2576
5212 msgid "Show work cost statistics"
5215 #: builtin/blame.c:2577
5216 msgid "Force progress reporting"
5219 #: builtin/blame.c:2578
5220 msgid "Show output score for blame entries"
5221 msgstr "显示判断 blame 条目位移的得分诊断信息"
5223 #: builtin/blame.c:2579
5224 msgid "Show original filename (Default: auto)"
5225 msgstr "显示原始文件名(默认:自动)"
5227 #: builtin/blame.c:2580
5228 msgid "Show original linenumber (Default: off)"
5229 msgstr "显示原始的行号(默认:关闭)"
5231 #: builtin/blame.c:2581
5232 msgid "Show in a format designed for machine consumption"
5233 msgstr "显示为一个适合机器读取的格式"
5235 #: builtin/blame.c:2582
5236 msgid "Show porcelain format with per-line commit information"
5237 msgstr "为每一行显示机器适用的提交信息"
5239 #: builtin/blame.c:2583
5240 msgid "Use the same output mode as git-annotate (Default: off)"
5241 msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
5243 #: builtin/blame.c:2584
5244 msgid "Show raw timestamp (Default: off)"
5245 msgstr "显示原始时间戳(默认:关闭)"
5247 #: builtin/blame.c:2585
5248 msgid "Show long commit SHA1 (Default: off)"
5249 msgstr "显示长的 SHA1 提交号(默认:关闭)"
5251 #: builtin/blame.c:2586
5252 msgid "Suppress author name and timestamp (Default: off)"
5253 msgstr "隐藏作者名字和时间戳(默认:关闭)"
5255 #: builtin/blame.c:2587
5256 msgid "Show author email instead of name (Default: off)"
5257 msgstr "显示作者的邮箱而不是名字(默认:关闭)"
5259 #: builtin/blame.c:2588
5260 msgid "Ignore whitespace differences"
5263 #: builtin/blame.c:2595
5264 msgid "Use an experimental heuristic to improve diffs"
5265 msgstr "使用一个试验性的启发式算法改进差异显示"
5267 #: builtin/blame.c:2597
5268 msgid "Spend extra cycles to find better match"
5269 msgstr "花费额外的循环来找到更好的匹配"
5271 #: builtin/blame.c:2598
5272 msgid "Use revisions from <file> instead of calling git-rev-list"
5273 msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
5275 #: builtin/blame.c:2599
5276 msgid "Use <file>'s contents as the final image"
5277 msgstr "使用 <文件> 的内容作为最终的图片"
5279 #: builtin/blame.c:2600 builtin/blame.c:2601
5283 #: builtin/blame.c:2600
5284 msgid "Find line copies within and across files"
5285 msgstr "找到文件内及跨文件的行拷贝"
5287 #: builtin/blame.c:2601
5288 msgid "Find line movements within and across files"
5289 msgstr "找到文件内及跨文件的行移动"
5291 #: builtin/blame.c:2602
5295 #: builtin/blame.c:2602
5296 msgid "Process only line range n,m, counting from 1"
5297 msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
5299 #: builtin/blame.c:2649
5300 msgid "--progress can't be used with --incremental or porcelain formats"
5301 msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用"
5303 #. TRANSLATORS: This string is used to tell us the maximum
5304 #. display width for a relative timestamp in "git blame"
5305 #. output. For C locale, "4 years, 11 months ago", which
5306 #. takes 22 places, is the longest among various forms of
5307 #. relative timestamps, but your language may need more or
5308 #. fewer display columns.
5309 #: builtin/blame.c:2697
5310 msgid "4 years, 11 months ago"
5313 #: builtin/blame.c:2777
5314 msgid "--contents and --reverse do not blend well."
5315 msgstr "--contents 和 --reverse 不能混用。"
5317 #: builtin/blame.c:2797
5318 msgid "cannot use --contents with final commit object name"
5319 msgstr "不能将 --contents 和最终的提交对象名共用"
5321 #: builtin/blame.c:2802
5322 msgid "--reverse and --first-parent together require specified latest commit"
5323 msgstr "--reverse 和 --first-parent 共用,需要指定最新的提交"
5325 #: builtin/blame.c:2829
5327 "--reverse --first-parent together require range along first-parent chain"
5328 msgstr "--reverse 和 --first-parent 共用,需要第一祖先链上的提交范围"
5330 #: builtin/blame.c:2840
5332 msgid "no such path %s in %s"
5333 msgstr "在 %2$s 中无此路径 %1$s"
5335 #: builtin/blame.c:2851
5337 msgid "cannot read blob %s for path %s"
5338 msgstr "不能为路径 %2$s 读取数据对象 %1$s"
5340 #: builtin/blame.c:2870
5342 msgid "file %s has only %lu line"
5343 msgid_plural "file %s has only %lu lines"
5344 msgstr[0] "文件 %s 只有 %lu 行"
5345 msgstr[1] "文件 %s 只有 %lu 行"
5347 #: builtin/branch.c:26
5348 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
5349 msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
5351 #: builtin/branch.c:27
5352 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
5353 msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
5355 #: builtin/branch.c:28
5356 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
5357 msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
5359 #: builtin/branch.c:29
5360 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
5361 msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
5363 #: builtin/branch.c:30
5364 msgid "git branch [<options>] [-r | -a] [--points-at]"
5365 msgstr "git branch [<选项>] [-r | -a] [--points-at]"
5367 #: builtin/branch.c:31
5368 msgid "git branch [<options>] [-r | -a] [--format]"
5369 msgstr "git branch [<选项>] [-r | -a] [--format]"
5371 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
5372 #: builtin/branch.c:144
5375 "deleting branch '%s' that has been merged to\n"
5376 " '%s', but not yet merged to HEAD."
5378 "将要删除的分支 '%s' 已经被合并到\n"
5381 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
5382 #: builtin/branch.c:148
5385 "not deleting branch '%s' that is not yet merged to\n"
5386 " '%s', even though it is merged to HEAD."
5388 "并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
5389 " 然而却尚未被合并到分支 '%s' 。"
5391 #: builtin/branch.c:162
5393 msgid "Couldn't look up commit object for '%s'"
5394 msgstr "无法查询 '%s' 指向的提交对象"
5396 #: builtin/branch.c:166
5399 "The branch '%s' is not fully merged.\n"
5400 "If you are sure you want to delete it, run 'git branch -D %s'."
5403 "如果您确认要删除它,执行 'git branch -D %s'。"
5405 #: builtin/branch.c:179
5406 msgid "Update of config-file failed"
5407 msgstr "无法更新 config 文件"
5409 #: builtin/branch.c:210
5410 msgid "cannot use -a with -d"
5411 msgstr "不能将 -a 和 -d 同时使用"
5413 #: builtin/branch.c:216
5414 msgid "Couldn't look up commit object for HEAD"
5415 msgstr "无法查询 HEAD 指向的提交对象"
5417 #: builtin/branch.c:230
5419 msgid "Cannot delete branch '%s' checked out at '%s'"
5420 msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。"
5422 #: builtin/branch.c:245
5424 msgid "remote-tracking branch '%s' not found."
5425 msgstr "未能找到远程跟踪分支 '%s'。"
5427 #: builtin/branch.c:246
5429 msgid "branch '%s' not found."
5430 msgstr "分支 '%s' 未发现。"
5432 #: builtin/branch.c:261
5434 msgid "Error deleting remote-tracking branch '%s'"
5435 msgstr "无法删除远程跟踪分支 '%s'"
5437 #: builtin/branch.c:262
5439 msgid "Error deleting branch '%s'"
5440 msgstr "无法删除分支 '%s'"
5442 #: builtin/branch.c:269
5444 msgid "Deleted remote-tracking branch %s (was %s).\n"
5445 msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n"
5447 #: builtin/branch.c:270
5449 msgid "Deleted branch %s (was %s).\n"
5450 msgstr "已删除分支 %s(曾为 %s)。\n"
5452 #: builtin/branch.c:441
5454 msgid "Branch %s is being rebased at %s"
5455 msgstr "分支 %s 正被变基到 %s"
5457 #: builtin/branch.c:445
5459 msgid "Branch %s is being bisected at %s"
5460 msgstr "分支 %s 正被二分查找于 %s"
5462 #: builtin/branch.c:460
5463 msgid "cannot rename the current branch while not on any."
5464 msgstr "无法重命名当前分支因为不处于任何分支上。"
5466 #: builtin/branch.c:470
5468 msgid "Invalid branch name: '%s'"
5469 msgstr "无效的分支名:'%s'"
5471 #: builtin/branch.c:487
5472 msgid "Branch rename failed"
5475 #: builtin/branch.c:490
5477 msgid "Renamed a misnamed branch '%s' away"
5478 msgstr "重命名掉一个错误命名的旧分支 '%s'"
5480 #: builtin/branch.c:493
5482 msgid "Branch renamed to %s, but HEAD is not updated!"
5483 msgstr "分支重命名为 %s,但 HEAD 没有更新!"
5485 #: builtin/branch.c:502
5486 msgid "Branch is renamed, but update of config-file failed"
5487 msgstr "分支被重命名,但更新 config 文件失败"
5489 #: builtin/branch.c:518
5492 "Please edit the description for the branch\n"
5494 "Lines starting with '%c' will be stripped.\n"
5498 "以 '%c' 开头的行将被过滤。\n"
5500 #: builtin/branch.c:551
5501 msgid "Generic options"
5504 #: builtin/branch.c:553
5505 msgid "show hash and subject, give twice for upstream branch"
5506 msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
5508 #: builtin/branch.c:554
5509 msgid "suppress informational messages"
5512 #: builtin/branch.c:555
5513 msgid "set up tracking mode (see git-pull(1))"
5514 msgstr "设置跟踪模式(参见 git-pull(1))"
5516 #: builtin/branch.c:557
5517 msgid "change upstream info"
5520 #: builtin/branch.c:559
5524 #: builtin/branch.c:559
5525 msgid "change the upstream info"
5528 #: builtin/branch.c:560
5529 msgid "Unset the upstream info"
5532 #: builtin/branch.c:561
5533 msgid "use colored output"
5536 #: builtin/branch.c:562
5537 msgid "act on remote-tracking branches"
5540 #: builtin/branch.c:564 builtin/branch.c:566
5541 msgid "print only branches that contain the commit"
5542 msgstr "只打印包含该提交的分支"
5544 #: builtin/branch.c:565 builtin/branch.c:567
5545 msgid "print only branches that don't contain the commit"
5546 msgstr "只打印不包含该提交的分支"
5548 #: builtin/branch.c:570
5549 msgid "Specific git-branch actions:"
5550 msgstr "具体的 git-branch 动作:"
5552 #: builtin/branch.c:571
5553 msgid "list both remote-tracking and local branches"
5554 msgstr "列出远程跟踪及本地分支"
5556 #: builtin/branch.c:573
5557 msgid "delete fully merged branch"
5560 #: builtin/branch.c:574
5561 msgid "delete branch (even if not merged)"
5562 msgstr "删除分支(即使没有合并)"
5564 #: builtin/branch.c:575
5565 msgid "move/rename a branch and its reflog"
5566 msgstr "移动/重命名一个分支,以及它的引用日志"
5568 #: builtin/branch.c:576
5569 msgid "move/rename a branch, even if target exists"
5570 msgstr "移动/重命名一个分支,即使目标已存在"
5572 #: builtin/branch.c:577
5573 msgid "list branch names"
5576 #: builtin/branch.c:578
5577 msgid "create the branch's reflog"
5580 #: builtin/branch.c:580
5581 msgid "edit the description for the branch"
5584 #: builtin/branch.c:581
5585 msgid "force creation, move/rename, deletion"
5586 msgstr "强制创建、移动/重命名、删除"
5588 #: builtin/branch.c:582
5589 msgid "print only branches that are merged"
5592 #: builtin/branch.c:583
5593 msgid "print only branches that are not merged"
5596 #: builtin/branch.c:584
5597 msgid "list branches in columns"
5600 #: builtin/branch.c:585 builtin/for-each-ref.c:38 builtin/tag.c:426
5604 #: builtin/branch.c:586 builtin/for-each-ref.c:39 builtin/tag.c:427
5605 msgid "field name to sort on"
5608 #: builtin/branch.c:588 builtin/for-each-ref.c:41 builtin/notes.c:404
5609 #: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570
5610 #: builtin/tag.c:429
5614 #: builtin/branch.c:589
5615 msgid "print only branches of the object"
5616 msgstr "只打印指向该对象的分支"
5618 #: builtin/branch.c:591 builtin/for-each-ref.c:47 builtin/tag.c:434
5619 msgid "sorting and filtering are case insensitive"
5620 msgstr "排序和过滤属于大小写不敏感"
5622 #: builtin/branch.c:592 builtin/for-each-ref.c:37 builtin/tag.c:433
5623 #: builtin/verify-tag.c:38
5624 msgid "format to use for the output"
5627 #: builtin/branch.c:611
5628 msgid "Failed to resolve HEAD as a valid ref."
5629 msgstr "无法将 HEAD 解析为有效引用。"
5631 #: builtin/branch.c:615 builtin/clone.c:724
5632 msgid "HEAD not found below refs/heads!"
5633 msgstr "HEAD 没有位于 /refs/heads 之下!"
5635 #: builtin/branch.c:638
5636 msgid "--column and --verbose are incompatible"
5637 msgstr "--column 和 --verbose 不兼容"
5639 #: builtin/branch.c:649 builtin/branch.c:701
5640 msgid "branch name required"
5643 #: builtin/branch.c:677
5644 msgid "Cannot give description to detached HEAD"
5645 msgstr "不能向分离头指针提供描述"
5647 #: builtin/branch.c:682
5648 msgid "cannot edit description of more than one branch"
5649 msgstr "不能为一个以上的分支编辑描述"
5651 #: builtin/branch.c:689
5653 msgid "No commit on branch '%s' yet."
5654 msgstr "分支 '%s' 尚无提交。"
5656 #: builtin/branch.c:692
5658 msgid "No branch named '%s'."
5661 #: builtin/branch.c:707
5662 msgid "too many branches for a rename operation"
5663 msgstr "为重命名操作提供了太多的分支名"
5665 #: builtin/branch.c:712
5666 msgid "too many branches to set new upstream"
5667 msgstr "为设置新上游提供了太多的分支名"
5669 #: builtin/branch.c:716
5672 "could not set upstream of HEAD to %s when it does not point to any branch."
5673 msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
5675 #: builtin/branch.c:719 builtin/branch.c:741 builtin/branch.c:762
5677 msgid "no such branch '%s'"
5680 #: builtin/branch.c:723
5682 msgid "branch '%s' does not exist"
5683 msgstr "分支 '%s' 不存在"
5685 #: builtin/branch.c:735
5686 msgid "too many branches to unset upstream"
5687 msgstr "为取消上游设置操作提供了太多的分支名"
5689 #: builtin/branch.c:739
5690 msgid "could not unset upstream of HEAD when it does not point to any branch."
5691 msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
5693 #: builtin/branch.c:745
5695 msgid "Branch '%s' has no upstream information"
5696 msgstr "分支 '%s' 没有上游信息"
5698 #: builtin/branch.c:759
5699 msgid "it does not make sense to create 'HEAD' manually"
5700 msgstr "手工创建 'HEAD' 没有意义"
5702 #: builtin/branch.c:765
5703 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
5704 msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
5706 #: builtin/branch.c:768
5709 "The --set-upstream flag is deprecated and will be removed. Consider using --"
5710 "track or --set-upstream-to\n"
5712 "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
5714 #: builtin/branch.c:785
5718 "If you wanted to make '%s' track '%s', do this:\n"
5722 "如果你想用 '%s' 跟踪 '%s', 这么做:\n"
5725 #: builtin/bundle.c:45
5727 msgid "%s is okay\n"
5730 #: builtin/bundle.c:58
5731 msgid "Need a repository to create a bundle."
5732 msgstr "需要一个仓库来创建包。"
5734 #: builtin/bundle.c:62
5735 msgid "Need a repository to unbundle."
5738 #: builtin/cat-file.c:513
5740 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
5741 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
5743 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
5744 "p | <类型> | --textconv | --filters) [--path=<路径>] <对象>"
5746 #: builtin/cat-file.c:514
5748 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
5751 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
5754 #: builtin/cat-file.c:551
5755 msgid "<type> can be one of: blob, tree, commit, tag"
5756 msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
5758 #: builtin/cat-file.c:552
5759 msgid "show object type"
5762 #: builtin/cat-file.c:553
5763 msgid "show object size"
5766 #: builtin/cat-file.c:555
5767 msgid "exit with zero when there's no error"
5768 msgstr "当没有错误时退出并返回零"
5770 #: builtin/cat-file.c:556
5771 msgid "pretty-print object's content"
5774 #: builtin/cat-file.c:558
5775 msgid "for blob objects, run textconv on object's content"
5776 msgstr "对于数据对象,对其内容做文本转换"
5778 #: builtin/cat-file.c:560
5779 msgid "for blob objects, run filters on object's content"
5780 msgstr "对于数据对象,对其内容做过滤"
5782 #: builtin/cat-file.c:561 git-submodule.sh:943
5786 #: builtin/cat-file.c:562
5787 msgid "use a specific path for --textconv/--filters"
5788 msgstr "对于 --textconv/--filters 使用一个特定的路径"
5790 #: builtin/cat-file.c:564
5791 msgid "allow -s and -t to work with broken/corrupt objects"
5792 msgstr "允许 -s 和 -t 对损坏的对象生效"
5794 #: builtin/cat-file.c:565
5795 msgid "buffer --batch output"
5796 msgstr "缓冲 --batch 的输出"
5798 #: builtin/cat-file.c:567
5799 msgid "show info and content of objects fed from the standard input"
5800 msgstr "显示从标准输入提供的对象的信息和内容"
5802 #: builtin/cat-file.c:570
5803 msgid "show info about objects fed from the standard input"
5804 msgstr "显示从标准输入提供的对象的信息"
5806 #: builtin/cat-file.c:573
5807 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
5808 msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)"
5810 #: builtin/cat-file.c:575
5811 msgid "show all objects with --batch or --batch-check"
5812 msgstr "使用 --batch 或 --batch-check 参数显示所有对象"
5814 #: builtin/check-attr.c:11
5815 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
5816 msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
5818 #: builtin/check-attr.c:12
5819 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
5820 msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]"
5822 #: builtin/check-attr.c:19
5823 msgid "report all attributes set on file"
5824 msgstr "报告设置在文件上的所有属性"
5826 #: builtin/check-attr.c:20
5827 msgid "use .gitattributes only from the index"
5828 msgstr "只使用索引中的 .gitattributes"
5830 #: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98
5831 msgid "read file names from stdin"
5834 #: builtin/check-attr.c:23 builtin/check-ignore.c:24
5835 msgid "terminate input and output records by a NUL character"
5836 msgstr "输入和输出的记录使用 NUL 字符终结"
5838 #: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:352
5839 msgid "suppress progress reporting"
5842 #: builtin/check-ignore.c:26
5843 msgid "show non-matching input paths"
5846 #: builtin/check-ignore.c:28
5847 msgid "ignore index when checking"
5850 #: builtin/check-ignore.c:154
5851 msgid "cannot specify pathnames with --stdin"
5852 msgstr "不能同时指定路径及 --stdin 参数"
5854 #: builtin/check-ignore.c:157
5855 msgid "-z only makes sense with --stdin"
5856 msgstr "-z 需要和 --stdin 参数共用才有意义"
5858 #: builtin/check-ignore.c:159
5859 msgid "no path specified"
5862 #: builtin/check-ignore.c:163
5863 msgid "--quiet is only valid with a single pathname"
5864 msgstr "参数 --quiet 只在提供一个路径名时有效"
5866 #: builtin/check-ignore.c:165
5867 msgid "cannot have both --quiet and --verbose"
5868 msgstr "不能同时提供 --quiet 和 --verbose 参数"
5870 #: builtin/check-ignore.c:168
5871 msgid "--non-matching is only valid with --verbose"
5872 msgstr "--non-matching 选项只在使用 --verbose 时有效"
5874 #: builtin/check-mailmap.c:8
5875 msgid "git check-mailmap [<options>] <contact>..."
5876 msgstr "git check-mailmap [<选项>] <联系地址>..."
5878 #: builtin/check-mailmap.c:13
5879 msgid "also read contacts from stdin"
5880 msgstr "还从标准输入读取联系地址"
5882 #: builtin/check-mailmap.c:24
5884 msgid "unable to parse contact: %s"
5885 msgstr "不能解析联系地址:%s"
5887 #: builtin/check-mailmap.c:47
5888 msgid "no contacts specified"
5891 #: builtin/checkout-index.c:127
5892 msgid "git checkout-index [<options>] [--] [<file>...]"
5893 msgstr "git checkout-index [<选项>] [--] [<文件>...]"
5895 #: builtin/checkout-index.c:144
5896 msgid "stage should be between 1 and 3 or all"
5897 msgstr "索引值应该取值 1 到 3 或者 all"
5899 #: builtin/checkout-index.c:160
5900 msgid "check out all files in the index"
5903 #: builtin/checkout-index.c:161
5904 msgid "force overwrite of existing files"
5907 #: builtin/checkout-index.c:163
5908 msgid "no warning for existing files and files not in index"
5909 msgstr "存在或不在索引中的文件都没有警告"
5911 #: builtin/checkout-index.c:165
5912 msgid "don't checkout new files"
5915 #: builtin/checkout-index.c:167
5916 msgid "update stat information in the index file"
5917 msgstr "更新索引中文件的状态信息"
5919 #: builtin/checkout-index.c:171
5920 msgid "read list of paths from the standard input"
5921 msgstr "从标准输入读取路径列表"
5923 #: builtin/checkout-index.c:173
5924 msgid "write the content to temporary files"
5927 #: builtin/checkout-index.c:174 builtin/column.c:30
5928 #: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
5929 #: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
5930 #: builtin/worktree.c:472
5934 #: builtin/checkout-index.c:175
5935 msgid "when creating files, prepend <string>"
5936 msgstr "在创建文件时,在前面加上 <字符串>"
5938 #: builtin/checkout-index.c:177
5939 msgid "copy out the files from named stage"
5940 msgstr "从指定暂存区中拷出文件"
5942 #: builtin/checkout.c:27
5943 msgid "git checkout [<options>] <branch>"
5944 msgstr "git checkout [<选项>] <分支>"
5946 #: builtin/checkout.c:28
5947 msgid "git checkout [<options>] [<branch>] -- <file>..."
5948 msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
5950 #: builtin/checkout.c:153 builtin/checkout.c:186
5952 msgid "path '%s' does not have our version"
5953 msgstr "路径 '%s' 没有我们的版本"
5955 #: builtin/checkout.c:155 builtin/checkout.c:188
5957 msgid "path '%s' does not have their version"
5958 msgstr "路径 '%s' 没有他们的版本"
5960 #: builtin/checkout.c:171
5962 msgid "path '%s' does not have all necessary versions"
5963 msgstr "路径 '%s' 没有全部必须的版本"
5965 #: builtin/checkout.c:215
5967 msgid "path '%s' does not have necessary versions"
5968 msgstr "路径 '%s' 没有必须的版本"
5970 #: builtin/checkout.c:232
5972 msgid "path '%s': cannot merge"
5973 msgstr "path '%s':无法合并"
5975 #: builtin/checkout.c:249
5977 msgid "Unable to add merge result for '%s'"
5978 msgstr "无法为 '%s' 添加合并结果"
5980 #: builtin/checkout.c:269 builtin/checkout.c:272 builtin/checkout.c:275
5981 #: builtin/checkout.c:278
5983 msgid "'%s' cannot be used with updating paths"
5984 msgstr "'%s' 不能在更新路径时使用"
5986 #: builtin/checkout.c:281 builtin/checkout.c:284
5988 msgid "'%s' cannot be used with %s"
5989 msgstr "'%s' 不能和 %s 同时使用"
5991 #: builtin/checkout.c:287
5993 msgid "Cannot update paths and switch to branch '%s' at the same time."
5994 msgstr "不能同时更新路径并切换到分支'%s'。"
5996 #: builtin/checkout.c:358 builtin/checkout.c:365
5998 msgid "path '%s' is unmerged"
5999 msgstr "路径 '%s' 未合并"
6001 #: builtin/checkout.c:513
6002 msgid "you need to resolve your current index first"
6003 msgstr "您需要先解决当前索引的冲突"
6005 #: builtin/checkout.c:644
6007 msgid "Can not do reflog for '%s': %s\n"
6008 msgstr "不能对 '%s' 执行 reflog 操作:%s\n"
6010 #: builtin/checkout.c:685
6011 msgid "HEAD is now at"
6014 #: builtin/checkout.c:689 builtin/clone.c:678
6015 msgid "unable to update HEAD"
6018 #: builtin/checkout.c:693
6020 msgid "Reset branch '%s'\n"
6021 msgstr "重置分支 '%s'\n"
6023 #: builtin/checkout.c:696
6025 msgid "Already on '%s'\n"
6026 msgstr "已经位于 '%s'\n"
6028 #: builtin/checkout.c:700
6030 msgid "Switched to and reset branch '%s'\n"
6031 msgstr "切换并重置分支 '%s'\n"
6033 #: builtin/checkout.c:702 builtin/checkout.c:1090
6035 msgid "Switched to a new branch '%s'\n"
6036 msgstr "切换到一个新分支 '%s'\n"
6038 #: builtin/checkout.c:704
6040 msgid "Switched to branch '%s'\n"
6041 msgstr "切换到分支 '%s'\n"
6044 #: builtin/checkout.c:755
6046 msgid " ... and %d more.\n"
6047 msgstr " ... 及其它 %d 个。\n"
6049 #: builtin/checkout.c:761
6052 "Warning: you are leaving %d commit behind, not connected to\n"
6053 "any of your branches:\n"
6057 "Warning: you are leaving %d commits behind, not connected to\n"
6058 "any of your branches:\n"
6062 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
6066 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
6070 #: builtin/checkout.c:780
6073 "If you want to keep it by creating a new branch, this may be a good time\n"
6076 " git branch <new-branch-name> %s\n"
6079 "If you want to keep them by creating a new branch, this may be a good time\n"
6082 " git branch <new-branch-name> %s\n"
6085 "如果您想要通过创建新分支保存它,这可能是一个好时候。\n"
6088 " git branch <新分支名> %s\n"
6091 "如果您想要通过创建新分支保存它们,这可能是一个好时候。\n"
6094 " git branch <新分支名> %s\n"
6097 #: builtin/checkout.c:816
6098 msgid "internal error in revision walk"
6099 msgstr "在版本遍历时遇到内部错误"
6101 #: builtin/checkout.c:820
6102 msgid "Previous HEAD position was"
6103 msgstr "之前的 HEAD 位置是"
6105 #: builtin/checkout.c:847 builtin/checkout.c:1085
6106 msgid "You are on a branch yet to be born"
6107 msgstr "您位于一个尚未初始化的分支"
6109 #: builtin/checkout.c:991
6111 msgid "only one reference expected, %d given."
6112 msgstr "应只有一个引用,却给出了 %d 个"
6114 #: builtin/checkout.c:1031 builtin/worktree.c:214
6116 msgid "invalid reference: %s"
6119 #: builtin/checkout.c:1060
6121 msgid "reference is not a tree: %s"
6124 #: builtin/checkout.c:1099
6125 msgid "paths cannot be used with switching branches"
6126 msgstr "路径不能和切换分支同时使用"
6128 #: builtin/checkout.c:1102 builtin/checkout.c:1106
6130 msgid "'%s' cannot be used with switching branches"
6131 msgstr "'%s' 不能和切换分支同时使用"
6133 #: builtin/checkout.c:1110 builtin/checkout.c:1113 builtin/checkout.c:1118
6134 #: builtin/checkout.c:1121
6136 msgid "'%s' cannot be used with '%s'"
6137 msgstr "'%s' 不能和 '%s' 同时使用"
6139 #: builtin/checkout.c:1126
6141 msgid "Cannot switch branch to a non-commit '%s'"
6142 msgstr "不能切换分支到一个非提交 '%s'"
6144 #: builtin/checkout.c:1159 builtin/checkout.c:1161 builtin/clone.c:111
6145 #: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:325
6146 #: builtin/worktree.c:327
6150 #: builtin/checkout.c:1160
6151 msgid "create and checkout a new branch"
6152 msgstr "创建并检出一个新的分支"
6154 #: builtin/checkout.c:1162
6155 msgid "create/reset and checkout a branch"
6156 msgstr "创建/重置并检出一个分支"
6158 #: builtin/checkout.c:1163
6159 msgid "create reflog for new branch"
6160 msgstr "为新的分支创建引用日志"
6162 #: builtin/checkout.c:1164 builtin/worktree.c:329
6163 msgid "detach HEAD at named commit"
6164 msgstr "HEAD 从指定的提交分离"
6166 #: builtin/checkout.c:1165
6167 msgid "set upstream info for new branch"
6168 msgstr "为新的分支设置上游信息"
6170 #: builtin/checkout.c:1167
6174 #: builtin/checkout.c:1167
6175 msgid "new unparented branch"
6178 #: builtin/checkout.c:1168
6179 msgid "checkout our version for unmerged files"
6180 msgstr "对尚未合并的文件检出我们的版本"
6182 #: builtin/checkout.c:1170
6183 msgid "checkout their version for unmerged files"
6184 msgstr "对尚未合并的文件检出他们的版本"
6186 #: builtin/checkout.c:1172
6187 msgid "force checkout (throw away local modifications)"
6188 msgstr "强制检出(丢弃本地修改)"
6190 #: builtin/checkout.c:1173
6191 msgid "perform a 3-way merge with the new branch"
6192 msgstr "和新的分支执行三方合并"
6194 #: builtin/checkout.c:1174 builtin/merge.c:234
6195 msgid "update ignored files (default)"
6196 msgstr "更新忽略的文件(默认)"
6198 #: builtin/checkout.c:1175 builtin/log.c:1473 parse-options.h:251
6202 #: builtin/checkout.c:1176
6203 msgid "conflict style (merge or diff3)"
6204 msgstr "冲突输出风格(merge 或 diff3)"
6206 #: builtin/checkout.c:1179
6207 msgid "do not limit pathspecs to sparse entries only"
6208 msgstr "对路径不做稀疏检出的限制"
6210 #: builtin/checkout.c:1181
6211 msgid "second guess 'git checkout <no-such-branch>'"
6212 msgstr "二次猜测'git checkout <无此分支>'"
6214 #: builtin/checkout.c:1183
6215 msgid "do not check if another worktree is holding the given ref"
6216 msgstr "不检查指定的引用是否被其他工作区所占用"
6218 #: builtin/checkout.c:1187 builtin/clone.c:78 builtin/fetch.c:119
6219 #: builtin/merge.c:231 builtin/pull.c:117 builtin/push.c:539
6220 #: builtin/send-pack.c:172
6221 msgid "force progress reporting"
6224 #: builtin/checkout.c:1224
6225 msgid "-b, -B and --orphan are mutually exclusive"
6226 msgstr "-b、-B 和 --orphan 是互斥的"
6228 #: builtin/checkout.c:1241
6229 msgid "--track needs a branch name"
6230 msgstr "--track 需要一个分支名"
6232 #: builtin/checkout.c:1246
6233 msgid "Missing branch name; try -b"
6234 msgstr "缺少分支名;尝试 -b"
6236 #: builtin/checkout.c:1282
6237 msgid "invalid path specification"
6240 #: builtin/checkout.c:1289
6243 "Cannot update paths and switch to branch '%s' at the same time.\n"
6244 "Did you intend to checkout '%s' which can not be resolved as commit?"
6246 "不能同时更新路径并切换到分支'%s'。\n"
6247 "您是想要检出 '%s' 但其未能解析为提交么?"
6249 #: builtin/checkout.c:1294
6251 msgid "git checkout: --detach does not take a path argument '%s'"
6252 msgstr "git checkout:--detach 不能接收路径参数 '%s'"
6254 #: builtin/checkout.c:1298
6256 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
6257 "checking out of the index."
6259 "git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
6261 #: builtin/clean.c:25
6263 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
6265 "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
6267 #: builtin/clean.c:29
6269 msgid "Removing %s\n"
6272 #: builtin/clean.c:30
6274 msgid "Would remove %s\n"
6277 #: builtin/clean.c:31
6279 msgid "Skipping repository %s\n"
6282 #: builtin/clean.c:32
6284 msgid "Would skip repository %s\n"
6287 #: builtin/clean.c:33
6289 msgid "failed to remove %s"
6292 #: builtin/clean.c:297 git-add--interactive.perl:614
6296 "1 - select a numbered item\n"
6297 "foo - select item based on unique prefix\n"
6298 " - (empty) select nothing\n"
6302 "foo - 通过唯一前缀选择一个选项\n"
6305 #: builtin/clean.c:301 git-add--interactive.perl:623
6309 "1 - select a single item\n"
6310 "3-5 - select a range of items\n"
6311 "2-3,6-9 - select multiple ranges\n"
6312 "foo - select item based on unique prefix\n"
6313 "-... - unselect specified items\n"
6314 "* - choose all items\n"
6315 " - (empty) finish selecting\n"
6319 "3-5 - 选择一个范围内的所有选项\n"
6320 "2-3,6-9 - 选择多个范围内的所有选项\n"
6321 "foo - 通过唯一前缀选择一个选项\n"
6326 #: builtin/clean.c:517 git-add--interactive.perl:589
6327 #: git-add--interactive.perl:594
6328 #, c-format, perl-format
6332 #: builtin/clean.c:659
6334 msgid "Input ignore patterns>> "
6335 msgstr "输入模版以排除条目>> "
6337 #: builtin/clean.c:696
6339 msgid "WARNING: Cannot find items matched by: %s"
6340 msgstr "警告:无法找到和 %s 匹配的条目"
6342 #: builtin/clean.c:717
6343 msgid "Select items to delete"
6346 #. TRANSLATORS: Make sure to keep [y/N] as is
6347 #: builtin/clean.c:758
6349 msgid "Remove %s [y/N]? "
6350 msgstr "删除 %s [y/N]?"
6352 #: builtin/clean.c:783 git-add--interactive.perl:1660
6357 #: builtin/clean.c:791
6359 "clean - start cleaning\n"
6360 "filter by pattern - exclude items from deletion\n"
6361 "select by numbers - select items to be deleted by numbers\n"
6362 "ask each - confirm each deletion (like \"rm -i\")\n"
6363 "quit - stop cleaning\n"
6364 "help - this screen\n"
6365 "? - help for prompt selection"
6368 "filter by pattern - 通过模版排除要删除的条目\n"
6369 "select by numbers - 通过数字选择要删除的条目\n"
6370 "ask each - 针对删除逐一询问(就像 \"rm -i\")\n"
6373 "? - 显示如何在提示符下选择的帮助"
6375 #: builtin/clean.c:818 git-add--interactive.perl:1736
6376 msgid "*** Commands ***"
6379 #: builtin/clean.c:819 git-add--interactive.perl:1733
6383 #: builtin/clean.c:827
6384 msgid "Would remove the following item:"
6385 msgid_plural "Would remove the following items:"
6386 msgstr[0] "将删除如下条目:"
6387 msgstr[1] "将删除如下条目:"
6389 #: builtin/clean.c:844
6390 msgid "No more files to clean, exiting."
6391 msgstr "没有要清理的文件,退出。"
6393 #: builtin/clean.c:875
6394 msgid "do not print names of files removed"
6397 #: builtin/clean.c:877
6401 #: builtin/clean.c:878
6402 msgid "interactive cleaning"
6405 #: builtin/clean.c:880
6406 msgid "remove whole directories"
6409 #: builtin/clean.c:881 builtin/describe.c:449 builtin/describe.c:451
6410 #: builtin/grep.c:1063 builtin/ls-files.c:539 builtin/name-rev.c:348
6411 #: builtin/name-rev.c:350 builtin/show-ref.c:176
6415 #: builtin/clean.c:882
6416 msgid "add <pattern> to ignore rules"
6417 msgstr "添加 <模式> 到忽略规则"
6419 #: builtin/clean.c:883
6420 msgid "remove ignored files, too"
6423 #: builtin/clean.c:885
6424 msgid "remove only ignored files"
6427 #: builtin/clean.c:903
6428 msgid "-x and -X cannot be used together"
6429 msgstr "-x 和 -X 不能同时使用"
6431 #: builtin/clean.c:907
6433 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
6436 "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
6438 #: builtin/clean.c:910
6440 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
6443 "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
6445 #: builtin/clone.c:37
6446 msgid "git clone [<options>] [--] <repo> [<dir>]"
6447 msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
6449 #: builtin/clone.c:80
6450 msgid "don't create a checkout"
6453 #: builtin/clone.c:81 builtin/clone.c:83 builtin/init-db.c:478
6454 msgid "create a bare repository"
6457 #: builtin/clone.c:85
6458 msgid "create a mirror repository (implies bare)"
6459 msgstr "创建一个镜像仓库(也是纯仓库)"
6461 #: builtin/clone.c:87
6462 msgid "to clone from a local repository"
6465 #: builtin/clone.c:89
6466 msgid "don't use local hardlinks, always copy"
6467 msgstr "不使用本地硬链接,始终复制"
6469 #: builtin/clone.c:91
6470 msgid "setup as shared repository"
6473 #: builtin/clone.c:93 builtin/clone.c:97
6477 #: builtin/clone.c:93 builtin/clone.c:97
6478 msgid "initialize submodules in the clone"
6481 #: builtin/clone.c:100
6482 msgid "number of submodules cloned in parallel"
6483 msgstr "并发克隆的子模组的数量"
6485 #: builtin/clone.c:101 builtin/init-db.c:475
6486 msgid "template-directory"
6489 #: builtin/clone.c:102 builtin/init-db.c:476
6490 msgid "directory from which templates will be used"
6493 #: builtin/clone.c:104 builtin/clone.c:106 builtin/submodule--helper.c:642
6494 #: builtin/submodule--helper.c:983
6495 msgid "reference repository"
6498 #: builtin/clone.c:108
6499 msgid "use --reference only while cloning"
6500 msgstr "仅在克隆时参考 --reference 指向的本地仓库"
6502 #: builtin/clone.c:109 builtin/column.c:26 builtin/merge-file.c:43
6506 #: builtin/clone.c:110
6507 msgid "use <name> instead of 'origin' to track upstream"
6508 msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
6510 #: builtin/clone.c:112
6511 msgid "checkout <branch> instead of the remote's HEAD"
6512 msgstr "检出 <分支> 而不是远程 HEAD"
6514 #: builtin/clone.c:114
6515 msgid "path to git-upload-pack on the remote"
6516 msgstr "远程 git-upload-pack 路径"
6518 #: builtin/clone.c:115 builtin/fetch.c:120 builtin/grep.c:1006
6519 #: builtin/pull.c:202
6523 #: builtin/clone.c:116
6524 msgid "create a shallow clone of that depth"
6525 msgstr "创建一个指定深度的浅克隆"
6527 #: builtin/clone.c:117 builtin/fetch.c:122 builtin/pack-objects.c:2918
6528 #: parse-options.h:142
6532 #: builtin/clone.c:118
6533 msgid "create a shallow clone since a specific time"
6534 msgstr "从一个特定时间创建一个浅克隆"
6536 #: builtin/clone.c:119 builtin/fetch.c:124
6540 #: builtin/clone.c:120 builtin/fetch.c:125
6541 msgid "deepen history of shallow clone, excluding rev"
6542 msgstr "深化浅克隆的历史,除了特定版本"
6544 #: builtin/clone.c:122
6545 msgid "clone only one branch, HEAD or --branch"
6546 msgstr "只克隆一个分支、HEAD 或 --branch"
6548 #: builtin/clone.c:124
6549 msgid "any cloned submodules will be shallow"
6550 msgstr "子模组将以浅下载模式克隆"
6552 #: builtin/clone.c:125 builtin/init-db.c:484
6556 #: builtin/clone.c:126 builtin/init-db.c:485
6557 msgid "separate git dir from working tree"
6558 msgstr "git目录和工作区分离"
6560 #: builtin/clone.c:127
6564 #: builtin/clone.c:128
6565 msgid "set config inside the new repository"
6566 msgstr "在新仓库中设置配置信息"
6568 #: builtin/clone.c:129 builtin/fetch.c:140 builtin/push.c:550
6569 msgid "use IPv4 addresses only"
6570 msgstr "只使用 IPv4 地址"
6572 #: builtin/clone.c:131 builtin/fetch.c:142 builtin/push.c:552
6573 msgid "use IPv6 addresses only"
6574 msgstr "只使用 IPv6 地址"
6576 #: builtin/clone.c:268
6578 "No directory name could be guessed.\n"
6579 "Please specify a directory on the command line"
6584 #: builtin/clone.c:321
6586 msgid "info: Could not add alternate for '%s': %s\n"
6587 msgstr "info: 不能为 '%s' 添加一个备用:%s\n"
6589 #: builtin/clone.c:393
6591 msgid "failed to open '%s'"
6594 #: builtin/clone.c:401
6596 msgid "%s exists and is not a directory"
6597 msgstr "%s 存在且不是一个目录"
6599 #: builtin/clone.c:415
6601 msgid "failed to stat %s\n"
6602 msgstr "无法枚举 %s 状态\n"
6604 #: builtin/clone.c:437
6606 msgid "failed to create link '%s'"
6607 msgstr "无法创建链接 '%s'"
6609 #: builtin/clone.c:441
6611 msgid "failed to copy file to '%s'"
6612 msgstr "无法拷贝文件至 '%s'"
6614 #: builtin/clone.c:466
6619 #: builtin/clone.c:478
6621 "Clone succeeded, but checkout failed.\n"
6622 "You can inspect what was checked out with 'git status'\n"
6623 "and retry the checkout with 'git checkout -f HEAD'\n"
6626 "您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
6627 "'git checkout -f HEAD' 重试\n"
6629 #: builtin/clone.c:555
6631 msgid "Could not find remote branch %s to clone."
6632 msgstr "不能发现要克隆的远程分支 %s。"
6634 #: builtin/clone.c:650
6635 msgid "remote did not send all necessary objects"
6636 msgstr "远程没有发送所有必须的对象"
6638 #: builtin/clone.c:666
6640 msgid "unable to update %s"
6643 #: builtin/clone.c:715
6644 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
6645 msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
6647 #: builtin/clone.c:746
6648 msgid "unable to checkout working tree"
6651 #: builtin/clone.c:786
6652 msgid "unable to write parameters to config file"
6653 msgstr "无法将参数写入配置文件"
6655 #: builtin/clone.c:849
6656 msgid "cannot repack to clean up"
6657 msgstr "无法执行 repack 来清理"
6659 #: builtin/clone.c:851
6660 msgid "cannot unlink temporary alternates file"
6661 msgstr "无法删除临时的 alternates 文件"
6663 #: builtin/clone.c:884 builtin/receive-pack.c:1901
6664 msgid "Too many arguments."
6667 #: builtin/clone.c:888
6668 msgid "You must specify a repository to clone."
6669 msgstr "您必须指定一个仓库来克隆。"
6671 #: builtin/clone.c:901
6673 msgid "--bare and --origin %s options are incompatible."
6674 msgstr "--bare 和 --origin %s 选项不兼容。"
6676 #: builtin/clone.c:904
6677 msgid "--bare and --separate-git-dir are incompatible."
6678 msgstr "--bare 和 --separate-git-dir 选项不兼容。"
6680 #: builtin/clone.c:917
6682 msgid "repository '%s' does not exist"
6683 msgstr "仓库 '%s' 不存在"
6685 #: builtin/clone.c:923 builtin/fetch.c:1337
6687 msgid "depth %s is not a positive number"
6688 msgstr "深度 %s 不是一个正数"
6690 #: builtin/clone.c:933
6692 msgid "destination path '%s' already exists and is not an empty directory."
6693 msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
6695 #: builtin/clone.c:943
6697 msgid "working tree '%s' already exists."
6698 msgstr "工作区 '%s' 已经存在。"
6700 #: builtin/clone.c:958 builtin/clone.c:969 builtin/difftool.c:252
6701 #: builtin/worktree.c:222 builtin/worktree.c:249
6703 msgid "could not create leading directories of '%s'"
6704 msgstr "不能为 '%s' 创建先导目录"
6706 #: builtin/clone.c:961
6708 msgid "could not create work tree dir '%s'"
6709 msgstr "不能创建工作区目录 '%s'"
6711 #: builtin/clone.c:973
6713 msgid "Cloning into bare repository '%s'...\n"
6714 msgstr "克隆到纯仓库 '%s'...\n"
6716 #: builtin/clone.c:975
6718 msgid "Cloning into '%s'...\n"
6719 msgstr "正克隆到 '%s'...\n"
6721 #: builtin/clone.c:999
6723 "clone --recursive is not compatible with both --reference and --reference-if-"
6725 msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容"
6727 #: builtin/clone.c:1055
6728 msgid "--depth is ignored in local clones; use file:// instead."
6729 msgstr "--depth 在本地克隆时被忽略,请改用 file:// 协议。"
6731 #: builtin/clone.c:1057
6732 msgid "--shallow-since is ignored in local clones; use file:// instead."
6733 msgstr "--shallow-since 在本地克隆时被忽略,请改用 file:// 协议。"
6735 #: builtin/clone.c:1059
6736 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
6737 msgstr "--shallow-exclude 在本地克隆时被忽略,请改用 file:// 协议。"
6739 #: builtin/clone.c:1062
6740 msgid "source repository is shallow, ignoring --local"
6741 msgstr "源仓库是浅克隆,忽略 --local"
6743 #: builtin/clone.c:1067
6744 msgid "--local is ignored"
6745 msgstr "--local 被忽略"
6747 #: builtin/clone.c:1071
6749 msgid "Don't know how to clone %s"
6752 #: builtin/clone.c:1126 builtin/clone.c:1134
6754 msgid "Remote branch %s not found in upstream %s"
6755 msgstr "远程分支 %s 在上游 %s 未发现"
6757 #: builtin/clone.c:1137
6758 msgid "You appear to have cloned an empty repository."
6759 msgstr "您似乎克隆了一个空仓库。"
6761 #: builtin/column.c:9
6762 msgid "git column [<options>]"
6763 msgstr "git column [<选项>]"
6765 #: builtin/column.c:26
6766 msgid "lookup config vars"
6769 #: builtin/column.c:27 builtin/column.c:28
6770 msgid "layout to use"
6773 #: builtin/column.c:29
6774 msgid "Maximum width"
6777 #: builtin/column.c:30
6778 msgid "Padding space on left border"
6781 #: builtin/column.c:31
6782 msgid "Padding space on right border"
6785 #: builtin/column.c:32
6786 msgid "Padding space between columns"
6789 #: builtin/column.c:51
6790 msgid "--command must be the first argument"
6791 msgstr "--command 必须是第一个参数"
6793 #: builtin/commit.c:38
6794 msgid "git commit [<options>] [--] <pathspec>..."
6795 msgstr "git commit [<选项>] [--] <路径规格>..."
6797 #: builtin/commit.c:43
6798 msgid "git status [<options>] [--] <pathspec>..."
6799 msgstr "git status [<选项>] [--] <路径规格>..."
6801 #: builtin/commit.c:48
6803 "Your name and email address were configured automatically based\n"
6804 "on your username and hostname. Please check that they are accurate.\n"
6805 "You can suppress this message by setting them explicitly. Run the\n"
6806 "following command and follow the instructions in your editor to edit\n"
6807 "your configuration file:\n"
6809 " git config --global --edit\n"
6811 "After doing this, you may fix the identity used for this commit with:\n"
6813 " git commit --amend --reset-author\n"
6815 "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
6816 "与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
6819 " git config --global --edit\n"
6821 "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
6823 " git commit --amend --reset-author\n"
6825 #: builtin/commit.c:61
6827 "Your name and email address were configured automatically based\n"
6828 "on your username and hostname. Please check that they are accurate.\n"
6829 "You can suppress this message by setting them explicitly:\n"
6831 " git config --global user.name \"Your Name\"\n"
6832 " git config --global user.email you@example.com\n"
6834 "After doing this, you may fix the identity used for this commit with:\n"
6836 " git commit --amend --reset-author\n"
6838 "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
6839 "与否。您可以对其进行设置以免再出现本提示信息:\n"
6841 " git config --global user.name \"Your Name\"\n"
6842 " git config --global user.email you@example.com\n"
6844 "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
6846 " git commit --amend --reset-author\n"
6848 #: builtin/commit.c:73
6850 "You asked to amend the most recent commit, but doing so would make\n"
6851 "it empty. You can repeat your command with --allow-empty, or you can\n"
6852 "remove the commit entirely with \"git reset HEAD^\".\n"
6854 "您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
6855 "--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
6857 #: builtin/commit.c:78
6859 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
6860 "If you wish to commit it anyway, use:\n"
6862 " git commit --allow-empty\n"
6865 "之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
6868 " git commit --allow-empty\n"
6871 #: builtin/commit.c:85
6872 msgid "Otherwise, please use 'git reset'\n"
6873 msgstr "否则,请使用命令 'git reset'\n"
6875 #: builtin/commit.c:88
6877 "If you wish to skip this commit, use:\n"
6881 "Then \"git cherry-pick --continue\" will resume cherry-picking\n"
6882 "the remaining commits.\n"
6884 "如果您想跳过这个提交,使用命令:\n"
6888 "然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
6891 #: builtin/commit.c:318
6892 msgid "failed to unpack HEAD tree object"
6893 msgstr "无法解包 HEAD 树对象"
6895 #: builtin/commit.c:359
6896 msgid "unable to create temporary index"
6899 #: builtin/commit.c:365
6900 msgid "interactive add failed"
6903 #: builtin/commit.c:378
6904 msgid "unable to update temporary index"
6907 #: builtin/commit.c:380
6908 msgid "Failed to update main cache tree"
6911 #: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476
6912 msgid "unable to write new_index file"
6913 msgstr "无法写 new_index 文件"
6915 #: builtin/commit.c:458
6916 msgid "cannot do a partial commit during a merge."
6917 msgstr "在合并过程中不能做部分提交。"
6919 #: builtin/commit.c:460
6920 msgid "cannot do a partial commit during a cherry-pick."
6921 msgstr "在拣选过程中不能做部分提交。"
6923 #: builtin/commit.c:469
6924 msgid "cannot read the index"
6927 #: builtin/commit.c:488
6928 msgid "unable to write temporary index file"
6931 #: builtin/commit.c:582
6933 msgid "commit '%s' lacks author header"
6934 msgstr "提交 '%s' 缺少作者信息"
6936 #: builtin/commit.c:584
6938 msgid "commit '%s' has malformed author line"
6939 msgstr "提交 '%s' 有非法的作者信息"
6941 #: builtin/commit.c:603
6942 msgid "malformed --author parameter"
6943 msgstr "非法的 --author 参数"
6945 #: builtin/commit.c:655
6947 "unable to select a comment character that is not used\n"
6948 "in the current commit message"
6949 msgstr "无法选择一个未被当前提交说明使用的注释字符"
6951 #: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1096
6953 msgid "could not lookup commit %s"
6956 #: builtin/commit.c:704 builtin/shortlog.c:294
6958 msgid "(reading log message from standard input)\n"
6959 msgstr "(正从标准输入中读取日志信息)\n"
6961 #: builtin/commit.c:706
6962 msgid "could not read log from standard input"
6963 msgstr "不能从标准输入中读取日志信息"
6965 #: builtin/commit.c:710
6967 msgid "could not read log file '%s'"
6968 msgstr "不能读取日志文件 '%s'"
6970 #: builtin/commit.c:737 builtin/commit.c:745
6971 msgid "could not read SQUASH_MSG"
6972 msgstr "不能读取 SQUASH_MSG"
6974 #: builtin/commit.c:742
6975 msgid "could not read MERGE_MSG"
6976 msgstr "不能读取 MERGE_MSG"
6978 #: builtin/commit.c:796
6979 msgid "could not write commit template"
6982 #: builtin/commit.c:814
6986 "It looks like you may be committing a merge.\n"
6987 "If this is not correct, please remove the file\n"
6992 "似乎您正在做一个合并提交。如果不对,请删除文件\n"
6996 #: builtin/commit.c:819
7000 "It looks like you may be committing a cherry-pick.\n"
7001 "If this is not correct, please remove the file\n"
7006 "似乎您正在做一个拣选提交。如果不对,请删除文件\n"
7010 #: builtin/commit.c:832
7013 "Please enter the commit message for your changes. Lines starting\n"
7014 "with '%c' will be ignored, and an empty message aborts the commit.\n"
7016 "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
7019 #: builtin/commit.c:839
7022 "Please enter the commit message for your changes. Lines starting\n"
7023 "with '%c' will be kept; you may remove them yourself if you want to.\n"
7024 "An empty message aborts the commit.\n"
7026 "请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
7027 "也可以删除它们。一个空的提交说明将会终止提交。\n"
7029 # 译者:为保证在输出中对齐,注意调整句中空格!
7030 #: builtin/commit.c:859
7032 msgid "%sAuthor: %.*s <%.*s>"
7033 msgstr "%s作者: %.*s <%.*s>"
7035 # 译者:为保证在输出中对齐,注意调整句中空格!
7036 #: builtin/commit.c:867
7041 # 译者:为保证在输出中对齐,注意调整句中空格!
7042 #: builtin/commit.c:874
7044 msgid "%sCommitter: %.*s <%.*s>"
7045 msgstr "%s提交者:%.*s <%.*s>"
7047 #: builtin/commit.c:892
7048 msgid "Cannot read index"
7051 #: builtin/commit.c:954
7052 msgid "Error building trees"
7055 #: builtin/commit.c:968 builtin/tag.c:273
7057 msgid "Please supply the message using either -m or -F option.\n"
7058 msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
7060 #: builtin/commit.c:1071
7062 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
7063 msgstr "--author '%s' 不是 'Name <email>' 格式,且未能在现有作者中找到匹配"
7065 #: builtin/commit.c:1086 builtin/commit.c:1325
7067 msgid "Invalid untracked files mode '%s'"
7068 msgstr "无效的未追踪文件参数 '%s'"
7070 #: builtin/commit.c:1124
7071 msgid "--long and -z are incompatible"
7072 msgstr "--long 和 -z 选项不兼容"
7074 #: builtin/commit.c:1154
7075 msgid "Using both --reset-author and --author does not make sense"
7076 msgstr "同时使用 --reset-author 和 --author 没有意义"
7078 #: builtin/commit.c:1163
7079 msgid "You have nothing to amend."
7082 #: builtin/commit.c:1166
7083 msgid "You are in the middle of a merge -- cannot amend."
7084 msgstr "您正处于一个合并过程中 -- 无法修补提交。"
7086 #: builtin/commit.c:1168
7087 msgid "You are in the middle of a cherry-pick -- cannot amend."
7088 msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
7090 #: builtin/commit.c:1171
7091 msgid "Options --squash and --fixup cannot be used together"
7092 msgstr "选项 --squash 和 --fixup 不能同时使用"
7094 #: builtin/commit.c:1181
7095 msgid "Only one of -c/-C/-F/--fixup can be used."
7096 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
7098 #: builtin/commit.c:1183
7099 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
7100 msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
7102 #: builtin/commit.c:1191
7103 msgid "--reset-author can be used only with -C, -c or --amend."
7104 msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
7106 #: builtin/commit.c:1208
7107 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
7108 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
7110 #: builtin/commit.c:1210
7111 msgid "No paths with --include/--only does not make sense."
7112 msgstr "参数 --include/--only 不跟路径没有意义。"
7114 #: builtin/commit.c:1212
7115 msgid "Explicit paths specified without -i or -o; assuming --only paths..."
7116 msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..."
7118 #: builtin/commit.c:1224 builtin/tag.c:551
7120 msgid "Invalid cleanup mode %s"
7123 #: builtin/commit.c:1229
7124 msgid "Paths with -a does not make sense."
7125 msgstr "路径和 -a 选项同时使用没有意义。"
7127 #: builtin/commit.c:1339 builtin/commit.c:1612
7128 msgid "show status concisely"
7131 #: builtin/commit.c:1341 builtin/commit.c:1614
7132 msgid "show branch information"
7135 #: builtin/commit.c:1343
7139 #: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525
7140 #: builtin/worktree.c:443
7141 msgid "machine-readable output"
7144 #: builtin/commit.c:1346 builtin/commit.c:1618
7145 msgid "show status in long format (default)"
7146 msgstr "以长格式显示状态(默认)"
7148 #: builtin/commit.c:1349 builtin/commit.c:1621
7149 msgid "terminate entries with NUL"
7150 msgstr "条目以 NUL 字符结尾"
7152 #: builtin/commit.c:1351 builtin/commit.c:1624 builtin/fast-export.c:981
7153 #: builtin/fast-export.c:984 builtin/tag.c:411
7157 #: builtin/commit.c:1352 builtin/commit.c:1624
7158 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
7159 msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
7161 #: builtin/commit.c:1355
7162 msgid "show ignored files"
7165 #: builtin/commit.c:1356 parse-options.h:155
7169 #: builtin/commit.c:1357
7171 "ignore changes to submodules, optional when: all, dirty, untracked. "
7174 "忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
7176 #: builtin/commit.c:1359
7177 msgid "list untracked files in columns"
7178 msgstr "以列的方式显示未跟踪的文件"
7180 #: builtin/commit.c:1435
7181 msgid "couldn't look up newly created commit"
7184 #: builtin/commit.c:1437
7185 msgid "could not parse newly created commit"
7188 #: builtin/commit.c:1482
7189 msgid "detached HEAD"
7192 # 译者:中文字符串拼接,可删除前导空格
7193 #: builtin/commit.c:1485
7194 msgid " (root-commit)"
7197 #: builtin/commit.c:1582
7198 msgid "suppress summary after successful commit"
7199 msgstr "提交成功后不显示概述信息"
7201 #: builtin/commit.c:1583
7202 msgid "show diff in commit message template"
7203 msgstr "在提交说明模板里显示差异"
7205 #: builtin/commit.c:1585
7206 msgid "Commit message options"
7209 #: builtin/commit.c:1586 builtin/tag.c:409
7210 msgid "read message from file"
7213 #: builtin/commit.c:1587
7217 #: builtin/commit.c:1587
7218 msgid "override author for commit"
7221 #: builtin/commit.c:1588 builtin/gc.c:353
7225 #: builtin/commit.c:1588
7226 msgid "override date for commit"
7229 #: builtin/commit.c:1589 builtin/merge.c:221 builtin/notes.c:398
7230 #: builtin/notes.c:561 builtin/tag.c:407
7234 #: builtin/commit.c:1589
7235 msgid "commit message"
7238 #: builtin/commit.c:1590 builtin/commit.c:1591 builtin/commit.c:1592
7239 #: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:77
7243 #: builtin/commit.c:1590
7244 msgid "reuse and edit message from specified commit"
7245 msgstr "重用并编辑指定提交的提交说明"
7247 #: builtin/commit.c:1591
7248 msgid "reuse message from specified commit"
7249 msgstr "重用指定提交的提交说明"
7251 #: builtin/commit.c:1592
7252 msgid "use autosquash formatted message to fixup specified commit"
7253 msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
7255 #: builtin/commit.c:1593
7256 msgid "use autosquash formatted message to squash specified commit"
7257 msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
7259 #: builtin/commit.c:1594
7260 msgid "the commit is authored by me now (used with -C/-c/--amend)"
7261 msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
7263 #: builtin/commit.c:1595 builtin/log.c:1420 builtin/revert.c:104
7264 msgid "add Signed-off-by:"
7265 msgstr "添加 Signed-off-by: 签名"
7267 #: builtin/commit.c:1596
7268 msgid "use specified template file"
7271 #: builtin/commit.c:1597
7272 msgid "force edit of commit"
7275 # 译者:可选值,不能翻译(或是原文中笔误,应为 mode)
7276 #: builtin/commit.c:1598
7280 #: builtin/commit.c:1598 builtin/tag.c:412
7281 msgid "how to strip spaces and #comments from message"
7282 msgstr "设置如何删除提交说明里的空格和#注释"
7284 #: builtin/commit.c:1599
7285 msgid "include status in commit message template"
7286 msgstr "在提交说明模板里包含状态信息"
7288 #: builtin/commit.c:1601 builtin/merge.c:233 builtin/pull.c:166
7289 #: builtin/revert.c:112
7290 msgid "GPG sign commit"
7293 #: builtin/commit.c:1604
7294 msgid "Commit contents options"
7297 #: builtin/commit.c:1605
7298 msgid "commit all changed files"
7301 #: builtin/commit.c:1606
7302 msgid "add specified files to index for commit"
7303 msgstr "添加指定的文件到索引区等待提交"
7305 #: builtin/commit.c:1607
7306 msgid "interactively add files"
7309 #: builtin/commit.c:1608
7310 msgid "interactively add changes"
7313 #: builtin/commit.c:1609
7314 msgid "commit only specified files"
7317 #: builtin/commit.c:1610
7318 msgid "bypass pre-commit and commit-msg hooks"
7319 msgstr "绕过 pre-commit 和 commit-msg 钩子"
7321 #: builtin/commit.c:1611
7322 msgid "show what would be committed"
7325 #: builtin/commit.c:1622
7326 msgid "amend previous commit"
7329 #: builtin/commit.c:1623
7330 msgid "bypass post-rewrite hook"
7331 msgstr "绕过 post-rewrite 钩子"
7333 #: builtin/commit.c:1628
7334 msgid "ok to record an empty change"
7337 #: builtin/commit.c:1630
7338 msgid "ok to record a change with an empty message"
7341 #: builtin/commit.c:1659
7342 msgid "could not parse HEAD commit"
7343 msgstr "不能解析 HEAD 提交"
7345 #: builtin/commit.c:1707
7347 msgid "Corrupt MERGE_HEAD file (%s)"
7348 msgstr "损坏的 MERGE_HEAD 文件(%s)"
7350 #: builtin/commit.c:1714
7351 msgid "could not read MERGE_MODE"
7352 msgstr "不能读取 MERGE_MODE"
7354 #: builtin/commit.c:1733
7356 msgid "could not read commit message: %s"
7357 msgstr "不能读取提交说明:%s"
7359 #: builtin/commit.c:1744
7361 msgid "Aborting commit; you did not edit the message.\n"
7362 msgstr "终止提交;您未更改来自模版的提交说明。\n"
7364 #: builtin/commit.c:1749
7366 msgid "Aborting commit due to empty commit message.\n"
7367 msgstr "终止提交因为提交说明为空。\n"
7369 #: builtin/commit.c:1797
7371 "Repository has been updated, but unable to write\n"
7372 "new_index file. Check that disk is not full and quota is\n"
7373 "not exceeded, and then \"git reset HEAD\" to recover."
7375 "仓库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
7376 "或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
7378 #: builtin/config.c:9
7379 msgid "git config [<options>]"
7380 msgstr "git config [<选项>]"
7382 #: builtin/config.c:55
7383 msgid "Config file location"
7386 #: builtin/config.c:56
7387 msgid "use global config file"
7390 #: builtin/config.c:57
7391 msgid "use system config file"
7394 #: builtin/config.c:58
7395 msgid "use repository config file"
7398 #: builtin/config.c:59
7399 msgid "use given config file"
7402 #: builtin/config.c:60
7406 #: builtin/config.c:60
7407 msgid "read config from given blob object"
7408 msgstr "从给定的数据对象读取配置"
7410 #: builtin/config.c:61
7414 #: builtin/config.c:62
7415 msgid "get value: name [value-regex]"
7416 msgstr "获取值:name [value-regex]"
7418 #: builtin/config.c:63
7419 msgid "get all values: key [value-regex]"
7420 msgstr "获得所有的值:key [value-regex]"
7422 #: builtin/config.c:64
7423 msgid "get values for regexp: name-regex [value-regex]"
7424 msgstr "根据正则表达式获得值:name-regex [value-regex]"
7426 #: builtin/config.c:65
7427 msgid "get value specific for the URL: section[.var] URL"
7428 msgstr "获得 URL 取值:section[.var] URL"
7430 #: builtin/config.c:66
7431 msgid "replace all matching variables: name value [value_regex]"
7432 msgstr "替换所有匹配的变量:name value [value_regex]"
7434 #: builtin/config.c:67
7435 msgid "add a new variable: name value"
7436 msgstr "添加一个新的变量:name value"
7438 #: builtin/config.c:68
7439 msgid "remove a variable: name [value-regex]"
7440 msgstr "删除一个变量:name [value-regex]"
7442 #: builtin/config.c:69
7443 msgid "remove all matches: name [value-regex]"
7444 msgstr "删除所有匹配项:name [value-regex]"
7446 #: builtin/config.c:70
7447 msgid "rename section: old-name new-name"
7448 msgstr "重命名小节:old-name new-name"
7450 #: builtin/config.c:71
7451 msgid "remove a section: name"
7452 msgstr "删除一个小节:name"
7454 #: builtin/config.c:72
7458 #: builtin/config.c:73
7459 msgid "open an editor"
7462 #: builtin/config.c:74
7463 msgid "find the color configured: slot [default]"
7464 msgstr "获得配置的颜色:配置 [默认]"
7466 #: builtin/config.c:75
7467 msgid "find the color setting: slot [stdout-is-tty]"
7468 msgstr "获得颜色设置:配置 [stdout-is-tty]"
7470 #: builtin/config.c:76
7474 #: builtin/config.c:77
7475 msgid "value is \"true\" or \"false\""
7476 msgstr "值是 \"true\" 或 \"false\""
7478 #: builtin/config.c:78
7479 msgid "value is decimal number"
7482 #: builtin/config.c:79
7483 msgid "value is --bool or --int"
7484 msgstr "值是 --bool or --int"
7486 #: builtin/config.c:80
7487 msgid "value is a path (file or directory name)"
7488 msgstr "值是一个路径(文件或目录名)"
7490 #: builtin/config.c:81
7494 #: builtin/config.c:82
7495 msgid "terminate values with NUL byte"
7496 msgstr "终止值是 NUL 字节"
7498 #: builtin/config.c:83
7499 msgid "show variable names only"
7502 #: builtin/config.c:84
7503 msgid "respect include directives on lookup"
7504 msgstr "查询时参照 include 指令递归查找"
7506 #: builtin/config.c:85
7507 msgid "show origin of config (file, standard input, blob, command line)"
7508 msgstr "显示配置的来源(文件、标准输入、数据对象,或命令行)"
7510 #: builtin/config.c:327
7511 msgid "unable to parse default color value"
7514 #: builtin/config.c:471
7517 "# This is Git's per-user configuration file.\n"
7519 "# Please adapt and uncomment the following lines:\n"
7523 "# This is Git's per-user configuration file.\n"
7525 "# Please adapt and uncomment the following lines:\n"
7529 #: builtin/config.c:611
7531 msgid "cannot create configuration file %s"
7532 msgstr "不能创建配置文件 %s"
7534 #: builtin/config.c:623
7537 "cannot overwrite multiple values with a single value\n"
7538 " Use a regexp, --add or --replace-all to change %s."
7541 " 使用一个正则表达式、--add 或 --replace-all 来修改 %s。"
7543 #: builtin/count-objects.c:86
7544 msgid "git count-objects [-v] [-H | --human-readable]"
7545 msgstr "git count-objects [-v] [-H | --human-readable]"
7547 #: builtin/count-objects.c:96
7548 msgid "print sizes in human readable format"
7549 msgstr "以用户可读的格式显示大小"
7551 #: builtin/describe.c:18
7552 msgid "git describe [<options>] [<commit-ish>...]"
7553 msgstr "git describe [<选项>] [<提交号>...]"
7555 #: builtin/describe.c:19
7556 msgid "git describe [<options>] --dirty"
7557 msgstr "git describe [<选项>] --dirty"
7559 #: builtin/describe.c:53
7563 #: builtin/describe.c:53
7567 #: builtin/describe.c:53
7571 #: builtin/describe.c:250
7573 msgid "annotated tag %s not available"
7576 #: builtin/describe.c:254
7578 msgid "annotated tag %s has no embedded name"
7579 msgstr "附注标签 %s 没有嵌入名称"
7581 #: builtin/describe.c:256
7583 msgid "tag '%s' is really '%s' here"
7584 msgstr "标签 '%s' 的确是在 '%s'"
7586 #: builtin/describe.c:283 builtin/log.c:487
7588 msgid "Not a valid object name %s"
7589 msgstr "不是一个有效的对象名 %s"
7591 #: builtin/describe.c:286
7593 msgid "%s is not a valid '%s' object"
7594 msgstr "%s 不是一个有效的 '%s' 对象"
7596 #: builtin/describe.c:303
7598 msgid "no tag exactly matches '%s'"
7599 msgstr "没有标签准确匹配 '%s'"
7601 #: builtin/describe.c:305
7603 msgid "searching to describe %s\n"
7606 #: builtin/describe.c:352
7608 msgid "finished search at %s\n"
7611 #: builtin/describe.c:379
7614 "No annotated tags can describe '%s'.\n"
7615 "However, there were unannotated tags: try --tags."
7618 "然而,存在未附注标签:尝试 --tags。"
7620 #: builtin/describe.c:383
7623 "No tags can describe '%s'.\n"
7624 "Try --always, or create some tags."
7627 "尝试 --always,或者创建一些标签。"
7629 #: builtin/describe.c:413
7631 msgid "traversed %lu commits\n"
7632 msgstr "已遍历 %lu 个提交\n"
7634 #: builtin/describe.c:416
7637 "more than %i tags found; listed %i most recent\n"
7638 "gave up search at %s\n"
7640 "发现多于 %i 个标签,列出最近的 %i 个\n"
7643 #: builtin/describe.c:438
7644 msgid "find the tag that comes after the commit"
7647 #: builtin/describe.c:439
7648 msgid "debug search strategy on stderr"
7649 msgstr "在标准错误上调试搜索策略"
7651 #: builtin/describe.c:440
7655 #: builtin/describe.c:441
7656 msgid "use any tag, even unannotated"
7657 msgstr "使用任意标签,即使未附带注释"
7659 #: builtin/describe.c:442
7660 msgid "always use long format"
7663 #: builtin/describe.c:443
7664 msgid "only follow first parent"
7667 #: builtin/describe.c:446
7668 msgid "only output exact matches"
7671 #: builtin/describe.c:448
7672 msgid "consider <n> most recent tags (default: 10)"
7673 msgstr "考虑最近 <n> 个标签(默认:10)"
7675 #: builtin/describe.c:450
7676 msgid "only consider tags matching <pattern>"
7677 msgstr "只考虑匹配 <模式> 的标签"
7679 #: builtin/describe.c:452
7680 msgid "do not consider tags matching <pattern>"
7681 msgstr "不考虑匹配 <模式> 的标签"
7683 #: builtin/describe.c:454 builtin/name-rev.c:357
7684 msgid "show abbreviated commit object as fallback"
7685 msgstr "显示简写的提交号作为后备"
7687 #: builtin/describe.c:455 builtin/describe.c:458
7691 #: builtin/describe.c:456
7692 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
7693 msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")"
7695 #: builtin/describe.c:459
7696 msgid "append <mark> on broken working tree (default: \"-broken\")"
7697 msgstr "对于损坏的工作区,追加 <标记>(默认:\"-broken\")"
7699 #: builtin/describe.c:477
7700 msgid "--long is incompatible with --abbrev=0"
7701 msgstr "--long 与 --abbrev=0 不兼容"
7703 #: builtin/describe.c:506
7704 msgid "No names found, cannot describe anything."
7705 msgstr "没有发现名称,无法描述任何东西。"
7707 #: builtin/describe.c:549
7708 msgid "--dirty is incompatible with commit-ishes"
7709 msgstr "--dirty 与提交号不兼容"
7711 #: builtin/describe.c:551
7712 msgid "--broken is incompatible with commit-ishes"
7713 msgstr "--broken 与提交号不兼容"
7715 #: builtin/diff.c:83
7717 msgid "'%s': not a regular file or symlink"
7718 msgstr "'%s':不是一个正规文件或符号链接"
7720 #: builtin/diff.c:234
7722 msgid "invalid option: %s"
7725 #: builtin/diff.c:358
7726 msgid "Not a git repository"
7727 msgstr "不是一个 git 仓库"
7729 #: builtin/diff.c:401
7731 msgid "invalid object '%s' given."
7732 msgstr "提供了无效对象 '%s'。"
7734 #: builtin/diff.c:410
7736 msgid "more than two blobs given: '%s'"
7737 msgstr "提供了超过两个数据对象:'%s'"
7739 #: builtin/diff.c:417
7741 msgid "unhandled object '%s' given."
7742 msgstr "无法处理的对象 '%s'。"
7744 #: builtin/difftool.c:28
7745 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
7746 msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]"
7748 #: builtin/difftool.c:241
7753 #: builtin/difftool.c:283
7755 msgid "could not read symlink %s"
7756 msgstr "无法读取符号链接 %s"
7758 #: builtin/difftool.c:285
7760 msgid "could not read symlink file %s"
7761 msgstr "无法读取符号链接文件 %s"
7763 #: builtin/difftool.c:293
7765 msgid "could not read object %s for symlink %s"
7766 msgstr "无法读取符号链接 %2$s 指向的对象 %1$s"
7768 #: builtin/difftool.c:395
7770 "combined diff formats('-c' and '--cc') are not supported in\n"
7771 "directory diff mode('-d' and '--dir-diff')."
7773 "不支持在目录比较模式('-d' 和 '--dir-diff')中采用组合差异格式('-c' 和 '--"
7776 #: builtin/difftool.c:609
7778 msgid "both files modified: '%s' and '%s'."
7779 msgstr "两个文件都被修改:'%s' 和 '%s'。"
7781 #: builtin/difftool.c:611
7782 msgid "working tree file has been left."
7783 msgstr "工作区文件被留了下来。"
7785 #: builtin/difftool.c:622
7787 msgid "temporary files exist in '%s'."
7788 msgstr "临时文件存在于 '%s'。"
7790 #: builtin/difftool.c:623
7791 msgid "you may want to cleanup or recover these."
7792 msgstr "您可能想要清理或者恢复它们。"
7794 #: builtin/difftool.c:669
7795 msgid "use `diff.guitool` instead of `diff.tool`"
7796 msgstr "使用 `diff.guitool` 代替 `diff.tool`"
7798 #: builtin/difftool.c:671
7799 msgid "perform a full-directory diff"
7800 msgstr "执行一个全目录差异比较"
7802 #: builtin/difftool.c:673
7803 msgid "do not prompt before launching a diff tool"
7804 msgstr "启动差异比较工具之前不提示"
7806 #: builtin/difftool.c:679
7807 msgid "use symlinks in dir-diff mode"
7808 msgstr "在 dir-diff 模式中使用符号链接"
7810 #: builtin/difftool.c:680
7814 #: builtin/difftool.c:681
7815 msgid "use the specified diff tool"
7816 msgstr "使用指定的差异比较工具"
7818 #: builtin/difftool.c:683
7819 msgid "print a list of diff tools that may be used with `--tool`"
7820 msgstr "显示可以用在 `--tool` 参数后的差异工具列表"
7822 #: builtin/difftool.c:686
7824 "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
7826 msgstr "当执行 diff 工具返回非零退出码时,使 'git-difftool' 退出"
7828 #: builtin/difftool.c:688
7832 #: builtin/difftool.c:689
7833 msgid "specify a custom command for viewing diffs"
7834 msgstr "指定一个用于查看差异的自定义命令"
7836 #: builtin/difftool.c:713
7837 msgid "no <tool> given for --tool=<tool>"
7838 msgstr "没有为 --tool=<工具> 参数提供 <工具>"
7840 #: builtin/difftool.c:720
7841 msgid "no <cmd> given for --extcmd=<cmd>"
7842 msgstr "没有为 --extcmd=<命令> 参数提供 <命令>"
7844 #: builtin/fast-export.c:25
7845 msgid "git fast-export [rev-list-opts]"
7846 msgstr "git fast-export [rev-list-opts]"
7848 #: builtin/fast-export.c:980
7849 msgid "show progress after <n> objects"
7850 msgstr "在 <n> 个对象之后显示进度"
7852 #: builtin/fast-export.c:982
7853 msgid "select handling of signed tags"
7856 #: builtin/fast-export.c:985
7857 msgid "select handling of tags that tag filtered objects"
7858 msgstr "选择当标签指向被过滤对象时该标签的处理方式"
7860 #: builtin/fast-export.c:988
7861 msgid "Dump marks to this file"
7864 #: builtin/fast-export.c:990
7865 msgid "Import marks from this file"
7868 #: builtin/fast-export.c:992
7869 msgid "Fake a tagger when tags lack one"
7870 msgstr "当标签缺少标记者字段时,假装提供一个"
7872 #: builtin/fast-export.c:994
7873 msgid "Output full tree for each commit"
7876 #: builtin/fast-export.c:996
7877 msgid "Use the done feature to terminate the stream"
7878 msgstr "使用 done 功能来终止流"
7880 #: builtin/fast-export.c:997
7881 msgid "Skip output of blob data"
7884 #: builtin/fast-export.c:998
7888 #: builtin/fast-export.c:999
7889 msgid "Apply refspec to exported refs"
7890 msgstr "对导出的引用应用引用规格"
7892 #: builtin/fast-export.c:1000
7893 msgid "anonymize output"
7896 #: builtin/fetch.c:21
7897 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
7898 msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
7900 #: builtin/fetch.c:22
7901 msgid "git fetch [<options>] <group>"
7902 msgstr "git fetch [<选项>] <组>"
7904 #: builtin/fetch.c:23
7905 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
7906 msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
7908 #: builtin/fetch.c:24
7909 msgid "git fetch --all [<options>]"
7910 msgstr "git fetch --all [<选项>]"
7912 #: builtin/fetch.c:95 builtin/pull.c:175
7913 msgid "fetch from all remotes"
7916 #: builtin/fetch.c:97 builtin/pull.c:178
7917 msgid "append to .git/FETCH_HEAD instead of overwriting"
7918 msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
7920 #: builtin/fetch.c:99 builtin/pull.c:181
7921 msgid "path to upload pack on remote end"
7924 #: builtin/fetch.c:100 builtin/pull.c:183
7925 msgid "force overwrite of local branch"
7928 #: builtin/fetch.c:102
7929 msgid "fetch from multiple remotes"
7932 #: builtin/fetch.c:104 builtin/pull.c:185
7933 msgid "fetch all tags and associated objects"
7934 msgstr "抓取所有的标签和关联对象"
7936 #: builtin/fetch.c:106
7937 msgid "do not fetch all tags (--no-tags)"
7938 msgstr "不抓取任何标签(--no-tags)"
7940 #: builtin/fetch.c:108
7941 msgid "number of submodules fetched in parallel"
7944 #: builtin/fetch.c:110 builtin/pull.c:188
7945 msgid "prune remote-tracking branches no longer on remote"
7946 msgstr "清除远程已经不存在的分支的跟踪分支"
7949 #: builtin/fetch.c:111 builtin/pull.c:191
7953 #: builtin/fetch.c:112 builtin/pull.c:192
7954 msgid "control recursive fetching of submodules"
7957 #: builtin/fetch.c:116 builtin/pull.c:200
7958 msgid "keep downloaded pack"
7961 #: builtin/fetch.c:118
7962 msgid "allow updating of HEAD ref"
7963 msgstr "允许更新 HEAD 引用"
7965 #: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203
7966 msgid "deepen history of shallow clone"
7969 #: builtin/fetch.c:123
7970 msgid "deepen history of shallow repository based on time"
7971 msgstr "基于时间来深化浅克隆的历史"
7973 #: builtin/fetch.c:129 builtin/pull.c:206
7974 msgid "convert to a complete repository"
7977 #: builtin/fetch.c:131 builtin/log.c:1440
7981 #: builtin/fetch.c:132
7982 msgid "prepend this to submodule path output"
7983 msgstr "在子模组路径输出的前面加上此目录"
7985 #: builtin/fetch.c:135
7986 msgid "default mode for recursion"
7989 #: builtin/fetch.c:137 builtin/pull.c:209
7990 msgid "accept refs that update .git/shallow"
7991 msgstr "接受更新 .git/shallow 的引用"
7993 #: builtin/fetch.c:138 builtin/pull.c:211
7997 #: builtin/fetch.c:139 builtin/pull.c:212
7998 msgid "specify fetch refmap"
7999 msgstr "指定获取操作的引用映射"
8001 #: builtin/fetch.c:395
8002 msgid "Couldn't find remote ref HEAD"
8003 msgstr "无法发现远程 HEAD 引用"
8005 #: builtin/fetch.c:513
8007 msgid "configuration fetch.output contains invalid value %s"
8008 msgstr "配置变量 fetch.output 包含无效值 %s"
8010 #: builtin/fetch.c:606
8012 msgid "object %s not found"
8015 #: builtin/fetch.c:610
8016 msgid "[up to date]"
8019 #: builtin/fetch.c:623 builtin/fetch.c:703
8023 #: builtin/fetch.c:624
8024 msgid "can't fetch in current branch"
8025 msgstr "当前分支下不能执行获取操作"
8027 #: builtin/fetch.c:633
8028 msgid "[tag update]"
8031 #: builtin/fetch.c:634 builtin/fetch.c:667 builtin/fetch.c:683
8032 #: builtin/fetch.c:698
8033 msgid "unable to update local ref"
8036 #: builtin/fetch.c:653
8040 #: builtin/fetch.c:656
8041 msgid "[new branch]"
8044 #: builtin/fetch.c:659
8048 #: builtin/fetch.c:698
8049 msgid "forced update"
8052 #: builtin/fetch.c:703
8053 msgid "non-fast-forward"
8056 #: builtin/fetch.c:748
8058 msgid "%s did not send all necessary objects\n"
8059 msgstr "%s 未发送所有必须的对象\n"
8061 #: builtin/fetch.c:768
8063 msgid "reject %s because shallow roots are not allowed to be updated"
8064 msgstr "拒绝 %s 因为浅克隆不允许被更新"
8066 #: builtin/fetch.c:855 builtin/fetch.c:951
8071 #: builtin/fetch.c:866
8074 "some local refs could not be updated; try running\n"
8075 " 'git remote prune %s' to remove any old, conflicting branches"
8077 "一些本地引用不能被更新;尝试运行\n"
8078 " 'git remote prune %s' 来删除旧的、有冲突的分支"
8081 #: builtin/fetch.c:921
8083 msgid " (%s will become dangling)"
8084 msgstr " (%s 将成为摇摆状态)"
8087 #: builtin/fetch.c:922
8089 msgid " (%s has become dangling)"
8090 msgstr " (%s 已成为摇摆状态)"
8092 #: builtin/fetch.c:954
8096 #: builtin/fetch.c:955 builtin/remote.c:1022
8100 #: builtin/fetch.c:978
8102 msgid "Refusing to fetch into current branch %s of non-bare repository"
8103 msgstr "拒绝获取到非纯仓库的当前分支 %s"
8105 #: builtin/fetch.c:997
8107 msgid "Option \"%s\" value \"%s\" is not valid for %s"
8108 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
8110 #: builtin/fetch.c:1000
8112 msgid "Option \"%s\" is ignored for %s\n"
8113 msgstr "选项 \"%s\" 为 %s 所忽略\n"
8115 #: builtin/fetch.c:1076
8117 msgid "Don't know how to fetch from %s"
8118 msgstr "不知道如何从 %s 获取"
8120 #: builtin/fetch.c:1236
8122 msgid "Fetching %s\n"
8125 #: builtin/fetch.c:1238 builtin/remote.c:96
8127 msgid "Could not fetch %s"
8130 #: builtin/fetch.c:1256
8132 "No remote repository specified. Please, specify either a URL or a\n"
8133 "remote name from which new revisions should be fetched."
8134 msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。"
8136 #: builtin/fetch.c:1279
8137 msgid "You need to specify a tag name."
8138 msgstr "您需要指定一个标签名称。"
8140 #: builtin/fetch.c:1321
8141 msgid "Negative depth in --deepen is not supported"
8142 msgstr "--deepen 不支持负数深度"
8144 #: builtin/fetch.c:1323
8145 msgid "--deepen and --depth are mutually exclusive"
8146 msgstr "--deepen 和 --depth 是互斥的"
8148 #: builtin/fetch.c:1328
8149 msgid "--depth and --unshallow cannot be used together"
8150 msgstr "--depth 和 --unshallow 不能同时使用"
8152 #: builtin/fetch.c:1330
8153 msgid "--unshallow on a complete repository does not make sense"
8154 msgstr "对于一个完整的仓库,参数 --unshallow 没有意义"
8156 #: builtin/fetch.c:1352
8157 msgid "fetch --all does not take a repository argument"
8158 msgstr "fetch --all 不能带一个仓库参数"
8160 #: builtin/fetch.c:1354
8161 msgid "fetch --all does not make sense with refspecs"
8162 msgstr "fetch --all 带引用规格没有任何意义"
8164 #: builtin/fetch.c:1365
8166 msgid "No such remote or remote group: %s"
8167 msgstr "没有这样的远程或远程组:%s"
8169 #: builtin/fetch.c:1373
8170 msgid "Fetching a group and specifying refspecs does not make sense"
8171 msgstr "获取组并指定引用规格没有意义"
8173 #: builtin/fmt-merge-msg.c:14
8175 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
8176 msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
8178 #: builtin/fmt-merge-msg.c:663
8179 msgid "populate log with at most <n> entries from shortlog"
8180 msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
8182 #: builtin/fmt-merge-msg.c:666
8183 msgid "alias for --log (deprecated)"
8184 msgstr "参数 --log 的别名(已弃用)"
8186 #: builtin/fmt-merge-msg.c:669
8190 #: builtin/fmt-merge-msg.c:670
8191 msgid "use <text> as start of message"
8192 msgstr "使用 <文本> 作为提交说明的开始"
8194 #: builtin/fmt-merge-msg.c:671
8195 msgid "file to read from"
8198 #: builtin/for-each-ref.c:9
8199 msgid "git for-each-ref [<options>] [<pattern>]"
8200 msgstr "git for-each-ref [<选项>] [<模式>]"
8202 #: builtin/for-each-ref.c:10
8203 msgid "git for-each-ref [--points-at <object>]"
8204 msgstr "git for-each-ref [--points-at <对象>]"
8206 #: builtin/for-each-ref.c:11
8207 msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
8208 msgstr "git for-each-ref [(--merged | --no-merged) [<提交>]]"
8210 #: builtin/for-each-ref.c:12
8211 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
8212 msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]"
8214 #: builtin/for-each-ref.c:27
8215 msgid "quote placeholders suitably for shells"
8216 msgstr "引用占位符适用于 shells"
8218 #: builtin/for-each-ref.c:29
8219 msgid "quote placeholders suitably for perl"
8220 msgstr "引用占位符适用于 perl"
8222 #: builtin/for-each-ref.c:31
8223 msgid "quote placeholders suitably for python"
8224 msgstr "引用占位符适用于 python"
8226 #: builtin/for-each-ref.c:33
8227 msgid "quote placeholders suitably for Tcl"
8228 msgstr "引用占位符适用于 Tcl"
8230 #: builtin/for-each-ref.c:36
8231 msgid "show only <n> matched refs"
8232 msgstr "只显示 <n> 个匹配的引用"
8234 #: builtin/for-each-ref.c:41
8235 msgid "print only refs which points at the given object"
8236 msgstr "只打印指向给定对象的引用"
8238 #: builtin/for-each-ref.c:43
8239 msgid "print only refs that are merged"
8242 #: builtin/for-each-ref.c:44
8243 msgid "print only refs that are not merged"
8246 #: builtin/for-each-ref.c:45
8247 msgid "print only refs which contain the commit"
8248 msgstr "只打印包含该提交的引用"
8250 #: builtin/for-each-ref.c:46
8251 msgid "print only refs which don't contain the commit"
8252 msgstr "只打印不包含该提交的引用"
8254 #: builtin/fsck.c:554
8255 msgid "Checking object directories"
8258 #: builtin/fsck.c:646
8259 msgid "git fsck [<options>] [<object>...]"
8260 msgstr "git fsck [<选项>] [<对象>...]"
8262 #: builtin/fsck.c:652
8263 msgid "show unreachable objects"
8266 #: builtin/fsck.c:653
8267 msgid "show dangling objects"
8270 #: builtin/fsck.c:654
8274 #: builtin/fsck.c:655
8275 msgid "report root nodes"
8278 #: builtin/fsck.c:656
8279 msgid "make index objects head nodes"
8280 msgstr "将索引亦作为检查的头节点"
8282 #: builtin/fsck.c:657
8283 msgid "make reflogs head nodes (default)"
8284 msgstr "将引用日志作为检查的头节点(默认)"
8286 #: builtin/fsck.c:658
8287 msgid "also consider packs and alternate objects"
8290 #: builtin/fsck.c:659
8291 msgid "check only connectivity"
8294 #: builtin/fsck.c:660
8295 msgid "enable more strict checking"
8298 #: builtin/fsck.c:662
8299 msgid "write dangling objects in .git/lost-found"
8300 msgstr "将摇摆对象写入 .git/lost-found 中"
8302 #: builtin/fsck.c:663 builtin/prune.c:107
8303 msgid "show progress"
8306 #: builtin/fsck.c:664
8307 msgid "show verbose names for reachable objects"
8308 msgstr "显示可达对象的详细名称"
8310 #: builtin/fsck.c:725
8311 msgid "Checking objects"
8315 msgid "git gc [<options>]"
8316 msgstr "git gc [<选项>]"
8320 msgid "Failed to fstat %s: %s"
8321 msgstr "无法获取 %s 状态:%s"
8325 msgid "Can't stat %s"
8331 "The last gc run reported the following. Please correct the root cause\n"
8333 "Automatic cleanup will not be performed until the file is removed.\n"
8337 "最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n"
8338 "在该文件被删除之前,自动清理将不会执行。\n"
8343 msgid "prune unreferenced objects"
8347 msgid "be more thorough (increased runtime)"
8348 msgstr "更彻底(增加运行时间)"
8351 msgid "enable auto-gc mode"
8355 msgid "force running gc even if there may be another gc running"
8356 msgstr "强制执行 gc 即使另外一个 gc 正在执行"
8360 msgid "Failed to parse gc.logexpiry value %s"
8361 msgstr "无法解析 gc.logexpiry 的值 %s"
8365 msgid "Auto packing the repository in background for optimum performance.\n"
8366 msgstr "自动在后台执行仓库打包以求最佳性能。\n"
8370 msgid "Auto packing the repository for optimum performance.\n"
8371 msgstr "自动打包仓库以求最佳性能。\n"
8375 msgid "See \"git help gc\" for manual housekeeping.\n"
8376 msgstr "手工维护参见 \"git help gc\"。\n"
8381 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
8383 "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>(如果不是,使用 --force)"
8387 "There are too many unreachable loose objects; run 'git prune' to remove them."
8388 msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
8390 #: builtin/grep.c:25
8391 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
8392 msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
8394 #: builtin/grep.c:232
8396 msgid "grep: failed to create thread: %s"
8397 msgstr "grep:无法创建线程:%s"
8399 #: builtin/grep.c:290
8401 msgid "invalid number of threads specified (%d) for %s"
8402 msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
8404 #: builtin/grep.c:769 builtin/grep.c:810
8406 msgid "unable to read tree (%s)"
8409 #: builtin/grep.c:829
8411 msgid "unable to grep from object of type %s"
8412 msgstr "无法抓取来自于 %s 类型的对象"
8414 #: builtin/grep.c:893
8416 msgid "switch `%c' expects a numerical value"
8417 msgstr "开关 `%c' 期望一个数字值"
8419 #: builtin/grep.c:980
8420 msgid "search in index instead of in the work tree"
8421 msgstr "在索引区搜索而不是在工作区"
8423 #: builtin/grep.c:982
8424 msgid "find in contents not managed by git"
8425 msgstr "在未被 git 管理的内容中查找"
8427 # 译者:中文字符串拼接,可删除前导空格
8428 #: builtin/grep.c:984
8429 msgid "search in both tracked and untracked files"
8430 msgstr "在跟踪和未跟踪的文件中搜索"
8432 #: builtin/grep.c:986
8433 msgid "ignore files specified via '.gitignore'"
8434 msgstr "忽略 '.gitignore' 包含的文件"
8436 #: builtin/grep.c:988
8437 msgid "recursively search in each submodule"
8438 msgstr "在每一个子模组中递归搜索"
8440 #: builtin/grep.c:990
8444 #: builtin/grep.c:991
8445 msgid "prepend parent project's basename to output"
8446 msgstr "在输出中以父项目的基本名为前缀"
8448 #: builtin/grep.c:994
8449 msgid "show non-matching lines"
8452 #: builtin/grep.c:996
8453 msgid "case insensitive matching"
8456 #: builtin/grep.c:998
8457 msgid "match patterns only at word boundaries"
8460 #: builtin/grep.c:1000
8461 msgid "process binary files as text"
8462 msgstr "把二进制文件当做文本处理"
8464 #: builtin/grep.c:1002
8465 msgid "don't match patterns in binary files"
8466 msgstr "不在二进制文件中匹配模式"
8468 #: builtin/grep.c:1005
8469 msgid "process binary files with textconv filters"
8470 msgstr "用 textconv 过滤器处理二进制文件"
8472 #: builtin/grep.c:1007
8473 msgid "descend at most <depth> levels"
8474 msgstr "最多以指定的深度向下寻找"
8476 #: builtin/grep.c:1011
8477 msgid "use extended POSIX regular expressions"
8478 msgstr "使用扩展的 POSIX 正则表达式"
8480 #: builtin/grep.c:1014
8481 msgid "use basic POSIX regular expressions (default)"
8482 msgstr "使用基本的 POSIX 正则表达式(默认)"
8484 #: builtin/grep.c:1017
8485 msgid "interpret patterns as fixed strings"
8486 msgstr "把模式解析为固定的字符串"
8488 #: builtin/grep.c:1020
8489 msgid "use Perl-compatible regular expressions"
8490 msgstr "使用 Perl 兼容的正则表达式"
8492 #: builtin/grep.c:1023
8493 msgid "show line numbers"
8496 #: builtin/grep.c:1024
8497 msgid "don't show filenames"
8500 #: builtin/grep.c:1025
8501 msgid "show filenames"
8504 #: builtin/grep.c:1027
8505 msgid "show filenames relative to top directory"
8506 msgstr "显示相对于顶级目录的文件名"
8508 #: builtin/grep.c:1029
8509 msgid "show only filenames instead of matching lines"
8510 msgstr "只显示文件名而不显示匹配的行"
8512 #: builtin/grep.c:1031
8513 msgid "synonym for --files-with-matches"
8514 msgstr "和 --files-with-matches 同义"
8516 #: builtin/grep.c:1034
8517 msgid "show only the names of files without match"
8520 #: builtin/grep.c:1036
8521 msgid "print NUL after filenames"
8522 msgstr "在文件名后输出 NUL 字符"
8524 #: builtin/grep.c:1038
8525 msgid "show the number of matches instead of matching lines"
8526 msgstr "显示总匹配行数,而不显示匹配的行"
8528 #: builtin/grep.c:1039
8529 msgid "highlight matches"
8532 #: builtin/grep.c:1041
8533 msgid "print empty line between matches from different files"
8534 msgstr "在不同文件的匹配项之间打印空行"
8536 #: builtin/grep.c:1043
8537 msgid "show filename only once above matches from same file"
8538 msgstr "只在同一文件的匹配项的上面显示一次文件名"
8540 #: builtin/grep.c:1046
8541 msgid "show <n> context lines before and after matches"
8542 msgstr "显示匹配项前后的 <n> 行上下文"
8544 #: builtin/grep.c:1049
8545 msgid "show <n> context lines before matches"
8546 msgstr "显示匹配项前 <n> 行上下文"
8548 #: builtin/grep.c:1051
8549 msgid "show <n> context lines after matches"
8550 msgstr "显示匹配项后 <n> 行上下文"
8552 #: builtin/grep.c:1053
8553 msgid "use <n> worker threads"
8554 msgstr "使用 <n> 个工作线程"
8556 #: builtin/grep.c:1054
8557 msgid "shortcut for -C NUM"
8560 #: builtin/grep.c:1057
8561 msgid "show a line with the function name before matches"
8562 msgstr "在匹配的前面显示一行函数名"
8564 #: builtin/grep.c:1059
8565 msgid "show the surrounding function"
8566 msgstr "显示所在函数的前后内容"
8568 #: builtin/grep.c:1062
8569 msgid "read patterns from file"
8572 #: builtin/grep.c:1064
8573 msgid "match <pattern>"
8576 #: builtin/grep.c:1066
8577 msgid "combine patterns specified with -e"
8578 msgstr "组合用 -e 参数设定的模式"
8580 #: builtin/grep.c:1078
8581 msgid "indicate hit with exit status without output"
8582 msgstr "不输出,而用退出码标识命中状态"
8584 #: builtin/grep.c:1080
8585 msgid "show only matches from files that match all patterns"
8586 msgstr "只显示匹配所有模式的文件中的匹配"
8588 #: builtin/grep.c:1082
8589 msgid "show parse tree for grep expression"
8590 msgstr "显示 grep 表达式的解析树"
8592 #: builtin/grep.c:1086
8596 #: builtin/grep.c:1086
8597 msgid "show matching files in the pager"
8600 #: builtin/grep.c:1089
8601 msgid "allow calling of grep(1) (ignored by this build)"
8602 msgstr "允许调用 grep(1)(本次构建忽略)"
8604 #: builtin/grep.c:1153
8605 msgid "no pattern given."
8608 #: builtin/grep.c:1189
8609 msgid "--no-index or --untracked cannot be used with revs"
8610 msgstr "--no-index 或 --untracked 不能和版本同时使用"
8612 #: builtin/grep.c:1195
8614 msgid "unable to resolve revision: %s"
8617 #: builtin/grep.c:1228 builtin/index-pack.c:1485
8619 msgid "invalid number of threads specified (%d)"
8620 msgstr "指定的线程数无效(%d)"
8622 #: builtin/grep.c:1251
8623 msgid "--open-files-in-pager only works on the worktree"
8624 msgstr "--open-files-in-pager 仅用于工作区"
8626 #: builtin/grep.c:1274
8627 msgid "option not supported with --recurse-submodules."
8628 msgstr "选项不支持和 --recurse-submodules 共用。"
8630 #: builtin/grep.c:1280
8631 msgid "--cached or --untracked cannot be used with --no-index."
8632 msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
8634 #: builtin/grep.c:1286
8635 msgid "--[no-]exclude-standard cannot be used for tracked contents."
8636 msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
8638 #: builtin/grep.c:1294
8639 msgid "both --cached and trees are given."
8640 msgstr "同时给出了 --cached 和树对象。"
8642 #: builtin/hash-object.c:81
8644 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
8647 "git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
8650 #: builtin/hash-object.c:82
8651 msgid "git hash-object --stdin-paths"
8652 msgstr "git hash-object --stdin-paths"
8654 #: builtin/hash-object.c:94
8658 #: builtin/hash-object.c:94
8662 #: builtin/hash-object.c:95
8663 msgid "write the object into the object database"
8666 #: builtin/hash-object.c:97
8667 msgid "read the object from stdin"
8670 #: builtin/hash-object.c:99
8671 msgid "store file as is without filters"
8672 msgstr "原样存储文件不使用过滤器"
8674 #: builtin/hash-object.c:100
8676 "just hash any random garbage to create corrupt objects for debugging Git"
8677 msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
8679 #: builtin/hash-object.c:101
8680 msgid "process file as it were from this path"
8681 msgstr "处理文件并假设其来自于此路径"
8683 #: builtin/help.c:42
8684 msgid "print all available commands"
8687 #: builtin/help.c:43
8688 msgid "exclude guides"
8691 #: builtin/help.c:44
8692 msgid "print list of useful guides"
8695 #: builtin/help.c:45
8696 msgid "show man page"
8699 #: builtin/help.c:46
8700 msgid "show manual in web browser"
8701 msgstr "在 web 浏览器中显示手册"
8703 #: builtin/help.c:48
8704 msgid "show info page"
8707 #: builtin/help.c:54
8708 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
8709 msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
8711 #: builtin/help.c:66
8713 msgid "unrecognized help format '%s'"
8714 msgstr "未能识别的帮助格式 '%s'"
8716 #: builtin/help.c:93
8717 msgid "Failed to start emacsclient."
8718 msgstr "无法启动 emacsclient。"
8720 #: builtin/help.c:106
8721 msgid "Failed to parse emacsclient version."
8722 msgstr "无法解析 emacsclient 版本。"
8724 #: builtin/help.c:114
8726 msgid "emacsclient version '%d' too old (< 22)."
8727 msgstr "emacsclient 版本 '%d' 太老(< 22)。"
8729 #: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170
8731 msgid "failed to exec '%s'"
8734 #: builtin/help.c:207
8737 "'%s': path for unsupported man viewer.\n"
8738 "Please consider using 'man.<tool>.cmd' instead."
8740 "'%s':不支持的 man 手册查看器的路径。\n"
8741 "请使用 'man.<工具>.cmd'。"
8743 #: builtin/help.c:219
8746 "'%s': cmd for supported man viewer.\n"
8747 "Please consider using 'man.<tool>.path' instead."
8749 "'%s': 支持的 man 手册查看器命令。\n"
8750 "请使用 'man.<工具>.path'。"
8752 #: builtin/help.c:336
8754 msgid "'%s': unknown man viewer."
8755 msgstr "'%s':未知的 man 查看器。"
8757 #: builtin/help.c:353
8758 msgid "no man viewer handled the request"
8759 msgstr "没有 man 查看器处理此请求"
8761 #: builtin/help.c:361
8762 msgid "no info viewer handled the request"
8763 msgstr "没有 info 查看器处理此请求"
8765 #: builtin/help.c:403
8766 msgid "Defining attributes per path"
8769 #: builtin/help.c:404
8770 msgid "Everyday Git With 20 Commands Or So"
8771 msgstr "每一天 Git 常用的约 20 条命令"
8773 #: builtin/help.c:405
8774 msgid "A Git glossary"
8777 #: builtin/help.c:406
8778 msgid "Specifies intentionally untracked files to ignore"
8781 #: builtin/help.c:407
8782 msgid "Defining submodule properties"
8785 #: builtin/help.c:408
8786 msgid "Specifying revisions and ranges for Git"
8787 msgstr "指定 Git 的版本和版本范围"
8789 #: builtin/help.c:409
8790 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
8791 msgstr "一个 Git 教程(针对 1.5.1 或更新版本)"
8793 #: builtin/help.c:410
8794 msgid "An overview of recommended workflows with Git"
8795 msgstr "Git 推荐的工作流概览"
8797 #: builtin/help.c:422
8798 msgid "The common Git guides are:\n"
8799 msgstr "最常用的 Git 向导有:\n"
8801 #: builtin/help.c:440
8803 msgid "`git %s' is aliased to `%s'"
8804 msgstr "`git %s' 是 `%s' 的别名"
8806 #: builtin/help.c:462 builtin/help.c:479
8811 #: builtin/index-pack.c:154
8813 msgid "unable to open %s"
8816 #: builtin/index-pack.c:204
8818 msgid "object type mismatch at %s"
8819 msgstr "%s 的对象类型不匹配"
8821 #: builtin/index-pack.c:224
8823 msgid "did not receive expected object %s"
8824 msgstr "未能获取预期的对象 %s"
8826 #: builtin/index-pack.c:227
8828 msgid "object %s: expected type %s, found %s"
8829 msgstr "对象 %s:应为类型 %s,却是 %s"
8831 #: builtin/index-pack.c:269
8833 msgid "cannot fill %d byte"
8834 msgid_plural "cannot fill %d bytes"
8835 msgstr[0] "无法填充 %d 字节"
8836 msgstr[1] "无法填充 %d 字节"
8838 #: builtin/index-pack.c:279
8840 msgstr "过早的文件结束符(EOF)"
8842 #: builtin/index-pack.c:280
8843 msgid "read error on input"
8846 #: builtin/index-pack.c:292
8847 msgid "used more bytes than were available"
8850 #: builtin/index-pack.c:299
8851 msgid "pack too large for current definition of off_t"
8852 msgstr "包太大超过了当前 off_t 的定义"
8854 #: builtin/index-pack.c:302 builtin/unpack-objects.c:92
8855 msgid "pack exceeds maximum allowed size"
8858 #: builtin/index-pack.c:317
8860 msgid "unable to create '%s'"
8863 #: builtin/index-pack.c:323
8865 msgid "cannot open packfile '%s'"
8866 msgstr "无法打开包文件 '%s'"
8868 #: builtin/index-pack.c:337
8869 msgid "pack signature mismatch"
8872 #: builtin/index-pack.c:339
8874 msgid "pack version %<PRIu32> unsupported"
8875 msgstr "不支持包版本 %<PRIu32>"
8877 #: builtin/index-pack.c:357
8879 msgid "pack has bad object at offset %<PRIuMAX>: %s"
8880 msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>:%s"
8882 #: builtin/index-pack.c:479
8884 msgid "inflate returned %d"
8887 #: builtin/index-pack.c:528
8888 msgid "offset value overflow for delta base object"
8889 msgstr "偏移值覆盖了 delta 基准对象"
8891 #: builtin/index-pack.c:536
8892 msgid "delta base offset is out of bound"
8893 msgstr "delta 基准偏移越界"
8895 #: builtin/index-pack.c:544
8897 msgid "unknown object type %d"
8900 #: builtin/index-pack.c:575
8901 msgid "cannot pread pack file"
8904 #: builtin/index-pack.c:577
8906 msgid "premature end of pack file, %<PRIuMAX> byte missing"
8907 msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
8908 msgstr[0] "包文件过早结束,缺少 %<PRIuMAX> 字节"
8909 msgstr[1] "包文件过早结束,缺少 %<PRIuMAX> 字节"
8911 #: builtin/index-pack.c:603
8912 msgid "serious inflate inconsistency"
8915 #: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
8916 #: builtin/index-pack.c:816 builtin/index-pack.c:825
8918 msgid "SHA1 COLLISION FOUND WITH %s !"
8919 msgstr "发现 %s 出现 SHA1 冲突!"
8921 #: builtin/index-pack.c:752 builtin/pack-objects.c:164
8922 #: builtin/pack-objects.c:257
8924 msgid "unable to read %s"
8927 #: builtin/index-pack.c:814
8929 msgid "cannot read existing object info %s"
8930 msgstr "不能读取现存对象信息 %s"
8932 #: builtin/index-pack.c:822
8934 msgid "cannot read existing object %s"
8935 msgstr "不能读取现存对象 %s"
8937 #: builtin/index-pack.c:836
8939 msgid "invalid blob object %s"
8942 #: builtin/index-pack.c:850
8947 #: builtin/index-pack.c:853
8948 msgid "Error in object"
8951 #: builtin/index-pack.c:855
8953 msgid "Not all child objects of %s are reachable"
8954 msgstr "%s 的所有子对象并非都可达"
8956 #: builtin/index-pack.c:927 builtin/index-pack.c:958
8957 msgid "failed to apply delta"
8960 #: builtin/index-pack.c:1128
8961 msgid "Receiving objects"
8964 #: builtin/index-pack.c:1128
8965 msgid "Indexing objects"
8968 #: builtin/index-pack.c:1160
8969 msgid "pack is corrupted (SHA1 mismatch)"
8970 msgstr "包冲突(SHA1 不匹配)"
8972 #: builtin/index-pack.c:1165
8973 msgid "cannot fstat packfile"
8976 #: builtin/index-pack.c:1168
8977 msgid "pack has junk at the end"
8980 #: builtin/index-pack.c:1179
8981 msgid "confusion beyond insanity in parse_pack_objects()"
8982 msgstr "parse_pack_objects() 中遇到不可理喻的问题"
8984 #: builtin/index-pack.c:1202
8985 msgid "Resolving deltas"
8988 #: builtin/index-pack.c:1213
8990 msgid "unable to create thread: %s"
8993 #: builtin/index-pack.c:1255
8994 msgid "confusion beyond insanity"
8997 #: builtin/index-pack.c:1261
8999 msgid "completed with %d local object"
9000 msgid_plural "completed with %d local objects"
9001 msgstr[0] "完成 %d 个本地对象"
9002 msgstr[1] "完成 %d 个本地对象"
9004 #: builtin/index-pack.c:1273
9006 msgid "Unexpected tail checksum for %s (disk corruption?)"
9007 msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
9009 #: builtin/index-pack.c:1277
9011 msgid "pack has %d unresolved delta"
9012 msgid_plural "pack has %d unresolved deltas"
9013 msgstr[0] "包有 %d 个未解决的 delta"
9014 msgstr[1] "包有 %d 个未解决的 delta"
9016 #: builtin/index-pack.c:1301
9018 msgid "unable to deflate appended object (%d)"
9019 msgstr "不能压缩附加对象(%d)"
9021 #: builtin/index-pack.c:1377
9023 msgid "local object %s is corrupt"
9024 msgstr "本地对象 %s 已损坏"
9026 #: builtin/index-pack.c:1403
9027 msgid "error while closing pack file"
9030 #: builtin/index-pack.c:1415
9032 msgid "cannot write keep file '%s'"
9033 msgstr "无法写保留文件 '%s'"
9035 #: builtin/index-pack.c:1423
9037 msgid "cannot close written keep file '%s'"
9038 msgstr "无法关闭保留文件 '%s'"
9040 #: builtin/index-pack.c:1433
9041 msgid "cannot store pack file"
9044 #: builtin/index-pack.c:1441
9045 msgid "cannot store index file"
9048 #: builtin/index-pack.c:1479
9050 msgid "bad pack.indexversion=%<PRIu32>"
9051 msgstr "坏的 pack.indexversion=%<PRIu32>"
9053 #: builtin/index-pack.c:1489 builtin/index-pack.c:1686
9055 msgid "no threads support, ignoring %s"
9056 msgstr "没有线程支持,忽略 %s"
9058 #: builtin/index-pack.c:1547
9060 msgid "Cannot open existing pack file '%s'"
9061 msgstr "无法打开现存包文件 '%s'"
9063 #: builtin/index-pack.c:1549
9065 msgid "Cannot open existing pack idx file for '%s'"
9066 msgstr "无法为 %s 打开包索引文件"
9068 #: builtin/index-pack.c:1596
9070 msgid "non delta: %d object"
9071 msgid_plural "non delta: %d objects"
9072 msgstr[0] "非 delta:%d 个对象"
9073 msgstr[1] "非 delta:%d 个对象"
9075 #: builtin/index-pack.c:1603
9077 msgid "chain length = %d: %lu object"
9078 msgid_plural "chain length = %d: %lu objects"
9079 msgstr[0] "链长 = %d: %lu 对象"
9080 msgstr[1] "链长 = %d: %lu 对象"
9082 #: builtin/index-pack.c:1616
9084 msgid "packfile name '%s' does not end with '.pack'"
9085 msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
9087 #: builtin/index-pack.c:1698 builtin/index-pack.c:1701
9088 #: builtin/index-pack.c:1717 builtin/index-pack.c:1721
9093 #: builtin/index-pack.c:1737
9094 msgid "--fix-thin cannot be used without --stdin"
9095 msgstr "--fix-thin 不能和 --stdin 同时使用"
9097 #: builtin/index-pack.c:1739
9098 msgid "--stdin requires a git repository"
9099 msgstr "--stdin 需要一个 git 仓库"
9101 #: builtin/index-pack.c:1747
9102 msgid "--verify with no packfile name given"
9103 msgstr "--verify 没有提供包文件名参数"
9105 #: builtin/init-db.c:54
9107 msgid "cannot stat '%s'"
9108 msgstr "不能枚举 '%s' 状态"
9110 #: builtin/init-db.c:60
9112 msgid "cannot stat template '%s'"
9113 msgstr "不能枚举模版 '%s' 状态"
9115 #: builtin/init-db.c:65
9117 msgid "cannot opendir '%s'"
9118 msgstr "不能打开目录 '%s'"
9120 #: builtin/init-db.c:76
9122 msgid "cannot readlink '%s'"
9123 msgstr "不能读取链接 '%s'"
9125 #: builtin/init-db.c:78
9127 msgid "cannot symlink '%s' '%s'"
9128 msgstr "不能自 '%s' 到 '%s' 创建符号链接"
9130 #: builtin/init-db.c:84
9132 msgid "cannot copy '%s' to '%s'"
9133 msgstr "不能拷贝 '%s' 至 '%s'"
9135 #: builtin/init-db.c:88
9137 msgid "ignoring template %s"
9140 #: builtin/init-db.c:119
9142 msgid "templates not found %s"
9145 #: builtin/init-db.c:134
9147 msgid "not copying templates from '%s': %s"
9148 msgstr "没有从 '%s' 复制模版:%s"
9150 #: builtin/init-db.c:327
9152 msgid "unable to handle file type %d"
9153 msgstr "不能处理 %d 类型的文件"
9155 #: builtin/init-db.c:330
9157 msgid "unable to move %s to %s"
9158 msgstr "不能移动 %s 至 %s"
9160 #: builtin/init-db.c:347 builtin/init-db.c:350
9162 msgid "%s already exists"
9165 #: builtin/init-db.c:403
9167 msgid "Reinitialized existing shared Git repository in %s%s\n"
9168 msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n"
9170 #: builtin/init-db.c:404
9172 msgid "Reinitialized existing Git repository in %s%s\n"
9173 msgstr "重新初始化已存在的 Git 仓库于 %s%s\n"
9175 #: builtin/init-db.c:408
9177 msgid "Initialized empty shared Git repository in %s%s\n"
9178 msgstr "已初始化空的共享 Git 仓库于 %s%s\n"
9180 #: builtin/init-db.c:409
9182 msgid "Initialized empty Git repository in %s%s\n"
9183 msgstr "已初始化空的 Git 仓库于 %s%s\n"
9185 #: builtin/init-db.c:457
9187 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
9188 "shared[=<permissions>]] [<directory>]"
9190 "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
9193 #: builtin/init-db.c:480
9197 #: builtin/init-db.c:481
9198 msgid "specify that the git repository is to be shared amongst several users"
9199 msgstr "指定 git 仓库是多个用户之间共享的"
9201 #: builtin/init-db.c:515 builtin/init-db.c:520
9203 msgid "cannot mkdir %s"
9206 #: builtin/init-db.c:524
9208 msgid "cannot chdir to %s"
9211 #: builtin/init-db.c:545
9214 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
9216 msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)"
9218 #: builtin/init-db.c:573
9220 msgid "Cannot access work tree '%s'"
9221 msgstr "不能访问工作区 '%s'"
9223 #: builtin/interpret-trailers.c:15
9225 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
9226 "<token>[(=|:)<value>])...] [<file>...]"
9228 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值"
9231 #: builtin/interpret-trailers.c:26
9232 msgid "edit files in place"
9235 #: builtin/interpret-trailers.c:27
9236 msgid "trim empty trailers"
9239 #: builtin/interpret-trailers.c:28
9243 #: builtin/interpret-trailers.c:29
9244 msgid "trailer(s) to add"
9247 #: builtin/interpret-trailers.c:42
9248 msgid "no input file given for in-place editing"
9249 msgstr "没有给出要原位编辑的文件"
9252 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
9253 msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
9256 msgid "git show [<options>] <object>..."
9257 msgstr "git show [<选项>] <对象>..."
9261 msgid "invalid --decorate option: %s"
9262 msgstr "无效的 --decorate 选项:%s"
9264 #: builtin/log.c:144
9265 msgid "suppress diff output"
9268 #: builtin/log.c:145
9272 #: builtin/log.c:146
9273 msgid "Use mail map file"
9276 #: builtin/log.c:147
9277 msgid "decorate options"
9280 #: builtin/log.c:150
9281 msgid "Process line range n,m in file, counting from 1"
9282 msgstr "处理文件中第 n 到 m 之间的行,从 1 开始"
9284 #: builtin/log.c:246
9286 msgid "Final output: %d %s\n"
9287 msgstr "最终输出:%d %s\n"
9289 #: builtin/log.c:493
9291 msgid "git show %s: bad file"
9292 msgstr "git show %s: 损坏的文件"
9294 #: builtin/log.c:507 builtin/log.c:601
9296 msgid "Could not read object %s"
9299 #: builtin/log.c:625
9301 msgid "Unknown type: %d"
9304 #: builtin/log.c:746
9305 msgid "format.headers without value"
9306 msgstr "format.headers 没有值"
9308 #: builtin/log.c:846
9309 msgid "name of output directory is too long"
9312 #: builtin/log.c:861
9314 msgid "Cannot open patch file %s"
9315 msgstr "无法打开补丁文件 %s"
9317 #: builtin/log.c:875
9318 msgid "Need exactly one range."
9321 #: builtin/log.c:885
9322 msgid "Not a range."
9325 #: builtin/log.c:991
9326 msgid "Cover letter needs email format"
9329 #: builtin/log.c:1071
9331 msgid "insane in-reply-to: %s"
9332 msgstr "不正常的 in-reply-to:%s"
9334 #: builtin/log.c:1098
9335 msgid "git format-patch [<options>] [<since> | <revision-range>]"
9336 msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
9338 #: builtin/log.c:1148
9339 msgid "Two output directories?"
9342 #: builtin/log.c:1255 builtin/log.c:1898 builtin/log.c:1900 builtin/log.c:1912
9344 msgid "Unknown commit %s"
9347 #: builtin/log.c:1265 builtin/notes.c:883 builtin/tag.c:532
9349 msgid "Failed to resolve '%s' as a valid ref."
9350 msgstr "无法解析 '%s' 为一个有效引用。"
9352 #: builtin/log.c:1270
9353 msgid "Could not find exact merge base."
9354 msgstr "不能找到准确的合并基线。"
9356 #: builtin/log.c:1274
9358 "Failed to get upstream, if you want to record base commit automatically,\n"
9359 "please use git branch --set-upstream-to to track a remote branch.\n"
9360 "Or you could specify base commit by --base=<base-commit-id> manually."
9362 "无法得到上游地址,如果你想自动记录基线提交,请使用命令\n"
9363 "git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n"
9364 "参数 --base=<base-commit-id> 手动指定一个基线提交。"
9366 #: builtin/log.c:1294
9367 msgid "Failed to find exact merge base"
9368 msgstr "无法找到准确的合并基线"
9370 #: builtin/log.c:1305
9371 msgid "base commit should be the ancestor of revision list"
9372 msgstr "基线提交应该是版本列表的祖先"
9374 #: builtin/log.c:1309
9375 msgid "base commit shouldn't be in revision list"
9376 msgstr "基线提交不应该出现在版本列表中"
9378 #: builtin/log.c:1358
9379 msgid "cannot get patch id"
9382 #: builtin/log.c:1415
9383 msgid "use [PATCH n/m] even with a single patch"
9384 msgstr "使用 [PATCH n/m],即使只有一个补丁"
9386 #: builtin/log.c:1418
9387 msgid "use [PATCH] even with multiple patches"
9388 msgstr "使用 [PATCH],即使有多个补丁"
9390 #: builtin/log.c:1422
9391 msgid "print patches to standard out"
9394 #: builtin/log.c:1424
9395 msgid "generate a cover letter"
9398 #: builtin/log.c:1426
9399 msgid "use simple number sequence for output file names"
9400 msgstr "使用简单的数字序列作为输出文件名"
9402 #: builtin/log.c:1427
9406 #: builtin/log.c:1428
9407 msgid "use <sfx> instead of '.patch'"
9408 msgstr "使用 <后缀> 代替 '.patch'"
9410 #: builtin/log.c:1430
9411 msgid "start numbering patches at <n> instead of 1"
9412 msgstr "补丁以 <n> 开始编号,而不是1"
9414 #: builtin/log.c:1432
9415 msgid "mark the series as Nth re-roll"
9416 msgstr "标记补丁系列是第几次重制"
9418 #: builtin/log.c:1434
9419 msgid "Use [RFC PATCH] instead of [PATCH]"
9420 msgstr "使用 [RFC PATCH] 代替 [PATCH]"
9422 #: builtin/log.c:1437
9423 msgid "Use [<prefix>] instead of [PATCH]"
9424 msgstr "使用 [<前缀>] 代替 [PATCH]"
9426 #: builtin/log.c:1440
9427 msgid "store resulting files in <dir>"
9428 msgstr "把结果文件存储在 <目录>"
9430 #: builtin/log.c:1443
9431 msgid "don't strip/add [PATCH]"
9432 msgstr "不删除/添加 [PATCH]"
9434 #: builtin/log.c:1446
9435 msgid "don't output binary diffs"
9438 #: builtin/log.c:1448
9439 msgid "output all-zero hash in From header"
9440 msgstr "在 From 头信息中输出全为零的哈希值"
9442 #: builtin/log.c:1450
9443 msgid "don't include a patch matching a commit upstream"
9444 msgstr "不包含已在上游提交中的补丁"
9446 #: builtin/log.c:1452
9447 msgid "show patch format instead of default (patch + stat)"
9448 msgstr "显示纯补丁格式而非默认的(补丁+状态)"
9450 #: builtin/log.c:1454
9454 #: builtin/log.c:1455
9458 #: builtin/log.c:1456
9459 msgid "add email header"
9462 #: builtin/log.c:1457 builtin/log.c:1459
9466 #: builtin/log.c:1457
9467 msgid "add To: header"
9470 #: builtin/log.c:1459
9471 msgid "add Cc: header"
9474 #: builtin/log.c:1461
9478 #: builtin/log.c:1462
9479 msgid "set From address to <ident> (or committer ident if absent)"
9480 msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)"
9482 #: builtin/log.c:1464
9486 #: builtin/log.c:1465
9487 msgid "make first mail a reply to <message-id>"
9488 msgstr "使第一封邮件作为对 <邮件标识> 的回复"
9490 #: builtin/log.c:1466 builtin/log.c:1469
9494 #: builtin/log.c:1467
9495 msgid "attach the patch"
9498 #: builtin/log.c:1470
9499 msgid "inline the patch"
9502 #: builtin/log.c:1474
9503 msgid "enable message threading, styles: shallow, deep"
9504 msgstr "启用邮件线索,风格:浅,深"
9506 #: builtin/log.c:1476
9510 #: builtin/log.c:1477
9511 msgid "add a signature"
9514 #: builtin/log.c:1478
9518 #: builtin/log.c:1479
9519 msgid "add prerequisite tree info to the patch series"
9520 msgstr "为补丁列表添加前置树信息"
9522 #: builtin/log.c:1481
9523 msgid "add a signature from a file"
9526 #: builtin/log.c:1482
9527 msgid "don't print the patch filenames"
9530 #: builtin/log.c:1572
9531 msgid "-n and -k are mutually exclusive."
9532 msgstr "-n 和 -k 互斥。"
9534 #: builtin/log.c:1574
9535 msgid "--subject-prefix/--rfc and -k are mutually exclusive."
9536 msgstr "--subject-prefix/--rfc 和 -k 互斥。"
9538 #: builtin/log.c:1582
9539 msgid "--name-only does not make sense"
9540 msgstr "--name-only 无意义"
9542 #: builtin/log.c:1584
9543 msgid "--name-status does not make sense"
9544 msgstr "--name-status 无意义"
9546 #: builtin/log.c:1586
9547 msgid "--check does not make sense"
9548 msgstr "--check 无意义"
9550 #: builtin/log.c:1616
9551 msgid "standard output, or directory, which one?"
9552 msgstr "标准输出或目录,哪一个?"
9554 #: builtin/log.c:1618
9556 msgid "Could not create directory '%s'"
9557 msgstr "不能创建目录 '%s'"
9559 #: builtin/log.c:1712
9561 msgid "unable to read signature file '%s'"
9562 msgstr "无法读取签名文件 '%s'"
9564 #: builtin/log.c:1784
9565 msgid "Failed to create output files"
9568 #: builtin/log.c:1833
9569 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
9570 msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
9572 #: builtin/log.c:1887
9575 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
9576 msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n"
9578 #: builtin/ls-files.c:461
9579 msgid "git ls-files [<options>] [<file>...]"
9580 msgstr "git ls-files [<选项>] [<文件>...]"
9582 #: builtin/ls-files.c:510
9583 msgid "identify the file status with tags"
9586 #: builtin/ls-files.c:512
9587 msgid "use lowercase letters for 'assume unchanged' files"
9588 msgstr "使用小写字母表示 '假设未改变的' 文件"
9590 #: builtin/ls-files.c:514
9591 msgid "show cached files in the output (default)"
9592 msgstr "显示缓存的文件(默认)"
9594 #: builtin/ls-files.c:516
9595 msgid "show deleted files in the output"
9598 #: builtin/ls-files.c:518
9599 msgid "show modified files in the output"
9602 #: builtin/ls-files.c:520
9603 msgid "show other files in the output"
9606 #: builtin/ls-files.c:522
9607 msgid "show ignored files in the output"
9610 #: builtin/ls-files.c:525
9611 msgid "show staged contents' object name in the output"
9612 msgstr "显示暂存区内容的对象名称"
9614 #: builtin/ls-files.c:527
9615 msgid "show files on the filesystem that need to be removed"
9616 msgstr "显示文件系统需要删除的文件"
9618 #: builtin/ls-files.c:529
9619 msgid "show 'other' directories' names only"
9620 msgstr "只显示“其他”目录的名称"
9622 #: builtin/ls-files.c:531
9623 msgid "show line endings of files"
9626 #: builtin/ls-files.c:533
9627 msgid "don't show empty directories"
9630 #: builtin/ls-files.c:536
9631 msgid "show unmerged files in the output"
9634 #: builtin/ls-files.c:538
9635 msgid "show resolve-undo information"
9636 msgstr "显示 resolve-undo 信息"
9638 #: builtin/ls-files.c:540
9639 msgid "skip files matching pattern"
9642 #: builtin/ls-files.c:543
9643 msgid "exclude patterns are read from <file>"
9644 msgstr "从 <文件> 中读取排除模式"
9646 #: builtin/ls-files.c:546
9647 msgid "read additional per-directory exclude patterns in <file>"
9648 msgstr "从 <文件> 读取额外的每个目录的排除模式"
9650 #: builtin/ls-files.c:548
9651 msgid "add the standard git exclusions"
9652 msgstr "添加标准的 git 排除"
9654 #: builtin/ls-files.c:551
9655 msgid "make the output relative to the project top directory"
9656 msgstr "显示相对于顶级目录的文件名"
9658 #: builtin/ls-files.c:554
9659 msgid "recurse through submodules"
9662 #: builtin/ls-files.c:556
9663 msgid "if any <file> is not in the index, treat this as an error"
9664 msgstr "如果任何 <文件> 都不在索引区,视为错误"
9666 #: builtin/ls-files.c:557
9670 #: builtin/ls-files.c:558
9671 msgid "pretend that paths removed since <tree-ish> are still present"
9672 msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
9674 #: builtin/ls-files.c:560
9675 msgid "show debugging data"
9678 #: builtin/ls-remote.c:7
9680 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
9681 " [-q | --quiet] [--exit-code] [--get-url]\n"
9682 " [--symref] [<repository> [<refs>...]]"
9684 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
9685 " [-q | --quiet] [--exit-code] [--get-url]\n"
9686 " [--symref] [<仓库> [<引用>...]]"
9688 #: builtin/ls-remote.c:52
9689 msgid "do not print remote URL"
9692 #: builtin/ls-remote.c:53 builtin/ls-remote.c:55
9696 #: builtin/ls-remote.c:54 builtin/ls-remote.c:56
9697 msgid "path of git-upload-pack on the remote host"
9698 msgstr "远程主机上的 git-upload-pack 路径"
9700 #: builtin/ls-remote.c:58
9701 msgid "limit to tags"
9704 #: builtin/ls-remote.c:59
9705 msgid "limit to heads"
9708 #: builtin/ls-remote.c:60
9709 msgid "do not show peeled tags"
9712 #: builtin/ls-remote.c:62
9713 msgid "take url.<base>.insteadOf into account"
9714 msgstr "参考 url.<base>.insteadOf 设置"
9716 #: builtin/ls-remote.c:64
9717 msgid "exit with exit code 2 if no matching refs are found"
9718 msgstr "若未找到匹配的引用则以退出码2退出"
9720 #: builtin/ls-remote.c:66
9721 msgid "show underlying ref in addition to the object pointed by it"
9722 msgstr "除了显示指向的对象外,显示指向的引用名"
9724 #: builtin/ls-tree.c:28
9725 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
9726 msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
9728 #: builtin/ls-tree.c:126
9729 msgid "only show trees"
9732 #: builtin/ls-tree.c:128
9733 msgid "recurse into subtrees"
9736 #: builtin/ls-tree.c:130
9737 msgid "show trees when recursing"
9740 #: builtin/ls-tree.c:133
9741 msgid "terminate entries with NUL byte"
9742 msgstr "条目以 NUL 字符终止"
9744 #: builtin/ls-tree.c:134
9745 msgid "include object size"
9748 #: builtin/ls-tree.c:136 builtin/ls-tree.c:138
9749 msgid "list only filenames"
9752 #: builtin/ls-tree.c:141
9753 msgid "use full path names"
9756 #: builtin/ls-tree.c:143
9757 msgid "list entire tree; not just current directory (implies --full-name)"
9758 msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
9760 #: builtin/merge.c:46
9761 msgid "git merge [<options>] [<commit>...]"
9762 msgstr "git merge [<选项>] [<提交>...]"
9764 #: builtin/merge.c:47
9765 msgid "git merge --abort"
9766 msgstr "git merge --abort"
9768 #: builtin/merge.c:48
9769 msgid "git merge --continue"
9770 msgstr "git merge --continue"
9772 #: builtin/merge.c:103
9773 msgid "switch `m' requires a value"
9774 msgstr "开关 `m' 需要一个值"
9776 #: builtin/merge.c:140
9778 msgid "Could not find merge strategy '%s'.\n"
9779 msgstr "不能找到合并策略 '%s'。\n"
9781 #: builtin/merge.c:141
9783 msgid "Available strategies are:"
9786 #: builtin/merge.c:146
9788 msgid "Available custom strategies are:"
9791 #: builtin/merge.c:196 builtin/pull.c:127
9792 msgid "do not show a diffstat at the end of the merge"
9793 msgstr "在合并的最后不显示差异统计"
9795 #: builtin/merge.c:199 builtin/pull.c:130
9796 msgid "show a diffstat at the end of the merge"
9797 msgstr "在合并的最后显示差异统计"
9799 #: builtin/merge.c:200 builtin/pull.c:133
9800 msgid "(synonym to --stat)"
9801 msgstr "(和 --stat 同义)"
9803 #: builtin/merge.c:202 builtin/pull.c:136
9804 msgid "add (at most <n>) entries from shortlog to merge commit message"
9805 msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
9807 #: builtin/merge.c:205 builtin/pull.c:139
9808 msgid "create a single commit instead of doing a merge"
9809 msgstr "创建一个单独的提交而不是做一次合并"
9811 #: builtin/merge.c:207 builtin/pull.c:142
9812 msgid "perform a commit if the merge succeeds (default)"
9813 msgstr "如果合并成功,执行一次提交(默认)"
9815 #: builtin/merge.c:209 builtin/pull.c:145
9816 msgid "edit message before committing"
9819 #: builtin/merge.c:210
9820 msgid "allow fast-forward (default)"
9823 #: builtin/merge.c:212 builtin/pull.c:151
9824 msgid "abort if fast-forward is not possible"
9825 msgstr "如果不能快进就放弃合并"
9827 #: builtin/merge.c:216 builtin/pull.c:154
9828 msgid "verify that the named commit has a valid GPG signature"
9829 msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
9831 #: builtin/merge.c:217 builtin/notes.c:773 builtin/pull.c:158
9832 #: builtin/revert.c:108
9836 #: builtin/merge.c:218 builtin/pull.c:159
9837 msgid "merge strategy to use"
9840 #: builtin/merge.c:219 builtin/pull.c:162
9841 msgid "option=value"
9842 msgstr "option=value"
9844 #: builtin/merge.c:220 builtin/pull.c:163
9845 msgid "option for selected merge strategy"
9848 #: builtin/merge.c:222
9849 msgid "merge commit message (for a non-fast-forward merge)"
9850 msgstr "合并的提交说明(针对非快进式合并)"
9852 #: builtin/merge.c:226
9853 msgid "abort the current in-progress merge"
9854 msgstr "放弃当前正在进行的合并"
9856 #: builtin/merge.c:228
9857 msgid "continue the current in-progress merge"
9858 msgstr "继续当前正在进行的合并"
9860 #: builtin/merge.c:230 builtin/pull.c:170
9861 msgid "allow merging unrelated histories"
9864 #: builtin/merge.c:258
9865 msgid "could not run stash."
9868 #: builtin/merge.c:263
9869 msgid "stash failed"
9872 #: builtin/merge.c:268
9874 msgid "not a valid object: %s"
9875 msgstr "不是一个有效对象:%s"
9877 #: builtin/merge.c:287 builtin/merge.c:304
9878 msgid "read-tree failed"
9882 #: builtin/merge.c:334
9883 msgid " (nothing to squash)"
9886 #: builtin/merge.c:345
9888 msgid "Squash commit -- not updating HEAD\n"
9889 msgstr "压缩提交 -- 未更新 HEAD\n"
9891 #: builtin/merge.c:395
9893 msgid "No merge message -- not updating HEAD\n"
9894 msgstr "无合并信息 -- 未更新 HEAD\n"
9896 #: builtin/merge.c:446
9898 msgid "'%s' does not point to a commit"
9899 msgstr "'%s' 没有指向一个提交"
9901 #: builtin/merge.c:536
9903 msgid "Bad branch.%s.mergeoptions string: %s"
9904 msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
9906 #: builtin/merge.c:656
9907 msgid "Not handling anything other than two heads merge."
9908 msgstr "未处理两个头合并之外的任何操作。"
9910 #: builtin/merge.c:670
9912 msgid "Unknown option for merge-recursive: -X%s"
9913 msgstr "merge-recursive 的未知选项:-X%s"
9915 #: builtin/merge.c:685
9917 msgid "unable to write %s"
9920 #: builtin/merge.c:737
9922 msgid "Could not read from '%s'"
9923 msgstr "不能从 '%s' 读取"
9925 #: builtin/merge.c:746
9927 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
9928 msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
9930 #: builtin/merge.c:752
9933 "Please enter a commit message to explain why this merge is necessary,\n"
9934 "especially if it merges an updated upstream into a topic branch.\n"
9936 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
9939 "请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
9942 "以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
9944 #: builtin/merge.c:776
9945 msgid "Empty commit message."
9948 #: builtin/merge.c:796
9950 msgid "Wonderful.\n"
9953 #: builtin/merge.c:851
9955 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
9956 msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
9958 #: builtin/merge.c:890
9959 msgid "No current branch."
9962 #: builtin/merge.c:892
9963 msgid "No remote for the current branch."
9964 msgstr "当前分支没有对应的远程仓库。"
9966 #: builtin/merge.c:894
9967 msgid "No default upstream defined for the current branch."
9968 msgstr "当前分支没有定义默认的上游分支。"
9970 #: builtin/merge.c:899
9972 msgid "No remote-tracking branch for %s from %s"
9973 msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
9975 #: builtin/merge.c:946
9977 msgid "Bad value '%s' in environment '%s'"
9978 msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'"
9980 #: builtin/merge.c:1020
9982 msgid "could not close '%s'"
9985 #: builtin/merge.c:1047
9987 msgid "not something we can merge in %s: %s"
9988 msgstr "不能在 %s 中合并:%s"
9990 #: builtin/merge.c:1081
9991 msgid "not something we can merge"
9994 #: builtin/merge.c:1146
9995 msgid "--abort expects no arguments"
9996 msgstr "--abort 不带参数"
9998 #: builtin/merge.c:1150
9999 msgid "There is no merge to abort (MERGE_HEAD missing)."
10000 msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
10002 #: builtin/merge.c:1162
10003 msgid "--continue expects no arguments"
10004 msgstr "--continue 不带参数"
10006 #: builtin/merge.c:1166
10007 msgid "There is no merge in progress (MERGE_HEAD missing)."
10008 msgstr "没有进行中的合并(MERGE_HEAD 丢失)。"
10010 #: builtin/merge.c:1182
10012 "You have not concluded your merge (MERGE_HEAD exists).\n"
10013 "Please, commit your changes before you merge."
10015 "您尚未结束您的合并(存在 MERGE_HEAD)。\n"
10018 #: builtin/merge.c:1189
10020 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
10021 "Please, commit your changes before you merge."
10023 "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
10026 #: builtin/merge.c:1192
10027 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
10028 msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
10030 #: builtin/merge.c:1201
10031 msgid "You cannot combine --squash with --no-ff."
10032 msgstr "您不能将 --squash 与 --no-ff 同时使用。"
10034 #: builtin/merge.c:1209
10035 msgid "No commit specified and merge.defaultToUpstream not set."
10036 msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
10038 #: builtin/merge.c:1226
10039 msgid "Squash commit into empty head not supported yet"
10040 msgstr "尚不支持到空分支的压缩提交"
10042 #: builtin/merge.c:1228
10043 msgid "Non-fast-forward commit does not make sense into an empty head"
10044 msgstr "到空分支的非快进式提交没有意义"
10046 #: builtin/merge.c:1233
10048 msgid "%s - not something we can merge"
10049 msgstr "%s - 不能被合并"
10051 #: builtin/merge.c:1235
10052 msgid "Can merge only exactly one commit into empty head"
10053 msgstr "只能将一个提交合并到空分支上"
10055 #: builtin/merge.c:1269
10057 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
10058 msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
10060 #: builtin/merge.c:1272
10062 msgid "Commit %s has a bad GPG signature allegedly by %s."
10063 msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
10065 #: builtin/merge.c:1275
10067 msgid "Commit %s does not have a GPG signature."
10068 msgstr "提交 %s 没有一个 GPG 签名。"
10070 #: builtin/merge.c:1278
10072 msgid "Commit %s has a good GPG signature by %s\n"
10073 msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
10075 #: builtin/merge.c:1340
10076 msgid "refusing to merge unrelated histories"
10079 #: builtin/merge.c:1349
10080 msgid "Already up-to-date."
10083 #: builtin/merge.c:1359
10085 msgid "Updating %s..%s\n"
10086 msgstr "更新 %s..%s\n"
10088 #: builtin/merge.c:1400
10090 msgid "Trying really trivial in-index merge...\n"
10091 msgstr "尝试非常小的索引内合并...\n"
10093 #: builtin/merge.c:1407
10098 #: builtin/merge.c:1432
10099 msgid "Already up-to-date. Yeeah!"
10102 #: builtin/merge.c:1438
10103 msgid "Not possible to fast-forward, aborting."
10106 #: builtin/merge.c:1461 builtin/merge.c:1540
10108 msgid "Rewinding the tree to pristine...\n"
10109 msgstr "将树回滚至原始状态...\n"
10111 #: builtin/merge.c:1465
10113 msgid "Trying merge strategy %s...\n"
10114 msgstr "尝试合并策略 %s...\n"
10116 #: builtin/merge.c:1531
10118 msgid "No merge strategy handled the merge.\n"
10119 msgstr "没有合并策略处理此合并。\n"
10121 #: builtin/merge.c:1533
10123 msgid "Merge with strategy %s failed.\n"
10124 msgstr "使用策略 %s 合并失败。\n"
10126 #: builtin/merge.c:1542
10128 msgid "Using the %s to prepare resolving by hand.\n"
10129 msgstr "使用 %s 以准备手工解决。\n"
10131 #: builtin/merge.c:1554
10133 msgid "Automatic merge went well; stopped before committing as requested\n"
10134 msgstr "自动合并进展顺利,按要求在提交前停止\n"
10136 #: builtin/merge-base.c:29
10137 msgid "git merge-base [-a | --all] <commit> <commit>..."
10138 msgstr "git merge-base [-a | --all] <提交> <提交>..."
10140 #: builtin/merge-base.c:30
10141 msgid "git merge-base [-a | --all] --octopus <commit>..."
10142 msgstr "git merge-base [-a | --all] --octopus <提交>..."
10144 #: builtin/merge-base.c:31
10145 msgid "git merge-base --independent <commit>..."
10146 msgstr "git merge-base --independent <提交>..."
10148 #: builtin/merge-base.c:32
10149 msgid "git merge-base --is-ancestor <commit> <commit>"
10150 msgstr "git merge-base --is-ancestor <提交> <提交>"
10152 #: builtin/merge-base.c:33
10153 msgid "git merge-base --fork-point <ref> [<commit>]"
10154 msgstr "git merge-base --fork-point <引用> [<提交>]"
10156 #: builtin/merge-base.c:217
10157 msgid "output all common ancestors"
10160 #: builtin/merge-base.c:219
10161 msgid "find ancestors for a single n-way merge"
10162 msgstr "查找一个多路合并的祖先提交"
10164 #: builtin/merge-base.c:221
10165 msgid "list revs not reachable from others"
10166 msgstr "显示不能被其他访问到的版本"
10168 #: builtin/merge-base.c:223
10169 msgid "is the first one ancestor of the other?"
10170 msgstr "第一个是其他的祖先提交么?"
10172 #: builtin/merge-base.c:225
10173 msgid "find where <commit> forked from reflog of <ref>"
10174 msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处"
10176 #: builtin/merge-file.c:8
10178 "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
10179 "<orig-file> <file2>"
10181 "git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文"
10184 #: builtin/merge-file.c:32
10185 msgid "send results to standard output"
10186 msgstr "将结果发送到标准输出"
10188 #: builtin/merge-file.c:33
10189 msgid "use a diff3 based merge"
10190 msgstr "使用基于 diff3 的合并"
10192 #: builtin/merge-file.c:34
10193 msgid "for conflicts, use our version"
10194 msgstr "如果冲突,使用我们的版本"
10196 #: builtin/merge-file.c:36
10197 msgid "for conflicts, use their version"
10198 msgstr "如果冲突,使用他们的版本"
10200 #: builtin/merge-file.c:38
10201 msgid "for conflicts, use a union version"
10202 msgstr "如果冲突,使用联合版本"
10204 #: builtin/merge-file.c:41
10205 msgid "for conflicts, use this marker size"
10206 msgstr "如果冲突,使用指定长度的标记"
10208 #: builtin/merge-file.c:42
10209 msgid "do not warn about conflicts"
10212 #: builtin/merge-file.c:44
10213 msgid "set labels for file1/orig-file/file2"
10214 msgstr "为 文件1/初始文件/文件2 设置标签"
10216 #: builtin/merge-recursive.c:45
10218 msgid "unknown option %s"
10221 #: builtin/merge-recursive.c:51
10223 msgid "could not parse object '%s'"
10224 msgstr "不能解析对象 '%s'"
10226 #: builtin/merge-recursive.c:55
10228 msgid "cannot handle more than %d base. Ignoring %s."
10229 msgid_plural "cannot handle more than %d bases. Ignoring %s."
10230 msgstr[0] "无法处理 %d 条以上的基线。忽略 %s。"
10231 msgstr[1] "无法处理 %d 条以上的基线。忽略 %s。"
10233 #: builtin/merge-recursive.c:63
10234 msgid "not handling anything other than two heads merge."
10235 msgstr "不能处理两个头合并之外的任何操作。"
10237 #: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
10239 msgid "could not resolve ref '%s'"
10240 msgstr "无法解析引用 '%s'"
10242 #: builtin/merge-recursive.c:77
10244 msgid "Merging %s with %s\n"
10245 msgstr "合并 %s 和 %s\n"
10247 #: builtin/mktree.c:65
10248 msgid "git mktree [-z] [--missing] [--batch]"
10249 msgstr "git mktree [-z] [--missing] [--batch]"
10251 #: builtin/mktree.c:152
10252 msgid "input is NUL terminated"
10253 msgstr "输入以 NUL 字符终止"
10255 #: builtin/mktree.c:153 builtin/write-tree.c:24
10256 msgid "allow missing objects"
10259 #: builtin/mktree.c:154
10260 msgid "allow creation of more than one tree"
10261 msgstr "允许创建一个以上的树"
10264 msgid "git mv [<options>] <source>... <destination>"
10265 msgstr "git mv [<选项>] <源>... <目标>"
10269 msgid "Directory %s is in index and no submodule?"
10270 msgstr "目录 %s 在索引中并且不是子模组?"
10272 #: builtin/mv.c:84 builtin/rm.c:290
10273 msgid "Please stage your changes to .gitmodules or stash them to proceed"
10274 msgstr "请将您的修改暂存到 .gitmodules 中或保存进度后再继续"
10276 #: builtin/mv.c:102
10278 msgid "%.*s is in index"
10281 #: builtin/mv.c:124
10282 msgid "force move/rename even if target exists"
10283 msgstr "强制移动/重命令,即使目标存在"
10285 #: builtin/mv.c:125
10286 msgid "skip move/rename errors"
10287 msgstr "跳过移动/重命名错误"
10289 #: builtin/mv.c:167
10291 msgid "destination '%s' is not a directory"
10292 msgstr "目标 '%s' 不是一个目录"
10294 #: builtin/mv.c:178
10296 msgid "Checking rename of '%s' to '%s'\n"
10297 msgstr "检查 '%s' 到 '%s' 的重命名\n"
10299 #: builtin/mv.c:182
10303 #: builtin/mv.c:185
10304 msgid "can not move directory into itself"
10305 msgstr "不能将目录移动到自身"
10307 #: builtin/mv.c:188
10308 msgid "cannot move directory over file"
10309 msgstr "不能将目录移动到文件"
10311 #: builtin/mv.c:197
10312 msgid "source directory is empty"
10315 #: builtin/mv.c:222
10316 msgid "not under version control"
10319 #: builtin/mv.c:225
10320 msgid "destination exists"
10323 #: builtin/mv.c:233
10325 msgid "overwriting '%s'"
10328 #: builtin/mv.c:236
10329 msgid "Cannot overwrite"
10332 #: builtin/mv.c:239
10333 msgid "multiple sources for the same target"
10336 #: builtin/mv.c:241
10337 msgid "destination directory does not exist"
10340 #: builtin/mv.c:248
10342 msgid "%s, source=%s, destination=%s"
10343 msgstr "%s,源=%s,目标=%s"
10345 #: builtin/mv.c:269
10347 msgid "Renaming %s to %s\n"
10348 msgstr "重命名 %s 至 %s\n"
10350 #: builtin/mv.c:275 builtin/remote.c:710 builtin/repack.c:384
10352 msgid "renaming '%s' failed"
10353 msgstr "重命名 '%s' 失败"
10355 #: builtin/name-rev.c:289
10356 msgid "git name-rev [<options>] <commit>..."
10357 msgstr "git name-rev [<选项>] <提交>..."
10359 #: builtin/name-rev.c:290
10360 msgid "git name-rev [<options>] --all"
10361 msgstr "git name-rev [<选项>] --all"
10363 #: builtin/name-rev.c:291
10364 msgid "git name-rev [<options>] --stdin"
10365 msgstr "git name-rev [<选项>] --stdin"
10367 #: builtin/name-rev.c:346
10368 msgid "print only names (no SHA-1)"
10369 msgstr "只打印名称(无 SHA-1)"
10371 #: builtin/name-rev.c:347
10372 msgid "only use tags to name the commits"
10373 msgstr "只使用标签来命名提交"
10375 #: builtin/name-rev.c:349
10376 msgid "only use refs matching <pattern>"
10377 msgstr "只使用和 <模式> 相匹配的引用"
10379 #: builtin/name-rev.c:351
10380 msgid "ignore refs matching <pattern>"
10381 msgstr "忽略和 <模式> 相匹配的引用"
10383 #: builtin/name-rev.c:353
10384 msgid "list all commits reachable from all refs"
10385 msgstr "列出可以从所有引用访问的提交"
10387 #: builtin/name-rev.c:354
10388 msgid "read from stdin"
10391 #: builtin/name-rev.c:355
10392 msgid "allow to print `undefined` names (default)"
10393 msgstr "允许打印 `未定义` 的名称(默认)"
10395 #: builtin/name-rev.c:361
10396 msgid "dereference tags in the input (internal use)"
10397 msgstr "反向解析输入中的标签(内部使用)"
10399 #: builtin/notes.c:25
10400 msgid "git notes [--ref <notes-ref>] [list [<object>]]"
10401 msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
10403 #: builtin/notes.c:26
10405 "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
10406 "| (-c | -C) <object>] [<object>]"
10408 "git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
10409 "| (-c | -C) <对象>] [<对象>]"
10411 #: builtin/notes.c:27
10412 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
10413 msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
10415 #: builtin/notes.c:28
10417 "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
10418 "(-c | -C) <object>] [<object>]"
10420 "git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
10421 "(-c | -C) <对象>] [<对象>]"
10423 #: builtin/notes.c:29
10424 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
10425 msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
10427 #: builtin/notes.c:30
10428 msgid "git notes [--ref <notes-ref>] show [<object>]"
10429 msgstr "git notes [--ref <注解引用>] show [<对象>]"
10431 #: builtin/notes.c:31
10433 "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
10434 msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
10436 #: builtin/notes.c:32
10437 msgid "git notes merge --commit [-v | -q]"
10438 msgstr "git notes merge --commit [-v | -q]"
10440 #: builtin/notes.c:33
10441 msgid "git notes merge --abort [-v | -q]"
10442 msgstr "git notes merge --abort [-v | -q]"
10444 #: builtin/notes.c:34
10445 msgid "git notes [--ref <notes-ref>] remove [<object>...]"
10446 msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
10448 #: builtin/notes.c:35
10449 msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
10450 msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
10452 #: builtin/notes.c:36
10453 msgid "git notes [--ref <notes-ref>] get-ref"
10454 msgstr "git notes [--ref <注解引用>] get-ref"
10456 #: builtin/notes.c:41
10457 msgid "git notes [list [<object>]]"
10458 msgstr "git notes [list [<对象>]]"
10460 #: builtin/notes.c:46
10461 msgid "git notes add [<options>] [<object>]"
10462 msgstr "git notes add [<选项>] [<对象>]"
10464 #: builtin/notes.c:51
10465 msgid "git notes copy [<options>] <from-object> <to-object>"
10466 msgstr "git notes copy [<选项>] <源对象> <目标对象>"
10468 #: builtin/notes.c:52
10469 msgid "git notes copy --stdin [<from-object> <to-object>]..."
10470 msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
10472 #: builtin/notes.c:57
10473 msgid "git notes append [<options>] [<object>]"
10474 msgstr "git notes append [<选项>] [<对象>]"
10476 #: builtin/notes.c:62
10477 msgid "git notes edit [<object>]"
10478 msgstr "git notes edit [<对象>]"
10480 #: builtin/notes.c:67
10481 msgid "git notes show [<object>]"
10482 msgstr "git notes show [<对象>]"
10484 #: builtin/notes.c:72
10485 msgid "git notes merge [<options>] <notes-ref>"
10486 msgstr "git notes merge [<选项>] <注解引用>"
10488 #: builtin/notes.c:73
10489 msgid "git notes merge --commit [<options>]"
10490 msgstr "git notes merge --commit [<选项>]"
10492 #: builtin/notes.c:74
10493 msgid "git notes merge --abort [<options>]"
10494 msgstr "git notes merge --abort [<选项>]"
10496 #: builtin/notes.c:79
10497 msgid "git notes remove [<object>]"
10498 msgstr "git notes remove [<对象>]"
10500 #: builtin/notes.c:84
10501 msgid "git notes prune [<options>]"
10502 msgstr "git notes prune [<选项>]"
10504 #: builtin/notes.c:89
10505 msgid "git notes get-ref"
10506 msgstr "git notes get-ref"
10508 #: builtin/notes.c:94
10509 msgid "Write/edit the notes for the following object:"
10510 msgstr "为下面的对象写/编辑说明:"
10512 #: builtin/notes.c:147
10514 msgid "unable to start 'show' for object '%s'"
10515 msgstr "不能为对象 '%s' 开始 'show'"
10517 #: builtin/notes.c:151
10518 msgid "could not read 'show' output"
10519 msgstr "不能读取 'show' 的输出"
10521 #: builtin/notes.c:159
10523 msgid "failed to finish 'show' for object '%s'"
10524 msgstr "无法为对象 '%s' 完成 'show'"
10526 #: builtin/notes.c:194
10527 msgid "please supply the note contents using either -m or -F option"
10528 msgstr "请通过 -m 或 -F 选项为注解提供内容"
10530 #: builtin/notes.c:203
10531 msgid "unable to write note object"
10534 #: builtin/notes.c:205
10536 msgid "the note contents have been left in %s"
10537 msgstr "注解内容被留在 %s 中"
10539 #: builtin/notes.c:233 builtin/tag.c:516
10541 msgid "cannot read '%s'"
10544 #: builtin/notes.c:235 builtin/tag.c:519
10546 msgid "could not open or read '%s'"
10547 msgstr "不能打开或读取 '%s'"
10549 #: builtin/notes.c:254 builtin/notes.c:305 builtin/notes.c:307
10550 #: builtin/notes.c:372 builtin/notes.c:427 builtin/notes.c:513
10551 #: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:658
10553 msgid "failed to resolve '%s' as a valid ref."
10554 msgstr "无法解析 '%s' 为一个有效引用。"
10556 #: builtin/notes.c:257
10558 msgid "failed to read object '%s'."
10559 msgstr "无法读取对象 '%s'。"
10561 #: builtin/notes.c:261
10563 msgid "cannot read note data from non-blob object '%s'."
10564 msgstr "不能从非数据对象 '%s' 中读取注解数据。"
10566 #: builtin/notes.c:301
10568 msgid "malformed input line: '%s'."
10569 msgstr "非法的输入行:'%s'。"
10571 #: builtin/notes.c:316
10573 msgid "failed to copy notes from '%s' to '%s'"
10574 msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
10576 #. TRANSLATORS: the first %s will be replaced by a
10577 #. git notes command: 'add', 'merge', 'remove', etc.
10578 #: builtin/notes.c:345
10580 msgid "refusing to %s notes in %s (outside of refs/notes/)"
10581 msgstr "拒绝向 %2$s(在 refs/notes/ 之外)%1$s注解"
10583 #: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496
10584 #: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:651
10585 #: builtin/notes.c:801 builtin/notes.c:948 builtin/notes.c:969
10586 msgid "too many parameters"
10589 #: builtin/notes.c:378 builtin/notes.c:664
10591 msgid "no note found for object %s."
10592 msgstr "未发现对象 %s 的注解。"
10594 #: builtin/notes.c:399 builtin/notes.c:562
10595 msgid "note contents as a string"
10596 msgstr "注解内容作为一个字符串"
10598 #: builtin/notes.c:402 builtin/notes.c:565
10599 msgid "note contents in a file"
10600 msgstr "注解内容到一个文件中"
10602 #: builtin/notes.c:405 builtin/notes.c:568
10603 msgid "reuse and edit specified note object"
10604 msgstr "重用和编辑指定的注解对象"
10606 #: builtin/notes.c:408 builtin/notes.c:571
10607 msgid "reuse specified note object"
10610 #: builtin/notes.c:411 builtin/notes.c:574
10611 msgid "allow storing empty note"
10614 #: builtin/notes.c:412 builtin/notes.c:483
10615 msgid "replace existing notes"
10618 #: builtin/notes.c:437
10621 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
10623 msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
10625 #: builtin/notes.c:452 builtin/notes.c:531
10627 msgid "Overwriting existing notes for object %s\n"
10628 msgstr "覆盖对象 %s 现存注解\n"
10630 #: builtin/notes.c:463 builtin/notes.c:623 builtin/notes.c:888
10632 msgid "Removing note for object %s\n"
10633 msgstr "删除对象 %s 的注解\n"
10635 #: builtin/notes.c:484
10636 msgid "read objects from stdin"
10639 #: builtin/notes.c:486
10640 msgid "load rewriting config for <command> (implies --stdin)"
10641 msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
10643 #: builtin/notes.c:504
10644 msgid "too few parameters"
10647 #: builtin/notes.c:525
10650 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
10652 msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
10654 #: builtin/notes.c:537
10656 msgid "missing notes on source object %s. Cannot copy."
10657 msgstr "源对象 %s 缺少注解。不能拷贝。"
10659 #: builtin/notes.c:589
10662 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
10663 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
10665 "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
10666 "请换用 'git notes add -f -m/-F/-c/-C'。\n"
10668 #: builtin/notes.c:684
10669 msgid "failed to delete ref NOTES_MERGE_PARTIAL"
10670 msgstr "无法删除引用 NOTES_MERGE_PARTIAL"
10672 #: builtin/notes.c:686
10673 msgid "failed to delete ref NOTES_MERGE_REF"
10674 msgstr "无法删除引用 NOTES_MERGE_REF"
10676 #: builtin/notes.c:688
10677 msgid "failed to remove 'git notes merge' worktree"
10678 msgstr "无法删除 'git notes merge' 工作区"
10680 #: builtin/notes.c:708
10681 msgid "failed to read ref NOTES_MERGE_PARTIAL"
10682 msgstr "无法读取引用 NOTES_MERGE_PARTIAL"
10684 #: builtin/notes.c:710
10685 msgid "could not find commit from NOTES_MERGE_PARTIAL."
10686 msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。"
10688 #: builtin/notes.c:712
10689 msgid "could not parse commit from NOTES_MERGE_PARTIAL."
10690 msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。"
10692 #: builtin/notes.c:725
10693 msgid "failed to resolve NOTES_MERGE_REF"
10694 msgstr "无法解析 NOTES_MERGE_REF"
10696 #: builtin/notes.c:728
10697 msgid "failed to finalize notes merge"
10700 #: builtin/notes.c:754
10702 msgid "unknown notes merge strategy %s"
10703 msgstr "未知的注解合并策略 %s"
10705 #: builtin/notes.c:770
10706 msgid "General options"
10709 #: builtin/notes.c:772
10710 msgid "Merge options"
10713 #: builtin/notes.c:774
10715 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
10717 msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
10719 #: builtin/notes.c:776
10720 msgid "Committing unmerged notes"
10723 #: builtin/notes.c:778
10724 msgid "finalize notes merge by committing unmerged notes"
10725 msgstr "通过提交未合并的注解来完成注解合并"
10727 #: builtin/notes.c:780
10728 msgid "Aborting notes merge resolution"
10731 #: builtin/notes.c:782
10732 msgid "abort notes merge"
10735 #: builtin/notes.c:793
10736 msgid "cannot mix --commit, --abort or -s/--strategy"
10737 msgstr "不能混用 --commit、--abort 或 -s/--strategy"
10739 #: builtin/notes.c:798
10740 msgid "must specify a notes ref to merge"
10741 msgstr "必须指定一个注解引用来合并"
10743 #: builtin/notes.c:822
10745 msgid "unknown -s/--strategy: %s"
10746 msgstr "未知的 -s/--strategy:%s"
10748 #: builtin/notes.c:859
10750 msgid "a notes merge into %s is already in-progress at %s"
10751 msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中"
10753 #: builtin/notes.c:862
10755 msgid "failed to store link to current notes ref (%s)"
10756 msgstr "无法存储链接到当前的注解引用(%s)"
10758 #: builtin/notes.c:864
10761 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
10762 "'git notes merge --commit', or abort the merge with 'git notes merge --"
10765 "自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提"
10766 "交结果,或者使用命令 'git notes merge --abort' 终止合并。\n"
10768 #: builtin/notes.c:886
10770 msgid "Object %s has no note\n"
10771 msgstr "对象 %s 没有注解\n"
10773 #: builtin/notes.c:898
10774 msgid "attempt to remove non-existent note is not an error"
10775 msgstr "尝试删除不存在的注解不是一个错误"
10777 #: builtin/notes.c:901
10778 msgid "read object names from the standard input"
10779 msgstr "从标准输入读取对象名称"
10781 #: builtin/notes.c:939 builtin/prune.c:105 builtin/worktree.c:127
10782 msgid "do not remove, show only"
10785 #: builtin/notes.c:940
10786 msgid "report pruned notes"
10789 #: builtin/notes.c:982
10793 #: builtin/notes.c:983
10794 msgid "use notes from <notes-ref>"
10795 msgstr "从 <注解引用> 使用注解"
10797 #: builtin/notes.c:1018
10799 msgid "unknown subcommand: %s"
10802 #: builtin/pack-objects.c:29
10804 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
10805 msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]"
10807 #: builtin/pack-objects.c:30
10809 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
10810 msgstr "git pack-objects [<选项>...] <base-name> [< <引用列表> | < <对象列表>]"
10812 #: builtin/pack-objects.c:177 builtin/pack-objects.c:180
10814 msgid "deflate error (%d)"
10817 #: builtin/pack-objects.c:770
10818 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
10819 msgstr "禁用 bitmap 写入,因为 pack.packSizeLimit 设置使得包被切分为多个"
10821 #: builtin/pack-objects.c:783
10822 msgid "Writing objects"
10825 #: builtin/pack-objects.c:1063
10826 msgid "disabling bitmap writing, as some objects are not being packed"
10827 msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
10829 #: builtin/pack-objects.c:2426
10830 msgid "Compressing objects"
10833 #: builtin/pack-objects.c:2829
10835 msgid "unsupported index version %s"
10836 msgstr "不支持的索引版本 %s"
10838 #: builtin/pack-objects.c:2833
10840 msgid "bad index version '%s'"
10841 msgstr "坏的索引版本 '%s'"
10843 #: builtin/pack-objects.c:2863
10844 msgid "do not show progress meter"
10847 #: builtin/pack-objects.c:2865
10848 msgid "show progress meter"
10851 #: builtin/pack-objects.c:2867
10852 msgid "show progress meter during object writing phase"
10853 msgstr "在对象写入阶段显示进度表"
10855 #: builtin/pack-objects.c:2870
10856 msgid "similar to --all-progress when progress meter is shown"
10857 msgstr "当进度表显示时类似于 --all-progress"
10859 #: builtin/pack-objects.c:2871
10860 msgid "version[,offset]"
10863 #: builtin/pack-objects.c:2872
10864 msgid "write the pack index file in the specified idx format version"
10865 msgstr "用指定的 idx 格式版本来写包索引文件"
10867 #: builtin/pack-objects.c:2875
10868 msgid "maximum size of each output pack file"
10869 msgstr "每个输出包的最大尺寸"
10871 #: builtin/pack-objects.c:2877
10872 msgid "ignore borrowed objects from alternate object store"
10873 msgstr "忽略从备用对象存储里借用对象"
10875 #: builtin/pack-objects.c:2879
10876 msgid "ignore packed objects"
10879 #: builtin/pack-objects.c:2881
10880 msgid "limit pack window by objects"
10881 msgstr "限制打包窗口的对象数"
10883 #: builtin/pack-objects.c:2883
10884 msgid "limit pack window by memory in addition to object limit"
10885 msgstr "除对象数量限制外设置打包窗口的内存限制"
10887 #: builtin/pack-objects.c:2885
10888 msgid "maximum length of delta chain allowed in the resulting pack"
10889 msgstr "打包允许的 delta 链的最大长度"
10891 #: builtin/pack-objects.c:2887
10892 msgid "reuse existing deltas"
10893 msgstr "重用已存在的 deltas"
10895 #: builtin/pack-objects.c:2889
10896 msgid "reuse existing objects"
10899 #: builtin/pack-objects.c:2891
10900 msgid "use OFS_DELTA objects"
10901 msgstr "使用 OFS_DELTA 对象"
10903 #: builtin/pack-objects.c:2893
10904 msgid "use threads when searching for best delta matches"
10905 msgstr "使用线程查询最佳 delta 匹配"
10907 #: builtin/pack-objects.c:2895
10908 msgid "do not create an empty pack output"
10911 #: builtin/pack-objects.c:2897
10912 msgid "read revision arguments from standard input"
10913 msgstr "从标准输入读取版本号参数"
10915 #: builtin/pack-objects.c:2899
10916 msgid "limit the objects to those that are not yet packed"
10917 msgstr "限制那些尚未打包的对象"
10919 #: builtin/pack-objects.c:2902
10920 msgid "include objects reachable from any reference"
10921 msgstr "包括可以从任何引用访问到的对象"
10923 #: builtin/pack-objects.c:2905
10924 msgid "include objects referred by reflog entries"
10925 msgstr "包括被引用日志引用到的对象"
10927 #: builtin/pack-objects.c:2908
10928 msgid "include objects referred to by the index"
10929 msgstr "包括被索引引用到的对象"
10931 #: builtin/pack-objects.c:2911
10932 msgid "output pack to stdout"
10935 #: builtin/pack-objects.c:2913
10936 msgid "include tag objects that refer to objects to be packed"
10937 msgstr "包括那些引用了待打包对象的标签对象"
10939 #: builtin/pack-objects.c:2915
10940 msgid "keep unreachable objects"
10943 #: builtin/pack-objects.c:2917
10944 msgid "pack loose unreachable objects"
10945 msgstr "打包松散的不可达对象"
10947 #: builtin/pack-objects.c:2919
10948 msgid "unpack unreachable objects newer than <time>"
10949 msgstr "将比给定 <时间> 新的无法访问的对象解包"
10951 #: builtin/pack-objects.c:2922
10952 msgid "create thin packs"
10955 #: builtin/pack-objects.c:2924
10956 msgid "create packs suitable for shallow fetches"
10957 msgstr "创建适合浅克隆仓库获取的包"
10959 #: builtin/pack-objects.c:2926
10960 msgid "ignore packs that have companion .keep file"
10961 msgstr "忽略配有 .keep 文件的包"
10963 #: builtin/pack-objects.c:2928
10964 msgid "pack compression level"
10967 #: builtin/pack-objects.c:2930
10968 msgid "do not hide commits by grafts"
10969 msgstr "显示被嫁接隐藏的提交"
10971 #: builtin/pack-objects.c:2932
10972 msgid "use a bitmap index if available to speed up counting objects"
10973 msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
10975 #: builtin/pack-objects.c:2934
10976 msgid "write a bitmap index together with the pack index"
10977 msgstr "在建立包索引的同时创建 bitmap 索引"
10979 #: builtin/pack-objects.c:3061
10980 msgid "Counting objects"
10983 #: builtin/pack-refs.c:6
10984 msgid "git pack-refs [<options>]"
10985 msgstr "git pack-refs [<选项>]"
10987 #: builtin/pack-refs.c:14
10988 msgid "pack everything"
10991 #: builtin/pack-refs.c:15
10992 msgid "prune loose refs (default)"
10993 msgstr "清除松散的引用(默认)"
10995 #: builtin/prune-packed.c:7
10996 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
10997 msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
10999 #: builtin/prune-packed.c:40
11000 msgid "Removing duplicate objects"
11003 #: builtin/prune.c:11
11004 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
11005 msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
11007 #: builtin/prune.c:106
11008 msgid "report pruned objects"
11011 #: builtin/prune.c:109
11012 msgid "expire objects older than <time>"
11013 msgstr "使早于给定时间的对象过期"
11015 #: builtin/prune.c:123
11016 msgid "cannot prune in a precious-objects repo"
11017 msgstr "不能在珍品仓库中执行清理操作"
11019 #: builtin/pull.c:51 builtin/pull.c:53
11021 msgid "Invalid value for %s: %s"
11022 msgstr "%s 的值无效:%s"
11024 #: builtin/pull.c:73
11025 msgid "git pull [<options>] [<repository> [<refspec>...]]"
11026 msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
11028 #: builtin/pull.c:121
11029 msgid "Options related to merging"
11032 #: builtin/pull.c:124
11033 msgid "incorporate changes by rebasing rather than merging"
11034 msgstr "使用变基操作取代合并操作以合入修改"
11036 #: builtin/pull.c:148 builtin/rebase--helper.c:18 builtin/revert.c:120
11037 msgid "allow fast-forward"
11040 #: builtin/pull.c:157
11041 msgid "automatically stash/stash pop before and after rebase"
11042 msgstr "自动在变基操作前后执行 stash/stash pop"
11044 #: builtin/pull.c:173
11045 msgid "Options related to fetching"
11048 #: builtin/pull.c:195
11049 msgid "number of submodules pulled in parallel"
11050 msgstr "并发拉取的子模组的数量"
11052 #: builtin/pull.c:284
11054 msgid "Invalid value for pull.ff: %s"
11055 msgstr "pull.ff 的取值无效:%s"
11057 #: builtin/pull.c:397
11059 "There is no candidate for rebasing against among the refs that you just "
11061 msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
11063 #: builtin/pull.c:399
11065 "There are no candidates for merging among the refs that you just fetched."
11066 msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
11068 #: builtin/pull.c:400
11070 "Generally this means that you provided a wildcard refspec which had no\n"
11071 "matches on the remote end."
11072 msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
11074 #: builtin/pull.c:403
11077 "You asked to pull from the remote '%s', but did not specify\n"
11078 "a branch. Because this is not the default configured remote\n"
11079 "for your current branch, you must specify a branch on the command line."
11081 "您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n"
11082 "分支默认的远程仓库,您必须在命令行中指定一个分支名。"
11084 #: builtin/pull.c:408 git-parse-remote.sh:73
11085 msgid "You are not currently on a branch."
11086 msgstr "您当前不在一个分支上。"
11088 #: builtin/pull.c:410 builtin/pull.c:425 git-parse-remote.sh:79
11089 msgid "Please specify which branch you want to rebase against."
11090 msgstr "请指定您要变基到哪一个分支。"
11092 #: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:82
11093 msgid "Please specify which branch you want to merge with."
11094 msgstr "请指定您要合并哪一个分支。"
11096 #: builtin/pull.c:413 builtin/pull.c:428
11097 msgid "See git-pull(1) for details."
11098 msgstr "详见 git-pull(1)。"
11100 #: builtin/pull.c:415 builtin/pull.c:421 builtin/pull.c:430
11101 #: git-parse-remote.sh:64
11105 #: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:455
11106 #: git-parse-remote.sh:65
11110 #: builtin/pull.c:423 git-parse-remote.sh:75
11111 msgid "There is no tracking information for the current branch."
11112 msgstr "当前分支没有跟踪信息。"
11114 #: builtin/pull.c:432 git-parse-remote.sh:95
11116 "If you wish to set tracking information for this branch you can do so with:"
11117 msgstr "如果您想要为此分支创建跟踪信息,您可以执行:"
11119 #: builtin/pull.c:437
11122 "Your configuration specifies to merge with the ref '%s'\n"
11123 "from the remote, but no such ref was fetched."
11125 "您的配置中指定要合并远程的引用 '%s',\n"
11128 #: builtin/pull.c:754
11129 msgid "ignoring --verify-signatures for rebase"
11130 msgstr "为变基操作忽略 --verify-signatures"
11132 #: builtin/pull.c:801
11133 msgid "--[no-]autostash option is only valid with --rebase."
11134 msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。"
11136 #: builtin/pull.c:809
11137 msgid "Updating an unborn branch with changes added to the index."
11138 msgstr "更新尚未诞生的分支,变更添加至索引。"
11140 #: builtin/pull.c:812
11141 msgid "pull with rebase"
11144 #: builtin/pull.c:813
11145 msgid "please commit or stash them."
11146 msgstr "请提交或为它们保存进度。"
11148 #: builtin/pull.c:838
11151 "fetch updated the current branch head.\n"
11152 "fast-forwarding your working tree from\n"
11155 "fetch 更新了当前的分支。快进您的工作区\n"
11158 #: builtin/pull.c:843
11161 "Cannot fast-forward your working tree.\n"
11162 "After making sure that you saved anything precious from\n"
11165 "$ git reset --hard\n"
11168 "您当前的工作区无法执行快进操作。\n"
11171 "以确认所有有用的数据均已保存。然后执行下面的命令\n"
11172 "$ git reset --hard\n"
11175 #: builtin/pull.c:858
11176 msgid "Cannot merge multiple branches into empty head."
11177 msgstr "无法将多个分支合并到空分支。"
11179 #: builtin/pull.c:862
11180 msgid "Cannot rebase onto multiple branches."
11181 msgstr "无法变基到多个分支。"
11183 #: builtin/push.c:16
11184 msgid "git push [<options>] [<repository> [<refspec>...]]"
11185 msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
11187 #: builtin/push.c:89
11188 msgid "tag shorthand without <tag>"
11189 msgstr "标签后面未提供 <标签> 参数"
11191 #: builtin/push.c:99
11192 msgid "--delete only accepts plain target ref names"
11193 msgstr "--delete 只接受简单的目标引用名"
11195 #: builtin/push.c:143
11198 "To choose either option permanently, see push.default in 'git help config'."
11201 "为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
11203 #: builtin/push.c:146
11206 "The upstream branch of your current branch does not match\n"
11207 "the name of your current branch. To push to the upstream branch\n"
11208 "on the remote, use\n"
11210 " git push %s HEAD:%s\n"
11212 "To push to the branch of the same name on the remote, use\n"
11214 " git push %s %s\n"
11217 "如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
11220 " git push %s HEAD:%s\n"
11224 " git push %s %s\n"
11227 #: builtin/push.c:161
11230 "You are not currently on a branch.\n"
11231 "To push the history leading to the current (detached HEAD)\n"
11234 " git push %s HEAD:<name-of-remote-branch>\n"
11237 "现在为推送当前(分离头指针)的历史,使用\n"
11239 " git push %s HEAD:<远程分支名字>\n"
11241 #: builtin/push.c:175
11244 "The current branch %s has no upstream branch.\n"
11245 "To push the current branch and set the remote as upstream, use\n"
11247 " git push --set-upstream %s %s\n"
11249 "当前分支 %s 没有对应的上游分支。\n"
11250 "为推送当前分支并建立与远程上游的跟踪,使用\n"
11252 " git push --set-upstream %s %s\n"
11254 #: builtin/push.c:183
11256 msgid "The current branch %s has multiple upstream branches, refusing to push."
11257 msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
11259 #: builtin/push.c:186
11262 "You are pushing to remote '%s', which is not the upstream of\n"
11263 "your current branch '%s', without telling me what to push\n"
11264 "to update which remote branch."
11266 "您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
11267 "而没有告诉我要推送什么、更新哪个远程分支。"
11269 #: builtin/push.c:245
11271 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
11272 msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。"
11274 #: builtin/push.c:252
11276 "Updates were rejected because the tip of your current branch is behind\n"
11277 "its remote counterpart. Integrate the remote changes (e.g.\n"
11278 "'git pull ...') before pushing again.\n"
11279 "See the 'Note about fast-forwards' in 'git push --help' for details."
11281 "更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
11282 "再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
11283 "'git push --help' 中的 'Note about fast-forwards' 小节。"
11285 #: builtin/push.c:258
11287 "Updates were rejected because a pushed branch tip is behind its remote\n"
11288 "counterpart. Check out this branch and integrate the remote changes\n"
11289 "(e.g. 'git pull ...') before pushing again.\n"
11290 "See the 'Note about fast-forwards' in 'git push --help' for details."
11292 "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
11293 "检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
11294 "'git push --help' 中的 'Note about fast-forwards' 小节。"
11296 #: builtin/push.c:264
11298 "Updates were rejected because the remote contains work that you do\n"
11299 "not have locally. This is usually caused by another repository pushing\n"
11300 "to the same ref. You may want to first integrate the remote changes\n"
11301 "(e.g., 'git pull ...') before pushing again.\n"
11302 "See the 'Note about fast-forwards' in 'git push --help' for details."
11304 "更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n"
11305 "一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
11306 "(如 'git pull ...')。\n"
11307 "详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
11309 #: builtin/push.c:271
11310 msgid "Updates were rejected because the tag already exists in the remote."
11311 msgstr "更新被拒绝,因为该标签在远程已经存在。"
11313 #: builtin/push.c:274
11315 "You cannot update a remote ref that points at a non-commit object,\n"
11316 "or update a remote ref to make it point at a non-commit object,\n"
11317 "without using the '--force' option.\n"
11319 "如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
11320 "也不能更新远程引用让其指向一个非提交对象。\n"
11322 #: builtin/push.c:334
11324 msgid "Pushing to %s\n"
11327 #: builtin/push.c:338
11329 msgid "failed to push some refs to '%s'"
11330 msgstr "无法推送一些引用到 '%s'"
11332 #: builtin/push.c:369
11334 msgid "bad repository '%s'"
11337 #: builtin/push.c:370
11339 "No configured push destination.\n"
11340 "Either specify the URL from the command-line or configure a remote "
11341 "repository using\n"
11343 " git remote add <name> <url>\n"
11345 "and then push using the remote name\n"
11347 " git push <name>\n"
11350 "或通过命令行指定 URL,或用下面命令配置一个远程仓库\n"
11352 " git remote add <名称> <地址>\n"
11358 #: builtin/push.c:388
11359 msgid "--all and --tags are incompatible"
11360 msgstr "--all 和 --tags 不兼容"
11362 #: builtin/push.c:389
11363 msgid "--all can't be combined with refspecs"
11364 msgstr "--all 不能和引用规格同时使用"
11366 #: builtin/push.c:394
11367 msgid "--mirror and --tags are incompatible"
11368 msgstr "--mirror 和 --tags 不兼容"
11370 #: builtin/push.c:395
11371 msgid "--mirror can't be combined with refspecs"
11372 msgstr "--mirror 不能和引用规格同时使用"
11374 #: builtin/push.c:400
11375 msgid "--all and --mirror are incompatible"
11376 msgstr "--all 和 --mirror 不兼容"
11378 #: builtin/push.c:518
11382 #: builtin/push.c:519 builtin/send-pack.c:162
11383 msgid "push all refs"
11386 #: builtin/push.c:520 builtin/send-pack.c:164
11387 msgid "mirror all refs"
11390 #: builtin/push.c:522
11391 msgid "delete refs"
11394 #: builtin/push.c:523
11395 msgid "push tags (can't be used with --all or --mirror)"
11396 msgstr "推送标签(不能使用 --all or --mirror)"
11398 #: builtin/push.c:526 builtin/send-pack.c:165
11399 msgid "force updates"
11402 #: builtin/push.c:528 builtin/send-pack.c:179
11403 msgid "refname>:<expect"
11406 #: builtin/push.c:529 builtin/send-pack.c:180
11407 msgid "require old value of ref to be at this value"
11408 msgstr "要求引用旧的取值为设定值"
11410 #: builtin/push.c:532
11411 msgid "control recursive pushing of submodules"
11412 msgstr "控制子模组的递归推送"
11414 #: builtin/push.c:534 builtin/send-pack.c:173
11415 msgid "use thin pack"
11418 #: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:159
11419 #: builtin/send-pack.c:160
11420 msgid "receive pack program"
11423 #: builtin/push.c:537
11424 msgid "set upstream for git pull/status"
11425 msgstr "设置 git pull/status 的上游"
11427 #: builtin/push.c:540
11428 msgid "prune locally removed refs"
11431 #: builtin/push.c:542
11432 msgid "bypass pre-push hook"
11433 msgstr "绕过 pre-push 钩子"
11435 #: builtin/push.c:543
11436 msgid "push missing but relevant tags"
11437 msgstr "推送缺失但有关的标签"
11439 #: builtin/push.c:546 builtin/send-pack.c:167
11440 msgid "GPG sign the push"
11441 msgstr "用 GPG 为推送签名"
11443 #: builtin/push.c:548 builtin/send-pack.c:174
11444 msgid "request atomic transaction on remote side"
11445 msgstr "需要远端支持原子事务"
11447 #: builtin/push.c:549 builtin/send-pack.c:170
11448 msgid "server-specific"
11449 msgstr "server-specific"
11451 #: builtin/push.c:549 builtin/send-pack.c:171
11452 msgid "option to transmit"
11455 #: builtin/push.c:563
11456 msgid "--delete is incompatible with --all, --mirror and --tags"
11457 msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
11459 #: builtin/push.c:565
11460 msgid "--delete doesn't make sense without any refs"
11461 msgstr "--delete 未接任何引用没有意义"
11463 #: builtin/push.c:584
11464 msgid "push options must not have new line characters"
11465 msgstr "推送选项不能有换行符"
11467 #: builtin/read-tree.c:40
11469 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
11470 "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
11471 "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
11473 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-"
11474 "u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
11475 "index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])"
11477 #: builtin/read-tree.c:130
11478 msgid "write resulting index to <file>"
11479 msgstr "将索引结果写入 <文件>"
11481 #: builtin/read-tree.c:133
11482 msgid "only empty the index"
11485 #: builtin/read-tree.c:135
11489 #: builtin/read-tree.c:137
11490 msgid "perform a merge in addition to a read"
11491 msgstr "读取之余再执行一个合并"
11493 #: builtin/read-tree.c:139
11494 msgid "3-way merge if no file level merging required"
11495 msgstr "如果没有文件级合并需要,执行三方合并"
11497 #: builtin/read-tree.c:141
11498 msgid "3-way merge in presence of adds and removes"
11499 msgstr "存在添加和删除时,也执行三方合并"
11501 #: builtin/read-tree.c:143
11502 msgid "same as -m, but discard unmerged entries"
11503 msgstr "类似于 -m,但丢弃未合并的条目"
11505 #: builtin/read-tree.c:144
11506 msgid "<subdirectory>/"
11509 #: builtin/read-tree.c:145
11510 msgid "read the tree into the index under <subdirectory>/"
11511 msgstr "读取树对象到索引的 <子目录>/ 下"
11513 #: builtin/read-tree.c:148
11514 msgid "update working tree with merge result"
11515 msgstr "用合并的结果更新工作区"
11517 #: builtin/read-tree.c:150
11521 #: builtin/read-tree.c:151
11522 msgid "allow explicitly ignored files to be overwritten"
11523 msgstr "允许忽略文件中设定的文件可以被覆盖"
11525 #: builtin/read-tree.c:154
11526 msgid "don't check the working tree after merging"
11529 #: builtin/read-tree.c:155
11530 msgid "don't update the index or the work tree"
11531 msgstr "不更新索引区和工作区"
11533 #: builtin/read-tree.c:157
11534 msgid "skip applying sparse checkout filter"
11535 msgstr "跳过应用稀疏检出过滤器"
11537 #: builtin/read-tree.c:159
11538 msgid "debug unpack-trees"
11539 msgstr "调试 unpack-trees"
11541 #: builtin/rebase--helper.c:7
11542 msgid "git rebase--helper [<options>]"
11543 msgstr "git rebase--helper [<选项>]"
11545 #: builtin/rebase--helper.c:19
11546 msgid "continue rebase"
11549 #: builtin/rebase--helper.c:21
11550 msgid "abort rebase"
11553 #: builtin/receive-pack.c:27
11554 msgid "git receive-pack <git-dir>"
11555 msgstr "git receive-pack <git-dir>"
11557 #: builtin/receive-pack.c:796
11559 "By default, updating the current branch in a non-bare repository\n"
11560 "is denied, because it will make the index and work tree inconsistent\n"
11561 "with what you pushed, and will require 'git reset --hard' to match\n"
11562 "the work tree to HEAD.\n"
11564 "You can set the 'receive.denyCurrentBranch' configuration variable\n"
11565 "to 'ignore' or 'warn' in the remote repository to allow pushing into\n"
11566 "its current branch; however, this is not recommended unless you\n"
11567 "arranged to update its work tree to match what you pushed in some\n"
11570 "To squelch this message and still keep the default behaviour, set\n"
11571 "'receive.denyCurrentBranch' configuration variable to 'refuse'."
11573 "默认禁止更新非纯仓库的当前分支,因为您推送的内容将导致索引和工作区\n"
11574 "不一致,并且将需要执行 'git reset --hard' 将工作区匹配到 HEAD。\n"
11576 "您可以在远程仓库中设置 'receive.denyCurrentBranch' 配置变量为\n"
11577 "'ignore' 或 'warn' 以允许推送到当前分支。然而不推荐这么做,除非您\n"
11578 "用某种方式将其工作区更新至您推送的状态。\n"
11580 "若要屏蔽此信息且保持默认行为,设置 'receive.denyCurrentBranch'\n"
11583 #: builtin/receive-pack.c:816
11585 "By default, deleting the current branch is denied, because the next\n"
11586 "'git clone' won't result in any file checked out, causing confusion.\n"
11588 "You can set 'receive.denyDeleteCurrent' configuration variable to\n"
11589 "'warn' or 'ignore' in the remote repository to allow deleting the\n"
11590 "current branch, with or without a warning message.\n"
11592 "To squelch this message, you can set it to 'refuse'."
11594 "默认禁止删除当前分支,因为下一次 'git clone' 将不会检出任何文件,\n"
11597 "您可以在远程仓库中设置 'receive.denyDeleteCurrent' 配置变量为\n"
11598 "'warn'(显示警告信息)或 'ignore'(忽略警告信息)以允许删除当前分支。\n"
11600 "若要屏蔽此信息,您可以设置它为 'refuse'。"
11602 #: builtin/receive-pack.c:1889
11606 #: builtin/receive-pack.c:1903
11607 msgid "You must specify a directory."
11608 msgstr "您必须指定一个目录。"
11610 #: builtin/reflog.c:423
11612 msgid "'%s' for '%s' is not a valid timestamp"
11613 msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
11615 #: builtin/reflog.c:540 builtin/reflog.c:545
11617 msgid "'%s' is not a valid timestamp"
11618 msgstr "'%s' 不是一个有效的时间戳"
11620 #: builtin/remote.c:12
11621 msgid "git remote [-v | --verbose]"
11622 msgstr "git remote [-v | --verbose]"
11624 #: builtin/remote.c:13
11626 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
11627 "mirror=<fetch|push>] <name> <url>"
11629 "git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
11630 "mirror=<fetch|push>] <名称> <地址>"
11632 #: builtin/remote.c:14 builtin/remote.c:34
11633 msgid "git remote rename <old> <new>"
11634 msgstr "git remote rename <旧名称> <新名称>"
11636 #: builtin/remote.c:15 builtin/remote.c:39
11637 msgid "git remote remove <name>"
11638 msgstr "git remote remove <名称>"
11640 #: builtin/remote.c:16 builtin/remote.c:44
11641 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
11642 msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
11644 #: builtin/remote.c:17
11645 msgid "git remote [-v | --verbose] show [-n] <name>"
11646 msgstr "git remote [-v | --verbose] show [-n] <名称>"
11648 #: builtin/remote.c:18
11649 msgid "git remote prune [-n | --dry-run] <name>"
11650 msgstr "git remote prune [-n | --dry-run] <名称>"
11652 #: builtin/remote.c:19
11654 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
11655 msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
11657 #: builtin/remote.c:20
11658 msgid "git remote set-branches [--add] <name> <branch>..."
11659 msgstr "git remote set-branches [--add] <名称> <分支>..."
11661 #: builtin/remote.c:21 builtin/remote.c:70
11662 msgid "git remote get-url [--push] [--all] <name>"
11663 msgstr "git remote get-url [--push] [--all] <名称>"
11665 #: builtin/remote.c:22 builtin/remote.c:75
11666 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
11667 msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
11669 #: builtin/remote.c:23 builtin/remote.c:76
11670 msgid "git remote set-url --add <name> <newurl>"
11671 msgstr "git remote set-url --add <名称> <新的地址>"
11673 #: builtin/remote.c:24 builtin/remote.c:77
11674 msgid "git remote set-url --delete <name> <url>"
11675 msgstr "git remote set-url --delete <名称> <地址>"
11677 #: builtin/remote.c:29
11678 msgid "git remote add [<options>] <name> <url>"
11679 msgstr "git remote add [<选项>] <名称> <地址>"
11681 #: builtin/remote.c:49
11682 msgid "git remote set-branches <name> <branch>..."
11683 msgstr "git remote set-branches <名称> <分支>..."
11685 #: builtin/remote.c:50
11686 msgid "git remote set-branches --add <name> <branch>..."
11687 msgstr "git remote set-branches --add <名称> <分支>..."
11689 #: builtin/remote.c:55
11690 msgid "git remote show [<options>] <name>"
11691 msgstr "git remote show [<选项>] <名称>"
11693 #: builtin/remote.c:60
11694 msgid "git remote prune [<options>] <name>"
11695 msgstr "git remote prune [<选项>] <名称>"
11697 #: builtin/remote.c:65
11698 msgid "git remote update [<options>] [<group> | <remote>]..."
11699 msgstr "git remote update [<选项>] [<组> | <远程>]..."
11701 #: builtin/remote.c:94
11703 msgid "Updating %s"
11706 #: builtin/remote.c:126
11708 "--mirror is dangerous and deprecated; please\n"
11709 "\t use --mirror=fetch or --mirror=push instead"
11711 "--mirror 选项危险且过时,请使用 --mirror=fetch\n"
11712 "\t 或 --mirror=push"
11714 #: builtin/remote.c:143
11716 msgid "unknown mirror argument: %s"
11717 msgstr "未知的镜像参数:%s"
11719 #: builtin/remote.c:159
11720 msgid "fetch the remote branches"
11723 #: builtin/remote.c:161
11724 msgid "import all tags and associated objects when fetching"
11725 msgstr "抓取时导入所有的标签和关联对象"
11727 #: builtin/remote.c:164
11728 msgid "or do not fetch any tag at all (--no-tags)"
11729 msgstr "或不抓取任何标签(--no-tags)"
11731 #: builtin/remote.c:166
11732 msgid "branch(es) to track"
11735 #: builtin/remote.c:167
11736 msgid "master branch"
11739 #: builtin/remote.c:168
11741 msgstr "push|fetch"
11743 #: builtin/remote.c:169
11744 msgid "set up remote as a mirror to push to or fetch from"
11745 msgstr "把远程设置为用以推送或抓取的镜像"
11747 #: builtin/remote.c:181
11748 msgid "specifying a master branch makes no sense with --mirror"
11749 msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
11751 #: builtin/remote.c:183
11752 msgid "specifying branches to track makes sense only with fetch mirrors"
11753 msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
11755 #: builtin/remote.c:190 builtin/remote.c:629
11757 msgid "remote %s already exists."
11758 msgstr "远程 %s 已经存在。"
11760 #: builtin/remote.c:194 builtin/remote.c:633
11762 msgid "'%s' is not a valid remote name"
11763 msgstr "'%s' 不是一个有效的远程名称"
11765 #: builtin/remote.c:234
11767 msgid "Could not setup master '%s'"
11768 msgstr "无法设置 master '%s'"
11770 #: builtin/remote.c:336
11772 msgid "Could not get fetch map for refspec %s"
11773 msgstr "无法得到引用规格 %s 的获取列表"
11775 #: builtin/remote.c:437 builtin/remote.c:445
11779 #: builtin/remote.c:449
11783 #: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:856
11785 msgid "No such remote: %s"
11786 msgstr "没有这样的远程:%s"
11788 #: builtin/remote.c:639
11790 msgid "Could not rename config section '%s' to '%s'"
11791 msgstr "不能重命名配置小节 '%s' 到 '%s'"
11793 #: builtin/remote.c:659
11796 "Not updating non-default fetch refspec\n"
11798 "\tPlease update the configuration manually if necessary."
11804 #: builtin/remote.c:695
11806 msgid "deleting '%s' failed"
11807 msgstr "删除 '%s' 失败"
11809 #: builtin/remote.c:729
11811 msgid "creating '%s' failed"
11812 msgstr "创建 '%s' 失败"
11814 #: builtin/remote.c:794
11816 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
11817 "to delete it, use:"
11819 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
11820 "to delete them, use:"
11821 msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
11822 msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
11824 #: builtin/remote.c:808
11826 msgid "Could not remove config section '%s'"
11827 msgstr "不能移除配置小节 '%s'"
11829 #: builtin/remote.c:909
11831 msgid " new (next fetch will store in remotes/%s)"
11832 msgstr " 新的(下一次获取将存储于 remotes/%s)"
11834 #: builtin/remote.c:912
11838 #: builtin/remote.c:914
11839 msgid " stale (use 'git remote prune' to remove)"
11840 msgstr " 过时(使用 'git remote prune' 来移除)"
11842 #: builtin/remote.c:916
11846 #: builtin/remote.c:957
11848 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
11849 msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
11851 #: builtin/remote.c:965
11853 msgid "rebases interactively onto remote %s"
11854 msgstr "交互式变基到远程 %s"
11856 #: builtin/remote.c:966
11858 msgid "rebases onto remote %s"
11861 #: builtin/remote.c:969
11863 msgid " merges with remote %s"
11864 msgstr " 与远程 %s 合并"
11866 #: builtin/remote.c:972
11868 msgid "merges with remote %s"
11871 #: builtin/remote.c:975
11873 msgid "%-*s and with remote %s\n"
11874 msgstr "%-*s 以及和远程 %s\n"
11876 #: builtin/remote.c:1018
11880 #: builtin/remote.c:1021
11884 #: builtin/remote.c:1025
11888 #: builtin/remote.c:1028
11889 msgid "fast-forwardable"
11892 #: builtin/remote.c:1031
11893 msgid "local out of date"
11896 #: builtin/remote.c:1038
11898 msgid " %-*s forces to %-*s (%s)"
11899 msgstr " %-*s 强制推送至 %-*s (%s)"
11901 #: builtin/remote.c:1041
11903 msgid " %-*s pushes to %-*s (%s)"
11904 msgstr " %-*s 推送至 %-*s (%s)"
11906 #: builtin/remote.c:1045
11908 msgid " %-*s forces to %s"
11909 msgstr " %-*s 强制推送至 %s"
11911 #: builtin/remote.c:1048
11913 msgid " %-*s pushes to %s"
11914 msgstr " %-*s 推送至 %s"
11916 #: builtin/remote.c:1116
11917 msgid "do not query remotes"
11920 #: builtin/remote.c:1143
11922 msgid "* remote %s"
11925 #: builtin/remote.c:1144
11927 msgid " Fetch URL: %s"
11930 #: builtin/remote.c:1145 builtin/remote.c:1158 builtin/remote.c:1297
11934 #. TRANSLATORS: the colon ':' should align with
11935 #. the one in " Fetch URL: %s" translation
11936 #: builtin/remote.c:1156 builtin/remote.c:1158
11938 msgid " Push URL: %s"
11941 #: builtin/remote.c:1160 builtin/remote.c:1162 builtin/remote.c:1164
11943 msgid " HEAD branch: %s"
11944 msgstr " HEAD 分支:%s"
11946 # 译者:中文字符串拼接,可删除前导空格
11947 #: builtin/remote.c:1160
11948 msgid "(not queried)"
11951 #: builtin/remote.c:1162
11955 #: builtin/remote.c:1166
11958 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
11959 msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
11961 #: builtin/remote.c:1178
11963 msgid " Remote branch:%s"
11964 msgid_plural " Remote branches:%s"
11965 msgstr[0] " 远程分支:%s"
11966 msgstr[1] " 远程分支:%s"
11968 # 译者:中文字符串拼接,可删除前导空格
11969 #: builtin/remote.c:1181 builtin/remote.c:1207
11970 msgid " (status not queried)"
11973 #: builtin/remote.c:1190
11974 msgid " Local branch configured for 'git pull':"
11975 msgid_plural " Local branches configured for 'git pull':"
11976 msgstr[0] " 为 'git pull' 配置的本地分支:"
11977 msgstr[1] " 为 'git pull' 配置的本地分支:"
11979 #: builtin/remote.c:1198
11980 msgid " Local refs will be mirrored by 'git push'"
11981 msgstr " 本地引用将在 'git push' 时被镜像"
11983 #: builtin/remote.c:1204
11985 msgid " Local ref configured for 'git push'%s:"
11986 msgid_plural " Local refs configured for 'git push'%s:"
11987 msgstr[0] " 为 'git push' 配置的本地引用%s:"
11988 msgstr[1] " 为 'git push' 配置的本地引用%s:"
11990 #: builtin/remote.c:1225
11991 msgid "set refs/remotes/<name>/HEAD according to remote"
11992 msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
11994 #: builtin/remote.c:1227
11995 msgid "delete refs/remotes/<name>/HEAD"
11996 msgstr "删除 refs/remotes/<名称>/HEAD"
11998 #: builtin/remote.c:1242
11999 msgid "Cannot determine remote HEAD"
12000 msgstr "无法确定远程 HEAD"
12002 #: builtin/remote.c:1244
12003 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
12004 msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
12006 #: builtin/remote.c:1254
12008 msgid "Could not delete %s"
12011 #: builtin/remote.c:1262
12013 msgid "Not a valid ref: %s"
12014 msgstr "不是一个有效引用:%s"
12016 #: builtin/remote.c:1264
12018 msgid "Could not setup %s"
12022 #: builtin/remote.c:1282
12024 msgid " %s will become dangling!"
12025 msgstr " %s 将成为摇摆状态!"
12028 #: builtin/remote.c:1283
12030 msgid " %s has become dangling!"
12031 msgstr " %s 已成为摇摆状态!"
12033 #: builtin/remote.c:1293
12038 #: builtin/remote.c:1294
12043 #: builtin/remote.c:1310
12045 msgid " * [would prune] %s"
12046 msgstr " * [将删除] %s"
12048 #: builtin/remote.c:1313
12050 msgid " * [pruned] %s"
12051 msgstr " * [已删除] %s"
12053 #: builtin/remote.c:1358
12054 msgid "prune remotes after fetching"
12057 #: builtin/remote.c:1421 builtin/remote.c:1475 builtin/remote.c:1543
12059 msgid "No such remote '%s'"
12060 msgstr "没有此远程 '%s'"
12062 #: builtin/remote.c:1437
12066 #: builtin/remote.c:1444
12067 msgid "no remote specified"
12070 #: builtin/remote.c:1461
12071 msgid "query push URLs rather than fetch URLs"
12072 msgstr "查询推送 URL 地址,而非获取 URL 地址"
12074 #: builtin/remote.c:1463
12075 msgid "return all URLs"
12076 msgstr "返回所有 URL 地址"
12078 #: builtin/remote.c:1491
12080 msgid "no URLs configured for remote '%s'"
12081 msgstr "没有给远程仓库 '%s' 设定 URL"
12083 #: builtin/remote.c:1517
12084 msgid "manipulate push URLs"
12087 #: builtin/remote.c:1519
12091 #: builtin/remote.c:1521
12092 msgid "delete URLs"
12095 #: builtin/remote.c:1528
12096 msgid "--add --delete doesn't make sense"
12097 msgstr "--add --delete 无意义"
12099 #: builtin/remote.c:1569
12101 msgid "Invalid old URL pattern: %s"
12102 msgstr "无效的旧 URL 匹配模版:%s"
12104 #: builtin/remote.c:1577
12106 msgid "No such URL found: %s"
12107 msgstr "未找到此 URL:%s"
12109 #: builtin/remote.c:1579
12110 msgid "Will not delete all non-push URLs"
12111 msgstr "将不会删除所有非推送 URL 地址"
12113 #: builtin/remote.c:1593
12114 msgid "be verbose; must be placed before a subcommand"
12115 msgstr "冗长输出;必须置于子命令之前"
12117 #: builtin/remote.c:1624
12119 msgid "Unknown subcommand: %s"
12122 #: builtin/repack.c:17
12123 msgid "git repack [<options>]"
12124 msgstr "git repack [<选项>]"
12126 #: builtin/repack.c:22
12128 "Incremental repacks are incompatible with bitmap indexes. Use\n"
12129 "--no-write-bitmap-index or disable the pack.writebitmaps configuration."
12131 "增量 repack 和 bitmap 索引不兼容。 使用 --no-write-bitmap-index\n"
12132 "或禁用 pack.writebitmaps 配置。"
12134 #: builtin/repack.c:166
12135 msgid "pack everything in a single pack"
12136 msgstr "所有内容打包到一个包文件中"
12138 #: builtin/repack.c:168
12139 msgid "same as -a, and turn unreachable objects loose"
12140 msgstr "和 -a 相同,并将不可达的对象设为松散对象"
12142 #: builtin/repack.c:171
12143 msgid "remove redundant packs, and run git-prune-packed"
12144 msgstr "删除多余的包,运行 git-prune-packed"
12146 #: builtin/repack.c:173
12147 msgid "pass --no-reuse-delta to git-pack-objects"
12148 msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
12150 #: builtin/repack.c:175
12151 msgid "pass --no-reuse-object to git-pack-objects"
12152 msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
12154 #: builtin/repack.c:177
12155 msgid "do not run git-update-server-info"
12156 msgstr "不运行 git-update-server-info"
12158 #: builtin/repack.c:180
12159 msgid "pass --local to git-pack-objects"
12160 msgstr "向 git-pack-objects 传递参数 --local"
12162 #: builtin/repack.c:182
12163 msgid "write bitmap index"
12164 msgstr "写 bitmap 索引"
12166 #: builtin/repack.c:183
12167 msgid "approxidate"
12170 #: builtin/repack.c:184
12171 msgid "with -A, do not loosen objects older than this"
12172 msgstr "使用 -A,不要将早于给定时间的对象过期"
12174 #: builtin/repack.c:186
12175 msgid "with -a, repack unreachable objects"
12176 msgstr "使用 -a ,重新对不可达对象打包"
12178 #: builtin/repack.c:188
12179 msgid "size of the window used for delta compression"
12180 msgstr "用于增量压缩的窗口值"
12182 #: builtin/repack.c:189 builtin/repack.c:193
12186 #: builtin/repack.c:190
12187 msgid "same as the above, but limit memory size instead of entries count"
12188 msgstr "和上面的相似,但限制内存大小而非条目数"
12190 #: builtin/repack.c:192
12191 msgid "limits the maximum delta depth"
12194 #: builtin/repack.c:194
12195 msgid "maximum size of each packfile"
12196 msgstr "每个包文件的最大尺寸"
12198 #: builtin/repack.c:196
12199 msgid "repack objects in packs marked with .keep"
12200 msgstr "对标记为 .keep 的包中的对象重新打包"
12202 #: builtin/repack.c:206
12203 msgid "cannot delete packs in a precious-objects repo"
12204 msgstr "不能删除珍品仓库中的打包文件"
12206 #: builtin/repack.c:210
12207 msgid "--keep-unreachable and -A are incompatible"
12208 msgstr "--keep-unreachable 和 -A 不兼容"
12210 #: builtin/repack.c:400 builtin/worktree.c:115
12212 msgid "failed to remove '%s'"
12215 #: builtin/replace.c:19
12216 msgid "git replace [-f] <object> <replacement>"
12217 msgstr "git replace [-f] <对象> <替换物>"
12219 #: builtin/replace.c:20
12220 msgid "git replace [-f] --edit <object>"
12221 msgstr "git replace [-f] --edit <对象>"
12223 #: builtin/replace.c:21
12224 msgid "git replace [-f] --graft <commit> [<parent>...]"
12225 msgstr "git replace [-f] --graft <提交> [<父提交>...]"
12227 #: builtin/replace.c:22
12228 msgid "git replace -d <object>..."
12229 msgstr "git replace -d <对象>..."
12231 #: builtin/replace.c:23
12232 msgid "git replace [--format=<format>] [-l [<pattern>]]"
12233 msgstr "git replace [--format=<格式>] [-l [<模式>]]"
12235 #: builtin/replace.c:329 builtin/replace.c:367 builtin/replace.c:395
12237 msgid "Not a valid object name: '%s'"
12238 msgstr "不是一个有效的对象名:'%s'"
12240 #: builtin/replace.c:359
12242 msgid "bad mergetag in commit '%s'"
12243 msgstr "提交 '%s' 中含有损坏的合并标签"
12245 #: builtin/replace.c:361
12247 msgid "malformed mergetag in commit '%s'"
12248 msgstr "提交 '%s' 中含有非法的合并标签"
12250 #: builtin/replace.c:372
12253 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
12254 "instead of --graft"
12255 msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft"
12257 #: builtin/replace.c:405
12259 msgid "the original commit '%s' has a gpg signature."
12260 msgstr "原始提交 '%s' 中包含一个 GPG 签名"
12262 #: builtin/replace.c:406
12263 msgid "the signature will be removed in the replacement commit!"
12264 msgstr "在替换的提交中签名将被移除!"
12266 #: builtin/replace.c:412
12268 msgid "could not write replacement commit for: '%s'"
12269 msgstr "不能为 '%s' 写替换提交"
12271 #: builtin/replace.c:436
12272 msgid "list replace refs"
12275 #: builtin/replace.c:437
12276 msgid "delete replace refs"
12279 #: builtin/replace.c:438
12280 msgid "edit existing object"
12283 #: builtin/replace.c:439
12284 msgid "change a commit's parents"
12285 msgstr "修改一个提交的父提交"
12287 #: builtin/replace.c:440
12288 msgid "replace the ref if it exists"
12291 #: builtin/replace.c:441
12292 msgid "do not pretty-print contents for --edit"
12293 msgstr "不要为 --edit 操作美观显示内容"
12295 #: builtin/replace.c:442
12296 msgid "use this format"
12299 #: builtin/rerere.c:12
12300 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
12301 msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
12303 #: builtin/rerere.c:58
12304 msgid "register clean resolutions in index"
12305 msgstr "在索引中注册干净的解决方案"
12307 #: builtin/reset.c:26
12309 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
12310 msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
12312 #: builtin/reset.c:27
12313 msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
12314 msgstr "git reset [-q] [<树或提交>] [--] <路径>..."
12316 #: builtin/reset.c:28
12317 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
12318 msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
12320 #: builtin/reset.c:34
12324 #: builtin/reset.c:34
12328 #: builtin/reset.c:34
12332 #: builtin/reset.c:34
12336 #: builtin/reset.c:34
12340 #: builtin/reset.c:74
12341 msgid "You do not have a valid HEAD."
12342 msgstr "您没有一个有效的 HEAD。"
12344 #: builtin/reset.c:76
12345 msgid "Failed to find tree of HEAD."
12346 msgstr "无法找到 HEAD 指向的树。"
12348 #: builtin/reset.c:82
12350 msgid "Failed to find tree of %s."
12351 msgstr "无法找到 %s 指向的树。"
12353 #: builtin/reset.c:100
12355 msgid "HEAD is now at %s"
12356 msgstr "HEAD 现在位于 %s"
12358 # 译者:汉字之间无空格,故删除%s前后空格
12359 #: builtin/reset.c:183
12361 msgid "Cannot do a %s reset in the middle of a merge."
12362 msgstr "在合并过程中不能做%s重置操作。"
12364 #: builtin/reset.c:276
12365 msgid "be quiet, only report errors"
12366 msgstr "安静模式,只报告错误"
12368 #: builtin/reset.c:278
12369 msgid "reset HEAD and index"
12370 msgstr "重置 HEAD 和索引"
12372 #: builtin/reset.c:279
12373 msgid "reset only HEAD"
12376 #: builtin/reset.c:281 builtin/reset.c:283
12377 msgid "reset HEAD, index and working tree"
12378 msgstr "重置 HEAD、索引和工作区"
12380 #: builtin/reset.c:285
12381 msgid "reset HEAD but keep local changes"
12382 msgstr "重置 HEAD 但保存本地变更"
12384 #: builtin/reset.c:288
12385 msgid "record only the fact that removed paths will be added later"
12386 msgstr "将删除的路径标记为稍后添加"
12388 #: builtin/reset.c:305
12390 msgid "Failed to resolve '%s' as a valid revision."
12391 msgstr "无法将 '%s' 解析为一个有效的版本。"
12393 #: builtin/reset.c:313
12395 msgid "Failed to resolve '%s' as a valid tree."
12396 msgstr "无法将 '%s' 解析为一个有效的树对象。"
12398 #: builtin/reset.c:322
12399 msgid "--patch is incompatible with --{hard,mixed,soft}"
12400 msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
12402 #: builtin/reset.c:331
12403 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
12404 msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。"
12406 # 译者:汉字之间无空格,故删除%s前后空格
12407 #: builtin/reset.c:333
12409 msgid "Cannot do %s reset with paths."
12410 msgstr "不能带路径进行%s重置。"
12412 # 译者:汉字之间无空格,故删除%s前后空格
12413 #: builtin/reset.c:343
12415 msgid "%s reset is not allowed in a bare repository"
12416 msgstr "不能对纯仓库进行%s重置"
12418 #: builtin/reset.c:347
12419 msgid "-N can only be used with --mixed"
12420 msgstr "-N 只能和 --mixed 同时使用"
12422 #: builtin/reset.c:364
12423 msgid "Unstaged changes after reset:"
12424 msgstr "重置后取消暂存的变更:"
12426 #: builtin/reset.c:370
12428 msgid "Could not reset index file to revision '%s'."
12429 msgstr "不能重置索引文件至版本 '%s'。"
12431 #: builtin/reset.c:374
12432 msgid "Could not write new index file."
12433 msgstr "不能写入新的索引文件。"
12435 #: builtin/rev-list.c:354
12436 msgid "rev-list does not support display of notes"
12437 msgstr "rev-list 不支持显示注解"
12439 #: builtin/rev-parse.c:393
12440 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
12441 msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
12443 #: builtin/rev-parse.c:398
12444 msgid "keep the `--` passed as an arg"
12445 msgstr "保持 `--` 作为一个参数传递"
12447 #: builtin/rev-parse.c:400
12448 msgid "stop parsing after the first non-option argument"
12449 msgstr "遇到第一个非选项参数后停止解析"
12451 #: builtin/rev-parse.c:403
12452 msgid "output in stuck long form"
12455 #: builtin/rev-parse.c:534
12457 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
12458 " or: git rev-parse --sq-quote [<arg>...]\n"
12459 " or: git rev-parse [<options>] [<arg>...]\n"
12461 "Run \"git rev-parse --parseopt -h\" for more information on the first usage."
12463 "git rev-parse --parseopt [<选项>] -- [<参数>...]\n"
12464 " 或者:git rev-parse --sq-quote [<参数>...]\n"
12465 " 或者:git rev-parse [<选项>] [<参数>...]\n"
12467 "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
12469 #: builtin/revert.c:22
12470 msgid "git revert [<options>] <commit-ish>..."
12471 msgstr "git revert [<选项>] <提交号>..."
12473 #: builtin/revert.c:23
12474 msgid "git revert <subcommand>"
12475 msgstr "git revert <子命令>"
12477 #: builtin/revert.c:28
12478 msgid "git cherry-pick [<options>] <commit-ish>..."
12479 msgstr "git cherry-pick [<选项>] <提交号>..."
12481 #: builtin/revert.c:29
12482 msgid "git cherry-pick <subcommand>"
12483 msgstr "git cherry-pick <子命令>"
12485 #: builtin/revert.c:89
12487 msgid "%s: %s cannot be used with %s"
12488 msgstr "%s:%s 不能和 %s 同时使用"
12490 #: builtin/revert.c:98
12491 msgid "end revert or cherry-pick sequence"
12494 #: builtin/revert.c:99
12495 msgid "resume revert or cherry-pick sequence"
12498 #: builtin/revert.c:100
12499 msgid "cancel revert or cherry-pick sequence"
12502 #: builtin/revert.c:101
12503 msgid "don't automatically commit"
12506 #: builtin/revert.c:102
12507 msgid "edit the commit message"
12510 #: builtin/revert.c:105
12511 msgid "parent-number"
12514 #: builtin/revert.c:106
12515 msgid "select mainline parent"
12518 #: builtin/revert.c:108
12519 msgid "merge strategy"
12522 #: builtin/revert.c:109
12526 #: builtin/revert.c:110
12527 msgid "option for merge strategy"
12530 #: builtin/revert.c:119
12531 msgid "append commit name"
12534 #: builtin/revert.c:121
12535 msgid "preserve initially empty commits"
12538 #: builtin/revert.c:122
12539 msgid "allow commits with empty messages"
12542 #: builtin/revert.c:123
12543 msgid "keep redundant, empty commits"
12544 msgstr "保持多余的、空的提交"
12546 #: builtin/revert.c:211
12547 msgid "revert failed"
12550 #: builtin/revert.c:224
12551 msgid "cherry-pick failed"
12555 msgid "git rm [<options>] [--] <file>..."
12556 msgstr "git rm [<选项>] [--] <文件>..."
12558 #: builtin/rm.c:205
12560 "the following file has staged content different from both the\n"
12561 "file and the HEAD:"
12563 "the following files have staged content different from both the\n"
12564 "file and the HEAD:"
12565 msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
12566 msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
12568 #: builtin/rm.c:210
12571 "(use -f to force removal)"
12576 #: builtin/rm.c:214
12577 msgid "the following file has changes staged in the index:"
12578 msgid_plural "the following files have changes staged in the index:"
12579 msgstr[0] "下列文件索引中有变更"
12580 msgstr[1] "下列文件索引中有变更"
12582 #: builtin/rm.c:218 builtin/rm.c:227
12585 "(use --cached to keep the file, or -f to force removal)"
12588 "(使用 --cached 保留本地文件,或用 -f 强制删除)"
12590 #: builtin/rm.c:224
12591 msgid "the following file has local modifications:"
12592 msgid_plural "the following files have local modifications:"
12593 msgstr[0] "如下文件有本地修改:"
12594 msgstr[1] "如下文件有本地修改:"
12596 #: builtin/rm.c:242
12597 msgid "do not list removed files"
12600 #: builtin/rm.c:243
12601 msgid "only remove from the index"
12604 #: builtin/rm.c:244
12605 msgid "override the up-to-date check"
12606 msgstr "忽略文件更新状态检查"
12608 #: builtin/rm.c:245
12609 msgid "allow recursive removal"
12612 #: builtin/rm.c:247
12613 msgid "exit with a zero status even if nothing matched"
12614 msgstr "即使没有匹配,也以零状态退出"
12616 #: builtin/rm.c:308
12618 msgid "not removing '%s' recursively without -r"
12619 msgstr "未提供 -r 选项不会递归删除 '%s'"
12621 #: builtin/rm.c:347
12623 msgid "git rm: unable to remove %s"
12624 msgstr "git rm:不能删除 %s"
12626 #: builtin/rm.c:370
12628 msgid "could not remove '%s'"
12631 #: builtin/send-pack.c:18
12633 "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
12634 "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
12636 " --all and explicit <ref> specification are mutually exclusive."
12638 "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
12639 "receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n"
12640 " --all 和明确的 <引用> 互斥。"
12642 #: builtin/send-pack.c:161
12643 msgid "remote name"
12646 #: builtin/send-pack.c:175
12647 msgid "use stateless RPC protocol"
12648 msgstr "使用无状态的 RPC 协议"
12650 #: builtin/send-pack.c:176
12651 msgid "read refs from stdin"
12654 #: builtin/send-pack.c:177
12655 msgid "print status from remote helper"
12656 msgstr "打印来自远程 helper 的状态"
12658 #: builtin/shortlog.c:13
12659 msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
12660 msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
12662 #: builtin/shortlog.c:248
12663 msgid "Group by committer rather than author"
12664 msgstr "按照提交者分组而不是作者"
12666 #: builtin/shortlog.c:250
12667 msgid "sort output according to the number of commits per author"
12668 msgstr "根据每个作者的提交数量排序"
12670 #: builtin/shortlog.c:252
12671 msgid "Suppress commit descriptions, only provides commit count"
12672 msgstr "隐藏提交说明,只提供提交数量"
12674 #: builtin/shortlog.c:254
12675 msgid "Show the email address of each author"
12676 msgstr "显示每个作者的电子邮件地址"
12678 #: builtin/shortlog.c:255
12679 msgid "w[,i1[,i2]]"
12680 msgstr "w[,i1[,i2]]"
12682 #: builtin/shortlog.c:256
12683 msgid "Linewrap output"
12686 #: builtin/show-branch.c:10
12688 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
12689 "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
12690 "\t\t[--more=<n> | --list | --independent | --merge-base]\n"
12691 "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
12693 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
12694 "\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
12695 "\t\t[--more=<n> | --list | --independent | --merge-base]\n"
12696 "\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
12698 #: builtin/show-branch.c:14
12699 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
12700 msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]"
12702 #: builtin/show-branch.c:374
12704 msgid "ignoring %s; cannot handle more than %d ref"
12705 msgid_plural "ignoring %s; cannot handle more than %d refs"
12706 msgstr[0] "忽略 %s,无法处理 %d 个以上的引用"
12707 msgstr[1] "忽略 %s,无法处理 %d 个以上的引用"
12709 #: builtin/show-branch.c:536
12711 msgid "no matching refs with %s"
12712 msgstr "没有和 %s 匹配的引用"
12714 #: builtin/show-branch.c:632
12715 msgid "show remote-tracking and local branches"
12716 msgstr "显示远程跟踪的和本地的分支"
12718 #: builtin/show-branch.c:634
12719 msgid "show remote-tracking branches"
12722 #: builtin/show-branch.c:636
12723 msgid "color '*!+-' corresponding to the branch"
12724 msgstr "着色 '*!+-' 到相应的分支"
12726 #: builtin/show-branch.c:638
12727 msgid "show <n> more commits after the common ancestor"
12728 msgstr "显示共同祖先后的 <n> 个提交"
12730 #: builtin/show-branch.c:640
12731 msgid "synonym to more=-1"
12732 msgstr "和 more=-1 同义"
12734 #: builtin/show-branch.c:641
12735 msgid "suppress naming strings"
12738 #: builtin/show-branch.c:643
12739 msgid "include the current branch"
12742 #: builtin/show-branch.c:645
12743 msgid "name commits with their object names"
12746 #: builtin/show-branch.c:647
12747 msgid "show possible merge bases"
12750 #: builtin/show-branch.c:649
12751 msgid "show refs unreachable from any other ref"
12752 msgstr "显示没有任何引用的的引用"
12754 #: builtin/show-branch.c:651
12755 msgid "show commits in topological order"
12758 #: builtin/show-branch.c:654
12759 msgid "show only commits not on the first branch"
12760 msgstr "只显示不在第一个分支上的提交"
12762 #: builtin/show-branch.c:656
12763 msgid "show merges reachable from only one tip"
12764 msgstr "显示仅一个分支可访问的合并提交"
12766 #: builtin/show-branch.c:658
12767 msgid "topologically sort, maintaining date order where possible"
12768 msgstr "拓扑方式排序,并尽可能地保持日期顺序"
12770 #: builtin/show-branch.c:661
12771 msgid "<n>[,<base>]"
12772 msgstr "<n>[,<base>]"
12774 #: builtin/show-branch.c:662
12775 msgid "show <n> most recent ref-log entries starting at base"
12776 msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
12778 #: builtin/show-branch.c:696
12780 "--reflog is incompatible with --all, --remotes, --independent or --merge-base"
12781 msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不兼容"
12783 #: builtin/show-branch.c:720
12784 msgid "no branches given, and HEAD is not valid"
12785 msgstr "未提供分支,且 HEAD 无效"
12787 #: builtin/show-branch.c:723
12788 msgid "--reflog option needs one branch name"
12789 msgstr "选项 --reflog 需要一个分支名"
12791 #: builtin/show-branch.c:726
12793 msgid "only %d entry can be shown at one time."
12794 msgid_plural "only %d entries can be shown at one time."
12795 msgstr[0] "一次只能显示 %d 个条目。"
12796 msgstr[1] "一次只能显示 %d 个条目。"
12798 #: builtin/show-branch.c:730
12800 msgid "no such ref %s"
12803 #: builtin/show-branch.c:814
12805 msgid "cannot handle more than %d rev."
12806 msgid_plural "cannot handle more than %d revs."
12807 msgstr[0] "不能处理 %d 个以上的版本。"
12808 msgstr[1] "不能处理 %d 个以上的版本。"
12810 #: builtin/show-branch.c:818
12812 msgid "'%s' is not a valid ref."
12813 msgstr "'%s' 不是一个有效的引用。"
12815 #: builtin/show-branch.c:821
12817 msgid "cannot find commit %s (%s)"
12818 msgstr "不能找到提交 %s(%s)"
12820 #: builtin/show-ref.c:10
12822 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
12823 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
12825 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
12826 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
12828 #: builtin/show-ref.c:11
12829 msgid "git show-ref --exclude-existing[=<pattern>]"
12830 msgstr "git show-ref --exclude-existing[=<模式>]"
12832 #: builtin/show-ref.c:159
12833 msgid "only show tags (can be combined with heads)"
12834 msgstr "只显示标签(可以和头共用)"
12836 #: builtin/show-ref.c:160
12837 msgid "only show heads (can be combined with tags)"
12838 msgstr "只显示头(可以和标签共用)"
12840 #: builtin/show-ref.c:161
12841 msgid "stricter reference checking, requires exact ref path"
12842 msgstr "更严格的引用检测,需要精确的引用路径"
12844 #: builtin/show-ref.c:164 builtin/show-ref.c:166
12845 msgid "show the HEAD reference, even if it would be filtered out"
12846 msgstr "显示 HEAD 引用,即使被过滤掉"
12848 #: builtin/show-ref.c:168
12849 msgid "dereference tags into object IDs"
12850 msgstr "转换标签到对象 ID"
12852 #: builtin/show-ref.c:170
12853 msgid "only show SHA1 hash using <n> digits"
12854 msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
12856 #: builtin/show-ref.c:174
12857 msgid "do not print results to stdout (useful with --verify)"
12858 msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
12860 #: builtin/show-ref.c:176
12861 msgid "show refs from stdin that aren't in local repository"
12862 msgstr "显示从标准输入中读入的不在本地仓库中的引用"
12864 #: builtin/stripspace.c:17
12865 msgid "git stripspace [-s | --strip-comments]"
12866 msgstr "git stripspace [-s | --strip-comments]"
12868 #: builtin/stripspace.c:18
12869 msgid "git stripspace [-c | --comment-lines]"
12870 msgstr "git stripspace [-c | --comment-lines]"
12872 #: builtin/stripspace.c:35
12873 msgid "skip and remove all lines starting with comment character"
12874 msgstr "跳过和移除所有的注释行"
12876 #: builtin/stripspace.c:38
12877 msgid "prepend comment character and space to each line"
12878 msgstr "为每一行的行首添加注释符和空格"
12880 #: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1075
12882 msgid "No such ref: %s"
12883 msgstr "没有这样的引用:%s"
12885 #: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1084
12887 msgid "Expecting a full ref name, got %s"
12888 msgstr "期望一个完整的引用名称,却得到 %s"
12890 #: builtin/submodule--helper.c:71
12892 msgid "cannot strip one component off url '%s'"
12893 msgstr "无法从 url '%s' 剥离一个组件"
12895 #: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630
12896 msgid "alternative anchor for relative paths"
12897 msgstr "相对路径的替代锚记(anchor)"
12899 #: builtin/submodule--helper.c:310
12900 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
12901 msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
12903 #: builtin/submodule--helper.c:356 builtin/submodule--helper.c:382
12905 msgid "No url found for submodule path '%s' in .gitmodules"
12906 msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url"
12908 #: builtin/submodule--helper.c:395
12911 "could not lookup configuration '%s'. Assuming this repository is its own "
12912 "authoritative upstream."
12913 msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。"
12915 #: builtin/submodule--helper.c:406
12917 msgid "Failed to register url for submodule path '%s'"
12918 msgstr "无法为子模组 '%s' 注册 url"
12920 #: builtin/submodule--helper.c:410
12922 msgid "Submodule '%s' (%s) registered for path '%s'\n"
12923 msgstr "子模组 '%s'(%s)未对路径 '%s' 注册\n"
12926 #: builtin/submodule--helper.c:420
12928 msgid "warning: command update mode suggested for submodule '%s'\n"
12929 msgstr "警告:建议子模组 '%s' 使用命令更新模式\n"
12931 #: builtin/submodule--helper.c:427
12933 msgid "Failed to register update mode for submodule path '%s'"
12934 msgstr "无法为子模组 '%s' 注册更新模式"
12936 #: builtin/submodule--helper.c:443
12937 msgid "Suppress output for initializing a submodule"
12938 msgstr "初始化子模组时抑制输出"
12940 #: builtin/submodule--helper.c:448
12941 msgid "git submodule--helper init [<path>]"
12942 msgstr "git submodule--helper init [<路径>]"
12944 #: builtin/submodule--helper.c:476
12945 msgid "git submodule--helper name <path>"
12946 msgstr "git submodule--helper name <路径>"
12948 #: builtin/submodule--helper.c:482
12950 msgid "no submodule mapping found in .gitmodules for path '%s'"
12951 msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射"
12953 #: builtin/submodule--helper.c:565 builtin/submodule--helper.c:568
12955 msgid "submodule '%s' cannot add alternate: %s"
12956 msgstr "子模组 '%s' 不能添加仓库备选:%s"
12958 #: builtin/submodule--helper.c:604
12960 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
12961 msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'"
12963 #: builtin/submodule--helper.c:611
12965 msgid "Value '%s' for submodule.alternateLocation is not recognized"
12966 msgstr "不能识别 submodule.alternateLocaion 的取值 '%s'"
12968 #: builtin/submodule--helper.c:633
12969 msgid "where the new submodule will be cloned to"
12970 msgstr "新的子模组将要克隆的路径"
12972 #: builtin/submodule--helper.c:636
12973 msgid "name of the new submodule"
12976 #: builtin/submodule--helper.c:639
12977 msgid "url where to clone the submodule from"
12978 msgstr "克隆子模组的 url 地址"
12980 #: builtin/submodule--helper.c:645
12981 msgid "depth for shallow clones"
12984 #: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993
12985 msgid "force cloning progress"
12988 #: builtin/submodule--helper.c:653
12990 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
12991 "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
12993 "git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
12994 "[--name <名字>] [--depth <深度>] --url <url> --path <路径>"
12996 #: builtin/submodule--helper.c:684
12998 msgid "clone of '%s' into submodule path '%s' failed"
12999 msgstr "无法克隆 '%s' 到子模组路径 '%s'"
13001 #: builtin/submodule--helper.c:699
13003 msgid "could not get submodule directory for '%s'"
13004 msgstr "无法得到 '%s' 的子模组目录"
13006 #: builtin/submodule--helper.c:764
13008 msgid "Submodule path '%s' not initialized"
13009 msgstr "子模组 '%s' 尚未初始化"
13011 #: builtin/submodule--helper.c:768
13012 msgid "Maybe you want to use 'update --init'?"
13013 msgstr "也许您想要执行 'update --init'?"
13015 #: builtin/submodule--helper.c:793
13017 msgid "Skipping unmerged submodule %s"
13018 msgstr "略过未合并的子模组 %s"
13020 #: builtin/submodule--helper.c:814
13022 msgid "Skipping submodule '%s'"
13023 msgstr "略过子模组 '%s'"
13025 #: builtin/submodule--helper.c:942
13027 msgid "Failed to clone '%s'. Retry scheduled"
13028 msgstr "克隆 '%s' 失败。按计划重试"
13030 #: builtin/submodule--helper.c:953
13032 msgid "Failed to clone '%s' a second time, aborting"
13033 msgstr "第二次尝试克隆 '%s' 失败,退出"
13035 #: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162
13036 msgid "path into the working tree"
13039 #: builtin/submodule--helper.c:977
13040 msgid "path into the working tree, across nested submodule boundaries"
13041 msgstr "工作区中的路径,递归嵌套子模组"
13043 #: builtin/submodule--helper.c:981
13044 msgid "rebase, merge, checkout or none"
13045 msgstr "rebase、merge、checkout 或 none"
13047 #: builtin/submodule--helper.c:985
13048 msgid "Create a shallow clone truncated to the specified number of revisions"
13049 msgstr "创建一个指定深度的浅克隆"
13051 #: builtin/submodule--helper.c:988
13052 msgid "parallel jobs"
13055 #: builtin/submodule--helper.c:990
13056 msgid "whether the initial clone should follow the shallow recommendation"
13057 msgstr "初始克隆是否应该遵守推荐的浅克隆选项"
13059 #: builtin/submodule--helper.c:991
13060 msgid "don't print cloning progress"
13063 #: builtin/submodule--helper.c:998
13064 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
13065 msgstr "git submodule--helper update_clone [--prefix=<路径>] [<路径>...]"
13067 #: builtin/submodule--helper.c:1008
13068 msgid "bad value for update parameter"
13069 msgstr "update 参数取值错误"
13071 #: builtin/submodule--helper.c:1079
13074 "Submodule (%s) branch configured to inherit branch from superproject, but "
13075 "the superproject is not on any branch"
13076 msgstr "子模组(%s)的分支配置为继承上级项目的分支,但是上级项目不在任何分支上"
13078 #: builtin/submodule--helper.c:1163
13079 msgid "recurse into submodules"
13082 #: builtin/submodule--helper.c:1169
13083 msgid "git submodule--helper embed-git-dir [<path>...]"
13084 msgstr "git submodule--helper embed-git-dir [<路径>...]"
13086 #: builtin/submodule--helper.c:1226
13087 msgid "submodule--helper subcommand must be called with a subcommand"
13088 msgstr "submodule-helper 子命令必须由另外的子命令调用"
13090 #: builtin/submodule--helper.c:1233
13092 msgid "%s doesn't support --super-prefix"
13093 msgstr "%s 不支持 --super-prefix"
13095 #: builtin/submodule--helper.c:1239
13097 msgid "'%s' is not a valid submodule--helper subcommand"
13098 msgstr "'%s' 不是一个有效的 submodule--helper 子命令"
13100 #: builtin/symbolic-ref.c:7
13101 msgid "git symbolic-ref [<options>] <name> [<ref>]"
13102 msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
13104 #: builtin/symbolic-ref.c:8
13105 msgid "git symbolic-ref -d [-q] <name>"
13106 msgstr "git symbolic-ref -d [-q] <名称>"
13108 #: builtin/symbolic-ref.c:40
13109 msgid "suppress error message for non-symbolic (detached) refs"
13110 msgstr "不显示非符号(分离的)引用的错误信息"
13112 #: builtin/symbolic-ref.c:41
13113 msgid "delete symbolic ref"
13116 #: builtin/symbolic-ref.c:42
13117 msgid "shorten ref output"
13120 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
13124 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
13125 msgid "reason of the update"
13128 #: builtin/tag.c:23
13130 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
13133 "git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]"
13135 #: builtin/tag.c:24
13136 msgid "git tag -d <tagname>..."
13137 msgstr "git tag -d <标签名>..."
13139 #: builtin/tag.c:25
13141 "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
13142 "points-at <object>]\n"
13143 "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
13145 "git tag -l [-n[<数字>]] [--contains <提交>] [--no-contains <提交>] [--points-"
13147 "\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]"
13149 #: builtin/tag.c:27
13150 msgid "git tag -v [--format=<format>] <tagname>..."
13151 msgstr "git tag -v [--format=<格式>] <标签名>..."
13153 #: builtin/tag.c:83
13155 msgid "tag '%s' not found."
13156 msgstr "未发现标签 '%s'。"
13158 #: builtin/tag.c:99
13160 msgid "Deleted tag '%s' (was %s)\n"
13161 msgstr "已删除标签 '%s'(曾为 %s)\n"
13163 #: builtin/tag.c:128
13167 "Write a message for tag:\n"
13169 "Lines starting with '%c' will be ignored.\n"
13174 "以 '%c' 开头的行将被忽略。\n"
13176 #: builtin/tag.c:132
13180 "Write a message for tag:\n"
13182 "Lines starting with '%c' will be kept; you may remove them yourself if you "
13188 "以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
13190 #: builtin/tag.c:210
13191 msgid "unable to sign the tag"
13194 #: builtin/tag.c:212
13195 msgid "unable to write tag file"
13198 #: builtin/tag.c:236
13199 msgid "bad object type."
13202 #: builtin/tag.c:282
13203 msgid "no tag message?"
13206 #: builtin/tag.c:289
13208 msgid "The tag message has been left in %s\n"
13209 msgstr "标签说明被保留在 %s\n"
13211 #: builtin/tag.c:312
13212 msgid "tag: tagging "
13213 msgstr "tag: tagging "
13215 #: builtin/tag.c:320
13216 msgid "object of unknown type"
13219 #: builtin/tag.c:327
13220 msgid "commit object"
13223 #: builtin/tag.c:335
13224 msgid "tree object"
13227 #: builtin/tag.c:338
13228 msgid "blob object"
13231 #: builtin/tag.c:341
13232 msgid "other tag object"
13235 #: builtin/tag.c:397
13236 msgid "list tag names"
13239 #: builtin/tag.c:399
13240 msgid "print <n> lines of each tag message"
13241 msgstr "每个标签信息打印 <n> 行"
13243 #: builtin/tag.c:401
13244 msgid "delete tags"
13247 #: builtin/tag.c:402
13248 msgid "verify tags"
13251 #: builtin/tag.c:404
13252 msgid "Tag creation options"
13255 #: builtin/tag.c:406
13256 msgid "annotated tag, needs a message"
13257 msgstr "附注标签,需要一个说明"
13259 #: builtin/tag.c:408
13260 msgid "tag message"
13263 #: builtin/tag.c:410
13264 msgid "annotated and GPG-signed tag"
13265 msgstr "附注并附加 GPG 签名的标签"
13267 #: builtin/tag.c:414
13268 msgid "use another key to sign the tag"
13269 msgstr "使用另外的私钥签名该标签"
13271 #: builtin/tag.c:415
13272 msgid "replace the tag if exists"
13273 msgstr "如果存在,替换现有的标签"
13275 #: builtin/tag.c:416 builtin/update-ref.c:368
13276 msgid "create a reflog"
13279 #: builtin/tag.c:418
13280 msgid "Tag listing options"
13283 #: builtin/tag.c:419
13284 msgid "show tag list in columns"
13285 msgstr "以列的方式显示标签列表"
13287 #: builtin/tag.c:420 builtin/tag.c:422
13288 msgid "print only tags that contain the commit"
13289 msgstr "只打印包含该提交的标签"
13291 #: builtin/tag.c:421 builtin/tag.c:423
13292 msgid "print only tags that don't contain the commit"
13293 msgstr "只打印不包含该提交的标签"
13295 #: builtin/tag.c:424
13296 msgid "print only tags that are merged"
13297 msgstr "只打印已经合并的标签"
13299 #: builtin/tag.c:425
13300 msgid "print only tags that are not merged"
13301 msgstr "只打印尚未合并的标签"
13303 #: builtin/tag.c:430
13304 msgid "print only tags of the object"
13305 msgstr "只打印指向该对象的标签"
13307 #: builtin/tag.c:469
13308 msgid "--column and -n are incompatible"
13309 msgstr "--column 和 -n 不兼容"
13311 #: builtin/tag.c:491
13312 msgid "-n option is only allowed in list mode"
13313 msgstr "-n 选项只允许用在列表显示模式"
13315 #: builtin/tag.c:493
13316 msgid "--contains option is only allowed in list mode"
13317 msgstr "--contains 选项只允许用在列表显示模式"
13319 #: builtin/tag.c:495
13320 msgid "--no-contains option is only allowed in list mode"
13321 msgstr "--no-contains 选项只允许用在列表显示模式"
13323 #: builtin/tag.c:497
13324 msgid "--points-at option is only allowed in list mode"
13325 msgstr "--points-at 选项只允许用在列表显示模式"
13327 #: builtin/tag.c:499
13328 msgid "--merged and --no-merged options are only allowed in list mode"
13329 msgstr "--merged 和 --no-merged 选项只允许用在列表显示模式"
13331 #: builtin/tag.c:510
13332 msgid "only one -F or -m option is allowed."
13333 msgstr "只允许一个 -F 或 -m 选项。"
13335 #: builtin/tag.c:529
13336 msgid "too many params"
13339 #: builtin/tag.c:535
13341 msgid "'%s' is not a valid tag name."
13342 msgstr "'%s' 不是一个有效的标签名称。"
13344 #: builtin/tag.c:540
13346 msgid "tag '%s' already exists"
13347 msgstr "标签 '%s' 已存在"
13349 #: builtin/tag.c:570
13351 msgid "Updated tag '%s' (was %s)\n"
13352 msgstr "已更新标签 '%s'(曾为 %s)\n"
13354 #: builtin/unpack-objects.c:493
13355 msgid "Unpacking objects"
13358 #: builtin/update-index.c:79
13360 msgid "failed to create directory %s"
13363 #: builtin/update-index.c:85
13365 msgid "failed to stat %s"
13366 msgstr "无法枚举 %s 状态"
13368 #: builtin/update-index.c:95
13370 msgid "failed to create file %s"
13373 #: builtin/update-index.c:103
13375 msgid "failed to delete file %s"
13378 #: builtin/update-index.c:110 builtin/update-index.c:216
13380 msgid "failed to delete directory %s"
13383 #: builtin/update-index.c:135
13385 msgid "Testing mtime in '%s' "
13386 msgstr "在 '%s' 中测试 mtime "
13388 #: builtin/update-index.c:149
13389 msgid "directory stat info does not change after adding a new file"
13390 msgstr "添加一个新文件后,目录的状态信息未改变"
13392 #: builtin/update-index.c:162
13393 msgid "directory stat info does not change after adding a new directory"
13394 msgstr "添加一个新目录后,目录的状态信息未改变"
13396 #: builtin/update-index.c:175
13397 msgid "directory stat info changes after updating a file"
13398 msgstr "更新一个文件后,目录的状态信息被修改"
13400 #: builtin/update-index.c:186
13401 msgid "directory stat info changes after adding a file inside subdirectory"
13402 msgstr "在子目录中添加文件后,目录的状态信息被修改"
13404 #: builtin/update-index.c:197
13405 msgid "directory stat info does not change after deleting a file"
13406 msgstr "删除一个文件后,目录的状态信息未改变"
13408 #: builtin/update-index.c:210
13409 msgid "directory stat info does not change after deleting a directory"
13410 msgstr "删除一个目录后,目录的状态信息未改变"
13412 #: builtin/update-index.c:217
13416 #: builtin/update-index.c:568
13417 msgid "git update-index [<options>] [--] [<file>...]"
13418 msgstr "git update-index [<选项>] [--] [<文件>...]"
13420 #: builtin/update-index.c:923
13421 msgid "continue refresh even when index needs update"
13422 msgstr "当索引需要更新时继续刷新"
13424 #: builtin/update-index.c:926
13425 msgid "refresh: ignore submodules"
13428 #: builtin/update-index.c:929
13429 msgid "do not ignore new files"
13432 #: builtin/update-index.c:931
13433 msgid "let files replace directories and vice-versa"
13434 msgstr "让文件替换目录(反之亦然)"
13436 #: builtin/update-index.c:933
13437 msgid "notice files missing from worktree"
13438 msgstr "通知文件从工作区丢失"
13440 #: builtin/update-index.c:935
13441 msgid "refresh even if index contains unmerged entries"
13442 msgstr "即使索引区包含未合并的条目也执行刷新"
13444 #: builtin/update-index.c:938
13445 msgid "refresh stat information"
13448 #: builtin/update-index.c:942
13449 msgid "like --refresh, but ignore assume-unchanged setting"
13450 msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
13452 #: builtin/update-index.c:946
13453 msgid "<mode>,<object>,<path>"
13454 msgstr "<存取模式>,<对象>,<路径>"
13456 #: builtin/update-index.c:947
13457 msgid "add the specified entry to the index"
13458 msgstr "添加指定的条目到索引区"
13460 #: builtin/update-index.c:956
13461 msgid "mark files as \"not changing\""
13462 msgstr "把文件标记为 \"没有变更\""
13464 #: builtin/update-index.c:959
13465 msgid "clear assumed-unchanged bit"
13466 msgstr "清除 assumed-unchanged 位"
13468 #: builtin/update-index.c:962
13469 msgid "mark files as \"index-only\""
13470 msgstr "把文件标记为 \"仅索引\""
13472 #: builtin/update-index.c:965
13473 msgid "clear skip-worktree bit"
13474 msgstr "清除 skip-worktree 位"
13476 #: builtin/update-index.c:968
13477 msgid "add to index only; do not add content to object database"
13478 msgstr "只添加到索引区;不添加对象到对象库"
13480 #: builtin/update-index.c:970
13481 msgid "remove named paths even if present in worktree"
13482 msgstr "即使存在工作区里,也删除路径"
13484 #: builtin/update-index.c:972
13485 msgid "with --stdin: input lines are terminated by null bytes"
13486 msgstr "携带 --stdin:输入的行以 null 字符终止"
13488 #: builtin/update-index.c:974
13489 msgid "read list of paths to be updated from standard input"
13490 msgstr "从标准输入中读取需要更新的路径列表"
13492 #: builtin/update-index.c:978
13493 msgid "add entries from standard input to the index"
13494 msgstr "从标准输入添加条目到索引区"
13496 #: builtin/update-index.c:982
13497 msgid "repopulate stages #2 and #3 for the listed paths"
13498 msgstr "为指定文件重新生成第2和第3暂存区"
13500 #: builtin/update-index.c:986
13501 msgid "only update entries that differ from HEAD"
13502 msgstr "只更新与 HEAD 不同的条目"
13504 #: builtin/update-index.c:990
13505 msgid "ignore files missing from worktree"
13506 msgstr "忽略工作区丢失的文件"
13508 #: builtin/update-index.c:993
13509 msgid "report actions to standard output"
13512 #: builtin/update-index.c:995
13513 msgid "(for porcelains) forget saved unresolved conflicts"
13514 msgstr "(for porcelains) 忘记保存的未解决的冲突"
13516 #: builtin/update-index.c:999
13517 msgid "write index in this format"
13518 msgstr "以这种格式写入索引区"
13520 #: builtin/update-index.c:1001
13521 msgid "enable or disable split index"
13524 #: builtin/update-index.c:1003
13525 msgid "enable/disable untracked cache"
13526 msgstr "启用/禁用对未跟踪文件的缓存"
13528 #: builtin/update-index.c:1005
13529 msgid "test if the filesystem supports untracked cache"
13530 msgstr "测试文件系统是否支持未跟踪文件缓存"
13532 #: builtin/update-index.c:1007
13533 msgid "enable untracked cache without testing the filesystem"
13534 msgstr "无需检测文件系统,启用对未跟踪文件的缓存"
13536 #: builtin/update-index.c:1107
13538 "core.splitIndex is set to false; remove or change it, if you really want to "
13539 "enable split index"
13541 "core.splitIndex 被设置为 false。如果您确实要启用索引拆分,请删除或修改它。"
13543 #: builtin/update-index.c:1116
13545 "core.splitIndex is set to true; remove or change it, if you really want to "
13546 "disable split index"
13548 "core.splitIndex 被设置为 true。如果您确实要禁用索引拆分,请删除或修改它。"
13550 #: builtin/update-index.c:1127
13552 "core.untrackedCache is set to true; remove or change it, if you really want "
13553 "to disable the untracked cache"
13555 "core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存,请删除或修"
13558 #: builtin/update-index.c:1131
13559 msgid "Untracked cache disabled"
13560 msgstr "缓存未跟踪文件被禁用"
13562 #: builtin/update-index.c:1139
13564 "core.untrackedCache is set to false; remove or change it, if you really want "
13565 "to enable the untracked cache"
13567 "core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存,请删除或"
13570 #: builtin/update-index.c:1143
13572 msgid "Untracked cache enabled for '%s'"
13573 msgstr "缓存未跟踪文件在 '%s' 启用"
13575 #: builtin/update-ref.c:9
13576 msgid "git update-ref [<options>] -d <refname> [<old-val>]"
13577 msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
13579 #: builtin/update-ref.c:10
13580 msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
13581 msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]"
13583 #: builtin/update-ref.c:11
13584 msgid "git update-ref [<options>] --stdin [-z]"
13585 msgstr "git update-ref [<选项>] --stdin [-z]"
13587 #: builtin/update-ref.c:363
13588 msgid "delete the reference"
13591 #: builtin/update-ref.c:365
13592 msgid "update <refname> not the one it points to"
13593 msgstr "更新 <引用名> 本身而不是它指向的引用"
13595 #: builtin/update-ref.c:366
13596 msgid "stdin has NUL-terminated arguments"
13597 msgstr "标准输入有以 NUL 字符终止的参数"
13599 #: builtin/update-ref.c:367
13600 msgid "read updates from stdin"
13603 #: builtin/update-server-info.c:6
13604 msgid "git update-server-info [--force]"
13605 msgstr "git update-server-info [--force]"
13607 #: builtin/update-server-info.c:14
13608 msgid "update the info files from scratch"
13609 msgstr "从头开始更新文件信息"
13611 #: builtin/verify-commit.c:17
13612 msgid "git verify-commit [-v | --verbose] <commit>..."
13613 msgstr "git verify-commit [-v | --verbose] <提交>..."
13615 #: builtin/verify-commit.c:72
13616 msgid "print commit contents"
13619 #: builtin/verify-commit.c:73 builtin/verify-tag.c:37
13620 msgid "print raw gpg status output"
13621 msgstr "打印原始 gpg 状态输出"
13623 #: builtin/verify-pack.c:54
13624 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
13625 msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
13627 #: builtin/verify-pack.c:64
13631 #: builtin/verify-pack.c:66
13632 msgid "show statistics only"
13635 #: builtin/verify-tag.c:18
13636 msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
13637 msgstr "git verify-tag [-v | --verbose] [--format=<格式>] <标签>..."
13639 #: builtin/verify-tag.c:36
13640 msgid "print tag contents"
13643 #: builtin/worktree.c:15
13644 msgid "git worktree add [<options>] <path> [<branch>]"
13645 msgstr "git worktree add [<选项>] <路径> [<分支>]"
13647 #: builtin/worktree.c:16
13648 msgid "git worktree list [<options>]"
13649 msgstr "git worktree list [<选项>]"
13651 #: builtin/worktree.c:17
13652 msgid "git worktree lock [<options>] <path>"
13653 msgstr "git worktree lock [<选项>] <路径>"
13655 #: builtin/worktree.c:18
13656 msgid "git worktree prune [<options>]"
13657 msgstr "git worktree prune [<选项>]"
13659 #: builtin/worktree.c:19
13660 msgid "git worktree unlock <path>"
13661 msgstr "git worktree unlock <路径>"
13663 #: builtin/worktree.c:42
13665 msgid "Removing worktrees/%s: not a valid directory"
13666 msgstr "删除工作区/%s:不是一个有效的目录"
13668 #: builtin/worktree.c:48
13670 msgid "Removing worktrees/%s: gitdir file does not exist"
13671 msgstr "删除 worktrees/%s:gitdir 文件不存在"
13673 #: builtin/worktree.c:53
13675 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
13676 msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)"
13678 #: builtin/worktree.c:64
13680 msgid "Removing worktrees/%s: invalid gitdir file"
13681 msgstr "删除 worktrees/%s:无效的 gitdir 文件"
13683 #: builtin/worktree.c:80
13685 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
13686 msgstr "删除 worktrees/%s:gitdir 文件的指向不存在"
13688 #: builtin/worktree.c:128
13689 msgid "report pruned working trees"
13692 #: builtin/worktree.c:130
13693 msgid "expire working trees older than <time>"
13694 msgstr "将早于 <time> 的工作区过期"
13696 #: builtin/worktree.c:204
13698 msgid "'%s' already exists"
13701 #: builtin/worktree.c:236
13703 msgid "could not create directory of '%s'"
13704 msgstr "不能创建目录 '%s'"
13706 #: builtin/worktree.c:272
13708 msgid "Preparing %s (identifier %s)"
13709 msgstr "准备 %s(标识符 %s)"
13711 #: builtin/worktree.c:324
13712 msgid "checkout <branch> even if already checked out in other worktree"
13713 msgstr "检出分支 <branch> 即使已经被检出到其它工作区"
13715 #: builtin/worktree.c:326
13716 msgid "create a new branch"
13719 #: builtin/worktree.c:328
13720 msgid "create or reset a branch"
13723 #: builtin/worktree.c:330
13724 msgid "populate the new working tree"
13727 #: builtin/worktree.c:338
13728 msgid "-b, -B, and --detach are mutually exclusive"
13729 msgstr "-b、-B 和 --detach 是互斥的"
13731 #: builtin/worktree.c:473
13732 msgid "reason for locking"
13735 #: builtin/worktree.c:485 builtin/worktree.c:518
13737 msgid "'%s' is not a working tree"
13738 msgstr "'%s' 不是一个工作区"
13740 #: builtin/worktree.c:487 builtin/worktree.c:520
13741 msgid "The main working tree cannot be locked or unlocked"
13742 msgstr "主工作区无法被加锁或解锁"
13744 #: builtin/worktree.c:492
13746 msgid "'%s' is already locked, reason: %s"
13747 msgstr "'%s' 已被锁定,原因:%s"
13749 #: builtin/worktree.c:494
13751 msgid "'%s' is already locked"
13754 #: builtin/worktree.c:522
13756 msgid "'%s' is not locked"
13759 #: builtin/write-tree.c:13
13760 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
13761 msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
13763 #: builtin/write-tree.c:26
13767 #: builtin/write-tree.c:27
13768 msgid "write tree object for a subdirectory <prefix>"
13769 msgstr "将 <前缀> 子目录内容写到一个树对象"
13771 #: builtin/write-tree.c:30
13772 msgid "only useful for debugging"
13775 #: upload-pack.c:22
13776 msgid "git upload-pack [<options>] <dir>"
13777 msgstr "git upload-pack [<选项>] <目录>"
13779 #: upload-pack.c:1040
13780 msgid "quit after a single request/response exchange"
13781 msgstr "在一次单独的请求/响应(request/response)交换后退出"
13783 #: upload-pack.c:1042
13784 msgid "exit immediately after initial ref advertisement"
13785 msgstr "在初始的引用广告后立即退出"
13787 #: upload-pack.c:1044
13788 msgid "do not try <directory>/.git/ if <directory> is no Git directory"
13789 msgstr "不要尝试 <directory>/.git/ 如果 <directory> 不是一个 Git 目录"
13791 #: upload-pack.c:1046
13792 msgid "interrupt transfer after <n> seconds of inactivity"
13793 msgstr "不活动 <n> 秒钟后终止传输"
13795 #: credential-cache--daemon.c:223
13798 "The permissions on your socket directory are too loose; other\n"
13799 "users may be able to read your cached credentials. Consider running:\n"
13803 "您的 socket 目录权限过于宽松,其他用户可能会读取您缓存的认证信息。考虑执"
13808 #: credential-cache--daemon.c:271
13809 msgid "print debugging messages to stderr"
13810 msgstr "调试信息输出到标准错误"
13814 "'git help -a' and 'git help -g' list available subcommands and some\n"
13815 "concept guides. See 'git help <command>' or 'git help <concept>'\n"
13816 "to read about a specific subcommand or concept."
13818 "命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
13819 "查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
13823 msgid "Delegation control is not supported with cURL < 7.22.0"
13824 msgstr "当 cURL < 7.22.0 时,不支持委托控制"
13827 msgid "Public key pinning not supported with cURL < 7.44.0"
13828 msgstr "不支持公钥文件锁定,因为 cURL < 7.44.0"
13833 "unable to update url base from redirection:\n"
13837 "不能更新重定向的 url base:\n"
13841 #: remote-curl.c:323
13843 msgid "redirecting to %s"
13847 msgid "start a working area (see also: git help tutorial)"
13848 msgstr "开始一个工作区(参见:git help tutorial)"
13850 #: common-cmds.h:10
13851 msgid "work on the current change (see also: git help everyday)"
13852 msgstr "在当前变更上工作(参见:git help everyday)"
13854 #: common-cmds.h:11
13855 msgid "examine the history and state (see also: git help revisions)"
13856 msgstr "检查历史和状态(参见:git help revisions)"
13858 #: common-cmds.h:12
13859 msgid "grow, mark and tweak your common history"
13860 msgstr "扩展、标记和调校您的历史记录"
13862 #: common-cmds.h:13
13863 msgid "collaborate (see also: git help workflows)"
13864 msgstr "协同(参见:git help workflows)"
13866 #: common-cmds.h:17
13867 msgid "Add file contents to the index"
13870 #: common-cmds.h:18
13871 msgid "Use binary search to find the commit that introduced a bug"
13872 msgstr "通过二分查找定位引入 bug 的提交"
13874 #: common-cmds.h:19
13875 msgid "List, create, or delete branches"
13876 msgstr "列出、创建或删除分支"
13878 #: common-cmds.h:20
13879 msgid "Switch branches or restore working tree files"
13880 msgstr "切换分支或恢复工作区文件"
13882 #: common-cmds.h:21
13883 msgid "Clone a repository into a new directory"
13884 msgstr "克隆一个仓库到一个新目录"
13886 #: common-cmds.h:22
13887 msgid "Record changes to the repository"
13890 #: common-cmds.h:23
13891 msgid "Show changes between commits, commit and working tree, etc"
13892 msgstr "显示提交之间、提交和工作区之间等的差异"
13894 #: common-cmds.h:24
13895 msgid "Download objects and refs from another repository"
13896 msgstr "从另外一个仓库下载对象和引用"
13898 #: common-cmds.h:25
13899 msgid "Print lines matching a pattern"
13902 #: common-cmds.h:26
13903 msgid "Create an empty Git repository or reinitialize an existing one"
13904 msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库"
13906 #: common-cmds.h:27
13907 msgid "Show commit logs"
13910 #: common-cmds.h:28
13911 msgid "Join two or more development histories together"
13912 msgstr "合并两个或更多开发历史"
13914 #: common-cmds.h:29
13915 msgid "Move or rename a file, a directory, or a symlink"
13916 msgstr "移动或重命名一个文件、目录或符号链接"
13918 #: common-cmds.h:30
13919 msgid "Fetch from and integrate with another repository or a local branch"
13920 msgstr "获取并整合另外的仓库或一个本地分支"
13922 #: common-cmds.h:31
13923 msgid "Update remote refs along with associated objects"
13924 msgstr "更新远程引用和相关的对象"
13926 #: common-cmds.h:32
13927 msgid "Reapply commits on top of another base tip"
13928 msgstr "在另一个分支上重新应用提交"
13930 #: common-cmds.h:33
13931 msgid "Reset current HEAD to the specified state"
13932 msgstr "重置当前 HEAD 到指定状态"
13934 #: common-cmds.h:34
13935 msgid "Remove files from the working tree and from the index"
13936 msgstr "从工作区和索引中删除文件"
13938 #: common-cmds.h:35
13939 msgid "Show various types of objects"
13942 #: common-cmds.h:36
13943 msgid "Show the working tree status"
13946 #: common-cmds.h:37
13947 msgid "Create, list, delete or verify a tag object signed with GPG"
13948 msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象"
13950 #: parse-options.h:145
13951 msgid "expiry-date"
13954 #: parse-options.h:160
13955 msgid "no-op (backward compatibility)"
13958 #: parse-options.h:238
13959 msgid "be more verbose"
13962 #: parse-options.h:240
13963 msgid "be more quiet"
13966 #: parse-options.h:246
13967 msgid "use <n> digits to display SHA-1s"
13968 msgstr "用 <n> 位数字显示 SHA-1 哈希值"
13971 msgid "update the index with reused conflict resolution if possible"
13972 msgstr "如果可能,重用冲突解决更新索引"
13974 #: git-bisect.sh:54
13975 msgid "You need to start by \"git bisect start\""
13976 msgstr "您需要执行 \"git bisect start\" 来开始"
13979 #. TRANSLATORS: Make sure to include [Y] and [n] in your
13980 #. translation. The program will only accept English input
13982 #: git-bisect.sh:60
13983 msgid "Do you want me to do it for you [Y/n]? "
13984 msgstr "您想让我为您这样做么[Y/n]? "
13986 #: git-bisect.sh:121
13988 msgid "unrecognised option: '$arg'"
13989 msgstr "未能识别的选项:'$arg'"
13991 #: git-bisect.sh:125
13993 msgid "'$arg' does not appear to be a valid revision"
13994 msgstr "'$arg' 看起来不像是一个有效的版本"
13996 #: git-bisect.sh:154
13997 msgid "Bad HEAD - I need a HEAD"
13998 msgstr "坏的 HEAD - 我需要一个 HEAD"
14000 #: git-bisect.sh:167
14003 "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
14004 msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。"
14006 #: git-bisect.sh:177
14007 msgid "won't bisect on cg-seek'ed tree"
14008 msgstr "不会在做了 cg-seek 的树上做二分查找"
14010 #: git-bisect.sh:181
14011 msgid "Bad HEAD - strange symbolic ref"
14012 msgstr "坏的 HEAD - 奇怪的符号引用"
14014 #: git-bisect.sh:233
14016 msgid "Bad bisect_write argument: $state"
14017 msgstr "坏的 bisect_write 参数:$state"
14019 #: git-bisect.sh:262
14021 msgid "Bad rev input: $arg"
14022 msgstr "坏的输入版本:$arg"
14024 #: git-bisect.sh:281
14026 msgid "Bad rev input: $bisected_head"
14027 msgstr "坏的输入版本:$bisected_head"
14029 #: git-bisect.sh:290
14031 msgid "Bad rev input: $rev"
14032 msgstr "坏的输入版本:$rev"
14034 #: git-bisect.sh:299
14036 msgid "'git bisect $TERM_BAD' can take only one argument."
14037 msgstr "'git bisect $TERM_BAD' 只能带一个参数。"
14039 #: git-bisect.sh:322
14041 msgid "Warning: bisecting only with a $TERM_BAD commit."
14042 msgstr "警告:在仅有一个坏($TERM_BAD)提交下进行二分查找。"
14045 #. TRANSLATORS: Make sure to include [Y] and [n] in your
14046 #. translation. The program will only accept English input
14048 #: git-bisect.sh:328
14049 msgid "Are you sure [Y/n]? "
14050 msgstr "您确认么[Y/n]? "
14052 #: git-bisect.sh:340
14055 "You need to give me at least one $bad_syn and one $good_syn revision.\n"
14056 "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
14058 "您需要给我至少一个好版本和一个坏版本。\n"
14059 "(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
14061 #: git-bisect.sh:343
14064 "You need to start by \"git bisect start\".\n"
14065 "You then need to give me at least one $good_syn and one $bad_syn revision.\n"
14066 "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
14068 "您需要执行 \"git bisect start\" 来开始。\n"
14069 "然后需要提供我至少一个好版本和一个坏版本。\n"
14070 "(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
14072 #: git-bisect.sh:414 git-bisect.sh:546
14073 msgid "We are not bisecting."
14074 msgstr "我们没有在二分查找。"
14076 #: git-bisect.sh:421
14078 msgid "'$invalid' is not a valid commit"
14079 msgstr "'$invalid' 不是一个有效的提交"
14081 #: git-bisect.sh:430
14084 "Could not check out original HEAD '$branch'.\n"
14085 "Try 'git bisect reset <commit>'."
14087 "不能检出原始 HEAD '$branch'。\n"
14088 "尝试 'git bisect reset <提交>'。"
14090 #: git-bisect.sh:458
14091 msgid "No logfile given"
14094 #: git-bisect.sh:459
14096 msgid "cannot read $file for replaying"
14097 msgstr "不能读取 $file 来重放"
14099 #: git-bisect.sh:480
14100 msgid "?? what are you talking about?"
14103 #: git-bisect.sh:492
14105 msgid "running $command"
14106 msgstr "运行 $command"
14108 #: git-bisect.sh:499
14111 "bisect run failed:\n"
14112 "exit code $res from '$command' is < 0 or >= 128"
14115 "命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
14117 #: git-bisect.sh:525
14118 msgid "bisect run cannot continue any more"
14119 msgstr "二分查找不能继续运行"
14121 #: git-bisect.sh:531
14124 "bisect run failed:\n"
14125 "'bisect_state $state' exited with error code $res"
14128 "'bisect_state $state' 退出码为 $res"
14130 #: git-bisect.sh:538
14131 msgid "bisect run success"
14134 #: git-bisect.sh:565
14135 msgid "please use two different terms"
14136 msgstr "请使用两个不同的术语"
14138 #: git-bisect.sh:575
14140 msgid "'$term' is not a valid term"
14141 msgstr "'$term' 不是一个有效的名称"
14143 #: git-bisect.sh:578
14145 msgid "can't use the builtin command '$term' as a term"
14146 msgstr "不能使用内置命令 '$term' 作为术语"
14148 #: git-bisect.sh:587 git-bisect.sh:593
14150 msgid "can't change the meaning of term '$term'"
14151 msgstr "不能修改术语 '$term' 的含义"
14153 #: git-bisect.sh:606
14155 msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
14156 msgstr "无效的命令:您当前正处于一个 $TERM_BAD/$TERM_GOOD 二分查找。"
14158 #: git-bisect.sh:636
14159 msgid "no terms defined"
14162 #: git-bisect.sh:653
14165 "invalid argument $arg for 'git bisect terms'.\n"
14166 "Supported options are: --term-good|--term-old and --term-bad|--term-new."
14168 "参数 $arg 对命令 'git bisect terms' 无效。\n"
14169 "支持的选项有:--term-good|--term-old 和 --term-bad|--term-new。"
14171 #: git-merge-octopus.sh:46
14173 "Error: Your local changes to the following files would be overwritten by "
14175 msgstr "错误:您对下列文件的本地修改将被合并操作覆盖"
14177 #: git-merge-octopus.sh:61
14178 msgid "Automated merge did not work."
14181 #: git-merge-octopus.sh:62
14182 msgid "Should not be doing an octopus."
14183 msgstr "不应该执行章鱼式合并。"
14185 #: git-merge-octopus.sh:73
14187 msgid "Unable to find common commit with $pretty_name"
14188 msgstr "无法找到和 $pretty_name 的基线提交"
14190 #: git-merge-octopus.sh:77
14192 msgid "Already up-to-date with $pretty_name"
14193 msgstr "已经和 $pretty_name 保持一致"
14195 #: git-merge-octopus.sh:89
14197 msgid "Fast-forwarding to: $pretty_name"
14198 msgstr "快进至:$pretty_name"
14200 #: git-merge-octopus.sh:97
14202 msgid "Trying simple merge with $pretty_name"
14203 msgstr "尝试和 $pretty_name 的简单合并"
14205 #: git-merge-octopus.sh:102
14206 msgid "Simple merge did not work, trying automatic merge."
14207 msgstr "简单合并未生效,尝试自动合并。"
14209 #: git-rebase.sh:57
14211 "When you have resolved this problem, run \"git rebase --continue\".\n"
14212 "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
14213 "To check out the original branch and stop rebasing, run \"git rebase --abort"
14216 "当您解决了此问题后,执行 \"git rebase --continue\"。\n"
14217 "如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
14218 "要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
14220 #: git-rebase.sh:157 git-rebase.sh:396
14222 msgid "Could not move back to $head_name"
14223 msgstr "无法移回 $head_name"
14225 #: git-rebase.sh:171
14227 msgid "Cannot store $stash_sha1"
14228 msgstr "无法保存 $stash_sha1"
14230 #: git-rebase.sh:211
14231 msgid "The pre-rebase hook refused to rebase."
14232 msgstr "钩子 pre-rebase 拒绝变基操作。"
14234 #: git-rebase.sh:216
14235 msgid "It looks like git-am is in progress. Cannot rebase."
14236 msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
14238 #: git-rebase.sh:357
14239 msgid "No rebase in progress?"
14240 msgstr "没有正在进行的变基?"
14242 #: git-rebase.sh:368
14243 msgid "The --edit-todo action can only be used during interactive rebase."
14244 msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
14246 #: git-rebase.sh:375
14247 msgid "Cannot read HEAD"
14250 #: git-rebase.sh:378
14252 "You must edit all merge conflicts and then\n"
14253 "mark them as resolved using git add"
14255 "您必须编辑所有的合并冲突,然后通过 git add\n"
14258 #: git-rebase.sh:418
14261 "It seems that there is already a $state_dir_base directory, and\n"
14262 "I wonder if you are in the middle of another rebase. If that is the\n"
14263 "case, please try\n"
14264 "\t$cmd_live_rebase\n"
14265 "If that is not the case, please\n"
14266 "\t$cmd_clear_stale_rebase\n"
14267 "and run me again. I am stopping in case you still have something\n"
14270 "好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n"
14272 "\t$cmd_live_rebase\n"
14274 "\t$cmd_clear_stale_rebase\n"
14275 "然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。"
14277 #: git-rebase.sh:469
14279 msgid "invalid upstream $upstream_name"
14280 msgstr "无效的上游 $upstream_name"
14282 #: git-rebase.sh:493
14284 msgid "$onto_name: there are more than one merge bases"
14285 msgstr "$onto_name: 有一个以上的合并基准"
14287 #: git-rebase.sh:496 git-rebase.sh:500
14289 msgid "$onto_name: there is no merge base"
14290 msgstr "$onto_name: 没有合并基准"
14292 #: git-rebase.sh:505
14294 msgid "Does not point to a valid commit: $onto_name"
14295 msgstr "没有指向一个有效的提交:$onto_name"
14297 #: git-rebase.sh:528
14299 msgid "fatal: no such branch: $branch_name"
14300 msgstr "严重错误:无此分支:$branch_name"
14302 #: git-rebase.sh:561
14303 msgid "Cannot autostash"
14304 msgstr "无法 autostash"
14306 #: git-rebase.sh:566
14308 msgid "Created autostash: $stash_abbrev"
14309 msgstr "创建了 autostash: $stash_abbrev"
14311 #: git-rebase.sh:570
14312 msgid "Please commit or stash them."
14313 msgstr "请提交或为它们保存进度。"
14315 #: git-rebase.sh:590
14317 msgid "Current branch $branch_name is up to date."
14318 msgstr "当前分支 $branch_name 是最新的。"
14320 #: git-rebase.sh:594
14322 msgid "Current branch $branch_name is up to date, rebase forced."
14323 msgstr "当前分支 $branch_name 是最新的,强制变基。"
14325 #: git-rebase.sh:605
14327 msgid "Changes from $mb to $onto:"
14328 msgstr "变更从 $mb 到 $onto:"
14330 #: git-rebase.sh:614
14331 msgid "First, rewinding head to replay your work on top of it..."
14332 msgstr "首先,回退分支以便在上面重放您的工作..."
14334 #: git-rebase.sh:624
14336 msgid "Fast-forwarded $branch_name to $onto_name."
14337 msgstr "快进 $branch_name 至 $onto_name。"
14340 msgid "git stash clear with parameters is unimplemented"
14341 msgstr "git stash clear 不支持参数"
14344 msgid "You do not have the initial commit yet"
14347 #: git-stash.sh:109
14348 msgid "Cannot save the current index state"
14349 msgstr "无法保存当前索引状态"
14351 #: git-stash.sh:124
14352 msgid "Cannot save the untracked files"
14355 #: git-stash.sh:144 git-stash.sh:157
14356 msgid "Cannot save the current worktree state"
14357 msgstr "无法保存当前工作区状态"
14359 #: git-stash.sh:161
14360 msgid "No changes selected"
14363 #: git-stash.sh:164
14364 msgid "Cannot remove temporary index (can't happen)"
14365 msgstr "无法删除临时索引(不应发生)"
14367 #: git-stash.sh:177
14368 msgid "Cannot record working tree state"
14371 #: git-stash.sh:209
14373 msgid "Cannot update $ref_stash with $w_commit"
14374 msgstr "无法用 $w_commit 更新 $ref_stash"
14376 #. TRANSLATORS: $option is an invalid option, like
14377 #. `--blah-blah'. The 7 spaces at the beginning of the
14378 #. second line correspond to "error: ". So you should line
14379 #. up the second line with however many characters the
14380 #. translation of "error: " takes in your language. E.g. in
14381 #. English this is:
14383 #. $ git stash save --blah-blah 2>&1 | head -n 2
14384 #. error: unknown option for 'stash save': --blah-blah
14385 #. To provide a message, use git stash save -- '--blah-blah'
14386 #: git-stash.sh:265
14389 "error: unknown option for 'stash save': $option\n"
14390 " To provide a message, use git stash save -- '$option'"
14392 "错误:'stash save' 的未知选项:$option\n"
14393 " 要提供一个描述信息,使用 git stash save -- '$option'"
14395 #: git-stash.sh:278
14396 msgid "Can't use --patch and --include-untracked or --all at the same time"
14397 msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all"
14399 #: git-stash.sh:286
14400 msgid "No local changes to save"
14401 msgstr "没有要保存的本地修改"
14403 #: git-stash.sh:291
14404 msgid "Cannot initialize stash"
14405 msgstr "无法初始化 stash"
14407 #: git-stash.sh:295
14408 msgid "Cannot save the current status"
14411 #: git-stash.sh:296
14413 msgid "Saved working directory and index state $stash_msg"
14414 msgstr "保存工作目录和索引状态 $stash_msg"
14416 #: git-stash.sh:323
14417 msgid "Cannot remove worktree changes"
14420 #: git-stash.sh:471
14422 msgid "unknown option: $opt"
14423 msgstr "未知选项: $opt"
14425 #: git-stash.sh:484
14426 msgid "No stash found."
14427 msgstr "未发现 stash。"
14429 #: git-stash.sh:491
14431 msgid "Too many revisions specified: $REV"
14432 msgstr "指定了太多的版本:$REV"
14434 #: git-stash.sh:506
14436 msgid "$reference is not a valid reference"
14437 msgstr "$reference 不是一个有效的引用"
14439 #: git-stash.sh:534
14441 msgid "'$args' is not a stash-like commit"
14442 msgstr "'$args' 不是 stash 样提交"
14444 #: git-stash.sh:545
14446 msgid "'$args' is not a stash reference"
14447 msgstr "'$args' 不是一个 stash 引用"
14449 #: git-stash.sh:553
14450 msgid "unable to refresh index"
14453 #: git-stash.sh:557
14454 msgid "Cannot apply a stash in the middle of a merge"
14455 msgstr "无法在合并过程中恢复进度"
14457 #: git-stash.sh:565
14458 msgid "Conflicts in index. Try without --index."
14459 msgstr "索引中有冲突。尝试不使用 --index。"
14461 #: git-stash.sh:567
14462 msgid "Could not save index tree"
14465 #: git-stash.sh:576
14466 msgid "Could not restore untracked files from stash"
14467 msgstr "无法从进度保存中恢复未跟踪文件"
14469 #: git-stash.sh:601
14470 msgid "Cannot unstage modified files"
14471 msgstr "无法将修改的文件取消暂存"
14473 #: git-stash.sh:616
14474 msgid "Index was not unstashed."
14475 msgstr "索引的进度没有被恢复。"
14477 #: git-stash.sh:630
14478 msgid "The stash is kept in case you need it again."
14479 msgstr "暂存被保留以备您再次需要。"
14481 #: git-stash.sh:639
14483 msgid "Dropped ${REV} ($s)"
14484 msgstr "丢弃了 ${REV} ($s)"
14486 #: git-stash.sh:640
14488 msgid "${REV}: Could not drop stash entry"
14489 msgstr "${REV}:不能丢弃进度条目"
14491 #: git-stash.sh:648
14492 msgid "No branch name specified"
14495 #: git-stash.sh:727
14496 msgid "(To restore them type \"git stash apply\")"
14497 msgstr "(为恢复数据输入 \"git stash apply\")"
14499 #: git-submodule.sh:181
14500 msgid "Relative path can only be used from the toplevel of the working tree"
14501 msgstr "只能在工作区的顶级目录中使用相对路径"
14503 #: git-submodule.sh:191
14505 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
14506 msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
14508 #: git-submodule.sh:210
14510 msgid "'$sm_path' already exists in the index"
14511 msgstr "'$sm_path' 已经存在于索引中"
14513 #: git-submodule.sh:213
14515 msgid "'$sm_path' already exists in the index and is not a submodule"
14516 msgstr "'$sm_path' 已经存在于索引中且不是一个子模组"
14518 #: git-submodule.sh:218
14521 "The following path is ignored by one of your .gitignore files:\n"
14523 "Use -f if you really want to add it."
14525 "以下路径被您的一个 .gitignore 文件所忽略:\n"
14527 "如果您确实想添加它,使用 -f 参数。"
14529 #: git-submodule.sh:236
14531 msgid "Adding existing repo at '$sm_path' to the index"
14532 msgstr "添加位于 '$sm_path' 的现存仓库到索引"
14534 #: git-submodule.sh:238
14536 msgid "'$sm_path' already exists and is not a valid git repo"
14537 msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库"
14539 #: git-submodule.sh:246
14541 msgid "A git directory for '$sm_name' is found locally with remote(s):"
14542 msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:"
14544 #: git-submodule.sh:248
14547 "If you want to reuse this local git directory instead of cloning again from\n"
14549 "use the '--force' option. If the local git directory is not the correct "
14551 "or you are unsure what this means choose another name with the '--name' "
14554 "如果您想要重用这个本地 git 目录而非重新克隆自\n"
14556 "使用 '--force' 选项。如果本地 git 目录不是正确的仓库\n"
14557 "或者您不确定这里的含义,使用 '--name' 选项选择另外的名称。"
14559 #: git-submodule.sh:254
14561 msgid "Reactivating local git directory for submodule '$sm_name'."
14562 msgstr "激活本地 git 目录到子模组 '$sm_name'。"
14564 #: git-submodule.sh:266
14566 msgid "Unable to checkout submodule '$sm_path'"
14567 msgstr "不能检出子模组 '$sm_path'"
14569 #: git-submodule.sh:271
14571 msgid "Failed to add submodule '$sm_path'"
14572 msgstr "无法添加子模组 '$sm_path'"
14574 #: git-submodule.sh:280
14576 msgid "Failed to register submodule '$sm_path'"
14577 msgstr "无法注册子模组 '$sm_path'"
14579 #: git-submodule.sh:341
14581 msgid "Entering '$displaypath'"
14582 msgstr "正在进入 '$displaypath'"
14584 #: git-submodule.sh:361
14586 msgid "Stopping at '$displaypath'; script returned non-zero status."
14587 msgstr "停止于 '$displaypath';脚本返回非零值。"
14589 #: git-submodule.sh:432
14591 msgid "pathspec and --all are incompatible"
14592 msgstr "pathspec 和 --all 不兼容"
14594 #: git-submodule.sh:437
14596 msgid "Use '--all' if you really want to deinitialize all submodules"
14597 msgstr "如果您确实想要对所有子模组执行取消初始化,请使用 '--all'"
14599 #: git-submodule.sh:457
14602 "Submodule work tree '$displaypath' contains a .git directory\n"
14603 "(use 'rm -rf' if you really want to remove it including all of its history)"
14605 "子模组工作区 '$displaypath' 包含一个 .git 目录\n"
14606 "(如果您真的想删除它及其全部历史,使用 'rm -rf' 命令)"
14608 #: git-submodule.sh:465
14611 "Submodule work tree '$displaypath' contains local modifications; use '-f' to "
14613 msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们"
14615 #: git-submodule.sh:468
14617 msgid "Cleared directory '$displaypath'"
14618 msgstr "已清除目录 '$displaypath'"
14620 #: git-submodule.sh:469
14622 msgid "Could not remove submodule work tree '$displaypath'"
14623 msgstr "无法移除子模组工作区 '$displaypath'"
14625 #: git-submodule.sh:472
14627 msgid "Could not create empty submodule directory '$displaypath'"
14628 msgstr "不能创建空的子模组目录 '$displaypath'"
14630 #: git-submodule.sh:481
14632 msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
14633 msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
14635 #: git-submodule.sh:637
14637 msgid "Unable to find current revision in submodule path '$displaypath'"
14638 msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
14640 #: git-submodule.sh:647
14642 msgid "Unable to fetch in submodule path '$sm_path'"
14643 msgstr "无法在子模组路径 '$sm_path' 中获取"
14645 #: git-submodule.sh:652
14648 "Unable to find current ${remote_name}/${branch} revision in submodule path "
14650 msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}"
14652 #: git-submodule.sh:670
14654 msgid "Unable to fetch in submodule path '$displaypath'"
14655 msgstr "无法在子模组路径 '$displaypath' 中获取"
14657 #: git-submodule.sh:676
14660 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
14661 "Direct fetching of that commit failed."
14663 "获取了子模组路径 '$displaypath',但是它没有包含 $sha1。直接获取该提交失败。"
14665 #: git-submodule.sh:683
14667 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
14668 msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
14670 #: git-submodule.sh:684
14672 msgid "Submodule path '$displaypath': checked out '$sha1'"
14673 msgstr "子模组路径 '$displaypath':检出 '$sha1'"
14675 #: git-submodule.sh:688
14677 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
14678 msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
14680 #: git-submodule.sh:689
14682 msgid "Submodule path '$displaypath': rebased into '$sha1'"
14683 msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
14685 #: git-submodule.sh:694
14687 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
14688 msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
14690 #: git-submodule.sh:695
14692 msgid "Submodule path '$displaypath': merged in '$sha1'"
14693 msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
14695 #: git-submodule.sh:700
14697 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
14698 msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败"
14700 #: git-submodule.sh:701
14702 msgid "Submodule path '$displaypath': '$command $sha1'"
14703 msgstr "子模组 '$displaypath':'$command $sha1'"
14705 #: git-submodule.sh:732
14707 msgid "Failed to recurse into submodule path '$displaypath'"
14708 msgstr "无法递归进子模组路径 '$displaypath'"
14710 #: git-submodule.sh:840
14711 msgid "The --cached option cannot be used with the --files option"
14712 msgstr "选项 --cached 不能和选项 --files 同时使用"
14714 #: git-submodule.sh:892
14716 msgid "unexpected mode $mod_dst"
14717 msgstr "意外的模式 $mod_dst"
14720 #: git-submodule.sh:912
14722 msgid " Warn: $display_name doesn't contain commit $sha1_src"
14723 msgstr " 警告:$display_name 未包含提交 $sha1_src"
14726 #: git-submodule.sh:915
14728 msgid " Warn: $display_name doesn't contain commit $sha1_dst"
14729 msgstr " 警告:$display_name 未包含提交 $sha1_dst"
14732 #: git-submodule.sh:918
14734 msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
14735 msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
14737 #: git-submodule.sh:1064
14739 msgid "Failed to recurse into submodule path '$sm_path'"
14740 msgstr "无法递归进子模组路径 '$sm_path'"
14742 #: git-submodule.sh:1136
14744 msgid "Synchronizing submodule url for '$displaypath'"
14745 msgstr "为 '$displaypath' 同步子模组 url"
14747 #: git-parse-remote.sh:89
14749 msgid "See git-${cmd}(1) for details."
14750 msgstr "详见 git-${cmd}(1)。"
14752 #: git-rebase--interactive.sh:140
14754 msgid "Rebasing ($new_count/$total)"
14755 msgstr "变基中($new_count/$total)"
14757 #: git-rebase--interactive.sh:156
14761 " p, pick = use commit\n"
14762 " r, reword = use commit, but edit the commit message\n"
14763 " e, edit = use commit, but stop for amending\n"
14764 " s, squash = use commit, but meld into previous commit\n"
14765 " f, fixup = like \"squash\", but discard this commit's log message\n"
14766 " x, exec = run command (the rest of the line) using shell\n"
14767 " d, drop = remove commit\n"
14769 "These lines can be re-ordered; they are executed from top to bottom.\n"
14773 " p, pick = 使用提交\n"
14774 " r, reword = 使用提交,但修改提交说明\n"
14775 " e, edit = 使用提交,但停止以便进行提交修补\n"
14776 " s, squash = 使用提交,但和前一个版本融合\n"
14777 " f, fixup = 类似于 \"squash\",但丢弃提交说明日志\n"
14778 " x, exec = 使用 shell 运行命令(此行剩余部分)\n"
14779 " d, drop = 删除提交\n"
14781 "这些行可以被重新排序;它们会被从上至下地执行。\n"
14784 #: git-rebase--interactive.sh:171
14787 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
14790 "不要删除任意一行。使用 'drop' 显式地删除一个提交。\n"
14792 #: git-rebase--interactive.sh:175
14795 "If you remove a line here THAT COMMIT WILL BE LOST.\n"
14798 "如果您在这里删除一行,对应的提交将会丢失。\n"
14800 #: git-rebase--interactive.sh:211
14803 "You can amend the commit now, with\n"
14805 "\tgit commit --amend $gpg_sign_opt_quoted\n"
14807 "Once you are satisfied with your changes, run\n"
14809 "\tgit rebase --continue"
14813 "\tgit commit --amend $gpg_sign_opt_quoted\n"
14817 "\tgit rebase --continue"
14819 #: git-rebase--interactive.sh:236
14821 msgid "$sha1: not a commit that can be picked"
14822 msgstr "$sha1:不是一个可以被拣选的提交"
14824 #: git-rebase--interactive.sh:275
14826 msgid "Invalid commit name: $sha1"
14827 msgstr "无效的提交名:$sha1"
14829 #: git-rebase--interactive.sh:317
14830 msgid "Cannot write current commit's replacement sha1"
14831 msgstr "不能写入当前提交的替代 sha1"
14833 #: git-rebase--interactive.sh:369
14835 msgid "Fast-forward to $sha1"
14838 #: git-rebase--interactive.sh:371
14840 msgid "Cannot fast-forward to $sha1"
14841 msgstr "不能快进到 $sha1"
14843 #: git-rebase--interactive.sh:380
14845 msgid "Cannot move HEAD to $first_parent"
14846 msgstr "不能移动 HEAD 到 $first_parent"
14848 #: git-rebase--interactive.sh:385
14850 msgid "Refusing to squash a merge: $sha1"
14851 msgstr "拒绝压缩一个合并:$sha1"
14853 #: git-rebase--interactive.sh:399
14855 msgid "Error redoing merge $sha1"
14856 msgstr "无法重做合并 $sha1"
14858 #: git-rebase--interactive.sh:407
14860 msgid "Could not pick $sha1"
14861 msgstr "不能拣选 $sha1"
14863 #: git-rebase--interactive.sh:416
14865 msgid "This is the commit message #${n}:"
14866 msgstr "这是提交说明 #${n}:"
14868 #: git-rebase--interactive.sh:421
14870 msgid "The commit message #${n} will be skipped:"
14871 msgstr "提交说明 #${n} 将被跳过:"
14873 #: git-rebase--interactive.sh:432
14875 msgid "This is a combination of $count commit."
14876 msgid_plural "This is a combination of $count commits."
14877 msgstr[0] "这是一个 $count 个提交的组合。"
14878 msgstr[1] "这是一个 $count 个提交的组合。"
14880 #: git-rebase--interactive.sh:441
14882 msgid "Cannot write $fixup_msg"
14883 msgstr "不能写入 $fixup_msg"
14885 #: git-rebase--interactive.sh:444
14886 msgid "This is a combination of 2 commits."
14887 msgstr "这是一个 2 个提交的组合。"
14889 #: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528
14890 #: git-rebase--interactive.sh:531
14892 msgid "Could not apply $sha1... $rest"
14893 msgstr "不能应用 $sha1... $rest"
14895 #: git-rebase--interactive.sh:559
14898 "Could not amend commit after successfully picking $sha1... $rest\n"
14899 "This is most likely due to an empty commit message, or the pre-commit hook\n"
14900 "failed. If the pre-commit hook failed, you may need to resolve the issue "
14902 "you are able to reword the commit."
14904 "不能在成功拣选 $sha1... $rest 之后修补提交\n"
14905 "这通常是因为空的提交说明,或者 pre-commit 钩子执行失败。如果是 pre-commit\n"
14906 "钩子执行失败,你可能需要在重写提交说明前解决这个问题。"
14908 #: git-rebase--interactive.sh:574
14910 msgid "Stopped at $sha1_abbrev... $rest"
14911 msgstr "停止在 $sha1_abbrev... $rest"
14913 #: git-rebase--interactive.sh:589
14915 msgid "Cannot '$squash_style' without a previous commit"
14916 msgstr "没有父提交的情况下不能 '$squash_style'"
14918 #: git-rebase--interactive.sh:631
14920 msgid "Executing: $rest"
14923 #: git-rebase--interactive.sh:639
14925 msgid "Execution failed: $rest"
14926 msgstr "执行失败:$rest"
14928 #: git-rebase--interactive.sh:641
14929 msgid "and made changes to the index and/or the working tree"
14930 msgstr "并且修改索引和/或工作区"
14933 #: git-rebase--interactive.sh:643
14935 "You can fix the problem, and then run\n"
14937 "\tgit rebase --continue"
14941 "\tgit rebase --continue"
14943 #. TRANSLATORS: after these lines is a command to be issued by the user
14944 #: git-rebase--interactive.sh:656
14947 "Execution succeeded: $rest\n"
14948 "but left changes to the index and/or the working tree\n"
14949 "Commit or stash your changes, and then run\n"
14951 "\tgit rebase --continue"
14954 "但是在索引和/或工作区中存在变更。提交或暂存修改,然后运行\n"
14956 "\tgit rebase --continue"
14958 #: git-rebase--interactive.sh:667
14960 msgid "Unknown command: $command $sha1 $rest"
14961 msgstr "未知命令:$command $sha1 $rest"
14963 #: git-rebase--interactive.sh:668
14964 msgid "Please fix this using 'git rebase --edit-todo'."
14965 msgstr "要修改请使用命令 'git rebase --edit-todo'。"
14967 #: git-rebase--interactive.sh:703
14969 msgid "Successfully rebased and updated $head_name."
14970 msgstr "成功变基并更新 $head_name。"
14972 #: git-rebase--interactive.sh:750
14973 msgid "Could not skip unnecessary pick commands"
14974 msgstr "不能跳过不必要的拣选命令"
14976 #: git-rebase--interactive.sh:908
14979 "Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
14982 "警告:缺失 SHA-1 或者在下面一行中不是一个提交:\n"
14985 #: git-rebase--interactive.sh:941
14988 "Warning: the command isn't recognized in the following line:\n"
14991 "警告:下面一行中的命令未能被识别:\n"
14994 #: git-rebase--interactive.sh:980
14995 msgid "could not detach HEAD"
14996 msgstr "不能检出为分离头指针"
14998 #: git-rebase--interactive.sh:1018
15000 "Warning: some commits may have been dropped accidentally.\n"
15001 "Dropped commits (newer to older):"
15002 msgstr "警告:一些提交可能被意外丢弃。丢弃的提交(从新到旧):"
15004 #: git-rebase--interactive.sh:1026
15006 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
15008 "Use 'git config rebase.missingCommitsCheck' to change the level of "
15010 "The possible behaviours are: ignore, warn, error."
15012 "为避免这条信息,使用 \"drop\" 指令显式地删除一个提交。\n"
15014 "使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n"
15015 "可选值有:ignore、warn、error。"
15017 #: git-rebase--interactive.sh:1037
15020 "Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
15022 msgstr "选项 rebase.missingCommitsCheck 的值 $check_level 无法被识别。已忽略。"
15024 #: git-rebase--interactive.sh:1054
15026 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
15029 "您可以用 'git rebase --edit-todo' 修正问题然后执行 'git rebase --continue'。"
15031 #: git-rebase--interactive.sh:1055
15032 msgid "Or you can abort the rebase with 'git rebase --abort'."
15033 msgstr "或者您可以使用 'git rebase --abort' 命令终止变基操作。"
15035 #: git-rebase--interactive.sh:1083
15036 msgid "Could not remove CHERRY_PICK_HEAD"
15037 msgstr "不能删除 CHERRY_PICK_HEAD"
15039 #: git-rebase--interactive.sh:1088
15042 "You have staged changes in your working tree.\n"
15043 "If these changes are meant to be\n"
15044 "squashed into the previous commit, run:\n"
15046 " git commit --amend $gpg_sign_opt_quoted\n"
15048 "If they are meant to go into a new commit, run:\n"
15050 " git commit $gpg_sign_opt_quoted\n"
15052 "In both cases, once you're done, continue with:\n"
15054 " git rebase --continue\n"
15056 "您已暂存了工作区的修改。如果这些修改要压缩到前一个提交,执行:\n"
15058 " git commit --amend $gpg_sign_opt_quoted\n"
15060 "如果这些变更要形成一个新提交,执行:\n"
15062 " git commit $gpg_sign_opt_quoted\n"
15064 "无论哪种情况,当您完成提交,继续执行:\n"
15066 " git rebase --continue\n"
15068 #: git-rebase--interactive.sh:1105
15069 msgid "Error trying to find the author identity to amend commit"
15070 msgstr "在修补提交中查找作者信息时遇到错误"
15072 #: git-rebase--interactive.sh:1110
15074 "You have uncommitted changes in your working tree. Please commit them\n"
15075 "first and then run 'git rebase --continue' again."
15077 "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
15079 #: git-rebase--interactive.sh:1115 git-rebase--interactive.sh:1119
15080 msgid "Could not commit staged changes."
15081 msgstr "不能提交暂存的修改。"
15083 #: git-rebase--interactive.sh:1147
15086 "You are editing the todo file of an ongoing interactive rebase.\n"
15087 "To continue rebase after editing, run:\n"
15088 " git rebase --continue\n"
15092 "您正在修改运行中的交互式变基的 todo 文件。若要在编辑结束后继续变基,\n"
15094 " git rebase --continue\n"
15097 #: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313
15098 msgid "Could not execute editor"
15101 #: git-rebase--interactive.sh:1168
15103 msgid "Could not checkout $switch_to"
15104 msgstr "不能检出 $switch_to"
15106 #: git-rebase--interactive.sh:1173
15110 #: git-rebase--interactive.sh:1174
15112 msgid "Could not create temporary $state_dir"
15113 msgstr "不能创建临时 $state_dir"
15115 #: git-rebase--interactive.sh:1176
15116 msgid "Could not mark as interactive"
15119 #: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191
15120 msgid "Could not init rewritten commits"
15121 msgstr "不能对重写提交进行初始化"
15123 #: git-rebase--interactive.sh:1291
15125 msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
15126 msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
15127 msgstr[0] "变基 $shortrevisions 到 $shortonto($todocount 个提交)"
15128 msgstr[1] "变基 $shortrevisions 到 $shortonto($todocount 个提交)"
15130 #: git-rebase--interactive.sh:1296
15133 "However, if you remove everything, the rebase will be aborted.\n"
15137 "然而,如果您删除全部内容,变基操作将会终止。\n"
15140 #: git-rebase--interactive.sh:1303
15141 msgid "Note that empty commits are commented out"
15142 msgstr "注意空提交已被注释掉"
15144 #: git-sh-setup.sh:89 git-sh-setup.sh:94
15146 msgid "usage: $dashless $USAGE"
15147 msgstr "用法:$dashless $USAGE"
15149 #: git-sh-setup.sh:190
15151 msgid "Cannot chdir to $cdup, the toplevel of the working tree"
15152 msgstr "不能切换目录到 $cdup,工作区的顶级目录"
15154 #: git-sh-setup.sh:199 git-sh-setup.sh:206
15156 msgid "fatal: $program_name cannot be used without a working tree."
15157 msgstr "严重错误:$program_name 不能在没有工作区的情况下使用"
15159 #: git-sh-setup.sh:220
15160 msgid "Cannot rebase: You have unstaged changes."
15161 msgstr "不能变基:您有未暂存的变更。"
15163 #: git-sh-setup.sh:223
15164 msgid "Cannot rewrite branches: You have unstaged changes."
15165 msgstr "不能重写分支:您有未暂存的变更。"
15167 #: git-sh-setup.sh:226
15168 msgid "Cannot pull with rebase: You have unstaged changes."
15169 msgstr "无法通过变基方式拉取:您有未暂存的变更。"
15171 #: git-sh-setup.sh:229
15173 msgid "Cannot $action: You have unstaged changes."
15174 msgstr "不能 $action:您有未暂存的变更。"
15176 #: git-sh-setup.sh:242
15177 msgid "Cannot rebase: Your index contains uncommitted changes."
15178 msgstr "不能变基:您的索引中包含未提交的变更。"
15180 #: git-sh-setup.sh:245
15181 msgid "Cannot pull with rebase: Your index contains uncommitted changes."
15182 msgstr "无法通过变基方式拉取:您的索引中包含未提交的变更。"
15184 #: git-sh-setup.sh:248
15186 msgid "Cannot $action: Your index contains uncommitted changes."
15187 msgstr "不能 $action:您的索引中包含未提交的变更。"
15189 #: git-sh-setup.sh:252
15190 msgid "Additionally, your index contains uncommitted changes."
15191 msgstr "而且您的索引中包含未提交的变更。"
15193 #: git-sh-setup.sh:372
15194 msgid "You need to run this command from the toplevel of the working tree."
15195 msgstr "您需要在工作区的顶级目录中运行这个命令。"
15197 #: git-sh-setup.sh:377
15198 msgid "Unable to determine absolute path of git directory"
15199 msgstr "不能确定 git 目录的绝对路径"
15201 #. TRANSLATORS: you can adjust this to align "git add -i" status menu
15202 #: git-add--interactive.perl:238
15204 msgid "%12s %12s %s"
15205 msgstr "%12s %12s %s"
15207 #: git-add--interactive.perl:239
15211 #: git-add--interactive.perl:239
15215 #: git-add--interactive.perl:288 git-add--interactive.perl:313
15219 #: git-add--interactive.perl:297 git-add--interactive.perl:351
15223 #: git-add--interactive.perl:333 git-add--interactive.perl:348
15227 #: git-add--interactive.perl:644
15229 msgid "added %d path\n"
15230 msgid_plural "added %d paths\n"
15231 msgstr[0] "增加了 %d 个路径\n"
15232 msgstr[1] "增加了 %d 个路径\n"
15234 #: git-add--interactive.perl:647
15236 msgid "updated %d path\n"
15237 msgid_plural "updated %d paths\n"
15238 msgstr[0] "更新了 %d 个路径\n"
15239 msgstr[1] "更新了 %d 个路径\n"
15241 #: git-add--interactive.perl:650
15243 msgid "reverted %d path\n"
15244 msgid_plural "reverted %d paths\n"
15245 msgstr[0] "还原了 %d 个路径\n"
15246 msgstr[1] "还原了 %d 个路径\n"
15248 #: git-add--interactive.perl:653
15250 msgid "touched %d path\n"
15251 msgid_plural "touched %d paths\n"
15252 msgstr[0] "触碰了 %d 个路径\n"
15253 msgstr[1] "触碰了 %d 个路径\n"
15255 #: git-add--interactive.perl:662
15259 #: git-add--interactive.perl:674
15263 #: git-add--interactive.perl:697
15265 msgid "note: %s is untracked now.\n"
15266 msgstr "说明:%s 现已成为未跟踪的。\n"
15268 #: git-add--interactive.perl:708
15269 msgid "Add untracked"
15272 #: git-add--interactive.perl:714
15273 msgid "No untracked files.\n"
15274 msgstr "没有未跟踪的文件。\n"
15276 #: git-add--interactive.perl:1030
15278 "If the patch applies cleanly, the edited hunk will immediately be\n"
15279 "marked for staging."
15280 msgstr "如果补丁能干净地应用,编辑块将立即标记为暂存。"
15282 #: git-add--interactive.perl:1033
15284 "If the patch applies cleanly, the edited hunk will immediately be\n"
15285 "marked for stashing."
15286 msgstr "如果补丁能干净地应用,编辑块将立即标记为保存进度。"
15288 #: git-add--interactive.perl:1036
15290 "If the patch applies cleanly, the edited hunk will immediately be\n"
15291 "marked for unstaging."
15292 msgstr "如果补丁能干净地应用,编辑块将立即标记为未暂存。"
15294 #: git-add--interactive.perl:1039 git-add--interactive.perl:1048
15296 "If the patch applies cleanly, the edited hunk will immediately be\n"
15297 "marked for applying."
15298 msgstr "如果补丁能干净地应用,编辑块将立即标记为应用。"
15300 #: git-add--interactive.perl:1042 git-add--interactive.perl:1045
15302 "If the patch applies cleanly, the edited hunk will immediately be\n"
15303 "marked for discarding."
15304 msgstr "如果补丁能干净地应用,编辑块将立即标记为丢弃。"
15306 #: git-add--interactive.perl:1058
15308 msgid "failed to open hunk edit file for writing: %s"
15309 msgstr "无法写入块编辑文件:%s"
15311 #: git-add--interactive.perl:1059
15312 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
15313 msgstr "手动块编辑模式 -- 查看底部的快速指南。\n"
15315 #: git-add--interactive.perl:1065
15319 "To remove '%s' lines, make them ' ' lines (context).\n"
15320 "To remove '%s' lines, delete them.\n"
15321 "Lines starting with %s will be removed.\n"
15324 "要删除 '%s' 开始的行,使其成为 ' ' 开始的行(上下文)。\n"
15325 "要删除 '%s' 开始的行,删除它们。\n"
15328 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
15329 #: git-add--interactive.perl:1073
15331 "If it does not apply cleanly, you will be given an opportunity to\n"
15332 "edit again. If all lines of the hunk are removed, then the edit is\n"
15333 "aborted and the hunk is left unchanged.\n"
15335 "如果不能干净地应用,您将有机会重新编辑。如果该块的全部内容删除,则\n"
15336 "此次编辑被终止,该块不会被修改。\n"
15338 #: git-add--interactive.perl:1087
15340 msgid "failed to open hunk edit file for reading: %s"
15341 msgstr "无法读取块编辑文件:%s"
15343 #. TRANSLATORS: do not translate [y/n]
15344 #. The program will only accept that input
15346 #. Consider translating (saying "no" discards!) as
15347 #. (saying "n" for "no" discards!) if the translation
15348 #. of the word "no" does not start with n.
15349 #: git-add--interactive.perl:1178
15351 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
15352 msgstr "您的编辑块不能被应用。重新编辑(选择 \"no\" 丢弃!) [y/n]? "
15354 #: git-add--interactive.perl:1187
15356 "y - stage this hunk\n"
15357 "n - do not stage this hunk\n"
15358 "q - quit; do not stage this hunk or any of the remaining ones\n"
15359 "a - stage this hunk and all later hunks in the file\n"
15360 "d - do not stage this hunk or any of the later hunks in the file"
15364 "q - 退出。不暂存该块及后面的全部块\n"
15365 "a - 暂存该块和本文件中后面的全部块\n"
15366 "d - 不暂存该块和本文件中后面的全部块"
15368 #: git-add--interactive.perl:1193
15370 "y - stash this hunk\n"
15371 "n - do not stash this hunk\n"
15372 "q - quit; do not stash this hunk or any of the remaining ones\n"
15373 "a - stash this hunk and all later hunks in the file\n"
15374 "d - do not stash this hunk or any of the later hunks in the file"
15378 "q - 退出。不贮藏该块及后面的全部块\n"
15379 "a - 贮藏该块和本文件中后面的全部块\n"
15380 "d - 不贮藏该块和本文件中后面的全部块"
15382 #: git-add--interactive.perl:1199
15384 "y - unstage this hunk\n"
15385 "n - do not unstage this hunk\n"
15386 "q - quit; do not unstage this hunk or any of the remaining ones\n"
15387 "a - unstage this hunk and all later hunks in the file\n"
15388 "d - do not unstage this hunk or any of the later hunks in the file"
15392 "q - 退出。不要不暂存该块及后面的全部块\n"
15393 "a - 不暂存该块和本文件中后面的全部块\n"
15394 "d - 不要不暂存该块和本文件中后面的全部块"
15396 #: git-add--interactive.perl:1205
15398 "y - apply this hunk to index\n"
15399 "n - do not apply this hunk to index\n"
15400 "q - quit; do not apply this hunk or any of the remaining ones\n"
15401 "a - apply this hunk and all later hunks in the file\n"
15402 "d - do not apply this hunk or any of the later hunks in the file"
15406 "q - 退出。不要应用该块及后面的全部块\n"
15407 "a - 应用该块和本文件中后面的全部块\n"
15408 "d - 不要应用该块和本文件中后面的全部块"
15410 #: git-add--interactive.perl:1211
15412 "y - discard this hunk from worktree\n"
15413 "n - do not discard this hunk from worktree\n"
15414 "q - quit; do not discard this hunk or any of the remaining ones\n"
15415 "a - discard this hunk and all later hunks in the file\n"
15416 "d - do not discard this hunk or any of the later hunks in the file"
15419 "n - 不要在工作区中丢弃该块\n"
15420 "q - 退出。不要丢弃该块及后面的全部块\n"
15421 "a - 丢弃该块和本文件中后面的全部块\n"
15422 "d - 不要丢弃该块和本文件中后面的全部块"
15424 #: git-add--interactive.perl:1217
15426 "y - discard this hunk from index and worktree\n"
15427 "n - do not discard this hunk from index and worktree\n"
15428 "q - quit; do not discard this hunk or any of the remaining ones\n"
15429 "a - discard this hunk and all later hunks in the file\n"
15430 "d - do not discard this hunk or any of the later hunks in the file"
15432 "y - 在索引和工作区中丢弃该块\n"
15433 "n - 不要在索引和工作区中丢弃该块\n"
15434 "q - 退出。不要丢弃该块及后面的全部块\n"
15435 "a - 丢弃该块和本文件中后面的全部块\n"
15436 "d - 不要丢弃该块和本文件中后面的全部块"
15438 #: git-add--interactive.perl:1223
15440 "y - apply this hunk to index and worktree\n"
15441 "n - do not apply this hunk to index and worktree\n"
15442 "q - quit; do not apply this hunk or any of the remaining ones\n"
15443 "a - apply this hunk and all later hunks in the file\n"
15444 "d - do not apply this hunk or any of the later hunks in the file"
15446 "y - 在索引和工作区中应用该块\n"
15447 "n - 不要在索引和工作区中应用该块\n"
15448 "q - 退出。不要应用该块及后面的全部块\n"
15449 "a - 应用该块和本文件中后面的全部块\n"
15450 "d - 不要应用该块和本文件中后面的全部块"
15452 #: git-add--interactive.perl:1232
15454 "g - select a hunk to go to\n"
15455 "/ - search for a hunk matching the given regex\n"
15456 "j - leave this hunk undecided, see next undecided hunk\n"
15457 "J - leave this hunk undecided, see next hunk\n"
15458 "k - leave this hunk undecided, see previous undecided hunk\n"
15459 "K - leave this hunk undecided, see previous hunk\n"
15460 "s - split the current hunk into smaller hunks\n"
15461 "e - manually edit the current hunk\n"
15465 "/ - 查找和给定正则表达式匹配的块\n"
15466 "j - 维持该块未决状态,查看下一个未决块\n"
15467 "J - 维持该块未决状态,查看下一个块\n"
15468 "k - 维持该块未决状态,查看上一个未决块\n"
15469 "K - 维持该块未决状态,查看上一个块\n"
15474 #: git-add--interactive.perl:1263
15475 msgid "The selected hunks do not apply to the index!\n"
15476 msgstr "选中的块不能应用到索引!\n"
15478 #: git-add--interactive.perl:1264
15479 msgid "Apply them to the worktree anyway? "
15480 msgstr "无论如何都要应用到工作区么?"
15482 #: git-add--interactive.perl:1267
15483 msgid "Nothing was applied.\n"
15486 #: git-add--interactive.perl:1278
15488 msgid "ignoring unmerged: %s\n"
15489 msgstr "忽略未合入的:%s\n"
15491 #: git-add--interactive.perl:1287
15492 msgid "Only binary files changed.\n"
15493 msgstr "只有二进制文件被修改。\n"
15495 #: git-add--interactive.perl:1289
15496 msgid "No changes.\n"
15499 #: git-add--interactive.perl:1297
15500 msgid "Patch update"
15503 #: git-add--interactive.perl:1349
15505 msgid "Stage mode change [y,n,q,a,d,/%s,?]? "
15506 msgstr "暂存状态修改 [y,n,q,a,d,/%s,?]? "
15508 #: git-add--interactive.perl:1350
15510 msgid "Stage deletion [y,n,q,a,d,/%s,?]? "
15511 msgstr "暂存状态删除 [y,n,q,a,d,/%s,?]? "
15513 #: git-add--interactive.perl:1351
15515 msgid "Stage this hunk [y,n,q,a,d,/%s,?]? "
15516 msgstr "暂存该块 [y,n,q,a,d,/%s,?]? "
15518 #: git-add--interactive.perl:1354
15520 msgid "Stash mode change [y,n,q,a,d,/%s,?]? "
15521 msgstr "贮藏状态修改 [y,n,q,a,d,/%s,?]? "
15523 #: git-add--interactive.perl:1355
15525 msgid "Stash deletion [y,n,q,a,d,/%s,?]? "
15526 msgstr "贮藏状态删除 [y,n,q,a,d,/%s,?]? "
15528 #: git-add--interactive.perl:1356
15530 msgid "Stash this hunk [y,n,q,a,d,/%s,?]? "
15531 msgstr "贮藏该块 [y,n,q,a,d,/%s,?]? "
15533 #: git-add--interactive.perl:1359
15535 msgid "Unstage mode change [y,n,q,a,d,/%s,?]? "
15536 msgstr "未暂存状态修改 [y,n,q,a,d,/%s,?]? "
15538 #: git-add--interactive.perl:1360
15540 msgid "Unstage deletion [y,n,q,a,d,/%s,?]? "
15541 msgstr "未暂存状态删除 [y,n,q,a,d,/%s,?]? "
15543 #: git-add--interactive.perl:1361
15545 msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? "
15546 msgstr "不暂存该块 [y,n,q,a,d,/%s,?]? "
15548 #: git-add--interactive.perl:1364
15550 msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? "
15551 msgstr "修改索引中的应用状态 [y,n,q,a,d,/%s,?]? "
15553 #: git-add--interactive.perl:1365
15555 msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? "
15556 msgstr "从索引中删除应用状态 [y,n,q,a,d,/%s,?]? "
15558 #: git-add--interactive.perl:1366
15560 msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? "
15561 msgstr "将此块应用到索引 [y,n,q,a,d,/%s,?]? "
15563 #: git-add--interactive.perl:1369
15565 msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? "
15566 msgstr "修改工作区中的丢弃状态 [y,n,q,a,d,/%s,?]? "
15568 #: git-add--interactive.perl:1370
15570 msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? "
15571 msgstr "从工作区中删除丢弃状态 [y,n,q,a,d,/%s,?]? "
15573 #: git-add--interactive.perl:1371
15575 msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? "
15576 msgstr "从工作区中丢弃该块 [y,n,q,a,d,/%s,?]? "
15578 #: git-add--interactive.perl:1374
15580 msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? "
15581 msgstr "修改索引和工作区中的丢弃状态 [y,n,q,a,d,/%s,?]? "
15583 #: git-add--interactive.perl:1375
15585 msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? "
15586 msgstr "从索引和工作区中删除丢弃状态 [y,n,q,a,d,/%s,?]? "
15588 #: git-add--interactive.perl:1376
15590 msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? "
15591 msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d,/%s,?]? "
15593 #: git-add--interactive.perl:1379
15595 msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? "
15596 msgstr "修改索引和工作区中的应用状态 [y,n,q,a,d,/%s,?]? "
15598 #: git-add--interactive.perl:1380
15600 msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? "
15601 msgstr "从索引和工作区中删除应用状态 [y,n,q,a,d,/%s,?]? "
15603 #: git-add--interactive.perl:1381
15605 msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? "
15606 msgstr "在索引和工作区中应用该块 [y,n,q,a,d,/%s,?]? "
15608 #: git-add--interactive.perl:1484
15609 msgid "go to which hunk (<ret> to see more)? "
15610 msgstr "跳转到哪个块(<回车> 查看更多)? "
15612 #: git-add--interactive.perl:1486
15613 msgid "go to which hunk? "
15616 #: git-add--interactive.perl:1495
15618 msgid "Invalid number: '%s'\n"
15619 msgstr "无效数字:'%s'\n"
15621 #: git-add--interactive.perl:1500
15623 msgid "Sorry, only %d hunk available.\n"
15624 msgid_plural "Sorry, only %d hunks available.\n"
15625 msgstr[0] "对不起,只有 %d 个可用块。\n"
15626 msgstr[1] "对不起,只有 %d 个可用块。\n"
15628 #: git-add--interactive.perl:1526
15629 msgid "search for regex? "
15630 msgstr "使用正则表达式搜索?"
15632 #: git-add--interactive.perl:1539
15634 msgid "Malformed search regexp %s: %s\n"
15635 msgstr "错误的正则表达式 %s:%s\n"
15637 #: git-add--interactive.perl:1549
15638 msgid "No hunk matches the given pattern\n"
15639 msgstr "没有和给定模式相匹配的快\n"
15641 #: git-add--interactive.perl:1561 git-add--interactive.perl:1583
15642 msgid "No previous hunk\n"
15645 #: git-add--interactive.perl:1570 git-add--interactive.perl:1589
15646 msgid "No next hunk\n"
15649 #: git-add--interactive.perl:1597
15651 msgid "Split into %d hunk.\n"
15652 msgid_plural "Split into %d hunks.\n"
15653 msgstr[0] "拆分为 %d 块。\n"
15654 msgstr[1] "拆分为 %d 块。\n"
15656 #: git-add--interactive.perl:1649
15657 msgid "Review diff"
15660 #. TRANSLATORS: please do not translate the command names
15661 #. 'status', 'update', 'revert', etc.
15662 #: git-add--interactive.perl:1668
15664 "status - show paths with changes\n"
15665 "update - add working tree state to the staged set of changes\n"
15666 "revert - revert staged set of changes back to the HEAD version\n"
15667 "patch - pick hunks and update selectively\n"
15668 "diff - view diff between HEAD and index\n"
15669 "add untracked - add contents of untracked files to the staged set of "
15672 "status - 显示含变更的路径\n"
15673 "update - 添加工作区状态至暂存列表\n"
15674 "revert - 还原修改的暂存集至 HEAD 版本\n"
15675 "patch - 挑选块并且有选择地更新\n"
15676 "diff - 显示 HEAD 和索引间差异\n"
15677 "add untracked - 添加未跟踪文件的内容至暂存列表\n"
15679 #: git-add--interactive.perl:1685 git-add--interactive.perl:1690
15680 #: git-add--interactive.perl:1693 git-add--interactive.perl:1700
15681 #: git-add--interactive.perl:1704 git-add--interactive.perl:1710
15685 #: git-add--interactive.perl:1706
15687 msgid "unknown --patch mode: %s"
15688 msgstr "未知的 --patch 模式:%s"
15690 #: git-add--interactive.perl:1712 git-add--interactive.perl:1718
15692 msgid "invalid argument %s, expecting --"
15693 msgstr "无效的参数 %s,期望是 --"
15695 #: git-send-email.perl:121
15696 msgid "local zone differs from GMT by a non-minute interval\n"
15697 msgstr "本地时间和 GMT 有不到一分钟间隔\n"
15699 #: git-send-email.perl:128 git-send-email.perl:134
15700 msgid "local time offset greater than or equal to 24 hours\n"
15701 msgstr "本地时间偏移量大于等于 24 小时\n"
15703 #: git-send-email.perl:202 git-send-email.perl:208
15704 msgid "the editor exited uncleanly, aborting everything"
15705 msgstr "编辑器非正常退出,终止所有操作"
15707 #: git-send-email.perl:282
15710 "'%s' contains an intermediate version of the email you were composing.\n"
15711 msgstr "'%s' 包含您正在编写的一个中间版本的邮件。\n"
15713 #: git-send-email.perl:287
15715 msgid "'%s.final' contains the composed email.\n"
15716 msgstr "'%s.final' 包含编辑的邮件。\n"
15718 #: git-send-email.perl:305
15719 msgid "--dump-aliases incompatible with other options\n"
15720 msgstr "--dump-aliases 和其它选项不兼容\n"
15722 #: git-send-email.perl:368 git-send-email.perl:623
15723 msgid "Cannot run git format-patch from outside a repository\n"
15724 msgstr "不能在仓库之外运行 git format-patch\n"
15726 #: git-send-email.perl:437
15728 msgid "Unknown --suppress-cc field: '%s'\n"
15729 msgstr "未知的 --suppress-cc 字段:'%s'\n"
15731 #: git-send-email.perl:466
15733 msgid "Unknown --confirm setting: '%s'\n"
15734 msgstr "未知的 --confirm 设置:'%s'\n"
15736 #: git-send-email.perl:498
15738 msgid "warning: sendmail alias with quotes is not supported: %s\n"
15739 msgstr "警告:不支持带引号的 sendmail 别名:%s\n"
15741 #: git-send-email.perl:500
15743 msgid "warning: `:include:` not supported: %s\n"
15744 msgstr "警告:不支持 `:include:`:%s\n"
15746 #: git-send-email.perl:502
15748 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
15749 msgstr "警告:不支持 `/file` 或 `|pipe` 重定向:%s\n"
15751 #: git-send-email.perl:507
15753 msgid "warning: sendmail line is not recognized: %s\n"
15754 msgstr "警告:不能识别的 sendmail 行:%s\n"
15756 #: git-send-email.perl:589
15759 "File '%s' exists but it could also be the range of commits\n"
15760 "to produce patches for. Please disambiguate by...\n"
15762 " * Saying \"./%s\" if you mean a file; or\n"
15763 " * Giving --format-patch option if you mean a range.\n"
15765 "存在文件 '%s' 但是它也可能是一个用于产生补丁列表的提交范围。请用如下方法消除"
15768 " * 如果含义为一个文件,使用 \"./%s\",或者\n"
15769 " * 如果含义为一个范围,使用 --format-patch 选项。\n"
15771 #: git-send-email.perl:610
15773 msgid "Failed to opendir %s: %s"
15774 msgstr "无法打开目录 %s: %s"
15776 #: git-send-email.perl:634
15780 "warning: no patches were sent\n"
15785 #: git-send-email.perl:645
15788 "No patch files specified!\n"
15795 #: git-send-email.perl:658
15797 msgid "No subject line in %s?"
15798 msgstr "在 %s 中没有标题行?"
15800 #: git-send-email.perl:668
15802 msgid "Failed to open for writing %s: %s"
15803 msgstr "无法写入 %s: %s"
15805 #: git-send-email.perl:678
15807 "Lines beginning in \"GIT:\" will be removed.\n"
15808 "Consider including an overall diffstat or table of contents\n"
15809 "for the patch you are writing.\n"
15811 "Clear the body content if you don't wish to send a summary.\n"
15813 "以 \"GIT:\" 开头的行将被删除。\n"
15814 "考虑包含一个整体的 diffstat 或者您正在写的补丁的目录。\n"
15816 "如果您不想发送摘要,清除内容。\n"
15818 #: git-send-email.perl:701
15820 msgid "Failed to open %s.final: %s"
15821 msgstr "无法打开 %s.final: %s"
15823 #: git-send-email.perl:704
15825 msgid "Failed to open %s: %s"
15826 msgstr "无法打开 %s: %s"
15828 #: git-send-email.perl:739
15829 msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
15830 msgstr "To/Cc/Bcc 字段不解析,它们被忽略\n"
15832 #: git-send-email.perl:748
15833 msgid "Summary email is empty, skipping it\n"
15834 msgstr "摘要邮件为空,跳过\n"
15836 #. TRANSLATORS: please keep [y/N] as is.
15837 #: git-send-email.perl:780
15839 msgid "Are you sure you want to use <%s> [y/N]? "
15840 msgstr "您确认要使用 <%s> [y/N]?"
15842 #: git-send-email.perl:809
15844 "The following files are 8bit, but do not declare a Content-Transfer-"
15846 msgstr "如下文件含 8bit 内容,但没有声明一个 Content-Transfer-Encoding。\n"
15848 #: git-send-email.perl:814
15849 msgid "Which 8bit encoding should I declare [UTF-8]? "
15850 msgstr "要声明 8bit 为什么样的编码格式 [UTF-8]?"
15852 #: git-send-email.perl:822
15855 "Refusing to send because the patch\n"
15857 "has the template subject '*** SUBJECT HERE ***'. Pass --force if you really "
15862 "包含模版标题 '*** SUBJECT HERE ***'。如果确实想要发送,使用参数 --force。\n"
15864 #: git-send-email.perl:841
15865 msgid "To whom should the emails be sent (if anyone)?"
15868 #: git-send-email.perl:859
15870 msgid "fatal: alias '%s' expands to itself\n"
15871 msgstr "严重:别名 '%s' 扩展为它自己\n"
15873 #: git-send-email.perl:871
15874 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
15875 msgstr "Message-ID 被用作第一封邮件的 In-Reply-To ?"
15877 #: git-send-email.perl:921 git-send-email.perl:929
15879 msgid "error: unable to extract a valid address from: %s\n"
15880 msgstr "错误:不能从 %s 中提取一个有效的邮件地址\n"
15882 #. TRANSLATORS: Make sure to include [q] [d] [e] in your
15883 #. translation. The program will only accept English input
15885 #: git-send-email.perl:933
15886 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
15887 msgstr "如何处理这个地址?([q]uit|[d]rop|[e]dit):"
15889 #: git-send-email.perl:1234
15891 msgid "CA path \"%s\" does not exist"
15892 msgstr "CA 路径 \"%s\" 不存在"
15894 #: git-send-email.perl:1309
15896 " The Cc list above has been expanded by additional\n"
15897 " addresses found in the patch commit message. By default\n"
15898 " send-email prompts before sending whenever this occurs.\n"
15899 " This behavior is controlled by the sendemail.confirm\n"
15900 " configuration setting.\n"
15902 " For additional information, run 'git send-email --help'.\n"
15903 " To retain the current behavior, but squelch this message,\n"
15904 " run 'git config --global sendemail.confirm auto'.\n"
15907 " 以上的抄送列表(Cc)已经用补丁提交信息中发现的地址进行\n"
15908 " 了扩展。缺省 send-email 会给出提示。这个行为可以通过\n"
15909 " sendemail.confirm 配置设置。\n"
15911 " 更多信息,执行 'git send-email --help'。\n"
15912 " 要保持当前行为,但不显示此信息,运行 'git config --global\n"
15913 " sendemail.confirm auto'。\n"
15916 #. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
15917 #. translation. The program will only accept English input
15919 #: git-send-email.perl:1324
15920 msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
15921 msgstr "发送邮件?([y]es|[n]o|[q]uit|[a]ll):"
15923 #: git-send-email.perl:1327
15924 msgid "Send this email reply required"
15927 #: git-send-email.perl:1353
15928 msgid "The required SMTP server is not properly defined."
15929 msgstr "要求的 SMTP 服务器未被正确定义。"
15931 #: git-send-email.perl:1397
15933 msgid "Server does not support STARTTLS! %s"
15934 msgstr "服务器不支持 STARTTLS!%s"
15936 #: git-send-email.perl:1403
15937 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
15938 msgstr "无法正确地初始化 SMTP。检查配置并使用 --smtp-debug。"
15940 #: git-send-email.perl:1421
15942 msgid "Failed to send %s\n"
15945 #: git-send-email.perl:1424
15947 msgid "Dry-Sent %s\n"
15950 #: git-send-email.perl:1424
15955 #: git-send-email.perl:1426
15956 msgid "Dry-OK. Log says:\n"
15957 msgstr "演习成功。日志说:\n"
15959 #: git-send-email.perl:1426
15960 msgid "OK. Log says:\n"
15963 #: git-send-email.perl:1438
15967 #: git-send-email.perl:1441
15968 msgid "Result: OK\n"
15971 #: git-send-email.perl:1454
15973 msgid "can't open file %s"
15976 #: git-send-email.perl:1501 git-send-email.perl:1521
15978 msgid "(mbox) Adding cc: %s from line '%s'\n"
15979 msgstr "(mbox) 添加 cc:%s 自行 '%s'\n"
15981 #: git-send-email.perl:1507
15983 msgid "(mbox) Adding to: %s from line '%s'\n"
15984 msgstr "(mbox) 添加 to:%s 自行 '%s'\n"
15986 #: git-send-email.perl:1555
15988 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
15989 msgstr "(non-mbox) 添加 cc:%s 自行 '%s'\n"
15991 #: git-send-email.perl:1578
15993 msgid "(body) Adding cc: %s from line '%s'\n"
15994 msgstr "(body) 添加 cc: %s 自行 '%s'\n"
15996 #: git-send-email.perl:1676
15998 msgid "(%s) Could not execute '%s'"
15999 msgstr "(%s) 不能执行 '%s'"
16001 #: git-send-email.perl:1683
16003 msgid "(%s) Adding %s: %s from: '%s'\n"
16004 msgstr "(%s) 添加 %s: %s 自:'%s'\n"
16006 #: git-send-email.perl:1687
16008 msgid "(%s) failed to close pipe to '%s'"
16009 msgstr "(%s) 无法关闭管道至 '%s'"
16011 #: git-send-email.perl:1714
16012 msgid "cannot send message as 7bit"
16013 msgstr "不能以 7bit 形式发送信息"
16015 #: git-send-email.perl:1722
16016 msgid "invalid transfer encoding"
16019 #: git-send-email.perl:1741 git-send-email.perl:1792 git-send-email.perl:1802
16021 msgid "unable to open %s: %s\n"
16022 msgstr "不能打开 %s:%s\n"
16024 #: git-send-email.perl:1744
16026 msgid "%s: patch contains a line longer than 998 characters"
16027 msgstr "%s:补丁包含一个超过 998 字符的行"
16029 #: git-send-email.perl:1760
16031 msgid "Skipping %s with backup suffix '%s'.\n"
16032 msgstr "略过 %s 含备份后缀 '%s'。\n"
16034 #. TRANSLATORS: please keep "[y|N]" as is.
16035 #: git-send-email.perl:1764
16037 msgid "Do you really want to send %s? [y|N]: "
16038 msgstr "您真的要发送 %s?[y|N]:"
16041 #~ "There is nothing to exclude from by :(exclude) patterns.\n"
16042 #~ "Perhaps you forgot to add either ':/' or '.' ?"
16044 #~ "没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"
16045 #~ "添加 ':/' 或 '.' ?"
16047 #~ msgid "unrecognized format: %%(%s)"
16048 #~ msgstr "未能识别的格式:%%(%s)"
16050 #~ msgid ":strip= requires a positive integer argument"
16051 #~ msgstr ":strip= 需要一个正整型参数"
16053 #~ msgid "ref '%s' does not have %ld components to :strip"
16054 #~ msgstr "引用 '%s' 未提供用于 :strip 的 %ld 个组件"
16056 #~ msgid "unknown %.*s format %s"
16057 #~ msgstr "未知的 %.*s 格式 %s"
16059 #~ msgid "[%s: gone]"
16060 #~ msgstr "[%s: 丢失]"
16065 #~ msgid "[%s: behind %d]"
16066 #~ msgstr "[%s:落后 %d]"
16068 #~ msgid "[%s: ahead %d]"
16069 #~ msgstr "[%s:领先 %d]"
16071 #~ msgid "[%s: ahead %d, behind %d]"
16072 #~ msgstr "[%s:领先 %d,落后 %d]"
16074 #~ msgid " **** invalid ref ****"
16075 #~ msgstr " **** 无效引用 ****"
16077 #~ msgid "insanely long object directory %.*s"
16078 #~ msgstr "不正常的长对象目录 %.*s"
16080 #~ msgid "git merge [<options>] <msg> HEAD <commit>"
16081 #~ msgstr "git merge [<选项>] <说明> HEAD <提交>"
16083 #~ msgid "'%s' is not a commit"
16084 #~ msgstr "'%s' 不是一个提交"
16086 #~ msgid "cannot open file '%s'"
16087 #~ msgstr "无法打开文件 '%s'"
16089 #~ msgid "could not close file %s"
16090 #~ msgstr "无法关闭文件 %s"
16092 #~ msgid "tag name too long: %.*s..."
16093 #~ msgstr "标签名称太长:%.*s..."
16095 #~ msgid "tag header too big."
16096 #~ msgstr "标签头信息太大。"
16099 #~ "If the patch applies cleanly, the edited hunk will immediately be\n"
16100 #~ "marked for discarding"
16101 #~ msgstr "如果补丁能干净地应用,编辑块将立即标记为丢弃"
16103 #~ msgid "Use an experimental blank-line-based heuristic to improve diffs"
16104 #~ msgstr "使用一个试验性的基于空行的启发式算法改进差异显示"
16106 #~ msgid "Clever... amending the last one with dirty index."
16107 #~ msgstr "聪明... 用脏索引修补最后一个提交。"
16110 #~ "the following submodule (or one of its nested submodules)\n"
16111 #~ "uses a .git directory:"
16113 #~ "the following submodules (or one of their nested submodules)\n"
16114 #~ "use a .git directory:"
16115 #~ msgstr[0] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
16116 #~ msgstr[1] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
16120 #~ "(use 'rm -rf' if you really want to remove it including all of its "
16124 #~ "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
16126 #~ msgid "Could not write to %s"
16127 #~ msgstr "不能写入 %s"
16129 #~ msgid "Error wrapping up %s."
16130 #~ msgstr "错误收尾 %s。"
16132 #~ msgid "Your local changes would be overwritten by cherry-pick."
16133 #~ msgstr "您的本地修改将被拣选操作覆盖。"
16135 #~ msgid "Cannot revert during another revert."
16136 #~ msgstr "不能在回退中执行另一回退。"
16138 #~ msgid "Cannot cherry-pick during another cherry-pick."
16139 #~ msgstr "不能在拣选过程中执行另一拣选。"
16141 #~ msgid "Could not parse line %d."
16142 #~ msgstr "不能解析第 %d 行。"
16144 #~ msgid "Could not open %s"
16145 #~ msgstr "不能打开 %s"
16147 #~ msgid "Could not read %s."
16148 #~ msgstr "不能读取 %s。"
16150 #~ msgid "Could not format %s."
16151 #~ msgstr "不能格式化 %s。"
16156 #~ msgid "cannot open %s: %s"
16157 #~ msgstr "不能打开 %s:%s"
16159 #~ msgid "You need to set your committer info first"
16160 #~ msgstr "您需要先设置您的提交者信息"