5b04ee3b95 · matheusbsbs/matheus-bagliano

@@ -135,8 +135,8 @@ msgid ""

135 msgstr ""

136 "Project-Id-Version: Git\n"

137 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"

138 -"POT-Creation-Date: 2016-03-16 00:16+0800\n"

139 -"PO-Revision-Date: 2016-03-16 00:18+0800\n"

138 +"POT-Creation-Date: 2016-05-24 23:42+0800\n"

139 +"PO-Revision-Date: 2016-06-04 22:06+0800\n"

140 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"

141 "Language-Team: GitHub <https://github.com/jiangxin/git/>\n"

142 "Language: zh_CN\n"

@@ -158,7 +158,7 @@ msgstr ""

158 "请在工作区改正文件，然后酌情使用 'git add/rm <文件>' 命令标记\n"

159 "解决方案并提交。"

160

161 -#: advice.c:101 builtin/merge.c:1226

161 +#: advice.c:101 builtin/merge.c:1238

162 msgid "You have not concluded your merge (MERGE_HEAD exists)."

163 msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。"

164

@@ -201,7 +201,7 @@ msgstr "格式"

201 msgid "archive format"

202 msgstr "归档格式"

203

204 -#: archive.c:430 builtin/log.c:1232

204 +#: archive.c:430 builtin/log.c:1395

205 msgid "prefix"

206 msgstr "前缀"

207

@@ -209,9 +209,9 @@ msgstr "前缀"

209 msgid "prepend prefix to each pathname in the archive"

210 msgstr "为归档中每个路径名加上前缀"

211

212 -#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2547

213 -#: builtin/blame.c:2548 builtin/config.c:60 builtin/fast-export.c:987

214 -#: builtin/fast-export.c:989 builtin/grep.c:720 builtin/hash-object.c:100

212 +#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548

213 +#: builtin/blame.c:2549 builtin/config.c:60 builtin/fast-export.c:987

214 +#: builtin/fast-export.c:989 builtin/grep.c:722 builtin/hash-object.c:100

215 #: builtin/ls-files.c:459 builtin/ls-files.c:462 builtin/notes.c:398

216 #: builtin/notes.c:561 builtin/read-tree.c:109 parse-options.h:153

217 msgid "file"

@@ -245,7 +245,8 @@ msgstr "压缩效果更好"

245 msgid "list supported archive formats"

246 msgstr "列出支持的归档格式"

247

248 -#: archive.c:451 builtin/archive.c:90 builtin/clone.c:78

248 +#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82

249 +#: builtin/submodule--helper.c:776

250 msgid "repo"

251 msgstr "仓库"

252

@@ -392,11 +393,16 @@ msgstr "歧义的对象名：'%s'。"

393 msgid "Not a valid branch point: '%s'."

394 msgstr "无效的分支点：'%s'。"

395

395 -#: branch.c:344

396 +#: branch.c:345

397 #, c-format

398 msgid "'%s' is already checked out at '%s'"

399 msgstr "'%s' 已经检出到 '%s'"

400

401 +#: branch.c:364

402 +#, c-format

403 +msgid "HEAD of working tree %s is not updated"

404 +msgstr "工作区 %s 的 HEAD 指向没有被更新"

405 +

406 #: bundle.c:34

407 #, c-format

408 msgid "'%s' does not look like a v2 bundle file"

@@ -407,7 +413,7 @@ msgstr "'%s' 不像是一个 v2 版本的包文件"

413 msgid "unrecognized header: %s%s (%d)"

414 msgstr "未能识别的包头：%s%s (%d)"

415

410 -#: bundle.c:87 builtin/commit.c:766

416 +#: bundle.c:87 builtin/commit.c:777

417 #, c-format

418 msgid "could not open '%s'"

419 msgstr "不能打开 '%s'"

@@ -416,10 +422,10 @@ msgstr "不能打开 '%s'"

422 msgid "Repository lacks these prerequisite commits:"

423 msgstr "仓库中缺少这些必备的提交："

424

419 -#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1074

420 -#: builtin/blame.c:2754 builtin/commit.c:1045 builtin/log.c:334

421 -#: builtin/log.c:852 builtin/log.c:1467 builtin/log.c:1700 builtin/merge.c:358

422 -#: builtin/shortlog.c:170

425 +#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073

426 +#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340

427 +#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875

428 +#: builtin/merge.c:361 builtin/shortlog.c:170

429 msgid "revision walk setup failed"

430 msgstr "版本遍历设置失败"

431

@@ -458,21 +464,21 @@ msgstr "rev-list 终止"

464 msgid "ref '%s' is excluded by the rev-list options"

465 msgstr "引用 '%s' 被 rev-list 选项排除"

466

461 -#: bundle.c:443 builtin/log.c:157 builtin/log.c:1372 builtin/shortlog.c:273

467 +#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273

468 #, c-format

469 msgid "unrecognized argument: %s"

470 msgstr "未能识别的参数：%s"

471

466 -#: bundle.c:449

472 +#: bundle.c:451

473 msgid "Refusing to create empty bundle."

474 msgstr "不能创建空包。"

475

470 -#: bundle.c:459

476 +#: bundle.c:463

477 #, c-format

478 msgid "cannot create '%s'"

479 msgstr "不能创建 '%s'"

480

475 -#: bundle.c:480

481 +#: bundle.c:491

482 msgid "index-pack died"

483 msgstr "index-pack 终止"

484

@@ -481,8 +487,8 @@ msgstr "index-pack 终止"

487 msgid "invalid color value: %.*s"

488 msgstr "无效的颜色值：%.*s"

489

484 -#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1505

485 -#: builtin/am.c:2135

490 +#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504

491 +#: builtin/am.c:2134

492 #, c-format

493 msgid "could not parse %s"

494 msgstr "不能解析 %s"

@@ -516,21 +522,21 @@ msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %3$s"

522 msgid "failed to expand user dir in: '%s'"

523 msgstr "无法扩展 '%s' 中的用户目录"

524

519 -#: config.c:758 config.c:769

525 +#: config.c:761 config.c:772

526 #, c-format

527 msgid "bad zlib compression level %d"

528 msgstr "错误的 zlib 压缩级别 %d"

529

524 -#: config.c:891

530 +#: config.c:890

531 #, c-format

532 msgid "invalid mode for object creation: %s"

533 msgstr "无效的对象创建模式：%s"

534

529 -#: config.c:1220

535 +#: config.c:1228

536 msgid "unable to parse command-line config"

537 msgstr "无法解析命令行中的配置"

538

533 -#: config.c:1281

539 +#: config.c:1284

540 msgid "unknown error occured while reading the configuration files"

541 msgstr "在读取配置文件时遇到未知错误"

542

@@ -549,24 +555,27 @@ msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"

555 msgid "%s has multiple values"

556 msgstr "%s 有多个取值"

557

552 -#: config.c:2226

558 +#: config.c:2224

559 #, c-format

554 -msgid "Could not set '%s' to '%s'"

560 +msgid "could not set '%s' to '%s'"

561 msgstr "不能设置 '%s' 为 '%s'"

562

563 +#: config.c:2226

564 +#, c-format

565 +msgid "could not unset '%s'"

566 +msgstr "不能取消设置 '%s'"

567 +

568 #: connected.c:69

569 msgid "Could not run 'git rev-list'"

570 msgstr "不能执行 'git rev-list'"

571

572 #: connected.c:89

562 -#, c-format

563 -msgid "failed write to rev-list: %s"

564 -msgstr "无法写入 rev-list：%s"

573 +msgid "failed write to rev-list"

574 +msgstr "无法写入 rev-list"

575

566 -#: connected.c:97

567 -#, c-format

568 -msgid "failed to close rev-list's stdin: %s"

569 -msgstr "无法关闭 rev-list 的标准输入：%s"

576 +#: connected.c:96

577 +msgid "failed to close rev-list's stdin"

578 +msgstr "无法关闭 rev-list 的标准输入"

579

580 #: date.c:95

581 msgid "in the future"

@@ -641,28 +650,28 @@ msgstr[1] "%lu 年前"

650 msgid "failed to read orderfile '%s'"

651 msgstr "无法读取排序文件 '%s'"

652

644 -#: diffcore-rename.c:536

653 +#: diffcore-rename.c:538

654 msgid "Performing inexact rename detection"

655 msgstr "正在进行非精确的重命名检测"

656

657 # 译者：注意保持前导空格

649 -#: diff.c:115

658 +#: diff.c:116

659 #, c-format

660 msgid " Failed to parse dirstat cut-off percentage '%s'\n"

661 msgstr " 无法解析 dirstat 截止（cut-off）百分比 '%s'\n"

662

663 # 译者：注意保持前导空格

655 -#: diff.c:120

664 +#: diff.c:121

665 #, c-format

666 msgid " Unknown dirstat parameter '%s'\n"

667 msgstr " 未知的 dirstat 参数 '%s'\n"

668

660 -#: diff.c:215

669 +#: diff.c:225

670 #, c-format

671 msgid "Unknown value for 'diff.submodule' config variable: '%s'"

672 msgstr "配置变量 'diff.submodule' 未知的取值：'%s'"

673

665 -#: diff.c:267

674 +#: diff.c:277

675 #, c-format

676 msgid ""

677 "Found errors in 'diff.dirstat' config variable:\n"

@@ -671,16 +680,16 @@ msgstr ""

680 "发现配置变量 'diff.dirstat' 中的错误：\n"

681 "%s"

682

674 -#: diff.c:2997

683 +#: diff.c:3007

684 #, c-format

685 msgid "external diff died, stopping at %s"

686 msgstr "外部 diff 退出，停止在 %s"

687

679 -#: diff.c:3393

688 +#: diff.c:3405

689 msgid "--follow requires exactly one pathspec"

690 msgstr "--follow 参数后只跟一个 pathspec"

691

683 -#: diff.c:3556

692 +#: diff.c:3568

693 #, c-format

694 msgid ""

695 "Failed to parse --dirstat/-X option parameter:\n"

@@ -689,20 +698,20 @@ msgstr ""

698 "无法解析 --dirstat/-X 选项的参数：\n"

699 "%s"

700

692 -#: diff.c:3570

701 +#: diff.c:3582

702 #, c-format

703 msgid "Failed to parse --submodule option parameter: '%s'"

704 msgstr "无法解析 --submodule 选项的参数：'%s'"

705

697 -#: dir.c:2004

706 +#: dir.c:1823

707 msgid "failed to get kernel name and information"

708 msgstr "无法获得内核名称和信息"

709

701 -#: dir.c:2123

710 +#: dir.c:1942

711 msgid "Untracked cache is disabled on this system or location."

712 msgstr "缓存未跟踪文件在本系统或位置中被禁用。"

713

705 -#: gpg-interface.c:166 gpg-interface.c:237

714 +#: gpg-interface.c:166 gpg-interface.c:235

715 msgid "could not run gpg."

716 msgstr "不能执行 gpg。"

717

@@ -716,28 +725,28 @@ msgstr "gpg 无法为数据签名"

725

726 #: gpg-interface.c:222

727 #, c-format

719 -msgid "could not create temporary file '%s': %s"

720 -msgstr "不能创建临时文件 '%s'：%s"

728 +msgid "could not create temporary file '%s'"

729 +msgstr "不能创建临时文件 '%s'"

730

722 -#: gpg-interface.c:225

731 +#: gpg-interface.c:224

732 #, c-format

724 -msgid "failed writing detached signature to '%s': %s"

725 -msgstr "无法将分离式签名写入 '%s'：%s"

733 +msgid "failed writing detached signature to '%s'"

734 +msgstr "无法将分离式签名写入 '%s'"

735

736 #: grep.c:1718

737 #, c-format

738 msgid "'%s': unable to read %s"

739 msgstr "'%s'：无法读取 %s"

740

732 -#: grep.c:1735

741 +#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155

742 #, c-format

734 -msgid "'%s': %s"

735 -msgstr "'%s'：%s"

743 +msgid "failed to stat '%s'"

744 +msgstr "无法枚举 '%s' 状态"

745

746 #: grep.c:1746

747 #, c-format

739 -msgid "'%s': short read %s"

740 -msgstr "'%s'：读取不完整 %s"

748 +msgid "'%s': short read"

749 +msgstr "'%s'：读取不完整"

750

751 #: help.c:205

752 #, c-format

@@ -803,12 +812,35 @@ msgstr[1] ""

812 msgid "%s: %s - %s"

813 msgstr "%s：%s - %s"

814

815 +#: lockfile.c:152

816 +#, c-format

817 +msgid ""

818 +"Unable to create '%s.lock': %s.\n"

819 +"\n"

820 +"Another git process seems to be running in this repository, e.g.\n"

821 +"an editor opened by 'git commit'. Please make sure all processes\n"

822 +"are terminated then try again. If it still fails, a git process\n"

823 +"may have crashed in this repository earlier:\n"

824 +"remove the file manually to continue."

825 +msgstr ""

826 +"无法创建 '%s.lock'：%s。\n"

827 +"\n"

828 +"似乎另外一个 git 进程在这个仓库中运行，例如：'git commit' 命令打\n"

829 +"开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错，\n"

830 +"可能之前有一个 git 进程在这个仓库中异常退出：\n"

831 +"手动删除这个文件再继续。"

832 +

833 +#: lockfile.c:160

834 +#, c-format

835 +msgid "Unable to create '%s.lock': %s"

836 +msgstr "不能创建 '%s.lock'：%s"

837 +

838 #: merge.c:41

839 msgid "failed to read the cache"

840 msgstr "无法读取缓存"

841

810 -#: merge.c:94 builtin/am.c:2008 builtin/am.c:2043 builtin/checkout.c:376

811 -#: builtin/checkout.c:587 builtin/clone.c:730

842 +#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375

843 +#: builtin/checkout.c:586 builtin/clone.c:732

844 msgid "unable to write new index file"

845 msgstr "无法写新的索引文件"

846

@@ -855,7 +887,7 @@ msgstr "不能读取对象 %s '%s'"

887 msgid "blob expected for %s '%s'"

888 msgstr "%s '%s' 应为数据对象"

889

858 -#: merge-recursive.c:790 builtin/clone.c:374

890 +#: merge-recursive.c:790 builtin/clone.c:376

891 #, c-format

892 msgid "failed to open '%s'"

893 msgstr "无法打开 '%s'"

@@ -990,7 +1022,7 @@ msgstr "略过 %s（已经做过相同合并）"

1022 msgid "Auto-merging %s"

1023 msgstr "自动合并 %s"

1024

993 -#: merge-recursive.c:1650 git-submodule.sh:1048

1025 +#: merge-recursive.c:1650 git-submodule.sh:941

1026 msgid "submodule"

1027 msgstr "子模组"

1028

@@ -1017,50 +1049,50 @@ msgstr "目录/文件"

1049 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"

1050 msgstr "冲突（%1$s）：在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"

1051

1020 -#: merge-recursive.c:1783

1052 +#: merge-recursive.c:1781

1053 #, c-format

1054 msgid "Adding %s"

1055 msgstr "添加 %s"

1056

1025 -#: merge-recursive.c:1800

1057 +#: merge-recursive.c:1798

1058 msgid "Fatal merge failure, shouldn't happen."

1059 msgstr "严重的合并错误，不应发生。"

1060

1029 -#: merge-recursive.c:1819

1061 +#: merge-recursive.c:1817

1062 msgid "Already up-to-date!"

1063 msgstr "已经是最新的！"

1064

1033 -#: merge-recursive.c:1828

1065 +#: merge-recursive.c:1826

1066 #, c-format

1067 msgid "merging of trees %s and %s failed"

1068 msgstr "无法合并树 %s 和 %s"

1069

1038 -#: merge-recursive.c:1858

1070 +#: merge-recursive.c:1856

1071 #, c-format

1072 msgid "Unprocessed path??? %s"

1073 msgstr "未处理的路径??? %s"

1074

1043 -#: merge-recursive.c:1906

1075 +#: merge-recursive.c:1904

1076 msgid "Merging:"

1077 msgstr "合并："

1078

1047 -#: merge-recursive.c:1919

1079 +#: merge-recursive.c:1917

1080 #, c-format

1081 msgid "found %u common ancestor:"

1082 msgid_plural "found %u common ancestors:"

1083 msgstr[0] "发现 %u 个共同祖先："

1084 msgstr[1] "发现 %u 个共同祖先："

1085

1054 -#: merge-recursive.c:1956

1086 +#: merge-recursive.c:1954

1087 msgid "merge returned no commit"

1088 msgstr "合并未返回提交"

1089

1058 -#: merge-recursive.c:2013

1090 +#: merge-recursive.c:2011

1091 #, c-format

1092 msgid "Could not parse object '%s'"

1093 msgstr "不能解析对象 '%s'"

1094

1063 -#: merge-recursive.c:2024 builtin/merge.c:646

1095 +#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831

1096 msgid "Unable to write index."

1097 msgstr "不能写入索引。"

1098

@@ -1090,29 +1122,29 @@ msgstr "坏的 %s 值：'%s'"

1122 msgid "unable to parse object: %s"

1123 msgstr "不能解析对象：%s"

1124

1093 -#: parse-options.c:570

1125 +#: parse-options.c:572

1126 msgid "..."

1127 msgstr "..."

1128

1097 -#: parse-options.c:588

1129 +#: parse-options.c:590

1130 #, c-format

1131 msgid "usage: %s"

1132 msgstr "用法：%s"

1133

1134 #. TRANSLATORS: the colon here should align with the

1135 #. one in "usage: %s" translation

1104 -#: parse-options.c:592

1136 +#: parse-options.c:594

1137 #, c-format

1138 msgid " or: %s"

1139 msgstr " 或：%s"

1140

1141 # 译者：为保证在输出中对齐，注意调整句中空格！

1110 -#: parse-options.c:595

1142 +#: parse-options.c:597

1143 #, c-format

1144 msgid " %s"

1145 msgstr " %s"

1146

1115 -#: parse-options.c:629

1147 +#: parse-options.c:631

1148 msgid "-NUM"

1149 msgstr "-数字"

1150

@@ -1121,7 +1153,7 @@ msgstr "-数字"

1153 msgid "malformed object name '%s'"

1154 msgstr "非法的对象名 '%s'"

1155

1124 -#: path.c:752

1156 +#: path.c:796

1157 #, c-format

1158 msgid "Could not make %s writable by group"

1159 msgstr "不能设置 %s 为组可写"

@@ -1188,7 +1220,7 @@ msgstr ""

1220 "没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"

1221 "添加 ':/' 或 '.' ？"

1222

1191 -#: pretty.c:969

1223 +#: pretty.c:971

1224 msgid "unable to parse --pretty format"

1225 msgstr "不能解析 --pretty 格式"

1226

@@ -1214,23 +1246,23 @@ msgstr ""

1246 "设置了 GIT_INDEX_VERSION，但是取值无效。\n"

1247 "使用版本 %i"

1248

1217 -#: refs.c:543 builtin/merge.c:761 builtin/merge.c:872 builtin/merge.c:974

1218 -#: builtin/merge.c:984

1249 +#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985

1250 +#: builtin/merge.c:995

1251 #, c-format

1252 msgid "Could not open '%s' for writing"

1253 msgstr "无法打开 '%s' 进行写入"

1254

1223 -#: refs/files-backend.c:2374

1255 +#: refs/files-backend.c:2243

1256 #, c-format

1257 msgid "could not delete reference %s: %s"

1258 msgstr "无法删除引用 %s：%s"

1259

1228 -#: refs/files-backend.c:2377

1260 +#: refs/files-backend.c:2246

1261 #, c-format

1262 msgid "could not delete references: %s"

1263 msgstr "无法删除引用：%s"

1264

1233 -#: refs/files-backend.c:2386

1265 +#: refs/files-backend.c:2255

1266 #, c-format

1267 msgid "could not remove reference %s"

1268 msgstr "无法删除引用 %s"

@@ -1369,93 +1401,93 @@ msgstr "格式：缺少 %%(end) 元素"

1401 msgid "malformed object name %s"

1402 msgstr "非法的对象名 %s"

1403

1372 -#: remote.c:745

1404 +#: remote.c:746

1405 #, c-format

1406 msgid "Cannot fetch both %s and %s to %s"

1407 msgstr "不能同时获取 %s 和 %s 至 %s"

1408

1377 -#: remote.c:749

1409 +#: remote.c:750

1410 #, c-format

1411 msgid "%s usually tracks %s, not %s"

1412 msgstr "%s 通常跟踪 %s，而非 %s"

1413

1382 -#: remote.c:753

1414 +#: remote.c:754

1415 #, c-format

1416 msgid "%s tracks both %s and %s"

1417 msgstr "%s 同时跟踪 %s 和 %s"

1418

1387 -#: remote.c:761

1419 +#: remote.c:762

1420 msgid "Internal error"

1421 msgstr "内部错误"

1422

1391 -#: remote.c:1677 remote.c:1720

1423 +#: remote.c:1678 remote.c:1721

1424 msgid "HEAD does not point to a branch"

1425 msgstr "HEAD 没有指向一个分支"

1426

1395 -#: remote.c:1686

1427 +#: remote.c:1687

1428 #, c-format

1429 msgid "no such branch: '%s'"

1430 msgstr "没有此分支：'%s'"

1431

1400 -#: remote.c:1689

1432 +#: remote.c:1690

1433 #, c-format

1434 msgid "no upstream configured for branch '%s'"

1435 msgstr "尚未给分支 '%s' 设置上游"

1436

1405 -#: remote.c:1695

1437 +#: remote.c:1696

1438 #, c-format

1439 msgid "upstream branch '%s' not stored as a remote-tracking branch"

1440 msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"

1441

1410 -#: remote.c:1710

1442 +#: remote.c:1711

1443 #, c-format

1444 msgid "push destination '%s' on remote '%s' has no local tracking branch"

1445 msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"

1446

1415 -#: remote.c:1725

1447 +#: remote.c:1726

1448 #, c-format

1449 msgid "branch '%s' has no remote for pushing"

1450 msgstr "分支 '%s' 没有设置要推送的远程服务器"

1451

1420 -#: remote.c:1736

1452 +#: remote.c:1737

1453 #, c-format

1454 msgid "push refspecs for '%s' do not include '%s'"

1455 msgstr "向 '%s' 推送引用规格未包含 '%s'"

1456

1425 -#: remote.c:1749

1457 +#: remote.c:1750

1458 msgid "push has no destination (push.default is 'nothing')"

1459 msgstr "推送无目标（push.default 是 'nothing'）"

1460

1429 -#: remote.c:1771

1461 +#: remote.c:1772

1462 msgid "cannot resolve 'simple' push to a single destination"

1463 msgstr "无法解析 'simple' 推送至一个单独的目标"

1464

1433 -#: remote.c:2073

1465 +#: remote.c:2074

1466 #, c-format

1467 msgid "Your branch is based on '%s', but the upstream is gone.\n"

1468 msgstr "您的分支基于 '%s'，但此上游分支已经不存在。\n"

1469

1438 -#: remote.c:2077

1470 +#: remote.c:2078

1471 msgid " (use \"git branch --unset-upstream\" to fixup)\n"

1472 msgstr " （使用 \"git branch --unset-upstream\" 来修复）\n"

1473

1442 -#: remote.c:2080

1474 +#: remote.c:2081

1475 #, c-format

1476 msgid "Your branch is up-to-date with '%s'.\n"

1477 msgstr "您的分支与上游分支 '%s' 一致。\n"

1478

1447 -#: remote.c:2084

1479 +#: remote.c:2085

1480 #, c-format

1481 msgid "Your branch is ahead of '%s' by %d commit.\n"

1482 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"

1483 msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"

1484 msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"

1485

1454 -#: remote.c:2090

1486 +#: remote.c:2091

1487 msgid " (use \"git push\" to publish your local commits)\n"

1488 msgstr " （使用 \"git push\" 来发布您的本地提交）\n"

1489

1458 -#: remote.c:2093

1490 +#: remote.c:2094

1491 #, c-format

1492 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"

1493 msgid_plural ""

@@ -1464,11 +1496,11 @@ msgstr[0] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"

1496 msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"

1497

1498 # 译者：注意保持前导空格

1467 -#: remote.c:2101

1499 +#: remote.c:2102

1500 msgid " (use \"git pull\" to update your local branch)\n"

