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 # - Fangyi Zhou <me AT fangyi.io>
7 # - Jiang Xin <worldhello.net AT gmail.com>
8 # - Lian Cheng <rhythm.mail AT gmail.com>
9 # - Ray Chen <oldsharp AT gmail.com>
10 # - Riku <lu.riku AT gmail.com>
11 # - Thynson <lanxingcan AT gmail.com>
12 # - ws3389 <willsmith3389 AT gmail.com>
13 # - Wang Sheng <wangsheng2008love AT 163.com>
14 # - 依云 <lilydjwg AT gmail.com>
15 # - Yichao Yu <yyc1992 AT gmail.com>
16 # - Zhuang Ya <zhuangya AT me.com>
18 # Git glossary for Chinese translators
21 # ---------------------------------+--------------------------------------
23 # abbreviate | 简写(的 SHA-1 值)
24 # alternate object database | 备用对象库
27 # annotated tag | 附注标签
28 # bare repository | 纯仓库
43 # commit message | 提交说明
44 # commit object | 提交对象
45 # commit-ish (also committish) | 提交号
47 # core Git | 核心 Git 工具
50 # dangling object | 悬空对象
51 # detached HEAD | 分离头指针
54 # dumb HTTP protocol | 哑 HTTP 协议
55 # evil merge | 坏合并(合并引入了父提交没有的修改)
60 # Git archive | 仓库(对于 arch 用户)
61 # gitfile | gitfile(仓库链接文件)
64 # HEAD | HEAD(头指针,亦即当前分支)
74 # master | master(默认分支名)
77 # object database | 对象库
78 # object identifier | 对象标识符
81 # octopus | 章鱼式合并(两分支以上的合并)
82 # origin | origin(默认的远程名称)
91 # plumbing | 管件(Git 底层核心命令的别称)
92 # porcelain | 瓷件(Git 上层封装命令的别称)
93 # precious-objects repo | 珍品仓库
103 # remote-tracking branch | 远程跟踪分支
112 # SHA-1 | SHA-1(安全哈希算法1)
113 # shallow repository | 浅(克隆)仓库
115 # smart HTTP protocol | 智能 HTTP 协议
117 # stage | n. 暂存区(即索引); v. 暂存
118 # stash | n. 贮藏区; v. 贮藏
121 # tag | n. 标签; v. 打标签
124 # topic branch | 主题分支
129 # tree-ish (also treeish) | 树对象(或可以解析为一树对象)
130 # unmerged index | 未合并索引
132 # unreachable object | 不可达对象
135 # upstream branch | 上游分支
140 "Project-Id-Version: Git\n"
141 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
142 "POT-Creation-Date: 2020-05-27 07:23+0800\n"
143 "PO-Revision-Date: 2020-05-27 07:39+0800\n"
144 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
145 "Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
147 "MIME-Version: 1.0\n"
148 "Content-Type: text/plain; charset=UTF-8\n"
149 "Content-Transfer-Encoding: 8bit\n"
150 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
152 #: add-interactive.c:368
157 #: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3142
158 #: sequencer.c:3581 sequencer.c:3723 builtin/rebase.c:1518
159 #: builtin/rebase.c:1919
160 msgid "could not read index"
163 #: add-interactive.c:576 git-add--interactive.perl:269
164 #: git-add--interactive.perl:294
168 #: add-interactive.c:634 git-add--interactive.perl:278
169 #: git-add--interactive.perl:332
173 #: add-interactive.c:635 git-add--interactive.perl:314
174 #: git-add--interactive.perl:329
178 #: add-interactive.c:672 git-add--interactive.perl:643
182 #: add-interactive.c:689 add-interactive.c:877
184 msgid "could not stage '%s'"
187 #: add-interactive.c:695 add-interactive.c:884 reset.c:89 sequencer.c:3336
188 msgid "could not write index"
191 #: add-interactive.c:698 git-add--interactive.perl:628
192 #, c-format, perl-format
193 msgid "updated %d path\n"
194 msgid_plural "updated %d paths\n"
195 msgstr[0] "更新了 %d 个路径\n"
196 msgstr[1] "更新了 %d 个路径\n"
198 #: add-interactive.c:716 git-add--interactive.perl:678
199 #, c-format, perl-format
200 msgid "note: %s is untracked now.\n"
201 msgstr "说明:%s 现已成为未跟踪的。\n"
203 #: add-interactive.c:721 apply.c:4110 builtin/checkout.c:294
204 #: builtin/reset.c:145
206 msgid "make_cache_entry failed for path '%s'"
207 msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
209 #: add-interactive.c:751 git-add--interactive.perl:655
213 #: add-interactive.c:767
214 msgid "Could not parse HEAD^{tree}"
215 msgstr "不能解析 HEAD^{tree}"
217 #: add-interactive.c:805 git-add--interactive.perl:631
218 #, c-format, perl-format
219 msgid "reverted %d path\n"
220 msgid_plural "reverted %d paths\n"
221 msgstr[0] "还原了 %d 个路径\n"
222 msgstr[1] "还原了 %d 个路径\n"
224 #: add-interactive.c:856 git-add--interactive.perl:695
226 msgid "No untracked files.\n"
229 #: add-interactive.c:860 git-add--interactive.perl:689
230 msgid "Add untracked"
233 #: add-interactive.c:887 git-add--interactive.perl:625
234 #, c-format, perl-format
235 msgid "added %d path\n"
236 msgid_plural "added %d paths\n"
237 msgstr[0] "增加了 %d 个路径\n"
238 msgstr[1] "增加了 %d 个路径\n"
240 #: add-interactive.c:917
242 msgid "ignoring unmerged: %s"
245 #: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366
247 msgid "Only binary files changed.\n"
248 msgstr "只有二进制文件被修改。\n"
250 #: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368
252 msgid "No changes.\n"
255 #: add-interactive.c:935 git-add--interactive.perl:1376
259 #: add-interactive.c:974 git-add--interactive.perl:1754
263 #: add-interactive.c:1002
264 msgid "show paths with changes"
267 #: add-interactive.c:1004
268 msgid "add working tree state to the staged set of changes"
269 msgstr "将工作区状态添加到暂存区修改集中"
271 #: add-interactive.c:1006
272 msgid "revert staged set of changes back to the HEAD version"
273 msgstr "将暂存的修改集恢复为 HEAD 版本"
275 #: add-interactive.c:1008
276 msgid "pick hunks and update selectively"
277 msgstr "挑选数据块并有选择地更新"
279 #: add-interactive.c:1010
280 msgid "view diff between HEAD and index"
281 msgstr "显示 HEAD 和索引的差异"
283 #: add-interactive.c:1012
284 msgid "add contents of untracked files to the staged set of changes"
285 msgstr "将未跟踪文件的内容添加到暂存区修改集中"
287 #: add-interactive.c:1020 add-interactive.c:1069
291 #: add-interactive.c:1022
292 msgid "select a single item"
295 #: add-interactive.c:1024
296 msgid "select a range of items"
299 #: add-interactive.c:1026
300 msgid "select multiple ranges"
303 #: add-interactive.c:1028 add-interactive.c:1073
304 msgid "select item based on unique prefix"
307 #: add-interactive.c:1030
308 msgid "unselect specified items"
311 #: add-interactive.c:1032
312 msgid "choose all items"
315 #: add-interactive.c:1034
316 msgid "(empty) finish selecting"
319 #: add-interactive.c:1071
320 msgid "select a numbered item"
323 #: add-interactive.c:1075
324 msgid "(empty) select nothing"
327 #: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1851
328 msgid "*** Commands ***"
331 #: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1848
335 #: add-interactive.c:1136 git-add--interactive.perl:213
339 #: add-interactive.c:1136 git-add--interactive.perl:213
343 #: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2250
344 #: builtin/am.c:2253 builtin/clone.c:123 builtin/fetch.c:145
345 #: builtin/merge.c:276 builtin/pull.c:190 builtin/submodule--helper.c:409
346 #: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397
347 #: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905
348 #: builtin/submodule--helper.c:2148 bugreport.c:129
349 #: git-add--interactive.perl:213
353 #: add-interactive.c:1143
354 msgid "could not refresh index"
357 #: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1765
362 #: add-patch.c:34 git-add--interactive.perl:1428
363 #, c-format, perl-format
364 msgid "Stage mode change [y,n,q,a,d%s,?]? "
365 msgstr "暂存模式变更 [y,n,q,a,d%s,?]? "
367 #: add-patch.c:35 git-add--interactive.perl:1429
368 #, c-format, perl-format
369 msgid "Stage deletion [y,n,q,a,d%s,?]? "
370 msgstr "暂存删除动作 [y,n,q,a,d%s,?]? "
372 #: add-patch.c:36 git-add--interactive.perl:1430
373 #, c-format, perl-format
374 msgid "Stage this hunk [y,n,q,a,d%s,?]? "
375 msgstr "暂存该块 [y,n,q,a,d%s,?]? "
379 "If the patch applies cleanly, the edited hunk will immediately be marked for "
381 msgstr "如果补丁能正确地应用,编辑块将立即标记为暂存。"
385 "y - stage this hunk\n"
386 "n - do not stage this hunk\n"
387 "q - quit; do not stage this hunk or any of the remaining ones\n"
388 "a - stage this hunk and all later hunks in the file\n"
389 "d - do not stage this hunk or any of the later hunks in the file\n"
393 "q - 退出。不暂存该块及后面的全部块\n"
394 "a - 暂存该块和本文件中后面的全部块\n"
395 "d - 不暂存该块和本文件中后面的全部块\n"
397 #: add-patch.c:55 git-add--interactive.perl:1433
398 #, c-format, perl-format
399 msgid "Stash mode change [y,n,q,a,d%s,?]? "
400 msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? "
402 #: add-patch.c:56 git-add--interactive.perl:1434
403 #, c-format, perl-format
404 msgid "Stash deletion [y,n,q,a,d%s,?]? "
405 msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? "
407 #: add-patch.c:57 git-add--interactive.perl:1435
408 #, c-format, perl-format
409 msgid "Stash this hunk [y,n,q,a,d%s,?]? "
410 msgstr "贮藏该块 [y,n,q,a,d%s,?]? "
414 "If the patch applies cleanly, the edited hunk will immediately be marked for "
416 msgstr "如果补丁能正确地应用,编辑块将立即标记为贮藏。"
420 "y - stash this hunk\n"
421 "n - do not stash this hunk\n"
422 "q - quit; do not stash this hunk or any of the remaining ones\n"
423 "a - stash this hunk and all later hunks in the file\n"
424 "d - do not stash this hunk or any of the later hunks in the file\n"
428 "q - 退出。不贮藏该块及后面的全部块\n"
429 "a - 贮藏该块和本文件中后面的全部块\n"
430 "d - 不贮藏该块和本文件中后面的全部块\n"
432 #: add-patch.c:78 git-add--interactive.perl:1438
433 #, c-format, perl-format
434 msgid "Unstage mode change [y,n,q,a,d%s,?]? "
435 msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? "
437 #: add-patch.c:79 git-add--interactive.perl:1439
438 #, c-format, perl-format
439 msgid "Unstage deletion [y,n,q,a,d%s,?]? "
440 msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? "
442 #: add-patch.c:80 git-add--interactive.perl:1440
443 #, c-format, perl-format
444 msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
445 msgstr "取消暂存该块 [y,n,q,a,d%s,?]? "
449 "If the patch applies cleanly, the edited hunk will immediately be marked for "
451 msgstr "如果补丁能正确地应用,编辑块将立即标记为未暂存。"
455 "y - unstage this hunk\n"
456 "n - do not unstage this hunk\n"
457 "q - quit; do not unstage this hunk or any of the remaining ones\n"
458 "a - unstage this hunk and all later hunks in the file\n"
459 "d - do not unstage this hunk or any of the later hunks in the file\n"
463 "q - 退出。不要取消暂存该块及后面的全部块\n"
464 "a - 取消暂存该块和本文件中后面的全部块\n"
465 "d - 不要取消暂存该块和本文件中后面的全部块\n"
467 #: add-patch.c:100 git-add--interactive.perl:1443
468 #, c-format, perl-format
469 msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
470 msgstr "将模式变更应用到索引 [y,n,q,a,d%s,?]? "
472 #: add-patch.c:101 git-add--interactive.perl:1444
473 #, c-format, perl-format
474 msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
475 msgstr "将删除操作应用到索引 [y,n,q,a,d%s,?]? "
477 #: add-patch.c:102 git-add--interactive.perl:1445
478 #, c-format, perl-format
479 msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
480 msgstr "将该块应用到索引 [y,n,q,a,d%s,?]? "
482 #: add-patch.c:104 add-patch.c:169 add-patch.c:212
484 "If the patch applies cleanly, the edited hunk will immediately be marked for "
486 msgstr "如果补丁能正确地应用,编辑块将立即标记为应用。"
490 "y - apply this hunk to index\n"
491 "n - do not apply this hunk to index\n"
492 "q - quit; do not apply this hunk or any of the remaining ones\n"
493 "a - apply this hunk and all later hunks in the file\n"
494 "d - do not apply this hunk or any of the later hunks in the file\n"
498 "q - 退出。不要应用该块及后面的全部块\n"
499 "a - 应用该块和本文件中后面的全部块\n"
500 "d - 不要应用该块和本文件中后面的全部块\n"
502 #: add-patch.c:122 git-add--interactive.perl:1448
503 #: git-add--interactive.perl:1463
504 #, c-format, perl-format
505 msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
506 msgstr "从工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
508 #: add-patch.c:123 git-add--interactive.perl:1449
509 #: git-add--interactive.perl:1464
510 #, c-format, perl-format
511 msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
512 msgstr "从工作区中丢弃删除动作 [y,n,q,a,d%s,?]? "
514 #: add-patch.c:124 git-add--interactive.perl:1450
515 #: git-add--interactive.perl:1465
516 #, c-format, perl-format
517 msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
518 msgstr "从工作区中丢弃该块 [y,n,q,a,d%s,?]? "
520 #: add-patch.c:126 add-patch.c:148 add-patch.c:191
522 "If the patch applies cleanly, the edited hunk will immediately be marked for "
524 msgstr "如果补丁能正确地应用,编辑块将立即标记为丢弃。"
526 #: add-patch.c:129 add-patch.c:194
528 "y - discard this hunk from worktree\n"
529 "n - do not discard this hunk from worktree\n"
530 "q - quit; do not discard this hunk or any of the remaining ones\n"
531 "a - discard this hunk and all later hunks in the file\n"
532 "d - do not discard this hunk or any of the later hunks in the file\n"
536 "q - 退出。不要丢弃该块及后面的全部块\n"
537 "a - 丢弃该块和本文件中后面的全部块\n"
538 "d - 不要丢弃该块和本文件中后面的全部块\n"
540 #: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1453
541 #, c-format, perl-format
542 msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
543 msgstr "从索引和工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
545 #: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1454
546 #, c-format, perl-format
547 msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
548 msgstr "从索引和工作区中丢弃删除 [y,n,q,a,d%s,?]? "
550 #: add-patch.c:146 add-patch.c:189 git-add--interactive.perl:1455
551 #, c-format, perl-format
552 msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
553 msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d%s,?]? "
557 "y - discard this hunk from index and worktree\n"
558 "n - do not discard this hunk from index and worktree\n"
559 "q - quit; do not discard this hunk or any of the remaining ones\n"
560 "a - discard this hunk and all later hunks in the file\n"
561 "d - do not discard this hunk or any of the later hunks in the file\n"
564 "n - 不要在索引和工作区中丢弃该块\n"
565 "q - 退出。不要丢弃该块及后面的全部块\n"
566 "a - 丢弃该块和本文件中后面的全部块\n"
567 "d - 不要丢弃该块和本文件中后面的全部块\n"
569 #: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1458
570 #, c-format, perl-format
571 msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
572 msgstr "将模式变更应用到索引和工作区 [y,n,q,a,d%s,?]? "
574 #: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1459
575 #, c-format, perl-format
576 msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
577 msgstr "将删除操作应用到索引和工作区 [y,n,q,a,d%s,?]? "
579 #: add-patch.c:167 add-patch.c:210 git-add--interactive.perl:1460
580 #, c-format, perl-format
581 msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
582 msgstr "将该块应用到索引和工作区 [y,n,q,a,d%s,?]? "
586 "y - apply this hunk to index and worktree\n"
587 "n - do not apply this hunk to index and worktree\n"
588 "q - quit; do not apply this hunk or any of the remaining ones\n"
589 "a - apply this hunk and all later hunks in the file\n"
590 "d - do not apply this hunk or any of the later hunks in the file\n"
593 "n - 不要在索引和工作区中应用该块\n"
594 "q - 退出。不要应用该块及后面的全部块\n"
595 "a - 应用该块和本文件中后面的全部块\n"
596 "d - 不要应用该块和本文件中后面的全部块\n"
600 "y - apply this hunk to worktree\n"
601 "n - do not apply this hunk to worktree\n"
602 "q - quit; do not apply this hunk or any of the remaining ones\n"
603 "a - apply this hunk and all later hunks in the file\n"
604 "d - do not apply this hunk or any of the later hunks in the file\n"
608 "q - 退出。不要应用该块及后面的全部块\n"
609 "a - 应用该块和本文件中后面的全部块\n"
610 "d - 不要应用该块和本文件中后面的全部块\n"
614 msgid "could not parse hunk header '%.*s'"
615 msgstr "无法解析数据块头信息 '%.*s'"
617 #: add-patch.c:338 add-patch.c:342
619 msgid "could not parse colored hunk header '%.*s'"
620 msgstr "无法解析彩色数据块头信息 '%.*s'"
623 msgid "could not parse diff"
627 msgid "could not parse colored diff"
632 msgid "failed to run '%s'"
636 msgid "mismatched output from interactive.diffFilter"
637 msgstr "interactive.diffFilter 的输出不匹配"
641 "Your filter must maintain a one-to-one correspondence\n"
642 "between its input and output lines."
643 msgstr "您的过滤器必须在其输入和输出的行之间保持一一对应的关系。"
648 "expected context line #%d in\n"
657 "hunks do not overlap:\n"
659 "\tdoes not end with:\n"
667 #: add-patch.c:1053 git-add--interactive.perl:1112
668 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
669 msgstr "手动块编辑模式 -- 查看底部的快速指南。\n"
675 "To remove '%c' lines, make them ' ' lines (context).\n"
676 "To remove '%c' lines, delete them.\n"
677 "Lines starting with %c will be removed.\n"
680 "要删除 '%c' 开始的行,使其成为 ' ' 开始的行(上下文)。\n"
681 "要删除 '%c' 开始的行,删除它们。\n"
684 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
685 #: add-patch.c:1071 git-add--interactive.perl:1126
687 "If it does not apply cleanly, you will be given an opportunity to\n"
688 "edit again. If all lines of the hunk are removed, then the edit is\n"
689 "aborted and the hunk is left unchanged.\n"
691 "如果不能干净地应用,您将有机会重新编辑。如果该块的全部内容删除,则\n"
695 msgid "could not parse hunk header"
699 msgid "'git apply --cached' failed"
700 msgstr "'git apply --cached' 失败"
702 #. TRANSLATORS: do not translate [y/n]
703 #. The program will only accept that input at this point.
704 #. Consider translating (saying "no" discards!) as
705 #. (saying "n" for "no" discards!) if the translation
706 #. of the word "no" does not start with n.
708 #. TRANSLATORS: do not translate [y/n]
709 #. The program will only accept that input
711 #. Consider translating (saying "no" discards!) as
712 #. (saying "n" for "no" discards!) if the translation
713 #. of the word "no" does not start with n.
714 #: add-patch.c:1218 git-add--interactive.perl:1239
716 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
717 msgstr "您的编辑块不能被应用。重新编辑(选择 \"no\" 丢弃!) [y/n]? "
720 msgid "The selected hunks do not apply to the index!"
721 msgstr "选中的块不能应用到索引!"
723 #: add-patch.c:1262 git-add--interactive.perl:1343
724 msgid "Apply them to the worktree anyway? "
725 msgstr "无论如何都要应用到工作区么?"
727 #: add-patch.c:1269 git-add--interactive.perl:1346
728 msgid "Nothing was applied.\n"
733 "j - leave this hunk undecided, see next undecided hunk\n"
734 "J - leave this hunk undecided, see next hunk\n"
735 "k - leave this hunk undecided, see previous undecided hunk\n"
736 "K - leave this hunk undecided, see previous hunk\n"
737 "g - select a hunk to go to\n"
738 "/ - search for a hunk matching the given regex\n"
739 "s - split the current hunk into smaller hunks\n"
740 "e - manually edit the current hunk\n"
743 "j - 维持该块未决状态,查看下一个未决块\n"
744 "J - 维持该块未决状态,查看下一个块\n"
745 "k - 维持该块未决状态,查看上一个未决块\n"
746 "K - 维持该块未决状态,查看上一个块\n"
748 "/ - 查找和给定正则表达式匹配的块\n"
753 #: add-patch.c:1447 add-patch.c:1457
754 msgid "No previous hunk"
757 #: add-patch.c:1452 add-patch.c:1462
762 msgid "No other hunks to goto"
765 #: add-patch.c:1479 git-add--interactive.perl:1577
766 msgid "go to which hunk (<ret> to see more)? "
767 msgstr "跳转到哪个块(<回车> 查看更多)? "
769 #: add-patch.c:1480 git-add--interactive.perl:1579
770 msgid "go to which hunk? "
775 msgid "Invalid number: '%s'"
780 msgid "Sorry, only %d hunk available."
781 msgid_plural "Sorry, only %d hunks available."
782 msgstr[0] "对不起,只有 %d 个可用块。"
783 msgstr[1] "对不起,只有 %d 个可用块。"
786 msgid "No other hunks to search"
789 #: add-patch.c:1511 git-add--interactive.perl:1623
790 msgid "search for regex? "
795 msgid "Malformed search regexp %s: %s"
796 msgstr "错误的正则表达式 %s:%s"
799 msgid "No hunk matches the given pattern"
800 msgstr "没有和给定模式相匹配的块"
803 msgid "Sorry, cannot split this hunk"
808 msgid "Split into %d hunks."
812 msgid "Sorry, cannot edit this hunk"
816 msgid "'git apply' failed"
817 msgstr "'git apply' 失败"
823 "Disable this message with \"git config advice.%s false\""
826 "使用 \"git config advice.%s false\" 来关闭此消息"
830 msgid "%shint: %.*s%s\n"
831 msgstr "%s提示:%.*s%s\n"
834 msgid "Cherry-picking is not possible because you have unmerged files."
835 msgstr "无法拣选,因为您有未合并的文件。"
838 msgid "Committing is not possible because you have unmerged files."
839 msgstr "无法提交,因为您有未合并的文件。"
842 msgid "Merging is not possible because you have unmerged files."
843 msgstr "无法合并,因为您有未合并的文件。"
846 msgid "Pulling is not possible because you have unmerged files."
847 msgstr "无法拉取,因为您有未合并的文件。"
850 msgid "Reverting is not possible because you have unmerged files."
851 msgstr "无法回退,因为您有未合并的文件。"
855 msgid "It is not possible to %s because you have unmerged files."
856 msgstr "无法 %s,因为您有未合并的文件。"
860 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"
861 "as appropriate to mark resolution and make a commit."
863 "请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n"
867 msgid "Exiting because of an unresolved conflict."
868 msgstr "因为存在未解决的冲突而退出。"
870 #: advice.c:278 builtin/merge.c:1353
871 msgid "You have not concluded your merge (MERGE_HEAD exists)."
872 msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
875 msgid "Please, commit your changes before merging."
876 msgstr "请在合并前先提交您的修改。"
879 msgid "Exiting because of unfinished merge."
880 msgstr "因为存在未完成的合并而退出。"
885 "Note: switching to '%s'.\n"
887 "You are in 'detached HEAD' state. You can look around, make experimental\n"
888 "changes and commit them, and you can discard any commits you make in this\n"
889 "state without impacting any branches by switching back to a branch.\n"
891 "If you want to create a new branch to retain commits you create, you may\n"
892 "do so (now or later) by using -c with the switch command. Example:\n"
894 " git switch -c <new-branch-name>\n"
896 "Or undo this operation with:\n"
900 "Turn off this advice by setting config variable advice.detachedHead to "
906 "您正处于分离头指针状态。您可以查看、做试验性的修改及提交,并且您可以在切换\n"
907 "回一个分支时,丢弃在此状态下所做的提交而不对分支造成影响。\n"
909 "如果您想要通过创建分支来保留在此状态下所做的提交,您可以通过在 switch 命令\n"
910 "中添加参数 -c 来实现(现在或稍后)。例如:\n"
912 " git switch -c <新分支名>\n"
918 "通过将配置变量 advice.detachedHead 设置为 false 来关闭此建议\n"
922 msgid "cmdline ends with \\"
926 msgid "unclosed quote"
931 msgid "unrecognized whitespace option '%s'"
932 msgstr "未能识别的空白字符选项 '%s'"
936 msgid "unrecognized whitespace ignore option '%s'"
937 msgstr "未能识别的空白字符忽略选项 '%s'"
940 msgid "--reject and --3way cannot be used together."
941 msgstr "--reject 和 --3way 不能同时使用。"
944 msgid "--cached and --3way cannot be used together."
945 msgstr "--cached 和 --3way 不能同时使用。"
948 msgid "--3way outside a repository"
949 msgstr "--3way 在一个仓库之外"
952 msgid "--index outside a repository"
953 msgstr "--index 在一个仓库之外"
956 msgid "--cached outside a repository"
957 msgstr "--cached 在一个仓库之外"
961 msgid "Cannot prepare timestamp regexp %s"
962 msgstr "无法准备时间戳正则表达式 %s"
966 msgid "regexec returned %d for input: %s"
967 msgstr "regexec 返回 %d,输入为:%s"
971 msgid "unable to find filename in patch at line %d"
972 msgstr "不能在补丁的第 %d 行找到文件名"
976 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
977 msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
981 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
982 msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
986 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
987 msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
991 msgid "git apply: bad git-diff - expected /dev/null on line %d"
992 msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
996 msgid "invalid mode on line %d: %s"
997 msgstr "第 %d 行包含无效文件模式:%s"
1001 msgid "inconsistent header lines %d and %d"
1002 msgstr "不一致的文件头,%d 行和 %d 行"
1007 "git diff header lacks filename information when removing %d leading pathname "
1008 "component (line %d)"
1010 "git diff header lacks filename information when removing %d leading pathname "
1011 "components (line %d)"
1012 msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
1013 msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
1017 msgid "git diff header lacks filename information (line %d)"
1018 msgstr "git diff 的头信息中缺乏文件名信息(第 %d 行)"
1022 msgid "recount: unexpected line: %.*s"
1023 msgstr "recount:意外的行:%.*s"
1027 msgid "patch fragment without header at line %d: %.*s"
1028 msgstr "第 %d 行的补丁片段没有头信息:%.*s"
1031 msgid "new file depends on old contents"
1035 msgid "deleted file still has contents"
1040 msgid "corrupt patch at line %d"
1041 msgstr "补丁在第 %d 行损坏"
1045 msgid "new file %s depends on old contents"
1046 msgstr "新文件 %s 依赖旧内容"
1050 msgid "deleted file %s still has contents"
1051 msgstr "删除的文件 %s 仍有内容"
1055 msgid "** warning: file %s becomes empty but is not deleted"
1056 msgstr "** 警告:文件 %s 成为空文件但并未删除"
1060 msgid "corrupt binary patch at line %d: %.*s"
1061 msgstr "二进制补丁在第 %d 行损坏:%.*s"
1065 msgid "unrecognized binary patch at line %d"
1066 msgstr "未能识别的二进制补丁位于第 %d 行"
1070 msgid "patch with only garbage at line %d"
1071 msgstr "补丁文件的第 %d 行只有垃圾数据"
1075 msgid "unable to read symlink %s"
1076 msgstr "无法读取符号链接 %s"
1080 msgid "unable to open or read %s"
1085 msgid "invalid start of line: '%c'"
1086 msgstr "无效的行首字符:'%c'"
1090 msgid "Hunk #%d succeeded at %d (offset %d line)."
1091 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1092 msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
1093 msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
1097 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
1098 msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
1103 "while searching for:\n"
1111 msgid "missing binary patch data for '%s'"
1112 msgstr "缺失 '%s' 的二进制补丁数据"
1116 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
1117 msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁"
1121 msgid "cannot apply binary patch to '%s' without full index line"
1122 msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁"
1127 "the patch applies to '%s' (%s), which does not match the current contents."
1128 msgstr "补丁应用到 '%s'(%s),但是和当前内容不匹配。"
1132 msgid "the patch applies to an empty '%s' but it is not empty"
1133 msgstr "补丁应用到空文件 '%s',但其并非空文件"
1137 msgid "the necessary postimage %s for '%s' cannot be read"
1138 msgstr "无法读取 '%2$s' 必需的目标文件 %1$s"
1142 msgid "binary patch does not apply to '%s'"
1143 msgstr "二进制补丁未应用到 '%s'"
1147 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1148 msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
1152 msgid "patch failed: %s:%ld"
1153 msgstr "打补丁失败:%s:%ld"
1157 msgid "cannot checkout %s"
1160 #: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:308
1162 msgid "failed to read %s"
1167 msgid "reading from '%s' beyond a symbolic link"
1168 msgstr "读取位于符号链接中的 '%s'"
1170 #: apply.c:3442 apply.c:3685
1172 msgid "path %s has been renamed/deleted"
1173 msgstr "路径 %s 已经被重命名/删除"
1175 #: apply.c:3528 apply.c:3700
1177 msgid "%s: does not exist in index"
1180 #: apply.c:3537 apply.c:3708
1182 msgid "%s: does not match index"
1186 msgid "repository lacks the necessary blob to fall back on 3-way merge."
1187 msgstr "仓库缺乏必要的数据对象以进行三方合并。"
1191 msgid "Falling back to three-way merge...\n"
1192 msgstr "回落到三方合并...\n"
1194 #: apply.c:3591 apply.c:3595
1196 msgid "cannot read the current contents of '%s'"
1197 msgstr "无法读取 '%s' 的当前内容"
1201 msgid "Failed to fall back on three-way merge...\n"
1202 msgstr "无法回落到三方合并...\n"
1206 msgid "Applied patch to '%s' with conflicts.\n"
1207 msgstr "应用补丁到 '%s' 存在冲突。\n"
1211 msgid "Applied patch to '%s' cleanly.\n"
1212 msgstr "成功应用补丁到 '%s'。\n"
1215 msgid "removal patch leaves file contents"
1216 msgstr "移除补丁仍留下了文件内容"
1220 msgid "%s: wrong type"
1225 msgid "%s has type %o, expected %o"
1226 msgstr "%s 的类型是 %o,应为 %o"
1228 #: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856
1229 #: read-cache.c:1325
1231 msgid "invalid path '%s'"
1236 msgid "%s: already exists in index"
1237 msgstr "%s:已经存在于索引中"
1241 msgid "%s: already exists in working directory"
1242 msgstr "%s:已经存在于工作区中"
1246 msgid "new mode (%o) of %s does not match old mode (%o)"
1247 msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
1251 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1252 msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
1256 msgid "affected file '%s' is beyond a symbolic link"
1257 msgstr "受影响的文件 '%s' 位于符号链接中"
1261 msgid "%s: patch does not apply"
1266 msgid "Checking patch %s..."
1267 msgstr "正在检查补丁 %s..."
1271 msgid "sha1 information is lacking or useless for submodule %s"
1272 msgstr "子模组 %s 的 sha1 信息缺失或无效"
1276 msgid "mode change for %s, which is not in current HEAD"
1277 msgstr "%s 的模式变更,但它不在当前 HEAD 中"
1281 msgid "sha1 information is lacking or useless (%s)."
1282 msgstr "sha1 信息缺失或无效(%s)。"
1286 msgid "could not add %s to temporary index"
1287 msgstr "不能在临时索引中添加 %s"
1291 msgid "could not write temporary index to %s"
1292 msgstr "不能把临时索引写入到 %s"
1296 msgid "unable to remove %s from index"
1297 msgstr "不能从索引中移除 %s"
1301 msgid "corrupt patch for submodule %s"
1302 msgstr "子模组 %s 损坏的补丁"
1306 msgid "unable to stat newly created file '%s'"
1307 msgstr "不能对新建文件 '%s' 调用 stat"
1311 msgid "unable to create backing store for newly created file %s"
1312 msgstr "不能为新建文件 %s 创建后端存储"
1314 #: apply.c:4316 apply.c:4461
1316 msgid "unable to add cache entry for %s"
1317 msgstr "无法为 %s 添加缓存条目"
1321 msgid "failed to write to '%s'"
1326 msgid "closing file '%s'"
1331 msgid "unable to write file '%s' mode %o"
1332 msgstr "不能写文件 '%s' 权限 %o"
1336 msgid "Applied patch %s cleanly."
1340 msgid "internal error"
1345 msgid "Applying patch %%s with %d reject..."
1346 msgid_plural "Applying patch %%s with %d rejects..."
1347 msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
1348 msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
1352 msgid "truncating .rej filename to %.*s.rej"
1353 msgstr "截短 .rej 文件名为 %.*s.rej"
1355 #: apply.c:4561 builtin/fetch.c:902 builtin/fetch.c:1195
1357 msgid "cannot open %s"
1362 msgid "Hunk #%d applied cleanly."
1363 msgstr "第 #%d 个片段成功应用。"
1367 msgid "Rejected hunk #%d."
1368 msgstr "拒绝第 #%d 个片段。"
1372 msgid "Skipped patch '%s'."
1376 msgid "unrecognized input"
1380 msgid "unable to read index file"
1385 msgid "can't open patch '%s': %s"
1386 msgstr "不能打开补丁 '%s':%s"
1390 msgid "squelched %d whitespace error"
1391 msgid_plural "squelched %d whitespace errors"
1392 msgstr[0] "抑制下仍有 %d 个空白字符误用"
1393 msgstr[1] "抑制下仍有 %d 个空白字符误用"
1395 #: apply.c:4916 apply.c:4931
1397 msgid "%d line adds whitespace errors."
1398 msgid_plural "%d lines add whitespace errors."
1399 msgstr[0] "%d 行新增了空白字符误用。"
1400 msgstr[1] "%d 行新增了空白字符误用。"
1404 msgid "%d line applied after fixing whitespace errors."
1405 msgid_plural "%d lines applied after fixing whitespace errors."
1406 msgstr[0] "修复空白错误后,应用了 %d 行。"
1407 msgstr[1] "修复空白错误后,应用了 %d 行。"
1409 #: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406
1410 msgid "Unable to write new index file"
1414 msgid "don't apply changes matching the given path"
1415 msgstr "不要应用与给出路径向匹配的变更"
1418 msgid "apply changes matching the given path"
1419 msgstr "应用与给出路径向匹配的变更"
1421 #: apply.c:4973 builtin/am.c:2259
1426 msgid "remove <num> leading slashes from traditional diff paths"
1427 msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
1430 msgid "ignore additions made by the patch"
1431 msgstr "忽略补丁中的添加的文件"
1434 msgid "instead of applying the patch, output diffstat for the input"
1435 msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
1438 msgid "show number of added and deleted lines in decimal notation"
1439 msgstr "以十进制数显示添加和删除的行数"
1442 msgid "instead of applying the patch, output a summary for the input"
1443 msgstr "不应用补丁,而是显示输入的概要"
1446 msgid "instead of applying the patch, see if the patch is applicable"
1447 msgstr "不应用补丁,而是查看补丁是否可应用"
1450 msgid "make sure the patch is applicable to the current index"
1451 msgstr "确认补丁可以应用到当前索引"
1454 msgid "mark new files with `git add --intent-to-add`"
1455 msgstr "使用命令 `git add --intent-to-add` 标记新增文件"
1458 msgid "apply a patch without touching the working tree"
1459 msgstr "应用补丁而不修改工作区"
1462 msgid "accept a patch that touches outside the working area"
1463 msgstr "接受修改工作区之外文件的补丁"
1466 msgid "also apply the patch (use with --stat/--summary/--check)"
1467 msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
1470 msgid "attempt three-way merge if a patch does not apply"
1471 msgstr "如果一个补丁不能应用则尝试三方合并"
1474 msgid "build a temporary index based on embedded index information"
1475 msgstr "创建一个临时索引基于嵌入的索引信息"
1477 #: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:525
1478 msgid "paths are separated with NUL character"
1479 msgstr "路径以 NUL 字符分隔"
1482 msgid "ensure at least <n> lines of context match"
1483 msgstr "确保至少匹配 <n> 行上下文"
1485 #: apply.c:5008 builtin/am.c:2238 builtin/interpret-trailers.c:98
1486 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
1487 #: builtin/pack-objects.c:3458 builtin/rebase.c:1332
1492 msgid "detect new or modified lines that have whitespace errors"
1493 msgstr "检查新增和修改的行中间的空白字符滥用"
1495 #: apply.c:5012 apply.c:5015
1496 msgid "ignore changes in whitespace when finding context"
1497 msgstr "查找上下文时忽略空白字符的变更"
1500 msgid "apply the patch in reverse"
1504 msgid "don't expect at least one line of context"
1508 msgid "leave the rejected hunks in corresponding *.rej files"
1509 msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
1512 msgid "allow overlapping hunks"
1515 #: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22
1516 #: builtin/commit.c:1366 builtin/count-objects.c:98 builtin/fsck.c:775
1517 #: builtin/log.c:2186 builtin/mv.c:123 builtin/read-tree.c:128
1522 msgid "tolerate incorrectly detected missing new-line at the end of file"
1523 msgstr "允许不正确的文件末尾换行符"
1526 msgid "do not trust the line counts in the hunk headers"
1527 msgstr "不信任补丁片段的头信息中的行号"
1529 #: apply.c:5032 builtin/am.c:2247
1534 msgid "prepend <root> to all filenames"
1535 msgstr "为所有文件名前添加 <根目录>"
1537 #: archive-tar.c:125 archive-zip.c:351
1539 msgid "cannot stream blob %s"
1540 msgstr "不能打开数据对象 %s"
1542 #: archive-tar.c:266 archive-zip.c:369
1544 msgid "unsupported file mode: 0%o (SHA1: %s)"
1545 msgstr "不支持的文件模式:0%o (SHA1: %s)"
1547 #: archive-tar.c:293 archive-zip.c:359
1549 msgid "cannot read %s"
1552 #: archive-tar.c:465
1554 msgid "unable to start '%s' filter"
1555 msgstr "无法启动 '%s' 过滤器"
1557 #: archive-tar.c:468
1558 msgid "unable to redirect descriptor"
1561 #: archive-tar.c:475
1563 msgid "'%s' filter reported error"
1564 msgstr "'%s' 过滤器报告了错误"
1566 #: archive-zip.c:319
1568 msgid "path is not valid UTF-8: %s"
1569 msgstr "路径不是有效的 UTF-8:%s"
1571 #: archive-zip.c:323
1573 msgid "path too long (%d chars, SHA1: %s): %s"
1574 msgstr "路径太长(%d 字符,SHA1:%s):%s"
1576 #: archive-zip.c:480 builtin/pack-objects.c:232 builtin/pack-objects.c:235
1578 msgid "deflate error (%d)"
1581 #: archive-zip.c:615
1583 msgid "timestamp too large for this system: %<PRIuMAX>"
1584 msgstr "对于本系统时间戳太大:%<PRIuMAX>"
1587 msgid "git archive [<options>] <tree-ish> [<path>...]"
1588 msgstr "git archive [<选项>] <树对象> [<路径>...]"
1591 msgid "git archive --list"
1592 msgstr "git archive --list"
1596 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
1598 "git archive --remote <仓库> [--exec <命令>] [<选项>] <树对象> [<路径>...]"
1601 msgid "git archive --remote <repo> [--exec <cmd>] --list"
1602 msgstr "git archive --remote <仓库> [--exec <命令>] --list"
1604 #: archive.c:377 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315
1606 msgid "pathspec '%s' did not match any files"
1607 msgstr "路径规格 '%s' 未匹配任何文件"
1611 msgid "no such ref: %.*s"
1616 msgid "not a valid object name: %s"
1617 msgstr "不是一个有效的对象名:%s"
1621 msgid "not a tree object: %s"
1625 msgid "current working directory is untracked"
1633 msgid "archive format"
1636 #: archive.c:465 builtin/log.c:1674
1641 msgid "prepend prefix to each pathname in the archive"
1642 msgstr "为归档中每个路径名加上前缀"
1644 #: archive.c:467 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866
1645 #: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162
1646 #: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:907
1647 #: builtin/hash-object.c:105 builtin/ls-files.c:561 builtin/ls-files.c:564
1648 #: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
1649 #: parse-options.h:190
1653 #: archive.c:468 builtin/archive.c:90
1654 msgid "write the archive to this file"
1658 msgid "read .gitattributes in working directory"
1659 msgstr "读取工作区中的 .gitattributes"
1662 msgid "report archived files on stderr"
1663 msgstr "在标准错误上报告归档文件"
1670 msgid "compress faster"
1674 msgid "compress better"
1678 msgid "list supported archive formats"
1681 #: archive.c:486 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
1682 #: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911
1686 #: archive.c:487 builtin/archive.c:92
1687 msgid "retrieve the archive from remote repository <repo>"
1688 msgstr "从远程仓库(<仓库>)提取归档文件"
1690 #: archive.c:488 builtin/archive.c:93 builtin/difftool.c:715
1691 #: builtin/notes.c:498
1695 #: archive.c:489 builtin/archive.c:94
1696 msgid "path to the remote git-upload-archive command"
1697 msgstr "远程 git-upload-archive 命令的路径"
1700 msgid "Unexpected option --remote"
1701 msgstr "未知参数 --remote"
1704 msgid "Option --exec can only be used together with --remote"
1705 msgstr "选项 --exec 只能和 --remote 同时使用"
1708 msgid "Unexpected option --output"
1709 msgstr "未知参数 --output"
1713 msgid "Unknown archive format '%s'"
1714 msgstr "未知归档格式 '%s'"
1718 msgid "Argument not supported for format '%s': -%d"
1719 msgstr "参数不支持此格式 '%s':-%d"
1723 msgid "%.*s is not a valid attribute name"
1724 msgstr "%.*s 不是一个有效的属性名"
1728 msgid "%s not allowed: %s:%d"
1729 msgstr "不允许 %s:%s:%d"
1733 "Negative patterns are ignored in git attributes\n"
1734 "Use '\\!' for literal leading exclamation."
1736 "负值模版在 git attributes 中被忽略\n"
1737 "当字符串确实要以感叹号开始时,使用 '\\!'。"
1741 msgid "Badly quoted content in file '%s': %s"
1742 msgstr "文件 '%s' 包含错误的引用格式:%s"
1746 msgid "We cannot bisect more!\n"
1747 msgstr "我们无法进行更多的二分查找!\n"
1751 msgid "Not a valid commit name %s"
1752 msgstr "不是一个有效的提交名 %s"
1757 "The merge base %s is bad.\n"
1758 "This means the bug has been fixed between %s and [%s].\n"
1761 "这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"
1766 "The merge base %s is new.\n"
1767 "The property has changed between %s and [%s].\n"
1770 "介于 %s 和 [%s] 之间的属性已经被修改。\n"
1775 "The merge base %s is %s.\n"
1776 "This means the first '%s' commit is between %s and [%s].\n"
1779 "这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"
1784 "Some %s revs are not ancestors of the %s rev.\n"
1785 "git bisect cannot work properly in this case.\n"
1786 "Maybe you mistook %s and %s revs?\n"
1788 "一些 %s 版本不是 %s 版本的祖先。\n"
1789 "这种情况下 git 二分查找无法正常工作。\n"
1790 "您可能弄错了 %s 和 %s 版本?\n"
1795 "the merge base between %s and [%s] must be skipped.\n"
1796 "So we cannot be sure the first %s commit is between %s and %s.\n"
1797 "We continue anyway."
1799 "介于 %s 和 [%s] 的合并基线一定被忽略了。\n"
1800 "所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"
1805 msgid "Bisecting: a merge base must be tested\n"
1806 msgstr "二分查找中:合并基线必须是经过测试的\n"
1810 msgid "a %s revision is needed"
1813 #: bisect.c:920 builtin/notes.c:177 builtin/tag.c:255
1815 msgid "could not create file '%s'"
1816 msgstr "不能创建文件 '%s'"
1818 #: bisect.c:966 builtin/merge.c:151
1820 msgid "could not read file '%s'"
1821 msgstr "不能读取文件 '%s'"
1824 msgid "reading bisect refs failed"
1829 msgid "%s was both %s and %s\n"
1830 msgstr "%s 同时为 %s 和 %s\n"
1835 "No testable commit found.\n"
1836 "Maybe you started with bad path parameters?\n"
1839 "可能您在运行时使用了错误的路径参数?\n"
1843 msgid "(roughly %d step)"
1844 msgid_plural "(roughly %d steps)"
1845 msgstr[0] "(大概 %d 步)"
1846 msgstr[1] "(大概 %d 步)"
1848 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
1849 #. steps)" translation.
1853 msgid "Bisecting: %d revision left to test after this %s\n"
1854 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
1855 msgstr[0] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n"
1856 msgstr[1] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n"
1859 msgid "--contents and --reverse do not blend well."
1860 msgstr "--contents 和 --reverse 不能混用。"
1863 msgid "cannot use --contents with final commit object name"
1864 msgstr "不能将 --contents 和最终的提交对象名共用"
1867 msgid "--reverse and --first-parent together require specified latest commit"
1868 msgstr "--reverse 和 --first-parent 共用,需要指定最新的提交"
1870 #: blame.c:2821 bundle.c:167 ref-filter.c:2200 remote.c:1924 sequencer.c:2018
1871 #: sequencer.c:4466 submodule.c:847 builtin/commit.c:1047 builtin/log.c:405
1872 #: builtin/log.c:1012 builtin/log.c:1541 builtin/log.c:1945 builtin/log.c:2235
1873 #: builtin/merge.c:415 builtin/pack-objects.c:3276 builtin/pack-objects.c:3291
1874 #: builtin/shortlog.c:192
1875 msgid "revision walk setup failed"
1880 "--reverse --first-parent together require range along first-parent chain"
1881 msgstr "--reverse 和 --first-parent 共用,需要第一祖先链上的提交范围"
1885 msgid "no such path %s in %s"
1886 msgstr "在 %2$s 中无此路径 %1$s"
1890 msgid "cannot read blob %s for path %s"
1891 msgstr "不能为路径 %2$s 读取数据对象 %1$s"
1897 "After fixing the error cause you may try to fix up\n"
1898 "the remote tracking information by invoking\n"
1899 "\"git branch --set-upstream-to=%s%s%s\"."
1902 "在修复错误后,您可以尝试修改远程跟踪分支,通过执行命令\n"
1903 "\"git branch --set-upstream-to=%s%s%s\" 。"
1907 msgid "Not setting branch %s as its own upstream."
1908 msgstr "未设置分支 %s 作为它自己的上游。"
1912 msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
1913 msgstr "分支 '%1$s' 设置为使用变基来跟踪来自 '%3$s' 的远程分支 '%2$s'。"
1917 msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
1918 msgstr "分支 '%1$s' 设置为跟踪来自 '%3$s' 的远程分支 '%2$s'。"
1922 msgid "Branch '%s' set up to track local branch '%s' by rebasing."
1923 msgstr "分支 '%s' 设置为使用变基来跟踪本地分支 '%s'。"
1927 msgid "Branch '%s' set up to track local branch '%s'."
1928 msgstr "分支 '%s' 设置为跟踪本地分支 '%s'。"
1932 msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
1933 msgstr "分支 '%s' 设置为使用变基来跟踪远程引用 '%s'。"
1937 msgid "Branch '%s' set up to track remote ref '%s'."
1938 msgstr "分支 '%s' 设置为跟踪远程引用 '%s'。"
1942 msgid "Branch '%s' set up to track local ref '%s' by rebasing."
1943 msgstr "分支 '%s' 设置为使用变基来跟踪本地引用 '%s'。"
1947 msgid "Branch '%s' set up to track local ref '%s'."
1948 msgstr "分支 '%s' 设置为跟踪本地引用 '%s'。"
1951 msgid "Unable to write upstream branch configuration"
1956 msgid "Not tracking: ambiguous information for ref %s"
1957 msgstr "未跟踪:引用 %s 有歧义"
1961 msgid "'%s' is not a valid branch name."
1962 msgstr "'%s' 不是一个有效的分支名称。"
1966 msgid "A branch named '%s' already exists."
1967 msgstr "一个分支名 '%s' 已经存在。"
1970 msgid "Cannot force update the current branch."
1971 msgstr "无法强制更新当前分支。"
1975 msgid "Cannot setup tracking information; starting point '%s' is not a branch."
1976 msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
1980 msgid "the requested upstream branch '%s' does not exist"
1981 msgstr "请求的上游分支 '%s' 不存在"
1986 "If you are planning on basing your work on an upstream\n"
1987 "branch that already exists at the remote, you may need to\n"
1988 "run \"git fetch\" to retrieve it.\n"
1990 "If you are planning to push out a new local branch that\n"
1991 "will track its remote counterpart, you may want to use\n"
1992 "\"git push -u\" to set the upstream config as you push."
1995 "如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
1996 "您可能需要执行 \"git fetch\" 来获取分支。\n"
1998 "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
1999 "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
2003 msgid "Not a valid object name: '%s'."
2004 msgstr "不是一个有效的对象名:'%s'。"
2008 msgid "Ambiguous object name: '%s'."
2009 msgstr "歧义的对象名:'%s'。"
2013 msgid "Not a valid branch point: '%s'."
2014 msgstr "无效的分支点:'%s'。"
2018 msgid "'%s' is already checked out at '%s'"
2019 msgstr "'%s' 已经检出到 '%s'"
2023 msgid "HEAD of working tree %s is not updated"
2024 msgstr "工作区 %s 的 HEAD 指向没有被更新"
2028 msgid "'%s' does not look like a v2 bundle file"
2029 msgstr "'%s' 不像是一个 v2 版本的包文件"
2033 msgid "unrecognized header: %s%s (%d)"
2034 msgstr "未能识别的包头:%s%s (%d)"
2036 #: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2270 sequencer.c:3034
2037 #: builtin/commit.c:814
2039 msgid "could not open '%s'"
2043 msgid "Repository lacks these prerequisite commits:"
2044 msgstr "仓库中缺少这些必备的提交:"
2047 msgid "need a repository to verify a bundle"
2048 msgstr "需要一个仓库来校验一个包"
2052 msgid "The bundle contains this ref:"
2053 msgid_plural "The bundle contains these %d refs:"
2054 msgstr[0] "这个包中含有这个引用:"
2055 msgstr[1] "这个包中含有 %d 个引用:"
2058 msgid "The bundle records a complete history."
2059 msgstr "这个包记录一个完整历史。"
2063 msgid "The bundle requires this ref:"
2064 msgid_plural "The bundle requires these %d refs:"
2065 msgstr[0] "这个包需要这个引用:"
2066 msgstr[1] "这个包需要 %d 个引用:"
2069 msgid "unable to dup bundle descriptor"
2070 msgstr "无法复制 bundle 描述符"
2073 msgid "Could not spawn pack-objects"
2074 msgstr "不能生成 pack-objects 进程"
2077 msgid "pack-objects died"
2078 msgstr "pack-objects 终止"
2081 msgid "rev-list died"
2082 msgstr "rev-list 终止"
2086 msgid "ref '%s' is excluded by the rev-list options"
2087 msgstr "引用 '%s' 被 rev-list 选项排除"
2089 #: bundle.c:461 builtin/log.c:208 builtin/log.c:1834 builtin/shortlog.c:306
2091 msgid "unrecognized argument: %s"
2095 msgid "Refusing to create empty bundle."
2100 msgid "cannot create '%s'"
2104 msgid "index-pack died"
2105 msgstr "index-pack 终止"
2109 msgid "invalid color value: %.*s"
2110 msgstr "无效的颜色值:%.*s"
2112 #: commit-graph.c:183
2113 msgid "commit-graph file is too small"
2116 #: commit-graph.c:248
2118 msgid "commit-graph signature %X does not match signature %X"
2119 msgstr "提交图形签名 %X 和签名 %X 不匹配"
2121 #: commit-graph.c:255
2123 msgid "commit-graph version %X does not match version %X"
2124 msgstr "提交图形版本 %X 和版本 %X 不匹配"
2126 #: commit-graph.c:262
2128 msgid "commit-graph hash version %X does not match version %X"
2129 msgstr "提交图形哈希版本 %X 和版本 %X 不匹配"
2131 #: commit-graph.c:284
2132 msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
2133 msgstr "提交图形块查找表条目丢失,文件可能不完整"
2135 #: commit-graph.c:294
2137 msgid "commit-graph improper chunk offset %08x%08x"
2138 msgstr "提交图形不正确的块偏移 %08x%08x"
2140 #: commit-graph.c:362
2142 msgid "commit-graph chunk id %08x appears multiple times"
2143 msgstr "提交图形块 id %08x 出现了多次"
2145 #: commit-graph.c:436
2146 msgid "commit-graph has no base graphs chunk"
2147 msgstr "提交图形没有基础图形块"
2149 #: commit-graph.c:446
2150 msgid "commit-graph chain does not match"
2153 #: commit-graph.c:494
2155 msgid "invalid commit-graph chain: line '%s' not a hash"
2156 msgstr "无效的提交图形链:行 '%s' 不是一个哈希值"
2158 #: commit-graph.c:518
2159 msgid "unable to find all commit-graph files"
2160 msgstr "无法找到所有提交图形文件"
2162 #: commit-graph.c:651 commit-graph.c:711
2163 msgid "invalid commit position. commit-graph is likely corrupt"
2164 msgstr "无效的提交位置。提交图形可能已损坏"
2166 #: commit-graph.c:672
2168 msgid "could not find commit %s"
2171 #: commit-graph.c:948 builtin/am.c:1292
2173 msgid "unable to parse commit %s"
2176 #: commit-graph.c:1096
2177 msgid "Writing changed paths Bloom filters index"
2178 msgstr "编写变更路径的 Bloom 过滤器索引"
2180 #: commit-graph.c:1121
2181 msgid "Writing changed paths Bloom filters data"
2182 msgstr "编写变更路径的 Bloom 过滤器数据"
2184 #: commit-graph.c:1160 builtin/pack-objects.c:2783
2186 msgid "unable to get type of object %s"
2187 msgstr "无法获得对象 %s 类型"
2189 #: commit-graph.c:1196
2190 msgid "Loading known commits in commit graph"
2191 msgstr "正在加载提交图中的已知提交"
2193 #: commit-graph.c:1213
2194 msgid "Expanding reachable commits in commit graph"
2195 msgstr "正在扩展提交图中的可达提交"
2197 #: commit-graph.c:1233
2198 msgid "Clearing commit marks in commit graph"
2199 msgstr "正在清除提交图中的提交标记"
2201 #: commit-graph.c:1252
2202 msgid "Computing commit graph generation numbers"
2203 msgstr "正在计算提交图世代数字"
2205 #: commit-graph.c:1300
2206 msgid "Computing commit changed paths Bloom filters"
2207 msgstr "计算提交变更路径的 Bloom 过滤器"
2209 #: commit-graph.c:1359
2211 msgid "Finding commits for commit graph in %d pack"
2212 msgid_plural "Finding commits for commit graph in %d packs"
2213 msgstr[0] "正在 %d 个包中查找提交图的提交"
2214 msgstr[1] "正在 %d 个包中查找提交图的提交"
2216 #: commit-graph.c:1372
2218 msgid "error adding pack %s"
2221 #: commit-graph.c:1376
2223 msgid "error opening index for %s"
2224 msgstr "为 %s 打开索引出错"
2226 #: commit-graph.c:1405
2228 msgid "Finding commits for commit graph from %d ref"
2229 msgid_plural "Finding commits for commit graph from %d refs"
2230 msgstr[0] "正在从 %d 个引用中查找提交图的提交"
2231 msgstr[1] "正在从 %d 个引用中查找提交图的提交"
2233 #: commit-graph.c:1426
2235 msgid "invalid commit object id: %s"
2236 msgstr "无效的提交对象 ID:%s"
2238 #: commit-graph.c:1442
2239 msgid "Finding commits for commit graph among packed objects"
2240 msgstr "正在打包对象中查找提交图的提交"
2242 #: commit-graph.c:1457
2243 msgid "Counting distinct commits in commit graph"
2244 msgstr "正在计算提交图中不同的提交"
2246 #: commit-graph.c:1489
2247 msgid "Finding extra edges in commit graph"
2248 msgstr "正在查找提交图中额外的边"
2250 #: commit-graph.c:1538
2251 msgid "failed to write correct number of base graph ids"
2252 msgstr "无法写入正确数量的基础图形 ID"
2254 #: commit-graph.c:1572 midx.c:812
2256 msgid "unable to create leading directories of %s"
2257 msgstr "不能为 %s 创建先导目录"
2259 #: commit-graph.c:1585
2260 msgid "unable to create temporary graph layer"
2263 #: commit-graph.c:1590
2265 msgid "unable to adjust shared permissions for '%s'"
2266 msgstr "无法为 '%s' 调整共享权限"
2268 #: commit-graph.c:1667
2270 msgid "Writing out commit graph in %d pass"
2271 msgid_plural "Writing out commit graph in %d passes"
2272 msgstr[0] "正在用 %d 步写出提交图"
2273 msgstr[1] "正在用 %d 步写出提交图"
2275 #: commit-graph.c:1712
2276 msgid "unable to open commit-graph chain file"
2277 msgstr "无法打开提交图形链文件"
2279 #: commit-graph.c:1728
2280 msgid "failed to rename base commit-graph file"
2281 msgstr "无法重命名基础提交图形文件"
2283 #: commit-graph.c:1748
2284 msgid "failed to rename temporary commit-graph file"
2285 msgstr "无法重命名临时提交图形文件"
2287 #: commit-graph.c:1874
2288 msgid "Scanning merged commits"
2291 #: commit-graph.c:1885
2293 msgid "unexpected duplicate commit id %s"
2294 msgstr "意外的重复提交 ID %s"
2296 #: commit-graph.c:1908
2297 msgid "Merging commit-graph"
2300 #: commit-graph.c:2096
2302 msgid "the commit graph format cannot write %d commits"
2303 msgstr "提交图格式不能写入 %d 个提交"
2305 #: commit-graph.c:2107
2306 msgid "too many commits to write graph"
2309 #: commit-graph.c:2200
2310 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
2311 msgstr "提交图文件的校验码错误,可能已经损坏"
2313 #: commit-graph.c:2210
2315 msgid "commit-graph has incorrect OID order: %s then %s"
2316 msgstr "提交图形的对象 ID 顺序不正确:%s 然后 %s"
2318 #: commit-graph.c:2220 commit-graph.c:2235
2320 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
2321 msgstr "提交图形有不正确的扇出值:fanout[%d] = %u != %u"
2323 #: commit-graph.c:2227
2325 msgid "failed to parse commit %s from commit-graph"
2326 msgstr "无法从提交图形中解析提交 %s"
2328 #: commit-graph.c:2245
2329 msgid "Verifying commits in commit graph"
2330 msgstr "正在校验提交图中的提交"
2332 #: commit-graph.c:2259
2334 msgid "failed to parse commit %s from object database for commit-graph"
2335 msgstr "无法从提交图形的对象库中解析提交 %s"
2337 #: commit-graph.c:2266
2339 msgid "root tree OID for commit %s in commit-graph is %s != %s"
2340 msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s"
2342 #: commit-graph.c:2276
2344 msgid "commit-graph parent list for commit %s is too long"
2345 msgstr "提交 %s 的提交图形父提交列表太长了"
2347 #: commit-graph.c:2285
2349 msgid "commit-graph parent for %s is %s != %s"
2350 msgstr "%s 的提交图形父提交是 %s != %s"
2352 #: commit-graph.c:2298
2354 msgid "commit-graph parent list for commit %s terminates early"
2355 msgstr "提交 %s 的提交图形父提交列表过早终止"
2357 #: commit-graph.c:2303
2360 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
2361 msgstr "提交图形中提交 %s 的世代号是零,但其它地方非零"
2363 #: commit-graph.c:2307
2366 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
2367 msgstr "提交图形中提交 %s 的世代号非零,但其它地方是零"
2369 #: commit-graph.c:2322
2371 msgid "commit-graph generation for commit %s is %u != %u"
2372 msgstr "提交图形中的提交 %s 的世代号是 %u != %u"
2374 #: commit-graph.c:2328
2376 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
2377 msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"
2379 #: commit.c:52 sequencer.c:2739 builtin/am.c:359 builtin/am.c:403
2380 #: builtin/am.c:1371 builtin/am.c:2013 builtin/replace.c:457
2382 msgid "could not parse %s"
2387 msgid "%s %s is not a commit!"
2388 msgstr "%s %s 不是一个提交!"
2392 "Support for <GIT_DIR>/info/grafts is deprecated\n"
2393 "and will be removed in a future Git version.\n"
2395 "Please use \"git replace --convert-graft-file\"\n"
2396 "to convert the grafts into replace refs.\n"
2398 "Turn this message off by running\n"
2399 "\"git config advice.graftFileDeprecated false\""
2401 "对 <GIT_DIR>/info/grafts 的支持已过时,并将在\n"
2404 "请使用 \"git replace --convert-graft-file\" 将\n"
2407 "设置 \"git config advice.graftFileDeprecated false\"\n"
2412 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
2413 msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
2417 msgid "Commit %s has a bad GPG signature allegedly by %s."
2418 msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
2422 msgid "Commit %s does not have a GPG signature."
2423 msgstr "提交 %s 没有 GPG 签名。"
2427 msgid "Commit %s has a good GPG signature by %s\n"
2428 msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
2432 "Warning: commit message did not conform to UTF-8.\n"
2433 "You may want to amend it after fixing the message, or set the config\n"
2434 "variable i18n.commitencoding to the encoding your project uses.\n"
2436 "警告:提交说明不符合 UTF-8 字符编码。\n"
2437 "您可以通过修补提交来改正提交说明,或者将配置变量 i18n.commitencoding\n"
2440 #: compat/obstack.c:406 compat/obstack.c:408
2441 msgid "memory exhausted"
2447 "exceeded maximum include depth (%d) while including\n"
2451 "This might be due to circular includes."
2453 "超过了最大包含深度(%1$d),当从\n"
2461 msgid "could not expand include path '%s'"
2462 msgstr "无法扩展包含路径 '%s'"
2465 msgid "relative config includes must come from files"
2466 msgstr "相对路径的配置文件引用必须来自于文件"
2469 msgid "relative config include conditionals must come from files"
2470 msgstr "相对路径的配置文件条件引用必须来自于文件"
2474 msgid "key does not contain a section: %s"
2475 msgstr "键名没有包含一个小节名称:%s"
2479 msgid "key does not contain variable name: %s"
2480 msgstr "键名没有包含变量名:%s"
2482 #: config.c:408 sequencer.c:2456
2484 msgid "invalid key: %s"
2489 msgid "invalid key (newline): %s"
2490 msgstr "无效键名(有换行符):%s"
2492 #: config.c:450 config.c:462
2494 msgid "bogus config parameter: %s"
2499 msgid "bogus format in %s"
2504 msgid "bad config line %d in blob %s"
2505 msgstr "数据对象 %2$s 中错误的配置行 %1$d"
2509 msgid "bad config line %d in file %s"
2510 msgstr "文件 %2$s 中错误的配置行 %1$d"
2514 msgid "bad config line %d in standard input"
2515 msgstr "标准输入中错误的配置行 %d"
2519 msgid "bad config line %d in submodule-blob %s"
2520 msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"
2524 msgid "bad config line %d in command line %s"
2525 msgstr "命令行 %2$s 中错误的配置行 %1$d"
2529 msgid "bad config line %d in %s"
2530 msgstr "在 %2$s 中错误的配置行 %1$d"
2533 msgid "out of range"
2537 msgid "invalid unit"
2542 msgid "bad numeric config value '%s' for '%s': %s"
2543 msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误:%3$s"
2547 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
2548 msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
2552 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
2553 msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
2557 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
2558 msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s':%3$s"
2562 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
2563 msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
2567 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
2568 msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
2572 msgid "bad numeric config value '%s' for '%s' in %s: %s"
2573 msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
2577 msgid "failed to expand user dir in: '%s'"
2578 msgstr "无法扩展用户目录:'%s'"
2582 msgid "'%s' for '%s' is not a valid timestamp"
2583 msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
2587 msgid "abbrev length out of range: %d"
2588 msgstr "缩写长度超出范围:%d"
2590 #: config.c:1237 config.c:1248
2592 msgid "bad zlib compression level %d"
2593 msgstr "错误的 zlib 压缩级别 %d"
2596 msgid "core.commentChar should only be one character"
2597 msgstr "core.commentChar 应该是一个字符"
2601 msgid "invalid mode for object creation: %s"
2602 msgstr "无效的对象创建模式:%s"
2606 msgid "malformed value for %s"
2611 msgid "malformed value for %s: %s"
2612 msgstr "%s 的取值格式错误:%s"
2615 msgid "must be one of nothing, matching, simple, upstream or current"
2616 msgstr "必须是其中之一:nothing、matching、simple、upstream 或 current"
2618 #: config.c:1533 builtin/pack-objects.c:3542
2620 msgid "bad pack compression level %d"
2621 msgstr "错误的打包压缩级别 %d"
2625 msgid "unable to load config blob object '%s'"
2626 msgstr "无法从数据对象 '%s' 加载配置"
2630 msgid "reference '%s' does not point to a blob"
2631 msgstr "引用 '%s' 没有指向一个数据对象"
2635 msgid "unable to resolve config blob '%s'"
2636 msgstr "不能解析配置对象 '%s'"
2640 msgid "failed to parse %s"
2644 msgid "unable to parse command-line config"
2645 msgstr "无法解析命令行中的配置"
2648 msgid "unknown error occurred while reading the configuration files"
2649 msgstr "在读取配置文件时遇到未知错误"
2653 msgid "Invalid %s: '%s'"
2658 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
2659 msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"
2663 msgid "unable to parse '%s' from command-line config"
2664 msgstr "无法解析命令行配置中的 '%s'"
2668 msgid "bad config variable '%s' in file '%s' at line %d"
2669 msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
2673 msgid "invalid section name '%s'"
2674 msgstr "无效的小节名称 '%s'"
2678 msgid "%s has multiple values"
2683 msgid "failed to write new configuration file %s"
2684 msgstr "写入新的配置文件 %s 失败"
2686 #: config.c:2770 config.c:3094
2688 msgid "could not lock config file %s"
2689 msgstr "不能锁定配置文件 %s"
2696 #: config.c:2816 builtin/config.c:344
2698 msgid "invalid pattern: %s"
2703 msgid "invalid config file %s"
2706 #: config.c:2854 config.c:3107
2708 msgid "fstat on %s failed"
2709 msgstr "对 %s 调用 fstat 失败"
2713 msgid "unable to mmap '%s'"
2714 msgstr "不能 mmap '%s'"
2716 #: config.c:2874 config.c:3112
2718 msgid "chmod on %s failed"
2719 msgstr "对 %s 调用 chmod 失败"
2721 #: config.c:2959 config.c:3209
2723 msgid "could not write config file %s"
2724 msgstr "不能写入配置文件 %s"
2728 msgid "could not set '%s' to '%s'"
2729 msgstr "不能设置 '%s' 为 '%s'"
2731 #: config.c:2995 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857
2733 msgid "could not unset '%s'"
2734 msgstr "不能取消设置 '%s'"
2738 msgid "invalid section name: %s"
2743 msgid "missing value for '%s'"
2747 msgid "the remote end hung up upon initial contact"
2748 msgstr "远端在初始连接时即挂断"
2752 "Could not read from remote repository.\n"
2754 "Please make sure you have the correct access rights\n"
2755 "and the repository exists."
2759 "请确认您有正确的访问权限并且仓库存在。"
2763 msgid "server doesn't support '%s'"
2764 msgstr "服务器不支持 '%s'"
2768 msgid "server doesn't support feature '%s'"
2769 msgstr "服务器不支持特性 '%s'"
2772 msgid "expected flush after capabilities"
2773 msgstr "在能力之后应为一个 flush 包"
2777 msgid "ignoring capabilities after first line '%s'"
2778 msgstr "忽略第一行 '%s' 之后的能力字段"
2781 msgid "protocol error: unexpected capabilities^{}"
2782 msgstr "协议错误:意外的 capabilities^{}"
2786 msgid "protocol error: expected shallow sha-1, got '%s'"
2787 msgstr "协议错误:预期浅克隆 sha-1,却得到 '%s'"
2790 msgid "repository on the other end cannot be shallow"
2791 msgstr "另一端的仓库不能是浅克隆仓库"
2794 msgid "invalid packet"
2799 msgid "protocol error: unexpected '%s'"
2800 msgstr "协议错误:意外的 '%s'"
2804 msgid "invalid ls-refs response: %s"
2805 msgstr "无效的 ls-refs 响应:%s"
2808 msgid "expected flush after ref listing"
2809 msgstr "在引用列表之后应该有一个 flush 包"
2813 msgid "protocol '%s' is not supported"
2814 msgstr "不支持 '%s' 协议"
2817 msgid "unable to set SO_KEEPALIVE on socket"
2818 msgstr "无法为 socket 设置 SO_KEEPALIVE"
2820 #: connect.c:635 connect.c:698
2822 msgid "Looking up %s ... "
2827 msgid "unable to look up %s (port %s) (%s)"
2828 msgstr "无法查找 %s(端口 %s)(%s)"
2830 #. TRANSLATORS: this is the end of "Looking up %s ... "
2831 #: connect.c:643 connect.c:714
2835 "Connecting to %s (port %s) ... "
2840 #: connect.c:665 connect.c:742
2843 "unable to connect to %s:\n"
2849 #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
2850 #: connect.c:671 connect.c:748
2856 msgid "unable to look up %s (%s)"
2857 msgstr "无法查找 %s(%s)"
2861 msgid "unknown port %s"
2864 #: connect.c:845 connect.c:1175
2866 msgid "strange hostname '%s' blocked"
2867 msgstr "已阻止奇怪的主机名 '%s'"
2871 msgid "strange port '%s' blocked"
2872 msgstr "已阻止奇怪的端口号 '%s'"
2876 msgid "cannot start proxy %s"
2880 msgid "no path specified; see 'git help pull' for valid url syntax"
2881 msgstr "未指定路径,执行 'git help pull' 查看有效的 url 语法"
2884 msgid "ssh variant 'simple' does not support -4"
2885 msgstr "ssh 变体 'simple' 不支持 -4"
2888 msgid "ssh variant 'simple' does not support -6"
2889 msgstr "ssh 变体 'simple' 不支持 -6"
2892 msgid "ssh variant 'simple' does not support setting port"
2893 msgstr "ssh 变体 'simple' 不支持设置端口"
2897 msgid "strange pathname '%s' blocked"
2898 msgstr "已阻止奇怪的路径名 '%s'"
2901 msgid "unable to fork"
2904 #: connected.c:107 builtin/fsck.c:209 builtin/prune.c:45
2905 msgid "Checking connectivity"
2909 msgid "Could not run 'git rev-list'"
2910 msgstr "不能执行 'git rev-list'"
2913 msgid "failed write to rev-list"
2914 msgstr "写入 rev-list 失败"
2917 msgid "failed to close rev-list's stdin"
2918 msgstr "关闭 rev-list 的标准输入失败"
2922 msgid "illegal crlf_action %d"
2923 msgstr "非法的 crlf 动作 %d"
2927 msgid "CRLF would be replaced by LF in %s"
2928 msgstr "%s 中的 CRLF 将被 LF 替换"
2933 "CRLF will be replaced by LF in %s.\n"
2934 "The file will have its original line endings in your working directory"
2936 "%s 中的 CRLF 将被 LF 替换。<\n"
2937 "在工作区中该文件仍保持原有的换行符。"
2941 msgid "LF would be replaced by CRLF in %s"
2942 msgstr "文件 %s 中的 LF 将被 CRLF 替换"
2947 "LF will be replaced by CRLF in %s.\n"
2948 "The file will have its original line endings in your working directory"
2950 "%s 中的 LF 将被 CRLF 替换。\n"
2955 msgid "BOM is prohibited in '%s' if encoded as %s"
2956 msgstr "如果使用 %2$s 编码,禁止在 '%1$s' 中使用 BOM"
2961 "The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
2962 "working-tree-encoding."
2964 "文件 '%s' 包含一个字节顺序标记(BOM)。请使用 UTF-%.*s 作为工作区编码。"
2968 msgid "BOM is required in '%s' if encoded as %s"
2969 msgstr "如果编码为 %2$s,需要在 '%1$s' 中使用 BOM"
2974 "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
2975 "%sLE (depending on the byte order) as working-tree-encoding."
2977 "文件 '%s' 缺失一个字节顺序标记(BOM)。请使用 UTF-%sBE or UTF-%sLE(取决于字"
2980 #: convert.c:419 convert.c:490
2982 msgid "failed to encode '%s' from %s to %s"
2983 msgstr "无法对 '%s' 进行从 %s 到 %s 的编码"
2987 msgid "encoding '%s' from %s to %s and back is not the same"
2988 msgstr "将'%s' 的编码从 %s 到 %s 来回转换不一致"
2992 msgid "cannot fork to run external filter '%s'"
2993 msgstr "不能 fork 以执行外部过滤器 '%s'"
2997 msgid "cannot feed the input to external filter '%s'"
2998 msgstr "不能将输入传递给外部过滤器 '%s'"
3002 msgid "external filter '%s' failed %d"
3003 msgstr "外部过滤器 '%s' 失败码 %d"
3005 #: convert.c:730 convert.c:733
3007 msgid "read from external filter '%s' failed"
3008 msgstr "从外部过滤器 '%s' 读取失败"
3010 #: convert.c:736 convert.c:791
3012 msgid "external filter '%s' failed"
3013 msgstr "外部过滤器 '%s' 失败"
3016 msgid "unexpected filter type"
3020 msgid "path name too long for external filter"
3021 msgstr "外部过滤器的路径名太长"
3026 "external filter '%s' is not available anymore although not all paths have "
3028 msgstr "外部过滤器 '%s' 不再可用,但并非所有路径都已过滤"
3031 msgid "true/false are no valid working-tree-encodings"
3032 msgstr "true/false 不是有效的工作区编码"
3034 #: convert.c:1431 convert.c:1465
3036 msgid "%s: clean filter '%s' failed"
3037 msgstr "%s:clean 过滤器 '%s' 失败"
3041 msgid "%s: smudge filter %s failed"
3042 msgstr "%s:smudge 过滤器 %s 失败"
3046 msgid "skipping credential lookup for key: credential.%s"
3047 msgstr "跳过凭据查询:credential.%s"
3050 msgid "refusing to work with credential missing host field"
3051 msgstr "拒绝使用缺少主机字段的凭据"
3054 msgid "refusing to work with credential missing protocol field"
3055 msgstr "拒绝使用缺少协议字段的凭据"
3059 msgid "url contains a newline in its %s component: %s"
3060 msgstr "URL 的 %s 组件中包含换行符:%s"
3064 msgid "url has no scheme: %s"
3065 msgstr "URL 没有 scheme:%s"
3069 msgid "credential url cannot be parsed: %s"
3070 msgstr "不能解析凭据 URL:%s"
3073 msgid "in the future"
3078 msgid "%<PRIuMAX> second ago"
3079 msgid_plural "%<PRIuMAX> seconds ago"
3080 msgstr[0] "%<PRIuMAX> 秒钟前"
3081 msgstr[1] "%<PRIuMAX> 秒钟前"
3085 msgid "%<PRIuMAX> minute ago"
3086 msgid_plural "%<PRIuMAX> minutes ago"
3087 msgstr[0] "%<PRIuMAX> 分钟前"
3088 msgstr[1] "%<PRIuMAX> 分钟前"
3092 msgid "%<PRIuMAX> hour ago"
3093 msgid_plural "%<PRIuMAX> hours ago"
3094 msgstr[0] "%<PRIuMAX> 小时前"
3095 msgstr[1] "%<PRIuMAX> 小时前"
3099 msgid "%<PRIuMAX> day ago"
3100 msgid_plural "%<PRIuMAX> days ago"
3101 msgstr[0] "%<PRIuMAX> 天前"
3102 msgstr[1] "%<PRIuMAX> 天前"
3106 msgid "%<PRIuMAX> week ago"
3107 msgid_plural "%<PRIuMAX> weeks ago"
3108 msgstr[0] "%<PRIuMAX> 周前"
3109 msgstr[1] "%<PRIuMAX> 周前"
3113 msgid "%<PRIuMAX> month ago"
3114 msgid_plural "%<PRIuMAX> months ago"
3115 msgstr[0] "%<PRIuMAX> 个月前"
3116 msgstr[1] "%<PRIuMAX> 个月前"
3120 msgid "%<PRIuMAX> year"
3121 msgid_plural "%<PRIuMAX> years"
3122 msgstr[0] "%<PRIuMAX> 年"
3123 msgstr[1] "%<PRIuMAX> 年"
3125 #. TRANSLATORS: "%s" is "<n> years"
3128 msgid "%s, %<PRIuMAX> month ago"
3129 msgid_plural "%s, %<PRIuMAX> months ago"
3130 msgstr[0] "%s %<PRIuMAX> 个月前"
3131 msgstr[1] "%s %<PRIuMAX> 个月前"
3133 #: date.c:197 date.c:202
3135 msgid "%<PRIuMAX> year ago"
3136 msgid_plural "%<PRIuMAX> years ago"
3137 msgstr[0] "%<PRIuMAX> 年前"
3138 msgstr[1] "%<PRIuMAX> 年前"
3140 #: delta-islands.c:272
3141 msgid "Propagating island marks"
3144 #: delta-islands.c:290
3146 msgid "bad tree object %s"
3149 #: delta-islands.c:334
3151 msgid "failed to load island regex for '%s': %s"
3152 msgstr "未能加载 '%s' 的数据岛正则表达式:%s"
3154 #: delta-islands.c:390
3156 msgid "island regex from config has too many capture groups (max=%d)"
3157 msgstr "来自 config 的数据岛正则表达式有太多的捕获组(最多 %d 个)"
3159 #: delta-islands.c:467
3161 msgid "Marked %d islands, done.\n"
3162 msgstr "已标记 %d 个数据岛,结束。\n"
3164 #: diff-no-index.c:238
3165 msgid "git diff --no-index [<options>] <path> <path>"
3166 msgstr "git diff --no-index [<选项>] <路径> <路径>"
3168 #: diff-no-index.c:263
3170 "Not a git repository. Use --no-index to compare two paths outside a working "
3172 msgstr "不是一个 git 仓库。使用 --no-index 比较工作区之外的两个路径"
3177 msgid " Failed to parse dirstat cut-off percentage '%s'\n"
3178 msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
3183 msgid " Unknown dirstat parameter '%s'\n"
3184 msgstr " 未知的 dirstat 参数 '%s'\n"
3188 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
3189 "'dimmed-zebra', 'plain'"
3191 "移动的颜色设置必须是 'no'、'default'、'blocks'、'zebra'、'dimmed_zebra' 或 "
3197 "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
3198 "'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
3200 "未知的 color-moved-ws 模式 '%s',可能的取值有 'ignore-space-change'、'ignore-"
3201 "space-at-eol'、'ignore-all-space'、'allow-indentation-change'"
3205 "color-moved-ws: allow-indentation-change cannot be combined with other "
3207 msgstr "color-moved-ws:allow-indentation-change 不能与其它空白字符模式共用"
3211 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
3212 msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
3217 "Found errors in 'diff.dirstat' config variable:\n"
3220 "发现配置变量 'diff.dirstat' 中的错误:\n"
3225 msgid "external diff died, stopping at %s"
3226 msgstr "外部 diff 退出,停止在 %s"
3229 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
3230 msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
3233 msgid "-G, -S and --find-object are mutually exclusive"
3234 msgstr "-G、-S 和 --find-object 是互斥的"
3237 msgid "--follow requires exactly one pathspec"
3238 msgstr "--follow 明确要求只跟一个路径规格"
3242 msgid "invalid --stat value: %s"
3243 msgstr "无效的 --stat 值:%s"
3245 #: diff.c:4717 diff.c:4722 diff.c:4727 diff.c:4732 diff.c:5245
3246 #: parse-options.c:197 parse-options.c:201
3248 msgid "%s expects a numerical value"
3254 "Failed to parse --dirstat/-X option parameter:\n"
3257 "无法解析 --dirstat/-X 选项的参数:\n"
3262 msgid "unknown change class '%c' in --diff-filter=%s"
3263 msgstr "--diff-filter=%2$s 中未知的变更类 '%1$c'"
3267 msgid "unknown value after ws-error-highlight=%.*s"
3268 msgstr "ws-error-highlight=%.*s 之后未知的值"
3272 msgid "unable to resolve '%s'"
3275 #: diff.c:4922 diff.c:4928
3277 msgid "%s expects <n>/<m> form"
3278 msgstr "%s 期望 <n>/<m> 格式"
3282 msgid "%s expects a character, got '%s'"
3283 msgstr "%s 期望一个字符,得到 '%s'"
3287 msgid "bad --color-moved argument: %s"
3288 msgstr "坏的 --color-moved 参数:%s"
3292 msgid "invalid mode '%s' in --color-moved-ws"
3293 msgstr "--color-moved-ws 中的无效模式 '%s' "
3297 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
3300 "diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""
3302 #: diff.c:5056 diff.c:5076
3304 msgid "invalid argument to %s"
3309 msgid "failed to parse --submodule option parameter: '%s'"
3310 msgstr "无法解析 --submodule 选项的参数:'%s'"
3314 msgid "bad --word-diff argument: %s"
3315 msgstr "坏的 --word-diff 参数:%s"
3318 msgid "Diff output format options"
3321 #: diff.c:5295 diff.c:5301
3322 msgid "generate patch"
3325 #: diff.c:5298 builtin/log.c:177
3326 msgid "suppress diff output"
3329 #: diff.c:5303 diff.c:5417 diff.c:5424
3333 #: diff.c:5304 diff.c:5307
3334 msgid "generate diffs with <n> lines context"
3335 msgstr "生成含 <n> 行上下文的差异"
3338 msgid "generate the diff in raw format"
3342 msgid "synonym for '-p --raw'"
3343 msgstr "和 '-p --raw' 同义"
3346 msgid "synonym for '-p --stat'"
3347 msgstr "和 '-p --stat' 同义"
3350 msgid "machine friendly --stat"
3351 msgstr "机器友好的 --stat"
3354 msgid "output only the last line of --stat"
3355 msgstr "只输出 --stat 的最后一行"
3357 #: diff.c:5325 diff.c:5333
3358 msgid "<param1,param2>..."
3359 msgstr "<参数1,参数2>..."
3363 "output the distribution of relative amount of changes for each sub-directory"
3364 msgstr "输出每个子目录相对变更的分布"
3367 msgid "synonym for --dirstat=cumulative"
3368 msgstr "和 --dirstat=cumulative 同义"
3371 msgid "synonym for --dirstat=files,param1,param2..."
3372 msgstr "是 --dirstat=files,param1,param2... 的同义词"
3375 msgid "warn if changes introduce conflict markers or whitespace errors"
3376 msgstr "如果变更中引入冲突定界符或空白错误,给出警告"
3379 msgid "condensed summary such as creations, renames and mode changes"
3380 msgstr "精简摘要,例如创建、重命名和模式变更"
3383 msgid "show only names of changed files"
3384 msgstr "只显示变更文件的文件名"
3387 msgid "show only names and status of changed files"
3388 msgstr "只显示变更文件的文件名和状态"
3391 msgid "<width>[,<name-width>[,<count>]]"
3392 msgstr "<宽度>[,<文件名宽度>[,<次数>]]"
3395 msgid "generate diffstat"
3396 msgstr "生成差异统计(diffstat)"
3398 #: diff.c:5352 diff.c:5355 diff.c:5358
3403 msgid "generate diffstat with a given width"
3404 msgstr "使用给定的长度生成差异统计"
3407 msgid "generate diffstat with a given name width"
3408 msgstr "使用给定的文件名长度生成差异统计"
3411 msgid "generate diffstat with a given graph width"
3412 msgstr "使用给定的图形长度生成差异统计"
3419 msgid "generate diffstat with limited lines"
3420 msgstr "生成有限行数的差异统计"
3423 msgid "generate compact summary in diffstat"
3424 msgstr "生成差异统计的简洁摘要"
3427 msgid "output a binary diff that can be applied"
3428 msgstr "输出一个可以应用的二进制差异"
3431 msgid "show full pre- and post-image object names on the \"index\" lines"
3432 msgstr "在 \"index\" 行显示完整的前后对象名称"
3435 msgid "show colored diff"
3444 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
3446 msgstr "对于差异中的上下文、旧的和新的行,加亮显示错误的空白字符"
3450 "do not munge pathnames and use NULs as output field terminators in --raw or "
3453 "在 --raw 或者 --numstat 中,不对路径字符转码并使用 NUL 字符做为输出字段的分隔"
3456 #: diff.c:5381 diff.c:5384 diff.c:5387 diff.c:5493
3461 msgid "show the given source prefix instead of \"a/\""
3462 msgstr "显示给定的源前缀取代 \"a/\""
3465 msgid "show the given destination prefix instead of \"b/\""
3466 msgstr "显示给定的目标前缀取代 \"b/\""
3469 msgid "prepend an additional prefix to every line of output"
3473 msgid "do not show any source or destination prefix"
3474 msgstr "不显示任何源和目标前缀"
3477 msgid "show context between diff hunks up to the specified number of lines"
3478 msgstr "显示指定行数的差异块间的上下文"
3480 #: diff.c:5398 diff.c:5403 diff.c:5408
3485 msgid "specify the character to indicate a new line instead of '+'"
3486 msgstr "指定一个字符取代 '+' 来表示新的一行"
3489 msgid "specify the character to indicate an old line instead of '-'"
3490 msgstr "指定一个字符取代 '-' 来表示旧的一行"
3493 msgid "specify the character to indicate a context instead of ' '"
3494 msgstr "指定一个字符取代 ' ' 来表示一行上下文"
3497 msgid "Diff rename options"
3505 msgid "break complete rewrite changes into pairs of delete and create"
3506 msgstr "将完全重写的变更打破为成对的删除和创建"
3509 msgid "detect renames"
3513 msgid "omit the preimage for deletes"
3514 msgstr "省略删除操作的差异输出"
3517 msgid "detect copies"
3521 msgid "use unmodified files as source to find copies"
3522 msgstr "使用未修改的文件做为发现拷贝的源"
3525 msgid "disable rename detection"
3529 msgid "use empty blobs as rename source"
3530 msgstr "使用空的数据对象做为重命名的源"
3533 msgid "continue listing the history of a file beyond renames"
3534 msgstr "继续列出文件重命名以外的历史记录"
3538 "prevent rename/copy detection if the number of rename/copy targets exceeds "
3540 msgstr "如果重命名/拷贝目标超过给定的限制,禁止重命名/拷贝检测"
3543 msgid "Diff algorithm options"
3547 msgid "produce the smallest possible diff"
3551 msgid "ignore whitespace when comparing lines"
3555 msgid "ignore changes in amount of whitespace"
3559 msgid "ignore changes in whitespace at EOL"
3560 msgstr "忽略行尾的空白字符变更"
3563 msgid "ignore carrier-return at the end of line"
3564 msgstr "忽略行尾的回车符(CR)"
3567 msgid "ignore changes whose lines are all blank"
3568 msgstr "忽略整行都是空白的变更"
3571 msgid "heuristic to shift diff hunk boundaries for easy reading"
3572 msgstr "启发式转换差异边界以便阅读"
3575 msgid "generate diff using the \"patience diff\" algorithm"
3576 msgstr "使用 \"patience diff\" 算法生成差异"
3579 msgid "generate diff using the \"histogram diff\" algorithm"
3580 msgstr "使用 \"histogram diff\" 算法生成差异"
3587 msgid "choose a diff algorithm"
3595 msgid "generate diff using the \"anchored diff\" algorithm"
3596 msgstr "使用 \"anchored diff\" 算法生成差异"
3598 #: diff.c:5476 diff.c:5485 diff.c:5488
3603 msgid "show word diff, using <mode> to delimit changed words"
3604 msgstr "显示单词差异,使用 <模式> 分隔变更的单词"
3606 #: diff.c:5479 diff.c:5482 diff.c:5527
3611 msgid "use <regex> to decide what a word is"
3612 msgstr "使用 <正则表达式> 确定何为一个词"
3615 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
3616 msgstr "相当于 --word-diff=color --word-diff-regex=<正则>"
3619 msgid "moved lines of code are colored differently"
3620 msgstr "移动的代码行用不同方式着色"
3623 msgid "how white spaces are ignored in --color-moved"
3624 msgstr "在 --color-moved 下如何忽略空白字符"
3627 msgid "Other diff options"
3631 msgid "when run from subdir, exclude changes outside and show relative paths"
3632 msgstr "当从子目录运行,排除目录之外的变更并显示相对路径"
3635 msgid "treat all files as text"
3636 msgstr "把所有文件当做文本处理"
3639 msgid "swap two inputs, reverse the diff"
3640 msgstr "交换两个输入,反转差异"
3643 msgid "exit with 1 if there were differences, 0 otherwise"
3644 msgstr "有差异时退出码为 1,否则为 0"
3647 msgid "disable all output of the program"
3651 msgid "allow an external diff helper to be executed"
3652 msgstr "允许执行一个外置的差异助手"
3655 msgid "run external text conversion filters when comparing binary files"
3656 msgstr "当比较二进制文件时,运行外部的文本转换过滤器"
3663 msgid "ignore changes to submodules in the diff generation"
3664 msgstr "在生成差异时,忽略子模组的更改"
3671 msgid "specify how differences in submodules are shown"
3672 msgstr "指定子模组的差异如何显示"
3675 msgid "hide 'git add -N' entries from the index"
3676 msgstr "隐藏索引中 'git add -N' 条目"
3679 msgid "treat 'git add -N' entries as real in the index"
3680 msgstr "将索引中 'git add -N' 条目当做真实的"
3688 "look for differences that change the number of occurrences of the specified "
3690 msgstr "查找改变了指定字符串出现次数的差异"
3694 "look for differences that change the number of occurrences of the specified "
3696 msgstr "查找改变指定正则匹配出现次数的差异"
3699 msgid "show all changes in the changeset with -S or -G"
3700 msgstr "显示使用 -S 或 -G 的变更集的所有变更"
3703 msgid "treat <string> in -S as extended POSIX regular expression"
3704 msgstr "将 -S 的 <string> 当做扩展的 POSIX 正则表达式"
3707 msgid "control the order in which files appear in the output"
3708 msgstr "控制输出中的文件显示顺序"
3716 "look for differences that change the number of occurrences of the specified "
3718 msgstr "查找改变指定对象出现次数的差异"
3721 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
3722 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
3725 msgid "select files by diff type"
3733 msgid "Output to a specific file"
3737 msgid "inexact rename detection was skipped due to too many files."
3738 msgstr "因为文件太多,略过不严格的重命名检查。"
3741 msgid "only found copies from modified paths due to too many files."
3742 msgstr "因为文件太多,只在修改的路径中查找拷贝。"
3747 "you may want to set your %s variable to at least %d and retry the command."
3748 msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。"
3750 #: diffcore-order.c:24
3752 msgid "failed to read orderfile '%s'"
3753 msgstr "读取排序文件 '%s' 失败"
3755 #: diffcore-rename.c:592
3756 msgid "Performing inexact rename detection"
3757 msgstr "正在进行非精确的重命名探测"
3761 msgid "pathspec '%s' did not match any file(s) known to git"
3762 msgstr "路径规格 '%s' 未匹配任何 git 已知文件"
3764 #: dir.c:695 dir.c:724 dir.c:737
3766 msgid "unrecognized pattern: '%s'"
3767 msgstr "未识别的模式:'%s'"
3769 #: dir.c:754 dir.c:768
3771 msgid "unrecognized negative pattern: '%s'"
3772 msgstr "未识别的反向模式:'%s'"
3776 msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
3777 msgstr "您的 sparse-checkout 文件可能有问题:重复的模式 '%s'"
3780 msgid "disabling cone pattern matching"
3781 msgstr "禁止 cone 模式匹配"
3785 msgid "cannot use %s as an exclude file"
3786 msgstr "不能将 %s 用作排除文件"
3790 msgid "could not open directory '%s'"
3791 msgstr "不能打开目录 '%s'"
3794 msgid "failed to get kernel name and information"
3795 msgstr "无法获得内核名称和信息"
3798 msgid "untracked cache is disabled on this system or location"
3799 msgstr "缓存未跟踪文件在本系统或位置中被禁用"
3803 msgid "index file corrupt in repo %s"
3804 msgstr "仓库 %s 中的索引文件损坏"
3806 #: dir.c:3526 dir.c:3531
3808 msgid "could not create directories for %s"
3809 msgstr "不能为 %s 创建目录"
3813 msgid "could not migrate git directory from '%s' to '%s'"
3814 msgstr "不能从 '%s' 迁移 git 目录到 '%s'"
3818 msgid "hint: Waiting for your editor to close the file...%c"
3819 msgstr "提示:等待您的编辑器关闭文件...%c"
3822 msgid "Filtering content"
3827 msgid "could not stat file '%s'"
3828 msgstr "不能对文件 '%s' 调用 stat"
3830 #: environment.c:150
3832 msgid "bad git namespace path \"%s\""
3833 msgstr "错误的 git 名字空间路径 \"%s\""
3835 #: environment.c:337
3837 msgid "could not set GIT_DIR to '%s'"
3838 msgstr "不能设置 GIT_DIR 为 '%s'"
3842 msgid "too many args to run %s"
3843 msgstr "执行 %s 的参数太多"
3846 msgid "git fetch-pack: expected shallow list"
3847 msgstr "git fetch-pack:应为 shallow 列表"
3850 msgid "git fetch-pack: expected a flush packet after shallow list"
3851 msgstr "git fetch-pack:在浅克隆列表之后期望一个 flush 包"
3854 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
3855 msgstr "git fetch-pack:期望 ACK/NAK,却得到 flush 包"
3859 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
3860 msgstr "git fetch-pack:应为 ACK/NAK,却得到 '%s'"
3863 msgid "unable to write to remote"
3867 msgid "--stateless-rpc requires multi_ack_detailed"
3868 msgstr "--stateless-rpc 需要 multi_ack_detailed"
3870 #: fetch-pack.c:357 fetch-pack.c:1364
3872 msgid "invalid shallow line: %s"
3873 msgstr "无效的 shallow 信息:%s"
3875 #: fetch-pack.c:363 fetch-pack.c:1370
3877 msgid "invalid unshallow line: %s"
3878 msgstr "无效的 unshallow 信息:%s"
3880 #: fetch-pack.c:365 fetch-pack.c:1372
3882 msgid "object not found: %s"
3885 #: fetch-pack.c:368 fetch-pack.c:1375
3887 msgid "error in object: %s"
3890 #: fetch-pack.c:370 fetch-pack.c:1377
3892 msgid "no shallow found: %s"
3893 msgstr "未发现 shallow:%s"
3895 #: fetch-pack.c:373 fetch-pack.c:1381
3897 msgid "expected shallow/unshallow, got %s"
3898 msgstr "应为 shallow/unshallow,却得到 %s"
3902 msgid "got %s %d %s"
3903 msgstr "得到 %s %d %s"
3907 msgid "invalid commit %s"
3914 #: fetch-pack.c:476 progress.c:336
3920 msgid "got %s (%d) %s"
3921 msgstr "得到 %s (%d) %s"
3925 msgid "Marking %s as complete"
3930 msgid "already have %s (%s)"
3934 msgid "fetch-pack: unable to fork off sideband demultiplexer"
3935 msgstr "fetch-pack:无法派生 sideband 多路输出"
3938 msgid "protocol error: bad pack header"
3943 msgid "fetch-pack: unable to fork off %s"
3944 msgstr "fetch-pack:无法派生进程 %s"
3952 msgid "error in sideband demultiplexer"
3953 msgstr "sideband 多路输出出错"
3957 msgid "Server version is %.*s"
3960 #: fetch-pack.c:971 fetch-pack.c:977 fetch-pack.c:980 fetch-pack.c:986
3961 #: fetch-pack.c:990 fetch-pack.c:994 fetch-pack.c:998 fetch-pack.c:1002
3962 #: fetch-pack.c:1006 fetch-pack.c:1010 fetch-pack.c:1014 fetch-pack.c:1018
3963 #: fetch-pack.c:1024 fetch-pack.c:1030 fetch-pack.c:1035 fetch-pack.c:1040
3965 msgid "Server supports %s"
3969 msgid "Server does not support shallow clients"
3970 msgstr "服务器不支持 shalllow 客户端"
3972 #: fetch-pack.c:1033
3973 msgid "Server does not support --shallow-since"
3974 msgstr "服务器不支持 --shallow-since"
3976 #: fetch-pack.c:1038
3977 msgid "Server does not support --shallow-exclude"
3978 msgstr "服务器不支持 --shallow-exclude"
3980 #: fetch-pack.c:1042
3981 msgid "Server does not support --deepen"
3982 msgstr "服务器不支持 --deepen"
3984 #: fetch-pack.c:1059
3985 msgid "no common commits"
3988 #: fetch-pack.c:1071 fetch-pack.c:1563
3989 msgid "git fetch-pack: fetch failed."
3990 msgstr "git fetch-pack:获取失败。"
3992 #: fetch-pack.c:1211
3993 msgid "Server does not support shallow requests"
3994 msgstr "服务器不支持 shalllow 请求"
3996 #: fetch-pack.c:1218
3997 msgid "Server supports filter"
3998 msgstr "服务器支持 filter"
4000 #: fetch-pack.c:1242
4001 msgid "unable to write request to remote"
4004 #: fetch-pack.c:1260
4006 msgid "error reading section header '%s'"
4007 msgstr "读取节标题 '%s' 出错"
4009 #: fetch-pack.c:1266
4011 msgid "expected '%s', received '%s'"
4012 msgstr "预期 '%s',得到 '%s'"
4014 #: fetch-pack.c:1327
4016 msgid "unexpected acknowledgment line: '%s'"
4017 msgstr "意外的确认行:'%s'"
4019 #: fetch-pack.c:1332
4021 msgid "error processing acks: %d"
4022 msgstr "处理 ack 出错:%d"
4024 #: fetch-pack.c:1342
4025 msgid "expected packfile to be sent after 'ready'"
4026 msgstr "预期在 'ready' 之后发送 packfile"
4028 #: fetch-pack.c:1344
4029 msgid "expected no other sections to be sent after no 'ready'"
4030 msgstr "在没有 'ready' 不应该发送其它小节"
4032 #: fetch-pack.c:1386
4034 msgid "error processing shallow info: %d"
4035 msgstr "处理浅克隆信息出错:%d"
4037 #: fetch-pack.c:1433
4039 msgid "expected wanted-ref, got '%s'"
4040 msgstr "预期 wanted-ref,得到 '%s'"
4042 #: fetch-pack.c:1438
4044 msgid "unexpected wanted-ref: '%s'"
4045 msgstr "意外的 wanted-ref:'%s'"
4047 #: fetch-pack.c:1443
4049 msgid "error processing wanted refs: %d"
4050 msgstr "处理要获取的引用出错:%d"
4052 #: fetch-pack.c:1789
4053 msgid "no matching remote head"
4056 #: fetch-pack.c:1812 builtin/clone.c:692
4057 msgid "remote did not send all necessary objects"
4058 msgstr "远程没有发送所有必需的对象"
4060 #: fetch-pack.c:1839
4062 msgid "no such remote ref %s"
4063 msgstr "没有这样的远程引用 %s"
4065 #: fetch-pack.c:1842
4067 msgid "Server does not allow request for unadvertised object %s"
4068 msgstr "服务器不允许请求未公开的对象 %s"
4070 #: gpg-interface.c:272
4071 msgid "could not create temporary file"
4074 #: gpg-interface.c:275
4076 msgid "failed writing detached signature to '%s'"
4077 msgstr "无法将分离式签名写入 '%s'"
4079 #: gpg-interface.c:457
4080 msgid "gpg failed to sign the data"
4085 msgid "ignore invalid color '%.*s' in log.graphColors"
4086 msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"
4090 "given pattern contains NULL byte (via -f <file>). This is only supported "
4091 "with -P under PCRE v2"
4093 "给定的模式包含 NULL 字符(通过 -f <文件> 参数)。只有 PCRE v2 下的 -P 支持此"
4098 msgid "'%s': unable to read %s"
4099 msgstr "'%s':无法读取 %s"
4101 #: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:82
4104 msgid "failed to stat '%s'"
4105 msgstr "对 '%s' 调用 stat 失败"
4109 msgid "'%s': short read"
4113 msgid "start a working area (see also: git help tutorial)"
4114 msgstr "开始一个工作区(参见:git help tutorial)"
4117 msgid "work on the current change (see also: git help everyday)"
4118 msgstr "在当前变更上工作(参见:git help everyday)"
4121 msgid "examine the history and state (see also: git help revisions)"
4122 msgstr "检查历史和状态(参见:git help revisions)"
4125 msgid "grow, mark and tweak your common history"
4126 msgstr "扩展、标记和调校您的历史记录"
4129 msgid "collaborate (see also: git help workflows)"
4130 msgstr "协同(参见:git help workflows)"
4133 msgid "Main Porcelain Commands"
4137 msgid "Ancillary Commands / Manipulators"
4141 msgid "Ancillary Commands / Interrogators"
4145 msgid "Interacting with Others"
4149 msgid "Low-level Commands / Manipulators"
4153 msgid "Low-level Commands / Interrogators"
4157 msgid "Low-level Commands / Syncing Repositories"
4161 msgid "Low-level Commands / Internal Helpers"
4166 msgid "available git commands in '%s'"
4167 msgstr "在 '%s' 下可用的 git 命令"
4170 msgid "git commands available from elsewhere on your $PATH"
4171 msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
4174 msgid "These are common Git commands used in various situations:"
4175 msgstr "这些是各种场合常见的 Git 命令:"
4177 #: help.c:363 git.c:99
4179 msgid "unsupported command listing type '%s'"
4180 msgstr "不支持的命令列表类型 '%s'"
4183 msgid "The common Git guides are:"
4184 msgstr "最常用的 Git 向导有:"
4187 msgid "See 'git help <command>' to read about a specific subcommand"
4188 msgstr "执行 'git help <command>' 来查看特定子命令"
4191 msgid "External commands"
4195 msgid "Command aliases"
4201 "'%s' appears to be a git command, but we were not\n"
4202 "able to execute it. Maybe git-%s is broken?"
4204 "'%s' 像是一个 git 命令,但却无法运行。\n"
4208 msgid "Uh oh. Your system reports no Git commands at all."
4209 msgstr "唉呀,您的系统中未发现 Git 命令。"
4213 msgid "WARNING: You called a Git command named '%s', which does not exist."
4214 msgstr "警告:您运行了一个并不存在的 Git 命令 '%s'。"
4218 msgid "Continuing under the assumption that you meant '%s'."
4219 msgstr "假定你想要的是 '%s' 并继续。"
4223 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
4224 msgstr "假定你想要的是 '%2$s',在 %1$0.1f 秒钟后继续。"
4228 msgid "git: '%s' is not a git command. See 'git --help'."
4229 msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
4234 "The most similar command is"
4237 "The most similar commands are"
4246 msgid "git version [<options>]"
4247 msgstr "git version [<选项>]"
4257 "Did you mean this?"
4260 "Did you mean one of these?"
4271 "*** Please tell me who you are.\n"
4275 " git config --global user.email \"you@example.com\"\n"
4276 " git config --global user.name \"Your Name\"\n"
4278 "to set your account's default identity.\n"
4279 "Omit --global to set the identity only in this repository.\n"
4287 " git config --global user.email \"you@example.com\"\n"
4288 " git config --global user.name \"Your Name\"\n"
4291 "如果仅在本仓库设置身份标识,则省略 --global 参数。\n"
4294 msgid "no email was given and auto-detection is disabled"
4295 msgstr "未提供邮件地址且自动探测被禁用"
4299 msgid "unable to auto-detect email address (got '%s')"
4300 msgstr "无法自动探测邮件地址(得到 '%s')"
4303 msgid "no name was given and auto-detection is disabled"
4304 msgstr "未提供姓名且自动探测被禁用"
4308 msgid "unable to auto-detect name (got '%s')"
4309 msgstr "无法自动探测姓名(得到 '%s')"
4313 msgid "empty ident name (for <%s>) not allowed"
4314 msgstr "不允许空的姓名(对于 <%s>)"
4318 msgid "name consists only of disallowed characters: %s"
4319 msgstr "姓名中仅包含禁用字符:%s"
4321 #: ident.c:436 builtin/commit.c:634
4323 msgid "invalid date format: %s"
4326 #: list-objects-filter-options.c:58
4327 msgid "expected 'tree:<depth>'"
4328 msgstr "期望 'tree:<深度>'"
4330 #: list-objects-filter-options.c:73
4331 msgid "sparse:path filters support has been dropped"
4332 msgstr "sparse:path 过滤器支持已被删除"
4334 #: list-objects-filter-options.c:86
4336 msgid "invalid filter-spec '%s'"
4337 msgstr "无效的过滤器表达式 '%s'"
4339 #: list-objects-filter-options.c:102
4341 msgid "must escape char in sub-filter-spec: '%c'"
4342 msgstr "必须对 sub-filter-spec 中的字符进行转义:'%c'"
4344 #: list-objects-filter-options.c:144
4345 msgid "expected something after combine:"
4346 msgstr "期望在组合后有一些东西:"
4348 #: list-objects-filter-options.c:226
4349 msgid "multiple filter-specs cannot be combined"
4352 #: list-objects-filter.c:492
4354 msgid "unable to access sparse blob in '%s'"
4355 msgstr "不能访问 '%s' 中的稀疏数据对象"
4357 #: list-objects-filter.c:495
4359 msgid "unable to parse sparse filter data in %s"
4360 msgstr "无法解析 %s 中的稀疏过滤器数据"
4362 #: list-objects.c:127
4364 msgid "entry '%s' in tree %s has tree mode, but is not a tree"
4365 msgstr "树 %2$s 中的条目 '%1$s' 具有树的模式,但不是一个树对象"
4367 #: list-objects.c:140
4369 msgid "entry '%s' in tree %s has blob mode, but is not a blob"
4370 msgstr "树 %2$s 中的条目 '%1$s' 具有数据对象的模式,但不是一个数据对象"
4372 #: list-objects.c:375
4374 msgid "unable to load root tree for commit %s"
4375 msgstr "无法为提交 %s 加载根树"
4380 "Unable to create '%s.lock': %s.\n"
4382 "Another git process seems to be running in this repository, e.g.\n"
4383 "an editor opened by 'git commit'. Please make sure all processes\n"
4384 "are terminated then try again. If it still fails, a git process\n"
4385 "may have crashed in this repository earlier:\n"
4386 "remove the file manually to continue."
4388 "无法创建 '%s.lock':%s。\n"
4390 "似乎另外一个 git 进程在这个仓库中运行,例如:'git commit' 命令打\n"
4391 "开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错,\n"
4392 "可能之前有一个 git 进程在这个仓库中异常退出:\n"
4397 msgid "Unable to create '%s.lock': %s"
4398 msgstr "不能创建 '%s.lock':%s"
4401 msgid "expected flush after ls-refs arguments"
4402 msgstr "在 ls-refs 参数后应该有一个 flush 包"
4404 #: merge-recursive.c:356
4405 msgid "(bad commit)\n"
4408 #: merge-recursive.c:379
4410 msgid "add_cacheinfo failed for path '%s'; merge aborting."
4411 msgstr "add_cacheinfo 对路径 '%s' 执行失败,合并终止。"
4413 #: merge-recursive.c:388
4415 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
4416 msgstr "add_cacheinfo 无法刷新路径 '%s',合并终止。"
4418 #: merge-recursive.c:874
4420 msgid "failed to create path '%s'%s"
4421 msgstr "创建路径 '%s'%s 失败"
4423 #: merge-recursive.c:885
4425 msgid "Removing %s to make room for subdirectory\n"
4426 msgstr "删除 %s 以便为子目录留出空间\n"
4428 #: merge-recursive.c:899 merge-recursive.c:918
4429 msgid ": perhaps a D/F conflict?"
4430 msgstr ":可能是一个目录/文件冲突?"
4432 #: merge-recursive.c:908
4434 msgid "refusing to lose untracked file at '%s'"
4435 msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
4437 #: merge-recursive.c:949 builtin/cat-file.c:41
4439 msgid "cannot read object %s '%s'"
4440 msgstr "不能读取对象 %s '%s'"
4442 #: merge-recursive.c:954
4444 msgid "blob expected for %s '%s'"
4445 msgstr "%s '%s' 应为数据对象"
4447 #: merge-recursive.c:979
4449 msgid "failed to open '%s': %s"
4450 msgstr "打开 '%s' 失败:%s"
4452 #: merge-recursive.c:990
4454 msgid "failed to symlink '%s': %s"
4455 msgstr "创建符号链接 '%s' 失败:%s"
4457 #: merge-recursive.c:995
4459 msgid "do not know what to do with %06o %s '%s'"
4460 msgstr "不知道如何处理 %06o %s '%s'"
4462 #: merge-recursive.c:1191
4464 msgid "Failed to merge submodule %s (not checked out)"
4465 msgstr "无法合并子模组 %s (没有检出)"
4467 #: merge-recursive.c:1198
4469 msgid "Failed to merge submodule %s (commits not present)"
4470 msgstr "无法合并子模组 %s(提交不存在)"
4472 #: merge-recursive.c:1205
4474 msgid "Failed to merge submodule %s (commits don't follow merge-base)"
4475 msgstr "无法合并子模组 %s (提交未跟随合并基线)"
4477 #: merge-recursive.c:1213 merge-recursive.c:1225
4479 msgid "Fast-forwarding submodule %s to the following commit:"
4480 msgstr "子模组 %s 快进到如下提交:"
4482 #: merge-recursive.c:1216 merge-recursive.c:1228
4484 msgid "Fast-forwarding submodule %s"
4487 #: merge-recursive.c:1251
4489 msgid "Failed to merge submodule %s (merge following commits not found)"
4490 msgstr "无法合并子模组 %s (没发现合并跟随的提交)"
4492 #: merge-recursive.c:1255
4494 msgid "Failed to merge submodule %s (not fast-forward)"
4495 msgstr "无法合并子模组 %s(非快进)"
4497 #: merge-recursive.c:1256
4498 msgid "Found a possible merge resolution for the submodule:\n"
4499 msgstr "找到子模组的一个可能的合并方案:\n"
4501 #: merge-recursive.c:1259
4504 "If this is correct simply add it to the index for example\n"
4507 " git update-index --cacheinfo 160000 %s \"%s\"\n"
4509 "which will accept this suggestion.\n"
4511 "如果这个正确,将其添加到索引,例如使用命令:\n"
4513 " git update-index --cacheinfo 160000 %s \"%s\"\n"
4517 #: merge-recursive.c:1268
4519 msgid "Failed to merge submodule %s (multiple merges found)"
4520 msgstr "无法合并子模组 %s (发现多个合并)"
4522 #: merge-recursive.c:1341
4523 msgid "Failed to execute internal merge"
4526 #: merge-recursive.c:1346
4528 msgid "Unable to add %s to database"
4529 msgstr "不能添加 %s 至对象库"
4531 #: merge-recursive.c:1378
4533 msgid "Auto-merging %s"
4536 #: merge-recursive.c:1402
4538 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
4539 msgstr "错误:拒绝丢失未跟踪文件 '%s',而是写入 %s。"
4541 #: merge-recursive.c:1474
4544 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
4547 "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
4550 #: merge-recursive.c:1479
4553 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
4556 "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
4559 #: merge-recursive.c:1486
4562 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
4565 "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
4568 #: merge-recursive.c:1491
4571 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
4572 "left in tree at %s."
4574 "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
4575 "%7$s 版本保留在 %9$s 中。"
4577 #: merge-recursive.c:1526
4581 #: merge-recursive.c:1526
4585 #: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129
4587 msgid "Refusing to lose dirty file at %s"
4588 msgstr "拒绝丢失脏文件 '%s'"
4590 #: merge-recursive.c:1587
4592 msgid "Refusing to lose untracked file at %s, even though it's in the way."
4593 msgstr "拒绝在 '%s' 处失去未跟踪文件,即使它存在于重命名中。"
4595 #: merge-recursive.c:1645
4597 msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
4598 msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
4600 #: merge-recursive.c:1676
4602 msgid "%s is a directory in %s adding as %s instead"
4603 msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
4605 #: merge-recursive.c:1681
4607 msgid "Refusing to lose untracked file at %s; adding as %s instead"
4608 msgstr "拒绝丢失未跟踪文件 '%s',而是添加为 %s"
4610 #: merge-recursive.c:1708
4613 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
4614 "\"->\"%s\" in \"%s\"%s"
4616 "冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
4617 "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
4619 #: merge-recursive.c:1713
4620 msgid " (left unresolved)"
4623 #: merge-recursive.c:1805
4625 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
4627 "冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
4630 #: merge-recursive.c:2068
4633 "CONFLICT (directory rename split): Unclear where to place %s because "
4634 "directory %s was renamed to multiple other directories, with no destination "
4635 "getting a majority of the files."
4637 "冲突(分割的目录重命名):不清楚 %s 应该放在哪里,因为目录 %s 被重命名到多个"
4640 #: merge-recursive.c:2100
4643 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
4644 "implicit directory rename(s) putting the following path(s) there: %s."
4646 "冲突(隐式目录重命名):处于隐式目录重命名的现存文件/目录 %s,将以下路径放"
4649 #: merge-recursive.c:2110
4652 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
4653 "implicit directory renames tried to put these paths there: %s"
4655 "冲突(隐式目录重命名):无法映射一个以上路径到 %s,隐式目录重命名尝试将这些路"
4658 #: merge-recursive.c:2202
4661 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
4664 "冲突(重命名/重命名):在 %3$s 中重命名目录 %1$s->%2$s,在 %6$s 中重命名目录 "
4667 #: merge-recursive.c:2447
4670 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
4672 msgstr "警告:避免应用 %s -> %s 的重命名到 %s,因为 %s 本身已被重命名。"
4674 #: merge-recursive.c:2973
4676 msgid "cannot read object %s"
4679 #: merge-recursive.c:2976
4681 msgid "object %s is not a blob"
4682 msgstr "对象 %s 不是一个数据对象"
4684 #: merge-recursive.c:3040
4688 #: merge-recursive.c:3040
4692 #: merge-recursive.c:3052
4696 #: merge-recursive.c:3056
4700 #: merge-recursive.c:3079
4702 msgid "Skipped %s (merged same as existing)"
4703 msgstr "略过 %s(已经做过相同合并)"
4705 #: merge-recursive.c:3101 git-submodule.sh:985
4709 #: merge-recursive.c:3102
4711 msgid "CONFLICT (%s): Merge conflict in %s"
4712 msgstr "冲突(%s):合并冲突于 %s"
4714 #: merge-recursive.c:3132
4716 msgid "Adding as %s instead"
4717 msgstr "而是以 %s 为名添加"
4719 #: merge-recursive.c:3215
4722 "Path updated: %s added in %s inside a directory that was renamed in %s; "
4725 "路径已更新:%s 添加到 %s,位于一个被重命名到 %s 的目录中,将其移动到 %s。"
4727 #: merge-recursive.c:3218
4730 "CONFLICT (file location): %s added in %s inside a directory that was renamed "
4731 "in %s, suggesting it should perhaps be moved to %s."
4733 "冲突(文件位置):%s 添加到 %s,位于一个被重命名为 %s 的目录中,建议将其移动"
4736 #: merge-recursive.c:3222
4739 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
4740 "%s; moving it to %s."
4742 "路径已更新:%1$s 重命名为 %3$s 中的 %2$s,而该目录被重命名到 %4$s 中,将其移"
4745 #: merge-recursive.c:3225
4748 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
4749 "was renamed in %s, suggesting it should perhaps be moved to %s."
4751 "冲突(文件位置):%1$s 重命名为 %3$s 中的 %2$s,而该目录被重命名到 %4$s 中,"
4754 #: merge-recursive.c:3339
4759 #: merge-recursive.c:3362
4760 msgid "file/directory"
4763 #: merge-recursive.c:3367
4764 msgid "directory/file"
4767 #: merge-recursive.c:3374
4769 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
4770 msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
4772 #: merge-recursive.c:3383
4777 #: merge-recursive.c:3392
4779 msgid "CONFLICT (add/add): Merge conflict in %s"
4780 msgstr "冲突(add/add):合并冲突于 %s"
4782 #: merge-recursive.c:3436
4783 msgid "Already up to date!"
4786 #: merge-recursive.c:3445
4788 msgid "merging of trees %s and %s failed"
4789 msgstr "无法合并树 %s 和 %s"
4791 #: merge-recursive.c:3549
4795 #: merge-recursive.c:3562
4797 msgid "found %u common ancestor:"
4798 msgid_plural "found %u common ancestors:"
4799 msgstr[0] "发现 %u 个共同祖先:"
4800 msgstr[1] "发现 %u 个共同祖先:"
4802 #: merge-recursive.c:3612
4803 msgid "merge returned no commit"
4806 #: merge-recursive.c:3671
4809 "Your local changes to the following files would be overwritten by merge:\n"
4812 "您对下列文件的本地修改将被合并操作覆盖:\n"
4815 #: merge-recursive.c:3768
4817 msgid "Could not parse object '%s'"
4818 msgstr "不能解析对象 '%s'"
4820 #: merge-recursive.c:3786 builtin/merge.c:705 builtin/merge.c:885
4821 msgid "Unable to write index."
4825 msgid "failed to read the cache"
4828 #: merge.c:108 rerere.c:720 builtin/am.c:1878 builtin/am.c:1912
4829 #: builtin/checkout.c:559 builtin/checkout.c:824 builtin/clone.c:816
4830 #: builtin/stash.c:265
4831 msgid "unable to write new index file"
4836 msgid "multi-pack-index file %s is too small"
4837 msgstr "多包索引文件 %s 太小"
4841 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
4842 msgstr "多包索引签名 0x%08x 和签名 0x%08x 不匹配"
4846 msgid "multi-pack-index version %d not recognized"
4847 msgstr "multi-pack-index 版本 %d 不能被识别"
4851 msgid "hash version %u does not match"
4852 msgstr "散列版本 %u 不匹配"
4855 msgid "invalid chunk offset (too large)"
4859 msgid "terminating multi-pack-index chunk id appears earlier than expected"
4860 msgstr "终止多包索引块 id 出现时间早于预期"
4863 msgid "multi-pack-index missing required pack-name chunk"
4864 msgstr "多包索引缺少必需的包名块"
4867 msgid "multi-pack-index missing required OID fanout chunk"
4868 msgstr "多包索引缺少必需的对象 ID 扇出块"
4871 msgid "multi-pack-index missing required OID lookup chunk"
4872 msgstr "多包索引缺少必需的对象 ID 查询块"
4875 msgid "multi-pack-index missing required object offsets chunk"
4876 msgstr "多包索引缺少必需的对象偏移块"
4880 msgid "multi-pack-index pack names out of order: '%s' before '%s'"
4881 msgstr "多包索引包名无序:'%s' 在 '%s' 之前"
4885 msgid "bad pack-int-id: %u (%u total packs)"
4886 msgstr "错的 pack-int-id:%u(共有 %u 个包)"
4889 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
4890 msgstr "多包索引存储一个64位偏移,但是 off_t 太小"
4893 msgid "error preparing packfile from multi-pack-index"
4894 msgstr "从多包索引准备 packfile 出错"
4898 msgid "failed to add packfile '%s'"
4899 msgstr "添加包文件 '%s' 失败"
4903 msgid "failed to open pack-index '%s'"
4904 msgstr "打开包索引 '%s' 失败"
4908 msgid "failed to locate object %d in packfile"
4909 msgstr "在包文件中定位对象 %d 失败"
4912 msgid "Adding packfiles to multi-pack-index"
4917 msgid "did not see pack-file %s to drop"
4918 msgstr "没有看到要丢弃的包文件 %s"
4921 msgid "no pack files to index."
4925 msgid "Writing chunks to multi-pack-index"
4930 msgid "failed to clear multi-pack-index at %s"
4931 msgstr "清理位于 %s 的多包索引失败"
4934 msgid "Looking for referenced packfiles"
4940 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
4941 msgstr "对象 ID 扇出无序:fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
4944 msgid "the midx contains no oid"
4945 msgstr "midx 不包含 oid"
4948 msgid "Verifying OID order in multi-pack-index"
4949 msgstr "校验多包索引中的 OID 顺序"
4953 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
4954 msgstr "对象 ID 查询无序:oid[%d] = %s >= %s = oid[%d]"
4957 msgid "Sorting objects by packfile"
4961 msgid "Verifying object offsets"
4966 msgid "failed to load pack entry for oid[%d] = %s"
4967 msgstr "为 oid[%d] = %s 加载包条目失败"
4971 msgid "failed to load pack-index for packfile %s"
4972 msgstr "为包文件 %s 加载包索引失败"
4976 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
4977 msgstr "oid[%d] = %s 错误的对象偏移:%<PRIx64> != %<PRIx64>"
4980 msgid "Counting referenced objects"
4984 msgid "Finding and deleting unreferenced packfiles"
4985 msgstr "正在查找和删除未引用的包文件"
4988 msgid "could not start pack-objects"
4989 msgstr "不能开始 pack-objects"
4992 msgid "could not finish pack-objects"
4993 msgstr "不能结束 pack-objects"
4997 msgid "unable to create lazy_dir thread: %s"
4998 msgstr "不能创建 lazy_dir 线程:%s"
5002 msgid "unable to create lazy_name thread: %s"
5003 msgstr "不能创建 lazy_name 线程:%s"
5007 msgid "unable to join lazy_name thread: %s"
5008 msgstr "不能加入 lasy_name 线程:%s"
5010 #: notes-merge.c:277
5013 "You have not concluded your previous notes merge (%s exists).\n"
5014 "Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
5015 "commit/abort the previous merge before you start a new notes merge."
5017 "您的前一次注释合并尚未结束(存在 %s)。\n"
5018 "在开始一个新的注释合并之前,请使用 'git notes merge --commit' 或者 'git "
5019 "notes merge --abort' 来提交/终止前一次合并。"
5021 #: notes-merge.c:284
5023 msgid "You have not concluded your notes merge (%s exists)."
5024 msgstr "您尚未结束注释合并(存在 %s)。"
5027 msgid "Cannot commit uninitialized/unreferenced notes tree"
5028 msgstr "不能提交未初始化/未引用的注解树"
5030 #: notes-utils.c:105
5032 msgid "Bad notes.rewriteMode value: '%s'"
5033 msgstr "坏的 notes.rewriteMode 值:'%s'"
5035 #: notes-utils.c:115
5037 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
5038 msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
5040 #. TRANSLATORS: The first %s is the name of
5041 #. the environment variable, the second %s is
5044 #: notes-utils.c:145
5046 msgid "Bad %s value: '%s'"
5047 msgstr "坏的 %s 值:'%s'"
5051 msgid "invalid object type \"%s\""
5052 msgstr "无效的对象类型 \"%s\""
5056 msgid "object %s is a %s, not a %s"
5057 msgstr "对象 %s 是一个 %s,不是一个 %s"
5061 msgid "object %s has unknown type id %d"
5062 msgstr "对象 %s 有未知的类型 id %d"
5066 msgid "unable to parse object: %s"
5069 #: object.c:266 object.c:278
5071 msgid "hash mismatch %s"
5072 msgstr "哈希值与 %s 不匹配"
5074 #: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2135
5076 msgid "unable to get size of %s"
5077 msgstr "无法得到 %s 的大小"
5080 msgid "offset before end of packfile (broken .idx?)"
5081 msgstr "偏移量在包文件结束之前(损坏的 .idx?)"
5085 msgid "offset before start of pack index for %s (corrupt index?)"
5086 msgstr "偏移量在 %s 的包索引开始之前(损坏的索引?)"
5090 msgid "offset beyond end of pack index for %s (truncated index?)"
5091 msgstr "偏移量越过了 %s 的包索引的结尾(被截断的索引?)"
5093 #: parse-options-cb.c:20 parse-options-cb.c:24
5095 msgid "option `%s' expects a numerical value"
5096 msgstr "选项 `%s' 期望一个数字值"
5098 #: parse-options-cb.c:41
5100 msgid "malformed expiration date '%s'"
5101 msgstr "格式错误的到期时间:'%s'"
5103 #: parse-options-cb.c:54
5105 msgid "option `%s' expects \"always\", \"auto\", or \"never\""
5106 msgstr "选项 `%s' 期望 \"always\"、\"auto\" 或 \"never\""
5108 #: parse-options-cb.c:130 parse-options-cb.c:147
5110 msgid "malformed object name '%s'"
5111 msgstr "格式错误的对象名 '%s'"
5113 #: parse-options.c:38
5115 msgid "%s requires a value"
5118 #: parse-options.c:73
5120 msgid "%s is incompatible with %s"
5121 msgstr "%s 与 %s 不兼容"
5123 #: parse-options.c:78
5125 msgid "%s : incompatible with something else"
5128 #: parse-options.c:92 parse-options.c:96 parse-options.c:317
5130 msgid "%s takes no value"
5133 #: parse-options.c:94
5135 msgid "%s isn't available"
5138 #: parse-options.c:217
5140 msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
5141 msgstr "%s 期望一个非负整数和一个可选的 k/m/g 后缀"
5143 #: parse-options.c:386
5145 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
5146 msgstr "有歧义的选项:%s(可以是 --%s%s 或 --%s%s)"
5148 #: parse-options.c:420 parse-options.c:428
5150 msgid "did you mean `--%s` (with two dashes)?"
5151 msgstr "你的意思是 `--%s`(有两个短线)?"
5153 #: parse-options.c:663 parse-options.c:963
5155 msgid "alias of --%s"
5158 #: parse-options.c:854
5160 msgid "unknown option `%s'"
5163 #: parse-options.c:856
5165 msgid "unknown switch `%c'"
5168 #: parse-options.c:858
5170 msgid "unknown non-ascii option in string: `%s'"
5171 msgstr "字符串中未知的非 ascii 字符选项:`%s'"
5173 #: parse-options.c:882
5177 #: parse-options.c:901
5182 #. TRANSLATORS: the colon here should align with the
5183 #. one in "usage: %s" translation.
5185 #: parse-options.c:907
5190 # 译者:为保证在输出中对齐,注意调整句中空格!
5191 #: parse-options.c:910
5196 #: parse-options.c:949
5202 msgid "Could not make %s writable by group"
5203 msgstr "不能设置 %s 为组可写"
5206 msgid "Escape character '\\' not allowed as last character in attr value"
5207 msgstr "转义字符 '\\' 不能作为属性值的最后一个字符"
5210 msgid "Only one 'attr:' specification is allowed."
5211 msgstr "只允许一个 'attr:' 规格。"
5214 msgid "attr spec must not be empty"
5219 msgid "invalid attribute name %s"
5223 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
5224 msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
5228 "global 'literal' pathspec setting is incompatible with all other global "
5230 msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
5233 msgid "invalid parameter for pathspec magic 'prefix'"
5234 msgstr "路径规格包含无效的神奇前缀"
5238 msgid "Invalid pathspec magic '%.*s' in '%s'"
5239 msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
5243 msgid "Missing ')' at the end of pathspec magic in '%s'"
5244 msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
5248 msgid "Unimplemented pathspec magic '%c' in '%s'"
5249 msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
5253 msgid "%s: 'literal' and 'glob' are incompatible"
5254 msgstr "%s:'literal' 和 'glob' 不兼容"
5258 msgid "%s: '%s' is outside repository at '%s'"
5259 msgstr "%s:'%s' 在位于 '%s' 的仓库之外"
5263 msgid "'%s' (mnemonic: '%c')"
5264 msgstr "'%s'(助记符:'%c')"
5268 msgid "%s: pathspec magic not supported by this command: %s"
5269 msgstr "%s:路径规格神奇前缀不被此命令支持:%s"
5273 msgid "pathspec '%s' is beyond a symbolic link"
5274 msgstr "路径规格 '%s' 位于符号链接中"
5278 msgid "line is badly quoted: %s"
5282 msgid "unable to write flush packet"
5283 msgstr "无法写 flush 包"
5286 msgid "unable to write delim packet"
5287 msgstr "无法写 delim 包"
5290 msgid "flush packet write failed"
5293 #: pkt-line.c:146 pkt-line.c:232
5294 msgid "protocol error: impossibly long line"
5295 msgstr "协议错误:不可能的长行"
5297 #: pkt-line.c:162 pkt-line.c:164
5298 msgid "packet write with format failed"
5302 msgid "packet write failed - data exceeds max packet size"
5303 msgstr "写数据包失败:数据超过了包的最大长度"
5305 #: pkt-line.c:203 pkt-line.c:210
5306 msgid "packet write failed"
5314 msgid "the remote end hung up unexpectedly"
5319 msgid "protocol error: bad line length character: %.4s"
5320 msgstr "协议错误:错误的行长度字符串:%.4s"
5322 #: pkt-line.c:341 pkt-line.c:346
5324 msgid "protocol error: bad line length %d"
5325 msgstr "协议错误:错误的行长度 %d"
5329 msgid "remote error: %s"
5332 #: preload-index.c:119
5333 msgid "Refreshing index"
5336 #: preload-index.c:138
5338 msgid "unable to create threaded lstat: %s"
5339 msgstr "无法创建线程 lstat:%s"
5342 msgid "unable to parse --pretty format"
5343 msgstr "不能解析 --pretty 格式"
5345 #: promisor-remote.c:23
5346 msgid "Remote with no URL"
5349 #: promisor-remote.c:58
5351 msgid "promisor remote name cannot begin with '/': %s"
5352 msgstr "promisor 远程名称不能以 '/' 开始:%s"
5354 #: prune-packed.c:35
5355 msgid "Removing duplicate objects"
5359 msgid "could not start `log`"
5363 msgid "could not read `log` output"
5364 msgstr "不能读取 `log` 的输出"
5366 #: range-diff.c:98 sequencer.c:5143
5368 msgid "could not parse commit '%s'"
5369 msgstr "不能解析提交 '%s'"
5374 "could not parse first line of `log` output: did not start with 'commit ': "
5376 msgstr "无法解析 `log` 输出的首行:不是以 'commit ' 开头:'%s'"
5380 msgid "could not parse git header '%.*s'"
5381 msgstr "无法解析 git 头 '%.*s'"
5384 msgid "failed to generate diff"
5387 #: range-diff.c:534 range-diff.c:536
5389 msgid "could not parse log for '%s'"
5390 msgstr "不能解析 '%s' 的日志"
5394 msgid "will not add file alias '%s' ('%s' already exists in index)"
5395 msgstr "将不会添加文件别名 '%s'('%s' 已经存在于索引中)"
5398 msgid "cannot create an empty blob in the object database"
5399 msgstr "不能在对象数据库中创建空的数据对象"
5403 msgid "%s: can only add regular files, symbolic links or git-directories"
5404 msgstr "%s:只能添加常规文件、符号链接或 git 目录"
5408 msgid "'%s' does not have a commit checked out"
5409 msgstr "'%s' 没有检出一个提交"
5413 msgid "unable to index file '%s'"
5414 msgstr "无法索引文件 '%s'"
5418 msgid "unable to add '%s' to index"
5419 msgstr "无法在索引中添加 '%s'"
5423 msgid "unable to stat '%s'"
5424 msgstr "无法对 %s 执行 stat"
5426 #: read-cache.c:1330
5428 msgid "'%s' appears as both a file and as a directory"
5429 msgstr "'%s' 看起来既是文件又是目录"
5431 #: read-cache.c:1536
5432 msgid "Refresh index"
5435 #: read-cache.c:1651
5438 "index.version set, but the value is invalid.\n"
5441 "设置了 index.version,但是取值无效。\n"
5444 #: read-cache.c:1661
5447 "GIT_INDEX_VERSION set, but the value is invalid.\n"
5450 "设置了 GIT_INDEX_VERSION,但是取值无效。\n"
5453 #: read-cache.c:1717
5455 msgid "bad signature 0x%08x"
5456 msgstr "坏的签名 0x%08x"
5458 #: read-cache.c:1720
5460 msgid "bad index version %d"
5463 #: read-cache.c:1729
5464 msgid "bad index file sha1 signature"
5465 msgstr "坏的索引文件 sha1 签名"
5467 #: read-cache.c:1759
5469 msgid "index uses %.4s extension, which we do not understand"
5470 msgstr "索引使用不被支持的 %.4s 扩展"
5473 #: read-cache.c:1761
5475 msgid "ignoring %.4s extension"
5478 #: read-cache.c:1798
5480 msgid "unknown index entry format 0x%08x"
5481 msgstr "未知的索引条目格式 0x%08x"
5483 #: read-cache.c:1814
5485 msgid "malformed name field in the index, near path '%s'"
5486 msgstr "索引中靠近路径 '%s' 有错误的名称字段"
5488 #: read-cache.c:1871
5489 msgid "unordered stage entries in index"
5490 msgstr "索引中有未排序的暂存条目"
5492 #: read-cache.c:1874
5494 msgid "multiple stage entries for merged file '%s'"
5495 msgstr "合并文件 '%s' 有多个暂存条目"
5497 #: read-cache.c:1877
5499 msgid "unordered stage entries for '%s'"
5500 msgstr "'%s' 的未排序暂存条目"
5502 #: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111
5503 #: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181
5504 #: builtin/checkout.c:488 builtin/checkout.c:676 builtin/clean.c:961
5505 #: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507
5506 #: builtin/mv.c:145 builtin/reset.c:247 builtin/rm.c:290
5507 #: builtin/submodule--helper.c:332
5508 msgid "index file corrupt"
5511 #: read-cache.c:2124
5513 msgid "unable to create load_cache_entries thread: %s"
5514 msgstr "无法创建 load_cache_entries 线程:%s"
5516 #: read-cache.c:2137
5518 msgid "unable to join load_cache_entries thread: %s"
5519 msgstr "无法加入 load_cache_entries 线程:%s"
5521 #: read-cache.c:2170
5523 msgid "%s: index file open failed"
5524 msgstr "%s:打开索引文件失败"
5526 #: read-cache.c:2174
5528 msgid "%s: cannot stat the open index"
5529 msgstr "%s:不能对打开的索引执行 stat 操作"
5531 #: read-cache.c:2178
5533 msgid "%s: index file smaller than expected"
5534 msgstr "%s:索引文件比预期的小"
5536 #: read-cache.c:2182
5538 msgid "%s: unable to map index file"
5539 msgstr "%s:无法对索引文件执行 map 操作"
5541 #: read-cache.c:2224
5543 msgid "unable to create load_index_extensions thread: %s"
5544 msgstr "无法创建 load_index_extensions 线程:%s"
5546 #: read-cache.c:2251
5548 msgid "unable to join load_index_extensions thread: %s"
5549 msgstr "无法加入 load_index_extensions 线程:%s"
5551 #: read-cache.c:2283
5553 msgid "could not freshen shared index '%s'"
5554 msgstr "无法刷新共享索引 '%s'"
5556 #: read-cache.c:2330
5558 msgid "broken index, expect %s in %s, got %s"
5559 msgstr "损坏的索引,期望在 %2$s 中的 %1$s,得到 %3$s"
5561 #: read-cache.c:3026 strbuf.c:1176 wrapper.c:622 builtin/merge.c:1130
5563 msgid "could not close '%s'"
5566 #: read-cache.c:3129 sequencer.c:2355 sequencer.c:4066
5568 msgid "could not stat '%s'"
5569 msgstr "不能对 '%s' 调用 stat"
5571 #: read-cache.c:3142
5573 msgid "unable to open git dir: %s"
5574 msgstr "不能打开 git 目录:%s"
5576 #: read-cache.c:3154
5578 msgid "unable to unlink: %s"
5581 #: read-cache.c:3179
5583 msgid "cannot fix permission bits on '%s'"
5584 msgstr "不能修复 '%s' 的权限位"
5586 #: read-cache.c:3328
5588 msgid "%s: cannot drop to stage #0"
5589 msgstr "%s:不能落到暂存区 #0"
5591 #: rebase-interactive.c:11
5593 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
5595 "Or you can abort the rebase with 'git rebase --abort'.\n"
5597 "您可以用 'git rebase --edit-todo' 修正,然后执行 'git rebase --continue'。\n"
5598 "或者您可以用 'git rebase --abort' 终止变基。\n"
5600 #: rebase-interactive.c:33
5603 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
5604 msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。"
5606 #: rebase-interactive.c:42
5610 "p, pick <commit> = use commit\n"
5611 "r, reword <commit> = use commit, but edit the commit message\n"
5612 "e, edit <commit> = use commit, but stop for amending\n"
5613 "s, squash <commit> = use commit, but meld into previous commit\n"
5614 "f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
5615 "x, exec <command> = run command (the rest of the line) using shell\n"
5616 "b, break = stop here (continue rebase later with 'git rebase --continue')\n"
5617 "d, drop <commit> = remove commit\n"
5618 "l, label <label> = label current HEAD with a name\n"
5619 "t, reset <label> = reset HEAD to a label\n"
5620 "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
5621 ". create a merge commit using the original merge commit's\n"
5622 ". message (or the oneline, if no original merge commit was\n"
5623 ". specified). Use -c <commit> to reword the commit message.\n"
5625 "These lines can be re-ordered; they are executed from top to bottom.\n"
5629 "p, pick <提交> = 使用提交\n"
5630 "r, reword <提交> = 使用提交,但修改提交说明\n"
5631 "e, edit <提交> = 使用提交,进入 shell 以便进行提交修补\n"
5632 "s, squash <提交> = 使用提交,但融合到前一个提交\n"
5633 "f, fixup <提交> = 类似于 \"squash\",但丢弃提交说明日志\n"
5634 "x, exec <命令> = 使用 shell 运行命令(此行剩余部分)\n"
5635 "b, break = 在此处停止(使用 'git rebase --continue' 继续变基)\n"
5636 "d, drop <提交> = 删除提交\n"
5637 "l, label <label> = 为当前 HEAD 打上标记\n"
5638 "t, reset <label> = 重置 HEAD 到该标记\n"
5639 "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
5640 ". 创建一个合并提交,并使用原始的合并提交说明(如果没有指定\n"
5641 ". 原始提交,使用注释部分的 oneline 作为提交说明)。使用\n"
5642 ". -c <提交> 可以编辑提交说明。\n"
5644 "可以对这些行重新排序,将从上至下执行。\n"
5646 #: rebase-interactive.c:63
5648 msgid "Rebase %s onto %s (%d command)"
5649 msgid_plural "Rebase %s onto %s (%d commands)"
5650 msgstr[0] "变基 %s 到 %s(%d 个提交)"
5651 msgstr[1] "变基 %s 到 %s(%d 个提交)"
5653 #: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228
5656 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
5659 "不要删除任意一行。使用 'drop' 显式地删除一个提交。\n"
5661 #: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232
5664 "If you remove a line here THAT COMMIT WILL BE LOST.\n"
5667 "如果您在这里删除一行,对应的提交将会丢失。\n"
5669 #: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871
5672 "You are editing the todo file of an ongoing interactive rebase.\n"
5673 "To continue rebase after editing, run:\n"
5674 " git rebase --continue\n"
5678 "您正在修改进行中的交互式变基待办列表。若要在编辑结束后继续变基,\n"
5680 " git rebase --continue\n"
5683 #: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948
5686 "However, if you remove everything, the rebase will be aborted.\n"
5690 "然而,如果您删除全部内容,变基操作将会终止。\n"
5693 #: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3463
5694 #: sequencer.c:3489 sequencer.c:5248 builtin/fsck.c:347 builtin/rebase.c:258
5696 msgid "could not write '%s'"
5699 #: rebase-interactive.c:116 builtin/rebase.c:190 builtin/rebase.c:216
5700 #: builtin/rebase.c:240
5702 msgid "could not write '%s'."
5705 #: rebase-interactive.c:193
5708 "Warning: some commits may have been dropped accidentally.\n"
5709 "Dropped commits (newer to older):\n"
5714 #: rebase-interactive.c:200
5717 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
5719 "Use 'git config rebase.missingCommitsCheck' to change the level of "
5721 "The possible behaviours are: ignore, warn, error.\n"
5724 "为避免这条信息,使用 \"drop\" 指令显式地删除一个提交。\n"
5726 "使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n"
5727 "可选值有:ignore、warn、error。\n"
5730 #: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2274
5731 #: builtin/rebase.c:176 builtin/rebase.c:201 builtin/rebase.c:227
5732 #: builtin/rebase.c:252
5734 msgid "could not read '%s'."
5737 #: ref-filter.c:42 wt-status.c:1936
5753 msgid "ahead %d, behind %d"
5754 msgstr "领先 %d,落后 %d"
5758 msgid "expected format: %%(color:<color>)"
5759 msgstr "期望的格式:%%(color:<颜色>)"
5763 msgid "unrecognized color: %%(color:%s)"
5764 msgstr "未能识别的颜色:%%(color:%s)"
5768 msgid "Integer value expected refname:lstrip=%s"
5769 msgstr "期望整数值 refname:lstrip=%s"
5773 msgid "Integer value expected refname:rstrip=%s"
5774 msgstr "期望整数值 refname:rstrip=%s"
5778 msgid "unrecognized %%(%s) argument: %s"
5779 msgstr "未能识别的 %%(%s) 参数:%s"
5783 msgid "%%(objecttype) does not take arguments"
5784 msgstr "%%(objecttype) 不带参数"
5788 msgid "unrecognized %%(objectsize) argument: %s"
5789 msgstr "未能识别的 %%(objectsize) 参数:%s"
5793 msgid "%%(deltabase) does not take arguments"
5794 msgstr "%%(deltabase) 不带参数"
5798 msgid "%%(body) does not take arguments"
5799 msgstr "%%(body) 不带参数"
5803 msgid "%%(subject) does not take arguments"
5804 msgstr "%%(subject) 不带参数"
5808 msgid "unknown %%(trailers) argument: %s"
5809 msgstr "未知的 %%(trailers) 参数:%s"
5813 msgid "positive value expected contents:lines=%s"
5814 msgstr "期望一个正数 contents:lines=%s"
5818 msgid "unrecognized %%(contents) argument: %s"
5819 msgstr "未能识别的 %%(contents) 参数:%s"
5823 msgid "positive value expected objectname:short=%s"
5824 msgstr "期望一个正数 objectname:short=%s"
5828 msgid "unrecognized %%(objectname) argument: %s"
5829 msgstr "未能识别的 %%(objectname) 参数:%s"
5833 msgid "expected format: %%(align:<width>,<position>)"
5834 msgstr "期望的格式:%%(align:<宽度>,<位置>)"
5838 msgid "unrecognized position:%s"
5843 msgid "unrecognized width:%s"
5848 msgid "unrecognized %%(align) argument: %s"
5849 msgstr "未能识别的 %%(align) 参数:%s"
5853 msgid "positive width expected with the %%(align) atom"
5854 msgstr "元素 %%(align) 需要一个正数的宽度"
5858 msgid "unrecognized %%(if) argument: %s"
5859 msgstr "未能识别的 %%(if) 参数:%s"
5863 msgid "malformed field name: %.*s"
5864 msgstr "格式错误的字段名:%.*s"
5868 msgid "unknown field name: %.*s"
5869 msgstr "未知的字段名:%.*s"
5874 "not a git repository, but the field '%.*s' requires access to object data"
5875 msgstr "不是一个 git 仓库,但是字段 '%.*s' 需要访问对象数据"
5879 msgid "format: %%(if) atom used without a %%(then) atom"
5880 msgstr "格式:使用了 %%(if) 元素而没有 %%(then) 元素"
5884 msgid "format: %%(then) atom used without an %%(if) atom"
5885 msgstr "格式:使用了 %%(then) 元素而没有 %%(if) 元素"
5889 msgid "format: %%(then) atom used more than once"
5890 msgstr "格式:%%(then) 元素用了多次"
5894 msgid "format: %%(then) atom used after %%(else)"
5895 msgstr "格式:%%(then) 元素用在了 %%(else) 之后"
5899 msgid "format: %%(else) atom used without an %%(if) atom"
5900 msgstr "格式:使用了 %%(else) 元素而没有 %%(if) 元素"
5904 msgid "format: %%(else) atom used without a %%(then) atom"
5905 msgstr "格式:使用了 %%(else) 元素而没有 %%(then) 元素"
5909 msgid "format: %%(else) atom used more than once"
5910 msgstr "格式:%%(else) 元素用了多次"
5914 msgid "format: %%(end) atom used without corresponding atom"
5915 msgstr "格式:使用了 %%(end) 元素却没有它的对应元素"
5919 msgid "malformed format string %s"
5920 msgstr "错误的格式化字符串 %s"
5922 #: ref-filter.c:1486
5924 msgid "no branch, rebasing %s"
5927 #: ref-filter.c:1489
5929 msgid "no branch, rebasing detached HEAD %s"
5930 msgstr "非分支,正变基分离头指针 %s"
5932 #: ref-filter.c:1492
5934 msgid "no branch, bisect started on %s"
5935 msgstr "非分支,二分查找开始于 %s"
5937 #: ref-filter.c:1502
5941 #: ref-filter.c:1538 ref-filter.c:1747
5943 msgid "missing object %s for %s"
5944 msgstr "缺失 %2$s 的对象 %1$s"
5946 #: ref-filter.c:1548
5948 msgid "parse_object_buffer failed on %s for %s"
5949 msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
5951 #: ref-filter.c:2001
5953 msgid "malformed object at '%s'"
5954 msgstr "格式错误的对象 '%s'"
5956 #: ref-filter.c:2090
5958 msgid "ignoring ref with broken name %s"
5959 msgstr "忽略带有错误名称 %s 的引用"
5961 #: ref-filter.c:2095 refs.c:625
5963 msgid "ignoring broken ref %s"
5966 #: ref-filter.c:2395
5968 msgid "format: %%(end) atom missing"
5969 msgstr "格式:缺少 %%(end) 元素"
5971 #: ref-filter.c:2495
5973 msgid "option `%s' is incompatible with --merged"
5974 msgstr "选项 `%s' 和 --merged 不兼容"
5976 #: ref-filter.c:2498
5978 msgid "option `%s' is incompatible with --no-merged"
5979 msgstr "选项 `%s' 和 --no-merged 不兼容"
5981 #: ref-filter.c:2508
5983 msgid "malformed object name %s"
5984 msgstr "格式错误的对象名 %s"
5986 #: ref-filter.c:2513
5988 msgid "option `%s' must point to a commit"
5989 msgstr "选项 `%s' 必须指向一个提交"
5993 msgid "%s does not point to a valid object!"
5994 msgstr "%s 没有指向一个有效的对象!"
5998 msgid "ignoring dangling symref %s"
5999 msgstr "忽略悬空符号引用 %s"
6003 msgid "could not open '%s' for writing: %s"
6004 msgstr "无法为写入打开 '%s':%s"
6006 #: refs.c:770 refs.c:821
6008 msgid "could not read ref '%s'"
6009 msgstr "无法读取引用 '%s'"
6013 msgid "ref '%s' already exists"
6014 msgstr "引用 '%s' 已经存在"
6018 msgid "unexpected object ID when writing '%s'"
6019 msgstr "写入 '%s' 时意外的对象 ID"
6021 #: refs.c:789 sequencer.c:408 sequencer.c:2721 sequencer.c:2925
6022 #: sequencer.c:2939 sequencer.c:3195 sequencer.c:5159 strbuf.c:1173
6025 msgid "could not write to '%s'"
6028 #: refs.c:816 strbuf.c:1171 wrapper.c:188 wrapper.c:358 builtin/am.c:719
6029 #: builtin/rebase.c:852
6031 msgid "could not open '%s' for writing"
6032 msgstr "无法打开 '%s' 进行写入"
6036 msgid "unexpected object ID when deleting '%s'"
6037 msgstr "删除 '%s' 时意外的对象 ID"
6041 msgid "log for ref %s has gap after %s"
6042 msgstr "引用 %s 的日志在 %s 之后有缺口"
6046 msgid "log for ref %s unexpectedly ended on %s"
6047 msgstr "引用 %s 的日志意外终止于 %s "
6051 msgid "log for %s is empty"
6056 msgid "refusing to update ref with bad name '%s'"
6057 msgstr "拒绝更新有错误名称 '%s' 的引用"
6061 msgid "update_ref failed for ref '%s': %s"
6062 msgstr "对引用 '%s' 执行 update_ref 失败:%s"
6066 msgid "multiple updates for ref '%s' not allowed"
6067 msgstr "不允许对引用 '%s' 多次更新"
6070 msgid "ref updates forbidden inside quarantine environment"
6071 msgstr "在隔离环境中禁止更新引用"
6073 #: refs.c:2107 refs.c:2137
6075 msgid "'%s' exists; cannot create '%s'"
6076 msgstr "'%s' 已存在,无法创建 '%s'"
6078 #: refs.c:2113 refs.c:2148
6080 msgid "cannot process '%s' and '%s' at the same time"
6081 msgstr "无法同时处理 '%s' 和 '%s'"
6083 #: refs/files-backend.c:1233
6085 msgid "could not remove reference %s"
6088 #: refs/files-backend.c:1247 refs/packed-backend.c:1541
6089 #: refs/packed-backend.c:1551
6091 msgid "could not delete reference %s: %s"
6092 msgstr "无法删除引用 %s:%s"
6094 #: refs/files-backend.c:1250 refs/packed-backend.c:1554
6096 msgid "could not delete references: %s"
6101 msgid "invalid refspec '%s'"
6102 msgstr "无效的引用表达式:'%s'"
6106 msgid "config remote shorthand cannot begin with '/': %s"
6107 msgstr "配置的远程短名称不能以 '/' 开始:%s"
6110 msgid "more than one receivepack given, using the first"
6111 msgstr "提供了一个以上的 receivepack,使用第一个"
6114 msgid "more than one uploadpack given, using the first"
6115 msgstr "提供了一个以上的 uploadpack,使用第一个"
6119 msgid "Cannot fetch both %s and %s to %s"
6120 msgstr "不能同时获取 %s 和 %s 至 %s"
6124 msgid "%s usually tracks %s, not %s"
6125 msgstr "%s 通常跟踪 %s,而非 %s"
6129 msgid "%s tracks both %s and %s"
6130 msgstr "%s 同时跟踪 %s 和 %s"
6134 msgid "key '%s' of pattern had no '*'"
6135 msgstr "模式的键 '%s' 没有 '*'"
6139 msgid "value '%s' of pattern has no '*'"
6140 msgstr "模式的值 '%s' 没有 '*'"
6144 msgid "src refspec %s does not match any"
6145 msgstr "源引用表达式 %s 没有匹配"
6149 msgid "src refspec %s matches more than one"
6150 msgstr "源引用表达式 %s 匹配超过一个"
6152 #. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
6153 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
6159 "The destination you provided is not a full refname (i.e.,\n"
6160 "starting with \"refs/\"). We tried to guess what you meant by:\n"
6162 "- Looking for a ref that matches '%s' on the remote side.\n"
6163 "- Checking if the <src> being pushed ('%s')\n"
6164 " is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
6165 " refs/{heads,tags}/ prefix on the remote side.\n"
6167 "Neither worked, so we gave up. You must fully qualify the ref."
6169 "您提供的目标不是一个完整的引用名称(即以 \"refs/\" 开头)。我们\n"
6172 "- 在远端查询和 '%s' 匹配的引用。\n"
6173 "- 检查要推送的 <src>('%s')是不是在 \"refs/{heads,tags}/\" 中的\n"
6174 " 引用。如果是,我们会在对应的远端添加 refs/{heads,tags}/ 前缀。\n"
6176 "都不行,所以我们已放弃。您必须给出完整的引用。"
6181 "The <src> part of the refspec is a commit object.\n"
6182 "Did you mean to create a new branch by pushing to\n"
6183 "'%s:refs/heads/%s'?"
6185 "引用表达式的 <src> 是一个提交对象。您是想创建一个新的分支而向\n"
6186 "'%s:refs/heads/%s' 推送么?"
6191 "The <src> part of the refspec is a tag object.\n"
6192 "Did you mean to create a new tag by pushing to\n"
6193 "'%s:refs/tags/%s'?"
6195 "引用表达式的 <src> 是一个标签对象。您是想创建一个新的标签而向\n"
6196 "'%s:refs/tags/%s' 推送么?"
6201 "The <src> part of the refspec is a tree object.\n"
6202 "Did you mean to tag a new tree by pushing to\n"
6203 "'%s:refs/tags/%s'?"
6205 "引用表达式的 <src> 是一个树对象。您是想为这个树对象创建标签而向\n"
6206 "'%s:refs/tags/%s' 推送么?"
6211 "The <src> part of the refspec is a blob object.\n"
6212 "Did you mean to tag a new blob by pushing to\n"
6213 "'%s:refs/tags/%s'?"
6215 "引用表达式的 <src> 是一个数据对象。您是想为这个数据对象创建标签而向\n"
6216 "'%s:refs/tags/%s' 推送么?"
6220 msgid "%s cannot be resolved to branch"
6221 msgstr "%s 无法被解析为分支"
6225 msgid "unable to delete '%s': remote ref does not exist"
6226 msgstr "无法删除 '%s':远程引用不存在"
6230 msgid "dst refspec %s matches more than one"
6231 msgstr "目标引用表达式 %s 匹配超过一个"
6235 msgid "dst ref %s receives from more than one src"
6236 msgstr "目标引用 %s 接收超过一个源"
6238 #: remote.c:1610 remote.c:1711
6239 msgid "HEAD does not point to a branch"
6240 msgstr "HEAD 没有指向一个分支"
6244 msgid "no such branch: '%s'"
6249 msgid "no upstream configured for branch '%s'"
6250 msgstr "尚未给分支 '%s' 设置上游"
6254 msgid "upstream branch '%s' not stored as a remote-tracking branch"
6255 msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
6259 msgid "push destination '%s' on remote '%s' has no local tracking branch"
6260 msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
6264 msgid "branch '%s' has no remote for pushing"
6265 msgstr "分支 '%s' 没有设置要推送的远程服务器"
6269 msgid "push refspecs for '%s' do not include '%s'"
6270 msgstr "向 '%s' 推送引用规格未包含 '%s'"
6273 msgid "push has no destination (push.default is 'nothing')"
6274 msgstr "推送无目标(push.default 是 'nothing')"
6277 msgid "cannot resolve 'simple' push to a single destination"
6278 msgstr "无法解析 'simple' 推送至一个单独的目标"
6282 msgid "couldn't find remote ref %s"
6283 msgstr "无法找到远程引用 %s"
6287 msgid "* Ignoring funny ref '%s' locally"
6288 msgstr "* 在本地忽略可笑的引用 '%s'"
6292 msgid "Your branch is based on '%s', but the upstream is gone.\n"
6293 msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
6296 msgid " (use \"git branch --unset-upstream\" to fixup)\n"
6297 msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n"
6301 msgid "Your branch is up to date with '%s'.\n"
6302 msgstr "您的分支与上游分支 '%s' 一致。\n"
6306 msgid "Your branch and '%s' refer to different commits.\n"
6307 msgstr "您的分支和 '%s' 指向不同的提交。\n"
6311 msgid " (use \"%s\" for details)\n"
6312 msgstr " (使用 \"%s\" 查看详情)\n"
6316 msgid "Your branch is ahead of '%s' by %d commit.\n"
6317 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
6318 msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
6319 msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
6322 msgid " (use \"git push\" to publish your local commits)\n"
6323 msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
6327 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
6329 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
6330 msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
6331 msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
6335 msgid " (use \"git pull\" to update your local branch)\n"
6336 msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
6341 "Your branch and '%s' have diverged,\n"
6342 "and have %d and %d different commit each, respectively.\n"
6344 "Your branch and '%s' have diverged,\n"
6345 "and have %d and %d different commits each, respectively.\n"
6347 "您的分支和 '%s' 出现了偏离,\n"
6348 "并且分别有 %d 和 %d 处不同的提交。\n"
6350 "您的分支和 '%s' 出现了偏离,\n"
6351 "并且分别有 %d 和 %d 处不同的提交。\n"
6355 msgid " (use \"git pull\" to merge the remote branch into yours)\n"
6356 msgstr " (使用 \"git pull\" 来合并远程分支)\n"
6360 msgid "cannot parse expected object name '%s'"
6361 msgstr "无法解析期望的对象名 '%s'"
6363 #: replace-object.c:21
6365 msgid "bad replace ref name: %s"
6366 msgstr "错误的替换引用名称:%s"
6368 #: replace-object.c:30
6370 msgid "duplicate replace ref: %s"
6373 #: replace-object.c:82
6375 msgid "replace depth too high for object %s"
6376 msgstr "对象 %s 的替换层级太深"
6378 #: repository.c:94 builtin/init-db.c:188
6380 msgid "The hash algorithm %s is not supported in this build."
6381 msgstr "这个版本不支持 %s 哈希算法。"
6383 #: rerere.c:217 rerere.c:226 rerere.c:229
6384 msgid "corrupt MERGE_RR"
6385 msgstr "损坏的 MERGE_RR"
6387 #: rerere.c:264 rerere.c:269
6388 msgid "unable to write rerere record"
6389 msgstr "无法写入 rerere 记录"
6393 msgid "there were errors while writing '%s' (%s)"
6394 msgstr "写入 '%s' (%s) 时出错"
6398 msgid "failed to flush '%s'"
6401 #: rerere.c:503 rerere.c:1039
6403 msgid "could not parse conflict hunks in '%s'"
6404 msgstr "不能解析 '%s' 中的冲突块"
6408 msgid "failed utime() on '%s'"
6409 msgstr "在 '%s' 上调用 utime() 失败"
6413 msgid "writing '%s' failed"
6418 msgid "Staged '%s' using previous resolution."
6419 msgstr "使用之前的解决方案暂存 '%s'。"
6423 msgid "Recorded resolution for '%s'."
6424 msgstr "已记录 '%s' 的解决方案。"
6428 msgid "Resolved '%s' using previous resolution."
6429 msgstr "使用之前的解决方案解决 '%s'。"
6433 msgid "cannot unlink stray '%s'"
6434 msgstr "不能删除 stray '%s'"
6438 msgid "Recorded preimage for '%s'"
6439 msgstr "为 '%s' 记录 preimage"
6441 #: rerere.c:881 submodule.c:2078 builtin/log.c:1891
6442 #: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466
6444 msgid "could not create directory '%s'"
6445 msgstr "不能创建目录 '%s'"
6449 msgid "failed to update conflicted state in '%s'"
6450 msgstr "更新 '%s' 中的冲突状态失败"
6452 #: rerere.c:1068 rerere.c:1075
6454 msgid "no remembered resolution for '%s'"
6455 msgstr "没有为 '%s' 记忆的解决方案"
6459 msgid "cannot unlink '%s'"
6464 msgid "Updated preimage for '%s'"
6465 msgstr "已为 '%s' 更新 preimage"
6469 msgid "Forgot resolution for '%s'\n"
6470 msgstr "忘记 '%s' 的解决方案\n"
6473 msgid "unable to open rr-cache directory"
6474 msgstr "不能打开 rr-cache 目录"
6477 msgid "could not determine HEAD revision"
6478 msgstr "不能确定 HEAD 版本"
6480 #: reset.c:70 reset.c:76 sequencer.c:3318
6482 msgid "failed to find tree of %s"
6483 msgstr "无法找到 %s 指向的树。"
6486 msgid "your current branch appears to be broken"
6487 msgstr "您的当前分支好像被损坏"
6491 msgid "your current branch '%s' does not have any commits yet"
6492 msgstr "您的当前分支 '%s' 尚无任何提交"
6495 msgid "--first-parent is incompatible with --bisect"
6496 msgstr "--first-parent 与 --bisect 不兼容"
6499 msgid "-L does not yet support diff formats besides -p and -s"
6500 msgstr "-L 尚不支持 -p 和 -s 之外的差异格式"
6502 #: run-command.c:763
6503 msgid "open /dev/null failed"
6504 msgstr "不能打开 /dev/null"
6506 #: run-command.c:1269
6508 msgid "cannot create async thread: %s"
6509 msgstr "不能创建 async 线程:%s"
6511 #: run-command.c:1333
6514 "The '%s' hook was ignored because it's not set as executable.\n"
6515 "You can disable this warning with `git config advice.ignoredHook false`."
6517 "因为没有将钩子 '%s' 设置为可执行,钩子被忽略。您可以通过\n"
6518 "配置 `git config advice.ignoredHook false` 来关闭这条警告。"
6521 msgid "unexpected flush packet while reading remote unpack status"
6522 msgstr "读取远程解包状态时收到意外的 flush 包"
6526 msgid "unable to parse remote unpack status: %s"
6527 msgstr "不能解析远程解包状态:%s"
6531 msgid "remote unpack failed: %s"
6535 msgid "failed to sign the push certificate"
6539 msgid "the receiving end does not support --signed push"
6544 "not sending a push certificate since the receiving end does not support --"
6546 msgstr "未发送推送证书,因为接收端不支持签名推送"
6549 msgid "the receiving end does not support --atomic push"
6553 msgid "the receiving end does not support push options"
6558 msgid "invalid commit message cleanup mode '%s'"
6559 msgstr "无效的提交信息清理模式 '%s'"
6563 msgid "could not delete '%s'"
6566 #: sequencer.c:316 builtin/rebase.c:743 builtin/rebase.c:1582 builtin/rm.c:385
6568 msgid "could not remove '%s'"
6585 msgid "unknown action: %d"
6590 "after resolving the conflicts, mark the corrected paths\n"
6591 "with 'git add <paths>' or 'git rm <paths>'"
6593 "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
6598 "after resolving the conflicts, mark the corrected paths\n"
6599 "with 'git add <paths>' or 'git rm <paths>'\n"
6600 "and commit the result with 'git commit'"
6602 "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
6603 "对修正后的文件做标记,然后用 'git commit' 提交"
6605 #: sequencer.c:406 sequencer.c:2921
6607 msgid "could not lock '%s'"
6612 msgid "could not write eol to '%s'"
6613 msgstr "不能将换行符写入 '%s'"
6615 #: sequencer.c:418 sequencer.c:2726 sequencer.c:2927 sequencer.c:2941
6618 msgid "failed to finalize '%s'"
6621 #: sequencer.c:431 sequencer.c:1620 sequencer.c:2746 sequencer.c:3185
6622 #: sequencer.c:3294 builtin/am.c:249 builtin/commit.c:786 builtin/merge.c:1128
6624 msgid "could not read '%s'"
6629 msgid "your local changes would be overwritten by %s."
6630 msgstr "您的本地修改将被%s覆盖。"
6633 msgid "commit your changes or stash them to proceed."
6634 msgstr "提交您的修改或贮藏后再继续。"
6638 msgid "%s: fast-forward"
6641 #: sequencer.c:532 builtin/tag.c:566
6643 msgid "Invalid cleanup mode %s"
6646 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
6651 msgid "%s: Unable to write new index file"
6652 msgstr "%s:无法写入新索引文件"
6655 msgid "unable to update cache tree"
6659 msgid "could not resolve HEAD commit"
6660 msgstr "不能解析 HEAD 提交"
6664 msgid "no key present in '%.*s'"
6665 msgstr "在 '%.*s' 中没有 key"
6669 msgid "unable to dequote value of '%s'"
6670 msgstr "无法为 '%s' 的值去引号"
6672 #: sequencer.c:785 wrapper.c:190 wrapper.c:360 builtin/am.c:710
6673 #: builtin/am.c:802 builtin/merge.c:1125 builtin/rebase.c:896
6675 msgid "could not open '%s' for reading"
6676 msgstr "无法打开 '%s' 进行读取"
6679 msgid "'GIT_AUTHOR_NAME' already given"
6680 msgstr "已经给出 'GIT_AUTHOR_NAME'"
6683 msgid "'GIT_AUTHOR_EMAIL' already given"
6684 msgstr "已经给出 'GIT_AUTHOR_EMAIL'"
6687 msgid "'GIT_AUTHOR_DATE' already given"
6688 msgstr "已经给出 'GIT_AUTHOR_DATE'"
6692 msgid "unknown variable '%s'"
6696 msgid "missing 'GIT_AUTHOR_NAME'"
6697 msgstr "缺少 'GIT_AUTHOR_NAME'"
6700 msgid "missing 'GIT_AUTHOR_EMAIL'"
6701 msgstr "缺少 'GIT_AUTHOR_EMAIL'"
6704 msgid "missing 'GIT_AUTHOR_DATE'"
6705 msgstr "缺少 'GIT_AUTHOR_DATE'"
6710 "you have staged changes in your working tree\n"
6711 "If these changes are meant to be squashed into the previous commit, run:\n"
6713 " git commit --amend %s\n"
6715 "If they are meant to go into a new commit, run:\n"
6719 "In both cases, once you're done, continue with:\n"
6721 " git rebase --continue\n"
6724 "如果这些修改需要被并入前一个提交,执行:\n"
6726 " git commit --amend %s\n"
6728 "如果这些修改要形成一个新提交,执行:\n"
6732 "无论哪种情况,当您完成提交,继续执行:\n"
6734 " git rebase --continue\n"
6737 msgid "'prepare-commit-msg' hook failed"
6738 msgstr "'prepare-commit-msg' 钩子失败"
6742 "Your name and email address were configured automatically based\n"
6743 "on your username and hostname. Please check that they are accurate.\n"
6744 "You can suppress this message by setting them explicitly. Run the\n"
6745 "following command and follow the instructions in your editor to edit\n"
6746 "your configuration file:\n"
6748 " git config --global --edit\n"
6750 "After doing this, you may fix the identity used for this commit with:\n"
6752 " git commit --amend --reset-author\n"
6754 "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
6755 "与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
6758 " git config --global --edit\n"
6760 "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
6762 " git commit --amend --reset-author\n"
6766 "Your name and email address were configured automatically based\n"
6767 "on your username and hostname. Please check that they are accurate.\n"
6768 "You can suppress this message by setting them explicitly:\n"
6770 " git config --global user.name \"Your Name\"\n"
6771 " git config --global user.email you@example.com\n"
6773 "After doing this, you may fix the identity used for this commit with:\n"
6775 " git commit --amend --reset-author\n"
6777 "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
6778 "与否。您可以对其进行设置以免再出现本提示信息:\n"
6780 " git config --global user.name \"Your Name\"\n"
6781 " git config --global user.email you@example.com\n"
6783 "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
6785 " git commit --amend --reset-author\n"
6788 msgid "couldn't look up newly created commit"
6792 msgid "could not parse newly created commit"
6796 msgid "unable to resolve HEAD after creating commit"
6797 msgstr "创建提交后,不能解析 HEAD"
6800 msgid "detached HEAD"
6803 # 译者:中文字符串拼接,可删除前导空格
6805 msgid " (root-commit)"
6809 msgid "could not parse HEAD"
6814 msgid "HEAD %s is not a commit!"
6815 msgstr "HEAD %s 不是一个提交!"
6817 #: sequencer.c:1283 sequencer.c:1357 builtin/commit.c:1579
6818 msgid "could not parse HEAD commit"
6819 msgstr "不能解析 HEAD 提交"
6821 #: sequencer.c:1335 sequencer.c:1980
6822 msgid "unable to parse commit author"
6825 #: sequencer.c:1346 builtin/am.c:1566 builtin/merge.c:695
6826 msgid "git write-tree failed to write a tree"
6827 msgstr "git write-tree 无法写入树对象"
6829 #: sequencer.c:1379 sequencer.c:1450
6831 msgid "unable to read commit message from '%s'"
6832 msgstr "不能从 '%s' 读取提交说明"
6834 #: sequencer.c:1406 builtin/am.c:1588 builtin/commit.c:1680 builtin/merge.c:894
6835 #: builtin/merge.c:919
6836 msgid "failed to write commit object"
6839 #: sequencer.c:1433 sequencer.c:4118
6841 msgid "could not update %s"
6846 msgid "could not parse commit %s"
6851 msgid "could not parse parent commit %s"
6854 #: sequencer.c:1569 sequencer.c:1680
6856 msgid "unknown command: %d"
6859 #: sequencer.c:1627 sequencer.c:1652
6861 msgid "This is a combination of %d commits."
6862 msgstr "这是一个 %d 个提交的组合。"
6865 msgid "need a HEAD to fixup"
6866 msgstr "需要一个 HEAD 来修复"
6868 #: sequencer.c:1639 sequencer.c:3230
6869 msgid "could not read HEAD"
6873 msgid "could not read HEAD's commit message"
6874 msgstr "不能读取 HEAD 的提交说明"
6878 msgid "cannot write '%s'"
6881 #: sequencer.c:1654 git-rebase--preserve-merges.sh:496
6882 msgid "This is the 1st commit message:"
6887 msgid "could not read commit message of %s"
6888 msgstr "不能读取 %s 的提交说明"
6892 msgid "This is the commit message #%d:"
6893 msgstr "这是提交说明 #%d:"
6897 msgid "The commit message #%d will be skipped:"
6898 msgstr "提交说明 #%d 将被跳过:"
6901 msgid "your index file is unmerged."
6902 msgstr "您的索引文件未完成合并。"
6905 msgid "cannot fixup root commit"
6910 msgid "commit %s is a merge but no -m option was given."
6911 msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
6913 #: sequencer.c:1797 sequencer.c:1805
6915 msgid "commit %s does not have parent %d"
6916 msgstr "提交 %s 没有第 %d 个父提交"
6920 msgid "cannot get commit message for %s"
6921 msgstr "不能得到 %s 的提交说明"
6923 #. TRANSLATORS: The first %s will be a "todo" command like
6924 #. "revert" or "pick", the second %s a SHA1.
6927 msgid "%s: cannot parse parent commit %s"
6928 msgstr "%s:不能解析父提交 %s"
6932 msgid "could not rename '%s' to '%s'"
6933 msgstr "不能将 '%s' 重命名为 '%s'"
6937 msgid "could not revert %s... %s"
6938 msgstr "不能还原 %s... %s"
6942 msgid "could not apply %s... %s"
6943 msgstr "不能应用 %s... %s"
6947 msgid "dropping %s %s -- patch contents already upstream\n"
6948 msgstr "丢弃 %s %s -- 补丁内容已在上游\n"
6952 msgid "git %s: failed to read the index"
6953 msgstr "git %s:无法读取索引"
6957 msgid "git %s: failed to refresh the index"
6958 msgstr "git %s:无法刷新索引"
6962 msgid "%s does not accept arguments: '%s'"
6963 msgstr "%s 不接受参数:'%s'"
6967 msgid "missing arguments for %s"
6972 msgid "could not parse '%s'"
6977 msgid "invalid line %d: %.*s"
6978 msgstr "无效行 %d:%.*s"
6982 msgid "cannot '%s' without a previous commit"
6983 msgstr "没有父提交的情况下不能 '%s'"
6986 msgid "cancelling a cherry picking in progress"
6987 msgstr "正在取消一个进行中的拣选"
6990 msgid "cancelling a revert in progress"
6991 msgstr "正在取消一个进行中的还原"
6994 msgid "please fix this using 'git rebase --edit-todo'."
6995 msgstr "请用 'git rebase --edit-todo' 来修改。"
6999 msgid "unusable instruction sheet: '%s'"
7000 msgstr "不可用的指令清单:'%s'"
7003 msgid "no commits parsed."
7007 msgid "cannot cherry-pick during a revert."
7008 msgstr "不能在回退中执行拣选。"
7011 msgid "cannot revert during a cherry-pick."
7012 msgstr "不能在拣选中执行回退。"
7016 msgid "invalid value for %s: %s"
7020 msgid "unusable squash-onto"
7021 msgstr "不可用的 squash-onto"
7025 msgid "malformed options sheet: '%s'"
7026 msgstr "格式错误的选项清单:'%s'"
7028 #: sequencer.c:2664 sequencer.c:4469
7029 msgid "empty commit set passed"
7033 msgid "revert is already in progress"
7038 msgid "try \"git revert (--continue | %s--abort | --quit)\""
7039 msgstr "尝试 \"git revert (--continue | %s--abort | --quit)\""
7042 msgid "cherry-pick is already in progress"
7047 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
7048 msgstr "尝试 \"git cherry-pick (--continue | %s--abort | --quit)\""
7052 msgid "could not create sequencer directory '%s'"
7053 msgstr "不能创建序列目录 '%s'"
7056 msgid "could not lock HEAD"
7059 #: sequencer.c:2776 sequencer.c:4206
7060 msgid "no cherry-pick or revert in progress"
7061 msgstr "拣选或还原操作并未进行"
7063 #: sequencer.c:2778 sequencer.c:2789
7064 msgid "cannot resolve HEAD"
7067 #: sequencer.c:2780 sequencer.c:2824
7068 msgid "cannot abort from a branch yet to be born"
7069 msgstr "不能从尚未建立的分支终止"
7071 #: sequencer.c:2810 builtin/grep.c:744
7073 msgid "cannot open '%s'"
7078 msgid "cannot read '%s': %s"
7079 msgstr "不能读取 '%s':%s"
7082 msgid "unexpected end of file"
7087 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
7088 msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
7091 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
7092 msgstr "您好像移动了 HEAD。未能回退,检查您的 HEAD!"
7095 msgid "no revert in progress"
7099 msgid "no cherry-pick in progress"
7103 msgid "failed to skip the commit"
7107 msgid "there is nothing to skip"
7113 "have you committed already?\n"
7114 "try \"git %s --continue\""
7117 "试试 \"git %s --continue\""
7119 #: sequencer.c:3060 sequencer.c:4098
7120 msgid "cannot read HEAD"
7125 msgid "unable to copy '%s' to '%s'"
7126 msgstr "无法拷贝 '%s' 至 '%s'"
7131 "You can amend the commit now, with\n"
7133 " git commit --amend %s\n"
7135 "Once you are satisfied with your changes, run\n"
7137 " git rebase --continue\n"
7141 " git commit --amend %s\n"
7145 " git rebase --continue\n"
7149 msgid "Could not apply %s... %.*s"
7150 msgstr "不能应用 %s... %.*s"
7154 msgid "Could not merge %.*s"
7157 #: sequencer.c:3116 sequencer.c:3120 builtin/difftool.c:641
7159 msgid "could not copy '%s' to '%s'"
7160 msgstr "不能拷贝 '%s' 至 '%s'"
7164 msgid "Executing: %s\n"
7171 "execution failed: %s\n"
7172 "%sYou can fix the problem, and then run\n"
7174 " git rebase --continue\n"
7180 " git rebase --continue\n"
7184 msgid "and made changes to the index and/or the working tree\n"
7185 msgstr "并且修改索引和/或工作区\n"
7190 "execution succeeded: %s\n"
7191 "but left changes to the index and/or the working tree\n"
7192 "Commit or stash your changes, and then run\n"
7194 " git rebase --continue\n"
7198 "但是在索引和/或工作区中存在变更\n"
7201 " git rebase --continue\n"
7206 msgid "illegal label name: '%.*s'"
7207 msgstr "非法的标签名称:'%.*s'"
7210 msgid "writing fake root commit"
7214 msgid "writing squash-onto"
7215 msgstr "写入 squash-onto"
7219 msgid "could not resolve '%s'"
7223 msgid "cannot merge without a current revision"
7228 msgid "unable to parse '%.*s'"
7229 msgstr "无法解析 '%.*s'"
7233 msgid "nothing to merge: '%.*s'"
7234 msgstr "无可用合并:'%.*s'"
7237 msgid "octopus merge cannot be executed on top of a [new root]"
7238 msgstr "章鱼合并不能在一个新的根提交上执行"
7242 msgid "could not get commit message of '%s'"
7243 msgstr "不能获取 '%s' 的提交说明"
7247 msgid "could not even attempt to merge '%.*s'"
7248 msgstr "甚至不能尝试合并 '%.*s'"
7251 msgid "merge: Unable to write new index file"
7252 msgstr "合并:无法写入新索引文件"
7255 msgid "Cannot autostash"
7256 msgstr "无法 autostash"
7260 msgid "Unexpected stash response: '%s'"
7261 msgstr "意外的 stash 响应:'%s'"
7265 msgid "Could not create directory for '%s'"
7266 msgstr "不能为 '%s' 创建目录"
7270 msgid "Created autostash: %s\n"
7271 msgstr "创建了 autostash:%s\n"
7274 msgid "could not reset --hard"
7275 msgstr "无法 reset --hard"
7279 msgid "Applied autostash.\n"
7280 msgstr "已应用 autostash。\n"
7284 msgid "cannot store %s"
7291 "Your changes are safe in the stash.\n"
7292 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
7296 "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
7299 msgid "Applying autostash resulted in conflicts."
7300 msgstr "应用自动贮藏导致冲突。"
7303 msgid "Autostash exists; creating a new stash entry."
7304 msgstr "自动贮藏已经存在;正在创建一个新的贮藏条目。"
7308 msgid "%s: not a valid OID"
7309 msgstr "%s:不是一个有效的对象 ID"
7311 #: sequencer.c:3862 git-rebase--preserve-merges.sh:779
7312 msgid "could not detach HEAD"
7317 msgid "Stopped at HEAD\n"
7322 msgid "Stopped at %s\n"
7328 "Could not execute the todo command\n"
7331 "It has been rescheduled; To edit the command before continuing, please\n"
7332 "edit the todo list first:\n"
7334 " git rebase --edit-todo\n"
7335 " git rebase --continue\n"
7340 "已被重新安排,在继续之前编辑命令,请先编辑待办列表:\n"
7342 " git rebase --edit-todo\n"
7343 " git rebase --continue\n"
7347 msgid "Rebasing (%d/%d)%s"
7348 msgstr "正在变基(%d/%d)%s"
7352 msgid "Stopped at %s... %.*s\n"
7353 msgstr "停止在 %s... %.*s\n"
7357 msgid "unknown command %d"
7361 msgid "could not read orig-head"
7362 msgstr "不能读取 orig-head"
7365 msgid "could not read 'onto'"
7366 msgstr "不能读取 'onto'"
7370 msgid "could not update HEAD to %s"
7371 msgstr "不能更新 HEAD 为 %s"
7375 msgid "Successfully rebased and updated %s.\n"
7376 msgstr "成功变基并更新 %s。\n"
7379 msgid "cannot rebase: You have unstaged changes."
7380 msgstr "不能变基:您有未暂存的变更。"
7383 msgid "cannot amend non-existing commit"
7388 msgid "invalid file: '%s'"
7393 msgid "invalid contents: '%s'"
7399 "You have uncommitted changes in your working tree. Please, commit them\n"
7400 "first and then run 'git rebase --continue' again."
7403 "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
7405 #: sequencer.c:4270 sequencer.c:4309
7407 msgid "could not write file: '%s'"
7408 msgstr "不能写入文件:'%s'"
7411 msgid "could not remove CHERRY_PICK_HEAD"
7412 msgstr "不能删除 CHERRY_PICK_HEAD"
7415 msgid "could not commit staged changes."
7420 msgid "%s: can't cherry-pick a %s"
7421 msgstr "%s:不能拣选一个%s"
7425 msgid "%s: bad revision"
7429 msgid "can't revert as initial commit"
7433 msgid "make_script: unhandled options"
7434 msgstr "make_script:有未能处理的选项"
7437 msgid "make_script: error preparing revisions"
7438 msgstr "make_script:准备版本时错误"
7440 #: sequencer.c:5206 sequencer.c:5223
7441 msgid "nothing to do"
7445 msgid "could not skip unnecessary pick commands"
7449 msgid "the script was already rearranged."
7454 msgid "'%s' is outside repository at '%s'"
7455 msgstr "'%s' 在位于 '%s' 的仓库之外"
7460 "%s: no such path in the working tree.\n"
7461 "Use 'git <command> -- <path>...' to specify paths that do not exist locally."
7464 "使用命令 'git <命令> -- <路径>...' 来指定本地不存在的路径。"
7469 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"
7470 "Use '--' to separate paths from revisions, like this:\n"
7471 "'git <command> [<revision>...] -- [<file>...]'"
7473 "有歧义的参数 '%s':未知的版本或路径不存在于工作区中。\n"
7474 "使用 '--' 来分隔版本和路径,例如:\n"
7475 "'git <命令> [<版本>...] -- [<文件>...]'"
7479 msgid "option '%s' must come before non-option arguments"
7480 msgstr "选项 '%s' 必须在其他非选项参数之前"
7485 "ambiguous argument '%s': both revision and filename\n"
7486 "Use '--' to separate paths from revisions, like this:\n"
7487 "'git <command> [<revision>...] -- [<file>...]'"
7489 "有歧义的参数 '%s':可同时是版本和文件\n"
7490 "使用 '--' 来分隔版本和路径,例如:\n"
7491 "'git <命令> [<版本>...] -- [<文件>...]'"
7494 msgid "unable to set up work tree using invalid config"
7495 msgstr "无法使用无效配置来创建工作区"
7498 msgid "this operation must be run in a work tree"
7499 msgstr "该操作必须在一个工作区中运行"
7503 msgid "Expected git repo version <= %d, found %d"
7504 msgstr "期望 git 仓库版本 <= %d,却得到 %d"
7507 msgid "unknown repository extensions found:"
7512 msgid "error opening '%s'"
7517 msgid "too large to be a .git file: '%s'"
7518 msgstr "文件太大,无法作为 .git 文件:'%s'"
7522 msgid "error reading %s"
7527 msgid "invalid gitfile format: %s"
7528 msgstr "无效的 gitfile 格式:%s"
7532 msgid "no path in gitfile: %s"
7533 msgstr "在 gitfile 中没有路径:%s"
7537 msgid "not a git repository: %s"
7538 msgstr "不是一个 git 仓库:%s"
7542 msgid "'$%s' too big"
7547 msgid "not a git repository: '%s'"
7548 msgstr "不是一个 git 仓库:'%s'"
7550 #: setup.c:751 setup.c:753 setup.c:784
7552 msgid "cannot chdir to '%s'"
7553 msgstr "不能切换目录到 '%s'"
7555 #: setup.c:756 setup.c:812 setup.c:822 setup.c:861 setup.c:869
7556 msgid "cannot come back to cwd"
7561 msgid "failed to stat '%*s%s%s'"
7562 msgstr "获取 '%*s%s%s' 状态(stat)失败"
7565 msgid "Unable to read current working directory"
7568 #: setup.c:1130 setup.c:1136
7570 msgid "cannot change to '%s'"
7575 msgid "not a git repository (or any of the parent directories): %s"
7576 msgstr "不是一个 git 仓库(或者任何父目录):%s"
7581 "not a git repository (or any parent up to mount point %s)\n"
7582 "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
7584 "不是一个 git 仓库(或者直至挂载点 %s 的任何父目录)\n"
7585 "停止在文件系统边界(未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM)。"
7590 "problem with core.sharedRepository filemode value (0%.3o).\n"
7591 "The owner of files must always have read and write permissions."
7593 "参数 core.sharedRepository 的文件属性值有问题(0%.3o)。\n"
7597 msgid "open /dev/null or dup failed"
7598 msgstr "不能打开或者复制 /dev/null"
7605 msgid "setsid failed"
7610 msgid "object directory %s does not exist; check .git/objects/info/alternates"
7611 msgstr "对象目录 %s 不存在,检查 .git/objects/info/alternates"
7615 msgid "unable to normalize alternate object path: %s"
7616 msgstr "无法规范化备用对象路径:%s"
7620 msgid "%s: ignoring alternate object stores, nesting too deep"
7621 msgstr "%s:忽略备用对象库,嵌套太深"
7625 msgid "unable to normalize object directory: %s"
7626 msgstr "无法规范化对象目录: %s"
7629 msgid "unable to fdopen alternates lockfile"
7630 msgstr "无法 fdopen 替换锁文件"
7633 msgid "unable to read alternates file"
7637 msgid "unable to move new alternates file into place"
7638 msgstr "无法将新的替代文件移动到位"
7642 msgid "path '%s' does not exist"
7643 msgstr "路径 '%s' 不存在"
7647 msgid "reference repository '%s' as a linked checkout is not supported yet."
7648 msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
7652 msgid "reference repository '%s' is not a local repository."
7653 msgstr "参考仓库 '%s' 不是一个本地仓库。"
7657 msgid "reference repository '%s' is shallow"
7658 msgstr "参考仓库 '%s' 是一个浅克隆"
7662 msgid "reference repository '%s' is grafted"
7663 msgstr "参考仓库 '%s' 已被移植"
7667 msgid "invalid line while parsing alternate refs: %s"
7668 msgstr "解析备用引用时无效的行:%s"
7672 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
7673 msgstr "尝试 mmap %<PRIuMAX>,超过了最大值 %<PRIuMAX>"
7681 msgid "object file %s is empty"
7684 #: sha1-file.c:1274 sha1-file.c:2454
7686 msgid "corrupt loose object '%s'"
7687 msgstr "损坏的松散对象 '%s'"
7689 #: sha1-file.c:1276 sha1-file.c:2458
7691 msgid "garbage at end of loose object '%s'"
7692 msgstr "松散对象 '%s' 后面有垃圾数据"
7695 msgid "invalid object type"
7700 msgid "unable to unpack %s header with --allow-unknown-type"
7701 msgstr "无法用 --allow-unknown-type 参数解开 %s 头信息"
7705 msgid "unable to unpack %s header"
7710 msgid "unable to parse %s header with --allow-unknown-type"
7711 msgstr "无法用 --allow-unknown-type 参数解析 %s 头信息"
7715 msgid "unable to parse %s header"
7720 msgid "failed to read object %s"
7725 msgid "replacement %s not found for %s"
7726 msgstr "找不到 %2$s 的替代 %1$s"
7730 msgid "loose object %s (stored in %s) is corrupt"
7731 msgstr "松散对象 %s(保存在 %s)已损坏"
7735 msgid "packed object %s (stored in %s) is corrupt"
7736 msgstr "打包对象 %s(保存在 %s)已损坏"
7740 msgid "unable to write file %s"
7745 msgid "unable to set permission to '%s'"
7746 msgstr "无法为 '%s' 设置权限"
7749 msgid "file write error"
7753 msgid "error when closing loose object file"
7754 msgstr "关闭松散对象文件时出错"
7758 msgid "insufficient permission for adding an object to repository database %s"
7759 msgstr "权限不足,无法在仓库对象库 %s 中添加对象"
7762 msgid "unable to create temporary file"
7766 msgid "unable to write loose object file"
7771 msgid "unable to deflate new object %s (%d)"
7772 msgstr "不能压缩新对象 %s(%d)"
7776 msgid "deflateEnd on object %s failed (%d)"
7777 msgstr "在对象 %s 上调用 deflateEnd 失败(%d)"
7781 msgid "confused by unstable object source data for %s"
7782 msgstr "被 %s 的不稳定对象源数据搞糊涂了"
7784 #: sha1-file.c:1906 builtin/pack-objects.c:1055
7786 msgid "failed utime() on %s"
7787 msgstr "在 %s 上调用 utime() 失败"
7791 msgid "cannot read object for %s"
7795 msgid "corrupt commit"
7804 msgid "read error while indexing %s"
7805 msgstr "索引 %s 时读取错误"
7809 msgid "short read while indexing %s"
7810 msgstr "索引 %s 时读入不完整"
7812 #: sha1-file.c:2206 sha1-file.c:2216
7814 msgid "%s: failed to insert into database"
7819 msgid "%s: unsupported file type"
7820 msgstr "%s:不支持的文件类型"
7824 msgid "%s is not a valid object"
7825 msgstr "%s 不是一个有效的对象"
7829 msgid "%s is not a valid '%s' object"
7830 msgstr "%s 不是一个有效的 '%s' 对象"
7832 #: sha1-file.c:2275 builtin/index-pack.c:155
7834 msgid "unable to open %s"
7837 #: sha1-file.c:2465 sha1-file.c:2518
7839 msgid "hash mismatch for %s (expected %s)"
7840 msgstr "%s 的哈希值不匹配(预期 %s)"
7844 msgid "unable to mmap %s"
7849 msgid "unable to unpack header of %s"
7850 msgstr "无法解压缩 %s 的头部"
7854 msgid "unable to parse header of %s"
7855 msgstr "无法解析 %s 的头部"
7859 msgid "unable to unpack contents of %s"
7860 msgstr "无法解压缩 %s 的内容"
7864 msgid "short SHA1 %s is ambiguous"
7865 msgstr "短 SHA1 %s 存在歧义"
7868 msgid "The candidates are:"
7873 "Git normally never creates a ref that ends with 40 hex characters\n"
7874 "because it will be ignored when you just specify 40-hex. These refs\n"
7875 "may be created by mistake. For example,\n"
7877 " git switch -c $br $(git rev-parse ...)\n"
7879 "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
7880 "examine these refs and maybe delete them. Turn this message off by\n"
7881 "running \"git config advice.objectNameWarning false\""
7883 "Git 通常不会创建一个以40个十六进制字符结尾的引用,因为当您只提供40\n"
7884 "个十六进制字符时将被忽略。这些引用可能被错误地创建。例如:\n"
7886 " git switch -c $br $(git rev-parse ...)\n"
7888 "当 \"$br\" 某种原因空白时,一个40位十六进制的引用将被创建。请检查这些\n"
7889 "引用,可能需要删除它们。运行 \"git config advice.objectNameWarning\n"
7890 "false\" 命令关闭本消息通知。"
7894 msgid "log for '%.*s' only goes back to %s"
7895 msgstr "'%.*s' 的日志仅能回到 %s"
7899 msgid "log for '%.*s' only has %d entries"
7900 msgstr "'%.*s' 的日志仅有 %d 个条目"
7904 msgid "path '%s' exists on disk, but not in '%.*s'"
7905 msgstr "路径 '%s' 在磁盘上,但是不在 '%.*s' 中"
7910 "path '%s' exists, but not '%s'\n"
7911 "hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
7913 "路径 '%s' 存在,而 '%s' 不存在\n"
7914 "提示:您的意思是 '%.*s:%s' 亦即 '%.*s:./%s'?"
7918 msgid "path '%s' does not exist in '%.*s'"
7919 msgstr "路径 '%s' 不在 '%.*s' 中"
7924 "path '%s' is in the index, but not at stage %d\n"
7925 "hint: Did you mean ':%d:%s'?"
7927 "路径 '%s' 在索引中,但不在暂存区 %d 中\n"
7928 "提示:您的意思是 ':%d:%s'?"
7933 "path '%s' is in the index, but not '%s'\n"
7934 "hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
7936 "路径 '%s' 在索引中,但 '%s' 不在\n"
7937 "提示:您的意思是 ':%d:%s' 亦即 ':%d:./%s'?"
7941 msgid "path '%s' exists on disk, but not in the index"
7942 msgstr "路径 '%s' 在磁盘上,但不在索引里"
7946 msgid "path '%s' does not exist (neither on disk nor in the index)"
7947 msgstr "路径 '%s' 不存在(既不在磁盘上,也不在索引中)"
7950 msgid "relative path syntax can't be used outside working tree"
7951 msgstr "不能在工作区之外使用相对路径语法"
7955 msgid "invalid object name '%.*s'."
7956 msgstr "无效的对象名 '%.*s'。"
7958 #. TRANSLATORS: IEC 80000-13:2008 gibibyte
7961 msgid "%u.%2.2u GiB"
7962 msgstr "%u.%2.2u GiB"
7964 #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
7967 msgid "%u.%2.2u GiB/s"
7968 msgstr "%u.%2.2u GiB/s"
7970 #. TRANSLATORS: IEC 80000-13:2008 mebibyte
7973 msgid "%u.%2.2u MiB"
7974 msgstr "%u.%2.2u MiB"
7976 #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
7979 msgid "%u.%2.2u MiB/s"
7980 msgstr "%u.%2.2u MiB/s"
7982 #. TRANSLATORS: IEC 80000-13:2008 kibibyte
7985 msgid "%u.%2.2u KiB"
7986 msgstr "%u.%2.2u KiB"
7988 #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
7991 msgid "%u.%2.2u KiB/s"
7992 msgstr "%u.%2.2u KiB/s"
7994 #. TRANSLATORS: IEC 80000-13:2008 byte
7998 msgid_plural "%u bytes"
8002 #. TRANSLATORS: IEC 80000-13:2008 byte/second
8006 msgid_plural "%u bytes/s"
8012 msgid "could not edit '%s'"
8015 #: submodule-config.c:237
8017 msgid "ignoring suspicious submodule name: %s"
8018 msgstr "忽略可疑的子模组名称:%s"
8020 #: submodule-config.c:304
8021 msgid "negative values not allowed for submodule.fetchjobs"
8022 msgstr "submodule.fetchjobs 不允许为负值"
8024 #: submodule-config.c:402
8026 msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
8027 msgstr "忽略可能被解析为命令行选项的 '%s':%s"
8029 #: submodule-config.c:499
8031 msgid "invalid value for %s"
8034 #: submodule-config.c:766
8036 msgid "Could not update .gitmodules entry %s"
8037 msgstr "不能更新 .gitmodules 条目 %s"
8039 #: submodule.c:114 submodule.c:143
8040 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
8041 msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
8043 #: submodule.c:118 submodule.c:147
8045 msgid "Could not find section in .gitmodules where path=%s"
8046 msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
8050 msgid "Could not remove .gitmodules entry for %s"
8051 msgstr "无法移除 %s 的 .gitmodules 条目"
8054 msgid "staging updated .gitmodules failed"
8055 msgstr "将更新后 .gitmodules 添加暂存区失败"
8059 msgid "in unpopulated submodule '%s'"
8060 msgstr "位于未检出的子模组 '%s'"
8064 msgid "Pathspec '%s' is in submodule '%.*s'"
8065 msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
8069 msgid "bad --ignore-submodules argument: %s"
8070 msgstr "坏的 --ignore-submodules 参数:%s"
8075 "Submodule in commit %s at path: '%s' collides with a submodule named the "
8076 "same. Skipping it."
8077 msgstr "提交 %s 中位于路径 '%s' 的子模组和同名的子模组冲突。 跳过它。"
8081 msgid "submodule entry '%s' (%s) is a %s, not a commit"
8082 msgstr "子模组条目 '%s'(%s)是一个 %s,不是一个提交"
8087 "Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
8089 msgstr "无法在子模组 %s 中执行 'git rev-list <提交> --not --remotes -n 1'"
8093 msgid "process for submodule '%s' failed"
8094 msgstr "处理子模组 '%s' 失败"
8096 #: submodule.c:1147 builtin/branch.c:678 builtin/submodule--helper.c:2045
8097 msgid "Failed to resolve HEAD as a valid ref."
8098 msgstr "无法将 HEAD 解析为有效引用。"
8102 msgid "Pushing submodule '%s'\n"
8103 msgstr "正在推送子模组 '%s'\n"
8107 msgid "Unable to push submodule '%s'\n"
8108 msgstr "无法推送子模组 '%s'\n"
8112 msgid "Fetching submodule %s%s\n"
8113 msgstr "正在获取子模组 %s%s\n"
8117 msgid "Could not access submodule '%s'\n"
8118 msgstr "无法访问子模组 '%s'\n"
8123 "Errors during submodule fetch:\n"
8131 msgid "'%s' not recognized as a git repository"
8132 msgstr "无法将 '%s' 识别为一个 git 仓库"
8136 msgid "Could not run 'git status --porcelain=2' in submodule %s"
8137 msgstr "无法在子模组 %s 中执行 'git status --porcelain=2'"
8141 msgid "'git status --porcelain=2' failed in submodule %s"
8142 msgstr "在子模组 %s 中执行 'git status --porcelain=2' 失败"
8146 msgid "could not start 'git status' in submodule '%s'"
8147 msgstr "无法在子模组 '%s' 中启动 'git status'"
8151 msgid "could not run 'git status' in submodule '%s'"
8152 msgstr "无法在子模组 '%s' 中执行 'git status'"
8156 msgid "Could not unset core.worktree setting in submodule '%s'"
8157 msgstr "无法在子模组 '%s' 中取消 core.worktree 的设置"
8159 #: submodule.c:1855 submodule.c:2165
8161 msgid "could not recurse into submodule '%s'"
8162 msgstr "无法递归进子模组路径 '%s'"
8165 msgid "could not reset submodule index"
8170 msgid "submodule '%s' has dirty index"
8171 msgstr "子模组 '%s' 中有脏索引"
8175 msgid "Submodule '%s' could not be updated."
8176 msgstr "子模组 '%s' 无法被更新。"
8180 msgid "submodule git dir '%s' is inside git dir '%.*s'"
8181 msgstr "子模组 git 目录 '%s' 位于 git 目录 '%.*s' 中"
8186 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
8187 msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir"
8189 #: submodule.c:2071 submodule.c:2130
8191 msgid "could not lookup name for submodule '%s'"
8192 msgstr "不能查询子模组 '%s' 的名称"
8196 msgid "refusing to move '%s' into an existing git dir"
8197 msgstr "禁止移动 '%s' 到现存 git 目录中"
8202 "Migrating git directory of '%s%s' from\n"
8206 "将 '%s%s' 的 git 目录从\n"
8211 msgid "could not start ls-files in .."
8212 msgstr "无法在 .. 中启动 ls-files"
8216 msgid "ls-tree returned unexpected return code %d"
8217 msgstr "ls-tree 返回未知返回值 %d"
8221 msgid "running trailer command '%s' failed"
8222 msgstr "执行 trailer 命令 '%s' 失败"
8224 #: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
8227 msgid "unknown value '%s' for key '%s'"
8228 msgstr "键 '%2$s' 的未知取值 '%1$s'"
8230 #: trailer.c:539 trailer.c:544 builtin/remote.c:298 builtin/remote.c:323
8232 msgid "more than one %s"
8237 msgid "empty trailer token in trailer '%.*s'"
8238 msgstr "签名 '%.*s' 的键为空"
8242 msgid "could not read input file '%s'"
8243 msgstr "不能读取输入文件 '%s'"
8246 msgid "could not read from stdin"
8249 #: trailer.c:1011 wrapper.c:665
8251 msgid "could not stat %s"
8252 msgstr "不能对 %s 调用 stat"
8256 msgid "file %s is not a regular file"
8257 msgstr "文件 %s 不是一个正规文件"
8261 msgid "file %s is not writable by user"
8262 msgstr "文件 %s 用户不可写"
8265 msgid "could not open temporary file"
8270 msgid "could not rename temporary file to %s"
8271 msgstr "不能重命名临时文件为 %s"
8273 #: transport-helper.c:61 transport-helper.c:90
8274 msgid "full write to remote helper failed"
8277 #: transport-helper.c:144
8279 msgid "unable to find remote helper for '%s'"
8280 msgstr "无法为 '%s' 找到远程助手"
8282 #: transport-helper.c:160 transport-helper.c:571
8283 msgid "can't dup helper output fd"
8284 msgstr "无法复制助手输出文件句柄"
8286 #: transport-helper.c:211
8289 "unknown mandatory capability %s; this remote helper probably needs newer "
8291 msgstr "未知的强制能力 %s,该远程助手可能需要新版本的Git"
8293 #: transport-helper.c:217
8294 msgid "this remote helper should implement refspec capability"
8295 msgstr "远程助手需要实现 refspec 能力"
8297 #: transport-helper.c:284 transport-helper.c:425
8299 msgid "%s unexpectedly said: '%s'"
8300 msgstr "%s 意外地说:'%s'"
8302 #: transport-helper.c:414
8304 msgid "%s also locked %s"
8307 #: transport-helper.c:493
8308 msgid "couldn't run fast-import"
8309 msgstr "不能执行 fast-import"
8311 #: transport-helper.c:516
8312 msgid "error while running fast-import"
8313 msgstr "执行 fast-import 出错"
8315 #: transport-helper.c:545 transport-helper.c:1135
8317 msgid "could not read ref %s"
8320 #: transport-helper.c:590
8322 msgid "unknown response to connect: %s"
8323 msgstr "连接时未知的响应:%s"
8325 #: transport-helper.c:612
8326 msgid "setting remote service path not supported by protocol"
8327 msgstr "协议不支持设置远程服务路径"
8329 #: transport-helper.c:614
8330 msgid "invalid remote service path"
8333 #: transport-helper.c:657 transport.c:1339
8334 msgid "operation not supported by protocol"
8337 #: transport-helper.c:660
8339 msgid "can't connect to subservice %s"
8340 msgstr "不能连接到子服务 %s"
8342 #: transport-helper.c:736
8344 msgid "expected ok/error, helper said '%s'"
8345 msgstr "预期 ok/error,助手说 '%s'"
8347 #: transport-helper.c:789
8349 msgid "helper reported unexpected status of %s"
8350 msgstr "助手报告 %s 的意外状态"
8352 #: transport-helper.c:850
8354 msgid "helper %s does not support dry-run"
8355 msgstr "助手 %s 不支持 dry-run"
8357 #: transport-helper.c:853
8359 msgid "helper %s does not support --signed"
8360 msgstr "助手 %s 不支持 --signed"
8362 #: transport-helper.c:856
8364 msgid "helper %s does not support --signed=if-asked"
8365 msgstr "助手 %s 不支持 --signed=if-asked"
8367 #: transport-helper.c:861
8369 msgid "helper %s does not support --atomic"
8370 msgstr "助手 %s 不支持 --atomic"
8372 #: transport-helper.c:867
8374 msgid "helper %s does not support 'push-option'"
8375 msgstr "助手 %s 不支持 'push-option'"
8377 #: transport-helper.c:966
8378 msgid "remote-helper doesn't support push; refspec needed"
8379 msgstr "remote-heper 不支持 push,需要引用表达式"
8381 #: transport-helper.c:971
8383 msgid "helper %s does not support 'force'"
8384 msgstr "助手 %s 不支持 'force'"
8386 #: transport-helper.c:1018
8387 msgid "couldn't run fast-export"
8388 msgstr "无法执行 fast-export"
8390 #: transport-helper.c:1023
8391 msgid "error while running fast-export"
8392 msgstr "执行 fast-export 时出错"
8394 #: transport-helper.c:1048
8397 "No refs in common and none specified; doing nothing.\n"
8398 "Perhaps you should specify a branch such as 'master'.\n"
8400 "没有共同的引用并且也没有指定,什么也不会做。\n"
8401 "可能您应该指定一个分支如 'master'。\n"
8403 #: transport-helper.c:1121
8405 msgid "malformed response in ref list: %s"
8406 msgstr "引用列表中格式错误的响应:%s"
8408 #: transport-helper.c:1273
8410 msgid "read(%s) failed"
8413 #: transport-helper.c:1300
8415 msgid "write(%s) failed"
8418 #: transport-helper.c:1349
8420 msgid "%s thread failed"
8423 #: transport-helper.c:1353
8425 msgid "%s thread failed to join: %s"
8426 msgstr "%s 线程等待失败:%s"
8428 #: transport-helper.c:1372 transport-helper.c:1376
8430 msgid "can't start thread for copying data: %s"
8431 msgstr "不能启动线程来拷贝数据:%s"
8433 #: transport-helper.c:1413
8435 msgid "%s process failed to wait"
8438 #: transport-helper.c:1417
8440 msgid "%s process failed"
8443 #: transport-helper.c:1435 transport-helper.c:1444
8444 msgid "can't start thread for copying data"
8445 msgstr "不能启动线程来拷贝数据"
8449 msgid "Would set upstream of '%s' to '%s' of '%s'\n"
8450 msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"
8454 msgid "could not read bundle '%s'"
8455 msgstr "无法读取 bundle '%s'"
8459 msgid "transport: invalid depth option '%s'"
8460 msgstr "传输:无效的深度选项 '%s'"
8463 msgid "see protocol.version in 'git help config' for more details"
8464 msgstr "查看 'git help config' 中的 protocol.version 获取更多信息"
8467 msgid "server options require protocol version 2 or later"
8468 msgstr "服务端选项需要版本 2 协议或更高"
8471 msgid "could not parse transport.color.* config"
8472 msgstr "不能解析 transport.color.* 配置"
8475 msgid "support for protocol v2 not implemented yet"
8476 msgstr "协议 v2 的支持尚未实现"
8480 msgid "unknown value for config '%s': %s"
8481 msgstr "配置 '%s' 的取值未知:%s"
8485 msgid "transport '%s' not allowed"
8486 msgstr "传输 '%s' 不允许"
8489 msgid "git-over-rsync is no longer supported"
8490 msgstr "不再支持 git-over-rsync"
8495 "The following submodule paths contain changes that can\n"
8496 "not be found on any remote:\n"
8497 msgstr "下列子模组路径所包含的修改在任何远程源中都找不到:\n"
8505 "\tgit push --recurse-submodules=on-demand\n"
8507 "or cd to the path and use\n"
8511 "to push them to a remote.\n"
8517 "\tgit push --recurse-submodules=on-demand\n"
8531 msgid "failed to push all needed submodules"
8532 msgstr "不能推送全部需要的子模组"
8535 msgid "too-short tree object"
8539 msgid "malformed mode in tree entry"
8540 msgstr "树对象中的条目模式错误"
8543 msgid "empty filename in tree entry"
8544 msgstr "树对象条目中空的文件名"
8547 msgid "too-short tree file"
8550 #: unpack-trees.c:113
8553 "Your local changes to the following files would be overwritten by checkout:\n"
8554 "%%sPlease commit your changes or stash them before you switch branches."
8556 "您对下列文件的本地修改将被检出操作覆盖:\n"
8557 "%%s请在切换分支前提交或贮藏您的修改。"
8559 #: unpack-trees.c:115
8562 "Your local changes to the following files would be overwritten by checkout:\n"
8565 "您对下列文件的本地修改将被检出操作覆盖:\n"
8568 #: unpack-trees.c:118
8571 "Your local changes to the following files would be overwritten by merge:\n"
8572 "%%sPlease commit your changes or stash them before you merge."
8574 "您对下列文件的本地修改将被合并操作覆盖:\n"
8575 "%%s请在合并前提交或贮藏您的修改。"
8577 #: unpack-trees.c:120
8580 "Your local changes to the following files would be overwritten by merge:\n"
8583 "您对下列文件的本地修改将被合并操作覆盖:\n"
8586 #: unpack-trees.c:123
8589 "Your local changes to the following files would be overwritten by %s:\n"
8590 "%%sPlease commit your changes or stash them before you %s."
8592 "您对下列文件的本地修改将被 %s 覆盖:\n"
8593 "%%s请在 %s 之前提交或贮藏您的修改。"
8595 #: unpack-trees.c:125
8598 "Your local changes to the following files would be overwritten by %s:\n"
8601 "您对下列文件的本地修改将被 %s 覆盖:\n"
8604 #: unpack-trees.c:130
8607 "Updating the following directories would lose untracked files in them:\n"
8610 "更新如下目录将会丢失其中未跟踪的文件:\n"
8613 #: unpack-trees.c:134
8616 "The following untracked working tree files would be removed by checkout:\n"
8617 "%%sPlease move or remove them before you switch branches."
8619 "工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
8622 #: unpack-trees.c:136
8625 "The following untracked working tree files would be removed by checkout:\n"
8628 "工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
8631 #: unpack-trees.c:139
8634 "The following untracked working tree files would be removed by merge:\n"
8635 "%%sPlease move or remove them before you merge."
8637 "工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
8640 #: unpack-trees.c:141
8643 "The following untracked working tree files would be removed by merge:\n"
8646 "工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
8649 #: unpack-trees.c:144
8652 "The following untracked working tree files would be removed by %s:\n"
8653 "%%sPlease move or remove them before you %s."
8655 "工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
8658 #: unpack-trees.c:146
8661 "The following untracked working tree files would be removed by %s:\n"
8664 "工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
8667 #: unpack-trees.c:152
8670 "The following untracked working tree files would be overwritten by "
8672 "%%sPlease move or remove them before you switch branches."
8674 "工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
8677 #: unpack-trees.c:154
8680 "The following untracked working tree files would be overwritten by "
8684 "工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
8687 #: unpack-trees.c:157
8690 "The following untracked working tree files would be overwritten by merge:\n"
8691 "%%sPlease move or remove them before you merge."
8693 "工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
8696 #: unpack-trees.c:159
8699 "The following untracked working tree files would be overwritten by merge:\n"
8702 "工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
8705 #: unpack-trees.c:162
8708 "The following untracked working tree files would be overwritten by %s:\n"
8709 "%%sPlease move or remove them before you %s."
8711 "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
8714 #: unpack-trees.c:164
8717 "The following untracked working tree files would be overwritten by %s:\n"
8720 "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
8723 #: unpack-trees.c:172
8725 msgid "Entry '%s' overlaps with '%s'. Cannot bind."
8726 msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"
8728 #: unpack-trees.c:175
8731 "Cannot update submodule:\n"
8737 #: unpack-trees.c:178
8740 "The following paths are not up to date and were left despite sparse "
8744 "尽管存在稀疏检出模板,以下路径不是最新,因而保留:\n"
8747 #: unpack-trees.c:180
8750 "The following paths are unmerged and were left despite sparse patterns:\n"
8753 "尽管存在稀疏检出模板,以下路径处于未合并状态,因而保留:\n"
8756 #: unpack-trees.c:182
8759 "The following paths were already present and thus not updated despite sparse "
8763 "尽管存在稀疏检出模板,以下路径已经存在,因而未更新:\n"
8766 #: unpack-trees.c:262
8771 #: unpack-trees.c:289
8774 "After fixing the above paths, you may want to run `git sparse-checkout "
8776 msgstr "在修复上述路径之后,你可能要执行 `git sparse-checkout reapply`。\n"
8778 #: unpack-trees.c:350
8779 msgid "Updating files"
8782 #: unpack-trees.c:382
8784 "the following paths have collided (e.g. case-sensitive paths\n"
8785 "on a case-insensitive filesystem) and only one from the same\n"
8786 "colliding group is in the working tree:\n"
8788 "以下路径发生碰撞(如:在不区分大小写的文件系统上的区分大小写的路径),\n"
8789 "并且碰撞组中只有一个文件存在工作区中:\n"
8791 #: unpack-trees.c:1498
8792 msgid "Updating index flags"
8795 #: upload-pack.c:1337
8796 msgid "expected flush after fetch arguments"
8797 msgstr "在 fetch 参数之后应该有一个 flush 包"
8800 msgid "invalid URL scheme name or missing '://' suffix"
8801 msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
8803 #: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
8805 msgid "invalid %XX escape sequence"
8806 msgstr "无效的 %XX 转义序列"
8809 msgid "missing host and scheme is not 'file:'"
8810 msgstr "缺失主机名且 URL 方案不是 'file:'"
8813 msgid "a 'file:' URL may not have a port number"
8814 msgstr "一个 'file:' URL 不应该包含端口号"
8817 msgid "invalid characters in host name"
8818 msgstr "主机名中包含无效的字符"
8820 #: urlmatch.c:292 urlmatch.c:303
8821 msgid "invalid port number"
8825 msgid "invalid '..' path segment"
8826 msgstr "无效的 '..' 路径片段"
8829 msgid "Fetching objects"
8832 #: worktree.c:262 builtin/am.c:2098
8834 msgid "failed to read '%s'"
8839 msgid "'%s' at main working tree is not the repository directory"
8840 msgstr "在主工作区的 '%s' 不是仓库目录"
8844 msgid "'%s' file does not contain absolute path to the working tree location"
8845 msgstr "文件 '%s' 不包含工作区的绝对路径"
8849 msgid "'%s' does not exist"
8854 msgid "'%s' is not a .git file, error code %d"
8855 msgstr "'%s' 不是一个 .git 文件,错误码 %d"
8859 msgid "'%s' does not point back to '%s'"
8860 msgstr "'%s' 没有指回到 '%s'"
8862 #: wrapper.c:186 wrapper.c:356
8864 msgid "could not open '%s' for reading and writing"
8865 msgstr "无法打开 '%s' 进行读写"
8867 #: wrapper.c:387 wrapper.c:588
8869 msgid "unable to access '%s'"
8873 msgid "unable to get current working directory"
8877 msgid "Unmerged paths:"
8881 #: wt-status.c:187 wt-status.c:219
8882 msgid " (use \"git restore --staged <file>...\" to unstage)"
8883 msgstr " (使用 \"git restore --staged <文件>...\" 以取消暂存)"
8886 #: wt-status.c:190 wt-status.c:222
8888 msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)"
8889 msgstr " (使用 \"git restore --source=%s --staged <文件>...\" 以取消暂存)"
8892 #: wt-status.c:193 wt-status.c:225
8893 msgid " (use \"git rm --cached <file>...\" to unstage)"
8894 msgstr " (使用 \"git rm --cached <文件>...\" 以取消暂存)"
8898 msgid " (use \"git add <file>...\" to mark resolution)"
8899 msgstr " (使用 \"git add <文件>...\" 标记解决方案)"
8902 #: wt-status.c:199 wt-status.c:203
8903 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
8904 msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)"
8908 msgid " (use \"git rm <file>...\" to mark resolution)"
8909 msgstr " (使用 \"git rm <文件>...\" 标记解决方案)"
8911 #: wt-status.c:211 wt-status.c:1072
8912 msgid "Changes to be committed:"
8915 #: wt-status.c:234 wt-status.c:1081
8916 msgid "Changes not staged for commit:"
8917 msgstr "尚未暂存以备提交的变更:"
8921 msgid " (use \"git add <file>...\" to update what will be committed)"
8922 msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)"
8926 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
8927 msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)"
8932 " (use \"git restore <file>...\" to discard changes in working directory)"
8933 msgstr " (使用 \"git restore <文件>...\" 丢弃工作区的改动)"
8937 msgid " (commit or discard the untracked or modified content in submodules)"
8938 msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
8943 msgid " (use \"git %s <file>...\" to include in what will be committed)"
8944 msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)"
8947 msgid "both deleted:"
8951 msgid "added by us:"
8955 msgid "deleted by them:"
8959 msgid "added by them:"
8963 msgid "deleted by us:"
8971 msgid "both modified:"
9006 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
9008 msgid "new commits, "
9011 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
9013 msgid "modified content, "
9016 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
9018 msgid "untracked content, "
9023 msgid "Your stash currently has %d entry"
9024 msgid_plural "Your stash currently has %d entries"
9025 msgstr[0] "您的贮藏区当前有 %d 条记录"
9026 msgstr[1] "您的贮藏区当前有 %d 条记录"
9029 msgid "Submodules changed but not updated:"
9030 msgstr "子模组已修改但尚未更新:"
9033 msgid "Submodule changes to be committed:"
9038 "Do not modify or remove the line above.\n"
9039 "Everything below it will be ignored."
9048 "It took %.2f seconds to compute the branch ahead/behind values.\n"
9049 "You can use '--no-ahead-behind' to avoid this.\n"
9052 "花了 %.2f 秒才计算出分支的领先/落后范围。\n"
9053 "为避免,您可以使用 '--no-ahead-behind'。\n"
9056 msgid "You have unmerged paths."
9061 msgid " (fix conflicts and run \"git commit\")"
9062 msgstr " (解决冲突并运行 \"git commit\")"
9066 msgid " (use \"git merge --abort\" to abort the merge)"
9067 msgstr " (使用 \"git merge --abort\" 终止合并)"
9070 msgid "All conflicts fixed but you are still merging."
9071 msgstr "所有冲突已解决但您仍处于合并中。"
9075 msgid " (use \"git commit\" to conclude merge)"
9076 msgstr " (使用 \"git commit\" 结束合并)"
9079 msgid "You are in the middle of an am session."
9080 msgstr "您正处于 am 操作过程中。"
9083 msgid "The current patch is empty."
9088 msgid " (fix conflicts and then run \"git am --continue\")"
9089 msgstr " (解决冲突,然后运行 \"git am --continue\")"
9093 msgid " (use \"git am --skip\" to skip this patch)"
9094 msgstr " (使用 \"git am --skip\" 跳过此补丁)"
9098 msgid " (use \"git am --abort\" to restore the original branch)"
9099 msgstr " (使用 \"git am --abort\" 恢复原有分支)"
9102 msgid "git-rebase-todo is missing."
9103 msgstr "git-rebase-todo 丢失。"
9106 msgid "No commands done."
9111 msgid "Last command done (%d command done):"
9112 msgid_plural "Last commands done (%d commands done):"
9113 msgstr[0] "最后一条命令已完成(%d 条命令被执行):"
9114 msgstr[1] "最后的命令已完成(%d 条命令被执行):"
9118 msgid " (see more in file %s)"
9119 msgstr " (更多参见文件 %s)"
9122 msgid "No commands remaining."
9127 msgid "Next command to do (%d remaining command):"
9128 msgid_plural "Next commands to do (%d remaining commands):"
9129 msgstr[0] "接下来要执行的命令(剩余 %d 条命令):"
9130 msgstr[1] "接下来要执行的命令(剩余 %d 条命令):"
9134 msgid " (use \"git rebase --edit-todo\" to view and edit)"
9135 msgstr " (使用 \"git rebase --edit-todo\" 来查看和编辑)"
9139 msgid "You are currently rebasing branch '%s' on '%s'."
9140 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
9143 msgid "You are currently rebasing."
9148 msgid " (fix conflicts and then run \"git rebase --continue\")"
9149 msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
9153 msgid " (use \"git rebase --skip\" to skip this patch)"
9154 msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
9158 msgid " (use \"git rebase --abort\" to check out the original branch)"
9159 msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
9163 msgid " (all conflicts fixed: run \"git rebase --continue\")"
9164 msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
9169 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
9170 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
9173 msgid "You are currently splitting a commit during a rebase."
9174 msgstr "您在执行变基操作时拆分提交。"
9178 msgid " (Once your working directory is clean, run \"git rebase --continue\")"
9179 msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
9183 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
9184 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
9187 msgid "You are currently editing a commit during a rebase."
9188 msgstr "您在执行变基操作时编辑提交。"
9192 msgid " (use \"git commit --amend\" to amend the current commit)"
9193 msgstr " (使用 \"git commit --amend\" 修补当前提交)"
9198 " (use \"git rebase --continue\" once you are satisfied with your changes)"
9199 msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
9202 msgid "Cherry-pick currently in progress."
9207 msgid "You are currently cherry-picking commit %s."
9208 msgstr "您在执行拣选提交 %s 的操作。"
9212 msgid " (fix conflicts and run \"git cherry-pick --continue\")"
9213 msgstr " (解决冲突并运行 \"git cherry-pick --continue\")"
9217 msgid " (run \"git cherry-pick --continue\" to continue)"
9218 msgstr " (执行 \"git cherry-pick --continue\" 以继续)"
9222 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
9223 msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")"
9227 msgid " (use \"git cherry-pick --skip\" to skip this patch)"
9228 msgstr " (使用 \"git cherry-pick --skip\" 跳过此补丁)"
9232 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
9233 msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
9236 msgid "Revert currently in progress."
9241 msgid "You are currently reverting commit %s."
9242 msgstr "您在执行反转提交 %s 的操作。"
9246 msgid " (fix conflicts and run \"git revert --continue\")"
9247 msgstr " (解决冲突并执行 \"git revert --continue\")"
9251 msgid " (run \"git revert --continue\" to continue)"
9252 msgstr " (执行 \"git revert --continue\" 以继续)"
9256 msgid " (all conflicts fixed: run \"git revert --continue\")"
9257 msgstr " (所有冲突已解决:执行 \"git revert --continue\")"
9261 msgid " (use \"git revert --skip\" to skip this patch)"
9262 msgstr " (使用 \"git revert --skip\" 跳过此补丁)"
9266 msgid " (use \"git revert --abort\" to cancel the revert operation)"
9267 msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
9271 msgid "You are currently bisecting, started from branch '%s'."
9272 msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
9275 msgid "You are currently bisecting."
9276 msgstr "您在执行二分查找操作。"
9280 msgid " (use \"git bisect reset\" to get back to the original branch)"
9281 msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
9288 msgid "interactive rebase in progress; onto "
9289 msgstr "交互式变基操作正在进行中;至 "
9292 msgid "rebase in progress; onto "
9293 msgstr "变基操作正在进行中;至 "
9296 msgid "Not currently on any branch."
9300 msgid "Initial commit"
9304 msgid "No commits yet"
9308 msgid "Untracked files"
9312 msgid "Ignored files"
9318 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
9319 "may speed it up, but you have to be careful not to forget to add\n"
9320 "new files yourself (see 'git help status')."
9322 "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
9323 "但您需要小心不要忘了添加新文件(参见 'git help status')。"
9327 msgid "Untracked files not listed%s"
9328 msgstr "未跟踪的文件没有列出%s"
9330 # 译者:中文字符串拼接,可删除前导空格
9332 msgid " (use -u option to show untracked files)"
9333 msgstr "(使用 -u 参数显示未跟踪的文件)"
9341 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
9342 msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
9346 msgid "no changes added to commit\n"
9352 "nothing added to commit but untracked files present (use \"git add\" to "
9354 msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
9358 msgid "nothing added to commit but untracked files present\n"
9359 msgstr "提交为空,但是存在尚未跟踪的文件\n"
9361 # 译者:中文字符串拼接,可删除前导空格
9364 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
9365 msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
9367 #: wt-status.c:1783 wt-status.c:1788
9369 msgid "nothing to commit\n"
9372 # 译者:中文字符串拼接,可删除前导空格
9375 msgid "nothing to commit (use -u to show untracked files)\n"
9376 msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
9378 # 译者:中文字符串拼接,可删除前导空格
9381 msgid "nothing to commit, working tree clean\n"
9382 msgstr "无文件要提交,干净的工作区\n"
9385 msgid "No commits yet on "
9389 msgid "HEAD (no branch)"
9397 #: wt-status.c:1940 wt-status.c:1948
9401 #: wt-status.c:1943 wt-status.c:1946
9405 #. TRANSLATORS: the action is e.g. "pull with rebase"
9408 msgid "cannot %s: You have unstaged changes."
9409 msgstr "不能%s:您有未暂存的变更。"
9412 msgid "additionally, your index contains uncommitted changes."
9413 msgstr "另外,您的索引中包含未提交的变更。"
9417 msgid "cannot %s: Your index contains uncommitted changes."
9418 msgstr "不能%s:您的索引中包含未提交的变更。"
9420 #: compat/precompose_utf8.c:58 builtin/clone.c:456
9422 msgid "failed to unlink '%s'"
9426 msgid "git add [<options>] [--] <pathspec>..."
9427 msgstr "git add [<选项>] [--] <路径规格>..."
9431 msgid "unexpected diff status %c"
9434 #: builtin/add.c:93 builtin/commit.c:285
9435 msgid "updating files failed"
9438 #: builtin/add.c:103
9440 msgid "remove '%s'\n"
9443 #: builtin/add.c:178
9444 msgid "Unstaged changes after refreshing the index:"
9445 msgstr "刷新索引之后尚未被暂存的变更:"
9447 #: builtin/add.c:266 builtin/rev-parse.c:904
9448 msgid "Could not read the index"
9451 #: builtin/add.c:277
9453 msgid "Could not open '%s' for writing."
9454 msgstr "无法为写入打开 '%s'。"
9456 #: builtin/add.c:281
9457 msgid "Could not write patch"
9460 #: builtin/add.c:284
9461 msgid "editing patch failed"
9464 #: builtin/add.c:287
9466 msgid "Could not stat '%s'"
9467 msgstr "不能对 '%s' 调用 stat"
9469 #: builtin/add.c:289
9470 msgid "Empty patch. Aborted."
9473 #: builtin/add.c:294
9475 msgid "Could not apply '%s'"
9478 #: builtin/add.c:302
9479 msgid "The following paths are ignored by one of your .gitignore files:\n"
9480 msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
9482 #: builtin/add.c:322 builtin/clean.c:904 builtin/fetch.c:164 builtin/mv.c:124
9483 #: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:548
9484 #: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165
9488 #: builtin/add.c:325
9489 msgid "interactive picking"
9492 #: builtin/add.c:326 builtin/checkout.c:1535 builtin/reset.c:308
9493 msgid "select hunks interactively"
9496 #: builtin/add.c:327
9497 msgid "edit current diff and apply"
9500 #: builtin/add.c:328
9501 msgid "allow adding otherwise ignored files"
9504 #: builtin/add.c:329
9505 msgid "update tracked files"
9508 #: builtin/add.c:330
9509 msgid "renormalize EOL of tracked files (implies -u)"
9510 msgstr "对已跟踪文件(暗含 -u)重新归一换行符"
9512 #: builtin/add.c:331
9513 msgid "record only the fact that the path will be added later"
9514 msgstr "只记录,该路径稍后再添加"
9516 #: builtin/add.c:332
9517 msgid "add changes from all tracked and untracked files"
9518 msgstr "添加所有改变的已跟踪文件和未跟踪文件"
9520 #: builtin/add.c:335
9521 msgid "ignore paths removed in the working tree (same as --no-all)"
9522 msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
9524 #: builtin/add.c:337
9525 msgid "don't add, only refresh the index"
9528 #: builtin/add.c:338
9529 msgid "just skip files which cannot be added because of errors"
9530 msgstr "跳过因出错不能添加的文件"
9532 #: builtin/add.c:339
9533 msgid "check if - even missing - files are ignored in dry run"
9534 msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
9536 #: builtin/add.c:341 builtin/update-index.c:1004
9537 msgid "override the executable bit of the listed files"
9538 msgstr "覆盖列表里文件的可执行位"
9540 #: builtin/add.c:343
9541 msgid "warn when adding an embedded repository"
9542 msgstr "创建一个嵌入式仓库时给予警告"
9544 #: builtin/add.c:345
9545 msgid "backend for `git stash -p`"
9546 msgstr "`git stash -p` 的后端"
9548 #: builtin/add.c:363
9551 "You've added another git repository inside your current repository.\n"
9552 "Clones of the outer repository will not contain the contents of\n"
9553 "the embedded repository and will not know how to obtain it.\n"
9554 "If you meant to add a submodule, use:\n"
9556 "\tgit submodule add <url> %s\n"
9558 "If you added this path by mistake, you can remove it from the\n"
9561 "\tgit rm --cached %s\n"
9563 "See \"git help submodule\" for more information."
9565 "您在当前仓库中添加了另一个Git仓库。克隆外层的仓库将不包含嵌入仓库的\n"
9566 "内容,并且不知道该如何获取它。如果您要添加一个子模组,使用:\n"
9568 "\tgit submodule add <url> %s\n"
9570 "如果您不小心添加了这个路径,可以用下面的命令将其从索引中删除:\n"
9572 "\tgit rm --cached %s\n"
9574 "参见 \"git help submodule\" 获取更多信息。"
9576 #: builtin/add.c:391
9578 msgid "adding embedded git repository: %s"
9579 msgstr "正在添加嵌入式 git 仓库:%s"
9581 #: builtin/add.c:410
9583 "Use -f if you really want to add them.\n"
9584 "Turn this message off by running\n"
9585 "\"git config advice.addIgnoredFile false\""
9587 "如果您确实要添加它们,使用 -f 参数。\n"
9589 "\"git config advice.addIgnoredFile false\""
9591 #: builtin/add.c:419
9592 msgid "adding files failed"
9595 #: builtin/add.c:447 builtin/commit.c:345
9596 msgid "--pathspec-from-file is incompatible with --interactive/--patch"
9597 msgstr "--pathspec-from-file 与 --interactive/--patch 不兼容"
9599 #: builtin/add.c:464
9600 msgid "--pathspec-from-file is incompatible with --edit"
9601 msgstr "--pathspec-from-file 与 --edit 不兼容"
9603 #: builtin/add.c:476
9604 msgid "-A and -u are mutually incompatible"
9605 msgstr "-A 和 -u 选项互斥"
9607 #: builtin/add.c:479
9608 msgid "Option --ignore-missing can only be used together with --dry-run"
9609 msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
9611 #: builtin/add.c:483
9613 msgid "--chmod param '%s' must be either -x or +x"
9614 msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x"
9616 #: builtin/add.c:501 builtin/checkout.c:1703 builtin/commit.c:351
9617 #: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1506
9618 msgid "--pathspec-from-file is incompatible with pathspec arguments"
9619 msgstr "--pathspec-from-file 与路径表达式参数不兼容"
9621 #: builtin/add.c:508 builtin/checkout.c:1715 builtin/commit.c:357
9622 #: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1512
9623 msgid "--pathspec-file-nul requires --pathspec-from-file"
9624 msgstr "--pathspec-file-nul 需要 --pathspec-from-file"
9626 #: builtin/add.c:512
9628 msgid "Nothing specified, nothing added.\n"
9629 msgstr "没有指定文件,也没有文件被添加。\n"
9631 #: builtin/add.c:514
9633 "Maybe you wanted to say 'git add .'?\n"
9634 "Turn this message off by running\n"
9635 "\"git config advice.addEmptyPathspec false\""
9637 "也许您想要执行 'git add .'?\n"
9639 "\"git config advice.addEmptyPathspec false\""
9642 msgid "could not parse author script"
9647 msgid "'%s' was deleted by the applypatch-msg hook"
9648 msgstr "'%s' 被 applypatch-msg 钩子删除"
9652 msgid "Malformed input line: '%s'."
9653 msgstr "非法的输入行:'%s'。"
9657 msgid "Failed to copy notes from '%s' to '%s'"
9658 msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
9661 msgid "fseek failed"
9666 msgid "could not parse patch '%s'"
9667 msgstr "无法解析补丁 '%s'"
9670 msgid "Only one StGIT patch series can be applied at once"
9671 msgstr "一次只能有一个 StGIT 补丁队列被应用"
9674 msgid "invalid timestamp"
9677 #: builtin/am.c:848 builtin/am.c:860
9678 msgid "invalid Date line"
9682 msgid "invalid timezone offset"
9686 msgid "Patch format detection failed."
9689 #: builtin/am.c:953 builtin/clone.c:409
9691 msgid "failed to create directory '%s'"
9692 msgstr "创建目录 '%s' 失败"
9695 msgid "Failed to split patches."
9698 #: builtin/am.c:1089
9700 msgid "When you have resolved this problem, run \"%s --continue\"."
9701 msgstr "当您解决这一问题,执行 \"%s --continue\"。"
9703 #: builtin/am.c:1090
9705 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
9706 msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。"
9708 #: builtin/am.c:1091
9710 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
9711 msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。"
9713 #: builtin/am.c:1174
9714 msgid "Patch sent with format=flowed; space at the end of lines might be lost."
9715 msgstr "补丁使用 format=flowed 格式发送,行尾的空格可能会丢失。"
9717 #: builtin/am.c:1202
9718 msgid "Patch is empty."
9721 #: builtin/am.c:1267
9723 msgid "missing author line in commit %s"
9724 msgstr "在提交 %s 中缺失作者行"
9726 #: builtin/am.c:1270
9728 msgid "invalid ident line: %.*s"
9729 msgstr "无效的身份标识:%.*s"
9731 #: builtin/am.c:1489
9732 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
9733 msgstr "仓库缺乏必要的数据对象以进行三方合并。"
9735 #: builtin/am.c:1491
9736 msgid "Using index info to reconstruct a base tree..."
9737 msgstr "使用索引来重建一个(三方合并的)基础目录树..."
9739 #: builtin/am.c:1510
9741 "Did you hand edit your patch?\n"
9742 "It does not apply to blobs recorded in its index."
9747 #: builtin/am.c:1516
9748 msgid "Falling back to patching base and 3-way merge..."
9749 msgstr "回落到基础版本上打补丁及进行三方合并..."
9751 #: builtin/am.c:1542
9752 msgid "Failed to merge in the changes."
9755 #: builtin/am.c:1574
9756 msgid "applying to an empty history"
9759 #: builtin/am.c:1621 builtin/am.c:1625
9761 msgid "cannot resume: %s does not exist."
9762 msgstr "无法继续:%s 不存在。"
9764 #: builtin/am.c:1643
9765 msgid "Commit Body is:"
9769 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
9770 #. in your translation. The program will only accept English
9771 #. input at this point.
9773 #: builtin/am.c:1653
9775 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
9776 msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:"
9778 #: builtin/am.c:1699 builtin/commit.c:395
9779 msgid "unable to write index file"
9782 #: builtin/am.c:1703
9784 msgid "Dirty index: cannot apply patches (dirty: %s)"
9785 msgstr "脏索引:不能应用补丁(脏文件:%s)"
9787 #: builtin/am.c:1743 builtin/am.c:1811
9789 msgid "Applying: %.*s"
9792 #: builtin/am.c:1760
9793 msgid "No changes -- Patch already applied."
9794 msgstr "没有变更 —— 补丁已经应用过。"
9796 #: builtin/am.c:1766
9798 msgid "Patch failed at %s %.*s"
9799 msgstr "打补丁失败于 %s %.*s"
9801 #: builtin/am.c:1770
9802 msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
9803 msgstr "用 'git am --show-current-patch=diff' 命令查看失败的补丁"
9805 #: builtin/am.c:1814
9807 "No changes - did you forget to use 'git add'?\n"
9808 "If there is nothing left to stage, chances are that something else\n"
9809 "already introduced the same changes; you might want to skip this patch."
9811 "没有变更 —— 您是不是忘了执行 'git add'?\n"
9812 "如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
9815 #: builtin/am.c:1821
9817 "You still have unmerged paths in your index.\n"
9818 "You should 'git add' each file with resolved conflicts to mark them as "
9820 "You might run `git rm` on a file to accept \"deleted by them\" for it."
9822 "在您的索引中仍存在未合并的路径。\n"
9823 "您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n"
9824 "你可以对 \"由他们删除\" 的文件执行 `git rm` 命令。"
9826 #: builtin/am.c:1928 builtin/am.c:1932 builtin/am.c:1944 builtin/reset.c:347
9827 #: builtin/reset.c:355
9829 msgid "Could not parse object '%s'."
9830 msgstr "不能解析对象 '%s'。"
9832 #: builtin/am.c:1980
9833 msgid "failed to clean index"
9836 #: builtin/am.c:2024
9838 "You seem to have moved HEAD since the last 'am' failure.\n"
9839 "Not rewinding to ORIG_HEAD"
9840 msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
9842 #: builtin/am.c:2131
9844 msgid "Invalid value for --patch-format: %s"
9845 msgstr "无效的 --patch-format 值:%s"
9847 #: builtin/am.c:2171
9849 msgid "Invalid value for --show-current-patch: %s"
9850 msgstr "无效的 --show-current-patch 值:%s"
9852 #: builtin/am.c:2175
9854 msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
9855 msgstr "--show-current-patch=%s 和 --show-current-patch=%s 不兼容"
9857 #: builtin/am.c:2206
9858 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
9859 msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
9861 #: builtin/am.c:2207
9862 msgid "git am [<options>] (--continue | --skip | --abort)"
9863 msgstr "git am [<选项>] (--continue | --skip | --abort)"
9865 #: builtin/am.c:2213
9866 msgid "run interactively"
9869 #: builtin/am.c:2215
9870 msgid "historical option -- no-op"
9871 msgstr "老的参数 —— 无作用"
9873 #: builtin/am.c:2217
9874 msgid "allow fall back on 3way merging if needed"
9875 msgstr "如果必要,允许使用三方合并。"
9877 #: builtin/am.c:2218 builtin/init-db.c:541 builtin/prune-packed.c:16
9878 #: builtin/repack.c:306 builtin/stash.c:816
9882 #: builtin/am.c:2220
9883 msgid "add a Signed-off-by line to the commit message"
9884 msgstr "在提交说明中添加一个 Signed-off-by 签名"
9886 #: builtin/am.c:2223
9887 msgid "recode into utf8 (default)"
9888 msgstr "使用 utf8 字符集(默认)"
9890 #: builtin/am.c:2225
9891 msgid "pass -k flag to git-mailinfo"
9892 msgstr "向 git-mailinfo 传递 -k 参数"
9894 #: builtin/am.c:2227
9895 msgid "pass -b flag to git-mailinfo"
9896 msgstr "向 git-mailinfo 传递 -b 参数"
9898 #: builtin/am.c:2229
9899 msgid "pass -m flag to git-mailinfo"
9900 msgstr "向 git-mailinfo 传递 -m 参数"
9902 #: builtin/am.c:2231
9903 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
9904 msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数"
9906 #: builtin/am.c:2234
9907 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
9908 msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置"
9910 #: builtin/am.c:2237
9911 msgid "strip everything before a scissors line"
9912 msgstr "丢弃裁切线前的所有内容"
9914 #: builtin/am.c:2239 builtin/am.c:2242 builtin/am.c:2245 builtin/am.c:2248
9915 #: builtin/am.c:2251 builtin/am.c:2254 builtin/am.c:2257 builtin/am.c:2260
9916 #: builtin/am.c:2266
9917 msgid "pass it through git-apply"
9918 msgstr "传递给 git-apply"
9920 #: builtin/am.c:2256 builtin/commit.c:1397 builtin/fmt-merge-msg.c:17
9921 #: builtin/fmt-merge-msg.c:20 builtin/grep.c:891 builtin/merge.c:252
9922 #: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
9923 #: builtin/rebase.c:1329 builtin/repack.c:317 builtin/repack.c:321
9924 #: builtin/repack.c:323 builtin/show-branch.c:650 builtin/show-ref.c:172
9925 #: builtin/tag.c:404 parse-options.h:154 parse-options.h:175
9926 #: parse-options.h:316
9930 #: builtin/am.c:2262 builtin/branch.c:659 builtin/for-each-ref.c:38
9931 #: builtin/replace.c:556 builtin/tag.c:438 builtin/verify-tag.c:38
9936 #: builtin/am.c:2263
9937 msgid "format the patch(es) are in"
9940 #: builtin/am.c:2269
9941 msgid "override error message when patch failure occurs"
9942 msgstr "打补丁失败时显示的错误信息"
9944 #: builtin/am.c:2271
9945 msgid "continue applying patches after resolving a conflict"
9946 msgstr "冲突解决后继续应用补丁"
9948 #: builtin/am.c:2274
9949 msgid "synonyms for --continue"
9950 msgstr "和 --continue 同义"
9952 #: builtin/am.c:2277
9953 msgid "skip the current patch"
9956 #: builtin/am.c:2280
9957 msgid "restore the original branch and abort the patching operation."
9958 msgstr "恢复原始分支并终止打补丁操作。"
9960 #: builtin/am.c:2283
9961 msgid "abort the patching operation but keep HEAD where it is."
9962 msgstr "终止补丁操作但保持 HEAD 不变。"
9964 #: builtin/am.c:2287
9965 msgid "show the patch being applied"
9968 #: builtin/am.c:2292
9969 msgid "lie about committer date"
9970 msgstr "将作者日期作为提交日期"
9972 #: builtin/am.c:2294
9973 msgid "use current timestamp for author date"
9974 msgstr "用当前时间作为作者日期"
9976 #: builtin/am.c:2296 builtin/commit-tree.c:120 builtin/commit.c:1517
9977 #: builtin/merge.c:289 builtin/pull.c:175 builtin/rebase.c:524
9978 #: builtin/rebase.c:1380 builtin/revert.c:117 builtin/tag.c:419
9982 #: builtin/am.c:2297 builtin/rebase.c:525 builtin/rebase.c:1381
9983 msgid "GPG-sign commits"
9984 msgstr "使用 GPG 签名提交"
9986 #: builtin/am.c:2300
9987 msgid "(internal use for git-rebase)"
9988 msgstr "(内部使用,用于 git-rebase)"
9990 #: builtin/am.c:2318
9992 "The -b/--binary option has been a no-op for long time, and\n"
9993 "it will be removed. Please do not use it anymore."
9995 "参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n"
9998 #: builtin/am.c:2325
9999 msgid "failed to read the index"
10002 #: builtin/am.c:2340
10004 msgid "previous rebase directory %s still exists but mbox given."
10005 msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。"
10007 #: builtin/am.c:2364
10010 "Stray %s directory found.\n"
10011 "Use \"git am --abort\" to remove it."
10014 "使用 \"git am --abort\" 删除它。"
10016 #: builtin/am.c:2370
10017 msgid "Resolve operation not in progress, we are not resuming."
10018 msgstr "解决操作未进行,我们不会继续。"
10020 #: builtin/am.c:2380
10021 msgid "interactive mode requires patches on the command line"
10022 msgstr "交互式模式需要命令行上提供补丁"
10024 #: builtin/apply.c:8
10025 msgid "git apply [<options>] [<patch>...]"
10026 msgstr "git apply [<选项>] [<补丁>...]"
10028 #: builtin/archive.c:17
10030 msgid "could not create archive file '%s'"
10031 msgstr "不能创建归档文件 '%s'"
10033 #: builtin/archive.c:20
10034 msgid "could not redirect output"
10037 #: builtin/archive.c:37
10038 msgid "git archive: Remote with no URL"
10039 msgstr "git archive:未提供远程 URL"
10041 #: builtin/archive.c:61
10042 msgid "git archive: expected ACK/NAK, got a flush packet"
10043 msgstr "git archive:期望是 ACK/NAK,却得到 flush 包"
10045 #: builtin/archive.c:64
10047 msgid "git archive: NACK %s"
10048 msgstr "git archive:NACK %s"
10050 #: builtin/archive.c:65
10051 msgid "git archive: protocol error"
10052 msgstr "git archive:协议错误"
10054 #: builtin/archive.c:69
10055 msgid "git archive: expected a flush"
10056 msgstr "git archive:应有一个 flush 包"
10058 #: builtin/bisect--helper.c:22
10059 msgid "git bisect--helper --next-all [--no-checkout]"
10060 msgstr "git bisect--helper --next-all [--no-checkout]"
10062 #: builtin/bisect--helper.c:23
10063 msgid "git bisect--helper --write-terms <bad_term> <good_term>"
10064 msgstr "git bisect--helper --write-terms <坏-术语> <好-术语>"
10066 #: builtin/bisect--helper.c:24
10067 msgid "git bisect--helper --bisect-clean-state"
10068 msgstr "git bisect--helper --bisect-clean-state"
10070 #: builtin/bisect--helper.c:25
10071 msgid "git bisect--helper --bisect-reset [<commit>]"
10072 msgstr "git bisect--helper --bisect-reset [<提交>]"
10074 #: builtin/bisect--helper.c:26
10076 "git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
10079 "git bisect--helper --bisect-write [--no-log] <状态> <版本> <好-术语> <坏-术语"
10082 #: builtin/bisect--helper.c:27
10084 "git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
10087 "git bisect--helper --bisect-check-and-set-terms <命令> <好-术语> <坏-术语>"
10089 #: builtin/bisect--helper.c:28
10090 msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
10091 msgstr "git bisect--helper --bisect-next-check <好-术语> <坏-术语> [<术语>]"
10093 #: builtin/bisect--helper.c:29
10095 "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
10098 "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
10101 #: builtin/bisect--helper.c:30
10103 "git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
10104 "=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]"
10106 "git bisect--helper --bisect-start [--term-{old,good}=<术语> --term-{new,bad}"
10107 "=<术语>][--no-checkout] [<坏> [<好>...]] [--] [<路径>...]"
10109 #: builtin/bisect--helper.c:86
10111 msgid "'%s' is not a valid term"
10112 msgstr "'%s' 不是一个有效的术语"
10114 #: builtin/bisect--helper.c:90
10116 msgid "can't use the builtin command '%s' as a term"
10117 msgstr "不能使用内置命令 '%s' 作为术语"
10119 #: builtin/bisect--helper.c:100
10121 msgid "can't change the meaning of the term '%s'"
10122 msgstr "不能修改术语 '%s' 的含义"
10124 #: builtin/bisect--helper.c:111
10125 msgid "please use two different terms"
10126 msgstr "请使用两个不同的术语"
10128 #: builtin/bisect--helper.c:118
10129 msgid "could not open the file BISECT_TERMS"
10130 msgstr "不能打开文件 BISECT_TERMS"
10132 #: builtin/bisect--helper.c:155
10134 msgid "We are not bisecting.\n"
10135 msgstr "我们没有在二分查找。\n"
10137 #: builtin/bisect--helper.c:163
10139 msgid "'%s' is not a valid commit"
10140 msgstr "'%s' 不是一个有效的提交"
10142 #: builtin/bisect--helper.c:172
10145 "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
10146 msgstr "不能检出原始 HEAD '%s'。尝试 'git bisect reset <提交>'。"
10148 #: builtin/bisect--helper.c:216
10150 msgid "Bad bisect_write argument: %s"
10151 msgstr "坏的 bisect_write 参数:%s"
10153 #: builtin/bisect--helper.c:221
10155 msgid "couldn't get the oid of the rev '%s'"
10156 msgstr "无法获取版本 '%s' 的对象 ID"
10158 #: builtin/bisect--helper.c:233
10160 msgid "couldn't open the file '%s'"
10161 msgstr "无法打开文件 '%s'"
10163 #: builtin/bisect--helper.c:259
10165 msgid "Invalid command: you're currently in a %s/%s bisect"
10166 msgstr "无效的命令:您当前正处于一个 %s/%s 二分查找中"
10168 #: builtin/bisect--helper.c:286
10171 "You need to give me at least one %s and %s revision.\n"
10172 "You can use \"git bisect %s\" and \"git bisect %s\" for that."
10174 "您需要给我至少一个 %s 和一个 %s 版本。\n"
10175 "为此您可以用 \"git bisect %s\" 和 \"git bisect %s\"。"
10177 #: builtin/bisect--helper.c:290
10180 "You need to start by \"git bisect start\".\n"
10181 "You then need to give me at least one %s and %s revision.\n"
10182 "You can use \"git bisect %s\" and \"git bisect %s\" for that."
10184 "您需要执行 \"git bisect start\" 来开始。\n"
10185 "然后需要提供我至少一个 %s 和一个 %s 版本。\n"
10186 "为此您可以用 \"git bisect %s\" 和 \"git bisect %s\" 命令。"
10188 #: builtin/bisect--helper.c:310
10190 msgid "bisecting only with a %s commit"
10191 msgstr "在只有一个 %s 提交的情况下二分查找"
10194 #. TRANSLATORS: Make sure to include [Y] and [n] in your
10195 #. translation. The program will only accept English input
10198 #: builtin/bisect--helper.c:318
10199 msgid "Are you sure [Y/n]? "
10200 msgstr "您确认么[Y/n]? "
10202 #: builtin/bisect--helper.c:379
10203 msgid "no terms defined"
10206 #: builtin/bisect--helper.c:382
10209 "Your current terms are %s for the old state\n"
10210 "and %s for the new state.\n"
10211 msgstr "您当前针对旧状态的术语是 %s,对新状态的术语是 %s。\n"
10213 #: builtin/bisect--helper.c:392
10216 "invalid argument %s for 'git bisect terms'.\n"
10217 "Supported options are: --term-good|--term-old and --term-bad|--term-new."
10219 "命令 'git bisect terms' 的参数 %s 无效。\n"
10220 "支持的选项有:--term-good|--term-old 和 --term-bad|--term-new。"
10222 #: builtin/bisect--helper.c:478
10224 msgid "unrecognized option: '%s'"
10225 msgstr "未识别的选项:'%s'"
10227 #: builtin/bisect--helper.c:482
10229 msgid "'%s' does not appear to be a valid revision"
10230 msgstr "'%s' 看起来不是一个有效的版本"
10232 #: builtin/bisect--helper.c:514
10233 msgid "bad HEAD - I need a HEAD"
10234 msgstr "坏的 HEAD - 我需要一个 HEAD"
10236 #: builtin/bisect--helper.c:529
10238 msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
10239 msgstr "检出 '%s' 失败。尝试 'git bisect start <有效分支>'。"
10241 #: builtin/bisect--helper.c:550
10242 msgid "won't bisect on cg-seek'ed tree"
10243 msgstr "不会在做了 cg-seek 的树上做二分查找"
10245 #: builtin/bisect--helper.c:553
10246 msgid "bad HEAD - strange symbolic ref"
10247 msgstr "坏的 HEAD - 奇怪的符号引用"
10249 #: builtin/bisect--helper.c:577
10251 msgid "invalid ref: '%s'"
10252 msgstr "无效的引用:'%s'"
10254 #: builtin/bisect--helper.c:633
10255 msgid "perform 'git bisect next'"
10256 msgstr "执行 'git bisect next'"
10258 #: builtin/bisect--helper.c:635
10259 msgid "write the terms to .git/BISECT_TERMS"
10260 msgstr "将术语写入 .git/BISECT_TERMS"
10262 #: builtin/bisect--helper.c:637
10263 msgid "cleanup the bisection state"
10266 #: builtin/bisect--helper.c:639
10267 msgid "check for expected revs"
10270 #: builtin/bisect--helper.c:641
10271 msgid "reset the bisection state"
10274 #: builtin/bisect--helper.c:643
10275 msgid "write out the bisection state in BISECT_LOG"
10276 msgstr "将二分查找的状态写入 BISECT_LOG"
10278 #: builtin/bisect--helper.c:645
10279 msgid "check and set terms in a bisection state"
10280 msgstr "在一个二分查找状态中检查和设置术语"
10282 #: builtin/bisect--helper.c:647
10283 msgid "check whether bad or good terms exist"
10284 msgstr "检查坏的或好的术语是否存在"
10286 #: builtin/bisect--helper.c:649
10287 msgid "print out the bisect terms"
10290 #: builtin/bisect--helper.c:651
10291 msgid "start the bisect session"
10294 #: builtin/bisect--helper.c:653
10295 msgid "update BISECT_HEAD instead of checking out the current commit"
10296 msgstr "更新 BISECT_HEAD 而非检出当前提交"
10298 #: builtin/bisect--helper.c:655
10299 msgid "no log for BISECT_WRITE"
10300 msgstr "BISECT_WRITE 无日志"
10302 #: builtin/bisect--helper.c:673
10303 msgid "--write-terms requires two arguments"
10304 msgstr "--write-terms 需要两个参数"
10306 #: builtin/bisect--helper.c:677
10307 msgid "--bisect-clean-state requires no arguments"
10308 msgstr "--bisect-clean-state 不带参数"
10310 #: builtin/bisect--helper.c:684
10311 msgid "--bisect-reset requires either no argument or a commit"
10312 msgstr "--bisect-reset 无需参数或者需要一个提交"
10314 #: builtin/bisect--helper.c:688
10315 msgid "--bisect-write requires either 4 or 5 arguments"
10316 msgstr "--bisect-write 需要 4 或 5 个参数"
10318 #: builtin/bisect--helper.c:694
10319 msgid "--check-and-set-terms requires 3 arguments"
10320 msgstr "--check-and-set-terms 需要 3 个参数"
10322 #: builtin/bisect--helper.c:700
10323 msgid "--bisect-next-check requires 2 or 3 arguments"
10324 msgstr "--bisect-next-check 需要 2 或 3 个参数"
10326 #: builtin/bisect--helper.c:706
10327 msgid "--bisect-terms requires 0 or 1 argument"
10328 msgstr "--bisect-terms 需要 0 或 1 个参数"
10330 #: builtin/blame.c:31
10331 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
10332 msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
10334 #: builtin/blame.c:36
10335 msgid "<rev-opts> are documented in git-rev-list(1)"
10336 msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
10338 #: builtin/blame.c:409
10340 msgid "expecting a color: %s"
10343 #: builtin/blame.c:416
10344 msgid "must end with a color"
10347 #: builtin/blame.c:729
10349 msgid "invalid color '%s' in color.blame.repeatedLines"
10350 msgstr "设置 color.blame.repeatedLines 中的无效颜色 '%s'"
10352 #: builtin/blame.c:747
10353 msgid "invalid value for blame.coloring"
10354 msgstr "设置 blame.coloring 中的无效取值"
10356 #: builtin/blame.c:822
10358 msgid "cannot find revision %s to ignore"
10359 msgstr "不能找到要忽略的版本 %s"
10361 #: builtin/blame.c:844
10362 msgid "Show blame entries as we find them, incrementally"
10363 msgstr "增量式地显示发现的 blame 条目"
10365 #: builtin/blame.c:845
10366 msgid "Show blank SHA-1 for boundary commits (Default: off)"
10367 msgstr "边界提交显示空的 SHA-1(默认:关闭)"
10369 #: builtin/blame.c:846
10370 msgid "Do not treat root commits as boundaries (Default: off)"
10371 msgstr "不把根提交作为边界(默认:关闭)"
10373 #: builtin/blame.c:847
10374 msgid "Show work cost statistics"
10377 #: builtin/blame.c:848
10378 msgid "Force progress reporting"
10381 #: builtin/blame.c:849
10382 msgid "Show output score for blame entries"
10383 msgstr "显示判断 blame 条目位移的得分诊断信息"
10385 #: builtin/blame.c:850
10386 msgid "Show original filename (Default: auto)"
10387 msgstr "显示原始文件名(默认:自动)"
10389 #: builtin/blame.c:851
10390 msgid "Show original linenumber (Default: off)"
10391 msgstr "显示原始的行号(默认:关闭)"
10393 #: builtin/blame.c:852
10394 msgid "Show in a format designed for machine consumption"
10395 msgstr "显示为一个适合机器读取的格式"
10397 #: builtin/blame.c:853
10398 msgid "Show porcelain format with per-line commit information"
10399 msgstr "为每一行显示机器适用的提交信息"
10401 #: builtin/blame.c:854
10402 msgid "Use the same output mode as git-annotate (Default: off)"
10403 msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
10405 #: builtin/blame.c:855
10406 msgid "Show raw timestamp (Default: off)"
10407 msgstr "显示原始时间戳(默认:关闭)"
10409 #: builtin/blame.c:856
10410 msgid "Show long commit SHA1 (Default: off)"
10411 msgstr "显示长的 SHA1 提交号(默认:关闭)"
10413 #: builtin/blame.c:857
10414 msgid "Suppress author name and timestamp (Default: off)"
10415 msgstr "隐藏作者名字和时间戳(默认:关闭)"
10417 #: builtin/blame.c:858
10418 msgid "Show author email instead of name (Default: off)"
10419 msgstr "显示作者的邮箱而不是名字(默认:关闭)"
10421 #: builtin/blame.c:859
10422 msgid "Ignore whitespace differences"
10425 #: builtin/blame.c:860 builtin/log.c:1721
10429 #: builtin/blame.c:860
10430 msgid "Ignore <rev> when blaming"
10431 msgstr "在执行 blame 操作时忽略 <版本>"
10433 #: builtin/blame.c:861
10434 msgid "Ignore revisions from <file>"
10435 msgstr "忽略来自 <文件> 中的版本"
10437 #: builtin/blame.c:862
10438 msgid "color redundant metadata from previous line differently"
10439 msgstr "使用颜色间隔输出与前一行不同的重复元信息"
10441 #: builtin/blame.c:863
10442 msgid "color lines by age"
10445 #: builtin/blame.c:864
10446 msgid "Spend extra cycles to find better match"
10447 msgstr "花费额外的循环来找到更好的匹配"
10449 #: builtin/blame.c:865
10450 msgid "Use revisions from <file> instead of calling git-rev-list"
10451 msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
10453 #: builtin/blame.c:866
10454 msgid "Use <file>'s contents as the final image"
10455 msgstr "使用 <文件> 的内容作为最终的图片"
10457 #: builtin/blame.c:867 builtin/blame.c:868
10461 #: builtin/blame.c:867
10462 msgid "Find line copies within and across files"
10463 msgstr "找到文件内及跨文件的行拷贝"
10465 #: builtin/blame.c:868
10466 msgid "Find line movements within and across files"
10467 msgstr "找到文件内及跨文件的行移动"
10469 #: builtin/blame.c:869
10473 #: builtin/blame.c:869
10474 msgid "Process only line range n,m, counting from 1"
10475 msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
10477 #: builtin/blame.c:921
10478 msgid "--progress can't be used with --incremental or porcelain formats"
10479 msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用"
10481 #. TRANSLATORS: This string is used to tell us the
10482 #. maximum display width for a relative timestamp in
10483 #. "git blame" output. For C locale, "4 years, 11
10484 #. months ago", which takes 22 places, is the longest
10485 #. among various forms of relative timestamps, but
10486 #. your language may need more or fewer display
10489 #: builtin/blame.c:972
10490 msgid "4 years, 11 months ago"
10491 msgstr "4 年 11 个月前"
10493 #: builtin/blame.c:1087
10495 msgid "file %s has only %lu line"
10496 msgid_plural "file %s has only %lu lines"
10497 msgstr[0] "文件 %s 只有 %lu 行"
10498 msgstr[1] "文件 %s 只有 %lu 行"
10500 #: builtin/blame.c:1133
10501 msgid "Blaming lines"
10504 #: builtin/branch.c:29
10505 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
10506 msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
10508 #: builtin/branch.c:30
10509 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
10510 msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
10512 #: builtin/branch.c:31
10513 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
10514 msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
10516 #: builtin/branch.c:32
10517 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
10518 msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
10520 #: builtin/branch.c:33
10521 msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
10522 msgstr "git branch [<选项>] (-c | -C) [<老分支>] <新分支>"
10524 #: builtin/branch.c:34
10525 msgid "git branch [<options>] [-r | -a] [--points-at]"
10526 msgstr "git branch [<选项>] [-r | -a] [--points-at]"
10528 #: builtin/branch.c:35
10529 msgid "git branch [<options>] [-r | -a] [--format]"
10530 msgstr "git branch [<选项>] [-r | -a] [--format]"
10532 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
10533 #: builtin/branch.c:154
10536 "deleting branch '%s' that has been merged to\n"
10537 " '%s', but not yet merged to HEAD."
10539 "将要删除的分支 '%s' 已经被合并到\n"
10540 " '%s',但未合并到 HEAD。"
10542 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
10543 #: builtin/branch.c:158
10546 "not deleting branch '%s' that is not yet merged to\n"
10547 " '%s', even though it is merged to HEAD."
10549 "并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
10550 " 然而却尚未被合并到分支 '%s' 。"
10552 #: builtin/branch.c:172
10554 msgid "Couldn't look up commit object for '%s'"
10555 msgstr "无法查询 '%s' 指向的提交对象"
10557 #: builtin/branch.c:176
10560 "The branch '%s' is not fully merged.\n"
10561 "If you are sure you want to delete it, run 'git branch -D %s'."
10563 "分支 '%s' 没有完全合并。\n"
10564 "如果您确认要删除它,执行 'git branch -D %s'。"
10566 #: builtin/branch.c:189
10567 msgid "Update of config-file failed"
10570 #: builtin/branch.c:220
10571 msgid "cannot use -a with -d"
10572 msgstr "不能将 -a 和 -d 同时使用"
10574 #: builtin/branch.c:226
10575 msgid "Couldn't look up commit object for HEAD"
10576 msgstr "无法查询 HEAD 指向的提交对象"
10578 #: builtin/branch.c:240
10580 msgid "Cannot delete branch '%s' checked out at '%s'"
10581 msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。"
10583 #: builtin/branch.c:255
10585 msgid "remote-tracking branch '%s' not found."
10586 msgstr "未能找到远程跟踪分支 '%s'。"
10588 #: builtin/branch.c:256
10590 msgid "branch '%s' not found."
10591 msgstr "分支 '%s' 未发现。"
10593 #: builtin/branch.c:271
10595 msgid "Error deleting remote-tracking branch '%s'"
10596 msgstr "无法删除远程跟踪分支 '%s'"
10598 #: builtin/branch.c:272
10600 msgid "Error deleting branch '%s'"
10601 msgstr "无法删除分支 '%s'"
10603 #: builtin/branch.c:279
10605 msgid "Deleted remote-tracking branch %s (was %s).\n"
10606 msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n"
10608 #: builtin/branch.c:280
10610 msgid "Deleted branch %s (was %s).\n"
10611 msgstr "已删除分支 %s(曾为 %s)。\n"
10613 #: builtin/branch.c:429 builtin/tag.c:61
10614 msgid "unable to parse format string"
10615 msgstr "不能解析格式化字符串"
10617 #: builtin/branch.c:460
10618 msgid "could not resolve HEAD"
10619 msgstr "不能解析 HEAD 提交"
10621 #: builtin/branch.c:466
10623 msgid "HEAD (%s) points outside of refs/heads/"
10624 msgstr "HEAD (%s) 指向 refs/heads/ 之外"
10626 #: builtin/branch.c:481
10628 msgid "Branch %s is being rebased at %s"
10629 msgstr "分支 %s 正被变基到 %s"
10631 #: builtin/branch.c:485
10633 msgid "Branch %s is being bisected at %s"
10634 msgstr "分支 %s 正被二分查找于 %s"
10636 #: builtin/branch.c:502
10637 msgid "cannot copy the current branch while not on any."
10638 msgstr "无法拷贝当前分支因为不处于任何分支上。"
10640 #: builtin/branch.c:504
10641 msgid "cannot rename the current branch while not on any."
10642 msgstr "无法重命名当前分支因为不处于任何分支上。"
10644 #: builtin/branch.c:515
10646 msgid "Invalid branch name: '%s'"
10647 msgstr "无效的分支名:'%s'"
10649 #: builtin/branch.c:542
10650 msgid "Branch rename failed"
10653 #: builtin/branch.c:544
10654 msgid "Branch copy failed"
10657 #: builtin/branch.c:548
10659 msgid "Created a copy of a misnamed branch '%s'"
10660 msgstr "已为错误命名的分支 '%s' 创建了一个副本"
10662 #: builtin/branch.c:551
10664 msgid "Renamed a misnamed branch '%s' away"
10665 msgstr "已将错误命名的分支 '%s' 重命名"
10667 #: builtin/branch.c:557
10669 msgid "Branch renamed to %s, but HEAD is not updated!"
10670 msgstr "分支重命名为 %s,但 HEAD 没有更新!"
10672 #: builtin/branch.c:566
10673 msgid "Branch is renamed, but update of config-file failed"
10674 msgstr "分支被重命名,但更新配置文件失败"
10676 #: builtin/branch.c:568
10677 msgid "Branch is copied, but update of config-file failed"
10678 msgstr "分支已拷贝,但更新配置文件失败"
10680 #: builtin/branch.c:584
10683 "Please edit the description for the branch\n"
10685 "Lines starting with '%c' will be stripped.\n"
10689 "以 '%c' 开头的行将被过滤。\n"
10691 #: builtin/branch.c:618
10692 msgid "Generic options"
10695 #: builtin/branch.c:620
10696 msgid "show hash and subject, give twice for upstream branch"
10697 msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
10699 #: builtin/branch.c:621
10700 msgid "suppress informational messages"
10703 #: builtin/branch.c:622
10704 msgid "set up tracking mode (see git-pull(1))"
10705 msgstr "设置跟踪模式(参见 git-pull(1))"
10707 #: builtin/branch.c:624
10711 #: builtin/branch.c:626 builtin/rebase.c:520
10715 #: builtin/branch.c:626
10716 msgid "change the upstream info"
10719 #: builtin/branch.c:627
10720 msgid "unset the upstream info"
10723 #: builtin/branch.c:628
10724 msgid "use colored output"
10727 #: builtin/branch.c:629
10728 msgid "act on remote-tracking branches"
10731 #: builtin/branch.c:631 builtin/branch.c:633
10732 msgid "print only branches that contain the commit"
10733 msgstr "只打印包含该提交的分支"
10735 #: builtin/branch.c:632 builtin/branch.c:634
10736 msgid "print only branches that don't contain the commit"
10737 msgstr "只打印不包含该提交的分支"
10739 #: builtin/branch.c:637
10740 msgid "Specific git-branch actions:"
10741 msgstr "具体的 git-branch 动作:"
10743 #: builtin/branch.c:638
10744 msgid "list both remote-tracking and local branches"
10745 msgstr "列出远程跟踪及本地分支"
10747 #: builtin/branch.c:640
10748 msgid "delete fully merged branch"
10751 #: builtin/branch.c:641
10752 msgid "delete branch (even if not merged)"
10753 msgstr "删除分支(即使没有合并)"
10755 #: builtin/branch.c:642
10756 msgid "move/rename a branch and its reflog"
10757 msgstr "移动/重命名一个分支,以及它的引用日志"
10759 #: builtin/branch.c:643
10760 msgid "move/rename a branch, even if target exists"
10761 msgstr "移动/重命名一个分支,即使目标已存在"
10763 #: builtin/branch.c:644
10764 msgid "copy a branch and its reflog"
10765 msgstr "拷贝一个分支和它的引用日志"
10767 #: builtin/branch.c:645
10768 msgid "copy a branch, even if target exists"
10769 msgstr "拷贝一个分支,即使目标已存在"
10771 #: builtin/branch.c:646
10772 msgid "list branch names"
10775 #: builtin/branch.c:647
10776 msgid "show current branch name"
10779 #: builtin/branch.c:648
10780 msgid "create the branch's reflog"
10783 #: builtin/branch.c:650
10784 msgid "edit the description for the branch"
10787 #: builtin/branch.c:651
10788 msgid "force creation, move/rename, deletion"
10789 msgstr "强制创建、移动/重命名、删除"
10791 #: builtin/branch.c:652
10792 msgid "print only branches that are merged"
10793 msgstr "只打印已经合并的分支"
10795 #: builtin/branch.c:653
10796 msgid "print only branches that are not merged"
10797 msgstr "只打印尚未合并的分支"
10799 #: builtin/branch.c:654
10800 msgid "list branches in columns"
10803 #: builtin/branch.c:656 builtin/for-each-ref.c:42 builtin/notes.c:415
10804 #: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
10805 #: builtin/tag.c:434
10809 #: builtin/branch.c:657
10810 msgid "print only branches of the object"
10811 msgstr "只打印指向该对象的分支"
10813 #: builtin/branch.c:658 builtin/for-each-ref.c:48 builtin/tag.c:441
10814 msgid "sorting and filtering are case insensitive"
10815 msgstr "排序和过滤属于大小写不敏感"
10817 #: builtin/branch.c:659 builtin/for-each-ref.c:38 builtin/tag.c:439
10818 #: builtin/verify-tag.c:38
10819 msgid "format to use for the output"
10822 #: builtin/branch.c:682 builtin/clone.c:789
10823 msgid "HEAD not found below refs/heads!"
10824 msgstr "HEAD 没有位于 /refs/heads 之下!"
10826 #: builtin/branch.c:706
10827 msgid "--column and --verbose are incompatible"
10828 msgstr "--column 和 --verbose 不兼容"
10830 #: builtin/branch.c:721 builtin/branch.c:775 builtin/branch.c:784
10831 msgid "branch name required"
10834 #: builtin/branch.c:751
10835 msgid "Cannot give description to detached HEAD"
10836 msgstr "不能向分离头指针提供描述"
10838 #: builtin/branch.c:756
10839 msgid "cannot edit description of more than one branch"
10840 msgstr "不能为一个以上的分支编辑描述"
10842 #: builtin/branch.c:763
10844 msgid "No commit on branch '%s' yet."
10845 msgstr "分支 '%s' 尚无提交。"
10847 #: builtin/branch.c:766
10849 msgid "No branch named '%s'."
10850 msgstr "没有分支 '%s'。"
10852 #: builtin/branch.c:781
10853 msgid "too many branches for a copy operation"
10854 msgstr "为拷贝操作提供了太多的分支名"
10856 #: builtin/branch.c:790
10857 msgid "too many arguments for a rename operation"
10858 msgstr "为重命名操作提供了太多的参数"
10860 #: builtin/branch.c:795
10861 msgid "too many arguments to set new upstream"
10862 msgstr "为设置新上游提供了太多的参数"
10864 #: builtin/branch.c:799
10867 "could not set upstream of HEAD to %s when it does not point to any branch."
10868 msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
10870 #: builtin/branch.c:802 builtin/branch.c:825
10872 msgid "no such branch '%s'"
10873 msgstr "没有此分支 '%s'"
10875 #: builtin/branch.c:806
10877 msgid "branch '%s' does not exist"
10878 msgstr "分支 '%s' 不存在"
10880 #: builtin/branch.c:819
10881 msgid "too many arguments to unset upstream"
10882 msgstr "为取消上游设置操作提供了太多的参数"
10884 #: builtin/branch.c:823
10885 msgid "could not unset upstream of HEAD when it does not point to any branch."
10886 msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
10888 #: builtin/branch.c:829
10890 msgid "Branch '%s' has no upstream information"
10891 msgstr "分支 '%s' 没有上游信息"
10893 #: builtin/branch.c:839
10895 "The -a, and -r, options to 'git branch' do not take a branch name.\n"
10896 "Did you mean to use: -a|-r --list <pattern>?"
10898 "'git branch' 的 -a 和 -r 选项不带一个分支名。\n"
10899 "您是否想要使用:-a|-r --list <模式>?"
10901 #: builtin/branch.c:843
10903 "the '--set-upstream' option is no longer supported. Please use '--track' or "
10904 "'--set-upstream-to' instead."
10906 "不再支持选项 '--set-upstream'。请使用 '--track' 或 '--set-upstream-to'。"
10908 #: builtin/bundle.c:15 builtin/bundle.c:23
10909 msgid "git bundle create [<options>] <file> <git-rev-list args>"
10910 msgstr "git bundle create [<选项>] <文件> <git-rev-list 参数>"
10912 #: builtin/bundle.c:16 builtin/bundle.c:28
10913 msgid "git bundle verify [<options>] <file>"
10914 msgstr "git bundle verify [<选项>] <文件>"
10916 #: builtin/bundle.c:17 builtin/bundle.c:33
10917 msgid "git bundle list-heads <file> [<refname>...]"
10918 msgstr "git bundle list-heads <文件> [<引用名>...]"
10920 #: builtin/bundle.c:18 builtin/bundle.c:38
10921 msgid "git bundle unbundle <file> [<refname>...]"
10922 msgstr "git bundle unbundle <文件> [<引用名>...]"
10924 #: builtin/bundle.c:66 builtin/pack-objects.c:3376
10925 msgid "do not show progress meter"
10928 #: builtin/bundle.c:68 builtin/pack-objects.c:3378
10929 msgid "show progress meter"
10932 #: builtin/bundle.c:70 builtin/pack-objects.c:3380
10933 msgid "show progress meter during object writing phase"
10934 msgstr "在对象写入阶段显示进度表"
10936 #: builtin/bundle.c:73 builtin/pack-objects.c:3383
10937 msgid "similar to --all-progress when progress meter is shown"
10938 msgstr "当进度表显示时类似于 --all-progress"
10940 #: builtin/bundle.c:93
10941 msgid "Need a repository to create a bundle."
10942 msgstr "需要一个仓库来创建包。"
10944 #: builtin/bundle.c:104
10945 msgid "do not show bundle details"
10946 msgstr "不显示 bundle 细节"
10948 #: builtin/bundle.c:119
10950 msgid "%s is okay\n"
10953 #: builtin/bundle.c:160
10954 msgid "Need a repository to unbundle."
10955 msgstr "需要一个仓库来解包。"
10957 #: builtin/bundle.c:168 builtin/remote.c:1686
10958 msgid "be verbose; must be placed before a subcommand"
10959 msgstr "冗长输出;必须置于子命令之前"
10961 #: builtin/bundle.c:190 builtin/remote.c:1717
10963 msgid "Unknown subcommand: %s"
10966 #: builtin/cat-file.c:598
10968 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
10969 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
10971 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
10972 "p | <类型> | --textconv | --filters) [--path=<路径>] <对象>"
10974 #: builtin/cat-file.c:599
10976 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
10979 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
10982 #: builtin/cat-file.c:620
10983 msgid "only one batch option may be specified"
10984 msgstr "只能指定一个批处理选项"
10986 #: builtin/cat-file.c:638
10987 msgid "<type> can be one of: blob, tree, commit, tag"
10988 msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
10990 #: builtin/cat-file.c:639
10991 msgid "show object type"
10994 #: builtin/cat-file.c:640
10995 msgid "show object size"
10998 #: builtin/cat-file.c:642
10999 msgid "exit with zero when there's no error"
11000 msgstr "当没有错误时退出并返回零"
11002 #: builtin/cat-file.c:643
11003 msgid "pretty-print object's content"
11004 msgstr "美观地打印对象的内容"
11006 #: builtin/cat-file.c:645
11007 msgid "for blob objects, run textconv on object's content"
11008 msgstr "对于数据对象,对其内容做文本转换"
11010 #: builtin/cat-file.c:647
11011 msgid "for blob objects, run filters on object's content"
11012 msgstr "对于数据对象,对其内容做过滤"
11014 #: builtin/cat-file.c:648 git-submodule.sh:984
11018 #: builtin/cat-file.c:649
11019 msgid "use a specific path for --textconv/--filters"
11020 msgstr "对于 --textconv/--filters 使用一个特定的路径"
11022 #: builtin/cat-file.c:651
11023 msgid "allow -s and -t to work with broken/corrupt objects"
11024 msgstr "允许 -s 和 -t 对损坏的对象生效"
11026 #: builtin/cat-file.c:652
11027 msgid "buffer --batch output"
11028 msgstr "缓冲 --batch 的输出"
11030 #: builtin/cat-file.c:654
11031 msgid "show info and content of objects fed from the standard input"
11032 msgstr "显示从标准输入提供的对象的信息和内容"
11034 #: builtin/cat-file.c:658
11035 msgid "show info about objects fed from the standard input"
11036 msgstr "显示从标准输入提供的对象的信息"
11038 #: builtin/cat-file.c:662
11039 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
11040 msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)"
11042 #: builtin/cat-file.c:664
11043 msgid "show all objects with --batch or --batch-check"
11044 msgstr "使用 --batch 或 --batch-check 参数显示所有对象"
11046 #: builtin/cat-file.c:666
11047 msgid "do not order --batch-all-objects output"
11048 msgstr "不要对 --batch-all-objects 的输出排序"
11050 #: builtin/check-attr.c:13
11051 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
11052 msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
11054 #: builtin/check-attr.c:14
11055 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
11056 msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]"
11058 #: builtin/check-attr.c:21
11059 msgid "report all attributes set on file"
11060 msgstr "报告设置在文件上的所有属性"
11062 #: builtin/check-attr.c:22
11063 msgid "use .gitattributes only from the index"
11064 msgstr "只使用索引中的 .gitattributes"
11066 #: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
11067 msgid "read file names from stdin"
11068 msgstr "从标准输入读出文件名"
11070 #: builtin/check-attr.c:25 builtin/check-ignore.c:27
11071 msgid "terminate input and output records by a NUL character"
11072 msgstr "输入和输出的记录使用 NUL 字符终结"
11074 #: builtin/check-ignore.c:21 builtin/checkout.c:1488 builtin/gc.c:537
11075 #: builtin/worktree.c:502
11076 msgid "suppress progress reporting"
11079 #: builtin/check-ignore.c:29
11080 msgid "show non-matching input paths"
11081 msgstr "显示未匹配的输入路径"
11083 #: builtin/check-ignore.c:31
11084 msgid "ignore index when checking"
11087 #: builtin/check-ignore.c:163
11088 msgid "cannot specify pathnames with --stdin"
11089 msgstr "不能同时指定路径及 --stdin 参数"
11091 #: builtin/check-ignore.c:166
11092 msgid "-z only makes sense with --stdin"
11093 msgstr "-z 需要和 --stdin 参数共用才有意义"
11095 #: builtin/check-ignore.c:168
11096 msgid "no path specified"
11099 #: builtin/check-ignore.c:172
11100 msgid "--quiet is only valid with a single pathname"
11101 msgstr "参数 --quiet 只在提供一个路径名时有效"
11103 #: builtin/check-ignore.c:174
11104 msgid "cannot have both --quiet and --verbose"
11105 msgstr "不能同时提供 --quiet 和 --verbose 参数"
11107 #: builtin/check-ignore.c:177
11108 msgid "--non-matching is only valid with --verbose"
11109 msgstr "--non-matching 选项只在使用 --verbose 时有效"
11111 #: builtin/check-mailmap.c:9
11112 msgid "git check-mailmap [<options>] <contact>..."
11113 msgstr "git check-mailmap [<选项>] <联系地址>..."
11115 #: builtin/check-mailmap.c:14
11116 msgid "also read contacts from stdin"
11117 msgstr "还从标准输入读取联系地址"
11119 #: builtin/check-mailmap.c:25
11121 msgid "unable to parse contact: %s"
11122 msgstr "不能解析联系地址:%s"
11124 #: builtin/check-mailmap.c:48
11125 msgid "no contacts specified"
11128 #: builtin/checkout-index.c:131
11129 msgid "git checkout-index [<options>] [--] [<file>...]"
11130 msgstr "git checkout-index [<选项>] [--] [<文件>...]"
11132 #: builtin/checkout-index.c:148
11133 msgid "stage should be between 1 and 3 or all"
11134 msgstr "索引值应该取值 1 到 3 或者 all"
11136 #: builtin/checkout-index.c:164
11137 msgid "check out all files in the index"
11138 msgstr "检出索引区的所有文件"
11140 #: builtin/checkout-index.c:165
11141 msgid "force overwrite of existing files"
11144 #: builtin/checkout-index.c:167
11145 msgid "no warning for existing files and files not in index"
11146 msgstr "存在或不在索引中的文件都没有警告"
11148 #: builtin/checkout-index.c:169
11149 msgid "don't checkout new files"
11152 #: builtin/checkout-index.c:171
11153 msgid "update stat information in the index file"
11154 msgstr "更新索引中文件的状态信息"
11156 #: builtin/checkout-index.c:175
11157 msgid "read list of paths from the standard input"
11158 msgstr "从标准输入读取路径列表"
11160 #: builtin/checkout-index.c:177
11161 msgid "write the content to temporary files"
11164 #: builtin/checkout-index.c:178 builtin/column.c:31
11165 #: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403
11166 #: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909
11167 #: builtin/worktree.c:675
11171 #: builtin/checkout-index.c:179
11172 msgid "when creating files, prepend <string>"
11173 msgstr "在创建文件时,在前面加上 <字符串>"
11175 #: builtin/checkout-index.c:181
11176 msgid "copy out the files from named stage"
11177 msgstr "从指定暂存区中拷出文件"
11179 #: builtin/checkout.c:31
11180 msgid "git checkout [<options>] <branch>"
11181 msgstr "git checkout [<选项>] <分支>"
11183 #: builtin/checkout.c:32
11184 msgid "git checkout [<options>] [<branch>] -- <file>..."
11185 msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
11187 #: builtin/checkout.c:37
11188 msgid "git switch [<options>] [<branch>]"
11189 msgstr "git switch [<选项>] [<分支>]"
11191 #: builtin/checkout.c:42
11192 msgid "git restore [<options>] [--source=<branch>] <file>..."
11193 msgstr "git restore [<选项>] [--source=<分支>] <文件>..."
11195 #: builtin/checkout.c:188 builtin/checkout.c:227
11197 msgid "path '%s' does not have our version"
11198 msgstr "路径 '%s' 没有我们的版本"
11200 #: builtin/checkout.c:190 builtin/checkout.c:229
11202 msgid "path '%s' does not have their version"
11203 msgstr "路径 '%s' 没有他们的版本"
11205 #: builtin/checkout.c:206
11207 msgid "path '%s' does not have all necessary versions"
11208 msgstr "路径 '%s' 没有全部必需的版本"
11210 #: builtin/checkout.c:256
11212 msgid "path '%s' does not have necessary versions"
11213 msgstr "路径 '%s' 没有必需的版本"
11215 #: builtin/checkout.c:274
11217 msgid "path '%s': cannot merge"
11218 msgstr "path '%s':无法合并"
11220 #: builtin/checkout.c:290
11222 msgid "Unable to add merge result for '%s'"
11223 msgstr "无法为 '%s' 添加合并结果"
11225 #: builtin/checkout.c:395
11227 msgid "Recreated %d merge conflict"
11228 msgid_plural "Recreated %d merge conflicts"
11229 msgstr[0] "重新创建了 %d 个合并冲突"
11230 msgstr[1] "重新创建了 %d 个合并冲突"
11232 #: builtin/checkout.c:400
11234 msgid "Updated %d path from %s"
11235 msgid_plural "Updated %d paths from %s"
11236 msgstr[0] "从 %2$s 更新了 %1$d 个路径"
11237 msgstr[1] "从 %2$s 更新了 %1$d 个路径"
11239 #: builtin/checkout.c:407
11241 msgid "Updated %d path from the index"
11242 msgid_plural "Updated %d paths from the index"
11243 msgstr[0] "从索引区更新了 %d 个路径"
11244 msgstr[1] "从索引区更新了 %d 个路径"
11246 #: builtin/checkout.c:430 builtin/checkout.c:433 builtin/checkout.c:436
11247 #: builtin/checkout.c:440
11249 msgid "'%s' cannot be used with updating paths"
11250 msgstr "'%s' 不能在更新路径时使用"
11252 #: builtin/checkout.c:443 builtin/checkout.c:446
11254 msgid "'%s' cannot be used with %s"
11255 msgstr "'%s' 不能和 %s 同时使用"
11257 #: builtin/checkout.c:450
11259 msgid "Cannot update paths and switch to branch '%s' at the same time."
11260 msgstr "不能同时更新路径并切换到分支'%s'。"
11262 #: builtin/checkout.c:454
11264 msgid "neither '%s' or '%s' is specified"
11265 msgstr "'%s' 或 '%s' 都没有指定"
11267 #: builtin/checkout.c:458
11269 msgid "'%s' must be used when '%s' is not specified"
11270 msgstr "未指定 '%2$s' 时,必须使用 '%1$s'"
11272 #: builtin/checkout.c:463 builtin/checkout.c:468
11274 msgid "'%s' or '%s' cannot be used with %s"
11275 msgstr "'%s' 或 '%s' 不能和 %s 一起使用"
11277 #: builtin/checkout.c:527 builtin/checkout.c:534
11279 msgid "path '%s' is unmerged"
11280 msgstr "路径 '%s' 未合并"
11282 #: builtin/checkout.c:704
11283 msgid "you need to resolve your current index first"
11284 msgstr "您需要先解决当前索引的冲突"
11286 #: builtin/checkout.c:758
11289 "cannot continue with staged changes in the following files:\n"
11292 "不能继续,下列文件有暂存的修改:\n"
11295 #: builtin/checkout.c:861
11297 msgid "Can not do reflog for '%s': %s\n"
11298 msgstr "不能对 '%s' 执行 reflog 操作:%s\n"
11300 #: builtin/checkout.c:903
11301 msgid "HEAD is now at"
11304 #: builtin/checkout.c:907 builtin/clone.c:720
11305 msgid "unable to update HEAD"
11308 #: builtin/checkout.c:911
11310 msgid "Reset branch '%s'\n"
11311 msgstr "重置分支 '%s'\n"
11313 #: builtin/checkout.c:914
11315 msgid "Already on '%s'\n"
11316 msgstr "已经位于 '%s'\n"
11318 #: builtin/checkout.c:918
11320 msgid "Switched to and reset branch '%s'\n"
11321 msgstr "切换并重置分支 '%s'\n"
11323 #: builtin/checkout.c:920 builtin/checkout.c:1344
11325 msgid "Switched to a new branch '%s'\n"
11326 msgstr "切换到一个新分支 '%s'\n"
11328 #: builtin/checkout.c:922
11330 msgid "Switched to branch '%s'\n"
11331 msgstr "切换到分支 '%s'\n"
11334 #: builtin/checkout.c:973
11336 msgid " ... and %d more.\n"
11337 msgstr " ... 及其它 %d 个。\n"
11339 #: builtin/checkout.c:979
11342 "Warning: you are leaving %d commit behind, not connected to\n"
11343 "any of your branches:\n"
11347 "Warning: you are leaving %d commits behind, not connected to\n"
11348 "any of your branches:\n"
11352 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
11356 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
11360 #: builtin/checkout.c:998
11363 "If you want to keep it by creating a new branch, this may be a good time\n"
11366 " git branch <new-branch-name> %s\n"
11369 "If you want to keep them by creating a new branch, this may be a good time\n"
11372 " git branch <new-branch-name> %s\n"
11375 "如果您想要通过创建新分支保存它,这可能是一个好时候。\n"
11378 " git branch <新分支名> %s\n"
11381 "如果您想要通过创建新分支保存它们,这可能是一个好时候。\n"
11384 " git branch <新分支名> %s\n"
11387 #: builtin/checkout.c:1033
11388 msgid "internal error in revision walk"
11389 msgstr "在版本遍历时遇到内部错误"
11391 #: builtin/checkout.c:1037
11392 msgid "Previous HEAD position was"
11393 msgstr "之前的 HEAD 位置是"
11395 #: builtin/checkout.c:1077 builtin/checkout.c:1339
11396 msgid "You are on a branch yet to be born"
11397 msgstr "您位于一个尚未初始化的分支"
11399 #: builtin/checkout.c:1152
11402 "'%s' could be both a local file and a tracking branch.\n"
11403 "Please use -- (and optionally --no-guess) to disambiguate"
11405 "'%s' 既可以是一个本地文件,也可以是一个跟踪分支。\n"
11406 "请使用 --(和可选的 --no-guess)来消除歧义"
11408 #: builtin/checkout.c:1159
11410 "If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
11411 "you can do so by fully qualifying the name with the --track option:\n"
11413 " git checkout --track origin/<name>\n"
11415 "If you'd like to always have checkouts of an ambiguous <name> prefer\n"
11416 "one remote, e.g. the 'origin' remote, consider setting\n"
11417 "checkout.defaultRemote=origin in your config."
11419 "如果您想要检出一个远程跟踪分支,例如在 'origin' 上的,您可以使用分支\n"
11420 "全名和 --track 选项:\n"
11422 " git checkout --track origin/<名称>\n"
11424 "如果您总是喜欢使用模糊的简短分支名 <名称>,而不喜欢如 'origin' 的远程\n"
11425 "名称,可以在配置中设置 checkout.defaultRemote=origin。"
11427 #: builtin/checkout.c:1169
11429 msgid "'%s' matched multiple (%d) remote tracking branches"
11430 msgstr "'%s' 匹配多个(%d 个)远程跟踪分支"
11432 #: builtin/checkout.c:1235
11433 msgid "only one reference expected"
11436 #: builtin/checkout.c:1252
11438 msgid "only one reference expected, %d given."
11439 msgstr "应只有一个引用,却给出了 %d 个"
11441 #: builtin/checkout.c:1298 builtin/worktree.c:283 builtin/worktree.c:451
11443 msgid "invalid reference: %s"
11446 #: builtin/checkout.c:1311 builtin/checkout.c:1677
11448 msgid "reference is not a tree: %s"
11449 msgstr "引用不是一个树:%s"
11451 #: builtin/checkout.c:1358
11453 msgid "a branch is expected, got tag '%s'"
11454 msgstr "期望一个分支,得到标签 '%s'"
11456 #: builtin/checkout.c:1360
11458 msgid "a branch is expected, got remote branch '%s'"
11459 msgstr "期望一个分支,得到远程分支 '%s'"
11461 #: builtin/checkout.c:1361 builtin/checkout.c:1369
11463 msgid "a branch is expected, got '%s'"
11464 msgstr "期望一个分支,得到 '%s'"
11466 #: builtin/checkout.c:1364
11468 msgid "a branch is expected, got commit '%s'"
11469 msgstr "期望一个分支,得到提交 '%s'"
11471 #: builtin/checkout.c:1380
11473 "cannot switch branch while merging\n"
11474 "Consider \"git merge --quit\" or \"git worktree add\"."
11477 "考虑使用 \"git merge --quit\" 或 \"git worktree add\"。"
11479 #: builtin/checkout.c:1384
11481 "cannot switch branch in the middle of an am session\n"
11482 "Consider \"git am --quit\" or \"git worktree add\"."
11484 "不能在一个 am 会话期间切换分支\n"
11485 "考虑使用 \"git am --quit\" 或 \"git worktree add\"。"
11487 #: builtin/checkout.c:1388
11489 "cannot switch branch while rebasing\n"
11490 "Consider \"git rebase --quit\" or \"git worktree add\"."
11493 "考虑使用 \"git rebase --quit\" 或 \"git worktree add\"。"
11495 #: builtin/checkout.c:1392
11497 "cannot switch branch while cherry-picking\n"
11498 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
11501 "考虑使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。"
11503 #: builtin/checkout.c:1396
11505 "cannot switch branch while reverting\n"
11506 "Consider \"git revert --quit\" or \"git worktree add\"."
11509 "考虑使用 \"git revert --quit\" 或 \"git worktree add\"。"
11511 #: builtin/checkout.c:1400
11512 msgid "you are switching branch while bisecting"
11513 msgstr "您在执行二分查找时切换分支"
11515 #: builtin/checkout.c:1407
11516 msgid "paths cannot be used with switching branches"
11517 msgstr "路径不能和切换分支同时使用"
11519 #: builtin/checkout.c:1410 builtin/checkout.c:1414 builtin/checkout.c:1418
11521 msgid "'%s' cannot be used with switching branches"
11522 msgstr "'%s' 不能和切换分支同时使用"
11524 #: builtin/checkout.c:1422 builtin/checkout.c:1425 builtin/checkout.c:1428
11525 #: builtin/checkout.c:1433 builtin/checkout.c:1438
11527 msgid "'%s' cannot be used with '%s'"
11528 msgstr "'%s' 不能和 '%s' 同时使用"
11530 #: builtin/checkout.c:1435
11532 msgid "'%s' cannot take <start-point>"
11533 msgstr "'%s' 不带 <起始点>"
11535 #: builtin/checkout.c:1443
11537 msgid "Cannot switch branch to a non-commit '%s'"
11538 msgstr "不能切换分支到一个非提交 '%s'"
11540 #: builtin/checkout.c:1450
11541 msgid "missing branch or commit argument"
11544 #: builtin/checkout.c:1492 builtin/clone.c:91 builtin/commit-graph.c:80
11545 #: builtin/commit-graph.c:164 builtin/fetch.c:168 builtin/merge.c:288
11546 #: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:561
11547 #: builtin/send-pack.c:173
11548 msgid "force progress reporting"
11551 #: builtin/checkout.c:1493
11552 msgid "perform a 3-way merge with the new branch"
11553 msgstr "和新的分支执行三方合并"
11555 #: builtin/checkout.c:1494 builtin/log.c:1709 parse-options.h:322
11559 #: builtin/checkout.c:1495
11560 msgid "conflict style (merge or diff3)"
11561 msgstr "冲突输出风格(merge 或 diff3)"
11563 #: builtin/checkout.c:1507 builtin/worktree.c:499
11564 msgid "detach HEAD at named commit"
11565 msgstr "HEAD 从指定的提交分离"
11567 #: builtin/checkout.c:1508
11568 msgid "set upstream info for new branch"
11569 msgstr "为新的分支设置上游信息"
11571 #: builtin/checkout.c:1510
11572 msgid "force checkout (throw away local modifications)"
11573 msgstr "强制检出(丢弃本地修改)"
11575 #: builtin/checkout.c:1512
11579 #: builtin/checkout.c:1512
11580 msgid "new unparented branch"
11581 msgstr "新的没有父提交的分支"
11583 #: builtin/checkout.c:1514 builtin/merge.c:292
11584 msgid "update ignored files (default)"
11585 msgstr "更新忽略的文件(默认)"
11587 #: builtin/checkout.c:1517
11588 msgid "do not check if another worktree is holding the given ref"
11589 msgstr "不检查指定的引用是否被其他工作区所占用"
11591 #: builtin/checkout.c:1530
11592 msgid "checkout our version for unmerged files"
11593 msgstr "对尚未合并的文件检出我们的版本"
11595 #: builtin/checkout.c:1533
11596 msgid "checkout their version for unmerged files"
11597 msgstr "对尚未合并的文件检出他们的版本"
11599 #: builtin/checkout.c:1537
11600 msgid "do not limit pathspecs to sparse entries only"
11601 msgstr "对路径不做稀疏检出的限制"
11603 #: builtin/checkout.c:1592
11605 msgid "-%c, -%c and --orphan are mutually exclusive"
11606 msgstr "-%c、-%c 和 --orphan 是互斥的"
11608 #: builtin/checkout.c:1596
11609 msgid "-p and --overlay are mutually exclusive"
11610 msgstr "-p 和 --overlay 互斥"
11612 #: builtin/checkout.c:1633
11613 msgid "--track needs a branch name"
11614 msgstr "--track 需要一个分支名"
11616 #: builtin/checkout.c:1638
11618 msgid "missing branch name; try -%c"
11619 msgstr "缺少分支名,尝试 -%c"
11621 #: builtin/checkout.c:1670
11623 msgid "could not resolve %s"
11626 #: builtin/checkout.c:1686
11627 msgid "invalid path specification"
11630 #: builtin/checkout.c:1693
11632 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
11633 msgstr "'%s' 不是一个提交,不能基于它创建分支 '%s'"
11635 #: builtin/checkout.c:1697
11637 msgid "git checkout: --detach does not take a path argument '%s'"
11638 msgstr "git checkout:--detach 不能接收路径参数 '%s'"
11640 #: builtin/checkout.c:1706
11641 msgid "--pathspec-from-file is incompatible with --detach"
11642 msgstr "--pathspec-from-file 与 --detach 不兼容"
11644 #: builtin/checkout.c:1709 builtin/reset.c:325 builtin/stash.c:1503
11645 msgid "--pathspec-from-file is incompatible with --patch"
11646 msgstr "--pathspec-from-file 与 --patch 不兼容"
11648 #: builtin/checkout.c:1720
11650 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
11651 "checking out of the index."
11653 "git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
11655 #: builtin/checkout.c:1725
11656 msgid "you must specify path(s) to restore"
11657 msgstr "您必须指定一个要恢复的路径"
11659 #: builtin/checkout.c:1751 builtin/checkout.c:1753 builtin/checkout.c:1802
11660 #: builtin/checkout.c:1804 builtin/clone.c:121 builtin/remote.c:170
11661 #: builtin/remote.c:172 builtin/worktree.c:495 builtin/worktree.c:497
11665 #: builtin/checkout.c:1752
11666 msgid "create and checkout a new branch"
11667 msgstr "创建并检出一个新的分支"
11669 #: builtin/checkout.c:1754
11670 msgid "create/reset and checkout a branch"
11671 msgstr "创建/重置并检出一个分支"
11673 #: builtin/checkout.c:1755
11674 msgid "create reflog for new branch"
11675 msgstr "为新的分支创建引用日志"
11677 #: builtin/checkout.c:1757
11678 msgid "second guess 'git checkout <no-such-branch>' (default)"
11679 msgstr "二次猜测 'git checkout <无此分支>'(默认)"
11681 #: builtin/checkout.c:1758
11682 msgid "use overlay mode (default)"
11683 msgstr "使用叠加模式(默认)"
11685 #: builtin/checkout.c:1803
11686 msgid "create and switch to a new branch"
11687 msgstr "创建并切换一个新分支"
11689 #: builtin/checkout.c:1805
11690 msgid "create/reset and switch to a branch"
11691 msgstr "创建/重置并切换一个分支"
11693 #: builtin/checkout.c:1807
11694 msgid "second guess 'git switch <no-such-branch>'"
11695 msgstr "二次猜测 'git switch <无此分支>'"
11697 #: builtin/checkout.c:1809
11698 msgid "throw away local modifications"
11701 #: builtin/checkout.c:1843
11702 msgid "which tree-ish to checkout from"
11705 #: builtin/checkout.c:1845
11706 msgid "restore the index"
11709 #: builtin/checkout.c:1847
11710 msgid "restore the working tree (default)"
11713 #: builtin/checkout.c:1849
11714 msgid "ignore unmerged entries"
11717 #: builtin/checkout.c:1850
11718 msgid "use overlay mode"
11721 #: builtin/clean.c:29
11723 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
11725 "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
11727 #: builtin/clean.c:33
11729 msgid "Removing %s\n"
11732 #: builtin/clean.c:34
11734 msgid "Would remove %s\n"
11737 #: builtin/clean.c:35
11739 msgid "Skipping repository %s\n"
11742 #: builtin/clean.c:36
11744 msgid "Would skip repository %s\n"
11745 msgstr "将忽略仓库 %s\n"
11747 #: builtin/clean.c:37
11749 msgid "failed to remove %s"
11752 #: builtin/clean.c:38
11754 msgid "could not lstat %s\n"
11755 msgstr "不能对 %s 调用 lstat\n"
11757 #: builtin/clean.c:302 git-add--interactive.perl:595
11761 "1 - select a numbered item\n"
11762 "foo - select item based on unique prefix\n"
11763 " - (empty) select nothing\n"
11767 "foo - 通过唯一前缀选择一个选项\n"
11770 #: builtin/clean.c:306 git-add--interactive.perl:604
11774 "1 - select a single item\n"
11775 "3-5 - select a range of items\n"
11776 "2-3,6-9 - select multiple ranges\n"
11777 "foo - select item based on unique prefix\n"
11778 "-... - unselect specified items\n"
11779 "* - choose all items\n"
11780 " - (empty) finish selecting\n"
11784 "3-5 - 选择一个范围内的所有选项\n"
11785 "2-3,6-9 - 选择多个范围内的所有选项\n"
11786 "foo - 通过唯一前缀选择一个选项\n"
11791 #: builtin/clean.c:521 git-add--interactive.perl:570
11792 #: git-add--interactive.perl:575
11793 #, c-format, perl-format
11794 msgid "Huh (%s)?\n"
11797 #: builtin/clean.c:661
11799 msgid "Input ignore patterns>> "
11800 msgstr "输入模版以排除条目>> "
11802 #: builtin/clean.c:696
11804 msgid "WARNING: Cannot find items matched by: %s"
11805 msgstr "警告:无法找到和 %s 匹配的条目"
11807 #: builtin/clean.c:717
11808 msgid "Select items to delete"
11811 #. TRANSLATORS: Make sure to keep [y/N] as is
11812 #: builtin/clean.c:758
11814 msgid "Remove %s [y/N]? "
11815 msgstr "删除 %s [y/N]?"
11817 #: builtin/clean.c:789
11819 "clean - start cleaning\n"
11820 "filter by pattern - exclude items from deletion\n"
11821 "select by numbers - select items to be deleted by numbers\n"
11822 "ask each - confirm each deletion (like \"rm -i\")\n"
11823 "quit - stop cleaning\n"
11824 "help - this screen\n"
11825 "? - help for prompt selection"
11828 "filter by pattern - 通过模版排除要删除的条目\n"
11829 "select by numbers - 通过数字选择要删除的条目\n"
11830 "ask each - 针对删除逐一询问(就像 \"rm -i\")\n"
11833 "? - 显示如何在提示符下选择的帮助"
11835 #: builtin/clean.c:825
11836 msgid "Would remove the following item:"
11837 msgid_plural "Would remove the following items:"
11838 msgstr[0] "将删除如下条目:"
11839 msgstr[1] "将删除如下条目:"
11841 #: builtin/clean.c:841
11842 msgid "No more files to clean, exiting."
11843 msgstr "没有要清理的文件,退出。"
11845 #: builtin/clean.c:903
11846 msgid "do not print names of files removed"
11847 msgstr "不打印删除文件的名称"
11849 #: builtin/clean.c:905
11853 #: builtin/clean.c:906
11854 msgid "interactive cleaning"
11857 #: builtin/clean.c:908
11858 msgid "remove whole directories"
11861 #: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567
11862 #: builtin/grep.c:909 builtin/log.c:182 builtin/log.c:184
11863 #: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528
11864 #: builtin/show-ref.c:179
11868 #: builtin/clean.c:910
11869 msgid "add <pattern> to ignore rules"
11870 msgstr "添加 <模式> 到忽略规则"
11872 #: builtin/clean.c:911
11873 msgid "remove ignored files, too"
11876 #: builtin/clean.c:913
11877 msgid "remove only ignored files"
11880 #: builtin/clean.c:931
11881 msgid "-x and -X cannot be used together"
11882 msgstr "-x 和 -X 不能同时使用"
11884 #: builtin/clean.c:935
11886 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
11889 "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
11891 #: builtin/clean.c:938
11893 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
11894 "refusing to clean"
11896 "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
11898 #: builtin/clone.c:45
11899 msgid "git clone [<options>] [--] <repo> [<dir>]"
11900 msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
11902 #: builtin/clone.c:93
11903 msgid "don't create a checkout"
11906 #: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:536
11907 msgid "create a bare repository"
11910 #: builtin/clone.c:98
11911 msgid "create a mirror repository (implies bare)"
11912 msgstr "创建一个镜像仓库(也是纯仓库)"
11914 #: builtin/clone.c:100
11915 msgid "to clone from a local repository"
11918 #: builtin/clone.c:102
11919 msgid "don't use local hardlinks, always copy"
11920 msgstr "不使用本地硬链接,始终复制"
11922 #: builtin/clone.c:104
11923 msgid "setup as shared repository"
11926 #: builtin/clone.c:106
11930 #: builtin/clone.c:106
11931 msgid "initialize submodules in the clone"
11932 msgstr "在克隆时初始化子模组"
11934 #: builtin/clone.c:110
11935 msgid "number of submodules cloned in parallel"
11936 msgstr "并发克隆的子模组的数量"
11938 #: builtin/clone.c:111 builtin/init-db.c:533
11939 msgid "template-directory"
11942 #: builtin/clone.c:112 builtin/init-db.c:534
11943 msgid "directory from which templates will be used"
11946 #: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407
11947 #: builtin/submodule--helper.c:1912
11948 msgid "reference repository"
11951 #: builtin/clone.c:118 builtin/submodule--helper.c:1409
11952 #: builtin/submodule--helper.c:1914
11953 msgid "use --reference only while cloning"
11954 msgstr "仅在克隆时参考 --reference 指向的本地仓库"
11956 #: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
11957 #: builtin/pack-objects.c:3442 builtin/repack.c:329
11961 #: builtin/clone.c:120
11962 msgid "use <name> instead of 'origin' to track upstream"
11963 msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
11965 #: builtin/clone.c:122
11966 msgid "checkout <branch> instead of the remote's HEAD"
11967 msgstr "检出 <分支> 而不是远程 HEAD"
11969 #: builtin/clone.c:124
11970 msgid "path to git-upload-pack on the remote"
11971 msgstr "远程 git-upload-pack 路径"
11973 #: builtin/clone.c:125 builtin/fetch.c:169 builtin/grep.c:848
11974 #: builtin/pull.c:208
11978 #: builtin/clone.c:126
11979 msgid "create a shallow clone of that depth"
11980 msgstr "创建一个指定深度的浅克隆"
11982 #: builtin/clone.c:127 builtin/fetch.c:171 builtin/pack-objects.c:3431
11983 #: builtin/pull.c:211
11987 #: builtin/clone.c:128
11988 msgid "create a shallow clone since a specific time"
11989 msgstr "从一个特定时间创建一个浅克隆"
11991 #: builtin/clone.c:129 builtin/fetch.c:173 builtin/fetch.c:196
11992 #: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1304
11996 #: builtin/clone.c:130 builtin/fetch.c:174 builtin/pull.c:215
11997 msgid "deepen history of shallow clone, excluding rev"
11998 msgstr "深化浅克隆的历史,除了特定版本"
12000 #: builtin/clone.c:132 builtin/submodule--helper.c:1419
12001 #: builtin/submodule--helper.c:1928
12002 msgid "clone only one branch, HEAD or --branch"
12003 msgstr "只克隆一个分支、HEAD 或 --branch"
12005 #: builtin/clone.c:134
12006 msgid "don't clone any tags, and make later fetches not to follow them"
12007 msgstr "不要克隆任何标签,并且后续获取操作也不下载它们"
12009 #: builtin/clone.c:136
12010 msgid "any cloned submodules will be shallow"
12011 msgstr "子模组将以浅下载模式克隆"
12013 #: builtin/clone.c:137 builtin/init-db.c:542
12017 #: builtin/clone.c:138 builtin/init-db.c:543
12018 msgid "separate git dir from working tree"
12019 msgstr "git目录和工作区分离"
12021 #: builtin/clone.c:139
12025 #: builtin/clone.c:140
12026 msgid "set config inside the new repository"
12027 msgstr "在新仓库中设置配置信息"
12029 #: builtin/clone.c:142 builtin/fetch.c:191 builtin/ls-remote.c:76
12030 #: builtin/pull.c:230 builtin/push.c:570 builtin/send-pack.c:171
12031 msgid "server-specific"
12032 msgstr "server-specific"
12034 #: builtin/clone.c:142 builtin/fetch.c:191 builtin/ls-remote.c:76
12035 #: builtin/pull.c:231 builtin/push.c:570 builtin/send-pack.c:172
12036 msgid "option to transmit"
12039 #: builtin/clone.c:143 builtin/fetch.c:192 builtin/pull.c:234
12040 #: builtin/push.c:571
12041 msgid "use IPv4 addresses only"
12042 msgstr "只使用 IPv4 地址"
12044 #: builtin/clone.c:145 builtin/fetch.c:194 builtin/pull.c:237
12045 #: builtin/push.c:573
12046 msgid "use IPv6 addresses only"
12047 msgstr "只使用 IPv6 地址"
12049 #: builtin/clone.c:149
12050 msgid "any cloned submodules will use their remote-tracking branch"
12051 msgstr "任何克隆的子模组将使用它们的远程跟踪分支"
12053 #: builtin/clone.c:151
12054 msgid "initialize sparse-checkout file to include only files at root"
12055 msgstr "初始化稀疏检出文件,只包含根目录文件"
12057 #: builtin/clone.c:287
12059 "No directory name could be guessed.\n"
12060 "Please specify a directory on the command line"
12065 #: builtin/clone.c:340
12067 msgid "info: Could not add alternate for '%s': %s\n"
12068 msgstr "info: 不能为 '%s' 添加一个备用:%s\n"
12070 #: builtin/clone.c:413
12072 msgid "%s exists and is not a directory"
12073 msgstr "%s 存在且不是一个目录"
12075 #: builtin/clone.c:431
12077 msgid "failed to start iterator over '%s'"
12078 msgstr "无法在 '%s' 上启动迭代器"
12080 #: builtin/clone.c:462
12082 msgid "failed to create link '%s'"
12083 msgstr "创建链接 '%s' 失败"
12085 #: builtin/clone.c:466
12087 msgid "failed to copy file to '%s'"
12088 msgstr "拷贝文件至 '%s' 失败"
12090 #: builtin/clone.c:471
12092 msgid "failed to iterate over '%s'"
12093 msgstr "无法在 '%s' 上迭代"
12095 #: builtin/clone.c:498
12100 #: builtin/clone.c:512
12102 "Clone succeeded, but checkout failed.\n"
12103 "You can inspect what was checked out with 'git status'\n"
12104 "and retry with 'git restore --source=HEAD :/'\n"
12107 "您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
12108 "'git restore --source=HEAD :/' 重试\n"
12110 #: builtin/clone.c:589
12112 msgid "Could not find remote branch %s to clone."
12113 msgstr "不能发现要克隆的远程分支 %s。"
12115 #: builtin/clone.c:708
12117 msgid "unable to update %s"
12120 #: builtin/clone.c:756
12121 msgid "failed to initialize sparse-checkout"
12124 #: builtin/clone.c:779
12125 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
12126 msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
12128 #: builtin/clone.c:811
12129 msgid "unable to checkout working tree"
12132 #: builtin/clone.c:868
12133 msgid "unable to write parameters to config file"
12134 msgstr "无法将参数写入配置文件"
12136 #: builtin/clone.c:931
12137 msgid "cannot repack to clean up"
12138 msgstr "无法执行 repack 来清理"
12140 #: builtin/clone.c:933
12141 msgid "cannot unlink temporary alternates file"
12142 msgstr "无法删除临时的 alternates 文件"
12144 #: builtin/clone.c:971 builtin/receive-pack.c:1972
12145 msgid "Too many arguments."
12148 #: builtin/clone.c:975
12149 msgid "You must specify a repository to clone."
12150 msgstr "您必须指定一个仓库来克隆。"
12152 #: builtin/clone.c:988
12154 msgid "--bare and --origin %s options are incompatible."
12155 msgstr "--bare 和 --origin %s 选项不兼容。"
12157 #: builtin/clone.c:991
12158 msgid "--bare and --separate-git-dir are incompatible."
12159 msgstr "--bare 和 --separate-git-dir 选项不兼容。"
12161 #: builtin/clone.c:1004
12163 msgid "repository '%s' does not exist"
12164 msgstr "仓库 '%s' 不存在"
12166 #: builtin/clone.c:1010 builtin/fetch.c:1789
12168 msgid "depth %s is not a positive number"
12169 msgstr "深度 %s 不是一个正数"
12171 #: builtin/clone.c:1020
12173 msgid "destination path '%s' already exists and is not an empty directory."
12174 msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
12176 #: builtin/clone.c:1030
12178 msgid "working tree '%s' already exists."
12179 msgstr "工作区 '%s' 已经存在。"
12181 #: builtin/clone.c:1045 builtin/clone.c:1066 builtin/difftool.c:271
12182 #: builtin/log.c:1886 builtin/worktree.c:295 builtin/worktree.c:327
12184 msgid "could not create leading directories of '%s'"
12185 msgstr "不能为 '%s' 创建先导目录"
12187 #: builtin/clone.c:1050
12189 msgid "could not create work tree dir '%s'"
12190 msgstr "不能创建工作区目录 '%s'"
12192 #: builtin/clone.c:1070
12194 msgid "Cloning into bare repository '%s'...\n"
12195 msgstr "克隆到纯仓库 '%s'...\n"
12197 #: builtin/clone.c:1072
12199 msgid "Cloning into '%s'...\n"
12200 msgstr "正克隆到 '%s'...\n"
12202 #: builtin/clone.c:1096
12204 "clone --recursive is not compatible with both --reference and --reference-if-"
12206 msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容"
12208 #: builtin/clone.c:1160
12209 msgid "--depth is ignored in local clones; use file:// instead."
12210 msgstr "--depth 在本地克隆时被忽略,请改用 file:// 协议。"
12212 #: builtin/clone.c:1162
12213 msgid "--shallow-since is ignored in local clones; use file:// instead."
12214 msgstr "--shallow-since 在本地克隆时被忽略,请改用 file:// 协议。"
12216 #: builtin/clone.c:1164
12217 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
12218 msgstr "--shallow-exclude 在本地克隆时被忽略,请改用 file:// 协议。"
12220 #: builtin/clone.c:1166
12221 msgid "--filter is ignored in local clones; use file:// instead."
12222 msgstr "--filter 在本地克隆时被忽略,请改用 file:// 协议。"
12224 #: builtin/clone.c:1169
12225 msgid "source repository is shallow, ignoring --local"
12226 msgstr "源仓库是浅克隆,忽略 --local"
12228 #: builtin/clone.c:1174
12229 msgid "--local is ignored"
12230 msgstr "--local 被忽略"
12232 #: builtin/clone.c:1249 builtin/clone.c:1257
12234 msgid "Remote branch %s not found in upstream %s"
12235 msgstr "远程分支 %s 在上游 %s 未发现"
12237 #: builtin/clone.c:1260
12238 msgid "You appear to have cloned an empty repository."
12239 msgstr "您似乎克隆了一个空仓库。"
12241 #: builtin/column.c:10
12242 msgid "git column [<options>]"
12243 msgstr "git column [<选项>]"
12245 #: builtin/column.c:27
12246 msgid "lookup config vars"
12249 #: builtin/column.c:28 builtin/column.c:29
12250 msgid "layout to use"
12253 #: builtin/column.c:30
12254 msgid "Maximum width"
12257 #: builtin/column.c:31
12258 msgid "Padding space on left border"
12261 #: builtin/column.c:32
12262 msgid "Padding space on right border"
12265 #: builtin/column.c:33
12266 msgid "Padding space between columns"
12269 #: builtin/column.c:51
12270 msgid "--command must be the first argument"
12271 msgstr "--command 必须是第一个参数"
12273 #: builtin/commit-graph.c:11 builtin/commit-graph.c:19
12275 "git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
12277 "git commit-graph verify [--object-dir <对象目录>] [--shallow] [--"
12280 #: builtin/commit-graph.c:12 builtin/commit-graph.c:24
12282 "git commit-graph write [--object-dir <objdir>] [--append] [--"
12283 "split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
12284 "paths] [--[no-]progress] <split options>"
12286 "git commit-graph write [--object-dir <对象目录>] [--append] [--split[=<策略"
12287 ">]] [--reachable|--stdin-packs|--stdin-commits] [--changed-paths] [--"
12288 "[no-]progress] <切分选项>"
12290 #: builtin/commit-graph.c:60
12292 msgid "could not find object directory matching %s"
12293 msgstr "无法找到和 %s 匹配的对象目录"
12295 #: builtin/commit-graph.c:76 builtin/commit-graph.c:152
12296 #: builtin/commit-graph.c:257 builtin/fetch.c:180 builtin/log.c:1678
12300 #: builtin/commit-graph.c:77 builtin/commit-graph.c:153
12301 #: builtin/commit-graph.c:258
12302 msgid "The object directory to store the graph"
12305 #: builtin/commit-graph.c:79
12306 msgid "if the commit-graph is split, only verify the tip file"
12307 msgstr "如果提交图形被拆分,只验证头一个文件"
12309 #: builtin/commit-graph.c:102
12311 msgid "Could not open commit-graph '%s'"
12312 msgstr "无法打开提交图形 '%s'"
12314 #: builtin/commit-graph.c:136
12316 msgid "unrecognized --split argument, %s"
12317 msgstr "未能识别的 --split 参数,%s"
12319 #: builtin/commit-graph.c:155
12320 msgid "start walk at all refs"
12323 #: builtin/commit-graph.c:157
12324 msgid "scan pack-indexes listed by stdin for commits"
12325 msgstr "从标准输入中的包索引文件列表中扫描提交"
12327 #: builtin/commit-graph.c:159
12328 msgid "start walk at commits listed by stdin"
12329 msgstr "从标准输入中的提交开始扫描"
12331 #: builtin/commit-graph.c:161
12332 msgid "include all commits already in the commit-graph file"
12333 msgstr "包含 commit-graph 文件中已有所有提交"
12335 #: builtin/commit-graph.c:163
12336 msgid "enable computation for changed paths"
12339 #: builtin/commit-graph.c:166
12340 msgid "allow writing an incremental commit-graph file"
12341 msgstr "允许写一个增量提交图形文件"
12343 #: builtin/commit-graph.c:170
12344 msgid "maximum number of commits in a non-base split commit-graph"
12345 msgstr "在非基本拆分提交图形中的最大提交数"
12347 #: builtin/commit-graph.c:172
12348 msgid "maximum ratio between two levels of a split commit-graph"
12349 msgstr "一个拆分提交图形的两个级别之间的最大比率"
12351 #: builtin/commit-graph.c:174
12352 msgid "only expire files older than a given date-time"
12353 msgstr "只让早于给定时间的文件过期"
12355 #: builtin/commit-graph.c:190
12356 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
12357 msgstr "不能同时使用 --reachable、--stdin-commits 或 --stdin-packs"
12359 #: builtin/commit-graph.c:229
12361 msgid "unexpected non-hex object ID: %s"
12362 msgstr "意外的非十六进制对象 ID:%s"
12364 #: builtin/commit-tree.c:18
12366 "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
12367 "<file>)...] <tree>"
12369 "git commit-tree [(-p <父提交>)...] [-S[<keyid>]] [(-m <消息>)...] [(-F <文件"
12372 #: builtin/commit-tree.c:31
12374 msgid "duplicate parent %s ignored"
12375 msgstr "忽略重复的父提交 %s"
12377 #: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:547
12379 msgid "not a valid object name %s"
12380 msgstr "不是一个有效的对象名 %s"
12382 #: builtin/commit-tree.c:93
12384 msgid "git commit-tree: failed to open '%s'"
12385 msgstr "git commit-tree:无法打开 '%s'"
12387 #: builtin/commit-tree.c:96
12389 msgid "git commit-tree: failed to read '%s'"
12390 msgstr "git commit-tree:无法读取 '%s'"
12392 #: builtin/commit-tree.c:98
12394 msgid "git commit-tree: failed to close '%s'"
12395 msgstr "git commit-tree:无法关闭 '%s'"
12397 #: builtin/commit-tree.c:111
12401 #: builtin/commit-tree.c:112
12402 msgid "id of a parent commit object"
12405 #: builtin/commit-tree.c:114 builtin/commit.c:1506 builtin/merge.c:273
12406 #: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1474
12407 #: builtin/tag.c:413
12411 #: builtin/commit-tree.c:115 builtin/commit.c:1506
12412 msgid "commit message"
12415 #: builtin/commit-tree.c:118
12416 msgid "read commit log message from file"
12417 msgstr "从文件中读取提交说明"
12419 #: builtin/commit-tree.c:121 builtin/commit.c:1518 builtin/merge.c:290
12420 #: builtin/pull.c:176 builtin/revert.c:118
12421 msgid "GPG sign commit"
12424 #: builtin/commit-tree.c:133
12425 msgid "must give exactly one tree"
12426 msgstr "必须精确地提供一个树"
12428 #: builtin/commit-tree.c:140
12429 msgid "git commit-tree: failed to read"
12430 msgstr "git commit-tree:读取失败"
12432 #: builtin/commit.c:41
12433 msgid "git commit [<options>] [--] <pathspec>..."
12434 msgstr "git commit [<选项>] [--] <路径规格>..."
12436 #: builtin/commit.c:46
12437 msgid "git status [<options>] [--] <pathspec>..."
12438 msgstr "git status [<选项>] [--] <路径规格>..."
12440 #: builtin/commit.c:51
12442 "You asked to amend the most recent commit, but doing so would make\n"
12443 "it empty. You can repeat your command with --allow-empty, or you can\n"
12444 "remove the commit entirely with \"git reset HEAD^\".\n"
12446 "您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
12447 "--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
12449 #: builtin/commit.c:56
12451 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
12452 "If you wish to commit it anyway, use:\n"
12454 " git commit --allow-empty\n"
12457 "之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
12460 " git commit --allow-empty\n"
12463 #: builtin/commit.c:63
12464 msgid "Otherwise, please use 'git rebase --skip'\n"
12465 msgstr "否则,请使用 'git rebase --skip'\n"
12467 #: builtin/commit.c:66
12468 msgid "Otherwise, please use 'git cherry-pick --skip'\n"
12469 msgstr "否则,请使用 'git cherry-pick --skip'\n"
12471 #: builtin/commit.c:69
12475 " git cherry-pick --continue\n"
12477 "to resume cherry-picking the remaining commits.\n"
12478 "If you wish to skip this commit, use:\n"
12480 " git cherry-pick --skip\n"
12485 " git cherry-pick --continue\n"
12487 "来继续拣选剩余提交。如果您想跳过此提交,使用:\n"
12489 " git cherry-pick --skip\n"
12492 #: builtin/commit.c:312
12493 msgid "failed to unpack HEAD tree object"
12494 msgstr "解包 HEAD 树对象失败"
12496 #: builtin/commit.c:348
12497 msgid "--pathspec-from-file with -a does not make sense"
12498 msgstr "--pathspec-from-file 和 -a 在一起没有意义"
12500 #: builtin/commit.c:361
12501 msgid "No paths with --include/--only does not make sense."
12502 msgstr "参数 --include/--only 不跟路径没有意义。"
12504 #: builtin/commit.c:373
12505 msgid "unable to create temporary index"
12508 #: builtin/commit.c:382
12509 msgid "interactive add failed"
12512 #: builtin/commit.c:397
12513 msgid "unable to update temporary index"
12516 #: builtin/commit.c:399
12517 msgid "Failed to update main cache tree"
12520 #: builtin/commit.c:424 builtin/commit.c:447 builtin/commit.c:495
12521 msgid "unable to write new_index file"
12522 msgstr "无法写 new_index 文件"
12524 #: builtin/commit.c:476
12525 msgid "cannot do a partial commit during a merge."
12526 msgstr "在合并过程中不能做部分提交。"
12528 #: builtin/commit.c:478
12529 msgid "cannot do a partial commit during a cherry-pick."
12530 msgstr "在拣选过程中不能做部分提交。"
12532 #: builtin/commit.c:480
12533 msgid "cannot do a partial commit during a rebase."
12534 msgstr "在变基过程中不能做部分提交。"
12536 #: builtin/commit.c:488
12537 msgid "cannot read the index"
12540 #: builtin/commit.c:507
12541 msgid "unable to write temporary index file"
12544 #: builtin/commit.c:605
12546 msgid "commit '%s' lacks author header"
12547 msgstr "提交 '%s' 缺少作者信息"
12549 #: builtin/commit.c:607
12551 msgid "commit '%s' has malformed author line"
12552 msgstr "提交 '%s' 有格式错误的作者信息"
12554 #: builtin/commit.c:626
12555 msgid "malformed --author parameter"
12556 msgstr "格式错误的 --author 参数"
12558 #: builtin/commit.c:679
12560 "unable to select a comment character that is not used\n"
12561 "in the current commit message"
12562 msgstr "无法选择一个未被当前提交说明使用的注释字符"
12564 #: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1099
12566 msgid "could not lookup commit %s"
12569 #: builtin/commit.c:729 builtin/shortlog.c:319
12571 msgid "(reading log message from standard input)\n"
12572 msgstr "(正从标准输入中读取日志信息)\n"
12574 #: builtin/commit.c:731
12575 msgid "could not read log from standard input"
12576 msgstr "不能从标准输入中读取日志信息"
12578 #: builtin/commit.c:735
12580 msgid "could not read log file '%s'"
12581 msgstr "不能读取日志文件 '%s'"
12583 #: builtin/commit.c:766 builtin/commit.c:782
12584 msgid "could not read SQUASH_MSG"
12585 msgstr "不能读取 SQUASH_MSG"
12587 #: builtin/commit.c:773
12588 msgid "could not read MERGE_MSG"
12589 msgstr "不能读取 MERGE_MSG"
12591 #: builtin/commit.c:833
12592 msgid "could not write commit template"
12595 #: builtin/commit.c:852
12599 "It looks like you may be committing a merge.\n"
12600 "If this is not correct, please remove the file\n"
12605 "似乎您正在做一个合并提交。如果不对,请删除文件\n"
12609 #: builtin/commit.c:857
12613 "It looks like you may be committing a cherry-pick.\n"
12614 "If this is not correct, please remove the file\n"
12619 "似乎您正在做一个拣选提交。如果不对,请删除文件\n"
12623 #: builtin/commit.c:870
12626 "Please enter the commit message for your changes. Lines starting\n"
12627 "with '%c' will be ignored, and an empty message aborts the commit.\n"
12629 "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
12632 #: builtin/commit.c:878
12635 "Please enter the commit message for your changes. Lines starting\n"
12636 "with '%c' will be kept; you may remove them yourself if you want to.\n"
12637 "An empty message aborts the commit.\n"
12639 "请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
12640 "也可以删除它们。一个空的提交说明将会终止提交。\n"
12642 # 译者:为保证在输出中对齐,注意调整句中空格!
12643 #: builtin/commit.c:895
12645 msgid "%sAuthor: %.*s <%.*s>"
12646 msgstr "%s作者: %.*s <%.*s>"
12648 # 译者:为保证在输出中对齐,注意调整句中空格!
12649 #: builtin/commit.c:903
12654 # 译者:为保证在输出中对齐,注意调整句中空格!
12655 #: builtin/commit.c:910
12657 msgid "%sCommitter: %.*s <%.*s>"
12658 msgstr "%s提交者:%.*s <%.*s>"
12660 #: builtin/commit.c:928
12661 msgid "Cannot read index"
12664 #: builtin/commit.c:999
12665 msgid "Error building trees"
12668 #: builtin/commit.c:1013 builtin/tag.c:276
12670 msgid "Please supply the message using either -m or -F option.\n"
12671 msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
12673 #: builtin/commit.c:1057
12675 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
12676 msgstr "--author '%s' 不是 '姓名 <邮箱>' 格式,且未能在现有作者中找到匹配"
12678 #: builtin/commit.c:1071
12680 msgid "Invalid ignored mode '%s'"
12681 msgstr "无效的忽略模式 '%s'"
12683 #: builtin/commit.c:1089 builtin/commit.c:1333
12685 msgid "Invalid untracked files mode '%s'"
12686 msgstr "无效的未追踪文件参数 '%s'"
12688 #: builtin/commit.c:1129
12689 msgid "--long and -z are incompatible"
12690 msgstr "--long 和 -z 选项不兼容"
12692 #: builtin/commit.c:1173
12693 msgid "Using both --reset-author and --author does not make sense"
12694 msgstr "同时使用 --reset-author 和 --author 没有意义"
12696 #: builtin/commit.c:1182
12697 msgid "You have nothing to amend."
12698 msgstr "您没有可修补的提交。"
12700 #: builtin/commit.c:1185
12701 msgid "You are in the middle of a merge -- cannot amend."
12702 msgstr "您正处于一个合并过程中 -- 无法修补提交。"
12704 #: builtin/commit.c:1187
12705 msgid "You are in the middle of a cherry-pick -- cannot amend."
12706 msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
12708 #: builtin/commit.c:1189
12709 msgid "You are in the middle of a rebase -- cannot amend."
12710 msgstr "您正处于一个变基过程中 -- 无法修补提交。"
12712 #: builtin/commit.c:1192
12713 msgid "Options --squash and --fixup cannot be used together"
12714 msgstr "选项 --squash 和 --fixup 不能同时使用"
12716 #: builtin/commit.c:1202
12717 msgid "Only one of -c/-C/-F/--fixup can be used."
12718 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
12720 #: builtin/commit.c:1204
12721 msgid "Option -m cannot be combined with -c/-C/-F."
12722 msgstr "选项 -m 不能和 -c/-C/-F 同时使用。"
12724 #: builtin/commit.c:1213
12725 msgid "--reset-author can be used only with -C, -c or --amend."
12726 msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
12728 #: builtin/commit.c:1231
12729 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
12730 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
12732 #: builtin/commit.c:1237
12734 msgid "paths '%s ...' with -a does not make sense"
12735 msgstr "路径 '%s ...' 和 -a 选项同时使用没有意义"
12737 #: builtin/commit.c:1368 builtin/commit.c:1529
12738 msgid "show status concisely"
12739 msgstr "以简洁的格式显示状态"
12741 #: builtin/commit.c:1370 builtin/commit.c:1531
12742 msgid "show branch information"
12745 #: builtin/commit.c:1372
12746 msgid "show stash information"
12749 #: builtin/commit.c:1374 builtin/commit.c:1533
12750 msgid "compute full ahead/behind values"
12751 msgstr "计算完整的领先/落后值"
12753 #: builtin/commit.c:1376
12757 #: builtin/commit.c:1376 builtin/commit.c:1535 builtin/push.c:549
12758 #: builtin/worktree.c:646
12759 msgid "machine-readable output"
12762 #: builtin/commit.c:1379 builtin/commit.c:1537
12763 msgid "show status in long format (default)"
12764 msgstr "以长格式显示状态(默认)"
12766 #: builtin/commit.c:1382 builtin/commit.c:1540
12767 msgid "terminate entries with NUL"
12768 msgstr "条目以 NUL 字符结尾"
12770 #: builtin/commit.c:1384 builtin/commit.c:1388 builtin/commit.c:1543
12771 #: builtin/fast-export.c:1153 builtin/fast-export.c:1156
12772 #: builtin/fast-export.c:1159 builtin/rebase.c:1392 parse-options.h:336
12776 #: builtin/commit.c:1385 builtin/commit.c:1543
12777 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
12778 msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
12780 #: builtin/commit.c:1389
12782 "show ignored files, optional modes: traditional, matching, no. (Default: "
12785 "显示已忽略的文件,可选模式:traditional、matching、no。(默认:traditional)"
12787 #: builtin/commit.c:1391 parse-options.h:192
12791 #: builtin/commit.c:1392
12793 "ignore changes to submodules, optional when: all, dirty, untracked. "
12796 "忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
12798 #: builtin/commit.c:1394
12799 msgid "list untracked files in columns"
12800 msgstr "以列的方式显示未跟踪的文件"
12802 #: builtin/commit.c:1395
12803 msgid "do not detect renames"
12806 #: builtin/commit.c:1397
12807 msgid "detect renames, optionally set similarity index"
12808 msgstr "检测重命名,可以设置索引相似度"
12810 #: builtin/commit.c:1417
12811 msgid "Unsupported combination of ignored and untracked-files arguments"
12812 msgstr "不支持已忽略和未跟踪文件参数的组合"
12814 #: builtin/commit.c:1499
12815 msgid "suppress summary after successful commit"
12816 msgstr "提交成功后不显示概述信息"
12818 #: builtin/commit.c:1500
12819 msgid "show diff in commit message template"
12820 msgstr "在提交说明模板里显示差异"
12822 #: builtin/commit.c:1502
12823 msgid "Commit message options"
12826 #: builtin/commit.c:1503 builtin/merge.c:277 builtin/tag.c:415
12827 msgid "read message from file"
12828 msgstr "从文件中读取提交说明"
12830 #: builtin/commit.c:1504
12834 #: builtin/commit.c:1504
12835 msgid "override author for commit"
12838 #: builtin/commit.c:1505 builtin/gc.c:538
12842 #: builtin/commit.c:1505
12843 msgid "override date for commit"
12846 #: builtin/commit.c:1507 builtin/commit.c:1508 builtin/commit.c:1509
12847 #: builtin/commit.c:1510 parse-options.h:328 ref-filter.h:92
12851 #: builtin/commit.c:1507
12852 msgid "reuse and edit message from specified commit"
12853 msgstr "重用并编辑指定提交的提交说明"
12855 #: builtin/commit.c:1508
12856 msgid "reuse message from specified commit"
12857 msgstr "重用指定提交的提交说明"
12859 #: builtin/commit.c:1509
12860 msgid "use autosquash formatted message to fixup specified commit"
12861 msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
12863 #: builtin/commit.c:1510
12864 msgid "use autosquash formatted message to squash specified commit"
12865 msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
12867 #: builtin/commit.c:1511
12868 msgid "the commit is authored by me now (used with -C/-c/--amend)"
12869 msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
12871 #: builtin/commit.c:1512 builtin/log.c:1655 builtin/merge.c:293
12872 #: builtin/pull.c:145 builtin/revert.c:110
12873 msgid "add Signed-off-by:"
12874 msgstr "添加 Signed-off-by: 签名"
12876 #: builtin/commit.c:1513
12877 msgid "use specified template file"
12880 #: builtin/commit.c:1514
12881 msgid "force edit of commit"
12884 #: builtin/commit.c:1516
12885 msgid "include status in commit message template"
12886 msgstr "在提交说明模板里包含状态信息"
12888 #: builtin/commit.c:1521
12889 msgid "Commit contents options"
12892 #: builtin/commit.c:1522
12893 msgid "commit all changed files"
12896 #: builtin/commit.c:1523
12897 msgid "add specified files to index for commit"
12898 msgstr "添加指定的文件到索引区等待提交"
12900 #: builtin/commit.c:1524
12901 msgid "interactively add files"
12904 #: builtin/commit.c:1525
12905 msgid "interactively add changes"
12908 #: builtin/commit.c:1526
12909 msgid "commit only specified files"
12912 #: builtin/commit.c:1527
12913 msgid "bypass pre-commit and commit-msg hooks"
12914 msgstr "绕过 pre-commit 和 commit-msg 钩子"
12916 #: builtin/commit.c:1528
12917 msgid "show what would be committed"
12920 #: builtin/commit.c:1541
12921 msgid "amend previous commit"
12924 #: builtin/commit.c:1542
12925 msgid "bypass post-rewrite hook"
12926 msgstr "绕过 post-rewrite 钩子"
12928 #: builtin/commit.c:1549
12929 msgid "ok to record an empty change"
12932 #: builtin/commit.c:1551
12933 msgid "ok to record a change with an empty message"
12936 #: builtin/commit.c:1624
12938 msgid "Corrupt MERGE_HEAD file (%s)"
12939 msgstr "损坏的 MERGE_HEAD 文件(%s)"
12941 #: builtin/commit.c:1631
12942 msgid "could not read MERGE_MODE"
12943 msgstr "不能读取 MERGE_MODE"
12945 #: builtin/commit.c:1652
12947 msgid "could not read commit message: %s"
12948 msgstr "不能读取提交说明:%s"
12950 #: builtin/commit.c:1659
12952 msgid "Aborting commit due to empty commit message.\n"
12953 msgstr "终止提交因为提交说明为空。\n"
12955 #: builtin/commit.c:1664
12957 msgid "Aborting commit; you did not edit the message.\n"
12958 msgstr "终止提交;您未更改来自模版的提交说明。\n"
12960 #: builtin/commit.c:1698
12962 "repository has been updated, but unable to write\n"
12963 "new_index file. Check that disk is not full and quota is\n"
12964 "not exceeded, and then \"git restore --staged :/\" to recover."
12966 "仓库已更新,但无法写 new_index 文件。检查是否磁盘已满或\n"
12967 "磁盘配额已耗尽,然后执行 \"git restore --staged :/\" 恢复。"
12969 #: builtin/config.c:11
12970 msgid "git config [<options>]"
12971 msgstr "git config [<选项>]"
12973 #: builtin/config.c:104 builtin/env--helper.c:23
12975 msgid "unrecognized --type argument, %s"
12976 msgstr "未能识别的 --type 参数,%s"
12978 #: builtin/config.c:116
12979 msgid "only one type at a time"
12982 #: builtin/config.c:125
12983 msgid "Config file location"
12986 #: builtin/config.c:126
12987 msgid "use global config file"
12990 #: builtin/config.c:127
12991 msgid "use system config file"
12994 #: builtin/config.c:128
12995 msgid "use repository config file"
12998 #: builtin/config.c:129
12999 msgid "use per-worktree config file"
13000 msgstr "使用工作区级别的配置文件"
13002 #: builtin/config.c:130
13003 msgid "use given config file"
13006 #: builtin/config.c:131
13010 #: builtin/config.c:131
13011 msgid "read config from given blob object"
13012 msgstr "从给定的数据对象读取配置"
13014 #: builtin/config.c:132
13018 #: builtin/config.c:133
13019 msgid "get value: name [value-regex]"
13020 msgstr "获取值:name [value-regex]"
13022 #: builtin/config.c:134
13023 msgid "get all values: key [value-regex]"
13024 msgstr "获得所有的值:key [value-regex]"
13026 #: builtin/config.c:135
13027 msgid "get values for regexp: name-regex [value-regex]"
13028 msgstr "根据正则表达式获得值:name-regex [value-regex]"
13030 #: builtin/config.c:136
13031 msgid "get value specific for the URL: section[.var] URL"
13032 msgstr "获得 URL 取值:section[.var] URL"
13034 #: builtin/config.c:137
13035 msgid "replace all matching variables: name value [value_regex]"
13036 msgstr "替换所有匹配的变量:name value [value_regex]"
13038 #: builtin/config.c:138
13039 msgid "add a new variable: name value"
13040 msgstr "添加一个新的变量:name value"
13042 #: builtin/config.c:139
13043 msgid "remove a variable: name [value-regex]"
13044 msgstr "删除一个变量:name [value-regex]"
13046 #: builtin/config.c:140
13047 msgid "remove all matches: name [value-regex]"
13048 msgstr "删除所有匹配项:name [value-regex]"
13050 #: builtin/config.c:141
13051 msgid "rename section: old-name new-name"
13052 msgstr "重命名小节:old-name new-name"
13054 #: builtin/config.c:142
13055 msgid "remove a section: name"
13056 msgstr "删除一个小节:name"
13058 #: builtin/config.c:143
13062 #: builtin/config.c:144
13063 msgid "open an editor"
13066 #: builtin/config.c:145
13067 msgid "find the color configured: slot [default]"
13068 msgstr "获得配置的颜色:配置 [默认]"
13070 #: builtin/config.c:146
13071 msgid "find the color setting: slot [stdout-is-tty]"
13072 msgstr "获得颜色设置:配置 [stdout-is-tty]"
13074 #: builtin/config.c:147
13078 #: builtin/config.c:148 builtin/env--helper.c:38
13079 msgid "value is given this type"
13082 #: builtin/config.c:149
13083 msgid "value is \"true\" or \"false\""
13084 msgstr "值是 \"true\" 或 \"false\""
13086 #: builtin/config.c:150
13087 msgid "value is decimal number"
13090 #: builtin/config.c:151
13091 msgid "value is --bool or --int"
13092 msgstr "值是 --bool or --int"
13094 #: builtin/config.c:152
13095 msgid "value is a path (file or directory name)"
13096 msgstr "值是一个路径(文件或目录名)"
13098 #: builtin/config.c:153
13099 msgid "value is an expiry date"
13102 #: builtin/config.c:154
13106 #: builtin/config.c:155
13107 msgid "terminate values with NUL byte"
13108 msgstr "终止值是 NUL 字节"
13110 #: builtin/config.c:156
13111 msgid "show variable names only"
13114 #: builtin/config.c:157
13115 msgid "respect include directives on lookup"
13116 msgstr "查询时参照 include 指令递归查找"
13118 #: builtin/config.c:158
13119 msgid "show origin of config (file, standard input, blob, command line)"
13120 msgstr "显示配置的来源(文件、标准输入、数据对象,或命令行)"
13122 #: builtin/config.c:159
13123 msgid "show scope of config (worktree, local, global, system, command)"
13124 msgstr "显示配置的作用域(工作区、本地、全局、系统、命令)"
13126 #: builtin/config.c:160 builtin/env--helper.c:40
13130 #: builtin/config.c:160
13131 msgid "with --get, use default value when missing entry"
13132 msgstr "使用 --get 参数,当缺少设置时使用默认值"
13134 #: builtin/config.c:174
13136 msgid "wrong number of arguments, should be %d"
13137 msgstr "错误的参数个数,应该为 %d 个"
13139 #: builtin/config.c:176
13141 msgid "wrong number of arguments, should be from %d to %d"
13142 msgstr "错误的参数个数,应该为从 %d 个到 %d 个"
13144 #: builtin/config.c:324
13146 msgid "invalid key pattern: %s"
13149 #: builtin/config.c:360
13151 msgid "failed to format default config value: %s"
13152 msgstr "格式化默认配置值失败:%s"
13154 #: builtin/config.c:417
13156 msgid "cannot parse color '%s'"
13157 msgstr "无法解析颜色 '%s'"
13159 #: builtin/config.c:459
13160 msgid "unable to parse default color value"
13163 #: builtin/config.c:512 builtin/config.c:768
13164 msgid "not in a git directory"
13165 msgstr "不在 git 仓库中"
13167 #: builtin/config.c:515
13168 msgid "writing to stdin is not supported"
13171 #: builtin/config.c:518
13172 msgid "writing config blobs is not supported"
13173 msgstr "不支持写到配置数据对象"
13175 #: builtin/config.c:603
13178 "# This is Git's per-user configuration file.\n"
13180 "# Please adapt and uncomment the following lines:\n"
13184 "# This is Git's per-user configuration file.\n"
13186 "# Please adapt and uncomment the following lines:\n"
13190 #: builtin/config.c:627
13191 msgid "only one config file at a time"
13192 msgstr "一次只能有一个配置文件"
13194 #: builtin/config.c:632
13195 msgid "--local can only be used inside a git repository"
13196 msgstr "--local 只能在一个仓库内使用"
13198 #: builtin/config.c:635
13199 msgid "--blob can only be used inside a git repository"
13200 msgstr "--blob 只能在一个仓库内使用"
13202 #: builtin/config.c:655
13203 msgid "$HOME not set"
13206 #: builtin/config.c:679
13208 "--worktree cannot be used with multiple working trees unless the config\n"
13209 "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
13210 "section in \"git help worktree\" for details"
13212 "不能和多个工作区一起使用 --worktree,除非启用 worktreeConfig 配置扩展。\n"
13213 "详情请阅读“git help worktree”的“CONFIGURATION FILE”小节"
13215 #: builtin/config.c:714
13216 msgid "--get-color and variable type are incoherent"
13217 msgstr "--get-color 和变量类型不兼容"
13219 #: builtin/config.c:719
13220 msgid "only one action at a time"
13223 #: builtin/config.c:732
13224 msgid "--name-only is only applicable to --list or --get-regexp"
13225 msgstr "--name-only 仅适用于 --list 或 --get-regexp"
13227 #: builtin/config.c:738
13229 "--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
13231 msgstr "--show-origin 仅适用于 --get、--get-all、--get-regexp 和 --list"
13233 #: builtin/config.c:744
13234 msgid "--default is only applicable to --get"
13235 msgstr "--default 仅适用于 --get"
13237 #: builtin/config.c:757
13239 msgid "unable to read config file '%s'"
13240 msgstr "无法读取配置文件 '%s'"
13242 #: builtin/config.c:760
13243 msgid "error processing config file(s)"
13246 #: builtin/config.c:770
13247 msgid "editing stdin is not supported"
13250 #: builtin/config.c:772
13251 msgid "editing blobs is not supported"
13254 #: builtin/config.c:786
13256 msgid "cannot create configuration file %s"
13257 msgstr "不能创建配置文件 %s"
13259 #: builtin/config.c:799
13262 "cannot overwrite multiple values with a single value\n"
13263 " Use a regexp, --add or --replace-all to change %s."
13266 " 使用一个正则表达式、--add 或 --replace-all 来修改 %s。"
13268 #: builtin/config.c:873 builtin/config.c:884
13270 msgid "no such section: %s"
13273 #: builtin/count-objects.c:90
13274 msgid "git count-objects [-v] [-H | --human-readable]"
13275 msgstr "git count-objects [-v] [-H | --human-readable]"
13277 #: builtin/count-objects.c:100
13278 msgid "print sizes in human readable format"
13279 msgstr "以用户可读的格式显示大小"
13281 #: builtin/describe.c:26
13282 msgid "git describe [<options>] [<commit-ish>...]"
13283 msgstr "git describe [<选项>] [<提交号>...]"
13285 #: builtin/describe.c:27
13286 msgid "git describe [<options>] --dirty"
13287 msgstr "git describe [<选项>] --dirty"
13289 #: builtin/describe.c:63
13293 #: builtin/describe.c:63
13294 msgid "lightweight"
13297 #: builtin/describe.c:63
13301 #: builtin/describe.c:277
13303 msgid "annotated tag %s not available"
13304 msgstr "附注标签 %s 无效"
13306 #: builtin/describe.c:281
13308 msgid "tag '%s' is externally known as '%s'"
13309 msgstr "标签 '%s' 在外部被认为是 '%s'"
13311 #: builtin/describe.c:328
13313 msgid "no tag exactly matches '%s'"
13314 msgstr "没有标签准确匹配 '%s'"
13316 #: builtin/describe.c:330
13318 msgid "No exact match on refs or tags, searching to describe\n"
13319 msgstr "没有精确匹配到引用或标签,继续搜索进行描述\n"
13321 #: builtin/describe.c:397
13323 msgid "finished search at %s\n"
13326 #: builtin/describe.c:424
13329 "No annotated tags can describe '%s'.\n"
13330 "However, there were unannotated tags: try --tags."
13332 "没有附注标签能描述 '%s'。\n"
13333 "然而,存在未附注标签:尝试 --tags。"
13335 #: builtin/describe.c:428
13338 "No tags can describe '%s'.\n"
13339 "Try --always, or create some tags."
13342 "尝试 --always,或者创建一些标签。"
13344 #: builtin/describe.c:458
13346 msgid "traversed %lu commits\n"
13347 msgstr "已遍历 %lu 个提交\n"
13349 #: builtin/describe.c:461
13352 "more than %i tags found; listed %i most recent\n"
13353 "gave up search at %s\n"
13355 "发现多于 %i 个标签,列出最近的 %i 个\n"
13358 #: builtin/describe.c:529
13360 msgid "describe %s\n"
13363 #: builtin/describe.c:532
13365 msgid "Not a valid object name %s"
13366 msgstr "不是一个有效的对象名 %s"
13368 #: builtin/describe.c:540
13370 msgid "%s is neither a commit nor blob"
13371 msgstr "%s 既不是提交也不是数据对象"
13373 #: builtin/describe.c:554
13374 msgid "find the tag that comes after the commit"
13375 msgstr "寻找该提交之后的标签"
13377 #: builtin/describe.c:555
13378 msgid "debug search strategy on stderr"
13379 msgstr "在标准错误上调试搜索策略"
13381 #: builtin/describe.c:556
13382 msgid "use any ref"
13385 #: builtin/describe.c:557
13386 msgid "use any tag, even unannotated"
13387 msgstr "使用任意标签,即使未附带注释"
13389 #: builtin/describe.c:558
13390 msgid "always use long format"
13391 msgstr "始终使用长提交号格式"
13393 #: builtin/describe.c:559
13394 msgid "only follow first parent"
13397 #: builtin/describe.c:562
13398 msgid "only output exact matches"
13401 #: builtin/describe.c:564
13402 msgid "consider <n> most recent tags (default: 10)"
13403 msgstr "考虑最近 <n> 个标签(默认:10)"
13405 #: builtin/describe.c:566
13406 msgid "only consider tags matching <pattern>"
13407 msgstr "只考虑匹配 <模式> 的标签"
13409 #: builtin/describe.c:568
13410 msgid "do not consider tags matching <pattern>"
13411 msgstr "不考虑匹配 <模式> 的标签"
13413 #: builtin/describe.c:570 builtin/name-rev.c:535
13414 msgid "show abbreviated commit object as fallback"
13415 msgstr "显示简写的提交号作为后备"
13417 #: builtin/describe.c:571 builtin/describe.c:574
13421 #: builtin/describe.c:572
13422 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
13423 msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")"
13425 #: builtin/describe.c:575
13426 msgid "append <mark> on broken working tree (default: \"-broken\")"
13427 msgstr "对于损坏的工作区,追加 <标记>(默认:\"-broken\")"
13429 #: builtin/describe.c:593
13430 msgid "--long is incompatible with --abbrev=0"
13431 msgstr "--long 与 --abbrev=0 不兼容"
13433 #: builtin/describe.c:622
13434 msgid "No names found, cannot describe anything."
13435 msgstr "没有发现名称,无法描述任何东西。"
13437 #: builtin/describe.c:673
13438 msgid "--dirty is incompatible with commit-ishes"
13439 msgstr "--dirty 与提交号不兼容"
13441 #: builtin/describe.c:675
13442 msgid "--broken is incompatible with commit-ishes"
13443 msgstr "--broken 与提交号不兼容"
13445 #: builtin/diff.c:84
13447 msgid "'%s': not a regular file or symlink"
13448 msgstr "'%s':不是一个正规文件或符号链接"
13450 #: builtin/diff.c:235
13452 msgid "invalid option: %s"
13455 #: builtin/diff.c:350
13456 msgid "Not a git repository"
13457 msgstr "不是一个 git 仓库"
13459 #: builtin/diff.c:394
13461 msgid "invalid object '%s' given."
13462 msgstr "提供了无效对象 '%s'。"
13464 #: builtin/diff.c:403
13466 msgid "more than two blobs given: '%s'"
13467 msgstr "提供了超过两个数据对象:'%s'"
13469 #: builtin/diff.c:408
13471 msgid "unhandled object '%s' given."
13472 msgstr "无法处理的对象 '%s'。"
13474 #: builtin/difftool.c:30
13475 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
13476 msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]"
13478 #: builtin/difftool.c:260
13483 #: builtin/difftool.c:302
13485 msgid "could not read symlink %s"
13486 msgstr "无法读取符号链接 %s"
13488 #: builtin/difftool.c:304
13490 msgid "could not read symlink file %s"
13491 msgstr "无法读取符号链接文件 %s"
13493 #: builtin/difftool.c:312
13495 msgid "could not read object %s for symlink %s"
13496 msgstr "无法读取符号链接 %2$s 指向的对象 %1$s"
13498 #: builtin/difftool.c:413
13500 "combined diff formats('-c' and '--cc') are not supported in\n"
13501 "directory diff mode('-d' and '--dir-diff')."
13503 "不支持在目录比较模式('-d' 和 '--dir-diff')中采用组合差异格式('-c' 和 '--"
13506 #: builtin/difftool.c:634
13508 msgid "both files modified: '%s' and '%s'."
13509 msgstr "两个文件都被修改:'%s' 和 '%s'。"
13511 #: builtin/difftool.c:636
13512 msgid "working tree file has been left."
13513 msgstr "工作区文件被留了下来。"
13515 #: builtin/difftool.c:647
13517 msgid "temporary files exist in '%s'."
13518 msgstr "临时文件存在于 '%s'。"
13520 #: builtin/difftool.c:648
13521 msgid "you may want to cleanup or recover these."
13522 msgstr "您可能想要清理或者恢复它们。"
13524 #: builtin/difftool.c:697
13525 msgid "use `diff.guitool` instead of `diff.tool`"
13526 msgstr "使用 `diff.guitool` 代替 `diff.tool`"
13528 #: builtin/difftool.c:699
13529 msgid "perform a full-directory diff"
13530 msgstr "执行一个全目录差异比较"
13532 #: builtin/difftool.c:701
13533 msgid "do not prompt before launching a diff tool"
13534 msgstr "启动差异比较工具之前不提示"
13536 #: builtin/difftool.c:706
13537 msgid "use symlinks in dir-diff mode"
13538 msgstr "在 dir-diff 模式中使用符号链接"
13540 #: builtin/difftool.c:707
13544 #: builtin/difftool.c:708
13545 msgid "use the specified diff tool"
13546 msgstr "使用指定的差异比较工具"
13548 #: builtin/difftool.c:710
13549 msgid "print a list of diff tools that may be used with `--tool`"
13550 msgstr "显示可以用在 `--tool` 参数后的差异工具列表"
13552 #: builtin/difftool.c:713
13554 "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
13556 msgstr "当执行 diff 工具返回非零退出码时,使 'git-difftool' 退出"
13558 #: builtin/difftool.c:716
13559 msgid "specify a custom command for viewing diffs"
13560 msgstr "指定一个用于查看差异的自定义命令"
13562 #: builtin/difftool.c:717
13563 msgid "passed to `diff`"
13564 msgstr "传递给 `diff`"
13566 #: builtin/difftool.c:732
13567 msgid "difftool requires worktree or --no-index"
13568 msgstr "difftool 要求工作区或者 --no-index"
13570 #: builtin/difftool.c:739
13571 msgid "--dir-diff is incompatible with --no-index"
13572 msgstr "--dir-diff 和 --no-index 不兼容"
13574 #: builtin/difftool.c:742
13575 msgid "--gui, --tool and --extcmd are mutually exclusive"
13576 msgstr "--gui、--tool 和 --extcmd 互斥"
13578 #: builtin/difftool.c:750
13579 msgid "no <tool> given for --tool=<tool>"
13580 msgstr "没有为 --tool=<工具> 参数提供 <工具>"
13582 #: builtin/difftool.c:757
13583 msgid "no <cmd> given for --extcmd=<cmd>"
13584 msgstr "没有为 --extcmd=<命令> 参数提供 <命令>"
13586 #: builtin/env--helper.c:6
13587 msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
13588 msgstr "git env--helper --type=[bool|ulong] <选项> <环境变量>"
13590 #: builtin/env--helper.c:37 builtin/hash-object.c:98
13594 #: builtin/env--helper.c:41
13595 msgid "default for git_env_*(...) to fall back on"
13596 msgstr "git_env_*(...) 的默认值"
13598 #: builtin/env--helper.c:43
13599 msgid "be quiet only use git_env_*() value as exit code"
13600 msgstr "安静模式,只使用 git_env_*() 的值作为退出码"
13602 #: builtin/env--helper.c:62
13604 msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
13605 msgstr "选项 `--default' 和 `type=bool` 期望一个布尔值,不是 `%s`"
13607 #: builtin/env--helper.c:77
13610 "option `--default' expects an unsigned long value with `--type=ulong`, not `"
13612 msgstr "选项 `--default' 和 `type=ulong` 期望一个无符号长整型,不是 `%s`"
13614 #: builtin/fast-export.c:29
13615 msgid "git fast-export [rev-list-opts]"
13616 msgstr "git fast-export [rev-list-opts]"
13618 #: builtin/fast-export.c:853
13619 msgid "Error: Cannot export nested tags unless --mark-tags is specified."
13620 msgstr "错误:除非指定 --mark-tags,否则无法导出嵌套标签。"
13622 #: builtin/fast-export.c:1152
13623 msgid "show progress after <n> objects"
13624 msgstr "在 <n> 个对象之后显示进度"
13626 #: builtin/fast-export.c:1154
13627 msgid "select handling of signed tags"
13628 msgstr "选择如何处理签名标签"
13630 #: builtin/fast-export.c:1157
13631 msgid "select handling of tags that tag filtered objects"
13632 msgstr "选择当标签指向被过滤对象时该标签的处理方式"
13634 #: builtin/fast-export.c:1160
13635 msgid "select handling of commit messages in an alternate encoding"
13636 msgstr "选择使用备用编码处理提交说明"
13638 #: builtin/fast-export.c:1163
13639 msgid "Dump marks to this file"
13640 msgstr "把标记存储到这个文件"
13642 #: builtin/fast-export.c:1165
13643 msgid "Import marks from this file"
13646 #: builtin/fast-export.c:1169
13647 msgid "Import marks from this file if it exists"
13648 msgstr "从该文件导入标记(如果存在的话)"
13650 #: builtin/fast-export.c:1171
13651 msgid "Fake a tagger when tags lack one"
13652 msgstr "当标签缺少标记者字段时,假装提供一个"
13654 #: builtin/fast-export.c:1173
13655 msgid "Output full tree for each commit"
13656 msgstr "每次提交都输出整个树"
13658 #: builtin/fast-export.c:1175
13659 msgid "Use the done feature to terminate the stream"
13660 msgstr "使用 done 功能来终止流"
13662 #: builtin/fast-export.c:1176
13663 msgid "Skip output of blob data"
13666 #: builtin/fast-export.c:1177 builtin/log.c:1724
13670 #: builtin/fast-export.c:1178
13671 msgid "Apply refspec to exported refs"
13672 msgstr "对导出的引用应用引用规格"
13674 #: builtin/fast-export.c:1179
13675 msgid "anonymize output"
13678 #: builtin/fast-export.c:1181
13679 msgid "Reference parents which are not in fast-export stream by object id"
13680 msgstr "引用父对象 ID 不在 fast-export 流中"
13682 #: builtin/fast-export.c:1183
13683 msgid "Show original object ids of blobs/commits"
13684 msgstr "显示数据对象/提交的原始对象 ID"
13686 #: builtin/fast-export.c:1185
13687 msgid "Label tags with mark ids"
13688 msgstr "对带有标记 ID 的标签做标记"
13690 #: builtin/fast-export.c:1220
13691 msgid "Cannot pass both --import-marks and --import-marks-if-exists"
13692 msgstr "不能同时传递参数 --import-marks 和 --import-marks-if-exists"
13694 #: builtin/fetch.c:35
13695 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
13696 msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
13698 #: builtin/fetch.c:36
13699 msgid "git fetch [<options>] <group>"
13700 msgstr "git fetch [<选项>] <组>"
13702 #: builtin/fetch.c:37
13703 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
13704 msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
13706 #: builtin/fetch.c:38
13707 msgid "git fetch --all [<options>]"
13708 msgstr "git fetch --all [<选项>]"
13710 #: builtin/fetch.c:117
13711 msgid "fetch.parallel cannot be negative"
13712 msgstr "fetch.parallel 不能为负数"
13714 #: builtin/fetch.c:140 builtin/pull.c:185
13715 msgid "fetch from all remotes"
13718 #: builtin/fetch.c:142 builtin/pull.c:245
13719 msgid "set upstream for git pull/fetch"
13720 msgstr "为 git pull/fetch 设置上游"
13722 #: builtin/fetch.c:144 builtin/pull.c:188
13723 msgid "append to .git/FETCH_HEAD instead of overwriting"
13724 msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
13726 #: builtin/fetch.c:146 builtin/pull.c:191
13727 msgid "path to upload pack on remote end"
13730 #: builtin/fetch.c:147
13731 msgid "force overwrite of local reference"
13734 #: builtin/fetch.c:149
13735 msgid "fetch from multiple remotes"
13738 #: builtin/fetch.c:151 builtin/pull.c:195
13739 msgid "fetch all tags and associated objects"
13740 msgstr "抓取所有的标签和关联对象"
13742 #: builtin/fetch.c:153
13743 msgid "do not fetch all tags (--no-tags)"
13744 msgstr "不抓取任何标签(--no-tags)"
13746 #: builtin/fetch.c:155
13747 msgid "number of submodules fetched in parallel"
13750 #: builtin/fetch.c:157 builtin/pull.c:198
13751 msgid "prune remote-tracking branches no longer on remote"
13752 msgstr "清除远程已经不存在的分支的跟踪分支"
13754 #: builtin/fetch.c:159
13755 msgid "prune local tags no longer on remote and clobber changed tags"
13756 msgstr "清除远程不存在的本地标签,并且替换变更标签"
13759 #: builtin/fetch.c:160 builtin/fetch.c:183 builtin/pull.c:122
13763 #: builtin/fetch.c:161
13764 msgid "control recursive fetching of submodules"
13765 msgstr "控制子模组的递归抓取"
13767 #: builtin/fetch.c:165 builtin/pull.c:206
13768 msgid "keep downloaded pack"
13771 #: builtin/fetch.c:167
13772 msgid "allow updating of HEAD ref"
13773 msgstr "允许更新 HEAD 引用"
13775 #: builtin/fetch.c:170 builtin/fetch.c:176 builtin/pull.c:209
13776 #: builtin/pull.c:218
13777 msgid "deepen history of shallow clone"
13780 #: builtin/fetch.c:172 builtin/pull.c:212
13781 msgid "deepen history of shallow repository based on time"
13782 msgstr "基于时间来深化浅克隆的历史"
13784 #: builtin/fetch.c:178 builtin/pull.c:221
13785 msgid "convert to a complete repository"
13786 msgstr "转换为一个完整的仓库"
13788 #: builtin/fetch.c:181
13789 msgid "prepend this to submodule path output"
13790 msgstr "在子模组路径输出的前面加上此目录"
13792 #: builtin/fetch.c:184
13794 "default for recursive fetching of submodules (lower priority than config "
13796 msgstr "递归获取子模组的缺省值(比配置文件优先级低)"
13798 #: builtin/fetch.c:188 builtin/pull.c:224
13799 msgid "accept refs that update .git/shallow"
13800 msgstr "接受更新 .git/shallow 的引用"
13802 #: builtin/fetch.c:189 builtin/pull.c:226
13806 #: builtin/fetch.c:190 builtin/pull.c:227
13807 msgid "specify fetch refmap"
13808 msgstr "指定获取操作的引用映射"
13810 #: builtin/fetch.c:197 builtin/pull.c:240
13811 msgid "report that we have only objects reachable from this object"
13812 msgstr "报告我们只拥有从该对象开始可达的对象"
13814 #: builtin/fetch.c:200
13815 msgid "run 'gc --auto' after fetching"
13816 msgstr "获取后执行 'gc --auto'"
13818 #: builtin/fetch.c:202 builtin/pull.c:243
13819 msgid "check for forced-updates on all updated branches"
13820 msgstr "在所有更新分支上检查强制更新"
13822 #: builtin/fetch.c:204
13823 msgid "write the commit-graph after fetching"
13826 #: builtin/fetch.c:514
13827 msgid "Couldn't find remote ref HEAD"
13828 msgstr "无法发现远程 HEAD 引用"
13830 #: builtin/fetch.c:654
13832 msgid "configuration fetch.output contains invalid value %s"
13833 msgstr "配置变量 fetch.output 包含无效值 %s"
13835 #: builtin/fetch.c:752
13837 msgid "object %s not found"
13840 #: builtin/fetch.c:756
13841 msgid "[up to date]"
13844 #: builtin/fetch.c:769 builtin/fetch.c:785 builtin/fetch.c:857
13848 #: builtin/fetch.c:770
13849 msgid "can't fetch in current branch"
13850 msgstr "当前分支下不能执行获取操作"
13852 #: builtin/fetch.c:780
13853 msgid "[tag update]"
13856 #: builtin/fetch.c:781 builtin/fetch.c:818 builtin/fetch.c:840
13857 #: builtin/fetch.c:852
13858 msgid "unable to update local ref"
13861 #: builtin/fetch.c:785
13862 msgid "would clobber existing tag"
13865 #: builtin/fetch.c:807
13869 #: builtin/fetch.c:810
13870 msgid "[new branch]"
13873 #: builtin/fetch.c:813
13877 #: builtin/fetch.c:852
13878 msgid "forced update"
13881 #: builtin/fetch.c:857
13882 msgid "non-fast-forward"
13885 #: builtin/fetch.c:878
13887 "Fetch normally indicates which branches had a forced update,\n"
13888 "but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
13889 "flag or run 'git config fetch.showForcedUpdates true'."
13891 "获取操作通常显示哪些分支发生了强制更新,但该检查已被禁用。\n"
13892 "要重新启用,请使用 '--show-forced-updates' 选项或运行\n"
13893 "'git config fetch.showForcedUpdates true'。"
13895 #: builtin/fetch.c:882
13898 "It took %.2f seconds to check forced updates. You can use\n"
13899 "'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
13901 " to avoid this check.\n"
13903 "花了 %.2f 秒来检查强制更新。您可以使用 '--no-show-forced-updates'\n"
13904 "或运行 'git config fetch.showForcedUpdates false' 以避免此项检查。\n"
13906 #: builtin/fetch.c:914
13908 msgid "%s did not send all necessary objects\n"
13909 msgstr "%s 未发送所有必需的对象\n"
13911 #: builtin/fetch.c:935
13913 msgid "reject %s because shallow roots are not allowed to be updated"
13914 msgstr "拒绝 %s 因为浅克隆不允许被更新"
13916 #: builtin/fetch.c:1020 builtin/fetch.c:1158
13918 msgid "From %.*s\n"
13921 #: builtin/fetch.c:1031
13924 "some local refs could not be updated; try running\n"
13925 " 'git remote prune %s' to remove any old, conflicting branches"
13927 "一些本地引用不能被更新;尝试运行\n"
13928 " 'git remote prune %s' 来删除旧的、有冲突的分支"
13931 #: builtin/fetch.c:1128
13933 msgid " (%s will become dangling)"
13934 msgstr " (%s 将成为悬空状态)"
13937 #: builtin/fetch.c:1129
13939 msgid " (%s has become dangling)"
13940 msgstr " (%s 已成为悬空状态)"
13942 #: builtin/fetch.c:1161
13946 #: builtin/fetch.c:1162 builtin/remote.c:1112
13950 #: builtin/fetch.c:1185
13952 msgid "Refusing to fetch into current branch %s of non-bare repository"
13953 msgstr "拒绝获取到非纯仓库的当前分支 %s"
13955 #: builtin/fetch.c:1204
13957 msgid "Option \"%s\" value \"%s\" is not valid for %s"
13958 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
13960 #: builtin/fetch.c:1207
13962 msgid "Option \"%s\" is ignored for %s\n"
13963 msgstr "选项 \"%s\" 为 %s 所忽略\n"
13965 #: builtin/fetch.c:1415
13966 msgid "multiple branches detected, incompatible with --set-upstream"
13967 msgstr "检测到多分支,和 --set-upstream 不兼容"
13969 #: builtin/fetch.c:1430
13970 msgid "not setting upstream for a remote remote-tracking branch"
13971 msgstr "没有为一个远程跟踪分支设置上游"
13973 #: builtin/fetch.c:1432
13974 msgid "not setting upstream for a remote tag"
13975 msgstr "没有为一个远程标签设置上游"
13977 #: builtin/fetch.c:1434
13978 msgid "unknown branch type"
13981 #: builtin/fetch.c:1436
13983 "no source branch found.\n"
13984 "you need to specify exactly one branch with the --set-upstream option."
13987 "您需要使用 --set-upstream 选项指定一个分支。"
13989 #: builtin/fetch.c:1562 builtin/fetch.c:1625
13991 msgid "Fetching %s\n"
13994 #: builtin/fetch.c:1572 builtin/fetch.c:1627 builtin/remote.c:101
13996 msgid "Could not fetch %s"
13999 #: builtin/fetch.c:1584
14001 msgid "could not fetch '%s' (exit code: %d)\n"
14002 msgstr "无法获取 '%s'(退出码:%d)\n"
14004 #: builtin/fetch.c:1687
14006 "No remote repository specified. Please, specify either a URL or a\n"
14007 "remote name from which new revisions should be fetched."
14008 msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。"
14010 #: builtin/fetch.c:1724
14011 msgid "You need to specify a tag name."
14012 msgstr "您需要指定一个标签名称。"
14014 #: builtin/fetch.c:1773
14015 msgid "Negative depth in --deepen is not supported"
14016 msgstr "--deepen 不支持负数深度"
14018 #: builtin/fetch.c:1775
14019 msgid "--deepen and --depth are mutually exclusive"
14020 msgstr "--deepen 和 --depth 是互斥的"
14022 #: builtin/fetch.c:1780
14023 msgid "--depth and --unshallow cannot be used together"
14024 msgstr "--depth 和 --unshallow 不能同时使用"
14026 #: builtin/fetch.c:1782
14027 msgid "--unshallow on a complete repository does not make sense"
14028 msgstr "对于一个完整的仓库,参数 --unshallow 没有意义"
14030 #: builtin/fetch.c:1798
14031 msgid "fetch --all does not take a repository argument"
14032 msgstr "fetch --all 不能带一个仓库参数"
14034 #: builtin/fetch.c:1800
14035 msgid "fetch --all does not make sense with refspecs"
14036 msgstr "fetch --all 带引用规格没有任何意义"
14038 #: builtin/fetch.c:1809
14040 msgid "No such remote or remote group: %s"
14041 msgstr "没有这样的远程或远程组:%s"
14043 #: builtin/fetch.c:1816
14044 msgid "Fetching a group and specifying refspecs does not make sense"
14045 msgstr "获取组并指定引用规格没有意义"
14047 #: builtin/fetch.c:1834
14049 "--filter can only be used with the remote configured in extensions."
14051 msgstr "只可以将 --filter 用于在 extensions.partialClone 中配置的远程仓库"
14053 #: builtin/fmt-merge-msg.c:7
14055 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
14056 msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
14058 #: builtin/fmt-merge-msg.c:18
14059 msgid "populate log with at most <n> entries from shortlog"
14060 msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
14062 #: builtin/fmt-merge-msg.c:21
14063 msgid "alias for --log (deprecated)"
14064 msgstr "参数 --log 的别名(已弃用)"
14066 #: builtin/fmt-merge-msg.c:24
14070 #: builtin/fmt-merge-msg.c:25
14071 msgid "use <text> as start of message"
14072 msgstr "使用 <文本> 作为提交说明的开始"
14074 #: builtin/fmt-merge-msg.c:26
14075 msgid "file to read from"
14078 #: builtin/for-each-ref.c:10
14079 msgid "git for-each-ref [<options>] [<pattern>]"
14080 msgstr "git for-each-ref [<选项>] [<模式>]"
14082 #: builtin/for-each-ref.c:11
14083 msgid "git for-each-ref [--points-at <object>]"
14084 msgstr "git for-each-ref [--points-at <对象>]"
14086 #: builtin/for-each-ref.c:12
14087 msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
14088 msgstr "git for-each-ref [(--merged | --no-merged) [<提交>]]"
14090 #: builtin/for-each-ref.c:13
14091 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
14092 msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]"
14094 #: builtin/for-each-ref.c:28
14095 msgid "quote placeholders suitably for shells"
14096 msgstr "引用占位符适用于 shells"
14098 #: builtin/for-each-ref.c:30
14099 msgid "quote placeholders suitably for perl"
14100 msgstr "引用占位符适用于 perl"
14102 #: builtin/for-each-ref.c:32
14103 msgid "quote placeholders suitably for python"
14104 msgstr "引用占位符适用于 python"
14106 #: builtin/for-each-ref.c:34
14107 msgid "quote placeholders suitably for Tcl"
14108 msgstr "引用占位符适用于 Tcl"
14110 #: builtin/for-each-ref.c:37
14111 msgid "show only <n> matched refs"
14112 msgstr "只显示 <n> 个匹配的引用"
14114 #: builtin/for-each-ref.c:39 builtin/tag.c:440
14115 msgid "respect format colors"
14116 msgstr "遵照格式中的颜色输出"
14118 #: builtin/for-each-ref.c:42
14119 msgid "print only refs which points at the given object"
14120 msgstr "只打印指向给定对象的引用"
14122 #: builtin/for-each-ref.c:44
14123 msgid "print only refs that are merged"
14124 msgstr "只打印已经合并的引用"
14126 #: builtin/for-each-ref.c:45
14127 msgid "print only refs that are not merged"
14128 msgstr "只打印没有合并的引用"
14130 #: builtin/for-each-ref.c:46
14131 msgid "print only refs which contain the commit"
14132 msgstr "只打印包含该提交的引用"
14134 #: builtin/for-each-ref.c:47
14135 msgid "print only refs which don't contain the commit"
14136 msgstr "只打印不包含该提交的引用"
14138 #: builtin/fsck.c:69 builtin/fsck.c:148 builtin/fsck.c:149
14142 #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
14143 #: builtin/fsck.c:101 builtin/fsck.c:121
14145 msgid "error in %s %s: %s"
14146 msgstr "%s %s 错误:%s"
14148 #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
14149 #: builtin/fsck.c:115
14151 msgid "warning in %s %s: %s"
14152 msgstr "%s %s 警告:%s"
14154 #: builtin/fsck.c:144 builtin/fsck.c:147
14156 msgid "broken link from %7s %s"
14157 msgstr "来自 %7s %s 的损坏的链接"
14159 #: builtin/fsck.c:156
14160 msgid "wrong object type in link"
14161 msgstr "链接中错误的对象类型"
14163 #: builtin/fsck.c:172
14166 "broken link from %7s %s\n"
14169 "损坏的链接来自于 %7s %s\n"
14172 #: builtin/fsck.c:283
14174 msgid "missing %s %s"
14177 #: builtin/fsck.c:310
14179 msgid "unreachable %s %s"
14182 #: builtin/fsck.c:330
14184 msgid "dangling %s %s"
14187 #: builtin/fsck.c:340
14188 msgid "could not create lost-found"
14189 msgstr "不能创建 lost-found"
14191 #: builtin/fsck.c:351
14193 msgid "could not finish '%s'"
14196 #: builtin/fsck.c:368
14198 msgid "Checking %s"
14201 #: builtin/fsck.c:406
14203 msgid "Checking connectivity (%d objects)"
14204 msgstr "正在检查连通性(%d 个对象)"
14206 #: builtin/fsck.c:425
14208 msgid "Checking %s %s"
14209 msgstr "正在检查 %s %s"
14211 #: builtin/fsck.c:430
14212 msgid "broken links"
14215 #: builtin/fsck.c:439
14220 #: builtin/fsck.c:447
14222 msgid "tagged %s %s (%s) in %s"
14223 msgstr "标记 %s %s (%s) 于 %s"
14225 #: builtin/fsck.c:476
14227 msgid "%s: object corrupt or missing"
14228 msgstr "%s:对象损坏或丢失"
14230 #: builtin/fsck.c:501
14232 msgid "%s: invalid reflog entry %s"
14233 msgstr "%s:无效的引用日志条目 %s"
14235 #: builtin/fsck.c:515
14237 msgid "Checking reflog %s->%s"
14238 msgstr "正在检查引用日志 %s->%s"
14240 #: builtin/fsck.c:549
14242 msgid "%s: invalid sha1 pointer %s"
14243 msgstr "%s:无效的 sha1 指针 %s"
14245 #: builtin/fsck.c:556
14247 msgid "%s: not a commit"
14250 #: builtin/fsck.c:610
14251 msgid "notice: No default references"
14254 #: builtin/fsck.c:625
14256 msgid "%s: object corrupt or missing: %s"
14257 msgstr "%s:对象损坏或丢失:%s"
14259 #: builtin/fsck.c:638
14261 msgid "%s: object could not be parsed: %s"
14262 msgstr "%s:不能解析对象:%s"
14264 #: builtin/fsck.c:658
14266 msgid "bad sha1 file: %s"
14267 msgstr "坏的 sha1 文件:%s"
14269 #: builtin/fsck.c:673
14270 msgid "Checking object directory"
14273 #: builtin/fsck.c:676
14274 msgid "Checking object directories"
14277 #: builtin/fsck.c:691
14279 msgid "Checking %s link"
14280 msgstr "正在检查 %s 链接"
14282 #: builtin/fsck.c:696 builtin/index-pack.c:843
14287 #: builtin/fsck.c:703
14289 msgid "%s points to something strange (%s)"
14290 msgstr "%s 指向奇怪的东西(%s)"
14292 #: builtin/fsck.c:709
14294 msgid "%s: detached HEAD points at nothing"
14295 msgstr "%s:分离头指针的指向不存在"
14297 #: builtin/fsck.c:713
14299 msgid "notice: %s points to an unborn branch (%s)"
14300 msgstr "注意:%s 指向一个尚未诞生的分支(%s)"
14302 #: builtin/fsck.c:725
14303 msgid "Checking cache tree"
14306 #: builtin/fsck.c:730
14308 msgid "%s: invalid sha1 pointer in cache-tree"
14309 msgstr "%s:cache-tree 中无效的 sha1 指针"
14311 #: builtin/fsck.c:739
14312 msgid "non-tree in cache-tree"
14313 msgstr "cache-tree 中非树对象"
14315 #: builtin/fsck.c:770
14316 msgid "git fsck [<options>] [<object>...]"
14317 msgstr "git fsck [<选项>] [<对象>...]"
14319 #: builtin/fsck.c:776
14320 msgid "show unreachable objects"
14323 #: builtin/fsck.c:777
14324 msgid "show dangling objects"
14327 #: builtin/fsck.c:778
14328 msgid "report tags"
14331 #: builtin/fsck.c:779
14332 msgid "report root nodes"
14335 #: builtin/fsck.c:780
14336 msgid "make index objects head nodes"
14337 msgstr "将索引亦作为检查的头节点"
14339 #: builtin/fsck.c:781
14340 msgid "make reflogs head nodes (default)"
14341 msgstr "将引用日志作为检查的头节点(默认)"
14343 #: builtin/fsck.c:782
14344 msgid "also consider packs and alternate objects"
14347 #: builtin/fsck.c:783
14348 msgid "check only connectivity"
14351 #: builtin/fsck.c:784
14352 msgid "enable more strict checking"
14355 #: builtin/fsck.c:786
14356 msgid "write dangling objects in .git/lost-found"
14357 msgstr "将悬空对象写入 .git/lost-found 中"
14359 #: builtin/fsck.c:787 builtin/prune.c:134
14360 msgid "show progress"
14363 #: builtin/fsck.c:788
14364 msgid "show verbose names for reachable objects"
14365 msgstr "显示可达对象的详细名称"
14367 #: builtin/fsck.c:847 builtin/index-pack.c:225
14368 msgid "Checking objects"
14371 #: builtin/fsck.c:875
14373 msgid "%s: object missing"
14376 #: builtin/fsck.c:886
14378 msgid "invalid parameter: expected sha1, got '%s'"
14379 msgstr "无效的参数:期望 sha1,得到 '%s'"
14382 msgid "git gc [<options>]"
14383 msgstr "git gc [<选项>]"
14387 msgid "Failed to fstat %s: %s"
14388 msgstr "对 %s 调用 fstat 失败:%s"
14390 #: builtin/gc.c:126
14392 msgid "failed to parse '%s' value '%s'"
14393 msgstr "无法解析 '%s' 值 '%s'"
14395 #: builtin/gc.c:475 builtin/init-db.c:57
14397 msgid "cannot stat '%s'"
14398 msgstr "不能对 '%s' 调用 stat"
14400 #: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:530
14402 msgid "cannot read '%s'"
14405 #: builtin/gc.c:491
14408 "The last gc run reported the following. Please correct the root cause\n"
14410 "Automatic cleanup will not be performed until the file is removed.\n"
14414 "最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n"
14415 "在该文件被删除之前,自动清理将不会执行。\n"
14419 #: builtin/gc.c:539
14420 msgid "prune unreferenced objects"
14423 #: builtin/gc.c:541
14424 msgid "be more thorough (increased runtime)"
14425 msgstr "更彻底(增加运行时间)"
14427 #: builtin/gc.c:542
14428 msgid "enable auto-gc mode"
14429 msgstr "启用自动垃圾回收模式"
14431 #: builtin/gc.c:545
14432 msgid "force running gc even if there may be another gc running"
14433 msgstr "强制执行 gc 即使另外一个 gc 正在执行"
14435 #: builtin/gc.c:548
14436 msgid "repack all other packs except the largest pack"
14437 msgstr "除了最大的包之外,对所有其它包文件重新打包"
14439 #: builtin/gc.c:565
14441 msgid "failed to parse gc.logexpiry value %s"
14442 msgstr "解析 gc.logexpiry 的值 %s 失败"
14444 #: builtin/gc.c:576
14446 msgid "failed to parse prune expiry value %s"
14447 msgstr "解析清除期限值 %s 失败"
14449 #: builtin/gc.c:596
14451 msgid "Auto packing the repository in background for optimum performance.\n"
14452 msgstr "自动在后台执行仓库打包以求最佳性能。\n"
14454 #: builtin/gc.c:598
14456 msgid "Auto packing the repository for optimum performance.\n"
14457 msgstr "自动打包仓库以求最佳性能。\n"
14459 #: builtin/gc.c:599
14461 msgid "See \"git help gc\" for manual housekeeping.\n"
14462 msgstr "手工维护参见 \"git help gc\"。\n"
14464 #: builtin/gc.c:639
14467 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
14469 "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>(如果不是,使用 --force)"
14471 #: builtin/gc.c:694
14473 "There are too many unreachable loose objects; run 'git prune' to remove them."
14474 msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
14476 #: builtin/grep.c:30
14477 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
14478 msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
14480 #: builtin/grep.c:225
14482 msgid "grep: failed to create thread: %s"
14483 msgstr "grep:无法创建线程:%s"
14485 #: builtin/grep.c:279
14487 msgid "invalid number of threads specified (%d) for %s"
14488 msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
14490 #. TRANSLATORS: %s is the configuration
14491 #. variable for tweaking threads, currently
14494 #: builtin/grep.c:287 builtin/index-pack.c:1537 builtin/index-pack.c:1730
14495 #: builtin/pack-objects.c:2855
14497 msgid "no threads support, ignoring %s"
14498 msgstr "没有线程支持,忽略 %s"
14500 #: builtin/grep.c:475 builtin/grep.c:600 builtin/grep.c:640
14502 msgid "unable to read tree (%s)"
14505 #: builtin/grep.c:655
14507 msgid "unable to grep from object of type %s"
14508 msgstr "无法抓取来自于 %s 类型的对象"
14510 #: builtin/grep.c:724
14512 msgid "switch `%c' expects a numerical value"
14513 msgstr "开关 `%c' 期望一个数字值"
14515 #: builtin/grep.c:823
14516 msgid "search in index instead of in the work tree"
14517 msgstr "在索引区搜索而不是在工作区"
14519 #: builtin/grep.c:825
14520 msgid "find in contents not managed by git"
14521 msgstr "在未被 git 管理的内容中查找"
14523 # 译者:中文字符串拼接,可删除前导空格
14524 #: builtin/grep.c:827
14525 msgid "search in both tracked and untracked files"
14526 msgstr "在跟踪和未跟踪的文件中搜索"
14528 #: builtin/grep.c:829
14529 msgid "ignore files specified via '.gitignore'"
14530 msgstr "忽略 '.gitignore' 包含的文件"
14532 #: builtin/grep.c:831
14533 msgid "recursively search in each submodule"
14534 msgstr "在每一个子模组中递归搜索"
14536 #: builtin/grep.c:834
14537 msgid "show non-matching lines"
14540 #: builtin/grep.c:836
14541 msgid "case insensitive matching"
14544 #: builtin/grep.c:838
14545 msgid "match patterns only at word boundaries"
14546 msgstr "只在单词边界匹配模式"
14548 #: builtin/grep.c:840
14549 msgid "process binary files as text"
14550 msgstr "把二进制文件当做文本处理"
14552 #: builtin/grep.c:842
14553 msgid "don't match patterns in binary files"
14554 msgstr "不在二进制文件中匹配模式"
14556 #: builtin/grep.c:845
14557 msgid "process binary files with textconv filters"
14558 msgstr "用 textconv 过滤器处理二进制文件"
14560 #: builtin/grep.c:847
14561 msgid "search in subdirectories (default)"
14562 msgstr "在子目录中寻找(默认)"
14564 #: builtin/grep.c:849
14565 msgid "descend at most <depth> levels"
14566 msgstr "最多以指定的深度向下寻找"
14568 #: builtin/grep.c:853
14569 msgid "use extended POSIX regular expressions"
14570 msgstr "使用扩展的 POSIX 正则表达式"
14572 #: builtin/grep.c:856
14573 msgid "use basic POSIX regular expressions (default)"
14574 msgstr "使用基本的 POSIX 正则表达式(默认)"
14576 #: builtin/grep.c:859
14577 msgid "interpret patterns as fixed strings"
14578 msgstr "把模式解析为固定的字符串"
14580 #: builtin/grep.c:862
14581 msgid "use Perl-compatible regular expressions"
14582 msgstr "使用 Perl 兼容的正则表达式"
14584 #: builtin/grep.c:865
14585 msgid "show line numbers"
14588 #: builtin/grep.c:866
14589 msgid "show column number of first match"
14590 msgstr "显示第一个匹配的列号"
14592 #: builtin/grep.c:867
14593 msgid "don't show filenames"
14596 #: builtin/grep.c:868
14597 msgid "show filenames"
14600 #: builtin/grep.c:870
14601 msgid "show filenames relative to top directory"
14602 msgstr "显示相对于顶级目录的文件名"
14604 #: builtin/grep.c:872
14605 msgid "show only filenames instead of matching lines"
14606 msgstr "只显示文件名而不显示匹配的行"
14608 #: builtin/grep.c:874
14609 msgid "synonym for --files-with-matches"
14610 msgstr "和 --files-with-matches 同义"
14612 #: builtin/grep.c:877
14613 msgid "show only the names of files without match"
14614 msgstr "只显示未匹配的文件名"
14616 #: builtin/grep.c:879
14617 msgid "print NUL after filenames"
14618 msgstr "在文件名后输出 NUL 字符"
14620 #: builtin/grep.c:882
14621 msgid "show only matching parts of a line"
14622 msgstr "只显示行中的匹配的部分"
14624 #: builtin/grep.c:884
14625 msgid "show the number of matches instead of matching lines"
14626 msgstr "显示总匹配行数,而不显示匹配的行"
14628 #: builtin/grep.c:885
14629 msgid "highlight matches"
14632 #: builtin/grep.c:887
14633 msgid "print empty line between matches from different files"
14634 msgstr "在不同文件的匹配项之间打印空行"
14636 #: builtin/grep.c:889
14637 msgid "show filename only once above matches from same file"
14638 msgstr "只在同一文件的匹配项的上面显示一次文件名"
14640 #: builtin/grep.c:892
14641 msgid "show <n> context lines before and after matches"
14642 msgstr "显示匹配项前后的 <n> 行上下文"
14644 #: builtin/grep.c:895
14645 msgid "show <n> context lines before matches"
14646 msgstr "显示匹配项前 <n> 行上下文"
14648 #: builtin/grep.c:897
14649 msgid "show <n> context lines after matches"
14650 msgstr "显示匹配项后 <n> 行上下文"
14652 #: builtin/grep.c:899
14653 msgid "use <n> worker threads"
14654 msgstr "使用 <n> 个工作线程"
14656 #: builtin/grep.c:900
14657 msgid "shortcut for -C NUM"
14660 #: builtin/grep.c:903
14661 msgid "show a line with the function name before matches"
14662 msgstr "在匹配的前面显示一行函数名"
14664 #: builtin/grep.c:905
14665 msgid "show the surrounding function"
14666 msgstr "显示所在函数的前后内容"
14668 #: builtin/grep.c:908
14669 msgid "read patterns from file"
14672 #: builtin/grep.c:910
14673 msgid "match <pattern>"
14676 #: builtin/grep.c:912
14677 msgid "combine patterns specified with -e"
14678 msgstr "组合用 -e 参数设定的模式"
14680 #: builtin/grep.c:924
14681 msgid "indicate hit with exit status without output"
14682 msgstr "不输出,而用退出码标识命中状态"
14684 #: builtin/grep.c:926
14685 msgid "show only matches from files that match all patterns"
14686 msgstr "只显示匹配所有模式的文件中的匹配"
14688 #: builtin/grep.c:928
14689 msgid "show parse tree for grep expression"
14690 msgstr "显示 grep 表达式的解析树"
14692 #: builtin/grep.c:932
14696 #: builtin/grep.c:932
14697 msgid "show matching files in the pager"
14700 #: builtin/grep.c:936
14701 msgid "allow calling of grep(1) (ignored by this build)"
14702 msgstr "允许调用 grep(1)(本次构建忽略)"
14704 #: builtin/grep.c:1003
14705 msgid "no pattern given"
14708 #: builtin/grep.c:1039
14709 msgid "--no-index or --untracked cannot be used with revs"
14710 msgstr "--no-index 或 --untracked 不能和版本同时使用"
14712 #: builtin/grep.c:1047
14714 msgid "unable to resolve revision: %s"
14717 #: builtin/grep.c:1077
14718 msgid "--untracked not supported with --recurse-submodules"
14719 msgstr "--untracked 不支持和 --recurse-submodules 共用"
14721 #: builtin/grep.c:1081
14722 msgid "invalid option combination, ignoring --threads"
14723 msgstr "无效的选项组合,忽略 --threads"
14725 #: builtin/grep.c:1084 builtin/pack-objects.c:3548
14726 msgid "no threads support, ignoring --threads"
14727 msgstr "没有线程支持,忽略 --threads"
14729 #: builtin/grep.c:1087 builtin/index-pack.c:1534 builtin/pack-objects.c:2852
14731 msgid "invalid number of threads specified (%d)"
14732 msgstr "指定的线程数无效(%d)"
14734 #: builtin/grep.c:1121
14735 msgid "--open-files-in-pager only works on the worktree"
14736 msgstr "--open-files-in-pager 仅用于工作区"
14738 #: builtin/grep.c:1147
14739 msgid "--cached or --untracked cannot be used with --no-index"
14740 msgstr "--cached 或 --untracked 不能与 --no-index 同时使用"
14742 #: builtin/grep.c:1153
14743 msgid "--[no-]exclude-standard cannot be used for tracked contents"
14744 msgstr "--[no-]exclude-standard 不能用于已跟踪内容"
14746 #: builtin/grep.c:1161
14747 msgid "both --cached and trees are given"
14748 msgstr "同时给出了 --cached 和树对象"
14750 #: builtin/hash-object.c:85
14752 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
14755 "git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
14758 #: builtin/hash-object.c:86
14759 msgid "git hash-object --stdin-paths"
14760 msgstr "git hash-object --stdin-paths"
14762 #: builtin/hash-object.c:98
14763 msgid "object type"
14766 #: builtin/hash-object.c:99
14767 msgid "write the object into the object database"
14768 msgstr "将对象写入对象数据库"
14770 #: builtin/hash-object.c:101
14771 msgid "read the object from stdin"
14774 #: builtin/hash-object.c:103
14775 msgid "store file as is without filters"
14776 msgstr "原样存储文件不使用过滤器"
14778 #: builtin/hash-object.c:104
14780 "just hash any random garbage to create corrupt objects for debugging Git"
14781 msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
14783 #: builtin/hash-object.c:105
14784 msgid "process file as it were from this path"
14785 msgstr "处理文件并假设其来自于此路径"
14787 #: builtin/help.c:47
14788 msgid "print all available commands"
14791 #: builtin/help.c:48
14792 msgid "exclude guides"
14795 #: builtin/help.c:49
14796 msgid "print list of useful guides"
14799 #: builtin/help.c:50
14800 msgid "print all configuration variable names"
14801 msgstr "打印所有配置变量名称"
14803 #: builtin/help.c:52
14804 msgid "show man page"
14807 #: builtin/help.c:53
14808 msgid "show manual in web browser"
14809 msgstr "在 web 浏览器中显示手册"
14811 #: builtin/help.c:55
14812 msgid "show info page"
14813 msgstr "显示 info 手册"
14815 #: builtin/help.c:57
14816 msgid "print command description"
14819 #: builtin/help.c:62
14820 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
14821 msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
14823 #: builtin/help.c:163
14825 msgid "unrecognized help format '%s'"
14826 msgstr "未能识别的帮助格式 '%s'"
14828 #: builtin/help.c:190
14829 msgid "Failed to start emacsclient."
14830 msgstr "无法启动 emacsclient。"
14832 #: builtin/help.c:203
14833 msgid "Failed to parse emacsclient version."
14834 msgstr "无法解析 emacsclient 版本。"
14836 #: builtin/help.c:211
14838 msgid "emacsclient version '%d' too old (< 22)."
14839 msgstr "emacsclient 版本 '%d' 太老(< 22)。"
14841 #: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
14843 msgid "failed to exec '%s'"
14844 msgstr "执行 '%s' 失败"
14846 #: builtin/help.c:307
14849 "'%s': path for unsupported man viewer.\n"
14850 "Please consider using 'man.<tool>.cmd' instead."
14852 "'%s':不支持的 man 手册查看器的路径。\n"
14853 "请使用 'man.<工具>.cmd'。"
14855 #: builtin/help.c:319
14858 "'%s': cmd for supported man viewer.\n"
14859 "Please consider using 'man.<tool>.path' instead."
14861 "'%s': 支持的 man 手册查看器命令。\n"
14862 "请使用 'man.<工具>.path'。"
14864 #: builtin/help.c:436
14866 msgid "'%s': unknown man viewer."
14867 msgstr "'%s':未知的 man 查看器。"
14869 #: builtin/help.c:453
14870 msgid "no man viewer handled the request"
14871 msgstr "没有 man 查看器处理此请求"
14873 #: builtin/help.c:461
14874 msgid "no info viewer handled the request"
14875 msgstr "没有 info 查看器处理此请求"
14877 #: builtin/help.c:520 builtin/help.c:531 git.c:337
14879 msgid "'%s' is aliased to '%s'"
14880 msgstr "'%s' 是 '%s' 的别名"
14882 #: builtin/help.c:534 git.c:367
14884 msgid "bad alias.%s string: %s"
14885 msgstr "坏的 alias.%s 字符串:%s"
14887 #: builtin/help.c:563 builtin/help.c:593
14889 msgid "usage: %s%s"
14892 #: builtin/help.c:577
14893 msgid "'git help config' for more information"
14894 msgstr "'git help config' 获取更多信息"
14896 #: builtin/index-pack.c:185
14898 msgid "object type mismatch at %s"
14899 msgstr "%s 的对象类型不匹配"
14901 #: builtin/index-pack.c:205
14903 msgid "did not receive expected object %s"
14904 msgstr "未能获取预期的对象 %s"
14906 #: builtin/index-pack.c:208
14908 msgid "object %s: expected type %s, found %s"
14909 msgstr "对象 %s:应为类型 %s,却是 %s"
14911 #: builtin/index-pack.c:258
14913 msgid "cannot fill %d byte"
14914 msgid_plural "cannot fill %d bytes"
14915 msgstr[0] "无法填充 %d 字节"
14916 msgstr[1] "无法填充 %d 字节"
14918 #: builtin/index-pack.c:268
14920 msgstr "过早的文件结束符(EOF)"
14922 #: builtin/index-pack.c:269
14923 msgid "read error on input"
14926 #: builtin/index-pack.c:281
14927 msgid "used more bytes than were available"
14928 msgstr "用掉了超过可用的字节"
14930 #: builtin/index-pack.c:288 builtin/pack-objects.c:607
14931 msgid "pack too large for current definition of off_t"
14932 msgstr "包太大超过了当前 off_t 的定义"
14934 #: builtin/index-pack.c:291 builtin/unpack-objects.c:95
14935 msgid "pack exceeds maximum allowed size"
14938 #: builtin/index-pack.c:306 builtin/repack.c:250
14940 msgid "unable to create '%s'"
14943 #: builtin/index-pack.c:312
14945 msgid "cannot open packfile '%s'"
14946 msgstr "无法打开包文件 '%s'"
14948 #: builtin/index-pack.c:326
14949 msgid "pack signature mismatch"
14952 #: builtin/index-pack.c:328
14954 msgid "pack version %<PRIu32> unsupported"
14955 msgstr "不支持包版本 %<PRIu32>"
14957 #: builtin/index-pack.c:346
14959 msgid "pack has bad object at offset %<PRIuMAX>: %s"
14960 msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>:%s"
14962 #: builtin/index-pack.c:466
14964 msgid "inflate returned %d"
14967 #: builtin/index-pack.c:515
14968 msgid "offset value overflow for delta base object"
14969 msgstr "偏移值覆盖了 delta 基准对象"
14971 #: builtin/index-pack.c:523
14972 msgid "delta base offset is out of bound"
14973 msgstr "delta 基准偏移越界"
14975 #: builtin/index-pack.c:531
14977 msgid "unknown object type %d"
14980 #: builtin/index-pack.c:562
14981 msgid "cannot pread pack file"
14984 #: builtin/index-pack.c:564
14986 msgid "premature end of pack file, %<PRIuMAX> byte missing"
14987 msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
14988 msgstr[0] "包文件过早结束,缺少 %<PRIuMAX> 字节"
14989 msgstr[1] "包文件过早结束,缺少 %<PRIuMAX> 字节"
14991 #: builtin/index-pack.c:590
14992 msgid "serious inflate inconsistency"
14995 #: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:765
14996 #: builtin/index-pack.c:804 builtin/index-pack.c:813
14998 msgid "SHA1 COLLISION FOUND WITH %s !"
14999 msgstr "发现 %s 出现 SHA1 冲突!"
15001 #: builtin/index-pack.c:738 builtin/pack-objects.c:159
15002 #: builtin/pack-objects.c:219 builtin/pack-objects.c:314
15004 msgid "unable to read %s"
15007 #: builtin/index-pack.c:802
15009 msgid "cannot read existing object info %s"
15010 msgstr "不能读取现存对象信息 %s"
15012 #: builtin/index-pack.c:810
15014 msgid "cannot read existing object %s"
15015 msgstr "不能读取现存对象 %s"
15017 #: builtin/index-pack.c:824
15019 msgid "invalid blob object %s"
15020 msgstr "无效的数据对象 %s"
15022 #: builtin/index-pack.c:827 builtin/index-pack.c:846
15023 msgid "fsck error in packed object"
15024 msgstr "对打包对象 fsck 检查出错"
15026 #: builtin/index-pack.c:848
15028 msgid "Not all child objects of %s are reachable"
15029 msgstr "%s 的所有子对象并非都可达"
15031 #: builtin/index-pack.c:920 builtin/index-pack.c:951
15032 msgid "failed to apply delta"
15033 msgstr "应用 delta 失败"
15035 #: builtin/index-pack.c:1121
15036 msgid "Receiving objects"
15039 #: builtin/index-pack.c:1121
15040 msgid "Indexing objects"
15043 #: builtin/index-pack.c:1155
15044 msgid "pack is corrupted (SHA1 mismatch)"
15045 msgstr "包冲突(SHA1 不匹配)"
15047 #: builtin/index-pack.c:1160
15048 msgid "cannot fstat packfile"
15049 msgstr "不能对包文件调用 fstat"
15051 #: builtin/index-pack.c:1163
15052 msgid "pack has junk at the end"
15055 #: builtin/index-pack.c:1175
15056 msgid "confusion beyond insanity in parse_pack_objects()"
15057 msgstr "parse_pack_objects() 中遇到不可理喻的问题"
15059 #: builtin/index-pack.c:1198
15060 msgid "Resolving deltas"
15061 msgstr "处理 delta 中"
15063 #: builtin/index-pack.c:1208 builtin/pack-objects.c:2616
15065 msgid "unable to create thread: %s"
15068 #: builtin/index-pack.c:1249
15069 msgid "confusion beyond insanity"
15072 #: builtin/index-pack.c:1255
15074 msgid "completed with %d local object"
15075 msgid_plural "completed with %d local objects"
15076 msgstr[0] "完成 %d 个本地对象"
15077 msgstr[1] "完成 %d 个本地对象"
15079 #: builtin/index-pack.c:1267
15081 msgid "Unexpected tail checksum for %s (disk corruption?)"
15082 msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
15084 #: builtin/index-pack.c:1271
15086 msgid "pack has %d unresolved delta"
15087 msgid_plural "pack has %d unresolved deltas"
15088 msgstr[0] "包有 %d 个未解决的 delta"
15089 msgstr[1] "包有 %d 个未解决的 delta"
15091 #: builtin/index-pack.c:1295
15093 msgid "unable to deflate appended object (%d)"
15094 msgstr "不能压缩附加对象(%d)"
15096 #: builtin/index-pack.c:1391
15098 msgid "local object %s is corrupt"
15099 msgstr "本地对象 %s 已损坏"
15101 #: builtin/index-pack.c:1405
15103 msgid "packfile name '%s' does not end with '.pack'"
15104 msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
15106 #: builtin/index-pack.c:1430
15108 msgid "cannot write %s file '%s'"
15109 msgstr "无法写入 %s 文件 '%s'"
15111 #: builtin/index-pack.c:1438
15113 msgid "cannot close written %s file '%s'"
15114 msgstr "无法关闭已写入的 %s 文件 '%s'"
15116 #: builtin/index-pack.c:1462
15117 msgid "error while closing pack file"
15120 #: builtin/index-pack.c:1476
15121 msgid "cannot store pack file"
15124 #: builtin/index-pack.c:1484
15125 msgid "cannot store index file"
15128 #: builtin/index-pack.c:1528 builtin/pack-objects.c:2863
15130 msgid "bad pack.indexversion=%<PRIu32>"
15131 msgstr "坏的 pack.indexversion=%<PRIu32>"
15133 #: builtin/index-pack.c:1596
15135 msgid "Cannot open existing pack file '%s'"
15136 msgstr "无法打开现存包文件 '%s'"
15138 #: builtin/index-pack.c:1598
15140 msgid "Cannot open existing pack idx file for '%s'"
15141 msgstr "无法为 %s 打开包索引文件"
15143 #: builtin/index-pack.c:1646
15145 msgid "non delta: %d object"
15146 msgid_plural "non delta: %d objects"
15147 msgstr[0] "非 delta:%d 个对象"
15148 msgstr[1] "非 delta:%d 个对象"
15150 #: builtin/index-pack.c:1653
15152 msgid "chain length = %d: %lu object"
15153 msgid_plural "chain length = %d: %lu objects"
15154 msgstr[0] "链长 = %d: %lu 对象"
15155 msgstr[1] "链长 = %d: %lu 对象"
15157 #: builtin/index-pack.c:1692
15158 msgid "Cannot come back to cwd"
15159 msgstr "无法返回当前工作目录"
15161 #: builtin/index-pack.c:1741 builtin/index-pack.c:1744
15162 #: builtin/index-pack.c:1760 builtin/index-pack.c:1764
15167 #: builtin/index-pack.c:1780
15168 msgid "--fix-thin cannot be used without --stdin"
15169 msgstr "--fix-thin 不能和 --stdin 同时使用"
15171 #: builtin/index-pack.c:1782
15172 msgid "--stdin requires a git repository"
15173 msgstr "--stdin 需要一个 git 仓库"
15175 #: builtin/index-pack.c:1788
15176 msgid "--verify with no packfile name given"
15177 msgstr "--verify 没有提供包文件名参数"
15179 #: builtin/index-pack.c:1836 builtin/unpack-objects.c:582
15180 msgid "fsck error in pack objects"
15181 msgstr "在打包对象中 fsck 检查出错"
15183 #: builtin/init-db.c:63
15185 msgid "cannot stat template '%s'"
15186 msgstr "不能对模版 '%s' 调用 stat"
15188 #: builtin/init-db.c:68
15190 msgid "cannot opendir '%s'"
15191 msgstr "不能打开目录 '%s'"
15193 #: builtin/init-db.c:80
15195 msgid "cannot readlink '%s'"
15196 msgstr "不能读取链接 '%s'"
15198 #: builtin/init-db.c:82
15200 msgid "cannot symlink '%s' '%s'"
15201 msgstr "不能自 '%s' 到 '%s' 创建符号链接"
15203 #: builtin/init-db.c:88
15205 msgid "cannot copy '%s' to '%s'"
15206 msgstr "不能拷贝 '%s' 至 '%s'"
15208 #: builtin/init-db.c:92
15210 msgid "ignoring template %s"
15213 #: builtin/init-db.c:123
15215 msgid "templates not found in %s"
15216 msgstr "没有在 %s 中找到模版"
15218 #: builtin/init-db.c:138
15220 msgid "not copying templates from '%s': %s"
15221 msgstr "没有从 '%s' 复制模版:%s"
15223 #: builtin/init-db.c:356
15225 msgid "unable to handle file type %d"
15226 msgstr "不能处理 %d 类型的文件"
15228 #: builtin/init-db.c:359
15230 msgid "unable to move %s to %s"
15231 msgstr "不能移动 %s 至 %s"
15233 #: builtin/init-db.c:374
15234 msgid "attempt to reinitialize repository with different hash"
15235 msgstr "尝试用不同的哈希算法重新初始化仓库"
15237 #: builtin/init-db.c:380 builtin/init-db.c:601
15239 msgid "unknown hash algorithm '%s'"
15240 msgstr "未知的哈希算法 '%s'"
15242 #: builtin/init-db.c:397 builtin/init-db.c:400
15244 msgid "%s already exists"
15247 #: builtin/init-db.c:458
15249 msgid "Reinitialized existing shared Git repository in %s%s\n"
15250 msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n"
15252 #: builtin/init-db.c:459
15254 msgid "Reinitialized existing Git repository in %s%s\n"
15255 msgstr "重新初始化已存在的 Git 仓库于 %s%s\n"
15257 #: builtin/init-db.c:463
15259 msgid "Initialized empty shared Git repository in %s%s\n"
15260 msgstr "已初始化空的共享 Git 仓库于 %s%s\n"
15262 #: builtin/init-db.c:464
15264 msgid "Initialized empty Git repository in %s%s\n"
15265 msgstr "已初始化空的 Git 仓库于 %s%s\n"
15267 #: builtin/init-db.c:513
15269 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
15270 "shared[=<permissions>]] [<directory>]"
15272 "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
15275 #: builtin/init-db.c:538
15276 msgid "permissions"
15279 #: builtin/init-db.c:539
15280 msgid "specify that the git repository is to be shared amongst several users"
15281 msgstr "指定 git 仓库是多个用户之间共享的"
15283 #: builtin/init-db.c:544
15287 #: builtin/init-db.c:545
15288 msgid "specify the hash algorithm to use"
15289 msgstr "指定要使用的哈希算法"
15291 #: builtin/init-db.c:578 builtin/init-db.c:583
15293 msgid "cannot mkdir %s"
15296 #: builtin/init-db.c:587
15298 msgid "cannot chdir to %s"
15299 msgstr "不能切换目录到 %s"
15301 #: builtin/init-db.c:614
15304 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
15306 msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)"
15308 #: builtin/init-db.c:642
15310 msgid "Cannot access work tree '%s'"
15311 msgstr "不能访问工作区 '%s'"
15313 #: builtin/interpret-trailers.c:16
15315 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
15316 "<token>[(=|:)<value>])...] [<file>...]"
15318 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值"
15319 ">])...] [<文件>...]"
15321 #: builtin/interpret-trailers.c:95
15322 msgid "edit files in place"
15325 #: builtin/interpret-trailers.c:96
15326 msgid "trim empty trailers"
15329 #: builtin/interpret-trailers.c:99
15330 msgid "where to place the new trailer"
15331 msgstr "在哪里放置新的尾部署名"
15333 #: builtin/interpret-trailers.c:101
15334 msgid "action if trailer already exists"
15335 msgstr "当尾部署名已经存在时所采取的动作"
15337 #: builtin/interpret-trailers.c:103
15338 msgid "action if trailer is missing"
15339 msgstr "当尾部署名缺失时所采取的动作"
15341 #: builtin/interpret-trailers.c:105
15342 msgid "output only the trailers"
15345 #: builtin/interpret-trailers.c:106
15346 msgid "do not apply config rules"
15349 #: builtin/interpret-trailers.c:107
15350 msgid "join whitespace-continued values"
15353 #: builtin/interpret-trailers.c:108
15354 msgid "set parsing options"
15357 #: builtin/interpret-trailers.c:110
15358 msgid "do not treat --- specially"
15359 msgstr "不要对 --- 特殊处理"
15361 #: builtin/interpret-trailers.c:111
15365 #: builtin/interpret-trailers.c:112
15366 msgid "trailer(s) to add"
15369 #: builtin/interpret-trailers.c:123
15370 msgid "--trailer with --only-input does not make sense"
15371 msgstr "--trailer 和 --only-input 同时使用没有意义"
15373 #: builtin/interpret-trailers.c:133
15374 msgid "no input file given for in-place editing"
15375 msgstr "没有给出要原位编辑的文件"
15377 #: builtin/log.c:57
15378 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
15379 msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
15381 #: builtin/log.c:58
15382 msgid "git show [<options>] <object>..."
15383 msgstr "git show [<选项>] <对象>..."
15385 #: builtin/log.c:111
15387 msgid "invalid --decorate option: %s"
15388 msgstr "无效的 --decorate 选项:%s"
15390 #: builtin/log.c:178
15391 msgid "show source"
15394 #: builtin/log.c:179
15395 msgid "Use mail map file"
15398 #: builtin/log.c:182
15399 msgid "only decorate refs that match <pattern>"
15400 msgstr "只修饰与 <模式> 匹配的引用"
15402 #: builtin/log.c:184
15403 msgid "do not decorate refs that match <pattern>"
15404 msgstr "不修饰和 <模式> 匹配的引用"
15406 #: builtin/log.c:185
15407 msgid "decorate options"
15410 #: builtin/log.c:188
15411 msgid "Process line range n,m in file, counting from 1"
15412 msgstr "处理文件中第 n 到 m 之间的行,从 1 开始"
15414 #: builtin/log.c:298
15416 msgid "Final output: %d %s\n"
15417 msgstr "最终输出:%d %s\n"
15419 #: builtin/log.c:556
15421 msgid "git show %s: bad file"
15422 msgstr "git show %s: 损坏的文件"
15424 #: builtin/log.c:571 builtin/log.c:666
15426 msgid "could not read object %s"
15429 #: builtin/log.c:691
15431 msgid "unknown type: %d"
15434 #: builtin/log.c:835
15436 msgid "%s: invalid cover from description mode"
15437 msgstr "%s:从描述生成附函的模式无效"
15439 #: builtin/log.c:842
15440 msgid "format.headers without value"
15441 msgstr "format.headers 没有值"
15443 #: builtin/log.c:957
15444 msgid "name of output directory is too long"
15447 #: builtin/log.c:973
15449 msgid "cannot open patch file %s"
15450 msgstr "无法打开补丁文件 %s"
15452 #: builtin/log.c:990
15453 msgid "need exactly one range"
15456 #: builtin/log.c:1000
15457 msgid "not a range"
15460 #: builtin/log.c:1164
15461 msgid "cover letter needs email format"
15462 msgstr "附函需要邮件地址格式"
15464 #: builtin/log.c:1170
15465 msgid "failed to create cover-letter file"
15468 #: builtin/log.c:1249
15470 msgid "insane in-reply-to: %s"
15471 msgstr "不正常的 in-reply-to:%s"
15473 #: builtin/log.c:1276
15474 msgid "git format-patch [<options>] [<since> | <revision-range>]"
15475 msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
15477 #: builtin/log.c:1334
15478 msgid "two output directories?"
15481 #: builtin/log.c:1445 builtin/log.c:2217 builtin/log.c:2219 builtin/log.c:2231
15483 msgid "unknown commit %s"
15486 #: builtin/log.c:1455 builtin/replace.c:58 builtin/replace.c:207
15487 #: builtin/replace.c:210
15489 msgid "failed to resolve '%s' as a valid ref"
15490 msgstr "无法将 '%s' 解析为一个有效引用"
15492 #: builtin/log.c:1460
15493 msgid "could not find exact merge base"
15494 msgstr "不能找到准确的合并基线"
15496 #: builtin/log.c:1464
15498 "failed to get upstream, if you want to record base commit automatically,\n"
15499 "please use git branch --set-upstream-to to track a remote branch.\n"
15500 "Or you could specify base commit by --base=<base-commit-id> manually"
15502 "无法得到上游地址,如果你想自动记录基线提交,请使用命令\n"
15503 "git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n"
15504 "参数 --base=<基线提交> 手动指定一个基线提交"
15506 #: builtin/log.c:1484
15507 msgid "failed to find exact merge base"
15508 msgstr "无法找到准确的合并基线"
15510 #: builtin/log.c:1495
15511 msgid "base commit should be the ancestor of revision list"
15512 msgstr "基线提交应该是版本列表的祖先"
15514 #: builtin/log.c:1499
15515 msgid "base commit shouldn't be in revision list"
15516 msgstr "基线提交不应该出现在版本列表中"
15518 #: builtin/log.c:1552
15519 msgid "cannot get patch id"
15522 #: builtin/log.c:1604
15523 msgid "failed to infer range-diff ranges"
15524 msgstr "无法推断 range-diff 范围"
15526 #: builtin/log.c:1650
15527 msgid "use [PATCH n/m] even with a single patch"
15528 msgstr "使用 [PATCH n/m],即使只有一个补丁"
15530 #: builtin/log.c:1653
15531 msgid "use [PATCH] even with multiple patches"
15532 msgstr "使用 [PATCH],即使有多个补丁"
15534 #: builtin/log.c:1657
15535 msgid "print patches to standard out"
15538 #: builtin/log.c:1659
15539 msgid "generate a cover letter"
15542 #: builtin/log.c:1661
15543 msgid "use simple number sequence for output file names"
15544 msgstr "使用简单的数字序列作为输出文件名"
15546 #: builtin/log.c:1662
15550 #: builtin/log.c:1663
15551 msgid "use <sfx> instead of '.patch'"
15552 msgstr "使用 <后缀> 代替 '.patch'"
15554 #: builtin/log.c:1665
15555 msgid "start numbering patches at <n> instead of 1"
15556 msgstr "补丁以 <n> 开始编号,而不是1"
15558 #: builtin/log.c:1667
15559 msgid "mark the series as Nth re-roll"
15560 msgstr "标记补丁系列是第几次重制"
15562 #: builtin/log.c:1669
15563 msgid "Use [RFC PATCH] instead of [PATCH]"
15564 msgstr "使用 [RFC PATCH] 代替 [PATCH]"
15566 #: builtin/log.c:1672
15567 msgid "cover-from-description-mode"
15568 msgstr "从分支描述获取附函的模式"
15570 #: builtin/log.c:1673
15571 msgid "generate parts of a cover letter based on a branch's description"
15572 msgstr "基于一个分支描述生成部分附函"
15574 #: builtin/log.c:1675
15575 msgid "Use [<prefix>] instead of [PATCH]"
15576 msgstr "使用 [<前缀>] 代替 [PATCH]"
15578 #: builtin/log.c:1678
15579 msgid "store resulting files in <dir>"
15580 msgstr "把结果文件存储在 <目录>"
15582 #: builtin/log.c:1681
15583 msgid "don't strip/add [PATCH]"
15584 msgstr "不删除/添加 [PATCH]"
15586 #: builtin/log.c:1684
15587 msgid "don't output binary diffs"
15590 #: builtin/log.c:1686
15591 msgid "output all-zero hash in From header"
15592 msgstr "在 From 头信息中输出全为零的哈希值"
15594 #: builtin/log.c:1688
15595 msgid "don't include a patch matching a commit upstream"
15596 msgstr "不包含已在上游提交中的补丁"
15598 #: builtin/log.c:1690
15599 msgid "show patch format instead of default (patch + stat)"
15600 msgstr "显示纯补丁格式而非默认的(补丁+状态)"
15602 #: builtin/log.c:1692
15606 #: builtin/log.c:1693
15610 #: builtin/log.c:1694
15611 msgid "add email header"
15614 #: builtin/log.c:1695 builtin/log.c:1696
15618 #: builtin/log.c:1695
15619 msgid "add To: header"
15622 #: builtin/log.c:1696
15623 msgid "add Cc: header"
15626 #: builtin/log.c:1697
15630 #: builtin/log.c:1698
15631 msgid "set From address to <ident> (or committer ident if absent)"
15632 msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)"
15634 #: builtin/log.c:1700
15638 #: builtin/log.c:1701
15639 msgid "make first mail a reply to <message-id>"
15640 msgstr "使第一封邮件作为对 <邮件标识> 的回复"
15642 #: builtin/log.c:1702 builtin/log.c:1705
15646 #: builtin/log.c:1703
15647 msgid "attach the patch"
15650 #: builtin/log.c:1706
15651 msgid "inline the patch"
15654 #: builtin/log.c:1710
15655 msgid "enable message threading, styles: shallow, deep"
15656 msgstr "启用邮件线索,风格:浅,深"
15658 #: builtin/log.c:1712
15662 #: builtin/log.c:1713
15663 msgid "add a signature"
15666 #: builtin/log.c:1714
15667 msgid "base-commit"
15670 #: builtin/log.c:1715
15671 msgid "add prerequisite tree info to the patch series"
15672 msgstr "为补丁列表添加前置树信息"
15674 #: builtin/log.c:1717
15675 msgid "add a signature from a file"
15678 #: builtin/log.c:1718
15679 msgid "don't print the patch filenames"
15682 #: builtin/log.c:1720
15683 msgid "show progress while generating patches"
15684 msgstr "在生成补丁时显示进度"
15686 #: builtin/log.c:1722
15687 msgid "show changes against <rev> in cover letter or single patch"
15688 msgstr "在附函或单个补丁中显示和 <rev> 的差异"
15690 #: builtin/log.c:1725
15691 msgid "show changes against <refspec> in cover letter or single patch"
15692 msgstr "在附函或单个补丁中显示和 <refspec> 的差异"
15694 #: builtin/log.c:1727
15695 msgid "percentage by which creation is weighted"
15698 #: builtin/log.c:1812
15700 msgid "invalid ident line: %s"
15701 msgstr "包含无效的身份标识:%s"
15703 #: builtin/log.c:1827
15704 msgid "-n and -k are mutually exclusive"
15705 msgstr "-n 和 -k 互斥"
15707 #: builtin/log.c:1829
15708 msgid "--subject-prefix/--rfc and -k are mutually exclusive"
15709 msgstr "--subject-prefix/--rfc 和 -k 互斥"
15711 #: builtin/log.c:1837
15712 msgid "--name-only does not make sense"
15713 msgstr "--name-only 无意义"
15715 #: builtin/log.c:1839
15716 msgid "--name-status does not make sense"
15717 msgstr "--name-status 无意义"
15719 #: builtin/log.c:1841
15720 msgid "--check does not make sense"
15721 msgstr "--check 无意义"
15723 #: builtin/log.c:1874
15724 msgid "standard output, or directory, which one?"
15725 msgstr "标准输出或目录,哪一个?"
15727 #: builtin/log.c:1978
15728 msgid "--interdiff requires --cover-letter or single patch"
15729 msgstr "--interdiff 需要 --cover-letter 或单一补丁"
15731 #: builtin/log.c:1982
15735 #: builtin/log.c:1983
15737 msgid "Interdiff against v%d:"
15738 msgstr "对 v%d 的版本差异:"
15740 #: builtin/log.c:1989
15741 msgid "--creation-factor requires --range-diff"
15742 msgstr "--creation-factor 需要 --range-diff"
15744 #: builtin/log.c:1993
15745 msgid "--range-diff requires --cover-letter or single patch"
15746 msgstr "--range-diff 需要 --cover-letter 或单一补丁"
15748 #: builtin/log.c:2001
15749 msgid "Range-diff:"
15752 #: builtin/log.c:2002
15754 msgid "Range-diff against v%d:"
15755 msgstr "对 v%d 的范围差异:"
15757 #: builtin/log.c:2013
15759 msgid "unable to read signature file '%s'"
15760 msgstr "无法读取签名文件 '%s'"
15762 #: builtin/log.c:2049
15763 msgid "Generating patches"
15766 #: builtin/log.c:2093
15767 msgid "failed to create output files"
15770 #: builtin/log.c:2152
15771 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
15772 msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
15774 #: builtin/log.c:2206
15777 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
15778 msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n"
15780 #: builtin/ls-files.c:471
15781 msgid "git ls-files [<options>] [<file>...]"
15782 msgstr "git ls-files [<选项>] [<文件>...]"
15784 #: builtin/ls-files.c:527
15785 msgid "identify the file status with tags"
15786 msgstr "用标签标识文件的状态"
15788 #: builtin/ls-files.c:529
15789 msgid "use lowercase letters for 'assume unchanged' files"
15790 msgstr "使用小写字母表示 '假设未改变的' 文件"
15792 #: builtin/ls-files.c:531
15793 msgid "use lowercase letters for 'fsmonitor clean' files"
15794 msgstr "使用小写字母表示 'fsmonitor clean' 文件"
15796 #: builtin/ls-files.c:533
15797 msgid "show cached files in the output (default)"
15798 msgstr "显示缓存的文件(默认)"
15800 #: builtin/ls-files.c:535
15801 msgid "show deleted files in the output"
15804 #: builtin/ls-files.c:537
15805 msgid "show modified files in the output"
15808 #: builtin/ls-files.c:539
15809 msgid "show other files in the output"
15812 #: builtin/ls-files.c:541
15813 msgid "show ignored files in the output"
15816 #: builtin/ls-files.c:544
15817 msgid "show staged contents' object name in the output"
15818 msgstr "显示暂存区内容的对象名称"
15820 #: builtin/ls-files.c:546
15821 msgid "show files on the filesystem that need to be removed"
15822 msgstr "显示文件系统需要删除的文件"
15824 #: builtin/ls-files.c:548
15825 msgid "show 'other' directories' names only"
15826 msgstr "只显示“其他”目录的名称"
15828 #: builtin/ls-files.c:550
15829 msgid "show line endings of files"
15832 #: builtin/ls-files.c:552
15833 msgid "don't show empty directories"
15836 #: builtin/ls-files.c:555
15837 msgid "show unmerged files in the output"
15840 #: builtin/ls-files.c:557
15841 msgid "show resolve-undo information"
15842 msgstr "显示 resolve-undo 信息"
15844 #: builtin/ls-files.c:559
15845 msgid "skip files matching pattern"
15848 #: builtin/ls-files.c:562
15849 msgid "exclude patterns are read from <file>"
15850 msgstr "从 <文件> 中读取排除模式"
15852 #: builtin/ls-files.c:565
15853 msgid "read additional per-directory exclude patterns in <file>"
15854 msgstr "从 <文件> 读取额外的每个目录的排除模式"
15856 #: builtin/ls-files.c:567
15857 msgid "add the standard git exclusions"
15858 msgstr "添加标准的 git 排除"
15860 #: builtin/ls-files.c:571
15861 msgid "make the output relative to the project top directory"
15862 msgstr "显示相对于顶级目录的文件名"
15864 #: builtin/ls-files.c:574
15865 msgid "recurse through submodules"
15868 #: builtin/ls-files.c:576
15869 msgid "if any <file> is not in the index, treat this as an error"
15870 msgstr "如果任何 <文件> 都不在索引区,视为错误"
15872 #: builtin/ls-files.c:577
15876 #: builtin/ls-files.c:578
15877 msgid "pretend that paths removed since <tree-ish> are still present"
15878 msgstr "假装自从 <树对象> 之后删除的路径仍然存在"
15880 #: builtin/ls-files.c:580
15881 msgid "show debugging data"
15884 #: builtin/ls-remote.c:9
15886 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
15887 " [-q | --quiet] [--exit-code] [--get-url]\n"
15888 " [--symref] [<repository> [<refs>...]]"
15890 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
15891 " [-q | --quiet] [--exit-code] [--get-url]\n"
15892 " [--symref] [<仓库> [<引用>...]]"
15894 #: builtin/ls-remote.c:59
15895 msgid "do not print remote URL"
15898 #: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1384
15902 #: builtin/ls-remote.c:61 builtin/ls-remote.c:63
15903 msgid "path of git-upload-pack on the remote host"
15904 msgstr "远程主机上的 git-upload-pack 路径"
15906 #: builtin/ls-remote.c:65
15907 msgid "limit to tags"
15910 #: builtin/ls-remote.c:66
15911 msgid "limit to heads"
15914 #: builtin/ls-remote.c:67
15915 msgid "do not show peeled tags"
15918 #: builtin/ls-remote.c:69
15919 msgid "take url.<base>.insteadOf into account"
15920 msgstr "参考 url.<base>.insteadOf 设置"
15922 #: builtin/ls-remote.c:72
15923 msgid "exit with exit code 2 if no matching refs are found"
15924 msgstr "若未找到匹配的引用则以退出码2退出"
15926 #: builtin/ls-remote.c:75
15927 msgid "show underlying ref in addition to the object pointed by it"
15928 msgstr "除了显示指向的对象外,显示指向的引用名"
15930 #: builtin/ls-tree.c:30
15931 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
15932 msgstr "git ls-tree [<选项>] <树对象> [<路径>...]"
15934 #: builtin/ls-tree.c:128
15935 msgid "only show trees"
15938 #: builtin/ls-tree.c:130
15939 msgid "recurse into subtrees"
15942 #: builtin/ls-tree.c:132
15943 msgid "show trees when recursing"
15946 #: builtin/ls-tree.c:135
15947 msgid "terminate entries with NUL byte"
15948 msgstr "条目以 NUL 字符终止"
15950 #: builtin/ls-tree.c:136
15951 msgid "include object size"
15954 #: builtin/ls-tree.c:138 builtin/ls-tree.c:140
15955 msgid "list only filenames"
15958 #: builtin/ls-tree.c:143
15959 msgid "use full path names"
15962 #: builtin/ls-tree.c:145
15963 msgid "list entire tree; not just current directory (implies --full-name)"
15964 msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
15966 #: builtin/mailsplit.c:241
15968 msgid "empty mbox: '%s'"
15969 msgstr "空的 mbox:'%s'"
15971 #: builtin/merge-base.c:32
15972 msgid "git merge-base [-a | --all] <commit> <commit>..."
15973 msgstr "git merge-base [-a | --all] <提交> <提交>..."
15975 #: builtin/merge-base.c:33
15976 msgid "git merge-base [-a | --all] --octopus <commit>..."
15977 msgstr "git merge-base [-a | --all] --octopus <提交>..."
15979 #: builtin/merge-base.c:34
15980 msgid "git merge-base --independent <commit>..."
15981 msgstr "git merge-base --independent <提交>..."
15983 #: builtin/merge-base.c:35
15984 msgid "git merge-base --is-ancestor <commit> <commit>"
15985 msgstr "git merge-base --is-ancestor <提交> <提交>"
15987 #: builtin/merge-base.c:36
15988 msgid "git merge-base --fork-point <ref> [<commit>]"
15989 msgstr "git merge-base --fork-point <引用> [<提交>]"
15991 #: builtin/merge-base.c:143
15992 msgid "output all common ancestors"
15995 #: builtin/merge-base.c:145
15996 msgid "find ancestors for a single n-way merge"
15997 msgstr "查找一个多路合并的祖先提交"
15999 #: builtin/merge-base.c:147
16000 msgid "list revs not reachable from others"
16001 msgstr "显示不能被其他访问到的版本"
16003 #: builtin/merge-base.c:149
16004 msgid "is the first one ancestor of the other?"
16005 msgstr "第一个是其他的祖先提交么?"
16007 #: builtin/merge-base.c:151
16008 msgid "find where <commit> forked from reflog of <ref>"
16009 msgstr "根据 <引用> 的引用日志查找 <提交> 的分叉点"
16011 #: builtin/merge-file.c:9
16013 "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
16014 "<orig-file> <file2>"
16016 "git merge-file [<选项>] [-L <名字1> [-L <初始名字> [-L <名字2>]]] <文件1> <初"
16019 #: builtin/merge-file.c:35
16020 msgid "send results to standard output"
16021 msgstr "将结果发送到标准输出"
16023 #: builtin/merge-file.c:36
16024 msgid "use a diff3 based merge"
16025 msgstr "使用基于 diff3 的合并"
16027 #: builtin/merge-file.c:37
16028 msgid "for conflicts, use our version"
16029 msgstr "如果冲突,使用我们的版本"
16031 #: builtin/merge-file.c:39
16032 msgid "for conflicts, use their version"
16033 msgstr "如果冲突,使用他们的版本"
16035 #: builtin/merge-file.c:41
16036 msgid "for conflicts, use a union version"
16037 msgstr "如果冲突,使用联合版本"
16039 #: builtin/merge-file.c:44
16040 msgid "for conflicts, use this marker size"
16041 msgstr "如果冲突,使用指定长度的标记"
16043 #: builtin/merge-file.c:45
16044 msgid "do not warn about conflicts"
16047 #: builtin/merge-file.c:47
16048 msgid "set labels for file1/orig-file/file2"
16049 msgstr "为 文件1/初始文件/文件2 设置标签"
16051 #: builtin/merge-recursive.c:47
16053 msgid "unknown option %s"
16056 #: builtin/merge-recursive.c:53
16058 msgid "could not parse object '%s'"
16059 msgstr "不能解析对象 '%s'"
16061 #: builtin/merge-recursive.c:57
16063 msgid "cannot handle more than %d base. Ignoring %s."
16064 msgid_plural "cannot handle more than %d bases. Ignoring %s."
16065 msgstr[0] "无法处理 %d 条以上的基线。忽略 %s。"
16066 msgstr[1] "无法处理 %d 条以上的基线。忽略 %s。"
16068 #: builtin/merge-recursive.c:65
16069 msgid "not handling anything other than two heads merge."
16070 msgstr "不能处理两个头合并之外的任何操作。"
16072 #: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
16074 msgid "could not resolve ref '%s'"
16075 msgstr "无法解析引用 '%s'"
16077 #: builtin/merge-recursive.c:82
16079 msgid "Merging %s with %s\n"
16080 msgstr "合并 %s 和 %s\n"
16082 #: builtin/merge.c:56
16083 msgid "git merge [<options>] [<commit>...]"
16084 msgstr "git merge [<选项>] [<提交>...]"
16086 #: builtin/merge.c:57
16087 msgid "git merge --abort"
16088 msgstr "git merge --abort"
16090 #: builtin/merge.c:58
16091 msgid "git merge --continue"
16092 msgstr "git merge --continue"
16094 #: builtin/merge.c:121
16095 msgid "switch `m' requires a value"
16096 msgstr "开关 `m' 需要一个值"
16098 #: builtin/merge.c:144
16100 msgid "option `%s' requires a value"
16101 msgstr "选项 `%s' 需要一个值"
16103 #: builtin/merge.c:190
16105 msgid "Could not find merge strategy '%s'.\n"
16106 msgstr "不能找到合并策略 '%s'。\n"
16108 #: builtin/merge.c:191
16110 msgid "Available strategies are:"
16113 #: builtin/merge.c:196
16115 msgid "Available custom strategies are:"
16116 msgstr "可用的自定义策略有:"
16118 #: builtin/merge.c:247 builtin/pull.c:133
16119 msgid "do not show a diffstat at the end of the merge"
16120 msgstr "在合并的最后不显示差异统计"
16122 #: builtin/merge.c:250 builtin/pull.c:136
16123 msgid "show a diffstat at the end of the merge"
16124 msgstr "在合并的最后显示差异统计"
16126 #: builtin/merge.c:251 builtin/pull.c:139
16127 msgid "(synonym to --stat)"
16128 msgstr "(和 --stat 同义)"
16130 #: builtin/merge.c:253 builtin/pull.c:142
16131 msgid "add (at most <n>) entries from shortlog to merge commit message"
16132 msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
16134 #: builtin/merge.c:256 builtin/pull.c:148
16135 msgid "create a single commit instead of doing a merge"
16136 msgstr "创建一个单独的提交而不是做一次合并"
16138 #: builtin/merge.c:258 builtin/pull.c:151
16139 msgid "perform a commit if the merge succeeds (default)"
16140 msgstr "如果合并成功,执行一次提交(默认)"
16142 #: builtin/merge.c:260 builtin/pull.c:154
16143 msgid "edit message before committing"
16144 msgstr "在提交前编辑提交说明"
16146 #: builtin/merge.c:262
16147 msgid "allow fast-forward (default)"
16150 #: builtin/merge.c:264 builtin/pull.c:161
16151 msgid "abort if fast-forward is not possible"
16152 msgstr "如果不能快进就放弃合并"
16154 #: builtin/merge.c:268 builtin/pull.c:164
16155 msgid "verify that the named commit has a valid GPG signature"
16156 msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
16158 #: builtin/merge.c:269 builtin/notes.c:787 builtin/pull.c:168
16159 #: builtin/rebase.c:527 builtin/rebase.c:1398 builtin/revert.c:114
16163 #: builtin/merge.c:270 builtin/pull.c:169
16164 msgid "merge strategy to use"
16167 #: builtin/merge.c:271 builtin/pull.c:172
16168 msgid "option=value"
16169 msgstr "option=value"
16171 #: builtin/merge.c:272 builtin/pull.c:173
16172 msgid "option for selected merge strategy"
16173 msgstr "所选的合并策略的选项"
16175 #: builtin/merge.c:274
16176 msgid "merge commit message (for a non-fast-forward merge)"
16177 msgstr "合并的提交说明(针对非快进式合并)"
16179 #: builtin/merge.c:281
16180 msgid "abort the current in-progress merge"
16181 msgstr "放弃当前正在进行的合并"
16184 #: builtin/merge.c:283
16185 msgid "--abort but leave index and working tree alone"
16186 msgstr "--abort,但是保留索引和工作区"
16188 #: builtin/merge.c:285
16189 msgid "continue the current in-progress merge"
16190 msgstr "继续当前正在进行的合并"
16192 #: builtin/merge.c:287 builtin/pull.c:180
16193 msgid "allow merging unrelated histories"
16194 msgstr "允许合并不相关的历史"
16196 #: builtin/merge.c:294
16197 msgid "bypass pre-merge-commit and commit-msg hooks"
16198 msgstr "绕过 pre-merge-commit 和 commit-msg 钩子"
16200 #: builtin/merge.c:311
16201 msgid "could not run stash."
16204 #: builtin/merge.c:316
16205 msgid "stash failed"
16208 #: builtin/merge.c:321
16210 msgid "not a valid object: %s"
16211 msgstr "不是一个有效对象:%s"
16213 #: builtin/merge.c:343 builtin/merge.c:360
16214 msgid "read-tree failed"
16218 #: builtin/merge.c:390
16219 msgid " (nothing to squash)"
16222 #: builtin/merge.c:401
16224 msgid "Squash commit -- not updating HEAD\n"
16225 msgstr "压缩提交 -- 未更新 HEAD\n"
16227 #: builtin/merge.c:451
16229 msgid "No merge message -- not updating HEAD\n"
16230 msgstr "无合并信息 -- 未更新 HEAD\n"
16232 #: builtin/merge.c:502
16234 msgid "'%s' does not point to a commit"
16235 msgstr "'%s' 没有指向一个提交"
16237 #: builtin/merge.c:589
16239 msgid "Bad branch.%s.mergeoptions string: %s"
16240 msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
16242 #: builtin/merge.c:716
16243 msgid "Not handling anything other than two heads merge."
16244 msgstr "未处理两个头合并之外的任何操作。"
16246 #: builtin/merge.c:730
16248 msgid "Unknown option for merge-recursive: -X%s"
16249 msgstr "merge-recursive 的未知选项:-X%s"
16251 #: builtin/merge.c:745
16253 msgid "unable to write %s"
16256 #: builtin/merge.c:797
16258 msgid "Could not read from '%s'"
16259 msgstr "不能从 '%s' 读取"
16261 #: builtin/merge.c:806
16263 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
16264 msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
16266 #: builtin/merge.c:812
16268 "Please enter a commit message to explain why this merge is necessary,\n"
16269 "especially if it merges an updated upstream into a topic branch.\n"
16272 "请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
16276 #: builtin/merge.c:817
16277 msgid "An empty message aborts the commit.\n"
16278 msgstr "空的提交说明会终止提交。\n"
16280 #: builtin/merge.c:820
16283 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
16285 msgstr "以 '%c' 开始的行将被忽略,而空的提交说明将终止提交。\n"
16287 #: builtin/merge.c:873
16288 msgid "Empty commit message."
16291 #: builtin/merge.c:888
16293 msgid "Wonderful.\n"
16296 #: builtin/merge.c:949
16298 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
16299 msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
16301 #: builtin/merge.c:988
16302 msgid "No current branch."
16305 #: builtin/merge.c:990
16306 msgid "No remote for the current branch."
16307 msgstr "当前分支没有对应的远程仓库。"
16309 #: builtin/merge.c:992
16310 msgid "No default upstream defined for the current branch."
16311 msgstr "当前分支没有定义默认的上游分支。"
16313 #: builtin/merge.c:997
16315 msgid "No remote-tracking branch for %s from %s"
16316 msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
16318 #: builtin/merge.c:1054
16320 msgid "Bad value '%s' in environment '%s'"
16321 msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'"
16323 #: builtin/merge.c:1157
16325 msgid "not something we can merge in %s: %s"
16326 msgstr "不能在 %s 中合并:%s"
16328 #: builtin/merge.c:1191
16329 msgid "not something we can merge"
16332 #: builtin/merge.c:1295
16333 msgid "--abort expects no arguments"
16334 msgstr "--abort 不带参数"
16336 #: builtin/merge.c:1299
16337 msgid "There is no merge to abort (MERGE_HEAD missing)."
16338 msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
16340 #: builtin/merge.c:1317
16341 msgid "--quit expects no arguments"
16342 msgstr "--quit 不带参数"
16344 #: builtin/merge.c:1330
16345 msgid "--continue expects no arguments"
16346 msgstr "--continue 不带参数"
16348 #: builtin/merge.c:1334
16349 msgid "There is no merge in progress (MERGE_HEAD missing)."
16350 msgstr "没有进行中的合并(MERGE_HEAD 丢失)。"
16352 #: builtin/merge.c:1350
16354 "You have not concluded your merge (MERGE_HEAD exists).\n"
16355 "Please, commit your changes before you merge."
16357 "您尚未结束您的合并(存在 MERGE_HEAD)。\n"
16360 #: builtin/merge.c:1357
16362 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
16363 "Please, commit your changes before you merge."
16365 "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
16368 #: builtin/merge.c:1360
16369 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
16370 msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
16372 #: builtin/merge.c:1374
16373 msgid "You cannot combine --squash with --no-ff."
16374 msgstr "您不能将 --squash 和 --no-ff 组合使用。"
16376 #: builtin/merge.c:1376
16377 msgid "You cannot combine --squash with --commit."
16378 msgstr "您不能将 --squash 和 --commit 组合使用。"
16380 #: builtin/merge.c:1392
16381 msgid "No commit specified and merge.defaultToUpstream not set."
16382 msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
16384 #: builtin/merge.c:1409
16385 msgid "Squash commit into empty head not supported yet"
16386 msgstr "尚不支持到空分支的压缩提交"
16388 #: builtin/merge.c:1411
16389 msgid "Non-fast-forward commit does not make sense into an empty head"
16390 msgstr "到空分支的非快进式提交没有意义"
16392 #: builtin/merge.c:1416
16394 msgid "%s - not something we can merge"
16395 msgstr "%s - 不能被合并"
16397 #: builtin/merge.c:1418
16398 msgid "Can merge only exactly one commit into empty head"
16399 msgstr "只能将一个提交合并到空分支上"
16401 #: builtin/merge.c:1499
16402 msgid "refusing to merge unrelated histories"
16405 #: builtin/merge.c:1508
16406 msgid "Already up to date."
16409 #: builtin/merge.c:1518
16411 msgid "Updating %s..%s\n"
16412 msgstr "更新 %s..%s\n"
16414 #: builtin/merge.c:1564
16416 msgid "Trying really trivial in-index merge...\n"
16417 msgstr "尝试非常小的索引内合并...\n"
16419 #: builtin/merge.c:1571
16424 #: builtin/merge.c:1596
16425 msgid "Already up to date. Yeeah!"
16428 #: builtin/merge.c:1602
16429 msgid "Not possible to fast-forward, aborting."
16432 #: builtin/merge.c:1630 builtin/merge.c:1695
16434 msgid "Rewinding the tree to pristine...\n"
16435 msgstr "将树回滚至原始状态...\n"
16437 #: builtin/merge.c:1634
16439 msgid "Trying merge strategy %s...\n"
16440 msgstr "尝试合并策略 %s...\n"
16442 #: builtin/merge.c:1686
16444 msgid "No merge strategy handled the merge.\n"
16445 msgstr "没有合并策略处理此合并。\n"
16447 #: builtin/merge.c:1688
16449 msgid "Merge with strategy %s failed.\n"
16450 msgstr "使用策略 %s 合并失败。\n"
16452 #: builtin/merge.c:1697
16454 msgid "Using the %s to prepare resolving by hand.\n"
16455 msgstr "使用 %s 以准备手工解决。\n"
16457 #: builtin/merge.c:1711
16459 msgid "Automatic merge went well; stopped before committing as requested\n"
16460 msgstr "自动合并进展顺利,按要求在提交前停止\n"
16462 #: builtin/mktree.c:66
16463 msgid "git mktree [-z] [--missing] [--batch]"
16464 msgstr "git mktree [-z] [--missing] [--batch]"
16466 #: builtin/mktree.c:154
16467 msgid "input is NUL terminated"
16468 msgstr "输入以 NUL 字符终止"
16470 #: builtin/mktree.c:155 builtin/write-tree.c:26
16471 msgid "allow missing objects"
16474 #: builtin/mktree.c:156
16475 msgid "allow creation of more than one tree"
16476 msgstr "允许创建一个以上的树"
16478 #: builtin/multi-pack-index.c:9
16480 "git multi-pack-index [<options>] (write|verify|expire|repack --batch-"
16483 "git multi-pack-index [<选项>] (write|verify|expire|repack --batch-size=<大小"
16486 #: builtin/multi-pack-index.c:26
16487 msgid "object directory containing set of packfile and pack-index pairs"
16488 msgstr "包含成对包文件和包索引的对象目录"
16490 #: builtin/multi-pack-index.c:29
16492 "during repack, collect pack-files of smaller size into a batch that is "
16493 "larger than this size"
16494 msgstr "在 repack 期间,将较小尺寸的包文件收集到大于此大小的批次中"
16496 #: builtin/multi-pack-index.c:50 builtin/prune-packed.c:25
16497 msgid "too many arguments"
16500 #: builtin/multi-pack-index.c:60
16501 msgid "--batch-size option is only for 'repack' subcommand"
16502 msgstr "--batch-size 选项仅用于 'repack' 子命令"
16504 #: builtin/multi-pack-index.c:69
16506 msgid "unrecognized subcommand: %s"
16507 msgstr "未识别的子命令:%s"
16510 msgid "git mv [<options>] <source>... <destination>"
16511 msgstr "git mv [<选项>] <源>... <目标>"
16515 msgid "Directory %s is in index and no submodule?"
16516 msgstr "目录 %s 在索引中并且不是子模组?"
16519 msgid "Please stage your changes to .gitmodules or stash them to proceed"
16520 msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续"
16522 #: builtin/mv.c:103
16524 msgid "%.*s is in index"
16527 #: builtin/mv.c:125
16528 msgid "force move/rename even if target exists"
16529 msgstr "强制移动/重命令,即使目标存在"
16531 #: builtin/mv.c:127
16532 msgid "skip move/rename errors"
16533 msgstr "跳过移动/重命名错误"
16535 #: builtin/mv.c:169
16537 msgid "destination '%s' is not a directory"
16538 msgstr "目标 '%s' 不是一个目录"
16540 #: builtin/mv.c:180
16542 msgid "Checking rename of '%s' to '%s'\n"
16543 msgstr "检查 '%s' 到 '%s' 的重命名\n"
16545 #: builtin/mv.c:184
16549 #: builtin/mv.c:187
16550 msgid "can not move directory into itself"
16551 msgstr "不能将目录移动到自身"
16553 #: builtin/mv.c:190
16554 msgid "cannot move directory over file"
16555 msgstr "不能将目录移动到文件"
16557 #: builtin/mv.c:199
16558 msgid "source directory is empty"
16561 #: builtin/mv.c:224
16562 msgid "not under version control"
16565 #: builtin/mv.c:227
16566 msgid "destination exists"
16569 #: builtin/mv.c:235
16571 msgid "overwriting '%s'"
16574 #: builtin/mv.c:238
16575 msgid "Cannot overwrite"
16578 #: builtin/mv.c:241
16579 msgid "multiple sources for the same target"
16582 #: builtin/mv.c:243
16583 msgid "destination directory does not exist"
16586 #: builtin/mv.c:250
16588 msgid "%s, source=%s, destination=%s"
16589 msgstr "%s,源=%s,目标=%s"
16591 #: builtin/mv.c:271
16593 msgid "Renaming %s to %s\n"
16594 msgstr "重命名 %s 至 %s\n"
16596 #: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:520
16598 msgid "renaming '%s' failed"
16599 msgstr "重命名 '%s' 失败"
16601 #: builtin/name-rev.c:465
16602 msgid "git name-rev [<options>] <commit>..."
16603 msgstr "git name-rev [<选项>] <提交>..."
16605 #: builtin/name-rev.c:466
16606 msgid "git name-rev [<options>] --all"
16607 msgstr "git name-rev [<选项>] --all"
16609 #: builtin/name-rev.c:467
16610 msgid "git name-rev [<options>] --stdin"
16611 msgstr "git name-rev [<选项>] --stdin"
16613 #: builtin/name-rev.c:524
16614 msgid "print only names (no SHA-1)"
16615 msgstr "只打印名称(无 SHA-1)"
16617 #: builtin/name-rev.c:525
16618 msgid "only use tags to name the commits"
16619 msgstr "只使用标签来命名提交"
16621 #: builtin/name-rev.c:527
16622 msgid "only use refs matching <pattern>"
16623 msgstr "只使用和 <模式> 相匹配的引用"
16625 #: builtin/name-rev.c:529
16626 msgid "ignore refs matching <pattern>"
16627 msgstr "忽略和 <模式> 相匹配的引用"
16629 #: builtin/name-rev.c:531
16630 msgid "list all commits reachable from all refs"
16631 msgstr "列出可以从所有引用访问的提交"
16633 #: builtin/name-rev.c:532
16634 msgid "read from stdin"
16637 #: builtin/name-rev.c:533
16638 msgid "allow to print `undefined` names (default)"
16639 msgstr "允许打印 `未定义` 的名称(默认)"
16641 #: builtin/name-rev.c:539
16642 msgid "dereference tags in the input (internal use)"
16643 msgstr "反向解析输入中的标签(内部使用)"
16645 #: builtin/notes.c:28
16646 msgid "git notes [--ref <notes-ref>] [list [<object>]]"
16647 msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
16649 #: builtin/notes.c:29
16651 "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
16652 "| (-c | -C) <object>] [<object>]"
16654 "git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
16655 "| (-c | -C) <对象>] [<对象>]"
16657 #: builtin/notes.c:30
16658 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
16659 msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
16661 #: builtin/notes.c:31
16663 "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
16664 "(-c | -C) <object>] [<object>]"
16666 "git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
16667 "(-c | -C) <对象>] [<对象>]"
16669 #: builtin/notes.c:32
16670 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
16671 msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
16673 #: builtin/notes.c:33
16674 msgid "git notes [--ref <notes-ref>] show [<object>]"
16675 msgstr "git notes [--ref <注解引用>] show [<对象>]"
16677 #: builtin/notes.c:34
16679 "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
16680 msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
16682 #: builtin/notes.c:35
16683 msgid "git notes merge --commit [-v | -q]"
16684 msgstr "git notes merge --commit [-v | -q]"
16686 #: builtin/notes.c:36
16687 msgid "git notes merge --abort [-v | -q]"
16688 msgstr "git notes merge --abort [-v | -q]"
16690 #: builtin/notes.c:37
16691 msgid "git notes [--ref <notes-ref>] remove [<object>...]"
16692 msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
16694 #: builtin/notes.c:38
16695 msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
16696 msgstr "git notes [--ref <注解引用>] prune [-n] [-v]"
16698 #: builtin/notes.c:39
16699 msgid "git notes [--ref <notes-ref>] get-ref"
16700 msgstr "git notes [--ref <注解引用>] get-ref"
16702 #: builtin/notes.c:44
16703 msgid "git notes [list [<object>]]"
16704 msgstr "git notes [list [<对象>]]"
16706 #: builtin/notes.c:49
16707 msgid "git notes add [<options>] [<object>]"
16708 msgstr "git notes add [<选项>] [<对象>]"
16710 #: builtin/notes.c:54
16711 msgid "git notes copy [<options>] <from-object> <to-object>"
16712 msgstr "git notes copy [<选项>] <源对象> <目标对象>"
16714 #: builtin/notes.c:55
16715 msgid "git notes copy --stdin [<from-object> <to-object>]..."
16716 msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
16718 #: builtin/notes.c:60
16719 msgid "git notes append [<options>] [<object>]"
16720 msgstr "git notes append [<选项>] [<对象>]"
16722 #: builtin/notes.c:65
16723 msgid "git notes edit [<object>]"
16724 msgstr "git notes edit [<对象>]"
16726 #: builtin/notes.c:70
16727 msgid "git notes show [<object>]"
16728 msgstr "git notes show [<对象>]"
16730 #: builtin/notes.c:75
16731 msgid "git notes merge [<options>] <notes-ref>"
16732 msgstr "git notes merge [<选项>] <注解引用>"
16734 #: builtin/notes.c:76
16735 msgid "git notes merge --commit [<options>]"
16736 msgstr "git notes merge --commit [<选项>]"
16738 #: builtin/notes.c:77
16739 msgid "git notes merge --abort [<options>]"
16740 msgstr "git notes merge --abort [<选项>]"
16742 #: builtin/notes.c:82
16743 msgid "git notes remove [<object>]"
16744 msgstr "git notes remove [<对象>]"
16746 #: builtin/notes.c:87
16747 msgid "git notes prune [<options>]"
16748 msgstr "git notes prune [<选项>]"
16750 #: builtin/notes.c:92
16751 msgid "git notes get-ref"
16752 msgstr "git notes get-ref"
16754 #: builtin/notes.c:97
16755 msgid "Write/edit the notes for the following object:"
16756 msgstr "为下面的对象写/编辑说明:"
16758 #: builtin/notes.c:150
16760 msgid "unable to start 'show' for object '%s'"
16761 msgstr "不能为对象 '%s' 开始 'show'"
16763 #: builtin/notes.c:154
16764 msgid "could not read 'show' output"
16765 msgstr "不能读取 'show' 的输出"
16767 #: builtin/notes.c:162
16769 msgid "failed to finish 'show' for object '%s'"
16770 msgstr "无法为对象 '%s' 完成 'show'"
16772 #: builtin/notes.c:197
16773 msgid "please supply the note contents using either -m or -F option"
16774 msgstr "请通过 -m 或 -F 选项为注解提供内容"
16776 #: builtin/notes.c:206
16777 msgid "unable to write note object"
16780 #: builtin/notes.c:208
16782 msgid "the note contents have been left in %s"
16783 msgstr "注解内容被留在 %s 中"
16785 #: builtin/notes.c:242 builtin/tag.c:533
16787 msgid "could not open or read '%s'"
16788 msgstr "不能打开或读取 '%s'"
16790 #: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
16791 #: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
16792 #: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
16794 msgid "failed to resolve '%s' as a valid ref."
16795 msgstr "无法解析 '%s' 为一个有效引用。"
16797 #: builtin/notes.c:265
16799 msgid "failed to read object '%s'."
16800 msgstr "读取对象 '%s' 失败。"
16802 #: builtin/notes.c:268
16804 msgid "cannot read note data from non-blob object '%s'."
16805 msgstr "不能从非数据对象 '%s' 中读取注解数据。"
16807 #: builtin/notes.c:309
16809 msgid "malformed input line: '%s'."
16810 msgstr "格式错误的输入行:'%s'。"
16812 #: builtin/notes.c:324
16814 msgid "failed to copy notes from '%s' to '%s'"
16815 msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
16817 #. TRANSLATORS: the first %s will be replaced by a git
16818 #. notes command: 'add', 'merge', 'remove', etc.
16820 #: builtin/notes.c:356
16822 msgid "refusing to %s notes in %s (outside of refs/notes/)"
16823 msgstr "拒绝向 %2$s(在 refs/notes/ 之外)%1$s注解"
16825 #: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
16826 #: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
16827 #: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
16828 msgid "too many parameters"
16831 #: builtin/notes.c:389 builtin/notes.c:678
16833 msgid "no note found for object %s."
16834 msgstr "未发现对象 %s 的注解。"
16836 #: builtin/notes.c:410 builtin/notes.c:576
16837 msgid "note contents as a string"
16838 msgstr "注解内容作为一个字符串"
16840 #: builtin/notes.c:413 builtin/notes.c:579
16841 msgid "note contents in a file"
16842 msgstr "注解内容到一个文件中"
16844 #: builtin/notes.c:416 builtin/notes.c:582
16845 msgid "reuse and edit specified note object"
16846 msgstr "重用和编辑指定的注解对象"
16848 #: builtin/notes.c:419 builtin/notes.c:585
16849 msgid "reuse specified note object"
16852 #: builtin/notes.c:422 builtin/notes.c:588
16853 msgid "allow storing empty note"
16856 #: builtin/notes.c:423 builtin/notes.c:496
16857 msgid "replace existing notes"
16860 #: builtin/notes.c:448
16863 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
16865 msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
16867 #: builtin/notes.c:463 builtin/notes.c:544
16869 msgid "Overwriting existing notes for object %s\n"
16870 msgstr "覆盖对象 %s 现存注解\n"
16872 #: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
16874 msgid "Removing note for object %s\n"
16875 msgstr "删除对象 %s 的注解\n"
16877 #: builtin/notes.c:497
16878 msgid "read objects from stdin"
16881 #: builtin/notes.c:499
16882 msgid "load rewriting config for <command> (implies --stdin)"
16883 msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
16885 #: builtin/notes.c:517
16886 msgid "too few parameters"
16889 #: builtin/notes.c:538
16892 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
16894 msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
16896 #: builtin/notes.c:550
16898 msgid "missing notes on source object %s. Cannot copy."
16899 msgstr "源对象 %s 缺少注解。不能拷贝。"
16901 #: builtin/notes.c:603
16904 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
16905 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
16907 "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
16908 "请换用 'git notes add -f -m/-F/-c/-C'。\n"
16910 #: builtin/notes.c:698
16911 msgid "failed to delete ref NOTES_MERGE_PARTIAL"
16912 msgstr "删除引用 NOTES_MERGE_PARTIAL 失败"
16914 #: builtin/notes.c:700
16915 msgid "failed to delete ref NOTES_MERGE_REF"
16916 msgstr "删除引用 NOTES_MERGE_REF 失败"
16918 #: builtin/notes.c:702
16919 msgid "failed to remove 'git notes merge' worktree"
16920 msgstr "删除 'git notes merge' 工作区失败"
16922 #: builtin/notes.c:722
16923 msgid "failed to read ref NOTES_MERGE_PARTIAL"
16924 msgstr "读取引用 NOTES_MERGE_PARTIAL 失败"
16926 #: builtin/notes.c:724
16927 msgid "could not find commit from NOTES_MERGE_PARTIAL."
16928 msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。"
16930 #: builtin/notes.c:726
16931 msgid "could not parse commit from NOTES_MERGE_PARTIAL."
16932 msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。"
16934 #: builtin/notes.c:739
16935 msgid "failed to resolve NOTES_MERGE_REF"
16936 msgstr "解析 NOTES_MERGE_REF 失败"
16938 #: builtin/notes.c:742
16939 msgid "failed to finalize notes merge"
16942 #: builtin/notes.c:768
16944 msgid "unknown notes merge strategy %s"
16945 msgstr "未知的注解合并策略 %s"
16947 #: builtin/notes.c:784
16948 msgid "General options"
16951 #: builtin/notes.c:786
16952 msgid "Merge options"
16955 #: builtin/notes.c:788
16957 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
16959 msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
16961 #: builtin/notes.c:790
16962 msgid "Committing unmerged notes"
16965 #: builtin/notes.c:792
16966 msgid "finalize notes merge by committing unmerged notes"
16967 msgstr "通过提交未合并的注解来完成注解合并"
16969 #: builtin/notes.c:794
16970 msgid "Aborting notes merge resolution"
16973 #: builtin/notes.c:796
16974 msgid "abort notes merge"
16977 #: builtin/notes.c:807
16978 msgid "cannot mix --commit, --abort or -s/--strategy"
16979 msgstr "不能混用 --commit、--abort 或 -s/--strategy"
16981 #: builtin/notes.c:812
16982 msgid "must specify a notes ref to merge"
16983 msgstr "必须指定一个注解引用来合并"
16985 #: builtin/notes.c:836
16987 msgid "unknown -s/--strategy: %s"
16988 msgstr "未知的 -s/--strategy:%s"
16990 #: builtin/notes.c:873
16992 msgid "a notes merge into %s is already in-progress at %s"
16993 msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中"
16995 #: builtin/notes.c:876
16997 msgid "failed to store link to current notes ref (%s)"
16998 msgstr "无法存储链接到当前的注解引用(%s)"
17000 #: builtin/notes.c:878
17003 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
17004 "'git notes merge --commit', or abort the merge with 'git notes merge --"
17007 "自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提"
17008 "交结果,或者使用命令 'git notes merge --abort' 终止合并。\n"
17010 #: builtin/notes.c:897 builtin/tag.c:546
17012 msgid "Failed to resolve '%s' as a valid ref."
17013 msgstr "无法解析 '%s' 为一个有效引用。"
17015 #: builtin/notes.c:900
17017 msgid "Object %s has no note\n"
17018 msgstr "对象 %s 没有注解\n"
17020 #: builtin/notes.c:912
17021 msgid "attempt to remove non-existent note is not an error"
17022 msgstr "尝试删除不存在的注解不是一个错误"
17024 #: builtin/notes.c:915
17025 msgid "read object names from the standard input"
17026 msgstr "从标准输入读取对象名称"
17028 #: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:164
17029 msgid "do not remove, show only"
17032 #: builtin/notes.c:955
17033 msgid "report pruned notes"
17036 #: builtin/notes.c:998
17040 #: builtin/notes.c:999
17041 msgid "use notes from <notes-ref>"
17042 msgstr "从 <注解引用> 使用注解"
17044 #: builtin/notes.c:1034 builtin/stash.c:1608
17046 msgid "unknown subcommand: %s"
17049 #: builtin/pack-objects.c:53
17051 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
17052 msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]"
17054 #: builtin/pack-objects.c:54
17056 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
17057 msgstr "git pack-objects [<选项>...] <前缀名称> [< <引用列表> | < <对象列表>]"
17059 #: builtin/pack-objects.c:431
17061 msgid "bad packed object CRC for %s"
17062 msgstr "%s 错的包对象 CRC"
17064 #: builtin/pack-objects.c:442
17066 msgid "corrupt packed object for %s"
17069 #: builtin/pack-objects.c:573
17071 msgid "recursive delta detected for object %s"
17072 msgstr "发现对象 %s 递归 delta"
17074 #: builtin/pack-objects.c:784
17076 msgid "ordered %u objects, expected %<PRIu32>"
17077 msgstr "排序了 %u 个对象,预期 %<PRIu32> 个"
17079 #: builtin/pack-objects.c:973
17080 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
17081 msgstr "禁用 bitmap 写入,因为 pack.packSizeLimit 设置使得包被切分为多个"
17083 #: builtin/pack-objects.c:986
17084 msgid "Writing objects"
17087 #: builtin/pack-objects.c:1047 builtin/update-index.c:90
17089 msgid "failed to stat %s"
17090 msgstr "对 %s 调用 stat 失败"
17092 #: builtin/pack-objects.c:1100
17094 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
17095 msgstr "写入 %<PRIu32> 个对象而预期 %<PRIu32> 个"
17097 #: builtin/pack-objects.c:1298
17098 msgid "disabling bitmap writing, as some objects are not being packed"
17099 msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
17101 #: builtin/pack-objects.c:1725
17103 msgid "delta base offset overflow in pack for %s"
17104 msgstr "%s 压缩中 delta 基准偏移越界"
17106 #: builtin/pack-objects.c:1734
17108 msgid "delta base offset out of bound for %s"
17109 msgstr "%s 的 delta 基准偏移越界"
17111 #: builtin/pack-objects.c:2005
17112 msgid "Counting objects"
17115 #: builtin/pack-objects.c:2150
17117 msgid "unable to parse object header of %s"
17118 msgstr "无法解析对象 %s 头信息"
17120 #: builtin/pack-objects.c:2220 builtin/pack-objects.c:2236
17121 #: builtin/pack-objects.c:2246
17123 msgid "object %s cannot be read"
17124 msgstr "对象 %s 无法读取"
17126 #: builtin/pack-objects.c:2223 builtin/pack-objects.c:2250
17128 msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
17129 msgstr "对象 %s 不一致的对象长度(%<PRIuMAX> vs %<PRIuMAX>)"
17131 #: builtin/pack-objects.c:2260
17132 msgid "suboptimal pack - out of memory"
17133 msgstr "次优(suboptimal)打包 - 内存不足"
17135 #: builtin/pack-objects.c:2575
17137 msgid "Delta compression using up to %d threads"
17138 msgstr "使用 %d 个线程进行压缩"
17140 #: builtin/pack-objects.c:2714
17142 msgid "unable to pack objects reachable from tag %s"
17143 msgstr "无法为标签 %s 压缩对象"
17145 #: builtin/pack-objects.c:2802
17146 msgid "Compressing objects"
17149 #: builtin/pack-objects.c:2808
17150 msgid "inconsistency with delta count"
17153 #: builtin/pack-objects.c:2889
17156 "expected edge object ID, got garbage:\n"
17159 "预期边界对象(edge object)ID,却得到垃圾数据:\n"
17162 #: builtin/pack-objects.c:2895
17165 "expected object ID, got garbage:\n"
17168 "预期对象 ID,却得到垃圾数据:\n"
17171 #: builtin/pack-objects.c:2993
17172 msgid "invalid value for --missing"
17173 msgstr "选项 --missing 的值无效"
17175 #: builtin/pack-objects.c:3052 builtin/pack-objects.c:3160
17176 msgid "cannot open pack index"
17179 #: builtin/pack-objects.c:3083
17181 msgid "loose object at %s could not be examined"
17182 msgstr "无法检查 %s 处的松散对象"
17184 #: builtin/pack-objects.c:3168
17185 msgid "unable to force loose object"
17188 #: builtin/pack-objects.c:3261
17190 msgid "not a rev '%s'"
17191 msgstr "不是一个版本 '%s'"
17193 #: builtin/pack-objects.c:3264
17195 msgid "bad revision '%s'"
17198 #: builtin/pack-objects.c:3289
17199 msgid "unable to add recent objects"
17202 #: builtin/pack-objects.c:3342
17204 msgid "unsupported index version %s"
17205 msgstr "不支持的索引版本 %s"
17207 #: builtin/pack-objects.c:3346
17209 msgid "bad index version '%s'"
17210 msgstr "坏的索引版本 '%s'"
17212 #: builtin/pack-objects.c:3384
17213 msgid "<version>[,<offset>]"
17214 msgstr "<版本>[,<偏移>]"
17216 #: builtin/pack-objects.c:3385
17217 msgid "write the pack index file in the specified idx format version"
17218 msgstr "用指定的 idx 格式版本来写包索引文件"
17220 #: builtin/pack-objects.c:3388
17221 msgid "maximum size of each output pack file"
17222 msgstr "每个输出包的最大尺寸"
17224 #: builtin/pack-objects.c:3390
17225 msgid "ignore borrowed objects from alternate object store"
17226 msgstr "忽略从备用对象存储里借用对象"
17228 #: builtin/pack-objects.c:3392
17229 msgid "ignore packed objects"
17232 #: builtin/pack-objects.c:3394
17233 msgid "limit pack window by objects"
17234 msgstr "限制打包窗口的对象数"
17236 #: builtin/pack-objects.c:3396
17237 msgid "limit pack window by memory in addition to object limit"
17238 msgstr "除对象数量限制外设置打包窗口的内存限制"
17240 #: builtin/pack-objects.c:3398
17241 msgid "maximum length of delta chain allowed in the resulting pack"
17242 msgstr "打包允许的 delta 链的最大长度"
17244 #: builtin/pack-objects.c:3400
17245 msgid "reuse existing deltas"
17246 msgstr "重用已存在的 deltas"
17248 #: builtin/pack-objects.c:3402
17249 msgid "reuse existing objects"
17252 #: builtin/pack-objects.c:3404
17253 msgid "use OFS_DELTA objects"
17254 msgstr "使用 OFS_DELTA 对象"
17256 #: builtin/pack-objects.c:3406
17257 msgid "use threads when searching for best delta matches"
17258 msgstr "使用线程查询最佳 delta 匹配"
17260 #: builtin/pack-objects.c:3408
17261 msgid "do not create an empty pack output"
17264 #: builtin/pack-objects.c:3410
17265 msgid "read revision arguments from standard input"
17266 msgstr "从标准输入读取版本号参数"
17268 #: builtin/pack-objects.c:3412
17269 msgid "limit the objects to those that are not yet packed"
17270 msgstr "限制那些尚未打包的对象"
17272 #: builtin/pack-objects.c:3415
17273 msgid "include objects reachable from any reference"
17274 msgstr "包括可以从任何引用访问到的对象"
17276 #: builtin/pack-objects.c:3418
17277 msgid "include objects referred by reflog entries"
17278 msgstr "包括被引用日志引用到的对象"
17280 #: builtin/pack-objects.c:3421
17281 msgid "include objects referred to by the index"
17282 msgstr "包括被索引引用到的对象"
17284 #: builtin/pack-objects.c:3424
17285 msgid "output pack to stdout"
17288 #: builtin/pack-objects.c:3426
17289 msgid "include tag objects that refer to objects to be packed"
17290 msgstr "包括那些引用了待打包对象的标签对象"
17292 #: builtin/pack-objects.c:3428
17293 msgid "keep unreachable objects"
17296 #: builtin/pack-objects.c:3430
17297 msgid "pack loose unreachable objects"
17298 msgstr "打包松散的不可达对象"
17300 #: builtin/pack-objects.c:3432
17301 msgid "unpack unreachable objects newer than <time>"
17302 msgstr "将比给定 <时间> 新的无法访问的对象解包"
17304 #: builtin/pack-objects.c:3435
17305 msgid "use the sparse reachability algorithm"
17308 #: builtin/pack-objects.c:3437
17309 msgid "create thin packs"
17312 #: builtin/pack-objects.c:3439
17313 msgid "create packs suitable for shallow fetches"
17314 msgstr "创建适合浅克隆仓库获取的包"
17316 #: builtin/pack-objects.c:3441
17317 msgid "ignore packs that have companion .keep file"
17318 msgstr "忽略配有 .keep 文件的包"
17320 #: builtin/pack-objects.c:3443
17321 msgid "ignore this pack"
17324 #: builtin/pack-objects.c:3445
17325 msgid "pack compression level"
17328 #: builtin/pack-objects.c:3447
17329 msgid "do not hide commits by grafts"
17330 msgstr "显示被移植隐藏的提交"
17332 #: builtin/pack-objects.c:3449
17333 msgid "use a bitmap index if available to speed up counting objects"
17334 msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
17336 #: builtin/pack-objects.c:3451
17337 msgid "write a bitmap index together with the pack index"
17338 msgstr "在建立包索引的同时创建 bitmap 索引"
17340 #: builtin/pack-objects.c:3455
17341 msgid "write a bitmap index if possible"
17342 msgstr "如果可能,写 bitmap 索引"
17344 #: builtin/pack-objects.c:3459
17345 msgid "handling for missing objects"
17348 #: builtin/pack-objects.c:3462
17349 msgid "do not pack objects in promisor packfiles"
17350 msgstr "不要打包 promisor 包文件中的对象"
17352 #: builtin/pack-objects.c:3464
17353 msgid "respect islands during delta compression"
17354 msgstr "在增量压缩时参考数据岛"
17356 #: builtin/pack-objects.c:3493
17358 msgid "delta chain depth %d is too deep, forcing %d"
17359 msgstr "增量链深度 %d 太深了,强制为 %d"
17361 #: builtin/pack-objects.c:3498
17363 msgid "pack.deltaCacheLimit is too high, forcing %d"
17364 msgstr "配置 pack.deltaCacheLimit 太高了,强制为 %d"
17366 #: builtin/pack-objects.c:3552
17367 msgid "--max-pack-size cannot be used to build a pack for transfer"
17368 msgstr "不能使用 --max-pack-size 来构建传输用的包文件"
17370 #: builtin/pack-objects.c:3554
17371 msgid "minimum pack size limit is 1 MiB"
17372 msgstr "最小的包文件大小是 1 MiB"
17374 #: builtin/pack-objects.c:3559
17375 msgid "--thin cannot be used to build an indexable pack"
17376 msgstr "--thin 不能用于创建一个可索引包"
17378 #: builtin/pack-objects.c:3562
17379 msgid "--keep-unreachable and --unpack-unreachable are incompatible"
17380 msgstr "--keep-unreachable 和 --unpack-unreachable 不兼容"
17382 #: builtin/pack-objects.c:3568
17383 msgid "cannot use --filter without --stdout"
17384 msgstr "不能在没有 --stdout 的情况下使用 --filter"
17386 #: builtin/pack-objects.c:3628
17387 msgid "Enumerating objects"
17390 #: builtin/pack-objects.c:3658
17393 "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
17396 "总共 %<PRIu32>(差异 %<PRIu32>),复用 %<PRIu32>(差异 %<PRIu32>),包复用 "
17399 #: builtin/pack-refs.c:8
17400 msgid "git pack-refs [<options>]"
17401 msgstr "git pack-refs [<选项>]"
17403 #: builtin/pack-refs.c:16
17404 msgid "pack everything"
17407 #: builtin/pack-refs.c:17
17408 msgid "prune loose refs (default)"
17409 msgstr "清除松散的引用(默认)"
17411 #: builtin/prune-packed.c:6
17412 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
17413 msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
17415 #: builtin/prune.c:14
17416 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
17417 msgstr "git prune [-n] [-v] [--progress] [--expire <时间>] [--] [<head>...]"
17419 #: builtin/prune.c:133
17420 msgid "report pruned objects"
17423 #: builtin/prune.c:136
17424 msgid "expire objects older than <time>"
17425 msgstr "使早于给定时间的对象过期"
17427 #: builtin/prune.c:138
17428 msgid "limit traversal to objects outside promisor packfiles"
17429 msgstr "限制遍历 promisor 包以外的对象"
17431 #: builtin/prune.c:152
17432 msgid "cannot prune in a precious-objects repo"
17433 msgstr "不能在珍品仓库中执行清理操作"
17435 #: builtin/pull.c:45 builtin/pull.c:47
17437 msgid "Invalid value for %s: %s"
17438 msgstr "%s 的值无效:%s"
17440 #: builtin/pull.c:67
17441 msgid "git pull [<options>] [<repository> [<refspec>...]]"
17442 msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
17444 #: builtin/pull.c:123
17445 msgid "control for recursive fetching of submodules"
17446 msgstr "控制子模组的递归获取"
17448 #: builtin/pull.c:127
17449 msgid "Options related to merging"
17452 #: builtin/pull.c:130
17453 msgid "incorporate changes by rebasing rather than merging"
17454 msgstr "使用变基操作取代合并操作以合入修改"
17456 #: builtin/pull.c:158 builtin/rebase.c:478 builtin/revert.c:126
17457 msgid "allow fast-forward"
17460 #: builtin/pull.c:167 parse-options.h:339
17461 msgid "automatically stash/stash pop before and after"
17462 msgstr "在操作前后执行自动贮藏和弹出贮藏"
17464 #: builtin/pull.c:183
17465 msgid "Options related to fetching"
17468 #: builtin/pull.c:193
17469 msgid "force overwrite of local branch"
17472 #: builtin/pull.c:201
17473 msgid "number of submodules pulled in parallel"
17474 msgstr "并发拉取的子模组的数量"
17476 #: builtin/pull.c:317
17478 msgid "Invalid value for pull.ff: %s"
17479 msgstr "pull.ff 的取值无效:%s"
17481 #: builtin/pull.c:349
17483 "Pulling without specifying how to reconcile divergent branches is\n"
17484 "discouraged. You can squelch this message by running one of the following\n"
17485 "commands sometime before your next pull:\n"
17487 " git config pull.rebase false # merge (the default strategy)\n"
17488 " git config pull.rebase true # rebase\n"
17489 " git config pull.ff only # fast-forward only\n"
17491 "You can replace \"git config\" with \"git config --global\" to set a "
17493 "preference for all repositories. You can also pass --rebase, --no-rebase,\n"
17494 "or --ff-only on the command line to override the configured default per\n"
17497 "不建议在没有为偏离分支指定合并策略时执行 pull 操作。 您可以在执行下一次\n"
17498 "pull 操作之前执行下面一条命令来抑制本消息:\n"
17500 " git config pull.rebase false # 合并(缺省策略)\n"
17501 " git config pull.rebase true # 变基\n"
17502 " git config pull.ff only # 仅快进\n"
17504 "您可以将 \"git config\" 替换为 \"git config --global\" 以便为所有仓库设置\n"
17505 "缺省的配置项。您也可以在每次执行 pull 命令时添加 --rebase、--no-rebase,\n"
17506 "或者 --ff-only 参数覆盖缺省设置。\n"
17508 #: builtin/pull.c:459
17510 "There is no candidate for rebasing against among the refs that you just "
17512 msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
17514 #: builtin/pull.c:461
17516 "There are no candidates for merging among the refs that you just fetched."
17517 msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
17519 #: builtin/pull.c:462
17521 "Generally this means that you provided a wildcard refspec which had no\n"
17522 "matches on the remote end."
17523 msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
17525 #: builtin/pull.c:465
17528 "You asked to pull from the remote '%s', but did not specify\n"
17529 "a branch. Because this is not the default configured remote\n"
17530 "for your current branch, you must specify a branch on the command line."
17532 "您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n"
17533 "分支默认的远程仓库,您必须在命令行中指定一个分支名。"
17535 #: builtin/pull.c:470 builtin/rebase.c:1234 git-parse-remote.sh:73
17536 msgid "You are not currently on a branch."
17537 msgstr "您当前不在一个分支上。"
17539 #: builtin/pull.c:472 builtin/pull.c:487 git-parse-remote.sh:79
17540 msgid "Please specify which branch you want to rebase against."
17541 msgstr "请指定您要变基到哪一个分支。"
17543 #: builtin/pull.c:474 builtin/pull.c:489 git-parse-remote.sh:82
17544 msgid "Please specify which branch you want to merge with."
17545 msgstr "请指定您要合并哪一个分支。"
17547 #: builtin/pull.c:475 builtin/pull.c:490
17548 msgid "See git-pull(1) for details."
17549 msgstr "详见 git-pull(1)。"
17551 #: builtin/pull.c:477 builtin/pull.c:483 builtin/pull.c:492
17552 #: builtin/rebase.c:1240 git-parse-remote.sh:64
17556 #: builtin/pull.c:477 builtin/pull.c:492 builtin/pull.c:497
17557 #: git-parse-remote.sh:65
17561 #: builtin/pull.c:485 builtin/rebase.c:1232 git-parse-remote.sh:75
17562 msgid "There is no tracking information for the current branch."
17563 msgstr "当前分支没有跟踪信息。"
17565 #: builtin/pull.c:494 git-parse-remote.sh:95
17567 "If you wish to set tracking information for this branch you can do so with:"
17568 msgstr "如果您想要为此分支创建跟踪信息,您可以执行:"
17570 #: builtin/pull.c:499
17573 "Your configuration specifies to merge with the ref '%s'\n"
17574 "from the remote, but no such ref was fetched."
17576 "您的配置中指定要合并远程的引用 '%s',\n"
17579 #: builtin/pull.c:610
17581 msgid "unable to access commit %s"
17584 #: builtin/pull.c:895
17585 msgid "ignoring --verify-signatures for rebase"
17586 msgstr "为变基操作忽略 --verify-signatures"
17588 #: builtin/pull.c:955
17589 msgid "Updating an unborn branch with changes added to the index."
17590 msgstr "更新尚未诞生的分支,变更添加至索引。"
17592 #: builtin/pull.c:959
17593 msgid "pull with rebase"
17596 #: builtin/pull.c:960
17597 msgid "please commit or stash them."
17600 #: builtin/pull.c:985
17603 "fetch updated the current branch head.\n"
17604 "fast-forwarding your working tree from\n"
17607 "fetch 更新了当前的分支。快进您的工作区\n"
17610 #: builtin/pull.c:991
17613 "Cannot fast-forward your working tree.\n"
17614 "After making sure that you saved anything precious from\n"
17617 "$ git reset --hard\n"
17620 "您当前的工作区无法执行快进操作。\n"
17623 "以确认所有有用的数据均已保存。然后执行下面的命令\n"
17624 "$ git reset --hard\n"
17627 #: builtin/pull.c:1006
17628 msgid "Cannot merge multiple branches into empty head."
17629 msgstr "无法将多个分支合并到空分支。"
17631 #: builtin/pull.c:1010
17632 msgid "Cannot rebase onto multiple branches."
17633 msgstr "无法变基到多个分支。"
17635 #: builtin/pull.c:1018
17636 msgid "cannot rebase with locally recorded submodule modifications"
17637 msgstr "本地子模组中有修改,无法变基"
17639 #: builtin/push.c:19
17640 msgid "git push [<options>] [<repository> [<refspec>...]]"
17641 msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
17643 #: builtin/push.c:112
17644 msgid "tag shorthand without <tag>"
17645 msgstr "标签后面未提供 <标签> 参数"
17647 #: builtin/push.c:122
17648 msgid "--delete only accepts plain target ref names"
17649 msgstr "--delete 只接受简单的目标引用名"
17651 #: builtin/push.c:168
17654 "To choose either option permanently, see push.default in 'git help config'."
17657 "为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
17659 #: builtin/push.c:171
17662 "The upstream branch of your current branch does not match\n"
17663 "the name of your current branch. To push to the upstream branch\n"
17664 "on the remote, use\n"
17666 " git push %s HEAD:%s\n"
17668 "To push to the branch of the same name on the remote, use\n"
17670 " git push %s HEAD\n"
17673 "您当前分支的上游分支和您当前分支名不匹配,为推送到远程的上游分支,\n"
17676 " git push %s HEAD:%s\n"
17680 " git push %s HEAD\n"
17683 #: builtin/push.c:186
17686 "You are not currently on a branch.\n"
17687 "To push the history leading to the current (detached HEAD)\n"
17690 " git push %s HEAD:<name-of-remote-branch>\n"
17693 "现在为推送当前(分离头指针)的历史,使用\n"
17695 " git push %s HEAD:<远程分支名字>\n"
17697 #: builtin/push.c:200
17700 "The current branch %s has no upstream branch.\n"
17701 "To push the current branch and set the remote as upstream, use\n"
17703 " git push --set-upstream %s %s\n"
17705 "当前分支 %s 没有对应的上游分支。\n"
17706 "为推送当前分支并建立与远程上游的跟踪,使用\n"
17708 " git push --set-upstream %s %s\n"
17710 #: builtin/push.c:208
17712 msgid "The current branch %s has multiple upstream branches, refusing to push."
17713 msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
17715 #: builtin/push.c:211
17718 "You are pushing to remote '%s', which is not the upstream of\n"
17719 "your current branch '%s', without telling me what to push\n"
17720 "to update which remote branch."
17722 "您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
17723 "而没有告诉我要推送什么、更新哪个远程分支。"
17725 #: builtin/push.c:270
17727 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
17728 msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。"
17730 #: builtin/push.c:277
17732 "Updates were rejected because the tip of your current branch is behind\n"
17733 "its remote counterpart. Integrate the remote changes (e.g.\n"
17734 "'git pull ...') before pushing again.\n"
17735 "See the 'Note about fast-forwards' in 'git push --help' for details."
17737 "更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
17738 "再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
17739 "'git push --help' 中的 'Note about fast-forwards' 小节。"
17741 #: builtin/push.c:283
17743 "Updates were rejected because a pushed branch tip is behind its remote\n"
17744 "counterpart. Check out this branch and integrate the remote changes\n"
17745 "(e.g. 'git pull ...') before pushing again.\n"
17746 "See the 'Note about fast-forwards' in 'git push --help' for details."
17748 "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
17749 "检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
17750 "'git push --help' 中的 'Note about fast-forwards' 小节。"
17752 #: builtin/push.c:289
17754 "Updates were rejected because the remote contains work that you do\n"
17755 "not have locally. This is usually caused by another repository pushing\n"
17756 "to the same ref. You may want to first integrate the remote changes\n"
17757 "(e.g., 'git pull ...') before pushing again.\n"
17758 "See the 'Note about fast-forwards' in 'git push --help' for details."
17760 "更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n"
17761 "一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
17762 "(如 'git pull ...')。\n"
17763 "详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
17765 #: builtin/push.c:296
17766 msgid "Updates were rejected because the tag already exists in the remote."
17767 msgstr "更新被拒绝,因为该标签在远程已经存在。"
17769 #: builtin/push.c:299
17771 "You cannot update a remote ref that points at a non-commit object,\n"
17772 "or update a remote ref to make it point at a non-commit object,\n"
17773 "without using the '--force' option.\n"
17775 "如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
17776 "也不能更新远程引用让其指向一个非提交对象。\n"
17778 #: builtin/push.c:361
17780 msgid "Pushing to %s\n"
17783 #: builtin/push.c:368
17785 msgid "failed to push some refs to '%s'"
17786 msgstr "推送一些引用到 '%s' 失败"
17788 #: builtin/push.c:542
17792 #: builtin/push.c:543 builtin/send-pack.c:164
17793 msgid "push all refs"
17796 #: builtin/push.c:544 builtin/send-pack.c:166
17797 msgid "mirror all refs"
17800 #: builtin/push.c:546
17801 msgid "delete refs"
17804 #: builtin/push.c:547
17805 msgid "push tags (can't be used with --all or --mirror)"
17806 msgstr "推送标签(不能使用 --all or --mirror)"
17808 #: builtin/push.c:550 builtin/send-pack.c:167
17809 msgid "force updates"
17812 #: builtin/push.c:551 builtin/send-pack.c:179
17813 msgid "<refname>:<expect>"
17814 msgstr "<引用名>:<期望值>"
17816 #: builtin/push.c:552 builtin/send-pack.c:180
17817 msgid "require old value of ref to be at this value"
17818 msgstr "要求引用旧的取值为设定值"
17820 #: builtin/push.c:555
17821 msgid "control recursive pushing of submodules"
17822 msgstr "控制子模组的递归推送"
17824 #: builtin/push.c:556 builtin/send-pack.c:174
17825 msgid "use thin pack"
17828 #: builtin/push.c:557 builtin/push.c:558 builtin/send-pack.c:161
17829 #: builtin/send-pack.c:162
17830 msgid "receive pack program"
17833 #: builtin/push.c:559
17834 msgid "set upstream for git pull/status"
17835 msgstr "设置 git pull/status 的上游"
17837 #: builtin/push.c:562
17838 msgid "prune locally removed refs"
17841 #: builtin/push.c:564
17842 msgid "bypass pre-push hook"
17843 msgstr "绕过 pre-push 钩子"
17845 #: builtin/push.c:565
17846 msgid "push missing but relevant tags"
17847 msgstr "推送缺失但有关的标签"
17849 #: builtin/push.c:567 builtin/send-pack.c:168
17850 msgid "GPG sign the push"
17851 msgstr "用 GPG 为推送签名"
17853 #: builtin/push.c:569 builtin/send-pack.c:175
17854 msgid "request atomic transaction on remote side"
17855 msgstr "需要远端支持原子事务"
17857 #: builtin/push.c:587
17858 msgid "--delete is incompatible with --all, --mirror and --tags"
17859 msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
17861 #: builtin/push.c:589
17862 msgid "--delete doesn't make sense without any refs"
17863 msgstr "--delete 未接任何引用没有意义"
17865 #: builtin/push.c:609
17867 msgid "bad repository '%s'"
17870 #: builtin/push.c:610
17872 "No configured push destination.\n"
17873 "Either specify the URL from the command-line or configure a remote "
17874 "repository using\n"
17876 " git remote add <name> <url>\n"
17878 "and then push using the remote name\n"
17880 " git push <name>\n"
17883 "或通过命令行指定 URL,或用下面命令配置一个远程仓库\n"
17885 " git remote add <名称> <地址>\n"
17891 #: builtin/push.c:625
17892 msgid "--all and --tags are incompatible"
17893 msgstr "--all 和 --tags 不兼容"
17895 #: builtin/push.c:627
17896 msgid "--all can't be combined with refspecs"
17897 msgstr "--all 不能和引用规格同时使用"
17899 #: builtin/push.c:631
17900 msgid "--mirror and --tags are incompatible"
17901 msgstr "--mirror 和 --tags 不兼容"
17903 #: builtin/push.c:633
17904 msgid "--mirror can't be combined with refspecs"
17905 msgstr "--mirror 不能和引用规格同时使用"
17907 #: builtin/push.c:636
17908 msgid "--all and --mirror are incompatible"
17909 msgstr "--all 和 --mirror 不兼容"
17911 #: builtin/push.c:640
17912 msgid "push options must not have new line characters"
17913 msgstr "推送选项不能有换行符"
17915 #: builtin/range-diff.c:8
17916 msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
17917 msgstr "git range-diff [<选项>] <old-base>..<old-tip> <new-base>..<new-tip>"
17919 #: builtin/range-diff.c:9
17920 msgid "git range-diff [<options>] <old-tip>...<new-tip>"
17921 msgstr "git range-diff [<选项>] <old-tip>...<new-tip>"
17923 #: builtin/range-diff.c:10
17924 msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
17925 msgstr "git range-diff [<选项>] <base> <old-tip> <new-tip>"
17927 #: builtin/range-diff.c:22
17928 msgid "Percentage by which creation is weighted"
17931 #: builtin/range-diff.c:24
17932 msgid "use simple diff colors"
17935 #: builtin/range-diff.c:26
17939 #: builtin/range-diff.c:26
17940 msgid "passed to 'git log'"
17941 msgstr "传递给 'git log'"
17943 #: builtin/range-diff.c:50 builtin/range-diff.c:54
17945 msgid "no .. in range: '%s'"
17946 msgstr "没有在范围中使用 ..:'%s'"
17948 #: builtin/range-diff.c:64
17949 msgid "single arg format must be symmetric range"
17950 msgstr "单个参数格式必须是对称范围(即包含...)"
17952 #: builtin/range-diff.c:79
17953 msgid "need two commit ranges"
17956 #: builtin/read-tree.c:41
17958 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
17959 "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
17960 "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
17962 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-"
17963 "u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
17964 "index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])"
17966 #: builtin/read-tree.c:124
17967 msgid "write resulting index to <file>"
17968 msgstr "将索引结果写入 <文件>"
17970 #: builtin/read-tree.c:127
17971 msgid "only empty the index"
17974 #: builtin/read-tree.c:129
17978 #: builtin/read-tree.c:131
17979 msgid "perform a merge in addition to a read"
17980 msgstr "读取之余再执行一个合并"
17982 #: builtin/read-tree.c:133
17983 msgid "3-way merge if no file level merging required"
17984 msgstr "如果没有文件级合并需要,执行三方合并"
17986 #: builtin/read-tree.c:135
17987 msgid "3-way merge in presence of adds and removes"
17988 msgstr "存在添加和删除时,也执行三方合并"
17990 #: builtin/read-tree.c:137
17991 msgid "same as -m, but discard unmerged entries"
17992 msgstr "类似于 -m,但丢弃未合并的条目"
17994 #: builtin/read-tree.c:138
17995 msgid "<subdirectory>/"
17998 #: builtin/read-tree.c:139
17999 msgid "read the tree into the index under <subdirectory>/"
18000 msgstr "读取树对象到索引的 <子目录>/ 下"
18002 #: builtin/read-tree.c:142
18003 msgid "update working tree with merge result"
18004 msgstr "用合并的结果更新工作区"
18006 #: builtin/read-tree.c:144
18010 #: builtin/read-tree.c:145
18011 msgid "allow explicitly ignored files to be overwritten"
18012 msgstr "允许忽略文件中设定的文件可以被覆盖"
18014 #: builtin/read-tree.c:148
18015 msgid "don't check the working tree after merging"
18018 #: builtin/read-tree.c:149
18019 msgid "don't update the index or the work tree"
18020 msgstr "不更新索引区和工作区"
18022 #: builtin/read-tree.c:151
18023 msgid "skip applying sparse checkout filter"
18024 msgstr "跳过应用稀疏检出过滤器"
18026 #: builtin/read-tree.c:153
18027 msgid "debug unpack-trees"
18028 msgstr "调试 unpack-trees"
18030 #: builtin/read-tree.c:157
18031 msgid "suppress feedback messages"
18034 #: builtin/read-tree.c:188
18035 msgid "You need to resolve your current index first"
18036 msgstr "您需要先解决当前索引的冲突"
18038 #: builtin/rebase.c:35
18040 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
18041 "[<upstream> [<branch>]]"
18043 "git rebase [-i] [options] [--exec <命令>] [--onto <新基线> | --keep-base] [<"
18046 #: builtin/rebase.c:37
18048 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
18050 "git rebase [-i] [选项] [--exec <命令>] [--onto <新基线>] --root [<分支>]"
18052 #: builtin/rebase.c:39
18053 msgid "git rebase --continue | --abort | --skip | --edit-todo"
18054 msgstr "git rebase --continue | --abort | --skip | --edit-todo"
18056 #: builtin/rebase.c:181 builtin/rebase.c:205 builtin/rebase.c:232
18058 msgid "unusable todo list: '%s'"
18059 msgstr "不可用的待办列表:'%s'"
18061 #: builtin/rebase.c:298
18063 msgid "could not create temporary %s"
18064 msgstr "无法创建临时的 %s"
18066 #: builtin/rebase.c:304
18067 msgid "could not mark as interactive"
18070 #: builtin/rebase.c:358
18071 msgid "could not generate todo list"
18074 #: builtin/rebase.c:399
18075 msgid "a base commit must be provided with --upstream or --onto"
18076 msgstr "使用 --upstream 或 --onto 必须提供一个基线提交"
18078 #: builtin/rebase.c:468
18079 msgid "git rebase--interactive [<options>]"
18080 msgstr "git rebase--interactive [<选项>]"
18082 #: builtin/rebase.c:481 builtin/rebase.c:1374
18083 msgid "keep commits which start empty"
18086 #: builtin/rebase.c:485 builtin/revert.c:128
18087 msgid "allow commits with empty messages"
18090 #: builtin/rebase.c:487
18091 msgid "rebase merge commits"
18094 #: builtin/rebase.c:489
18095 msgid "keep original branch points of cousins"
18096 msgstr "保持兄弟提交的原始分支点"
18098 #: builtin/rebase.c:491
18099 msgid "move commits that begin with squash!/fixup!"
18100 msgstr "移动以 squash!/fixup! 开头的提交"
18102 #: builtin/rebase.c:492
18103 msgid "sign commits"
18106 #: builtin/rebase.c:494 builtin/rebase.c:1314
18107 msgid "display a diffstat of what changed upstream"
18108 msgstr "显示上游变化的差异统计"
18110 #: builtin/rebase.c:496
18111 msgid "continue rebase"
18114 #: builtin/rebase.c:498
18115 msgid "skip commit"
18118 #: builtin/rebase.c:499
18119 msgid "edit the todo list"
18122 #: builtin/rebase.c:501
18123 msgid "show the current patch"
18126 #: builtin/rebase.c:504
18127 msgid "shorten commit ids in the todo list"
18128 msgstr "缩短待办列表中的提交号"
18130 #: builtin/rebase.c:506
18131 msgid "expand commit ids in the todo list"
18132 msgstr "扩展待办列表中的提交号"
18134 #: builtin/rebase.c:508
18135 msgid "check the todo list"
18138 #: builtin/rebase.c:510
18139 msgid "rearrange fixup/squash lines"
18140 msgstr "重新排列 fixup/squash 行"
18142 #: builtin/rebase.c:512
18143 msgid "insert exec commands in todo list"
18144 msgstr "在待办列表中插入 exec 执行命令"
18146 #: builtin/rebase.c:513
18150 #: builtin/rebase.c:516
18151 msgid "restrict-revision"
18152 msgstr "restrict-revision"
18154 #: builtin/rebase.c:516
18155 msgid "restrict revision"
18158 #: builtin/rebase.c:518
18159 msgid "squash-onto"
18160 msgstr "squash-onto"
18162 #: builtin/rebase.c:519
18163 msgid "squash onto"
18164 msgstr "squash onto"
18166 #: builtin/rebase.c:521
18167 msgid "the upstream commit"
18170 #: builtin/rebase.c:523
18174 #: builtin/rebase.c:523
18178 #: builtin/rebase.c:528
18179 msgid "rebase strategy"
18182 #: builtin/rebase.c:529
18183 msgid "strategy-opts"
18184 msgstr "strategy-opts"
18186 #: builtin/rebase.c:530
18187 msgid "strategy options"
18190 #: builtin/rebase.c:531
18194 #: builtin/rebase.c:532
18195 msgid "the branch or commit to checkout"
18198 #: builtin/rebase.c:533
18202 #: builtin/rebase.c:533
18206 #: builtin/rebase.c:534
18210 #: builtin/rebase.c:534
18211 msgid "the command to run"
18214 #: builtin/rebase.c:537 builtin/rebase.c:1407
18215 msgid "automatically re-schedule any `exec` that fails"
18216 msgstr "自动重新安排任何失败的 `exec`"
18218 #: builtin/rebase.c:553
18219 msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
18220 msgstr "不使用 --rebase-merges,则 --[no-]rebase-cousins 没有效果"
18222 #: builtin/rebase.c:569
18224 msgid "%s requires the merge backend"
18227 #: builtin/rebase.c:612
18229 msgid "could not get 'onto': '%s'"
18230 msgstr "无法获取 'onto':'%s'"
18232 #: builtin/rebase.c:629
18234 msgid "invalid orig-head: '%s'"
18235 msgstr "无效的原始 head:'%s'"
18237 #: builtin/rebase.c:654
18239 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
18240 msgstr "忽略无效的 allow_rerere_autoupdate:'%s'"
18242 #: builtin/rebase.c:799 git-rebase--preserve-merges.sh:81
18244 "Resolve all conflicts manually, mark them as resolved with\n"
18245 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
18246 "You can instead skip this commit: run \"git rebase --skip\".\n"
18247 "To abort and get back to the state before \"git rebase\", run \"git rebase --"
18250 "手工解决所有冲突,执行 \"git add/rm <冲突的文件>\" 标记\n"
18251 "冲突已解决,然后执行 \"git rebase --continue\"。您也可以执行\n"
18252 "\"git rebase --skip\" 命令跳过这个提交。如果想要终止执行并回到\n"
18253 "\"git rebase\" 执行之前的状态,执行 \"git rebase --abort\"。"
18255 #: builtin/rebase.c:882
18259 "git encountered an error while preparing the patches to replay\n"
18260 "these revisions:\n"
18264 "As a result, git cannot rebase them."
18267 "在为重放这些版本而准备补丁时,git 遇到了一个错误:\n"
18273 #: builtin/rebase.c:1208
18276 "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
18278 msgstr "无法识别的空类型 '%s';有效值有 \"drop\"、\"keep\" 和 \"ask\"。"
18280 #: builtin/rebase.c:1226
18284 "Please specify which branch you want to rebase against.\n"
18285 "See git-rebase(1) for details.\n"
18287 " git rebase '<branch>'\n"
18292 "详见 git-rebase(1)。\n"
18294 " git rebase '<branch>'\n"
18297 #: builtin/rebase.c:1242
18300 "If you wish to set tracking information for this branch you can do so with:\n"
18302 " git branch --set-upstream-to=%s/<branch> %s\n"
18305 "如果您想要为此分支创建跟踪信息,您可以执行:\n"
18307 " git branch --set-upstream-to=%s/<branch> %s\n"
18310 #: builtin/rebase.c:1272
18311 msgid "exec commands cannot contain newlines"
18312 msgstr "exec 命令不能包含换行符"
18314 #: builtin/rebase.c:1276
18315 msgid "empty exec command"
18316 msgstr "空的 exec 命令"
18318 #: builtin/rebase.c:1305
18319 msgid "rebase onto given branch instead of upstream"
18320 msgstr "变基到给定的分支而非上游"
18322 #: builtin/rebase.c:1307
18323 msgid "use the merge-base of upstream and branch as the current base"
18324 msgstr "使用上游和分支的合并基线做为当前基线"
18326 #: builtin/rebase.c:1309
18327 msgid "allow pre-rebase hook to run"
18328 msgstr "允许执行 pre-rebase 钩子"
18330 #: builtin/rebase.c:1311
18331 msgid "be quiet. implies --no-stat"
18332 msgstr "安静。暗示 --no-stat"
18334 #: builtin/rebase.c:1317
18335 msgid "do not show diffstat of what changed upstream"
18336 msgstr "不显示上游变化的差异统计"
18338 #: builtin/rebase.c:1320
18339 msgid "add a Signed-off-by: line to each commit"
18340 msgstr "为每一个提交添加一个 Signed-off-by: 签名"
18342 #: builtin/rebase.c:1322 builtin/rebase.c:1326 builtin/rebase.c:1328
18343 msgid "passed to 'git am'"
18344 msgstr "传递给 'git am"
18346 #: builtin/rebase.c:1330 builtin/rebase.c:1332
18347 msgid "passed to 'git apply'"
18348 msgstr "传递给 'git apply'"
18350 #: builtin/rebase.c:1334 builtin/rebase.c:1337
18351 msgid "cherry-pick all commits, even if unchanged"
18352 msgstr "拣选所有提交,即使未修改"
18354 #: builtin/rebase.c:1339
18358 #: builtin/rebase.c:1342
18359 msgid "skip current patch and continue"
18363 #: builtin/rebase.c:1344
18364 msgid "abort and check out the original branch"
18367 #: builtin/rebase.c:1347
18368 msgid "abort but keep HEAD where it is"
18369 msgstr "终止但保持 HEAD 不变"
18371 #: builtin/rebase.c:1348
18372 msgid "edit the todo list during an interactive rebase"
18373 msgstr "在交互式变基中编辑待办列表"
18375 #: builtin/rebase.c:1351
18376 msgid "show the patch file being applied or merged"
18377 msgstr "显示正在应用或合并的补丁文件"
18379 #: builtin/rebase.c:1354
18380 msgid "use apply strategies to rebase"
18381 msgstr "使用应用策略进行变基"
18383 #: builtin/rebase.c:1358
18384 msgid "use merging strategies to rebase"
18385 msgstr "使用合并策略进行变基"
18387 #: builtin/rebase.c:1362
18388 msgid "let the user edit the list of commits to rebase"
18389 msgstr "让用户编辑要变基的提交列表"
18391 #: builtin/rebase.c:1366
18392 msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
18393 msgstr "(已弃用)尝试重建合并提交而非忽略它们"
18395 #: builtin/rebase.c:1371
18396 msgid "how to handle commits that become empty"
18397 msgstr "如何处理成为空提交的提交"
18399 #: builtin/rebase.c:1378
18400 msgid "move commits that begin with squash!/fixup! under -i"
18401 msgstr "在 -i 交互模式下,移动以 squash!/fixup! 开头的提交"
18403 #: builtin/rebase.c:1385
18404 msgid "add exec lines after each commit of the editable list"
18405 msgstr "可编辑列表的每一个提交下面增加一行 exec"
18407 #: builtin/rebase.c:1389
18408 msgid "allow rebasing commits with empty messages"
18409 msgstr "允许针对空提交说明的提交变基"
18411 #: builtin/rebase.c:1393
18412 msgid "try to rebase merges instead of skipping them"
18413 msgstr "尝试对合并提交变基而不是忽略它们"
18415 #: builtin/rebase.c:1396
18416 msgid "use 'merge-base --fork-point' to refine upstream"
18417 msgstr "使用 'merge-base --fork-point' 来优化上游"
18419 #: builtin/rebase.c:1398
18420 msgid "use the given merge strategy"
18423 #: builtin/rebase.c:1400 builtin/revert.c:115
18427 #: builtin/rebase.c:1401
18428 msgid "pass the argument through to the merge strategy"
18429 msgstr "将参数传递给合并策略"
18431 #: builtin/rebase.c:1404
18432 msgid "rebase all reachable commits up to the root(s)"
18433 msgstr "将所有可达的提交变基到根提交"
18435 #: builtin/rebase.c:1409
18436 msgid "apply all changes, even those already present upstream"
18437 msgstr "应用所有更改,甚至那些已在上游存在的"
18439 #: builtin/rebase.c:1426
18441 "the rebase.useBuiltin support has been removed!\n"
18442 "See its entry in 'git help config' for details."
18444 "对 rebase.useBuiltin 的支持已被删除!\n"
18445 "详见 'git help config' 中的条目。"
18447 #: builtin/rebase.c:1432
18448 msgid "It looks like 'git am' is in progress. Cannot rebase."
18449 msgstr "看起来 'git-am' 正在执行中。无法变基。"
18451 #: builtin/rebase.c:1473
18453 "git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
18454 msgstr "git rebase --preserve-merges 被弃用。用 --rebase-merges 代替。"
18456 #: builtin/rebase.c:1478
18457 msgid "cannot combine '--keep-base' with '--onto'"
18458 msgstr "不能将 '--keep-base' 和 '--onto' 组合使用"
18460 #: builtin/rebase.c:1480
18461 msgid "cannot combine '--keep-base' with '--root'"
18462 msgstr "不能将 '--keep-base' 和 '--root' 组合使用"
18464 #: builtin/rebase.c:1484
18465 msgid "cannot combine '--root' with '--fork-point'"
18466 msgstr "不能将 '--root' 和 '--fork-point' 组合使用"
18468 #: builtin/rebase.c:1487
18469 msgid "No rebase in progress?"
18470 msgstr "没有正在进行的变基?"
18472 #: builtin/rebase.c:1491
18473 msgid "The --edit-todo action can only be used during interactive rebase."
18474 msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
18476 #: builtin/rebase.c:1514
18477 msgid "Cannot read HEAD"
18480 #: builtin/rebase.c:1526
18482 "You must edit all merge conflicts and then\n"
18483 "mark them as resolved using git add"
18485 "您必须编辑所有的合并冲突,然后通过 git add\n"
18488 #: builtin/rebase.c:1545
18489 msgid "could not discard worktree changes"
18492 #: builtin/rebase.c:1564
18494 msgid "could not move back to %s"
18497 #: builtin/rebase.c:1610
18500 "It seems that there is already a %s directory, and\n"
18501 "I wonder if you are in the middle of another rebase. If that is the\n"
18502 "case, please try\n"
18504 "If that is not the case, please\n"
18506 "and run me again. I am stopping in case you still have something\n"
18507 "valuable there.\n"
18509 "似乎已有一个 %s 目录,我怀疑您正处于另外一个变基操作过程中。\n"
18514 "然后再重新执行。 为避免丢失重要数据,我已经停止当前操作。\n"
18516 #: builtin/rebase.c:1638
18517 msgid "switch `C' expects a numerical value"
18518 msgstr "开关 `C' 期望一个数字值"
18520 #: builtin/rebase.c:1680
18522 msgid "Unknown mode: %s"
18525 #: builtin/rebase.c:1702
18526 msgid "--strategy requires --merge or --interactive"
18527 msgstr "--strategy 需要 --merge 或 --interactive"
18529 #: builtin/rebase.c:1732
18530 msgid "cannot combine apply options with merge options"
18531 msgstr "不能组合使用应用选项和合并选项"
18533 #: builtin/rebase.c:1745
18535 msgid "Unknown rebase backend: %s"
18536 msgstr "未知的变基后端:%s"
18538 #: builtin/rebase.c:1770
18539 msgid "--reschedule-failed-exec requires --exec or --interactive"
18540 msgstr "--reschedule-failed-exec 需要 --exec 或 --interactive"
18542 #: builtin/rebase.c:1790
18543 msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
18544 msgstr "不能将 '--preserve-merges' 和 '--rebase-merges' 同时使用"
18546 #: builtin/rebase.c:1794
18548 "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
18550 "错误:不能将 '--preserve-merges' 和 '--reschedule-failed-exec' 同时使用"
18552 #: builtin/rebase.c:1818
18554 msgid "invalid upstream '%s'"
18555 msgstr "无效的上游 '%s'"
18557 #: builtin/rebase.c:1824
18558 msgid "Could not create new root commit"
18561 #: builtin/rebase.c:1850
18563 msgid "'%s': need exactly one merge base with branch"
18564 msgstr "'%s':只需要与分支的一个合并基线"
18566 #: builtin/rebase.c:1853
18568 msgid "'%s': need exactly one merge base"
18569 msgstr "'%s':只需要一个合并基线"
18571 #: builtin/rebase.c:1861
18573 msgid "Does not point to a valid commit '%s'"
18574 msgstr "没有指向一个有效的提交 '%s'"
18576 #: builtin/rebase.c:1887
18578 msgid "fatal: no such branch/commit '%s'"
18579 msgstr "致命错误:无此分支/提交 '%s'"
18581 #: builtin/rebase.c:1895 builtin/submodule--helper.c:40
18582 #: builtin/submodule--helper.c:1990
18584 msgid "No such ref: %s"
18585 msgstr "没有这样的引用:%s"
18587 #: builtin/rebase.c:1906
18588 msgid "Could not resolve HEAD to a revision"
18589 msgstr "无法将 HEAD 解析为一个版本"
18591 #: builtin/rebase.c:1927
18592 msgid "Please commit or stash them."
18595 #: builtin/rebase.c:1963
18597 msgid "could not switch to %s"
18600 #: builtin/rebase.c:1974
18601 msgid "HEAD is up to date."
18602 msgstr "HEAD 是最新的。"
18604 #: builtin/rebase.c:1976
18606 msgid "Current branch %s is up to date.\n"
18607 msgstr "当前分支 %s 是最新的。\n"
18609 #: builtin/rebase.c:1984
18610 msgid "HEAD is up to date, rebase forced."
18611 msgstr "HEAD 是最新的,强制变基。"
18613 #: builtin/rebase.c:1986
18615 msgid "Current branch %s is up to date, rebase forced.\n"
18616 msgstr "当前分支 %s 是最新的,强制变基。\n"
18618 #: builtin/rebase.c:1994
18619 msgid "The pre-rebase hook refused to rebase."
18620 msgstr "pre-rebase 钩子拒绝了变基操作。"
18622 #: builtin/rebase.c:2001
18624 msgid "Changes to %s:\n"
18625 msgstr "到 %s 的变更:\n"
18627 #: builtin/rebase.c:2004
18629 msgid "Changes from %s to %s:\n"
18630 msgstr "从 %s 到 %s 的变更:\n"
18632 #: builtin/rebase.c:2029
18634 msgid "First, rewinding head to replay your work on top of it...\n"
18635 msgstr "首先,回退头指针以便在其上重放您的工作...\n"
18637 #: builtin/rebase.c:2038
18638 msgid "Could not detach HEAD"
18641 #: builtin/rebase.c:2047
18643 msgid "Fast-forwarded %s to %s.\n"
18644 msgstr "快进 %s 到 %s。\n"
18646 #: builtin/receive-pack.c:34
18647 msgid "git receive-pack <git-dir>"
18648 msgstr "git receive-pack <仓库目录>"
18650 #: builtin/receive-pack.c:843
18652 "By default, updating the current branch in a non-bare repository\n"
18653 "is denied, because it will make the index and work tree inconsistent\n"
18654 "with what you pushed, and will require 'git reset --hard' to match\n"
18655 "the work tree to HEAD.\n"
18657 "You can set the 'receive.denyCurrentBranch' configuration variable\n"
18658 "to 'ignore' or 'warn' in the remote repository to allow pushing into\n"
18659 "its current branch; however, this is not recommended unless you\n"
18660 "arranged to update its work tree to match what you pushed in some\n"
18663 "To squelch this message and still keep the default behaviour, set\n"
18664 "'receive.denyCurrentBranch' configuration variable to 'refuse'."
18666 "默认禁止更新非纯仓库的当前分支,因为您推送的内容将导致索引和工作区\n"
18667 "不一致,并且将需要执行 'git reset --hard' 将工作区匹配到 HEAD。\n"
18669 "您可以在远程仓库中设置 'receive.denyCurrentBranch' 配置变量为\n"
18670 "'ignore' 或 'warn' 以允许推送到当前分支。然而不推荐这么做,除非您\n"
18671 "用某种方式将其工作区更新至您推送的状态。\n"
18673 "若要屏蔽此信息且保持默认行为,设置 'receive.denyCurrentBranch'\n"
18676 #: builtin/receive-pack.c:863
18678 "By default, deleting the current branch is denied, because the next\n"
18679 "'git clone' won't result in any file checked out, causing confusion.\n"
18681 "You can set 'receive.denyDeleteCurrent' configuration variable to\n"
18682 "'warn' or 'ignore' in the remote repository to allow deleting the\n"
18683 "current branch, with or without a warning message.\n"
18685 "To squelch this message, you can set it to 'refuse'."
18687 "默认禁止删除当前分支,因为下一次 'git clone' 将不会检出任何文件,\n"
18690 "您可以在远程仓库中设置 'receive.denyDeleteCurrent' 配置变量为\n"
18691 "'warn'(显示警告信息)或 'ignore'(忽略警告信息)以允许删除当前分支。\n"
18693 "若要屏蔽此信息,您可以设置它为 'refuse'。"
18695 #: builtin/receive-pack.c:1960
18699 #: builtin/receive-pack.c:1974
18700 msgid "You must specify a directory."
18701 msgstr "您必须指定一个目录。"
18703 #: builtin/reflog.c:17
18705 "git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
18706 "rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
18709 "git reflog expire [--expire=<时间>] [--expire-unreachable=<时间>] [--"
18710 "rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] <引"
18713 #: builtin/reflog.c:22
18715 "git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
18718 "git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] <引"
18721 #: builtin/reflog.c:25
18722 msgid "git reflog exists <ref>"
18723 msgstr "git reflog exists <引用>"
18725 #: builtin/reflog.c:568 builtin/reflog.c:573
18727 msgid "'%s' is not a valid timestamp"
18728 msgstr "'%s' 不是一个有效的时间戳"
18730 #: builtin/reflog.c:606
18732 msgid "Marking reachable objects..."
18733 msgstr "正在标记可达对象..."
18735 #: builtin/reflog.c:644
18737 msgid "%s points nowhere!"
18740 #: builtin/reflog.c:696
18741 msgid "no reflog specified to delete"
18742 msgstr "未指定要删除的引用日志"
18744 #: builtin/reflog.c:705
18746 msgid "not a reflog: %s"
18747 msgstr "不是一个引用日志:%s"
18749 #: builtin/reflog.c:710
18751 msgid "no reflog for '%s'"
18752 msgstr "没有 '%s' 的引用日志"
18754 #: builtin/reflog.c:756
18756 msgid "invalid ref format: %s"
18757 msgstr "无效的引用格式:%s"
18759 #: builtin/reflog.c:765
18760 msgid "git reflog [ show | expire | delete | exists ]"
18761 msgstr "git reflog [ show | expire | delete | exists ]"
18763 #: builtin/remote.c:17
18764 msgid "git remote [-v | --verbose]"
18765 msgstr "git remote [-v | --verbose]"
18767 #: builtin/remote.c:18
18769 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
18770 "mirror=<fetch|push>] <name> <url>"
18772 "git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
18773 "mirror=<fetch|push>] <名称> <地址>"
18775 #: builtin/remote.c:19 builtin/remote.c:39
18776 msgid "git remote rename <old> <new>"
18777 msgstr "git remote rename <旧名称> <新名称>"
18779 #: builtin/remote.c:20 builtin/remote.c:44
18780 msgid "git remote remove <name>"
18781 msgstr "git remote remove <名称>"
18783 #: builtin/remote.c:21 builtin/remote.c:49
18784 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
18785 msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
18787 #: builtin/remote.c:22
18788 msgid "git remote [-v | --verbose] show [-n] <name>"
18789 msgstr "git remote [-v | --verbose] show [-n] <名称>"
18791 #: builtin/remote.c:23
18792 msgid "git remote prune [-n | --dry-run] <name>"
18793 msgstr "git remote prune [-n | --dry-run] <名称>"
18795 #: builtin/remote.c:24
18797 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
18798 msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
18800 #: builtin/remote.c:25
18801 msgid "git remote set-branches [--add] <name> <branch>..."
18802 msgstr "git remote set-branches [--add] <名称> <分支>..."
18804 #: builtin/remote.c:26 builtin/remote.c:75
18805 msgid "git remote get-url [--push] [--all] <name>"
18806 msgstr "git remote get-url [--push] [--all] <名称>"
18808 #: builtin/remote.c:27 builtin/remote.c:80
18809 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
18810 msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
18812 #: builtin/remote.c:28 builtin/remote.c:81
18813 msgid "git remote set-url --add <name> <newurl>"
18814 msgstr "git remote set-url --add <名称> <新的地址>"
18816 #: builtin/remote.c:29 builtin/remote.c:82
18817 msgid "git remote set-url --delete <name> <url>"
18818 msgstr "git remote set-url --delete <名称> <地址>"
18820 #: builtin/remote.c:34
18821 msgid "git remote add [<options>] <name> <url>"
18822 msgstr "git remote add [<选项>] <名称> <地址>"
18824 #: builtin/remote.c:54
18825 msgid "git remote set-branches <name> <branch>..."
18826 msgstr "git remote set-branches <名称> <分支>..."
18828 #: builtin/remote.c:55
18829 msgid "git remote set-branches --add <name> <branch>..."
18830 msgstr "git remote set-branches --add <名称> <分支>..."
18832 #: builtin/remote.c:60
18833 msgid "git remote show [<options>] <name>"
18834 msgstr "git remote show [<选项>] <名称>"
18836 #: builtin/remote.c:65
18837 msgid "git remote prune [<options>] <name>"
18838 msgstr "git remote prune [<选项>] <名称>"
18840 #: builtin/remote.c:70
18841 msgid "git remote update [<options>] [<group> | <remote>]..."
18842 msgstr "git remote update [<选项>] [<组> | <远程>]..."
18844 #: builtin/remote.c:99
18846 msgid "Updating %s"
18849 #: builtin/remote.c:131
18851 "--mirror is dangerous and deprecated; please\n"
18852 "\t use --mirror=fetch or --mirror=push instead"
18854 "--mirror 选项危险且过时,请使用 --mirror=fetch\n"
18855 "\t 或 --mirror=push"
18857 #: builtin/remote.c:148
18859 msgid "unknown mirror argument: %s"
18860 msgstr "未知的镜像参数:%s"
18862 #: builtin/remote.c:164
18863 msgid "fetch the remote branches"
18866 #: builtin/remote.c:166
18867 msgid "import all tags and associated objects when fetching"
18868 msgstr "抓取时导入所有的标签和关联对象"
18870 #: builtin/remote.c:169
18871 msgid "or do not fetch any tag at all (--no-tags)"
18872 msgstr "或不抓取任何标签(--no-tags)"
18874 #: builtin/remote.c:171
18875 msgid "branch(es) to track"
18878 #: builtin/remote.c:172
18879 msgid "master branch"
18882 #: builtin/remote.c:174
18883 msgid "set up remote as a mirror to push to or fetch from"
18884 msgstr "把远程设置为用以推送或抓取的镜像"
18886 #: builtin/remote.c:186
18887 msgid "specifying a master branch makes no sense with --mirror"
18888 msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
18890 #: builtin/remote.c:188
18891 msgid "specifying branches to track makes sense only with fetch mirrors"
18892 msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
18894 #: builtin/remote.c:195 builtin/remote.c:696
18896 msgid "remote %s already exists."
18897 msgstr "远程 %s 已经存在。"
18899 #: builtin/remote.c:199 builtin/remote.c:700
18901 msgid "'%s' is not a valid remote name"
18902 msgstr "'%s' 不是一个有效的远程名称"
18904 #: builtin/remote.c:239
18906 msgid "Could not setup master '%s'"
18907 msgstr "无法设置 master '%s'"
18909 #: builtin/remote.c:354
18911 msgid "Could not get fetch map for refspec %s"
18912 msgstr "无法得到引用规格 %s 的获取列表"
18914 #: builtin/remote.c:453 builtin/remote.c:461
18918 #: builtin/remote.c:465
18922 #: builtin/remote.c:653
18924 msgid "could not set '%s'"
18927 #: builtin/remote.c:658
18930 "The %s configuration remote.pushDefault in:\n"
18932 "now names the non-existent remote '%s'"
18934 "配置(%s)remote.pushDefault 位于:\n"
18936 "现在在为不存在的远程名 '%s' 命名"
18938 #: builtin/remote.c:689 builtin/remote.c:832 builtin/remote.c:940
18940 msgid "No such remote: '%s'"
18941 msgstr "没有此远程仓库:'%s'"
18943 #: builtin/remote.c:706
18945 msgid "Could not rename config section '%s' to '%s'"
18946 msgstr "不能重命名配置小节 '%s' 到 '%s'"
18948 #: builtin/remote.c:726
18951 "Not updating non-default fetch refspec\n"
18953 "\tPlease update the configuration manually if necessary."
18959 #: builtin/remote.c:766
18961 msgid "deleting '%s' failed"
18962 msgstr "删除 '%s' 失败"
18964 #: builtin/remote.c:800
18966 msgid "creating '%s' failed"
18967 msgstr "创建 '%s' 失败"
18969 #: builtin/remote.c:876
18971 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
18972 "to delete it, use:"
18974 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
18975 "to delete them, use:"
18976 msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
18977 msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
18979 #: builtin/remote.c:890
18981 msgid "Could not remove config section '%s'"
18982 msgstr "不能移除配置小节 '%s'"
18984 #: builtin/remote.c:993
18986 msgid " new (next fetch will store in remotes/%s)"
18987 msgstr " 新的(下一次获取将存储于 remotes/%s)"
18989 #: builtin/remote.c:996
18993 #: builtin/remote.c:998
18994 msgid " stale (use 'git remote prune' to remove)"
18995 msgstr " 过时(使用 'git remote prune' 来移除)"
18997 #: builtin/remote.c:1000
19001 #: builtin/remote.c:1041
19003 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
19004 msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
19006 #: builtin/remote.c:1050
19008 msgid "rebases interactively onto remote %s"
19009 msgstr "交互式变基到远程 %s"
19011 #: builtin/remote.c:1052
19013 msgid "rebases interactively (with merges) onto remote %s"
19014 msgstr "交互式变基(含合并提交)到远程 %s"
19016 #: builtin/remote.c:1055
19018 msgid "rebases onto remote %s"
19021 #: builtin/remote.c:1059
19023 msgid " merges with remote %s"
19024 msgstr " 与远程 %s 合并"
19026 #: builtin/remote.c:1062
19028 msgid "merges with remote %s"
19031 #: builtin/remote.c:1065
19033 msgid "%-*s and with remote %s\n"
19034 msgstr "%-*s 以及和远程 %s\n"
19036 #: builtin/remote.c:1108
19040 #: builtin/remote.c:1111
19044 #: builtin/remote.c:1115
19048 #: builtin/remote.c:1118
19049 msgid "fast-forwardable"
19052 #: builtin/remote.c:1121
19053 msgid "local out of date"
19056 #: builtin/remote.c:1128
19058 msgid " %-*s forces to %-*s (%s)"
19059 msgstr " %-*s 强制推送至 %-*s (%s)"
19061 #: builtin/remote.c:1131
19063 msgid " %-*s pushes to %-*s (%s)"
19064 msgstr " %-*s 推送至 %-*s (%s)"
19066 #: builtin/remote.c:1135
19068 msgid " %-*s forces to %s"
19069 msgstr " %-*s 强制推送至 %s"
19071 #: builtin/remote.c:1138
19073 msgid " %-*s pushes to %s"
19074 msgstr " %-*s 推送至 %s"
19076 #: builtin/remote.c:1206
19077 msgid "do not query remotes"
19080 #: builtin/remote.c:1233
19082 msgid "* remote %s"
19085 #: builtin/remote.c:1234
19087 msgid " Fetch URL: %s"
19090 #: builtin/remote.c:1235 builtin/remote.c:1251 builtin/remote.c:1390
19094 #. TRANSLATORS: the colon ':' should align
19095 #. with the one in " Fetch URL: %s"
19098 #: builtin/remote.c:1249 builtin/remote.c:1251
19100 msgid " Push URL: %s"
19103 #: builtin/remote.c:1253 builtin/remote.c:1255 builtin/remote.c:1257
19105 msgid " HEAD branch: %s"
19106 msgstr " HEAD 分支:%s"
19108 # 译者:中文字符串拼接,可删除前导空格
19109 #: builtin/remote.c:1253
19110 msgid "(not queried)"
19113 #: builtin/remote.c:1255
19117 #: builtin/remote.c:1259
19120 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
19121 msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
19123 #: builtin/remote.c:1271
19125 msgid " Remote branch:%s"
19126 msgid_plural " Remote branches:%s"
19127 msgstr[0] " 远程分支:%s"
19128 msgstr[1] " 远程分支:%s"
19130 # 译者:中文字符串拼接,可删除前导空格
19131 #: builtin/remote.c:1274 builtin/remote.c:1300
19132 msgid " (status not queried)"
19135 #: builtin/remote.c:1283
19136 msgid " Local branch configured for 'git pull':"
19137 msgid_plural " Local branches configured for 'git pull':"
19138 msgstr[0] " 为 'git pull' 配置的本地分支:"
19139 msgstr[1] " 为 'git pull' 配置的本地分支:"
19141 #: builtin/remote.c:1291
19142 msgid " Local refs will be mirrored by 'git push'"
19143 msgstr " 本地引用将在 'git push' 时被镜像"
19145 #: builtin/remote.c:1297
19147 msgid " Local ref configured for 'git push'%s:"
19148 msgid_plural " Local refs configured for 'git push'%s:"
19149 msgstr[0] " 为 'git push' 配置的本地引用%s:"
19150 msgstr[1] " 为 'git push' 配置的本地引用%s:"
19152 #: builtin/remote.c:1318
19153 msgid "set refs/remotes/<name>/HEAD according to remote"
19154 msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
19156 #: builtin/remote.c:1320
19157 msgid "delete refs/remotes/<name>/HEAD"
19158 msgstr "删除 refs/remotes/<名称>/HEAD"
19160 #: builtin/remote.c:1335
19161 msgid "Cannot determine remote HEAD"
19162 msgstr "无法确定远程 HEAD"
19164 #: builtin/remote.c:1337
19165 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
19166 msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
19168 #: builtin/remote.c:1347
19170 msgid "Could not delete %s"
19173 #: builtin/remote.c:1355
19175 msgid "Not a valid ref: %s"
19176 msgstr "不是一个有效引用:%s"
19178 #: builtin/remote.c:1357
19180 msgid "Could not setup %s"
19184 #: builtin/remote.c:1375
19186 msgid " %s will become dangling!"
19187 msgstr " %s 将成为悬空状态!"
19190 #: builtin/remote.c:1376
19192 msgid " %s has become dangling!"
19193 msgstr " %s 已成为悬空状态!"
19195 #: builtin/remote.c:1386
19200 #: builtin/remote.c:1387
19205 #: builtin/remote.c:1403
19207 msgid " * [would prune] %s"
19208 msgstr " * [将删除] %s"
19210 #: builtin/remote.c:1406
19212 msgid " * [pruned] %s"
19213 msgstr " * [已删除] %s"
19215 #: builtin/remote.c:1451
19216 msgid "prune remotes after fetching"
19219 #: builtin/remote.c:1514 builtin/remote.c:1568 builtin/remote.c:1636
19221 msgid "No such remote '%s'"
19222 msgstr "没有此远程 '%s'"
19224 #: builtin/remote.c:1530
19228 #: builtin/remote.c:1537
19229 msgid "no remote specified"
19232 #: builtin/remote.c:1554
19233 msgid "query push URLs rather than fetch URLs"
19234 msgstr "查询推送 URL 地址,而非获取 URL 地址"
19236 #: builtin/remote.c:1556
19237 msgid "return all URLs"
19238 msgstr "返回所有 URL 地址"
19240 #: builtin/remote.c:1584
19242 msgid "no URLs configured for remote '%s'"
19243 msgstr "没有给远程仓库 '%s' 设定 URL"
19245 #: builtin/remote.c:1610
19246 msgid "manipulate push URLs"
19249 #: builtin/remote.c:1612
19253 #: builtin/remote.c:1614
19254 msgid "delete URLs"
19257 #: builtin/remote.c:1621
19258 msgid "--add --delete doesn't make sense"
19259 msgstr "--add --delete 无意义"
19261 #: builtin/remote.c:1660
19263 msgid "Invalid old URL pattern: %s"
19264 msgstr "无效的旧 URL 匹配模版:%s"
19266 #: builtin/remote.c:1668
19268 msgid "No such URL found: %s"
19269 msgstr "未找到此 URL:%s"
19271 #: builtin/remote.c:1670
19272 msgid "Will not delete all non-push URLs"
19273 msgstr "将不会删除所有非推送 URL 地址"
19275 #: builtin/repack.c:25
19276 msgid "git repack [<options>]"
19277 msgstr "git repack [<选项>]"
19279 #: builtin/repack.c:30
19281 "Incremental repacks are incompatible with bitmap indexes. Use\n"
19282 "--no-write-bitmap-index or disable the pack.writebitmaps configuration."
19284 "增量 repack 和 bitmap 索引不兼容。 使用 --no-write-bitmap-index\n"
19285 "或禁用 pack.writebitmaps 配置。"
19287 #: builtin/repack.c:193
19288 msgid "could not start pack-objects to repack promisor objects"
19289 msgstr "无法开始 pack-objects 来重新打包 promisor 对象"
19291 #: builtin/repack.c:232 builtin/repack.c:418
19292 msgid "repack: Expecting full hex object ID lines only from pack-objects."
19293 msgstr "repack:期望来自 pack-objects 的完整十六进制对象 ID。"
19295 #: builtin/repack.c:256
19296 msgid "could not finish pack-objects to repack promisor objects"
19297 msgstr "无法完成 pack-objects 来重新打包 promisor 对象"
19299 #: builtin/repack.c:294
19300 msgid "pack everything in a single pack"
19301 msgstr "所有内容打包到一个包文件中"
19303 #: builtin/repack.c:296
19304 msgid "same as -a, and turn unreachable objects loose"
19305 msgstr "和 -a 相同,并将不可达的对象设为松散对象"
19307 #: builtin/repack.c:299
19308 msgid "remove redundant packs, and run git-prune-packed"
19309 msgstr "删除多余的包,运行 git-prune-packed"
19311 #: builtin/repack.c:301
19312 msgid "pass --no-reuse-delta to git-pack-objects"
19313 msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
19315 #: builtin/repack.c:303
19316 msgid "pass --no-reuse-object to git-pack-objects"
19317 msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
19319 #: builtin/repack.c:305
19320 msgid "do not run git-update-server-info"
19321 msgstr "不运行 git-update-server-info"
19323 #: builtin/repack.c:308
19324 msgid "pass --local to git-pack-objects"
19325 msgstr "向 git-pack-objects 传递参数 --local"
19327 #: builtin/repack.c:310
19328 msgid "write bitmap index"
19329 msgstr "写 bitmap 索引"
19331 #: builtin/repack.c:312
19332 msgid "pass --delta-islands to git-pack-objects"
19333 msgstr "向 git-pack-objects 传递参数 --delta-islands"
19335 #: builtin/repack.c:313
19336 msgid "approxidate"
19339 #: builtin/repack.c:314
19340 msgid "with -A, do not loosen objects older than this"
19341 msgstr "使用 -A,不要将早于给定时间的对象过期"
19343 #: builtin/repack.c:316
19344 msgid "with -a, repack unreachable objects"
19345 msgstr "使用 -a ,重新对不可达对象打包"
19347 #: builtin/repack.c:318
19348 msgid "size of the window used for delta compression"
19349 msgstr "用于增量压缩的窗口值"
19351 #: builtin/repack.c:319 builtin/repack.c:325
19355 #: builtin/repack.c:320
19356 msgid "same as the above, but limit memory size instead of entries count"
19357 msgstr "和上面的相似,但限制内存大小而非条目数"
19359 #: builtin/repack.c:322
19360 msgid "limits the maximum delta depth"
19363 #: builtin/repack.c:324
19364 msgid "limits the maximum number of threads"
19367 #: builtin/repack.c:326
19368 msgid "maximum size of each packfile"
19369 msgstr "每个包文件的最大尺寸"
19371 #: builtin/repack.c:328
19372 msgid "repack objects in packs marked with .keep"
19373 msgstr "对标记为 .keep 的包中的对象重新打包"
19375 #: builtin/repack.c:330
19376 msgid "do not repack this pack"
19377 msgstr "不要对该包文件重新打包"
19379 #: builtin/repack.c:340
19380 msgid "cannot delete packs in a precious-objects repo"
19381 msgstr "不能删除珍品仓库中的打包文件"
19383 #: builtin/repack.c:344
19384 msgid "--keep-unreachable and -A are incompatible"
19385 msgstr "--keep-unreachable 和 -A 不兼容"
19387 #: builtin/repack.c:427
19388 msgid "Nothing new to pack."
19391 #: builtin/repack.c:488
19394 "WARNING: Some packs in use have been renamed by\n"
19395 "WARNING: prefixing old- to their name, in order to\n"
19396 "WARNING: replace them with the new version of the\n"
19397 "WARNING: file. But the operation failed, and the\n"
19398 "WARNING: attempt to rename them back to their\n"
19399 "WARNING: original names also failed.\n"
19400 "WARNING: Please rename them in %s manually:\n"
19402 "警告:为了将包文件替换为新版本,一些使用中的包已经\n"
19403 "警告:通过添加 old- 前缀的方式重命名。但是操作失败,\n"
19404 "警告:并且尝试重命名改回原有文件名的操作也失败。\n"
19405 "警告:请手动将 %s 下的这些文件重命名:\n"
19407 #: builtin/repack.c:536
19409 msgid "failed to remove '%s'"
19410 msgstr "删除 '%s' 失败"
19412 #: builtin/replace.c:22
19413 msgid "git replace [-f] <object> <replacement>"
19414 msgstr "git replace [-f] <对象> <替换物>"
19416 #: builtin/replace.c:23
19417 msgid "git replace [-f] --edit <object>"
19418 msgstr "git replace [-f] --edit <对象>"
19420 #: builtin/replace.c:24
19421 msgid "git replace [-f] --graft <commit> [<parent>...]"
19422 msgstr "git replace [-f] --graft <提交> [<父提交>...]"
19424 #: builtin/replace.c:25
19425 msgid "git replace [-f] --convert-graft-file"
19426 msgstr "git replace [-f] --convert-graft-file"
19428 #: builtin/replace.c:26
19429 msgid "git replace -d <object>..."
19430 msgstr "git replace -d <对象>..."
19432 #: builtin/replace.c:27
19433 msgid "git replace [--format=<format>] [-l [<pattern>]]"
19434 msgstr "git replace [--format=<格式>] [-l [<模式>]]"
19436 #: builtin/replace.c:90
19439 "invalid replace format '%s'\n"
19440 "valid formats are 'short', 'medium' and 'long'"
19443 "有效的格式有 'short'、'medium' 和 'long'"
19445 #: builtin/replace.c:125
19447 msgid "replace ref '%s' not found"
19448 msgstr "未发现替换引用 '%s'"
19450 #: builtin/replace.c:141
19452 msgid "Deleted replace ref '%s'"
19453 msgstr "已删除替换引用 '%s'"
19455 #: builtin/replace.c:153
19457 msgid "'%s' is not a valid ref name"
19458 msgstr "'%s' 不是一个有效的引用名"
19460 #: builtin/replace.c:158
19462 msgid "replace ref '%s' already exists"
19463 msgstr "替换引用 '%s' 已经存在"
19465 #: builtin/replace.c:178
19468 "Objects must be of the same type.\n"
19469 "'%s' points to a replaced object of type '%s'\n"
19470 "while '%s' points to a replacement object of type '%s'."
19473 "'%s' 指向 '%s' 类型的替换对象\n"
19474 "而 '%s' 指向 '%s' 类型的替换对象。"
19476 #: builtin/replace.c:229
19478 msgid "unable to open %s for writing"
19479 msgstr "无法为写入打开 %s"
19481 #: builtin/replace.c:242
19482 msgid "cat-file reported failure"
19483 msgstr "cat-file 报告失败"
19485 #: builtin/replace.c:258
19487 msgid "unable to open %s for reading"
19488 msgstr "无法为读取打开 %s"
19490 #: builtin/replace.c:272
19491 msgid "unable to spawn mktree"
19492 msgstr "无法启动 mktree"
19494 #: builtin/replace.c:276
19495 msgid "unable to read from mktree"
19496 msgstr "无法从 mktree 读取"
19498 #: builtin/replace.c:285
19499 msgid "mktree reported failure"
19500 msgstr "mktree 报告失败"
19502 #: builtin/replace.c:289
19503 msgid "mktree did not return an object name"
19504 msgstr "mktree 没有返回一个对象名"
19506 #: builtin/replace.c:298
19508 msgid "unable to fstat %s"
19509 msgstr "无法对 %s 执行 fstat"
19511 #: builtin/replace.c:303
19512 msgid "unable to write object to database"
19513 msgstr "无法向数据库写入对象"
19515 #: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
19516 #: builtin/replace.c:454
19518 msgid "not a valid object name: '%s'"
19519 msgstr "不是一个有效的对象名:'%s'"
19521 #: builtin/replace.c:326
19523 msgid "unable to get object type for %s"
19524 msgstr "无法得到 %s 的对象类型"
19526 #: builtin/replace.c:342
19527 msgid "editing object file failed"
19530 #: builtin/replace.c:351
19532 msgid "new object is the same as the old one: '%s'"
19533 msgstr "新对象和旧对象相同:'%s'"
19535 #: builtin/replace.c:384
19537 msgid "could not parse %s as a commit"
19538 msgstr "无法将 %s 解析为一个提交"
19540 #: builtin/replace.c:416
19542 msgid "bad mergetag in commit '%s'"
19543 msgstr "提交 '%s' 中含有损坏的合并标签"
19545 #: builtin/replace.c:418
19547 msgid "malformed mergetag in commit '%s'"
19548 msgstr "提交 '%s' 中含有格式错误的合并标签"
19550 #: builtin/replace.c:430
19553 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
19554 "instead of --graft"
19555 msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft"
19557 #: builtin/replace.c:469
19559 msgid "the original commit '%s' has a gpg signature"
19560 msgstr "原始提交 '%s' 中有一个 gpg 签名"
19562 #: builtin/replace.c:470
19563 msgid "the signature will be removed in the replacement commit!"
19564 msgstr "在替换的提交中签名将被移除!"
19566 #: builtin/replace.c:480
19568 msgid "could not write replacement commit for: '%s'"
19569 msgstr "不能为 '%s' 写替换提交"
19571 #: builtin/replace.c:488
19573 msgid "graft for '%s' unnecessary"
19574 msgstr "对 '%s' 移植没有必要"
19576 #: builtin/replace.c:492
19578 msgid "new commit is the same as the old one: '%s'"
19579 msgstr "新提交和旧的一样:'%s'"
19581 #: builtin/replace.c:527
19584 "could not convert the following graft(s):\n"
19590 #: builtin/replace.c:548
19591 msgid "list replace refs"
19594 #: builtin/replace.c:549
19595 msgid "delete replace refs"
19598 #: builtin/replace.c:550
19599 msgid "edit existing object"
19602 #: builtin/replace.c:551
19603 msgid "change a commit's parents"
19604 msgstr "修改一个提交的父提交"
19606 #: builtin/replace.c:552
19607 msgid "convert existing graft file"
19610 #: builtin/replace.c:553
19611 msgid "replace the ref if it exists"
19614 #: builtin/replace.c:555
19615 msgid "do not pretty-print contents for --edit"
19616 msgstr "不要为 --edit 操作美观显示内容"
19618 #: builtin/replace.c:556
19619 msgid "use this format"
19622 #: builtin/replace.c:569
19623 msgid "--format cannot be used when not listing"
19624 msgstr "不列出时不能使用 --format"
19626 #: builtin/replace.c:577
19627 msgid "-f only makes sense when writing a replacement"
19628 msgstr "只有写一个替换时 -f 才有意义"
19630 #: builtin/replace.c:581
19631 msgid "--raw only makes sense with --edit"
19632 msgstr "--raw 只有和 --edit 共用才有意义"
19634 #: builtin/replace.c:587
19635 msgid "-d needs at least one argument"
19636 msgstr "-d 需要至少一个参数"
19638 #: builtin/replace.c:593
19639 msgid "bad number of arguments"
19642 #: builtin/replace.c:599
19643 msgid "-e needs exactly one argument"
19644 msgstr "-e 需要且仅需要一个参数"
19646 #: builtin/replace.c:605
19647 msgid "-g needs at least one argument"
19648 msgstr "-g 需要至少一个参数"
19650 #: builtin/replace.c:611
19651 msgid "--convert-graft-file takes no argument"
19652 msgstr "--convert-graft-file 不带参数"
19654 #: builtin/replace.c:617
19655 msgid "only one pattern can be given with -l"
19656 msgstr "只能为 -l 提供一个模式"
19658 #: builtin/rerere.c:13
19659 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
19660 msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
19662 #: builtin/rerere.c:60
19663 msgid "register clean resolutions in index"
19664 msgstr "在索引中注册干净的解决方案"
19666 #: builtin/rerere.c:79
19667 msgid "'git rerere forget' without paths is deprecated"
19668 msgstr "没有路径的 'git rerere forget' 已经过时"
19670 #: builtin/rerere.c:113
19672 msgid "unable to generate diff for '%s'"
19673 msgstr "无法为 '%s' 生成差异"
19675 #: builtin/reset.c:32
19677 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
19678 msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
19680 #: builtin/reset.c:33
19681 msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
19682 msgstr "git reset [-q] [<树对象>] [--] <路径表达式>..."
19684 #: builtin/reset.c:34
19686 "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
19687 msgstr "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<树对象>]"
19689 #: builtin/reset.c:35
19690 msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
19691 msgstr "git reset --patch [<树对象>] [--] [<路径表达式>...]"
19693 #: builtin/reset.c:41
19697 #: builtin/reset.c:41
19701 #: builtin/reset.c:41
19705 #: builtin/reset.c:41
19709 #: builtin/reset.c:41
19713 #: builtin/reset.c:83
19714 msgid "You do not have a valid HEAD."
19715 msgstr "您没有一个有效的 HEAD。"
19717 #: builtin/reset.c:85
19718 msgid "Failed to find tree of HEAD."
19719 msgstr "无法找到 HEAD 指向的树。"
19721 #: builtin/reset.c:91
19723 msgid "Failed to find tree of %s."
19724 msgstr "无法找到 %s 指向的树。"
19726 #: builtin/reset.c:116
19728 msgid "HEAD is now at %s"
19729 msgstr "HEAD 现在位于 %s"
19731 # 译者:汉字之间无空格,故删除%s前后空格
19732 #: builtin/reset.c:195
19734 msgid "Cannot do a %s reset in the middle of a merge."
19735 msgstr "在合并过程中不能做%s重置操作。"
19737 #: builtin/reset.c:295 builtin/stash.c:520 builtin/stash.c:595
19738 #: builtin/stash.c:619
19739 msgid "be quiet, only report errors"
19740 msgstr "安静模式,只报告错误"
19742 #: builtin/reset.c:297
19743 msgid "reset HEAD and index"
19744 msgstr "重置 HEAD 和索引"
19746 #: builtin/reset.c:298
19747 msgid "reset only HEAD"
19750 #: builtin/reset.c:300 builtin/reset.c:302
19751 msgid "reset HEAD, index and working tree"
19752 msgstr "重置 HEAD、索引和工作区"
19754 #: builtin/reset.c:304
19755 msgid "reset HEAD but keep local changes"
19756 msgstr "重置 HEAD 但保存本地变更"
19758 #: builtin/reset.c:310
19759 msgid "record only the fact that removed paths will be added later"
19760 msgstr "将删除的路径标记为稍后添加"
19762 #: builtin/reset.c:344
19764 msgid "Failed to resolve '%s' as a valid revision."
19765 msgstr "无法将 '%s' 解析为一个有效的版本。"
19767 #: builtin/reset.c:352
19769 msgid "Failed to resolve '%s' as a valid tree."
19770 msgstr "无法将 '%s' 解析为一个有效的树对象。"
19772 #: builtin/reset.c:361
19773 msgid "--patch is incompatible with --{hard,mixed,soft}"
19774 msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
19776 #: builtin/reset.c:371
19777 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
19778 msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。"
19780 # 译者:汉字之间无空格,故删除%s前后空格
19781 #: builtin/reset.c:373
19783 msgid "Cannot do %s reset with paths."
19784 msgstr "不能带路径进行%s重置。"
19786 # 译者:汉字之间无空格,故删除%s前后空格
19787 #: builtin/reset.c:388
19789 msgid "%s reset is not allowed in a bare repository"
19790 msgstr "不能对纯仓库进行%s重置"
19792 #: builtin/reset.c:392
19793 msgid "-N can only be used with --mixed"
19794 msgstr "-N 只能和 --mixed 同时使用"
19796 #: builtin/reset.c:413
19797 msgid "Unstaged changes after reset:"
19798 msgstr "重置后取消暂存的变更:"
19800 #: builtin/reset.c:416
19804 "It took %.2f seconds to enumerate unstaged changes after reset. You can\n"
19805 "use '--quiet' to avoid this. Set the config setting reset.quiet to true\n"
19806 "to make this the default.\n"
19809 "重置后,枚举未暂存变更花费了 %.2f 秒。 您可以使用 '--quiet' 避免此情况。\n"
19810 "将配置变量 reset.quiet 设置为 true 可使其成为默认值。\n"
19812 #: builtin/reset.c:434
19814 msgid "Could not reset index file to revision '%s'."
19815 msgstr "不能重置索引文件至版本 '%s'。"
19817 #: builtin/reset.c:439
19818 msgid "Could not write new index file."
19819 msgstr "不能写入新的索引文件。"
19821 #: builtin/rev-list.c:499
19822 msgid "cannot combine --exclude-promisor-objects and --missing"
19823 msgstr "不能同时使用 --exclude-promisor-objects 和 --missing 选项"
19825 #: builtin/rev-list.c:560
19826 msgid "object filtering requires --objects"
19827 msgstr "对象过滤需要 --objects"
19829 #: builtin/rev-list.c:610
19830 msgid "rev-list does not support display of notes"
19831 msgstr "rev-list 不支持显示注解"
19833 #: builtin/rev-list.c:615
19834 msgid "marked counting is incompatible with --objects"
19835 msgstr "标记计数和 --objects 不兼容"
19837 #: builtin/rev-parse.c:409
19838 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
19839 msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
19841 #: builtin/rev-parse.c:414
19842 msgid "keep the `--` passed as an arg"
19843 msgstr "保持 `--` 作为一个参数传递"
19845 #: builtin/rev-parse.c:416
19846 msgid "stop parsing after the first non-option argument"
19847 msgstr "遇到第一个非选项参数后停止解析"
19849 #: builtin/rev-parse.c:419
19850 msgid "output in stuck long form"
19853 #: builtin/rev-parse.c:552
19855 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
19856 " or: git rev-parse --sq-quote [<arg>...]\n"
19857 " or: git rev-parse [<options>] [<arg>...]\n"
19859 "Run \"git rev-parse --parseopt -h\" for more information on the first usage."
19861 "git rev-parse --parseopt [<选项>] -- [<参数>...]\n"
19862 " 或者:git rev-parse --sq-quote [<参数>...]\n"
19863 " 或者:git rev-parse [<选项>] [<参数>...]\n"
19865 "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
19867 #: builtin/revert.c:24
19868 msgid "git revert [<options>] <commit-ish>..."
19869 msgstr "git revert [<选项>] <提交号>..."
19871 #: builtin/revert.c:25
19872 msgid "git revert <subcommand>"
19873 msgstr "git revert <子命令>"
19875 #: builtin/revert.c:30
19876 msgid "git cherry-pick [<options>] <commit-ish>..."
19877 msgstr "git cherry-pick [<选项>] <提交号>..."
19879 #: builtin/revert.c:31
19880 msgid "git cherry-pick <subcommand>"
19881 msgstr "git cherry-pick <子命令>"
19883 #: builtin/revert.c:72
19885 msgid "option `%s' expects a number greater than zero"
19886 msgstr "选项 `%s' 期望一个大于零的数字"
19888 #: builtin/revert.c:92
19890 msgid "%s: %s cannot be used with %s"
19891 msgstr "%s:%s 不能和 %s 同时使用"
19893 #: builtin/revert.c:102
19894 msgid "end revert or cherry-pick sequence"
19897 #: builtin/revert.c:103
19898 msgid "resume revert or cherry-pick sequence"
19901 #: builtin/revert.c:104
19902 msgid "cancel revert or cherry-pick sequence"
19905 #: builtin/revert.c:105
19906 msgid "skip current commit and continue"
19909 #: builtin/revert.c:107
19910 msgid "don't automatically commit"
19913 #: builtin/revert.c:108
19914 msgid "edit the commit message"
19917 #: builtin/revert.c:111
19918 msgid "parent-number"
19921 #: builtin/revert.c:112
19922 msgid "select mainline parent"
19925 #: builtin/revert.c:114
19926 msgid "merge strategy"
19929 #: builtin/revert.c:116
19930 msgid "option for merge strategy"
19933 #: builtin/revert.c:125
19934 msgid "append commit name"
19937 #: builtin/revert.c:127
19938 msgid "preserve initially empty commits"
19941 #: builtin/revert.c:129
19942 msgid "keep redundant, empty commits"
19943 msgstr "保持多余的、空的提交"
19945 #: builtin/revert.c:232
19946 msgid "revert failed"
19949 #: builtin/revert.c:245
19950 msgid "cherry-pick failed"
19954 msgid "git rm [<options>] [--] <file>..."
19955 msgstr "git rm [<选项>] [--] <文件>..."
19957 #: builtin/rm.c:207
19959 "the following file has staged content different from both the\n"
19960 "file and the HEAD:"
19962 "the following files have staged content different from both the\n"
19963 "file and the HEAD:"
19964 msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
19965 msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
19967 #: builtin/rm.c:212
19970 "(use -f to force removal)"
19975 #: builtin/rm.c:216
19976 msgid "the following file has changes staged in the index:"
19977 msgid_plural "the following files have changes staged in the index:"
19978 msgstr[0] "下列文件索引中有变更"
19979 msgstr[1] "下列文件索引中有变更"
19981 #: builtin/rm.c:220 builtin/rm.c:229
19984 "(use --cached to keep the file, or -f to force removal)"
19987 "(使用 --cached 保留本地文件,或用 -f 强制删除)"
19989 #: builtin/rm.c:226
19990 msgid "the following file has local modifications:"
19991 msgid_plural "the following files have local modifications:"
19992 msgstr[0] "如下文件有本地修改:"
19993 msgstr[1] "如下文件有本地修改:"
19995 #: builtin/rm.c:243
19996 msgid "do not list removed files"
19999 #: builtin/rm.c:244
20000 msgid "only remove from the index"
20003 #: builtin/rm.c:245
20004 msgid "override the up-to-date check"
20005 msgstr "忽略文件更新状态检查"
20007 #: builtin/rm.c:246
20008 msgid "allow recursive removal"
20011 #: builtin/rm.c:248
20012 msgid "exit with a zero status even if nothing matched"
20013 msgstr "即使没有匹配,也以零状态退出"
20015 #: builtin/rm.c:282
20016 msgid "No pathspec was given. Which files should I remove?"
20017 msgstr "没有提供路径规格。我应该删除哪些文件?"
20019 #: builtin/rm.c:305
20020 msgid "please stage your changes to .gitmodules or stash them to proceed"
20021 msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续"
20023 #: builtin/rm.c:323
20025 msgid "not removing '%s' recursively without -r"
20026 msgstr "未提供 -r 选项不会递归删除 '%s'"
20028 #: builtin/rm.c:362
20030 msgid "git rm: unable to remove %s"
20031 msgstr "git rm:不能删除 %s"
20033 #: builtin/send-pack.c:20
20035 "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
20036 "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
20038 " --all and explicit <ref> specification are mutually exclusive."
20040 "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
20041 "receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n"
20042 " --all 和明确的 <引用> 互斥。"
20044 #: builtin/send-pack.c:163
20045 msgid "remote name"
20048 #: builtin/send-pack.c:176
20049 msgid "use stateless RPC protocol"
20050 msgstr "使用无状态的 RPC 协议"
20052 #: builtin/send-pack.c:177
20053 msgid "read refs from stdin"
20056 #: builtin/send-pack.c:178
20057 msgid "print status from remote helper"
20058 msgstr "打印来自远程 helper 的状态"
20060 #: builtin/shortlog.c:14
20061 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
20062 msgstr "git shortlog [<选项>] [<版本范围>] [[--] <路径>...]"
20064 #: builtin/shortlog.c:15
20065 msgid "git log --pretty=short | git shortlog [<options>]"
20066 msgstr "git log --pretty=short | git shortlog [<选项>]"
20068 #: builtin/shortlog.c:264
20069 msgid "Group by committer rather than author"
20070 msgstr "按照提交者分组而不是作者"
20072 #: builtin/shortlog.c:266
20073 msgid "sort output according to the number of commits per author"
20074 msgstr "根据每个作者的提交数量排序"
20076 #: builtin/shortlog.c:268
20077 msgid "Suppress commit descriptions, only provides commit count"
20078 msgstr "隐藏提交说明,只提供提交数量"
20080 #: builtin/shortlog.c:270
20081 msgid "Show the email address of each author"
20082 msgstr "显示每个作者的电子邮件地址"
20084 #: builtin/shortlog.c:271
20085 msgid "<w>[,<i1>[,<i2>]]"
20086 msgstr "<w>[,<i1>[,<i2>]]"
20088 #: builtin/shortlog.c:272
20089 msgid "Linewrap output"
20092 #: builtin/shortlog.c:301
20093 msgid "too many arguments given outside repository"
20094 msgstr "仓库外执行提供了太多的参数"
20096 #: builtin/show-branch.c:13
20098 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
20099 "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
20100 "\t\t[--more=<n> | --list | --independent | --merge-base]\n"
20101 "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
20103 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
20104 "\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
20105 "\t\t[--more=<n> | --list | --independent | --merge-base]\n"
20106 "\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
20108 #: builtin/show-branch.c:17
20109 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
20110 msgstr "git show-branch (-g | --reflog)[=<n>[,<起始点>]] [--list] [<引用>]"
20112 #: builtin/show-branch.c:395
20114 msgid "ignoring %s; cannot handle more than %d ref"
20115 msgid_plural "ignoring %s; cannot handle more than %d refs"
20116 msgstr[0] "忽略 %s,无法处理 %d 个以上的引用"
20117 msgstr[1] "忽略 %s,无法处理 %d 个以上的引用"
20119 #: builtin/show-branch.c:548
20121 msgid "no matching refs with %s"
20122 msgstr "没有和 %s 匹配的引用"
20124 #: builtin/show-branch.c:645
20125 msgid "show remote-tracking and local branches"
20126 msgstr "显示远程跟踪的和本地的分支"
20128 #: builtin/show-branch.c:647
20129 msgid "show remote-tracking branches"
20132 #: builtin/show-branch.c:649
20133 msgid "color '*!+-' corresponding to the branch"
20134 msgstr "着色 '*!+-' 到相应的分支"
20136 #: builtin/show-branch.c:651
20137 msgid "show <n> more commits after the common ancestor"
20138 msgstr "显示共同祖先后的 <n> 个提交"
20140 #: builtin/show-branch.c:653
20141 msgid "synonym to more=-1"
20142 msgstr "和 more=-1 同义"
20144 #: builtin/show-branch.c:654
20145 msgid "suppress naming strings"
20148 #: builtin/show-branch.c:656
20149 msgid "include the current branch"
20152 #: builtin/show-branch.c:658
20153 msgid "name commits with their object names"
20156 #: builtin/show-branch.c:660
20157 msgid "show possible merge bases"
20160 #: builtin/show-branch.c:662
20161 msgid "show refs unreachable from any other ref"
20162 msgstr "显示没有任何引用的的引用"
20164 #: builtin/show-branch.c:664
20165 msgid "show commits in topological order"
20168 #: builtin/show-branch.c:667
20169 msgid "show only commits not on the first branch"
20170 msgstr "只显示不在第一个分支上的提交"
20172 #: builtin/show-branch.c:669
20173 msgid "show merges reachable from only one tip"
20174 msgstr "显示仅一个分支可访问的合并提交"
20176 #: builtin/show-branch.c:671
20177 msgid "topologically sort, maintaining date order where possible"
20178 msgstr "拓扑方式排序,并尽可能地保持日期顺序"
20180 #: builtin/show-branch.c:674
20181 msgid "<n>[,<base>]"
20182 msgstr "<n>[,<base>]"
20184 #: builtin/show-branch.c:675
20185 msgid "show <n> most recent ref-log entries starting at base"
20186 msgstr "显示从起始点开始的 <n> 条最近的引用日志记录"
20188 #: builtin/show-branch.c:711
20190 "--reflog is incompatible with --all, --remotes, --independent or --merge-base"
20191 msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不兼容"
20193 #: builtin/show-branch.c:735
20194 msgid "no branches given, and HEAD is not valid"
20195 msgstr "未提供分支,且 HEAD 无效"
20197 #: builtin/show-branch.c:738
20198 msgid "--reflog option needs one branch name"
20199 msgstr "选项 --reflog 需要一个分支名"
20201 #: builtin/show-branch.c:741
20203 msgid "only %d entry can be shown at one time."
20204 msgid_plural "only %d entries can be shown at one time."
20205 msgstr[0] "一次只能显示 %d 个条目。"
20206 msgstr[1] "一次只能显示 %d 个条目。"
20208 #: builtin/show-branch.c:745
20210 msgid "no such ref %s"
20213 #: builtin/show-branch.c:831
20215 msgid "cannot handle more than %d rev."
20216 msgid_plural "cannot handle more than %d revs."
20217 msgstr[0] "不能处理 %d 个以上的版本。"
20218 msgstr[1] "不能处理 %d 个以上的版本。"
20220 #: builtin/show-branch.c:835
20222 msgid "'%s' is not a valid ref."
20223 msgstr "'%s' 不是一个有效的引用。"
20225 #: builtin/show-branch.c:838
20227 msgid "cannot find commit %s (%s)"
20228 msgstr "不能找到提交 %s(%s)"
20230 #: builtin/show-ref.c:12
20232 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
20233 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
20235 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
20236 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
20238 #: builtin/show-ref.c:13
20239 msgid "git show-ref --exclude-existing[=<pattern>]"
20240 msgstr "git show-ref --exclude-existing[=<模式>]"
20242 #: builtin/show-ref.c:162
20243 msgid "only show tags (can be combined with heads)"
20244 msgstr "只显示标签(可以和头共用)"
20246 #: builtin/show-ref.c:163
20247 msgid "only show heads (can be combined with tags)"
20248 msgstr "只显示头(可以和标签共用)"
20250 #: builtin/show-ref.c:164
20251 msgid "stricter reference checking, requires exact ref path"
20252 msgstr "更严格的引用检测,需要精确的引用路径"
20254 #: builtin/show-ref.c:167 builtin/show-ref.c:169
20255 msgid "show the HEAD reference, even if it would be filtered out"
20256 msgstr "显示 HEAD 引用,即使被过滤掉"
20258 #: builtin/show-ref.c:171
20259 msgid "dereference tags into object IDs"
20260 msgstr "转换标签到对象 ID"
20262 #: builtin/show-ref.c:173
20263 msgid "only show SHA1 hash using <n> digits"
20264 msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
20266 #: builtin/show-ref.c:177
20267 msgid "do not print results to stdout (useful with --verify)"
20268 msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
20270 #: builtin/show-ref.c:179
20271 msgid "show refs from stdin that aren't in local repository"
20272 msgstr "显示从标准输入中读入的不在本地仓库中的引用"
20274 #: builtin/sparse-checkout.c:21
20275 msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>"
20276 msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <选项>"
20278 #: builtin/sparse-checkout.c:64
20279 msgid "this worktree is not sparse (sparse-checkout file may not exist)"
20280 msgstr "本工作区不是稀疏模式(稀疏检出文件可能不存在)"
20282 #: builtin/sparse-checkout.c:212
20283 msgid "failed to create directory for sparse-checkout file"
20284 msgstr "无法为稀疏检出文件创建目录"
20286 #: builtin/sparse-checkout.c:253
20287 msgid "failed to set extensions.worktreeConfig setting"
20288 msgstr "无法设置 extensions.worktreeConfig"
20290 #: builtin/sparse-checkout.c:270
20291 msgid "git sparse-checkout init [--cone]"
20292 msgstr "git sparse-checkout init [--cone]"
20294 #: builtin/sparse-checkout.c:289
20295 msgid "initialize the sparse-checkout in cone mode"
20296 msgstr "初始化稀疏检出为 cone 模式"
20298 #: builtin/sparse-checkout.c:326
20300 msgid "failed to open '%s'"
20303 #: builtin/sparse-checkout.c:383
20305 msgid "could not normalize path %s"
20306 msgstr "无法规范化路径 %s"
20308 #: builtin/sparse-checkout.c:395
20309 msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
20310 msgstr "git sparse-checkout (set|add) (--stdin | <模式>)"
20312 #: builtin/sparse-checkout.c:420
20314 msgid "unable to unquote C-style string '%s'"
20315 msgstr "无法为 C 语言风格的字符串 '%s' 去引号"
20317 #: builtin/sparse-checkout.c:474 builtin/sparse-checkout.c:498
20318 msgid "unable to load existing sparse-checkout patterns"
20319 msgstr "无法加载现存的稀疏检出模式"
20321 #: builtin/sparse-checkout.c:543
20322 msgid "read patterns from standard in"
20325 #: builtin/sparse-checkout.c:580
20326 msgid "error while refreshing working directory"
20329 #: builtin/stash.c:22 builtin/stash.c:38
20330 msgid "git stash list [<options>]"
20331 msgstr "git stash list [<选项>]"
20333 #: builtin/stash.c:23 builtin/stash.c:43
20334 msgid "git stash show [<options>] [<stash>]"
20335 msgstr "git stash show [<选项>] [<stash>]"
20337 #: builtin/stash.c:24 builtin/stash.c:48
20338 msgid "git stash drop [-q|--quiet] [<stash>]"
20339 msgstr "git stash drop [-q|--quiet] [<stash>]"
20341 #: builtin/stash.c:25
20342 msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
20343 msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
20345 #: builtin/stash.c:26 builtin/stash.c:63
20346 msgid "git stash branch <branchname> [<stash>]"
20347 msgstr "git stash branch <分支名> [<stash>]"
20349 #: builtin/stash.c:27 builtin/stash.c:68
20350 msgid "git stash clear"
20351 msgstr "git stash clear"
20353 #: builtin/stash.c:28
20355 "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
20356 " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
20357 " [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
20358 " [--] [<pathspec>...]]"
20360 "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
20361 " [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n"
20362 " [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
20363 " [--] [<路径规格>...]]"
20365 #: builtin/stash.c:32 builtin/stash.c:85
20367 "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
20368 " [-u|--include-untracked] [-a|--all] [<message>]"
20370 "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
20371 " [-u|--include-untracked] [-a|--all] [<消息>]"
20373 #: builtin/stash.c:53
20374 msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
20375 msgstr "git stash pop [--index] [-q|--quiet] [<stash>]"
20377 #: builtin/stash.c:58
20378 msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
20379 msgstr "git stash apply [--index] [-q|--quiet] [<stash>]"
20381 #: builtin/stash.c:73
20382 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
20383 msgstr "git stash store [-m|--message <消息>] [-q|--quiet] <提交>"
20385 #: builtin/stash.c:78
20387 "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
20388 " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
20389 " [--] [<pathspec>...]]"
20391 "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
20392 " [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n"
20393 " [--] [<路径规格>...]]"
20395 #: builtin/stash.c:128
20397 msgid "'%s' is not a stash-like commit"
20398 msgstr "'%s' 不像是一个贮藏提交"
20400 #: builtin/stash.c:148
20402 msgid "Too many revisions specified:%s"
20403 msgstr "指定了太多的版本:%s"
20405 #: builtin/stash.c:162
20406 msgid "No stash entries found."
20409 #: builtin/stash.c:176
20411 msgid "%s is not a valid reference"
20412 msgstr "%s 不是一个有效的引用名"
20414 #: builtin/stash.c:225
20415 msgid "git stash clear with parameters is unimplemented"
20416 msgstr "git stash clear 不支持参数"
20418 #: builtin/stash.c:404
20419 msgid "cannot apply a stash in the middle of a merge"
20420 msgstr "无法在合并过程中应用贮藏"
20422 #: builtin/stash.c:415
20424 msgid "could not generate diff %s^!."
20425 msgstr "无法生成差异 %s^!."
20427 #: builtin/stash.c:422
20428 msgid "conflicts in index.Try without --index."
20429 msgstr "索引中有冲突。尝试不用 --index。"
20431 #: builtin/stash.c:428
20432 msgid "could not save index tree"
20435 #: builtin/stash.c:437
20436 msgid "could not restore untracked files from stash"
20437 msgstr "无法从贮藏条目中恢复未跟踪文件"
20439 #: builtin/stash.c:451
20441 msgid "Merging %s with %s"
20442 msgstr "正在合并 %s 和 %s"
20444 #: builtin/stash.c:461
20445 msgid "Index was not unstashed."
20446 msgstr "索引未从贮藏中恢复。"
20448 #: builtin/stash.c:522 builtin/stash.c:621
20449 msgid "attempt to recreate the index"
20452 #: builtin/stash.c:555
20454 msgid "Dropped %s (%s)"
20455 msgstr "丢弃了 %s(%s)"
20457 #: builtin/stash.c:558
20459 msgid "%s: Could not drop stash entry"
20460 msgstr "%s:无法丢弃贮藏条目"
20462 #: builtin/stash.c:583
20464 msgid "'%s' is not a stash reference"
20465 msgstr "'%s' 不是一个贮藏引用"
20467 #: builtin/stash.c:633
20468 msgid "The stash entry is kept in case you need it again."
20469 msgstr "贮藏条目被保留以备您再次需要。"
20471 #: builtin/stash.c:656
20472 msgid "No branch name specified"
20475 #: builtin/stash.c:800 builtin/stash.c:837
20477 msgid "Cannot update %s with %s"
20478 msgstr "无法用 %2$s 更新 %1$s"
20480 #: builtin/stash.c:818 builtin/stash.c:1475 builtin/stash.c:1540
20481 msgid "stash message"
20484 #: builtin/stash.c:828
20485 msgid "\"git stash store\" requires one <commit> argument"
20486 msgstr "\"git stash store\" 需要一个 <提交> 参数"
20488 #: builtin/stash.c:1046
20489 msgid "No changes selected"
20492 #: builtin/stash.c:1146
20493 msgid "You do not have the initial commit yet"
20496 #: builtin/stash.c:1173
20497 msgid "Cannot save the current index state"
20498 msgstr "无法保存当前索引状态"
20500 #: builtin/stash.c:1182
20501 msgid "Cannot save the untracked files"
20504 #: builtin/stash.c:1193 builtin/stash.c:1202
20505 msgid "Cannot save the current worktree state"
20506 msgstr "无法保存当前工作区状态"
20508 #: builtin/stash.c:1230
20509 msgid "Cannot record working tree state"
20512 #: builtin/stash.c:1279
20513 msgid "Can't use --patch and --include-untracked or --all at the same time"
20514 msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all"
20516 #: builtin/stash.c:1295
20517 msgid "Did you forget to 'git add'?"
20518 msgstr "您是否忘了执行 'git add'?"
20520 #: builtin/stash.c:1310
20521 msgid "No local changes to save"
20522 msgstr "没有要保存的本地修改"
20524 #: builtin/stash.c:1317
20525 msgid "Cannot initialize stash"
20528 #: builtin/stash.c:1332
20529 msgid "Cannot save the current status"
20532 #: builtin/stash.c:1337
20534 msgid "Saved working directory and index state %s"
20535 msgstr "保存工作目录和索引状态 %s"
20537 #: builtin/stash.c:1427
20538 msgid "Cannot remove worktree changes"
20541 #: builtin/stash.c:1466 builtin/stash.c:1531
20545 #: builtin/stash.c:1468 builtin/stash.c:1533
20546 msgid "stash in patch mode"
20549 #: builtin/stash.c:1469 builtin/stash.c:1534
20553 #: builtin/stash.c:1471 builtin/stash.c:1536
20554 msgid "include untracked files in stash"
20555 msgstr "贮藏中包含未跟踪文件"
20557 #: builtin/stash.c:1473 builtin/stash.c:1538
20558 msgid "include ignore files"
20561 #: builtin/stash.c:1573
20563 "the stash.useBuiltin support has been removed!\n"
20564 "See its entry in 'git help config' for details."
20566 "对 stash.useBuiltin 的支持已被删除!\n"
20567 "详见 'git help config' 中的条目。"
20569 #: builtin/stripspace.c:18
20570 msgid "git stripspace [-s | --strip-comments]"
20571 msgstr "git stripspace [-s | --strip-comments]"
20573 #: builtin/stripspace.c:19
20574 msgid "git stripspace [-c | --comment-lines]"
20575 msgstr "git stripspace [-c | --comment-lines]"
20577 #: builtin/stripspace.c:37
20578 msgid "skip and remove all lines starting with comment character"
20579 msgstr "跳过和移除所有的注释行"
20581 #: builtin/stripspace.c:40
20582 msgid "prepend comment character and space to each line"
20583 msgstr "为每一行的行首添加注释符和空格"
20585 #: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1999
20587 msgid "Expecting a full ref name, got %s"
20588 msgstr "期望一个完整的引用名称,却得到 %s"
20590 #: builtin/submodule--helper.c:64
20591 msgid "submodule--helper print-default-remote takes no arguments"
20592 msgstr "submodule--helper print-default-remote 不带参数"
20594 #: builtin/submodule--helper.c:102
20596 msgid "cannot strip one component off url '%s'"
20597 msgstr "无法从 url '%s' 剥离一个组件"
20599 #: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1395
20600 msgid "alternative anchor for relative paths"
20601 msgstr "相对路径的替代锚记(anchor)"
20603 #: builtin/submodule--helper.c:415
20604 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
20605 msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
20607 #: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630
20608 #: builtin/submodule--helper.c:653
20610 msgid "No url found for submodule path '%s' in .gitmodules"
20611 msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url"
20613 #: builtin/submodule--helper.c:524
20615 msgid "Entering '%s'\n"
20618 #: builtin/submodule--helper.c:527
20621 "run_command returned non-zero status for %s\n"
20624 "对 %s 执行 run_command 返回非零值。\n"
20627 #: builtin/submodule--helper.c:549
20630 "run_command returned non-zero status while recursing in the nested "
20631 "submodules of %s\n"
20634 "在递归 %s 的子模组执行 run_command 时返回非零值。\n"
20637 #: builtin/submodule--helper.c:565
20638 msgid "Suppress output of entering each submodule command"
20639 msgstr "阻止进入每一个子模组命令的输出"
20641 #: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1063
20642 msgid "Recurse into nested submodules"
20643 msgstr "递归进入嵌套子模组中"
20645 #: builtin/submodule--helper.c:572
20646 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
20647 msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <命令>"
20649 #: builtin/submodule--helper.c:599
20652 "could not look up configuration '%s'. Assuming this repository is its own "
20653 "authoritative upstream."
20654 msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。"
20656 #: builtin/submodule--helper.c:667
20658 msgid "Failed to register url for submodule path '%s'"
20659 msgstr "无法为子模组 '%s' 注册 url"
20661 #: builtin/submodule--helper.c:671
20663 msgid "Submodule '%s' (%s) registered for path '%s'\n"
20664 msgstr "子模组 '%s'(%s)已对路径 '%s' 注册\n"
20666 #: builtin/submodule--helper.c:681
20668 msgid "warning: command update mode suggested for submodule '%s'\n"
20669 msgstr "警告:建议子模组 '%s' 使用命令更新模式\n"
20671 #: builtin/submodule--helper.c:688
20673 msgid "Failed to register update mode for submodule path '%s'"
20674 msgstr "无法为子模组 '%s' 注册更新模式"
20676 #: builtin/submodule--helper.c:710
20677 msgid "Suppress output for initializing a submodule"
20678 msgstr "阻止子模组初始化的输出"
20680 #: builtin/submodule--helper.c:715
20681 msgid "git submodule--helper init [<options>] [<path>]"
20682 msgstr "git submodule--helper init [<选项>] [<路径>]"
20684 #: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
20686 msgid "no submodule mapping found in .gitmodules for path '%s'"
20687 msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射"
20689 #: builtin/submodule--helper.c:837
20691 msgid "could not resolve HEAD ref inside the submodule '%s'"
20692 msgstr "无法解析子模组 '%s' 的 HEAD 引用"
20694 #: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1033
20696 msgid "failed to recurse into submodule '%s'"
20697 msgstr "递归子模组 '%s' 失败"
20699 #: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1199
20700 msgid "Suppress submodule status output"
20703 #: builtin/submodule--helper.c:889
20705 "Use commit stored in the index instead of the one stored in the submodule "
20707 msgstr "使用存储在索引中的提交,而非存储在子模组 HEAD 中的提交"
20709 #: builtin/submodule--helper.c:890
20710 msgid "recurse into nested submodules"
20711 msgstr "递归进入嵌套子模组中"
20713 #: builtin/submodule--helper.c:895
20714 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
20715 msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路径>...]"
20717 #: builtin/submodule--helper.c:919
20718 msgid "git submodule--helper name <path>"
20719 msgstr "git submodule--helper name <路径>"
20721 #: builtin/submodule--helper.c:983
20723 msgid "Synchronizing submodule url for '%s'\n"
20724 msgstr "为 '%s' 同步子模组 url\n"
20726 #: builtin/submodule--helper.c:989
20728 msgid "failed to register url for submodule path '%s'"
20729 msgstr "无法为子模组路径 '%s' 注册 url"
20731 #: builtin/submodule--helper.c:1003
20733 msgid "failed to get the default remote for submodule '%s'"
20734 msgstr "无法得到子模组 '%s' 的默认远程关联"
20736 #: builtin/submodule--helper.c:1014
20738 msgid "failed to update remote for submodule '%s'"
20739 msgstr "无法为子模组 '%s' 更新远程关联"
20741 #: builtin/submodule--helper.c:1061
20742 msgid "Suppress output of synchronizing submodule url"
20743 msgstr "阻止子模组 url 同步的输出"
20745 #: builtin/submodule--helper.c:1068
20746 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
20747 msgstr "git submodule--helper sync [--quiet] [--recursive] [<路径>]"
20749 #: builtin/submodule--helper.c:1122
20752 "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
20753 "really want to remove it including all of its history)"
20755 "子模组工作区 '%s' 包含一个 .git 目录(如果您确需删除它及其全部历史,使用 'rm "
20758 #: builtin/submodule--helper.c:1134
20761 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
20763 msgstr "子模组工作区 '%s' 包含本地修改;使用 '-f' 丢弃它们"
20765 #: builtin/submodule--helper.c:1142
20767 msgid "Cleared directory '%s'\n"
20768 msgstr "已清除目录 '%s'\n"
20770 #: builtin/submodule--helper.c:1144
20772 msgid "Could not remove submodule work tree '%s'\n"
20773 msgstr "无法移除子模组工作区 '%s'\n"
20775 #: builtin/submodule--helper.c:1155
20777 msgid "could not create empty submodule directory %s"
20778 msgstr "不能创建空的子模组目录 %s"
20780 #: builtin/submodule--helper.c:1171
20782 msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
20783 msgstr "子模组 '%s'(%s)未对路径 '%s' 注册\n"
20785 #: builtin/submodule--helper.c:1200
20786 msgid "Remove submodule working trees even if they contain local changes"
20787 msgstr "删除子模组工作区,即使包含本地修改"
20789 #: builtin/submodule--helper.c:1201
20790 msgid "Unregister all submodules"
20791 msgstr "将所有子模组取消注册"
20793 #: builtin/submodule--helper.c:1206
20795 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
20797 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路径>...]]"
20799 #: builtin/submodule--helper.c:1220
20800 msgid "Use '--all' if you really want to deinitialize all submodules"
20801 msgstr "如果您确实想要对所有子模组执行取消初始化,请使用 '--all'"
20803 #: builtin/submodule--helper.c:1289
20805 "An alternate computed from a superproject's alternate is invalid.\n"
20806 "To allow Git to clone without an alternate in such a case, set\n"
20807 "submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n"
20808 "'--reference-if-able' instead of '--reference'."
20810 "从一个父项目的备用仓库中计算出的备用仓库无效。\n"
20811 "此场景下,设置 submodule.alternateErrorStrategy 为 'info',以允许\n"
20812 "Git 不使用备用仓库克隆,或者等效地使用 '--reference-if-able' 而非\n"
20813 "'--reference' 来克隆。"
20815 #: builtin/submodule--helper.c:1328 builtin/submodule--helper.c:1331
20817 msgid "submodule '%s' cannot add alternate: %s"
20818 msgstr "子模组 '%s' 不能添加仓库备选:%s"
20820 #: builtin/submodule--helper.c:1367
20822 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
20823 msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'"
20825 #: builtin/submodule--helper.c:1374
20827 msgid "Value '%s' for submodule.alternateLocation is not recognized"
20828 msgstr "不能识别 submodule.alternateLocaion 的取值 '%s'"
20830 #: builtin/submodule--helper.c:1398
20831 msgid "where the new submodule will be cloned to"
20832 msgstr "新的子模组将要克隆的路径"
20834 #: builtin/submodule--helper.c:1401
20835 msgid "name of the new submodule"
20838 #: builtin/submodule--helper.c:1404
20839 msgid "url where to clone the submodule from"
20840 msgstr "克隆子模组的 url 地址"
20842 #: builtin/submodule--helper.c:1412
20843 msgid "depth for shallow clones"
20846 #: builtin/submodule--helper.c:1415 builtin/submodule--helper.c:1924
20847 msgid "force cloning progress"
20850 #: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1926
20851 msgid "disallow cloning into non-empty directory"
20852 msgstr "不允许克隆到一个非空目录"
20854 #: builtin/submodule--helper.c:1424
20856 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
20857 "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
20858 "<url> --path <path>"
20860 "git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
20861 "[--name <名字>] [--depth <深度>] [--single-branch] --url <url> --path <路径>"
20863 #: builtin/submodule--helper.c:1449
20865 msgid "refusing to create/use '%s' in another submodule's git dir"
20866 msgstr "拒绝在另一个子模组的 git dir 中创建/使用 '%s'"
20868 #: builtin/submodule--helper.c:1460
20870 msgid "clone of '%s' into submodule path '%s' failed"
20871 msgstr "无法克隆 '%s' 到子模组路径 '%s'"
20873 #: builtin/submodule--helper.c:1464
20875 msgid "directory not empty: '%s'"
20878 #: builtin/submodule--helper.c:1476
20880 msgid "could not get submodule directory for '%s'"
20881 msgstr "无法得到 '%s' 的子模组目录"
20883 #: builtin/submodule--helper.c:1512
20885 msgid "Invalid update mode '%s' for submodule path '%s'"
20886 msgstr "子模组 '%2$s' 的更新模式 '%1$s' 无效"
20888 #: builtin/submodule--helper.c:1516
20890 msgid "Invalid update mode '%s' configured for submodule path '%s'"
20891 msgstr "为子模组 '%2$s' 配置的更新模式 '%1$s' 无效"
20893 #: builtin/submodule--helper.c:1617
20895 msgid "Submodule path '%s' not initialized"
20896 msgstr "子模组 '%s' 尚未初始化"
20898 #: builtin/submodule--helper.c:1621
20899 msgid "Maybe you want to use 'update --init'?"
20900 msgstr "也许您想要执行 'update --init'?"
20902 #: builtin/submodule--helper.c:1651
20904 msgid "Skipping unmerged submodule %s"
20905 msgstr "略过未合并的子模组 %s"
20907 #: builtin/submodule--helper.c:1680
20909 msgid "Skipping submodule '%s'"
20910 msgstr "略过子模组 '%s'"
20912 #: builtin/submodule--helper.c:1830
20914 msgid "Failed to clone '%s'. Retry scheduled"
20915 msgstr "克隆 '%s' 失败。按计划重试"
20917 #: builtin/submodule--helper.c:1841
20919 msgid "Failed to clone '%s' a second time, aborting"
20920 msgstr "第二次尝试克隆 '%s' 失败,退出"
20922 #: builtin/submodule--helper.c:1903 builtin/submodule--helper.c:2149
20923 msgid "path into the working tree"
20926 #: builtin/submodule--helper.c:1906
20927 msgid "path into the working tree, across nested submodule boundaries"
20928 msgstr "工作区中的路径,递归嵌套子模组"
20930 #: builtin/submodule--helper.c:1910
20931 msgid "rebase, merge, checkout or none"
20932 msgstr "rebase、merge、checkout 或 none"
20934 #: builtin/submodule--helper.c:1916
20935 msgid "Create a shallow clone truncated to the specified number of revisions"
20936 msgstr "创建一个指定深度的浅克隆"
20938 #: builtin/submodule--helper.c:1919
20939 msgid "parallel jobs"
20942 #: builtin/submodule--helper.c:1921
20943 msgid "whether the initial clone should follow the shallow recommendation"
20944 msgstr "初始克隆是否应该遵守推荐的浅克隆选项"
20946 #: builtin/submodule--helper.c:1922
20947 msgid "don't print cloning progress"
20950 #: builtin/submodule--helper.c:1933
20951 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
20952 msgstr "git submodule--helper update-clone [--prefix=<路径>] [<路径>...]"
20954 #: builtin/submodule--helper.c:1946
20955 msgid "bad value for update parameter"
20956 msgstr "update 参数取值错误"
20958 #: builtin/submodule--helper.c:1994
20961 "Submodule (%s) branch configured to inherit branch from superproject, but "
20962 "the superproject is not on any branch"
20963 msgstr "子模组(%s)的分支配置为继承上级项目的分支,但是上级项目不在任何分支上"
20965 #: builtin/submodule--helper.c:2117
20967 msgid "could not get a repository handle for submodule '%s'"
20968 msgstr "无法获得子模组 '%s' 的仓库句柄"
20970 #: builtin/submodule--helper.c:2150
20971 msgid "recurse into submodules"
20974 #: builtin/submodule--helper.c:2156
20975 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
20976 msgstr "git submodule--helper absorb-git-dirs [<选项>] [<路径>...]"
20978 #: builtin/submodule--helper.c:2212
20979 msgid "check if it is safe to write to the .gitmodules file"
20980 msgstr "检查写入 .gitmodules 文件是否安全"
20982 #: builtin/submodule--helper.c:2215
20983 msgid "unset the config in the .gitmodules file"
20984 msgstr "取消 .gitmodules 文件中的设置"
20986 #: builtin/submodule--helper.c:2220
20987 msgid "git submodule--helper config <name> [<value>]"
20988 msgstr "git submodule--helper config <名称> [<值>]"
20990 #: builtin/submodule--helper.c:2221
20991 msgid "git submodule--helper config --unset <name>"
20992 msgstr "git submodule--helper config --unset <名称>"
20994 #: builtin/submodule--helper.c:2222
20995 msgid "git submodule--helper config --check-writeable"
20996 msgstr "git submodule--helper config --check-writeable"
20998 #: builtin/submodule--helper.c:2241 git-submodule.sh:176
21000 msgid "please make sure that the .gitmodules file is in the working tree"
21001 msgstr "请确认 .gitmodules 文件在工作区里"
21003 #: builtin/submodule--helper.c:2257
21004 msgid "Suppress output for setting url of a submodule"
21005 msgstr "阻止设置子模组 URL 的输出"
21007 #: builtin/submodule--helper.c:2261
21008 msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
21009 msgstr "git submodule--helper set-url [--quiet] <路径> <新地址>"
21011 #: builtin/submodule--helper.c:2323 git.c:436 git.c:683
21013 msgid "%s doesn't support --super-prefix"
21014 msgstr "%s 不支持 --super-prefix"
21016 #: builtin/submodule--helper.c:2329
21018 msgid "'%s' is not a valid submodule--helper subcommand"
21019 msgstr "'%s' 不是一个有效的 submodule--helper 子命令"
21021 #: builtin/symbolic-ref.c:8
21022 msgid "git symbolic-ref [<options>] <name> [<ref>]"
21023 msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
21025 #: builtin/symbolic-ref.c:9
21026 msgid "git symbolic-ref -d [-q] <name>"
21027 msgstr "git symbolic-ref -d [-q] <名称>"
21029 #: builtin/symbolic-ref.c:40
21030 msgid "suppress error message for non-symbolic (detached) refs"
21031 msgstr "不显示非符号(分离的)引用的错误信息"
21033 #: builtin/symbolic-ref.c:41
21034 msgid "delete symbolic ref"
21037 #: builtin/symbolic-ref.c:42
21038 msgid "shorten ref output"
21041 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:486
21045 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:486
21046 msgid "reason of the update"
21049 #: builtin/tag.c:25
21051 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
21052 "\t\t<tagname> [<head>]"
21054 "git tag [-a | -s | -u <key-id>] [-f] [-m <消息> | -F <文件>]\n"
21057 #: builtin/tag.c:27
21058 msgid "git tag -d <tagname>..."
21059 msgstr "git tag -d <标签名>..."
21061 #: builtin/tag.c:28
21063 "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
21064 "points-at <object>]\n"
21065 "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
21067 "git tag -l [-n[<数字>]] [--contains <提交>] [--no-contains <提交>] [--points-"
21069 "\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]"
21071 #: builtin/tag.c:30
21072 msgid "git tag -v [--format=<format>] <tagname>..."
21073 msgstr "git tag -v [--format=<格式>] <标签名>..."
21075 #: builtin/tag.c:89
21077 msgid "tag '%s' not found."
21078 msgstr "未发现标签 '%s'。"
21080 #: builtin/tag.c:105
21082 msgid "Deleted tag '%s' (was %s)\n"
21083 msgstr "已删除标签 '%s'(曾为 %s)\n"
21085 #: builtin/tag.c:135
21089 "Write a message for tag:\n"
21091 "Lines starting with '%c' will be ignored.\n"
21096 "以 '%c' 开头的行将被忽略。\n"
21098 #: builtin/tag.c:139
21102 "Write a message for tag:\n"
21104 "Lines starting with '%c' will be kept; you may remove them yourself if you "
21110 "以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
21112 #: builtin/tag.c:198
21113 msgid "unable to sign the tag"
21116 #: builtin/tag.c:200
21117 msgid "unable to write tag file"
21120 #: builtin/tag.c:216
21123 "You have created a nested tag. The object referred to by your new tag is\n"
21124 "already a tag. If you meant to tag the object that it points to, use:\n"
21126 "\tgit tag -f %s %s^{}"
21128 "您创建了一个嵌套的标签。您的新标签指向的对象已经是一个标签。如果您想要\n"
21129 "对其指向的目标创建标签,使用:\n"
21131 "\tgit tag -f %s %s^{}"
21133 #: builtin/tag.c:232
21134 msgid "bad object type."
21137 #: builtin/tag.c:285
21138 msgid "no tag message?"
21141 #: builtin/tag.c:292
21143 msgid "The tag message has been left in %s\n"
21144 msgstr "标签说明被保留在 %s\n"
21146 #: builtin/tag.c:403
21147 msgid "list tag names"
21150 #: builtin/tag.c:405
21151 msgid "print <n> lines of each tag message"
21152 msgstr "每个标签信息打印 <n> 行"
21154 #: builtin/tag.c:407
21155 msgid "delete tags"
21158 #: builtin/tag.c:408
21159 msgid "verify tags"
21162 #: builtin/tag.c:410
21163 msgid "Tag creation options"
21166 #: builtin/tag.c:412
21167 msgid "annotated tag, needs a message"
21168 msgstr "附注标签,需要一个说明"
21170 #: builtin/tag.c:414
21171 msgid "tag message"
21174 #: builtin/tag.c:416
21175 msgid "force edit of tag message"
21178 #: builtin/tag.c:417
21179 msgid "annotated and GPG-signed tag"
21180 msgstr "附注并附加 GPG 签名的标签"
21182 #: builtin/tag.c:420
21183 msgid "use another key to sign the tag"
21184 msgstr "使用另外的私钥签名该标签"
21186 #: builtin/tag.c:421
21187 msgid "replace the tag if exists"
21188 msgstr "如果存在,替换现有的标签"
21190 #: builtin/tag.c:422 builtin/update-ref.c:492
21191 msgid "create a reflog"
21194 #: builtin/tag.c:424
21195 msgid "Tag listing options"
21198 #: builtin/tag.c:425
21199 msgid "show tag list in columns"
21200 msgstr "以列的方式显示标签列表"
21202 #: builtin/tag.c:426 builtin/tag.c:428
21203 msgid "print only tags that contain the commit"
21204 msgstr "只打印包含该提交的标签"
21206 #: builtin/tag.c:427 builtin/tag.c:429
21207 msgid "print only tags that don't contain the commit"
21208 msgstr "只打印不包含该提交的标签"
21210 #: builtin/tag.c:430
21211 msgid "print only tags that are merged"
21212 msgstr "只打印已经合并的标签"
21214 #: builtin/tag.c:431
21215 msgid "print only tags that are not merged"
21216 msgstr "只打印尚未合并的标签"
21218 #: builtin/tag.c:435
21219 msgid "print only tags of the object"
21220 msgstr "只打印指向该对象的标签"
21222 #: builtin/tag.c:483
21223 msgid "--column and -n are incompatible"
21224 msgstr "--column 和 -n 不兼容"
21226 #: builtin/tag.c:505
21227 msgid "-n option is only allowed in list mode"
21228 msgstr "-n 选项只允许用在列表显示模式"
21230 #: builtin/tag.c:507
21231 msgid "--contains option is only allowed in list mode"
21232 msgstr "--contains 选项只允许用在列表显示模式"
21234 #: builtin/tag.c:509
21235 msgid "--no-contains option is only allowed in list mode"
21236 msgstr "--no-contains 选项只允许用在列表显示模式"
21238 #: builtin/tag.c:511
21239 msgid "--points-at option is only allowed in list mode"
21240 msgstr "--points-at 选项只允许用在列表显示模式"
21242 #: builtin/tag.c:513
21243 msgid "--merged and --no-merged options are only allowed in list mode"
21244 msgstr "--merged 和 --no-merged 选项只允许用在列表显示模式"
21246 #: builtin/tag.c:524
21247 msgid "only one -F or -m option is allowed."
21248 msgstr "只允许一个 -F 或 -m 选项。"
21250 #: builtin/tag.c:543
21251 msgid "too many params"
21254 #: builtin/tag.c:549
21256 msgid "'%s' is not a valid tag name."
21257 msgstr "'%s' 不是一个有效的标签名称。"
21259 #: builtin/tag.c:554
21261 msgid "tag '%s' already exists"
21262 msgstr "标签 '%s' 已存在"
21264 #: builtin/tag.c:585
21266 msgid "Updated tag '%s' (was %s)\n"
21267 msgstr "已更新标签 '%s'(曾为 %s)\n"
21269 #: builtin/unpack-objects.c:502
21270 msgid "Unpacking objects"
21273 #: builtin/update-index.c:84
21275 msgid "failed to create directory %s"
21276 msgstr "创建目录 %s 失败"
21278 #: builtin/update-index.c:100
21280 msgid "failed to create file %s"
21281 msgstr "创建文件 %s 失败"
21283 #: builtin/update-index.c:108
21285 msgid "failed to delete file %s"
21286 msgstr "删除文件 %s 失败"
21288 #: builtin/update-index.c:115 builtin/update-index.c:221
21290 msgid "failed to delete directory %s"
21291 msgstr "删除目录 %s 失败"
21293 #: builtin/update-index.c:140
21295 msgid "Testing mtime in '%s' "
21296 msgstr "在 '%s' 中测试 mtime "
21298 #: builtin/update-index.c:154
21299 msgid "directory stat info does not change after adding a new file"
21300 msgstr "添加一个新文件后,目录的状态信息未改变"
21302 #: builtin/update-index.c:167
21303 msgid "directory stat info does not change after adding a new directory"
21304 msgstr "添加一个新目录后,目录的状态信息未改变"
21306 #: builtin/update-index.c:180
21307 msgid "directory stat info changes after updating a file"
21308 msgstr "更新一个文件后,目录的状态信息被修改"
21310 #: builtin/update-index.c:191
21311 msgid "directory stat info changes after adding a file inside subdirectory"
21312 msgstr "在子目录中添加文件后,目录的状态信息被修改"
21314 #: builtin/update-index.c:202
21315 msgid "directory stat info does not change after deleting a file"
21316 msgstr "删除一个文件后,目录的状态信息未改变"
21318 #: builtin/update-index.c:215
21319 msgid "directory stat info does not change after deleting a directory"
21320 msgstr "删除一个目录后,目录的状态信息未改变"
21322 #: builtin/update-index.c:222
21326 #: builtin/update-index.c:591
21327 msgid "git update-index [<options>] [--] [<file>...]"
21328 msgstr "git update-index [<选项>] [--] [<文件>...]"
21330 #: builtin/update-index.c:974
21331 msgid "continue refresh even when index needs update"
21332 msgstr "当索引需要更新时继续刷新"
21334 #: builtin/update-index.c:977
21335 msgid "refresh: ignore submodules"
21338 #: builtin/update-index.c:980
21339 msgid "do not ignore new files"
21342 #: builtin/update-index.c:982
21343 msgid "let files replace directories and vice-versa"
21344 msgstr "让文件替换目录(反之亦然)"
21346 #: builtin/update-index.c:984
21347 msgid "notice files missing from worktree"
21348 msgstr "通知文件从工作区丢失"
21350 #: builtin/update-index.c:986
21351 msgid "refresh even if index contains unmerged entries"
21352 msgstr "即使索引区包含未合并的条目也执行刷新"
21354 #: builtin/update-index.c:989
21355 msgid "refresh stat information"
21358 #: builtin/update-index.c:993
21359 msgid "like --refresh, but ignore assume-unchanged setting"
21360 msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
21362 #: builtin/update-index.c:997
21363 msgid "<mode>,<object>,<path>"
21364 msgstr "<存取模式>,<对象>,<路径>"
21366 #: builtin/update-index.c:998
21367 msgid "add the specified entry to the index"
21368 msgstr "添加指定的条目到索引区"
21370 #: builtin/update-index.c:1008
21371 msgid "mark files as \"not changing\""
21372 msgstr "把文件标记为 \"没有变更\""
21374 #: builtin/update-index.c:1011
21375 msgid "clear assumed-unchanged bit"
21376 msgstr "清除 assumed-unchanged 位"
21378 #: builtin/update-index.c:1014
21379 msgid "mark files as \"index-only\""
21380 msgstr "把文件标记为 \"仅索引\""
21382 #: builtin/update-index.c:1017
21383 msgid "clear skip-worktree bit"
21384 msgstr "清除 skip-worktree 位"
21386 #: builtin/update-index.c:1020
21387 msgid "do not touch index-only entries"
21390 #: builtin/update-index.c:1022
21391 msgid "add to index only; do not add content to object database"
21392 msgstr "只添加到索引区;不添加对象到对象库"
21394 #: builtin/update-index.c:1024
21395 msgid "remove named paths even if present in worktree"
21396 msgstr "即使存在工作区里,也删除路径"
21398 #: builtin/update-index.c:1026
21399 msgid "with --stdin: input lines are terminated by null bytes"
21400 msgstr "携带 --stdin:输入的行以 null 字符终止"
21402 #: builtin/update-index.c:1028
21403 msgid "read list of paths to be updated from standard input"
21404 msgstr "从标准输入中读取需要更新的路径列表"
21406 #: builtin/update-index.c:1032
21407 msgid "add entries from standard input to the index"
21408 msgstr "从标准输入添加条目到索引区"
21410 #: builtin/update-index.c:1036
21411 msgid "repopulate stages #2 and #3 for the listed paths"
21412 msgstr "为指定文件重新生成第2和第3暂存区"
21414 #: builtin/update-index.c:1040
21415 msgid "only update entries that differ from HEAD"
21416 msgstr "只更新与 HEAD 不同的条目"
21418 #: builtin/update-index.c:1044
21419 msgid "ignore files missing from worktree"
21420 msgstr "忽略工作区丢失的文件"
21422 #: builtin/update-index.c:1047
21423 msgid "report actions to standard output"
21426 #: builtin/update-index.c:1049
21427 msgid "(for porcelains) forget saved unresolved conflicts"
21428 msgstr "(for porcelains) 忘记保存的未解决的冲突"
21430 #: builtin/update-index.c:1053
21431 msgid "write index in this format"
21432 msgstr "以这种格式写入索引区"
21434 #: builtin/update-index.c:1055
21435 msgid "enable or disable split index"
21438 #: builtin/update-index.c:1057
21439 msgid "enable/disable untracked cache"
21440 msgstr "启用/禁用对未跟踪文件的缓存"
21442 #: builtin/update-index.c:1059
21443 msgid "test if the filesystem supports untracked cache"
21444 msgstr "测试文件系统是否支持未跟踪文件缓存"
21446 #: builtin/update-index.c:1061
21447 msgid "enable untracked cache without testing the filesystem"
21448 msgstr "无需检测文件系统,启用对未跟踪文件的缓存"
21450 #: builtin/update-index.c:1063
21451 msgid "write out the index even if is not flagged as changed"
21452 msgstr "即使没有被标记为已更改,也要写出索引"
21454 #: builtin/update-index.c:1065
21455 msgid "enable or disable file system monitor"
21456 msgstr "启用或禁用文件系统监控"
21458 #: builtin/update-index.c:1067
21459 msgid "mark files as fsmonitor valid"
21460 msgstr "标记文件为 fsmonitor 有效"
21462 #: builtin/update-index.c:1070
21463 msgid "clear fsmonitor valid bit"
21464 msgstr "清除 fsmonitor 有效位"
21466 #: builtin/update-index.c:1173
21468 "core.splitIndex is set to false; remove or change it, if you really want to "
21469 "enable split index"
21471 "core.splitIndex 被设置为 false。如果您确实要启用索引拆分,请删除或修改它。"
21473 #: builtin/update-index.c:1182
21475 "core.splitIndex is set to true; remove or change it, if you really want to "
21476 "disable split index"
21478 "core.splitIndex 被设置为 true。如果您确实要禁用索引拆分,请删除或修改它。"
21480 #: builtin/update-index.c:1194
21482 "core.untrackedCache is set to true; remove or change it, if you really want "
21483 "to disable the untracked cache"
21485 "core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存,请删除或修"
21488 #: builtin/update-index.c:1198
21489 msgid "Untracked cache disabled"
21490 msgstr "缓存未跟踪文件被禁用"
21492 #: builtin/update-index.c:1206
21494 "core.untrackedCache is set to false; remove or change it, if you really want "
21495 "to enable the untracked cache"
21497 "core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存,请删除或"
21500 #: builtin/update-index.c:1210
21502 msgid "Untracked cache enabled for '%s'"
21503 msgstr "缓存未跟踪文件在 '%s' 启用"
21505 #: builtin/update-index.c:1218
21506 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
21507 msgstr "core.fsmonitor 未设置;如果想要启用 fsmonitor 请设置该选项"
21509 #: builtin/update-index.c:1222
21510 msgid "fsmonitor enabled"
21511 msgstr "fsmonitor 被启用"
21513 #: builtin/update-index.c:1225
21515 "core.fsmonitor is set; remove it if you really want to disable fsmonitor"
21516 msgstr "core.fsmonitor 已设置;如果想要禁用 fsmonitor 请移除该选项"
21518 #: builtin/update-index.c:1229
21519 msgid "fsmonitor disabled"
21520 msgstr "fsmonitor 被禁用"
21522 #: builtin/update-ref.c:10
21523 msgid "git update-ref [<options>] -d <refname> [<old-val>]"
21524 msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
21526 #: builtin/update-ref.c:11
21527 msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
21528 msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]"
21530 #: builtin/update-ref.c:12
21531 msgid "git update-ref [<options>] --stdin [-z]"
21532 msgstr "git update-ref [<选项>] --stdin [-z]"
21534 #: builtin/update-ref.c:487
21535 msgid "delete the reference"
21538 #: builtin/update-ref.c:489
21539 msgid "update <refname> not the one it points to"
21540 msgstr "更新 <引用名> 本身而不是它指向的引用"
21542 #: builtin/update-ref.c:490
21543 msgid "stdin has NUL-terminated arguments"
21544 msgstr "标准输入有以 NUL 字符终止的参数"
21546 #: builtin/update-ref.c:491
21547 msgid "read updates from stdin"
21550 #: builtin/update-server-info.c:7
21551 msgid "git update-server-info [--force]"
21552 msgstr "git update-server-info [--force]"
21554 #: builtin/update-server-info.c:15
21555 msgid "update the info files from scratch"
21556 msgstr "从头开始更新文件信息"
21558 #: builtin/upload-pack.c:11
21559 msgid "git upload-pack [<options>] <dir>"
21560 msgstr "git upload-pack [<选项>] <目录>"
21562 #: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
21563 msgid "quit after a single request/response exchange"
21564 msgstr "在一次单独的请求/响应之后退出"
21566 #: builtin/upload-pack.c:25
21567 msgid "exit immediately after initial ref advertisement"
21568 msgstr "在初始的引用广告后立即退出"
21570 #: builtin/upload-pack.c:27
21571 msgid "do not try <directory>/.git/ if <directory> is no Git directory"
21572 msgstr "如果 <目录> 不是一个 Git 目录,不要尝试 <目录>/.git/"
21574 #: builtin/upload-pack.c:29
21575 msgid "interrupt transfer after <n> seconds of inactivity"
21576 msgstr "不活动 <n> 秒钟后终止传输"
21578 #: builtin/verify-commit.c:19
21579 msgid "git verify-commit [-v | --verbose] <commit>..."
21580 msgstr "git verify-commit [-v | --verbose] <提交>..."
21582 #: builtin/verify-commit.c:68
21583 msgid "print commit contents"
21586 #: builtin/verify-commit.c:69 builtin/verify-tag.c:37
21587 msgid "print raw gpg status output"
21588 msgstr "打印原始 gpg 状态输出"
21590 #: builtin/verify-pack.c:55
21591 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
21592 msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
21594 #: builtin/verify-pack.c:65
21598 #: builtin/verify-pack.c:67
21599 msgid "show statistics only"
21602 #: builtin/verify-tag.c:18
21603 msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
21604 msgstr "git verify-tag [-v | --verbose] [--format=<格式>] <标签>..."
21606 #: builtin/verify-tag.c:36
21607 msgid "print tag contents"
21610 #: builtin/worktree.c:17
21611 msgid "git worktree add [<options>] <path> [<commit-ish>]"
21612 msgstr "git worktree add [<选项>] <路径> [<提交>]"
21614 #: builtin/worktree.c:18
21615 msgid "git worktree list [<options>]"
21616 msgstr "git worktree list [<选项>]"
21618 #: builtin/worktree.c:19
21619 msgid "git worktree lock [<options>] <path>"
21620 msgstr "git worktree lock [<选项>] <路径>"
21622 #: builtin/worktree.c:20
21623 msgid "git worktree move <worktree> <new-path>"
21624 msgstr "git worktree move <工作区> <新路径>"
21626 #: builtin/worktree.c:21
21627 msgid "git worktree prune [<options>]"
21628 msgstr "git worktree prune [<选项>]"
21630 #: builtin/worktree.c:22
21631 msgid "git worktree remove [<options>] <worktree>"
21632 msgstr "git worktree remove [<选项>] <工作区>"
21634 #: builtin/worktree.c:23
21635 msgid "git worktree unlock <path>"
21636 msgstr "git worktree unlock <路径>"
21638 #: builtin/worktree.c:60 builtin/worktree.c:894
21640 msgid "failed to delete '%s'"
21641 msgstr "删除 '%s' 失败"
21643 #: builtin/worktree.c:79
21645 msgid "Removing worktrees/%s: not a valid directory"
21646 msgstr "删除工作区/%s:不是一个有效的目录"
21648 #: builtin/worktree.c:85
21650 msgid "Removing worktrees/%s: gitdir file does not exist"
21651 msgstr "删除 worktrees/%s:gitdir 文件不存在"
21653 #: builtin/worktree.c:90 builtin/worktree.c:99
21655 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
21656 msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)"
21658 #: builtin/worktree.c:109
21661 "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
21663 msgstr "删除工作树/%s:读取过短(期望 %<PRIuMAX> 字节,读取 %<PRIuMAX>)"
21665 #: builtin/worktree.c:117
21667 msgid "Removing worktrees/%s: invalid gitdir file"
21668 msgstr "删除 worktrees/%s:无效的 gitdir 文件"
21670 #: builtin/worktree.c:126
21672 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
21673 msgstr "删除 worktrees/%s:gitdir 文件的指向不存在"
21675 #: builtin/worktree.c:165
21676 msgid "report pruned working trees"
21679 #: builtin/worktree.c:167
21680 msgid "expire working trees older than <time>"
21681 msgstr "将早于 <时间> 的工作区过期"
21683 #: builtin/worktree.c:234
21685 msgid "'%s' already exists"
21688 #: builtin/worktree.c:244
21690 msgid "unable to re-add worktree '%s'"
21691 msgstr "无法再次添加工作区 '%s'"
21693 #: builtin/worktree.c:249
21696 "'%s' is a missing but locked worktree;\n"
21697 "use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
21699 "'%s' 是一个丢失但锁定的工作区,使用\n"
21700 "'add -f -f' 覆盖,或 'unlock' 和 'prune' 或 'remove' 清除"
21702 #: builtin/worktree.c:251
21705 "'%s' is a missing but already registered worktree;\n"
21706 "use 'add -f' to override, or 'prune' or 'remove' to clear"
21708 "'%s' 是一个丢失但已经注册的工作区,使用\n"
21709 "'add -f' 覆盖,或 'prune' 或 'remove' 清除"
21711 #: builtin/worktree.c:301
21713 msgid "could not create directory of '%s'"
21714 msgstr "不能创建目录 '%s'"
21716 #: builtin/worktree.c:435 builtin/worktree.c:441
21718 msgid "Preparing worktree (new branch '%s')"
21719 msgstr "准备工作区(新分支 '%s')"
21721 #: builtin/worktree.c:437
21723 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
21724 msgstr "准备工作区(重置分支 '%s',之前为 %s)"
21726 #: builtin/worktree.c:446
21728 msgid "Preparing worktree (checking out '%s')"
21729 msgstr "准备工作区(检出 '%s')"
21731 #: builtin/worktree.c:452
21733 msgid "Preparing worktree (detached HEAD %s)"
21734 msgstr "准备工作区(分离头指针 %s)"
21736 #: builtin/worktree.c:493
21737 msgid "checkout <branch> even if already checked out in other worktree"
21738 msgstr "检出 <分支>,即使已经被检出到其它工作区"
21740 #: builtin/worktree.c:496
21741 msgid "create a new branch"
21744 #: builtin/worktree.c:498
21745 msgid "create or reset a branch"
21748 #: builtin/worktree.c:500
21749 msgid "populate the new working tree"
21752 #: builtin/worktree.c:501
21753 msgid "keep the new working tree locked"
21756 #: builtin/worktree.c:504
21757 msgid "set up tracking mode (see git-branch(1))"
21758 msgstr "设置跟踪模式(参见 git-branch(1))"
21760 #: builtin/worktree.c:507
21761 msgid "try to match the new branch name with a remote-tracking branch"
21762 msgstr "尝试为新分支名匹配一个远程跟踪分支"
21764 #: builtin/worktree.c:515
21765 msgid "-b, -B, and --detach are mutually exclusive"
21766 msgstr "-b、-B 和 --detach 是互斥的"
21768 #: builtin/worktree.c:576
21769 msgid "--[no-]track can only be used if a new branch is created"
21770 msgstr "只能在创建新分支时使用选项 --[no-]track "
21772 #: builtin/worktree.c:676
21773 msgid "reason for locking"
21776 #: builtin/worktree.c:688 builtin/worktree.c:721 builtin/worktree.c:795
21777 #: builtin/worktree.c:922
21779 msgid "'%s' is not a working tree"
21780 msgstr "'%s' 不是一个工作区"
21782 #: builtin/worktree.c:690 builtin/worktree.c:723
21783 msgid "The main working tree cannot be locked or unlocked"
21784 msgstr "主工作区无法被加锁或解锁"
21786 #: builtin/worktree.c:695
21788 msgid "'%s' is already locked, reason: %s"
21789 msgstr "'%s' 已被锁定,原因:%s"
21791 #: builtin/worktree.c:697
21793 msgid "'%s' is already locked"
21796 #: builtin/worktree.c:725
21798 msgid "'%s' is not locked"
21801 #: builtin/worktree.c:766
21802 msgid "working trees containing submodules cannot be moved or removed"
21803 msgstr "不能移动或删除包含子模组的工作区"
21805 #: builtin/worktree.c:774
21806 msgid "force move even if worktree is dirty or locked"
21807 msgstr "强制移动,即使工作区是脏的或已锁定"
21809 #: builtin/worktree.c:797 builtin/worktree.c:924
21811 msgid "'%s' is a main working tree"
21812 msgstr "'%s' 是一个主工作区"
21814 #: builtin/worktree.c:802
21816 msgid "could not figure out destination name from '%s'"
21817 msgstr "无法从 '%s' 算出目标名称"
21819 #: builtin/worktree.c:808
21821 msgid "target '%s' already exists"
21822 msgstr "目标 '%s' 已存在"
21824 #: builtin/worktree.c:816
21827 "cannot move a locked working tree, lock reason: %s\n"
21828 "use 'move -f -f' to override or unlock first"
21830 "无法移动一个锁定的工作区,锁定原因:%s\n"
21831 "使用 'move -f -f' 覆盖或先解锁"
21833 #: builtin/worktree.c:818
21835 "cannot move a locked working tree;\n"
21836 "use 'move -f -f' to override or unlock first"
21839 "使用 'move -f -f' 覆盖或先解锁"
21841 #: builtin/worktree.c:821
21843 msgid "validation failed, cannot move working tree: %s"
21844 msgstr "验证失败,无法移动工作区:%s"
21846 #: builtin/worktree.c:826
21848 msgid "failed to move '%s' to '%s'"
21849 msgstr "移动 '%s' 到 '%s' 失败"
21851 #: builtin/worktree.c:874
21853 msgid "failed to run 'git status' on '%s'"
21854 msgstr "在 '%s' 中执行 'git status' 失败"
21856 #: builtin/worktree.c:878
21858 msgid "'%s' contains modified or untracked files, use --force to delete it"
21859 msgstr "'%s' 包含修改或未跟踪的文件,使用 --force 删除"
21861 #: builtin/worktree.c:883
21863 msgid "failed to run 'git status' on '%s', code %d"
21864 msgstr "在 '%s' 中执行 'git status' 失败,退出码 %d"
21866 #: builtin/worktree.c:906
21867 msgid "force removal even if worktree is dirty or locked"
21868 msgstr "强制删除,即使工作区是脏的或已锁定"
21870 #: builtin/worktree.c:929
21873 "cannot remove a locked working tree, lock reason: %s\n"
21874 "use 'remove -f -f' to override or unlock first"
21876 "无法删除一个锁定的工作区,锁定原因:%s\n"
21877 "使用 'remove -f -f' 覆盖或先解锁"
21879 #: builtin/worktree.c:931
21881 "cannot remove a locked working tree;\n"
21882 "use 'remove -f -f' to override or unlock first"
21885 "使用 'remove -f -f' 覆盖或先解锁"
21887 #: builtin/worktree.c:934
21889 msgid "validation failed, cannot remove working tree: %s"
21890 msgstr "验证失败,无法删除工作区:%s"
21892 #: builtin/write-tree.c:15
21893 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
21894 msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
21896 #: builtin/write-tree.c:28
21900 #: builtin/write-tree.c:29
21901 msgid "write tree object for a subdirectory <prefix>"
21902 msgstr "将 <前缀> 子目录内容写到一个树对象"
21904 #: builtin/write-tree.c:31
21905 msgid "only useful for debugging"
21909 msgid "git version:\n"
21914 msgid "uname() failed with error '%s' (%d)\n"
21915 msgstr "uname() 失败,错误为 '%s'(%d)\n"
21918 msgid "compiler info: "
21922 msgid "libc info: "
21926 msgid "not run from a git repository - no hooks to show\n"
21927 msgstr "不是在 git 仓库中执行 - 没有要显示的钩子\n"
21930 msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
21931 msgstr "git bugreport [-o|--output-directory <文件>] [-s|--suffix <格式>]"
21935 "Thank you for filling out a Git bug report!\n"
21936 "Please answer the following questions to help us understand your issue.\n"
21938 "What did you do before the bug happened? (Steps to reproduce your issue)\n"
21940 "What did you expect to happen? (Expected behavior)\n"
21942 "What happened instead? (Actual behavior)\n"
21944 "What's different between what you expected and what actually happened?\n"
21946 "Anything else you want to add:\n"
21948 "Please review the rest of the bug report below.\n"
21949 "You can delete any lines you don't wish to share.\n"
21951 "感谢您填写 Git 错误报告!\n"
21952 "请填写以下问卷,以帮助我们了解您的问题。\n"
21954 "在错误发生之前,您做了什么?(重现问题的步骤)\n"
21960 "您所期望的与实际发生的有什么不同?\n"
21965 "您可以删除任何您不想共享的内容。\n"
21968 msgid "specify a destination for the bugreport file"
21969 msgstr "指定错误报告文件的目标位置"
21972 msgid "specify a strftime format suffix for the filename"
21973 msgstr "指定文件的 strftime 格式后缀"
21977 msgid "could not create leading directories for '%s'"
21978 msgstr "不能为 '%s' 创建先导目录"
21981 msgid "System Info"
21985 msgid "Enabled Hooks"
21990 msgid "couldn't create a new file at '%s'"
21991 msgstr "不能创建新文件 '%s'"
21995 msgid "Created new report at '%s'.\n"
21996 msgstr "在 '%s' 创建了新报告。\n"
21998 #: fast-import.c:3085
22000 msgid "Missing from marks for submodule '%s'"
22001 msgstr "子模组 '%s' 缺少 from 标记"
22003 #: fast-import.c:3087
22005 msgid "Missing to marks for submodule '%s'"
22006 msgstr "子模组 '%s' 缺少 to 标记"
22008 #: fast-import.c:3222
22010 msgid "Expected 'mark' command, got %s"
22011 msgstr "预期 'mark' 命令,得到 %s"
22013 #: fast-import.c:3227
22015 msgid "Expected 'to' command, got %s"
22016 msgstr "预期 'to' 命令,得到 %s"
22018 #: fast-import.c:3317
22019 msgid "Expected format name:filename for submodule rewrite option"
22020 msgstr "子模组重写选项的预期格式为 name:filename"
22022 #: fast-import.c:3371
22024 msgid "feature '%s' forbidden in input without --allow-unsafe-features"
22025 msgstr "不带 --allow-unsafe-features 的输入中禁止使用功能 '%s'"
22027 #: credential-cache--daemon.c:223
22030 "The permissions on your socket directory are too loose; other\n"
22031 "users may be able to read your cached credentials. Consider running:\n"
22035 "您的 socket 目录权限过于宽松,其他用户可能会读取您缓存的认证信息。考虑执"
22040 #: credential-cache--daemon.c:272
22041 msgid "print debugging messages to stderr"
22042 msgstr "调试信息输出到标准错误"
22044 #: t/helper/test-reach.c:152
22046 msgid "commit %s is not marked reachable"
22047 msgstr "提交 %s 没有标记为可达"
22049 #: t/helper/test-reach.c:162
22050 msgid "too many commits marked reachable"
22053 #: t/helper/test-serve-v2.c:7
22054 msgid "test-tool serve-v2 [<options>]"
22055 msgstr "test-tool serve-v2 [<选项>]"
22057 #: t/helper/test-serve-v2.c:19
22058 msgid "exit immediately after advertising capabilities"
22059 msgstr "对能力广告之后立即退出"
22063 "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
22064 " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
22065 " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
22067 " [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
22068 " <command> [<args>]"
22070 "git [--version] [--help] [-C <路径>] [-c <名称>=<取值>]\n"
22071 " [--exec-path[=<路径>]] [--html-path] [--man-path] [--info-path]\n"
22072 " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
22074 " [--git-dir=<路径>] [--work-tree=<路径>] [--namespace=<名称>]\n"
22079 "'git help -a' and 'git help -g' list available subcommands and some\n"
22080 "concept guides. See 'git help <command>' or 'git help <concept>'\n"
22081 "to read about a specific subcommand or concept.\n"
22082 "See 'git help git' for an overview of the system."
22084 "命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
22085 "查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
22087 "有关系统的概述,查看 'git help git'。"
22091 msgid "no directory given for --git-dir\n"
22092 msgstr "没有为 --git-dir 提供目录\n"
22096 msgid "no namespace given for --namespace\n"
22097 msgstr "没有为 --namespace 提供命名空间\n"
22101 msgid "no directory given for --work-tree\n"
22102 msgstr "没有为 --work-tree 提供目录\n"
22106 msgid "no prefix given for --super-prefix\n"
22107 msgstr "没有为 --super-prefix 提供前缀\n"
22111 msgid "-c expects a configuration string\n"
22112 msgstr "应为 -c 提供一个配置字符串\n"
22116 msgid "no directory given for -C\n"
22117 msgstr "没有为 -C 提供目录\n"
22121 msgid "unknown option: %s\n"
22126 msgid "while expanding alias '%s': '%s'"
22127 msgstr "在扩展别名 '%s' 时:'%s'"
22132 "alias '%s' changes environment variables.\n"
22133 "You can use '!git' in the alias to do this"
22135 "别名 '%s' 修改环境变量。您可以使用在别名中\n"
22140 msgid "empty alias for %s"
22145 msgid "recursive alias: %s"
22149 msgid "write failure on standard output"
22153 msgid "unknown write failure on standard output"
22154 msgstr "到标准输出的未知写入错误"
22157 msgid "close failed on standard output"
22162 msgid "alias loop detected: expansion of '%s' does not terminate:%s"
22163 msgstr "检测到别名循环:'%s'的扩展未终止:%s"
22167 msgid "cannot handle %s as a builtin"
22168 msgstr "不能作为内置命令处理 %s"
22181 msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
22182 msgstr "展开别名命令 '%s' 失败,'%s' 不是一个 git 命令\n"
22186 msgid "failed to run command '%s': %s\n"
22187 msgstr "运行命令 '%s' 失败:%s\n"
22191 msgid "negative value for http.postbuffer; defaulting to %d"
22192 msgstr "http.postbuffer 为负值,默认为 %d"
22195 msgid "Delegation control is not supported with cURL < 7.22.0"
22196 msgstr "不支持委托控制,因为 cURL < 7.22.0"
22199 msgid "Public key pinning not supported with cURL < 7.44.0"
22200 msgstr "不支持公钥文件锁定,因为 cURL < 7.44.0"
22203 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
22204 msgstr "不支持 CURLSSLOPT_NO_REVOKE,因为 cURL < 7.44.0"
22207 msgid "Protocol restrictions not supported with cURL < 7.19.4"
22208 msgstr "不支持协议限制,因为 cURL < 7.19.4"
22212 msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
22213 msgstr "不支持的 SSL 后端 '%s'。支持的 SSL 后端:"
22217 msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
22218 msgstr "无法设置 SSL 后端为 '%s':cURL: cURL 没有使用 SSL 后端构建"
22222 msgid "Could not set SSL backend to '%s': already set"
22223 msgstr "无法将 SSL 后端设置为 '%s':已经设置"
22228 "unable to update url base from redirection:\n"
22232 "不能更新重定向的 url base:\n"
22236 #: remote-curl.c:166
22238 msgid "invalid quoting in push-option value: '%s'"
22239 msgstr "在 push-option 取值中无效的引号:'%s'"
22241 #: remote-curl.c:263
22243 msgid "%sinfo/refs not valid: is this a git repository?"
22244 msgstr "%sinfo/refs 无效:这是一个 git 仓库么?"
22246 #: remote-curl.c:364
22247 msgid "invalid server response; expected service, got flush packet"
22248 msgstr "无效的服务端响应。预期服务,得到 flush 包"
22250 #: remote-curl.c:395
22252 msgid "invalid server response; got '%s'"
22253 msgstr "无效的服务端响应,得到 '%s'"
22255 #: remote-curl.c:455
22257 msgid "repository '%s' not found"
22258 msgstr "仓库 '%s' 未找到"
22260 #: remote-curl.c:459
22262 msgid "Authentication failed for '%s'"
22265 #: remote-curl.c:463
22267 msgid "unable to access '%s': %s"
22268 msgstr "无法访问 '%s':%s"
22270 #: remote-curl.c:469
22272 msgid "redirecting to %s"
22275 #: remote-curl.c:593
22276 msgid "shouldn't have EOF when not gentle on EOF"
22277 msgstr "当没有设置温和处理文件结束符(EOF)时,不应该有文件结束符"
22279 #: remote-curl.c:673
22280 msgid "unable to rewind rpc post data - try increasing http.postBuffer"
22281 msgstr "无法倒回 rpc post 数据 - 尝试增加 http.postBuffer"
22283 #: remote-curl.c:733
22285 msgid "RPC failed; %s"
22288 #: remote-curl.c:773
22289 msgid "cannot handle pushes this big"
22290 msgstr "不能处理这么大的推送"
22292 #: remote-curl.c:888
22294 msgid "cannot deflate request; zlib deflate error %d"
22295 msgstr "不能压缩请求,zlib 压缩错误 %d"
22297 #: remote-curl.c:892
22299 msgid "cannot deflate request; zlib end error %d"
22300 msgstr "不能压缩请求,zlib 结束错误 %d"
22302 #: remote-curl.c:1023
22303 msgid "dumb http transport does not support shallow capabilities"
22304 msgstr "哑 http 传输不支持 shalllow 能力"
22306 #: remote-curl.c:1038
22307 msgid "fetch failed."
22310 #: remote-curl.c:1086
22311 msgid "cannot fetch by sha1 over smart http"
22312 msgstr "无法通过智能 HTTP 获取 sha1"
22314 #: remote-curl.c:1130 remote-curl.c:1136
22316 msgid "protocol error: expected sha/ref, got '%s'"
22317 msgstr "协议错误:期望 sha/ref,却得到 '%s'"
22319 #: remote-curl.c:1148 remote-curl.c:1263
22321 msgid "http transport does not support %s"
22322 msgstr "http 传输协议不支持 %s"
22324 #: remote-curl.c:1184
22325 msgid "git-http-push failed"
22326 msgstr "git-http-push 失败"
22328 #: remote-curl.c:1369
22329 msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
22330 msgstr "remote-curl:用法:git remote-curl <远程> [<url>]"
22332 #: remote-curl.c:1401
22333 msgid "remote-curl: error reading command stream from git"
22334 msgstr "remote-curl:错误读取来自 git 的命令流"
22336 #: remote-curl.c:1408
22337 msgid "remote-curl: fetch attempted without a local repo"
22338 msgstr "remote-curl:尝试没有本地仓库下获取"
22340 #: remote-curl.c:1448
22342 msgid "remote-curl: unknown command '%s' from git"
22343 msgstr "remote-curl:未知的来自 git 的命令 '%s'"
22345 #: compat/compiler.h:26
22346 msgid "no compiler information available\n"
22347 msgstr "编译器信息不可用\n"
22349 #: compat/compiler.h:38
22350 msgid "no libc information available\n"
22351 msgstr "libc 信息不可用\n"
22353 #: list-objects-filter-options.h:85
22357 #: list-objects-filter-options.h:86
22358 msgid "object filtering"
22361 #: parse-options.h:183
22362 msgid "expiry-date"
22365 #: parse-options.h:197
22366 msgid "no-op (backward compatibility)"
22369 #: parse-options.h:309
22370 msgid "be more verbose"
22373 #: parse-options.h:311
22374 msgid "be more quiet"
22377 #: parse-options.h:317
22378 msgid "use <n> digits to display SHA-1s"
22379 msgstr "用 <n> 位数字显示 SHA-1 哈希值"
22381 #: parse-options.h:336
22382 msgid "how to strip spaces and #comments from message"
22383 msgstr "设置如何删除提交说明里的空格和#注释"
22385 #: parse-options.h:337
22386 msgid "read pathspec from file"
22387 msgstr "从文件读取路径表达式"
22389 #: parse-options.h:338
22391 "with --pathspec-from-file, pathspec elements are separated with NUL character"
22392 msgstr "使用 --pathspec-from-file,路径表达式用空字符分隔"
22394 #: ref-filter.h:101
22398 #: ref-filter.h:101
22399 msgid "field name to sort on"
22403 msgid "update the index with reused conflict resolution if possible"
22404 msgstr "如果可能,重用冲突解决更新索引"
22407 msgid "HEAD detached at "
22411 msgid "HEAD detached from "
22414 #: command-list.h:50
22415 msgid "Add file contents to the index"
22418 #: command-list.h:51
22419 msgid "Apply a series of patches from a mailbox"
22420 msgstr "应用邮箱格式的系列补丁"
22422 #: command-list.h:52
22423 msgid "Annotate file lines with commit information"
22424 msgstr "使用提交信息注释文件行"
22426 #: command-list.h:53
22427 msgid "Apply a patch to files and/or to the index"
22428 msgstr "应用一个补丁到文件和/或索引区"
22430 #: command-list.h:54
22431 msgid "Import a GNU Arch repository into Git"
22432 msgstr "将一个 GNU Arch 仓库导入到 Git"
22434 #: command-list.h:55
22435 msgid "Create an archive of files from a named tree"
22436 msgstr "基于一个指定的树创建文件存档"
22438 #: command-list.h:56
22439 msgid "Use binary search to find the commit that introduced a bug"
22440 msgstr "通过二分查找定位引入 bug 的提交"
22442 #: command-list.h:57
22443 msgid "Show what revision and author last modified each line of a file"
22444 msgstr "显示文件每一行最后修改的版本和修改者"
22446 #: command-list.h:58
22447 msgid "List, create, or delete branches"
22448 msgstr "列出、创建或删除分支"
22450 #: command-list.h:59
22451 msgid "Collect information for user to file a bug report"
22452 msgstr "收集信息以供用户提交错误报告"
22454 #: command-list.h:60
22455 msgid "Move objects and refs by archive"
22456 msgstr "通过归档移动对象和引用"
22458 #: command-list.h:61
22459 msgid "Provide content or type and size information for repository objects"
22460 msgstr "提供仓库对象的内容、类型或大小"
22462 #: command-list.h:62
22463 msgid "Display gitattributes information"
22464 msgstr "显示 gitattributes 信息"
22466 #: command-list.h:63
22467 msgid "Debug gitignore / exclude files"
22468 msgstr "调试 gitignore / exclude 文件"
22470 #: command-list.h:64
22471 msgid "Show canonical names and email addresses of contacts"
22472 msgstr "显示联系人的规范名称和电子邮件"
22474 #: command-list.h:65
22475 msgid "Switch branches or restore working tree files"
22476 msgstr "切换分支或恢复工作区文件"
22478 #: command-list.h:66
22479 msgid "Copy files from the index to the working tree"
22480 msgstr "从索引拷贝文件到工作区"
22482 #: command-list.h:67
22483 msgid "Ensures that a reference name is well formed"
22484 msgstr "确保引用名称格式正确"
22486 #: command-list.h:68
22487 msgid "Find commits yet to be applied to upstream"
22488 msgstr "查找尚未应用到上游的提交"
22490 #: command-list.h:69
22491 msgid "Apply the changes introduced by some existing commits"
22492 msgstr "应用一些现存提交引入的修改"
22494 #: command-list.h:70
22495 msgid "Graphical alternative to git-commit"
22496 msgstr "git-commit 的图形替代界面"
22498 #: command-list.h:71
22499 msgid "Remove untracked files from the working tree"
22500 msgstr "从工作区中删除未跟踪文件"
22502 #: command-list.h:72
22503 msgid "Clone a repository into a new directory"
22504 msgstr "克隆仓库到一个新目录"
22506 #: command-list.h:73
22507 msgid "Display data in columns"
22510 #: command-list.h:74
22511 msgid "Record changes to the repository"
22514 #: command-list.h:75
22515 msgid "Write and verify Git commit-graph files"
22516 msgstr "写入和校验 Git 提交图文件"
22518 #: command-list.h:76
22519 msgid "Create a new commit object"
22520 msgstr "创建一个新的提交对象"
22522 #: command-list.h:77
22523 msgid "Get and set repository or global options"
22524 msgstr "获取和设置仓库或者全局选项"
22526 #: command-list.h:78
22527 msgid "Count unpacked number of objects and their disk consumption"
22528 msgstr "计算未打包对象的数量和磁盘空间占用"
22530 #: command-list.h:79
22531 msgid "Retrieve and store user credentials"
22534 #: command-list.h:80
22535 msgid "Helper to temporarily store passwords in memory"
22536 msgstr "在内存中临时存储密码的助手"
22538 #: command-list.h:81
22539 msgid "Helper to store credentials on disk"
22540 msgstr "在磁盘存储密码的助手"
22542 #: command-list.h:82
22543 msgid "Export a single commit to a CVS checkout"
22544 msgstr "将一个提交导出到 CVS 检出中"
22546 #: command-list.h:83
22547 msgid "Salvage your data out of another SCM people love to hate"
22548 msgstr "从另外一个人们爱恨的配置管理系统中拯救你的数据"
22550 #: command-list.h:84
22551 msgid "A CVS server emulator for Git"
22552 msgstr "Git 的一个 CVS 服务模拟器"
22554 #: command-list.h:85
22555 msgid "A really simple server for Git repositories"
22556 msgstr "一个非常简单的 Git 仓库服务器"
22558 #: command-list.h:86
22559 msgid "Give an object a human readable name based on an available ref"
22560 msgstr "基于一个现存的引用为一个对象起一个可读的名称"
22562 #: command-list.h:87
22563 msgid "Show changes between commits, commit and working tree, etc"
22564 msgstr "显示提交之间、提交和工作区之间等的差异"
22566 #: command-list.h:88
22567 msgid "Compares files in the working tree and the index"
22568 msgstr "比较工作区和索引区中的文件"
22570 #: command-list.h:89
22571 msgid "Compare a tree to the working tree or index"
22572 msgstr "将一个树和工作区或索引做比较"
22574 #: command-list.h:90
22575 msgid "Compares the content and mode of blobs found via two tree objects"
22576 msgstr "比较两个树对象的文件内容和模式"
22578 #: command-list.h:91
22579 msgid "Show changes using common diff tools"
22580 msgstr "使用常见的差异工具显示更改"
22582 #: command-list.h:92
22583 msgid "Git data exporter"
22586 #: command-list.h:93
22587 msgid "Backend for fast Git data importers"
22588 msgstr "Git 快速数据导入器后端"
22590 #: command-list.h:94
22591 msgid "Download objects and refs from another repository"
22592 msgstr "从另外一个仓库下载对象和引用"
22594 #: command-list.h:95
22595 msgid "Receive missing objects from another repository"
22596 msgstr "从另一个仓库获取缺失的对象"
22598 #: command-list.h:96
22599 msgid "Rewrite branches"
22602 #: command-list.h:97
22603 msgid "Produce a merge commit message"
22604 msgstr "生成一个合并提交信息"
22606 #: command-list.h:98
22607 msgid "Output information on each ref"
22608 msgstr "对每一个引用输出信息 "
22610 #: command-list.h:99
22611 msgid "Prepare patches for e-mail submission"
22612 msgstr "准备电子邮件提交的补丁"
22614 #: command-list.h:100
22615 msgid "Verifies the connectivity and validity of the objects in the database"
22616 msgstr "验证仓库中对象的连通性和有效性"
22618 #: command-list.h:101
22619 msgid "Cleanup unnecessary files and optimize the local repository"
22620 msgstr "清除不必要的文件和优化本地仓库"
22622 #: command-list.h:102
22623 msgid "Extract commit ID from an archive created using git-archive"
22624 msgstr "从 git-archive 创建的归档文件中提取提交 ID"
22626 #: command-list.h:103
22627 msgid "Print lines matching a pattern"
22630 #: command-list.h:104
22631 msgid "A portable graphical interface to Git"
22632 msgstr "一个便携的 Git 图形客户端"
22634 #: command-list.h:105
22635 msgid "Compute object ID and optionally creates a blob from a file"
22636 msgstr "从一个文件计算对象 ID,并可以创建 blob 数据对象"
22638 #: command-list.h:106
22639 msgid "Display help information about Git"
22640 msgstr "显示 Git 的帮助信息"
22642 #: command-list.h:107
22643 msgid "Server side implementation of Git over HTTP"
22644 msgstr "Git HTTP 协议的服务端实现"
22646 #: command-list.h:108
22647 msgid "Download from a remote Git repository via HTTP"
22648 msgstr "通过 HTTP 从远程 Git 仓库下载"
22650 #: command-list.h:109
22651 msgid "Push objects over HTTP/DAV to another repository"
22652 msgstr "通过 HTTP/DAV 推送对象另一个仓库"
22654 #: command-list.h:110
22655 msgid "Send a collection of patches from stdin to an IMAP folder"
22656 msgstr "从标准输入将一组补丁发送到IMAP文件夹"
22658 #: command-list.h:111
22659 msgid "Build pack index file for an existing packed archive"
22660 msgstr "从一个现存的包存档文件创建包索引"
22662 #: command-list.h:112
22663 msgid "Create an empty Git repository or reinitialize an existing one"
22664 msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库"
22666 #: command-list.h:113
22667 msgid "Instantly browse your working repository in gitweb"
22668 msgstr "在 gitweb 中即时浏览您的工作仓库"
22670 #: command-list.h:114
22671 msgid "Add or parse structured information in commit messages"
22672 msgstr "添加或解析提交说明中的结构化信息"
22674 #: command-list.h:115
22675 msgid "The Git repository browser"
22678 #: command-list.h:116
22679 msgid "Show commit logs"
22682 #: command-list.h:117
22683 msgid "Show information about files in the index and the working tree"
22684 msgstr "显示索引和工作区中文件的信息"
22686 #: command-list.h:118
22687 msgid "List references in a remote repository"
22688 msgstr "显示一个远程仓库的引用"
22690 #: command-list.h:119
22691 msgid "List the contents of a tree object"
22692 msgstr "显示一个树对象的内容"
22694 #: command-list.h:120
22695 msgid "Extracts patch and authorship from a single e-mail message"
22696 msgstr "从单个电子邮件中提取补丁和作者身份"
22698 #: command-list.h:121
22699 msgid "Simple UNIX mbox splitter program"
22700 msgstr "简单的 UNIX mbox 邮箱切分程序"
22702 #: command-list.h:122
22703 msgid "Join two or more development histories together"
22704 msgstr "合并两个或更多开发历史"
22706 #: command-list.h:123
22707 msgid "Find as good common ancestors as possible for a merge"
22708 msgstr "为了合并查找尽可能好的公共祖先提交"
22710 #: command-list.h:124
22711 msgid "Run a three-way file merge"
22712 msgstr "运行一个三路文件合并"
22714 #: command-list.h:125
22715 msgid "Run a merge for files needing merging"
22716 msgstr "对于需要合并的文件执行合并"
22718 #: command-list.h:126
22719 msgid "The standard helper program to use with git-merge-index"
22720 msgstr "与 git-merge-index 一起使用的标准向导程序"
22722 #: command-list.h:127
22723 msgid "Run merge conflict resolution tools to resolve merge conflicts"
22724 msgstr "运行合并冲突解决工具以解决合并冲突"
22726 #: command-list.h:128
22727 msgid "Show three-way merge without touching index"
22728 msgstr "显示三路合并而不动索引"
22730 #: command-list.h:129
22731 msgid "Write and verify multi-pack-indexes"
22734 #: command-list.h:130
22735 msgid "Creates a tag object"
22738 #: command-list.h:131
22739 msgid "Build a tree-object from ls-tree formatted text"
22740 msgstr "基于 ls-tree 的格式化文本创建一个树对象"
22742 #: command-list.h:132
22743 msgid "Move or rename a file, a directory, or a symlink"
22744 msgstr "移动或重命名一个文件、目录或符号链接"
22747 #: command-list.h:133
22748 msgid "Find symbolic names for given revs"
22749 msgstr "查找给定版本的符号名称"
22751 #: command-list.h:134
22752 msgid "Add or inspect object notes"
22755 #: command-list.h:135
22756 msgid "Import from and submit to Perforce repositories"
22757 msgstr "导入和提交到 Perforce 仓库中"
22759 #: command-list.h:136
22760 msgid "Create a packed archive of objects"
22763 #: command-list.h:137
22764 msgid "Find redundant pack files"
22767 #: command-list.h:138
22768 msgid "Pack heads and tags for efficient repository access"
22769 msgstr "打包头和标签以实现高效的仓库访问"
22771 #: command-list.h:139
22772 msgid "Routines to help parsing remote repository access parameters"
22773 msgstr "帮助解析远程仓库访问参数的例程"
22775 #: command-list.h:140
22776 msgid "Compute unique ID for a patch"
22777 msgstr "计算一个补丁的唯一 ID"
22779 #: command-list.h:141
22780 msgid "Prune all unreachable objects from the object database"
22781 msgstr "删除对象库中所有不可达对象"
22783 #: command-list.h:142
22784 msgid "Remove extra objects that are already in pack files"
22785 msgstr "删除已经在包文件中的多余对象"
22787 #: command-list.h:143
22788 msgid "Fetch from and integrate with another repository or a local branch"
22789 msgstr "获取并整合另外的仓库或一个本地分支"
22791 #: command-list.h:144
22792 msgid "Update remote refs along with associated objects"
22793 msgstr "更新远程引用和相关的对象"
22795 #: command-list.h:145
22796 msgid "Applies a quilt patchset onto the current branch"
22797 msgstr "将一个 quilt 补丁集应用到当前分支。"
22799 #: command-list.h:146
22800 msgid "Compare two commit ranges (e.g. two versions of a branch)"
22801 msgstr "比较两个提交范围(如一个分支的两个版本)"
22803 #: command-list.h:147
22804 msgid "Reads tree information into the index"
22807 #: command-list.h:148
22808 msgid "Reapply commits on top of another base tip"
22809 msgstr "在另一个分支上重新应用提交"
22811 #: command-list.h:149
22812 msgid "Receive what is pushed into the repository"
22813 msgstr "接收推送到仓库中的对象"
22815 #: command-list.h:150
22816 msgid "Manage reflog information"
22817 msgstr "管理 reflog 信息"
22819 #: command-list.h:151
22820 msgid "Manage set of tracked repositories"
22823 #: command-list.h:152
22824 msgid "Pack unpacked objects in a repository"
22825 msgstr "打包仓库中未打包对象"
22827 #: command-list.h:153
22828 msgid "Create, list, delete refs to replace objects"
22829 msgstr "创建、列出、删除对象替换引用"
22831 #: command-list.h:154
22832 msgid "Generates a summary of pending changes"
22835 #: command-list.h:155
22836 msgid "Reuse recorded resolution of conflicted merges"
22837 msgstr "重用冲突合并的解决方案记录"
22839 #: command-list.h:156
22840 msgid "Reset current HEAD to the specified state"
22841 msgstr "重置当前 HEAD 到指定状态"
22843 #: command-list.h:157
22844 msgid "Restore working tree files"
22847 #: command-list.h:158
22848 msgid "Revert some existing commits"
22851 #: command-list.h:159
22852 msgid "Lists commit objects in reverse chronological order"
22853 msgstr "按时间顺序列出提交对象"
22855 #: command-list.h:160
22856 msgid "Pick out and massage parameters"
22859 #: command-list.h:161
22860 msgid "Remove files from the working tree and from the index"
22861 msgstr "从工作区和索引中删除文件"
22863 #: command-list.h:162
22864 msgid "Send a collection of patches as emails"
22865 msgstr "通过电子邮件发送一组补丁"
22867 #: command-list.h:163
22868 msgid "Push objects over Git protocol to another repository"
22869 msgstr "使用 Git 协议推送对象到另一个仓库"
22871 #: command-list.h:164
22872 msgid "Restricted login shell for Git-only SSH access"
22873 msgstr "只允许 Git SSH 访问的受限登录shell"
22875 #: command-list.h:165
22876 msgid "Summarize 'git log' output"
22877 msgstr "'git log' 输出摘要"
22879 #: command-list.h:166
22880 msgid "Show various types of objects"
22883 #: command-list.h:167
22884 msgid "Show branches and their commits"
22887 #: command-list.h:168
22888 msgid "Show packed archive index"
22891 #: command-list.h:169
22892 msgid "List references in a local repository"
22893 msgstr "显示本地仓库中的引用"
22895 #: command-list.h:170
22896 msgid "Git's i18n setup code for shell scripts"
22897 msgstr "为 shell 脚本准备的 Git 国际化设置代码"
22899 #: command-list.h:171
22900 msgid "Common Git shell script setup code"
22901 msgstr "常用的 Git shell 脚本设置代码"
22903 #: command-list.h:172
22904 msgid "Initialize and modify the sparse-checkout"
22905 msgstr "初始化及修改稀疏检出"
22907 #: command-list.h:173
22908 msgid "Stash the changes in a dirty working directory away"
22909 msgstr "贮藏脏工作区中的修改"
22911 #: command-list.h:174
22912 msgid "Add file contents to the staging area"
22913 msgstr "将文件内容添加到索引"
22915 #: command-list.h:175
22916 msgid "Show the working tree status"
22919 #: command-list.h:176
22920 msgid "Remove unnecessary whitespace"
22921 msgstr "删除不必要的空白字符"
22923 #: command-list.h:177
22924 msgid "Initialize, update or inspect submodules"
22925 msgstr "初始化、更新或检查子模组"
22927 #: command-list.h:178
22928 msgid "Bidirectional operation between a Subversion repository and Git"
22929 msgstr "Subersion 仓库和 Git 之间的双向操作"
22931 #: command-list.h:179
22932 msgid "Switch branches"
22935 #: command-list.h:180
22936 msgid "Read, modify and delete symbolic refs"
22937 msgstr "读取、修改和删除符号引用"
22939 #: command-list.h:181
22940 msgid "Create, list, delete or verify a tag object signed with GPG"
22941 msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象"
22943 #: command-list.h:182
22944 msgid "Creates a temporary file with a blob's contents"
22945 msgstr "用 blob 数据对象的内容创建一个临时文件"
22947 #: command-list.h:183
22948 msgid "Unpack objects from a packed archive"
22949 msgstr "从打包文件中解压缩对象"
22951 #: command-list.h:184
22952 msgid "Register file contents in the working tree to the index"
22953 msgstr "将工作区的文件内容注册到索引"
22955 #: command-list.h:185
22956 msgid "Update the object name stored in a ref safely"
22957 msgstr "安全地更新存储于引用中的对象名称"
22959 #: command-list.h:186
22960 msgid "Update auxiliary info file to help dumb servers"
22961 msgstr "更新辅助信息文件以帮助哑协议服务"
22963 #: command-list.h:187
22964 msgid "Send archive back to git-archive"
22965 msgstr "将存档发送回 git-archive"
22967 #: command-list.h:188
22968 msgid "Send objects packed back to git-fetch-pack"
22969 msgstr "将对象压缩包发送回 git-fetch-pack"
22971 #: command-list.h:189
22972 msgid "Show a Git logical variable"
22973 msgstr "显示一个Git逻辑变量"
22975 #: command-list.h:190
22976 msgid "Check the GPG signature of commits"
22977 msgstr "检查 GPG 提交签名"
22979 #: command-list.h:191
22980 msgid "Validate packed Git archive files"
22981 msgstr "校验打包的Git存仓文件"
22983 #: command-list.h:192
22984 msgid "Check the GPG signature of tags"
22985 msgstr "检查标签的 GPG 签名"
22987 #: command-list.h:193
22988 msgid "Git web interface (web frontend to Git repositories)"
22989 msgstr "Git web 界面(Git 仓库的 web 前端)"
22991 #: command-list.h:194
22992 msgid "Show logs with difference each commit introduces"
22993 msgstr "显示每一个提交引入的差异日志"
22995 #: command-list.h:195
22996 msgid "Manage multiple working trees"
22999 #: command-list.h:196
23000 msgid "Create a tree object from the current index"
23001 msgstr "从当前索引创建一个树对象"
23003 #: command-list.h:197
23004 msgid "Defining attributes per path"
23007 #: command-list.h:198
23008 msgid "Git command-line interface and conventions"
23009 msgstr "Git 命令行界面和约定"
23011 #: command-list.h:199
23012 msgid "A Git core tutorial for developers"
23013 msgstr "面向开发人员的 Git 核心教程"
23015 #: command-list.h:200
23016 msgid "Git for CVS users"
23017 msgstr "适合 CVS 用户的 Git 帮助"
23019 #: command-list.h:201
23020 msgid "Tweaking diff output"
23023 #: command-list.h:202
23024 msgid "A useful minimum set of commands for Everyday Git"
23025 msgstr "每一天 Git 的一组有用的最小命令集合"
23027 #: command-list.h:203
23028 msgid "Frequently asked questions about using Git"
23029 msgstr "关于使用 Git 的常见问题"
23031 #: command-list.h:204
23032 msgid "A Git Glossary"
23035 #: command-list.h:205
23036 msgid "Hooks used by Git"
23039 #: command-list.h:206
23040 msgid "Specifies intentionally untracked files to ignore"
23041 msgstr "忽略指定的未跟踪文件"
23043 #: command-list.h:207
23044 msgid "Defining submodule properties"
23047 #: command-list.h:208
23048 msgid "Git namespaces"
23051 #: command-list.h:209
23052 msgid "Git Repository Layout"
23055 #: command-list.h:210
23056 msgid "Specifying revisions and ranges for Git"
23057 msgstr "指定 Git 的版本和版本范围"
23059 #: command-list.h:211
23060 msgid "Mounting one repository inside another"
23061 msgstr "将一个仓库安装到另外一个仓库中"
23063 #: command-list.h:212
23064 msgid "A tutorial introduction to Git: part two"
23065 msgstr "一个 Git 教程:第二部分"
23067 #: command-list.h:213
23068 msgid "A tutorial introduction to Git"
23071 #: command-list.h:214
23072 msgid "An overview of recommended workflows with Git"
23073 msgstr "Git 推荐的工作流概览"
23075 #: git-bisect.sh:54
23076 msgid "You need to start by \"git bisect start\""
23077 msgstr "您需要执行 \"git bisect start\" 来开始"
23080 #. TRANSLATORS: Make sure to include [Y] and [n] in your
23081 #. translation. The program will only accept English input
23083 #: git-bisect.sh:60
23084 msgid "Do you want me to do it for you [Y/n]? "
23085 msgstr "您想让我为您这样做么[Y/n]? "
23087 #: git-bisect.sh:101
23089 msgid "Bad rev input: $arg"
23090 msgstr "坏的输入版本:$arg"
23092 #: git-bisect.sh:121
23094 msgid "Bad rev input: $bisected_head"
23095 msgstr "坏的输入版本:$bisected_head"
23097 #: git-bisect.sh:130
23099 msgid "Bad rev input: $rev"
23100 msgstr "坏的输入版本:$rev"
23102 #: git-bisect.sh:139
23104 msgid "'git bisect $TERM_BAD' can take only one argument."
23105 msgstr "'git bisect $TERM_BAD' 只能带一个参数。"
23107 #: git-bisect.sh:209
23108 msgid "No logfile given"
23111 #: git-bisect.sh:210
23113 msgid "cannot read $file for replaying"
23114 msgstr "不能读取 $file 来重放"
23116 #: git-bisect.sh:233
23117 msgid "?? what are you talking about?"
23120 #: git-bisect.sh:243
23121 msgid "bisect run failed: no command provided."
23122 msgstr "二分查找运行失败:没有提供命令。"
23124 #: git-bisect.sh:248
23126 msgid "running $command"
23127 msgstr "运行 $command"
23129 #: git-bisect.sh:255
23132 "bisect run failed:\n"
23133 "exit code $res from '$command' is < 0 or >= 128"
23136 "命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
23138 #: git-bisect.sh:281
23139 msgid "bisect run cannot continue any more"
23140 msgstr "二分查找不能继续运行"
23142 #: git-bisect.sh:287
23145 "bisect run failed:\n"
23146 "'bisect_state $state' exited with error code $res"
23149 "'bisect_state $state' 退出码为 $res"
23151 #: git-bisect.sh:294
23152 msgid "bisect run success"
23155 #: git-bisect.sh:302
23156 msgid "We are not bisecting."
23157 msgstr "我们没有在二分查找。"
23159 #: git-merge-octopus.sh:46
23161 "Error: Your local changes to the following files would be overwritten by "
23163 msgstr "错误:您对下列文件的本地修改将被合并操作覆盖"
23165 #: git-merge-octopus.sh:61
23166 msgid "Automated merge did not work."
23169 #: git-merge-octopus.sh:62
23170 msgid "Should not be doing an octopus."
23171 msgstr "不应该执行章鱼式合并。"
23173 #: git-merge-octopus.sh:73
23175 msgid "Unable to find common commit with $pretty_name"
23176 msgstr "无法找到和 $pretty_name 的基线提交"
23178 #: git-merge-octopus.sh:77
23180 msgid "Already up to date with $pretty_name"
23181 msgstr "已经和 $pretty_name 保持一致"
23183 #: git-merge-octopus.sh:89
23185 msgid "Fast-forwarding to: $pretty_name"
23186 msgstr "快进至:$pretty_name"
23188 #: git-merge-octopus.sh:97
23190 msgid "Trying simple merge with $pretty_name"
23191 msgstr "尝试和 $pretty_name 的简单合并"
23193 #: git-merge-octopus.sh:102
23194 msgid "Simple merge did not work, trying automatic merge."
23195 msgstr "简单合并未生效,尝试自动合并。"
23197 #: git-submodule.sh:205
23198 msgid "Relative path can only be used from the toplevel of the working tree"
23199 msgstr "只能在工作区的顶级目录中使用相对路径"
23201 #: git-submodule.sh:215
23203 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
23204 msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
23206 #: git-submodule.sh:234
23208 msgid "'$sm_path' already exists in the index"
23209 msgstr "'$sm_path' 已经存在于索引中"
23211 #: git-submodule.sh:237
23213 msgid "'$sm_path' already exists in the index and is not a submodule"
23214 msgstr "'$sm_path' 已经存在于索引中且不是一个子模组"
23216 #: git-submodule.sh:244
23218 msgid "'$sm_path' does not have a commit checked out"
23219 msgstr "'$sm_path' 没有检出的提交"
23221 #: git-submodule.sh:275
23223 msgid "Adding existing repo at '$sm_path' to the index"
23224 msgstr "添加位于 '$sm_path' 的现存仓库到索引"
23226 #: git-submodule.sh:277
23228 msgid "'$sm_path' already exists and is not a valid git repo"
23229 msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库"
23231 #: git-submodule.sh:285
23233 msgid "A git directory for '$sm_name' is found locally with remote(s):"
23234 msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:"
23236 #: git-submodule.sh:287
23239 "If you want to reuse this local git directory instead of cloning again from\n"
23241 "use the '--force' option. If the local git directory is not the correct "
23243 "or you are unsure what this means choose another name with the '--name' "
23246 "如果您想要重用这个本地 git 目录而非重新克隆自\n"
23248 "使用 '--force' 选项。如果本地 git 目录不是正确的仓库\n"
23249 "或者您不确定这里的含义,使用 '--name' 选项选择另外的名称。"
23251 #: git-submodule.sh:293
23253 msgid "Reactivating local git directory for submodule '$sm_name'."
23254 msgstr "激活本地 git 目录到子模组 '$sm_name'。"
23256 #: git-submodule.sh:305
23258 msgid "Unable to checkout submodule '$sm_path'"
23259 msgstr "不能检出子模组 '$sm_path'"
23261 #: git-submodule.sh:310
23263 msgid "Failed to add submodule '$sm_path'"
23264 msgstr "无法添加子模组 '$sm_path'"
23266 #: git-submodule.sh:319
23268 msgid "Failed to register submodule '$sm_path'"
23269 msgstr "无法注册子模组 '$sm_path'"
23271 #: git-submodule.sh:592
23273 msgid "Unable to find current revision in submodule path '$displaypath'"
23274 msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
23276 #: git-submodule.sh:602
23278 msgid "Unable to fetch in submodule path '$sm_path'"
23279 msgstr "无法在子模组路径 '$sm_path' 中获取"
23281 #: git-submodule.sh:607
23284 "Unable to find current ${remote_name}/${branch} revision in submodule path "
23286 msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}"
23288 #: git-submodule.sh:625
23291 "Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
23293 msgstr "无法在子模组路径 '$displaypath' 中获取,尝试直接获取 $sha1:"
23295 #: git-submodule.sh:631
23298 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
23299 "Direct fetching of that commit failed."
23301 "获取了子模组路径 '$displaypath',但是它没有包含 $sha1。直接获取该提交失败。"
23303 #: git-submodule.sh:638
23305 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
23306 msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
23308 #: git-submodule.sh:639
23310 msgid "Submodule path '$displaypath': checked out '$sha1'"
23311 msgstr "子模组路径 '$displaypath':检出 '$sha1'"
23313 #: git-submodule.sh:643
23315 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
23316 msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
23318 #: git-submodule.sh:644
23320 msgid "Submodule path '$displaypath': rebased into '$sha1'"
23321 msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
23323 #: git-submodule.sh:649
23325 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
23326 msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
23328 #: git-submodule.sh:650
23330 msgid "Submodule path '$displaypath': merged in '$sha1'"
23331 msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
23333 #: git-submodule.sh:655
23335 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
23336 msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败"
23338 #: git-submodule.sh:656
23340 msgid "Submodule path '$displaypath': '$command $sha1'"
23341 msgstr "子模组 '$displaypath':'$command $sha1'"
23343 #: git-submodule.sh:687
23345 msgid "Failed to recurse into submodule path '$displaypath'"
23346 msgstr "无法递归进子模组路径 '$displaypath'"
23348 #: git-submodule.sh:878
23349 msgid "The --cached option cannot be used with the --files option"
23350 msgstr "选项 --cached 不能和选项 --files 同时使用"
23352 #: git-submodule.sh:930
23354 msgid "unexpected mode $mod_dst"
23355 msgstr "意外的模式 $mod_dst"
23358 #: git-submodule.sh:950
23360 msgid " Warn: $display_name doesn't contain commit $sha1_src"
23361 msgstr " 警告:$display_name 未包含提交 $sha1_src"
23364 #: git-submodule.sh:953
23366 msgid " Warn: $display_name doesn't contain commit $sha1_dst"
23367 msgstr " 警告:$display_name 未包含提交 $sha1_dst"
23370 #: git-submodule.sh:956
23372 msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
23373 msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
23375 #: git-parse-remote.sh:89
23377 msgid "See git-${cmd}(1) for details."
23378 msgstr "详见 git-${cmd}(1)。"
23380 #: git-rebase--preserve-merges.sh:109
23381 msgid "Applied autostash."
23382 msgstr "已应用 autostash。"
23384 #: git-rebase--preserve-merges.sh:112
23386 msgid "Cannot store $stash_sha1"
23387 msgstr "不能存储 $stash_sha1"
23389 #: git-rebase--preserve-merges.sh:113
23391 "Applying autostash resulted in conflicts.\n"
23392 "Your changes are safe in the stash.\n"
23393 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
23395 "应用 autostash 导致了冲突。\n"
23396 "您的修改安全地保存在贮藏区中。\n"
23397 "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
23399 #: git-rebase--preserve-merges.sh:191
23401 msgid "Rebasing ($new_count/$total)"
23402 msgstr "变基中($new_count/$total)"
23404 #: git-rebase--preserve-merges.sh:207
23408 "p, pick <commit> = use commit\n"
23409 "r, reword <commit> = use commit, but edit the commit message\n"
23410 "e, edit <commit> = use commit, but stop for amending\n"
23411 "s, squash <commit> = use commit, but meld into previous commit\n"
23412 "f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
23413 "x, exec <commit> = run command (the rest of the line) using shell\n"
23414 "d, drop <commit> = remove commit\n"
23415 "l, label <label> = label current HEAD with a name\n"
23416 "t, reset <label> = reset HEAD to a label\n"
23417 "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
23418 ". create a merge commit using the original merge commit's\n"
23419 ". message (or the oneline, if no original merge commit was\n"
23420 ". specified). Use -c <commit> to reword the commit message.\n"
23422 "These lines can be re-ordered; they are executed from top to bottom.\n"
23426 "p, pick <提交> = 使用提交\n"
23427 "r, reword <提交> = 使用提交,但修改提交说明\n"
23428 "e, edit <提交> = 使用提交,但停下来修补\n"
23429 "s, squash <提交> = 使用提交,但融合到前一个提交\n"
23430 "f, fixup <提交> = 类似于 \"squash\",但丢弃提交说明日志\n"
23431 "x, exec <命令> = 使用 shell 运行命令(此行剩余部分)\n"
23432 "d, drop <提交> = 删除提交\n"
23433 "l, label <标签> = 为当前 HEAD 打上标签\n"
23434 "t, reset <标签> = 重置 HEAD 到该标签\n"
23435 "m, merge [-C <提交> | -c <提交>] <标签> [# <oneline>]\n"
23436 ". 创建一个合并提交,并使用原始的合并提交说明(如果没有指定\n"
23437 ". 原始提交,使用注释部分的 oneline 作为提交说明)。使用\n"
23438 ". -c <提交> 可以编辑提交说明。\n"
23440 "可以对这些行重新排序,将从上至下执行。\n"
23442 #: git-rebase--preserve-merges.sh:270
23445 "You can amend the commit now, with\n"
23447 "\tgit commit --amend $gpg_sign_opt_quoted\n"
23449 "Once you are satisfied with your changes, run\n"
23451 "\tgit rebase --continue"
23455 "\tgit commit --amend $gpg_sign_opt_quoted\n"
23459 "\tgit rebase --continue"
23461 #: git-rebase--preserve-merges.sh:295
23463 msgid "$sha1: not a commit that can be picked"
23464 msgstr "$sha1:不是一个可以被拣选的提交"
23466 #: git-rebase--preserve-merges.sh:334
23468 msgid "Invalid commit name: $sha1"
23469 msgstr "无效的提交名:$sha1"
23471 #: git-rebase--preserve-merges.sh:364
23472 msgid "Cannot write current commit's replacement sha1"
23473 msgstr "不能写入当前提交的替代 sha1"
23475 #: git-rebase--preserve-merges.sh:415
23477 msgid "Fast-forward to $sha1"
23480 #: git-rebase--preserve-merges.sh:417
23482 msgid "Cannot fast-forward to $sha1"
23483 msgstr "不能快进到 $sha1"
23485 #: git-rebase--preserve-merges.sh:426
23487 msgid "Cannot move HEAD to $first_parent"
23488 msgstr "不能移动 HEAD 到 $first_parent"
23490 #: git-rebase--preserve-merges.sh:431
23492 msgid "Refusing to squash a merge: $sha1"
23493 msgstr "拒绝压缩一个合并:$sha1"
23495 #: git-rebase--preserve-merges.sh:449
23497 msgid "Error redoing merge $sha1"
23498 msgstr "无法重做合并 $sha1"
23500 #: git-rebase--preserve-merges.sh:458
23502 msgid "Could not pick $sha1"
23503 msgstr "不能拣选 $sha1"
23505 #: git-rebase--preserve-merges.sh:467
23507 msgid "This is the commit message #${n}:"
23508 msgstr "这是提交说明 #${n}:"
23510 #: git-rebase--preserve-merges.sh:472
23512 msgid "The commit message #${n} will be skipped:"
23513 msgstr "提交说明 #${n} 将被跳过:"
23515 #: git-rebase--preserve-merges.sh:483
23517 msgid "This is a combination of $count commit."
23518 msgid_plural "This is a combination of $count commits."
23519 msgstr[0] "这是一个 $count 个提交的组合。"
23520 msgstr[1] "这是一个 $count 个提交的组合。"
23522 #: git-rebase--preserve-merges.sh:492
23524 msgid "Cannot write $fixup_msg"
23525 msgstr "不能写入 $fixup_msg"
23527 #: git-rebase--preserve-merges.sh:495
23528 msgid "This is a combination of 2 commits."
23529 msgstr "这是一个 2 个提交的组合。"
23531 #: git-rebase--preserve-merges.sh:536 git-rebase--preserve-merges.sh:579
23532 #: git-rebase--preserve-merges.sh:582
23534 msgid "Could not apply $sha1... $rest"
23535 msgstr "不能应用 $sha1... $rest"
23537 #: git-rebase--preserve-merges.sh:611
23540 "Could not amend commit after successfully picking $sha1... $rest\n"
23541 "This is most likely due to an empty commit message, or the pre-commit hook\n"
23542 "failed. If the pre-commit hook failed, you may need to resolve the issue "
23544 "you are able to reword the commit."
23546 "不能在成功拣选 $sha1... $rest 之后修补提交\n"
23547 "这通常是因为空的提交说明,或者 pre-commit 钩子执行失败。如果是 pre-commit\n"
23548 "钩子执行失败,你可能需要在重写提交说明前解决这个问题。"
23550 #: git-rebase--preserve-merges.sh:626
23552 msgid "Stopped at $sha1_abbrev... $rest"
23553 msgstr "停止在 $sha1_abbrev... $rest"
23555 #: git-rebase--preserve-merges.sh:641
23557 msgid "Cannot '$squash_style' without a previous commit"
23558 msgstr "没有父提交的情况下不能 '$squash_style'"
23560 #: git-rebase--preserve-merges.sh:683
23562 msgid "Executing: $rest"
23565 #: git-rebase--preserve-merges.sh:691
23567 msgid "Execution failed: $rest"
23568 msgstr "执行失败:$rest"
23570 #: git-rebase--preserve-merges.sh:693
23571 msgid "and made changes to the index and/or the working tree"
23572 msgstr "并且修改索引和/或工作区"
23575 #: git-rebase--preserve-merges.sh:695
23577 "You can fix the problem, and then run\n"
23579 "\tgit rebase --continue"
23583 "\tgit rebase --continue"
23585 #. TRANSLATORS: after these lines is a command to be issued by the user
23586 #: git-rebase--preserve-merges.sh:708
23589 "Execution succeeded: $rest\n"
23590 "but left changes to the index and/or the working tree\n"
23591 "Commit or stash your changes, and then run\n"
23593 "\tgit rebase --continue"
23596 "但是在索引和/或工作区中存在变更。提交或贮藏修改,然后运行\n"
23598 "\tgit rebase --continue"
23600 #: git-rebase--preserve-merges.sh:719
23602 msgid "Unknown command: $command $sha1 $rest"
23603 msgstr "未知命令:$command $sha1 $rest"
23605 #: git-rebase--preserve-merges.sh:720
23606 msgid "Please fix this using 'git rebase --edit-todo'."
23607 msgstr "要修改请使用命令 'git rebase --edit-todo'。"
23609 #: git-rebase--preserve-merges.sh:755
23611 msgid "Successfully rebased and updated $head_name."
23612 msgstr "成功变基并更新 $head_name。"
23614 #: git-rebase--preserve-merges.sh:812
23615 msgid "Could not remove CHERRY_PICK_HEAD"
23616 msgstr "不能删除 CHERRY_PICK_HEAD"
23618 #: git-rebase--preserve-merges.sh:817
23621 "You have staged changes in your working tree.\n"
23622 "If these changes are meant to be\n"
23623 "squashed into the previous commit, run:\n"
23625 " git commit --amend $gpg_sign_opt_quoted\n"
23627 "If they are meant to go into a new commit, run:\n"
23629 " git commit $gpg_sign_opt_quoted\n"
23631 "In both cases, once you're done, continue with:\n"
23633 " git rebase --continue\n"
23635 "您已暂存了工作区的修改。如果这些修改要压缩到前一个提交,执行:\n"
23637 " git commit --amend $gpg_sign_opt_quoted\n"
23639 "如果这些变更要形成一个新提交,执行:\n"
23641 " git commit $gpg_sign_opt_quoted\n"
23643 "无论哪种情况,当您完成提交,继续执行:\n"
23645 " git rebase --continue\n"
23647 #: git-rebase--preserve-merges.sh:834
23648 msgid "Error trying to find the author identity to amend commit"
23649 msgstr "在修补提交中查找作者信息时遇到错误"
23651 #: git-rebase--preserve-merges.sh:839
23653 "You have uncommitted changes in your working tree. Please commit them\n"
23654 "first and then run 'git rebase --continue' again."
23656 "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
23658 #: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848
23659 msgid "Could not commit staged changes."
23660 msgstr "不能提交暂存的修改。"
23662 #: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965
23663 msgid "Could not execute editor"
23666 #: git-rebase--preserve-merges.sh:900
23668 msgid "Could not checkout $switch_to"
23669 msgstr "不能检出 $switch_to"
23671 #: git-rebase--preserve-merges.sh:907
23675 #: git-rebase--preserve-merges.sh:908
23677 msgid "Could not create temporary $state_dir"
23678 msgstr "不能创建临时 $state_dir"
23680 #: git-rebase--preserve-merges.sh:911
23681 msgid "Could not mark as interactive"
23684 #: git-rebase--preserve-merges.sh:943
23686 msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
23687 msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
23688 msgstr[0] "变基 $shortrevisions 到 $shortonto($todocount 个提交)"
23689 msgstr[1] "变基 $shortrevisions 到 $shortonto($todocount 个提交)"
23691 #: git-rebase--preserve-merges.sh:955
23692 msgid "Note that empty commits are commented out"
23693 msgstr "注意空提交已被注释掉"
23695 #: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002
23696 msgid "Could not init rewritten commits"
23697 msgstr "不能对重写提交进行初始化"
23699 #: git-sh-setup.sh:89 git-sh-setup.sh:94
23701 msgid "usage: $dashless $USAGE"
23702 msgstr "用法:$dashless $USAGE"
23704 #: git-sh-setup.sh:191
23706 msgid "Cannot chdir to $cdup, the toplevel of the working tree"
23707 msgstr "不能切换目录到 $cdup,工作区的顶级目录"
23709 #: git-sh-setup.sh:200 git-sh-setup.sh:207
23711 msgid "fatal: $program_name cannot be used without a working tree."
23712 msgstr "致命错误:$program_name 不能在没有工作区的情况下使用"
23714 #: git-sh-setup.sh:221
23715 msgid "Cannot rebase: You have unstaged changes."
23716 msgstr "不能变基:您有未暂存的变更。"
23718 #: git-sh-setup.sh:224
23719 msgid "Cannot rewrite branches: You have unstaged changes."
23720 msgstr "不能重写分支:您有未暂存的变更。"
23722 #: git-sh-setup.sh:227
23723 msgid "Cannot pull with rebase: You have unstaged changes."
23724 msgstr "无法通过变基方式拉取:您有未暂存的变更。"
23726 #: git-sh-setup.sh:230
23728 msgid "Cannot $action: You have unstaged changes."
23729 msgstr "不能 $action:您有未暂存的变更。"
23731 #: git-sh-setup.sh:243
23732 msgid "Cannot rebase: Your index contains uncommitted changes."
23733 msgstr "不能变基:您的索引中包含未提交的变更。"
23735 #: git-sh-setup.sh:246
23736 msgid "Cannot pull with rebase: Your index contains uncommitted changes."
23737 msgstr "无法通过变基方式拉取:您的索引中包含未提交的变更。"
23739 #: git-sh-setup.sh:249
23741 msgid "Cannot $action: Your index contains uncommitted changes."
23742 msgstr "不能 $action:您的索引中包含未提交的变更。"
23744 #: git-sh-setup.sh:253
23745 msgid "Additionally, your index contains uncommitted changes."
23746 msgstr "而且您的索引中包含未提交的变更。"
23748 #: git-sh-setup.sh:373
23749 msgid "You need to run this command from the toplevel of the working tree."
23750 msgstr "您需要在工作区的顶级目录中运行这个命令。"
23752 #: git-sh-setup.sh:378
23753 msgid "Unable to determine absolute path of git directory"
23754 msgstr "不能确定 git 目录的绝对路径"
23756 #. TRANSLATORS: you can adjust this to align "git add -i" status menu
23757 #: git-add--interactive.perl:212
23759 msgid "%12s %12s %s"
23760 msgstr "%12s %12s %s"
23762 #: git-add--interactive.perl:634
23764 msgid "touched %d path\n"
23765 msgid_plural "touched %d paths\n"
23766 msgstr[0] "触碰了 %d 个路径\n"
23767 msgstr[1] "触碰了 %d 个路径\n"
23769 #: git-add--interactive.perl:1053
23771 "If the patch applies cleanly, the edited hunk will immediately be\n"
23772 "marked for staging."
23773 msgstr "如果补丁能干净地应用,编辑块将立即标记为暂存。"
23775 #: git-add--interactive.perl:1056
23777 "If the patch applies cleanly, the edited hunk will immediately be\n"
23778 "marked for stashing."
23779 msgstr "如果补丁能干净地应用,编辑块将立即标记为贮藏。"
23781 #: git-add--interactive.perl:1059
23783 "If the patch applies cleanly, the edited hunk will immediately be\n"
23784 "marked for unstaging."
23785 msgstr "如果补丁能干净地应用,编辑块将立即标记为未暂存。"
23787 #: git-add--interactive.perl:1062 git-add--interactive.perl:1071
23788 #: git-add--interactive.perl:1077
23790 "If the patch applies cleanly, the edited hunk will immediately be\n"
23791 "marked for applying."
23792 msgstr "如果补丁能干净地应用,编辑块将立即标记为应用。"
23794 #: git-add--interactive.perl:1065 git-add--interactive.perl:1068
23795 #: git-add--interactive.perl:1074
23797 "If the patch applies cleanly, the edited hunk will immediately be\n"
23798 "marked for discarding."
23799 msgstr "如果补丁能干净地应用,编辑块将立即标记为丢弃。"
23801 #: git-add--interactive.perl:1111
23803 msgid "failed to open hunk edit file for writing: %s"
23804 msgstr "为写入打开块编辑文件失败:%s"
23806 #: git-add--interactive.perl:1118
23810 "To remove '%s' lines, make them ' ' lines (context).\n"
23811 "To remove '%s' lines, delete them.\n"
23812 "Lines starting with %s will be removed.\n"
23815 "要删除 '%s' 开始的行,使其成为 ' ' 开始的行(上下文)。\n"
23816 "要删除 '%s' 开始的行,删除它们。\n"
23819 #: git-add--interactive.perl:1140
23821 msgid "failed to open hunk edit file for reading: %s"
23822 msgstr "无法读取块编辑文件:%s"
23824 #: git-add--interactive.perl:1248
23826 "y - stage this hunk\n"
23827 "n - do not stage this hunk\n"
23828 "q - quit; do not stage this hunk or any of the remaining ones\n"
23829 "a - stage this hunk and all later hunks in the file\n"
23830 "d - do not stage this hunk or any of the later hunks in the file"
23834 "q - 退出。不暂存该块及后面的全部块\n"
23835 "a - 暂存该块和本文件中后面的全部块\n"
23836 "d - 不暂存该块和本文件中后面的全部块"
23838 #: git-add--interactive.perl:1254
23840 "y - stash this hunk\n"
23841 "n - do not stash this hunk\n"
23842 "q - quit; do not stash this hunk or any of the remaining ones\n"
23843 "a - stash this hunk and all later hunks in the file\n"
23844 "d - do not stash this hunk or any of the later hunks in the file"
23848 "q - 退出。不贮藏该块及后面的全部块\n"
23849 "a - 贮藏该块和本文件中后面的全部块\n"
23850 "d - 不贮藏该块和本文件中后面的全部块"
23852 #: git-add--interactive.perl:1260
23854 "y - unstage this hunk\n"
23855 "n - do not unstage this hunk\n"
23856 "q - quit; do not unstage this hunk or any of the remaining ones\n"
23857 "a - unstage this hunk and all later hunks in the file\n"
23858 "d - do not unstage this hunk or any of the later hunks in the file"
23862 "q - 退出。不要不暂存该块及后面的全部块\n"
23863 "a - 不暂存该块和本文件中后面的全部块\n"
23864 "d - 不要不暂存该块和本文件中后面的全部块"
23866 #: git-add--interactive.perl:1266
23868 "y - apply this hunk to index\n"
23869 "n - do not apply this hunk to index\n"
23870 "q - quit; do not apply this hunk or any of the remaining ones\n"
23871 "a - apply this hunk and all later hunks in the file\n"
23872 "d - do not apply this hunk or any of the later hunks in the file"
23876 "q - 退出。不要应用该块及后面的全部块\n"
23877 "a - 应用该块和本文件中后面的全部块\n"
23878 "d - 不要应用该块和本文件中后面的全部块"
23880 #: git-add--interactive.perl:1272 git-add--interactive.perl:1290
23882 "y - discard this hunk from worktree\n"
23883 "n - do not discard this hunk from worktree\n"
23884 "q - quit; do not discard this hunk or any of the remaining ones\n"
23885 "a - discard this hunk and all later hunks in the file\n"
23886 "d - do not discard this hunk or any of the later hunks in the file"
23889 "n - 不要在工作区中丢弃该块\n"
23890 "q - 退出。不要丢弃该块及后面的全部块\n"
23891 "a - 丢弃该块和本文件中后面的全部块\n"
23892 "d - 不要丢弃该块和本文件中后面的全部块"
23894 #: git-add--interactive.perl:1278
23896 "y - discard this hunk from index and worktree\n"
23897 "n - do not discard this hunk from index and worktree\n"
23898 "q - quit; do not discard this hunk or any of the remaining ones\n"
23899 "a - discard this hunk and all later hunks in the file\n"
23900 "d - do not discard this hunk or any of the later hunks in the file"
23902 "y - 在索引和工作区中丢弃该块\n"
23903 "n - 不要在索引和工作区中丢弃该块\n"
23904 "q - 退出。不要丢弃该块及后面的全部块\n"
23905 "a - 丢弃该块和本文件中后面的全部块\n"
23906 "d - 不要丢弃该块和本文件中后面的全部块"
23908 #: git-add--interactive.perl:1284
23910 "y - apply this hunk to index and worktree\n"
23911 "n - do not apply this hunk to index and worktree\n"
23912 "q - quit; do not apply this hunk or any of the remaining ones\n"
23913 "a - apply this hunk and all later hunks in the file\n"
23914 "d - do not apply this hunk or any of the later hunks in the file"
23916 "y - 在索引和工作区中应用该块\n"
23917 "n - 不要在索引和工作区中应用该块\n"
23918 "q - 退出。不要应用该块及后面的全部块\n"
23919 "a - 应用该块和本文件中后面的全部块\n"
23920 "d - 不要应用该块和本文件中后面的全部块"
23922 #: git-add--interactive.perl:1296
23924 "y - apply this hunk to worktree\n"
23925 "n - do not apply this hunk to worktree\n"
23926 "q - quit; do not apply this hunk or any of the remaining ones\n"
23927 "a - apply this hunk and all later hunks in the file\n"
23928 "d - do not apply this hunk or any of the later hunks in the file"
23931 "n - 不要在工作区中应用该块\n"
23932 "q - 退出。不要应用该块及后面的全部块\n"
23933 "a - 应用该块和本文件中后面的全部块\n"
23934 "d - 不要应用该块和本文件中后面的全部块"
23936 #: git-add--interactive.perl:1311
23938 "g - select a hunk to go to\n"
23939 "/ - search for a hunk matching the given regex\n"
23940 "j - leave this hunk undecided, see next undecided hunk\n"
23941 "J - leave this hunk undecided, see next hunk\n"
23942 "k - leave this hunk undecided, see previous undecided hunk\n"
23943 "K - leave this hunk undecided, see previous hunk\n"
23944 "s - split the current hunk into smaller hunks\n"
23945 "e - manually edit the current hunk\n"
23949 "/ - 查找和给定正则表达式匹配的块\n"
23950 "j - 维持该块未决状态,查看下一个未决块\n"
23951 "J - 维持该块未决状态,查看下一个块\n"
23952 "k - 维持该块未决状态,查看上一个未决块\n"
23953 "K - 维持该块未决状态,查看上一个块\n"
23958 #: git-add--interactive.perl:1342
23959 msgid "The selected hunks do not apply to the index!\n"
23960 msgstr "选中的块不能应用到索引!\n"
23962 #: git-add--interactive.perl:1357
23964 msgid "ignoring unmerged: %s\n"
23965 msgstr "忽略未合入的:%s\n"
23967 #: git-add--interactive.perl:1468
23969 msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
23970 msgstr "将模式变更应用到工作区 [y,n,q,a,d%s,?]? "
23972 #: git-add--interactive.perl:1469
23974 msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
23975 msgstr "将删除操作应用到工作区 [y,n,q,a,d%s,?]? "
23977 #: git-add--interactive.perl:1470
23979 msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
23980 msgstr "将该块应用到工作区 [y,n,q,a,d%s,?]? "
23982 #: git-add--interactive.perl:1570
23983 msgid "No other hunks to goto\n"
23984 msgstr "没有其它可供跳转的块\n"
23986 #: git-add--interactive.perl:1588
23988 msgid "Invalid number: '%s'\n"
23989 msgstr "无效数字:'%s'\n"
23991 #: git-add--interactive.perl:1593
23993 msgid "Sorry, only %d hunk available.\n"
23994 msgid_plural "Sorry, only %d hunks available.\n"
23995 msgstr[0] "对不起,只有 %d 个可用块。\n"
23996 msgstr[1] "对不起,只有 %d 个可用块。\n"
23998 #: git-add--interactive.perl:1619
23999 msgid "No other hunks to search\n"
24000 msgstr "没有其它可供查找的块\n"
24002 #: git-add--interactive.perl:1636
24004 msgid "Malformed search regexp %s: %s\n"
24005 msgstr "错误的正则表达式 %s:%s\n"
24007 #: git-add--interactive.perl:1646
24008 msgid "No hunk matches the given pattern\n"
24009 msgstr "没有和给定模式相匹配的块\n"
24011 #: git-add--interactive.perl:1658 git-add--interactive.perl:1680
24012 msgid "No previous hunk\n"
24015 #: git-add--interactive.perl:1667 git-add--interactive.perl:1686
24016 msgid "No next hunk\n"
24019 #: git-add--interactive.perl:1692
24020 msgid "Sorry, cannot split this hunk\n"
24021 msgstr "对不起,不能拆分这个块\n"
24023 #: git-add--interactive.perl:1698
24025 msgid "Split into %d hunk.\n"
24026 msgid_plural "Split into %d hunks.\n"
24027 msgstr[0] "拆分为 %d 块。\n"
24028 msgstr[1] "拆分为 %d 块。\n"
24030 #: git-add--interactive.perl:1708
24031 msgid "Sorry, cannot edit this hunk\n"
24032 msgstr "对不起,不能编辑这个块\n"
24034 #. TRANSLATORS: please do not translate the command names
24035 #. 'status', 'update', 'revert', etc.
24036 #: git-add--interactive.perl:1773
24038 "status - show paths with changes\n"
24039 "update - add working tree state to the staged set of changes\n"
24040 "revert - revert staged set of changes back to the HEAD version\n"
24041 "patch - pick hunks and update selectively\n"
24042 "diff - view diff between HEAD and index\n"
24043 "add untracked - add contents of untracked files to the staged set of "
24046 "status - 显示含变更的路径\n"
24047 "update - 添加工作区状态至暂存列表\n"
24048 "revert - 还原修改的暂存集至 HEAD 版本\n"
24049 "patch - 挑选块并且有选择地更新\n"
24050 "diff - 显示 HEAD 和索引间差异\n"
24051 "add untracked - 添加未跟踪文件的内容至暂存列表\n"
24053 #: git-add--interactive.perl:1790 git-add--interactive.perl:1795
24054 #: git-add--interactive.perl:1798 git-add--interactive.perl:1805
24055 #: git-add--interactive.perl:1808 git-add--interactive.perl:1815
24056 #: git-add--interactive.perl:1819 git-add--interactive.perl:1825
24060 #: git-add--interactive.perl:1821
24062 msgid "unknown --patch mode: %s"
24063 msgstr "未知的 --patch 模式:%s"
24065 #: git-add--interactive.perl:1827 git-add--interactive.perl:1833
24067 msgid "invalid argument %s, expecting --"
24068 msgstr "无效的参数 %s,期望是 --"
24070 #: git-send-email.perl:138
24071 msgid "local zone differs from GMT by a non-minute interval\n"
24072 msgstr "本地时间和 GMT 有不到一分钟间隔\n"
24074 #: git-send-email.perl:145 git-send-email.perl:151
24075 msgid "local time offset greater than or equal to 24 hours\n"
24076 msgstr "本地时间偏移量大于等于 24 小时\n"
24078 #: git-send-email.perl:223 git-send-email.perl:229
24079 msgid "the editor exited uncleanly, aborting everything"
24080 msgstr "编辑器非正常退出,终止所有操作"
24082 #: git-send-email.perl:310
24085 "'%s' contains an intermediate version of the email you were composing.\n"
24086 msgstr "'%s' 包含您正在编写的一个中间版本的邮件。\n"
24088 #: git-send-email.perl:315
24090 msgid "'%s.final' contains the composed email.\n"
24091 msgstr "'%s.final' 包含编辑的邮件。\n"
24093 #: git-send-email.perl:408
24094 msgid "--dump-aliases incompatible with other options\n"
24095 msgstr "--dump-aliases 和其它选项不兼容\n"
24097 #: git-send-email.perl:481 git-send-email.perl:683
24098 msgid "Cannot run git format-patch from outside a repository\n"
24099 msgstr "不能在仓库之外运行 git format-patch\n"
24101 #: git-send-email.perl:484
24103 "`batch-size` and `relogin` must be specified together (via command-line or "
24104 "configuration option)\n"
24105 msgstr "`batch-size` 和 `relogin` 必须同时定义(通过命令行或者配置选项)\n"
24107 #: git-send-email.perl:497
24109 msgid "Unknown --suppress-cc field: '%s'\n"
24110 msgstr "未知的 --suppress-cc 字段:'%s'\n"
24112 #: git-send-email.perl:528
24114 msgid "Unknown --confirm setting: '%s'\n"
24115 msgstr "未知的 --confirm 设置:'%s'\n"
24117 #: git-send-email.perl:556
24119 msgid "warning: sendmail alias with quotes is not supported: %s\n"
24120 msgstr "警告:不支持带引号的 sendmail 别名:%s\n"
24122 #: git-send-email.perl:558
24124 msgid "warning: `:include:` not supported: %s\n"
24125 msgstr "警告:不支持 `:include:`:%s\n"
24127 #: git-send-email.perl:560
24129 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
24130 msgstr "警告:不支持 `/file` 或 `|pipe` 重定向:%s\n"
24132 #: git-send-email.perl:565
24134 msgid "warning: sendmail line is not recognized: %s\n"
24135 msgstr "警告:不能识别的 sendmail 行:%s\n"
24137 #: git-send-email.perl:649
24140 "File '%s' exists but it could also be the range of commits\n"
24141 "to produce patches for. Please disambiguate by...\n"
24143 " * Saying \"./%s\" if you mean a file; or\n"
24144 " * Giving --format-patch option if you mean a range.\n"
24146 "存在文件 '%s' 但是它也可能是一个用于产生补丁列表的提交范围。请用如下方法消除"
24149 " * 如果含义为一个文件,使用 \"./%s\",或者\n"
24150 " * 如果含义为一个范围,使用 --format-patch 选项。\n"
24152 #: git-send-email.perl:670
24154 msgid "Failed to opendir %s: %s"
24155 msgstr "无法打开目录 %s: %s"
24157 #: git-send-email.perl:694
24161 "warning: no patches were sent\n"
24166 #: git-send-email.perl:705
24169 "No patch files specified!\n"
24176 #: git-send-email.perl:718
24178 msgid "No subject line in %s?"
24179 msgstr "在 %s 中没有标题行?"
24181 #: git-send-email.perl:728
24183 msgid "Failed to open for writing %s: %s"
24184 msgstr "为写入打开 %s 失败: %s"
24186 #: git-send-email.perl:739
24188 "Lines beginning in \"GIT:\" will be removed.\n"
24189 "Consider including an overall diffstat or table of contents\n"
24190 "for the patch you are writing.\n"
24192 "Clear the body content if you don't wish to send a summary.\n"
24194 "以 \"GIT:\" 开头的行将被删除。\n"
24195 "考虑包含一个整体的差异统计或者您正在写的补丁的目录。\n"
24197 "如果您不想发送摘要,清除内容。\n"
24199 #: git-send-email.perl:763
24201 msgid "Failed to open %s: %s"
24202 msgstr "无法打开 %s: %s"
24204 #: git-send-email.perl:780
24206 msgid "Failed to open %s.final: %s"
24207 msgstr "无法打开 %s.final: %s"
24209 #: git-send-email.perl:823
24210 msgid "Summary email is empty, skipping it\n"
24211 msgstr "摘要邮件为空,跳过\n"
24213 #. TRANSLATORS: please keep [y/N] as is.
24214 #: git-send-email.perl:858
24216 msgid "Are you sure you want to use <%s> [y/N]? "
24217 msgstr "您确认要使用 <%s> [y/N]?"
24219 #: git-send-email.perl:913
24221 "The following files are 8bit, but do not declare a Content-Transfer-"
24223 msgstr "如下文件含 8bit 内容,但没有声明一个 Content-Transfer-Encoding。\n"
24225 #: git-send-email.perl:918
24226 msgid "Which 8bit encoding should I declare [UTF-8]? "
24227 msgstr "要声明 8bit 为什么样的编码格式 [UTF-8]?"
24229 #: git-send-email.perl:926
24232 "Refusing to send because the patch\n"
24234 "has the template subject '*** SUBJECT HERE ***'. Pass --force if you really "
24239 "包含模版标题 '*** SUBJECT HERE ***'。如果确实想要发送,使用参数 --force。\n"
24241 #: git-send-email.perl:945
24242 msgid "To whom should the emails be sent (if anyone)?"
24245 #: git-send-email.perl:963
24247 msgid "fatal: alias '%s' expands to itself\n"
24248 msgstr "致命错误:别名 '%s' 扩展为它自己\n"
24250 #: git-send-email.perl:975
24251 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
24252 msgstr "Message-ID 被用作第一封邮件的 In-Reply-To ?"
24254 #: git-send-email.perl:1033 git-send-email.perl:1041
24256 msgid "error: unable to extract a valid address from: %s\n"
24257 msgstr "错误:不能从 %s 中提取一个有效的邮件地址\n"
24259 #. TRANSLATORS: Make sure to include [q] [d] [e] in your
24260 #. translation. The program will only accept English input
24262 #: git-send-email.perl:1045
24263 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
24264 msgstr "如何处理这个地址?([q]uit|[d]rop|[e]dit):"
24266 #: git-send-email.perl:1362
24268 msgid "CA path \"%s\" does not exist"
24269 msgstr "CA 路径 \"%s\" 不存在"
24271 #: git-send-email.perl:1445
24273 " The Cc list above has been expanded by additional\n"
24274 " addresses found in the patch commit message. By default\n"
24275 " send-email prompts before sending whenever this occurs.\n"
24276 " This behavior is controlled by the sendemail.confirm\n"
24277 " configuration setting.\n"
24279 " For additional information, run 'git send-email --help'.\n"
24280 " To retain the current behavior, but squelch this message,\n"
24281 " run 'git config --global sendemail.confirm auto'.\n"
24284 " 以上的抄送列表(Cc)已经用补丁提交信息中发现的地址进行\n"
24285 " 了扩展。缺省 send-email 会给出提示。这个行为可以通过\n"
24286 " sendemail.confirm 配置设置。\n"
24288 " 更多信息,执行 'git send-email --help'。\n"
24289 " 要保持当前行为,但不显示此信息,运行 'git config --global\n"
24290 " sendemail.confirm auto'。\n"
24293 #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
24294 #. translation. The program will only accept English input
24296 #: git-send-email.perl:1460
24297 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
24298 msgstr "发送这封邮件?([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
24300 #: git-send-email.perl:1463
24301 msgid "Send this email reply required"
24304 #: git-send-email.perl:1491
24305 msgid "The required SMTP server is not properly defined."
24306 msgstr "要求的 SMTP 服务器未被正确定义。"
24308 #: git-send-email.perl:1538
24310 msgid "Server does not support STARTTLS! %s"
24311 msgstr "服务器不支持 STARTTLS!%s"
24313 #: git-send-email.perl:1543 git-send-email.perl:1547
24315 msgid "STARTTLS failed! %s"
24316 msgstr "STARTTLS 失败!%s"
24318 #: git-send-email.perl:1556
24319 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
24320 msgstr "无法正确地初始化 SMTP。检查配置并使用 --smtp-debug。"
24322 #: git-send-email.perl:1574
24324 msgid "Failed to send %s\n"
24327 #: git-send-email.perl:1577
24329 msgid "Dry-Sent %s\n"
24332 #: git-send-email.perl:1577
24337 #: git-send-email.perl:1579
24338 msgid "Dry-OK. Log says:\n"
24339 msgstr "演习成功。日志说:\n"
24341 #: git-send-email.perl:1579
24342 msgid "OK. Log says:\n"
24345 #: git-send-email.perl:1591
24349 #: git-send-email.perl:1594
24350 msgid "Result: OK\n"
24353 #: git-send-email.perl:1612
24355 msgid "can't open file %s"
24358 #: git-send-email.perl:1659 git-send-email.perl:1679
24360 msgid "(mbox) Adding cc: %s from line '%s'\n"
24361 msgstr "(mbox) 添加 cc:%s 自行 '%s'\n"
24363 #: git-send-email.perl:1665
24365 msgid "(mbox) Adding to: %s from line '%s'\n"
24366 msgstr "(mbox) 添加 to:%s 自行 '%s'\n"
24368 #: git-send-email.perl:1718
24370 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
24371 msgstr "(non-mbox) 添加 cc:%s 自行 '%s'\n"
24373 #: git-send-email.perl:1753
24375 msgid "(body) Adding cc: %s from line '%s'\n"
24376 msgstr "(body) 添加 cc: %s 自行 '%s'\n"
24378 #: git-send-email.perl:1864
24380 msgid "(%s) Could not execute '%s'"
24381 msgstr "(%s) 不能执行 '%s'"
24383 #: git-send-email.perl:1871
24385 msgid "(%s) Adding %s: %s from: '%s'\n"
24386 msgstr "(%s) 添加 %s: %s 自:'%s'\n"
24388 #: git-send-email.perl:1875
24390 msgid "(%s) failed to close pipe to '%s'"
24391 msgstr "(%s) 无法关闭管道至 '%s'"
24393 #: git-send-email.perl:1905
24394 msgid "cannot send message as 7bit"
24395 msgstr "不能以 7bit 形式发送信息"
24397 #: git-send-email.perl:1913
24398 msgid "invalid transfer encoding"
24401 #: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016
24403 msgid "unable to open %s: %s\n"
24404 msgstr "不能打开 %s:%s\n"
24406 #: git-send-email.perl:1957
24408 msgid "%s: patch contains a line longer than 998 characters"
24409 msgstr "%s:补丁包含一个超过 998 字符的行"
24411 #: git-send-email.perl:1974
24413 msgid "Skipping %s with backup suffix '%s'.\n"
24414 msgstr "略过 %s 含备份后缀 '%s'。\n"
24416 #. TRANSLATORS: please keep "[y|N]" as is.
24417 #: git-send-email.perl:1978
24419 msgid "Do you really want to send %s? [y|N]: "
24420 msgstr "您真的要发送 %s?[y|N]:"