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: 2016-11-25 22:50+0800\n"
139 "PO-Revision-Date: 2016-11-25 22:54+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:1181
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:3390 apply.c:3401 apply.c:3447 setup.c:248
452 msgid "failed to read %s"
457 msgid "reading from '%s' beyond a symbolic link"
458 msgstr "读取位于符号链接中的 '%s'"
460 #: apply.c:3427 apply.c:3667
462 msgid "path %s has been renamed/deleted"
463 msgstr "路径 %s 已经被重命名/删除"
465 #: apply.c:3510 apply.c:3681
467 msgid "%s: does not exist in index"
470 #: apply.c:3519 apply.c:3689
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:3573 apply.c:3577
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:3859 apply.c:3861
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:4090 builtin/checkout.c:233 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:4297 apply.c:4441
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:4540 builtin/fetch.c:740 builtin/fetch.c:989
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:4864 apply.c:4879
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:4888 builtin/add.c:463 builtin/mv.c:286 builtin/rm.c:431
704 msgid "Unable to write new index file"
707 #: apply.c:4919 apply.c:4922 builtin/am.c:2277 builtin/am.c:2280
708 #: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180
709 #: builtin/submodule--helper.c:281 builtin/submodule--helper.c:407
710 #: builtin/submodule--helper.c:589 builtin/submodule--helper.c:592
711 #: builtin/submodule--helper.c:944 builtin/submodule--helper.c:947
716 msgid "don't apply changes matching the given path"
717 msgstr "不要应用与给出路径向匹配的变更"
720 msgid "apply changes matching the given path"
721 msgstr "应用与给出路径向匹配的变更"
723 #: apply.c:4925 builtin/am.c:2286
728 msgid "remove <num> leading slashes from traditional diff paths"
729 msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
732 msgid "ignore additions made by the patch"
736 msgid "instead of applying the patch, output diffstat for the input"
737 msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
740 msgid "show number of added and deleted lines in decimal notation"
741 msgstr "以十进制数显示添加和删除的行数"
744 msgid "instead of applying the patch, output a summary for the input"
745 msgstr "不应用补丁,而是显示输入的概要"
748 msgid "instead of applying the patch, see if the patch is applicable"
749 msgstr "不应用补丁,而是查看补丁是否可应用"
752 msgid "make sure the patch is applicable to the current index"
753 msgstr "确认补丁可以应用到当前索引"
756 msgid "apply a patch without touching the working tree"
760 msgid "accept a patch that touches outside the working area"
761 msgstr "接受修改工作区之外文件的补丁"
764 msgid "also apply the patch (use with --stat/--summary/--check)"
765 msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
768 msgid "attempt three-way merge if a patch does not apply"
769 msgstr "如果一个补丁不能应用则尝试三方合并"
772 msgid "build a temporary index based on embedded index information"
773 msgstr "创建一个临时索引基于嵌入的索引信息"
775 #: apply.c:4954 builtin/checkout-index.c:169 builtin/ls-files.c:505
776 msgid "paths are separated with NUL character"
777 msgstr "路径以 NUL 字符分隔"
780 msgid "ensure at least <n> lines of context match"
781 msgstr "确保至少匹配 <n> 行上下文"
783 #: apply.c:4957 builtin/am.c:2265
788 msgid "detect new or modified lines that have whitespace errors"
789 msgstr "检查新增和修改的行中间的空白字符滥用"
791 #: apply.c:4961 apply.c:4964
792 msgid "ignore changes in whitespace when finding context"
793 msgstr "查找上下文时忽略空白字符的变更"
796 msgid "apply the patch in reverse"
800 msgid "don't expect at least one line of context"
804 msgid "leave the rejected hunks in corresponding *.rej files"
805 msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
808 msgid "allow overlapping hunks"
811 #: apply.c:4974 builtin/add.c:267 builtin/check-ignore.c:19
812 #: builtin/commit.c:1339 builtin/count-objects.c:94 builtin/fsck.c:593
813 #: builtin/log.c:1860 builtin/mv.c:110 builtin/read-tree.c:114
818 msgid "tolerate incorrectly detected missing new-line at the end of file"
819 msgstr "允许不正确的文件末尾换行符"
822 msgid "do not trust the line counts in the hunk headers"
823 msgstr "不信任补丁片段的头信息中的行号"
825 #: apply.c:4981 builtin/am.c:2274
830 msgid "prepend <root> to all filenames"
831 msgstr "为所有文件名前添加 <根目录>"
834 msgid "git archive [<options>] <tree-ish> [<path>...]"
835 msgstr "git archive [<选项>] <树或提交> [<路径>...]"
838 msgid "git archive --list"
839 msgstr "git archive --list"
843 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
845 "git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]"
848 msgid "git archive --remote <repo> [--exec <cmd>] --list"
849 msgstr "git archive --remote <仓库> [--exec <命令>] --list"
851 #: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:327
853 msgid "pathspec '%s' did not match any files"
854 msgstr "路径规格 '%s' 未匹配任何文件"
861 msgid "archive format"
864 #: archive.c:430 builtin/log.c:1429
869 msgid "prepend prefix to each pathname in the archive"
870 msgstr "为归档中每个路径名加上前缀"
872 #: archive.c:432 builtin/archive.c:88 builtin/blame.c:2603
873 #: builtin/blame.c:2604 builtin/config.c:59 builtin/fast-export.c:987
874 #: builtin/fast-export.c:989 builtin/grep.c:723 builtin/hash-object.c:101
875 #: builtin/ls-files.c:539 builtin/ls-files.c:542 builtin/notes.c:401
876 #: builtin/notes.c:564 builtin/read-tree.c:109 parse-options.h:153
880 #: archive.c:433 builtin/archive.c:89
881 msgid "write the archive to this file"
885 msgid "read .gitattributes in working directory"
886 msgstr "读取工作区中的 .gitattributes"
889 msgid "report archived files on stderr"
890 msgstr "在标准错误上报告归档文件"
897 msgid "compress faster"
901 msgid "compress better"
905 msgid "list supported archive formats"
908 #: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88
909 #: builtin/submodule--helper.c:601 builtin/submodule--helper.c:953
913 #: archive.c:452 builtin/archive.c:91
914 msgid "retrieve the archive from remote repository <repo>"
915 msgstr "从远程仓库(<仓库>)提取归档文件"
917 #: archive.c:453 builtin/archive.c:92 builtin/notes.c:485
921 #: archive.c:454 builtin/archive.c:93
922 msgid "path to the remote git-upload-archive command"
923 msgstr "远程 git-upload-archive 命令的路径"
926 msgid "Unexpected option --remote"
927 msgstr "未知参数 --remote"
930 msgid "Option --exec can only be used together with --remote"
931 msgstr "选项 --exec 只能和 --remote 同时使用"
934 msgid "Unexpected option --output"
935 msgstr "未知参数 --output"
939 msgid "Unknown archive format '%s'"
944 msgid "Argument not supported for format '%s': -%d"
945 msgstr "参数不支持此格式 '%s':-%d"
949 "Negative patterns are ignored in git attributes\n"
950 "Use '\\!' for literal leading exclamation."
952 "负值模版在 git attributes 中被忽略\n"
953 "当字符串确实要以感叹号开始时,使用 '\\!'。"
957 msgid "Could not open file '%s'"
962 msgid "Badly quoted content in file '%s': %s"
963 msgstr "文件 '%s' 包含错误的引用格式:%s"
967 msgid "We cannot bisect more!\n"
968 msgstr "我们无法进行更多的二分查找!\n"
972 msgid "Not a valid commit name %s"
973 msgstr "不是一个有效的提交名 %s"
978 "The merge base %s is bad.\n"
979 "This means the bug has been fixed between %s and [%s].\n"
982 "这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"
987 "The merge base %s is new.\n"
988 "The property has changed between %s and [%s].\n"
991 "介于 %s 和 [%s] 之间的属性已经被修改。\n"
996 "The merge base %s is %s.\n"
997 "This means the first '%s' commit is between %s and [%s].\n"
1000 "这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"
1005 "Some %s revs are not ancestor of the %s rev.\n"
1006 "git bisect cannot work properly in this case.\n"
1007 "Maybe you mistook %s and %s revs?\n"
1009 "一些 %s 版本不是 %s 版本的祖先。\n"
1010 "这种情况下 git 二分查找无法正常工作。\n"
1011 "您可能弄错了 %s 和 %s 版本?\n"
1016 "the merge base between %s and [%s] must be skipped.\n"
1017 "So we cannot be sure the first %s commit is between %s and %s.\n"
1018 "We continue anyway."
1020 "介于 %s 和 [%s] 的合并基线一定被忽略了。\n"
1021 "所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"
1026 msgid "Bisecting: a merge base must be tested\n"
1027 msgstr "二分查找中:合并基线必须是经过测试的\n"
1031 msgid "a %s revision is needed"
1034 #: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248
1036 msgid "could not create file '%s'"
1037 msgstr "不能创建文件 '%s'"
1041 msgid "could not read file '%s'"
1042 msgstr "不能读取文件 '%s'"
1045 msgid "reading bisect refs failed"
1050 msgid "%s was both %s and %s\n"
1051 msgstr "%s 同时为 %s 和 %s\n"
1056 "No testable commit found.\n"
1057 "Maybe you started with bad path parameters?\n"
1060 "可能您在运行时使用了错误的路径参数?\n"
1064 msgid "(roughly %d step)"
1065 msgid_plural "(roughly %d steps)"
1066 msgstr[0] "(大概 %d 步)"
1067 msgstr[1] "(大概 %d 步)"
1069 #. TRANSLATORS: the last %s will be replaced with
1070 #. "(roughly %d steps)" translation
1073 msgid "Bisecting: %d revision left to test after this %s\n"
1074 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
1075 msgstr[0] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n"
1076 msgstr[1] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n"
1082 "After fixing the error cause you may try to fix up\n"
1083 "the remote tracking information by invoking\n"
1084 "\"git branch --set-upstream-to=%s%s%s\"."
1087 "在修复错误后,您可以尝试修改远程跟踪分支,通过执行命令\n"
1088 "\"git branch --set-upstream-to=%s%s%s\" 。"
1092 msgid "Not setting branch %s as its own upstream."
1093 msgstr "未设置分支 %s 作为它自己的上游。"
1097 msgid "Branch %s set up to track remote branch %s from %s by rebasing."
1098 msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"
1102 msgid "Branch %s set up to track remote branch %s from %s."
1103 msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"
1107 msgid "Branch %s set up to track local branch %s by rebasing."
1108 msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"
1112 msgid "Branch %s set up to track local branch %s."
1113 msgstr "分支 %s 设置为跟踪本地分支 %s。"
1117 msgid "Branch %s set up to track remote ref %s by rebasing."
1118 msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"
1122 msgid "Branch %s set up to track remote ref %s."
1123 msgstr "分支 %s 设置为跟踪远程引用 %s。"
1127 msgid "Branch %s set up to track local ref %s by rebasing."
1128 msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"
1132 msgid "Branch %s set up to track local ref %s."
1133 msgstr "分支 %s 设置为跟踪本地引用 %s。"
1136 msgid "Unable to write upstream branch configuration"
1141 msgid "Not tracking: ambiguous information for ref %s"
1142 msgstr "未跟踪:引用 %s 有歧义"
1146 msgid "'%s' is not a valid branch name."
1147 msgstr "'%s' 不是一个有效的分支名称。"
1151 msgid "A branch named '%s' already exists."
1152 msgstr "一个分支名 '%s' 已经存在。"
1155 msgid "Cannot force update the current branch."
1156 msgstr "无法强制更新当前分支。"
1160 msgid "Cannot setup tracking information; starting point '%s' is not a branch."
1161 msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
1165 msgid "the requested upstream branch '%s' does not exist"
1166 msgstr "请求的上游分支 '%s' 不存在"
1171 "If you are planning on basing your work on an upstream\n"
1172 "branch that already exists at the remote, you may need to\n"
1173 "run \"git fetch\" to retrieve it.\n"
1175 "If you are planning to push out a new local branch that\n"
1176 "will track its remote counterpart, you may want to use\n"
1177 "\"git push -u\" to set the upstream config as you push."
1180 "如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
1181 "您可能需要执行 \"git fetch\" 来获取分支。\n"
1183 "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
1184 "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
1188 msgid "Not a valid object name: '%s'."
1189 msgstr "不是一个有效的对象名:'%s'。"
1193 msgid "Ambiguous object name: '%s'."
1194 msgstr "歧义的对象名:'%s'。"
1198 msgid "Not a valid branch point: '%s'."
1199 msgstr "无效的分支点:'%s'。"
1203 msgid "'%s' is already checked out at '%s'"
1204 msgstr "'%s' 已经检出到 '%s'"
1208 msgid "HEAD of working tree %s is not updated"
1209 msgstr "工作区 %s 的 HEAD 指向没有被更新"
1213 msgid "'%s' does not look like a v2 bundle file"
1214 msgstr "'%s' 不像是一个 v2 版本的包文件"
1218 msgid "unrecognized header: %s%s (%d)"
1219 msgstr "未能识别的包头:%s%s (%d)"
1221 #: bundle.c:87 sequencer.c:963 builtin/commit.c:777
1223 msgid "could not open '%s'"
1227 msgid "Repository lacks these prerequisite commits:"
1228 msgstr "仓库中缺少这些必备的提交:"
1230 #: bundle.c:163 ref-filter.c:1462 sequencer.c:830 sequencer.c:1374
1231 #: builtin/blame.c:2814 builtin/commit.c:1061 builtin/log.c:348
1232 #: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909
1233 #: builtin/merge.c:356 builtin/shortlog.c:170
1234 msgid "revision walk setup failed"
1239 msgid "The bundle contains this ref:"
1240 msgid_plural "The bundle contains these %d refs:"
1241 msgstr[0] "这个包中含有这个引用:"
1242 msgstr[1] "这个包中含有 %d 个引用:"
1245 msgid "The bundle records a complete history."
1246 msgstr "这个包记录一个完整历史。"
1250 msgid "The bundle requires this ref:"
1251 msgid_plural "The bundle requires these %d refs:"
1252 msgstr[0] "这个包需要这个引用:"
1253 msgstr[1] "这个包需要 %d 个引用:"
1256 msgid "Could not spawn pack-objects"
1257 msgstr "不能生成 pack-objects 进程"
1260 msgid "pack-objects died"
1261 msgstr "pack-objects 终止"
1264 msgid "rev-list died"
1265 msgstr "rev-list 终止"
1269 msgid "ref '%s' is excluded by the rev-list options"
1270 msgstr "引用 '%s' 被 rev-list 选项排除"
1272 #: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:273
1274 msgid "unrecognized argument: %s"
1278 msgid "Refusing to create empty bundle."
1283 msgid "cannot create '%s'"
1287 msgid "index-pack died"
1288 msgstr "index-pack 终止"
1292 msgid "invalid color value: %.*s"
1293 msgstr "无效的颜色值:%.*s"
1295 #: commit.c:40 builtin/am.c:421 builtin/am.c:457 builtin/am.c:1493
1296 #: builtin/am.c:2127
1298 msgid "could not parse %s"
1303 msgid "%s %s is not a commit!"
1304 msgstr "%s %s 不是一个提交!"
1308 "Warning: commit message did not conform to UTF-8.\n"
1309 "You may want to amend it after fixing the message, or set the config\n"
1310 "variable i18n.commitencoding to the encoding your project uses.\n"
1312 "警告:提交说明不符合 UTF-8 字符集。\n"
1313 "您可以通过修补提交来改正提交说明,或者将配置变量 i18n.commitencoding\n"
1316 #: compat/obstack.c:406 compat/obstack.c:408
1317 msgid "memory exhausted"
1322 msgid "bad config line %d in blob %s"
1323 msgstr "数据对象 %2$s 中错误的配置行 %1$d"
1327 msgid "bad config line %d in file %s"
1328 msgstr "文件 %2$s 中错误的配置行 %1$d"
1332 msgid "bad config line %d in standard input"
1333 msgstr "标准输入中错误的配置行 %d"
1337 msgid "bad config line %d in submodule-blob %s"
1338 msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"
1342 msgid "bad config line %d in command line %s"
1343 msgstr "命令行 %2$s 中错误的配置行 %1$d"
1347 msgid "bad config line %d in %s"
1348 msgstr "在 %2$s 中错误的配置行 %1$d"
1351 msgid "out of range"
1355 msgid "invalid unit"
1360 msgid "bad numeric config value '%s' for '%s': %s"
1361 msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误:%3$s"
1365 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
1366 msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1370 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
1371 msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1375 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
1376 msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s':%3$s"
1380 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
1381 msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1385 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
1386 msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1390 msgid "bad numeric config value '%s' for '%s' in %s: %s"
1391 msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1395 msgid "failed to expand user dir in: '%s'"
1396 msgstr "无法扩展 '%s' 中的用户目录"
1398 #: config.c:852 config.c:863
1400 msgid "bad zlib compression level %d"
1401 msgstr "错误的 zlib 压缩级别 %d"
1405 msgid "invalid mode for object creation: %s"
1406 msgstr "无效的对象创建模式:%s"
1409 msgid "unable to parse command-line config"
1410 msgstr "无法解析命令行中的配置"
1413 msgid "unknown error occurred while reading the configuration files"
1414 msgstr "在读取配置文件时遇到未知错误"
1418 msgid "unable to parse '%s' from command-line config"
1419 msgstr "无法解析命令行配置中的 '%s'"
1423 msgid "bad config variable '%s' in file '%s' at line %d"
1424 msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
1428 msgid "%s has multiple values"
1433 msgid "could not set '%s' to '%s'"
1434 msgstr "不能设置 '%s' 为 '%s'"
1438 msgid "could not unset '%s'"
1439 msgstr "不能取消设置 '%s'"
1442 msgid "The remote end hung up upon initial contact"
1443 msgstr "远端在初始连接时即挂断"
1447 "Could not read from remote repository.\n"
1449 "Please make sure you have the correct access rights\n"
1450 "and the repository exists."
1454 "请确认您有正确的访问权限并且仓库存在。"
1456 #: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140
1457 msgid "Checking connectivity"
1461 msgid "Could not run 'git rev-list'"
1462 msgstr "不能执行 'git rev-list'"
1465 msgid "failed write to rev-list"
1466 msgstr "无法写入 rev-list"
1469 msgid "failed to close rev-list's stdin"
1470 msgstr "无法关闭 rev-list 的标准输入"
1475 "CRLF will be replaced by LF in %s.\n"
1476 "The file will have its original line endings in your working directory."
1478 "文件 %s 中的 CRLF 将被 LF 替换。\n"
1479 "在工作区中该文件仍保持原有的换行符。"
1483 msgid "CRLF would be replaced by LF in %s."
1484 msgstr "文件 %s 中的 CRLF 将被 LF 替换。"
1489 "LF will be replaced by CRLF in %s.\n"
1490 "The file will have its original line endings in your working directory."
1492 "文件 %s 中的 LF 将被 CRLF 替换。\n"
1493 "在工作区中该文件仍保持原有的换行符。"
1497 msgid "LF would be replaced by CRLF in %s"
1498 msgstr "文件 %s 中的 LF 将被 CRLF 替换"
1501 msgid "in the future"
1506 msgid "%lu second ago"
1507 msgid_plural "%lu seconds ago"
1513 msgid "%lu minute ago"
1514 msgid_plural "%lu minutes ago"
1520 msgid "%lu hour ago"
1521 msgid_plural "%lu hours ago"
1528 msgid_plural "%lu days ago"
1534 msgid "%lu week ago"
1535 msgid_plural "%lu weeks ago"
1541 msgid "%lu month ago"
1542 msgid_plural "%lu months ago"
1549 msgid_plural "%lu years"
1553 #. TRANSLATORS: "%s" is "<n> years"
1556 msgid "%s, %lu month ago"
1557 msgid_plural "%s, %lu months ago"
1558 msgstr[0] "%s %lu 个月前"
1559 msgstr[1] "%s %lu 个月前"
1561 #: date.c:156 date.c:161
1563 msgid "%lu year ago"
1564 msgid_plural "%lu years ago"
1568 #: diffcore-order.c:24
1570 msgid "failed to read orderfile '%s'"
1571 msgstr "无法读取排序文件 '%s'"
1573 #: diffcore-rename.c:536
1574 msgid "Performing inexact rename detection"
1575 msgstr "正在进行非精确的重命名检测"
1579 msgid "option '%s' requires a value"
1580 msgstr "选项 '%s' 需要一个值"
1585 msgid " Failed to parse dirstat cut-off percentage '%s'\n"
1586 msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
1591 msgid " Unknown dirstat parameter '%s'\n"
1592 msgstr " 未知的 dirstat 参数 '%s'\n"
1596 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
1597 msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
1602 "Found errors in 'diff.dirstat' config variable:\n"
1605 "发现配置变量 'diff.dirstat' 中的错误:\n"
1610 msgid "external diff died, stopping at %s"
1611 msgstr "外部 diff 退出,停止在 %s"
1614 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
1615 msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
1618 msgid "--follow requires exactly one pathspec"
1619 msgstr "--follow 明确要求只跟一个路径规格"
1624 "Failed to parse --dirstat/-X option parameter:\n"
1627 "无法解析 --dirstat/-X 选项的参数:\n"
1632 msgid "Failed to parse --submodule option parameter: '%s'"
1633 msgstr "无法解析 --submodule 选项的参数:'%s'"
1636 msgid "inexact rename detection was skipped due to too many files."
1637 msgstr "因为文件太多,略过不严格的重命名检查。"
1640 msgid "only found copies from modified paths due to too many files."
1641 msgstr "因为文件太多,只在修改的路径中查找拷贝。"
1646 "you may want to set your %s variable to at least %d and retry the command."
1647 msgstr "您可能想要将您的 %s 变量至少设置为 %d 并重复此命令。"
1650 msgid "failed to get kernel name and information"
1651 msgstr "无法获得内核名称和信息"
1654 msgid "Untracked cache is disabled on this system or location."
1655 msgstr "缓存未跟踪文件在本系统或位置中被禁用。"
1658 msgid "git fetch-pack: expected shallow list"
1659 msgstr "git fetch-pack:应为 shallow 列表"
1662 msgid "git fetch-pack: expected ACK/NAK, got EOF"
1663 msgstr "git fetch-pack:应为 ACK/NAK,却得到 EOF"
1667 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
1668 msgstr "git fetch-pack:应为 ACK/NAK,却得到 '%s'"
1671 msgid "--stateless-rpc requires multi_ack_detailed"
1672 msgstr "--stateless-rpc 需要 multi_ack_detailed"
1676 msgid "invalid shallow line: %s"
1677 msgstr "无效的 shallow 信息:%s"
1681 msgid "invalid unshallow line: %s"
1682 msgstr "无效的 unshallow 信息:%s"
1686 msgid "object not found: %s"
1691 msgid "error in object: %s"
1696 msgid "no shallow found: %s"
1697 msgstr "未发现 shallow:%s"
1701 msgid "expected shallow/unshallow, got %s"
1702 msgstr "应为 shallow/unshallow,却得到 %s"
1706 msgid "got %s %d %s"
1707 msgstr "得到 %s %d %s"
1711 msgid "invalid commit %s"
1718 #: fetch-pack.c:493 progress.c:235
1724 msgid "got %s (%d) %s"
1725 msgstr "得到 %s (%d) %s"
1729 msgid "Marking %s as complete"
1734 msgid "already have %s (%s)"
1735 msgstr "已经有 %s (%s)"
1738 msgid "fetch-pack: unable to fork off sideband demultiplexer"
1739 msgstr "fetch-pack:无法派生 sideband 多路输出"
1742 msgid "protocol error: bad pack header"
1747 msgid "fetch-pack: unable to fork off %s"
1748 msgstr "fetch-pack:无法派生进程 %s"
1756 msgid "error in sideband demultiplexer"
1757 msgstr "sideband 多路输出出错"
1760 msgid "Server does not support shallow clients"
1761 msgstr "服务器不支持 shalllow 客户端"
1764 msgid "Server supports multi_ack_detailed"
1765 msgstr "服务器支持 multi_ack_detailed"
1768 msgid "Server supports no-done"
1769 msgstr "服务器支持 no-done"
1772 msgid "Server supports multi_ack"
1773 msgstr "服务器支持 multi_ack"
1776 msgid "Server supports side-band-64k"
1777 msgstr "服务器支持 side-band-64k"
1780 msgid "Server supports side-band"
1781 msgstr "服务器支持 side-band"
1784 msgid "Server supports allow-tip-sha1-in-want"
1785 msgstr "服务器支持 allow-tip-sha1-in-want"
1788 msgid "Server supports allow-reachable-sha1-in-want"
1789 msgstr "服务器支持 allow-reachable-sha1-in-want"
1792 msgid "Server supports ofs-delta"
1793 msgstr "服务器支持 ofs-delta"
1797 msgid "Server version is %.*s"
1801 msgid "Server does not support --shallow-since"
1802 msgstr "服务器不支持 --shallow-since"
1805 msgid "Server does not support --shallow-exclude"
1806 msgstr "服务器不支持 --shallow-exclude"
1809 msgid "Server does not support --deepen"
1810 msgstr "服务器不支持 --deepen"
1813 msgid "no common commits"
1817 msgid "git fetch-pack: fetch failed."
1818 msgstr "git fetch-pack:获取失败。"
1820 #: fetch-pack.c:1087
1821 msgid "no matching remote head"
1824 #: gpg-interface.c:185
1825 msgid "gpg failed to sign the data"
1826 msgstr "gpg 无法为数据签名"
1828 #: gpg-interface.c:215
1829 msgid "could not create temporary file"
1832 #: gpg-interface.c:217
1834 msgid "failed writing detached signature to '%s'"
1835 msgstr "无法将分离式签名写入 '%s'"
1839 msgid "'%s': unable to read %s"
1840 msgstr "'%s':无法读取 %s"
1842 #: grep.c:1799 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:155
1844 msgid "failed to stat '%s'"
1845 msgstr "无法枚举 '%s' 状态"
1849 msgid "'%s': short read"
1854 msgid "available git commands in '%s'"
1855 msgstr "在 '%s' 下可用的 git 命令"
1858 msgid "git commands available from elsewhere on your $PATH"
1859 msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
1862 msgid "These are common Git commands used in various situations:"
1863 msgstr "这些是各种场合常见的 Git 命令:"
1868 "'%s' appears to be a git command, but we were not\n"
1869 "able to execute it. Maybe git-%s is broken?"
1871 "'%s' 像是一个 git 命令,但却无法运行。\n"
1875 msgid "Uh oh. Your system reports no Git commands at all."
1876 msgstr "唉呀,您的系统中未发现 Git 命令。"
1881 "WARNING: You called a Git command named '%s', which does not exist.\n"
1882 "Continuing under the assumption that you meant '%s'"
1884 "警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要运行的\n"
1889 msgid "in %0.1f seconds automatically..."
1890 msgstr "在 %0.1f 秒钟后自动运行..."
1894 msgid "git: '%s' is not a git command. See 'git --help'."
1895 msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
1897 #: help.c:399 help.c:465
1900 "Did you mean this?"
1903 "Did you mean one of these?"
1919 "*** Please tell me who you are.\n"
1923 " git config --global user.email \"you@example.com\"\n"
1924 " git config --global user.name \"Your Name\"\n"
1926 "to set your account's default identity.\n"
1927 "Omit --global to set the identity only in this repository.\n"
1935 " git config --global user.email \"you@example.com\"\n"
1936 " git config --global user.name \"Your Name\"\n"
1939 "如果仅在本仓库设置身份标识,则省略 --global 参数。\n"
1944 "Unable to create '%s.lock': %s.\n"
1946 "Another git process seems to be running in this repository, e.g.\n"
1947 "an editor opened by 'git commit'. Please make sure all processes\n"
1948 "are terminated then try again. If it still fails, a git process\n"
1949 "may have crashed in this repository earlier:\n"
1950 "remove the file manually to continue."
1952 "无法创建 '%s.lock':%s。\n"
1954 "似乎另外一个 git 进程在这个仓库中运行,例如:'git commit' 命令打\n"
1955 "开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错,\n"
1956 "可能之前有一个 git 进程在这个仓库中异常退出:\n"
1961 msgid "Unable to create '%s.lock': %s"
1962 msgstr "不能创建 '%s.lock':%s"
1965 msgid "failed to read the cache"
1968 #: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:374
1969 #: builtin/checkout.c:588 builtin/clone.c:731
1970 msgid "unable to write new index file"
1973 #: merge-recursive.c:209
1974 msgid "(bad commit)\n"
1977 #: merge-recursive.c:231
1979 msgid "addinfo_cache failed for path '%s'"
1980 msgstr "为路径 '%s' addinfo_cache 失败"
1982 #: merge-recursive.c:301
1983 msgid "error building trees"
1986 #: merge-recursive.c:720
1988 msgid "failed to create path '%s'%s"
1989 msgstr "无法创建路径 '%s'%s"
1991 #: merge-recursive.c:731
1993 msgid "Removing %s to make room for subdirectory\n"
1994 msgstr "删除 %s 以便为子目录留出空间\n"
1996 #: merge-recursive.c:745 merge-recursive.c:764
1997 msgid ": perhaps a D/F conflict?"
1998 msgstr ":可能是一个目录/文件冲突?"
2000 #: merge-recursive.c:754
2002 msgid "refusing to lose untracked file at '%s'"
2003 msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
2005 #: merge-recursive.c:796 builtin/cat-file.c:34
2007 msgid "cannot read object %s '%s'"
2008 msgstr "不能读取对象 %s '%s'"
2010 #: merge-recursive.c:798
2012 msgid "blob expected for %s '%s'"
2013 msgstr "%s '%s' 应为数据对象"
2015 #: merge-recursive.c:822
2017 msgid "failed to open '%s': %s"
2018 msgstr "无法打开 '%s':%s"
2020 #: merge-recursive.c:833
2022 msgid "failed to symlink '%s': %s"
2023 msgstr "无法创建符号链接 '%s':%s"
2025 #: merge-recursive.c:838
2027 msgid "do not know what to do with %06o %s '%s'"
2028 msgstr "不知道如何处理 %06o %s '%s'"
2030 #: merge-recursive.c:978
2031 msgid "Failed to execute internal merge"
2034 #: merge-recursive.c:982
2036 msgid "Unable to add %s to database"
2037 msgstr "不能添加 %s 至对象库"
2039 #: merge-recursive.c:1081 merge-recursive.c:1095
2042 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
2045 "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
2048 #: merge-recursive.c:1087 merge-recursive.c:1100
2051 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
2054 "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
2057 #: merge-recursive.c:1143
2061 #: merge-recursive.c:1143
2065 #: merge-recursive.c:1200
2067 msgid "%s is a directory in %s adding as %s instead"
2068 msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
2070 #: merge-recursive.c:1225
2073 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
2074 "\"->\"%s\" in \"%s\"%s"
2076 "冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
2077 "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
2079 #: merge-recursive.c:1230
2080 msgid " (left unresolved)"
2083 #: merge-recursive.c:1292
2085 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
2087 "冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
2090 #: merge-recursive.c:1325
2092 msgid "Renaming %s to %s and %s to %s instead"
2093 msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
2095 #: merge-recursive.c:1531
2097 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
2098 msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
2100 #: merge-recursive.c:1546
2102 msgid "Adding merged %s"
2105 #: merge-recursive.c:1553 merge-recursive.c:1766
2107 msgid "Adding as %s instead"
2108 msgstr "而是以 %s 为名添加"
2110 #: merge-recursive.c:1610
2112 msgid "cannot read object %s"
2115 #: merge-recursive.c:1613
2117 msgid "object %s is not a blob"
2118 msgstr "对象 %s 不是一个数据对象"
2120 #: merge-recursive.c:1666
2124 #: merge-recursive.c:1666
2128 #: merge-recursive.c:1676
2132 #: merge-recursive.c:1683
2136 #: merge-recursive.c:1718
2138 msgid "Skipped %s (merged same as existing)"
2139 msgstr "略过 %s(已经做过相同合并)"
2141 #: merge-recursive.c:1732
2143 msgid "Auto-merging %s"
2146 #: merge-recursive.c:1736 git-submodule.sh:924
2150 #: merge-recursive.c:1737
2152 msgid "CONFLICT (%s): Merge conflict in %s"
2153 msgstr "冲突(%s):合并冲突于 %s"
2155 #: merge-recursive.c:1831
2160 #: merge-recursive.c:1857
2161 msgid "file/directory"
2164 #: merge-recursive.c:1863
2165 msgid "directory/file"
2168 #: merge-recursive.c:1868
2170 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
2171 msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
2173 #: merge-recursive.c:1877
2178 #: merge-recursive.c:1914
2179 msgid "Already up-to-date!"
2182 #: merge-recursive.c:1923
2184 msgid "merging of trees %s and %s failed"
2185 msgstr "无法合并树 %s 和 %s"
2187 #: merge-recursive.c:2006
2191 #: merge-recursive.c:2019
2193 msgid "found %u common ancestor:"
2194 msgid_plural "found %u common ancestors:"
2195 msgstr[0] "发现 %u 个共同祖先:"
2196 msgstr[1] "发现 %u 个共同祖先:"
2198 #: merge-recursive.c:2058
2199 msgid "merge returned no commit"
2202 #: merge-recursive.c:2121
2204 msgid "Could not parse object '%s'"
2205 msgstr "不能解析对象 '%s'"
2207 #: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788
2208 msgid "Unable to write index."
2211 #: notes-merge.c:273
2214 "You have not concluded your previous notes merge (%s exists).\n"
2215 "Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
2216 "commit/abort the previous merge before you start a new notes merge."
2218 "您尚未结束您前一次注释合并(存在 %s)。\n"
2219 "请您在开始一个新的注释合并之前,使用 'git notes merge --commit' 或者 'git "
2220 "notes merge --abort' 来提交/终止前一次合并。"
2222 #: notes-merge.c:280
2224 msgid "You have not concluded your notes merge (%s exists)."
2225 msgstr "您尚未结束注释合并(存在 %s)。"
2228 msgid "Cannot commit uninitialized/unreferenced notes tree"
2229 msgstr "不能提交未初始化/未引用的注解树"
2231 #: notes-utils.c:100
2233 msgid "Bad notes.rewriteMode value: '%s'"
2234 msgstr "坏的 notes.rewriteMode 值:'%s'"
2236 #: notes-utils.c:110
2238 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
2239 msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
2241 #. TRANSLATORS: The first %s is the name of the
2242 #. environment variable, the second %s is its value
2243 #: notes-utils.c:137
2245 msgid "Bad %s value: '%s'"
2246 msgstr "坏的 %s 值:'%s'"
2250 msgid "unable to parse object: %s"
2253 #: parse-options.c:572
2257 #: parse-options.c:590
2262 #. TRANSLATORS: the colon here should align with the
2263 #. one in "usage: %s" translation
2264 #: parse-options.c:594
2269 # 译者:为保证在输出中对齐,注意调整句中空格!
2270 #: parse-options.c:597
2275 #: parse-options.c:631
2279 #: parse-options-cb.c:108
2281 msgid "malformed object name '%s'"
2282 msgstr "非法的对象名 '%s'"
2286 msgid "Could not make %s writable by group"
2287 msgstr "不能设置 %s 为组可写"
2290 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
2291 msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
2295 "global 'literal' pathspec setting is incompatible with all other global "
2297 msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
2300 msgid "invalid parameter for pathspec magic 'prefix'"
2301 msgstr "路径规格包含无效的神奇前缀"
2305 msgid "Invalid pathspec magic '%.*s' in '%s'"
2306 msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
2310 msgid "Missing ')' at the end of pathspec magic in '%s'"
2311 msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
2315 msgid "Unimplemented pathspec magic '%c' in '%s'"
2316 msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
2320 msgid "%s: 'literal' and 'glob' are incompatible"
2321 msgstr "%s:'literal' 和 'glob' 不兼容"
2325 msgid "%s: '%s' is outside repository"
2326 msgstr "%s:'%s' 在仓库之外"
2330 msgid "Pathspec '%s' is in submodule '%.*s'"
2331 msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
2335 msgid "%s: pathspec magic not supported by this command: %s"
2336 msgstr "%s:路径规格神奇前缀不被此命令支持:%s"
2340 "empty strings as pathspecs will be made invalid in upcoming releases. please "
2341 "use . instead if you meant to match all paths"
2343 "在即将到来的版本,不能再使用空字符串作为路径表达式。如果要匹配所有路径,\n"
2348 msgid "pathspec '%s' is beyond a symbolic link"
2349 msgstr "路径规格 '%s' 位于符号链接中"
2353 "There is nothing to exclude from by :(exclude) patterns.\n"
2354 "Perhaps you forgot to add either ':/' or '.' ?"
2356 "没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"
2360 msgid "unable to parse --pretty format"
2361 msgstr "不能解析 --pretty 格式"
2363 #: read-cache.c:1315
2366 "index.version set, but the value is invalid.\n"
2369 "设置了 index.version,但是取值无效。\n"
2372 #: read-cache.c:1325
2375 "GIT_INDEX_VERSION set, but the value is invalid.\n"
2378 "设置了 GIT_INDEX_VERSION,但是取值无效。\n"
2381 #: refs.c:576 builtin/merge.c:840
2383 msgid "Could not open '%s' for writing"
2384 msgstr "无法打开 '%s' 进行写入"
2386 #: refs/files-backend.c:2481
2388 msgid "could not delete reference %s: %s"
2389 msgstr "无法删除引用 %s:%s"
2391 #: refs/files-backend.c:2484
2393 msgid "could not delete references: %s"
2396 #: refs/files-backend.c:2493
2398 msgid "could not remove reference %s"
2403 msgid "expected format: %%(color:<color>)"
2404 msgstr "期望的格式:%%(color:<color>)"
2408 msgid "unrecognized color: %%(color:%s)"
2409 msgstr "未能识别的颜色:%%(color:%s)"
2413 msgid "unrecognized format: %%(%s)"
2414 msgstr "未能识别的格式:%%(%s)"
2418 msgid "%%(body) does not take arguments"
2419 msgstr "%%(body) 不带参数"
2423 msgid "%%(subject) does not take arguments"
2424 msgstr "%%(subject) 不带参数"
2428 msgid "positive value expected contents:lines=%s"
2429 msgstr "要为 contents:lines=%s 提供一个正数"
2433 msgid "unrecognized %%(contents) argument: %s"
2434 msgstr "未能识别的 %%(contents) 参数:%s"
2438 msgid "unrecognized %%(objectname) argument: %s"
2439 msgstr "未能识别的 %%(objectname) 参数:%s"
2443 msgid "expected format: %%(align:<width>,<position>)"
2444 msgstr "期望的格式:%%(align:<width>,<position>)"
2448 msgid "unrecognized position:%s"
2453 msgid "unrecognized width:%s"
2458 msgid "unrecognized %%(align) argument: %s"
2459 msgstr "未能识别的 %%(align) 参数:%s"
2463 msgid "positive width expected with the %%(align) atom"
2464 msgstr "元素 %%(align) 需要一个正数的宽度"
2468 msgid "malformed field name: %.*s"
2469 msgstr "非法的字段名:%.*s"
2473 msgid "unknown field name: %.*s"
2474 msgstr "未知的字段名:%.*s"
2478 msgid "format: %%(end) atom used without corresponding atom"
2479 msgstr "格式:使用了 %%(end) 元素却没有它的对应元素"
2483 msgid "malformed format string %s"
2484 msgstr "非法的格式化字符串 %s"
2487 msgid ":strip= requires a positive integer argument"
2488 msgstr ":strip= 需要一个正整型参数"
2492 msgid "ref '%s' does not have %ld components to :strip"
2493 msgstr "引用 '%s' 未提供用于 :strip 的 %ld 个组件"
2495 #: ref-filter.c:1046
2497 msgid "unknown %.*s format %s"
2498 msgstr "未知的 %.*s 格式 %s"
2500 #: ref-filter.c:1066 ref-filter.c:1097
2502 msgid "missing object %s for %s"
2503 msgstr "缺失 %2$s 的对象 %1$s"
2505 #: ref-filter.c:1069 ref-filter.c:1100
2507 msgid "parse_object_buffer failed on %s for %s"
2508 msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
2510 #: ref-filter.c:1311
2512 msgid "malformed object at '%s'"
2513 msgstr "非法的对象于 '%s'"
2515 #: ref-filter.c:1373
2517 msgid "ignoring ref with broken name %s"
2518 msgstr "忽略带有错误名称 %s 的引用"
2520 #: ref-filter.c:1378
2522 msgid "ignoring broken ref %s"
2525 #: ref-filter.c:1633
2527 msgid "format: %%(end) atom missing"
2528 msgstr "格式:缺少 %%(end) 元素"
2530 #: ref-filter.c:1687
2532 msgid "malformed object name %s"
2537 msgid "Cannot fetch both %s and %s to %s"
2538 msgstr "不能同时获取 %s 和 %s 至 %s"
2542 msgid "%s usually tracks %s, not %s"
2543 msgstr "%s 通常跟踪 %s,而非 %s"
2547 msgid "%s tracks both %s and %s"
2548 msgstr "%s 同时跟踪 %s 和 %s"
2551 msgid "Internal error"
2554 #: remote.c:1677 remote.c:1720
2555 msgid "HEAD does not point to a branch"
2556 msgstr "HEAD 没有指向一个分支"
2560 msgid "no such branch: '%s'"
2565 msgid "no upstream configured for branch '%s'"
2566 msgstr "尚未给分支 '%s' 设置上游"
2570 msgid "upstream branch '%s' not stored as a remote-tracking branch"
2571 msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
2575 msgid "push destination '%s' on remote '%s' has no local tracking branch"
2576 msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
2580 msgid "branch '%s' has no remote for pushing"
2581 msgstr "分支 '%s' 没有设置要推送的远程服务器"
2585 msgid "push refspecs for '%s' do not include '%s'"
2586 msgstr "向 '%s' 推送引用规格未包含 '%s'"
2589 msgid "push has no destination (push.default is 'nothing')"
2590 msgstr "推送无目标(push.default 是 'nothing')"
2593 msgid "cannot resolve 'simple' push to a single destination"
2594 msgstr "无法解析 'simple' 推送至一个单独的目标"
2598 msgid "Your branch is based on '%s', but the upstream is gone.\n"
2599 msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
2602 msgid " (use \"git branch --unset-upstream\" to fixup)\n"
2603 msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n"
2607 msgid "Your branch is up-to-date with '%s'.\n"
2608 msgstr "您的分支与上游分支 '%s' 一致。\n"
2612 msgid "Your branch is ahead of '%s' by %d commit.\n"
2613 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
2614 msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
2615 msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
2618 msgid " (use \"git push\" to publish your local commits)\n"
2619 msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
2623 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
2625 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
2626 msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
2627 msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
2631 msgid " (use \"git pull\" to update your local branch)\n"
2632 msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
2637 "Your branch and '%s' have diverged,\n"
2638 "and have %d and %d different commit each, respectively.\n"
2640 "Your branch and '%s' have diverged,\n"
2641 "and have %d and %d different commits each, respectively.\n"
2643 "您的分支和 '%s' 出现了偏离,\n"
2644 "并且分别有 %d 和 %d 处不同的提交。\n"
2646 "您的分支和 '%s' 出现了偏离,\n"
2647 "并且分别有 %d 和 %d 处不同的提交。\n"
2651 msgid " (use \"git pull\" to merge the remote branch into yours)\n"
2652 msgstr " (使用 \"git pull\" 来合并远程分支)\n"
2655 msgid "your current branch appears to be broken"
2656 msgstr "您的当前分支好像被损坏"
2660 msgid "your current branch '%s' does not have any commits yet"
2661 msgstr "您的当前分支 '%s' 尚无任何提交"
2664 msgid "--first-parent is incompatible with --bisect"
2665 msgstr "--first-parent 与 --bisect 不兼容"
2667 #: run-command.c:106
2668 msgid "open /dev/null failed"
2669 msgstr "不能打开 /dev/null"
2671 #: run-command.c:108
2673 msgid "dup2(%d,%d) failed"
2674 msgstr "不能调用 dup2(%d,%d)"
2677 msgid "failed to sign the push certificate"
2681 msgid "the receiving end does not support --signed push"
2686 "not sending a push certificate since the receiving end does not support --"
2688 msgstr "未发送推送证书,因为接收端不支持签名推送"
2691 msgid "the receiving end does not support --atomic push"
2695 msgid "the receiving end does not support push options"
2708 "after resolving the conflicts, mark the corrected paths\n"
2709 "with 'git add <paths>' or 'git rm <paths>'"
2711 "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
2716 "after resolving the conflicts, mark the corrected paths\n"
2717 "with 'git add <paths>' or 'git rm <paths>'\n"
2718 "and commit the result with 'git commit'"
2720 "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
2721 "对修正后的文件做标记,然后用 'git commit' 提交"
2723 #: sequencer.c:244 sequencer.c:1209
2725 msgid "could not lock '%s'"
2728 #: sequencer.c:247 sequencer.c:1125 sequencer.c:1214
2730 msgid "could not write to '%s'"
2735 msgid "could not write eol to '%s'"
2736 msgstr "不能将换行符写入 '%s'"
2738 #: sequencer.c:255 sequencer.c:1130 sequencer.c:1216
2740 msgid "failed to finalize '%s'."
2743 #: sequencer.c:279 builtin/am.c:259 builtin/commit.c:749 builtin/merge.c:1032
2745 msgid "could not read '%s'"
2750 msgid "your local changes would be overwritten by %s."
2751 msgstr "您的本地修改将被%s覆盖。"
2754 msgid "commit your changes or stash them to proceed."
2755 msgstr "提交您的修改或保存进度后再继续。"
2759 msgid "%s: fast-forward"
2762 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
2765 msgid "%s: Unable to write new index file"
2766 msgstr "%s:无法写入新索引文件"
2769 msgid "could not resolve HEAD commit\n"
2770 msgstr "不能解析 HEAD 提交\n"
2773 msgid "unable to update cache tree\n"
2779 "you have staged changes in your working tree\n"
2780 "If these changes are meant to be squashed into the previous commit, run:\n"
2782 " git commit --amend %s\n"
2784 "If they are meant to go into a new commit, run:\n"
2788 "In both cases, once you're done, continue with:\n"
2790 " git rebase --continue\n"
2792 "您已暂存了工作区的修改。如果这些修改要压缩到前一个提交,执行:\n"
2794 " git commit --amend %s\n"
2796 "如果这些变更要形成一个新提交,执行:\n"
2800 "无论哪种情况,当您完成提交,继续执行:\n"
2802 " git rebase --continue\n"
2806 msgid "could not parse commit %s\n"
2807 msgstr "不能解析提交 %s\n"
2811 msgid "could not parse parent commit %s\n"
2812 msgstr "不能解析父提交 %s\n"
2815 msgid "your index file is unmerged."
2816 msgstr "您的索引文件未完成合并。"
2820 msgid "commit %s is a merge but no -m option was given."
2821 msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
2825 msgid "commit %s does not have parent %d"
2826 msgstr "提交 %s 没有第 %d 个父提交"
2830 msgid "mainline was specified but commit %s is not a merge."
2831 msgstr "指定了主线,但是提交 %s 不是一个合并提交。"
2833 #. TRANSLATORS: The first %s will be a "todo" command like
2834 #. "revert" or "pick", the second %s a SHA1.
2837 msgid "%s: cannot parse parent commit %s"
2838 msgstr "%s:不能解析父提交 %s"
2842 msgid "cannot get commit message for %s"
2843 msgstr "不能得到 %s 的提交说明"
2847 msgid "could not revert %s... %s"
2848 msgstr "不能还原 %s... %s"
2852 msgid "could not apply %s... %s"
2853 msgstr "不能应用 %s... %s"
2856 msgid "empty commit set passed"
2861 msgid "git %s: failed to read the index"
2862 msgstr "git %s:无法读取索引"
2866 msgid "git %s: failed to refresh the index"
2867 msgstr "git %s:无法刷新索引"
2871 msgid "invalid line %d: %.*s"
2872 msgstr "无效行 %d:%.*s"
2875 msgid "no commits parsed."
2880 msgid "could not read '%s'."
2885 msgid "unusable instruction sheet: '%s'"
2886 msgstr "无用的指令清单:'%s'"
2889 msgid "cannot cherry-pick during a revert."
2890 msgstr "不能在回退中执行拣选。"
2893 msgid "cannot revert during a cherry-pick."
2894 msgstr "不能在拣选中执行回退。"
2898 msgid "invalid key: %s"
2903 msgid "invalid value for %s: %s"
2908 msgid "malformed options sheet: '%s'"
2909 msgstr "非法的选项清单:'%s'"
2912 msgid "a cherry-pick or revert is already in progress"
2913 msgstr "一个拣选或还原操作已在进行"
2916 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
2917 msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
2921 msgid "could not create sequencer directory '%s'"
2922 msgstr "不能创建序列目录 '%s'"
2925 msgid "could not lock HEAD"
2928 #: sequencer.c:1151 sequencer.c:1289
2929 msgid "no cherry-pick or revert in progress"
2930 msgstr "拣选或还原操作并未进行"
2933 msgid "cannot resolve HEAD"
2936 #: sequencer.c:1155 sequencer.c:1189
2937 msgid "cannot abort from a branch yet to be born"
2938 msgstr "不能从尚未建立的分支终止"
2940 #: sequencer.c:1175 builtin/grep.c:578
2942 msgid "cannot open '%s'"
2947 msgid "cannot read '%s': %s"
2948 msgstr "不能读取 '%s':%s"
2951 msgid "unexpected end of file"
2956 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
2957 msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
2961 msgid "%s: can't cherry-pick a %s"
2962 msgstr "%s:不能拣选一个%s"
2966 msgid "%s: bad revision"
2970 msgid "can't revert as initial commit"
2976 "%s: no such path in the working tree.\n"
2977 "Use 'git <command> -- <path>...' to specify paths that do not exist locally."
2980 "使用命令 'git <command> -- <path>...' 来指定本地不存在的路径。"
2985 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"
2986 "Use '--' to separate paths from revisions, like this:\n"
2987 "'git <command> [<revision>...] -- [<file>...]'"
2989 "有歧义的参数 '%s':未知的版本或路径不存在于工作区中。\n"
2990 "使用 '--' 来分隔版本和路径,例如:\n"
2991 "'git <command> [<revision>...] -- [<file>...]'"
2996 "ambiguous argument '%s': both revision and filename\n"
2997 "Use '--' to separate paths from revisions, like this:\n"
2998 "'git <command> [<revision>...] -- [<file>...]'"
3000 "有歧义的参数 '%s':可同时是版本和文件\n"
3001 "使用 '--' 来分隔版本和路径,例如:\n"
3002 "'git <command> [<revision>...] -- [<file>...]'"
3006 msgid "Expected git repo version <= %d, found %d"
3007 msgstr "期望 git 仓库版本 <= %d,却得到 %d"
3010 msgid "unknown repository extensions found:"
3015 msgid "Not a git repository (or any of the parent directories): %s"
3016 msgstr "不是一个 git 仓库(或者任何父目录):%s"
3018 #: setup.c:764 setup.c:915 builtin/index-pack.c:1641
3019 msgid "Cannot come back to cwd"
3023 msgid "Unable to read current working directory"
3029 "Not a git repository (or any parent up to mount point %s)\n"
3030 "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
3032 "不是一个 git 仓库(或者向上递归至挂载点 %s 的任何祖先目录)\n"
3033 "停止在文件系统边界(未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM)。"
3037 msgid "Cannot change to '%s/..'"
3038 msgstr "不能切换到 '%s/..'"
3043 "Problem with core.sharedRepository filemode value (0%.3o).\n"
3044 "The owner of files must always have read and write permissions."
3046 "参数 core.sharedRepository 的文件权限值有错(0%.3o)。\n"
3051 msgid "path '%s' does not exist"
3052 msgstr "路径 '%s' 不存在"
3056 msgid "reference repository '%s' as a linked checkout is not supported yet."
3057 msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
3061 msgid "reference repository '%s' is not a local repository."
3062 msgstr "参考仓库 '%s' 不是一个本地仓库。"
3066 msgid "reference repository '%s' is shallow"
3067 msgstr "参考仓库 '%s' 是一个浅克隆"
3071 msgid "reference repository '%s' is grafted"
3072 msgstr "参考仓库 '%s' 已被嫁接"
3075 msgid "offset before end of packfile (broken .idx?)"
3076 msgstr "偏移量在包文件结束之前(损坏的 .idx?)"
3080 msgid "offset before start of pack index for %s (corrupt index?)"
3081 msgstr "偏移量在 %s 的包索引开始之前(损坏的索引?)"
3085 msgid "offset beyond end of pack index for %s (truncated index?)"
3086 msgstr "偏移量越过了 %s 的包索引的结尾(被截断的索引?)"
3090 msgid "short SHA1 %s is ambiguous"
3091 msgstr "歧义的短 SHA1 %s"
3094 msgid "The candidates are:"
3099 "Git normally never creates a ref that ends with 40 hex characters\n"
3100 "because it will be ignored when you just specify 40-hex. These refs\n"
3101 "may be created by mistake. For example,\n"
3103 " git checkout -b $br $(git rev-parse ...)\n"
3105 "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
3106 "examine these refs and maybe delete them. Turn this message off by\n"
3107 "running \"git config advice.objectNameWarning false\""
3109 "Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n"
3110 "十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n"
3112 " git checkout -b $br $(git rev-parse ...)\n"
3114 "当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n"
3115 "可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
3118 #: submodule.c:64 submodule.c:98
3119 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
3120 msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
3122 #: submodule.c:68 submodule.c:102
3124 msgid "Could not find section in .gitmodules where path=%s"
3125 msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
3129 msgid "Could not update .gitmodules entry %s"
3130 msgstr "不能更新 .gitmodules 条目 %s"
3134 msgid "Could not remove .gitmodules entry for %s"
3135 msgstr "无法移除 %s 的 .gitmodules 条目"
3138 msgid "staging updated .gitmodules failed"
3139 msgstr "将更新后 .gitmodules 添加暂存区失败"
3142 msgid "negative values not allowed for submodule.fetchJobs"
3143 msgstr "submodule.fetchJobs 不允许为负值"
3145 #: submodule-config.c:358
3147 msgid "invalid value for %s"
3152 msgid "running trailer command '%s' failed"
3153 msgstr "执行 trailer 命令 '%s' 失败"
3155 #: trailer.c:471 trailer.c:475 trailer.c:479 trailer.c:533 trailer.c:537
3158 msgid "unknown value '%s' for key '%s'"
3159 msgstr "键 '%2$s' 的未知取值 '%1$s'"
3161 #: trailer.c:523 trailer.c:528 builtin/remote.c:289
3163 msgid "more than one %s"
3168 msgid "empty trailer token in trailer '%.*s'"
3169 msgstr "签名 '%.*s' 的键为空"
3173 msgid "could not read input file '%s'"
3174 msgstr "不能读取输入文件 '%s'"
3177 msgid "could not read from stdin"
3180 #: trailer.c:929 builtin/am.c:44
3182 msgid "could not stat %s"
3183 msgstr "不能获取 %s 的文件状态"
3187 msgid "file %s is not a regular file"
3188 msgstr "文件 %s 不是一个正规文件"
3192 msgid "file %s is not writable by user"
3193 msgstr "文件 %s 用户不可写"
3196 msgid "could not open temporary file"
3201 msgid "could not rename temporary file to %s"
3202 msgstr "不能重命名临时文件为 %s"
3206 msgid "Would set upstream of '%s' to '%s' of '%s'\n"
3207 msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"
3211 msgid "transport: invalid depth option '%s'"
3212 msgstr "传输:无效的深度选项 '%s'"
3217 "The following submodule paths contain changes that can\n"
3218 "not be found on any remote:\n"
3219 msgstr "下列子模组路径所包含的修改在任何远程源中都找不到:\n"
3227 "\tgit push --recurse-submodules=on-demand\n"
3229 "or cd to the path and use\n"
3233 "to push them to a remote.\n"
3239 "\tgit push --recurse-submodules=on-demand\n"
3252 #: transport-helper.c:1075
3254 msgid "Could not read ref %s"
3258 msgid "too-short tree object"
3262 msgid "malformed mode in tree entry"
3263 msgstr "树对象中的条目属性错误"
3266 msgid "empty filename in tree entry"
3267 msgstr "树对象条目中空的文件名"
3270 msgid "too-short tree file"
3273 #: unpack-trees.c:64
3276 "Your local changes to the following files would be overwritten by checkout:\n"
3277 "%%sPlease commit your changes or stash them before you switch branches."
3279 "您对下列文件的本地修改将被检出操作覆盖:\n"
3280 "%%s请在切换分支前提交您的修改或者保存进度。"
3282 #: unpack-trees.c:66
3285 "Your local changes to the following files would be overwritten by checkout:\n"
3288 "您对下列文件的本地修改将被检出操作覆盖:\n"
3291 #: unpack-trees.c:69
3294 "Your local changes to the following files would be overwritten by merge:\n"
3295 "%%sPlease commit your changes or stash them before you merge."
3297 "您对下列文件的本地修改将被合并操作覆盖:\n"
3298 "%%s请在合并前提交您的修改或者保存进度。"
3300 #: unpack-trees.c:71
3303 "Your local changes to the following files would be overwritten by merge:\n"
3306 "您对下列文件的本地修改将被合并操作覆盖:\n"
3309 #: unpack-trees.c:74
3312 "Your local changes to the following files would be overwritten by %s:\n"
3313 "%%sPlease commit your changes or stash them before you %s."
3315 "您对下列文件的本地修改将被 %s 覆盖:\n"
3316 "%%s请在 %s 之前提交您的修改或者保存进度。"
3318 #: unpack-trees.c:76
3321 "Your local changes to the following files would be overwritten by %s:\n"
3324 "您对下列文件的本地修改将被 %s 覆盖:\n"
3327 #: unpack-trees.c:81
3330 "Updating the following directories would lose untracked files in it:\n"
3333 "更新如下目录将会丢失其中未跟踪的文件:\n"
3336 #: unpack-trees.c:85
3339 "The following untracked working tree files would be removed by checkout:\n"
3340 "%%sPlease move or remove them before you switch branches."
3342 "工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
3345 #: unpack-trees.c:87
3348 "The following untracked working tree files would be removed by checkout:\n"
3351 "工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
3354 #: unpack-trees.c:90
3357 "The following untracked working tree files would be removed by merge:\n"
3358 "%%sPlease move or remove them before you merge."
3360 "工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
3363 #: unpack-trees.c:92
3366 "The following untracked working tree files would be removed by merge:\n"
3369 "工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
3372 #: unpack-trees.c:95
3375 "The following untracked working tree files would be removed by %s:\n"
3376 "%%sPlease move or remove them before you %s."
3378 "工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
3381 #: unpack-trees.c:97
3384 "The following untracked working tree files would be removed by %s:\n"
3387 "工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
3390 #: unpack-trees.c:102
3393 "The following untracked working tree files would be overwritten by "
3395 "%%sPlease move or remove them before you switch branches."
3397 "工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
3400 #: unpack-trees.c:104
3403 "The following untracked working tree files would be overwritten by "
3407 "工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
3410 #: unpack-trees.c:107
3413 "The following untracked working tree files would be overwritten by merge:\n"
3414 "%%sPlease move or remove them before you merge."
3416 "工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
3419 #: unpack-trees.c:109
3422 "The following untracked working tree files would be overwritten by merge:\n"
3425 "工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
3428 #: unpack-trees.c:112
3431 "The following untracked working tree files would be overwritten by %s:\n"
3432 "%%sPlease move or remove them before you %s."
3434 "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
3437 #: unpack-trees.c:114
3440 "The following untracked working tree files would be overwritten by %s:\n"
3443 "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
3446 #: unpack-trees.c:121
3448 msgid "Entry '%s' overlaps with '%s'. Cannot bind."
3449 msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"
3451 #: unpack-trees.c:124
3454 "Cannot update sparse checkout: the following entries are not up-to-date:\n"
3457 "无法更新稀疏检出:如下条目不是最新:\n"
3460 #: unpack-trees.c:126
3463 "The following working tree files would be overwritten by sparse checkout "
3467 "工作区中下列文件将被稀疏检出更新所覆盖:\n"
3470 #: unpack-trees.c:128
3473 "The following working tree files would be removed by sparse checkout "
3477 "工作区中下列文件将被稀疏检出更新所删除:\n"
3480 #: unpack-trees.c:205
3485 #: unpack-trees.c:237
3486 msgid "Checking out files"
3490 msgid "invalid URL scheme name or missing '://' suffix"
3491 msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
3493 #: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
3495 msgid "invalid %XX escape sequence"
3496 msgstr "无效的 %XX 转义序列"
3499 msgid "missing host and scheme is not 'file:'"
3500 msgstr "缺失主机名且 URL 方案不是 'file:'"
3503 msgid "a 'file:' URL may not have a port number"
3504 msgstr "一个 'file:' URL 不应该包含端口号"
3507 msgid "invalid characters in host name"
3508 msgstr "主机名中包含无效的字符"
3510 #: urlmatch.c:244 urlmatch.c:255
3511 msgid "invalid port number"
3515 msgid "invalid '..' path segment"
3516 msgstr "无效的 '..' 路径片段"
3520 msgid "failed to read '%s'"
3523 #: wrapper.c:222 wrapper.c:392
3525 msgid "could not open '%s' for reading and writing"
3526 msgstr "无法打开 '%s' 进行读写"
3528 #: wrapper.c:224 wrapper.c:394 builtin/am.c:766
3530 msgid "could not open '%s' for writing"
3531 msgstr "无法打开 '%s' 进行写入"
3533 #: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759
3534 #: builtin/am.c:847 builtin/commit.c:1705 builtin/merge.c:1029
3535 #: builtin/pull.c:341
3537 msgid "could not open '%s' for reading"
3538 msgstr "无法打开 '%s' 进行读取"
3540 #: wrapper.c:605 wrapper.c:626
3542 msgid "unable to access '%s'"
3546 msgid "unable to get current working directory"
3551 msgid "could not write to %s"
3556 msgid "could not close %s"
3560 msgid "Unmerged paths:"
3564 #: wt-status.c:178 wt-status.c:205
3566 msgid " (use \"git reset %s <file>...\" to unstage)"
3567 msgstr " (使用 \"git reset %s <文件>...\" 以取消暂存)"
3570 #: wt-status.c:180 wt-status.c:207
3571 msgid " (use \"git rm --cached <file>...\" to unstage)"
3572 msgstr " (使用 \"git rm --cached <文件>...\" 以取消暂存)"
3576 msgid " (use \"git add <file>...\" to mark resolution)"
3577 msgstr " (使用 \"git add <文件>...\" 标记解决方案)"
3580 #: wt-status.c:186 wt-status.c:190
3581 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
3582 msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)"
3586 msgid " (use \"git rm <file>...\" to mark resolution)"
3587 msgstr " (使用 \"git rm <文件>...\" 标记解决方案)"
3589 #: wt-status.c:199 wt-status.c:945
3590 msgid "Changes to be committed:"
3593 #: wt-status.c:217 wt-status.c:954
3594 msgid "Changes not staged for commit:"
3595 msgstr "尚未暂存以备提交的变更:"
3599 msgid " (use \"git add <file>...\" to update what will be committed)"
3600 msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)"
3604 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
3605 msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)"
3610 " (use \"git checkout -- <file>...\" to discard changes in working directory)"
3611 msgstr " (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)"
3615 msgid " (commit or discard the untracked or modified content in submodules)"
3616 msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
3621 msgid " (use \"git %s <file>...\" to include in what will be committed)"
3622 msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)"
3625 msgid "both deleted:"
3629 msgid "added by us:"
3633 msgid "deleted by them:"
3637 msgid "added by them:"
3641 msgid "deleted by us:"
3649 msgid "both modified:"
3684 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
3686 msgid "new commits, "
3689 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
3691 msgid "modified content, "
3694 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
3696 msgid "untracked content, "
3700 msgid "Submodules changed but not updated:"
3701 msgstr "子模组已修改但尚未更新:"
3704 msgid "Submodule changes to be committed:"
3709 "Do not touch the line above.\n"
3710 "Everything below will be removed."
3716 msgid "You have unmerged paths."
3721 msgid " (fix conflicts and run \"git commit\")"
3722 msgstr " (解决冲突并运行 \"git commit\")"
3726 msgid " (use \"git merge --abort\" to abort the merge)"
3727 msgstr " (使用 \"git merge --abort\" 终止合并)"
3730 msgid "All conflicts fixed but you are still merging."
3731 msgstr "所有冲突已解决但您仍处于合并中。"
3735 msgid " (use \"git commit\" to conclude merge)"
3736 msgstr " (使用 \"git commit\" 结束合并)"
3739 msgid "You are in the middle of an am session."
3740 msgstr "您正处于 am 操作过程中。"
3743 msgid "The current patch is empty."
3748 msgid " (fix conflicts and then run \"git am --continue\")"
3749 msgstr " (解决冲突,然后运行 \"git am --continue\")"
3753 msgid " (use \"git am --skip\" to skip this patch)"
3754 msgstr " (使用 \"git am --skip\" 跳过此补丁)"
3758 msgid " (use \"git am --abort\" to restore the original branch)"
3759 msgstr " (使用 \"git am --abort\" 恢复原有分支)"
3762 msgid "No commands done."
3767 msgid "Last command done (%d command done):"
3768 msgid_plural "Last commands done (%d commands done):"
3769 msgstr[0] "最后一条命令已完成(%d 条命令被执行):"
3770 msgstr[1] "最后的命令已完成(%d 条命令被执行):"
3774 msgid " (see more in file %s)"
3775 msgstr " (更多参见文件 %s)"
3778 msgid "No commands remaining."
3783 msgid "Next command to do (%d remaining command):"
3784 msgid_plural "Next commands to do (%d remaining commands):"
3785 msgstr[0] "接下来要执行的命令(剩余 %d 条命令):"
3786 msgstr[1] "接下来要执行的命令(剩余 %d 条命令):"
3790 msgid " (use \"git rebase --edit-todo\" to view and edit)"
3791 msgstr " (使用 \"git rebase --edit-todo\" 来查看和编辑)"
3795 msgid "You are currently rebasing branch '%s' on '%s'."
3796 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
3799 msgid "You are currently rebasing."
3804 msgid " (fix conflicts and then run \"git rebase --continue\")"
3805 msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
3809 msgid " (use \"git rebase --skip\" to skip this patch)"
3810 msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
3814 msgid " (use \"git rebase --abort\" to check out the original branch)"
3815 msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
3819 msgid " (all conflicts fixed: run \"git rebase --continue\")"
3820 msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
3825 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
3826 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
3829 msgid "You are currently splitting a commit during a rebase."
3830 msgstr "您在执行变基操作时拆分提交。"
3834 msgid " (Once your working directory is clean, run \"git rebase --continue\")"
3835 msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
3839 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
3840 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
3843 msgid "You are currently editing a commit during a rebase."
3844 msgstr "您在执行变基操作时编辑提交。"
3848 msgid " (use \"git commit --amend\" to amend the current commit)"
3849 msgstr " (使用 \"git commit --amend\" 修补当前提交)"
3854 " (use \"git rebase --continue\" once you are satisfied with your changes)"
3855 msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
3859 msgid "You are currently cherry-picking commit %s."
3860 msgstr "您在执行拣选提交 %s 的操作。"
3864 msgid " (fix conflicts and run \"git cherry-pick --continue\")"
3865 msgstr " (解决冲突并运行 \"git cherry-pick --continue\")"
3869 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
3870 msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")"
3874 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
3875 msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
3879 msgid "You are currently reverting commit %s."
3880 msgstr "您在执行反转提交 %s 的操作。"
3884 msgid " (fix conflicts and run \"git revert --continue\")"
3885 msgstr " (解决冲突并运行 \"git revert --continue\")"
3889 msgid " (all conflicts fixed: run \"git revert --continue\")"
3890 msgstr " (所有冲突已解决:运行 \"git revert --continue\")"
3894 msgid " (use \"git revert --abort\" to cancel the revert operation)"
3895 msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
3899 msgid "You are currently bisecting, started from branch '%s'."
3900 msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
3903 msgid "You are currently bisecting."
3904 msgstr "您在执行二分查找操作。"
3908 msgid " (use \"git bisect reset\" to get back to the original branch)"
3909 msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
3916 msgid "interactive rebase in progress; onto "
3917 msgstr "交互式变基操作正在进行中;至 "
3920 msgid "rebase in progress; onto "
3921 msgstr "变基操作正在进行中;至 "
3924 msgid "HEAD detached at "
3928 msgid "HEAD detached from "
3932 msgid "Not currently on any branch."
3936 msgid "Initial commit"
3940 msgid "Untracked files"
3944 msgid "Ignored files"
3950 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
3951 "may speed it up, but you have to be careful not to forget to add\n"
3952 "new files yourself (see 'git help status')."
3954 "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
3955 "但您需要小心不要忘了添加新文件(参见 'git help status')。"
3959 msgid "Untracked files not listed%s"
3960 msgstr "未跟踪的文件没有列出%s"
3962 # 译者:中文字符串拼接,可删除前导空格
3964 msgid " (use -u option to show untracked files)"
3965 msgstr "(使用 -u 参数显示未跟踪的文件)"
3973 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
3974 msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
3978 msgid "no changes added to commit\n"
3984 "nothing added to commit but untracked files present (use \"git add\" to "
3986 msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
3990 msgid "nothing added to commit but untracked files present\n"
3991 msgstr "提交为空,但是存在尚未跟踪的文件\n"
3993 # 译者:中文字符串拼接,可删除前导空格
3996 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
3997 msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
3999 #: wt-status.c:1614 wt-status.c:1619
4001 msgid "nothing to commit\n"
4004 # 译者:中文字符串拼接,可删除前导空格
4007 msgid "nothing to commit (use -u to show untracked files)\n"
4008 msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
4010 # 译者:中文字符串拼接,可删除前导空格
4013 msgid "nothing to commit, working tree clean\n"
4014 msgstr "无文件要提交,干净的工作区\n"
4018 msgid "Initial commit on "
4022 msgid "HEAD (no branch)"
4030 #: wt-status.c:1763 wt-status.c:1771
4034 #: wt-status.c:1766 wt-status.c:1769
4038 #. TRANSLATORS: the action is e.g. "pull with rebase"
4041 msgid "cannot %s: You have unstaged changes."
4042 msgstr "不能%s:您有未暂存的变更。"
4045 msgid "additionally, your index contains uncommitted changes."
4046 msgstr "而且您的索引中包含未提交的变更。"
4050 msgid "cannot %s: Your index contains uncommitted changes."
4051 msgstr "不能%s:您的索引中包含未提交的变更。"
4053 #: compat/precompose_utf8.c:57 builtin/clone.c:414
4055 msgid "failed to unlink '%s'"
4059 msgid "git add [<options>] [--] <pathspec>..."
4060 msgstr "git add [<选项>] [--] <路径规格>..."
4064 msgid "unexpected diff status %c"
4067 #: builtin/add.c:85 builtin/commit.c:291
4068 msgid "updating files failed"
4073 msgid "remove '%s'\n"
4076 #: builtin/add.c:149
4077 msgid "Unstaged changes after refreshing the index:"
4078 msgstr "刷新索引之后尚未被暂存的变更:"
4080 #: builtin/add.c:209 builtin/rev-parse.c:840
4081 msgid "Could not read the index"
4084 #: builtin/add.c:220
4086 msgid "Could not open '%s' for writing."
4087 msgstr "无法打开 '%s' 进行写入。"
4089 #: builtin/add.c:224
4090 msgid "Could not write patch"
4093 #: builtin/add.c:227
4094 msgid "editing patch failed"
4097 #: builtin/add.c:230
4099 msgid "Could not stat '%s'"
4100 msgstr "不能查看文件状态 '%s'"
4102 #: builtin/add.c:232
4103 msgid "Empty patch. Aborted."
4106 #: builtin/add.c:237
4108 msgid "Could not apply '%s'"
4111 #: builtin/add.c:247
4112 msgid "The following paths are ignored by one of your .gitignore files:\n"
4113 msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
4115 #: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:111
4116 #: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:521
4117 #: builtin/remote.c:1326 builtin/rm.c:268 builtin/send-pack.c:162
4121 #: builtin/add.c:269
4122 msgid "interactive picking"
4125 #: builtin/add.c:270 builtin/checkout.c:1156 builtin/reset.c:286
4126 msgid "select hunks interactively"
4129 #: builtin/add.c:271
4130 msgid "edit current diff and apply"
4133 #: builtin/add.c:272
4134 msgid "allow adding otherwise ignored files"
4137 #: builtin/add.c:273
4138 msgid "update tracked files"
4141 #: builtin/add.c:274
4142 msgid "record only the fact that the path will be added later"
4143 msgstr "只记录,该路径稍后再添加"
4145 #: builtin/add.c:275
4146 msgid "add changes from all tracked and untracked files"
4147 msgstr "添加所有改变的已跟踪文件和未跟踪文件"
4149 #: builtin/add.c:278
4150 msgid "ignore paths removed in the working tree (same as --no-all)"
4151 msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
4153 #: builtin/add.c:280
4154 msgid "don't add, only refresh the index"
4157 #: builtin/add.c:281
4158 msgid "just skip files which cannot be added because of errors"
4159 msgstr "跳过因出错不能添加的文件"
4161 #: builtin/add.c:282
4162 msgid "check if - even missing - files are ignored in dry run"
4163 msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
4165 #: builtin/add.c:283 builtin/update-index.c:947
4169 #: builtin/add.c:283 builtin/update-index.c:948
4170 msgid "override the executable bit of the listed files"
4171 msgstr "覆盖列表里文件的可执行位"
4173 #: builtin/add.c:305
4175 msgid "Use -f if you really want to add them.\n"
4176 msgstr "使用 -f 参数如果您确实要添加它们。\n"
4178 #: builtin/add.c:312
4179 msgid "adding files failed"
4182 #: builtin/add.c:348
4183 msgid "-A and -u are mutually incompatible"
4184 msgstr "-A 和 -u 选项互斥"
4186 #: builtin/add.c:355
4187 msgid "Option --ignore-missing can only be used together with --dry-run"
4188 msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
4190 #: builtin/add.c:359
4192 msgid "--chmod param '%s' must be either -x or +x"
4193 msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x"
4195 #: builtin/add.c:374
4197 msgid "Nothing specified, nothing added.\n"
4198 msgstr "没有指定文件,也没有文件被添加。\n"
4200 #: builtin/add.c:375
4202 msgid "Maybe you wanted to say 'git add .'?\n"
4203 msgstr "也许您想要执行 'git add .'?\n"
4205 #: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279
4206 #: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350
4207 #: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
4208 #: builtin/submodule--helper.c:244
4209 msgid "index file corrupt"
4213 msgid "could not parse author script"
4218 msgid "'%s' was deleted by the applypatch-msg hook"
4219 msgstr "'%s' 被 applypatch-msg 钩子删除"
4223 msgid "Malformed input line: '%s'."
4224 msgstr "非法的输入行:'%s'。"
4228 msgid "Failed to copy notes from '%s' to '%s'"
4229 msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
4232 msgid "fseek failed"
4237 msgid "could not parse patch '%s'"
4238 msgstr "无法解析补丁 '%s'"
4241 msgid "Only one StGIT patch series can be applied at once"
4242 msgstr "一次只能有一个 StGIT 补丁队列被应用"
4245 msgid "invalid timestamp"
4248 #: builtin/am.c:890 builtin/am.c:898
4249 msgid "invalid Date line"
4253 msgid "invalid timezone offset"
4257 msgid "Patch format detection failed."
4260 #: builtin/am.c:989 builtin/clone.c:379
4262 msgid "failed to create directory '%s'"
4263 msgstr "无法创建目录 '%s'"
4266 msgid "Failed to split patches."
4269 #: builtin/am.c:1125 builtin/commit.c:376
4270 msgid "unable to write index file"
4273 #: builtin/am.c:1176
4275 msgid "When you have resolved this problem, run \"%s --continue\"."
4276 msgstr "当您解决这一问题,执行 \"%s --continue\"。"
4278 #: builtin/am.c:1177
4280 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
4281 msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。"
4283 #: builtin/am.c:1178
4285 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
4286 msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。"
4288 #: builtin/am.c:1316
4289 msgid "Patch is empty. Was it split wrong?"
4290 msgstr "补丁为空。是不是切分错误?"
4292 #: builtin/am.c:1390 builtin/log.c:1550
4294 msgid "invalid ident line: %s"
4295 msgstr "包含无效的身份标识:%s"
4297 #: builtin/am.c:1417
4299 msgid "unable to parse commit %s"
4302 #: builtin/am.c:1610
4303 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
4304 msgstr "仓库缺乏必要的数据对象以进行三方合并。"
4306 #: builtin/am.c:1612
4307 msgid "Using index info to reconstruct a base tree..."
4308 msgstr "使用索引来重建一个(三方合并的)基础目录树..."
4310 #: builtin/am.c:1631
4312 "Did you hand edit your patch?\n"
4313 "It does not apply to blobs recorded in its index."
4318 #: builtin/am.c:1637
4319 msgid "Falling back to patching base and 3-way merge..."
4320 msgstr "回落到基础版本上打补丁及进行三方合并..."
4322 #: builtin/am.c:1662
4323 msgid "Failed to merge in the changes."
4326 #: builtin/am.c:1686 builtin/merge.c:628
4327 msgid "git write-tree failed to write a tree"
4328 msgstr "git write-tree 无法写入一树对象"
4330 #: builtin/am.c:1693
4331 msgid "applying to an empty history"
4334 #: builtin/am.c:1706 builtin/commit.c:1769 builtin/merge.c:798
4335 #: builtin/merge.c:823
4336 msgid "failed to write commit object"
4339 #: builtin/am.c:1739 builtin/am.c:1743
4341 msgid "cannot resume: %s does not exist."
4342 msgstr "无法继续:%s 不存在。"
4344 #: builtin/am.c:1759
4345 msgid "cannot be interactive without stdin connected to a terminal."
4346 msgstr "标准输入没有和终端关联,不能进行交互式操作。"
4348 #: builtin/am.c:1764
4349 msgid "Commit Body is:"
4353 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
4354 #. in your translation. The program will only accept English
4355 #. input at this point.
4357 #: builtin/am.c:1774
4358 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
4359 msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:"
4361 #: builtin/am.c:1824
4363 msgid "Dirty index: cannot apply patches (dirty: %s)"
4364 msgstr "脏索引:不能应用补丁(脏文件:%s)"
4366 #: builtin/am.c:1861 builtin/am.c:1933
4368 msgid "Applying: %.*s"
4371 #: builtin/am.c:1877
4372 msgid "No changes -- Patch already applied."
4373 msgstr "没有变更 —— 补丁已经应用过。"
4375 #: builtin/am.c:1885
4377 msgid "Patch failed at %s %.*s"
4378 msgstr "打补丁失败于 %s %.*s"
4380 #: builtin/am.c:1891
4382 msgid "The copy of the patch that failed is found in: %s"
4383 msgstr "失败的补丁文件副本位于:%s"
4385 #: builtin/am.c:1936
4387 "No changes - did you forget to use 'git add'?\n"
4388 "If there is nothing left to stage, chances are that something else\n"
4389 "already introduced the same changes; you might want to skip this patch."
4391 "没有变更 —— 您是不是忘了执行 'git add'?\n"
4392 "如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
4395 #: builtin/am.c:1943
4397 "You still have unmerged paths in your index.\n"
4398 "Did you forget to use 'git add'?"
4401 "您是否忘了执行 'git add'?"
4403 #: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308
4404 #: builtin/reset.c:316
4406 msgid "Could not parse object '%s'."
4407 msgstr "不能解析对象 '%s'。"
4409 #: builtin/am.c:2103
4410 msgid "failed to clean index"
4413 #: builtin/am.c:2137
4415 "You seem to have moved HEAD since the last 'am' failure.\n"
4416 "Not rewinding to ORIG_HEAD"
4417 msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
4419 #: builtin/am.c:2200
4421 msgid "Invalid value for --patch-format: %s"
4422 msgstr "无效的 --patch-format 值:%s"
4424 #: builtin/am.c:2233
4425 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
4426 msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
4428 #: builtin/am.c:2234
4429 msgid "git am [<options>] (--continue | --skip | --abort)"
4430 msgstr "git am [<选项>] (--continue | --skip | --abort)"
4432 #: builtin/am.c:2240
4433 msgid "run interactively"
4436 #: builtin/am.c:2242
4437 msgid "historical option -- no-op"
4438 msgstr "老的参数 —— 无作用"
4440 #: builtin/am.c:2244
4441 msgid "allow fall back on 3way merging if needed"
4442 msgstr "如果必要,允许使用三方合并。"
4444 #: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57
4445 #: builtin/repack.c:172
4449 #: builtin/am.c:2247
4450 msgid "add a Signed-off-by line to the commit message"
4451 msgstr "在提交说明中添加一个 Signed-off-by 签名"
4453 #: builtin/am.c:2250
4454 msgid "recode into utf8 (default)"
4455 msgstr "使用 utf8 字符集(默认)"
4457 #: builtin/am.c:2252
4458 msgid "pass -k flag to git-mailinfo"
4459 msgstr "向 git-mailinfo 传递 -k 参数"
4461 #: builtin/am.c:2254
4462 msgid "pass -b flag to git-mailinfo"
4463 msgstr "向 git-mailinfo 传递 -b 参数"
4465 #: builtin/am.c:2256
4466 msgid "pass -m flag to git-mailinfo"
4467 msgstr "向 git-mailinfo 传递 -m 参数"
4469 #: builtin/am.c:2258
4470 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
4471 msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数"
4473 #: builtin/am.c:2261
4474 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
4475 msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置"
4477 #: builtin/am.c:2264
4478 msgid "strip everything before a scissors line"
4479 msgstr "丢弃裁切线前的所有内容"
4481 #: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275
4482 #: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287
4483 #: builtin/am.c:2293
4484 msgid "pass it through git-apply"
4485 msgstr "传递给 git-apply"
4487 #: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
4488 #: builtin/grep.c:707 builtin/merge.c:200 builtin/pull.c:135
4489 #: builtin/pull.c:194 builtin/repack.c:181 builtin/repack.c:185
4490 #: builtin/show-branch.c:644 builtin/show-ref.c:175 builtin/tag.c:340
4491 #: parse-options.h:132 parse-options.h:134 parse-options.h:245
4495 #: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438
4496 #: builtin/tag.c:372
4500 #: builtin/am.c:2290
4501 msgid "format the patch(es) are in"
4504 #: builtin/am.c:2296
4505 msgid "override error message when patch failure occurs"
4506 msgstr "打补丁失败时显示的错误信息"
4508 #: builtin/am.c:2298
4509 msgid "continue applying patches after resolving a conflict"
4510 msgstr "冲突解决后继续应用补丁"
4512 #: builtin/am.c:2301
4513 msgid "synonyms for --continue"
4514 msgstr "和 --continue 同义"
4516 #: builtin/am.c:2304
4517 msgid "skip the current patch"
4520 #: builtin/am.c:2307
4521 msgid "restore the original branch and abort the patching operation."
4522 msgstr "恢复原始分支并终止打补丁操作。"
4524 #: builtin/am.c:2311
4525 msgid "lie about committer date"
4526 msgstr "将作者日期作为提交日期"
4528 #: builtin/am.c:2313
4529 msgid "use current timestamp for author date"
4530 msgstr "用当前时间作为作者日期"
4532 #: builtin/am.c:2315 builtin/commit.c:1605 builtin/merge.c:229
4533 #: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:355
4537 #: builtin/am.c:2316
4538 msgid "GPG-sign commits"
4539 msgstr "使用 GPG 签名提交"
4541 #: builtin/am.c:2319
4542 msgid "(internal use for git-rebase)"
4543 msgstr "(内部使用,用于 git-rebase)"
4545 #: builtin/am.c:2334
4547 "The -b/--binary option has been a no-op for long time, and\n"
4548 "it will be removed. Please do not use it anymore."
4550 "参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n"
4553 #: builtin/am.c:2341
4554 msgid "failed to read the index"
4557 #: builtin/am.c:2356
4559 msgid "previous rebase directory %s still exists but mbox given."
4560 msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。"
4562 #: builtin/am.c:2380
4565 "Stray %s directory found.\n"
4566 "Use \"git am --abort\" to remove it."
4569 "使用 \"git am --abort\" 删除它。"
4571 #: builtin/am.c:2386
4572 msgid "Resolve operation not in progress, we are not resuming."
4573 msgstr "解决操作未进行,我们不会继续。"
4575 #: builtin/apply.c:8
4576 msgid "git apply [<options>] [<patch>...]"
4577 msgstr "git apply [<选项>] [<补丁>...]"
4579 #: builtin/archive.c:17
4581 msgid "could not create archive file '%s'"
4582 msgstr "不能创建归档文件 '%s'"
4584 #: builtin/archive.c:20
4585 msgid "could not redirect output"
4588 #: builtin/archive.c:37
4589 msgid "git archive: Remote with no URL"
4590 msgstr "git archive:未提供远程 URL"
4592 #: builtin/archive.c:58
4593 msgid "git archive: expected ACK/NAK, got EOF"
4594 msgstr "git archive:应为 ACK/NACK,却得到 EOF"
4596 #: builtin/archive.c:61
4598 msgid "git archive: NACK %s"
4599 msgstr "git archive:NACK %s"
4601 #: builtin/archive.c:63
4603 msgid "remote error: %s"
4606 #: builtin/archive.c:64
4607 msgid "git archive: protocol error"
4608 msgstr "git archive:协议错误"
4610 #: builtin/archive.c:68
4611 msgid "git archive: expected a flush"
4612 msgstr "git archive:应有一个 flush 刷新"
4614 #: builtin/bisect--helper.c:7
4615 msgid "git bisect--helper --next-all [--no-checkout]"
4616 msgstr "git bisect--helper --next-all [--no-checkout]"
4618 #: builtin/bisect--helper.c:17
4619 msgid "perform 'git bisect next'"
4620 msgstr "执行 'git bisect next'"
4622 #: builtin/bisect--helper.c:19
4623 msgid "update BISECT_HEAD instead of checking out the current commit"
4624 msgstr "更新 BISECT_HEAD 而非检出当前提交"
4626 #: builtin/blame.c:33
4627 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
4628 msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
4630 #: builtin/blame.c:38
4631 msgid "<rev-opts> are documented in git-rev-list(1)"
4632 msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
4634 #: builtin/blame.c:1781
4635 msgid "Blaming lines"
4638 #: builtin/blame.c:2577
4639 msgid "Show blame entries as we find them, incrementally"
4640 msgstr "增量式地显示发现的 blame 条目"
4642 #: builtin/blame.c:2578
4643 msgid "Show blank SHA-1 for boundary commits (Default: off)"
4644 msgstr "边界提交显示空的 SHA-1(默认:关闭)"
4646 #: builtin/blame.c:2579
4647 msgid "Do not treat root commits as boundaries (Default: off)"
4648 msgstr "不把根提交作为边界(默认:关闭)"
4650 #: builtin/blame.c:2580
4651 msgid "Show work cost statistics"
4654 #: builtin/blame.c:2581
4655 msgid "Force progress reporting"
4658 #: builtin/blame.c:2582
4659 msgid "Show output score for blame entries"
4660 msgstr "显示判断 blame 条目位移的得分诊断信息"
4662 #: builtin/blame.c:2583
4663 msgid "Show original filename (Default: auto)"
4664 msgstr "显示原始文件名(默认:自动)"
4666 #: builtin/blame.c:2584
4667 msgid "Show original linenumber (Default: off)"
4668 msgstr "显示原始的行号(默认:关闭)"
4670 #: builtin/blame.c:2585
4671 msgid "Show in a format designed for machine consumption"
4672 msgstr "显示为一个适合机器读取的格式"
4674 #: builtin/blame.c:2586
4675 msgid "Show porcelain format with per-line commit information"
4676 msgstr "为每一行显示机器适用的提交信息"
4678 #: builtin/blame.c:2587
4679 msgid "Use the same output mode as git-annotate (Default: off)"
4680 msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
4682 #: builtin/blame.c:2588
4683 msgid "Show raw timestamp (Default: off)"
4684 msgstr "显示原始时间戳(默认:关闭)"
4686 #: builtin/blame.c:2589
4687 msgid "Show long commit SHA1 (Default: off)"
4688 msgstr "显示长的 SHA1 提交号(默认:关闭)"
4690 #: builtin/blame.c:2590
4691 msgid "Suppress author name and timestamp (Default: off)"
4692 msgstr "隐藏作者名字和时间戳(默认:关闭)"
4694 #: builtin/blame.c:2591
4695 msgid "Show author email instead of name (Default: off)"
4696 msgstr "显示作者的邮箱而不是名字(默认:关闭)"
4698 #: builtin/blame.c:2592
4699 msgid "Ignore whitespace differences"
4702 #: builtin/blame.c:2599
4703 msgid "Use an experimental indent-based heuristic to improve diffs"
4704 msgstr "使用一个试验性的基于缩进的启发式算法改进差异显示"
4706 #: builtin/blame.c:2600
4707 msgid "Use an experimental blank-line-based heuristic to improve diffs"
4708 msgstr "使用一个试验性的基于空行的启发式算法改进差异显示"
4710 #: builtin/blame.c:2602
4711 msgid "Spend extra cycles to find better match"
4712 msgstr "花费额外的循环来找到更好的匹配"
4714 #: builtin/blame.c:2603
4715 msgid "Use revisions from <file> instead of calling git-rev-list"
4716 msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
4718 #: builtin/blame.c:2604
4719 msgid "Use <file>'s contents as the final image"
4720 msgstr "使用 <文件> 的内容作为最终的图片"
4722 #: builtin/blame.c:2605 builtin/blame.c:2606
4726 #: builtin/blame.c:2605
4727 msgid "Find line copies within and across files"
4728 msgstr "找到文件内及跨文件的行拷贝"
4730 #: builtin/blame.c:2606
4731 msgid "Find line movements within and across files"
4732 msgstr "找到文件内及跨文件的行移动"
4734 #: builtin/blame.c:2607
4738 #: builtin/blame.c:2607
4739 msgid "Process only line range n,m, counting from 1"
4740 msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
4742 #: builtin/blame.c:2654
4743 msgid "--progress can't be used with --incremental or porcelain formats"
4744 msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用"
4746 #. TRANSLATORS: This string is used to tell us the maximum
4747 #. display width for a relative timestamp in "git blame"
4748 #. output. For C locale, "4 years, 11 months ago", which
4749 #. takes 22 places, is the longest among various forms of
4750 #. relative timestamps, but your language may need more or
4751 #. fewer display columns.
4752 #: builtin/blame.c:2700
4753 msgid "4 years, 11 months ago"
4756 #: builtin/blame.c:2780
4757 msgid "--contents and --reverse do not blend well."
4758 msgstr "--contents 和 --reverse 不能混用。"
4760 #: builtin/blame.c:2800
4761 msgid "cannot use --contents with final commit object name"
4762 msgstr "不能将 --contents 和最终的提交对象名共用"
4764 #: builtin/blame.c:2805
4765 msgid "--reverse and --first-parent together require specified latest commit"
4766 msgstr "--reverse 和 --first-parent 共用,需要指定最新的提交"
4768 #: builtin/blame.c:2832
4770 "--reverse --first-parent together require range along first-parent chain"
4771 msgstr "--reverse 和 --first-parent 共用,需要第一祖先链上的提交范围"
4773 #: builtin/blame.c:2843
4775 msgid "no such path %s in %s"
4776 msgstr "在 %2$s 中无此路径 %1$s"
4778 #: builtin/blame.c:2854
4780 msgid "cannot read blob %s for path %s"
4781 msgstr "不能为路径 %2$s 读取对象 %1$s"
4783 #: builtin/blame.c:2873
4785 msgid "file %s has only %lu line"
4786 msgid_plural "file %s has only %lu lines"
4787 msgstr[0] "文件 %s 只有 %lu 行"
4788 msgstr[1] "文件 %s 只有 %lu 行"
4790 #: builtin/branch.c:26
4791 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
4792 msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
4794 #: builtin/branch.c:27
4795 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
4796 msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
4798 #: builtin/branch.c:28
4799 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
4800 msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
4802 #: builtin/branch.c:29
4803 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
4804 msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
4806 #: builtin/branch.c:30
4807 msgid "git branch [<options>] [-r | -a] [--points-at]"
4808 msgstr "git branch [<选项>] [-r | -a] [--points-at]"
4810 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
4811 #: builtin/branch.c:143
4814 "deleting branch '%s' that has been merged to\n"
4815 " '%s', but not yet merged to HEAD."
4817 "将要删除的分支 '%s' 已经被合并到\n"
4820 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
4821 #: builtin/branch.c:147
4824 "not deleting branch '%s' that is not yet merged to\n"
4825 " '%s', even though it is merged to HEAD."
4827 "并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
4828 " 然而却尚未被合并到分支 '%s' 。"
4830 #: builtin/branch.c:161
4832 msgid "Couldn't look up commit object for '%s'"
4833 msgstr "无法查询 '%s' 指向的提交对象"
4835 #: builtin/branch.c:165
4838 "The branch '%s' is not fully merged.\n"
4839 "If you are sure you want to delete it, run 'git branch -D %s'."
4842 "如果您确认要删除它,执行 'git branch -D %s'。"
4844 #: builtin/branch.c:178
4845 msgid "Update of config-file failed"
4846 msgstr "无法更新 config 文件"
4848 #: builtin/branch.c:206
4849 msgid "cannot use -a with -d"
4850 msgstr "不能将 -a 和 -d 同时使用"
4852 #: builtin/branch.c:212
4853 msgid "Couldn't look up commit object for HEAD"
4854 msgstr "无法查询 HEAD 指向的提交对象"
4856 #: builtin/branch.c:226
4858 msgid "Cannot delete branch '%s' checked out at '%s'"
4859 msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。"
4861 #: builtin/branch.c:241
4863 msgid "remote-tracking branch '%s' not found."
4864 msgstr "未能找到远程跟踪分支 '%s'。"
4866 #: builtin/branch.c:242
4868 msgid "branch '%s' not found."
4869 msgstr "分支 '%s' 未发现。"
4871 #: builtin/branch.c:257
4873 msgid "Error deleting remote-tracking branch '%s'"
4874 msgstr "无法删除远程跟踪分支 '%s'"
4876 #: builtin/branch.c:258
4878 msgid "Error deleting branch '%s'"
4879 msgstr "无法删除分支 '%s'"
4881 #: builtin/branch.c:265
4883 msgid "Deleted remote-tracking branch %s (was %s).\n"
4884 msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n"
4886 #: builtin/branch.c:266
4888 msgid "Deleted branch %s (was %s).\n"
4889 msgstr "已删除分支 %s(曾为 %s)。\n"
4891 #: builtin/branch.c:312
4896 #: builtin/branch.c:317
4901 #: builtin/branch.c:322
4903 msgid "[%s: behind %d]"
4906 #: builtin/branch.c:324
4911 #: builtin/branch.c:328
4913 msgid "[%s: ahead %d]"
4916 #: builtin/branch.c:330
4921 #: builtin/branch.c:333
4923 msgid "[%s: ahead %d, behind %d]"
4924 msgstr "[%s:领先 %d,落后 %d]"
4926 #: builtin/branch.c:336
4928 msgid "[ahead %d, behind %d]"
4929 msgstr "[领先 %d,落后 %d]"
4931 #: builtin/branch.c:349
4932 msgid " **** invalid ref ****"
4933 msgstr " **** 无效引用 ****"
4935 #: builtin/branch.c:375
4937 msgid "(no branch, rebasing %s)"
4938 msgstr "(非分支,正变基 %s)"
4940 #: builtin/branch.c:378
4942 msgid "(no branch, bisect started on %s)"
4943 msgstr "(非分支,二分查找开始于 %s)"
4945 #. TRANSLATORS: make sure this matches
4946 #. "HEAD detached at " in wt-status.c
4947 #: builtin/branch.c:384
4949 msgid "(HEAD detached at %s)"
4950 msgstr "(头指针分离于 %s)"
4952 #. TRANSLATORS: make sure this matches
4953 #. "HEAD detached from " in wt-status.c
4954 #: builtin/branch.c:389
4956 msgid "(HEAD detached from %s)"
4957 msgstr "(头指针分离自 %s)"
4959 #: builtin/branch.c:393
4963 #: builtin/branch.c:544
4965 msgid "Branch %s is being rebased at %s"
4966 msgstr "分支 %s 正被变基到 %s"
4968 #: builtin/branch.c:548
4970 msgid "Branch %s is being bisected at %s"
4971 msgstr "分支 %s 正被二分查找于 %s"
4973 #: builtin/branch.c:563
4974 msgid "cannot rename the current branch while not on any."
4975 msgstr "无法重命名当前分支因为不处于任何分支上。"
4977 #: builtin/branch.c:573
4979 msgid "Invalid branch name: '%s'"
4980 msgstr "无效的分支名:'%s'"
4982 #: builtin/branch.c:590
4983 msgid "Branch rename failed"
4986 #: builtin/branch.c:594
4988 msgid "Renamed a misnamed branch '%s' away"
4989 msgstr "重命名掉一个错误命名的旧分支 '%s'"
4991 #: builtin/branch.c:597
4993 msgid "Branch renamed to %s, but HEAD is not updated!"
4994 msgstr "分支重命名为 %s,但 HEAD 没有更新!"
4996 #: builtin/branch.c:604
4997 msgid "Branch is renamed, but update of config-file failed"
4998 msgstr "分支被重命名,但更新 config 文件失败"
5000 #: builtin/branch.c:620
5003 "Please edit the description for the branch\n"
5005 "Lines starting with '%c' will be stripped.\n"
5009 "以 '%c' 开头的行将被过滤。\n"
5011 #: builtin/branch.c:651
5012 msgid "Generic options"
5015 #: builtin/branch.c:653
5016 msgid "show hash and subject, give twice for upstream branch"
5017 msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
5019 #: builtin/branch.c:654
5020 msgid "suppress informational messages"
5023 #: builtin/branch.c:655
5024 msgid "set up tracking mode (see git-pull(1))"
5025 msgstr "设置跟踪模式(参见 git-pull(1))"
5027 #: builtin/branch.c:657
5028 msgid "change upstream info"
5031 #: builtin/branch.c:659
5035 #: builtin/branch.c:659
5036 msgid "change the upstream info"
5039 #: builtin/branch.c:660
5040 msgid "Unset the upstream info"
5043 #: builtin/branch.c:661
5044 msgid "use colored output"
5047 #: builtin/branch.c:662
5048 msgid "act on remote-tracking branches"
5051 #: builtin/branch.c:664 builtin/branch.c:665
5052 msgid "print only branches that contain the commit"
5053 msgstr "只打印包含该提交的分支"
5055 #: builtin/branch.c:668
5056 msgid "Specific git-branch actions:"
5057 msgstr "具体的 git-branch 动作:"
5059 #: builtin/branch.c:669
5060 msgid "list both remote-tracking and local branches"
5061 msgstr "列出远程跟踪及本地分支"
5063 #: builtin/branch.c:671
5064 msgid "delete fully merged branch"
5067 #: builtin/branch.c:672
5068 msgid "delete branch (even if not merged)"
5069 msgstr "删除分支(即使没有合并)"
5071 #: builtin/branch.c:673
5072 msgid "move/rename a branch and its reflog"
5073 msgstr "移动/重命名一个分支,以及它的引用日志"
5075 #: builtin/branch.c:674
5076 msgid "move/rename a branch, even if target exists"
5077 msgstr "移动/重命名一个分支,即使目标已存在"
5079 #: builtin/branch.c:675
5080 msgid "list branch names"
5083 #: builtin/branch.c:676
5084 msgid "create the branch's reflog"
5087 #: builtin/branch.c:678
5088 msgid "edit the description for the branch"
5091 #: builtin/branch.c:679
5092 msgid "force creation, move/rename, deletion"
5093 msgstr "强制创建、移动/重命名、删除"
5095 #: builtin/branch.c:680
5096 msgid "print only branches that are merged"
5099 #: builtin/branch.c:681
5100 msgid "print only branches that are not merged"
5103 #: builtin/branch.c:682
5104 msgid "list branches in columns"
5107 #: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366
5111 #: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367
5112 msgid "field name to sort on"
5115 #: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:404
5116 #: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570
5117 #: builtin/tag.c:369
5121 #: builtin/branch.c:687
5122 msgid "print only branches of the object"
5123 msgstr "只打印指向该对象的分支"
5125 #: builtin/branch.c:705
5126 msgid "Failed to resolve HEAD as a valid ref."
5127 msgstr "无法将 HEAD 解析为有效引用。"
5129 #: builtin/branch.c:709 builtin/clone.c:706
5130 msgid "HEAD not found below refs/heads!"
5131 msgstr "HEAD 没有位于 /refs/heads 之下!"
5133 #: builtin/branch.c:729
5134 msgid "--column and --verbose are incompatible"
5135 msgstr "--column 和 --verbose 不兼容"
5137 #: builtin/branch.c:740 builtin/branch.c:782
5138 msgid "branch name required"
5141 #: builtin/branch.c:758
5142 msgid "Cannot give description to detached HEAD"
5143 msgstr "不能向分离头指针提供描述"
5145 #: builtin/branch.c:763
5146 msgid "cannot edit description of more than one branch"
5147 msgstr "不能为一个以上的分支编辑描述"
5149 #: builtin/branch.c:770
5151 msgid "No commit on branch '%s' yet."
5152 msgstr "分支 '%s' 尚无提交。"
5154 #: builtin/branch.c:773
5156 msgid "No branch named '%s'."
5159 #: builtin/branch.c:788
5160 msgid "too many branches for a rename operation"
5161 msgstr "为重命名操作提供了太多的分支名"
5163 #: builtin/branch.c:793
5164 msgid "too many branches to set new upstream"
5165 msgstr "为设置新上游提供了太多的分支名"
5167 #: builtin/branch.c:797
5170 "could not set upstream of HEAD to %s when it does not point to any branch."
5171 msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
5173 #: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843
5175 msgid "no such branch '%s'"
5178 #: builtin/branch.c:804
5180 msgid "branch '%s' does not exist"
5181 msgstr "分支 '%s' 不存在"
5183 #: builtin/branch.c:816
5184 msgid "too many branches to unset upstream"
5185 msgstr "为取消上游设置操作提供了太多的分支名"
5187 #: builtin/branch.c:820
5188 msgid "could not unset upstream of HEAD when it does not point to any branch."
5189 msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
5191 #: builtin/branch.c:826
5193 msgid "Branch '%s' has no upstream information"
5194 msgstr "分支 '%s' 没有上游信息"
5196 #: builtin/branch.c:840
5197 msgid "it does not make sense to create 'HEAD' manually"
5198 msgstr "手工创建 'HEAD' 没有意义"
5200 #: builtin/branch.c:846
5201 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
5202 msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
5204 #: builtin/branch.c:849
5207 "The --set-upstream flag is deprecated and will be removed. Consider using --"
5208 "track or --set-upstream-to\n"
5210 "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
5212 #: builtin/branch.c:866
5216 "If you wanted to make '%s' track '%s', do this:\n"
5220 "如果你想用 '%s' 跟踪 '%s', 这么做:\n"
5223 #: builtin/bundle.c:51
5225 msgid "%s is okay\n"
5228 #: builtin/bundle.c:64
5229 msgid "Need a repository to create a bundle."
5230 msgstr "需要一个仓库来创建包。"
5232 #: builtin/bundle.c:68
5233 msgid "Need a repository to unbundle."
5236 #: builtin/cat-file.c:513
5238 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
5239 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
5241 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
5242 "p | <类型> | --textconv | --filters) [--path=<路径>] <对象>"
5244 #: builtin/cat-file.c:514
5246 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
5249 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
5252 #: builtin/cat-file.c:551
5253 msgid "<type> can be one of: blob, tree, commit, tag"
5254 msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
5256 #: builtin/cat-file.c:552
5257 msgid "show object type"
5260 #: builtin/cat-file.c:553
5261 msgid "show object size"
5264 #: builtin/cat-file.c:555
5265 msgid "exit with zero when there's no error"
5266 msgstr "当没有错误时退出并返回零"
5268 #: builtin/cat-file.c:556
5269 msgid "pretty-print object's content"
5272 #: builtin/cat-file.c:558
5273 msgid "for blob objects, run textconv on object's content"
5274 msgstr "对于数据对象,对其内容做文本转换"
5276 #: builtin/cat-file.c:560
5277 msgid "for blob objects, run filters on object's content"
5278 msgstr "对于数据对象,对其内容做过滤"
5280 #: builtin/cat-file.c:561 git-submodule.sh:923
5284 #: builtin/cat-file.c:562
5285 msgid "use a specific path for --textconv/--filters"
5286 msgstr "对于 --textconv/--filters 使用一个特定的路径"
5288 #: builtin/cat-file.c:564
5289 msgid "allow -s and -t to work with broken/corrupt objects"
5290 msgstr "允许 -s 和 -t 对损坏的对象生效"
5292 #: builtin/cat-file.c:565
5293 msgid "buffer --batch output"
5294 msgstr "缓冲 --batch 的输出"
5296 #: builtin/cat-file.c:567
5297 msgid "show info and content of objects fed from the standard input"
5298 msgstr "显示从标准输入提供的对象的信息和内容"
5300 #: builtin/cat-file.c:570
5301 msgid "show info about objects fed from the standard input"
5302 msgstr "显示从标准输入提供的对象的信息"
5304 #: builtin/cat-file.c:573
5305 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
5306 msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)"
5308 #: builtin/cat-file.c:575
5309 msgid "show all objects with --batch or --batch-check"
5310 msgstr "使用 --batch 或 --batch-check 参数显示所有对象"
5312 #: builtin/check-attr.c:11
5313 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
5314 msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
5316 #: builtin/check-attr.c:12
5317 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
5318 msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]"
5320 #: builtin/check-attr.c:19
5321 msgid "report all attributes set on file"
5322 msgstr "报告设置在文件上的所有属性"
5324 #: builtin/check-attr.c:20
5325 msgid "use .gitattributes only from the index"
5326 msgstr "只使用索引中的 .gitattributes"
5328 #: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98
5329 msgid "read file names from stdin"
5332 #: builtin/check-attr.c:23 builtin/check-ignore.c:24
5333 msgid "terminate input and output records by a NUL character"
5334 msgstr "输入和输出的记录使用 NUL 字符终结"
5336 #: builtin/check-ignore.c:18 builtin/checkout.c:1137 builtin/gc.c:325
5337 msgid "suppress progress reporting"
5340 #: builtin/check-ignore.c:26
5341 msgid "show non-matching input paths"
5344 #: builtin/check-ignore.c:28
5345 msgid "ignore index when checking"
5348 #: builtin/check-ignore.c:154
5349 msgid "cannot specify pathnames with --stdin"
5350 msgstr "不能同时指定路径及 --stdin 参数"
5352 #: builtin/check-ignore.c:157
5353 msgid "-z only makes sense with --stdin"
5354 msgstr "-z 需要和 --stdin 参数共用才有意义"
5356 #: builtin/check-ignore.c:159
5357 msgid "no path specified"
5360 #: builtin/check-ignore.c:163
5361 msgid "--quiet is only valid with a single pathname"
5362 msgstr "参数 --quiet 只在提供一个路径名时有效"
5364 #: builtin/check-ignore.c:165
5365 msgid "cannot have both --quiet and --verbose"
5366 msgstr "不能同时提供 --quiet 和 --verbose 参数"
5368 #: builtin/check-ignore.c:168
5369 msgid "--non-matching is only valid with --verbose"
5370 msgstr "--non-matching 选项只在使用 --verbose 时有效"
5372 #: builtin/check-mailmap.c:8
5373 msgid "git check-mailmap [<options>] <contact>..."
5374 msgstr "git check-mailmap [<选项>] <联系地址>..."
5376 #: builtin/check-mailmap.c:13
5377 msgid "also read contacts from stdin"
5378 msgstr "还从标准输入读取联系地址"
5380 #: builtin/check-mailmap.c:24
5382 msgid "unable to parse contact: %s"
5383 msgstr "不能解析联系地址:%s"
5385 #: builtin/check-mailmap.c:47
5386 msgid "no contacts specified"
5389 #: builtin/checkout-index.c:127
5390 msgid "git checkout-index [<options>] [--] [<file>...]"
5391 msgstr "git checkout-index [<选项>] [--] [<文件>...]"
5393 #: builtin/checkout-index.c:144
5394 msgid "stage should be between 1 and 3 or all"
5395 msgstr "索引值应该取值 1 到 3 或者 all"
5397 #: builtin/checkout-index.c:160
5398 msgid "check out all files in the index"
5401 #: builtin/checkout-index.c:161
5402 msgid "force overwrite of existing files"
5405 #: builtin/checkout-index.c:163
5406 msgid "no warning for existing files and files not in index"
5407 msgstr "存在或不在索引中的文件都没有警告"
5409 #: builtin/checkout-index.c:165
5410 msgid "don't checkout new files"
5413 #: builtin/checkout-index.c:167
5414 msgid "update stat information in the index file"
5415 msgstr "更新索引中文件的状态信息"
5417 #: builtin/checkout-index.c:171
5418 msgid "read list of paths from the standard input"
5419 msgstr "从标准输入读取路径列表"
5421 #: builtin/checkout-index.c:173
5422 msgid "write the content to temporary files"
5425 #: builtin/checkout-index.c:174 builtin/column.c:30
5426 #: builtin/submodule--helper.c:595 builtin/submodule--helper.c:598
5427 #: builtin/submodule--helper.c:604 builtin/submodule--helper.c:951
5428 #: builtin/worktree.c:469
5432 #: builtin/checkout-index.c:175
5433 msgid "when creating files, prepend <string>"
5434 msgstr "在创建文件时,在前面加上 <字符串>"
5436 #: builtin/checkout-index.c:177
5437 msgid "copy out the files from named stage"
5438 msgstr "从指定暂存区中拷出文件"
5440 #: builtin/checkout.c:25
5441 msgid "git checkout [<options>] <branch>"
5442 msgstr "git checkout [<选项>] <分支>"
5444 #: builtin/checkout.c:26
5445 msgid "git checkout [<options>] [<branch>] -- <file>..."
5446 msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
5448 #: builtin/checkout.c:134 builtin/checkout.c:167
5450 msgid "path '%s' does not have our version"
5451 msgstr "路径 '%s' 没有我们的版本"
5453 #: builtin/checkout.c:136 builtin/checkout.c:169
5455 msgid "path '%s' does not have their version"
5456 msgstr "路径 '%s' 没有他们的版本"
5458 #: builtin/checkout.c:152
5460 msgid "path '%s' does not have all necessary versions"
5461 msgstr "路径 '%s' 没有全部必须的版本"
5463 #: builtin/checkout.c:196
5465 msgid "path '%s' does not have necessary versions"
5466 msgstr "路径 '%s' 没有必须的版本"
5468 #: builtin/checkout.c:213
5470 msgid "path '%s': cannot merge"
5471 msgstr "path '%s':无法合并"
5473 #: builtin/checkout.c:230
5475 msgid "Unable to add merge result for '%s'"
5476 msgstr "无法为 '%s' 添加合并结果"
5478 #: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
5479 #: builtin/checkout.c:259
5481 msgid "'%s' cannot be used with updating paths"
5482 msgstr "'%s' 不能在更新路径时使用"
5484 #: builtin/checkout.c:262 builtin/checkout.c:265
5486 msgid "'%s' cannot be used with %s"
5487 msgstr "'%s' 不能和 %s 同时使用"
5489 #: builtin/checkout.c:268
5491 msgid "Cannot update paths and switch to branch '%s' at the same time."
5492 msgstr "不能同时更新路径并切换到分支'%s'。"
5494 #: builtin/checkout.c:339 builtin/checkout.c:346
5496 msgid "path '%s' is unmerged"
5497 msgstr "路径 '%s' 未合并"
5499 #: builtin/checkout.c:494
5500 msgid "you need to resolve your current index first"
5501 msgstr "您需要先解决当前索引的冲突"
5503 #: builtin/checkout.c:624
5505 msgid "Can not do reflog for '%s': %s\n"
5506 msgstr "不能对 '%s' 执行 reflog 操作:%s\n"
5508 #: builtin/checkout.c:663
5509 msgid "HEAD is now at"
5512 #: builtin/checkout.c:667 builtin/clone.c:660
5513 msgid "unable to update HEAD"
5516 #: builtin/checkout.c:671
5518 msgid "Reset branch '%s'\n"
5519 msgstr "重置分支 '%s'\n"
5521 #: builtin/checkout.c:674
5523 msgid "Already on '%s'\n"
5524 msgstr "已经位于 '%s'\n"
5526 #: builtin/checkout.c:678
5528 msgid "Switched to and reset branch '%s'\n"
5529 msgstr "切换并重置分支 '%s'\n"
5531 #: builtin/checkout.c:680 builtin/checkout.c:1069
5533 msgid "Switched to a new branch '%s'\n"
5534 msgstr "切换到一个新分支 '%s'\n"
5536 #: builtin/checkout.c:682
5538 msgid "Switched to branch '%s'\n"
5539 msgstr "切换到分支 '%s'\n"
5542 #: builtin/checkout.c:733
5544 msgid " ... and %d more.\n"
5545 msgstr " ... 及其它 %d 个。\n"
5547 #: builtin/checkout.c:739
5550 "Warning: you are leaving %d commit behind, not connected to\n"
5551 "any of your branches:\n"
5555 "Warning: you are leaving %d commits behind, not connected to\n"
5556 "any of your branches:\n"
5560 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
5564 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
5568 #: builtin/checkout.c:758
5571 "If you want to keep it by creating a new branch, this may be a good time\n"
5574 " git branch <new-branch-name> %s\n"
5577 "If you want to keep them by creating a new branch, this may be a good time\n"
5580 " git branch <new-branch-name> %s\n"
5583 "如果您想要通过创建新分支保存它,这可能是一个好时候。\n"
5586 " git branch <新分支名> %s\n"
5589 "如果您想要通过创建新分支保存它们,这可能是一个好时候。\n"
5592 " git branch <新分支名> %s\n"
5595 #: builtin/checkout.c:794
5596 msgid "internal error in revision walk"
5597 msgstr "在版本遍历时遇到内部错误"
5599 #: builtin/checkout.c:798
5600 msgid "Previous HEAD position was"
5601 msgstr "之前的 HEAD 位置是"
5603 #: builtin/checkout.c:825 builtin/checkout.c:1064
5604 msgid "You are on a branch yet to be born"
5605 msgstr "您位于一个尚未初始化的分支"
5607 #: builtin/checkout.c:970
5609 msgid "only one reference expected, %d given."
5610 msgstr "应只有一个引用,却给出了 %d 个"
5612 #: builtin/checkout.c:1010 builtin/worktree.c:214
5614 msgid "invalid reference: %s"
5617 #: builtin/checkout.c:1039
5619 msgid "reference is not a tree: %s"
5622 #: builtin/checkout.c:1078
5623 msgid "paths cannot be used with switching branches"
5624 msgstr "路径不能和切换分支同时使用"
5626 #: builtin/checkout.c:1081 builtin/checkout.c:1085
5628 msgid "'%s' cannot be used with switching branches"
5629 msgstr "'%s' 不能和切换分支同时使用"
5631 #: builtin/checkout.c:1089 builtin/checkout.c:1092 builtin/checkout.c:1097
5632 #: builtin/checkout.c:1100
5634 msgid "'%s' cannot be used with '%s'"
5635 msgstr "'%s' 不能和 '%s' 同时使用"
5637 #: builtin/checkout.c:1105
5639 msgid "Cannot switch branch to a non-commit '%s'"
5640 msgstr "不能切换分支到一个非提交 '%s'"
5642 #: builtin/checkout.c:1138 builtin/checkout.c:1140 builtin/clone.c:93
5643 #: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324
5644 #: builtin/worktree.c:326
5648 #: builtin/checkout.c:1139
5649 msgid "create and checkout a new branch"
5650 msgstr "创建并检出一个新的分支"
5652 #: builtin/checkout.c:1141
5653 msgid "create/reset and checkout a branch"
5654 msgstr "创建/重置并检出一个分支"
5656 #: builtin/checkout.c:1142
5657 msgid "create reflog for new branch"
5658 msgstr "为新的分支创建引用日志"
5660 #: builtin/checkout.c:1143 builtin/worktree.c:328
5661 msgid "detach HEAD at named commit"
5662 msgstr "HEAD 从指定的提交分离"
5664 #: builtin/checkout.c:1144
5665 msgid "set upstream info for new branch"
5666 msgstr "为新的分支设置上游信息"
5668 #: builtin/checkout.c:1146
5672 #: builtin/checkout.c:1146
5673 msgid "new unparented branch"
5676 #: builtin/checkout.c:1147
5677 msgid "checkout our version for unmerged files"
5678 msgstr "对尚未合并的文件检出我们的版本"
5680 #: builtin/checkout.c:1149
5681 msgid "checkout their version for unmerged files"
5682 msgstr "对尚未合并的文件检出他们的版本"
5684 #: builtin/checkout.c:1151
5685 msgid "force checkout (throw away local modifications)"
5686 msgstr "强制检出(丢弃本地修改)"
5688 #: builtin/checkout.c:1152
5689 msgid "perform a 3-way merge with the new branch"
5690 msgstr "和新的分支执行三方合并"
5692 #: builtin/checkout.c:1153 builtin/merge.c:231
5693 msgid "update ignored files (default)"
5694 msgstr "更新忽略的文件(默认)"
5696 #: builtin/checkout.c:1154 builtin/log.c:1466 parse-options.h:251
5700 #: builtin/checkout.c:1155
5701 msgid "conflict style (merge or diff3)"
5702 msgstr "冲突输出风格(merge 或 diff3)"
5704 #: builtin/checkout.c:1158
5705 msgid "do not limit pathspecs to sparse entries only"
5706 msgstr "对路径不做稀疏检出的限制"
5708 #: builtin/checkout.c:1160
5709 msgid "second guess 'git checkout <no-such-branch>'"
5710 msgstr "二次猜测'git checkout <无此分支>'"
5712 #: builtin/checkout.c:1162
5713 msgid "do not check if another worktree is holding the given ref"
5714 msgstr "不检查指定的引用是否被其他工作区所占用"
5716 #: builtin/checkout.c:1163 builtin/clone.c:63 builtin/fetch.c:119
5717 #: builtin/merge.c:228 builtin/pull.c:117 builtin/push.c:536
5718 #: builtin/send-pack.c:168
5719 msgid "force progress reporting"
5722 #: builtin/checkout.c:1194
5723 msgid "-b, -B and --orphan are mutually exclusive"
5724 msgstr "-b、-B 和 --orphan 是互斥的"
5726 #: builtin/checkout.c:1211
5727 msgid "--track needs a branch name"
5728 msgstr "--track 需要一个分支名"
5730 #: builtin/checkout.c:1216
5731 msgid "Missing branch name; try -b"
5732 msgstr "缺少分支名;尝试 -b"
5734 #: builtin/checkout.c:1252
5735 msgid "invalid path specification"
5738 #: builtin/checkout.c:1259
5741 "Cannot update paths and switch to branch '%s' at the same time.\n"
5742 "Did you intend to checkout '%s' which can not be resolved as commit?"
5744 "不能同时更新路径并切换到分支'%s'。\n"
5745 "您是想要检出 '%s' 但其未能解析为提交么?"
5747 #: builtin/checkout.c:1264
5749 msgid "git checkout: --detach does not take a path argument '%s'"
5750 msgstr "git checkout:--detach 不能接收路径参数 '%s'"
5752 #: builtin/checkout.c:1268
5754 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
5755 "checking out of the index."
5757 "git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
5759 #: builtin/clean.c:25
5761 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
5763 "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
5765 #: builtin/clean.c:29
5767 msgid "Removing %s\n"
5770 #: builtin/clean.c:30
5772 msgid "Would remove %s\n"
5775 #: builtin/clean.c:31
5777 msgid "Skipping repository %s\n"
5780 #: builtin/clean.c:32
5782 msgid "Would skip repository %s\n"
5785 #: builtin/clean.c:33
5787 msgid "failed to remove %s"
5790 #: builtin/clean.c:291
5793 "1 - select a numbered item\n"
5794 "foo - select item based on unique prefix\n"
5795 " - (empty) select nothing"
5799 "foo - 通过标题选择一个选项\n"
5802 #: builtin/clean.c:295
5805 "1 - select a single item\n"
5806 "3-5 - select a range of items\n"
5807 "2-3,6-9 - select multiple ranges\n"
5808 "foo - select item based on unique prefix\n"
5809 "-... - unselect specified items\n"
5810 "* - choose all items\n"
5811 " - (empty) finish selecting"
5815 "3-5 - 选择一个范围内的所有选项\n"
5816 "2-3,6-9 - 选择多个范围内的所有选项\n"
5817 "foo - 通过标题选择一个选项\n"
5822 #: builtin/clean.c:511
5827 #: builtin/clean.c:653
5829 msgid "Input ignore patterns>> "
5830 msgstr "输入模版以排除条目>> "
5832 #: builtin/clean.c:690
5834 msgid "WARNING: Cannot find items matched by: %s"
5835 msgstr "警告:无法找到和 %s 匹配的条目"
5837 #: builtin/clean.c:711
5838 msgid "Select items to delete"
5841 #. TRANSLATORS: Make sure to keep [y/N] as is
5842 #: builtin/clean.c:752
5844 msgid "Remove %s [y/N]? "
5845 msgstr "删除 %s [y/N]?"
5847 #: builtin/clean.c:777
5851 #: builtin/clean.c:785
5853 "clean - start cleaning\n"
5854 "filter by pattern - exclude items from deletion\n"
5855 "select by numbers - select items to be deleted by numbers\n"
5856 "ask each - confirm each deletion (like \"rm -i\")\n"
5857 "quit - stop cleaning\n"
5858 "help - this screen\n"
5859 "? - help for prompt selection"
5862 "filter by pattern - 通过模版排除要删除的条目\n"
5863 "select by numbers - 通过数字选择要删除的条目\n"
5864 "ask each - 针对删除逐一询问(就像 \"rm -i\")\n"
5867 "? - 显示如何在提示符下选择的帮助"
5869 #: builtin/clean.c:812
5870 msgid "*** Commands ***"
5873 #: builtin/clean.c:813
5877 #: builtin/clean.c:821
5878 msgid "Would remove the following item:"
5879 msgid_plural "Would remove the following items:"
5880 msgstr[0] "将删除如下条目:"
5881 msgstr[1] "将删除如下条目:"
5883 #: builtin/clean.c:838
5884 msgid "No more files to clean, exiting."
5885 msgstr "没有要清理的文件,退出。"
5887 #: builtin/clean.c:869
5888 msgid "do not print names of files removed"
5891 #: builtin/clean.c:871
5895 #: builtin/clean.c:872
5896 msgid "interactive cleaning"
5899 #: builtin/clean.c:874
5900 msgid "remove whole directories"
5903 #: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:725
5904 #: builtin/ls-files.c:536 builtin/name-rev.c:313 builtin/show-ref.c:182
5908 #: builtin/clean.c:876
5909 msgid "add <pattern> to ignore rules"
5910 msgstr "添加 <模式> 到忽略规则"
5912 #: builtin/clean.c:877
5913 msgid "remove ignored files, too"
5916 #: builtin/clean.c:879
5917 msgid "remove only ignored files"
5920 #: builtin/clean.c:897
5921 msgid "-x and -X cannot be used together"
5922 msgstr "-x 和 -X 不能同时使用"
5924 #: builtin/clean.c:901
5926 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
5929 "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
5931 #: builtin/clean.c:904
5933 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
5936 "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
5938 #: builtin/clone.c:37
5939 msgid "git clone [<options>] [--] <repo> [<dir>]"
5940 msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
5942 #: builtin/clone.c:65
5943 msgid "don't create a checkout"
5946 #: builtin/clone.c:66 builtin/clone.c:68 builtin/init-db.c:478
5947 msgid "create a bare repository"
5950 #: builtin/clone.c:70
5951 msgid "create a mirror repository (implies bare)"
5952 msgstr "创建一个镜像仓库(也是纯仓库)"
5954 #: builtin/clone.c:72
5955 msgid "to clone from a local repository"
5958 #: builtin/clone.c:74
5959 msgid "don't use local hardlinks, always copy"
5960 msgstr "不使用本地硬链接,始终复制"
5962 #: builtin/clone.c:76
5963 msgid "setup as shared repository"
5966 #: builtin/clone.c:78 builtin/clone.c:80
5967 msgid "initialize submodules in the clone"
5970 #: builtin/clone.c:82
5971 msgid "number of submodules cloned in parallel"
5972 msgstr "并发克隆的子模组的数量"
5974 #: builtin/clone.c:83 builtin/init-db.c:475
5975 msgid "template-directory"
5978 #: builtin/clone.c:84 builtin/init-db.c:476
5979 msgid "directory from which templates will be used"
5982 #: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:602
5983 #: builtin/submodule--helper.c:954
5984 msgid "reference repository"
5987 #: builtin/clone.c:90
5988 msgid "use --reference only while cloning"
5989 msgstr "仅在克隆时参考 --reference 指向的本地仓库"
5991 #: builtin/clone.c:91 builtin/column.c:26 builtin/merge-file.c:44
5995 #: builtin/clone.c:92
5996 msgid "use <name> instead of 'origin' to track upstream"
5997 msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
5999 #: builtin/clone.c:94
6000 msgid "checkout <branch> instead of the remote's HEAD"
6001 msgstr "检出 <分支> 而不是远程 HEAD"
6003 #: builtin/clone.c:96
6004 msgid "path to git-upload-pack on the remote"
6005 msgstr "远程 git-upload-pack 路径"
6007 #: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668
6008 #: builtin/pull.c:202
6012 #: builtin/clone.c:98
6013 msgid "create a shallow clone of that depth"
6014 msgstr "创建一个指定深度的浅克隆"
6016 #: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2848
6017 #: parse-options.h:142
6021 #: builtin/clone.c:100
6022 msgid "create a shallow clone since a specific time"
6023 msgstr "从一个特定时间创建一个浅克隆"
6025 #: builtin/clone.c:101 builtin/fetch.c:124
6029 #: builtin/clone.c:102 builtin/fetch.c:125
6030 msgid "deepen history of shallow clone by excluding rev"
6031 msgstr "通过排除版本来深化浅克隆的历史"
6033 #: builtin/clone.c:104
6034 msgid "clone only one branch, HEAD or --branch"
6035 msgstr "只克隆一个分支、HEAD 或 --branch"
6037 #: builtin/clone.c:106
6038 msgid "any cloned submodules will be shallow"
6039 msgstr "子模组将以浅下载模式克隆"
6041 #: builtin/clone.c:107 builtin/init-db.c:484
6045 #: builtin/clone.c:108 builtin/init-db.c:485
6046 msgid "separate git dir from working tree"
6047 msgstr "git目录和工作区分离"
6049 #: builtin/clone.c:109
6053 #: builtin/clone.c:110
6054 msgid "set config inside the new repository"
6055 msgstr "在新仓库中设置配置信息"
6057 #: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:547
6058 msgid "use IPv4 addresses only"
6059 msgstr "只使用 IPv4 地址"
6061 #: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:549
6062 msgid "use IPv6 addresses only"
6063 msgstr "只使用 IPv6 地址"
6065 #: builtin/clone.c:250
6067 "No directory name could be guessed.\n"
6068 "Please specify a directory on the command line"
6073 #: builtin/clone.c:303
6075 msgid "info: Could not add alternate for '%s': %s\n"
6076 msgstr "info: 不能为 '%s' 添加一个备用:%s\n"
6078 #: builtin/clone.c:375
6080 msgid "failed to open '%s'"
6083 #: builtin/clone.c:383
6085 msgid "%s exists and is not a directory"
6086 msgstr "%s 存在且不是一个目录"
6088 #: builtin/clone.c:397
6090 msgid "failed to stat %s\n"
6091 msgstr "无法枚举 %s 状态\n"
6093 #: builtin/clone.c:419
6095 msgid "failed to create link '%s'"
6096 msgstr "无法创建链接 '%s'"
6098 #: builtin/clone.c:423
6100 msgid "failed to copy file to '%s'"
6101 msgstr "无法拷贝文件至 '%s'"
6103 #: builtin/clone.c:448
6108 #: builtin/clone.c:460
6110 "Clone succeeded, but checkout failed.\n"
6111 "You can inspect what was checked out with 'git status'\n"
6112 "and retry the checkout with 'git checkout -f HEAD'\n"
6115 "您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
6116 "'git checkout -f HEAD' 重试\n"
6118 #: builtin/clone.c:537
6120 msgid "Could not find remote branch %s to clone."
6121 msgstr "不能发现要克隆的远程分支 %s。"
6123 #: builtin/clone.c:632
6124 msgid "remote did not send all necessary objects"
6125 msgstr "远程没有发送所有必须的对象"
6127 #: builtin/clone.c:648
6129 msgid "unable to update %s"
6132 #: builtin/clone.c:697
6133 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
6134 msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
6136 #: builtin/clone.c:728
6137 msgid "unable to checkout working tree"
6140 #: builtin/clone.c:768
6141 msgid "unable to write parameters to config file"
6142 msgstr "无法将参数写入配置文件"
6144 #: builtin/clone.c:831
6145 msgid "cannot repack to clean up"
6146 msgstr "无法执行 repack 来清理"
6148 #: builtin/clone.c:833
6149 msgid "cannot unlink temporary alternates file"
6150 msgstr "无法删除临时的 alternates 文件"
6152 #: builtin/clone.c:866 builtin/receive-pack.c:1895
6153 msgid "Too many arguments."
6156 #: builtin/clone.c:870
6157 msgid "You must specify a repository to clone."
6158 msgstr "您必须指定一个仓库来克隆。"
6160 #: builtin/clone.c:883
6162 msgid "--bare and --origin %s options are incompatible."
6163 msgstr "--bare 和 --origin %s 选项不兼容。"
6165 #: builtin/clone.c:886
6166 msgid "--bare and --separate-git-dir are incompatible."
6167 msgstr "--bare 和 --separate-git-dir 选项不兼容。"
6169 #: builtin/clone.c:899
6171 msgid "repository '%s' does not exist"
6172 msgstr "仓库 '%s' 不存在"
6174 #: builtin/clone.c:905 builtin/fetch.c:1338
6176 msgid "depth %s is not a positive number"
6177 msgstr "深度 %s 不是一个正数"
6179 #: builtin/clone.c:915
6181 msgid "destination path '%s' already exists and is not an empty directory."
6182 msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
6184 #: builtin/clone.c:925
6186 msgid "working tree '%s' already exists."
6187 msgstr "工作区 '%s' 已经存在。"
6189 #: builtin/clone.c:940 builtin/clone.c:951 builtin/submodule--helper.c:657
6190 #: builtin/worktree.c:222 builtin/worktree.c:249
6192 msgid "could not create leading directories of '%s'"
6193 msgstr "不能为 '%s' 创建先导目录"
6195 #: builtin/clone.c:943
6197 msgid "could not create work tree dir '%s'"
6198 msgstr "不能创建工作区目录 '%s'"
6200 #: builtin/clone.c:955
6202 msgid "Cloning into bare repository '%s'...\n"
6203 msgstr "克隆到纯仓库 '%s'...\n"
6205 #: builtin/clone.c:957
6207 msgid "Cloning into '%s'...\n"
6208 msgstr "正克隆到 '%s'...\n"
6210 #: builtin/clone.c:963
6212 "clone --recursive is not compatible with both --reference and --reference-if-"
6214 msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容"
6216 #: builtin/clone.c:1019
6217 msgid "--depth is ignored in local clones; use file:// instead."
6218 msgstr "--depth 在本地克隆时被忽略,请改用 file:// 协议。"
6220 #: builtin/clone.c:1021
6221 msgid "--shallow-since is ignored in local clones; use file:// instead."
6222 msgstr "--shallow-since 在本地克隆时被忽略,请改用 file:// 协议。"
6224 #: builtin/clone.c:1023
6225 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
6226 msgstr "--shallow-exclude 在本地克隆时被忽略,请改用 file:// 协议。"
6228 #: builtin/clone.c:1026
6229 msgid "source repository is shallow, ignoring --local"
6230 msgstr "源仓库是浅克隆,忽略 --local"
6232 #: builtin/clone.c:1031
6233 msgid "--local is ignored"
6234 msgstr "--local 被忽略"
6236 #: builtin/clone.c:1035
6238 msgid "Don't know how to clone %s"
6241 #: builtin/clone.c:1090 builtin/clone.c:1098
6243 msgid "Remote branch %s not found in upstream %s"
6244 msgstr "远程分支 %s 在上游 %s 未发现"
6246 #: builtin/clone.c:1101
6247 msgid "You appear to have cloned an empty repository."
6248 msgstr "您似乎克隆了一个空仓库。"
6250 #: builtin/column.c:9
6251 msgid "git column [<options>]"
6252 msgstr "git column [<选项>]"
6254 #: builtin/column.c:26
6255 msgid "lookup config vars"
6258 #: builtin/column.c:27 builtin/column.c:28
6259 msgid "layout to use"
6262 #: builtin/column.c:29
6263 msgid "Maximum width"
6266 #: builtin/column.c:30
6267 msgid "Padding space on left border"
6270 #: builtin/column.c:31
6271 msgid "Padding space on right border"
6274 #: builtin/column.c:32
6275 msgid "Padding space between columns"
6278 #: builtin/column.c:51
6279 msgid "--command must be the first argument"
6280 msgstr "--command 必须是第一个参数"
6282 #: builtin/commit.c:38
6283 msgid "git commit [<options>] [--] <pathspec>..."
6284 msgstr "git commit [<选项>] [--] <路径规格>..."
6286 #: builtin/commit.c:43
6287 msgid "git status [<options>] [--] <pathspec>..."
6288 msgstr "git status [<选项>] [--] <路径规格>..."
6290 #: builtin/commit.c:48
6292 "Your name and email address were configured automatically based\n"
6293 "on your username and hostname. Please check that they are accurate.\n"
6294 "You can suppress this message by setting them explicitly. Run the\n"
6295 "following command and follow the instructions in your editor to edit\n"
6296 "your configuration file:\n"
6298 " git config --global --edit\n"
6300 "After doing this, you may fix the identity used for this commit with:\n"
6302 " git commit --amend --reset-author\n"
6304 "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
6305 "与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
6308 " git config --global --edit\n"
6310 "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
6312 " git commit --amend --reset-author\n"
6314 #: builtin/commit.c:61
6316 "Your name and email address were configured automatically based\n"
6317 "on your username and hostname. Please check that they are accurate.\n"
6318 "You can suppress this message by setting them explicitly:\n"
6320 " git config --global user.name \"Your Name\"\n"
6321 " git config --global user.email you@example.com\n"
6323 "After doing this, you may fix the identity used for this commit with:\n"
6325 " git commit --amend --reset-author\n"
6327 "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
6328 "与否。您可以对其进行设置以免再出现本提示信息:\n"
6330 " git config --global user.name \"Your Name\"\n"
6331 " git config --global user.email you@example.com\n"
6333 "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
6335 " git commit --amend --reset-author\n"
6337 #: builtin/commit.c:73
6339 "You asked to amend the most recent commit, but doing so would make\n"
6340 "it empty. You can repeat your command with --allow-empty, or you can\n"
6341 "remove the commit entirely with \"git reset HEAD^\".\n"
6343 "您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
6344 "--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
6346 #: builtin/commit.c:78
6348 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
6349 "If you wish to commit it anyway, use:\n"
6351 " git commit --allow-empty\n"
6354 "之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
6357 " git commit --allow-empty\n"
6360 #: builtin/commit.c:85
6361 msgid "Otherwise, please use 'git reset'\n"
6362 msgstr "否则,请使用命令 'git reset'\n"
6364 #: builtin/commit.c:88
6366 "If you wish to skip this commit, use:\n"
6370 "Then \"git cherry-pick --continue\" will resume cherry-picking\n"
6371 "the remaining commits.\n"
6373 "如果您想跳过这个提交,使用命令:\n"
6377 "然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
6380 #: builtin/commit.c:318
6381 msgid "failed to unpack HEAD tree object"
6382 msgstr "无法解包 HEAD 树对象"
6384 #: builtin/commit.c:359
6385 msgid "unable to create temporary index"
6388 #: builtin/commit.c:365
6389 msgid "interactive add failed"
6392 #: builtin/commit.c:378
6393 msgid "unable to update temporary index"
6396 #: builtin/commit.c:380
6397 msgid "Failed to update main cache tree"
6400 #: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476
6401 msgid "unable to write new_index file"
6402 msgstr "无法写 new_index 文件"
6404 #: builtin/commit.c:458
6405 msgid "cannot do a partial commit during a merge."
6406 msgstr "在合并过程中不能做部分提交。"
6408 #: builtin/commit.c:460
6409 msgid "cannot do a partial commit during a cherry-pick."
6410 msgstr "在拣选过程中不能做部分提交。"
6412 #: builtin/commit.c:469
6413 msgid "cannot read the index"
6416 #: builtin/commit.c:488
6417 msgid "unable to write temporary index file"
6420 #: builtin/commit.c:582
6422 msgid "commit '%s' lacks author header"
6423 msgstr "提交 '%s' 缺少作者信息"
6425 #: builtin/commit.c:584
6427 msgid "commit '%s' has malformed author line"
6428 msgstr "提交 '%s' 有非法的作者信息"
6430 #: builtin/commit.c:603
6431 msgid "malformed --author parameter"
6432 msgstr "非法的 --author 参数"
6434 #: builtin/commit.c:611
6436 msgid "invalid date format: %s"
6439 #: builtin/commit.c:655
6441 "unable to select a comment character that is not used\n"
6442 "in the current commit message"
6443 msgstr "无法选择一个未被当前提交说明使用的注释字符"
6445 #: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1096
6447 msgid "could not lookup commit %s"
6450 #: builtin/commit.c:704 builtin/shortlog.c:286
6452 msgid "(reading log message from standard input)\n"
6453 msgstr "(正从标准输入中读取日志信息)\n"
6455 #: builtin/commit.c:706
6456 msgid "could not read log from standard input"
6457 msgstr "不能从标准输入中读取日志信息"
6459 #: builtin/commit.c:710
6461 msgid "could not read log file '%s'"
6462 msgstr "不能读取日志文件 '%s'"
6464 #: builtin/commit.c:737 builtin/commit.c:745
6465 msgid "could not read SQUASH_MSG"
6466 msgstr "不能读取 SQUASH_MSG"
6468 #: builtin/commit.c:742
6469 msgid "could not read MERGE_MSG"
6470 msgstr "不能读取 MERGE_MSG"
6472 #: builtin/commit.c:796
6473 msgid "could not write commit template"
6476 #: builtin/commit.c:814
6480 "It looks like you may be committing a merge.\n"
6481 "If this is not correct, please remove the file\n"
6486 "似乎您正在做一个合并提交。如果不对,请删除文件\n"
6490 #: builtin/commit.c:819
6494 "It looks like you may be committing a cherry-pick.\n"
6495 "If this is not correct, please remove the file\n"
6500 "似乎您正在做一个拣选提交。如果不对,请删除文件\n"
6504 #: builtin/commit.c:832
6507 "Please enter the commit message for your changes. Lines starting\n"
6508 "with '%c' will be ignored, and an empty message aborts the commit.\n"
6510 "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
6513 #: builtin/commit.c:839
6516 "Please enter the commit message for your changes. Lines starting\n"
6517 "with '%c' will be kept; you may remove them yourself if you want to.\n"
6518 "An empty message aborts the commit.\n"
6520 "请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
6521 "也可以删除它们。一个空的提交说明将会终止提交。\n"
6523 # 译者:为保证在输出中对齐,注意调整句中空格!
6524 #: builtin/commit.c:859
6526 msgid "%sAuthor: %.*s <%.*s>"
6527 msgstr "%s作者: %.*s <%.*s>"
6529 # 译者:为保证在输出中对齐,注意调整句中空格!
6530 #: builtin/commit.c:867
6535 # 译者:为保证在输出中对齐,注意调整句中空格!
6536 #: builtin/commit.c:874
6538 msgid "%sCommitter: %.*s <%.*s>"
6539 msgstr "%s提交者:%.*s <%.*s>"
6541 #: builtin/commit.c:892
6542 msgid "Cannot read index"
6545 #: builtin/commit.c:954
6546 msgid "Error building trees"
6549 #: builtin/commit.c:969 builtin/tag.c:266
6551 msgid "Please supply the message using either -m or -F option.\n"
6552 msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
6554 #: builtin/commit.c:1071
6556 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
6557 msgstr "--author '%s' 不是 'Name <email>' 格式,且未能在现有作者中找到匹配"
6559 #: builtin/commit.c:1086 builtin/commit.c:1327
6561 msgid "Invalid untracked files mode '%s'"
6562 msgstr "无效的未追踪文件参数 '%s'"
6564 #: builtin/commit.c:1124
6565 msgid "--long and -z are incompatible"
6566 msgstr "--long 和 -z 选项不兼容"
6568 #: builtin/commit.c:1154
6569 msgid "Using both --reset-author and --author does not make sense"
6570 msgstr "同时使用 --reset-author 和 --author 没有意义"
6572 #: builtin/commit.c:1163
6573 msgid "You have nothing to amend."
6576 #: builtin/commit.c:1166
6577 msgid "You are in the middle of a merge -- cannot amend."
6578 msgstr "您正处于一个合并过程中 -- 无法修补提交。"
6580 #: builtin/commit.c:1168
6581 msgid "You are in the middle of a cherry-pick -- cannot amend."
6582 msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
6584 #: builtin/commit.c:1171
6585 msgid "Options --squash and --fixup cannot be used together"
6586 msgstr "选项 --squash 和 --fixup 不能同时使用"
6588 #: builtin/commit.c:1181
6589 msgid "Only one of -c/-C/-F/--fixup can be used."
6590 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
6592 #: builtin/commit.c:1183
6593 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
6594 msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
6596 #: builtin/commit.c:1191
6597 msgid "--reset-author can be used only with -C, -c or --amend."
6598 msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
6600 #: builtin/commit.c:1208
6601 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
6602 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
6604 #: builtin/commit.c:1210
6605 msgid "No paths with --include/--only does not make sense."
6606 msgstr "参数 --include/--only 不跟路径没有意义。"
6608 #: builtin/commit.c:1212
6609 msgid "Clever... amending the last one with dirty index."
6610 msgstr "聪明... 用脏索引修补最后一个提交。"
6612 #: builtin/commit.c:1214
6613 msgid "Explicit paths specified without -i or -o; assuming --only paths..."
6614 msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..."
6616 #: builtin/commit.c:1226 builtin/tag.c:474
6618 msgid "Invalid cleanup mode %s"
6621 #: builtin/commit.c:1231
6622 msgid "Paths with -a does not make sense."
6623 msgstr "路径和 -a 选项同时使用没有意义。"
6625 #: builtin/commit.c:1341 builtin/commit.c:1617
6626 msgid "show status concisely"
6629 #: builtin/commit.c:1343 builtin/commit.c:1619
6630 msgid "show branch information"
6633 #: builtin/commit.c:1345
6637 #: builtin/commit.c:1345 builtin/commit.c:1621 builtin/push.c:522
6638 #: builtin/worktree.c:440
6639 msgid "machine-readable output"
6642 #: builtin/commit.c:1348 builtin/commit.c:1623
6643 msgid "show status in long format (default)"
6644 msgstr "以长格式显示状态(默认)"
6646 #: builtin/commit.c:1351 builtin/commit.c:1626
6647 msgid "terminate entries with NUL"
6648 msgstr "条目以 NUL 字符结尾"
6650 #: builtin/commit.c:1353 builtin/commit.c:1629 builtin/fast-export.c:981
6651 #: builtin/fast-export.c:984 builtin/tag.c:353
6655 #: builtin/commit.c:1354 builtin/commit.c:1629
6656 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
6657 msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
6659 #: builtin/commit.c:1357
6660 msgid "show ignored files"
6663 #: builtin/commit.c:1358 parse-options.h:155
6667 #: builtin/commit.c:1359
6669 "ignore changes to submodules, optional when: all, dirty, untracked. "
6672 "忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
6674 #: builtin/commit.c:1361
6675 msgid "list untracked files in columns"
6676 msgstr "以列的方式显示未跟踪的文件"
6678 #: builtin/commit.c:1437
6679 msgid "couldn't look up newly created commit"
6682 #: builtin/commit.c:1439
6683 msgid "could not parse newly created commit"
6686 #: builtin/commit.c:1484
6687 msgid "detached HEAD"
6690 # 译者:中文字符串拼接,可删除前导空格
6691 #: builtin/commit.c:1487
6692 msgid " (root-commit)"
6695 #: builtin/commit.c:1587
6696 msgid "suppress summary after successful commit"
6697 msgstr "提交成功后不显示概述信息"
6699 #: builtin/commit.c:1588
6700 msgid "show diff in commit message template"
6701 msgstr "在提交说明模板里显示差异"
6703 #: builtin/commit.c:1590
6704 msgid "Commit message options"
6707 #: builtin/commit.c:1591 builtin/tag.c:351
6708 msgid "read message from file"
6711 #: builtin/commit.c:1592
6715 #: builtin/commit.c:1592
6716 msgid "override author for commit"
6719 #: builtin/commit.c:1593 builtin/gc.c:326
6723 #: builtin/commit.c:1593
6724 msgid "override date for commit"
6727 #: builtin/commit.c:1594 builtin/merge.c:220 builtin/notes.c:398
6728 #: builtin/notes.c:561 builtin/tag.c:349
6732 #: builtin/commit.c:1594
6733 msgid "commit message"
6736 #: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
6737 #: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:79
6741 #: builtin/commit.c:1595
6742 msgid "reuse and edit message from specified commit"
6743 msgstr "重用并编辑指定提交的提交说明"
6745 #: builtin/commit.c:1596
6746 msgid "reuse message from specified commit"
6747 msgstr "重用指定提交的提交说明"
6749 #: builtin/commit.c:1597
6750 msgid "use autosquash formatted message to fixup specified commit"
6751 msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
6753 #: builtin/commit.c:1598
6754 msgid "use autosquash formatted message to squash specified commit"
6755 msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
6757 #: builtin/commit.c:1599
6758 msgid "the commit is authored by me now (used with -C/-c/--amend)"
6759 msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
6761 #: builtin/commit.c:1600 builtin/log.c:1413 builtin/revert.c:86
6762 msgid "add Signed-off-by:"
6763 msgstr "添加 Signed-off-by: 签名"
6765 #: builtin/commit.c:1601
6766 msgid "use specified template file"
6769 #: builtin/commit.c:1602
6770 msgid "force edit of commit"
6773 # 译者:可选值,不能翻译(或是原文中笔误,应为 mode)
6774 #: builtin/commit.c:1603
6778 #: builtin/commit.c:1603 builtin/tag.c:354
6779 msgid "how to strip spaces and #comments from message"
6780 msgstr "设置如何删除提交说明里的空格和#注释"
6782 #: builtin/commit.c:1604
6783 msgid "include status in commit message template"
6784 msgstr "在提交说明模板里包含状态信息"
6786 #: builtin/commit.c:1606 builtin/merge.c:230 builtin/pull.c:166
6787 #: builtin/revert.c:93
6788 msgid "GPG sign commit"
6791 #: builtin/commit.c:1609
6792 msgid "Commit contents options"
6795 #: builtin/commit.c:1610
6796 msgid "commit all changed files"
6799 #: builtin/commit.c:1611
6800 msgid "add specified files to index for commit"
6801 msgstr "添加指定的文件到索引区等待提交"
6803 #: builtin/commit.c:1612
6804 msgid "interactively add files"
6807 #: builtin/commit.c:1613
6808 msgid "interactively add changes"
6811 #: builtin/commit.c:1614
6812 msgid "commit only specified files"
6815 #: builtin/commit.c:1615
6816 msgid "bypass pre-commit and commit-msg hooks"
6817 msgstr "绕过 pre-commit 和 commit-msg 钩子"
6819 #: builtin/commit.c:1616
6820 msgid "show what would be committed"
6823 #: builtin/commit.c:1627
6824 msgid "amend previous commit"
6827 #: builtin/commit.c:1628
6828 msgid "bypass post-rewrite hook"
6829 msgstr "绕过 post-rewrite 钩子"
6831 #: builtin/commit.c:1633
6832 msgid "ok to record an empty change"
6835 #: builtin/commit.c:1635
6836 msgid "ok to record a change with an empty message"
6839 #: builtin/commit.c:1664
6840 msgid "could not parse HEAD commit"
6841 msgstr "不能解析 HEAD 提交"
6843 #: builtin/commit.c:1712
6845 msgid "Corrupt MERGE_HEAD file (%s)"
6846 msgstr "损坏的 MERGE_HEAD 文件(%s)"
6848 #: builtin/commit.c:1719
6849 msgid "could not read MERGE_MODE"
6850 msgstr "不能读取 MERGE_MODE"
6852 #: builtin/commit.c:1738
6854 msgid "could not read commit message: %s"
6855 msgstr "不能读取提交说明:%s"
6857 #: builtin/commit.c:1749
6859 msgid "Aborting commit; you did not edit the message.\n"
6860 msgstr "终止提交;您未更改来自模版的提交说明。\n"
6862 #: builtin/commit.c:1754
6864 msgid "Aborting commit due to empty commit message.\n"
6865 msgstr "终止提交因为提交说明为空。\n"
6867 #: builtin/commit.c:1802
6869 "Repository has been updated, but unable to write\n"
6870 "new_index file. Check that disk is not full and quota is\n"
6871 "not exceeded, and then \"git reset HEAD\" to recover."
6873 "仓库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
6874 "或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
6876 #: builtin/config.c:9
6877 msgid "git config [<options>]"
6878 msgstr "git config [<选项>]"
6880 #: builtin/config.c:55
6881 msgid "Config file location"
6884 #: builtin/config.c:56
6885 msgid "use global config file"
6888 #: builtin/config.c:57
6889 msgid "use system config file"
6892 #: builtin/config.c:58
6893 msgid "use repository config file"
6896 #: builtin/config.c:59
6897 msgid "use given config file"
6900 #: builtin/config.c:60
6904 #: builtin/config.c:60
6905 msgid "read config from given blob object"
6906 msgstr "从给定的数据对象读取配置"
6908 #: builtin/config.c:61
6912 #: builtin/config.c:62
6913 msgid "get value: name [value-regex]"
6914 msgstr "获取值:name [value-regex]"
6916 #: builtin/config.c:63
6917 msgid "get all values: key [value-regex]"
6918 msgstr "获得所有的值:key [value-regex]"
6920 #: builtin/config.c:64
6921 msgid "get values for regexp: name-regex [value-regex]"
6922 msgstr "根据正则表达式获得值:name-regex [value-regex]"
6924 #: builtin/config.c:65
6925 msgid "get value specific for the URL: section[.var] URL"
6926 msgstr "获得 URL 取值:section[.var] URL"
6928 #: builtin/config.c:66
6929 msgid "replace all matching variables: name value [value_regex]"
6930 msgstr "替换所有匹配的变量:name value [value_regex]"
6932 #: builtin/config.c:67
6933 msgid "add a new variable: name value"
6934 msgstr "添加一个新的变量:name value"
6936 #: builtin/config.c:68
6937 msgid "remove a variable: name [value-regex]"
6938 msgstr "删除一个变量:name [value-regex]"
6940 #: builtin/config.c:69
6941 msgid "remove all matches: name [value-regex]"
6942 msgstr "删除所有匹配项:name [value-regex]"
6944 #: builtin/config.c:70
6945 msgid "rename section: old-name new-name"
6946 msgstr "重命名小节:old-name new-name"
6948 #: builtin/config.c:71
6949 msgid "remove a section: name"
6950 msgstr "删除一个小节:name"
6952 #: builtin/config.c:72
6956 #: builtin/config.c:73
6957 msgid "open an editor"
6960 #: builtin/config.c:74
6961 msgid "find the color configured: slot [default]"
6962 msgstr "获得配置的颜色:配置 [默认]"
6964 #: builtin/config.c:75
6965 msgid "find the color setting: slot [stdout-is-tty]"
6966 msgstr "获得颜色设置:配置 [stdout-is-tty]"
6968 #: builtin/config.c:76
6972 #: builtin/config.c:77
6973 msgid "value is \"true\" or \"false\""
6974 msgstr "值是 \"true\" 或 \"false\""
6976 #: builtin/config.c:78
6977 msgid "value is decimal number"
6980 #: builtin/config.c:79
6981 msgid "value is --bool or --int"
6982 msgstr "值是 --bool or --int"
6984 #: builtin/config.c:80
6985 msgid "value is a path (file or directory name)"
6986 msgstr "值是一个路径(文件或目录名)"
6988 #: builtin/config.c:81
6992 #: builtin/config.c:82
6993 msgid "terminate values with NUL byte"
6994 msgstr "终止值是 NUL 字节"
6996 #: builtin/config.c:83
6997 msgid "show variable names only"
7000 #: builtin/config.c:84
7001 msgid "respect include directives on lookup"
7002 msgstr "查询时参照 include 指令递归查找"
7004 #: builtin/config.c:85
7005 msgid "show origin of config (file, standard input, blob, command line)"
7006 msgstr "显示配置的来源(文件、标准输入、数据对象,或命令行)"
7008 #: builtin/config.c:327
7009 msgid "unable to parse default color value"
7012 #: builtin/config.c:471
7015 "# This is Git's per-user configuration file.\n"
7017 "# Please adapt and uncomment the following lines:\n"
7021 "# This is Git's per-user configuration file.\n"
7023 "# Please adapt and uncomment the following lines:\n"
7027 #: builtin/config.c:613
7029 msgid "cannot create configuration file %s"
7030 msgstr "不能创建配置文件 %s"
7032 #: builtin/config.c:625
7035 "cannot overwrite multiple values with a single value\n"
7036 " Use a regexp, --add or --replace-all to change %s."
7039 " 使用一个正则表达式、--add 或 --replace-all 来修改 %s。"
7041 #: builtin/count-objects.c:86
7042 msgid "git count-objects [-v] [-H | --human-readable]"
7043 msgstr "git count-objects [-v] [-H | --human-readable]"
7045 #: builtin/count-objects.c:96
7046 msgid "print sizes in human readable format"
7047 msgstr "以用户可读的格式显示大小"
7049 #: builtin/describe.c:17
7050 msgid "git describe [<options>] [<commit-ish>...]"
7051 msgstr "git describe [<选项>] [<提交号>...]"
7053 #: builtin/describe.c:18
7054 msgid "git describe [<options>] --dirty"
7055 msgstr "git describe [<选项>] --dirty"
7057 #: builtin/describe.c:217
7059 msgid "annotated tag %s not available"
7062 #: builtin/describe.c:221
7064 msgid "annotated tag %s has no embedded name"
7065 msgstr "附注标签 %s 没有嵌入名称"
7067 #: builtin/describe.c:223
7069 msgid "tag '%s' is really '%s' here"
7070 msgstr "标签 '%s' 的确是在 '%s'"
7072 #: builtin/describe.c:250 builtin/log.c:480
7074 msgid "Not a valid object name %s"
7075 msgstr "不是一个有效的对象名 %s"
7077 #: builtin/describe.c:253
7079 msgid "%s is not a valid '%s' object"
7080 msgstr "%s 不是一个有效的 '%s' 对象"
7082 #: builtin/describe.c:270
7084 msgid "no tag exactly matches '%s'"
7085 msgstr "没有标签准确匹配 '%s'"
7087 #: builtin/describe.c:272
7089 msgid "searching to describe %s\n"
7092 #: builtin/describe.c:319
7094 msgid "finished search at %s\n"
7097 #: builtin/describe.c:346
7100 "No annotated tags can describe '%s'.\n"
7101 "However, there were unannotated tags: try --tags."
7104 "然而,存在未附注标签:尝试 --tags。"
7106 #: builtin/describe.c:350
7109 "No tags can describe '%s'.\n"
7110 "Try --always, or create some tags."
7113 "尝试 --always,或者创建一些标签。"
7115 #: builtin/describe.c:371
7117 msgid "traversed %lu commits\n"
7118 msgstr "已遍历 %lu 个提交\n"
7120 #: builtin/describe.c:374
7123 "more than %i tags found; listed %i most recent\n"
7124 "gave up search at %s\n"
7126 "发现多于 %i 个标签,列出最近的 %i 个\n"
7129 #: builtin/describe.c:396
7130 msgid "find the tag that comes after the commit"
7133 #: builtin/describe.c:397
7134 msgid "debug search strategy on stderr"
7135 msgstr "在标准错误上调试搜索策略"
7137 #: builtin/describe.c:398
7141 #: builtin/describe.c:399
7142 msgid "use any tag, even unannotated"
7143 msgstr "使用任意标签,即使未附带注释"
7145 #: builtin/describe.c:400
7146 msgid "always use long format"
7149 #: builtin/describe.c:401
7150 msgid "only follow first parent"
7153 #: builtin/describe.c:404
7154 msgid "only output exact matches"
7157 #: builtin/describe.c:406
7158 msgid "consider <n> most recent tags (default: 10)"
7159 msgstr "考虑最近 <n> 个标签(默认:10)"
7161 #: builtin/describe.c:408
7162 msgid "only consider tags matching <pattern>"
7163 msgstr "只考虑匹配 <模式> 的标签"
7165 #: builtin/describe.c:410 builtin/name-rev.c:320
7166 msgid "show abbreviated commit object as fallback"
7167 msgstr "显示简写的提交号作为后备"
7169 #: builtin/describe.c:411
7173 #: builtin/describe.c:412
7174 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
7175 msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")"
7177 #: builtin/describe.c:430
7178 msgid "--long is incompatible with --abbrev=0"
7179 msgstr "--long 与 --abbrev=0 不兼容"
7181 #: builtin/describe.c:456
7182 msgid "No names found, cannot describe anything."
7183 msgstr "没有发现名称,无法描述任何东西。"
7185 #: builtin/describe.c:476
7186 msgid "--dirty is incompatible with commit-ishes"
7187 msgstr "--dirty 不能与提交同时使用"
7189 #: builtin/diff.c:86
7191 msgid "'%s': not a regular file or symlink"
7192 msgstr "'%s':不是一个正规文件或符号链接"
7194 #: builtin/diff.c:237
7196 msgid "invalid option: %s"
7199 #: builtin/diff.c:361
7200 msgid "Not a git repository"
7201 msgstr "不是一个 git 仓库"
7203 #: builtin/diff.c:404
7205 msgid "invalid object '%s' given."
7206 msgstr "提供了无效对象 '%s'。"
7208 #: builtin/diff.c:413
7210 msgid "more than two blobs given: '%s'"
7211 msgstr "提供了超过两个数据对象:'%s'"
7213 #: builtin/diff.c:420
7215 msgid "unhandled object '%s' given."
7216 msgstr "无法处理的对象 '%s'。"
7218 #: builtin/fast-export.c:25
7219 msgid "git fast-export [rev-list-opts]"
7220 msgstr "git fast-export [rev-list-opts]"
7222 #: builtin/fast-export.c:980
7223 msgid "show progress after <n> objects"
7224 msgstr "在 <n> 个对象之后显示进度"
7226 #: builtin/fast-export.c:982
7227 msgid "select handling of signed tags"
7230 #: builtin/fast-export.c:985
7231 msgid "select handling of tags that tag filtered objects"
7232 msgstr "选择当标签指向被过滤对象时该标签的处理方式"
7234 #: builtin/fast-export.c:988
7235 msgid "Dump marks to this file"
7238 #: builtin/fast-export.c:990
7239 msgid "Import marks from this file"
7242 #: builtin/fast-export.c:992
7243 msgid "Fake a tagger when tags lack one"
7244 msgstr "当标签缺少标记者字段时,假装提供一个"
7246 #: builtin/fast-export.c:994
7247 msgid "Output full tree for each commit"
7250 #: builtin/fast-export.c:996
7251 msgid "Use the done feature to terminate the stream"
7252 msgstr "使用 done 功能来终止流"
7254 #: builtin/fast-export.c:997
7255 msgid "Skip output of blob data"
7258 #: builtin/fast-export.c:998
7262 #: builtin/fast-export.c:999
7263 msgid "Apply refspec to exported refs"
7264 msgstr "对导出的引用应用引用规格"
7266 #: builtin/fast-export.c:1000
7267 msgid "anonymize output"
7270 #: builtin/fetch.c:21
7271 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
7272 msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
7274 #: builtin/fetch.c:22
7275 msgid "git fetch [<options>] <group>"
7276 msgstr "git fetch [<选项>] <组>"
7278 #: builtin/fetch.c:23
7279 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
7280 msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
7282 #: builtin/fetch.c:24
7283 msgid "git fetch --all [<options>]"
7284 msgstr "git fetch --all [<选项>]"
7286 #: builtin/fetch.c:95 builtin/pull.c:175
7287 msgid "fetch from all remotes"
7290 #: builtin/fetch.c:97 builtin/pull.c:178
7291 msgid "append to .git/FETCH_HEAD instead of overwriting"
7292 msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
7294 #: builtin/fetch.c:99 builtin/pull.c:181
7295 msgid "path to upload pack on remote end"
7298 #: builtin/fetch.c:100 builtin/pull.c:183
7299 msgid "force overwrite of local branch"
7302 #: builtin/fetch.c:102
7303 msgid "fetch from multiple remotes"
7306 #: builtin/fetch.c:104 builtin/pull.c:185
7307 msgid "fetch all tags and associated objects"
7308 msgstr "抓取所有的标签和关联对象"
7310 #: builtin/fetch.c:106
7311 msgid "do not fetch all tags (--no-tags)"
7312 msgstr "不抓取任何标签(--no-tags)"
7314 #: builtin/fetch.c:108
7315 msgid "number of submodules fetched in parallel"
7318 #: builtin/fetch.c:110 builtin/pull.c:188
7319 msgid "prune remote-tracking branches no longer on remote"
7320 msgstr "清除远程已经不存在的分支的跟踪分支"
7323 #: builtin/fetch.c:111 builtin/pull.c:191
7327 #: builtin/fetch.c:112 builtin/pull.c:192
7328 msgid "control recursive fetching of submodules"
7331 #: builtin/fetch.c:116 builtin/pull.c:200
7332 msgid "keep downloaded pack"
7335 #: builtin/fetch.c:118
7336 msgid "allow updating of HEAD ref"
7337 msgstr "允许更新 HEAD 引用"
7339 #: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203
7340 msgid "deepen history of shallow clone"
7343 #: builtin/fetch.c:123
7344 msgid "deepen history of shallow repository based on time"
7345 msgstr "基于时间来深化浅克隆的历史"
7347 #: builtin/fetch.c:129 builtin/pull.c:206
7348 msgid "convert to a complete repository"
7351 #: builtin/fetch.c:131 builtin/log.c:1433
7355 #: builtin/fetch.c:132
7356 msgid "prepend this to submodule path output"
7357 msgstr "在子模组路径输出的前面加上此目录"
7359 #: builtin/fetch.c:135
7360 msgid "default mode for recursion"
7363 #: builtin/fetch.c:137 builtin/pull.c:209
7364 msgid "accept refs that update .git/shallow"
7365 msgstr "接受更新 .git/shallow 的引用"
7367 #: builtin/fetch.c:138 builtin/pull.c:211
7371 #: builtin/fetch.c:139 builtin/pull.c:212
7372 msgid "specify fetch refmap"
7373 msgstr "指定获取操作的引用映射"
7375 #: builtin/fetch.c:398
7376 msgid "Couldn't find remote ref HEAD"
7377 msgstr "无法发现远程 HEAD 引用"
7379 #: builtin/fetch.c:514
7381 msgid "configuration fetch.output contains invalid value %s"
7382 msgstr "配置变量 fetch.output 包含无效值 %s"
7384 #: builtin/fetch.c:607
7386 msgid "object %s not found"
7389 #: builtin/fetch.c:611
7390 msgid "[up to date]"
7393 #: builtin/fetch.c:624 builtin/fetch.c:704
7397 #: builtin/fetch.c:625
7398 msgid "can't fetch in current branch"
7399 msgstr "当前分支下不能执行获取操作"
7401 #: builtin/fetch.c:634
7402 msgid "[tag update]"
7405 #: builtin/fetch.c:635 builtin/fetch.c:668 builtin/fetch.c:684
7406 #: builtin/fetch.c:699
7407 msgid "unable to update local ref"
7410 #: builtin/fetch.c:654
7414 #: builtin/fetch.c:657
7415 msgid "[new branch]"
7418 #: builtin/fetch.c:660
7422 #: builtin/fetch.c:699
7423 msgid "forced update"
7426 #: builtin/fetch.c:704
7427 msgid "non-fast-forward"
7430 #: builtin/fetch.c:749
7432 msgid "%s did not send all necessary objects\n"
7433 msgstr "%s 未发送所有必须的对象\n"
7435 #: builtin/fetch.c:769
7437 msgid "reject %s because shallow roots are not allowed to be updated"
7438 msgstr "拒绝 %s 因为浅克隆不允许被更新"
7440 #: builtin/fetch.c:856 builtin/fetch.c:952
7445 #: builtin/fetch.c:867
7448 "some local refs could not be updated; try running\n"
7449 " 'git remote prune %s' to remove any old, conflicting branches"
7451 "一些本地引用不能被更新;尝试运行\n"
7452 " 'git remote prune %s' 来删除旧的、有冲突的分支"
7455 #: builtin/fetch.c:922
7457 msgid " (%s will become dangling)"
7458 msgstr " (%s 将成为摇摆状态)"
7461 #: builtin/fetch.c:923
7463 msgid " (%s has become dangling)"
7464 msgstr " (%s 已成为摇摆状态)"
7466 #: builtin/fetch.c:955
7470 #: builtin/fetch.c:956 builtin/remote.c:1020
7474 #: builtin/fetch.c:979
7476 msgid "Refusing to fetch into current branch %s of non-bare repository"
7477 msgstr "拒绝获取到非纯仓库的当前分支 %s"
7479 #: builtin/fetch.c:998
7481 msgid "Option \"%s\" value \"%s\" is not valid for %s"
7482 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
7484 #: builtin/fetch.c:1001
7486 msgid "Option \"%s\" is ignored for %s\n"
7487 msgstr "选项 \"%s\" 为 %s 所忽略\n"
7489 #: builtin/fetch.c:1077
7491 msgid "Don't know how to fetch from %s"
7492 msgstr "不知道如何从 %s 获取"
7494 #: builtin/fetch.c:1237
7496 msgid "Fetching %s\n"
7499 #: builtin/fetch.c:1239 builtin/remote.c:96
7501 msgid "Could not fetch %s"
7504 #: builtin/fetch.c:1257
7506 "No remote repository specified. Please, specify either a URL or a\n"
7507 "remote name from which new revisions should be fetched."
7508 msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。"
7510 #: builtin/fetch.c:1280
7511 msgid "You need to specify a tag name."
7512 msgstr "您需要指定一个标签名称。"
7514 #: builtin/fetch.c:1322
7515 msgid "Negative depth in --deepen is not supported"
7516 msgstr "--deepen 不支持负数深度"
7518 #: builtin/fetch.c:1324
7519 msgid "--deepen and --depth are mutually exclusive"
7520 msgstr "--deepen 和 --depth 是互斥的"
7522 #: builtin/fetch.c:1329
7523 msgid "--depth and --unshallow cannot be used together"
7524 msgstr "--depth 和 --unshallow 不能同时使用"
7526 #: builtin/fetch.c:1331
7527 msgid "--unshallow on a complete repository does not make sense"
7528 msgstr "对于一个完整的仓库,参数 --unshallow 没有意义"
7530 #: builtin/fetch.c:1353
7531 msgid "fetch --all does not take a repository argument"
7532 msgstr "fetch --all 不能带一个仓库参数"
7534 #: builtin/fetch.c:1355
7535 msgid "fetch --all does not make sense with refspecs"
7536 msgstr "fetch --all 带引用规格没有任何意义"
7538 #: builtin/fetch.c:1366
7540 msgid "No such remote or remote group: %s"
7541 msgstr "没有这样的远程或远程组:%s"
7543 #: builtin/fetch.c:1374
7544 msgid "Fetching a group and specifying refspecs does not make sense"
7545 msgstr "获取组并指定引用规格没有意义"
7547 #: builtin/fmt-merge-msg.c:14
7549 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
7550 msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
7552 #: builtin/fmt-merge-msg.c:663
7553 msgid "populate log with at most <n> entries from shortlog"
7554 msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
7556 #: builtin/fmt-merge-msg.c:666
7557 msgid "alias for --log (deprecated)"
7558 msgstr "参数 --log 的别名(已弃用)"
7560 #: builtin/fmt-merge-msg.c:669
7564 #: builtin/fmt-merge-msg.c:670
7565 msgid "use <text> as start of message"
7566 msgstr "使用 <文本> 作为提交说明的开始"
7568 #: builtin/fmt-merge-msg.c:671
7569 msgid "file to read from"
7572 #: builtin/for-each-ref.c:9
7573 msgid "git for-each-ref [<options>] [<pattern>]"
7574 msgstr "git for-each-ref [<选项>] [<模式>]"
7576 #: builtin/for-each-ref.c:10
7577 msgid "git for-each-ref [--points-at <object>]"
7578 msgstr "git for-each-ref [--points-at <对象>]"
7580 #: builtin/for-each-ref.c:11
7581 msgid "git for-each-ref [(--merged | --no-merged) [<object>]]"
7582 msgstr "git for-each-ref [(--merged | --no-merged) [<对象>]]"
7584 #: builtin/for-each-ref.c:12
7585 msgid "git for-each-ref [--contains [<object>]]"
7586 msgstr "git for-each-ref [--contains [<对象>]]"
7588 #: builtin/for-each-ref.c:27
7589 msgid "quote placeholders suitably for shells"
7590 msgstr "引用占位符适用于 shells"
7592 #: builtin/for-each-ref.c:29
7593 msgid "quote placeholders suitably for perl"
7594 msgstr "引用占位符适用于 perl"
7596 #: builtin/for-each-ref.c:31
7597 msgid "quote placeholders suitably for python"
7598 msgstr "引用占位符适用于 python"
7600 #: builtin/for-each-ref.c:33
7601 msgid "quote placeholders suitably for Tcl"
7602 msgstr "引用占位符适用于 Tcl"
7604 #: builtin/for-each-ref.c:36
7605 msgid "show only <n> matched refs"
7606 msgstr "只显示 <n> 个匹配的引用"
7608 #: builtin/for-each-ref.c:37 builtin/tag.c:372
7609 msgid "format to use for the output"
7612 #: builtin/for-each-ref.c:41
7613 msgid "print only refs which points at the given object"
7614 msgstr "只打印指向给定对象的引用"
7616 #: builtin/for-each-ref.c:43
7617 msgid "print only refs that are merged"
7620 #: builtin/for-each-ref.c:44
7621 msgid "print only refs that are not merged"
7624 #: builtin/for-each-ref.c:45
7625 msgid "print only refs which contain the commit"
7626 msgstr "只打印包含该提交的引用"
7628 #: builtin/fsck.c:519
7629 msgid "Checking object directories"
7632 #: builtin/fsck.c:588
7633 msgid "git fsck [<options>] [<object>...]"
7634 msgstr "git fsck [<选项>] [<对象>...]"
7636 #: builtin/fsck.c:594
7637 msgid "show unreachable objects"
7640 #: builtin/fsck.c:595
7641 msgid "show dangling objects"
7644 #: builtin/fsck.c:596
7648 #: builtin/fsck.c:597
7649 msgid "report root nodes"
7652 #: builtin/fsck.c:598
7653 msgid "make index objects head nodes"
7654 msgstr "将索引亦作为检查的头节点"
7656 #: builtin/fsck.c:599
7657 msgid "make reflogs head nodes (default)"
7658 msgstr "将引用日志作为检查的头节点(默认)"
7660 #: builtin/fsck.c:600
7661 msgid "also consider packs and alternate objects"
7664 #: builtin/fsck.c:601
7665 msgid "check only connectivity"
7668 #: builtin/fsck.c:602
7669 msgid "enable more strict checking"
7672 #: builtin/fsck.c:604
7673 msgid "write dangling objects in .git/lost-found"
7674 msgstr "将摇摆对象写入 .git/lost-found 中"
7676 #: builtin/fsck.c:605 builtin/prune.c:107
7677 msgid "show progress"
7680 #: builtin/fsck.c:606
7681 msgid "show verbose names for reachable objects"
7682 msgstr "显示可达对象的详细名称"
7684 #: builtin/fsck.c:665
7685 msgid "Checking objects"
7689 msgid "git gc [<options>]"
7690 msgstr "git gc [<选项>]"
7694 msgid "Invalid %s: '%s'"
7699 msgid "insanely long object directory %.*s"
7700 msgstr "不正常的长对象目录 %.*s"
7705 "The last gc run reported the following. Please correct the root cause\n"
7707 "Automatic cleanup will not be performed until the file is removed.\n"
7711 "最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n"
7712 "在该文件被删除之前,自动清理将不会执行。\n"
7717 msgid "prune unreferenced objects"
7721 msgid "be more thorough (increased runtime)"
7722 msgstr "更彻底(增加运行时间)"
7725 msgid "enable auto-gc mode"
7729 msgid "force running gc even if there may be another gc running"
7730 msgstr "强制执行 gc 即使另外一个 gc 正在执行"
7734 msgid "Auto packing the repository in background for optimum performance.\n"
7735 msgstr "自动在后台执行仓库打包以求最佳性能。\n"
7739 msgid "Auto packing the repository for optimum performance.\n"
7740 msgstr "自动打包仓库以求最佳性能。\n"
7744 msgid "See \"git help gc\" for manual housekeeping.\n"
7745 msgstr "手工维护参见 \"git help gc\"。\n"
7750 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
7752 "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> (如果不是,使用 --force)"
7756 "There are too many unreachable loose objects; run 'git prune' to remove them."
7757 msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
7759 #: builtin/grep.c:23
7760 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
7761 msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
7763 #: builtin/grep.c:219
7765 msgid "grep: failed to create thread: %s"
7766 msgstr "grep:无法创建线程:%s"
7768 #: builtin/grep.c:277
7770 msgid "invalid number of threads specified (%d) for %s"
7771 msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
7773 #: builtin/grep.c:453 builtin/grep.c:488
7775 msgid "unable to read tree (%s)"
7778 #: builtin/grep.c:503
7780 msgid "unable to grep from object of type %s"
7781 msgstr "无法抓取来自于 %s 类型的对象"
7783 #: builtin/grep.c:561
7785 msgid "switch `%c' expects a numerical value"
7786 msgstr "开关 `%c' 期望一个数字值"
7788 #: builtin/grep.c:647
7789 msgid "search in index instead of in the work tree"
7790 msgstr "在索引区搜索而不是在工作区"
7792 #: builtin/grep.c:649
7793 msgid "find in contents not managed by git"
7794 msgstr "在未被 git 管理的内容中查找"
7796 # 译者:中文字符串拼接,可删除前导空格
7797 #: builtin/grep.c:651
7798 msgid "search in both tracked and untracked files"
7799 msgstr "在跟踪和未跟踪的文件中搜索"
7801 #: builtin/grep.c:653
7802 msgid "ignore files specified via '.gitignore'"
7803 msgstr "忽略 '.gitignore' 包含的文件"
7805 #: builtin/grep.c:656
7806 msgid "show non-matching lines"
7809 #: builtin/grep.c:658
7810 msgid "case insensitive matching"
7813 #: builtin/grep.c:660
7814 msgid "match patterns only at word boundaries"
7817 #: builtin/grep.c:662
7818 msgid "process binary files as text"
7819 msgstr "把二进制文件当做文本处理"
7821 #: builtin/grep.c:664
7822 msgid "don't match patterns in binary files"
7823 msgstr "不在二进制文件中匹配模式"
7825 #: builtin/grep.c:667
7826 msgid "process binary files with textconv filters"
7827 msgstr "用 textconv 过滤器处理二进制文件"
7829 #: builtin/grep.c:669
7830 msgid "descend at most <depth> levels"
7831 msgstr "最多以指定的深度向下寻找"
7833 #: builtin/grep.c:673
7834 msgid "use extended POSIX regular expressions"
7835 msgstr "使用扩展的 POSIX 正则表达式"
7837 #: builtin/grep.c:676
7838 msgid "use basic POSIX regular expressions (default)"
7839 msgstr "使用基本的 POSIX 正则表达式(默认)"
7841 #: builtin/grep.c:679
7842 msgid "interpret patterns as fixed strings"
7843 msgstr "把模式解析为固定的字符串"
7845 #: builtin/grep.c:682
7846 msgid "use Perl-compatible regular expressions"
7847 msgstr "使用 Perl 兼容的正则表达式"
7849 #: builtin/grep.c:685
7850 msgid "show line numbers"
7853 #: builtin/grep.c:686
7854 msgid "don't show filenames"
7857 #: builtin/grep.c:687
7858 msgid "show filenames"
7861 #: builtin/grep.c:689
7862 msgid "show filenames relative to top directory"
7863 msgstr "显示相对于顶级目录的文件名"
7865 #: builtin/grep.c:691
7866 msgid "show only filenames instead of matching lines"
7867 msgstr "只显示文件名而不显示匹配的行"
7869 #: builtin/grep.c:693
7870 msgid "synonym for --files-with-matches"
7871 msgstr "和 --files-with-matches 同义"
7873 #: builtin/grep.c:696
7874 msgid "show only the names of files without match"
7877 #: builtin/grep.c:698
7878 msgid "print NUL after filenames"
7879 msgstr "在文件名后输出 NUL 字符"
7881 #: builtin/grep.c:700
7882 msgid "show the number of matches instead of matching lines"
7883 msgstr "显示总匹配行数,而不显示匹配的行"
7885 #: builtin/grep.c:701
7886 msgid "highlight matches"
7889 #: builtin/grep.c:703
7890 msgid "print empty line between matches from different files"
7891 msgstr "在不同文件的匹配项之间打印空行"
7893 #: builtin/grep.c:705
7894 msgid "show filename only once above matches from same file"
7895 msgstr "只在同一文件的匹配项的上面显示一次文件名"
7897 #: builtin/grep.c:708
7898 msgid "show <n> context lines before and after matches"
7899 msgstr "显示匹配项前后的 <n> 行上下文"
7901 #: builtin/grep.c:711
7902 msgid "show <n> context lines before matches"
7903 msgstr "显示匹配项前 <n> 行上下文"
7905 #: builtin/grep.c:713
7906 msgid "show <n> context lines after matches"
7907 msgstr "显示匹配项后 <n> 行上下文"
7909 #: builtin/grep.c:715
7910 msgid "use <n> worker threads"
7911 msgstr "使用 <n> 个工作线程"
7913 #: builtin/grep.c:716
7914 msgid "shortcut for -C NUM"
7917 #: builtin/grep.c:719
7918 msgid "show a line with the function name before matches"
7919 msgstr "在匹配的前面显示一行函数名"
7921 #: builtin/grep.c:721
7922 msgid "show the surrounding function"
7923 msgstr "显示所在函数的前后内容"
7925 #: builtin/grep.c:724
7926 msgid "read patterns from file"
7929 #: builtin/grep.c:726
7930 msgid "match <pattern>"
7933 #: builtin/grep.c:728
7934 msgid "combine patterns specified with -e"
7935 msgstr "组合用 -e 参数设定的模式"
7937 #: builtin/grep.c:740
7938 msgid "indicate hit with exit status without output"
7939 msgstr "不输出,而用退出码标识命中状态"
7941 #: builtin/grep.c:742
7942 msgid "show only matches from files that match all patterns"
7943 msgstr "只显示匹配所有模式的文件中的匹配"
7945 #: builtin/grep.c:744
7946 msgid "show parse tree for grep expression"
7947 msgstr "显示 grep 表达式的解析树"
7949 #: builtin/grep.c:748
7953 #: builtin/grep.c:748
7954 msgid "show matching files in the pager"
7957 #: builtin/grep.c:751
7958 msgid "allow calling of grep(1) (ignored by this build)"
7959 msgstr "允许调用 grep(1)(本次构建忽略)"
7961 #: builtin/grep.c:814
7962 msgid "no pattern given."
7965 #: builtin/grep.c:846 builtin/index-pack.c:1480
7967 msgid "invalid number of threads specified (%d)"
7968 msgstr "指定的线程数无效(%d)"
7970 #: builtin/grep.c:876
7971 msgid "--open-files-in-pager only works on the worktree"
7972 msgstr "--open-files-in-pager 仅用于工作区"
7974 #: builtin/grep.c:902
7975 msgid "--cached or --untracked cannot be used with --no-index."
7976 msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
7978 #: builtin/grep.c:907
7979 msgid "--no-index or --untracked cannot be used with revs."
7980 msgstr "--no-index 或 --untracked 不能和版本同时使用。"
7982 #: builtin/grep.c:910
7983 msgid "--[no-]exclude-standard cannot be used for tracked contents."
7984 msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
7986 #: builtin/grep.c:918
7987 msgid "both --cached and trees are given."
7988 msgstr "同时给出了 --cached 和树对象。"
7990 #: builtin/hash-object.c:81
7992 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
7995 "git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
7998 #: builtin/hash-object.c:82
7999 msgid "git hash-object --stdin-paths"
8000 msgstr "git hash-object --stdin-paths"
8002 #: builtin/hash-object.c:94
8006 #: builtin/hash-object.c:94
8010 #: builtin/hash-object.c:95
8011 msgid "write the object into the object database"
8014 #: builtin/hash-object.c:97
8015 msgid "read the object from stdin"
8018 #: builtin/hash-object.c:99
8019 msgid "store file as is without filters"
8020 msgstr "原样存储文件不使用过滤器"
8022 #: builtin/hash-object.c:100
8024 "just hash any random garbage to create corrupt objects for debugging Git"
8025 msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
8027 #: builtin/hash-object.c:101
8028 msgid "process file as it were from this path"
8029 msgstr "处理文件并假设其来自于此路径"
8031 #: builtin/help.c:42
8032 msgid "print all available commands"
8035 #: builtin/help.c:43
8036 msgid "exclude guides"
8039 #: builtin/help.c:44
8040 msgid "print list of useful guides"
8043 #: builtin/help.c:45
8044 msgid "show man page"
8047 #: builtin/help.c:46
8048 msgid "show manual in web browser"
8049 msgstr "在 web 浏览器中显示手册"
8051 #: builtin/help.c:48
8052 msgid "show info page"
8055 #: builtin/help.c:54
8056 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
8057 msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
8059 #: builtin/help.c:66
8061 msgid "unrecognized help format '%s'"
8062 msgstr "未能识别的帮助格式 '%s'"
8064 #: builtin/help.c:93
8065 msgid "Failed to start emacsclient."
8066 msgstr "无法启动 emacsclient。"
8068 #: builtin/help.c:106
8069 msgid "Failed to parse emacsclient version."
8070 msgstr "无法解析 emacsclient 版本。"
8072 #: builtin/help.c:114
8074 msgid "emacsclient version '%d' too old (< 22)."
8075 msgstr "emacsclient 版本 '%d' 太老(< 22)。"
8077 #: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170
8079 msgid "failed to exec '%s'"
8082 #: builtin/help.c:207
8085 "'%s': path for unsupported man viewer.\n"
8086 "Please consider using 'man.<tool>.cmd' instead."
8088 "'%s':不支持的 man 手册查看器的路径。\n"
8089 "请使用 'man.<工具>.cmd'。"
8091 #: builtin/help.c:219
8094 "'%s': cmd for supported man viewer.\n"
8095 "Please consider using 'man.<tool>.path' instead."
8097 "'%s': 支持的 man 手册查看器命令。\n"
8098 "请使用 'man.<工具>.path'。"
8100 #: builtin/help.c:336
8102 msgid "'%s': unknown man viewer."
8103 msgstr "'%s':未知的 man 查看器。"
8105 #: builtin/help.c:353
8106 msgid "no man viewer handled the request"
8107 msgstr "没有 man 查看器处理此请求"
8109 #: builtin/help.c:361
8110 msgid "no info viewer handled the request"
8111 msgstr "没有 info 查看器处理此请求"
8113 #: builtin/help.c:403
8114 msgid "Defining attributes per path"
8117 #: builtin/help.c:404
8118 msgid "Everyday Git With 20 Commands Or So"
8119 msgstr "每一天 Git 常用的约 20 条命令"
8121 #: builtin/help.c:405
8122 msgid "A Git glossary"
8125 #: builtin/help.c:406
8126 msgid "Specifies intentionally untracked files to ignore"
8129 #: builtin/help.c:407
8130 msgid "Defining submodule properties"
8133 #: builtin/help.c:408
8134 msgid "Specifying revisions and ranges for Git"
8135 msgstr "指定 Git 的版本和版本范围"
8137 #: builtin/help.c:409
8138 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
8139 msgstr "一个 Git 教程(针对 1.5.1 或更新版本)"
8141 #: builtin/help.c:410
8142 msgid "An overview of recommended workflows with Git"
8143 msgstr "Git 推荐的工作流概览"
8145 #: builtin/help.c:422
8146 msgid "The common Git guides are:\n"
8147 msgstr "最常用的 Git 向导有:\n"
8149 #: builtin/help.c:440
8151 msgid "`git %s' is aliased to `%s'"
8152 msgstr "`git %s' 是 `%s' 的别名"
8154 #: builtin/help.c:462 builtin/help.c:479
8159 #: builtin/index-pack.c:154
8161 msgid "unable to open %s"
8164 #: builtin/index-pack.c:204
8166 msgid "object type mismatch at %s"
8167 msgstr "%s 的对象类型不匹配"
8169 #: builtin/index-pack.c:224
8171 msgid "did not receive expected object %s"
8172 msgstr "未能获取预期的对象 %s"
8174 #: builtin/index-pack.c:227
8176 msgid "object %s: expected type %s, found %s"
8177 msgstr "对象 %s:应为类型 %s,却是 %s"
8179 #: builtin/index-pack.c:269
8181 msgid "cannot fill %d byte"
8182 msgid_plural "cannot fill %d bytes"
8183 msgstr[0] "无法填充 %d 字节"
8184 msgstr[1] "无法填充 %d 字节"
8186 #: builtin/index-pack.c:279
8188 msgstr "过早的文件结束符(EOF)"
8190 #: builtin/index-pack.c:280
8191 msgid "read error on input"
8194 #: builtin/index-pack.c:292
8195 msgid "used more bytes than were available"
8198 #: builtin/index-pack.c:299
8199 msgid "pack too large for current definition of off_t"
8200 msgstr "包太大超过了当前 off_t 的定义"
8202 #: builtin/index-pack.c:302 builtin/unpack-objects.c:92
8203 msgid "pack exceeds maximum allowed size"
8206 #: builtin/index-pack.c:317
8208 msgid "unable to create '%s'"
8211 #: builtin/index-pack.c:322
8213 msgid "cannot open packfile '%s'"
8214 msgstr "无法打开包文件 '%s'"
8216 #: builtin/index-pack.c:336
8217 msgid "pack signature mismatch"
8220 #: builtin/index-pack.c:338
8222 msgid "pack version %<PRIu32> unsupported"
8223 msgstr "不支持包版本 %<PRIu32>"
8225 #: builtin/index-pack.c:356
8227 msgid "pack has bad object at offset %<PRIuMAX>: %s"
8228 msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>:%s"
8230 #: builtin/index-pack.c:478
8232 msgid "inflate returned %d"
8235 #: builtin/index-pack.c:527
8236 msgid "offset value overflow for delta base object"
8237 msgstr "偏移值覆盖了 delta 基准对象"
8239 #: builtin/index-pack.c:535
8240 msgid "delta base offset is out of bound"
8241 msgstr "delta 基准偏移越界"
8243 #: builtin/index-pack.c:543
8245 msgid "unknown object type %d"
8248 #: builtin/index-pack.c:574
8249 msgid "cannot pread pack file"
8252 #: builtin/index-pack.c:576
8254 msgid "premature end of pack file, %<PRIuMAX> byte missing"
8255 msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
8256 msgstr[0] "包文件过早结束,缺少 %<PRIuMAX> 字节"
8257 msgstr[1] "包文件过早结束,缺少 %<PRIuMAX> 字节"
8259 #: builtin/index-pack.c:602
8260 msgid "serious inflate inconsistency"
8263 #: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
8264 #: builtin/index-pack.c:811 builtin/index-pack.c:820
8266 msgid "SHA1 COLLISION FOUND WITH %s !"
8267 msgstr "发现 %s 出现 SHA1 冲突!"
8269 #: builtin/index-pack.c:751 builtin/pack-objects.c:166
8270 #: builtin/pack-objects.c:258
8272 msgid "unable to read %s"
8275 #: builtin/index-pack.c:817
8277 msgid "cannot read existing object %s"
8278 msgstr "不能读取现存对象 %s"
8280 #: builtin/index-pack.c:831
8282 msgid "invalid blob object %s"
8285 #: builtin/index-pack.c:845
8290 #: builtin/index-pack.c:848
8291 msgid "Error in object"
8294 #: builtin/index-pack.c:850
8296 msgid "Not all child objects of %s are reachable"
8297 msgstr "%s 的所有子对象并非都可达"
8299 #: builtin/index-pack.c:922 builtin/index-pack.c:953
8300 msgid "failed to apply delta"
8303 #: builtin/index-pack.c:1123
8304 msgid "Receiving objects"
8307 #: builtin/index-pack.c:1123
8308 msgid "Indexing objects"
8311 #: builtin/index-pack.c:1155
8312 msgid "pack is corrupted (SHA1 mismatch)"
8313 msgstr "包冲突(SHA1 不匹配)"
8315 #: builtin/index-pack.c:1160
8316 msgid "cannot fstat packfile"
8319 #: builtin/index-pack.c:1163
8320 msgid "pack has junk at the end"
8323 #: builtin/index-pack.c:1174
8324 msgid "confusion beyond insanity in parse_pack_objects()"
8325 msgstr "parse_pack_objects() 中遇到不可理喻的问题"
8327 #: builtin/index-pack.c:1197
8328 msgid "Resolving deltas"
8331 #: builtin/index-pack.c:1208
8333 msgid "unable to create thread: %s"
8336 #: builtin/index-pack.c:1250
8337 msgid "confusion beyond insanity"
8340 #: builtin/index-pack.c:1256
8342 msgid "completed with %d local object"
8343 msgid_plural "completed with %d local objects"
8344 msgstr[0] "完成 %d 个本地对象"
8345 msgstr[1] "完成 %d 个本地对象"
8347 #: builtin/index-pack.c:1268
8349 msgid "Unexpected tail checksum for %s (disk corruption?)"
8350 msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
8352 #: builtin/index-pack.c:1272
8354 msgid "pack has %d unresolved delta"
8355 msgid_plural "pack has %d unresolved deltas"
8356 msgstr[0] "包有 %d 个未解决的 delta"
8357 msgstr[1] "包有 %d 个未解决的 delta"
8359 #: builtin/index-pack.c:1296
8361 msgid "unable to deflate appended object (%d)"
8362 msgstr "不能压缩附加对象(%d)"
8364 #: builtin/index-pack.c:1372
8366 msgid "local object %s is corrupt"
8367 msgstr "本地对象 %s 已损坏"
8369 #: builtin/index-pack.c:1396
8370 msgid "error while closing pack file"
8373 #: builtin/index-pack.c:1409
8375 msgid "cannot write keep file '%s'"
8376 msgstr "无法写保留文件 '%s'"
8378 #: builtin/index-pack.c:1417
8380 msgid "cannot close written keep file '%s'"
8381 msgstr "无法关闭保留文件 '%s'"
8383 #: builtin/index-pack.c:1430
8384 msgid "cannot store pack file"
8387 #: builtin/index-pack.c:1441
8388 msgid "cannot store index file"
8391 #: builtin/index-pack.c:1474
8393 msgid "bad pack.indexversion=%<PRIu32>"
8394 msgstr "坏的 pack.indexversion=%<PRIu32>"
8396 #: builtin/index-pack.c:1484 builtin/index-pack.c:1681
8398 msgid "no threads support, ignoring %s"
8399 msgstr "没有线程支持,忽略 %s"
8401 #: builtin/index-pack.c:1542
8403 msgid "Cannot open existing pack file '%s'"
8404 msgstr "无法打开现存包文件 '%s'"
8406 #: builtin/index-pack.c:1544
8408 msgid "Cannot open existing pack idx file for '%s'"
8409 msgstr "无法为 %s 打开包索引文件"
8411 #: builtin/index-pack.c:1591
8413 msgid "non delta: %d object"
8414 msgid_plural "non delta: %d objects"
8415 msgstr[0] "非 delta:%d 个对象"
8416 msgstr[1] "非 delta:%d 个对象"
8418 #: builtin/index-pack.c:1598
8420 msgid "chain length = %d: %lu object"
8421 msgid_plural "chain length = %d: %lu objects"
8422 msgstr[0] "链长 = %d: %lu 对象"
8423 msgstr[1] "链长 = %d: %lu 对象"
8425 #: builtin/index-pack.c:1611
8427 msgid "packfile name '%s' does not end with '.pack'"
8428 msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
8430 #: builtin/index-pack.c:1693 builtin/index-pack.c:1696
8431 #: builtin/index-pack.c:1712 builtin/index-pack.c:1716
8436 #: builtin/index-pack.c:1732
8437 msgid "--fix-thin cannot be used without --stdin"
8438 msgstr "--fix-thin 不能和 --stdin 同时使用"
8440 #: builtin/index-pack.c:1740
8441 msgid "--verify with no packfile name given"
8442 msgstr "--verify 没有提供包文件名参数"
8444 #: builtin/init-db.c:54
8446 msgid "cannot stat '%s'"
8447 msgstr "不能枚举 '%s' 状态"
8449 #: builtin/init-db.c:60
8451 msgid "cannot stat template '%s'"
8452 msgstr "不能枚举模版 '%s' 状态"
8454 #: builtin/init-db.c:65
8456 msgid "cannot opendir '%s'"
8457 msgstr "不能打开目录 '%s'"
8459 #: builtin/init-db.c:76
8461 msgid "cannot readlink '%s'"
8462 msgstr "不能读取链接 '%s'"
8464 #: builtin/init-db.c:78
8466 msgid "cannot symlink '%s' '%s'"
8467 msgstr "不能自 '%s' 到 '%s' 创建符号链接"
8469 #: builtin/init-db.c:84
8471 msgid "cannot copy '%s' to '%s'"
8472 msgstr "不能拷贝 '%s' 至 '%s'"
8474 #: builtin/init-db.c:88
8476 msgid "ignoring template %s"
8479 #: builtin/init-db.c:119
8481 msgid "templates not found %s"
8484 #: builtin/init-db.c:134
8486 msgid "not copying templates from '%s': %s"
8487 msgstr "没有从 '%s' 复制模版:%s"
8489 #: builtin/init-db.c:327
8491 msgid "unable to handle file type %d"
8492 msgstr "不能处理 %d 类型的文件"
8494 #: builtin/init-db.c:330
8496 msgid "unable to move %s to %s"
8497 msgstr "不能移动 %s 至 %s"
8499 #: builtin/init-db.c:347 builtin/init-db.c:350
8501 msgid "%s already exists"
8504 #: builtin/init-db.c:403
8506 msgid "Reinitialized existing shared Git repository in %s%s\n"
8507 msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n"
8509 #: builtin/init-db.c:404
8511 msgid "Reinitialized existing Git repository in %s%s\n"
8512 msgstr "重新初始化已存在的 Git 仓库于 %s%s\n"
8514 #: builtin/init-db.c:408
8516 msgid "Initialized empty shared Git repository in %s%s\n"
8517 msgstr "已初始化空的共享 Git 仓库于 %s%s\n"
8519 #: builtin/init-db.c:409
8521 msgid "Initialized empty Git repository in %s%s\n"
8522 msgstr "已初始化空的 Git 仓库于 %s%s\n"
8524 #: builtin/init-db.c:457
8526 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
8527 "shared[=<permissions>]] [<directory>]"
8529 "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
8532 #: builtin/init-db.c:480
8536 #: builtin/init-db.c:481
8537 msgid "specify that the git repository is to be shared amongst several users"
8538 msgstr "指定 git 仓库是多个用户之间共享的"
8540 #: builtin/init-db.c:515 builtin/init-db.c:520
8542 msgid "cannot mkdir %s"
8545 #: builtin/init-db.c:524
8547 msgid "cannot chdir to %s"
8550 #: builtin/init-db.c:545
8553 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
8555 msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)"
8557 #: builtin/init-db.c:573
8559 msgid "Cannot access work tree '%s'"
8560 msgstr "不能访问工作区 '%s'"
8562 #: builtin/interpret-trailers.c:15
8564 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
8565 "<token>[(=|:)<value>])...] [<file>...]"
8567 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值"
8570 #: builtin/interpret-trailers.c:26
8571 msgid "edit files in place"
8574 #: builtin/interpret-trailers.c:27
8575 msgid "trim empty trailers"
8578 #: builtin/interpret-trailers.c:28
8582 #: builtin/interpret-trailers.c:29
8583 msgid "trailer(s) to add"
8586 #: builtin/interpret-trailers.c:42
8587 msgid "no input file given for in-place editing"
8588 msgstr "没有给出要原位编辑的文件"
8591 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
8592 msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
8595 msgid "git show [<options>] <object>..."
8596 msgstr "git show [<选项>] <对象>..."
8600 msgid "invalid --decorate option: %s"
8601 msgstr "无效的 --decorate 选项:%s"
8603 #: builtin/log.c:139
8604 msgid "suppress diff output"
8607 #: builtin/log.c:140
8611 #: builtin/log.c:141
8612 msgid "Use mail map file"
8615 #: builtin/log.c:142
8616 msgid "decorate options"
8619 #: builtin/log.c:145
8620 msgid "Process line range n,m in file, counting from 1"
8621 msgstr "处理文件中第 n 到 m 之间的行,从 1 开始"
8623 #: builtin/log.c:241
8625 msgid "Final output: %d %s\n"
8626 msgstr "最终输出:%d %s\n"
8628 #: builtin/log.c:486
8630 msgid "git show %s: bad file"
8631 msgstr "git show %s: 损坏的文件"
8633 #: builtin/log.c:500 builtin/log.c:594
8635 msgid "Could not read object %s"
8638 #: builtin/log.c:618
8640 msgid "Unknown type: %d"
8643 #: builtin/log.c:739
8644 msgid "format.headers without value"
8645 msgstr "format.headers 没有值"
8647 #: builtin/log.c:839
8648 msgid "name of output directory is too long"
8651 #: builtin/log.c:854
8653 msgid "Cannot open patch file %s"
8654 msgstr "无法打开补丁文件 %s"
8656 #: builtin/log.c:868
8657 msgid "Need exactly one range."
8660 #: builtin/log.c:878
8661 msgid "Not a range."
8664 #: builtin/log.c:984
8665 msgid "Cover letter needs email format"
8668 #: builtin/log.c:1063
8670 msgid "insane in-reply-to: %s"
8671 msgstr "不正常的 in-reply-to:%s"
8673 #: builtin/log.c:1091
8674 msgid "git format-patch [<options>] [<since> | <revision-range>]"
8675 msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
8677 #: builtin/log.c:1141
8678 msgid "Two output directories?"
8681 #: builtin/log.c:1248 builtin/log.c:1891 builtin/log.c:1893 builtin/log.c:1905
8683 msgid "Unknown commit %s"
8686 #: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:455
8688 msgid "Failed to resolve '%s' as a valid ref."
8689 msgstr "无法解析 '%s' 为一个有效引用。"
8691 #: builtin/log.c:1263
8692 msgid "Could not find exact merge base."
8693 msgstr "不能找到准确的合并基线。"
8695 #: builtin/log.c:1267
8697 "Failed to get upstream, if you want to record base commit automatically,\n"
8698 "please use git branch --set-upstream-to to track a remote branch.\n"
8699 "Or you could specify base commit by --base=<base-commit-id> manually."
8701 "无法得到上游地址,如果你想自动记录基线提交,请使用命令\n"
8702 "git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n"
8703 "参数 --base=<base-commit-id> 手动指定一个基线提交。"
8705 #: builtin/log.c:1287
8706 msgid "Failed to find exact merge base"
8707 msgstr "无法找到准确的合并基线"
8709 #: builtin/log.c:1298
8710 msgid "base commit should be the ancestor of revision list"
8711 msgstr "基线提交应该是版本列表的祖先"
8713 #: builtin/log.c:1302
8714 msgid "base commit shouldn't be in revision list"
8715 msgstr "基线提交不应该出现在版本列表中"
8717 #: builtin/log.c:1351
8718 msgid "cannot get patch id"
8721 #: builtin/log.c:1408
8722 msgid "use [PATCH n/m] even with a single patch"
8723 msgstr "使用 [PATCH n/m],即使只有一个补丁"
8725 #: builtin/log.c:1411
8726 msgid "use [PATCH] even with multiple patches"
8727 msgstr "使用 [PATCH],即使有多个补丁"
8729 #: builtin/log.c:1415
8730 msgid "print patches to standard out"
8733 #: builtin/log.c:1417
8734 msgid "generate a cover letter"
8737 #: builtin/log.c:1419
8738 msgid "use simple number sequence for output file names"
8739 msgstr "使用简单的数字序列作为输出文件名"
8741 #: builtin/log.c:1420
8745 #: builtin/log.c:1421
8746 msgid "use <sfx> instead of '.patch'"
8747 msgstr "使用 <后缀> 代替 '.patch'"
8749 #: builtin/log.c:1423
8750 msgid "start numbering patches at <n> instead of 1"
8751 msgstr "补丁以 <n> 开始编号,而不是1"
8753 #: builtin/log.c:1425
8754 msgid "mark the series as Nth re-roll"
8755 msgstr "标记补丁系列是第几次重制"
8757 #: builtin/log.c:1427
8758 msgid "Use [RFC PATCH] instead of [PATCH]"
8759 msgstr "使用 [RFC PATCH] 代替 [PATCH]"
8761 #: builtin/log.c:1430
8762 msgid "Use [<prefix>] instead of [PATCH]"
8763 msgstr "使用 [<前缀>] 代替 [PATCH]"
8765 #: builtin/log.c:1433
8766 msgid "store resulting files in <dir>"
8767 msgstr "把结果文件存储在 <目录>"
8769 #: builtin/log.c:1436
8770 msgid "don't strip/add [PATCH]"
8771 msgstr "不删除/添加 [PATCH]"
8773 #: builtin/log.c:1439
8774 msgid "don't output binary diffs"
8777 #: builtin/log.c:1441
8778 msgid "output all-zero hash in From header"
8779 msgstr "在 From 头信息中输出全为零的哈希值"
8781 #: builtin/log.c:1443
8782 msgid "don't include a patch matching a commit upstream"
8783 msgstr "不包含已在上游提交中的补丁"
8785 #: builtin/log.c:1445
8786 msgid "show patch format instead of default (patch + stat)"
8787 msgstr "显示纯补丁格式而非默认的(补丁+状态)"
8789 #: builtin/log.c:1447
8793 #: builtin/log.c:1448
8797 #: builtin/log.c:1449
8798 msgid "add email header"
8801 #: builtin/log.c:1450 builtin/log.c:1452
8805 #: builtin/log.c:1450
8806 msgid "add To: header"
8809 #: builtin/log.c:1452
8810 msgid "add Cc: header"
8813 #: builtin/log.c:1454
8817 #: builtin/log.c:1455
8818 msgid "set From address to <ident> (or committer ident if absent)"
8819 msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)"
8821 #: builtin/log.c:1457
8825 #: builtin/log.c:1458
8826 msgid "make first mail a reply to <message-id>"
8827 msgstr "使第一封邮件作为对 <邮件标识> 的回复"
8829 #: builtin/log.c:1459 builtin/log.c:1462
8833 #: builtin/log.c:1460
8834 msgid "attach the patch"
8837 #: builtin/log.c:1463
8838 msgid "inline the patch"
8841 #: builtin/log.c:1467
8842 msgid "enable message threading, styles: shallow, deep"
8843 msgstr "启用邮件线索,风格:浅,深"
8845 #: builtin/log.c:1469
8849 #: builtin/log.c:1470
8850 msgid "add a signature"
8853 #: builtin/log.c:1471
8857 #: builtin/log.c:1472
8858 msgid "add prerequisite tree info to the patch series"
8859 msgstr "为补丁列表添加前置树信息"
8861 #: builtin/log.c:1474
8862 msgid "add a signature from a file"
8865 #: builtin/log.c:1475
8866 msgid "don't print the patch filenames"
8869 #: builtin/log.c:1565
8870 msgid "-n and -k are mutually exclusive."
8871 msgstr "-n 和 -k 互斥。"
8873 #: builtin/log.c:1567
8874 msgid "--subject-prefix/--rfc and -k are mutually exclusive."
8875 msgstr "--subject-prefix/--rfc 和 -k 互斥。"
8877 #: builtin/log.c:1575
8878 msgid "--name-only does not make sense"
8879 msgstr "--name-only 无意义"
8881 #: builtin/log.c:1577
8882 msgid "--name-status does not make sense"
8883 msgstr "--name-status 无意义"
8885 #: builtin/log.c:1579
8886 msgid "--check does not make sense"
8887 msgstr "--check 无意义"
8889 #: builtin/log.c:1609
8890 msgid "standard output, or directory, which one?"
8891 msgstr "标准输出或目录,哪一个?"
8893 #: builtin/log.c:1611
8895 msgid "Could not create directory '%s'"
8896 msgstr "不能创建目录 '%s'"
8898 #: builtin/log.c:1705
8900 msgid "unable to read signature file '%s'"
8901 msgstr "无法读取签名文件 '%s'"
8903 #: builtin/log.c:1777
8904 msgid "Failed to create output files"
8907 #: builtin/log.c:1826
8908 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
8909 msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
8911 #: builtin/log.c:1880
8914 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
8915 msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n"
8917 #: builtin/ls-files.c:458
8918 msgid "git ls-files [<options>] [<file>...]"
8919 msgstr "git ls-files [<选项>] [<文件>...]"
8921 #: builtin/ls-files.c:507
8922 msgid "identify the file status with tags"
8925 #: builtin/ls-files.c:509
8926 msgid "use lowercase letters for 'assume unchanged' files"
8927 msgstr "使用小写字母表示 '假设未改变的' 文件"
8929 #: builtin/ls-files.c:511
8930 msgid "show cached files in the output (default)"
8931 msgstr "显示缓存的文件(默认)"
8933 #: builtin/ls-files.c:513
8934 msgid "show deleted files in the output"
8937 #: builtin/ls-files.c:515
8938 msgid "show modified files in the output"
8941 #: builtin/ls-files.c:517
8942 msgid "show other files in the output"
8945 #: builtin/ls-files.c:519
8946 msgid "show ignored files in the output"
8949 #: builtin/ls-files.c:522
8950 msgid "show staged contents' object name in the output"
8951 msgstr "显示暂存区内容的对象名称"
8953 #: builtin/ls-files.c:524
8954 msgid "show files on the filesystem that need to be removed"
8955 msgstr "显示文件系统需要删除的文件"
8957 #: builtin/ls-files.c:526
8958 msgid "show 'other' directories' names only"
8959 msgstr "只显示“其他”目录的名称"
8961 #: builtin/ls-files.c:528
8962 msgid "show line endings of files"
8965 #: builtin/ls-files.c:530
8966 msgid "don't show empty directories"
8969 #: builtin/ls-files.c:533
8970 msgid "show unmerged files in the output"
8973 #: builtin/ls-files.c:535
8974 msgid "show resolve-undo information"
8975 msgstr "显示 resolve-undo 信息"
8977 #: builtin/ls-files.c:537
8978 msgid "skip files matching pattern"
8981 #: builtin/ls-files.c:540
8982 msgid "exclude patterns are read from <file>"
8983 msgstr "从 <文件> 中读取排除模式"
8985 #: builtin/ls-files.c:543
8986 msgid "read additional per-directory exclude patterns in <file>"
8987 msgstr "从 <文件> 读取额外的每个目录的排除模式"
8989 #: builtin/ls-files.c:545
8990 msgid "add the standard git exclusions"
8991 msgstr "添加标准的 git 排除"
8993 #: builtin/ls-files.c:548
8994 msgid "make the output relative to the project top directory"
8995 msgstr "显示相对于顶级目录的文件名"
8997 #: builtin/ls-files.c:551
8998 msgid "recurse through submodules"
9001 #: builtin/ls-files.c:553
9002 msgid "if any <file> is not in the index, treat this as an error"
9003 msgstr "如果任何 <文件> 都不在索引区,视为错误"
9005 #: builtin/ls-files.c:554
9009 #: builtin/ls-files.c:555
9010 msgid "pretend that paths removed since <tree-ish> are still present"
9011 msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
9013 #: builtin/ls-files.c:557
9014 msgid "show debugging data"
9017 #: builtin/ls-remote.c:7
9019 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
9020 " [-q | --quiet] [--exit-code] [--get-url]\n"
9021 " [--symref] [<repository> [<refs>...]]"
9023 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
9024 " [-q | --quiet] [--exit-code] [--get-url]\n"
9025 " [--symref] [<仓库> [<引用>...]]"
9027 #: builtin/ls-remote.c:50
9028 msgid "do not print remote URL"
9031 #: builtin/ls-remote.c:51 builtin/ls-remote.c:53
9035 #: builtin/ls-remote.c:52 builtin/ls-remote.c:54
9036 msgid "path of git-upload-pack on the remote host"
9037 msgstr "远程主机上的 git-upload-pack 路径"
9039 #: builtin/ls-remote.c:56
9040 msgid "limit to tags"
9043 #: builtin/ls-remote.c:57
9044 msgid "limit to heads"
9047 #: builtin/ls-remote.c:58
9048 msgid "do not show peeled tags"
9051 #: builtin/ls-remote.c:60
9052 msgid "take url.<base>.insteadOf into account"
9053 msgstr "参考 url.<base>.insteadOf 设置"
9055 #: builtin/ls-remote.c:62
9056 msgid "exit with exit code 2 if no matching refs are found"
9057 msgstr "若未找到匹配的引用则以退出码2退出"
9059 #: builtin/ls-remote.c:64
9060 msgid "show underlying ref in addition to the object pointed by it"
9061 msgstr "除了显示指向的对象外,显示指向的引用名"
9063 #: builtin/ls-tree.c:28
9064 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
9065 msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
9067 #: builtin/ls-tree.c:128
9068 msgid "only show trees"
9071 #: builtin/ls-tree.c:130
9072 msgid "recurse into subtrees"
9075 #: builtin/ls-tree.c:132
9076 msgid "show trees when recursing"
9079 #: builtin/ls-tree.c:135
9080 msgid "terminate entries with NUL byte"
9081 msgstr "条目以 NUL 字符终止"
9083 #: builtin/ls-tree.c:136
9084 msgid "include object size"
9087 #: builtin/ls-tree.c:138 builtin/ls-tree.c:140
9088 msgid "list only filenames"
9091 #: builtin/ls-tree.c:143
9092 msgid "use full path names"
9095 #: builtin/ls-tree.c:145
9096 msgid "list entire tree; not just current directory (implies --full-name)"
9097 msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
9099 #: builtin/merge.c:46
9100 msgid "git merge [<options>] [<commit>...]"
9101 msgstr "git merge [<选项>] [<提交>...]"
9103 #: builtin/merge.c:47
9104 msgid "git merge [<options>] <msg> HEAD <commit>"
9105 msgstr "git merge [<选项>] <说明> HEAD <提交>"
9107 #: builtin/merge.c:48
9108 msgid "git merge --abort"
9109 msgstr "git merge --abort"
9111 #: builtin/merge.c:102
9112 msgid "switch `m' requires a value"
9113 msgstr "开关 `m' 需要一个值"
9115 #: builtin/merge.c:139
9117 msgid "Could not find merge strategy '%s'.\n"
9118 msgstr "不能找到合并策略 '%s'。\n"
9120 #: builtin/merge.c:140
9122 msgid "Available strategies are:"
9125 #: builtin/merge.c:145
9127 msgid "Available custom strategies are:"
9130 #: builtin/merge.c:195 builtin/pull.c:127
9131 msgid "do not show a diffstat at the end of the merge"
9132 msgstr "在合并的最后不显示差异统计"
9134 #: builtin/merge.c:198 builtin/pull.c:130
9135 msgid "show a diffstat at the end of the merge"
9136 msgstr "在合并的最后显示差异统计"
9138 #: builtin/merge.c:199 builtin/pull.c:133
9139 msgid "(synonym to --stat)"
9140 msgstr "(和 --stat 同义)"
9142 #: builtin/merge.c:201 builtin/pull.c:136
9143 msgid "add (at most <n>) entries from shortlog to merge commit message"
9144 msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
9146 #: builtin/merge.c:204 builtin/pull.c:139
9147 msgid "create a single commit instead of doing a merge"
9148 msgstr "创建一个单独的提交而不是做一次合并"
9150 #: builtin/merge.c:206 builtin/pull.c:142
9151 msgid "perform a commit if the merge succeeds (default)"
9152 msgstr "如果合并成功,执行一次提交(默认)"
9154 #: builtin/merge.c:208 builtin/pull.c:145
9155 msgid "edit message before committing"
9158 #: builtin/merge.c:209
9159 msgid "allow fast-forward (default)"
9162 #: builtin/merge.c:211 builtin/pull.c:151
9163 msgid "abort if fast-forward is not possible"
9164 msgstr "如果不能快进就放弃合并"
9166 #: builtin/merge.c:215 builtin/pull.c:154
9167 msgid "verify that the named commit has a valid GPG signature"
9168 msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
9170 #: builtin/merge.c:216 builtin/notes.c:774 builtin/pull.c:158
9171 #: builtin/revert.c:89
9175 #: builtin/merge.c:217 builtin/pull.c:159
9176 msgid "merge strategy to use"
9179 #: builtin/merge.c:218 builtin/pull.c:162
9180 msgid "option=value"
9181 msgstr "option=value"
9183 #: builtin/merge.c:219 builtin/pull.c:163
9184 msgid "option for selected merge strategy"
9187 #: builtin/merge.c:221
9188 msgid "merge commit message (for a non-fast-forward merge)"
9189 msgstr "合并的提交说明(针对非快进式合并)"
9191 #: builtin/merge.c:225
9192 msgid "abort the current in-progress merge"
9193 msgstr "放弃当前正在进行的合并"
9195 #: builtin/merge.c:227 builtin/pull.c:170
9196 msgid "allow merging unrelated histories"
9199 #: builtin/merge.c:255
9200 msgid "could not run stash."
9203 #: builtin/merge.c:260
9204 msgid "stash failed"
9207 #: builtin/merge.c:265
9209 msgid "not a valid object: %s"
9210 msgstr "不是一个有效对象:%s"
9212 #: builtin/merge.c:284 builtin/merge.c:301
9213 msgid "read-tree failed"
9217 #: builtin/merge.c:331
9218 msgid " (nothing to squash)"
9221 #: builtin/merge.c:342
9223 msgid "Squash commit -- not updating HEAD\n"
9224 msgstr "压缩提交 -- 未更新 HEAD\n"
9226 #: builtin/merge.c:392
9228 msgid "No merge message -- not updating HEAD\n"
9229 msgstr "无合并信息 -- 未更新 HEAD\n"
9231 #: builtin/merge.c:443
9233 msgid "'%s' does not point to a commit"
9234 msgstr "'%s' 没有指向一个提交"
9236 #: builtin/merge.c:533
9238 msgid "Bad branch.%s.mergeoptions string: %s"
9239 msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
9241 #: builtin/merge.c:652
9242 msgid "Not handling anything other than two heads merge."
9243 msgstr "不能处理两个头合并之外的任何操作。"
9245 #: builtin/merge.c:666
9247 msgid "Unknown option for merge-recursive: -X%s"
9248 msgstr "merge-recursive 的未知选项:-X%s"
9250 #: builtin/merge.c:681
9252 msgid "unable to write %s"
9255 #: builtin/merge.c:733
9257 msgid "Could not read from '%s'"
9258 msgstr "不能从 '%s' 读取"
9260 #: builtin/merge.c:742
9262 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
9263 msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
9265 #: builtin/merge.c:748
9268 "Please enter a commit message to explain why this merge is necessary,\n"
9269 "especially if it merges an updated upstream into a topic branch.\n"
9271 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
9274 "请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
9277 "以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
9279 #: builtin/merge.c:772
9280 msgid "Empty commit message."
9283 #: builtin/merge.c:792
9285 msgid "Wonderful.\n"
9288 #: builtin/merge.c:847
9290 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
9291 msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
9293 #: builtin/merge.c:863
9295 msgid "'%s' is not a commit"
9296 msgstr "'%s' 不是一个提交"
9298 #: builtin/merge.c:904
9299 msgid "No current branch."
9302 #: builtin/merge.c:906
9303 msgid "No remote for the current branch."
9304 msgstr "当前分支没有对应的远程仓库。"
9306 #: builtin/merge.c:908
9307 msgid "No default upstream defined for the current branch."
9308 msgstr "当前分支没有定义默认的上游分支。"
9310 #: builtin/merge.c:913
9312 msgid "No remote-tracking branch for %s from %s"
9313 msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
9315 #: builtin/merge.c:960
9317 msgid "Bad value '%s' in environment '%s'"
9318 msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'"
9320 #: builtin/merge.c:1034
9322 msgid "could not close '%s'"
9325 #: builtin/merge.c:1061
9327 msgid "not something we can merge in %s: %s"
9328 msgstr "不能在 %s 中合并:%s"
9330 #: builtin/merge.c:1095
9331 msgid "not something we can merge"
9334 #: builtin/merge.c:1162
9335 msgid "There is no merge to abort (MERGE_HEAD missing)."
9336 msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
9338 #: builtin/merge.c:1178
9340 "You have not concluded your merge (MERGE_HEAD exists).\n"
9341 "Please, commit your changes before you merge."
9343 "您尚未结束您的合并(存在 MERGE_HEAD)。\n"
9346 #: builtin/merge.c:1185
9348 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
9349 "Please, commit your changes before you merge."
9351 "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
9354 #: builtin/merge.c:1188
9355 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
9356 msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
9358 #: builtin/merge.c:1197
9359 msgid "You cannot combine --squash with --no-ff."
9360 msgstr "您不能将 --squash 与 --no-ff 同时使用。"
9362 #: builtin/merge.c:1205
9363 msgid "No commit specified and merge.defaultToUpstream not set."
9364 msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
9366 #: builtin/merge.c:1222
9367 msgid "Squash commit into empty head not supported yet"
9368 msgstr "尚不支持到空分支的压缩提交"
9370 #: builtin/merge.c:1224
9371 msgid "Non-fast-forward commit does not make sense into an empty head"
9372 msgstr "到空分支的非快进式提交没有意义"
9374 #: builtin/merge.c:1229
9376 msgid "%s - not something we can merge"
9379 #: builtin/merge.c:1231
9380 msgid "Can merge only exactly one commit into empty head"
9381 msgstr "只能将一个提交合并到空分支上"
9383 #: builtin/merge.c:1287
9385 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
9386 msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
9388 #: builtin/merge.c:1290
9390 msgid "Commit %s has a bad GPG signature allegedly by %s."
9391 msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
9393 #: builtin/merge.c:1293
9395 msgid "Commit %s does not have a GPG signature."
9396 msgstr "提交 %s 没有一个 GPG 签名。"
9398 #: builtin/merge.c:1296
9400 msgid "Commit %s has a good GPG signature by %s\n"
9401 msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
9403 #: builtin/merge.c:1358
9404 msgid "refusing to merge unrelated histories"
9407 #: builtin/merge.c:1367
9408 msgid "Already up-to-date."
9411 #: builtin/merge.c:1377
9413 msgid "Updating %s..%s\n"
9414 msgstr "更新 %s..%s\n"
9416 #: builtin/merge.c:1418
9418 msgid "Trying really trivial in-index merge...\n"
9419 msgstr "尝试非常小的索引内合并...\n"
9421 #: builtin/merge.c:1425
9426 #: builtin/merge.c:1450
9427 msgid "Already up-to-date. Yeeah!"
9430 #: builtin/merge.c:1456
9431 msgid "Not possible to fast-forward, aborting."
9434 #: builtin/merge.c:1479 builtin/merge.c:1558
9436 msgid "Rewinding the tree to pristine...\n"
9437 msgstr "将树回滚至原始状态...\n"
9439 #: builtin/merge.c:1483
9441 msgid "Trying merge strategy %s...\n"
9442 msgstr "尝试合并策略 %s...\n"
9444 #: builtin/merge.c:1549
9446 msgid "No merge strategy handled the merge.\n"
9447 msgstr "没有合并策略处理此合并。\n"
9449 #: builtin/merge.c:1551
9451 msgid "Merge with strategy %s failed.\n"
9452 msgstr "使用策略 %s 合并失败。\n"
9454 #: builtin/merge.c:1560
9456 msgid "Using the %s to prepare resolving by hand.\n"
9457 msgstr "使用 %s 以准备手工解决。\n"
9459 #: builtin/merge.c:1572
9461 msgid "Automatic merge went well; stopped before committing as requested\n"
9462 msgstr "自动合并进展顺利,按要求在提交前停止\n"
9464 #: builtin/merge-base.c:29
9465 msgid "git merge-base [-a | --all] <commit> <commit>..."
9466 msgstr "git merge-base [-a | --all] <提交> <提交>..."
9468 #: builtin/merge-base.c:30
9469 msgid "git merge-base [-a | --all] --octopus <commit>..."
9470 msgstr "git merge-base [-a | --all] --octopus <提交>..."
9472 #: builtin/merge-base.c:31
9473 msgid "git merge-base --independent <commit>..."
9474 msgstr "git merge-base --independent <提交>..."
9476 #: builtin/merge-base.c:32
9477 msgid "git merge-base --is-ancestor <commit> <commit>"
9478 msgstr "git merge-base --is-ancestor <提交> <提交>"
9480 #: builtin/merge-base.c:33
9481 msgid "git merge-base --fork-point <ref> [<commit>]"
9482 msgstr "git merge-base --fork-point <引用> [<提交>]"
9484 #: builtin/merge-base.c:217
9485 msgid "output all common ancestors"
9488 #: builtin/merge-base.c:219
9489 msgid "find ancestors for a single n-way merge"
9490 msgstr "查找一个多路合并的祖先提交"
9492 #: builtin/merge-base.c:221
9493 msgid "list revs not reachable from others"
9494 msgstr "显示不能被其他访问到的版本"
9496 #: builtin/merge-base.c:223
9497 msgid "is the first one ancestor of the other?"
9498 msgstr "第一个是其他的祖先提交么?"
9500 #: builtin/merge-base.c:225
9501 msgid "find where <commit> forked from reflog of <ref>"
9502 msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处"
9504 #: builtin/merge-file.c:8
9506 "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
9507 "<orig-file> <file2>"
9509 "git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文"
9512 #: builtin/merge-file.c:33
9513 msgid "send results to standard output"
9516 #: builtin/merge-file.c:34
9517 msgid "use a diff3 based merge"
9518 msgstr "使用基于 diff3 的合并"
9520 #: builtin/merge-file.c:35
9521 msgid "for conflicts, use our version"
9522 msgstr "如果冲突,使用我们的版本"
9524 #: builtin/merge-file.c:37
9525 msgid "for conflicts, use their version"
9526 msgstr "如果冲突,使用他们的版本"
9528 #: builtin/merge-file.c:39
9529 msgid "for conflicts, use a union version"
9530 msgstr "如果冲突,使用联合版本"
9532 #: builtin/merge-file.c:42
9533 msgid "for conflicts, use this marker size"
9534 msgstr "如果冲突,使用指定长度的标记"
9536 #: builtin/merge-file.c:43
9537 msgid "do not warn about conflicts"
9540 #: builtin/merge-file.c:45
9541 msgid "set labels for file1/orig-file/file2"
9542 msgstr "为 文件1/初始文件/文件2 设置标签"
9544 #: builtin/merge-recursive.c:45
9546 msgid "unknown option %s"
9549 #: builtin/merge-recursive.c:51
9551 msgid "could not parse object '%s'"
9552 msgstr "不能解析对象 '%s'"
9554 #: builtin/merge-recursive.c:55
9556 msgid "cannot handle more than %d base. Ignoring %s."
9557 msgid_plural "cannot handle more than %d bases. Ignoring %s."
9558 msgstr[0] "无法处理 %d 条以上的基线。忽略 %s。"
9559 msgstr[1] "无法处理 %d 条以上的基线。忽略 %s。"
9561 #: builtin/merge-recursive.c:63
9562 msgid "not handling anything other than two heads merge."
9563 msgstr "不能处理两个头合并之外的任何操作。"
9565 #: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
9567 msgid "could not resolve ref '%s'"
9568 msgstr "无法解析引用 '%s'"
9570 #: builtin/merge-recursive.c:77
9572 msgid "Merging %s with %s\n"
9573 msgstr "合并 %s 和 %s\n"
9575 #: builtin/mktree.c:65
9576 msgid "git mktree [-z] [--missing] [--batch]"
9577 msgstr "git mktree [-z] [--missing] [--batch]"
9579 #: builtin/mktree.c:152
9580 msgid "input is NUL terminated"
9581 msgstr "输入以 NUL 字符终止"
9583 #: builtin/mktree.c:153 builtin/write-tree.c:24
9584 msgid "allow missing objects"
9587 #: builtin/mktree.c:154
9588 msgid "allow creation of more than one tree"
9592 msgid "git mv [<options>] <source>... <destination>"
9593 msgstr "git mv [<选项>] <源>... <目标>"
9597 msgid "Directory %s is in index and no submodule?"
9598 msgstr "目录 %s 在索引中并且不是子模组?"
9600 #: builtin/mv.c:72 builtin/rm.c:317
9601 msgid "Please stage your changes to .gitmodules or stash them to proceed"
9602 msgstr "请将您的修改暂存到 .gitmodules 中或保存进度后再继续"
9606 msgid "%.*s is in index"
9610 msgid "force move/rename even if target exists"
9611 msgstr "强制移动/重命令,即使目标存在"
9614 msgid "skip move/rename errors"
9619 msgid "destination '%s' is not a directory"
9620 msgstr "目标 '%s' 不是一个目录"
9624 msgid "Checking rename of '%s' to '%s'\n"
9625 msgstr "检查 '%s' 到 '%s' 的重命名\n"
9632 msgid "can not move directory into itself"
9636 msgid "cannot move directory over file"
9640 msgid "source directory is empty"
9644 msgid "not under version control"
9648 msgid "destination exists"
9653 msgid "overwriting '%s'"
9657 msgid "Cannot overwrite"
9661 msgid "multiple sources for the same target"
9665 msgid "destination directory does not exist"
9670 msgid "%s, source=%s, destination=%s"
9671 msgstr "%s,源=%s,目标=%s"
9675 msgid "Renaming %s to %s\n"
9676 msgstr "重命名 %s 至 %s\n"
9678 #: builtin/mv.c:263 builtin/remote.c:710 builtin/repack.c:375
9680 msgid "renaming '%s' failed"
9681 msgstr "重命名 '%s' 失败"
9683 #: builtin/name-rev.c:257
9684 msgid "git name-rev [<options>] <commit>..."
9685 msgstr "git name-rev [<选项>] <提交>..."
9687 #: builtin/name-rev.c:258
9688 msgid "git name-rev [<options>] --all"
9689 msgstr "git name-rev [<选项>] --all"
9691 #: builtin/name-rev.c:259
9692 msgid "git name-rev [<options>] --stdin"
9693 msgstr "git name-rev [<选项>] --stdin"
9695 #: builtin/name-rev.c:311
9696 msgid "print only names (no SHA-1)"
9697 msgstr "只打印名称(无 SHA-1)"
9699 #: builtin/name-rev.c:312
9700 msgid "only use tags to name the commits"
9703 #: builtin/name-rev.c:314
9704 msgid "only use refs matching <pattern>"
9705 msgstr "只使用和 <模式> 相匹配的引用"
9707 #: builtin/name-rev.c:316
9708 msgid "list all commits reachable from all refs"
9709 msgstr "列出可以从所有引用访问的提交"
9711 #: builtin/name-rev.c:317
9712 msgid "read from stdin"
9715 #: builtin/name-rev.c:318
9716 msgid "allow to print `undefined` names (default)"
9717 msgstr "允许打印 `未定义` 的名称(默认)"
9719 #: builtin/name-rev.c:324
9720 msgid "dereference tags in the input (internal use)"
9721 msgstr "反向解析输入中的标签(内部使用)"
9723 #: builtin/notes.c:25
9724 msgid "git notes [--ref <notes-ref>] [list [<object>]]"
9725 msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
9727 #: builtin/notes.c:26
9729 "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
9730 "| (-c | -C) <object>] [<object>]"
9732 "git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
9733 "| (-c | -C) <对象>] [<对象>]"
9735 #: builtin/notes.c:27
9736 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
9737 msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
9739 #: builtin/notes.c:28
9741 "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
9742 "(-c | -C) <object>] [<object>]"
9744 "git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
9745 "(-c | -C) <对象>] [<对象>]"
9747 #: builtin/notes.c:29
9748 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
9749 msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
9751 #: builtin/notes.c:30
9752 msgid "git notes [--ref <notes-ref>] show [<object>]"
9753 msgstr "git notes [--ref <注解引用>] show [<对象>]"
9755 #: builtin/notes.c:31
9757 "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
9758 msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
9760 #: builtin/notes.c:32
9761 msgid "git notes merge --commit [-v | -q]"
9762 msgstr "git notes merge --commit [-v | -q]"
9764 #: builtin/notes.c:33
9765 msgid "git notes merge --abort [-v | -q]"
9766 msgstr "git notes merge --abort [-v | -q]"
9768 #: builtin/notes.c:34
9769 msgid "git notes [--ref <notes-ref>] remove [<object>...]"
9770 msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
9772 #: builtin/notes.c:35
9773 msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
9774 msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
9776 #: builtin/notes.c:36
9777 msgid "git notes [--ref <notes-ref>] get-ref"
9778 msgstr "git notes [--ref <注解引用>] get-ref"
9780 #: builtin/notes.c:41
9781 msgid "git notes [list [<object>]]"
9782 msgstr "git notes [list [<对象>]]"
9784 #: builtin/notes.c:46
9785 msgid "git notes add [<options>] [<object>]"
9786 msgstr "git notes add [<选项>] [<对象>]"
9788 #: builtin/notes.c:51
9789 msgid "git notes copy [<options>] <from-object> <to-object>"
9790 msgstr "git notes copy [<选项>] <源对象> <目标对象>"
9792 #: builtin/notes.c:52
9793 msgid "git notes copy --stdin [<from-object> <to-object>]..."
9794 msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
9796 #: builtin/notes.c:57
9797 msgid "git notes append [<options>] [<object>]"
9798 msgstr "git notes append [<选项>] [<对象>]"
9800 #: builtin/notes.c:62
9801 msgid "git notes edit [<object>]"
9802 msgstr "git notes edit [<对象>]"
9804 #: builtin/notes.c:67
9805 msgid "git notes show [<object>]"
9806 msgstr "git notes show [<对象>]"
9808 #: builtin/notes.c:72
9809 msgid "git notes merge [<options>] <notes-ref>"
9810 msgstr "git notes merge [<选项>] <注解引用>"
9812 #: builtin/notes.c:73
9813 msgid "git notes merge --commit [<options>]"
9814 msgstr "git notes merge --commit [<选项>]"
9816 #: builtin/notes.c:74
9817 msgid "git notes merge --abort [<options>]"
9818 msgstr "git notes merge --abort [<选项>]"
9820 #: builtin/notes.c:79
9821 msgid "git notes remove [<object>]"
9822 msgstr "git notes remove [<对象>]"
9824 #: builtin/notes.c:84
9825 msgid "git notes prune [<options>]"
9826 msgstr "git notes prune [<选项>]"
9828 #: builtin/notes.c:89
9829 msgid "git notes get-ref"
9830 msgstr "git notes get-ref"
9832 #: builtin/notes.c:94
9833 msgid "Write/edit the notes for the following object:"
9834 msgstr "为下面的对象写/编辑说明:"
9836 #: builtin/notes.c:147
9838 msgid "unable to start 'show' for object '%s'"
9839 msgstr "不能为对象 '%s' 开始 'show'"
9841 #: builtin/notes.c:151
9842 msgid "could not read 'show' output"
9843 msgstr "不能读取 'show' 的输出"
9845 #: builtin/notes.c:159
9847 msgid "failed to finish 'show' for object '%s'"
9848 msgstr "无法为对象 '%s' 完成 'show'"
9850 #: builtin/notes.c:194
9851 msgid "please supply the note contents using either -m or -F option"
9852 msgstr "请通过 -m 或 -F 选项为注解提供内容"
9854 #: builtin/notes.c:203
9855 msgid "unable to write note object"
9858 #: builtin/notes.c:205
9860 msgid "the note contents have been left in %s"
9861 msgstr "注解内容被留在 %s 中"
9863 #: builtin/notes.c:233 builtin/tag.c:439
9865 msgid "cannot read '%s'"
9868 #: builtin/notes.c:235 builtin/tag.c:442
9870 msgid "could not open or read '%s'"
9871 msgstr "不能打开或读取 '%s'"
9873 #: builtin/notes.c:254 builtin/notes.c:305 builtin/notes.c:307
9874 #: builtin/notes.c:372 builtin/notes.c:427 builtin/notes.c:513
9875 #: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:659
9877 msgid "failed to resolve '%s' as a valid ref."
9878 msgstr "无法解析 '%s' 为一个有效引用。"
9880 #: builtin/notes.c:257
9882 msgid "failed to read object '%s'."
9883 msgstr "无法读取对象 '%s'。"
9885 #: builtin/notes.c:261
9887 msgid "cannot read note data from non-blob object '%s'."
9888 msgstr "不能从非数据对象 '%s' 中读取注解数据。"
9890 #: builtin/notes.c:301
9892 msgid "malformed input line: '%s'."
9893 msgstr "非法的输入行:'%s'。"
9895 #: builtin/notes.c:316
9897 msgid "failed to copy notes from '%s' to '%s'"
9898 msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
9900 #. TRANSLATORS: the first %s will be replaced by a
9901 #. git notes command: 'add', 'merge', 'remove', etc.
9902 #: builtin/notes.c:345
9904 msgid "refusing to %s notes in %s (outside of refs/notes/)"
9905 msgstr "拒绝向 %2$s(在 refs/notes/ 之外)%1$s注解"
9907 #: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496
9908 #: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:652
9909 #: builtin/notes.c:802 builtin/notes.c:949 builtin/notes.c:970
9910 msgid "too many parameters"
9913 #: builtin/notes.c:378 builtin/notes.c:665
9915 msgid "no note found for object %s."
9916 msgstr "未发现对象 %s 的注解。"
9918 #: builtin/notes.c:399 builtin/notes.c:562
9919 msgid "note contents as a string"
9920 msgstr "注解内容作为一个字符串"
9922 #: builtin/notes.c:402 builtin/notes.c:565
9923 msgid "note contents in a file"
9926 #: builtin/notes.c:405 builtin/notes.c:568
9927 msgid "reuse and edit specified note object"
9928 msgstr "重用和编辑指定的注解对象"
9930 #: builtin/notes.c:408 builtin/notes.c:571
9931 msgid "reuse specified note object"
9934 #: builtin/notes.c:411 builtin/notes.c:574
9935 msgid "allow storing empty note"
9938 #: builtin/notes.c:412 builtin/notes.c:483
9939 msgid "replace existing notes"
9942 #: builtin/notes.c:437
9945 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
9947 msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
9949 #: builtin/notes.c:452 builtin/notes.c:531
9951 msgid "Overwriting existing notes for object %s\n"
9952 msgstr "覆盖对象 %s 现存注解\n"
9954 #: builtin/notes.c:463 builtin/notes.c:624 builtin/notes.c:889
9956 msgid "Removing note for object %s\n"
9957 msgstr "删除对象 %s 的注解\n"
9959 #: builtin/notes.c:484
9960 msgid "read objects from stdin"
9963 #: builtin/notes.c:486
9964 msgid "load rewriting config for <command> (implies --stdin)"
9965 msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
9967 #: builtin/notes.c:504
9968 msgid "too few parameters"
9971 #: builtin/notes.c:525
9974 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
9976 msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
9978 #: builtin/notes.c:537
9980 msgid "missing notes on source object %s. Cannot copy."
9981 msgstr "源对象 %s 缺少注解。不能拷贝。"
9983 #: builtin/notes.c:589
9986 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
9987 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
9989 "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
9990 "请换用 'git notes add -f -m/-F/-c/-C'。\n"
9992 #: builtin/notes.c:685
9993 msgid "failed to delete ref NOTES_MERGE_PARTIAL"
9994 msgstr "无法删除引用 NOTES_MERGE_PARTIAL"
9996 #: builtin/notes.c:687
9997 msgid "failed to delete ref NOTES_MERGE_REF"
9998 msgstr "无法删除引用 NOTES_MERGE_REF"
10000 #: builtin/notes.c:689
10001 msgid "failed to remove 'git notes merge' worktree"
10002 msgstr "无法删除 'git notes merge' 工作区"
10004 #: builtin/notes.c:709
10005 msgid "failed to read ref NOTES_MERGE_PARTIAL"
10006 msgstr "无法读取引用 NOTES_MERGE_PARTIAL"
10008 #: builtin/notes.c:711
10009 msgid "could not find commit from NOTES_MERGE_PARTIAL."
10010 msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。"
10012 #: builtin/notes.c:713
10013 msgid "could not parse commit from NOTES_MERGE_PARTIAL."
10014 msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。"
10016 #: builtin/notes.c:726
10017 msgid "failed to resolve NOTES_MERGE_REF"
10018 msgstr "无法解析 NOTES_MERGE_REF"
10020 #: builtin/notes.c:729
10021 msgid "failed to finalize notes merge"
10024 #: builtin/notes.c:755
10026 msgid "unknown notes merge strategy %s"
10027 msgstr "未知的注解合并策略 %s"
10029 #: builtin/notes.c:771
10030 msgid "General options"
10033 #: builtin/notes.c:773
10034 msgid "Merge options"
10037 #: builtin/notes.c:775
10039 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
10041 msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
10043 #: builtin/notes.c:777
10044 msgid "Committing unmerged notes"
10047 #: builtin/notes.c:779
10048 msgid "finalize notes merge by committing unmerged notes"
10049 msgstr "通过提交未合并的注解来完成注解合并"
10051 #: builtin/notes.c:781
10052 msgid "Aborting notes merge resolution"
10055 #: builtin/notes.c:783
10056 msgid "abort notes merge"
10059 #: builtin/notes.c:794
10060 msgid "cannot mix --commit, --abort or -s/--strategy"
10061 msgstr "不能混用 --commit、--abort 或 -s/--strategy"
10063 #: builtin/notes.c:799
10064 msgid "must specify a notes ref to merge"
10065 msgstr "必须指定一个注解引用来合并"
10067 #: builtin/notes.c:823
10069 msgid "unknown -s/--strategy: %s"
10070 msgstr "未知的 -s/--strategy:%s"
10072 #: builtin/notes.c:860
10074 msgid "a notes merge into %s is already in-progress at %s"
10075 msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中"
10077 #: builtin/notes.c:863
10079 msgid "failed to store link to current notes ref (%s)"
10080 msgstr "无法存储链接到当前的注解引用(%s)"
10082 #: builtin/notes.c:865
10085 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
10086 "'git notes merge --commit', or abort the merge with 'git notes merge --"
10089 "自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提"
10090 "交结果,或者使用命令 'git notes merge --abort' 终止合并。\n"
10092 #: builtin/notes.c:887
10094 msgid "Object %s has no note\n"
10095 msgstr "对象 %s 没有注解\n"
10097 #: builtin/notes.c:899
10098 msgid "attempt to remove non-existent note is not an error"
10099 msgstr "尝试删除不存在的注解不是一个错误"
10101 #: builtin/notes.c:902
10102 msgid "read object names from the standard input"
10103 msgstr "从标准输入读取对象名称"
10105 #: builtin/notes.c:940 builtin/prune.c:105 builtin/worktree.c:127
10106 msgid "do not remove, show only"
10109 #: builtin/notes.c:941
10110 msgid "report pruned notes"
10113 #: builtin/notes.c:983
10117 #: builtin/notes.c:984
10118 msgid "use notes from <notes-ref>"
10119 msgstr "从 <注解引用> 使用注解"
10121 #: builtin/notes.c:1019
10123 msgid "unknown subcommand: %s"
10126 #: builtin/pack-objects.c:29
10128 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
10129 msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]"
10131 #: builtin/pack-objects.c:30
10133 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
10134 msgstr "git pack-objects [<选项>...] <base-name> [< <引用列表> | < <对象列表>]"
10136 #: builtin/pack-objects.c:179 builtin/pack-objects.c:182
10138 msgid "deflate error (%d)"
10141 #: builtin/pack-objects.c:768
10142 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
10143 msgstr "禁用 bitmap 写入,因为 pack.packSizeLimit 设置使得包被切分为多个"
10145 #: builtin/pack-objects.c:781
10146 msgid "Writing objects"
10149 #: builtin/pack-objects.c:1070
10150 msgid "disabling bitmap writing, as some objects are not being packed"
10151 msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
10153 #: builtin/pack-objects.c:2346
10154 msgid "Compressing objects"
10157 #: builtin/pack-objects.c:2759
10159 msgid "unsupported index version %s"
10160 msgstr "不支持的索引版本 %s"
10162 #: builtin/pack-objects.c:2763
10164 msgid "bad index version '%s'"
10165 msgstr "坏的索引版本 '%s'"
10167 #: builtin/pack-objects.c:2793
10168 msgid "do not show progress meter"
10171 #: builtin/pack-objects.c:2795
10172 msgid "show progress meter"
10175 #: builtin/pack-objects.c:2797
10176 msgid "show progress meter during object writing phase"
10177 msgstr "在对象写入阶段显示进度表"
10179 #: builtin/pack-objects.c:2800
10180 msgid "similar to --all-progress when progress meter is shown"
10181 msgstr "当进度表显示时类似于 --all-progress"
10183 #: builtin/pack-objects.c:2801
10184 msgid "version[,offset]"
10187 #: builtin/pack-objects.c:2802
10188 msgid "write the pack index file in the specified idx format version"
10189 msgstr "用指定的 idx 格式版本来写包索引文件"
10191 #: builtin/pack-objects.c:2805
10192 msgid "maximum size of each output pack file"
10193 msgstr "每个输出包的最大尺寸"
10195 #: builtin/pack-objects.c:2807
10196 msgid "ignore borrowed objects from alternate object store"
10197 msgstr "忽略从备用对象存储里借用对象"
10199 #: builtin/pack-objects.c:2809
10200 msgid "ignore packed objects"
10203 #: builtin/pack-objects.c:2811
10204 msgid "limit pack window by objects"
10205 msgstr "限制打包窗口的对象数"
10207 #: builtin/pack-objects.c:2813
10208 msgid "limit pack window by memory in addition to object limit"
10209 msgstr "除对象数量限制外设置打包窗口的内存限制"
10211 #: builtin/pack-objects.c:2815
10212 msgid "maximum length of delta chain allowed in the resulting pack"
10213 msgstr "打包允许的 delta 链的最大长度"
10215 #: builtin/pack-objects.c:2817
10216 msgid "reuse existing deltas"
10217 msgstr "重用已存在的 deltas"
10219 #: builtin/pack-objects.c:2819
10220 msgid "reuse existing objects"
10223 #: builtin/pack-objects.c:2821
10224 msgid "use OFS_DELTA objects"
10225 msgstr "使用 OFS_DELTA 对象"
10227 #: builtin/pack-objects.c:2823
10228 msgid "use threads when searching for best delta matches"
10229 msgstr "使用线程查询最佳 delta 匹配"
10231 #: builtin/pack-objects.c:2825
10232 msgid "do not create an empty pack output"
10235 #: builtin/pack-objects.c:2827
10236 msgid "read revision arguments from standard input"
10237 msgstr "从标准输入读取版本号参数"
10239 #: builtin/pack-objects.c:2829
10240 msgid "limit the objects to those that are not yet packed"
10241 msgstr "限制那些尚未打包的对象"
10243 #: builtin/pack-objects.c:2832
10244 msgid "include objects reachable from any reference"
10245 msgstr "包括可以从任何引用访问到的对象"
10247 #: builtin/pack-objects.c:2835
10248 msgid "include objects referred by reflog entries"
10249 msgstr "包括被引用日志引用到的对象"
10251 #: builtin/pack-objects.c:2838
10252 msgid "include objects referred to by the index"
10253 msgstr "包括被索引引用到的对象"
10255 #: builtin/pack-objects.c:2841
10256 msgid "output pack to stdout"
10259 #: builtin/pack-objects.c:2843
10260 msgid "include tag objects that refer to objects to be packed"
10261 msgstr "包括那些引用了待打包对象的标签对象"
10263 #: builtin/pack-objects.c:2845
10264 msgid "keep unreachable objects"
10267 #: builtin/pack-objects.c:2847
10268 msgid "pack loose unreachable objects"
10269 msgstr "打包松散的不可达对象"
10271 #: builtin/pack-objects.c:2849
10272 msgid "unpack unreachable objects newer than <time>"
10273 msgstr "将比给定 <时间> 新的无法访问的对象解包"
10275 #: builtin/pack-objects.c:2852
10276 msgid "create thin packs"
10279 #: builtin/pack-objects.c:2854
10280 msgid "create packs suitable for shallow fetches"
10281 msgstr "创建适合浅克隆仓库获取的包"
10283 #: builtin/pack-objects.c:2856
10284 msgid "ignore packs that have companion .keep file"
10285 msgstr "忽略配有 .keep 文件的包"
10287 #: builtin/pack-objects.c:2858
10288 msgid "pack compression level"
10291 #: builtin/pack-objects.c:2860
10292 msgid "do not hide commits by grafts"
10293 msgstr "显示被嫁接隐藏的提交"
10295 #: builtin/pack-objects.c:2862
10296 msgid "use a bitmap index if available to speed up counting objects"
10297 msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
10299 #: builtin/pack-objects.c:2864
10300 msgid "write a bitmap index together with the pack index"
10301 msgstr "在建立包索引的同时创建 bitmap 索引"
10303 #: builtin/pack-objects.c:2993
10304 msgid "Counting objects"
10307 #: builtin/pack-refs.c:6
10308 msgid "git pack-refs [<options>]"
10309 msgstr "git pack-refs [<选项>]"
10311 #: builtin/pack-refs.c:14
10312 msgid "pack everything"
10315 #: builtin/pack-refs.c:15
10316 msgid "prune loose refs (default)"
10317 msgstr "清除松散的引用(默认)"
10319 #: builtin/prune-packed.c:7
10320 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
10321 msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
10323 #: builtin/prune-packed.c:40
10324 msgid "Removing duplicate objects"
10327 #: builtin/prune.c:11
10328 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
10329 msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
10331 #: builtin/prune.c:106 builtin/worktree.c:128
10332 msgid "report pruned objects"
10335 #: builtin/prune.c:109 builtin/worktree.c:130
10336 msgid "expire objects older than <time>"
10337 msgstr "使早于给定时间的对象过期"
10339 #: builtin/prune.c:123
10340 msgid "cannot prune in a precious-objects repo"
10341 msgstr "不能在珍品仓库中执行清理操作"
10343 #: builtin/pull.c:51 builtin/pull.c:53
10345 msgid "Invalid value for %s: %s"
10346 msgstr "%s 的值无效:%s"
10348 #: builtin/pull.c:73
10349 msgid "git pull [<options>] [<repository> [<refspec>...]]"
10350 msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
10352 #: builtin/pull.c:121
10353 msgid "Options related to merging"
10356 #: builtin/pull.c:124
10357 msgid "incorporate changes by rebasing rather than merging"
10358 msgstr "使用变基操作取代合并操作以合入修改"
10360 #: builtin/pull.c:148 builtin/revert.c:101
10361 msgid "allow fast-forward"
10364 #: builtin/pull.c:157
10365 msgid "automatically stash/stash pop before and after rebase"
10366 msgstr "自动在变基操作前后执行 stash/stash pop"
10368 #: builtin/pull.c:173
10369 msgid "Options related to fetching"
10372 #: builtin/pull.c:195
10373 msgid "number of submodules pulled in parallel"
10374 msgstr "并发拉取的子模组的数量"
10376 #: builtin/pull.c:284
10378 msgid "Invalid value for pull.ff: %s"
10379 msgstr "pull.ff 的取值无效:%s"
10381 #: builtin/pull.c:397
10383 "There is no candidate for rebasing against among the refs that you just "
10385 msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
10387 #: builtin/pull.c:399
10389 "There are no candidates for merging among the refs that you just fetched."
10390 msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
10392 #: builtin/pull.c:400
10394 "Generally this means that you provided a wildcard refspec which had no\n"
10395 "matches on the remote end."
10396 msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
10398 #: builtin/pull.c:403
10401 "You asked to pull from the remote '%s', but did not specify\n"
10402 "a branch. Because this is not the default configured remote\n"
10403 "for your current branch, you must specify a branch on the command line."
10405 "您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n"
10406 "分支默认的远程仓库,您必须在命令行中指定一个分支名。"
10408 #: builtin/pull.c:408 git-parse-remote.sh:73
10409 msgid "You are not currently on a branch."
10410 msgstr "您当前不在一个分支上。"
10412 #: builtin/pull.c:410 builtin/pull.c:425 git-parse-remote.sh:79
10413 msgid "Please specify which branch you want to rebase against."
10414 msgstr "请指定您要变基到哪一个分支。"
10416 #: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:82
10417 msgid "Please specify which branch you want to merge with."
10418 msgstr "请指定您要合并哪一个分支。"
10420 #: builtin/pull.c:413 builtin/pull.c:428
10421 msgid "See git-pull(1) for details."
10422 msgstr "详见 git-pull(1)。"
10424 #: builtin/pull.c:415 builtin/pull.c:421 builtin/pull.c:430
10425 #: git-parse-remote.sh:64
10429 #: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:451
10430 #: git-parse-remote.sh:65
10434 #: builtin/pull.c:423 git-parse-remote.sh:75
10435 msgid "There is no tracking information for the current branch."
10436 msgstr "当前分支没有跟踪信息。"
10438 #: builtin/pull.c:432 git-parse-remote.sh:95
10440 "If you wish to set tracking information for this branch you can do so with:"
10441 msgstr "如果您想要为此分支创建跟踪信息,您可以执行:"
10443 #: builtin/pull.c:437
10446 "Your configuration specifies to merge with the ref '%s'\n"
10447 "from the remote, but no such ref was fetched."
10449 "您的配置中指定要合并远程的引用 '%s',\n"
10452 #: builtin/pull.c:754
10453 msgid "ignoring --verify-signatures for rebase"
10454 msgstr "为变基操作忽略 --verify-signatures"
10456 #: builtin/pull.c:801
10457 msgid "--[no-]autostash option is only valid with --rebase."
10458 msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。"
10460 #: builtin/pull.c:809
10461 msgid "Updating an unborn branch with changes added to the index."
10462 msgstr "更新尚未诞生的分支,变更添加至索引。"
10464 #: builtin/pull.c:812
10465 msgid "pull with rebase"
10468 #: builtin/pull.c:813
10469 msgid "please commit or stash them."
10470 msgstr "请提交或为它们保存进度。"
10472 #: builtin/pull.c:838
10475 "fetch updated the current branch head.\n"
10476 "fast-forwarding your working tree from\n"
10479 "fetch 更新了当前的分支。快进您的工作区\n"
10482 #: builtin/pull.c:843
10485 "Cannot fast-forward your working tree.\n"
10486 "After making sure that you saved anything precious from\n"
10489 "$ git reset --hard\n"
10492 "您当前的工作区无法执行快进操作。\n"
10495 "以确认所有有用的数据均已保存。然后执行下面的命令\n"
10496 "$ git reset --hard\n"
10499 #: builtin/pull.c:858
10500 msgid "Cannot merge multiple branches into empty head."
10501 msgstr "无法将多个分支合并到空分支。"
10503 #: builtin/pull.c:862
10504 msgid "Cannot rebase onto multiple branches."
10505 msgstr "无法变基到多个分支。"
10507 #: builtin/push.c:16
10508 msgid "git push [<options>] [<repository> [<refspec>...]]"
10509 msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
10511 #: builtin/push.c:89
10512 msgid "tag shorthand without <tag>"
10513 msgstr "标签后面未提供 <标签> 参数"
10515 #: builtin/push.c:99
10516 msgid "--delete only accepts plain target ref names"
10517 msgstr "--delete 只接受简单的目标引用名"
10519 #: builtin/push.c:143
10522 "To choose either option permanently, see push.default in 'git help config'."
10525 "为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
10527 #: builtin/push.c:146
10530 "The upstream branch of your current branch does not match\n"
10531 "the name of your current branch. To push to the upstream branch\n"
10532 "on the remote, use\n"
10534 " git push %s HEAD:%s\n"
10536 "To push to the branch of the same name on the remote, use\n"
10538 " git push %s %s\n"
10541 "如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
10544 " git push %s HEAD:%s\n"
10548 " git push %s %s\n"
10551 #: builtin/push.c:161
10554 "You are not currently on a branch.\n"
10555 "To push the history leading to the current (detached HEAD)\n"
10558 " git push %s HEAD:<name-of-remote-branch>\n"
10561 "现在为推送当前(分离头指针)的历史,使用\n"
10563 " git push %s HEAD:<远程分支名字>\n"
10565 #: builtin/push.c:175
10568 "The current branch %s has no upstream branch.\n"
10569 "To push the current branch and set the remote as upstream, use\n"
10571 " git push --set-upstream %s %s\n"
10573 "当前分支 %s 没有对应的上游分支。\n"
10574 "为推送当前分支并建立与远程上游的跟踪,使用\n"
10576 " git push --set-upstream %s %s\n"
10578 #: builtin/push.c:183
10580 msgid "The current branch %s has multiple upstream branches, refusing to push."
10581 msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
10583 #: builtin/push.c:186
10586 "You are pushing to remote '%s', which is not the upstream of\n"
10587 "your current branch '%s', without telling me what to push\n"
10588 "to update which remote branch."
10590 "您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
10591 "而没有告诉我要推送什么、更新哪个远程分支。"
10593 #: builtin/push.c:242
10595 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
10596 msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。"
10598 #: builtin/push.c:249
10600 "Updates were rejected because the tip of your current branch is behind\n"
10601 "its remote counterpart. Integrate the remote changes (e.g.\n"
10602 "'git pull ...') before pushing again.\n"
10603 "See the 'Note about fast-forwards' in 'git push --help' for details."
10605 "更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
10606 "再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
10607 "'git push --help' 中的 'Note about fast-forwards' 小节。"
10609 #: builtin/push.c:255
10611 "Updates were rejected because a pushed branch tip is behind its remote\n"
10612 "counterpart. Check out this branch and integrate the remote changes\n"
10613 "(e.g. 'git pull ...') before pushing again.\n"
10614 "See the 'Note about fast-forwards' in 'git push --help' for details."
10616 "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
10617 "检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
10618 "'git push --help' 中的 'Note about fast-forwards' 小节。"
10620 #: builtin/push.c:261
10622 "Updates were rejected because the remote contains work that you do\n"
10623 "not have locally. This is usually caused by another repository pushing\n"
10624 "to the same ref. You may want to first integrate the remote changes\n"
10625 "(e.g., 'git pull ...') before pushing again.\n"
10626 "See the 'Note about fast-forwards' in 'git push --help' for details."
10628 "更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n"
10629 "一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
10630 "(如 'git pull ...')。\n"
10631 "详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
10633 #: builtin/push.c:268
10634 msgid "Updates were rejected because the tag already exists in the remote."
10635 msgstr "更新被拒绝,因为该标签在远程已经存在。"
10637 #: builtin/push.c:271
10639 "You cannot update a remote ref that points at a non-commit object,\n"
10640 "or update a remote ref to make it point at a non-commit object,\n"
10641 "without using the '--force' option.\n"
10643 "如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
10644 "也不能更新远程引用让其指向一个非提交对象。\n"
10646 #: builtin/push.c:331
10648 msgid "Pushing to %s\n"
10651 #: builtin/push.c:335
10653 msgid "failed to push some refs to '%s'"
10654 msgstr "无法推送一些引用到 '%s'"
10656 #: builtin/push.c:366
10658 msgid "bad repository '%s'"
10661 #: builtin/push.c:367
10663 "No configured push destination.\n"
10664 "Either specify the URL from the command-line or configure a remote "
10665 "repository using\n"
10667 " git remote add <name> <url>\n"
10669 "and then push using the remote name\n"
10671 " git push <name>\n"
10674 "或通过命令行指定 URL,或用下面命令配置一个远程仓库\n"
10676 " git remote add <名称> <地址>\n"
10682 #: builtin/push.c:385
10683 msgid "--all and --tags are incompatible"
10684 msgstr "--all 和 --tags 不兼容"
10686 #: builtin/push.c:386
10687 msgid "--all can't be combined with refspecs"
10688 msgstr "--all 不能和引用规格同时使用"
10690 #: builtin/push.c:391
10691 msgid "--mirror and --tags are incompatible"
10692 msgstr "--mirror 和 --tags 不兼容"
10694 #: builtin/push.c:392
10695 msgid "--mirror can't be combined with refspecs"
10696 msgstr "--mirror 不能和引用规格同时使用"
10698 #: builtin/push.c:397
10699 msgid "--all and --mirror are incompatible"
10700 msgstr "--all 和 --mirror 不兼容"
10702 #: builtin/push.c:515
10706 #: builtin/push.c:516 builtin/send-pack.c:161
10707 msgid "push all refs"
10710 #: builtin/push.c:517 builtin/send-pack.c:163
10711 msgid "mirror all refs"
10714 #: builtin/push.c:519
10715 msgid "delete refs"
10718 #: builtin/push.c:520
10719 msgid "push tags (can't be used with --all or --mirror)"
10720 msgstr "推送标签(不能使用 --all or --mirror)"
10722 #: builtin/push.c:523 builtin/send-pack.c:164
10723 msgid "force updates"
10726 #: builtin/push.c:525 builtin/send-pack.c:175
10727 msgid "refname>:<expect"
10730 #: builtin/push.c:526 builtin/send-pack.c:176
10731 msgid "require old value of ref to be at this value"
10732 msgstr "要求引用旧的取值为设定值"
10734 #: builtin/push.c:529
10735 msgid "control recursive pushing of submodules"
10736 msgstr "控制子模组的递归推送"
10738 #: builtin/push.c:531 builtin/send-pack.c:169
10739 msgid "use thin pack"
10742 #: builtin/push.c:532 builtin/push.c:533 builtin/send-pack.c:158
10743 #: builtin/send-pack.c:159
10744 msgid "receive pack program"
10747 #: builtin/push.c:534
10748 msgid "set upstream for git pull/status"
10749 msgstr "设置 git pull/status 的上游"
10751 #: builtin/push.c:537
10752 msgid "prune locally removed refs"
10755 #: builtin/push.c:539
10756 msgid "bypass pre-push hook"
10757 msgstr "绕过 pre-push 钩子"
10759 #: builtin/push.c:540
10760 msgid "push missing but relevant tags"
10761 msgstr "推送缺失但有关的标签"
10763 #: builtin/push.c:543 builtin/send-pack.c:166
10764 msgid "GPG sign the push"
10765 msgstr "用 GPG 为推送签名"
10767 #: builtin/push.c:545 builtin/send-pack.c:170
10768 msgid "request atomic transaction on remote side"
10769 msgstr "需要远端支持原子事务"
10771 #: builtin/push.c:546
10772 msgid "server-specific"
10773 msgstr "server-specific"
10775 #: builtin/push.c:546
10776 msgid "option to transmit"
10779 #: builtin/push.c:560
10780 msgid "--delete is incompatible with --all, --mirror and --tags"
10781 msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
10783 #: builtin/push.c:562
10784 msgid "--delete doesn't make sense without any refs"
10785 msgstr "--delete 未接任何引用没有意义"
10787 #: builtin/push.c:579
10788 msgid "push options must not have new line characters"
10789 msgstr "推送选项不能有换行符"
10791 #: builtin/read-tree.c:37
10793 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
10794 "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
10795 "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
10797 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-"
10798 "u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
10799 "index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])"
10801 #: builtin/read-tree.c:110
10802 msgid "write resulting index to <file>"
10803 msgstr "将索引结果写入 <文件>"
10805 #: builtin/read-tree.c:113
10806 msgid "only empty the index"
10809 #: builtin/read-tree.c:115
10813 #: builtin/read-tree.c:117
10814 msgid "perform a merge in addition to a read"
10815 msgstr "读取之余再执行一个合并"
10817 #: builtin/read-tree.c:119
10818 msgid "3-way merge if no file level merging required"
10819 msgstr "如果没有文件级合并需要,执行三方合并"
10821 #: builtin/read-tree.c:121
10822 msgid "3-way merge in presence of adds and removes"
10823 msgstr "存在添加和删除时,也执行三方合并"
10825 #: builtin/read-tree.c:123
10826 msgid "same as -m, but discard unmerged entries"
10827 msgstr "类似于 -m,但丢弃未合并的条目"
10829 #: builtin/read-tree.c:124
10830 msgid "<subdirectory>/"
10833 #: builtin/read-tree.c:125
10834 msgid "read the tree into the index under <subdirectory>/"
10835 msgstr "读取树对象到索引的 <子目录>/ 下"
10837 #: builtin/read-tree.c:128
10838 msgid "update working tree with merge result"
10839 msgstr "用合并的结果更新工作区"
10841 #: builtin/read-tree.c:130
10845 #: builtin/read-tree.c:131
10846 msgid "allow explicitly ignored files to be overwritten"
10847 msgstr "允许忽略文件中设定的文件可以被覆盖"
10849 #: builtin/read-tree.c:134
10850 msgid "don't check the working tree after merging"
10853 #: builtin/read-tree.c:135
10854 msgid "don't update the index or the work tree"
10855 msgstr "不更新索引区和工作区"
10857 #: builtin/read-tree.c:137
10858 msgid "skip applying sparse checkout filter"
10859 msgstr "跳过应用稀疏检出过滤器"
10861 #: builtin/read-tree.c:139
10862 msgid "debug unpack-trees"
10863 msgstr "调试 unpack-trees"
10865 #: builtin/receive-pack.c:26
10866 msgid "git receive-pack <git-dir>"
10867 msgstr "git receive-pack <git-dir>"
10869 #: builtin/receive-pack.c:793
10871 "By default, updating the current branch in a non-bare repository\n"
10872 "is denied, because it will make the index and work tree inconsistent\n"
10873 "with what you pushed, and will require 'git reset --hard' to match\n"
10874 "the work tree to HEAD.\n"
10876 "You can set 'receive.denyCurrentBranch' configuration variable to\n"
10877 "'ignore' or 'warn' in the remote repository to allow pushing into\n"
10878 "its current branch; however, this is not recommended unless you\n"
10879 "arranged to update its work tree to match what you pushed in some\n"
10882 "To squelch this message and still keep the default behaviour, set\n"
10883 "'receive.denyCurrentBranch' configuration variable to 'refuse'."
10885 "默认禁止更新非纯仓库的当前分支,因为您推送的内容将导致索引和工作区\n"
10886 "不一致,并且将需要执行 'git reset --hard' 将工作区匹配到 HEAD。\n"
10888 "您可以在远程仓库中设置 'receive.denyCurrentBranch' 配置变量为\n"
10889 "'ignore' 或 'warn' 以允许推送到当前分支。然而不推荐这么做,除非您\n"
10890 "用某种方式将其工作区更新至您推送的状态。\n"
10892 "若要屏蔽此信息且保持默认行为,设置 'receive.denyCurrentBranch'\n"
10895 #: builtin/receive-pack.c:813
10897 "By default, deleting the current branch is denied, because the next\n"
10898 "'git clone' won't result in any file checked out, causing confusion.\n"
10900 "You can set 'receive.denyDeleteCurrent' configuration variable to\n"
10901 "'warn' or 'ignore' in the remote repository to allow deleting the\n"
10902 "current branch, with or without a warning message.\n"
10904 "To squelch this message, you can set it to 'refuse'."
10906 "默认禁止删除当前分支,因为下一次 'git clone' 将不会检出任何文件,\n"
10909 "您可以在远程仓库中设置 'receive.denyDeleteCurrent' 配置变量为\n"
10910 "'warn' 或 'ignore' 以允许删除当前分支,显示或者不显示警告。\n"
10912 "若要屏蔽此信息,您可以设置它为 'refuse'。"
10914 #: builtin/receive-pack.c:1883
10918 #: builtin/receive-pack.c:1897
10919 msgid "You must specify a directory."
10920 msgstr "您必须指定一个目录。"
10922 #: builtin/reflog.c:423
10924 msgid "'%s' for '%s' is not a valid timestamp"
10925 msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
10927 #: builtin/reflog.c:540 builtin/reflog.c:545
10929 msgid "'%s' is not a valid timestamp"
10930 msgstr "'%s' 不是一个有效的时间戳"
10932 #: builtin/remote.c:12
10933 msgid "git remote [-v | --verbose]"
10934 msgstr "git remote [-v | --verbose]"
10936 #: builtin/remote.c:13
10938 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
10939 "mirror=<fetch|push>] <name> <url>"
10941 "git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
10942 "mirror=<fetch|push>] <名称> <地址>"
10944 #: builtin/remote.c:14 builtin/remote.c:34
10945 msgid "git remote rename <old> <new>"
10946 msgstr "git remote rename <旧名称> <新名称>"
10948 #: builtin/remote.c:15 builtin/remote.c:39
10949 msgid "git remote remove <name>"
10950 msgstr "git remote remove <名称>"
10952 #: builtin/remote.c:16 builtin/remote.c:44
10953 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
10954 msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
10956 #: builtin/remote.c:17
10957 msgid "git remote [-v | --verbose] show [-n] <name>"
10958 msgstr "git remote [-v | --verbose] show [-n] <名称>"
10960 #: builtin/remote.c:18
10961 msgid "git remote prune [-n | --dry-run] <name>"
10962 msgstr "git remote prune [-n | --dry-run] <名称>"
10964 #: builtin/remote.c:19
10966 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
10967 msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
10969 #: builtin/remote.c:20
10970 msgid "git remote set-branches [--add] <name> <branch>..."
10971 msgstr "git remote set-branches [--add] <名称> <分支>..."
10973 #: builtin/remote.c:21 builtin/remote.c:70
10974 msgid "git remote get-url [--push] [--all] <name>"
10975 msgstr "git remote get-url [--push] [--all] <名称>"
10977 #: builtin/remote.c:22 builtin/remote.c:75
10978 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
10979 msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
10981 #: builtin/remote.c:23 builtin/remote.c:76
10982 msgid "git remote set-url --add <name> <newurl>"
10983 msgstr "git remote set-url --add <名称> <新的地址>"
10985 #: builtin/remote.c:24 builtin/remote.c:77
10986 msgid "git remote set-url --delete <name> <url>"
10987 msgstr "git remote set-url --delete <名称> <地址>"
10989 #: builtin/remote.c:29
10990 msgid "git remote add [<options>] <name> <url>"
10991 msgstr "git remote add [<选项>] <名称> <地址>"
10993 #: builtin/remote.c:49
10994 msgid "git remote set-branches <name> <branch>..."
10995 msgstr "git remote set-branches <名称> <分支>..."
10997 #: builtin/remote.c:50
10998 msgid "git remote set-branches --add <name> <branch>..."
10999 msgstr "git remote set-branches --add <名称> <分支>..."
11001 #: builtin/remote.c:55
11002 msgid "git remote show [<options>] <name>"
11003 msgstr "git remote show [<选项>] <名称>"
11005 #: builtin/remote.c:60
11006 msgid "git remote prune [<options>] <name>"
11007 msgstr "git remote prune [<选项>] <名称>"
11009 #: builtin/remote.c:65
11010 msgid "git remote update [<options>] [<group> | <remote>]..."
11011 msgstr "git remote update [<选项>] [<组> | <远程>]..."
11013 #: builtin/remote.c:94
11015 msgid "Updating %s"
11018 #: builtin/remote.c:126
11020 "--mirror is dangerous and deprecated; please\n"
11021 "\t use --mirror=fetch or --mirror=push instead"
11023 "--mirror 选项危险且过时,请使用 --mirror=fetch\n"
11024 "\t 或 --mirror=push"
11026 #: builtin/remote.c:143
11028 msgid "unknown mirror argument: %s"
11029 msgstr "未知的镜像参数:%s"
11031 #: builtin/remote.c:159
11032 msgid "fetch the remote branches"
11035 #: builtin/remote.c:161
11036 msgid "import all tags and associated objects when fetching"
11037 msgstr "抓取时导入所有的标签和关联对象"
11039 #: builtin/remote.c:164
11040 msgid "or do not fetch any tag at all (--no-tags)"
11041 msgstr "或不抓取任何标签(--no-tags)"
11043 #: builtin/remote.c:166
11044 msgid "branch(es) to track"
11047 #: builtin/remote.c:167
11048 msgid "master branch"
11051 #: builtin/remote.c:168
11053 msgstr "push|fetch"
11055 #: builtin/remote.c:169
11056 msgid "set up remote as a mirror to push to or fetch from"
11057 msgstr "把远程设置为用以推送或抓取的镜像"
11059 #: builtin/remote.c:181
11060 msgid "specifying a master branch makes no sense with --mirror"
11061 msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
11063 #: builtin/remote.c:183
11064 msgid "specifying branches to track makes sense only with fetch mirrors"
11065 msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
11067 #: builtin/remote.c:190 builtin/remote.c:629
11069 msgid "remote %s already exists."
11070 msgstr "远程 %s 已经存在。"
11072 #: builtin/remote.c:194 builtin/remote.c:633
11074 msgid "'%s' is not a valid remote name"
11075 msgstr "'%s' 不是一个有效的远程名称"
11077 #: builtin/remote.c:234
11079 msgid "Could not setup master '%s'"
11080 msgstr "无法设置 master '%s'"
11082 #: builtin/remote.c:336
11084 msgid "Could not get fetch map for refspec %s"
11085 msgstr "无法得到引用规格 %s 的获取列表"
11087 #: builtin/remote.c:437 builtin/remote.c:445
11091 #: builtin/remote.c:449
11095 #: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:854
11097 msgid "No such remote: %s"
11098 msgstr "没有这样的远程:%s"
11100 #: builtin/remote.c:639
11102 msgid "Could not rename config section '%s' to '%s'"
11103 msgstr "不能重命名配置小节 '%s' 到 '%s'"
11105 #: builtin/remote.c:659
11108 "Not updating non-default fetch refspec\n"
11110 "\tPlease update the configuration manually if necessary."
11116 #: builtin/remote.c:695
11118 msgid "deleting '%s' failed"
11119 msgstr "删除 '%s' 失败"
11121 #: builtin/remote.c:729
11123 msgid "creating '%s' failed"
11124 msgstr "创建 '%s' 失败"
11126 #: builtin/remote.c:792
11128 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
11129 "to delete it, use:"
11131 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
11132 "to delete them, use:"
11133 msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
11134 msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
11136 #: builtin/remote.c:806
11138 msgid "Could not remove config section '%s'"
11139 msgstr "不能移除配置小节 '%s'"
11141 #: builtin/remote.c:907
11143 msgid " new (next fetch will store in remotes/%s)"
11144 msgstr " 新的(下一次获取将存储于 remotes/%s)"
11146 #: builtin/remote.c:910
11150 #: builtin/remote.c:912
11151 msgid " stale (use 'git remote prune' to remove)"
11152 msgstr " 过时(使用 'git remote prune' 来移除)"
11154 #: builtin/remote.c:914
11158 #: builtin/remote.c:955
11160 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
11161 msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
11163 #: builtin/remote.c:963
11165 msgid "rebases interactively onto remote %s"
11166 msgstr "交互式变基到远程 %s"
11168 #: builtin/remote.c:964
11170 msgid "rebases onto remote %s"
11173 #: builtin/remote.c:967
11175 msgid " merges with remote %s"
11176 msgstr " 与远程 %s 合并"
11178 #: builtin/remote.c:970
11180 msgid "merges with remote %s"
11183 #: builtin/remote.c:973
11185 msgid "%-*s and with remote %s\n"
11186 msgstr "%-*s 以及和远程 %s\n"
11188 #: builtin/remote.c:1016
11192 #: builtin/remote.c:1019
11196 #: builtin/remote.c:1023
11200 #: builtin/remote.c:1026
11201 msgid "fast-forwardable"
11204 #: builtin/remote.c:1029
11205 msgid "local out of date"
11208 #: builtin/remote.c:1036
11210 msgid " %-*s forces to %-*s (%s)"
11211 msgstr " %-*s 强制推送至 %-*s (%s)"
11213 #: builtin/remote.c:1039
11215 msgid " %-*s pushes to %-*s (%s)"
11216 msgstr " %-*s 推送至 %-*s (%s)"
11218 #: builtin/remote.c:1043
11220 msgid " %-*s forces to %s"
11221 msgstr " %-*s 强制推送至 %s"
11223 #: builtin/remote.c:1046
11225 msgid " %-*s pushes to %s"
11226 msgstr " %-*s 推送至 %s"
11228 #: builtin/remote.c:1114
11229 msgid "do not query remotes"
11232 #: builtin/remote.c:1141
11234 msgid "* remote %s"
11237 #: builtin/remote.c:1142
11239 msgid " Fetch URL: %s"
11242 #: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1295
11246 #. TRANSLATORS: the colon ':' should align with
11247 #. the one in " Fetch URL: %s" translation
11248 #: builtin/remote.c:1154 builtin/remote.c:1156
11250 msgid " Push URL: %s"
11253 #: builtin/remote.c:1158 builtin/remote.c:1160 builtin/remote.c:1162
11255 msgid " HEAD branch: %s"
11256 msgstr " HEAD 分支:%s"
11258 # 译者:中文字符串拼接,可删除前导空格
11259 #: builtin/remote.c:1158
11260 msgid "(not queried)"
11263 #: builtin/remote.c:1160
11267 #: builtin/remote.c:1164
11270 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
11271 msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
11273 #: builtin/remote.c:1176
11275 msgid " Remote branch:%s"
11276 msgid_plural " Remote branches:%s"
11277 msgstr[0] " 远程分支:%s"
11278 msgstr[1] " 远程分支:%s"
11280 # 译者:中文字符串拼接,可删除前导空格
11281 #: builtin/remote.c:1179 builtin/remote.c:1205
11282 msgid " (status not queried)"
11285 #: builtin/remote.c:1188
11286 msgid " Local branch configured for 'git pull':"
11287 msgid_plural " Local branches configured for 'git pull':"
11288 msgstr[0] " 为 'git pull' 配置的本地分支:"
11289 msgstr[1] " 为 'git pull' 配置的本地分支:"
11291 #: builtin/remote.c:1196
11292 msgid " Local refs will be mirrored by 'git push'"
11293 msgstr " 本地引用将在 'git push' 时被镜像"
11295 #: builtin/remote.c:1202
11297 msgid " Local ref configured for 'git push'%s:"
11298 msgid_plural " Local refs configured for 'git push'%s:"
11299 msgstr[0] " 为 'git push' 配置的本地引用%s:"
11300 msgstr[1] " 为 'git push' 配置的本地引用%s:"
11302 #: builtin/remote.c:1223
11303 msgid "set refs/remotes/<name>/HEAD according to remote"
11304 msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
11306 #: builtin/remote.c:1225
11307 msgid "delete refs/remotes/<name>/HEAD"
11308 msgstr "删除 refs/remotes/<名称>/HEAD"
11310 #: builtin/remote.c:1240
11311 msgid "Cannot determine remote HEAD"
11312 msgstr "无法确定远程 HEAD"
11314 #: builtin/remote.c:1242
11315 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
11316 msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
11318 #: builtin/remote.c:1252
11320 msgid "Could not delete %s"
11323 #: builtin/remote.c:1260
11325 msgid "Not a valid ref: %s"
11326 msgstr "不是一个有效引用:%s"
11328 #: builtin/remote.c:1262
11330 msgid "Could not setup %s"
11334 #: builtin/remote.c:1280
11336 msgid " %s will become dangling!"
11337 msgstr " %s 将成为摇摆状态!"
11340 #: builtin/remote.c:1281
11342 msgid " %s has become dangling!"
11343 msgstr " %s 已成为摇摆状态!"
11345 #: builtin/remote.c:1291
11350 #: builtin/remote.c:1292
11355 #: builtin/remote.c:1308
11357 msgid " * [would prune] %s"
11358 msgstr " * [将删除] %s"
11360 #: builtin/remote.c:1311
11362 msgid " * [pruned] %s"
11363 msgstr " * [已删除] %s"
11365 #: builtin/remote.c:1356
11366 msgid "prune remotes after fetching"
11369 #: builtin/remote.c:1419 builtin/remote.c:1473 builtin/remote.c:1541
11371 msgid "No such remote '%s'"
11372 msgstr "没有此远程 '%s'"
11374 #: builtin/remote.c:1435
11378 #: builtin/remote.c:1442
11379 msgid "no remote specified"
11382 #: builtin/remote.c:1459
11383 msgid "query push URLs rather than fetch URLs"
11384 msgstr "查询推送 URL 地址,而非获取 URL 地址"
11386 #: builtin/remote.c:1461
11387 msgid "return all URLs"
11388 msgstr "返回所有 URL 地址"
11390 #: builtin/remote.c:1489
11392 msgid "no URLs configured for remote '%s'"
11393 msgstr "没有给远程仓库 '%s' 设定 URL"
11395 #: builtin/remote.c:1515
11396 msgid "manipulate push URLs"
11399 #: builtin/remote.c:1517
11403 #: builtin/remote.c:1519
11404 msgid "delete URLs"
11407 #: builtin/remote.c:1526
11408 msgid "--add --delete doesn't make sense"
11409 msgstr "--add --delete 无意义"
11411 #: builtin/remote.c:1567
11413 msgid "Invalid old URL pattern: %s"
11414 msgstr "无效的旧 URL 匹配模版:%s"
11416 #: builtin/remote.c:1575
11418 msgid "No such URL found: %s"
11419 msgstr "未找到此 URL:%s"
11421 #: builtin/remote.c:1577
11422 msgid "Will not delete all non-push URLs"
11423 msgstr "将不会删除所有非推送 URL 地址"
11425 #: builtin/remote.c:1591
11426 msgid "be verbose; must be placed before a subcommand"
11427 msgstr "冗长输出;必须置于子命令之前"
11429 #: builtin/remote.c:1622
11431 msgid "Unknown subcommand: %s"
11434 #: builtin/repack.c:17
11435 msgid "git repack [<options>]"
11436 msgstr "git repack [<选项>]"
11438 #: builtin/repack.c:160
11439 msgid "pack everything in a single pack"
11440 msgstr "所有内容打包到一个包文件中"
11442 #: builtin/repack.c:162
11443 msgid "same as -a, and turn unreachable objects loose"
11444 msgstr "和 -a 相同,并将不可达的对象设为松散对象"
11446 #: builtin/repack.c:165
11447 msgid "remove redundant packs, and run git-prune-packed"
11448 msgstr "删除多余的包,运行 git-prune-packed"
11450 #: builtin/repack.c:167
11451 msgid "pass --no-reuse-delta to git-pack-objects"
11452 msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
11454 #: builtin/repack.c:169
11455 msgid "pass --no-reuse-object to git-pack-objects"
11456 msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
11458 #: builtin/repack.c:171
11459 msgid "do not run git-update-server-info"
11460 msgstr "不运行 git-update-server-info"
11462 #: builtin/repack.c:174
11463 msgid "pass --local to git-pack-objects"
11464 msgstr "向 git-pack-objects 传递参数 --local"
11466 #: builtin/repack.c:176
11467 msgid "write bitmap index"
11468 msgstr "写 bitmap 索引"
11470 #: builtin/repack.c:177
11471 msgid "approxidate"
11474 #: builtin/repack.c:178
11475 msgid "with -A, do not loosen objects older than this"
11476 msgstr "使用 -A,不要将早于给定时间的对象过期"
11478 #: builtin/repack.c:180
11479 msgid "with -a, repack unreachable objects"
11480 msgstr "使用 -a ,重新对不可达对象打包"
11482 #: builtin/repack.c:182
11483 msgid "size of the window used for delta compression"
11484 msgstr "用于增量压缩的窗口值"
11486 #: builtin/repack.c:183 builtin/repack.c:187
11490 #: builtin/repack.c:184
11491 msgid "same as the above, but limit memory size instead of entries count"
11492 msgstr "和上面的相似,但限制内存大小而非条目数"
11494 #: builtin/repack.c:186
11495 msgid "limits the maximum delta depth"
11498 #: builtin/repack.c:188
11499 msgid "maximum size of each packfile"
11500 msgstr "每个包文件的最大尺寸"
11502 #: builtin/repack.c:190
11503 msgid "repack objects in packs marked with .keep"
11504 msgstr "对标记为 .keep 的包中的对象重新打包"
11506 #: builtin/repack.c:200
11507 msgid "cannot delete packs in a precious-objects repo"
11508 msgstr "不能删除珍品仓库中的打包文件"
11510 #: builtin/repack.c:204
11511 msgid "--keep-unreachable and -A are incompatible"
11512 msgstr "--keep-unreachable 和 -A 不兼容"
11514 #: builtin/repack.c:391 builtin/worktree.c:115
11516 msgid "failed to remove '%s'"
11519 #: builtin/replace.c:19
11520 msgid "git replace [-f] <object> <replacement>"
11521 msgstr "git replace [-f] <对象> <替换物>"
11523 #: builtin/replace.c:20
11524 msgid "git replace [-f] --edit <object>"
11525 msgstr "git replace [-f] --edit <对象>"
11527 #: builtin/replace.c:21
11528 msgid "git replace [-f] --graft <commit> [<parent>...]"
11529 msgstr "git replace [-f] --graft <提交> [<父提交>...]"
11531 #: builtin/replace.c:22
11532 msgid "git replace -d <object>..."
11533 msgstr "git replace -d <对象>..."
11535 #: builtin/replace.c:23
11536 msgid "git replace [--format=<format>] [-l [<pattern>]]"
11537 msgstr "git replace [--format=<格式>] [-l [<模式>]]"
11539 #: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
11541 msgid "Not a valid object name: '%s'"
11542 msgstr "不是一个有效的对象名:'%s'"
11544 #: builtin/replace.c:355
11546 msgid "bad mergetag in commit '%s'"
11547 msgstr "提交 '%s' 中含有损坏的合并标签"
11549 #: builtin/replace.c:357
11551 msgid "malformed mergetag in commit '%s'"
11552 msgstr "提交 '%s' 中含有非法的合并标签"
11554 #: builtin/replace.c:368
11557 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
11558 "instead of --graft"
11559 msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft"
11561 #: builtin/replace.c:401
11563 msgid "the original commit '%s' has a gpg signature."
11564 msgstr "原始提交 '%s' 中包含一个 GPG 签名"
11566 #: builtin/replace.c:402
11567 msgid "the signature will be removed in the replacement commit!"
11568 msgstr "在替换的提交中签名将被移除!"
11570 #: builtin/replace.c:408
11572 msgid "could not write replacement commit for: '%s'"
11573 msgstr "不能为 '%s' 写替换提交"
11575 #: builtin/replace.c:432
11576 msgid "list replace refs"
11579 #: builtin/replace.c:433
11580 msgid "delete replace refs"
11583 #: builtin/replace.c:434
11584 msgid "edit existing object"
11587 #: builtin/replace.c:435
11588 msgid "change a commit's parents"
11589 msgstr "修改一个提交的父提交"
11591 #: builtin/replace.c:436
11592 msgid "replace the ref if it exists"
11595 #: builtin/replace.c:437
11596 msgid "do not pretty-print contents for --edit"
11597 msgstr "不要为 --edit 操作美观显示内容"
11599 #: builtin/replace.c:438
11600 msgid "use this format"
11603 #: builtin/rerere.c:12
11604 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
11605 msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
11607 #: builtin/rerere.c:58
11608 msgid "register clean resolutions in index"
11609 msgstr "在索引中注册干净的解决方案"
11611 #: builtin/reset.c:26
11613 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
11614 msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
11616 #: builtin/reset.c:27
11617 msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
11618 msgstr "git reset [-q] [<树或提交>] [--] <路径>..."
11620 #: builtin/reset.c:28
11621 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
11622 msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
11624 #: builtin/reset.c:34
11628 #: builtin/reset.c:34
11632 #: builtin/reset.c:34
11636 #: builtin/reset.c:34
11640 #: builtin/reset.c:34
11644 #: builtin/reset.c:74
11645 msgid "You do not have a valid HEAD."
11646 msgstr "您没有一个有效的 HEAD。"
11648 #: builtin/reset.c:76
11649 msgid "Failed to find tree of HEAD."
11650 msgstr "无法找到 HEAD 指向的树。"
11652 #: builtin/reset.c:82
11654 msgid "Failed to find tree of %s."
11655 msgstr "无法找到 %s 指向的树。"
11657 #: builtin/reset.c:100
11659 msgid "HEAD is now at %s"
11660 msgstr "HEAD 现在位于 %s"
11662 # 译者:汉字之间无空格,故删除%s前后空格
11663 #: builtin/reset.c:183
11665 msgid "Cannot do a %s reset in the middle of a merge."
11666 msgstr "在合并过程中不能做%s重置操作。"
11668 #: builtin/reset.c:276
11669 msgid "be quiet, only report errors"
11670 msgstr "安静模式,只报告错误"
11672 #: builtin/reset.c:278
11673 msgid "reset HEAD and index"
11674 msgstr "重置 HEAD 和索引"
11676 #: builtin/reset.c:279
11677 msgid "reset only HEAD"
11680 #: builtin/reset.c:281 builtin/reset.c:283
11681 msgid "reset HEAD, index and working tree"
11682 msgstr "重置 HEAD、索引和工作区"
11684 #: builtin/reset.c:285
11685 msgid "reset HEAD but keep local changes"
11686 msgstr "重置 HEAD 但保存本地变更"
11688 #: builtin/reset.c:288
11689 msgid "record only the fact that removed paths will be added later"
11690 msgstr "将删除的路径标记为稍后添加"
11692 #: builtin/reset.c:305
11694 msgid "Failed to resolve '%s' as a valid revision."
11695 msgstr "无法将 '%s' 解析为一个有效的版本。"
11697 #: builtin/reset.c:313
11699 msgid "Failed to resolve '%s' as a valid tree."
11700 msgstr "无法将 '%s' 解析为一个有效的树对象。"
11702 #: builtin/reset.c:322
11703 msgid "--patch is incompatible with --{hard,mixed,soft}"
11704 msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
11706 #: builtin/reset.c:331
11707 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
11708 msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。"
11710 # 译者:汉字之间无空格,故删除%s前后空格
11711 #: builtin/reset.c:333
11713 msgid "Cannot do %s reset with paths."
11714 msgstr "不能带路径进行%s重置。"
11716 # 译者:汉字之间无空格,故删除%s前后空格
11717 #: builtin/reset.c:343
11719 msgid "%s reset is not allowed in a bare repository"
11720 msgstr "不能对纯仓库进行%s重置"
11722 #: builtin/reset.c:347
11723 msgid "-N can only be used with --mixed"
11724 msgstr "-N 只能和 --mixed 同时使用"
11726 #: builtin/reset.c:364
11727 msgid "Unstaged changes after reset:"
11728 msgstr "重置后取消暂存的变更:"
11730 #: builtin/reset.c:370
11732 msgid "Could not reset index file to revision '%s'."
11733 msgstr "不能重置索引文件至版本 '%s'。"
11735 #: builtin/reset.c:374
11736 msgid "Could not write new index file."
11737 msgstr "不能写入新的索引文件。"
11739 #: builtin/rev-list.c:354
11740 msgid "rev-list does not support display of notes"
11741 msgstr "rev-list 不支持显示注解"
11743 #: builtin/rev-parse.c:386
11744 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
11745 msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
11747 #: builtin/rev-parse.c:391
11748 msgid "keep the `--` passed as an arg"
11749 msgstr "保持 `--` 作为一个参数传递"
11751 #: builtin/rev-parse.c:393
11752 msgid "stop parsing after the first non-option argument"
11753 msgstr "遇到第一个非选项参数后停止解析"
11755 #: builtin/rev-parse.c:396
11756 msgid "output in stuck long form"
11759 #: builtin/rev-parse.c:527
11761 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
11762 " or: git rev-parse --sq-quote [<arg>...]\n"
11763 " or: git rev-parse [<options>] [<arg>...]\n"
11765 "Run \"git rev-parse --parseopt -h\" for more information on the first usage."
11767 "git rev-parse --parseopt [<选项>] -- [<参数>...]\n"
11768 " 或者:git rev-parse --sq-quote [<参数>...]\n"
11769 " 或者:git rev-parse [<选项>] [<参数>...]\n"
11771 "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
11773 #: builtin/revert.c:22
11774 msgid "git revert [<options>] <commit-ish>..."
11775 msgstr "git revert [<选项>] <提交号>..."
11777 #: builtin/revert.c:23
11778 msgid "git revert <subcommand>"
11779 msgstr "git revert <子命令>"
11781 #: builtin/revert.c:28
11782 msgid "git cherry-pick [<options>] <commit-ish>..."
11783 msgstr "git cherry-pick [<选项>] <提交号>..."
11785 #: builtin/revert.c:29
11786 msgid "git cherry-pick <subcommand>"
11787 msgstr "git cherry-pick <子命令>"
11789 #: builtin/revert.c:71
11791 msgid "%s: %s cannot be used with %s"
11792 msgstr "%s:%s 不能和 %s 同时使用"
11794 #: builtin/revert.c:80
11795 msgid "end revert or cherry-pick sequence"
11798 #: builtin/revert.c:81
11799 msgid "resume revert or cherry-pick sequence"
11802 #: builtin/revert.c:82
11803 msgid "cancel revert or cherry-pick sequence"
11806 #: builtin/revert.c:83
11807 msgid "don't automatically commit"
11810 #: builtin/revert.c:84
11811 msgid "edit the commit message"
11814 #: builtin/revert.c:87
11815 msgid "parent number"
11818 #: builtin/revert.c:89
11819 msgid "merge strategy"
11822 #: builtin/revert.c:90
11826 #: builtin/revert.c:91
11827 msgid "option for merge strategy"
11830 #: builtin/revert.c:100
11831 msgid "append commit name"
11834 #: builtin/revert.c:102
11835 msgid "preserve initially empty commits"
11838 #: builtin/revert.c:103
11839 msgid "allow commits with empty messages"
11842 #: builtin/revert.c:104
11843 msgid "keep redundant, empty commits"
11844 msgstr "保持多余的、空的提交"
11846 #: builtin/revert.c:192
11847 msgid "revert failed"
11850 #: builtin/revert.c:205
11851 msgid "cherry-pick failed"
11855 msgid "git rm [<options>] [--] <file>..."
11856 msgstr "git rm [<选项>] [--] <文件>..."
11860 "the following submodule (or one of its nested submodules)\n"
11861 "uses a .git directory:"
11863 "the following submodules (or one of their nested submodules)\n"
11864 "use a .git directory:"
11865 msgstr[0] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
11866 msgstr[1] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
11871 "(use 'rm -rf' if you really want to remove it including all of its history)"
11874 "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
11876 #: builtin/rm.c:230
11878 "the following file has staged content different from both the\n"
11879 "file and the HEAD:"
11881 "the following files have staged content different from both the\n"
11882 "file and the HEAD:"
11883 msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
11884 msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
11886 #: builtin/rm.c:235
11889 "(use -f to force removal)"
11894 #: builtin/rm.c:239
11895 msgid "the following file has changes staged in the index:"
11896 msgid_plural "the following files have changes staged in the index:"
11897 msgstr[0] "下列文件索引中有变更"
11898 msgstr[1] "下列文件索引中有变更"
11900 #: builtin/rm.c:243 builtin/rm.c:254
11903 "(use --cached to keep the file, or -f to force removal)"
11906 "(使用 --cached 保留本地文件,或用 -f 强制删除)"
11908 #: builtin/rm.c:251
11909 msgid "the following file has local modifications:"
11910 msgid_plural "the following files have local modifications:"
11911 msgstr[0] "如下文件有本地修改:"
11912 msgstr[1] "如下文件有本地修改:"
11914 #: builtin/rm.c:269
11915 msgid "do not list removed files"
11918 #: builtin/rm.c:270
11919 msgid "only remove from the index"
11922 #: builtin/rm.c:271
11923 msgid "override the up-to-date check"
11924 msgstr "忽略文件更新状态检查"
11926 #: builtin/rm.c:272
11927 msgid "allow recursive removal"
11930 #: builtin/rm.c:274
11931 msgid "exit with a zero status even if nothing matched"
11932 msgstr "即使没有匹配,也以零状态退出"
11934 #: builtin/rm.c:335
11936 msgid "not removing '%s' recursively without -r"
11937 msgstr "未提供 -r 选项不会递归删除 '%s'"
11939 #: builtin/rm.c:374
11941 msgid "git rm: unable to remove %s"
11942 msgstr "git rm:不能删除 %s"
11944 #: builtin/send-pack.c:18
11946 "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
11947 "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
11949 " --all and explicit <ref> specification are mutually exclusive."
11951 "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
11952 "receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n"
11953 " --all 和明确的 <引用> 互斥。"
11955 #: builtin/send-pack.c:160
11956 msgid "remote name"
11959 #: builtin/send-pack.c:171
11960 msgid "use stateless RPC protocol"
11961 msgstr "使用无状态的 RPC 协议"
11963 #: builtin/send-pack.c:172
11964 msgid "read refs from stdin"
11967 #: builtin/send-pack.c:173
11968 msgid "print status from remote helper"
11969 msgstr "打印来自远程 helper 的状态"
11971 #: builtin/shortlog.c:13
11972 msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
11973 msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
11975 #: builtin/shortlog.c:242
11976 msgid "sort output according to the number of commits per author"
11977 msgstr "根据每个作者的提交数量排序"
11979 #: builtin/shortlog.c:244
11980 msgid "Suppress commit descriptions, only provides commit count"
11981 msgstr "隐藏提交说明,只提供提交数量"
11983 #: builtin/shortlog.c:246
11984 msgid "Show the email address of each author"
11985 msgstr "显示每个作者的电子邮件地址"
11987 #: builtin/shortlog.c:247
11988 msgid "w[,i1[,i2]]"
11989 msgstr "w[,i1[,i2]]"
11991 #: builtin/shortlog.c:248
11992 msgid "Linewrap output"
11995 #: builtin/show-branch.c:10
11997 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
11998 "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
11999 "\t\t[--more=<n> | --list | --independent | --merge-base]\n"
12000 "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
12002 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
12003 "\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
12004 "\t\t[--more=<n> | --list | --independent | --merge-base]\n"
12005 "\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
12007 #: builtin/show-branch.c:14
12008 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
12009 msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]"
12011 #: builtin/show-branch.c:375
12013 msgid "ignoring %s; cannot handle more than %d ref"
12014 msgid_plural "ignoring %s; cannot handle more than %d refs"
12015 msgstr[0] "忽略 %s,无法处理 %d 个以上的引用"
12016 msgstr[1] "忽略 %s,无法处理 %d 个以上的引用"
12018 #: builtin/show-branch.c:541
12020 msgid "no matching refs with %s"
12021 msgstr "没有和 %s 匹配的引用"
12023 #: builtin/show-branch.c:639
12024 msgid "show remote-tracking and local branches"
12025 msgstr "显示远程跟踪的和本地的分支"
12027 #: builtin/show-branch.c:641
12028 msgid "show remote-tracking branches"
12031 #: builtin/show-branch.c:643
12032 msgid "color '*!+-' corresponding to the branch"
12033 msgstr "着色 '*!+-' 到相应的分支"
12035 #: builtin/show-branch.c:645
12036 msgid "show <n> more commits after the common ancestor"
12037 msgstr "显示共同祖先后的 <n> 个提交"
12039 #: builtin/show-branch.c:647
12040 msgid "synonym to more=-1"
12041 msgstr "和 more=-1 同义"
12043 #: builtin/show-branch.c:648
12044 msgid "suppress naming strings"
12047 #: builtin/show-branch.c:650
12048 msgid "include the current branch"
12051 #: builtin/show-branch.c:652
12052 msgid "name commits with their object names"
12055 #: builtin/show-branch.c:654
12056 msgid "show possible merge bases"
12059 #: builtin/show-branch.c:656
12060 msgid "show refs unreachable from any other ref"
12061 msgstr "显示没有任何引用的的引用"
12063 #: builtin/show-branch.c:658
12064 msgid "show commits in topological order"
12067 #: builtin/show-branch.c:661
12068 msgid "show only commits not on the first branch"
12069 msgstr "只显示不在第一个分支上的提交"
12071 #: builtin/show-branch.c:663
12072 msgid "show merges reachable from only one tip"
12073 msgstr "显示仅一个分支可访问的合并提交"
12075 #: builtin/show-branch.c:665
12076 msgid "topologically sort, maintaining date order where possible"
12077 msgstr "拓扑方式排序,并尽可能地保持日期顺序"
12079 #: builtin/show-branch.c:668
12080 msgid "<n>[,<base>]"
12081 msgstr "<n>[,<base>]"
12083 #: builtin/show-branch.c:669
12084 msgid "show <n> most recent ref-log entries starting at base"
12085 msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
12087 #: builtin/show-branch.c:703
12089 "--reflog is incompatible with --all, --remotes, --independent or --merge-base"
12090 msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不兼容"
12092 #: builtin/show-branch.c:727
12093 msgid "no branches given, and HEAD is not valid"
12094 msgstr "未提供分支,且 HEAD 无效"
12096 #: builtin/show-branch.c:730
12097 msgid "--reflog option needs one branch name"
12098 msgstr "选项 --reflog 需要一个分支名"
12100 #: builtin/show-branch.c:733
12102 msgid "only %d entry can be shown at one time."
12103 msgid_plural "only %d entries can be shown at one time."
12104 msgstr[0] "一次只能显示 %d 个条目。"
12105 msgstr[1] "一次只能显示 %d 个条目。"
12107 #: builtin/show-branch.c:737
12109 msgid "no such ref %s"
12112 #: builtin/show-branch.c:829
12114 msgid "cannot handle more than %d rev."
12115 msgid_plural "cannot handle more than %d revs."
12116 msgstr[0] "不能处理 %d 个以上的版本。"
12117 msgstr[1] "不能处理 %d 个以上的版本。"
12119 #: builtin/show-branch.c:833
12121 msgid "'%s' is not a valid ref."
12122 msgstr "'%s' 不是一个有效的引用。"
12124 #: builtin/show-branch.c:836
12126 msgid "cannot find commit %s (%s)"
12127 msgstr "不能找到提交 %s (%s)"
12129 #: builtin/show-ref.c:10
12131 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
12132 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
12134 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
12135 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
12137 #: builtin/show-ref.c:11
12138 msgid "git show-ref --exclude-existing[=<pattern>]"
12139 msgstr "git show-ref --exclude-existing[=<模式>]"
12141 #: builtin/show-ref.c:165
12142 msgid "only show tags (can be combined with heads)"
12143 msgstr "只显示标签(可以和头共用)"
12145 #: builtin/show-ref.c:166
12146 msgid "only show heads (can be combined with tags)"
12147 msgstr "只显示头(可以和标签共用)"
12149 #: builtin/show-ref.c:167
12150 msgid "stricter reference checking, requires exact ref path"
12151 msgstr "更严格的引用检测,需要精确的引用路径"
12153 #: builtin/show-ref.c:170 builtin/show-ref.c:172
12154 msgid "show the HEAD reference, even if it would be filtered out"
12155 msgstr "显示 HEAD 引用,即使被过滤掉"
12157 #: builtin/show-ref.c:174
12158 msgid "dereference tags into object IDs"
12159 msgstr "转换标签到对象 ID"
12161 #: builtin/show-ref.c:176
12162 msgid "only show SHA1 hash using <n> digits"
12163 msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
12165 #: builtin/show-ref.c:180
12166 msgid "do not print results to stdout (useful with --verify)"
12167 msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
12169 #: builtin/show-ref.c:182
12170 msgid "show refs from stdin that aren't in local repository"
12171 msgstr "显示从标准输入中读入的不在本地仓库中的引用"
12173 #: builtin/stripspace.c:17
12174 msgid "git stripspace [-s | --strip-comments]"
12175 msgstr "git stripspace [-s | --strip-comments]"
12177 #: builtin/stripspace.c:18
12178 msgid "git stripspace [-c | --comment-lines]"
12179 msgstr "git stripspace [-c | --comment-lines]"
12181 #: builtin/stripspace.c:35
12182 msgid "skip and remove all lines starting with comment character"
12183 msgstr "跳过和移除所有的注释行"
12185 #: builtin/stripspace.c:38
12186 msgid "prepend comment character and space to each line"
12187 msgstr "为每一行的行首添加注释符和空格"
12189 #: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1046
12191 msgid "No such ref: %s"
12192 msgstr "没有这样的引用:%s"
12194 #: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1055
12196 msgid "Expecting a full ref name, got %s"
12197 msgstr "期望一个完整的引用名称,却得到 %s"
12199 #: builtin/submodule--helper.c:71
12201 msgid "cannot strip one component off url '%s'"
12202 msgstr "无法从 url '%s' 剥离一个组件"
12204 #: builtin/submodule--helper.c:282 builtin/submodule--helper.c:408
12205 #: builtin/submodule--helper.c:590
12206 msgid "alternative anchor for relative paths"
12207 msgstr "相对路径的替代锚记(anchor)"
12209 #: builtin/submodule--helper.c:287
12210 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
12211 msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
12213 #: builtin/submodule--helper.c:329 builtin/submodule--helper.c:343
12215 msgid "No url found for submodule path '%s' in .gitmodules"
12216 msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url"
12218 #: builtin/submodule--helper.c:369
12220 msgid "Failed to register url for submodule path '%s'"
12221 msgstr "无法为子模组 '%s' 注册 url"
12223 #: builtin/submodule--helper.c:373
12225 msgid "Submodule '%s' (%s) registered for path '%s'\n"
12226 msgstr "子模组 '%s'(%s)未对路径 '%s' 注册\n"
12229 #: builtin/submodule--helper.c:383
12231 msgid "warning: command update mode suggested for submodule '%s'\n"
12232 msgstr "警告:建议子模组 '%s' 使用命令更新模式\n"
12234 #: builtin/submodule--helper.c:390
12236 msgid "Failed to register update mode for submodule path '%s'"
12237 msgstr "无法为子模组 '%s' 注册更新模式"
12239 #: builtin/submodule--helper.c:409
12240 msgid "Suppress output for initializing a submodule"
12241 msgstr "初始化子模组时抑制输出"
12243 #: builtin/submodule--helper.c:414
12244 msgid "git submodule--helper init [<path>]"
12245 msgstr "git submodule--helper init [<路径>]"
12247 #: builtin/submodule--helper.c:435
12248 msgid "git submodule--helper name <path>"
12249 msgstr "git submodule--helper name <路径>"
12251 #: builtin/submodule--helper.c:441
12253 msgid "no submodule mapping found in .gitmodules for path '%s'"
12254 msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射"
12256 #: builtin/submodule--helper.c:524 builtin/submodule--helper.c:527
12258 msgid "submodule '%s' cannot add alternate: %s"
12259 msgstr "子模组 '%s' 不能添加仓库备选:%s"
12261 #: builtin/submodule--helper.c:563
12263 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
12264 msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'"
12266 #: builtin/submodule--helper.c:570
12268 msgid "Value '%s' for submodule.alternateLocation is not recognized"
12269 msgstr "不能识别 submodule.alternateLocaion 的取值 '%s'"
12271 #: builtin/submodule--helper.c:593
12272 msgid "where the new submodule will be cloned to"
12273 msgstr "新的子模组将要克隆的路径"
12275 #: builtin/submodule--helper.c:596
12276 msgid "name of the new submodule"
12279 #: builtin/submodule--helper.c:599
12280 msgid "url where to clone the submodule from"
12281 msgstr "克隆子模组的 url 地址"
12283 #: builtin/submodule--helper.c:605
12284 msgid "depth for shallow clones"
12287 #: builtin/submodule--helper.c:608 builtin/submodule--helper.c:964
12288 msgid "force cloning progress"
12291 #: builtin/submodule--helper.c:613
12293 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
12294 "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
12296 "git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
12297 "[--name <名字>] [--depth <深度>] --url <url> --path <路径>"
12299 #: builtin/submodule--helper.c:638 builtin/submodule--helper.c:648
12301 msgid "could not create directory '%s'"
12302 msgstr "不能创建目录 '%s'"
12304 #: builtin/submodule--helper.c:644
12306 msgid "clone of '%s' into submodule path '%s' failed"
12307 msgstr "无法克隆 '%s' 到子模组路径 '%s'"
12309 #: builtin/submodule--helper.c:660
12311 msgid "cannot open file '%s'"
12312 msgstr "无法打开文件 '%s'"
12314 #: builtin/submodule--helper.c:665
12316 msgid "could not close file %s"
12319 #: builtin/submodule--helper.c:672
12321 msgid "could not get submodule directory for '%s'"
12322 msgstr "无法得到 '%s' 的子模组目录"
12324 #: builtin/submodule--helper.c:726
12326 msgid "Submodule path '%s' not initialized"
12327 msgstr "子模组 '%s' 尚未初始化"
12329 #: builtin/submodule--helper.c:730
12330 msgid "Maybe you want to use 'update --init'?"
12331 msgstr "也许您想要执行 'update --init'?"
12333 #: builtin/submodule--helper.c:756
12335 msgid "Skipping unmerged submodule %s"
12336 msgstr "略过未合并的子模组 %s"
12338 #: builtin/submodule--helper.c:777
12340 msgid "Skipping submodule '%s'"
12341 msgstr "略过子模组 '%s'"
12343 #: builtin/submodule--helper.c:913
12345 msgid "Failed to clone '%s'. Retry scheduled"
12346 msgstr "克隆 '%s' 失败。按计划重试"
12348 #: builtin/submodule--helper.c:924
12350 msgid "Failed to clone '%s' a second time, aborting"
12351 msgstr "第二次尝试克隆 '%s' 失败,退出"
12353 #: builtin/submodule--helper.c:945
12354 msgid "path into the working tree"
12357 #: builtin/submodule--helper.c:948
12358 msgid "path into the working tree, across nested submodule boundaries"
12359 msgstr "工作区中的路径,递归嵌套子模组"
12361 #: builtin/submodule--helper.c:952
12362 msgid "rebase, merge, checkout or none"
12363 msgstr "rebase、merge、checkout 或 none"
12365 #: builtin/submodule--helper.c:956
12366 msgid "Create a shallow clone truncated to the specified number of revisions"
12367 msgstr "创建一个指定深度的浅克隆"
12369 #: builtin/submodule--helper.c:959
12370 msgid "parallel jobs"
12373 #: builtin/submodule--helper.c:961
12374 msgid "whether the initial clone should follow the shallow recommendation"
12375 msgstr "初始克隆是否应该遵守推荐的浅克隆选项"
12377 #: builtin/submodule--helper.c:962
12378 msgid "don't print cloning progress"
12381 #: builtin/submodule--helper.c:969
12382 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
12383 msgstr "git submodule--helper update_clone [--prefix=<路径>] [<路径>...]"
12385 #: builtin/submodule--helper.c:979
12386 msgid "bad value for update parameter"
12387 msgstr "update 参数取值错误"
12389 #: builtin/submodule--helper.c:1050
12392 "Submodule (%s) branch configured to inherit branch from superproject, but "
12393 "the superproject is not on any branch"
12394 msgstr "子模组(%s)的分支配置为继承上级项目的分支,但是上级项目不在任何分支上"
12396 #: builtin/submodule--helper.c:1100
12397 msgid "submodule--helper subcommand must be called with a subcommand"
12398 msgstr "submodule-helper 子命令必须由另外的子命令调用"
12400 #: builtin/submodule--helper.c:1107
12402 msgid "'%s' is not a valid submodule--helper subcommand"
12403 msgstr "'%s' 不是一个有效的 submodule--helper 子命令"
12405 #: builtin/symbolic-ref.c:7
12406 msgid "git symbolic-ref [<options>] <name> [<ref>]"
12407 msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
12409 #: builtin/symbolic-ref.c:8
12410 msgid "git symbolic-ref -d [-q] <name>"
12411 msgstr "git symbolic-ref -d [-q] <名称>"
12413 #: builtin/symbolic-ref.c:40
12414 msgid "suppress error message for non-symbolic (detached) refs"
12415 msgstr "不显示非符号(分离的)引用的错误信息"
12417 #: builtin/symbolic-ref.c:41
12418 msgid "delete symbolic ref"
12421 #: builtin/symbolic-ref.c:42
12422 msgid "shorten ref output"
12425 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
12429 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
12430 msgid "reason of the update"
12433 #: builtin/tag.c:23
12435 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
12438 "git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]"
12440 #: builtin/tag.c:24
12441 msgid "git tag -d <tagname>..."
12442 msgstr "git tag -d <标签名>..."
12444 #: builtin/tag.c:25
12446 "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
12447 "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
12449 "git tag -l [-n[<数字>]] [--contains <提交>] [--points-at <对象>]\n"
12450 "\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]"
12452 #: builtin/tag.c:27
12453 msgid "git tag -v <tagname>..."
12454 msgstr "git tag -v <标签名>..."
12456 #: builtin/tag.c:81
12458 msgid "tag name too long: %.*s..."
12459 msgstr "标签名称太长:%.*s..."
12461 #: builtin/tag.c:86
12463 msgid "tag '%s' not found."
12464 msgstr "未发现标签 '%s'。"
12466 #: builtin/tag.c:101
12468 msgid "Deleted tag '%s' (was %s)\n"
12469 msgstr "已删除标签 '%s'(曾为 %s)\n"
12471 #: builtin/tag.c:117
12475 "Write a message for tag:\n"
12477 "Lines starting with '%c' will be ignored.\n"
12482 "以 '%c' 开头的行将被忽略。\n"
12484 #: builtin/tag.c:121
12488 "Write a message for tag:\n"
12490 "Lines starting with '%c' will be kept; you may remove them yourself if you "
12496 "以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
12498 #: builtin/tag.c:199
12499 msgid "unable to sign the tag"
12502 #: builtin/tag.c:201
12503 msgid "unable to write tag file"
12506 #: builtin/tag.c:226
12507 msgid "bad object type."
12510 #: builtin/tag.c:239
12511 msgid "tag header too big."
12514 #: builtin/tag.c:275
12515 msgid "no tag message?"
12518 #: builtin/tag.c:281
12520 msgid "The tag message has been left in %s\n"
12521 msgstr "标签说明被保留在 %s\n"
12523 #: builtin/tag.c:339
12524 msgid "list tag names"
12527 #: builtin/tag.c:341
12528 msgid "print <n> lines of each tag message"
12529 msgstr "每个标签信息打印 <n> 行"
12531 #: builtin/tag.c:343
12532 msgid "delete tags"
12535 #: builtin/tag.c:344
12536 msgid "verify tags"
12539 #: builtin/tag.c:346
12540 msgid "Tag creation options"
12543 #: builtin/tag.c:348
12544 msgid "annotated tag, needs a message"
12545 msgstr "附注标签,需要一个说明"
12547 #: builtin/tag.c:350
12548 msgid "tag message"
12551 #: builtin/tag.c:352
12552 msgid "annotated and GPG-signed tag"
12553 msgstr "附注并附加 GPG 签名的标签"
12555 #: builtin/tag.c:356
12556 msgid "use another key to sign the tag"
12557 msgstr "使用另外的私钥签名该标签"
12559 #: builtin/tag.c:357
12560 msgid "replace the tag if exists"
12561 msgstr "如果存在,替换现有的标签"
12563 #: builtin/tag.c:358 builtin/update-ref.c:368
12564 msgid "create a reflog"
12567 #: builtin/tag.c:360
12568 msgid "Tag listing options"
12571 #: builtin/tag.c:361
12572 msgid "show tag list in columns"
12573 msgstr "以列的方式显示标签列表"
12575 #: builtin/tag.c:362 builtin/tag.c:363
12576 msgid "print only tags that contain the commit"
12577 msgstr "只打印包含提交的标签"
12579 #: builtin/tag.c:364
12580 msgid "print only tags that are merged"
12581 msgstr "只打印已经合并的标签"
12583 #: builtin/tag.c:365
12584 msgid "print only tags that are not merged"
12585 msgstr "只打印尚未合并的标签"
12587 #: builtin/tag.c:370
12588 msgid "print only tags of the object"
12591 #: builtin/tag.c:399
12592 msgid "--column and -n are incompatible"
12593 msgstr "--column 和 -n 不兼容"
12595 #: builtin/tag.c:419
12596 msgid "-n option is only allowed with -l."
12597 msgstr "-n 选项只允许和 -l 同时使用。"
12599 #: builtin/tag.c:421
12600 msgid "--contains option is only allowed with -l."
12601 msgstr "--contains 选项只允许和 -l 同时使用。"
12603 #: builtin/tag.c:423
12604 msgid "--points-at option is only allowed with -l."
12605 msgstr "--points-at 选项只允许和 -l 同时使用。"
12607 #: builtin/tag.c:425
12608 msgid "--merged and --no-merged option are only allowed with -l"
12609 msgstr "选项 --merged 和 --no-merged 只能和 -l 共用"
12611 #: builtin/tag.c:433
12612 msgid "only one -F or -m option is allowed."
12613 msgstr "只允许一个 -F 或 -m 选项。"
12615 #: builtin/tag.c:452
12616 msgid "too many params"
12619 #: builtin/tag.c:458
12621 msgid "'%s' is not a valid tag name."
12622 msgstr "'%s' 不是一个有效的标签名称。"
12624 #: builtin/tag.c:463
12626 msgid "tag '%s' already exists"
12627 msgstr "标签 '%s' 已存在"
12629 #: builtin/tag.c:491
12631 msgid "Updated tag '%s' (was %s)\n"
12632 msgstr "已更新标签 '%s'(曾为 %s)\n"
12634 #: builtin/unpack-objects.c:493
12635 msgid "Unpacking objects"
12638 #: builtin/update-index.c:79
12640 msgid "failed to create directory %s"
12643 #: builtin/update-index.c:85
12645 msgid "failed to stat %s"
12646 msgstr "无法枚举 %s 状态"
12648 #: builtin/update-index.c:95
12650 msgid "failed to create file %s"
12653 #: builtin/update-index.c:103
12655 msgid "failed to delete file %s"
12658 #: builtin/update-index.c:110 builtin/update-index.c:212
12660 msgid "failed to delete directory %s"
12663 #: builtin/update-index.c:133
12665 msgid "Testing mtime in '%s' "
12666 msgstr "在 '%s' 中测试 mtime "
12668 #: builtin/update-index.c:145
12669 msgid "directory stat info does not change after adding a new file"
12670 msgstr "添加一个新文件后,目录的状态信息未改变"
12672 #: builtin/update-index.c:158
12673 msgid "directory stat info does not change after adding a new directory"
12674 msgstr "添加一个新目录后,目录的状态信息未改变"
12676 #: builtin/update-index.c:171
12677 msgid "directory stat info changes after updating a file"
12678 msgstr "更新一个文件后,目录的状态信息被修改"
12680 #: builtin/update-index.c:182
12681 msgid "directory stat info changes after adding a file inside subdirectory"
12682 msgstr "在子目录中添加文件后,目录的状态信息被修改"
12684 #: builtin/update-index.c:193
12685 msgid "directory stat info does not change after deleting a file"
12686 msgstr "删除一个文件后,目录的状态信息未改变"
12688 #: builtin/update-index.c:206
12689 msgid "directory stat info does not change after deleting a directory"
12690 msgstr "删除一个目录后,目录的状态信息未改变"
12692 #: builtin/update-index.c:213
12696 #: builtin/update-index.c:564
12697 msgid "git update-index [<options>] [--] [<file>...]"
12698 msgstr "git update-index [<选项>] [--] [<文件>...]"
12700 #: builtin/update-index.c:919
12701 msgid "continue refresh even when index needs update"
12702 msgstr "当索引需要更新时继续刷新"
12704 #: builtin/update-index.c:922
12705 msgid "refresh: ignore submodules"
12708 #: builtin/update-index.c:925
12709 msgid "do not ignore new files"
12712 #: builtin/update-index.c:927
12713 msgid "let files replace directories and vice-versa"
12714 msgstr "让文件替换目录(反之亦然)"
12716 #: builtin/update-index.c:929
12717 msgid "notice files missing from worktree"
12718 msgstr "通知文件从工作区丢失"
12720 #: builtin/update-index.c:931
12721 msgid "refresh even if index contains unmerged entries"
12722 msgstr "即使索引区包含未合并的条目也执行刷新"
12724 #: builtin/update-index.c:934
12725 msgid "refresh stat information"
12728 #: builtin/update-index.c:938
12729 msgid "like --refresh, but ignore assume-unchanged setting"
12730 msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
12732 #: builtin/update-index.c:942
12733 msgid "<mode>,<object>,<path>"
12734 msgstr "<存取模式>,<对象>,<路径>"
12736 #: builtin/update-index.c:943
12737 msgid "add the specified entry to the index"
12738 msgstr "添加指定的条目到索引区"
12740 #: builtin/update-index.c:952
12741 msgid "mark files as \"not changing\""
12742 msgstr "把文件标记为 \"没有变更\""
12744 #: builtin/update-index.c:955
12745 msgid "clear assumed-unchanged bit"
12746 msgstr "清除 assumed-unchanged 位"
12748 #: builtin/update-index.c:958
12749 msgid "mark files as \"index-only\""
12750 msgstr "把文件标记为 \"仅索引\""
12752 #: builtin/update-index.c:961
12753 msgid "clear skip-worktree bit"
12754 msgstr "清除 skip-worktree 位"
12756 #: builtin/update-index.c:964
12757 msgid "add to index only; do not add content to object database"
12758 msgstr "只添加到索引区;不添加对象到对象库"
12760 #: builtin/update-index.c:966
12761 msgid "remove named paths even if present in worktree"
12762 msgstr "即使存在工作区里,也删除路径"
12764 #: builtin/update-index.c:968
12765 msgid "with --stdin: input lines are terminated by null bytes"
12766 msgstr "携带 --stdin:输入的行以 null 字符终止"
12768 #: builtin/update-index.c:970
12769 msgid "read list of paths to be updated from standard input"
12770 msgstr "从标准输入中读取需要更新的路径列表"
12772 #: builtin/update-index.c:974
12773 msgid "add entries from standard input to the index"
12774 msgstr "从标准输入添加条目到索引区"
12776 #: builtin/update-index.c:978
12777 msgid "repopulate stages #2 and #3 for the listed paths"
12778 msgstr "为指定文件重新生成第2和第3暂存区"
12780 #: builtin/update-index.c:982
12781 msgid "only update entries that differ from HEAD"
12782 msgstr "只更新与 HEAD 不同的条目"
12784 #: builtin/update-index.c:986
12785 msgid "ignore files missing from worktree"
12786 msgstr "忽略工作区丢失的文件"
12788 #: builtin/update-index.c:989
12789 msgid "report actions to standard output"
12792 #: builtin/update-index.c:991
12793 msgid "(for porcelains) forget saved unresolved conflicts"
12794 msgstr "(for porcelains) 忘记保存的未解决的冲突"
12796 #: builtin/update-index.c:995
12797 msgid "write index in this format"
12798 msgstr "以这种格式写入索引区"
12800 #: builtin/update-index.c:997
12801 msgid "enable or disable split index"
12804 #: builtin/update-index.c:999
12805 msgid "enable/disable untracked cache"
12806 msgstr "启用/禁用对未跟踪文件的缓存"
12808 #: builtin/update-index.c:1001
12809 msgid "test if the filesystem supports untracked cache"
12810 msgstr "测试文件系统是否支持未跟踪文件缓存"
12812 #: builtin/update-index.c:1003
12813 msgid "enable untracked cache without testing the filesystem"
12814 msgstr "无需检测文件系统,启用对未跟踪文件的缓存"
12816 #: builtin/update-index.c:1119
12818 "core.untrackedCache is set to true; remove or change it, if you really want "
12819 "to disable the untracked cache"
12821 "core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存,请删除或修"
12824 #: builtin/update-index.c:1123
12825 msgid "Untracked cache disabled"
12826 msgstr "缓存未跟踪文件被禁用"
12828 #: builtin/update-index.c:1131
12830 "core.untrackedCache is set to false; remove or change it, if you really want "
12831 "to enable the untracked cache"
12833 "core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存,请删除或"
12836 #: builtin/update-index.c:1135
12838 msgid "Untracked cache enabled for '%s'"
12839 msgstr "缓存未跟踪文件在 '%s' 启用"
12841 #: builtin/update-ref.c:9
12842 msgid "git update-ref [<options>] -d <refname> [<old-val>]"
12843 msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
12845 #: builtin/update-ref.c:10
12846 msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
12847 msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]"
12849 #: builtin/update-ref.c:11
12850 msgid "git update-ref [<options>] --stdin [-z]"
12851 msgstr "git update-ref [<选项>] --stdin [-z]"
12853 #: builtin/update-ref.c:363
12854 msgid "delete the reference"
12857 #: builtin/update-ref.c:365
12858 msgid "update <refname> not the one it points to"
12859 msgstr "更新 <引用名> 本身而不是它指向的引用"
12861 #: builtin/update-ref.c:366
12862 msgid "stdin has NUL-terminated arguments"
12863 msgstr "标准输入有以 NUL 字符终止的参数"
12865 #: builtin/update-ref.c:367
12866 msgid "read updates from stdin"
12869 #: builtin/update-server-info.c:6
12870 msgid "git update-server-info [--force]"
12871 msgstr "git update-server-info [--force]"
12873 #: builtin/update-server-info.c:14
12874 msgid "update the info files from scratch"
12875 msgstr "从头开始更新文件信息"
12877 #: builtin/verify-commit.c:17
12878 msgid "git verify-commit [-v | --verbose] <commit>..."
12879 msgstr "git verify-commit [-v | --verbose] <提交>..."
12881 #: builtin/verify-commit.c:72
12882 msgid "print commit contents"
12885 #: builtin/verify-commit.c:73 builtin/verify-tag.c:35
12886 msgid "print raw gpg status output"
12887 msgstr "打印原始 gpg 状态输出"
12889 #: builtin/verify-pack.c:54
12890 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
12891 msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
12893 #: builtin/verify-pack.c:64
12897 #: builtin/verify-pack.c:66
12898 msgid "show statistics only"
12901 #: builtin/verify-tag.c:17
12902 msgid "git verify-tag [-v | --verbose] <tag>..."
12903 msgstr "git verify-tag [-v | --verbose] <标签>..."
12905 #: builtin/verify-tag.c:34
12906 msgid "print tag contents"
12909 #: builtin/worktree.c:15
12910 msgid "git worktree add [<options>] <path> [<branch>]"
12911 msgstr "git worktree add [<选项>] <路径> [<分支>]"
12913 #: builtin/worktree.c:16
12914 msgid "git worktree list [<options>]"
12915 msgstr "git worktree list [<选项>]"
12917 #: builtin/worktree.c:17
12918 msgid "git worktree lock [<options>] <path>"
12919 msgstr "git worktree lock [<选项>] <路径>"
12921 #: builtin/worktree.c:18
12922 msgid "git worktree prune [<options>]"
12923 msgstr "git worktree prune [<选项>]"
12925 #: builtin/worktree.c:19
12926 msgid "git worktree unlock <path>"
12927 msgstr "git worktree unlock <路径>"
12929 #: builtin/worktree.c:42
12931 msgid "Removing worktrees/%s: not a valid directory"
12932 msgstr "删除工作区/%s:不是一个有效的目录"
12934 #: builtin/worktree.c:48
12936 msgid "Removing worktrees/%s: gitdir file does not exist"
12937 msgstr "删除 worktrees/%s:gitdir 文件不存在"
12939 #: builtin/worktree.c:53
12941 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
12942 msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)"
12944 #: builtin/worktree.c:64
12946 msgid "Removing worktrees/%s: invalid gitdir file"
12947 msgstr "删除 worktrees/%s:无效的 gitdir 文件"
12949 #: builtin/worktree.c:80
12951 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
12952 msgstr "删除 worktrees/%s:gitdir 文件的指向不存在"
12954 #: builtin/worktree.c:204
12956 msgid "'%s' already exists"
12959 #: builtin/worktree.c:236
12961 msgid "could not create directory of '%s'"
12962 msgstr "不能创建目录 '%s'"
12964 #: builtin/worktree.c:272
12966 msgid "Preparing %s (identifier %s)"
12967 msgstr "准备 %s (标识符 %s)"
12969 #: builtin/worktree.c:323
12970 msgid "checkout <branch> even if already checked out in other worktree"
12971 msgstr "检出分支 <branch> 即使已经被检出到其它工作区"
12973 #: builtin/worktree.c:325
12974 msgid "create a new branch"
12977 #: builtin/worktree.c:327
12978 msgid "create or reset a branch"
12981 #: builtin/worktree.c:329
12982 msgid "populate the new working tree"
12985 #: builtin/worktree.c:337
12986 msgid "-b, -B, and --detach are mutually exclusive"
12987 msgstr "-b、-B 和 --detach 是互斥的"
12989 #: builtin/worktree.c:470
12990 msgid "reason for locking"
12993 #: builtin/worktree.c:482 builtin/worktree.c:515
12995 msgid "'%s' is not a working tree"
12996 msgstr "'%s' 不是一个工作区"
12998 #: builtin/worktree.c:484 builtin/worktree.c:517
12999 msgid "The main working tree cannot be locked or unlocked"
13000 msgstr "主工作区无法被加锁或解锁"
13002 #: builtin/worktree.c:489
13004 msgid "'%s' is already locked, reason: %s"
13005 msgstr "'%s' 已被锁定,原因:%s"
13007 #: builtin/worktree.c:491
13009 msgid "'%s' is already locked"
13012 #: builtin/worktree.c:519
13014 msgid "'%s' is not locked"
13017 #: builtin/write-tree.c:13
13018 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
13019 msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
13021 #: builtin/write-tree.c:26
13025 #: builtin/write-tree.c:27
13026 msgid "write tree object for a subdirectory <prefix>"
13027 msgstr "将 <前缀> 子目录内容写到一个树对象"
13029 #: builtin/write-tree.c:30
13030 msgid "only useful for debugging"
13033 #: upload-pack.c:22
13034 msgid "git upload-pack [<options>] <dir>"
13035 msgstr "git upload-pack [<选项>] <目录>"
13037 #: upload-pack.c:1028
13038 msgid "quit after a single request/response exchange"
13039 msgstr "在一次单独的请求/响应(request/response)交换后退出"
13041 #: upload-pack.c:1030
13042 msgid "exit immediately after initial ref advertisement"
13043 msgstr "在初始的引用广告后立即退出"
13045 #: upload-pack.c:1032
13046 msgid "do not try <directory>/.git/ if <directory> is no Git directory"
13047 msgstr "不要尝试 <directory>/.git/ 如果 <directory> 不是一个 Git 目录"
13049 #: upload-pack.c:1034
13050 msgid "interrupt transfer after <n> seconds of inactivity"
13051 msgstr "不活动 <n> 秒钟后终止传输"
13053 #: credential-cache--daemon.c:223
13056 "The permissions on your socket directory are too loose; other\n"
13057 "users may be able to read your cached credentials. Consider running:\n"
13061 "您 socket 目录权限过于放松,其他用户可能会读取您缓存的认证信息。考虑执行:\n"
13065 #: credential-cache--daemon.c:271
13066 msgid "print debugging messages to stderr"
13067 msgstr "调试信息输出到标准错误"
13071 "'git help -a' and 'git help -g' list available subcommands and some\n"
13072 "concept guides. See 'git help <command>' or 'git help <concept>'\n"
13073 "to read about a specific subcommand or concept."
13075 "命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
13076 "查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
13080 msgid "Delegation control is not supported with cURL < 7.22.0"
13081 msgstr "当 cURL < 7.22.0 时,不支持委托控制"
13084 msgid "Public key pinning not supported with cURL < 7.44.0"
13085 msgstr "不支持公钥文件锁定,因为 cURL < 7.44.0"
13088 msgid "start a working area (see also: git help tutorial)"
13089 msgstr "开始一个工作区(参见:git help tutorial)"
13091 #: common-cmds.h:10
13092 msgid "work on the current change (see also: git help everyday)"
13093 msgstr "在当前变更上工作(参见:git help everyday)"
13095 #: common-cmds.h:11
13096 msgid "examine the history and state (see also: git help revisions)"
13097 msgstr "检查历史和状态(参见:git help revisions)"
13099 #: common-cmds.h:12
13100 msgid "grow, mark and tweak your common history"
13101 msgstr "扩展、标记和调校您的历史记录"
13103 #: common-cmds.h:13
13104 msgid "collaborate (see also: git help workflows)"
13105 msgstr "协同(参见:git help workflows)"
13107 #: common-cmds.h:17
13108 msgid "Add file contents to the index"
13111 #: common-cmds.h:18
13112 msgid "Use binary search to find the commit that introduced a bug"
13113 msgstr "通过二分查找定位引入 bug 的提交"
13115 #: common-cmds.h:19
13116 msgid "List, create, or delete branches"
13117 msgstr "列出、创建或删除分支"
13119 #: common-cmds.h:20
13120 msgid "Switch branches or restore working tree files"
13121 msgstr "切换分支或恢复工作区文件"
13123 #: common-cmds.h:21
13124 msgid "Clone a repository into a new directory"
13125 msgstr "克隆一个仓库到一个新目录"
13127 #: common-cmds.h:22
13128 msgid "Record changes to the repository"
13131 #: common-cmds.h:23
13132 msgid "Show changes between commits, commit and working tree, etc"
13133 msgstr "显示提交之间、提交和工作区之间等的差异"
13135 #: common-cmds.h:24
13136 msgid "Download objects and refs from another repository"
13137 msgstr "从另外一个仓库下载对象和引用"
13139 #: common-cmds.h:25
13140 msgid "Print lines matching a pattern"
13143 #: common-cmds.h:26
13144 msgid "Create an empty Git repository or reinitialize an existing one"
13145 msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库"
13147 #: common-cmds.h:27
13148 msgid "Show commit logs"
13151 #: common-cmds.h:28
13152 msgid "Join two or more development histories together"
13153 msgstr "合并两个或更多开发历史"
13155 #: common-cmds.h:29
13156 msgid "Move or rename a file, a directory, or a symlink"
13157 msgstr "移动或重命名一个文件、目录或符号链接"
13159 #: common-cmds.h:30
13160 msgid "Fetch from and integrate with another repository or a local branch"
13161 msgstr "获取并整合另外的仓库或一个本地分支"
13163 #: common-cmds.h:31
13164 msgid "Update remote refs along with associated objects"
13165 msgstr "更新远程引用和相关的对象"
13167 #: common-cmds.h:32
13168 msgid "Reapply commits on top of another base tip"
13169 msgstr "在另一个分支上重新应用提交"
13171 #: common-cmds.h:33
13172 msgid "Reset current HEAD to the specified state"
13173 msgstr "重置当前 HEAD 到指定状态"
13175 #: common-cmds.h:34
13176 msgid "Remove files from the working tree and from the index"
13177 msgstr "从工作区和索引中删除文件"
13179 #: common-cmds.h:35
13180 msgid "Show various types of objects"
13183 #: common-cmds.h:36
13184 msgid "Show the working tree status"
13187 #: common-cmds.h:37
13188 msgid "Create, list, delete or verify a tag object signed with GPG"
13189 msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象"
13191 #: parse-options.h:145
13192 msgid "expiry-date"
13195 #: parse-options.h:160
13196 msgid "no-op (backward compatibility)"
13199 #: parse-options.h:238
13200 msgid "be more verbose"
13203 #: parse-options.h:240
13204 msgid "be more quiet"
13207 #: parse-options.h:246
13208 msgid "use <n> digits to display SHA-1s"
13209 msgstr "用 <n> 位数字显示 SHA-1 哈希值"
13212 msgid "update the index with reused conflict resolution if possible"
13213 msgstr "如果可能,重用冲突解决更新索引"
13215 #: git-bisect.sh:54
13216 msgid "You need to start by \"git bisect start\""
13217 msgstr "您需要执行 \"git bisect start\" 来开始"
13220 #. TRANSLATORS: Make sure to include [Y] and [n] in your
13221 #. translation. The program will only accept English input
13223 #: git-bisect.sh:60
13224 msgid "Do you want me to do it for you [Y/n]? "
13225 msgstr "您想让我为您这样做么[Y/n]? "
13227 #: git-bisect.sh:121
13229 msgid "unrecognised option: '$arg'"
13230 msgstr "未能识别的选项:'$arg'"
13232 #: git-bisect.sh:125
13234 msgid "'$arg' does not appear to be a valid revision"
13235 msgstr "'$arg' 看起来不像是一个有效的版本"
13237 #: git-bisect.sh:154
13238 msgid "Bad HEAD - I need a HEAD"
13239 msgstr "坏的 HEAD - 我需要一个 HEAD"
13241 #: git-bisect.sh:167
13244 "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
13245 msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。"
13247 #: git-bisect.sh:177
13248 msgid "won't bisect on cg-seek'ed tree"
13249 msgstr "不会在做了 cg-seek 的树上做二分查找"
13251 #: git-bisect.sh:181
13252 msgid "Bad HEAD - strange symbolic ref"
13253 msgstr "坏的 HEAD - 奇怪的符号引用"
13255 #: git-bisect.sh:233
13257 msgid "Bad bisect_write argument: $state"
13258 msgstr "坏的 bisect_write 参数:$state"
13260 #: git-bisect.sh:262
13262 msgid "Bad rev input: $arg"
13263 msgstr "坏的输入版本:$arg"
13265 #: git-bisect.sh:281
13267 msgid "Bad rev input: $bisected_head"
13268 msgstr "坏的输入版本:$bisected_head"
13270 #: git-bisect.sh:290
13272 msgid "Bad rev input: $rev"
13273 msgstr "坏的输入版本:$rev"
13275 #: git-bisect.sh:299
13277 msgid "'git bisect $TERM_BAD' can take only one argument."
13278 msgstr "'git bisect $TERM_BAD' 只能带一个参数。"
13280 #: git-bisect.sh:322
13282 msgid "Warning: bisecting only with a $TERM_BAD commit."
13283 msgstr "警告:在仅有一个坏($TERM_BAD)提交下进行二分查找。"
13286 #. TRANSLATORS: Make sure to include [Y] and [n] in your
13287 #. translation. The program will only accept English input
13289 #: git-bisect.sh:328
13290 msgid "Are you sure [Y/n]? "
13291 msgstr "您确认么[Y/n]? "
13293 #: git-bisect.sh:340
13296 "You need to give me at least one $bad_syn and one $good_syn revision.\n"
13297 "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
13299 "您需要给我至少一个好版本和一个坏版本。\n"
13300 "(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
13302 #: git-bisect.sh:343
13305 "You need to start by \"git bisect start\".\n"
13306 "You then need to give me at least one $good_syn and one $bad_syn revision.\n"
13307 "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
13309 "您需要执行 \"git bisect start\" 来开始。\n"
13310 "然后需要提供我至少一个好版本和一个坏版本。\n"
13311 "(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
13313 #: git-bisect.sh:414 git-bisect.sh:546
13314 msgid "We are not bisecting."
13315 msgstr "我们没有在二分查找。"
13317 #: git-bisect.sh:421
13319 msgid "'$invalid' is not a valid commit"
13320 msgstr "'$invalid' 不是一个有效的提交"
13322 #: git-bisect.sh:430
13325 "Could not check out original HEAD '$branch'.\n"
13326 "Try 'git bisect reset <commit>'."
13328 "不能检出原始 HEAD '$branch'。\n"
13329 "尝试 'git bisect reset <提交>'。"
13331 #: git-bisect.sh:458
13332 msgid "No logfile given"
13335 #: git-bisect.sh:459
13337 msgid "cannot read $file for replaying"
13338 msgstr "不能读取 $file 来重放"
13340 #: git-bisect.sh:480
13341 msgid "?? what are you talking about?"
13344 #: git-bisect.sh:492
13346 msgid "running $command"
13347 msgstr "运行 $command"
13349 #: git-bisect.sh:499
13352 "bisect run failed:\n"
13353 "exit code $res from '$command' is < 0 or >= 128"
13356 "命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
13358 #: git-bisect.sh:525
13359 msgid "bisect run cannot continue any more"
13360 msgstr "二分查找不能继续运行"
13362 #: git-bisect.sh:531
13365 "bisect run failed:\n"
13366 "'bisect_state $state' exited with error code $res"
13369 "'bisect_state $state' 退出码为 $res"
13371 #: git-bisect.sh:538
13372 msgid "bisect run success"
13375 #: git-bisect.sh:565
13376 msgid "please use two different terms"
13377 msgstr "请使用两个不同的术语"
13379 #: git-bisect.sh:575
13381 msgid "'$term' is not a valid term"
13382 msgstr "'$term' 不是一个有效的名称"
13384 #: git-bisect.sh:578
13386 msgid "can't use the builtin command '$term' as a term"
13387 msgstr "不能使用内置命令 '$term' 作为术语"
13389 #: git-bisect.sh:587 git-bisect.sh:593
13391 msgid "can't change the meaning of term '$term'"
13392 msgstr "不能修改术语 '$term' 的含义"
13394 #: git-bisect.sh:606
13396 msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
13397 msgstr "无效的命令:您当前正处于一个 $TERM_BAD/$TERM_GOOD 二分查找。"
13399 #: git-bisect.sh:636
13400 msgid "no terms defined"
13403 #: git-bisect.sh:653
13406 "invalid argument $arg for 'git bisect terms'.\n"
13407 "Supported options are: --term-good|--term-old and --term-bad|--term-new."
13409 "参数 $arg 对命令 'git bisect terms' 无效。\n"
13410 "支持的选项有:--term-good|--term-old 和 --term-bad|--term-new。"
13412 #: git-merge-octopus.sh:46
13414 "Error: Your local changes to the following files would be overwritten by "
13416 msgstr "错误:您对下列文件的本地修改将被合并操作覆盖"
13418 #: git-merge-octopus.sh:61
13419 msgid "Automated merge did not work."
13422 #: git-merge-octopus.sh:62
13423 msgid "Should not be doing an octopus."
13424 msgstr "不应该执行章鱼式合并。"
13426 #: git-merge-octopus.sh:73
13428 msgid "Unable to find common commit with $pretty_name"
13429 msgstr "无法找到和 $pretty_name 的基线提交"
13431 #: git-merge-octopus.sh:77
13433 msgid "Already up-to-date with $pretty_name"
13434 msgstr "已经和 $pretty_name 保持一致"
13436 #: git-merge-octopus.sh:89
13438 msgid "Fast-forwarding to: $pretty_name"
13439 msgstr "快进至:$pretty_name"
13441 #: git-merge-octopus.sh:97
13443 msgid "Trying simple merge with $pretty_name"
13444 msgstr "尝试和 $pretty_name 的简单合并"
13446 #: git-merge-octopus.sh:102
13447 msgid "Simple merge did not work, trying automatic merge."
13448 msgstr "简单合并未生效,尝试自动合并。"
13450 #: git-rebase.sh:56
13452 "When you have resolved this problem, run \"git rebase --continue\".\n"
13453 "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
13454 "To check out the original branch and stop rebasing, run \"git rebase --abort"
13457 "当您解决了此问题后,执行 \"git rebase --continue\"。\n"
13458 "如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
13459 "要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
13461 #: git-rebase.sh:156 git-rebase.sh:395
13463 msgid "Could not move back to $head_name"
13464 msgstr "无法移回 $head_name"
13466 #: git-rebase.sh:167
13467 msgid "Applied autostash."
13468 msgstr "成功应用 autostash。"
13470 #: git-rebase.sh:170
13472 msgid "Cannot store $stash_sha1"
13473 msgstr "无法保存 $stash_sha1"
13475 #: git-rebase.sh:171
13477 "Applying autostash resulted in conflicts.\n"
13478 "Your changes are safe in the stash.\n"
13479 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
13481 "应用 autostash 导致冲突。\n"
13482 "您的修改安全地保存在 stash 中。\n"
13483 "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
13485 #: git-rebase.sh:210
13486 msgid "The pre-rebase hook refused to rebase."
13487 msgstr "钩子 pre-rebase 拒绝变基操作。"
13489 #: git-rebase.sh:215
13490 msgid "It looks like git-am is in progress. Cannot rebase."
13491 msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
13493 #: git-rebase.sh:356
13494 msgid "No rebase in progress?"
13495 msgstr "没有正在进行的变基?"
13497 #: git-rebase.sh:367
13498 msgid "The --edit-todo action can only be used during interactive rebase."
13499 msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
13501 #: git-rebase.sh:374
13502 msgid "Cannot read HEAD"
13505 #: git-rebase.sh:377
13507 "You must edit all merge conflicts and then\n"
13508 "mark them as resolved using git add"
13510 "您必须编辑所有的合并冲突,然后通过 git add\n"
13513 #: git-rebase.sh:414
13516 "It seems that there is already a $state_dir_base directory, and\n"
13517 "I wonder if you are in the middle of another rebase. If that is the\n"
13518 "case, please try\n"
13519 "\t$cmd_live_rebase\n"
13520 "If that is not the case, please\n"
13521 "\t$cmd_clear_stale_rebase\n"
13522 "and run me again. I am stopping in case you still have something\n"
13525 "好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n"
13527 "\t$cmd_live_rebase\n"
13529 "\t$cmd_clear_stale_rebase\n"
13530 "然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。"
13532 #: git-rebase.sh:465
13534 msgid "invalid upstream $upstream_name"
13535 msgstr "无效的上游 $upstream_name"
13537 #: git-rebase.sh:489
13539 msgid "$onto_name: there are more than one merge bases"
13540 msgstr "$onto_name: 有一个以上的合并基准"
13542 #: git-rebase.sh:492 git-rebase.sh:496
13544 msgid "$onto_name: there is no merge base"
13545 msgstr "$onto_name: 没有合并基准"
13547 #: git-rebase.sh:501
13549 msgid "Does not point to a valid commit: $onto_name"
13550 msgstr "没有指向一个有效的提交:$onto_name"
13552 #: git-rebase.sh:524
13554 msgid "fatal: no such branch: $branch_name"
13555 msgstr "严重错误:无此分支:$branch_name"
13557 #: git-rebase.sh:557
13558 msgid "Cannot autostash"
13559 msgstr "无法 autostash"
13561 #: git-rebase.sh:562
13563 msgid "Created autostash: $stash_abbrev"
13564 msgstr "创建了 autostash: $stash_abbrev"
13566 #: git-rebase.sh:566
13567 msgid "Please commit or stash them."
13568 msgstr "请提交或为它们保存进度。"
13570 #: git-rebase.sh:586
13572 msgid "Current branch $branch_name is up to date."
13573 msgstr "当前分支 $branch_name 是最新的。"
13575 #: git-rebase.sh:590
13577 msgid "Current branch $branch_name is up to date, rebase forced."
13578 msgstr "当前分支 $branch_name 是最新的,强制变基。"
13580 #: git-rebase.sh:601
13582 msgid "Changes from $mb to $onto:"
13583 msgstr "变更从 $mb 到 $onto:"
13585 #: git-rebase.sh:610
13586 msgid "First, rewinding head to replay your work on top of it..."
13587 msgstr "首先,回退分支以便在上面重放您的工作..."
13589 #: git-rebase.sh:620
13591 msgid "Fast-forwarded $branch_name to $onto_name."
13592 msgstr "快进 $branch_name 至 $onto_name。"
13595 msgid "git stash clear with parameters is unimplemented"
13596 msgstr "git stash clear 不支持参数"
13599 msgid "You do not have the initial commit yet"
13603 msgid "Cannot save the current index state"
13604 msgstr "无法保存当前索引状态"
13606 #: git-stash.sh:103
13607 msgid "Cannot save the untracked files"
13610 #: git-stash.sh:123 git-stash.sh:136
13611 msgid "Cannot save the current worktree state"
13612 msgstr "无法保存当前工作区状态"
13614 #: git-stash.sh:140
13615 msgid "No changes selected"
13618 #: git-stash.sh:143
13619 msgid "Cannot remove temporary index (can't happen)"
13620 msgstr "无法删除临时索引(不应发生)"
13622 #: git-stash.sh:156
13623 msgid "Cannot record working tree state"
13626 #: git-stash.sh:188
13628 msgid "Cannot update $ref_stash with $w_commit"
13629 msgstr "无法用 $w_commit 更新 $ref_stash"
13631 #. TRANSLATORS: $option is an invalid option, like
13632 #. `--blah-blah'. The 7 spaces at the beginning of the
13633 #. second line correspond to "error: ". So you should line
13634 #. up the second line with however many characters the
13635 #. translation of "error: " takes in your language. E.g. in
13636 #. English this is:
13638 #. $ git stash save --blah-blah 2>&1 | head -n 2
13639 #. error: unknown option for 'stash save': --blah-blah
13640 #. To provide a message, use git stash save -- '--blah-blah'
13641 #: git-stash.sh:238
13644 "error: unknown option for 'stash save': $option\n"
13645 " To provide a message, use git stash save -- '$option'"
13647 "错误:'stash save' 的未知选项:$option\n"
13648 " 要提供一个描述信息,使用 git stash save -- '$option'"
13650 #: git-stash.sh:251
13651 msgid "Can't use --patch and --include-untracked or --all at the same time"
13652 msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all"
13654 #: git-stash.sh:259
13655 msgid "No local changes to save"
13656 msgstr "没有要保存的本地修改"
13658 #: git-stash.sh:263
13659 msgid "Cannot initialize stash"
13660 msgstr "无法初始化 stash"
13662 #: git-stash.sh:267
13663 msgid "Cannot save the current status"
13666 #: git-stash.sh:268
13668 msgid "Saved working directory and index state $stash_msg"
13669 msgstr "保存工作目录和索引状态 $stash_msg"
13671 #: git-stash.sh:285
13672 msgid "Cannot remove worktree changes"
13675 #: git-stash.sh:403
13677 msgid "unknown option: $opt"
13678 msgstr "未知选项: $opt"
13680 #: git-stash.sh:416
13681 msgid "No stash found."
13682 msgstr "未发现 stash。"
13684 #: git-stash.sh:423
13686 msgid "Too many revisions specified: $REV"
13687 msgstr "指定了太多的版本:$REV"
13689 #: git-stash.sh:438
13691 msgid "$reference is not a valid reference"
13692 msgstr "$reference 不是一个有效的引用"
13694 #: git-stash.sh:466
13696 msgid "'$args' is not a stash-like commit"
13697 msgstr "'$args' 不是 stash 样提交"
13699 #: git-stash.sh:477
13701 msgid "'$args' is not a stash reference"
13702 msgstr "'$args' 不是一个 stash 引用"
13704 #: git-stash.sh:485
13705 msgid "unable to refresh index"
13708 #: git-stash.sh:489
13709 msgid "Cannot apply a stash in the middle of a merge"
13710 msgstr "无法在合并过程中恢复进度"
13712 #: git-stash.sh:497
13713 msgid "Conflicts in index. Try without --index."
13714 msgstr "索引中有冲突。尝试不使用 --index。"
13716 #: git-stash.sh:499
13717 msgid "Could not save index tree"
13720 #: git-stash.sh:508
13721 msgid "Could not restore untracked files from stash"
13722 msgstr "无法从进度保存中恢复未跟踪文件"
13724 #: git-stash.sh:533
13725 msgid "Cannot unstage modified files"
13726 msgstr "无法将修改的文件取消暂存"
13728 #: git-stash.sh:548
13729 msgid "Index was not unstashed."
13730 msgstr "索引的进度没有被恢复。"
13732 #: git-stash.sh:562
13733 msgid "The stash is kept in case you need it again."
13734 msgstr "暂存被保留以备您再次需要。"
13736 #: git-stash.sh:571
13738 msgid "Dropped ${REV} ($s)"
13739 msgstr "丢弃了 ${REV} ($s)"
13741 #: git-stash.sh:572
13743 msgid "${REV}: Could not drop stash entry"
13744 msgstr "${REV}:不能丢弃进度条目"
13746 #: git-stash.sh:580
13747 msgid "No branch name specified"
13750 #: git-stash.sh:652
13751 msgid "(To restore them type \"git stash apply\")"
13752 msgstr "(为恢复数据输入 \"git stash apply\")"
13754 #: git-submodule.sh:184
13755 msgid "Relative path can only be used from the toplevel of the working tree"
13756 msgstr "只能在工作区的顶级目录中使用相对路径"
13758 #: git-submodule.sh:194
13760 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
13761 msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
13763 #: git-submodule.sh:211
13765 msgid "'$sm_path' already exists in the index"
13766 msgstr "'$sm_path' 已经存在于索引中"
13768 #: git-submodule.sh:215
13771 "The following path is ignored by one of your .gitignore files:\n"
13773 "Use -f if you really want to add it."
13775 "以下路径被您的一个 .gitignore 文件所忽略:\n"
13777 "如果您确实想添加它,使用 -f 参数。"
13779 #: git-submodule.sh:233
13781 msgid "Adding existing repo at '$sm_path' to the index"
13782 msgstr "添加位于 '$sm_path' 的现存仓库到索引"
13784 #: git-submodule.sh:235
13786 msgid "'$sm_path' already exists and is not a valid git repo"
13787 msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库"
13789 #: git-submodule.sh:243
13791 msgid "A git directory for '$sm_name' is found locally with remote(s):"
13792 msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:"
13794 #: git-submodule.sh:245
13797 "If you want to reuse this local git directory instead of cloning again from\n"
13799 "use the '--force' option. If the local git directory is not the correct "
13801 "or you are unsure what this means choose another name with the '--name' "
13804 "如果您想要重用这个本地 git 目录而非重新克隆自\n"
13806 "使用 '--force' 选项。如果本地 git 目录不是正确的仓库\n"
13807 "或者您不确定这里的含义,使用 '--name' 选项选择另外的名称。"
13809 #: git-submodule.sh:251
13811 msgid "Reactivating local git directory for submodule '$sm_name'."
13812 msgstr "激活本地 git 目录到子模组 '$sm_name'。"
13814 #: git-submodule.sh:263
13816 msgid "Unable to checkout submodule '$sm_path'"
13817 msgstr "不能检出子模组 '$sm_path'"
13819 #: git-submodule.sh:268
13821 msgid "Failed to add submodule '$sm_path'"
13822 msgstr "无法添加子模组 '$sm_path'"
13824 #: git-submodule.sh:277
13826 msgid "Failed to register submodule '$sm_path'"
13827 msgstr "无法注册子模组 '$sm_path'"
13829 #: git-submodule.sh:324
13831 msgid "Entering '$displaypath'"
13832 msgstr "正在进入 '$displaypath'"
13834 #: git-submodule.sh:344
13836 msgid "Stopping at '$displaypath'; script returned non-zero status."
13837 msgstr "停止于 '$displaypath';脚本返回非零值。"
13839 #: git-submodule.sh:415
13841 msgid "pathspec and --all are incompatible"
13842 msgstr "pathspec 和 --all 不兼容"
13844 #: git-submodule.sh:420
13846 msgid "Use '--all' if you really want to deinitialize all submodules"
13847 msgstr "如果您确实想要对所有子模组执行取消初始化,请使用 '--all'"
13849 #: git-submodule.sh:440
13852 "Submodule work tree '$displaypath' contains a .git directory\n"
13853 "(use 'rm -rf' if you really want to remove it including all of its history)"
13855 "子模组工作区 '$displaypath' 包含一个 .git 目录\n"
13856 "(如果您真的想删除它及其全部历史,使用 'rm -rf' 命令)"
13858 #: git-submodule.sh:448
13861 "Submodule work tree '$displaypath' contains local modifications; use '-f' to "
13863 msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们"
13865 #: git-submodule.sh:451
13867 msgid "Cleared directory '$displaypath'"
13868 msgstr "已清除目录 '$displaypath'"
13870 #: git-submodule.sh:452
13872 msgid "Could not remove submodule work tree '$displaypath'"
13873 msgstr "无法移除子模组工作区 '$displaypath'"
13875 #: git-submodule.sh:455
13877 msgid "Could not create empty submodule directory '$displaypath'"
13878 msgstr "不能创建空的子模组目录 '$displaypath'"
13880 #: git-submodule.sh:464
13882 msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
13883 msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
13885 #: git-submodule.sh:617
13887 msgid "Unable to find current revision in submodule path '$displaypath'"
13888 msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
13890 #: git-submodule.sh:627
13892 msgid "Unable to fetch in submodule path '$sm_path'"
13893 msgstr "无法在子模组路径 '$sm_path' 中获取"
13895 #: git-submodule.sh:632
13898 "Unable to find current ${remote_name}/${branch} revision in submodule path "
13900 msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}"
13902 #: git-submodule.sh:650
13904 msgid "Unable to fetch in submodule path '$displaypath'"
13905 msgstr "无法在子模组路径 '$displaypath' 中获取"
13907 #: git-submodule.sh:656
13910 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
13911 "Direct fetching of that commit failed."
13913 "获取了子模组路径 '$displaypath',但是它没有包含 $sha1。直接获取该提交失败。"
13915 #: git-submodule.sh:663
13917 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
13918 msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
13920 #: git-submodule.sh:664
13922 msgid "Submodule path '$displaypath': checked out '$sha1'"
13923 msgstr "子模组路径 '$displaypath':检出 '$sha1'"
13925 #: git-submodule.sh:668
13927 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
13928 msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
13930 #: git-submodule.sh:669
13932 msgid "Submodule path '$displaypath': rebased into '$sha1'"
13933 msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
13935 #: git-submodule.sh:674
13937 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
13938 msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
13940 #: git-submodule.sh:675
13942 msgid "Submodule path '$displaypath': merged in '$sha1'"
13943 msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
13945 #: git-submodule.sh:680
13947 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
13948 msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败"
13950 #: git-submodule.sh:681
13952 msgid "Submodule path '$displaypath': '$command $sha1'"
13953 msgstr "子模组 '$displaypath':'$command $sha1'"
13955 #: git-submodule.sh:712
13957 msgid "Failed to recurse into submodule path '$displaypath'"
13958 msgstr "无法递归进子模组路径 '$displaypath'"
13960 #: git-submodule.sh:820
13961 msgid "The --cached option cannot be used with the --files option"
13962 msgstr "选项 --cached 不能和选项 --files 同时使用"
13964 #: git-submodule.sh:872
13966 msgid "unexpected mode $mod_dst"
13967 msgstr "意外的模式 $mod_dst"
13970 #: git-submodule.sh:892
13972 msgid " Warn: $display_name doesn't contain commit $sha1_src"
13973 msgstr " 警告:$display_name 未包含提交 $sha1_src"
13976 #: git-submodule.sh:895
13978 msgid " Warn: $display_name doesn't contain commit $sha1_dst"
13979 msgstr " 警告:$display_name 未包含提交 $sha1_dst"
13982 #: git-submodule.sh:898
13984 msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
13985 msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
13987 #: git-submodule.sh:1045
13989 msgid "Failed to recurse into submodule path '$sm_path'"
13990 msgstr "无法递归进子模组路径 '$sm_path'"
13992 #: git-submodule.sh:1112
13994 msgid "Synchronizing submodule url for '$displaypath'"
13995 msgstr "为 '$displaypath' 同步子模组 url"
13997 #: git-parse-remote.sh:89
13999 msgid "See git-${cmd}(1) for details."
14000 msgstr "详见 git-${cmd}(1)。"
14002 #: git-rebase--interactive.sh:131
14004 msgid "Rebasing ($new_count/$total)"
14005 msgstr "变基中($new_count/$total)"
14007 #: git-rebase--interactive.sh:147
14011 " p, pick = use commit\n"
14012 " r, reword = use commit, but edit the commit message\n"
14013 " e, edit = use commit, but stop for amending\n"
14014 " s, squash = use commit, but meld into previous commit\n"
14015 " f, fixup = like \"squash\", but discard this commit's log message\n"
14016 " x, exec = run command (the rest of the line) using shell\n"
14017 " d, drop = remove commit\n"
14019 "These lines can be re-ordered; they are executed from top to bottom.\n"
14023 " p, pick = 使用提交\n"
14024 " r, reword = 使用提交,但修改提交说明\n"
14025 " e, edit = 使用提交,但停止以便进行提交修补\n"
14026 " s, squash = 使用提交,但和前一个版本融合\n"
14027 " f, fixup = 类似于 \"squash\",但丢弃提交说明日志\n"
14028 " x, exec = 使用 shell 运行命令(此行剩余部分)\n"
14029 " d, drop = 删除提交\n"
14031 "这些行可以被重新排序;它们会被从上至下地执行。\n"
14034 #: git-rebase--interactive.sh:162
14037 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
14040 "不要删除任意一行。使用 'drop' 显式地删除一个提交。\n"
14042 #: git-rebase--interactive.sh:166
14045 "If you remove a line here THAT COMMIT WILL BE LOST.\n"
14048 "如果您在这里删除一行,对应的提交将会丢失。\n"
14050 #: git-rebase--interactive.sh:202
14053 "You can amend the commit now, with\n"
14055 "\tgit commit --amend $gpg_sign_opt_quoted\n"
14057 "Once you are satisfied with your changes, run\n"
14059 "\tgit rebase --continue"
14063 "\tgit commit --amend $gpg_sign_opt_quoted\n"
14067 "\tgit rebase --continue"
14069 #: git-rebase--interactive.sh:227
14071 msgid "$sha1: not a commit that can be picked"
14072 msgstr "$sha1:不是一个可以被拣选的提交"
14074 #: git-rebase--interactive.sh:266
14076 msgid "Invalid commit name: $sha1"
14077 msgstr "无效的提交名:$sha1"
14079 #: git-rebase--interactive.sh:308
14080 msgid "Cannot write current commit's replacement sha1"
14081 msgstr "不能写入当前提交的替代 sha1"
14083 #: git-rebase--interactive.sh:360
14085 msgid "Fast-forward to $sha1"
14088 #: git-rebase--interactive.sh:362
14090 msgid "Cannot fast-forward to $sha1"
14091 msgstr "不能快进到 $sha1"
14093 #: git-rebase--interactive.sh:371
14095 msgid "Cannot move HEAD to $first_parent"
14096 msgstr "不能移动 HEAD 到 $first_parent"
14098 #: git-rebase--interactive.sh:376
14100 msgid "Refusing to squash a merge: $sha1"
14101 msgstr "拒绝压缩一个合并:$sha1"
14103 #: git-rebase--interactive.sh:390
14105 msgid "Error redoing merge $sha1"
14106 msgstr "无法重做合并 $sha1"
14108 #: git-rebase--interactive.sh:398
14110 msgid "Could not pick $sha1"
14111 msgstr "不能拣选 $sha1"
14113 #: git-rebase--interactive.sh:407
14115 msgid "This is the commit message #${n}:"
14116 msgstr "这是提交说明 #${n}:"
14118 #: git-rebase--interactive.sh:412
14120 msgid "The commit message #${n} will be skipped:"
14121 msgstr "提交说明 #${n} 将被跳过:"
14123 #: git-rebase--interactive.sh:423
14125 msgid "This is a combination of $count commit."
14126 msgid_plural "This is a combination of $count commits."
14127 msgstr[0] "这是一个 $count 个提交的组合。"
14128 msgstr[1] "这是一个 $count 个提交的组合。"
14130 #: git-rebase--interactive.sh:431
14132 msgid "Cannot write $fixup_msg"
14133 msgstr "不能写入 $fixup_msg"
14135 #: git-rebase--interactive.sh:434
14136 msgid "This is a combination of 2 commits."
14137 msgstr "这是一个 2 个提交的组合。"
14139 #: git-rebase--interactive.sh:435
14140 msgid "This is the 1st commit message:"
14141 msgstr "这是第一个提交说明:"
14143 #: git-rebase--interactive.sh:475 git-rebase--interactive.sh:518
14144 #: git-rebase--interactive.sh:521
14146 msgid "Could not apply $sha1... $rest"
14147 msgstr "不能应用 $sha1... $rest"
14149 #: git-rebase--interactive.sh:549
14152 "Could not amend commit after successfully picking $sha1... $rest\n"
14153 "This is most likely due to an empty commit message, or the pre-commit hook\n"
14154 "failed. If the pre-commit hook failed, you may need to resolve the issue "
14156 "you are able to reword the commit."
14158 "不能在成功拣选 $sha1... $rest 之后修补提交\n"
14159 "这通常是因为空的提交说明,或者 pre-commit 钩子执行失败。如果是 pre-commit\n"
14160 "钩子执行失败,你可能需要在重写提交说明前解决这个问题。"
14162 #: git-rebase--interactive.sh:564
14164 msgid "Stopped at $sha1_abbrev... $rest"
14165 msgstr "停止在 $sha1_abbrev... $rest"
14167 #: git-rebase--interactive.sh:579
14169 msgid "Cannot '$squash_style' without a previous commit"
14170 msgstr "没有父提交的情况下不能 '$squash_style'"
14172 #: git-rebase--interactive.sh:621
14174 msgid "Executing: $rest"
14177 #: git-rebase--interactive.sh:629
14179 msgid "Execution failed: $rest"
14180 msgstr "执行失败:$rest"
14182 #: git-rebase--interactive.sh:631
14183 msgid "and made changes to the index and/or the working tree"
14184 msgstr "并且修改索引和/或工作区"
14187 #: git-rebase--interactive.sh:633
14189 "You can fix the problem, and then run\n"
14191 "\tgit rebase --continue"
14195 "\tgit rebase --continue"
14197 #. TRANSLATORS: after these lines is a command to be issued by the user
14198 #: git-rebase--interactive.sh:646
14201 "Execution succeeded: $rest\n"
14202 "but left changes to the index and/or the working tree\n"
14203 "Commit or stash your changes, and then run\n"
14205 "\tgit rebase --continue"
14208 "但是在索引和/或工作区中存在变更。提交或暂存修改,然后运行\n"
14210 "\tgit rebase --continue"
14212 #: git-rebase--interactive.sh:657
14214 msgid "Unknown command: $command $sha1 $rest"
14215 msgstr "未知命令:$command $sha1 $rest"
14217 #: git-rebase--interactive.sh:658
14218 msgid "Please fix this using 'git rebase --edit-todo'."
14219 msgstr "要修改请使用命令 'git rebase --edit-todo'。"
14221 #: git-rebase--interactive.sh:693
14223 msgid "Successfully rebased and updated $head_name."
14224 msgstr "成功变基并更新 $head_name。"
14226 #: git-rebase--interactive.sh:740
14227 msgid "Could not skip unnecessary pick commands"
14228 msgstr "不能跳过不必要的拣选命令"
14230 #: git-rebase--interactive.sh:898
14233 "Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
14236 "警告:缺失 SHA-1 或者在下面一行中不是一个提交:\n"
14239 #: git-rebase--interactive.sh:931
14242 "Warning: the command isn't recognized in the following line:\n"
14245 "警告:下面一行中的命令未能被识别:\n"
14248 #: git-rebase--interactive.sh:970
14249 msgid "could not detach HEAD"
14250 msgstr "不能检出为分离头指针"
14252 #: git-rebase--interactive.sh:1008
14254 "Warning: some commits may have been dropped accidentally.\n"
14255 "Dropped commits (newer to older):"
14256 msgstr "警告:一些提交可能被意外丢弃。丢弃的提交(从新到旧):"
14258 #: git-rebase--interactive.sh:1016
14260 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
14262 "Use 'git config rebase.missingCommitsCheck' to change the level of "
14264 "The possible behaviours are: ignore, warn, error."
14266 "为避免这条信息,使用 \"drop\" 指令显式地删除一个提交。\n"
14268 "使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n"
14269 "可选值有:ignore、warn、error。"
14271 #: git-rebase--interactive.sh:1027
14274 "Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
14276 msgstr "选项 rebase.missingCommitsCheck 的值 $check_level 无法被识别。已忽略。"
14278 #: git-rebase--interactive.sh:1044
14280 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
14283 "您可以用命令 'git rebase --edit-todo' 修正然后执行命令 'git rebase --"
14286 #: git-rebase--interactive.sh:1045
14287 msgid "Or you can abort the rebase with 'git rebase --abort'."
14288 msgstr "或者您可以使用 'git rebase --abort' 命令终止变基操作。"
14290 #: git-rebase--interactive.sh:1069
14291 msgid "Could not remove CHERRY_PICK_HEAD"
14292 msgstr "不能删除 CHERRY_PICK_HEAD"
14294 #: git-rebase--interactive.sh:1074
14297 "You have staged changes in your working tree.\n"
14298 "If these changes are meant to be\n"
14299 "squashed into the previous commit, run:\n"
14301 " git commit --amend $gpg_sign_opt_quoted\n"
14303 "If they are meant to go into a new commit, run:\n"
14305 " git commit $gpg_sign_opt_quoted\n"
14307 "In both cases, once you're done, continue with:\n"
14309 " git rebase --continue\n"
14311 "您已暂存了工作区的修改。如果这些修改要压缩到前一个提交,执行:\n"
14313 " git commit --amend $gpg_sign_opt_quoted\n"
14315 "如果这些变更要形成一个新提交,执行:\n"
14317 " git commit $gpg_sign_opt_quoted\n"
14319 "无论哪种情况,当您完成提交,继续执行:\n"
14321 " git rebase --continue\n"
14323 #: git-rebase--interactive.sh:1091
14324 msgid "Error trying to find the author identity to amend commit"
14325 msgstr "在修补提交中查找作者信息时遇到错误"
14327 #: git-rebase--interactive.sh:1096
14329 "You have uncommitted changes in your working tree. Please commit them\n"
14330 "first and then run 'git rebase --continue' again."
14332 "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
14334 #: git-rebase--interactive.sh:1101 git-rebase--interactive.sh:1105
14335 msgid "Could not commit staged changes."
14336 msgstr "不能提交暂存的修改。"
14338 #: git-rebase--interactive.sh:1129
14341 "You are editing the todo file of an ongoing interactive rebase.\n"
14342 "To continue rebase after editing, run:\n"
14343 " git rebase --continue\n"
14347 "您正在修改运行中的交互式变基的 todo 文件。若要在编辑结束后继续变基,\n"
14349 " git rebase --continue\n"
14352 #: git-rebase--interactive.sh:1137 git-rebase--interactive.sh:1295
14353 msgid "Could not execute editor"
14356 #: git-rebase--interactive.sh:1150
14358 msgid "Could not checkout $switch_to"
14359 msgstr "不能检出 $switch_to"
14361 #: git-rebase--interactive.sh:1155
14365 #: git-rebase--interactive.sh:1156
14367 msgid "Could not create temporary $state_dir"
14368 msgstr "不能创建临时 $state_dir"
14370 #: git-rebase--interactive.sh:1158
14371 msgid "Could not mark as interactive"
14374 #: git-rebase--interactive.sh:1168 git-rebase--interactive.sh:1173
14375 msgid "Could not init rewritten commits"
14376 msgstr "不能对重写提交进行初始化"
14378 #: git-rebase--interactive.sh:1273
14380 msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
14381 msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
14382 msgstr[0] "变基 $shortrevisions 到 $shortonto($todocount 个提交)"
14383 msgstr[1] "变基 $shortrevisions 到 $shortonto($todocount 个提交)"
14385 #: git-rebase--interactive.sh:1278
14388 "However, if you remove everything, the rebase will be aborted.\n"
14392 "然而,如果您删除全部内容,变基操作将会终止。\n"
14395 #: git-rebase--interactive.sh:1285
14396 msgid "Note that empty commits are commented out"
14397 msgstr "注意空提交已被注释掉"
14399 #: git-sh-setup.sh:89 git-sh-setup.sh:94
14401 msgid "usage: $dashless $USAGE"
14402 msgstr "用法:$dashless $USAGE"
14404 #: git-sh-setup.sh:190
14406 msgid "Cannot chdir to $cdup, the toplevel of the working tree"
14407 msgstr "不能切换目录到 $cdup,工作区的顶级目录"
14409 #: git-sh-setup.sh:199 git-sh-setup.sh:206
14411 msgid "fatal: $program_name cannot be used without a working tree."
14412 msgstr "严重错误:$program_name 不能在没有工作区的情况下使用"
14414 #: git-sh-setup.sh:220
14415 msgid "Cannot rebase: You have unstaged changes."
14416 msgstr "不能变基:您有未暂存的变更。"
14418 #: git-sh-setup.sh:223
14419 msgid "Cannot rewrite branches: You have unstaged changes."
14420 msgstr "不能重写分支:您有未暂存的变更。"
14422 #: git-sh-setup.sh:226
14423 msgid "Cannot pull with rebase: You have unstaged changes."
14424 msgstr "无法通过变基方式拉取:您有未暂存的变更。"
14426 #: git-sh-setup.sh:229
14428 msgid "Cannot $action: You have unstaged changes."
14429 msgstr "不能 $action:您有未暂存的变更。"
14431 #: git-sh-setup.sh:242
14432 msgid "Cannot rebase: Your index contains uncommitted changes."
14433 msgstr "不能变基:您的索引中包含未提交的变更。"
14435 #: git-sh-setup.sh:245
14436 msgid "Cannot pull with rebase: Your index contains uncommitted changes."
14437 msgstr "无法通过变基方式拉取:您的索引中包含未提交的变更。"
14439 #: git-sh-setup.sh:248
14441 msgid "Cannot $action: Your index contains uncommitted changes."
14442 msgstr "不能 $action:您的索引中包含未提交的变更。"
14444 #: git-sh-setup.sh:252
14445 msgid "Additionally, your index contains uncommitted changes."
14446 msgstr "而且您的索引中包含未提交的变更。"
14448 #: git-sh-setup.sh:372
14449 msgid "You need to run this command from the toplevel of the working tree."
14450 msgstr "您需要在工作区的顶级目录中运行这个命令。"
14452 #: git-sh-setup.sh:377
14453 msgid "Unable to determine absolute path of git directory"
14454 msgstr "不能确定 git 目录的绝对路径"
14456 #~ msgid "Could not write to %s"
14457 #~ msgstr "不能写入 %s"
14459 #~ msgid "Error wrapping up %s."
14460 #~ msgstr "错误收尾 %s。"
14462 #~ msgid "Your local changes would be overwritten by cherry-pick."
14463 #~ msgstr "您的本地修改将被拣选操作覆盖。"
14465 #~ msgid "Cannot revert during another revert."
14466 #~ msgstr "不能在回退中执行另一回退。"
14468 #~ msgid "Cannot cherry-pick during another cherry-pick."
14469 #~ msgstr "不能在拣选过程中执行另一拣选。"
14471 #~ msgid "Could not parse line %d."
14472 #~ msgstr "不能解析第 %d 行。"
14474 #~ msgid "Could not open %s"
14475 #~ msgstr "不能打开 %s"
14477 #~ msgid "Could not read %s."
14478 #~ msgstr "不能读取 %s。"
14480 #~ msgid "Could not format %s."
14481 #~ msgstr "不能格式化 %s。"
14486 #~ msgid "cannot open %s: %s"
14487 #~ msgstr "不能打开 %s:%s"
14489 #~ msgid "You need to set your committer info first"
14490 #~ msgstr "您需要先设置您的提交者信息"