1501 msgstr " （使用 \"git pull\" 来更新您的本地分支）\n"

1502

1471 -#: remote.c:2104

1503 +#: remote.c:2105

1504 #, c-format

1505 msgid ""

1506 "Your branch and '%s' have diverged,\n"

@@ -1484,20 +1516,20 @@ msgstr[1] ""

1516 "并且分别有 %d 和 %d 处不同的提交。\n"

1517

1518 # 译者：注意保持前导空格

1487 -#: remote.c:2114

1519 +#: remote.c:2115

1520 msgid " (use \"git pull\" to merge the remote branch into yours)\n"

1521 msgstr " （使用 \"git pull\" 来合并远程分支）\n"

1522

1491 -#: revision.c:2131

1523 +#: revision.c:2142

1524 msgid "your current branch appears to be broken"

1525 msgstr "您的当前分支好像被损坏"

1526

1495 -#: revision.c:2134

1527 +#: revision.c:2145

1528 #, c-format

1529 msgid "your current branch '%s' does not have any commits yet"

1530 msgstr "您的当前分支 '%s' 尚无任何提交"

1531

1500 -#: revision.c:2328

1532 +#: revision.c:2339

1533 msgid "--first-parent is incompatible with --bisect"

1534 msgstr "--first-parent 与 --bisect 不兼容"

1535

@@ -1545,7 +1577,7 @@ msgstr ""

1577 "冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"

1578 "对修正后的文件做标记，然后用 'git commit' 提交"

1579

1548 -#: sequencer.c:190 sequencer.c:833 sequencer.c:913

1580 +#: sequencer.c:190 sequencer.c:833 sequencer.c:912

1581 #, c-format

1582 msgid "Could not write to %s"

1583 msgstr "不能写入 %s"

@@ -1703,12 +1735,12 @@ msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""

1735 msgid "Could not create sequencer directory %s"

1736 msgstr "不能创建序列目录 %s"

1737

1706 -#: sequencer.c:835 sequencer.c:917

1738 +#: sequencer.c:835 sequencer.c:916

1739 #, c-format

1740 msgid "Error wrapping up %s."

1741 msgstr "错误收尾 %s。"

1742

1711 -#: sequencer.c:854 sequencer.c:987

1743 +#: sequencer.c:854 sequencer.c:986

1744 msgid "no cherry-pick or revert in progress"

1745 msgstr "拣选或还原操作并未进行"

1746

@@ -1720,63 +1752,72 @@ msgstr "不能解析 HEAD"

1752 msgid "cannot abort from a branch yet to be born"

1753 msgstr "不能从尚未建立的分支终止"

1754

1723 -#: sequencer.c:878 builtin/apply.c:4287

1755 +#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851

1756 #, c-format

1725 -msgid "cannot open %s: %s"

1726 -msgstr "不能打开 %s：%s"

1757 +msgid "cannot open %s"

1758 +msgstr "不能打开 %s"

1759

1728 -#: sequencer.c:881

1760 +#: sequencer.c:880

1761 #, c-format

1762 msgid "cannot read %s: %s"

1763 msgstr "不能读取 %s：%s"

1764

1733 -#: sequencer.c:882

1765 +#: sequencer.c:881

1766 msgid "unexpected end of file"

1767 msgstr "意外的文件结束"

1768

1737 -#: sequencer.c:888

1769 +#: sequencer.c:887

1770 #, c-format

1771 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"

1772 msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"

1773

1742 -#: sequencer.c:910

1774 +#: sequencer.c:909

1775 #, c-format

1776 msgid "Could not format %s."

1777 msgstr "不能格式化 %s。"

1778

1747 -#: sequencer.c:1055

1779 +#: sequencer.c:1054

1780 #, c-format

1781 msgid "%s: can't cherry-pick a %s"

1782 msgstr "%s：不能拣选一个%s"

1783

1752 -#: sequencer.c:1058

1784 +#: sequencer.c:1057

1785 #, c-format

1786 msgid "%s: bad revision"

1787 msgstr "%s：错误的版本"

1788

1757 -#: sequencer.c:1092

1789 +#: sequencer.c:1091

1790 msgid "Can't revert as initial commit"

1791 msgstr "不能作为初始提交还原"

1792

1761 -#: sequencer.c:1093

1793 +#: sequencer.c:1092

1794 msgid "Can't cherry-pick into empty head"

1795 msgstr "不能拣选到空分支"

1796

1765 -#: setup.c:246

1797 +#: setup.c:248

1798 #, c-format

1799 msgid "failed to read %s"

1800 msgstr "无法读取 %s"

1801

1802 +#: setup.c:468

1803 +#, c-format

1804 +msgid "Expected git repo version <= %d, found %d"

1805 +msgstr "期望 git 仓库版本 <= %d，却得到 %d"

1806 +

1807 +#: setup.c:476

1808 +msgid "unknown repository extensions found:"

1809 +msgstr "发现未知的仓库扩展："

1810 +

1811 #: sha1_file.c:1080

1812 msgid "offset before end of packfile (broken .idx?)"

1813 msgstr "偏移量在包文件结束之前（损坏的 .idx？）"

1814

1774 -#: sha1_file.c:2459

1815 +#: sha1_file.c:2458

1816 #, c-format

1817 msgid "offset before start of pack index for %s (corrupt index?)"

1818 msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）"

1819

1779 -#: sha1_file.c:2463

1820 +#: sha1_file.c:2462

1821 #, c-format

1822 msgid "offset beyond end of pack index for %s (truncated index?)"

1823 msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）"

@@ -1802,29 +1843,38 @@ msgstr ""

1843 "可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"

1844 "命令关闭本消息通知。"

1845

1805 -#: submodule.c:62 submodule.c:96

1846 +#: submodule.c:64 submodule.c:98

1847 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"

1848 msgstr "无法修改未合并的 .gitmodules，先解决合并冲突"

1849

1809 -#: submodule.c:66 submodule.c:100

1850 +#: submodule.c:68 submodule.c:102

1851 #, c-format

1852 msgid "Could not find section in .gitmodules where path=%s"

1853 msgstr "无法在 .gitmodules 中找到 path=%s 的小节"

1854

1814 -#: submodule.c:74

1855 +#: submodule.c:76

1856 #, c-format

1857 msgid "Could not update .gitmodules entry %s"

1858 msgstr "不能更新 .gitmodules 条目 %s"

1859

1819 -#: submodule.c:107

1860 +#: submodule.c:109

1861 #, c-format

1862 msgid "Could not remove .gitmodules entry for %s"

1863 msgstr "无法移除 %s 的 .gitmodules 条目"

1864

1824 -#: submodule.c:118

1865 +#: submodule.c:120

1866 msgid "staging updated .gitmodules failed"

1867 msgstr "将更新后 .gitmodules 添加暂存区失败"

1868

1869 +#: submodule.c:177

1870 +msgid "negative values not allowed for submodule.fetchJobs"

1871 +msgstr "submodule.fetchJobs 不允许为负值"

1872 +

1873 +#: submodule-config.c:355

1874 +#, c-format

1875 +msgid "invalid value for %s"

1876 +msgstr "%s 的值无效"

1877 +

1878 #: trailer.c:237

1879 #, c-format

1880 msgid "running trailer command '%s' failed"

@@ -1884,7 +1934,219 @@ msgstr "不能重命名临时文件为 %s"

1934 msgid "Could not read ref %s"

1935 msgstr "不能读取引用 %s"

1936

1887 -#: unpack-trees.c:203

1937 +#: unpack-trees.c:64

1938 +#, c-format

1939 +msgid ""

1940 +"Your local changes to the following files would be overwritten by checkout:\n"

1941 +"%%sPlease commit your changes or stash them before you can switch branches."

1942 +msgstr ""

1943 +"您对下列文件的本地修改将被检出操作覆盖：\n"

1944 +"%%s请在切换分支前提交您的修改或者进度保存。"

1945 +

1946 +#: unpack-trees.c:66

1947 +#, c-format

1948 +msgid ""

1949 +"Your local changes to the following files would be overwritten by checkout:\n"

1950 +"%%s"

1951 +msgstr ""

1952 +"您对下列文件的本地修改将被检出操作覆盖：\n"

1953 +"%%s"

1954 +

1955 +#: unpack-trees.c:69

1956 +#, c-format

1957 +msgid ""

1958 +"Your local changes to the following files would be overwritten by merge:\n"

1959 +"%%sPlease commit your changes or stash them before you can merge."

1960 +msgstr ""

1961 +"您对下列文件的本地修改将被合并操作覆盖：\n"

1962 +"%%s请在合并前提交您的修改或者进度保存。"

1963 +

1964 +#: unpack-trees.c:71

1965 +#, c-format

1966 +msgid ""

1967 +"Your local changes to the following files would be overwritten by merge:\n"

1968 +"%%s"

1969 +msgstr ""

1970 +"您对下列文件的本地修改将被合并操作覆盖：\n"

1971 +"%%s"

1972 +

1973 +#: unpack-trees.c:74

1974 +#, c-format

1975 +msgid ""

1976 +"Your local changes to the following files would be overwritten by %s:\n"

1977 +"%%sPlease commit your changes or stash them before you can %s."

1978 +msgstr ""

1979 +"您对下列文件的本地修改将被 %s 覆盖：\n"

1980 +"%%s请在 %s 之前提交您的修改或者进度保存。"

1981 +

1982 +#: unpack-trees.c:76

1983 +#, c-format

1984 +msgid ""

1985 +"Your local changes to the following files would be overwritten by %s:\n"

1986 +"%%s"

1987 +msgstr ""

1988 +"您对下列文件的本地修改将被 %s 覆盖：\n"

1989 +"%%s"

1990 +

1991 +#: unpack-trees.c:81

1992 +#, c-format

1993 +msgid ""

1994 +"Updating the following directories would lose untracked files in it:\n"

1995 +"%s"

1996 +msgstr ""

1997 +"更新如下目录将会丢失其中未跟踪的文件：\n"

1998 +"%s"

1999 +

2000 +#: unpack-trees.c:85

2001 +#, c-format

2002 +msgid ""

2003 +"The following untracked working tree files would be removed by checkout:\n"

2004 +"%%sPlease move or remove them before you can switch branches."

2005 +msgstr ""

2006 +"如下未跟踪的工作区文件将因为检出而被删除：\n"

2007 +"%%s请在切换分支之前移动或删除这些文件。"

2008 +

2009 +#: unpack-trees.c:87

2010 +#, c-format

2011 +msgid ""

2012 +"The following untracked working tree files would be removed by checkout:\n"

2013 +"%%s"

2014 +msgstr ""

2015 +"工作区中下列未跟踪的文件将会因为检出操作而被删除：\n"

2016 +"%%s"

2017 +

2018 +#: unpack-trees.c:90

2019 +#, c-format

2020 +msgid ""

2021 +"The following untracked working tree files would be removed by merge:\n"

2022 +"%%sPlease move or remove them before you can merge."

2023 +msgstr ""

2024 +"工作区中下列未跟踪的文件将会因为合并操作而被删除：\n"

2025 +"%%s请在合并前移动或删除。"

2026 +

2027 +#: unpack-trees.c:92

2028 +#, c-format

2029 +msgid ""

2030 +"The following untracked working tree files would be removed by merge:\n"

2031 +"%%s"

2032 +msgstr ""

2033 +"工作区中下列未跟踪的文件将会因为合并操作而被删除：\n"

2034 +"%%s"

2035 +

2036 +#: unpack-trees.c:95

2037 +#, c-format

2038 +msgid ""

2039 +"The following untracked working tree files would be removed by %s:\n"

2040 +"%%sPlease move or remove them before you can %s."

2041 +msgstr ""

2042 +"工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n"

2043 +"%%s请在 %s 前移动或删除。"

2044 +

2045 +#: unpack-trees.c:97

2046 +#, c-format

2047 +msgid ""

2048 +"The following untracked working tree files would be removed by %s:\n"

2049 +"%%s"

2050 +msgstr ""

2051 +"工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n"

2052 +"%%s"

2053 +

2054 +#: unpack-trees.c:102

2055 +#, c-format

2056 +msgid ""

2057 +"The following untracked working tree files would be overwritten by "

2058 +"checkout:\n"

2059 +"%%sPlease move or remove them before you can switch branches."

2060 +msgstr ""

2061 +"工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n"

2062 +"%%s请在切换分支前移动或删除。"

2063 +

2064 +#: unpack-trees.c:104

2065 +#, c-format

2066 +msgid ""

2067 +"The following untracked working tree files would be overwritten by "

2068 +"checkout:\n"

2069 +"%%s"

2070 +msgstr ""

2071 +"工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n"

2072 +"%%s"

2073 +

2074 +#: unpack-trees.c:107

2075 +#, c-format

2076 +msgid ""

2077 +"The following untracked working tree files would be overwritten by merge:\n"

2078 +"%%sPlease move or remove them before you can merge."

2079 +msgstr ""

2080 +"工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n"

2081 +"%%s请在合并前移动或删除。"

2082 +

2083 +#: unpack-trees.c:109

2084 +#, c-format

2085 +msgid ""

2086 +"The following untracked working tree files would be overwritten by merge:\n"

2087 +"%%s"

2088 +msgstr ""

2089 +"工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n"

2090 +"%%s"

2091 +

2092 +#: unpack-trees.c:112

2093 +#, c-format

2094 +msgid ""

2095 +"The following untracked working tree files would be overwritten by %s:\n"

2096 +"%%sPlease move or remove them before you can %s."

2097 +msgstr ""

2098 +"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n"

2099 +"%%s请在 %s 前移动或删除。"

2100 +

2101 +#: unpack-trees.c:114

2102 +#, c-format

2103 +msgid ""

2104 +"The following untracked working tree files would be overwritten by %s:\n"

2105 +"%%s"

2106 +msgstr ""

2107 +"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n"

2108 +"%%s"

2109 +

2110 +#: unpack-trees.c:121

2111 +#, c-format

2112 +msgid "Entry '%s' overlaps with '%s'. Cannot bind."

2113 +msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"

2114 +

2115 +#: unpack-trees.c:124

2116 +#, c-format

2117 +msgid ""

2118 +"Cannot update sparse checkout: the following entries are not up-to-date:\n"

2119 +"%s"

2120 +msgstr ""

2121 +"无法更新稀疏检出。如下条目不是最新：\n"

2122 +"%s"

2123 +

2124 +#: unpack-trees.c:126

2125 +#, c-format

2126 +msgid ""

2127 +"The following Working tree files would be overwritten by sparse checkout "

2128 +"update:\n"

2129 +"%s"

2130 +msgstr ""

2131 +"工作区中下列文件将会因为稀疏检出而被覆盖：\n"

2132 +"%s"

2133 +

2134 +#: unpack-trees.c:128

2135 +#, c-format

2136 +msgid ""

2137 +"The following Working tree files would be removed by sparse checkout "

2138 +"update:\n"

2139 +"%s"

2140 +msgstr ""

2141 +"工作区中下列文件将会因为稀疏检出而被删除：\n"

2142 +"%s"

2143 +

2144 +#: unpack-trees.c:205

2145 +#, c-format

2146 +msgid "Aborting\n"

2147 +msgstr "终止中\n"

2148 +

2149 +#: unpack-trees.c:237

2150 msgid "Checking out files"

2151 msgstr "正在检出文件"

2152

@@ -1922,205 +2184,201 @@ msgstr "无效的 '..' 路径片段"

2184 msgid "could not open '%s' for reading and writing"

2185 msgstr "无法打开 '%s' 进行读写"

2186

1925 -#: wrapper.c:224 wrapper.c:383

2187 +#: wrapper.c:224 wrapper.c:383 builtin/am.c:779

2188 #, c-format

2189 msgid "could not open '%s' for writing"

2190 msgstr "无法打开 '%s' 进行写入"

2191

1930 -#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691

1931 -#: builtin/merge.c:1075 builtin/pull.c:387

2192 +#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772

2193 +#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086

2194 +#: builtin/pull.c:407

2195 #, c-format

2196 msgid "could not open '%s' for reading"

2197 msgstr "无法打开 '%s' 进行读取"

2198

1936 -#: wrapper.c:611

1937 -#, c-format

1938 -msgid "unable to access '%s': %s"

1939 -msgstr "不能访问 '%s'：%s"

1940 -

1941 -#: wrapper.c:632

2199 +#: wrapper.c:594 wrapper.c:615

2200 #, c-format

2201 msgid "unable to access '%s'"

2202 msgstr "不能访问 '%s'"

2203

1946 -#: wrapper.c:640

2204 +#: wrapper.c:623

2205 msgid "unable to get current working directory"

2206 msgstr "不能获取当前工作目录"

2207

1950 -#: wrapper.c:667

2208 +#: wrapper.c:650

2209 #, c-format

2210 msgid "could not open %s for writing"

2211 msgstr "不能写入 %s"

2212

1955 -#: wrapper.c:678 builtin/am.c:410

2213 +#: wrapper.c:661 builtin/am.c:410

2214 #, c-format

2215 msgid "could not write to %s"

2216 msgstr "不能写入 %s"

2217

1960 -#: wrapper.c:684

2218 +#: wrapper.c:667

2219 #, c-format

2220 msgid "could not close %s"

2221 msgstr "不能关闭 %s"

2222

1965 -#: wt-status.c:149

2223 +#: wt-status.c:150

2224 msgid "Unmerged paths:"

2225 msgstr "未合并的路径："

2226

2227 # 译者：注意保持前导空格

1970 -#: wt-status.c:176 wt-status.c:203

2228 +#: wt-status.c:177 wt-status.c:204

2229 #, c-format

2230 msgid " (use \"git reset %s <file>...\" to unstage)"

2231 msgstr " （使用 \"git reset %s <文件>...\" 以取消暂存）"

2232

2233 # 译者：注意保持前导空格

1976 -#: wt-status.c:178 wt-status.c:205

2234 +#: wt-status.c:179 wt-status.c:206

2235 msgid " (use \"git rm --cached <file>...\" to unstage)"

2236 msgstr " （使用 \"git rm --cached <文件>...\" 以取消暂存）"

2237

2238 # 译者：注意保持前导空格

1981 -#: wt-status.c:182

2239 +#: wt-status.c:183

2240 msgid " (use \"git add <file>...\" to mark resolution)"

2241 msgstr " （使用 \"git add <文件>...\" 标记解决方案）"

2242

2243 # 译者：注意保持前导空格

1986 -#: wt-status.c:184 wt-status.c:188

2244 +#: wt-status.c:185 wt-status.c:189

2245 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"

2246 msgstr " （酌情使用 \"git add/rm <文件>...\" 标记解决方案）"

2247

2248 # 译者：注意保持前导空格

1991 -#: wt-status.c:186

2249 +#: wt-status.c:187

2250 msgid " (use \"git rm <file>...\" to mark resolution)"

2251 msgstr " （使用 \"git rm <文件>...\" 标记解决方案）"

2252

1995 -#: wt-status.c:197 wt-status.c:880

2253 +#: wt-status.c:198 wt-status.c:881

2254 msgid "Changes to be committed:"

2255 msgstr "要提交的变更："

2256

1999 -#: wt-status.c:215 wt-status.c:889

2257 +#: wt-status.c:216 wt-status.c:890

2258 msgid "Changes not staged for commit:"

2259 msgstr "尚未暂存以备提交的变更："

2260

2261 # 译者：注意保持前导空格

2004 -#: wt-status.c:219

2262 +#: wt-status.c:220

2263 msgid " (use \"git add <file>...\" to update what will be committed)"

2264 msgstr " （使用 \"git add <文件>...\" 更新要提交的内容）"

2265

2266 # 译者：注意保持前导空格

2009 -#: wt-status.c:221

2267 +#: wt-status.c:222

2268 msgid " (use \"git add/rm <file>...\" to update what will be committed)"

2269 msgstr " （使用 \"git add/rm <文件>...\" 更新要提交的内容）"

2270

2271 # 译者：注意保持前导空格

2014 -#: wt-status.c:222

2272 +#: wt-status.c:223

2273 msgid ""

2274 " (use \"git checkout -- <file>...\" to discard changes in working directory)"

2275 msgstr " （使用 \"git checkout -- <文件>...\" 丢弃工作区的改动）"

2276

2277 # 译者：注意保持前导空格

2020 -#: wt-status.c:224

2278 +#: wt-status.c:225

2279 msgid " (commit or discard the untracked or modified content in submodules)"

2280 msgstr " （提交或丢弃子模组中未跟踪或修改的内容）"

2281

2282 # 译者：注意保持前导空格

2025 -#: wt-status.c:236

2283 +#: wt-status.c:237

2284 #, c-format

2285 msgid " (use \"git %s <file>...\" to include in what will be committed)"

2286 msgstr " （使用 \"git %s <文件>...\" 以包含要提交的内容）"

2287

2030 -#: wt-status.c:251

2288 +#: wt-status.c:252

2289 msgid "both deleted:"

2290 msgstr "双方删除："

2291

2034 -#: wt-status.c:253

2292 +#: wt-status.c:254

2293 msgid "added by us:"

2294 msgstr "由我们添加："

2295

2038 -#: wt-status.c:255

2296 +#: wt-status.c:256

2297 msgid "deleted by them:"

2298 msgstr "由他们删除："

2299

2042 -#: wt-status.c:257

2300 +#: wt-status.c:258

2301 msgid "added by them:"

2302 msgstr "由他们添加："

2303

2046 -#: wt-status.c:259

2304 +#: wt-status.c:260

2305 msgid "deleted by us:"

2306 msgstr "由我们删除："

2307

2050 -#: wt-status.c:261

2308 +#: wt-status.c:262

2309 msgid "both added:"

2310 msgstr "双方添加："

2311

2054 -#: wt-status.c:263

2312 +#: wt-status.c:264

2313 msgid "both modified:"

2314 msgstr "双方修改："

2315

2058 -#: wt-status.c:265

2316 +#: wt-status.c:266

2317 #, c-format

2318 msgid "bug: unhandled unmerged status %x"

2319 msgstr "bug：无法处理的未合并状态 %x"

2320

2063 -#: wt-status.c:273

2321 +#: wt-status.c:274

2322 msgid "new file:"

2323 msgstr "新文件："

2324

2067 -#: wt-status.c:275

2325 +#: wt-status.c:276

2326 msgid "copied:"

2327 msgstr "拷贝："

2328

2071 -#: wt-status.c:277

2329 +#: wt-status.c:278

2330 msgid "deleted:"

2331 msgstr "删除："

2332

2075 -#: wt-status.c:279

2333 +#: wt-status.c:280

2334 msgid "modified:"

2335 msgstr "修改："

2336

2079 -#: wt-status.c:281

2337 +#: wt-status.c:282

2338 msgid "renamed:"

2339 msgstr "重命名："

2340

2083 -#: wt-status.c:283

2341 +#: wt-status.c:284

2342 msgid "typechange:"

2343 msgstr "类型变更："

2344

2087 -#: wt-status.c:285

2345 +#: wt-status.c:286

2346 msgid "unknown:"

2347 msgstr "未知："

2348

2091 -#: wt-status.c:287

2349 +#: wt-status.c:288

2350 msgid "unmerged:"

2351 msgstr "未合并："

2352

2353 # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字

2096 -#: wt-status.c:369

2354 +#: wt-status.c:370

2355 msgid "new commits, "

2356 msgstr "新提交, "

2357

2358 # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字

2101 -#: wt-status.c:371

2359 +#: wt-status.c:372

2360 msgid "modified content, "

2361 msgstr "修改的内容, "

2362

2363 # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字

2106 -#: wt-status.c:373

2364 +#: wt-status.c:374

2365 msgid "untracked content, "

2366 msgstr "未跟踪的内容, "

2367

2110 -#: wt-status.c:390

2368 +#: wt-status.c:391

2369 #, c-format

2370 msgid "bug: unhandled diff status %c"

2371 msgstr "bug：无法处理的差异状态 %c"

2372

2115 -#: wt-status.c:754

2373 +#: wt-status.c:755

2374 msgid "Submodules changed but not updated:"

2375 msgstr "子模组已修改但尚未更新："

2376

2119 -#: wt-status.c:756

2377 +#: wt-status.c:757

2378 msgid "Submodule changes to be committed:"

2379 msgstr "要提交的子模组变更："

2380

2123 -#: wt-status.c:837

2381 +#: wt-status.c:838

2382 msgid ""

2383 "Do not touch the line above.\n"

2384 "Everything below will be removed."

@@ -2128,44 +2386,44 @@ msgstr ""

2386 "不要改动上面的一行。\n"

2387 "下面的所有内容均将被删除。"

2388

2131 -#: wt-status.c:948

2389 +#: wt-status.c:949

2390 msgid "You have unmerged paths."

2391 msgstr "您有尚未合并的路径。"

2392

2393 # 译者：注意保持前导空格

2136 -#: wt-status.c:951

2394 +#: wt-status.c:952

2395 msgid " (fix conflicts and run \"git commit\")"

2396 msgstr " （解决冲突并运行 \"git commit\"）"

2397

2140 -#: wt-status.c:954

2398 +#: wt-status.c:956

2399 msgid "All conflicts fixed but you are still merging."

2400 msgstr "所有冲突已解决但您仍处于合并中。"

2401

2402 # 译者：注意保持前导空格

2145 -#: wt-status.c:957

2403 +#: wt-status.c:959

2404 msgid " (use \"git commit\" to conclude merge)"

2405 msgstr " （使用 \"git commit\" 结束合并）"

2406

2149 -#: wt-status.c:967

2407 +#: wt-status.c:969

2408 msgid "You are in the middle of an am session."

2409 msgstr "您正处于 am 操作过程中。"

2410

2153 -#: wt-status.c:970

2411 +#: wt-status.c:972

2412 msgid "The current patch is empty."

2413 msgstr "当前的补丁为空。"

2414

2415 # 译者：注意保持前导空格

2158 -#: wt-status.c:974

2416 +#: wt-status.c:976

2417 msgid " (fix conflicts and then run \"git am --continue\")"

2418 msgstr " （解决冲突，然后运行 \"git am --continue\"）"

2419

2420 # 译者：注意保持前导空格

2163 -#: wt-status.c:976

2421 +#: wt-status.c:978

2422 msgid " (use \"git am --skip\" to skip this patch)"

2423 msgstr " （使用 \"git am --skip\" 跳过此补丁）"

2424

2425 # 译者：注意保持前导空格

2168 -#: wt-status.c:978

2426 +#: wt-status.c:980

2427 msgid " (use \"git am --abort\" to restore the original branch)"

2428 msgstr " （使用 \"git am --abort\" 恢复原有分支）"

2429

@@ -2319,43 +2577,43 @@ msgstr "您在执行二分查找操作。"

2577 msgid " (use \"git bisect reset\" to get back to the original branch)"

2578 msgstr " （使用 \"git bisect reset\" 以回到原有分支）"

2579

2322 -#: wt-status.c:1438

2580 +#: wt-status.c:1460

2581 msgid "On branch "

2582 msgstr "位于分支 "

2583

2326 -#: wt-status.c:1444

2584 +#: wt-status.c:1466

2585 msgid "interactive rebase in progress; onto "

2586 msgstr "交互式变基操作正在进行中；至 "

2587

2330 -#: wt-status.c:1446

2588 +#: wt-status.c:1468

2589 msgid "rebase in progress; onto "

2590 msgstr "变基操作正在进行中；至 "

2591

2334 -#: wt-status.c:1451

2592 +#: wt-status.c:1473

2593 msgid "HEAD detached at "

2594 msgstr "头指针分离于 "

2595

2338 -#: wt-status.c:1453

2596 +#: wt-status.c:1475

2597 msgid "HEAD detached from "

2598 msgstr "头指针分离自 "

2599

2342 -#: wt-status.c:1456

2600 +#: wt-status.c:1478

2601 msgid "Not currently on any branch."

2602 msgstr "当前不在任何分支上。"

2603

2346 -#: wt-status.c:1474

2604 +#: wt-status.c:1496

2605 msgid "Initial commit"

2606 msgstr "初始提交"

2607

2350 -#: wt-status.c:1488

2608 +#: wt-status.c:1510

2609 msgid "Untracked files"

2610 msgstr "未跟踪的文件"

2611

2354 -#: wt-status.c:1490

2612 +#: wt-status.c:1512

2613 msgid "Ignored files"

2614 msgstr "忽略的文件"

2615

2358 -#: wt-status.c:1494

2616 +#: wt-status.c:1516

2617 #, c-format

2618 msgid ""

2619 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"

@@ -2365,88 +2623,88 @@ msgstr ""

2623 "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度，\n"

2624 "但您需要小心不要忘了添加新文件（参见 'git help status'）。"

2625

2368 -#: wt-status.c:1500

2626 +#: wt-status.c:1522

2627 #, c-format

2628 msgid "Untracked files not listed%s"

2629 msgstr "未跟踪的文件没有列出%s"

2630

2631 # 译者：中文字符串拼接，可删除前导空格

2374 -#: wt-status.c:1502

2632 +#: wt-status.c:1524

2633 msgid " (use -u option to show untracked files)"

2634 msgstr "（使用 -u 参数显示未跟踪的文件）"

2635

2378 -#: wt-status.c:1508

2636 +#: wt-status.c:1530

2637 msgid "No changes"

2638 msgstr "没有修改"

2639

2382 -#: wt-status.c:1513

2640 +#: wt-status.c:1535

2641 #, c-format

2642 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"

2643 msgstr "修改尚未加入提交（使用 \"git add\" 和/或 \"git commit -a\"）\n"

2644

2387 -#: wt-status.c:1516

2645 +#: wt-status.c:1538

2646 #, c-format

2647 msgid "no changes added to commit\n"

2648 msgstr "修改尚未加入提交\n"

2649

2392 -#: wt-status.c:1519

2650 +#: wt-status.c:1541

2651 #, c-format

2652 msgid ""

2653 "nothing added to commit but untracked files present (use \"git add\" to "

2654 "track)\n"

2655 msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n"

2656

2399 -#: wt-status.c:1522

2657 +#: wt-status.c:1544

2658 #, c-format

2659 msgid "nothing added to commit but untracked files present\n"

2660 msgstr "提交为空，但是存在尚未跟踪的文件\n"

2661

2662 # 译者：中文字符串拼接，可删除前导空格

2405 -#: wt-status.c:1525

2663 +#: wt-status.c:1547

2664 #, c-format

2665 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"

2666 msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n"

2667

2410 -#: wt-status.c:1528 wt-status.c:1533

2668 +#: wt-status.c:1550 wt-status.c:1555

2669 #, c-format

2670 msgid "nothing to commit\n"

2671 msgstr "无文件要提交\n"

2672

2673 # 译者：中文字符串拼接，可删除前导空格

2416 -#: wt-status.c:1531

2674 +#: wt-status.c:1553

2675 #, c-format

2676 msgid "nothing to commit (use -u to show untracked files)\n"

2677 msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n"

2678

2679 # 译者：中文字符串拼接，可删除前导空格

2422 -#: wt-status.c:1535

2680 +#: wt-status.c:1557

2681 #, c-format

2682 msgid "nothing to commit, working directory clean\n"

2683 msgstr "无文件要提交，干净的工作区\n"

2684

2685 # 译者：注意保持句尾空格

2428 -#: wt-status.c:1642

2686 +#: wt-status.c:1664

2687 msgid "Initial commit on "

2688 msgstr "初始提交于 "

2689

2432 -#: wt-status.c:1646

2690 +#: wt-status.c:1668

2691 msgid "HEAD (no branch)"

2692 msgstr "HEAD（非分支）"

2693

2436 -#: wt-status.c:1675

2694 +#: wt-status.c:1697

2695 msgid "gone"

2696 msgstr "丢失"

2697

2698 # 译者：注意保持句尾空格

2441 -#: wt-status.c:1677 wt-status.c:1685

2699 +#: wt-status.c:1699 wt-status.c:1707

2700 msgid "behind "

2701 msgstr "落后 "

2702

2445 -#: wt-status.c:1680 wt-status.c:1683

2703 +#: wt-status.c:1702 wt-status.c:1705

2704 msgid "ahead "

2705 msgstr "领先 "

2706

2449 -#: compat/precompose_utf8.c:57 builtin/clone.c:413

2707 +#: compat/precompose_utf8.c:57 builtin/clone.c:415

2708 #, c-format

2709 msgid "failed to unlink '%s'"

2710 msgstr "无法删除 '%s'"

@@ -2460,7 +2718,7 @@ msgstr "git add [<选项>] [--] <路径规格>..."

2718 msgid "unexpected diff status %c"

2719 msgstr "意外的差异状态 %c"

2720

2463 -#: builtin/add.c:70 builtin/commit.c:278

2721 +#: builtin/add.c:70 builtin/commit.c:280

2722 msgid "updating files failed"

2723 msgstr "更新文件失败"

2724

@@ -2473,7 +2731,7 @@ msgstr "删除 '%s'\n"

2731 msgid "Unstaged changes after refreshing the index:"

2732 msgstr "刷新索引之后尚未被暂存的变更："

2733

2476 -#: builtin/add.c:194 builtin/rev-parse.c:797

2734 +#: builtin/add.c:194 builtin/rev-parse.c:811

2735 msgid "Could not read the index"

2736 msgstr "不能读取索引"

2737

@@ -2509,14 +2767,14 @@ msgid "The following paths are ignored by one of your .gitignore files:\n"

2767 msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n"

2768

2769 #: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111

2512 -#: builtin/prune-packed.c:55 builtin/pull.c:189 builtin/push.c:511

2513 -#: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162

2770 +#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511

2771 +#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162

2772 msgid "dry run"

2773 msgstr "演习"

2774

2517 -#: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19

2518 -#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558

2519 -#: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114

2775 +#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19

2776 +#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557

2777 +#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114

2778 msgid "be verbose"

2779 msgstr "冗长输出"

2780

@@ -2524,7 +2782,7 @@ msgstr "冗长输出"

2782 msgid "interactive picking"

2783 msgstr "交互式拣选"

2784

2527 -#: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286

2785 +#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286

2786 msgid "select hunks interactively"

2787 msgstr "交互式挑选数据块"

2788

@@ -2592,16 +2850,16 @@ msgid "Maybe you wanted to say 'git add .'?\n"

2850 msgstr "也许您想要执行 'git add .'？\n"

2851

2852 #: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914

2595 -#: builtin/commit.c:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298

2596 -#: builtin/submodule--helper.c:35

2853 +#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298

2854 +#: builtin/submodule--helper.c:240

2855 msgid "index file corrupt"

2856 msgstr "索引文件损坏"

2857

2600 -#: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430

2858 +#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430

2859 msgid "Unable to write new index file"

2860 msgstr "无法写入新索引文件"

2861

2604 -#: builtin/am.c:256 builtin/commit.c:738 builtin/merge.c:1078

2862 +#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089

2863 #, c-format

2864 msgid "could not read '%s'"

2865 msgstr "不能读取 '%s'"

@@ -2629,16 +2887,6 @@ msgstr "从 '%s' 拷贝注解到 '%s' 时失败"

2887 msgid "fseek failed"

2888 msgstr "fseek 失败"

2889

2632 -#: builtin/am.c:772 builtin/am.c:860

2633 -#, c-format

2634 -msgid "could not open '%s' for reading: %s"

2635 -msgstr "无法打开 '%s' 进行读取：%s"

2636 -

2637 -#: builtin/am.c:779

2638 -#, c-format

2639 -msgid "could not open '%s' for writing: %s"

2640 -msgstr "无法打开 '%s' 进行写入：%s"

2641 -

2890 #: builtin/am.c:788

2891 #, c-format

2892 msgid "could not parse patch '%s'"

@@ -2648,73 +2896,73 @@ msgstr "无法解析补丁 '%s'"

2896 msgid "Only one StGIT patch series can be applied at once"

2897 msgstr "一次只能有一个 StGIT 补丁队列被应用"

2898

2651 -#: builtin/am.c:901

2899 +#: builtin/am.c:900

2900 msgid "invalid timestamp"

2901 msgstr "无效的时间戳"

2902

2655 -#: builtin/am.c:904 builtin/am.c:912

2903 +#: builtin/am.c:903 builtin/am.c:911

2904 msgid "invalid Date line"

2905 msgstr "无效的日期行"

2906

2659 -#: builtin/am.c:909

2907 +#: builtin/am.c:908

2908 msgid "invalid timezone offset"

2909 msgstr "无效的时区偏移值"

2910

2663 -#: builtin/am.c:996

2911 +#: builtin/am.c:995

2912 msgid "Patch format detection failed."

2913 msgstr "补丁格式检测失败。"

2914

2667 -#: builtin/am.c:1001 builtin/clone.c:378

2915 +#: builtin/am.c:1000 builtin/clone.c:380

2916 #, c-format

2917 msgid "failed to create directory '%s'"

2918 msgstr "无法创建目录 '%s'"

2919

2672 -#: builtin/am.c:1005

2920 +#: builtin/am.c:1004

2921 msgid "Failed to split patches."

2922 msgstr "无法拆分补丁。"

2923

2676 -#: builtin/am.c:1137 builtin/commit.c:363

2924 +#: builtin/am.c:1136 builtin/commit.c:365

2925 msgid "unable to write index file"

2926 msgstr "无法写入索引文件"

2927

2680 -#: builtin/am.c:1188

2928 +#: builtin/am.c:1187

2929 #, c-format

2930 msgid "When you have resolved this problem, run \"%s --continue\"."

2931 msgstr "当您解决这一问题，执行 \"%s --continue\"。"

2932

2685 -#: builtin/am.c:1189

2933 +#: builtin/am.c:1188

2934 #, c-format

2935 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."

2936 msgstr "如果您想要跳过这一补丁，则执行 \"%s --skip\"。"

2937

2690 -#: builtin/am.c:1190

2938 +#: builtin/am.c:1189

2939 #, c-format

2940 msgid "To restore the original branch and stop patching, run \"%s --abort\"."

2941 msgstr "若要复原至原始分支并停止补丁操作，执行 \"%s --abort\"。"

2942

2695 -#: builtin/am.c:1328

2943 +#: builtin/am.c:1327

2944 msgid "Patch is empty. Was it split wrong?"

2945 msgstr "补丁为空。是不是切分错误？"

2946

2699 -#: builtin/am.c:1402 builtin/log.c:1350

2947 +#: builtin/am.c:1401 builtin/log.c:1516

2948 #, c-format

2949 msgid "invalid ident line: %s"

2950 msgstr "包含无效的身份标识：%s"

2951

2704 -#: builtin/am.c:1429

2952 +#: builtin/am.c:1428

2953 #, c-format

2954 msgid "unable to parse commit %s"

2955 msgstr "不能解析提交 %s"

2956

2709 -#: builtin/am.c:1631

2957 +#: builtin/am.c:1630

2958 msgid "Repository lacks necessary blobs to fall back on 3-way merge."

2959 msgstr "仓库缺乏必要的数据对象以进行三方合并。"

2960

2713 -#: builtin/am.c:1633

2961 +#: builtin/am.c:1632

2962 msgid "Using index info to reconstruct a base tree..."

2963 msgstr "使用索引来重建一个（三方合并的）基础目录树..."

2964

2717 -#: builtin/am.c:1652

2965 +#: builtin/am.c:1651

2966 msgid ""

2967 "Did you hand edit your patch?\n"

2968 "It does not apply to blobs recorded in its index."

@@ -2722,37 +2970,37 @@ msgstr ""

2970 "您是否曾手动编辑过您的补丁？\n"

2971 "无法应用补丁到索引中的数据对象上。"

2972

2725 -#: builtin/am.c:1658

2973 +#: builtin/am.c:1657

2974 msgid "Falling back to patching base and 3-way merge..."

2975 msgstr "回落到基础版本上打补丁及进行三方合并..."

2976

2729 -#: builtin/am.c:1673

2977 +#: builtin/am.c:1672

2978 msgid "Failed to merge in the changes."

2979 msgstr "无法合并变更。"

2980

2733 -#: builtin/am.c:1697 builtin/merge.c:633

2981 +#: builtin/am.c:1696 builtin/merge.c:636

2982 msgid "git write-tree failed to write a tree"

2983 msgstr "git write-tree 无法写入一树对象"

2984

2737 -#: builtin/am.c:1704

2985 +#: builtin/am.c:1703

2986 msgid "applying to an empty history"

2987 msgstr "正应用到一个空历史上"

2988

2741 -#: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830

2742 -#: builtin/merge.c:855

2989 +#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841

2990 +#: builtin/merge.c:866

2991 msgid "failed to write commit object"

2992 msgstr "无法写提交对象"

2993

2746 -#: builtin/am.c:1749 builtin/am.c:1753

2994 +#: builtin/am.c:1748 builtin/am.c:1752

2995 #, c-format

2996 msgid "cannot resume: %s does not exist."

2997 msgstr "无法继续：%s 不存在。"

2998

2751 -#: builtin/am.c:1769

2999 +#: builtin/am.c:1768

3000 msgid "cannot be interactive without stdin connected to a terminal."

3001 msgstr "标准输入没有和终端关联，不能进行交互式操作。"

3002

2755 -#: builtin/am.c:1774

3003 +#: builtin/am.c:1773

3004 msgid "Commit Body is:"

3005 msgstr "提交内容为："

3006

@@ -2761,35 +3009,35 @@ msgstr "提交内容为："

3009 #. in your translation. The program will only accept English

3010 #. input at this point.

3011 #.

2764 -#: builtin/am.c:1784

3012 +#: builtin/am.c:1783

3013 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "

3014 msgstr "应用？是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]："

3015

2768 -#: builtin/am.c:1834

3016 +#: builtin/am.c:1833

3017 #, c-format

3018 msgid "Dirty index: cannot apply patches (dirty: %s)"

3019 msgstr "脏索引：不能应用补丁（脏文件：%s）"

3020

2773 -#: builtin/am.c:1869 builtin/am.c:1941

3021 +#: builtin/am.c:1868 builtin/am.c:1940

3022 #, c-format

3023 msgid "Applying: %.*s"

3024 msgstr "应用：%.*s"

3025

2778 -#: builtin/am.c:1885

3026 +#: builtin/am.c:1884

3027 msgid "No changes -- Patch already applied."

3028 msgstr "没有变更 —— 补丁已经应用过。"

3029

2782 -#: builtin/am.c:1893

3030 +#: builtin/am.c:1892

3031 #, c-format

3032 msgid "Patch failed at %s %.*s"

3033 msgstr "打补丁失败于 %s %.*s"

3034

2787 -#: builtin/am.c:1899

3035 +#: builtin/am.c:1898

3036 #, c-format

3037 msgid "The copy of the patch that failed is found in: %s"

3038 msgstr "失败的补丁文件副本位于：%s"

3039

2792 -#: builtin/am.c:1944

3040 +#: builtin/am.c:1943

3041 msgid ""

3042 "No changes - did you forget to use 'git add'?\n"

3043 "If there is nothing left to stage, chances are that something else\n"

@@ -2799,7 +3047,7 @@ msgstr ""

3047 "如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n"

3048 "您也许想要跳过这个补丁。"

3049

2802 -#: builtin/am.c:1951

3050 +#: builtin/am.c:1950

3051 msgid ""

3052 "You still have unmerged paths in your index.\n"

3053 "Did you forget to use 'git add'?"

@@ -2807,168 +3055,170 @@ msgstr ""

3055 "您的索引中仍有未合并的路径。\n"

3056 "您是否忘了执行 'git add'？"

3057

2810 -#: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308

3058 +#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308

3059 #: builtin/reset.c:316

3060 #, c-format

3061 msgid "Could not parse object '%s'."

3062 msgstr "不能解析对象 '%s'。"

3063

2816 -#: builtin/am.c:2111

3064 +#: builtin/am.c:2110

3065 msgid "failed to clean index"

3066 msgstr "无法清空索引"

3067

2820 -#: builtin/am.c:2145

3068 +#: builtin/am.c:2144

3069 msgid ""

3070 "You seem to have moved HEAD since the last 'am' failure.\n"

3071 "Not rewinding to ORIG_HEAD"

3072 msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"

3073

2826 -#: builtin/am.c:2206

3074 +#: builtin/am.c:2205

3075 #, c-format

3076 msgid "Invalid value for --patch-format: %s"

3077 msgstr "无效的 --patch-format 值：%s"

3078

2831 -#: builtin/am.c:2239

3079 +#: builtin/am.c:2238

3080 msgid "git am [<options>] [(<mbox>|<Maildir>)...]"

3081 msgstr "git am [<选项>] [(<mbox>|<Maildir>)...]"

3082

2835 -#: builtin/am.c:2240

3083 +#: builtin/am.c:2239

3084 msgid "git am [<options>] (--continue | --skip | --abort)"

3085 msgstr "git am [<选项>] (--continue | --skip | --abort)"

3086

2839 -#: builtin/am.c:2246

3087 +#: builtin/am.c:2245

3088 msgid "run interactively"

3089 msgstr "以交互式方式运行"

3090

2843 -#: builtin/am.c:2248

3091 +#: builtin/am.c:2247

3092 msgid "historical option -- no-op"

3093 msgstr "老的参数 —— 无作用"

3094

2847 -#: builtin/am.c:2250

3095 +#: builtin/am.c:2249

3096 msgid "allow fall back on 3way merging if needed"

3097 msgstr "如果必要，允许使用三方合并。"

3098

2851 -#: builtin/am.c:2251 builtin/init-db.c:474 builtin/prune-packed.c:57

3099 +#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57

3100 #: builtin/repack.c:171

3101 msgid "be quiet"

3102 msgstr "静默模式"

3103

2856 -#: builtin/am.c:2253

3104 +#: builtin/am.c:2252

3105 msgid "add a Signed-off-by line to the commit message"

3106 msgstr "在提交说明中添加一个 Signed-off-by 签名"

3107

2860 -#: builtin/am.c:2256

3108 +#: builtin/am.c:2255

3109 msgid "recode into utf8 (default)"

3110 msgstr "使用 utf8 字符集（默认）"

3111

2864 -#: builtin/am.c:2258

3112 +#: builtin/am.c:2257

3113 msgid "pass -k flag to git-mailinfo"

3114 msgstr "向 git-mailinfo 传递 -k 参数"

3115

2868 -#: builtin/am.c:2260

3116 +#: builtin/am.c:2259

3117 msgid "pass -b flag to git-mailinfo"

3118 msgstr "向 git-mailinfo 传递 -b 参数"

3119

2872 -#: builtin/am.c:2262

3120 +#: builtin/am.c:2261

3121 msgid "pass -m flag to git-mailinfo"

3122 msgstr "向 git-mailinfo 传递 -m 参数"

3123

2876 -#: builtin/am.c:2264

3124 +#: builtin/am.c:2263

3125 msgid "pass --keep-cr flag to git-mailsplit for mbox format"

3126 msgstr "针对 mbox 格式，向 git-mailsplit 传递 --keep-cr 参数"

3127

2880 -#: builtin/am.c:2267

3128 +#: builtin/am.c:2266

3129 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"

3130 msgstr "不向 git-mailsplit 传递 --keep-cr 参数，覆盖 am.keepcr 的设置"

3131

2884 -#: builtin/am.c:2270

3132 +#: builtin/am.c:2269

3133 msgid "strip everything before a scissors line"

3134 msgstr "丢弃裁切线前的所有内容"

3135

2888 -#: builtin/am.c:2271 builtin/apply.c:4544

3136 +#: builtin/am.c:2270 builtin/apply.c:4546

3137 msgid "action"

3138 msgstr "动作"

3139

2892 -#: builtin/am.c:2272 builtin/am.c:2275 builtin/am.c:2278 builtin/am.c:2281

2893 -#: builtin/am.c:2284 builtin/am.c:2287 builtin/am.c:2290 builtin/am.c:2293

2894 -#: builtin/am.c:2299

3140 +#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280

3141 +#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292

3142 +#: builtin/am.c:2298

3143 msgid "pass it through git-apply"

3144 msgstr "传递给 git-apply"

3145

2898 -#: builtin/am.c:2280 builtin/apply.c:4568

3146 +#: builtin/am.c:2279 builtin/apply.c:4570

3147 msgid "root"

3148 msgstr "根目录"

3149

2902 -#: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506

2903 -#: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95

2904 -#: builtin/pull.c:171 builtin/submodule--helper.c:72

2905 -#: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163

3150 +#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508

3151 +#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95

3152 +#: builtin/pull.c:179 builtin/submodule--helper.c:277

3153 +#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485

3154 +#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767

3155 +#: builtin/submodule--helper.c:770

3156 msgid "path"

3157 msgstr "路径"

3158

2909 -#: builtin/am.c:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669

2910 -#: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131

2911 -#: builtin/pull.c:185 builtin/repack.c:178 builtin/repack.c:182

3159 +#: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669

3160 +#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134

3161 +#: builtin/pull.c:193 builtin/repack.c:178 builtin/repack.c:182

3162 #: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340

3163 #: parse-options.h:132 parse-options.h:134 parse-options.h:244

3164 msgid "n"

3165 msgstr "n"

3166

2917 -#: builtin/am.c:2292 builtin/apply.c:4512

3167 +#: builtin/am.c:2291 builtin/apply.c:4514

3168 msgid "num"

3169 msgstr "数字"

3170

2921 -#: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438

3171 +#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438

3172 #: builtin/tag.c:372

3173 msgid "format"

3174 msgstr "格式"

3175

2926 -#: builtin/am.c:2296

3176 +#: builtin/am.c:2295

3177 msgid "format the patch(es) are in"

3178 msgstr "补丁的格式"

3179

2930 -#: builtin/am.c:2302

3180 +#: builtin/am.c:2301

3181 msgid "override error message when patch failure occurs"

3182 msgstr "打补丁失败时显示的错误信息"

3183

2934 -#: builtin/am.c:2304

3184 +#: builtin/am.c:2303

3185 msgid "continue applying patches after resolving a conflict"

3186 msgstr "冲突解决后继续应用补丁"

3187

2938 -#: builtin/am.c:2307

3188 +#: builtin/am.c:2306

3189 msgid "synonyms for --continue"

3190 msgstr "和 --continue 同义"

3191

2942 -#: builtin/am.c:2310

3192 +#: builtin/am.c:2309

3193 msgid "skip the current patch"

3194 msgstr "跳过当前补丁"

3195

2946 -#: builtin/am.c:2313

3196 +#: builtin/am.c:2312

3197 msgid "restore the original branch and abort the patching operation."

3198 msgstr "恢复原始分支并终止打补丁操作。"

3199

2950 -#: builtin/am.c:2317

3200 +#: builtin/am.c:2316

3201 msgid "lie about committer date"

3202 msgstr "将作者日期作为提交日期"

3203

2954 -#: builtin/am.c:2319

3204 +#: builtin/am.c:2318

3205 msgid "use current timestamp for author date"

3206 msgstr "用当前时间作为作者日期"

3207

2958 -#: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225

2959 -#: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355

3208 +#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228

3209 +#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355

3210 msgid "key-id"

3211 msgstr "key-id"

3212

2963 -#: builtin/am.c:2322

3213 +#: builtin/am.c:2321

3214 msgid "GPG-sign commits"

3215 msgstr "使用 GPG 签名提交"

3216

2967 -#: builtin/am.c:2325

3217 +#: builtin/am.c:2324

3218 msgid "(internal use for git-rebase)"

3219 msgstr "（内部使用，用于 git-rebase）"

3220

2971 -#: builtin/am.c:2340

3221 +#: builtin/am.c:2339

3222 msgid ""

3223 "The -b/--binary option has been a no-op for long time, and\n"

3224 "it will be removed. Please do not use it anymore."

@@ -2976,16 +3226,16 @@ msgstr ""

3226 "参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被移除。\n"

3227 "请不要再使用它了。"

3228

2979 -#: builtin/am.c:2347

3229 +#: builtin/am.c:2346

3230 msgid "failed to read the index"

3231 msgstr "无法读取索引"

3232

2983 -#: builtin/am.c:2362

3233 +#: builtin/am.c:2361

3234 #, c-format

3235 msgid "previous rebase directory %s still exists but mbox given."

3236 msgstr "之前的变基目录 %s 仍然存在，但却提供了 mbox。"

3237

2988 -#: builtin/am.c:2386

3238 +#: builtin/am.c:2385

3239 #, c-format

3240 msgid ""

3241 "Stray %s directory found.\n"

@@ -2994,7 +3244,7 @@ msgstr ""

3244 "发现了错误的 %s 目录。\n"

3245 "使用 \"git am --abort\" 删除它。"

3246

2997 -#: builtin/am.c:2392

3247 +#: builtin/am.c:2391

3248 msgid "Resolve operation not in progress, we are not resuming."

3249 msgstr "解决操作未进行，我们不会继续。"

3250

@@ -3027,37 +3277,37 @@ msgstr "regexec 返回 %d，输入为：%s"

3277 msgid "unable to find filename in patch at line %d"

3278 msgstr "不能在补丁的第 %d 行找到文件名"

3279

3030 -#: builtin/apply.c:940

3280 +#: builtin/apply.c:937

3281 #, c-format

3282 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"

3283 msgstr "git apply：错误的 git-diff - 应为 /dev/null，但在第 %2$d 行得到 %1$s"

3284

3035 -#: builtin/apply.c:944

3285 +#: builtin/apply.c:942

3286 #, c-format

3287 msgid "git apply: bad git-diff - inconsistent new filename on line %d"

3288 msgstr "git apply：错误的 git-diff - 第 %d 行上新文件名不一致"

3289

3040 -#: builtin/apply.c:945

3290 +#: builtin/apply.c:943

3291 #, c-format

3292 msgid "git apply: bad git-diff - inconsistent old filename on line %d"

3293 msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件名不一致"

3294

3045 -#: builtin/apply.c:952

3295 +#: builtin/apply.c:949

3296 #, c-format

3297 msgid "git apply: bad git-diff - expected /dev/null on line %d"

3298 msgstr "git apply：错误的 git-diff - 第 %d 行处应为 /dev/null"

3299

3050 -#: builtin/apply.c:1415

3300 +#: builtin/apply.c:1406

3301 #, c-format

3302 msgid "recount: unexpected line: %.*s"

3303 msgstr "recount：意外的行：%.*s"

3304

3055 -#: builtin/apply.c:1472

3305 +#: builtin/apply.c:1463

3306 #, c-format

3307 msgid "patch fragment without header at line %d: %.*s"

3308 msgstr "第 %d 行的补丁片段没有头信息：%.*s"

3309

3060 -#: builtin/apply.c:1489

3310 +#: builtin/apply.c:1480

3311 #, c-format

3312 msgid ""

3313 "git diff header lacks filename information when removing %d leading pathname "

@@ -3068,77 +3318,77 @@ msgid_plural ""

3318 msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"

3319 msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"

3320

3071 -#: builtin/apply.c:1655

3321 +#: builtin/apply.c:1646

3322 msgid "new file depends on old contents"

3323 msgstr "新文件依赖旧内容"

3324

3075 -#: builtin/apply.c:1657

3325 +#: builtin/apply.c:1648

3326 msgid "deleted file still has contents"

3327 msgstr "删除的文件仍有内容"

3328

3079 -#: builtin/apply.c:1683

3329 +#: builtin/apply.c:1674

3330 #, c-format

3331 msgid "corrupt patch at line %d"

3332 msgstr "补丁在第 %d 行损坏"

3333

3084 -#: builtin/apply.c:1719

3334 +#: builtin/apply.c:1710

3335 #, c-format

3336 msgid "new file %s depends on old contents"

3337 msgstr "新文件 %s 依赖旧内容"

3338

3089 -#: builtin/apply.c:1721

3339 +#: builtin/apply.c:1712

3340 #, c-format

3341 msgid "deleted file %s still has contents"

3342 msgstr "删除的文件 %s 仍有内容"

3343

3094 -#: builtin/apply.c:1724

3344 +#: builtin/apply.c:1715

3345 #, c-format

3346 msgid "** warning: file %s becomes empty but is not deleted"

3347 msgstr "** 警告：文件 %s 成为空文件但并未删除"

3348

3099 -#: builtin/apply.c:1870

3349 +#: builtin/apply.c:1861

3350 #, c-format

3351 msgid "corrupt binary patch at line %d: %.*s"

3352 msgstr "二进制补丁在第 %d 行损坏：%.*s"

3353

3104 -#: builtin/apply.c:1899

3354 +#: builtin/apply.c:1895

3355 #, c-format

3356 msgid "unrecognized binary patch at line %d"

3357 msgstr "未能识别的二进制补丁位于第 %d 行"

3358

3109 -#: builtin/apply.c:2050

3359 +#: builtin/apply.c:2048

3360 #, c-format

3361 msgid "patch with only garbage at line %d"

3362 msgstr "补丁文件的第 %d 行只有垃圾数据"

3363

3114 -#: builtin/apply.c:2140

3364 +#: builtin/apply.c:2138

3365 #, c-format

3366 msgid "unable to read symlink %s"

3367 msgstr "无法读取符号链接 %s"

3368

3119 -#: builtin/apply.c:2144

3369 +#: builtin/apply.c:2142

3370 #, c-format

3371 msgid "unable to open or read %s"

3372 msgstr "不能打开或读取 %s"

3373

3124 -#: builtin/apply.c:2777

3374 +#: builtin/apply.c:2775

3375 #, c-format

3376 msgid "invalid start of line: '%c'"

3377 msgstr "无效的行首字符：'%c'"

3378

3129 -#: builtin/apply.c:2896

3379 +#: builtin/apply.c:2894

3380 #, c-format

3381 msgid "Hunk #%d succeeded at %d (offset %d line)."

3382 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."

3383 msgstr[0] "块 #%d 成功应用于 %d（偏移 %d 行）"

3384 msgstr[1] "块 #%d 成功应用于 %d（偏移 %d 行）"

3385

3136 -#: builtin/apply.c:2908

3386 +#: builtin/apply.c:2906

3387 #, c-format

3388 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"

3389 msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段"

3390

3141 -#: builtin/apply.c:2914

3391 +#: builtin/apply.c:2912

3392 #, c-format

3393 msgid ""

3394 "while searching for:\n"

@@ -3147,319 +3397,329 @@ msgstr ""

3397 "当查询：\n"

3398 "%.*s"

3399

3150 -#: builtin/apply.c:2934

3400 +#: builtin/apply.c:2932

3401 #, c-format

3402 msgid "missing binary patch data for '%s'"

3403 msgstr "缺失 '%s' 的二进制补丁数据"

3404

3155 -#: builtin/apply.c:3035

3405 +#: builtin/apply.c:3033

3406 #, c-format

3407 msgid "binary patch does not apply to '%s'"

3408 msgstr "二进制补丁未应用到 '%s'"

3409

3160 -#: builtin/apply.c:3041

3410 +#: builtin/apply.c:3039

3411 #, c-format

3412 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"

3413 msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）"

3414

3165 -#: builtin/apply.c:3062

3415 +#: builtin/apply.c:3060

3416 #, c-format

3417 msgid "patch failed: %s:%ld"

3418 msgstr "打补丁失败：%s:%ld"

3419

3170 -#: builtin/apply.c:3186

3420 +#: builtin/apply.c:3184

3421 #, c-format

3422 msgid "cannot checkout %s"

3423 msgstr "不能检出 %s"

3424

3175 -#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287

3425 +#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285

3426 #, c-format

3427 msgid "read of %s failed"

3428 msgstr "读取 %s 失败"

3429

3180 -#: builtin/apply.c:3239

3430 +#: builtin/apply.c:3237

3431 #, c-format

3432 msgid "reading from '%s' beyond a symbolic link"

3433 msgstr "读取位于符号链接中的 '%s'"

3434

3185 -#: builtin/apply.c:3267 builtin/apply.c:3489

3435 +#: builtin/apply.c:3265 builtin/apply.c:3487

3436 #, c-format

3437 msgid "path %s has been renamed/deleted"

3438 msgstr "路径 %s 已经被重命名/删除"

3439

3190 -#: builtin/apply.c:3348 builtin/apply.c:3503

3440 +#: builtin/apply.c:3346 builtin/apply.c:3501

3441 #, c-format

3442 msgid "%s: does not exist in index"

3443 msgstr "%s：不存在于索引中"

3444

3195 -#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517

3445 +#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515

3446 #, c-format

3447 msgid "%s: %s"

3448 msgstr "%s：%s"

3449

3200 -#: builtin/apply.c:3357 builtin/apply.c:3511

3450 +#: builtin/apply.c:3355 builtin/apply.c:3509

3451 #, c-format

3452 msgid "%s: does not match index"

3453 msgstr "%s：和索引不匹配"

3454

3205 -#: builtin/apply.c:3459

3455 +#: builtin/apply.c:3457

3456 msgid "removal patch leaves file contents"

3457 msgstr "移除补丁仍留下了文件内容"

3458

3209 -#: builtin/apply.c:3528

3459 +#: builtin/apply.c:3526

3460 #, c-format

3461 msgid "%s: wrong type"

3462 msgstr "%s：错误类型"

3463

3214 -#: builtin/apply.c:3530

3464 +#: builtin/apply.c:3528

3465 #, c-format

3466 msgid "%s has type %o, expected %o"

3467 msgstr "%s 的类型是 %o，应为 %o"

3468

3219 -#: builtin/apply.c:3689 builtin/apply.c:3691

3469 +#: builtin/apply.c:3687 builtin/apply.c:3689

3470 #, c-format

3471 msgid "invalid path '%s'"

3472 msgstr "无效路径 '%s'"

3473

3224 -#: builtin/apply.c:3746

3474 +#: builtin/apply.c:3744

3475 #, c-format

3476 msgid "%s: already exists in index"

3477 msgstr "%s：已经存在于索引中"

3478

3229 -#: builtin/apply.c:3749

3479 +#: builtin/apply.c:3747

3480 #, c-format

3481 msgid "%s: already exists in working directory"

3482 msgstr "%s：已经存在于工作区中"

3483

3234 -#: builtin/apply.c:3769

3484 +#: builtin/apply.c:3767

3485 #, c-format

3486 msgid "new mode (%o) of %s does not match old mode (%o)"

3487 msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配"

3488

3239 -#: builtin/apply.c:3774

3489 +#: builtin/apply.c:3772

3490 #, c-format

3491 msgid "new mode (%o) of %s does not match old mode (%o) of %s"

3492 msgstr "%2$s 的新模式（%1$o）和 %4$s 的旧模式（%3$o）不匹配"

3493

3244 -#: builtin/apply.c:3794

3494 +#: builtin/apply.c:3792

3495 #, c-format

3496 msgid "affected file '%s' is beyond a symbolic link"

3497 msgstr "受影响的文件 '%s' 位于符号链接中"

3498

3249 -#: builtin/apply.c:3798

3499 +#: builtin/apply.c:3796

3500 #, c-format

3501 msgid "%s: patch does not apply"

3502 msgstr "%s：补丁未应用"

3503

3254 -#: builtin/apply.c:3812

3504 +#: builtin/apply.c:3810

3505 #, c-format

3506 msgid "Checking patch %s..."

3507 msgstr "检查补丁 %s..."

3508

3259 -#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135

3509 +#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135

3510 #, c-format

3511 msgid "make_cache_entry failed for path '%s'"

3512 msgstr "对路径 '%s' 的 make_cache_entry 操作失败"

3513

3264 -#: builtin/apply.c:4048

3514 +#: builtin/apply.c:4046

3515 #, c-format

3516 msgid "unable to remove %s from index"

3517 msgstr "不能从索引中移除 %s"

3518

3269 -#: builtin/apply.c:4077

3519 +#: builtin/apply.c:4075

3520 #, c-format

3521 msgid "corrupt patch for submodule %s"

3522 msgstr "子模组 %s 损坏的补丁"

3523

3274 -#: builtin/apply.c:4081

3524 +#: builtin/apply.c:4079

3525 #, c-format

3526 msgid "unable to stat newly created file '%s'"

3527 msgstr "不能枚举新建文件 '%s' 的状态"

3528

3279 -#: builtin/apply.c:4086

3529 +#: builtin/apply.c:4084

3530 #, c-format

3531 msgid "unable to create backing store for newly created file %s"

3532 msgstr "不能为新建文件 %s 创建后端存储"

3533

3284 -#: builtin/apply.c:4089 builtin/apply.c:4197

3534 +#: builtin/apply.c:4087 builtin/apply.c:4195

3535 #, c-format

3536 msgid "unable to add cache entry for %s"

3537 msgstr "无法为 %s 添加缓存条目"

3538

3289 -#: builtin/apply.c:4122

3539 +#: builtin/apply.c:4120

3540 #, c-format

3541 msgid "closing file '%s'"

3542 msgstr "关闭文件 '%s'"

3543

3294 -#: builtin/apply.c:4171

3544 +#: builtin/apply.c:4169

3545 #, c-format

3546 msgid "unable to write file '%s' mode %o"

3547 msgstr "不能写文件 '%s' 权限 %o"

3548

3299 -#: builtin/apply.c:4258

3549 +#: builtin/apply.c:4256

3550 #, c-format

3551 msgid "Applied patch %s cleanly."

3552 msgstr "成功应用补丁 %s。"

3553

3304 -#: builtin/apply.c:4266

3554 +#: builtin/apply.c:4264

3555 msgid "internal error"

3556 msgstr "内部错误"

3557

3308 -#: builtin/apply.c:4269

3558 +#: builtin/apply.c:4267

3559 #, c-format

3560 msgid "Applying patch %%s with %d reject..."

3561 msgid_plural "Applying patch %%s with %d rejects..."

3562 msgstr[0] "应用 %%s 个补丁，其中 %d 个被拒绝..."

3563 msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..."

3564

3315 -#: builtin/apply.c:4279

3565 +#: builtin/apply.c:4277

3566 #, c-format

3567 msgid "truncating .rej filename to %.*s.rej"

3568 msgstr "截短 .rej 文件名为 %.*s.rej"

3569

3320 -#: builtin/apply.c:4300

3570 +#: builtin/apply.c:4285

3571 +#, c-format

3572 +msgid "cannot open %s: %s"

3573 +msgstr "不能打开 %s：%s"

3574 +

3575 +#: builtin/apply.c:4298

3576 #, c-format

3577 msgid "Hunk #%d applied cleanly."

3578 msgstr "第 #%d 个片段成功应用。"

3579

3325 -#: builtin/apply.c:4303

3580 +#: builtin/apply.c:4301

3581 #, c-format

3582 msgid "Rejected hunk #%d."

3583 msgstr "拒绝第 #%d 个片段。"

3584

3330 -#: builtin/apply.c:4393

3585 +#: builtin/apply.c:4387

3586 +#, c-format

3587 +msgid "Skipped patch '%s'."

3588 +msgstr "略过补丁 '%s'。"

3589 +

3590 +#: builtin/apply.c:4395

3591 msgid "unrecognized input"

3592 msgstr "未能识别的输入"

3593

3334 -#: builtin/apply.c:4404

3594 +#: builtin/apply.c:4406

3595 msgid "unable to read index file"

3596 msgstr "无法读取索引文件"

3597

3338 -#: builtin/apply.c:4507

3598 +#: builtin/apply.c:4509

3599 msgid "don't apply changes matching the given path"

3600 msgstr "不要应用与给出路径向匹配的变更"

3601

3342 -#: builtin/apply.c:4510

3602 +#: builtin/apply.c:4512

3603 msgid "apply changes matching the given path"

3604 msgstr "应用与给出路径向匹配的变更"

3605

3346 -#: builtin/apply.c:4513

3606 +#: builtin/apply.c:4515

3607 msgid "remove <num> leading slashes from traditional diff paths"

3608 msgstr "从传统的 diff 路径中移除指定数量的前导斜线"

3609

3350 -#: builtin/apply.c:4516

3610 +#: builtin/apply.c:4518

3611 msgid "ignore additions made by the patch"

3612 msgstr "忽略补丁中的添加的文件"

3613

3354 -#: builtin/apply.c:4518

3614 +#: builtin/apply.c:4520

3615 msgid "instead of applying the patch, output diffstat for the input"

3616 msgstr "不应用补丁，而是显示输入的差异统计（diffstat）"

3617

3358 -#: builtin/apply.c:4522

3618 +#: builtin/apply.c:4524

3619 msgid "show number of added and deleted lines in decimal notation"

3620 msgstr "以十进制数显示添加和删除的行数"

3621

3362 -#: builtin/apply.c:4524

3622 +#: builtin/apply.c:4526

3623 msgid "instead of applying the patch, output a summary for the input"

3624 msgstr "不应用补丁，而是显示输入的概要"

3625

3366 -#: builtin/apply.c:4526

3626 +#: builtin/apply.c:4528

3627 msgid "instead of applying the patch, see if the patch is applicable"

3628 msgstr "不应用补丁，而是查看补丁是否可应用"

3629

3370 -#: builtin/apply.c:4528

3630 +#: builtin/apply.c:4530

3631 msgid "make sure the patch is applicable to the current index"

3632 msgstr "确认补丁可以应用到当前索引"

3633

3374 -#: builtin/apply.c:4530

3634 +#: builtin/apply.c:4532

3635 msgid "apply a patch without touching the working tree"

3636 msgstr "应用补丁而不修改工作区"

3637

3378 -#: builtin/apply.c:4532

3638 +#: builtin/apply.c:4534

3639 msgid "accept a patch that touches outside the working area"

3640 msgstr "接受修改工作区之外文件的补丁"

3641

3382 -#: builtin/apply.c:4534

3642 +#: builtin/apply.c:4536

3643 msgid "also apply the patch (use with --stat/--summary/--check)"

3644 msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）"

3645

3386 -#: builtin/apply.c:4536

3646 +#: builtin/apply.c:4538

3647 msgid "attempt three-way merge if a patch does not apply"

3648 msgstr "如果一个补丁不能应用则尝试三方合并"

3649

3390 -#: builtin/apply.c:4538

3650 +#: builtin/apply.c:4540

3651 msgid "build a temporary index based on embedded index information"

3652 msgstr "创建一个临时索引基于嵌入的索引信息"

3653

3394 -#: builtin/apply.c:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425

3654 +#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425

3655 msgid "paths are separated with NUL character"

3656 msgstr "路径以 NUL 字符分隔"

3657

3398 -#: builtin/apply.c:4543

3658 +#: builtin/apply.c:4545

3659 msgid "ensure at least <n> lines of context match"

3660 msgstr "确保至少匹配 <n> 行上下文"

3661

3402 -#: builtin/apply.c:4545

3662 +#: builtin/apply.c:4547

3663 msgid "detect new or modified lines that have whitespace errors"

3664 msgstr "检查新增和修改的行中间的空白字符滥用"

3665

3406 -#: builtin/apply.c:4548 builtin/apply.c:4551

3666 +#: builtin/apply.c:4550 builtin/apply.c:4553

3667 msgid "ignore changes in whitespace when finding context"

3668 msgstr "查找上下文时忽略空白字符的变更"

3669

3410 -#: builtin/apply.c:4554

3670 +#: builtin/apply.c:4556

3671 msgid "apply the patch in reverse"

3672 msgstr "反向应用补丁"

3673

3414 -#: builtin/apply.c:4556

3674 +#: builtin/apply.c:4558

3675 msgid "don't expect at least one line of context"

3676 msgstr "无需至少一行上下文"

3677

3418 -#: builtin/apply.c:4558

3678 +#: builtin/apply.c:4560

3679 msgid "leave the rejected hunks in corresponding *.rej files"

3680 msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"

3681

3422 -#: builtin/apply.c:4560

3682 +#: builtin/apply.c:4562

3683 msgid "allow overlapping hunks"

3684 msgstr "允许重叠的补丁片段"

3685

3426 -#: builtin/apply.c:4563

3686 +#: builtin/apply.c:4565

3687 msgid "tolerate incorrectly detected missing new-line at the end of file"

3688 msgstr "允许不正确的文件末尾换行符"

3689

3430 -#: builtin/apply.c:4566

3690 +#: builtin/apply.c:4568

3691 msgid "do not trust the line counts in the hunk headers"

3692 msgstr "不信任补丁片段的头信息中的行号"

3693

3434 -#: builtin/apply.c:4569

3694 +#: builtin/apply.c:4571

3695 msgid "prepend <root> to all filenames"

3696 msgstr "为所有文件名前添加 <根目录>"

3697

3438 -#: builtin/apply.c:4591

3698 +#: builtin/apply.c:4593

3699 msgid "--3way outside a repository"

3700 msgstr "--3way 在一个仓库之外"

3701

3442 -#: builtin/apply.c:4599

3702 +#: builtin/apply.c:4601

3703 msgid "--index outside a repository"

3704 msgstr "--index 在一个仓库之外"

3705

3446 -#: builtin/apply.c:4602

3706 +#: builtin/apply.c:4604

3707 msgid "--cached outside a repository"

3708 msgstr "--cached 在一个仓库之外"

3709

3450 -#: builtin/apply.c:4621

3710 +#: builtin/apply.c:4623

3711 #, c-format

3712 msgid "can't open patch '%s'"

3713 msgstr "不能打开补丁 '%s'"

3714

3455 -#: builtin/apply.c:4635

3715 +#: builtin/apply.c:4637

3716 #, c-format

3717 msgid "squelched %d whitespace error"

3718 msgid_plural "squelched %d whitespace errors"

3719 msgstr[0] "抑制下仍有 %d 个空白字符误用"

3720 msgstr[1] "抑制下仍有 %d 个空白字符误用"

3721

3462 -#: builtin/apply.c:4641 builtin/apply.c:4651

3722 +#: builtin/apply.c:4643 builtin/apply.c:4653

3723 #, c-format

3724 msgid "%d line adds whitespace errors."

3725 msgid_plural "%d lines add whitespace errors."

@@ -3525,99 +3785,99 @@ msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"

3785 msgid "Blaming lines"

3786 msgstr "追踪代码行"

3787

3528 -#: builtin/blame.c:2530

3788 +#: builtin/blame.c:2531

3789 msgid "Show blame entries as we find them, incrementally"

3790 msgstr "增量式地显示发现的 blame 条目"

3791

3532 -#: builtin/blame.c:2531

3792 +#: builtin/blame.c:2532

3793 msgid "Show blank SHA-1 for boundary commits (Default: off)"

3794 msgstr "边界提交显示空的 SHA-1（默认：关闭）"

3795

3536 -#: builtin/blame.c:2532

3796 +#: builtin/blame.c:2533

3797 msgid "Do not treat root commits as boundaries (Default: off)"

3798 msgstr "不把根提交作为边界（默认：关闭）"

3799

3540 -#: builtin/blame.c:2533

3800 +#: builtin/blame.c:2534

3801 msgid "Show work cost statistics"

3802 msgstr "显示命令消耗统计"

3803

3544 -#: builtin/blame.c:2534

3804 +#: builtin/blame.c:2535

3805 msgid "Force progress reporting"

3806 msgstr "强制进度显示"

3807

3548 -#: builtin/blame.c:2535

3808 +#: builtin/blame.c:2536

3809 msgid "Show output score for blame entries"

3810 msgstr "显示判断 blame 条目位移的得分诊断信息"

3811

3552 -#: builtin/blame.c:2536

3812 +#: builtin/blame.c:2537

3813 msgid "Show original filename (Default: auto)"

3814 msgstr "显示原始文件名（默认：自动）"

3815

3556 -#: builtin/blame.c:2537

3816 +#: builtin/blame.c:2538

3817 msgid "Show original linenumber (Default: off)"

3818 msgstr "显示原始的行号（默认：关闭）"

3819

3560 -#: builtin/blame.c:2538

3820 +#: builtin/blame.c:2539

3821 msgid "Show in a format designed for machine consumption"

3822 msgstr "显示为一个适合机器读取的格式"

3823

3564 -#: builtin/blame.c:2539

3824 +#: builtin/blame.c:2540

3825 msgid "Show porcelain format with per-line commit information"

3826 msgstr "为每一行显示机器适用的提交信息"

3827

3568 -#: builtin/blame.c:2540

3828 +#: builtin/blame.c:2541

3829 msgid "Use the same output mode as git-annotate (Default: off)"

3830 msgstr "使用和 git-annotate 相同的输出模式（默认：关闭）"

3831

3572 -#: builtin/blame.c:2541

3832 +#: builtin/blame.c:2542

3833 msgid "Show raw timestamp (Default: off)"

3834 msgstr "显示原始时间戳（默认：关闭）"

3835

3576 -#: builtin/blame.c:2542

3836 +#: builtin/blame.c:2543

3837 msgid "Show long commit SHA1 (Default: off)"

3838 msgstr "显示长的 SHA1 提交号（默认：关闭）"

3839

3580 -#: builtin/blame.c:2543

3840 +#: builtin/blame.c:2544

3841 msgid "Suppress author name and timestamp (Default: off)"

3842 msgstr "隐藏作者名字和时间戳（默认：关闭）"

3843

3584 -#: builtin/blame.c:2544

3844 +#: builtin/blame.c:2545

3845 msgid "Show author email instead of name (Default: off)"

3846 msgstr "显示作者的邮箱而不是名字（默认：关闭）"

3847

3588 -#: builtin/blame.c:2545

3848 +#: builtin/blame.c:2546

3849 msgid "Ignore whitespace differences"

3850 msgstr "忽略空白差异"

3851

3592 -#: builtin/blame.c:2546

3852 +#: builtin/blame.c:2547

3853 msgid "Spend extra cycles to find better match"

3854 msgstr "花费额外的循环来找到更好的匹配"

3855

3596 -#: builtin/blame.c:2547

3856 +#: builtin/blame.c:2548

3857 msgid "Use revisions from <file> instead of calling git-rev-list"

3858 msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"

3859

3600 -#: builtin/blame.c:2548

3860 +#: builtin/blame.c:2549

3861 msgid "Use <file>'s contents as the final image"

3862 msgstr "使用 <文件> 的内容作为最终的图片"

3863

3604 -#: builtin/blame.c:2549 builtin/blame.c:2550

3864 +#: builtin/blame.c:2550 builtin/blame.c:2551

3865 msgid "score"

3866 msgstr "得分"

3867

3608 -#: builtin/blame.c:2549

3868 +#: builtin/blame.c:2550

3869 msgid "Find line copies within and across files"

3870 msgstr "找到文件内及跨文件的行拷贝"

3871

3612 -#: builtin/blame.c:2550

3872 +#: builtin/blame.c:2551

3873 msgid "Find line movements within and across files"

3874 msgstr "找到文件内及跨文件的行移动"

3875

3616 -#: builtin/blame.c:2551

3876 +#: builtin/blame.c:2552

3877 msgid "n,m"

3878 msgstr "n,m"

3879

3620 -#: builtin/blame.c:2551

3880 +#: builtin/blame.c:2552

3881 msgid "Process only line range n,m, counting from 1"

3882 msgstr "只处理行范围在 n 和 m 之间的，从 1 开始"

3883

@@ -3627,32 +3887,32 @@ msgstr "只处理行范围在 n 和 m 之间的，从 1 开始"

3887 #. takes 22 places, is the longest among various forms of

3888 #. relative timestamps, but your language may need more or

3889 #. fewer display columns.

3630 -#: builtin/blame.c:2640

3890 +#: builtin/blame.c:2641

3891 msgid "4 years, 11 months ago"

3892 msgstr "4 年 11 个月前"

3893

3634 -#: builtin/branch.c:25

3894 +#: builtin/branch.c:26

3895 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"

3896 msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"

3897

3638 -#: builtin/branch.c:26

3898 +#: builtin/branch.c:27

3899 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"

3900 msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"

3901

3642 -#: builtin/branch.c:27

3902 +#: builtin/branch.c:28

3903 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."

3904 msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."

3905

3646 -#: builtin/branch.c:28

3906 +#: builtin/branch.c:29

3907 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"

3908 msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"

3909

3650 -#: builtin/branch.c:29

3910 +#: builtin/branch.c:30

3911 msgid "git branch [<options>] [-r | -a] [--points-at]"

3912 msgstr "git branch [<选项>] [-r | -a] [--points-at]"

3913

3914 # 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长

3655 -#: builtin/branch.c:142

3915 +#: builtin/branch.c:143

3916 #, c-format

3917 msgid ""

3918 "deleting branch '%s' that has been merged to\n"

@@ -3662,7 +3922,7 @@ msgstr ""

3922 " '%s'，但未合并到 HEAD。"

3923

3924 # 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长

3665 -#: builtin/branch.c:146

3925 +#: builtin/branch.c:147

3926 #, c-format

3927 msgid ""

3928 "not deleting branch '%s' that is not yet merged to\n"

@@ -3671,12 +3931,12 @@ msgstr ""

3931 "并未删除分支 '%s'，虽然它已经合并到 HEAD，\n"

3932 " 然而却尚未被合并到分支 '%s' 。"

3933

3674 -#: builtin/branch.c:160

3934 +#: builtin/branch.c:161

3935 #, c-format

3936 msgid "Couldn't look up commit object for '%s'"

3937 msgstr "无法查询 '%s' 指向的提交对象"

3938

3679 -#: builtin/branch.c:164

3939 +#: builtin/branch.c:165

3940 #, c-format

3941 msgid ""

3942 "The branch '%s' is not fully merged.\n"

@@ -3685,335 +3945,356 @@ msgstr ""

3945 "分支 '%s' 没有完全合并。\n"

3946 "如果您确认要删除它，执行 'git branch -D %s'。"

3947

3688 -#: builtin/branch.c:177

3948 +#: builtin/branch.c:178

3949 msgid "Update of config-file failed"

3950 msgstr "无法更新 config 文件"

3951

3692 -#: builtin/branch.c:205

3952 +#: builtin/branch.c:206

3953 msgid "cannot use -a with -d"

3954 msgstr "不能将 -a 和 -d 同时使用"

3955

3696 -#: builtin/branch.c:211

3956 +#: builtin/branch.c:212

3957 msgid "Couldn't look up commit object for HEAD"

3958 msgstr "无法查询 HEAD 指向的提交对象"

3959

3700 -#: builtin/branch.c:219

3960 +#: builtin/branch.c:226

3961 #, c-format

3702 -msgid "Cannot delete the branch '%s' which you are currently on."

3703 -msgstr "无法删除您当前所在的分支 '%s'。"

3962 +msgid "Cannot delete branch '%s' checked out at '%s'"

3963 +msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。"

3964

3705 -#: builtin/branch.c:235

3965 +#: builtin/branch.c:241

3966 #, c-format

3967 msgid "remote-tracking branch '%s' not found."

3968 msgstr "未能找到远程跟踪分支 '%s'。"

3969

3710 -#: builtin/branch.c:236

3970 +#: builtin/branch.c:242

3971 #, c-format

3972 msgid "branch '%s' not found."

3973 msgstr "分支 '%s' 未发现。"

3974

3715 -#: builtin/branch.c:251

3975 +#: builtin/branch.c:257

3976 #, c-format

3977 msgid "Error deleting remote-tracking branch '%s'"

3978 msgstr "无法删除远程跟踪分支 '%s'"

3979

3720 -#: builtin/branch.c:252

3980 +#: builtin/branch.c:258

3981 #, c-format

3982 msgid "Error deleting branch '%s'"

3983 msgstr "无法删除分支 '%s'"

3984

3725 -#: builtin/branch.c:259

3985 +#: builtin/branch.c:265

3986 #, c-format

3987 msgid "Deleted remote-tracking branch %s (was %s).\n"

3988 msgstr "已删除远程跟踪分支 %s（曾为 %s）。\n"

3989

3730 -#: builtin/branch.c:260

3990 +#: builtin/branch.c:266

3991 #, c-format

3992 msgid "Deleted branch %s (was %s).\n"

3993 msgstr "已删除分支 %s（曾为 %s）。\n"

3994

3735 -#: builtin/branch.c:303

3995 +#: builtin/branch.c:309

3996 #, c-format

3997 msgid "[%s: gone]"

3998 msgstr "[%s: 丢失]"

3999

3740 -#: builtin/branch.c:308

4000 +#: builtin/branch.c:314

4001 #, c-format

4002 msgid "[%s]"

4003 msgstr "[%s]"

4004

3745 -#: builtin/branch.c:313

4005 +#: builtin/branch.c:319

4006 #, c-format

4007 msgid "[%s: behind %d]"

4008 msgstr "[%s：落后 %d]"

4009

3750 -#: builtin/branch.c:315

4010 +#: builtin/branch.c:321

4011 #, c-format

4012 msgid "[behind %d]"

4013 msgstr "[落后 %d]"

4014

3755 -#: builtin/branch.c:319

4015 +#: builtin/branch.c:325

4016 #, c-format

4017 msgid "[%s: ahead %d]"

4018 msgstr "[%s：领先 %d]"

4019

3760 -#: builtin/branch.c:321

4020 +#: builtin/branch.c:327

4021 #, c-format

4022 msgid "[ahead %d]"

4023 msgstr "[领先 %d]"

4024

3765 -#: builtin/branch.c:324

4025 +#: builtin/branch.c:330

4026 #, c-format

4027 msgid "[%s: ahead %d, behind %d]"

4028 msgstr "[%s：领先 %d，落后 %d]"

4029

3770 -#: builtin/branch.c:327

4030 +#: builtin/branch.c:333

4031 #, c-format

4032 msgid "[ahead %d, behind %d]"

4033 msgstr "[领先 %d，落后 %d]"

4034

3775 -#: builtin/branch.c:340

4035 +#: builtin/branch.c:346

4036 msgid " **** invalid ref ****"

4037 msgstr " **** 无效引用 ****"

4038

3779 -#: builtin/branch.c:366

4039 +#: builtin/branch.c:372

4040 #, c-format

4041 msgid "(no branch, rebasing %s)"

4042 msgstr "（非分支，正变基 %s）"

4043

3784 -#: builtin/branch.c:369

4044 +#: builtin/branch.c:375

4045 #, c-format

4046 msgid "(no branch, bisect started on %s)"

4047 msgstr "（非分支，二分查找开始于 %s）"

4048

3789 -#: builtin/branch.c:375

4049 +#. TRANSLATORS: make sure this matches

4050 +#. "HEAD detached at " in wt-status.c

4051 +#: builtin/branch.c:381

4052 #, c-format

4053 msgid "(HEAD detached at %s)"

4054 msgstr "（头指针分离于 %s）"

4055

3794 -#: builtin/branch.c:378

4056 +#. TRANSLATORS: make sure this matches

4057 +#. "HEAD detached from " in wt-status.c

4058 +#: builtin/branch.c:386

4059 #, c-format

4060 msgid "(HEAD detached from %s)"

4061 msgstr "（头指针分离自 %s）"

4062

3799 -#: builtin/branch.c:382

4063 +#: builtin/branch.c:390

4064 msgid "(no branch)"

4065 msgstr "（非分支）"

4066

3803 -#: builtin/branch.c:524

4067 +#: builtin/branch.c:541

4068 +#, c-format

4069 +msgid "Branch %s is being rebased at %s"

4070 +msgstr "分支 %s 正被变基到 %s"

4071 +

4072 +#: builtin/branch.c:545

4073 +#, c-format

4074 +msgid "Branch %s is being bisected at %s"

4075 +msgstr "分支 %s 正被二分查找于 %s"

4076 +

4077 +#: builtin/branch.c:560

4078 msgid "cannot rename the current branch while not on any."

4079 msgstr "无法重命名当前分支因为不处于任何分支上。"

4080

3807 -#: builtin/branch.c:534

4081 +#: builtin/branch.c:570

4082 #, c-format

4083 msgid "Invalid branch name: '%s'"

4084 msgstr "无效的分支名：'%s'"

4085

3812 -#: builtin/branch.c:549

4086 +#: builtin/branch.c:587

4087 msgid "Branch rename failed"

4088 msgstr "分支重命名失败"

4089

3816 -#: builtin/branch.c:553

4090 +#: builtin/branch.c:591

4091 #, c-format

4092 msgid "Renamed a misnamed branch '%s' away"

4093 msgstr "重命名掉一个错误命名的旧分支 '%s'"

4094

3821 -#: builtin/branch.c:557

4095 +#: builtin/branch.c:594

4096 #, c-format

4097 msgid "Branch renamed to %s, but HEAD is not updated!"

4098 msgstr "分支重命名为 %s，但 HEAD 没有更新！"

4099

3826 -#: builtin/branch.c:564

4100 +#: builtin/branch.c:601

4101 msgid "Branch is renamed, but update of config-file failed"

4102 msgstr "分支被重命名，但更新 config 文件失败"

4103

3830 -#: builtin/branch.c:586

3831 -#, c-format

3832 -msgid "could not write branch description template: %s"

3833 -msgstr "不能写分支描述模版：%s"

4104 +#: builtin/branch.c:623

4105 +msgid "could not write branch description template"

4106 +msgstr "不能写分支描述模版"

4107

3835 -#: builtin/branch.c:615

4108 +#: builtin/branch.c:651

4109 msgid "Generic options"

4110 msgstr "通用选项"

4111

3839 -#: builtin/branch.c:617

4112 +#: builtin/branch.c:653

4113 msgid "show hash and subject, give twice for upstream branch"

4114 msgstr "显示哈希值和主题，若参数出现两次则显示上游分支"

4115

3843 -#: builtin/branch.c:618

4116 +#: builtin/branch.c:654

4117 msgid "suppress informational messages"

4118 msgstr "不显示信息"

4119

3847 -#: builtin/branch.c:619

4120 +#: builtin/branch.c:655

4121 msgid "set up tracking mode (see git-pull(1))"

4122 msgstr "设置跟踪模式（参见 git-pull(1)）"

4123

3851 -#: builtin/branch.c:621

4124 +#: builtin/branch.c:657

4125 msgid "change upstream info"

4126 msgstr "改变上游信息"

4127

3855 -#: builtin/branch.c:625

4128 +#: builtin/branch.c:659

4129 +msgid "upstream"

4130 +msgstr "上游"

4131 +

4132 +#: builtin/branch.c:659

4133 +msgid "change the upstream info"

4134 +msgstr "改变上游信息"

4135 +

4136 +#: builtin/branch.c:661

4137 msgid "use colored output"

4138 msgstr "使用彩色输出"

4139

3859 -#: builtin/branch.c:626

4140 +#: builtin/branch.c:662

4141 msgid "act on remote-tracking branches"

4142 msgstr "作用于远程跟踪分支"

4143

3863 -#: builtin/branch.c:628 builtin/branch.c:629

4144 +#: builtin/branch.c:664 builtin/branch.c:665

4145 msgid "print only branches that contain the commit"

4146 msgstr "只打印包含该提交的分支"

4147

3867 -#: builtin/branch.c:632

4148 +#: builtin/branch.c:668

4149 msgid "Specific git-branch actions:"

4150 msgstr "具体的 git-branch 动作："

4151

3871 -#: builtin/branch.c:633

4152 +#: builtin/branch.c:669

4153 msgid "list both remote-tracking and local branches"

4154 msgstr "列出远程跟踪及本地分支"

4155

3875 -#: builtin/branch.c:635

4156 +#: builtin/branch.c:671

4157 msgid "delete fully merged branch"

4158 msgstr "删除完全合并的分支"

4159

3879 -#: builtin/branch.c:636

4160 +#: builtin/branch.c:672

4161 msgid "delete branch (even if not merged)"

4162 msgstr "删除分支（即使没有合并）"

4163

3883 -#: builtin/branch.c:637

4164 +#: builtin/branch.c:673

4165 msgid "move/rename a branch and its reflog"

4166 msgstr "移动/重命名一个分支，以及它的引用日志"

4167

3887 -#: builtin/branch.c:638

4168 +#: builtin/branch.c:674

4169 msgid "move/rename a branch, even if target exists"

4170 msgstr "移动/重命名一个分支，即使目标已存在"

4171

3891 -#: builtin/branch.c:639

4172 +#: builtin/branch.c:675

4173 msgid "list branch names"

4174 msgstr "列出分支名"

4175

3895 -#: builtin/branch.c:640

4176 +#: builtin/branch.c:676

4177 msgid "create the branch's reflog"

4178 msgstr "创建分支的引用日志"

4179

3899 -#: builtin/branch.c:642

4180 +#: builtin/branch.c:678

4181 msgid "edit the description for the branch"

4182 msgstr "标记分支的描述"

4183

3903 -#: builtin/branch.c:643

4184 +#: builtin/branch.c:679

4185 msgid "force creation, move/rename, deletion"

4186 msgstr "强制创建、移动/重命名、删除"

4187

3907 -#: builtin/branch.c:644

4188 +#: builtin/branch.c:680

4189 msgid "print only branches that are merged"

4190 msgstr "只打印已经合并的分支"

4191

3911 -#: builtin/branch.c:645

4192 +#: builtin/branch.c:681

4193 msgid "print only branches that are not merged"

4194 msgstr "只打印尚未合并的分支"

4195

3915 -#: builtin/branch.c:646

4196 +#: builtin/branch.c:682

4197 msgid "list branches in columns"

4198 msgstr "以列的方式显示分支"

4199

3919 -#: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366

4200 +#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366

4201 msgid "key"

4202 msgstr "key"

4203

3923 -#: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367

4204 +#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367

4205 msgid "field name to sort on"

4206 msgstr "排序的字段名"

4207

3927 -#: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401

4208 +#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401

4209 #: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567

4210 #: builtin/tag.c:369

4211 msgid "object"

4212 msgstr "对象"

4213

3933 -#: builtin/branch.c:651

4214 +#: builtin/branch.c:687

4215 msgid "print only branches of the object"

4216 msgstr "只打印指向该对象的分支"

4217

3937 -#: builtin/branch.c:669

4218 +#: builtin/branch.c:705

4219 msgid "Failed to resolve HEAD as a valid ref."

4220 msgstr "无法将 HEAD 解析为有效引用。"

4221

3941 -#: builtin/branch.c:673 builtin/clone.c:705

4222 +#: builtin/branch.c:709 builtin/clone.c:707

4223 msgid "HEAD not found below refs/heads!"

4224 msgstr "HEAD 没有位于 /refs/heads 之下！"

4225

3945 -#: builtin/branch.c:693

4226 +#: builtin/branch.c:729

4227 msgid "--column and --verbose are incompatible"

4228 msgstr "--column 和 --verbose 不兼容"

4229

3949 -#: builtin/branch.c:704 builtin/branch.c:746

4230 +#: builtin/branch.c:740 builtin/branch.c:782

4231 msgid "branch name required"

4232 msgstr "必须提供分支名"

4233

3953 -#: builtin/branch.c:722

4234 +#: builtin/branch.c:758

4235 msgid "Cannot give description to detached HEAD"

4236 msgstr "不能向分离头指针提供描述"

4237

3957 -#: builtin/branch.c:727

4238 +#: builtin/branch.c:763

4239 msgid "cannot edit description of more than one branch"

4240 msgstr "不能为一个以上的分支编辑描述"

4241

3961 -#: builtin/branch.c:734

4242 +#: builtin/branch.c:770

4243 #, c-format

4244 msgid "No commit on branch '%s' yet."

4245 msgstr "分支 '%s' 尚无提交。"

4246

3966 -#: builtin/branch.c:737

4247 +#: builtin/branch.c:773

4248 #, c-format

4249 msgid "No branch named '%s'."

4250 msgstr "没有分支 '%s'。"

4251

3971 -#: builtin/branch.c:752

4252 +#: builtin/branch.c:788

4253 msgid "too many branches for a rename operation"

4254 msgstr "为重命名操作提供了太多的分支名"

4255

3975 -#: builtin/branch.c:757

4256 +#: builtin/branch.c:793

4257 msgid "too many branches to set new upstream"

4258 msgstr "为设置新上游提供了太多的分支名"

4259

3979 -#: builtin/branch.c:761

4260 +#: builtin/branch.c:797

4261 #, c-format

4262 msgid ""

4263 "could not set upstream of HEAD to %s when it does not point to any branch."

4264 msgstr "无法设置 HEAD 的上游为 %s，因为 HEAD 没有指向任何分支。"

4265

3985 -#: builtin/branch.c:764 builtin/branch.c:786 builtin/branch.c:807

4266 +#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843

4267 #, c-format

4268 msgid "no such branch '%s'"

4269 msgstr "没有此分支 '%s'"

4270

3990 -#: builtin/branch.c:768

4271 +#: builtin/branch.c:804

4272 #, c-format

4273 msgid "branch '%s' does not exist"

4274 msgstr "分支 '%s' 不存在"

4275

3995 -#: builtin/branch.c:780

4276 +#: builtin/branch.c:816

4277 msgid "too many branches to unset upstream"

4278 msgstr "为取消上游设置操作提供了太多的分支名"

4279

3999 -#: builtin/branch.c:784

4280 +#: builtin/branch.c:820

4281 msgid "could not unset upstream of HEAD when it does not point to any branch."

4282 msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"

4283

4003 -#: builtin/branch.c:790

4284 +#: builtin/branch.c:826

4285 #, c-format

4286 msgid "Branch '%s' has no upstream information"

4287 msgstr "分支 '%s' 没有上游信息"

4288

4008 -#: builtin/branch.c:804

4289 +#: builtin/branch.c:840

4290 msgid "it does not make sense to create 'HEAD' manually"

4291 msgstr "手工创建 'HEAD' 没有意义"

4292

4012 -#: builtin/branch.c:810

4293 +#: builtin/branch.c:846

4294 msgid "-a and -r options to 'git branch' do not make sense with a branch name"

4295 msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"

4296

4016 -#: builtin/branch.c:813

4297 +#: builtin/branch.c:849

4298 #, c-format

4299 msgid ""

4300 "The --set-upstream flag is deprecated and will be removed. Consider using --"

@@ -4021,7 +4302,7 @@ msgid ""

4302 msgstr ""

4303 "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"

4304

4024 -#: builtin/branch.c:830

4305 +#: builtin/branch.c:866

4306 #, c-format

4307 msgid ""

4308 "\n"

@@ -4032,16 +4313,6 @@ msgstr ""

4313 "如果你想用 '%s' 跟踪 '%s', 这么做：\n"

4314 "\n"

4315

4035 -#: builtin/branch.c:831

4036 -#, c-format

4037 -msgid " git branch -d %s\n"

4038 -msgstr " git branch -d %s\n"

4039 -

4040 -#: builtin/branch.c:832

4041 -#, c-format

4042 -msgid " git branch --set-upstream-to %s\n"

4043 -msgstr " git branch --set-upstream-to %s\n"

4044 -

4316 #: builtin/bundle.c:51

4317 #, c-format

4318 msgid "%s is okay\n"

@@ -4139,7 +4410,7 @@ msgstr "从标准输入读出文件名"

4410 msgid "terminate input and output records by a NUL character"

4411 msgstr "输入和输出的记录使用 NUL 字符终结"

4412

4142 -#: builtin/check-ignore.c:18 builtin/checkout.c:1136 builtin/gc.c:325

4413 +#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325

4414 msgid "suppress progress reporting"

4415 msgstr "不显示进度报告"

4416

@@ -4229,8 +4500,9 @@ msgid "write the content to temporary files"

4500 msgstr "将内容写入临时文件"

4501

4502 #: builtin/checkout-index.c:174 builtin/column.c:30

4232 -#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169

4233 -#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175

4503 +#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494

4504 +#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500

4505 +#: builtin/submodule--helper.c:774

4506 msgid "string"

4507 msgstr "字符串"

4508

@@ -4280,80 +4552,80 @@ msgstr "path '%s'：无法合并"

4552 msgid "Unable to add merge result for '%s'"

4553 msgstr "无法为 '%s' 添加合并结果"

4554

4283 -#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257

4284 -#: builtin/checkout.c:260

4555 +#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256

4556 +#: builtin/checkout.c:259

4557 #, c-format

4558 msgid "'%s' cannot be used with updating paths"

4559 msgstr "'%s' 不能在更新路径时使用"

4560

4289 -#: builtin/checkout.c:263 builtin/checkout.c:266

4561 +#: builtin/checkout.c:262 builtin/checkout.c:265

4562 #, c-format

4563 msgid "'%s' cannot be used with %s"

4564 msgstr "'%s' 不能和 %s 同时使用"

4565

4294 -#: builtin/checkout.c:269

4566 +#: builtin/checkout.c:268

4567 #, c-format

4568 msgid "Cannot update paths and switch to branch '%s' at the same time."

4569 msgstr "不能同时更新路径并切换到分支'%s'。"

4570

4299 -#: builtin/checkout.c:280 builtin/checkout.c:474

4571 +#: builtin/checkout.c:279 builtin/checkout.c:473

4572 msgid "corrupt index file"

4573 msgstr "损坏的索引文件"

4574

4303 -#: builtin/checkout.c:340 builtin/checkout.c:347

4575 +#: builtin/checkout.c:339 builtin/checkout.c:346

4576 #, c-format

4577 msgid "path '%s' is unmerged"

4578 msgstr "路径 '%s' 未合并"

4579

4308 -#: builtin/checkout.c:496

4580 +#: builtin/checkout.c:495

4581 msgid "you need to resolve your current index first"

4582 msgstr "您需要先解决当前索引的冲突"

4583

4312 -#: builtin/checkout.c:623

4584 +#: builtin/checkout.c:622

4585 #, c-format

4586 msgid "Can not do reflog for '%s': %s\n"

4587 msgstr "不能对 '%s' 执行 reflog 操作：%s\n"

4588

4317 -#: builtin/checkout.c:661

4589 +#: builtin/checkout.c:660

4590 msgid "HEAD is now at"

4591 msgstr "HEAD 目前位于"

4592

4321 -#: builtin/checkout.c:665 builtin/clone.c:659

4593 +#: builtin/checkout.c:664 builtin/clone.c:661

4594 msgid "unable to update HEAD"

4595 msgstr "不能更新 HEAD"

4596

4325 -#: builtin/checkout.c:669

4597 +#: builtin/checkout.c:668

4598 #, c-format

4599 msgid "Reset branch '%s'\n"

4600 msgstr "重置分支 '%s'\n"

4601

4330 -#: builtin/checkout.c:672

4602 +#: builtin/checkout.c:671

4603 #, c-format

4604 msgid "Already on '%s'\n"

4605 msgstr "已经位于 '%s'\n"

4606

4335 -#: builtin/checkout.c:676

4607 +#: builtin/checkout.c:675

4608 #, c-format

4609 msgid "Switched to and reset branch '%s'\n"

4610 msgstr "切换并重置分支 '%s'\n"

4611

4340 -#: builtin/checkout.c:678 builtin/checkout.c:1068

4612 +#: builtin/checkout.c:677 builtin/checkout.c:1067

4613 #, c-format

4614 msgid "Switched to a new branch '%s'\n"

4615 msgstr "切换到一个新分支 '%s'\n"

4616

4345 -#: builtin/checkout.c:680

4617 +#: builtin/checkout.c:679

4618 #, c-format

4619 msgid "Switched to branch '%s'\n"

4620 msgstr "切换到分支 '%s'\n"

4621

4622 # 译者：注意保持前导空格

4351 -#: builtin/checkout.c:732

4623 +#: builtin/checkout.c:731

4624 #, c-format

4625 msgid " ... and %d more.\n"

4626 msgstr " ... 及其它 %d 个。\n"

4627

4356 -#: builtin/checkout.c:738

4628 +#: builtin/checkout.c:737

4629 #, c-format

4630 msgid ""

4631 "Warning: you are leaving %d commit behind, not connected to\n"

@@ -4374,7 +4646,7 @@ msgstr[1] ""

4646 "\n"

4647 "%s\n"

4648

4377 -#: builtin/checkout.c:757

4649 +#: builtin/checkout.c:756

4650 #, c-format

4651 msgid ""

4652 "If you want to keep it by creating a new branch, this may be a good time\n"

@@ -4401,150 +4673,150 @@ msgstr[1] ""

4673 " git branch <新分支名> %s\n"

4674 "\n"

4675

4404 -#: builtin/checkout.c:793

4676 +#: builtin/checkout.c:792

4677 msgid "internal error in revision walk"

4678 msgstr "在版本遍历时遇到内部错误"

4679

4408 -#: builtin/checkout.c:797

4680 +#: builtin/checkout.c:796

4681 msgid "Previous HEAD position was"

4682 msgstr "之前的 HEAD 位置是"

4683

4412 -#: builtin/checkout.c:824 builtin/checkout.c:1063

4684 +#: builtin/checkout.c:823 builtin/checkout.c:1062

4685 msgid "You are on a branch yet to be born"

4686 msgstr "您位于一个尚未初始化的分支"

4687

4416 -#: builtin/checkout.c:969

4688 +#: builtin/checkout.c:968

4689 #, c-format

4690 msgid "only one reference expected, %d given."

4691 msgstr "只要一个引用，却给出了 %d 个"

4692

4421 -#: builtin/checkout.c:1009 builtin/worktree.c:211

4693 +#: builtin/checkout.c:1008 builtin/worktree.c:212

4694 #, c-format

4695 msgid "invalid reference: %s"

4696 msgstr "无效引用：%s"

4697

4426 -#: builtin/checkout.c:1038

4698 +#: builtin/checkout.c:1037

4699 #, c-format

4700 msgid "reference is not a tree: %s"

4701 msgstr "引用不是一个树：%s"

4702

4431 -#: builtin/checkout.c:1077

4703 +#: builtin/checkout.c:1076

4704 msgid "paths cannot be used with switching branches"

4705 msgstr "路径不能和切换分支同时使用"

4706

4435 -#: builtin/checkout.c:1080 builtin/checkout.c:1084

4707 +#: builtin/checkout.c:1079 builtin/checkout.c:1083

4708 #, c-format

4709 msgid "'%s' cannot be used with switching branches"

4710 msgstr "'%s' 不能和切换分支同时使用"

4711

4440 -#: builtin/checkout.c:1088 builtin/checkout.c:1091 builtin/checkout.c:1096

4441 -#: builtin/checkout.c:1099

4712 +#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095

4713 +#: builtin/checkout.c:1098

4714 #, c-format

4715 msgid "'%s' cannot be used with '%s'"

4716 msgstr "'%s' 不能和 '%s' 同时使用"

4717

4446 -#: builtin/checkout.c:1104

4718 +#: builtin/checkout.c:1103

4719 #, c-format

4720 msgid "Cannot switch branch to a non-commit '%s'"

4721 msgstr "不能切换分支到一个非提交 '%s'"

4722

4451 -#: builtin/checkout.c:1137 builtin/checkout.c:1139 builtin/clone.c:84

4452 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318

4453 -#: builtin/worktree.c:320

4723 +#: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88

4724 +#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323

4725 +#: builtin/worktree.c:325

4726 msgid "branch"

4727 msgstr "分支"

4728

4457 -#: builtin/checkout.c:1138

4729 +#: builtin/checkout.c:1137

4730 msgid "create and checkout a new branch"

4731 msgstr "创建并检出一个新的分支"

4732

4461 -#: builtin/checkout.c:1140

4733 +#: builtin/checkout.c:1139

4734 msgid "create/reset and checkout a branch"

4735 msgstr "创建/重置并检出一个分支"

4736

4465 -#: builtin/checkout.c:1141

4737 +#: builtin/checkout.c:1140

4738 msgid "create reflog for new branch"

4739 msgstr "为新的分支创建引用日志"

4740

4469 -#: builtin/checkout.c:1142

4741 +#: builtin/checkout.c:1141

4742 msgid "detach the HEAD at named commit"

4743 msgstr "成为指向该提交的分离头指针"

4744

4473 -#: builtin/checkout.c:1143

4745 +#: builtin/checkout.c:1142

4746 msgid "set upstream info for new branch"

4747 msgstr "为新的分支设置上游信息"

4748

4477 -#: builtin/checkout.c:1145

4749 +#: builtin/checkout.c:1144

4750 msgid "new-branch"

4751 msgstr "新分支"

4752

4481 -#: builtin/checkout.c:1145

4753 +#: builtin/checkout.c:1144

4754 msgid "new unparented branch"

4755 msgstr "新的没有父提交的分支"

4756

4485 -#: builtin/checkout.c:1146

4757 +#: builtin/checkout.c:1145

4758 msgid "checkout our version for unmerged files"

4759 msgstr "对尚未合并的文件检出我们的版本"

4760

4489 -#: builtin/checkout.c:1148

4761 +#: builtin/checkout.c:1147

4762 msgid "checkout their version for unmerged files"

4763 msgstr "对尚未合并的文件检出他们的版本"

4764

4493 -#: builtin/checkout.c:1150

4765 +#: builtin/checkout.c:1149

4766 msgid "force checkout (throw away local modifications)"

4767 msgstr "强制检出（丢弃本地修改）"

4768

4497 -#: builtin/checkout.c:1151

4769 +#: builtin/checkout.c:1150

4770 msgid "perform a 3-way merge with the new branch"

4771 msgstr "和新的分支执行三方合并"

4772

4501 -#: builtin/checkout.c:1152 builtin/merge.c:227

4773 +#: builtin/checkout.c:1151 builtin/merge.c:230

4774 msgid "update ignored files (default)"

4775 msgstr "更新忽略的文件（默认）"

4776

4505 -#: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250

4777 +#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250

4778 msgid "style"

4779 msgstr "风格"

4780

4509 -#: builtin/checkout.c:1154

4781 +#: builtin/checkout.c:1153

4782 msgid "conflict style (merge or diff3)"

4783 msgstr "冲突输出风格（merge 或 diff3）"

4784

4513 -#: builtin/checkout.c:1157

4785 +#: builtin/checkout.c:1156

4786 msgid "do not limit pathspecs to sparse entries only"

4787 msgstr "对路径不做稀疏检出的限制"

4788

4517 -#: builtin/checkout.c:1159

4789 +#: builtin/checkout.c:1158

4790 msgid "second guess 'git checkout <no-such-branch>'"

4791 msgstr "二次猜测'git checkout <无此分支>'"

4792

4521 -#: builtin/checkout.c:1161

4793 +#: builtin/checkout.c:1160

4794 msgid "do not check if another worktree is holding the given ref"

4795 msgstr "不检查指定的引用是否被其他工作区所占用"

4796

4525 -#: builtin/checkout.c:1162 builtin/clone.c:58 builtin/fetch.c:116

4526 -#: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526

4797 +#: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116

4798 +#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526

4799 #: builtin/send-pack.c:168

4800 msgid "force progress reporting"

4801 msgstr "强制显示进度报告"

4802

4531 -#: builtin/checkout.c:1193

4803 +#: builtin/checkout.c:1192

4804 msgid "-b, -B and --orphan are mutually exclusive"

4805 msgstr "-b、-B 和 --orphan 是互斥的"

4806

4535 -#: builtin/checkout.c:1210

4807 +#: builtin/checkout.c:1209

4808 msgid "--track needs a branch name"

4809 msgstr "--track 需要一个分支名"

4810

4539 -#: builtin/checkout.c:1215

4811 +#: builtin/checkout.c:1214

4812 msgid "Missing branch name; try -b"

4813 msgstr "缺少分支名；尝试 -b"

4814

4543 -#: builtin/checkout.c:1251

4815 +#: builtin/checkout.c:1250

4816 msgid "invalid path specification"

4817 msgstr "无效的路径规格"

4818

4547 -#: builtin/checkout.c:1258

4819 +#: builtin/checkout.c:1257

4820 #, c-format

4821 msgid ""

4822 "Cannot update paths and switch to branch '%s' at the same time.\n"

@@ -4553,12 +4825,12 @@ msgstr ""

4825 "不能同时更新路径并切换到分支'%s'。\n"

4826 "您是想要检出 '%s' 但其未能解析为提交么？"

4827

4556 -#: builtin/checkout.c:1263

4828 +#: builtin/checkout.c:1262

4829 #, c-format

4830 msgid "git checkout: --detach does not take a path argument '%s'"

4831 msgstr "git checkout：--detach 不能接收路径参数 '%s'"

4832

4561 -#: builtin/checkout.c:1267

4833 +#: builtin/checkout.c:1266

4834 msgid ""

4835 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"

4836 "checking out of the index."

@@ -4709,8 +4981,8 @@ msgstr "交互式清除"

4981 msgid "remove whole directories"

4982 msgstr "删除整个目录"

4983

4712 -#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:722

4713 -#: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182

4984 +#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724

4985 +#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182

4986 msgid "pattern"

4987 msgstr "模式"

4988

@@ -4748,104 +5020,113 @@ msgstr ""

5020 msgid "git clone [<options>] [--] <repo> [<dir>]"

5021 msgstr "git clone [<选项>] [--] <仓库> [<路径>]"

5022

4751 -#: builtin/clone.c:60

5023 +#: builtin/clone.c:62

5024 msgid "don't create a checkout"

5025 msgstr "不创建一个检出"

5026

4755 -#: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469

5027 +#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473

5028 msgid "create a bare repository"

5029 msgstr "创建一个纯仓库"

5030

4759 -#: builtin/clone.c:65

5031 +#: builtin/clone.c:67

5032 msgid "create a mirror repository (implies bare)"

5033 msgstr "创建一个镜像仓库（也是纯仓库）"

5034

4763 -#: builtin/clone.c:67

5035 +#: builtin/clone.c:69

5036 msgid "to clone from a local repository"

5037 msgstr "从本地仓库克隆"

5038

4767 -#: builtin/clone.c:69

5039 +#: builtin/clone.c:71

5040 msgid "don't use local hardlinks, always copy"

5041 msgstr "不使用本地硬链接，始终复制"

5042

4771 -#: builtin/clone.c:71

5043 +#: builtin/clone.c:73

5044 msgid "setup as shared repository"

5045 msgstr "设置为共享仓库"

5046

4775 -#: builtin/clone.c:73 builtin/clone.c:75

5047 +#: builtin/clone.c:75 builtin/clone.c:77

5048 msgid "initialize submodules in the clone"

5049 msgstr "在克隆时初始化子模组"

5050

4779 -#: builtin/clone.c:76 builtin/init-db.c:466

5051 +#: builtin/clone.c:79

5052 +msgid "number of submodules cloned in parallel"

5053 +msgstr "并发克隆的子模组的数量"

5054 +

5055 +#: builtin/clone.c:80 builtin/init-db.c:470

5056 msgid "template-directory"

5057 msgstr "模板目录"

5058

4783 -#: builtin/clone.c:77 builtin/init-db.c:467

5059 +#: builtin/clone.c:81 builtin/init-db.c:471

5060 msgid "directory from which templates will be used"

5061 msgstr "模板目录将被使用"

5062

4787 -#: builtin/clone.c:79 builtin/submodule--helper.c:173

5063 +#: builtin/clone.c:83 builtin/submodule--helper.c:498

5064 +#: builtin/submodule--helper.c:777

5065 msgid "reference repository"

5066 msgstr "参考仓库"

5067

4791 -#: builtin/clone.c:81

5068 +#: builtin/clone.c:85

5069 msgid "use --reference only while cloning"

5070 msgstr "仅在克隆时参考 --reference 指向的本地仓库"

5071

4795 -#: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44

5072 +#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44

5073 msgid "name"

5074 msgstr "名称"

5075

4799 -#: builtin/clone.c:83

5076 +#: builtin/clone.c:87

5077 msgid "use <name> instead of 'origin' to track upstream"

5078 msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"

5079

4803 -#: builtin/clone.c:85

5080 +#: builtin/clone.c:89

5081 msgid "checkout <branch> instead of the remote's HEAD"

5082 msgstr "检出 <分支> 而不是远程 HEAD"

5083

4807 -#: builtin/clone.c:87

5084 +#: builtin/clone.c:91

5085 msgid "path to git-upload-pack on the remote"

5086 msgstr "远程 git-upload-pack 路径"

5087

4811 -#: builtin/clone.c:88 builtin/fetch.c:117 builtin/grep.c:665

4812 -#: builtin/pull.c:193

5088 +#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667

5089 +#: builtin/pull.c:201

5090 msgid "depth"

5091 msgstr "深度"

5092

4816 -#: builtin/clone.c:89

5093 +#: builtin/clone.c:93

5094 msgid "create a shallow clone of that depth"

5095 msgstr "创建一个指定深度的浅克隆"

5096

4820 -#: builtin/clone.c:91

5097 +#: builtin/clone.c:95

5098 msgid "clone only one branch, HEAD or --branch"

5099 msgstr "只克隆一个分支、HEAD 或 --branch"

5100

4824 -#: builtin/clone.c:92 builtin/init-db.c:475

5101 +#: builtin/clone.c:97

5102 +msgid "any cloned submodules will be shallow"

5103 +msgstr "子模组将以浅下载模式克隆"

5104 +

5105 +#: builtin/clone.c:98 builtin/init-db.c:479

5106 msgid "gitdir"

5107 msgstr "git目录"

5108

4828 -#: builtin/clone.c:93 builtin/init-db.c:476

5109 +#: builtin/clone.c:99 builtin/init-db.c:480

5110 msgid "separate git dir from working tree"

5111 msgstr "git目录和工作区分离"

5112

4832 -#: builtin/clone.c:94

5113 +#: builtin/clone.c:100

5114 msgid "key=value"

5115 msgstr "key=value"

5116

4836 -#: builtin/clone.c:95

5117 +#: builtin/clone.c:101

5118 msgid "set config inside the new repository"

5119 msgstr "在新仓库中设置配置信息"

5120

4840 -#: builtin/clone.c:96 builtin/fetch.c:131 builtin/push.c:536

5121 +#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536

5122 msgid "use IPv4 addresses only"

5123 msgstr "只使用 IPv4 地址"

5124

4844 -#: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538

5125 +#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538

5126 msgid "use IPv6 addresses only"

5127 msgstr "只使用 IPv6 地址"

5128

4848 -#: builtin/clone.c:239

5129 +#: builtin/clone.c:241

5130 msgid ""

5131 "No directory name could be guessed.\n"

5132 "Please specify a directory on the command line"

@@ -4853,57 +5134,52 @@ msgstr ""

5134 "无法猜到目录名。\n"

5135 "请在命令行指定一个目录"

5136

4856 -#: builtin/clone.c:305

5137 +#: builtin/clone.c:307

5138 #, c-format

5139 msgid "reference repository '%s' as a linked checkout is not supported yet."

5140 msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"

5141

4861 -#: builtin/clone.c:307

5142 +#: builtin/clone.c:309

5143 #, c-format

5144 msgid "reference repository '%s' is not a local repository."

5145 msgstr "参考仓库 '%s' 不是一个本地仓库。"

5146

4866 -#: builtin/clone.c:312

5147 +#: builtin/clone.c:314

5148 #, c-format

5149 msgid "reference repository '%s' is shallow"

5150 msgstr "参考仓库 '%s' 是一个浅克隆"

5151

4871 -#: builtin/clone.c:315

5152 +#: builtin/clone.c:317

5153 #, c-format

5154 msgid "reference repository '%s' is grafted"

5155 msgstr "参考仓库 '%s' 已被嫁接"

5156

4876 -#: builtin/clone.c:380 builtin/diff.c:84

4877 -#, c-format

4878 -msgid "failed to stat '%s'"

4879 -msgstr "无法枚举 '%s' 状态"

4880 -

4881 -#: builtin/clone.c:382

5157 +#: builtin/clone.c:384

5158 #, c-format

5159 msgid "%s exists and is not a directory"

5160 msgstr "%s 存在且不是一个目录"

5161

4886 -#: builtin/clone.c:396

5162 +#: builtin/clone.c:398

5163 #, c-format

5164 msgid "failed to stat %s\n"

5165 msgstr "无法枚举 %s 状态\n"

5166

4891 -#: builtin/clone.c:418

5167 +#: builtin/clone.c:420

5168 #, c-format

5169 msgid "failed to create link '%s'"

5170 msgstr "无法创建链接 '%s'"

5171

4896 -#: builtin/clone.c:422

5172 +#: builtin/clone.c:424

5173 #, c-format

5174 msgid "failed to copy file to '%s'"

5175 msgstr "无法拷贝文件至 '%s'"

5176

4901 -#: builtin/clone.c:447 builtin/clone.c:631

5177 +#: builtin/clone.c:449 builtin/clone.c:633

5178 #, c-format

5179 msgid "done.\n"

5180 msgstr "完成。\n"

5181

4906 -#: builtin/clone.c:459

5182 +#: builtin/clone.c:461

5183 msgid ""

5184 "Clone succeeded, but checkout failed.\n"

5185 "You can inspect what was checked out with 'git status'\n"

@@ -4913,126 +5189,126 @@ msgstr ""

5189 "您可以通过 'git status' 检查哪些已被检出，然后使用命令\n"

5190 "'git checkout -f HEAD' 重试\n"

5191

4916 -#: builtin/clone.c:536

5192 +#: builtin/clone.c:538

5193 #, c-format

5194 msgid "Could not find remote branch %s to clone."

5195 msgstr "不能发现要克隆的远程分支 %s。"

5196

4921 -#: builtin/clone.c:626

5197 +#: builtin/clone.c:628

5198 #, c-format

5199 msgid "Checking connectivity... "

5200 msgstr "检查连接... "

5201

4926 -#: builtin/clone.c:629

5202 +#: builtin/clone.c:631

5203 msgid "remote did not send all necessary objects"

5204 msgstr "远程没有发送所有必须的对象"

5205

4930 -#: builtin/clone.c:647

5206 +#: builtin/clone.c:649

5207 #, c-format

5208 msgid "unable to update %s"

5209 msgstr "不能更新 %s"

5210

4935 -#: builtin/clone.c:696

5211 +#: builtin/clone.c:698

5212 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"

5213 msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n"

5214

4939 -#: builtin/clone.c:727

5215 +#: builtin/clone.c:729

5216 msgid "unable to checkout working tree"

5217 msgstr "不能检出工作区"

5218

4943 -#: builtin/clone.c:753

5219 +#: builtin/clone.c:767

5220 msgid "unable to write parameters to config file"

5221 msgstr "无法将参数写入配置文件"

5222

4947 -#: builtin/clone.c:816

5223 +#: builtin/clone.c:830

5224 msgid "cannot repack to clean up"

5225 msgstr "无法执行 repack 来清理"

5226

4951 -#: builtin/clone.c:818

5227 +#: builtin/clone.c:832

5228 msgid "cannot unlink temporary alternates file"

5229 msgstr "无法删除临时的 alternates 文件"

5230

4955 -#: builtin/clone.c:850

5231 +#: builtin/clone.c:864 builtin/receive-pack.c:1731

5232 msgid "Too many arguments."

5233 msgstr "太多参数。"

5234

4959 -#: builtin/clone.c:854

5235 +#: builtin/clone.c:868

5236 msgid "You must specify a repository to clone."

5237 msgstr "您必须指定一个仓库来克隆。"

5238

4963 -#: builtin/clone.c:865

5239 +#: builtin/clone.c:879

5240 #, c-format

5241 msgid "--bare and --origin %s options are incompatible."

5242 msgstr "--bare 和 --origin %s 选项不兼容。"

5243

4968 -#: builtin/clone.c:868

5244 +#: builtin/clone.c:882

5245 msgid "--bare and --separate-git-dir are incompatible."

5246 msgstr "--bare 和 --separate-git-dir 选项不兼容。"

5247

4972 -#: builtin/clone.c:881

5248 +#: builtin/clone.c:895

5249 #, c-format

5250 msgid "repository '%s' does not exist"

5251 msgstr "仓库 '%s' 不存在"

5252

4977 -#: builtin/clone.c:887 builtin/fetch.c:1174

5253 +#: builtin/clone.c:901 builtin/fetch.c:1174

5254 #, c-format

5255 msgid "depth %s is not a positive number"

5256 msgstr "深度 %s 不是一个正数"

5257

4982 -#: builtin/clone.c:897

5258 +#: builtin/clone.c:911

5259 #, c-format

5260 msgid "destination path '%s' already exists and is not an empty directory."

5261 msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。"

5262

4987 -#: builtin/clone.c:907

5263 +#: builtin/clone.c:921

5264 #, c-format

5265 msgid "working tree '%s' already exists."

5266 msgstr "工作区 '%s' 已经存在。"

5267

4992 -#: builtin/clone.c:922 builtin/clone.c:933 builtin/submodule--helper.c:218

4993 -#: builtin/worktree.c:219 builtin/worktree.c:246

5268 +#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547

5269 +#: builtin/worktree.c:220 builtin/worktree.c:247

5270 #, c-format

5271 msgid "could not create leading directories of '%s'"

5272 msgstr "不能为 '%s' 创建先导目录"

5273

4998 -#: builtin/clone.c:925

5274 +#: builtin/clone.c:939

5275 #, c-format

5276 msgid "could not create work tree dir '%s'"

5277 msgstr "不能创建工作区目录 '%s'"

5278

5003 -#: builtin/clone.c:943

5279 +#: builtin/clone.c:957

5280 #, c-format

5281 msgid "Cloning into bare repository '%s'...\n"

5282 msgstr "克隆到纯仓库 '%s'...\n"

5283

5008 -#: builtin/clone.c:945

5284 +#: builtin/clone.c:959

5285 #, c-format

5286 msgid "Cloning into '%s'...\n"

5287 msgstr "正克隆到 '%s'...\n"

5288

5013 -#: builtin/clone.c:984

5289 +#: builtin/clone.c:998

5290 msgid "--depth is ignored in local clones; use file:// instead."

5291 msgstr "--depth 在本地克隆被忽略，改为 file:// 协议试试。"

5292

5017 -#: builtin/clone.c:987

5293 +#: builtin/clone.c:1001

5294 msgid "source repository is shallow, ignoring --local"

5295 msgstr "源仓库是浅克隆，忽略 --local"

5296

5021 -#: builtin/clone.c:992

5297 +#: builtin/clone.c:1006

5298 msgid "--local is ignored"

5299 msgstr "--local 被忽略"

5300

5025 -#: builtin/clone.c:996

5301 +#: builtin/clone.c:1010

5302 #, c-format

5303 msgid "Don't know how to clone %s"

5304 msgstr "不知道如何克隆 %s"

5305

5030 -#: builtin/clone.c:1045 builtin/clone.c:1053

5306 +#: builtin/clone.c:1059 builtin/clone.c:1067

5307 #, c-format

5308 msgid "Remote branch %s not found in upstream %s"

5309 msgstr "远程分支 %s 在上游 %s 未发现"

5310

5035 -#: builtin/clone.c:1056

5311 +#: builtin/clone.c:1070

5312 msgid "You appear to have cloned an empty repository."

5313 msgstr "您似乎克隆了一个空仓库。"

5314

@@ -5166,103 +5442,103 @@ msgstr ""

5442 "然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"

5443 "操作。\n"

5444

5169 -#: builtin/commit.c:305

5445 +#: builtin/commit.c:307

5446 msgid "failed to unpack HEAD tree object"

5447 msgstr "无法解包 HEAD 树对象"

5448

5173 -#: builtin/commit.c:346

5449 +#: builtin/commit.c:348

5450 msgid "unable to create temporary index"

5451 msgstr "不能创建临时索引"

5452

5177 -#: builtin/commit.c:352

5453 +#: builtin/commit.c:354

5454 msgid "interactive add failed"

5455 msgstr "交互式添加失败"

5456

5181 -#: builtin/commit.c:365

5457 +#: builtin/commit.c:367

5458 msgid "unable to update temporary index"

5459 msgstr "无法更新临时索引"

5460

5185 -#: builtin/commit.c:367

5461 +#: builtin/commit.c:369

5462 msgid "Failed to update main cache tree"

5463 msgstr "不能更新树的主缓存"

5464

5189 -#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463

5465 +#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465

5466 msgid "unable to write new_index file"

5467 msgstr "无法写 new_index 文件"

5468

5193 -#: builtin/commit.c:445

5469 +#: builtin/commit.c:447

5470 msgid "cannot do a partial commit during a merge."

5471 msgstr "在合并过程中不能做部分提交。"

5472

5197 -#: builtin/commit.c:447

5473 +#: builtin/commit.c:449

5474 msgid "cannot do a partial commit during a cherry-pick."

5475 msgstr "在拣选过程中不能做部分提交。"

5476

5201 -#: builtin/commit.c:456

5477 +#: builtin/commit.c:458

5478 msgid "cannot read the index"

5479 msgstr "无法读取索引"

5480

5205 -#: builtin/commit.c:475

5481 +#: builtin/commit.c:477

5482 msgid "unable to write temporary index file"

5483 msgstr "无法写临时索引文件"

5484

5209 -#: builtin/commit.c:580

5485 +#: builtin/commit.c:582

5486 #, c-format

5487 msgid "commit '%s' lacks author header"

5488 msgstr "提交 '%s' 缺少作者信息"

5489

5214 -#: builtin/commit.c:582

5490 +#: builtin/commit.c:584

5491 #, c-format

5492 msgid "commit '%s' has malformed author line"

5493 msgstr "提交 '%s' 有非法的作者信息"

5494

5219 -#: builtin/commit.c:601

5495 +#: builtin/commit.c:603

5496 msgid "malformed --author parameter"

5497 msgstr "非法的 --author 参数"

5498

5223 -#: builtin/commit.c:609

5499 +#: builtin/commit.c:611

5500 #, c-format

5501 msgid "invalid date format: %s"

5502 msgstr "无效的日期格式：%s"

5503

5228 -#: builtin/commit.c:653

5504 +#: builtin/commit.c:655

5505 msgid ""

5506 "unable to select a comment character that is not used\n"

5507 "in the current commit message"

5508 msgstr "无法选择一个未被当前提交说明使用的注释字符"

5509

5234 -#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080

5510 +#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091

5511 #, c-format

5512 msgid "could not lookup commit %s"

5513 msgstr "不能查询提交 %s"

5514

5239 -#: builtin/commit.c:702 builtin/shortlog.c:285

5515 +#: builtin/commit.c:704 builtin/shortlog.c:285

5516 #, c-format

5517 msgid "(reading log message from standard input)\n"

5518 msgstr "（正从标准输入中读取日志信息）\n"

5519

5244 -#: builtin/commit.c:704

5520 +#: builtin/commit.c:706

5521 msgid "could not read log from standard input"

5522 msgstr "不能从标准输入中读取日志信息"

5523

5248 -#: builtin/commit.c:708

5524 +#: builtin/commit.c:710

5525 #, c-format

5526 msgid "could not read log file '%s'"

5527 msgstr "不能读取日志文件 '%s'"

5528

5253 -#: builtin/commit.c:730

5254 -msgid "could not read MERGE_MSG"

5255 -msgstr "不能读取 MERGE_MSG"

5256 -

5257 -#: builtin/commit.c:734

5529 +#: builtin/commit.c:737 builtin/commit.c:745

5530 msgid "could not read SQUASH_MSG"

5531 msgstr "不能读取 SQUASH_MSG"

5532

5261 -#: builtin/commit.c:785

5533 +#: builtin/commit.c:742

5534 +msgid "could not read MERGE_MSG"

5535 +msgstr "不能读取 MERGE_MSG"

5536 +

5537 +#: builtin/commit.c:796

5538 msgid "could not write commit template"

5539 msgstr "不能写提交模版"

5540

5265 -#: builtin/commit.c:803

5541 +#: builtin/commit.c:814

5542 #, c-format

5543 msgid ""

5544 "\n"

@@ -5276,7 +5552,7 @@ msgstr ""

5552 "\t%s\n"

5553 "然后重试。\n"

5554

5279 -#: builtin/commit.c:808

5555 +#: builtin/commit.c:819

5556 #, c-format

5557 msgid ""

5558 "\n"

@@ -5290,7 +5566,7 @@ msgstr ""

5566 "\t%s\n"

5567 "然后重试。\n"

5568

5293 -#: builtin/commit.c:821

5569 +#: builtin/commit.c:832

5570 #, c-format

5571 msgid ""

5572 "Please enter the commit message for your changes. Lines starting\n"

@@ -5299,7 +5575,7 @@ msgstr ""

5575 "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n"

5576 "说明将会终止提交。\n"

5577

5302 -#: builtin/commit.c:828

5578 +#: builtin/commit.c:839

5579 #, c-format

5580 msgid ""

5581 "Please enter the commit message for your changes. Lines starting\n"

@@ -5310,346 +5586,346 @@ msgstr ""

5586 "也可以删除它们。一个空的提交说明将会终止提交。\n"

5587

5588 # 译者：为保证在输出中对齐，注意调整句中空格！

5313 -#: builtin/commit.c:848

5589 +#: builtin/commit.c:859

5590 #, c-format

5591 msgid "%sAuthor: %.*s <%.*s>"

5592 msgstr "%s作者： %.*s <%.*s>"

5593

5594 # 译者：为保证在输出中对齐，注意调整句中空格！

5319 -#: builtin/commit.c:856

5595 +#: builtin/commit.c:867

5596 #, c-format

5597 msgid "%sDate: %s"

5598 msgstr "%s日期： %s"

5599

5600 # 译者：为保证在输出中对齐，注意调整句中空格！

5325 -#: builtin/commit.c:863

5601 +#: builtin/commit.c:874

5602 #, c-format

5603 msgid "%sCommitter: %.*s <%.*s>"

5604 msgstr "%s提交者：%.*s <%.*s>"

5605

5330 -#: builtin/commit.c:881

5606 +#: builtin/commit.c:892

5607 msgid "Cannot read index"

5608 msgstr "无法读取索引"

5609

5334 -#: builtin/commit.c:938

5610 +#: builtin/commit.c:949

5611 msgid "Error building trees"

5612 msgstr "无法创建树对象"

5613

5338 -#: builtin/commit.c:953 builtin/tag.c:266

5614 +#: builtin/commit.c:964 builtin/tag.c:266

5615 #, c-format

5616 msgid "Please supply the message using either -m or -F option.\n"

5617 msgstr "请使用 -m 或 -F 选项提供提交说明。\n"

5618

5343 -#: builtin/commit.c:1055

5619 +#: builtin/commit.c:1066

5620 #, c-format

5621 msgid "--author '%s' is not 'Name <email>' and matches no existing author"

5622 msgstr "--author '%s' 不是 'Name <email>' 格式，且未能在现有作者中找到匹配"

5623

5348 -#: builtin/commit.c:1070 builtin/commit.c:1310

5624 +#: builtin/commit.c:1081 builtin/commit.c:1321

5625 #, c-format

5626 msgid "Invalid untracked files mode '%s'"

5627 msgstr "无效的未追踪文件参数 '%s'"

5628

5353 -#: builtin/commit.c:1107

5629 +#: builtin/commit.c:1118

5630 msgid "--long and -z are incompatible"

5631 msgstr "--long 和 -z 选项不兼容"

5632

5357 -#: builtin/commit.c:1137

5633 +#: builtin/commit.c:1148

5634 msgid "Using both --reset-author and --author does not make sense"

5635 msgstr "同时使用 --reset-author 和 --author 没有意义"

5636

5361 -#: builtin/commit.c:1146

5637 +#: builtin/commit.c:1157

5638 msgid "You have nothing to amend."

5639 msgstr "您没有可修补的提交。"

5640

5365 -#: builtin/commit.c:1149

5641 +#: builtin/commit.c:1160

5642 msgid "You are in the middle of a merge -- cannot amend."

5643 msgstr "您正处于一个合并过程中 -- 无法修补提交。"

5644

5369 -#: builtin/commit.c:1151

5645 +#: builtin/commit.c:1162

5646 msgid "You are in the middle of a cherry-pick -- cannot amend."

5647 msgstr "您正处于一个拣选过程中 -- 无法修补提交。"

5648

5373 -#: builtin/commit.c:1154

5649 +#: builtin/commit.c:1165

5650 msgid "Options --squash and --fixup cannot be used together"

5651 msgstr "选项 --squash 和 --fixup 不能同时使用"

5652

5377 -#: builtin/commit.c:1164

5653 +#: builtin/commit.c:1175

5654 msgid "Only one of -c/-C/-F/--fixup can be used."

5655 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"

5656

5381 -#: builtin/commit.c:1166

5657 +#: builtin/commit.c:1177

5658 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."

5659 msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"

5660

5385 -#: builtin/commit.c:1174

5661 +#: builtin/commit.c:1185

5662 msgid "--reset-author can be used only with -C, -c or --amend."

5663 msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"

5664

5389 -#: builtin/commit.c:1191

5665 +#: builtin/commit.c:1202

5666 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."

5667 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"

5668

5393 -#: builtin/commit.c:1193

5669 +#: builtin/commit.c:1204

5670 msgid "No paths with --include/--only does not make sense."

5671 msgstr "参数 --include/--only 不跟路径没有意义。"

5672

5397 -#: builtin/commit.c:1195

5673 +#: builtin/commit.c:1206

5674 msgid "Clever... amending the last one with dirty index."

5675 msgstr "聪明... 用脏索引修补最后一个提交。"

5676

5401 -#: builtin/commit.c:1197

5677 +#: builtin/commit.c:1208

5678 msgid "Explicit paths specified without -i or -o; assuming --only paths..."

5679 msgstr "指定了明确的路径而没有使用 -i 或 -o 选项，认为是 --only paths..."

5680

5405 -#: builtin/commit.c:1209 builtin/tag.c:475

5681 +#: builtin/commit.c:1220 builtin/tag.c:474

5682 #, c-format

5683 msgid "Invalid cleanup mode %s"

5684 msgstr "无效的清理模式 %s"

5685

5410 -#: builtin/commit.c:1214

5686 +#: builtin/commit.c:1225

5687 msgid "Paths with -a does not make sense."

5688 msgstr "路径和 -a 选项同时使用没有意义。"

5689

5414 -#: builtin/commit.c:1324 builtin/commit.c:1605

5690 +#: builtin/commit.c:1335 builtin/commit.c:1621

5691 msgid "show status concisely"

5692 msgstr "以简洁的格式显示状态"

5693

5418 -#: builtin/commit.c:1326 builtin/commit.c:1607

5694 +#: builtin/commit.c:1337 builtin/commit.c:1623

5695 msgid "show branch information"

5696 msgstr "显示分支信息"

5697

5422 -#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512

5423 -#: builtin/worktree.c:430

5698 +#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512

5699 +#: builtin/worktree.c:437

5700 msgid "machine-readable output"

5701 msgstr "机器可读的输出"

5702

5427 -#: builtin/commit.c:1331 builtin/commit.c:1611

5703 +#: builtin/commit.c:1342 builtin/commit.c:1627

5704 msgid "show status in long format (default)"

5705 msgstr "以长格式显示状态（默认）"

5706

5431 -#: builtin/commit.c:1334 builtin/commit.c:1614

5707 +#: builtin/commit.c:1345 builtin/commit.c:1630

5708 msgid "terminate entries with NUL"

5709 msgstr "条目以 NUL 字符结尾"

5710

5435 -#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981

5711 +#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981

5712 #: builtin/fast-export.c:984 builtin/tag.c:353

5713 msgid "mode"

5714 msgstr "模式"

5715

5440 -#: builtin/commit.c:1337 builtin/commit.c:1617

5716 +#: builtin/commit.c:1348 builtin/commit.c:1633

5717 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"

5718 msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）"

5719

5444 -#: builtin/commit.c:1340

5720 +#: builtin/commit.c:1351

5721 msgid "show ignored files"

5722 msgstr "显示忽略的文件"

5723

5448 -#: builtin/commit.c:1341 parse-options.h:155

5724 +#: builtin/commit.c:1352 parse-options.h:155

5725 msgid "when"

5726 msgstr "何时"

5727

5452 -#: builtin/commit.c:1342

5728 +#: builtin/commit.c:1353

5729 msgid ""

5730 "ignore changes to submodules, optional when: all, dirty, untracked. "

5731 "(Default: all)"

5732 msgstr ""

5733 "忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）"

5734

5459 -#: builtin/commit.c:1344

5735 +#: builtin/commit.c:1355

5736 msgid "list untracked files in columns"

5737 msgstr "以列的方式显示未跟踪的文件"

5738

5463 -#: builtin/commit.c:1430

5739 +#: builtin/commit.c:1441

5740 msgid "couldn't look up newly created commit"

5741 msgstr "无法找到新创建的提交"

5742

5467 -#: builtin/commit.c:1432

5743 +#: builtin/commit.c:1443

5744 msgid "could not parse newly created commit"

5745 msgstr "不能解析新创建的提交"

5746

5471 -#: builtin/commit.c:1477

5747 +#: builtin/commit.c:1488

5748 msgid "detached HEAD"

5749 msgstr "分离头指针"

5750

5751 # 译者：中文字符串拼接，可删除前导空格

5476 -#: builtin/commit.c:1480

5752 +#: builtin/commit.c:1491

5753 msgid " (root-commit)"

5754 msgstr "（根提交）"

5755

5480 -#: builtin/commit.c:1575

5756 +#: builtin/commit.c:1591

5757 msgid "suppress summary after successful commit"

5758 msgstr "提交成功后不显示概述信息"

5759

5484 -#: builtin/commit.c:1576

5760 +#: builtin/commit.c:1592

5761 msgid "show diff in commit message template"

5762 msgstr "在提交说明模板里显示差异"

5763

5488 -#: builtin/commit.c:1578

5764 +#: builtin/commit.c:1594

5765 msgid "Commit message options"

5766 msgstr "提交说明选项"

5767

5492 -#: builtin/commit.c:1579 builtin/tag.c:351

5768 +#: builtin/commit.c:1595 builtin/tag.c:351

5769 msgid "read message from file"

5770 msgstr "从文件中读取提交说明"

5771

5496 -#: builtin/commit.c:1580

5772 +#: builtin/commit.c:1596

5773 msgid "author"

5774 msgstr "作者"

5775

5500 -#: builtin/commit.c:1580

5776 +#: builtin/commit.c:1596

5777 msgid "override author for commit"

5778 msgstr "提交时覆盖作者"

5779

5504 -#: builtin/commit.c:1581 builtin/gc.c:326

5780 +#: builtin/commit.c:1597 builtin/gc.c:326

5781 msgid "date"

5782 msgstr "日期"

5783

5508 -#: builtin/commit.c:1581

5784 +#: builtin/commit.c:1597

5785 msgid "override date for commit"

5786 msgstr "提交时覆盖日期"

5787

5512 -#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395

5788 +#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395

5789 #: builtin/notes.c:558 builtin/tag.c:349

5790 msgid "message"

5791 msgstr "说明"

5792

5517 -#: builtin/commit.c:1582

5793 +#: builtin/commit.c:1598

5794 msgid "commit message"

5795 msgstr "提交说明"

5796

5521 -#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585

5522 -#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79

5797 +#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601

5798 +#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79

5799 msgid "commit"

5800 msgstr "提交"

5801

5526 -#: builtin/commit.c:1583

5802 +#: builtin/commit.c:1599

5803 msgid "reuse and edit message from specified commit"

5804 msgstr "重用并编辑指定提交的提交说明"

5805

5530 -#: builtin/commit.c:1584

5806 +#: builtin/commit.c:1600

5807 msgid "reuse message from specified commit"

5808 msgstr "重用指定提交的提交说明"

5809

5534 -#: builtin/commit.c:1585

5810 +#: builtin/commit.c:1601

5811 msgid "use autosquash formatted message to fixup specified commit"

5812 msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"

5813

5538 -#: builtin/commit.c:1586

5814 +#: builtin/commit.c:1602

5815 msgid "use autosquash formatted message to squash specified commit"

5816 msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"

5817

5542 -#: builtin/commit.c:1587

5818 +#: builtin/commit.c:1603

5819 msgid "the commit is authored by me now (used with -C/-c/--amend)"

5820 msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）"

5821

5546 -#: builtin/commit.c:1588 builtin/log.c:1219 builtin/revert.c:86

5822 +#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86

5823 msgid "add Signed-off-by:"

5824 msgstr "添加 Signed-off-by: 签名"

5825

5550 -#: builtin/commit.c:1589

5826 +#: builtin/commit.c:1605

5827 msgid "use specified template file"

5828 msgstr "使用指定的模板文件"

5829

5554 -#: builtin/commit.c:1590

5830 +#: builtin/commit.c:1606

5831 msgid "force edit of commit"

5832 msgstr "强制编辑提交"

5833

5834 # 译者：可选值，不能翻译（或是原文中笔误，应为 mode）

5559 -#: builtin/commit.c:1591

5835 +#: builtin/commit.c:1607

5836 msgid "default"

5837 msgstr "default"

5838

5563 -#: builtin/commit.c:1591 builtin/tag.c:354

5839 +#: builtin/commit.c:1607 builtin/tag.c:354

5840 msgid "how to strip spaces and #comments from message"

5841 msgstr "设置如何删除提交说明里的空格和#注释"

5842

5567 -#: builtin/commit.c:1592

5843 +#: builtin/commit.c:1608

5844 msgid "include status in commit message template"

5845 msgstr "在提交说明模板里包含状态信息"

5846

5571 -#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:160

5847 +#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165

5848 #: builtin/revert.c:93

5849 msgid "GPG sign commit"

5850 msgstr "GPG 提交签名"

5851

5576 -#: builtin/commit.c:1597

5852 +#: builtin/commit.c:1613

5853 msgid "Commit contents options"

5854 msgstr "提交内容选项"

5855

5580 -#: builtin/commit.c:1598

5856 +#: builtin/commit.c:1614

5857 msgid "commit all changed files"

5858 msgstr "提交所有改动的文件"

5859

5584 -#: builtin/commit.c:1599

5860 +#: builtin/commit.c:1615

5861 msgid "add specified files to index for commit"

5862 msgstr "添加指定的文件到索引区等待提交"

5863

5588 -#: builtin/commit.c:1600

5864 +#: builtin/commit.c:1616

5865 msgid "interactively add files"

5866 msgstr "交互式添加文件"

5867

5592 -#: builtin/commit.c:1601

5868 +#: builtin/commit.c:1617

5869 msgid "interactively add changes"

5870 msgstr "交互式添加变更"

5871

5596 -#: builtin/commit.c:1602

5872 +#: builtin/commit.c:1618

5873 msgid "commit only specified files"

5874 msgstr "只提交指定的文件"

5875

5600 -#: builtin/commit.c:1603

5876 +#: builtin/commit.c:1619

5877 msgid "bypass pre-commit hook"

5878 msgstr "绕过 pre-commit 钩子"

5879

5604 -#: builtin/commit.c:1604

5880 +#: builtin/commit.c:1620

5881 msgid "show what would be committed"

5882 msgstr "显示将要提交的内容"

5883

5608 -#: builtin/commit.c:1615

5884 +#: builtin/commit.c:1631

5885 msgid "amend previous commit"

5886 msgstr "修改先前的提交"

5887

5612 -#: builtin/commit.c:1616

5888 +#: builtin/commit.c:1632

5889 msgid "bypass post-rewrite hook"

5890 msgstr "绕过 post-rewrite 钩子"

5891

5616 -#: builtin/commit.c:1621

5892 +#: builtin/commit.c:1637

5893 msgid "ok to record an empty change"

5894 msgstr "允许一个空提交"

5895

5620 -#: builtin/commit.c:1623

5896 +#: builtin/commit.c:1639

5897 msgid "ok to record a change with an empty message"

5898 msgstr "允许空的提交说明"

5899

5624 -#: builtin/commit.c:1652

5900 +#: builtin/commit.c:1668

5901 msgid "could not parse HEAD commit"

5902 msgstr "不能解析 HEAD 提交"

5903

5628 -#: builtin/commit.c:1698

5904 +#: builtin/commit.c:1718

5905 #, c-format

5906 msgid "Corrupt MERGE_HEAD file (%s)"

5907 msgstr "损坏的 MERGE_HEAD 文件（%s）"

5908

5633 -#: builtin/commit.c:1705

5909 +#: builtin/commit.c:1725

5910 msgid "could not read MERGE_MODE"

5911 msgstr "不能读取 MERGE_MODE"

5912

5637 -#: builtin/commit.c:1724

5913 +#: builtin/commit.c:1744

5914 #, c-format

5915 msgid "could not read commit message: %s"

5916 msgstr "不能读取提交说明：%s"

5917

5642 -#: builtin/commit.c:1735

5918 +#: builtin/commit.c:1755

5919 #, c-format

5920 msgid "Aborting commit; you did not edit the message.\n"

5921 msgstr "终止提交；您未更改来自模版的提交说明。\n"

5922

5647 -#: builtin/commit.c:1740

5923 +#: builtin/commit.c:1760

5924 #, c-format

5925 msgid "Aborting commit due to empty commit message.\n"

5926 msgstr "终止提交因为提交说明为空。\n"

5927

5652 -#: builtin/commit.c:1788

5928 +#: builtin/commit.c:1808

5929 msgid ""

5930 "Repository has been updated, but unable to write\n"

5931 "new_index file. Check that disk is not full and quota is\n"

@@ -5794,7 +6070,7 @@ msgstr "显示配置的来源（文件、标准输入、数据对象，或命令

6070 msgid "unable to parse default color value"

6071 msgstr "不能解析默认颜色值"

6072

5797 -#: builtin/config.c:469

6073 +#: builtin/config.c:472

6074 #, c-format

6075 msgid ""

6076 "# This is Git's per-user configuration file.\n"

@@ -5809,7 +6085,7 @@ msgstr ""

6085 "#\tname = %s\n"

6086 "#\temail = %s\n"

6087

5812 -#: builtin/config.c:611

6088 +#: builtin/config.c:614

6089 #, c-format

6090 msgid "cannot create configuration file %s"

6091 msgstr "不能创建配置文件 %s"

@@ -5845,7 +6121,7 @@ msgstr "附注标签 %s 没有嵌入名称"

6121 msgid "tag '%s' is really '%s' here"

6122 msgstr "标签 '%s' 的确是在 '%s'"

6123

5848 -#: builtin/describe.c:250 builtin/log.c:459

6124 +#: builtin/describe.c:250 builtin/log.c:465

6125 #, c-format

6126 msgid "Not a valid object name %s"

6127 msgstr "不是一个有效的对象名 %s"

@@ -5938,7 +6214,7 @@ msgstr "考虑最近 <n> 个标签（默认：10）"

6214 msgid "only consider tags matching <pattern>"

6215 msgstr "只考虑匹配 <模式> 的标签"

6216

5941 -#: builtin/describe.c:410 builtin/name-rev.c:314

6217 +#: builtin/describe.c:410 builtin/name-rev.c:321

6218 msgid "show abbreviated commit object as fallback"

6219 msgstr "显示简写的提交号作为后备"

6220

@@ -5972,21 +6248,21 @@ msgstr "'%s'：不是一个正规文件或符号链接"

6248 msgid "invalid option: %s"

6249 msgstr "无效选项：%s"

6250

5975 -#: builtin/diff.c:358

6251 +#: builtin/diff.c:360

6252 msgid "Not a git repository"

6253 msgstr "不是一个 git 仓库"

6254

5979 -#: builtin/diff.c:401

6255 +#: builtin/diff.c:403

6256 #, c-format

6257 msgid "invalid object '%s' given."

6258 msgstr "提供了无效对象 '%s'。"

6259

5984 -#: builtin/diff.c:410

6260 +#: builtin/diff.c:412

6261 #, c-format

6262 msgid "more than two blobs given: '%s'"

6263 msgstr "提供了超过两个数据对象：'%s'"

6264

5989 -#: builtin/diff.c:417

6265 +#: builtin/diff.c:419

6266 #, c-format

6267 msgid "unhandled object '%s' given."

6268 msgstr "无法处理的对象 '%s'。"

@@ -6059,19 +6335,19 @@ msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"

6335 msgid "git fetch --all [<options>]"

6336 msgstr "git fetch --all [<选项>]"

6337

6062 -#: builtin/fetch.c:92 builtin/pull.c:166

6338 +#: builtin/fetch.c:92 builtin/pull.c:174

6339 msgid "fetch from all remotes"

6340 msgstr "从所有的远程抓取"

6341

6066 -#: builtin/fetch.c:94 builtin/pull.c:169

6342 +#: builtin/fetch.c:94 builtin/pull.c:177

6343 msgid "append to .git/FETCH_HEAD instead of overwriting"

6344 msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"

6345

6070 -#: builtin/fetch.c:96 builtin/pull.c:172

6346 +#: builtin/fetch.c:96 builtin/pull.c:180

6347 msgid "path to upload pack on remote end"

6348 msgstr "上传包到远程的路径"

6349

6074 -#: builtin/fetch.c:97 builtin/pull.c:174

6350 +#: builtin/fetch.c:97 builtin/pull.c:182

6351 msgid "force overwrite of local branch"

6352 msgstr "强制覆盖本地分支"

6353

@@ -6079,7 +6355,7 @@ msgstr "强制覆盖本地分支"

6355 msgid "fetch from multiple remotes"

6356 msgstr "从多个远程抓取"

6357

6082 -#: builtin/fetch.c:101 builtin/pull.c:176

6358 +#: builtin/fetch.c:101 builtin/pull.c:184

6359 msgid "fetch all tags and associated objects"

6360 msgstr "抓取所有的标签和关联对象"

6361

@@ -6091,20 +6367,20 @@ msgstr "不抓取任何标签(--no-tags)"

6367 msgid "number of submodules fetched in parallel"

6368 msgstr "子模组获取的并发数"

6369

6094 -#: builtin/fetch.c:107 builtin/pull.c:179

6370 +#: builtin/fetch.c:107 builtin/pull.c:187

6371 msgid "prune remote-tracking branches no longer on remote"

6372 msgstr "清除远程已经不存在的分支的跟踪分支"

6373

6374 # 译者：可选值，不能翻译

6099 -#: builtin/fetch.c:108 builtin/pull.c:182

6375 +#: builtin/fetch.c:108 builtin/pull.c:190

6376 msgid "on-demand"

6377 msgstr "on-demand"

6378

6103 -#: builtin/fetch.c:109 builtin/pull.c:183

6379 +#: builtin/fetch.c:109 builtin/pull.c:191

6380 msgid "control recursive fetching of submodules"

6381 msgstr "控制子模组的递归抓取"

6382

6107 -#: builtin/fetch.c:113 builtin/pull.c:191

6383 +#: builtin/fetch.c:113 builtin/pull.c:199

6384 msgid "keep downloaded pack"

6385 msgstr "保持下载包"

6386

@@ -6112,15 +6388,15 @@ msgstr "保持下载包"

6388 msgid "allow updating of HEAD ref"

6389 msgstr "允许更新 HEAD 引用"

6390

6115 -#: builtin/fetch.c:118 builtin/pull.c:194

6391 +#: builtin/fetch.c:118 builtin/pull.c:202

6392 msgid "deepen history of shallow clone"

6393 msgstr "深化浅克隆的历史"

6394

6119 -#: builtin/fetch.c:120 builtin/pull.c:197

6395 +#: builtin/fetch.c:120 builtin/pull.c:205

6396 msgid "convert to a complete repository"

6397 msgstr "转换为一个完整的仓库"

6398

6123 -#: builtin/fetch.c:122 builtin/log.c:1236

6399 +#: builtin/fetch.c:122 builtin/log.c:1399

6400 msgid "dir"

6401 msgstr "目录"

6402

@@ -6132,15 +6408,15 @@ msgstr "在子模组路径输出的前面加上此目录"

6408 msgid "default mode for recursion"

6409 msgstr "递归的默认模式"

6410

6135 -#: builtin/fetch.c:128 builtin/pull.c:200

6411 +#: builtin/fetch.c:128 builtin/pull.c:208

6412 msgid "accept refs that update .git/shallow"

6413 msgstr "接受更新 .git/shallow 的引用"

6414

6139 -#: builtin/fetch.c:129 builtin/pull.c:202

6415 +#: builtin/fetch.c:129 builtin/pull.c:210

6416 msgid "refmap"

6417 msgstr "引用映射"

6418

6143 -#: builtin/fetch.c:130 builtin/pull.c:203

6419 +#: builtin/fetch.c:130 builtin/pull.c:211

6420 msgid "specify fetch refmap"

6421 msgstr "指定获取操作的引用映射"

6422

@@ -6199,11 +6475,6 @@ msgstr "强制更新"

6475 msgid "(non-fast-forward)"

6476 msgstr "（非快进式）"

6477

6202 -#: builtin/fetch.c:610 builtin/fetch.c:851

6203 -#, c-format

6204 -msgid "cannot open %s: %s\n"

6205 -msgstr "无法打开 %s：%s\n"

6206 -

6478 #: builtin/fetch.c:619

6479 #, c-format

6480 msgid "%s did not send all necessary objects\n"

@@ -6402,55 +6673,55 @@ msgstr "检查连接中"

6673 msgid "Checking object directories"

6674 msgstr "检查对象目录中"

6675

6405 -#: builtin/fsck.c:553

6676 +#: builtin/fsck.c:552

6677 msgid "git fsck [<options>] [<object>...]"

6678 msgstr "git fsck [<选项>] [<对象>...]"

6679

6409 -#: builtin/fsck.c:559

6680 +#: builtin/fsck.c:558

6681 msgid "show unreachable objects"

6682 msgstr "显示不可达的对象"

6683

6413 -#: builtin/fsck.c:560

6684 +#: builtin/fsck.c:559

6685 msgid "show dangling objects"

6686 msgstr "显示摇摆的对象"

6687

6417 -#: builtin/fsck.c:561

6688 +#: builtin/fsck.c:560

6689 msgid "report tags"

6690 msgstr "报告标签"

6691

6421 -#: builtin/fsck.c:562

6692 +#: builtin/fsck.c:561

6693 msgid "report root nodes"

6694 msgstr "报告根节点"

6695

6425 -#: builtin/fsck.c:563

6696 +#: builtin/fsck.c:562

6697 msgid "make index objects head nodes"

6698 msgstr "将索引亦作为检查的头节点"

6699

6429 -#: builtin/fsck.c:564

6700 +#: builtin/fsck.c:563

6701 msgid "make reflogs head nodes (default)"

6702 msgstr "将引用日志作为检查的头节点（默认）"

6703

6433 -#: builtin/fsck.c:565

6704 +#: builtin/fsck.c:564

6705 msgid "also consider packs and alternate objects"

6706 msgstr "也考虑包和备用对象"

6707

6437 -#: builtin/fsck.c:566

6708 +#: builtin/fsck.c:565

6709 msgid "check only connectivity"

6710 msgstr "仅检查连通性"

6711

6441 -#: builtin/fsck.c:567

6712 +#: builtin/fsck.c:566

6713 msgid "enable more strict checking"

6714 msgstr "启用更严格的检查"

6715

6445 -#: builtin/fsck.c:569

6716 +#: builtin/fsck.c:568

6717 msgid "write dangling objects in .git/lost-found"

6718 msgstr "将摇摆对象写入 .git/lost-found 中"

6719

6449 -#: builtin/fsck.c:570 builtin/prune.c:107

6720 +#: builtin/fsck.c:569 builtin/prune.c:107

6721 msgid "show progress"

6722 msgstr "显示进度"

6723

6453 -#: builtin/fsck.c:631

6724 +#: builtin/fsck.c:630

6725 msgid "Checking objects"

6726 msgstr "检查对象中"

6727

@@ -6549,215 +6820,215 @@ msgstr "无法读取树（%s）"

6820 msgid "unable to grep from object of type %s"

6821 msgstr "无法抓取来自于 %s 类型的对象"

6822

6552 -#: builtin/grep.c:558

6823 +#: builtin/grep.c:560

6824 #, c-format

6825 msgid "switch `%c' expects a numerical value"

6826 msgstr "开关 `%c' 期望一个数字值"

6827

6557 -#: builtin/grep.c:575

6828 +#: builtin/grep.c:577

6829 #, c-format

6830 msgid "cannot open '%s'"

6831 msgstr "不能打开 '%s'"

6832

6562 -#: builtin/grep.c:644

6833 +#: builtin/grep.c:646

6834 msgid "search in index instead of in the work tree"

6835 msgstr "在索引区搜索而不是在工作区"

6836

6566 -#: builtin/grep.c:646

6837 +#: builtin/grep.c:648

6838 msgid "find in contents not managed by git"

6839 msgstr "在未被 git 管理的内容中查找"

6840

6841 # 译者：中文字符串拼接，可删除前导空格

6571 -#: builtin/grep.c:648

6842 +#: builtin/grep.c:650

6843 msgid "search in both tracked and untracked files"

6844 msgstr "在跟踪和未跟踪的文件中搜索"

6845

6575 -#: builtin/grep.c:650

6846 +#: builtin/grep.c:652

6847 msgid "ignore files specified via '.gitignore'"

6848 msgstr "忽略 '.gitignore' 包含的文件"

6849

6579 -#: builtin/grep.c:653

6850 +#: builtin/grep.c:655

6851 msgid "show non-matching lines"

6852 msgstr "显示未匹配的行"

6853

6583 -#: builtin/grep.c:655

6854 +#: builtin/grep.c:657

6855 msgid "case insensitive matching"

6856 msgstr "不区分大小写匹配"

6857

6587 -#: builtin/grep.c:657

6858 +#: builtin/grep.c:659

6859 msgid "match patterns only at word boundaries"

6860 msgstr "只在单词边界匹配模式"

6861

6591 -#: builtin/grep.c:659

6862 +#: builtin/grep.c:661

6863 msgid "process binary files as text"

6864 msgstr "把二进制文件当做文本处理"

6865

6595 -#: builtin/grep.c:661

6866 +#: builtin/grep.c:663

6867 msgid "don't match patterns in binary files"

6868 msgstr "不在二进制文件中匹配模式"

6869

6599 -#: builtin/grep.c:664

6870 +#: builtin/grep.c:666

6871 msgid "process binary files with textconv filters"

6872 msgstr "用 textconv 过滤器处理二进制文件"

6873

6603 -#: builtin/grep.c:666

6874 +#: builtin/grep.c:668

6875 msgid "descend at most <depth> levels"

6876 msgstr "最多以指定的深度向下寻找"

6877

6607 -#: builtin/grep.c:670

6878 +#: builtin/grep.c:672

6879 msgid "use extended POSIX regular expressions"

6880 msgstr "使用扩展的 POSIX 正则表达式"

6881

6611 -#: builtin/grep.c:673

6882 +#: builtin/grep.c:675

6883 msgid "use basic POSIX regular expressions (default)"

6884 msgstr "使用基本的 POSIX 正则表达式（默认）"

6885

6615 -#: builtin/grep.c:676

6886 +#: builtin/grep.c:678

6887 msgid "interpret patterns as fixed strings"

6888 msgstr "把模式解析为固定的字符串"

6889

6619 -#: builtin/grep.c:679

6890 +#: builtin/grep.c:681

6891 msgid "use Perl-compatible regular expressions"

6892 msgstr "使用 Perl 兼容的正则表达式"

6893

6623 -#: builtin/grep.c:682

6894 +#: builtin/grep.c:684

6895 msgid "show line numbers"

6896 msgstr "显示行号"

6897

6627 -#: builtin/grep.c:683

6898 +#: builtin/grep.c:685

6899 msgid "don't show filenames"

6900 msgstr "不显示文件名"

6901

6631 -#: builtin/grep.c:684

6902 +#: builtin/grep.c:686

6903 msgid "show filenames"

6904 msgstr "显示文件名"

6905

6635 -#: builtin/grep.c:686

6906 +#: builtin/grep.c:688

6907 msgid "show filenames relative to top directory"

6908 msgstr "显示相对于顶级目录的文件名"

6909

6639 -#: builtin/grep.c:688

6910 +#: builtin/grep.c:690

6911 msgid "show only filenames instead of matching lines"

6912 msgstr "只显示文件名而不显示匹配的行"

6913

6643 -#: builtin/grep.c:690

6914 +#: builtin/grep.c:692

6915 msgid "synonym for --files-with-matches"

6916 msgstr "和 --files-with-matches 同义"

6917

6647 -#: builtin/grep.c:693

6918 +#: builtin/grep.c:695

6919 msgid "show only the names of files without match"

6920 msgstr "只显示未匹配的文件名"

6921

6651 -#: builtin/grep.c:695

6922 +#: builtin/grep.c:697

6923 msgid "print NUL after filenames"

6924 msgstr "在文件名后输出 NUL 字符"

6925

6655 -#: builtin/grep.c:697

6926 +#: builtin/grep.c:699

6927 msgid "show the number of matches instead of matching lines"

6928 msgstr "显示总匹配行数，而不显示匹配的行"

6929

6659 -#: builtin/grep.c:698

6930 +#: builtin/grep.c:700

6931 msgid "highlight matches"

6932 msgstr "高亮显示匹配项"

6933

6663 -#: builtin/grep.c:700

6934 +#: builtin/grep.c:702

6935 msgid "print empty line between matches from different files"

6936 msgstr "在不同文件的匹配项之间打印空行"

6937

6667 -#: builtin/grep.c:702

6938 +#: builtin/grep.c:704

6939 msgid "show filename only once above matches from same file"

6940 msgstr "只在同一文件的匹配项的上面显示一次文件名"

6941

6671 -#: builtin/grep.c:705

6942 +#: builtin/grep.c:707

6943 msgid "show <n> context lines before and after matches"

6944 msgstr "显示匹配项前后的 <n> 行上下文"

6945

6675 -#: builtin/grep.c:708

6946 +#: builtin/grep.c:710

6947 msgid "show <n> context lines before matches"

6948 msgstr "显示匹配项前 <n> 行上下文"

6949

6679 -#: builtin/grep.c:710

6950 +#: builtin/grep.c:712

6951 msgid "show <n> context lines after matches"

6952 msgstr "显示匹配项后 <n> 行上下文"

6953

6683 -#: builtin/grep.c:712

6954 +#: builtin/grep.c:714

6955 msgid "use <n> worker threads"

6956 msgstr "使用 <n> 个工作线程"

6957

6687 -#: builtin/grep.c:713

6958 +#: builtin/grep.c:715

6959 msgid "shortcut for -C NUM"

6960 msgstr "快捷键 -C 数字"

6961

6691 -#: builtin/grep.c:716

6962 +#: builtin/grep.c:718

6963 msgid "show a line with the function name before matches"

6964 msgstr "在匹配的前面显示一行函数名"

6965

6695 -#: builtin/grep.c:718

6966 +#: builtin/grep.c:720

6967 msgid "show the surrounding function"

6968 msgstr "显示所在函数的前后内容"

6969

6699 -#: builtin/grep.c:721

6970 +#: builtin/grep.c:723

6971 msgid "read patterns from file"

6972 msgstr "从文件读取模式"

6973

6703 -#: builtin/grep.c:723

6974 +#: builtin/grep.c:725

6975 msgid "match <pattern>"

6976 msgstr "匹配 <模式>"

6977

6707 -#: builtin/grep.c:725

6978 +#: builtin/grep.c:727

6979 msgid "combine patterns specified with -e"

6980 msgstr "组合用 -e 参数设定的模式"

6981

6711 -#: builtin/grep.c:737

6982 +#: builtin/grep.c:739

6983 msgid "indicate hit with exit status without output"

6984 msgstr "不输出，而用退出码标识命中状态"

6985

6715 -#: builtin/grep.c:739

6986 +#: builtin/grep.c:741

6987 msgid "show only matches from files that match all patterns"

6988 msgstr "只显示匹配所有模式的文件中的匹配"

6989

6719 -#: builtin/grep.c:741

6990 +#: builtin/grep.c:743

6991 msgid "show parse tree for grep expression"

6992 msgstr "显示 grep 表达式的解析树"

6993

6723 -#: builtin/grep.c:745

6994 +#: builtin/grep.c:747

6995 msgid "pager"

6996 msgstr "分页"

6997

6727 -#: builtin/grep.c:745

6998 +#: builtin/grep.c:747

6999 msgid "show matching files in the pager"

7000 msgstr "分页显示匹配的文件"

7001

6731 -#: builtin/grep.c:748

7002 +#: builtin/grep.c:750

7003 msgid "allow calling of grep(1) (ignored by this build)"

7004 msgstr "允许调用 grep(1)（本次构建忽略）"

7005

6735 -#: builtin/grep.c:811

7006 +#: builtin/grep.c:813

7007 msgid "no pattern given."

7008 msgstr "未提供模式匹配。"

7009

6739 -#: builtin/grep.c:843 builtin/index-pack.c:1475

7010 +#: builtin/grep.c:845 builtin/index-pack.c:1477

7011 #, c-format

7012 msgid "invalid number of threads specified (%d)"

7013 msgstr "指定的线程数无效（%d）"

7014

6744 -#: builtin/grep.c:873

7015 +#: builtin/grep.c:875

7016 msgid "--open-files-in-pager only works on the worktree"

7017 msgstr "--open-files-in-pager 仅用于工作区"

7018

6748 -#: builtin/grep.c:899

7019 +#: builtin/grep.c:901

7020 msgid "--cached or --untracked cannot be used with --no-index."

7021 msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"

7022

6752 -#: builtin/grep.c:904

7023 +#: builtin/grep.c:906

7024 msgid "--no-index or --untracked cannot be used with revs."

7025 msgstr "--no-index 或 --untracked 不能和版本同时使用。"

7026

l10n: zh_CN: for git v2.9.0 l10n round 1