5c57d7622e · 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-05-24 23:42+0800\n"

139 -"PO-Revision-Date: 2016-06-06 23:05+0800\n"

138 +"POT-Creation-Date: 2016-08-27 23:21+0800\n"

139 +"PO-Revision-Date: 2016-08-31 00:11+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"

@@ -150,7 +150,32 @@ msgstr ""

150 msgid "hint: %.*s\n"

151 msgstr "提示：%.*s\n"

152

153 -#: advice.c:88

153 +#: advice.c:83

154 +msgid "Cherry-picking is not possible because you have unmerged files."

155 +msgstr "无法拣选，因为您有未合并的文件。"

156 +

157 +#: advice.c:85

158 +msgid "Committing is not possible because you have unmerged files."

159 +msgstr "无法提交，因为您有未合并的文件。"

160 +

161 +#: advice.c:87

162 +msgid "Merging is not possible because you have unmerged files."

163 +msgstr "无法合并，因为您有未合并的文件。"

164 +

165 +#: advice.c:89

166 +msgid "Pulling is not possible because you have unmerged files."

167 +msgstr "无法拉取，因为您有未合并的文件。"

168 +

169 +#: advice.c:91

170 +msgid "Reverting is not possible because you have unmerged files."

171 +msgstr "无法回退，因为您有未合并的文件。"

172 +

173 +#: advice.c:93

174 +#, c-format

175 +msgid "It is not possible to %s because you have unmerged files."

176 +msgstr "无法 %s，因为您有未合并的文件。"

177 +

178 +#: advice.c:101

179 msgid ""

180 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"

181 "as appropriate to mark resolution and make a commit."

@@ -158,18 +183,48 @@ msgstr ""

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

184 "解决方案并提交。"

185

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

186 +#: advice.c:109

187 +msgid "Exiting because of an unresolved conflict."

188 +msgstr "因为存在未解决的冲突而退出。"

189 +

190 +#: advice.c:114 builtin/merge.c:1181

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

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

193

165 -#: advice.c:103

194 +#: advice.c:116

195 msgid "Please, commit your changes before merging."

196 msgstr "请在合并前先提交您的修改。"

197

169 -#: advice.c:104

198 +#: advice.c:117

199 msgid "Exiting because of unfinished merge."

200 msgstr "因为存在未完成的合并而退出。"

201

202 +#: advice.c:123

203 +#, c-format

204 +msgid ""

205 +"Note: checking out '%s'.\n"

206 +"\n"

207 +"You are in 'detached HEAD' state. You can look around, make experimental\n"

208 +"changes and commit them, and you can discard any commits you make in this\n"

209 +"state without impacting any branches by performing another checkout.\n"

210 +"\n"

211 +"If you want to create a new branch to retain commits you create, you may\n"

212 +"do so (now or later) by using -b with the checkout command again. Example:\n"

213 +"\n"

214 +" git checkout -b <new-branch-name>\n"

215 +"\n"

216 +msgstr ""

217 +"注意：正在检出 '%s'。\n"

218 +"\n"

219 +"您正处于分离头指针状态。您可以查看、做试验性的修改及提交，并且您可以通过另外\n"

220 +"的检出分支操作丢弃在这个状态下所做的任何提交。\n"

221 +"\n"

222 +"如果您想要通过创建分支来保留在此状态下所做的提交，您可以通过在检出命令添加\n"

223 +"参数 -b 来实现（现在或稍后）。例如：\n"

224 +"\n"

225 +" git checkout -b <new-branch-name>\n"

226 +"\n"

227 +

228 #: archive.c:12

229 msgid "git archive [<options>] <tree-ish> [<path>...]"

230 msgstr "git archive [<选项>] <树或提交> [<路径>...]"

@@ -188,7 +243,7 @@ msgstr ""

243 msgid "git archive --remote <repo> [--exec <cmd>] --list"

244 msgstr "git archive --remote <仓库> [--exec <命令>] --list"

245

191 -#: archive.c:344 builtin/add.c:137 builtin/add.c:420 builtin/rm.c:327

246 +#: archive.c:344 builtin/add.c:139 builtin/add.c:435 builtin/rm.c:327

247 #, c-format

248 msgid "pathspec '%s' did not match any files"

249 msgstr "路径规格 '%s' 未匹配任何文件"

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

256 msgid "archive format"

257 msgstr "归档格式"

258

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

259 +#: archive.c:430 builtin/log.c:1422

260 msgid "prefix"

261 msgstr "前缀"

262

@@ -209,11 +264,11 @@ msgstr "前缀"

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

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

266

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

267 +#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2553

268 +#: builtin/blame.c:2554 builtin/config.c:59 builtin/fast-export.c:987

269 #: 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

270 +#: builtin/ls-files.c:460 builtin/ls-files.c:463 builtin/notes.c:399

271 +#: builtin/notes.c:562 builtin/read-tree.c:109 parse-options.h:153

272 msgid "file"

273 msgstr "文件"

274

@@ -246,7 +301,7 @@ msgid "list supported archive formats"

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

302

303 #: archive.c:451 builtin/archive.c:90 builtin/clone.c:82

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

304 +#: builtin/submodule--helper.c:832

305 msgid "repo"

306 msgstr "仓库"

307

@@ -254,7 +309,7 @@ msgstr "仓库"

309 msgid "retrieve the archive from remote repository <repo>"

310 msgstr "从远程仓库（<仓库>）提取归档文件"

311

257 -#: archive.c:453 builtin/archive.c:92 builtin/notes.c:482

312 +#: archive.c:453 builtin/archive.c:92 builtin/notes.c:483

313 msgid "command"

314 msgstr "命令"

315

@@ -262,6 +317,28 @@ msgstr "命令"

317 msgid "path to the remote git-upload-archive command"

318 msgstr "远程 git-upload-archive 命令的路径"

319

320 +#: archive.c:461

321 +msgid "Unexpected option --remote"

322 +msgstr "意外的选项 --remote"

323 +

324 +#: archive.c:463

325 +msgid "Option --exec can only be used together with --remote"

326 +msgstr "选项 --exec 只能和 --remote 同时使用"

327 +

328 +#: archive.c:465

329 +msgid "Unexpected option --output"

330 +msgstr "未知参数 --output"

331 +

332 +#: archive.c:487

333 +#, c-format

334 +msgid "Unknown archive format '%s'"

335 +msgstr "未知归档格式 '%s'"

336 +

337 +#: archive.c:494

338 +#, c-format

339 +msgid "Argument not supported for format '%s': -%d"

340 +msgstr "参数不支持此格式 '%s'：-%d"

341 +

342 #: attr.c:263

343 msgid ""

344 "Negative patterns are ignored in git attributes\n"

@@ -270,6 +347,129 @@ msgstr ""

347 "负值模版在 git attributes 中被忽略\n"

348 "当字符串确实要以感叹号开始时，使用 '\\!'。"

349

350 +#: bisect.c:441

351 +#, c-format

352 +msgid "Could not open file '%s'"

353 +msgstr "不能打开文件 '%s'"

354 +

355 +#: bisect.c:446

356 +#, c-format

357 +msgid "Badly quoted content in file '%s': %s"

358 +msgstr "文件 '%s' 包含错误的引用格式：%s"

359 +

360 +#: bisect.c:655

361 +#, c-format

362 +msgid "We cannot bisect more!\n"

363 +msgstr "我们无法进行更多的二分查找！\n"

364 +

365 +#: bisect.c:708

366 +#, c-format

367 +msgid "Not a valid commit name %s"

368 +msgstr "不是一个有效的提交名 %s"

369 +

370 +#: bisect.c:732

371 +#, c-format

372 +msgid ""

373 +"The merge base %s is bad.\n"

374 +"This means the bug has been fixed between %s and [%s].\n"

375 +msgstr ""

376 +"合并基线 %s 是坏的。\n"

377 +"这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"

378 +

379 +#: bisect.c:737

380 +#, c-format

381 +msgid ""

382 +"The merge base %s is new.\n"

383 +"The property has changed between %s and [%s].\n"

384 +msgstr ""

385 +"合并基线 %s 是新的。\n"

386 +"介于 %s 和 [%s] 之间的属性已经被修改。\n"

387 +

388 +#: bisect.c:742

389 +#, c-format

390 +msgid ""

391 +"The merge base %s is %s.\n"

392 +"This means the first '%s' commit is between %s and [%s].\n"

393 +msgstr ""

394 +"合并基线 %s 是 %s。\n"

395 +"这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"

396 +

397 +#: bisect.c:750

398 +#, c-format

399 +msgid ""

400 +"Some %s revs are not ancestor of the %s rev.\n"

401 +"git bisect cannot work properly in this case.\n"

402 +"Maybe you mistook %s and %s revs?\n"

403 +msgstr ""

404 +"一些 %s 版本不是 %s 版本的祖先。\n"

405 +"这种情况下 git 二分查找无法正常工作。\n"

406 +"您可能弄错了 %s 和 %s 版本？\n"

407 +

408 +#: bisect.c:763

409 +#, c-format

410 +msgid ""

411 +"the merge base between %s and [%s] must be skipped.\n"

412 +"So we cannot be sure the first %s commit is between %s and %s.\n"

413 +"We continue anyway."

414 +msgstr ""

415 +"介于 %s 和 [%s] 的合并基线一定被忽略了。\n"

416 +"所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"

417 +"我们仍旧继续。"

418 +

419 +#: bisect.c:798

420 +#, c-format

421 +msgid "Bisecting: a merge base must be tested\n"

422 +msgstr "二分查找中：合并基线必须要测试\n"

423 +

424 +#: bisect.c:849

425 +#, c-format

426 +msgid "a %s revision is needed"

427 +msgstr "需要一个 %s 版本"

428 +

429 +#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248

430 +#, c-format

431 +msgid "could not create file '%s'"

432 +msgstr "不能创建文件 '%s'"

433 +

434 +#: bisect.c:917

435 +#, c-format

436 +msgid "could not read file '%s'"

437 +msgstr "不能读取文件 '%s'"

438 +

439 +#: bisect.c:947

440 +msgid "reading bisect refs failed"

441 +msgstr "读取二分查找引用失败"

442 +

443 +#: bisect.c:967

444 +#, c-format

445 +msgid "%s was both %s and %s\n"

446 +msgstr "%s 同时为 %s 和 %s\n"

447 +

448 +#: bisect.c:975

449 +#, c-format

450 +msgid ""

451 +"No testable commit found.\n"

452 +"Maybe you started with bad path parameters?\n"

453 +msgstr ""

454 +"没有发现可测试的提交。\n"

455 +"可能您在运行时使用了错误的路径参数？\n"

456 +

457 +#: bisect.c:994

458 +#, c-format

459 +msgid "(roughly %d step)"

460 +msgid_plural "(roughly %d steps)"

461 +msgstr[0] "（大概 %d 步）"

462 +msgstr[1] "（大概 %d 步）"

463 +

464 +#. TRANSLATORS: the last %s will be replaced with

465 +#. "(roughly %d steps)" translation

466 +#: bisect.c:998

467 +#, c-format

468 +msgid "Bisecting: %d revision left to test after this %s\n"

469 +msgid_plural "Bisecting: %d revisions left to test after this %s\n"

470 +msgstr[0] "二分查找中：在 %2$s 之后还剩下 %1$d 个版本\n"

471 +msgstr[1] "二分查找中：在 %2$s 之后还剩下 %1$d 个版本\n"

472 +

473 #: branch.c:53

474 #, c-format

475 msgid ""

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

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

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

615

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

616 +#: bundle.c:87 builtin/commit.c:778

617 #, c-format

618 msgid "could not open '%s'"

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

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

622 msgid "Repository lacks these prerequisite commits:"

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

624

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

625 +#: bundle.c:163 ref-filter.c:1462 sequencer.c:630 sequencer.c:1085

626 +#: builtin/blame.c:2763 builtin/commit.c:1057 builtin/log.c:348

627 +#: builtin/log.c:890 builtin/log.c:1336 builtin/log.c:1659 builtin/log.c:1901

628 +#: builtin/merge.c:356 builtin/shortlog.c:170

629 msgid "revision walk setup failed"

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

631

@@ -464,7 +664,7 @@ msgstr "rev-list 终止"

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

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

666

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

667 +#: bundle.c:443 builtin/log.c:165 builtin/log.c:1565 builtin/shortlog.c:273

668 #, c-format

669 msgid "unrecognized argument: %s"

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

@@ -482,13 +682,13 @@ msgstr "不能创建 '%s'"

682 msgid "index-pack died"

683 msgstr "index-pack 终止"

684

485 -#: color.c:275

685 +#: color.c:290

686 #, c-format

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

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

689

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

491 -#: builtin/am.c:2134

690 +#: commit.c:40 builtin/am.c:433 builtin/am.c:469 builtin/am.c:1505

691 +#: builtin/am.c:2119

692 #, c-format

693 msgid "could not parse %s"

694 msgstr "不能解析 %s"

@@ -502,128 +702,190 @@ msgstr "%s %s 不是一个提交!"

702 msgid "memory exhausted"

703 msgstr "内存耗尽"

704

505 -#: config.c:475 config.c:477

705 +#: config.c:516

706 +#, c-format

707 +msgid "bad config line %d in blob %s"

708 +msgstr "数据对象 %2$s 中错误的配置行 %1$d"

709 +

710 +#: config.c:520

711 +#, c-format

712 +msgid "bad config line %d in file %s"

713 +msgstr "文件 %2$s 中错误的配置行 %1$d"

714 +

715 +#: config.c:524

716 #, c-format

507 -msgid "bad config line %d in %s %s"

508 -msgstr "%2$s %3$s 出错于第 %1$d 行"

717 +msgid "bad config line %d in standard input"

718 +msgstr "标准输入中错误的配置行 %d"

719

510 -#: config.c:593

720 +#: config.c:528

721 #, c-format

512 -msgid "bad numeric config value '%s' for '%s' in %s %s: %s"

513 -msgstr "%3$s %4$s 中配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %5$s"

722 +msgid "bad config line %d in submodule-blob %s"

723 +msgstr "子模组数据 %2$s 中错误的配置行 %1$d"

724

515 -#: config.c:595

725 +#: config.c:532

726 +#, c-format

727 +msgid "bad config line %d in command line %s"

728 +msgstr "命令行 %2$s 中错误的配置行 %1$d"

729 +

730 +#: config.c:536

731 +#, c-format

732 +msgid "bad config line %d in %s"

733 +msgstr "在 %2$s 中错误的配置行 %1$d"

734 +

735 +#: config.c:655

736 +msgid "out of range"

737 +msgstr "超出范围"

738 +

739 +#: config.c:655

740 +msgid "invalid unit"

741 +msgstr "无效的单位"

742 +

743 +#: config.c:661

744 #, c-format

745 msgid "bad numeric config value '%s' for '%s': %s"

746 msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %3$s"

747

520 -#: config.c:680

748 +#: config.c:666

749 +#, c-format

750 +msgid "bad numeric config value '%s' for '%s' in blob %s: %s"

751 +msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s': %4$s"

752 +

753 +#: config.c:669

754 +#, c-format

755 +msgid "bad numeric config value '%s' for '%s' in file %s: %s"

756 +msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s': %4$s"

757 +

758 +#: config.c:672

759 +#, c-format

760 +msgid "bad numeric config value '%s' for '%s' in standard input: %s"

761 +msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s': %3$s"

762 +

763 +#: config.c:675

764 +#, c-format

765 +msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"

766 +msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s': %4$s"

767 +

768 +#: config.c:678

769 +#, c-format

770 +msgid "bad numeric config value '%s' for '%s' in command line %s: %s"

771 +msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s': %4$s"

772 +

773 +#: config.c:681

774 +#, c-format

775 +msgid "bad numeric config value '%s' for '%s' in %s: %s"

776 +msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s': %4$s"

777 +

778 +#: config.c:768

779 #, c-format

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

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

782

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

783 +#: config.c:849 config.c:860

784 #, c-format

785 msgid "bad zlib compression level %d"

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

787

530 -#: config.c:890

788 +#: config.c:978

789 #, c-format

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

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

792

535 -#: config.c:1228

793 +#: config.c:1312

794 msgid "unable to parse command-line config"

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

796

539 -#: config.c:1284

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

797 +#: config.c:1362

798 +msgid "unknown error occurred while reading the configuration files"

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

800

543 -#: config.c:1629

801 +#: config.c:1716

802 #, c-format

803 msgid "unable to parse '%s' from command-line config"

804 msgstr "无法解析命令行配置中的 '%s'"

805

548 -#: config.c:1631

806 +#: config.c:1718

807 #, c-format

808 msgid "bad config variable '%s' in file '%s' at line %d"

809 msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"

810

553 -#: config.c:1690

811 +#: config.c:1777

812 #, c-format

813 msgid "%s has multiple values"

814 msgstr "%s 有多个取值"

815

558 -#: config.c:2224

816 +#: config.c:2311

817 #, c-format

818 msgid "could not set '%s' to '%s'"

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

820

563 -#: config.c:2226

821 +#: config.c:2313

822 #, c-format

823 msgid "could not unset '%s'"

824 msgstr "不能取消设置 '%s'"

825

568 -#: connected.c:69

826 +#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140

827 +msgid "Checking connectivity"

828 +msgstr "检查连接中"

829 +

830 +#: connected.c:74

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

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

833

572 -#: connected.c:89

834 +#: connected.c:94

835 msgid "failed write to rev-list"

836 msgstr "无法写入 rev-list"

837

576 -#: connected.c:96

838 +#: connected.c:101

839 msgid "failed to close rev-list's stdin"

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

841

580 -#: date.c:95

842 +#: date.c:97

843 msgid "in the future"

844 msgstr "在将来"

845

584 -#: date.c:101

846 +#: date.c:103

847 #, c-format

848 msgid "%lu second ago"

849 msgid_plural "%lu seconds ago"

850 msgstr[0] "%lu 秒钟前"

851 msgstr[1] "%lu 秒钟前"

852

591 -#: date.c:108

853 +#: date.c:110

854 #, c-format

855 msgid "%lu minute ago"

856 msgid_plural "%lu minutes ago"

857 msgstr[0] "%lu 分钟前"

858 msgstr[1] "%lu 分钟前"

859

598 -#: date.c:115

860 +#: date.c:117

861 #, c-format

862 msgid "%lu hour ago"

863 msgid_plural "%lu hours ago"

864 msgstr[0] "%lu 小时前"

865 msgstr[1] "%lu 小时前"

866

605 -#: date.c:122

867 +#: date.c:124

868 #, c-format

869 msgid "%lu day ago"

870 msgid_plural "%lu days ago"

871 msgstr[0] "%lu 天前"

872 msgstr[1] "%lu 天前"

873

612 -#: date.c:128

874 +#: date.c:130

875 #, c-format

876 msgid "%lu week ago"

877 msgid_plural "%lu weeks ago"

878 msgstr[0] "%lu 周前"

879 msgstr[1] "%lu 周前"

880

619 -#: date.c:135

881 +#: date.c:137

882 #, c-format

883 msgid "%lu month ago"

884 msgid_plural "%lu months ago"

885 msgstr[0] "%lu 个月前"

886 msgstr[1] "%lu 个月前"

887

626 -#: date.c:146

888 +#: date.c:148

889 #, c-format

890 msgid "%lu year"

891 msgid_plural "%lu years"

@@ -631,14 +893,14 @@ msgstr[0] "%lu 年"

893 msgstr[1] "%lu 年"

894

895 #. TRANSLATORS: "%s" is "<n> years"

634 -#: date.c:149

896 +#: date.c:151

897 #, c-format

898 msgid "%s, %lu month ago"

899 msgid_plural "%s, %lu months ago"

900 msgstr[0] "%s %lu 个月前"

901 msgstr[1] "%s %lu 个月前"

902

641 -#: date.c:154 date.c:159

903 +#: date.c:156 date.c:161

904 #, c-format

905 msgid "%lu year ago"

906 msgid_plural "%lu years ago"

@@ -650,7 +912,7 @@ msgstr[1] "%lu 年前"

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

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

914

653 -#: diffcore-rename.c:538

915 +#: diffcore-rename.c:540

916 msgid "Performing inexact rename detection"

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

918

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

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

943 "%s"

944

683 -#: diff.c:3007

945 +#: diff.c:3017

946 #, c-format

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

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

949

688 -#: diff.c:3405

950 +#: diff.c:3415

951 msgid "--follow requires exactly one pathspec"

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

953

692 -#: diff.c:3568

954 +#: diff.c:3578

955 #, c-format

956 msgid ""

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

@@ -698,7 +960,7 @@ msgstr ""

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

961 "%s"

962

701 -#: diff.c:3582

963 +#: diff.c:3592

964 #, c-format

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

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

@@ -711,39 +973,30 @@ msgstr "无法获得内核名称和信息"

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

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

975

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

715 -msgid "could not run gpg."

716 -msgstr "不能执行 gpg。"

717 -

976 #: gpg-interface.c:178

719 -msgid "gpg did not accept the data"

720 -msgstr "gpg 没有接受数据"

721 -

722 -#: gpg-interface.c:189

977 msgid "gpg failed to sign the data"

978 msgstr "gpg 无法为数据签名"

979

726 -#: gpg-interface.c:222

727 -#, c-format

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

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

980 +#: gpg-interface.c:208

981 +msgid "could not create temporary file"

982 +msgstr "不能创建临时文件"

983

731 -#: gpg-interface.c:224

984 +#: gpg-interface.c:210

985 #, c-format

986 msgid "failed writing detached signature to '%s'"

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

988

736 -#: grep.c:1718

989 +#: grep.c:1792

990 #, c-format

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

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

993

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

994 +#: grep.c:1809 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155

995 #, c-format

996 msgid "failed to stat '%s'"

997 msgstr "无法枚举 '%s' 状态"

998

746 -#: grep.c:1746

999 +#: grep.c:1820

1000 #, c-format

1001 msgid "'%s': short read"

1002 msgstr "'%s'：读取不完整"

@@ -793,7 +1046,7 @@ msgstr "在 %0.1f 秒钟后自动运行..."

1046 msgid "git: '%s' is not a git command. See 'git --help'."

1047 msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。"

1048

796 -#: help.c:404 help.c:464

1049 +#: help.c:404 help.c:470

1050 msgid ""

1051 "\n"

1052 "Did you mean this?"

@@ -807,7 +1060,7 @@ msgstr[1] ""

1060 "\n"

1061 "您指的是这其中的某一个么？"

1062

810 -#: help.c:460

1063 +#: help.c:466

1064 #, c-format

1065 msgid "%s: %s - %s"

1066 msgstr "%s：%s - %s"

@@ -839,83 +1092,78 @@ msgstr "不能创建 '%s.lock'：%s"

1092 msgid "failed to read the cache"

1093 msgstr "无法读取缓存"

1094

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

1095 +#: merge.c:94 builtin/am.c:1992 builtin/am.c:2027 builtin/checkout.c:375

1096 +#: builtin/checkout.c:589 builtin/clone.c:732

1097 msgid "unable to write new index file"

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

1099

847 -#: merge-recursive.c:189

848 -#, c-format

1100 +#: merge-recursive.c:209

1101 msgid "(bad commit)\n"

1102 msgstr "（坏提交）\n"

1103

852 -#: merge-recursive.c:209

1104 +#: merge-recursive.c:231

1105 #, c-format

1106 msgid "addinfo_cache failed for path '%s'"

1107 msgstr "为路径 '%s' addinfo_cache 失败"

1108

857 -#: merge-recursive.c:270

1109 +#: merge-recursive.c:301

1110 msgid "error building trees"

1111 msgstr "无法创建树"

1112

861 -#: merge-recursive.c:689

1113 +#: merge-recursive.c:720

1114 #, c-format

1115 msgid "failed to create path '%s'%s"

1116 msgstr "无法创建路径 '%s'%s"

1117

866 -#: merge-recursive.c:700

1118 +#: merge-recursive.c:731

1119 #, c-format

1120 msgid "Removing %s to make room for subdirectory\n"

1121 msgstr "删除 %s 以便为子目录留出空间\n"

1122

871 -#: merge-recursive.c:714 merge-recursive.c:735

1123 +#: merge-recursive.c:745 merge-recursive.c:764

1124 msgid ": perhaps a D/F conflict?"

1125 msgstr "：可能是一个目录/文件冲突？"

1126

875 -#: merge-recursive.c:725

1127 +#: merge-recursive.c:754

1128 #, c-format

1129 msgid "refusing to lose untracked file at '%s'"

1130 msgstr "拒绝丢弃 '%s' 中的未跟踪文件"

1131

880 -#: merge-recursive.c:765

1132 +#: merge-recursive.c:796

1133 #, c-format

1134 msgid "cannot read object %s '%s'"

1135 msgstr "不能读取对象 %s '%s'"

1136

885 -#: merge-recursive.c:767

1137 +#: merge-recursive.c:798

1138 #, c-format

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

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

1141

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

1142 +#: merge-recursive.c:822

1143 #, c-format

892 -msgid "failed to open '%s'"

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

1144 +msgid "failed to open '%s': %s"

1145 +msgstr "无法打开 '%s'：%s"

1146

895 -#: merge-recursive.c:798

1147 +#: merge-recursive.c:833

1148 #, c-format

897 -msgid "failed to symlink '%s'"

898 -msgstr "无法创建符号链接 '%s'"

1149 +msgid "failed to symlink '%s': %s"

1150 +msgstr "无法创建符号链接 '%s'：%s"

1151

900 -#: merge-recursive.c:801

1152 +#: merge-recursive.c:838

1153 #, c-format

1154 msgid "do not know what to do with %06o %s '%s'"

1155 msgstr "不知道如何处理 %06o %s '%s'"

1156

905 -#: merge-recursive.c:939

1157 +#: merge-recursive.c:978

1158 msgid "Failed to execute internal merge"

1159 msgstr "无法执行内部合并"

1160

909 -#: merge-recursive.c:943

1161 +#: merge-recursive.c:982

1162 #, c-format

1163 msgid "Unable to add %s to database"

1164 msgstr "不能添加 %s 至对象库"

1165

914 -#: merge-recursive.c:959

915 -msgid "unsupported object type in the tree"

916 -msgstr "在树中有不支持的对象类型"

917 -

918 -#: merge-recursive.c:1034 merge-recursive.c:1048

1166 +#: merge-recursive.c:1081 merge-recursive.c:1095

1167 #, c-format

1168 msgid ""

1169 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

@@ -924,7 +1172,7 @@ msgstr ""

1172 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s 中"

1173 "的版本被保留。"

1174

927 -#: merge-recursive.c:1040 merge-recursive.c:1053

1175 +#: merge-recursive.c:1087 merge-recursive.c:1100

1176 #, c-format

1177 msgid ""

1178 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

@@ -933,20 +1181,20 @@ msgstr ""

1181 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s 中"

1182 "的版本保留于 %8$s 中。"

1183

936 -#: merge-recursive.c:1094

1184 +#: merge-recursive.c:1143

1185 msgid "rename"

1186 msgstr "重命名"

1187

940 -#: merge-recursive.c:1094

1188 +#: merge-recursive.c:1143

1189 msgid "renamed"

1190 msgstr "重命名"

1191

944 -#: merge-recursive.c:1150

1192 +#: merge-recursive.c:1200

1193 #, c-format

1194 msgid "%s is a directory in %s adding as %s instead"

1195 msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"

1196

949 -#: merge-recursive.c:1172

1197 +#: merge-recursive.c:1225

1198 #, c-format

1199 msgid ""

1200 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"

@@ -955,144 +1203,135 @@ msgstr ""

1203 "冲突（重命名/重命名）：在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\"，在分支 "

1204 "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"

1205

958 -#: merge-recursive.c:1177

1206 +#: merge-recursive.c:1230

1207 msgid " (left unresolved)"

1208 msgstr "（留下未解决）"

1209

962 -#: merge-recursive.c:1231

1210 +#: merge-recursive.c:1292

1211 #, c-format

1212 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"

1213 msgstr ""

1214 "冲突（重命名/重命名）：在 %3$s 中重命名 %1$s->%2$s，在 %6$s 中重命名 %4$s->"

1215 "%5$s"

1216

969 -#: merge-recursive.c:1261

1217 +#: merge-recursive.c:1325

1218 #, c-format

1219 msgid "Renaming %s to %s and %s to %s instead"

1220 msgstr "而是重命名 %s 至 %s，以及 %s 至 %s"

1221

974 -#: merge-recursive.c:1460

1222 +#: merge-recursive.c:1531

1223 #, c-format

1224 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"

1225 msgstr "冲突（重命名/添加）：在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"

1226

979 -#: merge-recursive.c:1470

1227 +#: merge-recursive.c:1546

1228 #, c-format

1229 msgid "Adding merged %s"

1230 msgstr "添加合并后的 %s"

1231

984 -#: merge-recursive.c:1475 merge-recursive.c:1677

1232 +#: merge-recursive.c:1553 merge-recursive.c:1766

1233 #, c-format

1234 msgid "Adding as %s instead"

1235 msgstr "而是以 %s 为名添加"

1236

989 -#: merge-recursive.c:1526

1237 +#: merge-recursive.c:1610

1238 #, c-format

1239 msgid "cannot read object %s"

1240 msgstr "不能读取对象 %s"

1241

994 -#: merge-recursive.c:1529

1242 +#: merge-recursive.c:1613

1243 #, c-format

1244 msgid "object %s is not a blob"

1245 msgstr "对象 %s 不是一个数据对象"

1246

999 -#: merge-recursive.c:1581

1247 +#: merge-recursive.c:1666

1248 msgid "modify"

1249 msgstr "修改"

1250

1003 -#: merge-recursive.c:1581

1251 +#: merge-recursive.c:1666

1252 msgid "modified"

1253 msgstr "修改"

1254

1007 -#: merge-recursive.c:1591

1255 +#: merge-recursive.c:1676

1256 msgid "content"

1257 msgstr "内容"

1258

1011 -#: merge-recursive.c:1598

1259 +#: merge-recursive.c:1683

1260 msgid "add/add"

1261 msgstr "添加/添加"

1262

1015 -#: merge-recursive.c:1632

1263 +#: merge-recursive.c:1718

1264 #, c-format

1265 msgid "Skipped %s (merged same as existing)"

1266 msgstr "略过 %s（已经做过相同合并）"

1267

1020 -#: merge-recursive.c:1646

1268 +#: merge-recursive.c:1732

1269 #, c-format

1270 msgid "Auto-merging %s"

1271 msgstr "自动合并 %s"

1272

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

1273 +#: merge-recursive.c:1736 git-submodule.sh:919

1274 msgid "submodule"

1275 msgstr "子模组"

1276

1029 -#: merge-recursive.c:1651

1277 +#: merge-recursive.c:1737

1278 #, c-format

1279 msgid "CONFLICT (%s): Merge conflict in %s"

1280 msgstr "冲突（%s）：合并冲突于 %s"

1281

1034 -#: merge-recursive.c:1737

1282 +#: merge-recursive.c:1831

1283 #, c-format

1284 msgid "Removing %s"

1285 msgstr "删除 %s"

1286

1039 -#: merge-recursive.c:1762

1287 +#: merge-recursive.c:1857

1288 msgid "file/directory"

1289 msgstr "文件/目录"

1290

1043 -#: merge-recursive.c:1768

1291 +#: merge-recursive.c:1863

1292 msgid "directory/file"

1293 msgstr "目录/文件"

1294

1047 -#: merge-recursive.c:1773

1295 +#: merge-recursive.c:1868

1296 #, c-format

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

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

1299

1052 -#: merge-recursive.c:1781

1300 +#: merge-recursive.c:1877

1301 #, c-format

1302 msgid "Adding %s"

1303 msgstr "添加 %s"

1304

1057 -#: merge-recursive.c:1798

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

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

1060 -

1061 -#: merge-recursive.c:1817

1305 +#: merge-recursive.c:1914

1306 msgid "Already up-to-date!"

1307 msgstr "已经是最新的！"

1308

1065 -#: merge-recursive.c:1826

1309 +#: merge-recursive.c:1923

1310 #, c-format

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

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

1313

1070 -#: merge-recursive.c:1856

1071 -#, c-format

1072 -msgid "Unprocessed path??? %s"

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

1074 -

1075 -#: merge-recursive.c:1904

1314 +#: merge-recursive.c:2006

1315 msgid "Merging:"

1316 msgstr "合并："

1317

1079 -#: merge-recursive.c:1917

1318 +#: merge-recursive.c:2019

1319 #, c-format

1320 msgid "found %u common ancestor:"

1321 msgid_plural "found %u common ancestors:"

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

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

1324

1086 -#: merge-recursive.c:1954

1325 +#: merge-recursive.c:2058

1326 msgid "merge returned no commit"

1327 msgstr "合并未返回提交"

1328

1090 -#: merge-recursive.c:2011

1329 +#: merge-recursive.c:2121

1330 #, c-format

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

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

1333

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

1334 +#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788

1335 msgid "Unable to write index."

1336 msgstr "不能写入索引。"

1337

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

1392 msgid "malformed object name '%s'"

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

1394

1156 -#: path.c:796

1395 +#: path.c:798

1396 #, c-format

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

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

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

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

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

1461

1223 -#: pretty.c:971

1462 +#: pretty.c:973

1463 msgid "unable to parse --pretty format"

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

1465

@@ -1246,23 +1485,22 @@ msgstr ""

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

1486 "使用版本 %i"

1487

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

1250 -#: builtin/merge.c:995

1488 +#: refs.c:551 builtin/merge.c:840

1489 #, c-format

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

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

1492

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

1493 +#: refs/files-backend.c:2534

1494 #, c-format

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

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

1497

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

1498 +#: refs/files-backend.c:2537

1499 #, c-format

1500 msgid "could not delete references: %s"

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

1502

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

1503 +#: refs/files-backend.c:2546

1504 #, c-format

1505 msgid "could not remove reference %s"

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

@@ -1420,74 +1658,74 @@ msgstr "%s 同时跟踪 %s 和 %s"

1658 msgid "Internal error"

1659 msgstr "内部错误"

1660

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

1661 +#: remote.c:1677 remote.c:1720

1662 msgid "HEAD does not point to a branch"

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

1664

1427 -#: remote.c:1687

1665 +#: remote.c:1686

1666 #, c-format

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

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

1669

1432 -#: remote.c:1690

1670 +#: remote.c:1689

1671 #, c-format

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

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

1674

1437 -#: remote.c:1696

1675 +#: remote.c:1695

1676 #, c-format

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

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

1679

1442 -#: remote.c:1711

1680 +#: remote.c:1710

1681 #, c-format

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

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

1684

1447 -#: remote.c:1726

1685 +#: remote.c:1725

1686 #, c-format

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

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

1689

1452 -#: remote.c:1737

1690 +#: remote.c:1736

1691 #, c-format

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

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

1694

1457 -#: remote.c:1750

1695 +#: remote.c:1749

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

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

1698

1461 -#: remote.c:1772

1699 +#: remote.c:1771

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

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

1702

1465 -#: remote.c:2074

1703 +#: remote.c:2073

1704 #, c-format

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

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

1707

1470 -#: remote.c:2078

1708 +#: remote.c:2077

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

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

1711

1474 -#: remote.c:2081

1712 +#: remote.c:2080

1713 #, c-format

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

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

1716

1479 -#: remote.c:2085

1717 +#: remote.c:2084

1718 #, c-format

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

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

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

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

1723

1486 -#: remote.c:2091

1724 +#: remote.c:2090

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

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

1727

1490 -#: remote.c:2094

1728 +#: remote.c:2093

1729 #, c-format

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

1731 msgid_plural ""

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

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

1735

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

1499 -#: remote.c:2102

1737 +#: remote.c:2101

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

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

1740

1503 -#: remote.c:2105

1741 +#: remote.c:2104

1742 #, c-format

1743 msgid ""

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

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

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

1755

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

1519 -#: remote.c:2115

1757 +#: remote.c:2114

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

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

1760

1523 -#: revision.c:2142

1761 +#: revision.c:2132

1762 msgid "your current branch appears to be broken"

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

1764

1527 -#: revision.c:2145

1765 +#: revision.c:2135

1766 #, c-format

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

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

1769

1532 -#: revision.c:2339

1770 +#: revision.c:2329

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

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

1773

@@ -1542,24 +1780,28 @@ msgstr "不能打开 /dev/null"

1780 msgid "dup2(%d,%d) failed"

1781 msgstr "不能调用 dup2(%d,%d)"

1782

1545 -#: send-pack.c:295

1783 +#: send-pack.c:298

1784 msgid "failed to sign the push certificate"

1785 msgstr "无法为推送证书签名"

1786

1549 -#: send-pack.c:404

1787 +#: send-pack.c:411

1788 msgid "the receiving end does not support --signed push"

1789 msgstr "接收端不支持签名推送"

1790

1553 -#: send-pack.c:406

1791 +#: send-pack.c:413

1792 msgid ""

1793 "not sending a push certificate since the receiving end does not support --"

1794 "signed push"

1795 msgstr "未发送推送证书，因为接收端不支持签名推送"

1796

1559 -#: send-pack.c:418

1797 +#: send-pack.c:425

1798 msgid "the receiving end does not support --atomic push"

1799 msgstr "接收端不支持原子推送"

1800

1801 +#: send-pack.c:430

1802 +msgid "the receiving end does not support push options"

1803 +msgstr "接收端不支持推送选项"

1804 +

1805 #: sequencer.c:174

1806 msgid ""

1807 "after resolving the conflicts, mark the corrected paths\n"

@@ -1577,15 +1819,15 @@ msgstr ""

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

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

1821

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

1822 +#: sequencer.c:190 sequencer.c:841 sequencer.c:924

1823 #, c-format

1824 msgid "Could not write to %s"

1825 msgstr "不能写入 %s"

1826

1585 -#: sequencer.c:193

1827 +#: sequencer.c:193 sequencer.c:843 sequencer.c:928

1828 #, c-format

1587 -msgid "Error wrapping up %s"

1588 -msgstr "错误收尾 %s"

1829 +msgid "Error wrapping up %s."

1830 +msgstr "错误收尾 %s。"

1831

1832 #: sequencer.c:208

1833 msgid "Your local changes would be overwritten by cherry-pick."

@@ -1599,202 +1841,240 @@ msgstr "您的本地修改将被还原操作覆盖。"

1841 msgid "Commit your changes or stash them to proceed."

1842 msgstr "提交您的修改或保存进度后再继续。"

1843

1844 +#: sequencer.c:228

1845 +#, c-format

1846 +msgid "%s: fast-forward"

1847 +msgstr "%s：快进"

1848 +

1849 #. TRANSLATORS: %s will be "revert" or "cherry-pick"

1603 -#: sequencer.c:300

1850 +#: sequencer.c:303

1851 #, c-format

1852 msgid "%s: Unable to write new index file"

1853 msgstr "%s：无法写入新索引文件"

1854

1608 -#: sequencer.c:318

1855 +#: sequencer.c:321

1856 msgid "Could not resolve HEAD commit\n"

1857 msgstr "不能解析 HEAD 提交\n"

1858

1612 -#: sequencer.c:338

1859 +#: sequencer.c:341

1860 msgid "Unable to update cache tree\n"

1861 msgstr "不能更新缓存\n"

1862

1616 -#: sequencer.c:390

1863 +#: sequencer.c:393

1864 #, c-format

1865 msgid "Could not parse commit %s\n"

1866 msgstr "不能解析提交 %s\n"

1867

1621 -#: sequencer.c:395

1868 +#: sequencer.c:398

1869 #, c-format

1870 msgid "Could not parse parent commit %s\n"

1871 msgstr "不能解析父提交 %s\n"

1872

1626 -#: sequencer.c:460

1873 +#: sequencer.c:463

1874 msgid "Your index file is unmerged."

1875 msgstr "您的索引文件未完成合并。"

1876

1630 -#: sequencer.c:479

1877 +#: sequencer.c:482

1878 #, c-format

1879 msgid "Commit %s is a merge but no -m option was given."

1880 msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"

1881

1635 -#: sequencer.c:487

1882 +#: sequencer.c:490

1883 #, c-format

1884 msgid "Commit %s does not have parent %d"

1885 msgstr "提交 %s 没有父提交 %d"

1886

1640 -#: sequencer.c:491

1887 +#: sequencer.c:494

1888 #, c-format

1889 msgid "Mainline was specified but commit %s is not a merge."

1890 msgstr "指定了主线但提交 %s 不是一个合并。"

1891

1892 #. TRANSLATORS: The first %s will be "revert" or

1893 #. "cherry-pick", the second %s a SHA1

1647 -#: sequencer.c:504

1894 +#: sequencer.c:507

1895 #, c-format

1896 msgid "%s: cannot parse parent commit %s"

1897 msgstr "%s：不能解析父提交 %s"

1898

1652 -#: sequencer.c:508

1899 +#: sequencer.c:511

1900 #, c-format

1901 msgid "Cannot get commit message for %s"

1902 msgstr "不能得到 %s 的提交说明"

1903

1657 -#: sequencer.c:594

1904 +#: sequencer.c:597

1905 #, c-format

1906 msgid "could not revert %s... %s"

1907 msgstr "不能还原 %s... %s"

1908

1662 -#: sequencer.c:595

1909 +#: sequencer.c:598

1910 #, c-format

1911 msgid "could not apply %s... %s"

1912 msgstr "不能应用 %s... %s"

1913

1667 -#: sequencer.c:630

1914 +#: sequencer.c:633

1915 msgid "empty commit set passed"

1916 msgstr "提供了空的提交集"

1917

1671 -#: sequencer.c:638

1918 +#: sequencer.c:641

1919 #, c-format

1920 msgid "git %s: failed to read the index"

1921 msgstr "git %s：无法读取索引"

1922

1676 -#: sequencer.c:642

1923 +#: sequencer.c:645

1924 #, c-format

1925 msgid "git %s: failed to refresh the index"

1926 msgstr "git %s：无法刷新索引"

1927

1681 -#: sequencer.c:702

1682 -#, c-format

1683 -msgid "Cannot %s during a %s"

1684 -msgstr "无法 %s 在一个 %s 过程中"

1928 +#: sequencer.c:705

1929 +msgid "Cannot revert during another revert."

1930 +msgstr "不能在回退中执行另一回退。"

1931 +

1932 +#: sequencer.c:706

1933 +msgid "Cannot revert during a cherry-pick."

1934 +msgstr "不能在拣选中执行回退。"

1935

1686 -#: sequencer.c:724

1936 +#: sequencer.c:709

1937 +msgid "Cannot cherry-pick during a revert."

1938 +msgstr "不能在回退中执行拣选。"

1939 +

1940 +#: sequencer.c:710

1941 +msgid "Cannot cherry-pick during another cherry-pick."

1942 +msgstr "不能在拣选过程中执行另一拣选。"

1943 +

1944 +#: sequencer.c:732

1945 #, c-format

1946 msgid "Could not parse line %d."

1947 msgstr "不能解析第 %d 行。"

1948

1691 -#: sequencer.c:729

1949 +#: sequencer.c:737

1950 msgid "No commits parsed."

1951 msgstr "没有提交被解析。"

1952

1695 -#: sequencer.c:741

1953 +#: sequencer.c:749

1954 #, c-format

1955 msgid "Could not open %s"

1956 msgstr "不能打开 %s"

1957

1700 -#: sequencer.c:745

1958 +#: sequencer.c:753

1959 #, c-format

1960 msgid "Could not read %s."

1961 msgstr "不能读取 %s。"

1962

1705 -#: sequencer.c:752

1963 +#: sequencer.c:760

1964 #, c-format

1965 msgid "Unusable instruction sheet: %s"

1966 msgstr "无用的指令表单：%s"

1967

1710 -#: sequencer.c:782

1968 +#: sequencer.c:790

1969 #, c-format

1970 msgid "Invalid key: %s"

1971 msgstr "无效键名：%s"

1972

1715 -#: sequencer.c:785 builtin/pull.c:50 builtin/pull.c:52

1973 +#: sequencer.c:793 builtin/pull.c:50 builtin/pull.c:52

1974 #, c-format

1975 msgid "Invalid value for %s: %s"

1976 msgstr "%s 的值无效：%s"

1977

1720 -#: sequencer.c:795

1978 +#: sequencer.c:803

1979 #, c-format

1980 msgid "Malformed options sheet: %s"

1981 msgstr "非法的选项表单：%s"

1982

1725 -#: sequencer.c:814

1983 +#: sequencer.c:822

1984 msgid "a cherry-pick or revert is already in progress"

1985 msgstr "一个拣选或还原操作已在进行"

1986

1729 -#: sequencer.c:815

1987 +#: sequencer.c:823

1988 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""

1989 msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""

1990

1733 -#: sequencer.c:819

1991 +#: sequencer.c:827

1992 #, c-format

1993 msgid "Could not create sequencer directory %s"

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

1995

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

1739 -#, c-format

1740 -msgid "Error wrapping up %s."

1741 -msgstr "错误收尾 %s。"

1742 -

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

1996 +#: sequencer.c:862 sequencer.c:998

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

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

1999

1747 -#: sequencer.c:856

2000 +#: sequencer.c:864

2001 msgid "cannot resolve HEAD"

2002 msgstr "不能解析 HEAD"

2003

1751 -#: sequencer.c:858

2004 +#: sequencer.c:866 sequencer.c:900

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

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

2007

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

2008 +#: sequencer.c:886 builtin/fetch.c:724 builtin/fetch.c:970

2009 #, c-format

2010 msgid "cannot open %s"

2011 msgstr "不能打开 %s"

2012

1760 -#: sequencer.c:880

2013 +#: sequencer.c:888

2014 #, c-format

2015 msgid "cannot read %s: %s"

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

2017

1765 -#: sequencer.c:881

2018 +#: sequencer.c:889

2019 msgid "unexpected end of file"

2020 msgstr "意外的文件结束"

2021

1769 -#: sequencer.c:887

2022 +#: sequencer.c:895

2023 #, c-format

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

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

2026

1774 -#: sequencer.c:909

2027 +#: sequencer.c:921

2028 #, c-format

2029 msgid "Could not format %s."

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

2031

1779 -#: sequencer.c:1054

2032 +#: sequencer.c:1066

2033 #, c-format

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

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

2036

1784 -#: sequencer.c:1057

2037 +#: sequencer.c:1069

2038 #, c-format

2039 msgid "%s: bad revision"

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

2041

1789 -#: sequencer.c:1091

2042 +#: sequencer.c:1102

2043 msgid "Can't revert as initial commit"

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

2045

1793 -#: sequencer.c:1092

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

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

2046 +#: setup.c:160

2047 +#, c-format

2048 +msgid ""

2049 +"%s: no such path in the working tree.\n"

2050 +"Use 'git <command> -- <path>...' to specify paths that do not exist locally."

2051 +msgstr ""

2052 +"%s：工作区中无此路径。\n"

2053 +"使用命令 'git <command> -- <path>...' 来指定本地不存在的路径。"

2054 +

2055 +#: setup.c:173

2056 +#, c-format

2057 +msgid ""

2058 +"ambiguous argument '%s': unknown revision or path not in the working tree.\n"

2059 +"Use '--' to separate paths from revisions, like this:\n"

2060 +"'git <command> [<revision>...] -- [<file>...]'"

2061 +msgstr ""

2062 +"有歧义的参数 '%s'：工作区中未知的版本或路径。\n"

2063 +"使用 '--' 来分隔版本和路径，例如：\n"

2064 +"'git <command> [<revision>...] -- [<file>...]'"

2065 +

2066 +#: setup.c:223

2067 +#, c-format

2068 +msgid ""

2069 +"ambiguous argument '%s': both revision and filename\n"

2070 +"Use '--' to separate paths from revisions, like this:\n"

2071 +"'git <command> [<revision>...] -- [<file>...]'"

2072 +msgstr ""

2073 +"有歧义的参数 '%s'：两者均为版本和文件\n"

2074 +"使用 '--' 来分隔版本和路径，例如：\n"

2075 +"'git <command> [<revision>...] -- [<file>...]'"

2076

1797 -#: setup.c:248

2077 +#: setup.c:248 builtin/apply.c:3362 builtin/apply.c:3373 builtin/apply.c:3419

2078 #, c-format

2079 msgid "failed to read %s"

2080 msgstr "无法读取 %s"

@@ -1808,16 +2088,52 @@ msgstr "期望 git 仓库版本 <= %d，却得到 %d"

2088 msgid "unknown repository extensions found:"

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

2090

1811 -#: sha1_file.c:1080

2091 +#: setup.c:762

2092 +#, c-format

2093 +msgid "Not a git repository (or any of the parent directories): %s"

2094 +msgstr "不是一个 git 仓库（或者任何父目录）：%s"

2095 +

2096 +#: setup.c:764 setup.c:915 builtin/index-pack.c:1641

2097 +msgid "Cannot come back to cwd"

2098 +msgstr "无法返回当前工作目录"

2099 +

2100 +#: setup.c:845

2101 +msgid "Unable to read current working directory"

2102 +msgstr "不能读取当前工作目录"

2103 +

2104 +#: setup.c:920

2105 +#, c-format

2106 +msgid ""

2107 +"Not a git repository (or any parent up to mount point %s)\n"

2108 +"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."

2109 +msgstr ""

2110 +"不是一个 git 仓库（或者任何向上递归到挂载点 %s）\n"

2111 +"停止在文件系统边界（未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM）。"

2112 +

2113 +#: setup.c:927

2114 +#, c-format

2115 +msgid "Cannot change to '%s/..'"

2116 +msgstr "不能切换到 '%s/..'"

2117 +

2118 +#: setup.c:989

2119 +#, c-format

2120 +msgid ""

2121 +"Problem with core.sharedRepository filemode value (0%.3o).\n"

2122 +"The owner of files must always have read and write permissions."

2123 +msgstr ""

2124 +"参数 core.sharedRepository 的文件权限值有错(0%.3o)。\n"

2125 +"文件属主必须始终拥有读写权限。"

2126 +

2127 +#: sha1_file.c:1046

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

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

2130

1815 -#: sha1_file.c:2458

2131 +#: sha1_file.c:2434

2132 #, c-format

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

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

2135

1820 -#: sha1_file.c:2462

2136 +#: sha1_file.c:2438

2137 #, c-format

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

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

@@ -1870,7 +2186,7 @@ msgstr "将更新后 .gitmodules 添加暂存区失败"

2186 msgid "negative values not allowed for submodule.fetchJobs"

2187 msgstr "submodule.fetchJobs 不允许为负值"

2188

1873 -#: submodule-config.c:355

2189 +#: submodule-config.c:358

2190 #, c-format

2191 msgid "invalid value for %s"

2192 msgstr "%s 的值无效"

@@ -1929,6 +2245,54 @@ msgstr "不能打开临时文件"

2245 msgid "could not rename temporary file to %s"

2246 msgstr "不能重命名临时文件为 %s"

2247

2248 +#: transport.c:62

2249 +#, c-format

2250 +msgid "Would set upstream of '%s' to '%s' of '%s'\n"

2251 +msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"

2252 +

2253 +#: transport.c:151

2254 +#, c-format

2255 +msgid "transport: invalid depth option '%s'"

2256 +msgstr "传输：无效的深度选项 '%s'"

2257 +

2258 +#: transport.c:771

2259 +#, c-format

2260 +msgid ""

2261 +"The following submodule paths contain changes that can\n"

2262 +"not be found on any remote:\n"

2263 +msgstr "如下的子模组路径的修改在任何远程源中都找不到：\n"

2264 +

2265 +#: transport.c:775

2266 +#, c-format

2267 +msgid ""

2268 +"\n"

2269 +"Please try\n"

2270 +"\n"

2271 +"\tgit push --recurse-submodules=on-demand\n"

2272 +"\n"

2273 +"or cd to the path and use\n"

2274 +"\n"

2275 +"\tgit push\n"

2276 +"\n"

2277 +"to push them to a remote.\n"

2278 +"\n"

2279 +msgstr ""

2280 +"\n"

2281 +"请尝试\n"

2282 +"\n"

2283 +"\tgit push --recurse-submodules=on-demand\n"

2284 +"\n"

2285 +"或者进入到子目录执行\n"

2286 +"\n"

2287 +"\tgit push\n"

2288 +"\n"

2289 +"来推送到远程源。\n"

2290 +"\n"

2291 +

2292 +#: transport.c:783

2293 +msgid "Aborting."

2294 +msgstr "正在终止。"

2295 +

2296 #: transport-helper.c:1041

2297 #, c-format

2298 msgid "Could not read ref %s"

@@ -1938,7 +2302,7 @@ msgstr "不能读取引用 %s"

2302 #, c-format

2303 msgid ""

2304 "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."

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

2306 msgstr ""

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

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

@@ -1956,7 +2320,7 @@ msgstr ""

2320 #, c-format

2321 msgid ""

2322 "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."

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

2324 msgstr ""

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

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

@@ -1974,7 +2338,7 @@ msgstr ""

2338 #, c-format

2339 msgid ""

2340 "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."

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

2342 msgstr ""

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

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

@@ -2001,7 +2365,7 @@ msgstr ""

2365 #, c-format

2366 msgid ""

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

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

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

2369 msgstr ""

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

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

@@ -2019,7 +2383,7 @@ msgstr ""

2383 #, c-format

2384 msgid ""

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

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

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

2387 msgstr ""

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

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

@@ -2037,7 +2401,7 @@ msgstr ""

2401 #, c-format

2402 msgid ""

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

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

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

2405 msgstr ""

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

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

@@ -2056,7 +2420,7 @@ msgstr ""

2420 msgid ""

2421 "The following untracked working tree files would be overwritten by "

2422 "checkout:\n"

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

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

2424 msgstr ""

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

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

@@ -2075,7 +2439,7 @@ msgstr ""

2439 #, c-format

2440 msgid ""

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

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

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

2443 msgstr ""

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

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

@@ -2093,7 +2457,7 @@ msgstr ""

2457 #, c-format

2458 msgid ""

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

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

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

2461 msgstr ""

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

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

@@ -2179,43 +2543,43 @@ msgstr "无效的端口号"

2543 msgid "invalid '..' path segment"

2544 msgstr "无效的 '..' 路径片段"

2545

2182 -#: wrapper.c:222 wrapper.c:381

2546 +#: worktree.c:282

2547 +#, c-format

2548 +msgid "failed to read '%s'"

2549 +msgstr "无法读取 '%s'"

2550 +

2551 +#: wrapper.c:222 wrapper.c:392

2552 #, c-format

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

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

2555

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

2556 +#: wrapper.c:224 wrapper.c:394 builtin/am.c:778

2557 #, c-format

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

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

2560

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

2561 +#: wrapper.c:226 wrapper.c:396 builtin/am.c:324 builtin/am.c:771

2562 +#: builtin/am.c:859 builtin/commit.c:1712 builtin/merge.c:1029

2563 #: builtin/pull.c:407

2564 #, c-format

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

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

2567

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

2568 +#: wrapper.c:605 wrapper.c:626

2569 #, c-format

2570 msgid "unable to access '%s'"

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

2572

2204 -#: wrapper.c:623

2573 +#: wrapper.c:634

2574 msgid "unable to get current working directory"

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

2576

2208 -#: wrapper.c:650

2209 -#, c-format

2210 -msgid "could not open %s for writing"

2211 -msgstr "不能写入 %s"

2212 -

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

2577 +#: wrapper.c:658

2578 #, c-format

2579 msgid "could not write to %s"

2580 msgstr "不能写入 %s"

2581

2218 -#: wrapper.c:667

2582 +#: wrapper.c:660

2583 #, c-format

2584 msgid "could not close %s"

2585 msgstr "不能关闭 %s"

@@ -2250,11 +2614,11 @@ msgstr " （酌情使用 \"git add/rm <文件>...\" 标记解决方案）"

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

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

2616

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

2617 +#: wt-status.c:198 wt-status.c:882

2618 msgid "Changes to be committed:"

2619 msgstr "要提交的变更："

2620

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

2621 +#: wt-status.c:216 wt-status.c:891

2622 msgid "Changes not staged for commit:"

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

2624

@@ -2313,11 +2677,6 @@ msgstr "双方添加："

2677 msgid "both modified:"

2678 msgstr "双方修改："

2679

2316 -#: wt-status.c:266

2317 -#, c-format

2318 -msgid "bug: unhandled unmerged status %x"

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

2320 -

2680 #: wt-status.c:274

2681 msgid "new file:"

2682 msgstr "新文件："

@@ -2365,20 +2724,15 @@ msgstr "修改的内容, "

2724 msgid "untracked content, "

2725 msgstr "未跟踪的内容, "

2726

2368 -#: wt-status.c:391

2369 -#, c-format

2370 -msgid "bug: unhandled diff status %c"

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

2372 -

2373 -#: wt-status.c:755

2727 +#: wt-status.c:756

2728 msgid "Submodules changed but not updated:"

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

2730

2377 -#: wt-status.c:757

2731 +#: wt-status.c:758

2732 msgid "Submodule changes to be committed:"

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

2734

2381 -#: wt-status.c:838

2735 +#: wt-status.c:839

2736 msgid ""

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

2738 "Everything below will be removed."

@@ -2386,68 +2740,73 @@ msgstr ""

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

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

2742

2389 -#: wt-status.c:949

2743 +#: wt-status.c:950

2744 msgid "You have unmerged paths."

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

2746

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

2394 -#: wt-status.c:952

2748 +#: wt-status.c:953

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

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

2751

2398 -#: wt-status.c:956

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

2753 +#: wt-status.c:955

2754 +msgid " (use \"git merge --abort\" to abort the merge)"

2755 +msgstr " （使用 \"git merge --abort\" 终止合并）"

2756 +

2757 +#: wt-status.c:960

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

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

2760

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

2403 -#: wt-status.c:959

2762 +#: wt-status.c:963

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

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

2765

2407 -#: wt-status.c:969

2766 +#: wt-status.c:973

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

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

2769

2411 -#: wt-status.c:972

2770 +#: wt-status.c:976

2771 msgid "The current patch is empty."

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

2773

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

2416 -#: wt-status.c:976

2775 +#: wt-status.c:980

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

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

2778

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

2421 -#: wt-status.c:978

2780 +#: wt-status.c:982

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

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

2783

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

2426 -#: wt-status.c:980

2785 +#: wt-status.c:984

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

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

2788

2430 -#: wt-status.c:1105

2789 +#: wt-status.c:1109

2790 msgid "No commands done."

2791 msgstr "没有命令被执行。"

2792

2434 -#: wt-status.c:1108

2793 +#: wt-status.c:1112

2794 #, c-format

2795 msgid "Last command done (%d command done):"

2796 msgid_plural "Last commands done (%d commands done):"

2797 msgstr[0] "最后一条命令已完成（%d 条命令被执行）："

2798 msgstr[1] "最后的命令已完成（%d 条命令被执行）："

2799

2441 -#: wt-status.c:1119

2800 +#: wt-status.c:1123

2801 #, c-format

2802 msgid " (see more in file %s)"

2803 msgstr " （更多参见文件 %s）"

2804

2446 -#: wt-status.c:1124

2805 +#: wt-status.c:1128

2806 msgid "No commands remaining."

2807 msgstr "未剩下任何命令。"

2808

2450 -#: wt-status.c:1127

2809 +#: wt-status.c:1131

2810 #, c-format

2811 msgid "Next command to do (%d remaining command):"

2812 msgid_plural "Next commands to do (%d remaining commands):"

@@ -2455,165 +2814,165 @@ msgstr[0] "接下来要执行的命令（剩余 %d 条命令）："

2814 msgstr[1] "接下来要执行的命令（剩余 %d 条命令）："

2815

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

2458 -#: wt-status.c:1135

2817 +#: wt-status.c:1139

2818 msgid " (use \"git rebase --edit-todo\" to view and edit)"

2819 msgstr " （使用 \"git rebase --edit-todo\" 来查看和编辑）"

2820

2462 -#: wt-status.c:1148

2821 +#: wt-status.c:1152

2822 #, c-format

2823 msgid "You are currently rebasing branch '%s' on '%s'."

2824 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"

2825

2467 -#: wt-status.c:1153

2826 +#: wt-status.c:1157

2827 msgid "You are currently rebasing."

2828 msgstr "您在执行变基操作。"

2829

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

2472 -#: wt-status.c:1167

2831 +#: wt-status.c:1171

2832 msgid " (fix conflicts and then run \"git rebase --continue\")"

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

2834

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

2477 -#: wt-status.c:1169

2836 +#: wt-status.c:1173

2837 msgid " (use \"git rebase --skip\" to skip this patch)"

2838 msgstr " （使用 \"git rebase --skip\" 跳过此补丁）"

2839

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

2482 -#: wt-status.c:1171

2841 +#: wt-status.c:1175

2842 msgid " (use \"git rebase --abort\" to check out the original branch)"

2843 msgstr " （使用 \"git rebase --abort\" 以检出原有分支）"

2844

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

2487 -#: wt-status.c:1177

2846 +#: wt-status.c:1181

2847 msgid " (all conflicts fixed: run \"git rebase --continue\")"

2848 msgstr " （所有冲突已解决：运行 \"git rebase --continue\"）"

2849

2491 -#: wt-status.c:1181

2850 +#: wt-status.c:1185

2851 #, c-format

2852 msgid ""

2853 "You are currently splitting a commit while rebasing branch '%s' on '%s'."

2854 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"

2855

2497 -#: wt-status.c:1186

2856 +#: wt-status.c:1190

2857 msgid "You are currently splitting a commit during a rebase."

2858 msgstr "您在执行变基操作时拆分提交。"

2859

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

2502 -#: wt-status.c:1189

2861 +#: wt-status.c:1193

2862 msgid " (Once your working directory is clean, run \"git rebase --continue\")"

2863 msgstr " （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）"

2864

2506 -#: wt-status.c:1193

2865 +#: wt-status.c:1197

2866 #, c-format

2867 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."

2868 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"

2869

2511 -#: wt-status.c:1198

2870 +#: wt-status.c:1202

2871 msgid "You are currently editing a commit during a rebase."

2872 msgstr "您在执行变基操作时编辑提交。"

2873

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

2516 -#: wt-status.c:1201

2875 +#: wt-status.c:1205

2876 msgid " (use \"git commit --amend\" to amend the current commit)"

2877 msgstr " （使用 \"git commit --amend\" 修补当前提交）"

2878

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

2521 -#: wt-status.c:1203

2880 +#: wt-status.c:1207

2881 msgid ""

2882 " (use \"git rebase --continue\" once you are satisfied with your changes)"

2883 msgstr " （当您对您的修改满意后执行 \"git rebase --continue\"）"

2884

2526 -#: wt-status.c:1213

2885 +#: wt-status.c:1217

2886 #, c-format

2887 msgid "You are currently cherry-picking commit %s."

2888 msgstr "您在执行拣选提交 %s 的操作。"

2889

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

2532 -#: wt-status.c:1218

2891 +#: wt-status.c:1222

2892 msgid " (fix conflicts and run \"git cherry-pick --continue\")"

2893 msgstr " （解决冲突并运行 \"git cherry-pick --continue\"）"

2894

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

2537 -#: wt-status.c:1221

2896 +#: wt-status.c:1225

2897 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"

2898 msgstr " （所有冲突已解决：运行 \"git cherry-pick --continue\"）"

2899

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

2542 -#: wt-status.c:1223

2901 +#: wt-status.c:1227

2902 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"

2903 msgstr " （使用 \"git cherry-pick --abort\" 以取消拣选操作）"

2904

2546 -#: wt-status.c:1232

2905 +#: wt-status.c:1236

2906 #, c-format

2907 msgid "You are currently reverting commit %s."

2908 msgstr "您在执行反转提交 %s 的操作。"

2909

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

2552 -#: wt-status.c:1237

2911 +#: wt-status.c:1241

2912 msgid " (fix conflicts and run \"git revert --continue\")"

2913 msgstr " （解决冲突并运行 \"git revert --continue\"）"

2914

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

2557 -#: wt-status.c:1240

2916 +#: wt-status.c:1244

2917 msgid " (all conflicts fixed: run \"git revert --continue\")"

2918 msgstr " （所有冲突已解决：运行 \"git revert --continue\"）"

2919

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

2562 -#: wt-status.c:1242

2921 +#: wt-status.c:1246

2922 msgid " (use \"git revert --abort\" to cancel the revert operation)"

2923 msgstr " （使用 \"git revert --abort\" 以取消反转提交操作）"

2924

2566 -#: wt-status.c:1253

2925 +#: wt-status.c:1257

2926 #, c-format

2927 msgid "You are currently bisecting, started from branch '%s'."

2928 msgstr "您在执行从分支 '%s' 开始的二分查找操作。"

2929

2571 -#: wt-status.c:1257

2930 +#: wt-status.c:1261

2931 msgid "You are currently bisecting."

2932 msgstr "您在执行二分查找操作。"

2933

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

2576 -#: wt-status.c:1260

2935 +#: wt-status.c:1264

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

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

2938

2580 -#: wt-status.c:1460

2939 +#: wt-status.c:1464

2940 msgid "On branch "

2941 msgstr "位于分支 "

2942

2584 -#: wt-status.c:1466

2943 +#: wt-status.c:1470

2944 msgid "interactive rebase in progress; onto "

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

2946

2588 -#: wt-status.c:1468

2947 +#: wt-status.c:1472

2948 msgid "rebase in progress; onto "

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

2950

2592 -#: wt-status.c:1473

2951 +#: wt-status.c:1477

2952 msgid "HEAD detached at "

2953 msgstr "头指针分离于 "

2954

2596 -#: wt-status.c:1475

2955 +#: wt-status.c:1479

2956 msgid "HEAD detached from "

2957 msgstr "头指针分离自 "

2958

2600 -#: wt-status.c:1478

2959 +#: wt-status.c:1482

2960 msgid "Not currently on any branch."

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

2962

2604 -#: wt-status.c:1496

2963 +#: wt-status.c:1500

2964 msgid "Initial commit"

2965 msgstr "初始提交"

2966

2608 -#: wt-status.c:1510

2967 +#: wt-status.c:1514

2968 msgid "Untracked files"

2969 msgstr "未跟踪的文件"

2970

2612 -#: wt-status.c:1512

2971 +#: wt-status.c:1516

2972 msgid "Ignored files"

2973 msgstr "忽略的文件"

2974

2616 -#: wt-status.c:1516

2975 +#: wt-status.c:1520

2976 #, c-format

2977 msgid ""

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

@@ -2623,84 +2982,84 @@ msgstr ""

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

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

2984

2626 -#: wt-status.c:1522

2985 +#: wt-status.c:1526

2986 #, c-format

2987 msgid "Untracked files not listed%s"

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

2989

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

2632 -#: wt-status.c:1524

2991 +#: wt-status.c:1528

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

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

2994

2636 -#: wt-status.c:1530

2995 +#: wt-status.c:1534

2996 msgid "No changes"

2997 msgstr "没有修改"

2998

2640 -#: wt-status.c:1535

2999 +#: wt-status.c:1539

3000 #, c-format

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

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

3003

2645 -#: wt-status.c:1538

3004 +#: wt-status.c:1542

3005 #, c-format

3006 msgid "no changes added to commit\n"

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

3008

2650 -#: wt-status.c:1541

3009 +#: wt-status.c:1545

3010 #, c-format

3011 msgid ""

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

3013 "track)\n"

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

3015

2657 -#: wt-status.c:1544

3016 +#: wt-status.c:1548

3017 #, c-format

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

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

3020

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

2663 -#: wt-status.c:1547

3022 +#: wt-status.c:1551

3023 #, c-format

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

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

3026

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

3027 +#: wt-status.c:1554 wt-status.c:1559

3028 #, c-format

3029 msgid "nothing to commit\n"

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

3031

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

2674 -#: wt-status.c:1553

3033 +#: wt-status.c:1557

3034 #, c-format

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

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

3037

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

2680 -#: wt-status.c:1557

3039 +#: wt-status.c:1561

3040 #, c-format

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

3041 +msgid "nothing to commit, working tree clean\n"

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

3043

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

2686 -#: wt-status.c:1664

3045 +#: wt-status.c:1668

3046 msgid "Initial commit on "

3047 msgstr "初始提交于 "

3048

2690 -#: wt-status.c:1668

3049 +#: wt-status.c:1672

3050 msgid "HEAD (no branch)"

3051 msgstr "HEAD（非分支）"

3052

2694 -#: wt-status.c:1697

3053 +#: wt-status.c:1701

3054 msgid "gone"

3055 msgstr "丢失"

3056

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

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

3058 +#: wt-status.c:1703 wt-status.c:1711

3059 msgid "behind "

3060 msgstr "落后 "

3061

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

3062 +#: wt-status.c:1706 wt-status.c:1709

3063 msgid "ahead "

3064 msgstr "领先 "

3065

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

3077 msgid "unexpected diff status %c"

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

3079

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

3080 +#: builtin/add.c:71 builtin/commit.c:281

3081 msgid "updating files failed"

3082 msgstr "更新文件失败"

3083

2725 -#: builtin/add.c:80

3084 +#: builtin/add.c:81

3085 #, c-format

3086 msgid "remove '%s'\n"

3087 msgstr "删除 '%s'\n"

3088

2730 -#: builtin/add.c:134

3089 +#: builtin/add.c:136

3090 msgid "Unstaged changes after refreshing the index:"

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

3092

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

3093 +#: builtin/add.c:196 builtin/rev-parse.c:811

3094 msgid "Could not read the index"

3095 msgstr "不能读取索引"

3096

2738 -#: builtin/add.c:205

3097 +#: builtin/add.c:207

3098 #, c-format

3099 msgid "Could not open '%s' for writing."

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

3101

2743 -#: builtin/add.c:209

3102 +#: builtin/add.c:211

3103 msgid "Could not write patch"

3104 msgstr "不能生成补丁"

3105

2747 -#: builtin/add.c:212

3106 +#: builtin/add.c:214

3107 msgid "editing patch failed"

3108 msgstr "编辑补丁失败"

3109

2751 -#: builtin/add.c:215

3110 +#: builtin/add.c:217

3111 #, c-format

3112 msgid "Could not stat '%s'"

3113 msgstr "不能查看文件状态 '%s'"

3114

2756 -#: builtin/add.c:217

3115 +#: builtin/add.c:219

3116 msgid "Empty patch. Aborted."

3117 msgstr "空补丁。异常终止。"

3118

2760 -#: builtin/add.c:222

3119 +#: builtin/add.c:224

3120 #, c-format

3121 msgid "Could not apply '%s'"

3122 msgstr "不能应用 '%s'"

3123

2765 -#: builtin/add.c:232

3124 +#: builtin/add.c:234

3125 msgid "The following paths are ignored by one of your .gitignore files:\n"

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

3127

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

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

3128 +#: builtin/add.c:253 builtin/clean.c:870 builtin/fetch.c:113 builtin/mv.c:111

3129 +#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:521

3130 +#: builtin/remote.c:1327 builtin/rm.c:268 builtin/send-pack.c:162

3131 msgid "dry run"

3132 msgstr "演习"

3133

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

3134 +#: builtin/add.c:254 builtin/apply.c:4854 builtin/check-ignore.c:19

3135 +#: builtin/commit.c:1334 builtin/count-objects.c:85 builtin/fsck.c:593

3136 +#: builtin/log.c:1852 builtin/mv.c:110 builtin/read-tree.c:114

3137 msgid "be verbose"

3138 msgstr "冗长输出"

3139

2781 -#: builtin/add.c:252

3140 +#: builtin/add.c:256

3141 msgid "interactive picking"

3142 msgstr "交互式拣选"

3143

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

3144 +#: builtin/add.c:257 builtin/checkout.c:1157 builtin/reset.c:286

3145 msgid "select hunks interactively"

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

3147

2789 -#: builtin/add.c:254

3148 +#: builtin/add.c:258

3149 msgid "edit current diff and apply"

3150 msgstr "编辑当前差异并应用"

3151

2793 -#: builtin/add.c:255

3152 +#: builtin/add.c:259

3153 msgid "allow adding otherwise ignored files"

3154 msgstr "允许添加忽略的文件"

3155

2797 -#: builtin/add.c:256

3156 +#: builtin/add.c:260

3157 msgid "update tracked files"

3158 msgstr "更新已跟踪的文件"

3159

2801 -#: builtin/add.c:257

3160 +#: builtin/add.c:261

3161 msgid "record only the fact that the path will be added later"

3162 msgstr "只记录，该路径稍后再添加"

3163

2805 -#: builtin/add.c:258

3164 +#: builtin/add.c:262

3165 msgid "add changes from all tracked and untracked files"

3166 msgstr "添加所有改变的已跟踪文件和未跟踪文件"

3167

2809 -#: builtin/add.c:261

3168 +#: builtin/add.c:265

3169 msgid "ignore paths removed in the working tree (same as --no-all)"

3170 msgstr "忽略工作区中移除的路径（和 --no-all 相同）"

3171

2813 -#: builtin/add.c:263

3172 +#: builtin/add.c:267

3173 msgid "don't add, only refresh the index"

3174 msgstr "不添加，只刷新索引"

3175

2817 -#: builtin/add.c:264

3176 +#: builtin/add.c:268

3177 msgid "just skip files which cannot be added because of errors"

3178 msgstr "跳过因出错不能添加的文件"

3179

2821 -#: builtin/add.c:265

3180 +#: builtin/add.c:269

3181 msgid "check if - even missing - files are ignored in dry run"

3182 msgstr "检查在演习模式下文件（即使不存在）是否被忽略"

3183

2825 -#: builtin/add.c:287

3184 +#: builtin/add.c:270 builtin/update-index.c:958

3185 +msgid "(+/-)x"

3186 +msgstr "(+/-)x"

3187 +

3188 +#: builtin/add.c:270 builtin/update-index.c:959

3189 +msgid "override the executable bit of the listed files"

3190 +msgstr "覆盖列表里文件的可执行位"

3191 +

3192 +#: builtin/add.c:292

3193 #, c-format

3194 msgid "Use -f if you really want to add them.\n"

3195 msgstr "使用 -f 参数如果您确实要添加它们。\n"

3196

2830 -#: builtin/add.c:294

3197 +#: builtin/add.c:300

3198 msgid "adding files failed"

3199 msgstr "添加文件失败"

3200

2834 -#: builtin/add.c:330

3201 +#: builtin/add.c:336

3202 msgid "-A and -u are mutually incompatible"

3203 msgstr "-A 和 -u 选项互斥"

3204

2838 -#: builtin/add.c:337

3205 +#: builtin/add.c:343

3206 msgid "Option --ignore-missing can only be used together with --dry-run"

3207 msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"

3208

3209 #: builtin/add.c:352

3210 #, c-format

3211 +msgid "--chmod param '%s' must be either -x or +x"

3212 +msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x"

3213 +

3214 +#: builtin/add.c:367

3215 +#, c-format

3216 msgid "Nothing specified, nothing added.\n"

3217 msgstr "没有指定文件，也没有文件被添加。\n"

3218

2847 -#: builtin/add.c:353

3219 +#: builtin/add.c:368

3220 #, c-format

3221 msgid "Maybe you wanted to say 'git add .'?\n"

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

3223

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

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

3224 +#: builtin/add.c:373 builtin/check-ignore.c:172 builtin/checkout.c:279

3225 +#: builtin/checkout.c:473 builtin/clean.c:914 builtin/commit.c:340

3226 +#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298

3227 #: builtin/submodule--helper.c:240

3228 msgid "index file corrupt"

3229 msgstr "索引文件损坏"

3230

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

3231 +#: builtin/add.c:454 builtin/apply.c:4784 builtin/mv.c:286 builtin/rm.c:431

3232 msgid "Unable to write new index file"

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

3234

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

3235 +#: builtin/am.c:257 builtin/commit.c:750 builtin/merge.c:1032

3236 #, c-format

3237 msgid "could not read '%s'"

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

3239

2867 -#: builtin/am.c:430

3240 +#: builtin/am.c:426

3241 msgid "could not parse author script"

3242 msgstr "不能解析作者脚本"

3243

2871 -#: builtin/am.c:507

3244 +#: builtin/am.c:503

3245 #, c-format

3246 msgid "'%s' was deleted by the applypatch-msg hook"

3247 msgstr "'%s' 被 applypatch-msg 钩子删除"

3248

2876 -#: builtin/am.c:548 builtin/notes.c:300

3249 +#: builtin/am.c:544 builtin/notes.c:301

3250 #, c-format

3251 msgid "Malformed input line: '%s'."

3252 msgstr "非法的输入行：'%s'。"

3253

2881 -#: builtin/am.c:585 builtin/notes.c:315

3254 +#: builtin/am.c:581 builtin/notes.c:316

3255 #, c-format

3256 msgid "Failed to copy notes from '%s' to '%s'"

3257 msgstr "从 '%s' 拷贝注解到 '%s' 时失败"

3258

2886 -#: builtin/am.c:611

3259 +#: builtin/am.c:607

3260 msgid "fseek failed"

3261 msgstr "fseek 失败"

3262

2890 -#: builtin/am.c:788

3263 +#: builtin/am.c:787

3264 #, c-format

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

3266 msgstr "无法解析补丁 '%s'"

3267

2895 -#: builtin/am.c:853

3268 +#: builtin/am.c:852

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

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

3271

2899 -#: builtin/am.c:900

3272 +#: builtin/am.c:899

3273 msgid "invalid timestamp"

3274 msgstr "无效的时间戳"

3275

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

3276 +#: builtin/am.c:902 builtin/am.c:910

3277 msgid "invalid Date line"

3278 msgstr "无效的日期行"

3279

2907 -#: builtin/am.c:908

3280 +#: builtin/am.c:907

3281 msgid "invalid timezone offset"

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

3283

2911 -#: builtin/am.c:995

3284 +#: builtin/am.c:996

3285 msgid "Patch format detection failed."

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

3287

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

3288 +#: builtin/am.c:1001 builtin/clone.c:380

3289 #, c-format

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

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

3292

2920 -#: builtin/am.c:1004

3293 +#: builtin/am.c:1005

3294 msgid "Failed to split patches."

3295 msgstr "无法拆分补丁。"

3296

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

3297 +#: builtin/am.c:1137 builtin/commit.c:366

3298 msgid "unable to write index file"

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

3300

2928 -#: builtin/am.c:1187

3301 +#: builtin/am.c:1188

3302 #, c-format

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

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

3305

2933 -#: builtin/am.c:1188

3306 +#: builtin/am.c:1189

3307 #, c-format

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

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

3310

2938 -#: builtin/am.c:1189

3311 +#: builtin/am.c:1190

3312 #, c-format

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

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

3315

2943 -#: builtin/am.c:1327

3316 +#: builtin/am.c:1328

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

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

3319

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

3320 +#: builtin/am.c:1402 builtin/log.c:1543

3321 #, c-format

3322 msgid "invalid ident line: %s"

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

3324

2952 -#: builtin/am.c:1428

3325 +#: builtin/am.c:1429

3326 #, c-format

3327 msgid "unable to parse commit %s"

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

3329

2957 -#: builtin/am.c:1630

3330 +#: builtin/am.c:1602

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

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

3333

2961 -#: builtin/am.c:1632

3334 +#: builtin/am.c:1604

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

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

3337

2965 -#: builtin/am.c:1651

3338 +#: builtin/am.c:1623

3339 msgid ""

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

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

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

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

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

3345

2973 -#: builtin/am.c:1657

3346 +#: builtin/am.c:1629

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

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

3349

2977 -#: builtin/am.c:1672

3350 +#: builtin/am.c:1654

3351 msgid "Failed to merge in the changes."

3352 msgstr "无法合并变更。"

3353

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

3354 +#: builtin/am.c:1679 builtin/merge.c:628

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

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

3357

2985 -#: builtin/am.c:1703

3358 +#: builtin/am.c:1686

3359 msgid "applying to an empty history"

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

3361

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

2990 -#: builtin/merge.c:866

3362 +#: builtin/am.c:1699 builtin/commit.c:1776 builtin/merge.c:798

3363 +#: builtin/merge.c:823

3364 msgid "failed to write commit object"

3365 msgstr "无法写提交对象"

3366

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

3367 +#: builtin/am.c:1731 builtin/am.c:1735

3368 #, c-format

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

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

3371

2999 -#: builtin/am.c:1768

3372 +#: builtin/am.c:1751

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

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

3375

3003 -#: builtin/am.c:1773

3376 +#: builtin/am.c:1756

3377 msgid "Commit Body is:"

3378 msgstr "提交内容为："

3379

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

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

3383 #. input at this point.

3384 #.

3012 -#: builtin/am.c:1783

3385 +#: builtin/am.c:1766

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

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

3388

3016 -#: builtin/am.c:1833

3389 +#: builtin/am.c:1816

3390 #, c-format

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

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

3393

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

3394 +#: builtin/am.c:1853 builtin/am.c:1925

3395 #, c-format

3396 msgid "Applying: %.*s"

3397 msgstr "应用：%.*s"

3398

3026 -#: builtin/am.c:1884

3399 +#: builtin/am.c:1869

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

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

3402

3030 -#: builtin/am.c:1892

3403 +#: builtin/am.c:1877

3404 #, c-format

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

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

3407

3035 -#: builtin/am.c:1898

3408 +#: builtin/am.c:1883

3409 #, c-format

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

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

3412

3040 -#: builtin/am.c:1943

3413 +#: builtin/am.c:1928

3414 msgid ""

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

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

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

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

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

3422

3050 -#: builtin/am.c:1950

3423 +#: builtin/am.c:1935

3424 msgid ""

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

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

@@ -3055,170 +3428,170 @@ msgstr ""

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

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

3430

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

3431 +#: builtin/am.c:2043 builtin/am.c:2047 builtin/am.c:2059 builtin/reset.c:308

3432 #: builtin/reset.c:316

3433 #, c-format

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

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

3436

3064 -#: builtin/am.c:2110

3437 +#: builtin/am.c:2095

3438 msgid "failed to clean index"

3439 msgstr "无法清空索引"

3440

3068 -#: builtin/am.c:2144

3441 +#: builtin/am.c:2129

3442 msgid ""

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

3444 "Not rewinding to ORIG_HEAD"

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

3446

3074 -#: builtin/am.c:2205

3447 +#: builtin/am.c:2192

3448 #, c-format

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

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

3451

3079 -#: builtin/am.c:2238

3452 +#: builtin/am.c:2225

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

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

3455

3083 -#: builtin/am.c:2239

3456 +#: builtin/am.c:2226

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

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

3459

3087 -#: builtin/am.c:2245

3460 +#: builtin/am.c:2232

3461 msgid "run interactively"

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

3463

3091 -#: builtin/am.c:2247

3464 +#: builtin/am.c:2234

3465 msgid "historical option -- no-op"

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

3467

3095 -#: builtin/am.c:2249

3468 +#: builtin/am.c:2236

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

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

3471

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

3100 -#: builtin/repack.c:171

3472 +#: builtin/am.c:2237 builtin/init-db.c:481 builtin/prune-packed.c:57

3473 +#: builtin/repack.c:172

3474 msgid "be quiet"

3475 msgstr "静默模式"

3476

3104 -#: builtin/am.c:2252

3477 +#: builtin/am.c:2239

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

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

3480

3108 -#: builtin/am.c:2255

3481 +#: builtin/am.c:2242

3482 msgid "recode into utf8 (default)"

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

3484

3112 -#: builtin/am.c:2257

3485 +#: builtin/am.c:2244

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

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

3488

3116 -#: builtin/am.c:2259

3489 +#: builtin/am.c:2246

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

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

3492

3120 -#: builtin/am.c:2261

3493 +#: builtin/am.c:2248

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

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

3496

3124 -#: builtin/am.c:2263

3497 +#: builtin/am.c:2250

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

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

3500

3128 -#: builtin/am.c:2266

3501 +#: builtin/am.c:2253

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

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

3504

3132 -#: builtin/am.c:2269

3505 +#: builtin/am.c:2256

3506 msgid "strip everything before a scissors line"

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

3508

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

3509 +#: builtin/am.c:2257 builtin/apply.c:4837

3510 msgid "action"

3511 msgstr "动作"

3512

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

3513 +#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267

3514 +#: builtin/am.c:2270 builtin/am.c:2273 builtin/am.c:2276 builtin/am.c:2279

3515 +#: builtin/am.c:2285

3516 msgid "pass it through git-apply"

3517 msgstr "传递给 git-apply"

3518

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

3519 +#: builtin/am.c:2266 builtin/apply.c:4861

3520 msgid "root"

3521 msgstr "根目录"

3522

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

3523 +#: builtin/am.c:2269 builtin/am.c:2272 builtin/apply.c:4799

3524 +#: builtin/apply.c:4802 builtin/clone.c:90 builtin/fetch.c:96

3525 #: 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

3526 +#: builtin/submodule--helper.c:402 builtin/submodule--helper.c:482

3527 +#: builtin/submodule--helper.c:485 builtin/submodule--helper.c:823

3528 +#: builtin/submodule--helper.c:826

3529 msgid "path"

3530 msgstr "路径"

3531

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

3532 +#: builtin/am.c:2275 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669

3533 +#: builtin/grep.c:706 builtin/merge.c:200 builtin/pull.c:134

3534 +#: builtin/pull.c:193 builtin/repack.c:181 builtin/repack.c:185

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

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

3537 msgid "n"

3538 msgstr "n"

3539

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

3540 +#: builtin/am.c:2278 builtin/apply.c:4805

3541 msgid "num"

3542 msgstr "数字"

3543

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

3544 +#: builtin/am.c:2281 builtin/for-each-ref.c:37 builtin/replace.c:438

3545 #: builtin/tag.c:372

3546 msgid "format"

3547 msgstr "格式"

3548

3176 -#: builtin/am.c:2295

3549 +#: builtin/am.c:2282

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

3551 msgstr "补丁的格式"

3552

3180 -#: builtin/am.c:2301

3553 +#: builtin/am.c:2288

3554 msgid "override error message when patch failure occurs"

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

3556

3184 -#: builtin/am.c:2303

3557 +#: builtin/am.c:2290

3558 msgid "continue applying patches after resolving a conflict"

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

3560

3188 -#: builtin/am.c:2306

3561 +#: builtin/am.c:2293

3562 msgid "synonyms for --continue"

3563 msgstr "和 --continue 同义"

3564

3192 -#: builtin/am.c:2309

3565 +#: builtin/am.c:2296

3566 msgid "skip the current patch"

3567 msgstr "跳过当前补丁"

3568

3196 -#: builtin/am.c:2312

3569 +#: builtin/am.c:2299

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

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

3572

3200 -#: builtin/am.c:2316

3573 +#: builtin/am.c:2303

3574 msgid "lie about committer date"

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

3576

3204 -#: builtin/am.c:2318

3577 +#: builtin/am.c:2305

3578 msgid "use current timestamp for author date"

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

3580

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

3581 +#: builtin/am.c:2307 builtin/commit.c:1610 builtin/merge.c:229

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

3583 msgid "key-id"

3584 msgstr "key-id"

3585

3213 -#: builtin/am.c:2321

3586 +#: builtin/am.c:2308

3587 msgid "GPG-sign commits"

3588 msgstr "使用 GPG 签名提交"

3589

3217 -#: builtin/am.c:2324

3590 +#: builtin/am.c:2311

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

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

3593

3221 -#: builtin/am.c:2339

3594 +#: builtin/am.c:2326

3595 msgid ""

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

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

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

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

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

3601

3229 -#: builtin/am.c:2346

3602 +#: builtin/am.c:2333

3603 msgid "failed to read the index"

3604 msgstr "无法读取索引"

3605

3233 -#: builtin/am.c:2361

3606 +#: builtin/am.c:2348

3607 #, c-format

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

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

3610

3238 -#: builtin/am.c:2385

3611 +#: builtin/am.c:2372

3612 #, c-format

3613 msgid ""

3614 "Stray %s directory found.\n"

@@ -3244,70 +3617,70 @@ msgstr ""

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

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

3619

3247 -#: builtin/am.c:2391

3620 +#: builtin/am.c:2378

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

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

3623

3251 -#: builtin/apply.c:59

3624 +#: builtin/apply.c:122

3625 msgid "git apply [<options>] [<patch>...]"

3626 msgstr "git apply [<选项>] [<补丁>...]"

3627

3255 -#: builtin/apply.c:111

3628 +#: builtin/apply.c:153

3629 #, c-format

3630 msgid "unrecognized whitespace option '%s'"

3631 msgstr "未能识别的空白字符选项 '%s'"

3632

3260 -#: builtin/apply.c:126

3633 +#: builtin/apply.c:169

3634 #, c-format

3635 msgid "unrecognized whitespace ignore option '%s'"

3636 msgstr "未能识别的空白字符忽略选项 '%s'"

3637

3265 -#: builtin/apply.c:818

3638 +#: builtin/apply.c:854

3639 #, c-format

3640 msgid "Cannot prepare timestamp regexp %s"

3641 msgstr "无法准备时间戳正则表达式 %s"

3642

3270 -#: builtin/apply.c:827

3643 +#: builtin/apply.c:863

3644 #, c-format

3645 msgid "regexec returned %d for input: %s"

3646 msgstr "regexec 返回 %d，输入为：%s"

3647

3275 -#: builtin/apply.c:908

3648 +#: builtin/apply.c:947

3649 #, c-format

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

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

3652

3280 -#: builtin/apply.c:937

3653 +#: builtin/apply.c:984

3654 #, c-format

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

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

3657

3285 -#: builtin/apply.c:942

3658 +#: builtin/apply.c:989

3659 #, c-format

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

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

3662

3290 -#: builtin/apply.c:943

3663 +#: builtin/apply.c:990

3664 #, c-format

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

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

3667

3295 -#: builtin/apply.c:949

3668 +#: builtin/apply.c:995

3669 #, c-format

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

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

3672

3300 -#: builtin/apply.c:1406

3673 +#: builtin/apply.c:1489

3674 #, c-format

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

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

3677

3305 -#: builtin/apply.c:1463

3678 +#: builtin/apply.c:1550

3679 #, c-format

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

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

3682

3310 -#: builtin/apply.c:1480

3683 +#: builtin/apply.c:1567

3684 #, c-format

3685 msgid ""

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

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

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

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

3693

3321 -#: builtin/apply.c:1646

3694 +#: builtin/apply.c:1743

3695 msgid "new file depends on old contents"

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

3697

3325 -#: builtin/apply.c:1648

3698 +#: builtin/apply.c:1745

3699 msgid "deleted file still has contents"

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

3701

3329 -#: builtin/apply.c:1674

3702 +#: builtin/apply.c:1774

3703 #, c-format

3704 msgid "corrupt patch at line %d"

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

3706

3334 -#: builtin/apply.c:1710

3707 +#: builtin/apply.c:1810

3708 #, c-format

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

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

3711

3339 -#: builtin/apply.c:1712

3712 +#: builtin/apply.c:1812

3713 #, c-format

3714 msgid "deleted file %s still has contents"

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

3716

3344 -#: builtin/apply.c:1715

3717 +#: builtin/apply.c:1815

3718 #, c-format

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

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

3721

3349 -#: builtin/apply.c:1861

3722 +#: builtin/apply.c:1962

3723 #, c-format

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

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

3726

3354 -#: builtin/apply.c:1895

3727 +#: builtin/apply.c:1999

3728 #, c-format

3729 msgid "unrecognized binary patch at line %d"

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

3731

3359 -#: builtin/apply.c:2048

3732 +#: builtin/apply.c:2154

3733 #, c-format

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

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

3736

3364 -#: builtin/apply.c:2138

3737 +#: builtin/apply.c:2244

3738 #, c-format

3739 msgid "unable to read symlink %s"

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

3741

3369 -#: builtin/apply.c:2142

3742 +#: builtin/apply.c:2248

3743 #, c-format

3744 msgid "unable to open or read %s"

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

3746

3374 -#: builtin/apply.c:2775

3747 +#: builtin/apply.c:2901

3748 #, c-format

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

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

3751

3379 -#: builtin/apply.c:2894

3752 +#: builtin/apply.c:3020

3753 #, c-format

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

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

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

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

3758

3386 -#: builtin/apply.c:2906

3759 +#: builtin/apply.c:3032

3760 #, c-format

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

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

3763

3391 -#: builtin/apply.c:2912

3764 +#: builtin/apply.c:3038

3765 #, c-format

3766 msgid ""

3767 "while searching for:\n"

@@ -3397,335 +3770,330 @@ msgstr ""

3770 "当查询：\n"

3771 "%.*s"

3772

3400 -#: builtin/apply.c:2932

3773 +#: builtin/apply.c:3060

3774 #, c-format

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

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

3777

3405 -#: builtin/apply.c:3033

3778 +#: builtin/apply.c:3163

3779 #, c-format

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

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

3782

3410 -#: builtin/apply.c:3039

3783 +#: builtin/apply.c:3169

3784 #, c-format

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

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

3787

3415 -#: builtin/apply.c:3060

3788 +#: builtin/apply.c:3190

3789 #, c-format

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

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

3792

3420 -#: builtin/apply.c:3184

3793 +#: builtin/apply.c:3314

3794 #, c-format

3795 msgid "cannot checkout %s"

3796 msgstr "不能检出 %s"

3797

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 -

3430 -#: builtin/apply.c:3237

3798 +#: builtin/apply.c:3370

3799 #, c-format

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

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

3802

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

3803 +#: builtin/apply.c:3399 builtin/apply.c:3630

3804 #, c-format

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

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

3807

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

3808 +#: builtin/apply.c:3482 builtin/apply.c:3644

3809 #, c-format

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

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

3812

3445 -#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515

3813 +#: builtin/apply.c:3486 builtin/apply.c:3636 builtin/apply.c:3658

3814 #, c-format

3815 msgid "%s: %s"

3816 msgstr "%s：%s"

3817

3450 -#: builtin/apply.c:3355 builtin/apply.c:3509

3818 +#: builtin/apply.c:3491 builtin/apply.c:3652

3819 #, c-format

3820 msgid "%s: does not match index"

3821 msgstr "%s：和索引不匹配"

3822

3455 -#: builtin/apply.c:3457

3823 +#: builtin/apply.c:3597

3824 msgid "removal patch leaves file contents"

3825 msgstr "移除补丁仍留下了文件内容"

3826

3459 -#: builtin/apply.c:3526

3827 +#: builtin/apply.c:3669

3828 #, c-format

3829 msgid "%s: wrong type"

3830 msgstr "%s：错误类型"

3831

3464 -#: builtin/apply.c:3528

3832 +#: builtin/apply.c:3671

3833 #, c-format

3834 msgid "%s has type %o, expected %o"

3835 msgstr "%s 的类型是 %o，应为 %o"

3836

3469 -#: builtin/apply.c:3687 builtin/apply.c:3689

3837 +#: builtin/apply.c:3822 builtin/apply.c:3824

3838 #, c-format

3839 msgid "invalid path '%s'"

3840 msgstr "无效路径 '%s'"

3841

3474 -#: builtin/apply.c:3744

3842 +#: builtin/apply.c:3879

3843 #, c-format

3844 msgid "%s: already exists in index"

3845 msgstr "%s：已经存在于索引中"

3846

3479 -#: builtin/apply.c:3747

3847 +#: builtin/apply.c:3882

3848 #, c-format

3849 msgid "%s: already exists in working directory"

3850 msgstr "%s：已经存在于工作区中"

3851

3484 -#: builtin/apply.c:3767

3852 +#: builtin/apply.c:3902

3853 #, c-format

3854 msgid "new mode (%o) of %s does not match old mode (%o)"

3855 msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配"

3856

3489 -#: builtin/apply.c:3772

3857 +#: builtin/apply.c:3907

3858 #, c-format

3859 msgid "new mode (%o) of %s does not match old mode (%o) of %s"

3860 msgstr "%2$s 的新模式（%1$o）和 %4$s 的旧模式（%3$o）不匹配"

3861

3494 -#: builtin/apply.c:3792

3862 +#: builtin/apply.c:3927

3863 #, c-format

3864 msgid "affected file '%s' is beyond a symbolic link"

3865 msgstr "受影响的文件 '%s' 位于符号链接中"

3866

3499 -#: builtin/apply.c:3796

3867 +#: builtin/apply.c:3931

3868 #, c-format

3869 msgid "%s: patch does not apply"

3870 msgstr "%s：补丁未应用"

3871

3504 -#: builtin/apply.c:3810

3872 +#: builtin/apply.c:3945

3873 #, c-format

3874 msgid "Checking patch %s..."

3875 msgstr "检查补丁 %s..."

3876

3509 -#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135

3877 +#: builtin/apply.c:4038 builtin/checkout.c:233 builtin/reset.c:135

3878 #, c-format

3879 msgid "make_cache_entry failed for path '%s'"

3880 msgstr "对路径 '%s' 的 make_cache_entry 操作失败"

3881

3514 -#: builtin/apply.c:4046

3882 +#: builtin/apply.c:4182

3883 #, c-format

3884 msgid "unable to remove %s from index"

3885 msgstr "不能从索引中移除 %s"

3886

3519 -#: builtin/apply.c:4075

3887 +#: builtin/apply.c:4215

3888 #, c-format

3889 msgid "corrupt patch for submodule %s"

3890 msgstr "子模组 %s 损坏的补丁"

3891

3524 -#: builtin/apply.c:4079

3892 +#: builtin/apply.c:4219

3893 #, c-format

3894 msgid "unable to stat newly created file '%s'"

3895 msgstr "不能枚举新建文件 '%s' 的状态"

3896

3529 -#: builtin/apply.c:4084

3897 +#: builtin/apply.c:4224

3898 #, c-format

3899 msgid "unable to create backing store for newly created file %s"

3900 msgstr "不能为新建文件 %s 创建后端存储"

3901

3534 -#: builtin/apply.c:4087 builtin/apply.c:4195

3902 +#: builtin/apply.c:4227 builtin/apply.c:4340

3903 #, c-format

3904 msgid "unable to add cache entry for %s"

3905 msgstr "无法为 %s 添加缓存条目"

3906

3539 -#: builtin/apply.c:4120

3907 +#: builtin/apply.c:4260

3908 #, c-format

3909 msgid "closing file '%s'"

3910 msgstr "关闭文件 '%s'"

3911

3544 -#: builtin/apply.c:4169

3912 +#: builtin/apply.c:4313

3913 #, c-format

3914 msgid "unable to write file '%s' mode %o"

3915 msgstr "不能写文件 '%s' 权限 %o"

3916

3549 -#: builtin/apply.c:4256

3917 +#: builtin/apply.c:4403

3918 #, c-format

3919 msgid "Applied patch %s cleanly."

3920 msgstr "成功应用补丁 %s。"

3921

3554 -#: builtin/apply.c:4264

3922 +#: builtin/apply.c:4411

3923 msgid "internal error"

3924 msgstr "内部错误"

3925

3558 -#: builtin/apply.c:4267

3926 +#: builtin/apply.c:4414

3927 #, c-format

3928 msgid "Applying patch %%s with %d reject..."

3929 msgid_plural "Applying patch %%s with %d rejects..."

3930 msgstr[0] "应用 %%s 个补丁，其中 %d 个被拒绝..."

3931 msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..."

3932

3565 -#: builtin/apply.c:4277

3933 +#: builtin/apply.c:4424

3934 #, c-format

3935 msgid "truncating .rej filename to %.*s.rej"

3936 msgstr "截短 .rej 文件名为 %.*s.rej"

3937

3570 -#: builtin/apply.c:4285

3938 +#: builtin/apply.c:4432

3939 #, c-format

3940 msgid "cannot open %s: %s"

3941 msgstr "不能打开 %s：%s"

3942

3575 -#: builtin/apply.c:4298

3943 +#: builtin/apply.c:4445

3944 #, c-format

3945 msgid "Hunk #%d applied cleanly."

3946 msgstr "第 #%d 个片段成功应用。"

3947

3580 -#: builtin/apply.c:4301

3948 +#: builtin/apply.c:4448

3949 #, c-format

3950 msgid "Rejected hunk #%d."

3951 msgstr "拒绝第 #%d 个片段。"

3952

3585 -#: builtin/apply.c:4387

3953 +#: builtin/apply.c:4537

3954 #, c-format

3955 msgid "Skipped patch '%s'."

3956 msgstr "略过补丁 '%s'。"

3957

3590 -#: builtin/apply.c:4395

3958 +#: builtin/apply.c:4545

3959 msgid "unrecognized input"

3960 msgstr "未能识别的输入"

3961

3594 -#: builtin/apply.c:4406

3962 +#: builtin/apply.c:4556

3963 msgid "unable to read index file"

3964 msgstr "无法读取索引文件"

3965

3598 -#: builtin/apply.c:4509

3599 -msgid "don't apply changes matching the given path"

3600 -msgstr "不要应用与给出路径向匹配的变更"

3966 +#: builtin/apply.c:4701

3967 +msgid "--3way outside a repository"

3968 +msgstr "--3way 在一个仓库之外"

3969

3602 -#: builtin/apply.c:4512

3603 -msgid "apply changes matching the given path"

3604 -msgstr "应用与给出路径向匹配的变更"

3970 +#: builtin/apply.c:4709

3971 +msgid "--index outside a repository"

3972 +msgstr "--index 在一个仓库之外"

3973

3606 -#: builtin/apply.c:4515

3607 -msgid "remove <num> leading slashes from traditional diff paths"

3608 -msgstr "从传统的 diff 路径中移除指定数量的前导斜线"

3974 +#: builtin/apply.c:4712

3975 +msgid "--cached outside a repository"

3976 +msgstr "--cached 在一个仓库之外"

3977

3610 -#: builtin/apply.c:4518

3611 -msgid "ignore additions made by the patch"

3978 +#: builtin/apply.c:4745

3979 +#, c-format

3980 +msgid "can't open patch '%s'"

3981 +msgstr "不能打开补丁 '%s'"

3982 +

3983 +#: builtin/apply.c:4760

3984 +#, c-format

3985 +msgid "squelched %d whitespace error"

3986 +msgid_plural "squelched %d whitespace errors"

3987 +msgstr[0] "抑制下仍有 %d 个空白字符误用"

3988 +msgstr[1] "抑制下仍有 %d 个空白字符误用"

3989 +

3990 +#: builtin/apply.c:4766 builtin/apply.c:4776

3991 +#, c-format

3992 +msgid "%d line adds whitespace errors."

3993 +msgid_plural "%d lines add whitespace errors."

3994 +msgstr[0] "%d 行有空白字符误用。"

3995 +msgstr[1] "%d 行有空白字符误用。"

3996 +

3997 +#: builtin/apply.c:4800

3998 +msgid "don't apply changes matching the given path"

3999 +msgstr "不要应用与给出路径向匹配的变更"

4000 +

4001 +#: builtin/apply.c:4803

4002 +msgid "apply changes matching the given path"

4003 +msgstr "应用与给出路径向匹配的变更"

4004 +

4005 +#: builtin/apply.c:4806

4006 +msgid "remove <num> leading slashes from traditional diff paths"

4007 +msgstr "从传统的 diff 路径中移除指定数量的前导斜线"

4008 +

4009 +#: builtin/apply.c:4809

4010 +msgid "ignore additions made by the patch"

4011 msgstr "忽略补丁中的添加的文件"

4012

3614 -#: builtin/apply.c:4520

4013 +#: builtin/apply.c:4811

4014 msgid "instead of applying the patch, output diffstat for the input"

4015 msgstr "不应用补丁，而是显示输入的差异统计（diffstat）"

4016

3618 -#: builtin/apply.c:4524

4017 +#: builtin/apply.c:4815

4018 msgid "show number of added and deleted lines in decimal notation"

4019 msgstr "以十进制数显示添加和删除的行数"

4020

3622 -#: builtin/apply.c:4526

4021 +#: builtin/apply.c:4817

4022 msgid "instead of applying the patch, output a summary for the input"

4023 msgstr "不应用补丁，而是显示输入的概要"

4024

3626 -#: builtin/apply.c:4528

4025 +#: builtin/apply.c:4819

4026 msgid "instead of applying the patch, see if the patch is applicable"

4027 msgstr "不应用补丁，而是查看补丁是否可应用"

4028

3630 -#: builtin/apply.c:4530

4029 +#: builtin/apply.c:4821

4030 msgid "make sure the patch is applicable to the current index"

4031 msgstr "确认补丁可以应用到当前索引"

4032

3634 -#: builtin/apply.c:4532

4033 +#: builtin/apply.c:4823

4034 msgid "apply a patch without touching the working tree"

4035 msgstr "应用补丁而不修改工作区"

4036

3638 -#: builtin/apply.c:4534

4037 +#: builtin/apply.c:4825

4038 msgid "accept a patch that touches outside the working area"

4039 msgstr "接受修改工作区之外文件的补丁"

4040

3642 -#: builtin/apply.c:4536

4041 +#: builtin/apply.c:4827

4042 msgid "also apply the patch (use with --stat/--summary/--check)"

4043 msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）"

4044

3646 -#: builtin/apply.c:4538

4045 +#: builtin/apply.c:4829

4046 msgid "attempt three-way merge if a patch does not apply"

4047 msgstr "如果一个补丁不能应用则尝试三方合并"

4048

3650 -#: builtin/apply.c:4540

4049 +#: builtin/apply.c:4831

4050 msgid "build a temporary index based on embedded index information"

4051 msgstr "创建一个临时索引基于嵌入的索引信息"

4052

3654 -#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425

4053 +#: builtin/apply.c:4834 builtin/checkout-index.c:169 builtin/ls-files.c:426

4054 msgid "paths are separated with NUL character"

4055 msgstr "路径以 NUL 字符分隔"

4056

3658 -#: builtin/apply.c:4545

4057 +#: builtin/apply.c:4836

4058 msgid "ensure at least <n> lines of context match"

4059 msgstr "确保至少匹配 <n> 行上下文"

4060

3662 -#: builtin/apply.c:4547

4061 +#: builtin/apply.c:4838

4062 msgid "detect new or modified lines that have whitespace errors"

4063 msgstr "检查新增和修改的行中间的空白字符滥用"

4064

3666 -#: builtin/apply.c:4550 builtin/apply.c:4553

4065 +#: builtin/apply.c:4841 builtin/apply.c:4844

4066 msgid "ignore changes in whitespace when finding context"

4067 msgstr "查找上下文时忽略空白字符的变更"

4068

3670 -#: builtin/apply.c:4556

4069 +#: builtin/apply.c:4847

4070 msgid "apply the patch in reverse"

4071 msgstr "反向应用补丁"

4072

3674 -#: builtin/apply.c:4558

4073 +#: builtin/apply.c:4849

4074 msgid "don't expect at least one line of context"

4075 msgstr "无需至少一行上下文"

4076

3678 -#: builtin/apply.c:4560

4077 +#: builtin/apply.c:4851

4078 msgid "leave the rejected hunks in corresponding *.rej files"

4079 msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"

4080

3682 -#: builtin/apply.c:4562

4081 +#: builtin/apply.c:4853

4082 msgid "allow overlapping hunks"

4083 msgstr "允许重叠的补丁片段"

4084

3686 -#: builtin/apply.c:4565

4085 +#: builtin/apply.c:4856

4086 msgid "tolerate incorrectly detected missing new-line at the end of file"

4087 msgstr "允许不正确的文件末尾换行符"

4088

3690 -#: builtin/apply.c:4568

4089 +#: builtin/apply.c:4859

4090 msgid "do not trust the line counts in the hunk headers"

4091 msgstr "不信任补丁片段的头信息中的行号"

4092

3694 -#: builtin/apply.c:4571

4093 +#: builtin/apply.c:4862

4094 msgid "prepend <root> to all filenames"

4095 msgstr "为所有文件名前添加 <根目录>"

4096

3698 -#: builtin/apply.c:4593

3699 -msgid "--3way outside a repository"

3700 -msgstr "--3way 在一个仓库之外"

3701 -

3702 -#: builtin/apply.c:4601

3703 -msgid "--index outside a repository"

3704 -msgstr "--index 在一个仓库之外"

3705 -

3706 -#: builtin/apply.c:4604

3707 -msgid "--cached outside a repository"

3708 -msgstr "--cached 在一个仓库之外"

3709 -

3710 -#: builtin/apply.c:4623

3711 -#, c-format

3712 -msgid "can't open patch '%s'"

3713 -msgstr "不能打开补丁 '%s'"

3714 -

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 -

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."

3726 -msgstr[0] "%d 行有空白字符误用。"

3727 -msgstr[1] "%d 行有空白字符误用。"

3728 -

4097 #: builtin/archive.c:17

4098 #, c-format

4099 msgid "could not create archive file '%s'"

@@ -3781,103 +4149,103 @@ msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"

4149 msgid "<rev-opts> are documented in git-rev-list(1)"

4150 msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"

4151

3784 -#: builtin/blame.c:1782

4152 +#: builtin/blame.c:1781

4153 msgid "Blaming lines"

4154 msgstr "追踪代码行"

4155

3788 -#: builtin/blame.c:2531

4156 +#: builtin/blame.c:2536

4157 msgid "Show blame entries as we find them, incrementally"

4158 msgstr "增量式地显示发现的 blame 条目"

4159

3792 -#: builtin/blame.c:2532

4160 +#: builtin/blame.c:2537

4161 msgid "Show blank SHA-1 for boundary commits (Default: off)"

4162 msgstr "边界提交显示空的 SHA-1（默认：关闭）"

4163

3796 -#: builtin/blame.c:2533

4164 +#: builtin/blame.c:2538

4165 msgid "Do not treat root commits as boundaries (Default: off)"

4166 msgstr "不把根提交作为边界（默认：关闭）"

4167

3800 -#: builtin/blame.c:2534

4168 +#: builtin/blame.c:2539

4169 msgid "Show work cost statistics"

4170 msgstr "显示命令消耗统计"

4171

3804 -#: builtin/blame.c:2535

4172 +#: builtin/blame.c:2540

4173 msgid "Force progress reporting"

4174 msgstr "强制进度显示"

4175

3808 -#: builtin/blame.c:2536

4176 +#: builtin/blame.c:2541

4177 msgid "Show output score for blame entries"

4178 msgstr "显示判断 blame 条目位移的得分诊断信息"

4179

3812 -#: builtin/blame.c:2537

4180 +#: builtin/blame.c:2542

4181 msgid "Show original filename (Default: auto)"

4182 msgstr "显示原始文件名（默认：自动）"

4183

3816 -#: builtin/blame.c:2538

4184 +#: builtin/blame.c:2543

4185 msgid "Show original linenumber (Default: off)"

4186 msgstr "显示原始的行号（默认：关闭）"

4187

3820 -#: builtin/blame.c:2539

4188 +#: builtin/blame.c:2544

4189 msgid "Show in a format designed for machine consumption"

4190 msgstr "显示为一个适合机器读取的格式"

4191

3824 -#: builtin/blame.c:2540

4192 +#: builtin/blame.c:2545

4193 msgid "Show porcelain format with per-line commit information"

4194 msgstr "为每一行显示机器适用的提交信息"

4195

3828 -#: builtin/blame.c:2541

4196 +#: builtin/blame.c:2546

4197 msgid "Use the same output mode as git-annotate (Default: off)"

4198 msgstr "使用和 git-annotate 相同的输出模式（默认：关闭）"

4199

3832 -#: builtin/blame.c:2542

4200 +#: builtin/blame.c:2547

4201 msgid "Show raw timestamp (Default: off)"

4202 msgstr "显示原始时间戳（默认：关闭）"

4203

3836 -#: builtin/blame.c:2543

4204 +#: builtin/blame.c:2548

4205 msgid "Show long commit SHA1 (Default: off)"

4206 msgstr "显示长的 SHA1 提交号（默认：关闭）"

4207

3840 -#: builtin/blame.c:2544

4208 +#: builtin/blame.c:2549

4209 msgid "Suppress author name and timestamp (Default: off)"

4210 msgstr "隐藏作者名字和时间戳（默认：关闭）"

4211

3844 -#: builtin/blame.c:2545

4212 +#: builtin/blame.c:2550

4213 msgid "Show author email instead of name (Default: off)"

4214 msgstr "显示作者的邮箱而不是名字（默认：关闭）"

4215

3848 -#: builtin/blame.c:2546

4216 +#: builtin/blame.c:2551

4217 msgid "Ignore whitespace differences"

4218 msgstr "忽略空白差异"

4219

3852 -#: builtin/blame.c:2547

4220 +#: builtin/blame.c:2552

4221 msgid "Spend extra cycles to find better match"

4222 msgstr "花费额外的循环来找到更好的匹配"

4223

3856 -#: builtin/blame.c:2548

4224 +#: builtin/blame.c:2553

4225 msgid "Use revisions from <file> instead of calling git-rev-list"

4226 msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"

4227

3860 -#: builtin/blame.c:2549

4228 +#: builtin/blame.c:2554

4229 msgid "Use <file>'s contents as the final image"

4230 msgstr "使用 <文件> 的内容作为最终的图片"

4231

3864 -#: builtin/blame.c:2550 builtin/blame.c:2551

4232 +#: builtin/blame.c:2555 builtin/blame.c:2556

4233 msgid "score"

4234 msgstr "得分"

4235

3868 -#: builtin/blame.c:2550

4236 +#: builtin/blame.c:2555

4237 msgid "Find line copies within and across files"

4238 msgstr "找到文件内及跨文件的行拷贝"

4239

3872 -#: builtin/blame.c:2551

4240 +#: builtin/blame.c:2556

4241 msgid "Find line movements within and across files"

4242 msgstr "找到文件内及跨文件的行移动"

4243

3876 -#: builtin/blame.c:2552

4244 +#: builtin/blame.c:2557

4245 msgid "n,m"

4246 msgstr "n,m"

4247

3880 -#: builtin/blame.c:2552

4248 +#: builtin/blame.c:2557

4249 msgid "Process only line range n,m, counting from 1"

4250 msgstr "只处理行范围在 n 和 m 之间的，从 1 开始"

4251

@@ -3887,7 +4255,7 @@ msgstr "只处理行范围在 n 和 m 之间的，从 1 开始"

4255 #. takes 22 places, is the longest among various forms of

4256 #. relative timestamps, but your language may need more or

4257 #. fewer display columns.

3890 -#: builtin/blame.c:2641

4258 +#: builtin/blame.c:2649

4259 msgid "4 years, 11 months ago"

4260 msgstr "4 年 11 个月前"

4261

@@ -3992,118 +4360,125 @@ msgstr "已删除远程跟踪分支 %s（曾为 %s）。\n"

4360 msgid "Deleted branch %s (was %s).\n"

4361 msgstr "已删除分支 %s（曾为 %s）。\n"

4362

3995 -#: builtin/branch.c:309

4363 +#: builtin/branch.c:312

4364 #, c-format

4365 msgid "[%s: gone]"

4366 msgstr "[%s: 丢失]"

4367

4000 -#: builtin/branch.c:314

4368 +#: builtin/branch.c:317

4369 #, c-format

4370 msgid "[%s]"

4371 msgstr "[%s]"

4372

4005 -#: builtin/branch.c:319

4373 +#: builtin/branch.c:322

4374 #, c-format

4375 msgid "[%s: behind %d]"

4376 msgstr "[%s：落后 %d]"

4377

4010 -#: builtin/branch.c:321

4378 +#: builtin/branch.c:324

4379 #, c-format

4380 msgid "[behind %d]"

4381 msgstr "[落后 %d]"

4382

4015 -#: builtin/branch.c:325

4383 +#: builtin/branch.c:328

4384 #, c-format

4385 msgid "[%s: ahead %d]"

4386 msgstr "[%s：领先 %d]"

4387

4020 -#: builtin/branch.c:327

4388 +#: builtin/branch.c:330

4389 #, c-format

4390 msgid "[ahead %d]"

4391 msgstr "[领先 %d]"

4392

4025 -#: builtin/branch.c:330

4393 +#: builtin/branch.c:333

4394 #, c-format

4395 msgid "[%s: ahead %d, behind %d]"

4396 msgstr "[%s：领先 %d，落后 %d]"

4397

4030 -#: builtin/branch.c:333

4398 +#: builtin/branch.c:336

4399 #, c-format

4400 msgid "[ahead %d, behind %d]"

4401 msgstr "[领先 %d，落后 %d]"

4402

4035 -#: builtin/branch.c:346

4403 +#: builtin/branch.c:349

4404 msgid " **** invalid ref ****"

4405 msgstr " **** 无效引用 ****"

4406

4039 -#: builtin/branch.c:372

4407 +#: builtin/branch.c:375

4408 #, c-format

4409 msgid "(no branch, rebasing %s)"

4410 msgstr "（非分支，正变基 %s）"

4411

4044 -#: builtin/branch.c:375

4412 +#: builtin/branch.c:378

4413 #, c-format

4414 msgid "(no branch, bisect started on %s)"

4415 msgstr "（非分支，二分查找开始于 %s）"

4416

4417 #. TRANSLATORS: make sure this matches

4418 #. "HEAD detached at " in wt-status.c

4051 -#: builtin/branch.c:381

4419 +#: builtin/branch.c:384

4420 #, c-format

4421 msgid "(HEAD detached at %s)"

4422 msgstr "（头指针分离于 %s）"

4423

4424 #. TRANSLATORS: make sure this matches

4425 #. "HEAD detached from " in wt-status.c

4058 -#: builtin/branch.c:386

4426 +#: builtin/branch.c:389

4427 #, c-format

4428 msgid "(HEAD detached from %s)"

4429 msgstr "（头指针分离自 %s）"

4430

4063 -#: builtin/branch.c:390

4431 +#: builtin/branch.c:393

4432 msgid "(no branch)"

4433 msgstr "（非分支）"

4434

4067 -#: builtin/branch.c:541

4435 +#: builtin/branch.c:544

4436 #, c-format

4437 msgid "Branch %s is being rebased at %s"

4438 msgstr "分支 %s 正被变基到 %s"

4439

4072 -#: builtin/branch.c:545

4440 +#: builtin/branch.c:548

4441 #, c-format

4442 msgid "Branch %s is being bisected at %s"

4443 msgstr "分支 %s 正被二分查找于 %s"

4444

4077 -#: builtin/branch.c:560

4445 +#: builtin/branch.c:563

4446 msgid "cannot rename the current branch while not on any."

4447 msgstr "无法重命名当前分支因为不处于任何分支上。"

4448

4081 -#: builtin/branch.c:570

4449 +#: builtin/branch.c:573

4450 #, c-format

4451 msgid "Invalid branch name: '%s'"

4452 msgstr "无效的分支名：'%s'"

4453

4086 -#: builtin/branch.c:587

4454 +#: builtin/branch.c:590

4455 msgid "Branch rename failed"

4456 msgstr "分支重命名失败"

4457

4090 -#: builtin/branch.c:591

4458 +#: builtin/branch.c:594

4459 #, c-format

4460 msgid "Renamed a misnamed branch '%s' away"

4461 msgstr "重命名掉一个错误命名的旧分支 '%s'"

4462

4095 -#: builtin/branch.c:594

4463 +#: builtin/branch.c:597

4464 #, c-format

4465 msgid "Branch renamed to %s, but HEAD is not updated!"

4466 msgstr "分支重命名为 %s，但 HEAD 没有更新！"

4467

4100 -#: builtin/branch.c:601

4468 +#: builtin/branch.c:604

4469 msgid "Branch is renamed, but update of config-file failed"

4470 msgstr "分支被重命名，但更新 config 文件失败"

4471

4104 -#: builtin/branch.c:623

4105 -msgid "could not write branch description template"

4106 -msgstr "不能写分支描述模版"

4472 +#: builtin/branch.c:620

4473 +#, c-format

4474 +msgid ""

4475 +"Please edit the description for the branch\n"

4476 +" %s\n"

4477 +"Lines starting with '%c' will be stripped.\n"

4478 +msgstr ""

4479 +"请编辑分支的描述\n"

4480 +" %s\n"

4481 +"以 '%c' 开头的行将被过滤。\n"

4482

4483 #: builtin/branch.c:651

4484 msgid "Generic options"

@@ -4205,8 +4580,8 @@ msgstr "key"

4580 msgid "field name to sort on"

4581 msgstr "排序的字段名"

4582

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

4583 +#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:402

4584 +#: builtin/notes.c:405 builtin/notes.c:565 builtin/notes.c:568

4585 #: builtin/tag.c:369

4586 msgid "object"

4587 msgstr "对象"

@@ -4326,7 +4701,7 @@ msgstr "需要一个仓库来创建包。"

4701 msgid "Need a repository to unbundle."

4702 msgstr "需要一个仓库来解包。"

4703

4329 -#: builtin/cat-file.c:428

4704 +#: builtin/cat-file.c:443

4705 msgid ""

4706 "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"

4707 "<type>|--textconv) <object>"

@@ -4334,55 +4709,55 @@ msgstr ""

4709 "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|<类型"

4710 ">|--textconv) <对象>"

4711

4337 -#: builtin/cat-file.c:429

4712 +#: builtin/cat-file.c:444

4713 msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"

4714 msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]"

4715

4341 -#: builtin/cat-file.c:466

4716 +#: builtin/cat-file.c:481

4717 msgid "<type> can be one of: blob, tree, commit, tag"

4718 msgstr "<类型> 可以是其中之一：blob、tree、commit、tag"

4719

4345 -#: builtin/cat-file.c:467

4720 +#: builtin/cat-file.c:482

4721 msgid "show object type"

4722 msgstr "显示对象类型"

4723

4349 -#: builtin/cat-file.c:468

4724 +#: builtin/cat-file.c:483

4725 msgid "show object size"

4726 msgstr "显示对象大小"

4727

4353 -#: builtin/cat-file.c:470

4728 +#: builtin/cat-file.c:485

4729 msgid "exit with zero when there's no error"

4730 msgstr "当没有错误时退出并返回零"

4731

4357 -#: builtin/cat-file.c:471

4732 +#: builtin/cat-file.c:486

4733 msgid "pretty-print object's content"

4734 msgstr "美观地打印对象的内容"

4735

4361 -#: builtin/cat-file.c:473

4736 +#: builtin/cat-file.c:488

4737 msgid "for blob objects, run textconv on object's content"

4738 msgstr "对于数据对象，对其内容执行 textconv"

4739

4365 -#: builtin/cat-file.c:475

4740 +#: builtin/cat-file.c:490

4741 msgid "allow -s and -t to work with broken/corrupt objects"

4742 msgstr "允许 -s 和 -t 对损坏的对象生效"

4743

4369 -#: builtin/cat-file.c:476

4744 +#: builtin/cat-file.c:491

4745 msgid "buffer --batch output"

4746 msgstr "缓冲 --batch 的输出"

4747

4373 -#: builtin/cat-file.c:478

4748 +#: builtin/cat-file.c:493

4749 msgid "show info and content of objects fed from the standard input"

4750 msgstr "显示从标准输入提供的对象的信息和内容"

4751

4377 -#: builtin/cat-file.c:481

4752 +#: builtin/cat-file.c:496

4753 msgid "show info about objects fed from the standard input"

4754 msgstr "显示从标准输入提供的对象的信息"

4755

4381 -#: builtin/cat-file.c:484

4756 +#: builtin/cat-file.c:499

4757 msgid "follow in-tree symlinks (used with --batch or --batch-check)"

4758 msgstr "跟随树内符号链接（和 --batch 或 --batch-check 共用）"

4759

4385 -#: builtin/cat-file.c:486

4760 +#: builtin/cat-file.c:501

4761 msgid "show all objects with --batch or --batch-check"

4762 msgstr "使用 --batch 或 --batch-check 参数显示所有对象"

4763

@@ -4410,7 +4785,7 @@ msgstr "从标准输入读出文件名"

4785 msgid "terminate input and output records by a NUL character"

4786 msgstr "输入和输出的记录使用 NUL 字符终结"

4787

4413 -#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325

4788 +#: builtin/check-ignore.c:18 builtin/checkout.c:1138 builtin/gc.c:325

4789 msgid "suppress progress reporting"

4790 msgstr "不显示进度报告"

4791

@@ -4500,9 +4875,9 @@ msgid "write the content to temporary files"

4875 msgstr "将内容写入临时文件"

4876

4877 #: builtin/checkout-index.c:174 builtin/column.c:30

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

4878 +#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:491

4879 +#: builtin/submodule--helper.c:494 builtin/submodule--helper.c:497

4880 +#: builtin/submodule--helper.c:830 builtin/worktree.c:469

4881 msgid "string"

4882 msgstr "字符串"

4883

@@ -4568,10 +4943,6 @@ msgstr "'%s' 不能和 %s 同时使用"

4943 msgid "Cannot update paths and switch to branch '%s' at the same time."

4944 msgstr "不能同时更新路径并切换到分支'%s'。"

4945

4571 -#: builtin/checkout.c:279 builtin/checkout.c:473

4572 -msgid "corrupt index file"

4573 -msgstr "损坏的索引文件"

4574 -

4946 #: builtin/checkout.c:339 builtin/checkout.c:346

4947 #, c-format

4948 msgid "path '%s' is unmerged"

@@ -4581,51 +4952,51 @@ msgstr "路径 '%s' 未合并"

4952 msgid "you need to resolve your current index first"

4953 msgstr "您需要先解决当前索引的冲突"

4954

4584 -#: builtin/checkout.c:622

4955 +#: builtin/checkout.c:625

4956 #, c-format

4957 msgid "Can not do reflog for '%s': %s\n"

4958 msgstr "不能对 '%s' 执行 reflog 操作：%s\n"

4959

4589 -#: builtin/checkout.c:660

4960 +#: builtin/checkout.c:664

4961 msgid "HEAD is now at"

4962 msgstr "HEAD 目前位于"

4963

4593 -#: builtin/checkout.c:664 builtin/clone.c:661

4964 +#: builtin/checkout.c:668 builtin/clone.c:661

4965 msgid "unable to update HEAD"

4966 msgstr "不能更新 HEAD"

4967

4597 -#: builtin/checkout.c:668

4968 +#: builtin/checkout.c:672

4969 #, c-format

4970 msgid "Reset branch '%s'\n"

4971 msgstr "重置分支 '%s'\n"

4972

4602 -#: builtin/checkout.c:671

4973 +#: builtin/checkout.c:675

4974 #, c-format

4975 msgid "Already on '%s'\n"

4976 msgstr "已经位于 '%s'\n"

4977

4607 -#: builtin/checkout.c:675

4978 +#: builtin/checkout.c:679

4979 #, c-format

4980 msgid "Switched to and reset branch '%s'\n"

4981 msgstr "切换并重置分支 '%s'\n"

4982

4612 -#: builtin/checkout.c:677 builtin/checkout.c:1067

4983 +#: builtin/checkout.c:681 builtin/checkout.c:1070

4984 #, c-format

4985 msgid "Switched to a new branch '%s'\n"

4986 msgstr "切换到一个新分支 '%s'\n"

4987

4617 -#: builtin/checkout.c:679

4988 +#: builtin/checkout.c:683

4989 #, c-format

4990 msgid "Switched to branch '%s'\n"

4991 msgstr "切换到分支 '%s'\n"

4992

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

4623 -#: builtin/checkout.c:731

4994 +#: builtin/checkout.c:734

4995 #, c-format

4996 msgid " ... and %d more.\n"

4997 msgstr " ... 及其它 %d 个。\n"

4998

4628 -#: builtin/checkout.c:737

4999 +#: builtin/checkout.c:740

5000 #, c-format

5001 msgid ""

5002 "Warning: you are leaving %d commit behind, not connected to\n"

@@ -4646,7 +5017,7 @@ msgstr[1] ""

5017 "\n"

5018 "%s\n"

5019

4649 -#: builtin/checkout.c:756

5020 +#: builtin/checkout.c:759

5021 #, c-format

5022 msgid ""

5023 "If you want to keep it by creating a new branch, this may be a good time\n"

@@ -4673,150 +5044,150 @@ msgstr[1] ""

5044 " git branch <新分支名> %s\n"

5045 "\n"

5046

4676 -#: builtin/checkout.c:792

5047 +#: builtin/checkout.c:795

5048 msgid "internal error in revision walk"

5049 msgstr "在版本遍历时遇到内部错误"

5050

4680 -#: builtin/checkout.c:796

5051 +#: builtin/checkout.c:799

5052 msgid "Previous HEAD position was"

5053 msgstr "之前的 HEAD 位置是"

5054

4684 -#: builtin/checkout.c:823 builtin/checkout.c:1062

5055 +#: builtin/checkout.c:826 builtin/checkout.c:1065

5056 msgid "You are on a branch yet to be born"

5057 msgstr "您位于一个尚未初始化的分支"

5058

4688 -#: builtin/checkout.c:968

5059 +#: builtin/checkout.c:971

5060 #, c-format

5061 msgid "only one reference expected, %d given."

5062 msgstr "只要一个引用，却给出了 %d 个"

5063

4693 -#: builtin/checkout.c:1008 builtin/worktree.c:212

5064 +#: builtin/checkout.c:1011 builtin/worktree.c:214

5065 #, c-format

5066 msgid "invalid reference: %s"

5067 msgstr "无效引用：%s"

5068

4698 -#: builtin/checkout.c:1037

5069 +#: builtin/checkout.c:1040

5070 #, c-format

5071 msgid "reference is not a tree: %s"

5072 msgstr "引用不是一个树：%s"

5073

4703 -#: builtin/checkout.c:1076

5074 +#: builtin/checkout.c:1079

5075 msgid "paths cannot be used with switching branches"

5076 msgstr "路径不能和切换分支同时使用"

5077

4707 -#: builtin/checkout.c:1079 builtin/checkout.c:1083

5078 +#: builtin/checkout.c:1082 builtin/checkout.c:1086

5079 #, c-format

5080 msgid "'%s' cannot be used with switching branches"

5081 msgstr "'%s' 不能和切换分支同时使用"

5082

4712 -#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095

4713 -#: builtin/checkout.c:1098

5083 +#: builtin/checkout.c:1090 builtin/checkout.c:1093 builtin/checkout.c:1098

5084 +#: builtin/checkout.c:1101

5085 #, c-format

5086 msgid "'%s' cannot be used with '%s'"

5087 msgstr "'%s' 不能和 '%s' 同时使用"

5088

4718 -#: builtin/checkout.c:1103

5089 +#: builtin/checkout.c:1106

5090 #, c-format

5091 msgid "Cannot switch branch to a non-commit '%s'"

5092 msgstr "不能切换分支到一个非提交 '%s'"

5093

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

5094 +#: builtin/checkout.c:1139 builtin/checkout.c:1141 builtin/clone.c:88

5095 +#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324

5096 +#: builtin/worktree.c:326

5097 msgid "branch"

5098 msgstr "分支"

5099

4729 -#: builtin/checkout.c:1137

5100 +#: builtin/checkout.c:1140

5101 msgid "create and checkout a new branch"

5102 msgstr "创建并检出一个新的分支"

5103

4733 -#: builtin/checkout.c:1139

5104 +#: builtin/checkout.c:1142

5105 msgid "create/reset and checkout a branch"

5106 msgstr "创建/重置并检出一个分支"

5107

4737 -#: builtin/checkout.c:1140

5108 +#: builtin/checkout.c:1143

5109 msgid "create reflog for new branch"

5110 msgstr "为新的分支创建引用日志"

5111

4741 -#: builtin/checkout.c:1141

4742 -msgid "detach the HEAD at named commit"

4743 -msgstr "成为指向该提交的分离头指针"

5112 +#: builtin/checkout.c:1144 builtin/worktree.c:328

5113 +msgid "detach HEAD at named commit"

5114 +msgstr "HEAD 从指定的提交分离"

5115

4745 -#: builtin/checkout.c:1142

5116 +#: builtin/checkout.c:1145

5117 msgid "set upstream info for new branch"

5118 msgstr "为新的分支设置上游信息"

5119

4749 -#: builtin/checkout.c:1144

5120 +#: builtin/checkout.c:1147

5121 msgid "new-branch"

5122 msgstr "新分支"

5123

4753 -#: builtin/checkout.c:1144

5124 +#: builtin/checkout.c:1147

5125 msgid "new unparented branch"

5126 msgstr "新的没有父提交的分支"

5127

4757 -#: builtin/checkout.c:1145

5128 +#: builtin/checkout.c:1148

5129 msgid "checkout our version for unmerged files"

5130 msgstr "对尚未合并的文件检出我们的版本"

5131

4761 -#: builtin/checkout.c:1147

5132 +#: builtin/checkout.c:1150

5133 msgid "checkout their version for unmerged files"

5134 msgstr "对尚未合并的文件检出他们的版本"

5135

4765 -#: builtin/checkout.c:1149

5136 +#: builtin/checkout.c:1152

5137 msgid "force checkout (throw away local modifications)"

5138 msgstr "强制检出（丢弃本地修改）"

5139

4769 -#: builtin/checkout.c:1150

5140 +#: builtin/checkout.c:1153

5141 msgid "perform a 3-way merge with the new branch"

5142 msgstr "和新的分支执行三方合并"

5143

4773 -#: builtin/checkout.c:1151 builtin/merge.c:230

5144 +#: builtin/checkout.c:1154 builtin/merge.c:231

5145 msgid "update ignored files (default)"

5146 msgstr "更新忽略的文件（默认）"

5147

4777 -#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250

5148 +#: builtin/checkout.c:1155 builtin/log.c:1459 parse-options.h:250

5149 msgid "style"

5150 msgstr "风格"

5151

4781 -#: builtin/checkout.c:1153

5152 +#: builtin/checkout.c:1156

5153 msgid "conflict style (merge or diff3)"

5154 msgstr "冲突输出风格（merge 或 diff3）"

5155

4785 -#: builtin/checkout.c:1156

5156 +#: builtin/checkout.c:1159

5157 msgid "do not limit pathspecs to sparse entries only"

5158 msgstr "对路径不做稀疏检出的限制"

5159

4789 -#: builtin/checkout.c:1158

5160 +#: builtin/checkout.c:1161

5161 msgid "second guess 'git checkout <no-such-branch>'"

5162 msgstr "二次猜测'git checkout <无此分支>'"

5163

4793 -#: builtin/checkout.c:1160

5164 +#: builtin/checkout.c:1163

5165 msgid "do not check if another worktree is holding the given ref"

5166 msgstr "不检查指定的引用是否被其他工作区所占用"

5167

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

5168 +#: builtin/checkout.c:1164 builtin/clone.c:60 builtin/fetch.c:117

5169 +#: builtin/merge.c:228 builtin/pull.c:116 builtin/push.c:536

5170 #: builtin/send-pack.c:168

5171 msgid "force progress reporting"

5172 msgstr "强制显示进度报告"

5173

4803 -#: builtin/checkout.c:1192

5174 +#: builtin/checkout.c:1195

5175 msgid "-b, -B and --orphan are mutually exclusive"

5176 msgstr "-b、-B 和 --orphan 是互斥的"

5177

4807 -#: builtin/checkout.c:1209

5178 +#: builtin/checkout.c:1212

5179 msgid "--track needs a branch name"

5180 msgstr "--track 需要一个分支名"

5181

4811 -#: builtin/checkout.c:1214

5182 +#: builtin/checkout.c:1217

5183 msgid "Missing branch name; try -b"

5184 msgstr "缺少分支名；尝试 -b"

5185

4815 -#: builtin/checkout.c:1250

5186 +#: builtin/checkout.c:1253

5187 msgid "invalid path specification"

5188 msgstr "无效的路径规格"

5189

4819 -#: builtin/checkout.c:1257

5190 +#: builtin/checkout.c:1260

5191 #, c-format

5192 msgid ""

5193 "Cannot update paths and switch to branch '%s' at the same time.\n"

@@ -4825,12 +5196,12 @@ msgstr ""

5196 "不能同时更新路径并切换到分支'%s'。\n"

5197 "您是想要检出 '%s' 但其未能解析为提交么？"

5198

4828 -#: builtin/checkout.c:1262

5199 +#: builtin/checkout.c:1265

5200 #, c-format

5201 msgid "git checkout: --detach does not take a path argument '%s'"

5202 msgstr "git checkout：--detach 不能接收路径参数 '%s'"

5203

4833 -#: builtin/checkout.c:1266

5204 +#: builtin/checkout.c:1269

5205 msgid ""

5206 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"

5207 "checking out of the index."

@@ -4982,7 +5353,7 @@ msgid "remove whole directories"

5353 msgstr "删除整个目录"

5354

5355 #: 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

5356 +#: builtin/ls-files.c:457 builtin/name-rev.c:314 builtin/show-ref.c:182

5357 msgid "pattern"

5358 msgstr "模式"

5359

@@ -5024,7 +5395,7 @@ msgstr "git clone [<选项>] [--] <仓库> [<路径>]"

5395 msgid "don't create a checkout"

5396 msgstr "不创建一个检出"

5397

5027 -#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473

5398 +#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:476

5399 msgid "create a bare repository"

5400 msgstr "创建一个纯仓库"

5401

@@ -5052,16 +5423,16 @@ msgstr "在克隆时初始化子模组"

5423 msgid "number of submodules cloned in parallel"

5424 msgstr "并发克隆的子模组的数量"

5425

5055 -#: builtin/clone.c:80 builtin/init-db.c:470

5426 +#: builtin/clone.c:80 builtin/init-db.c:473

5427 msgid "template-directory"

5428 msgstr "模板目录"

5429

5059 -#: builtin/clone.c:81 builtin/init-db.c:471

5430 +#: builtin/clone.c:81 builtin/init-db.c:474

5431 msgid "directory from which templates will be used"

5432 msgstr "模板目录将被使用"

5433

5063 -#: builtin/clone.c:83 builtin/submodule--helper.c:498

5064 -#: builtin/submodule--helper.c:777

5434 +#: builtin/clone.c:83 builtin/submodule--helper.c:495

5435 +#: builtin/submodule--helper.c:833

5436 msgid "reference repository"

5437 msgstr "参考仓库"

5438

@@ -5085,7 +5456,7 @@ msgstr "检出 <分支> 而不是远程 HEAD"

5456 msgid "path to git-upload-pack on the remote"

5457 msgstr "远程 git-upload-pack 路径"

5458

5088 -#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667

5459 +#: builtin/clone.c:92 builtin/fetch.c:118 builtin/grep.c:667

5460 #: builtin/pull.c:201

5461 msgid "depth"

5462 msgstr "深度"

@@ -5102,11 +5473,11 @@ msgstr "只克隆一个分支、HEAD 或 --branch"

5473 msgid "any cloned submodules will be shallow"

5474 msgstr "子模组将以浅下载模式克隆"

5475

5105 -#: builtin/clone.c:98 builtin/init-db.c:479

5476 +#: builtin/clone.c:98 builtin/init-db.c:482

5477 msgid "gitdir"

5478 msgstr "git目录"

5479

5109 -#: builtin/clone.c:99 builtin/init-db.c:480

5480 +#: builtin/clone.c:99 builtin/init-db.c:483

5481 msgid "separate git dir from working tree"

5482 msgstr "git目录和工作区分离"

5483

@@ -5118,11 +5489,11 @@ msgstr "key=value"

5489 msgid "set config inside the new repository"

5490 msgstr "在新仓库中设置配置信息"

5491

5121 -#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536

5492 +#: builtin/clone.c:102 builtin/fetch.c:132 builtin/push.c:547

5493 msgid "use IPv4 addresses only"

5494 msgstr "只使用 IPv4 地址"

5495

5125 -#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538

5496 +#: builtin/clone.c:104 builtin/fetch.c:134 builtin/push.c:549

5497 msgid "use IPv6 addresses only"

5498 msgstr "只使用 IPv6 地址"

5499

@@ -5154,6 +5525,11 @@ msgstr "参考仓库 '%s' 是一个浅克隆"

5525 msgid "reference repository '%s' is grafted"

5526 msgstr "参考仓库 '%s' 已被嫁接"

5527

5528 +#: builtin/clone.c:376

5529 +#, c-format

5530 +msgid "failed to open '%s'"

5531 +msgstr "无法打开 '%s'"

5532 +

5533 #: builtin/clone.c:384

5534 #, c-format

5535 msgid "%s exists and is not a directory"

@@ -5174,7 +5550,7 @@ msgstr "无法创建链接 '%s'"

5550 msgid "failed to copy file to '%s'"

5551 msgstr "无法拷贝文件至 '%s'"

5552

5177 -#: builtin/clone.c:449 builtin/clone.c:633

5553 +#: builtin/clone.c:449

5554 #, c-format

5555 msgid "done.\n"

5556 msgstr "完成。\n"

@@ -5194,12 +5570,7 @@ msgstr ""

5570 msgid "Could not find remote branch %s to clone."

5571 msgstr "不能发现要克隆的远程分支 %s。"

5572

5197 -#: builtin/clone.c:628

5198 -#, c-format

5199 -msgid "Checking connectivity... "

5200 -msgstr "检查连接... "

5201 -

5202 -#: builtin/clone.c:631

5573 +#: builtin/clone.c:633

5574 msgid "remote did not send all necessary objects"

5575 msgstr "远程没有发送所有必须的对象"

5576

@@ -5216,99 +5587,99 @@ msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n"

5587 msgid "unable to checkout working tree"

5588 msgstr "不能检出工作区"

5589

5219 -#: builtin/clone.c:767

5590 +#: builtin/clone.c:766

5591 msgid "unable to write parameters to config file"

5592 msgstr "无法将参数写入配置文件"

5593

5223 -#: builtin/clone.c:830

5594 +#: builtin/clone.c:829

5595 msgid "cannot repack to clean up"

5596 msgstr "无法执行 repack 来清理"

5597

5227 -#: builtin/clone.c:832

5598 +#: builtin/clone.c:831

5599 msgid "cannot unlink temporary alternates file"

5600 msgstr "无法删除临时的 alternates 文件"

5601

5231 -#: builtin/clone.c:864 builtin/receive-pack.c:1731

5602 +#: builtin/clone.c:863 builtin/receive-pack.c:1855

5603 msgid "Too many arguments."

5604 msgstr "太多参数。"

5605

5235 -#: builtin/clone.c:868

5606 +#: builtin/clone.c:867

5607 msgid "You must specify a repository to clone."

5608 msgstr "您必须指定一个仓库来克隆。"

5609

5239 -#: builtin/clone.c:879

5610 +#: builtin/clone.c:878

5611 #, c-format

5612 msgid "--bare and --origin %s options are incompatible."

5613 msgstr "--bare 和 --origin %s 选项不兼容。"

5614

5244 -#: builtin/clone.c:882

5615 +#: builtin/clone.c:881

5616 msgid "--bare and --separate-git-dir are incompatible."

5617 msgstr "--bare 和 --separate-git-dir 选项不兼容。"

5618

5248 -#: builtin/clone.c:895

5619 +#: builtin/clone.c:894

5620 #, c-format

5621 msgid "repository '%s' does not exist"

5622 msgstr "仓库 '%s' 不存在"

5623

5253 -#: builtin/clone.c:901 builtin/fetch.c:1174

5624 +#: builtin/clone.c:900 builtin/fetch.c:1293

5625 #, c-format

5626 msgid "depth %s is not a positive number"

5627 msgstr "深度 %s 不是一个正数"

5628

5258 -#: builtin/clone.c:911

5629 +#: builtin/clone.c:910

5630 #, c-format

5631 msgid "destination path '%s' already exists and is not an empty directory."

5632 msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。"

5633

5263 -#: builtin/clone.c:921

5634 +#: builtin/clone.c:920

5635 #, c-format

5636 msgid "working tree '%s' already exists."

5637 msgstr "工作区 '%s' 已经存在。"

5638

5268 -#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547

5269 -#: builtin/worktree.c:220 builtin/worktree.c:247

5639 +#: builtin/clone.c:935 builtin/clone.c:946 builtin/submodule--helper.c:544

5640 +#: builtin/worktree.c:222 builtin/worktree.c:249

5641 #, c-format

5642 msgid "could not create leading directories of '%s'"

5643 msgstr "不能为 '%s' 创建先导目录"

5644

5274 -#: builtin/clone.c:939

5645 +#: builtin/clone.c:938

5646 #, c-format

5647 msgid "could not create work tree dir '%s'"

5648 msgstr "不能创建工作区目录 '%s'"

5649

5279 -#: builtin/clone.c:957

5650 +#: builtin/clone.c:956

5651 #, c-format

5652 msgid "Cloning into bare repository '%s'...\n"

5653 msgstr "克隆到纯仓库 '%s'...\n"

5654

5284 -#: builtin/clone.c:959

5655 +#: builtin/clone.c:958

5656 #, c-format

5657 msgid "Cloning into '%s'...\n"

5658 msgstr "正克隆到 '%s'...\n"

5659

5289 -#: builtin/clone.c:998

5660 +#: builtin/clone.c:997

5661 msgid "--depth is ignored in local clones; use file:// instead."

5662 msgstr "--depth 在本地克隆被忽略，改为 file:// 协议试试。"

5663

5293 -#: builtin/clone.c:1001

5664 +#: builtin/clone.c:1000

5665 msgid "source repository is shallow, ignoring --local"

5666 msgstr "源仓库是浅克隆，忽略 --local"

5667

5297 -#: builtin/clone.c:1006

5668 +#: builtin/clone.c:1005

5669 msgid "--local is ignored"

5670 msgstr "--local 被忽略"

5671

5301 -#: builtin/clone.c:1010

5672 +#: builtin/clone.c:1009

5673 #, c-format

5674 msgid "Don't know how to clone %s"

5675 msgstr "不知道如何克隆 %s"

5676

5306 -#: builtin/clone.c:1059 builtin/clone.c:1067

5677 +#: builtin/clone.c:1058 builtin/clone.c:1066

5678 #, c-format

5679 msgid "Remote branch %s not found in upstream %s"

5680 msgstr "远程分支 %s 在上游 %s 未发现"

5681

5311 -#: builtin/clone.c:1070

5682 +#: builtin/clone.c:1069

5683 msgid "You appear to have cloned an empty repository."

5684 msgstr "您似乎克隆了一个空仓库。"

5685

@@ -5442,103 +5813,103 @@ msgstr ""

5813 "然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"

5814 "操作。\n"

5815

5445 -#: builtin/commit.c:307

5816 +#: builtin/commit.c:308

5817 msgid "failed to unpack HEAD tree object"

5818 msgstr "无法解包 HEAD 树对象"

5819

5449 -#: builtin/commit.c:348

5820 +#: builtin/commit.c:349

5821 msgid "unable to create temporary index"

5822 msgstr "不能创建临时索引"

5823

5453 -#: builtin/commit.c:354

5824 +#: builtin/commit.c:355

5825 msgid "interactive add failed"

5826 msgstr "交互式添加失败"

5827

5457 -#: builtin/commit.c:367

5828 +#: builtin/commit.c:368

5829 msgid "unable to update temporary index"

5830 msgstr "无法更新临时索引"

5831

5461 -#: builtin/commit.c:369

5832 +#: builtin/commit.c:370

5833 msgid "Failed to update main cache tree"

5834 msgstr "不能更新树的主缓存"

5835

5465 -#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465

5836 +#: builtin/commit.c:394 builtin/commit.c:417 builtin/commit.c:466

5837 msgid "unable to write new_index file"

5838 msgstr "无法写 new_index 文件"

5839

5469 -#: builtin/commit.c:447

5840 +#: builtin/commit.c:448

5841 msgid "cannot do a partial commit during a merge."

5842 msgstr "在合并过程中不能做部分提交。"

5843

5473 -#: builtin/commit.c:449

5844 +#: builtin/commit.c:450

5845 msgid "cannot do a partial commit during a cherry-pick."

5846 msgstr "在拣选过程中不能做部分提交。"

5847

5477 -#: builtin/commit.c:458

5848 +#: builtin/commit.c:459

5849 msgid "cannot read the index"

5850 msgstr "无法读取索引"

5851

5481 -#: builtin/commit.c:477

5852 +#: builtin/commit.c:478

5853 msgid "unable to write temporary index file"

5854 msgstr "无法写临时索引文件"

5855

5485 -#: builtin/commit.c:582

5856 +#: builtin/commit.c:583

5857 #, c-format

5858 msgid "commit '%s' lacks author header"

5859 msgstr "提交 '%s' 缺少作者信息"

5860

5490 -#: builtin/commit.c:584

5861 +#: builtin/commit.c:585

5862 #, c-format

5863 msgid "commit '%s' has malformed author line"

5864 msgstr "提交 '%s' 有非法的作者信息"

5865

5495 -#: builtin/commit.c:603

5866 +#: builtin/commit.c:604

5867 msgid "malformed --author parameter"

5868 msgstr "非法的 --author 参数"

5869

5499 -#: builtin/commit.c:611

5870 +#: builtin/commit.c:612

5871 #, c-format

5872 msgid "invalid date format: %s"

5873 msgstr "无效的日期格式：%s"

5874

5504 -#: builtin/commit.c:655

5875 +#: builtin/commit.c:656

5876 msgid ""

5877 "unable to select a comment character that is not used\n"

5878 "in the current commit message"

5879 msgstr "无法选择一个未被当前提交说明使用的注释字符"

5880

5510 -#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091

5881 +#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1092

5882 #, c-format

5883 msgid "could not lookup commit %s"

5884 msgstr "不能查询提交 %s"

5885

5515 -#: builtin/commit.c:704 builtin/shortlog.c:285

5886 +#: builtin/commit.c:705 builtin/shortlog.c:286

5887 #, c-format

5888 msgid "(reading log message from standard input)\n"

5889 msgstr "（正从标准输入中读取日志信息）\n"

5890

5520 -#: builtin/commit.c:706

5891 +#: builtin/commit.c:707

5892 msgid "could not read log from standard input"

5893 msgstr "不能从标准输入中读取日志信息"

5894

5524 -#: builtin/commit.c:710

5895 +#: builtin/commit.c:711

5896 #, c-format

5897 msgid "could not read log file '%s'"

5898 msgstr "不能读取日志文件 '%s'"

5899

5529 -#: builtin/commit.c:737 builtin/commit.c:745

5900 +#: builtin/commit.c:738 builtin/commit.c:746

5901 msgid "could not read SQUASH_MSG"

5902 msgstr "不能读取 SQUASH_MSG"

5903

5533 -#: builtin/commit.c:742

5904 +#: builtin/commit.c:743

5905 msgid "could not read MERGE_MSG"

5906 msgstr "不能读取 MERGE_MSG"

5907

5537 -#: builtin/commit.c:796

5908 +#: builtin/commit.c:797

5909 msgid "could not write commit template"

5910 msgstr "不能写提交模版"

5911

5541 -#: builtin/commit.c:814

5912 +#: builtin/commit.c:815

5913 #, c-format

5914 msgid ""

5915 "\n"

@@ -5552,7 +5923,7 @@ msgstr ""

5923 "\t%s\n"

5924 "然后重试。\n"

5925

5555 -#: builtin/commit.c:819

5926 +#: builtin/commit.c:820

5927 #, c-format

5928 msgid ""

5929 "\n"

@@ -5566,7 +5937,7 @@ msgstr ""

5937 "\t%s\n"

5938 "然后重试。\n"

5939

5569 -#: builtin/commit.c:832

5940 +#: builtin/commit.c:833

5941 #, c-format

5942 msgid ""

5943 "Please enter the commit message for your changes. Lines starting\n"

@@ -5575,7 +5946,7 @@ msgstr ""

5946 "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n"

5947 "说明将会终止提交。\n"

5948

5578 -#: builtin/commit.c:839

5949 +#: builtin/commit.c:840

5950 #, c-format

5951 msgid ""

5952 "Please enter the commit message for your changes. Lines starting\n"

@@ -5586,346 +5957,346 @@ msgstr ""

5957 "也可以删除它们。一个空的提交说明将会终止提交。\n"

5958

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

5589 -#: builtin/commit.c:859

5960 +#: builtin/commit.c:860

5961 #, c-format

5962 msgid "%sAuthor: %.*s <%.*s>"

5963 msgstr "%s作者： %.*s <%.*s>"

5964

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

5595 -#: builtin/commit.c:867

5966 +#: builtin/commit.c:868

5967 #, c-format

5968 msgid "%sDate: %s"

5969 msgstr "%s日期： %s"

5970

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

5601 -#: builtin/commit.c:874

5972 +#: builtin/commit.c:875

5973 #, c-format

5974 msgid "%sCommitter: %.*s <%.*s>"

5975 msgstr "%s提交者：%.*s <%.*s>"

5976

5606 -#: builtin/commit.c:892

5977 +#: builtin/commit.c:893

5978 msgid "Cannot read index"

5979 msgstr "无法读取索引"

5980

5610 -#: builtin/commit.c:949

5981 +#: builtin/commit.c:950

5982 msgid "Error building trees"

5983 msgstr "无法创建树对象"

5984

5614 -#: builtin/commit.c:964 builtin/tag.c:266

5985 +#: builtin/commit.c:965 builtin/tag.c:266

5986 #, c-format

5987 msgid "Please supply the message using either -m or -F option.\n"

5988 msgstr "请使用 -m 或 -F 选项提供提交说明。\n"

5989

5619 -#: builtin/commit.c:1066

5990 +#: builtin/commit.c:1067

5991 #, c-format

5992 msgid "--author '%s' is not 'Name <email>' and matches no existing author"

5993 msgstr "--author '%s' 不是 'Name <email>' 格式，且未能在现有作者中找到匹配"

5994

5624 -#: builtin/commit.c:1081 builtin/commit.c:1321

5995 +#: builtin/commit.c:1082 builtin/commit.c:1322

5996 #, c-format

5997 msgid "Invalid untracked files mode '%s'"

5998 msgstr "无效的未追踪文件参数 '%s'"

5999

5629 -#: builtin/commit.c:1118

6000 +#: builtin/commit.c:1119

6001 msgid "--long and -z are incompatible"

6002 msgstr "--long 和 -z 选项不兼容"

6003

5633 -#: builtin/commit.c:1148

6004 +#: builtin/commit.c:1149

6005 msgid "Using both --reset-author and --author does not make sense"

6006 msgstr "同时使用 --reset-author 和 --author 没有意义"

6007

5637 -#: builtin/commit.c:1157

6008 +#: builtin/commit.c:1158

6009 msgid "You have nothing to amend."

6010 msgstr "您没有可修补的提交。"

6011

5641 -#: builtin/commit.c:1160

6012 +#: builtin/commit.c:1161

6013 msgid "You are in the middle of a merge -- cannot amend."

6014 msgstr "您正处于一个合并过程中 -- 无法修补提交。"

6015

5645 -#: builtin/commit.c:1162

6016 +#: builtin/commit.c:1163

6017 msgid "You are in the middle of a cherry-pick -- cannot amend."

6018 msgstr "您正处于一个拣选过程中 -- 无法修补提交。"

6019

5649 -#: builtin/commit.c:1165

6020 +#: builtin/commit.c:1166

6021 msgid "Options --squash and --fixup cannot be used together"

6022 msgstr "选项 --squash 和 --fixup 不能同时使用"

6023

5653 -#: builtin/commit.c:1175

6024 +#: builtin/commit.c:1176

6025 msgid "Only one of -c/-C/-F/--fixup can be used."

6026 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"

6027

5657 -#: builtin/commit.c:1177

6028 +#: builtin/commit.c:1178

6029 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."

6030 msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"

6031

5661 -#: builtin/commit.c:1185

6032 +#: builtin/commit.c:1186

6033 msgid "--reset-author can be used only with -C, -c or --amend."

6034 msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"

6035

5665 -#: builtin/commit.c:1202

6036 +#: builtin/commit.c:1203

6037 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."

6038 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"

6039

5669 -#: builtin/commit.c:1204

6040 +#: builtin/commit.c:1205

6041 msgid "No paths with --include/--only does not make sense."

6042 msgstr "参数 --include/--only 不跟路径没有意义。"

6043

5673 -#: builtin/commit.c:1206

6044 +#: builtin/commit.c:1207

6045 msgid "Clever... amending the last one with dirty index."

6046 msgstr "聪明... 用脏索引修补最后一个提交。"

6047

5677 -#: builtin/commit.c:1208

6048 +#: builtin/commit.c:1209

6049 msgid "Explicit paths specified without -i or -o; assuming --only paths..."

6050 msgstr "指定了明确的路径而没有使用 -i 或 -o 选项，认为是 --only paths..."

6051

5681 -#: builtin/commit.c:1220 builtin/tag.c:474

6052 +#: builtin/commit.c:1221 builtin/tag.c:474

6053 #, c-format

6054 msgid "Invalid cleanup mode %s"

6055 msgstr "无效的清理模式 %s"

6056

5686 -#: builtin/commit.c:1225

6057 +#: builtin/commit.c:1226

6058 msgid "Paths with -a does not make sense."

6059 msgstr "路径和 -a 选项同时使用没有意义。"

6060

5690 -#: builtin/commit.c:1335 builtin/commit.c:1621

6061 +#: builtin/commit.c:1336 builtin/commit.c:1622

6062 msgid "show status concisely"

6063 msgstr "以简洁的格式显示状态"

6064

5694 -#: builtin/commit.c:1337 builtin/commit.c:1623

6065 +#: builtin/commit.c:1338 builtin/commit.c:1624

6066 msgid "show branch information"

6067 msgstr "显示分支信息"

6068

5698 -#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512

5699 -#: builtin/worktree.c:437

6069 +#: builtin/commit.c:1340 builtin/commit.c:1626 builtin/push.c:522

6070 +#: builtin/worktree.c:440

6071 msgid "machine-readable output"

6072 msgstr "机器可读的输出"

6073

5703 -#: builtin/commit.c:1342 builtin/commit.c:1627

6074 +#: builtin/commit.c:1343 builtin/commit.c:1628

6075 msgid "show status in long format (default)"

6076 msgstr "以长格式显示状态（默认）"

6077

5707 -#: builtin/commit.c:1345 builtin/commit.c:1630

6078 +#: builtin/commit.c:1346 builtin/commit.c:1631

6079 msgid "terminate entries with NUL"

6080 msgstr "条目以 NUL 字符结尾"

6081

5711 -#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981

6082 +#: builtin/commit.c:1348 builtin/commit.c:1634 builtin/fast-export.c:981

6083 #: builtin/fast-export.c:984 builtin/tag.c:353

6084 msgid "mode"

6085 msgstr "模式"

6086

5716 -#: builtin/commit.c:1348 builtin/commit.c:1633

6087 +#: builtin/commit.c:1349 builtin/commit.c:1634

6088 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"

6089 msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）"

6090

5720 -#: builtin/commit.c:1351

6091 +#: builtin/commit.c:1352

6092 msgid "show ignored files"

6093 msgstr "显示忽略的文件"

6094

5724 -#: builtin/commit.c:1352 parse-options.h:155

6095 +#: builtin/commit.c:1353 parse-options.h:155

6096 msgid "when"

6097 msgstr "何时"

6098

5728 -#: builtin/commit.c:1353

6099 +#: builtin/commit.c:1354

6100 msgid ""

6101 "ignore changes to submodules, optional when: all, dirty, untracked. "

6102 "(Default: all)"

6103 msgstr ""

6104 "忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）"

6105

5735 -#: builtin/commit.c:1355

6106 +#: builtin/commit.c:1356

6107 msgid "list untracked files in columns"

6108 msgstr "以列的方式显示未跟踪的文件"

6109

5739 -#: builtin/commit.c:1441

6110 +#: builtin/commit.c:1442

6111 msgid "couldn't look up newly created commit"

6112 msgstr "无法找到新创建的提交"

6113

5743 -#: builtin/commit.c:1443

6114 +#: builtin/commit.c:1444

6115 msgid "could not parse newly created commit"

6116 msgstr "不能解析新创建的提交"

6117

5747 -#: builtin/commit.c:1488

6118 +#: builtin/commit.c:1489

6119 msgid "detached HEAD"

6120 msgstr "分离头指针"

6121

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

5752 -#: builtin/commit.c:1491

6123 +#: builtin/commit.c:1492

6124 msgid " (root-commit)"

6125 msgstr "（根提交）"

6126

5756 -#: builtin/commit.c:1591

6127 +#: builtin/commit.c:1592

6128 msgid "suppress summary after successful commit"

6129 msgstr "提交成功后不显示概述信息"

6130

5760 -#: builtin/commit.c:1592

6131 +#: builtin/commit.c:1593

6132 msgid "show diff in commit message template"

6133 msgstr "在提交说明模板里显示差异"

6134

5764 -#: builtin/commit.c:1594

6135 +#: builtin/commit.c:1595

6136 msgid "Commit message options"

6137 msgstr "提交说明选项"

6138

5768 -#: builtin/commit.c:1595 builtin/tag.c:351

6139 +#: builtin/commit.c:1596 builtin/tag.c:351

6140 msgid "read message from file"

6141 msgstr "从文件中读取提交说明"

6142

5772 -#: builtin/commit.c:1596

6143 +#: builtin/commit.c:1597

6144 msgid "author"

6145 msgstr "作者"

6146

5776 -#: builtin/commit.c:1596

6147 +#: builtin/commit.c:1597

6148 msgid "override author for commit"

6149 msgstr "提交时覆盖作者"

6150

5780 -#: builtin/commit.c:1597 builtin/gc.c:326

6151 +#: builtin/commit.c:1598 builtin/gc.c:326

6152 msgid "date"

6153 msgstr "日期"

6154

5784 -#: builtin/commit.c:1597

6155 +#: builtin/commit.c:1598

6156 msgid "override date for commit"

6157 msgstr "提交时覆盖日期"

6158

5788 -#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395

5789 -#: builtin/notes.c:558 builtin/tag.c:349

6159 +#: builtin/commit.c:1599 builtin/merge.c:220 builtin/notes.c:396

6160 +#: builtin/notes.c:559 builtin/tag.c:349

6161 msgid "message"

6162 msgstr "说明"

6163

5793 -#: builtin/commit.c:1598

6164 +#: builtin/commit.c:1599

6165 msgid "commit message"

6166 msgstr "提交说明"

6167

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

6168 +#: builtin/commit.c:1600 builtin/commit.c:1601 builtin/commit.c:1602

6169 +#: builtin/commit.c:1603 parse-options.h:256 ref-filter.h:79

6170 msgid "commit"

6171 msgstr "提交"

6172

5802 -#: builtin/commit.c:1599

6173 +#: builtin/commit.c:1600

6174 msgid "reuse and edit message from specified commit"

6175 msgstr "重用并编辑指定提交的提交说明"

6176

5806 -#: builtin/commit.c:1600

6177 +#: builtin/commit.c:1601

6178 msgid "reuse message from specified commit"

6179 msgstr "重用指定提交的提交说明"

6180

5810 -#: builtin/commit.c:1601

6181 +#: builtin/commit.c:1602

6182 msgid "use autosquash formatted message to fixup specified commit"

6183 msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"

6184

5814 -#: builtin/commit.c:1602

6185 +#: builtin/commit.c:1603

6186 msgid "use autosquash formatted message to squash specified commit"

6187 msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"

6188

5818 -#: builtin/commit.c:1603

6189 +#: builtin/commit.c:1604

6190 msgid "the commit is authored by me now (used with -C/-c/--amend)"

6191 msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）"

6192

5822 -#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86

6193 +#: builtin/commit.c:1605 builtin/log.c:1409 builtin/revert.c:86

6194 msgid "add Signed-off-by:"

6195 msgstr "添加 Signed-off-by: 签名"

6196

5826 -#: builtin/commit.c:1605

6197 +#: builtin/commit.c:1606

6198 msgid "use specified template file"

6199 msgstr "使用指定的模板文件"

6200

5830 -#: builtin/commit.c:1606

6201 +#: builtin/commit.c:1607

6202 msgid "force edit of commit"

6203 msgstr "强制编辑提交"

6204

6205 # 译者：可选值，不能翻译（或是原文中笔误，应为 mode）

5835 -#: builtin/commit.c:1607

6206 +#: builtin/commit.c:1608

6207 msgid "default"

6208 msgstr "default"

6209

5839 -#: builtin/commit.c:1607 builtin/tag.c:354

6210 +#: builtin/commit.c:1608 builtin/tag.c:354

6211 msgid "how to strip spaces and #comments from message"

6212 msgstr "设置如何删除提交说明里的空格和#注释"

6213

5843 -#: builtin/commit.c:1608

6214 +#: builtin/commit.c:1609

6215 msgid "include status in commit message template"

6216 msgstr "在提交说明模板里包含状态信息"

6217

5847 -#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165

6218 +#: builtin/commit.c:1611 builtin/merge.c:230 builtin/pull.c:165

6219 #: builtin/revert.c:93

6220 msgid "GPG sign commit"

6221 msgstr "GPG 提交签名"

6222

5852 -#: builtin/commit.c:1613

6223 +#: builtin/commit.c:1614

6224 msgid "Commit contents options"

6225 msgstr "提交内容选项"

6226

5856 -#: builtin/commit.c:1614

6227 +#: builtin/commit.c:1615

6228 msgid "commit all changed files"

6229 msgstr "提交所有改动的文件"

6230

5860 -#: builtin/commit.c:1615

6231 +#: builtin/commit.c:1616

6232 msgid "add specified files to index for commit"

6233 msgstr "添加指定的文件到索引区等待提交"

6234

5864 -#: builtin/commit.c:1616

6235 +#: builtin/commit.c:1617

6236 msgid "interactively add files"

6237 msgstr "交互式添加文件"

6238

5868 -#: builtin/commit.c:1617

6239 +#: builtin/commit.c:1618

6240 msgid "interactively add changes"

6241 msgstr "交互式添加变更"

6242

5872 -#: builtin/commit.c:1618

6243 +#: builtin/commit.c:1619

6244 msgid "commit only specified files"

6245 msgstr "只提交指定的文件"

6246

5876 -#: builtin/commit.c:1619

5877 -msgid "bypass pre-commit hook"

5878 -msgstr "绕过 pre-commit 钩子"

5879 -

6247 #: builtin/commit.c:1620

6248 +msgid "bypass pre-commit and commit-msg hooks"

6249 +msgstr "绕过 pre-commit 和 commit-msg 钩子"

6250 +

6251 +#: builtin/commit.c:1621

6252 msgid "show what would be committed"

6253 msgstr "显示将要提交的内容"

6254

5884 -#: builtin/commit.c:1631

6255 +#: builtin/commit.c:1632

6256 msgid "amend previous commit"

6257 msgstr "修改先前的提交"

6258

5888 -#: builtin/commit.c:1632

6259 +#: builtin/commit.c:1633

6260 msgid "bypass post-rewrite hook"

6261 msgstr "绕过 post-rewrite 钩子"

6262

5892 -#: builtin/commit.c:1637

6263 +#: builtin/commit.c:1638

6264 msgid "ok to record an empty change"

6265 msgstr "允许一个空提交"

6266

5896 -#: builtin/commit.c:1639

6267 +#: builtin/commit.c:1640

6268 msgid "ok to record a change with an empty message"

6269 msgstr "允许空的提交说明"

6270

5900 -#: builtin/commit.c:1668

6271 +#: builtin/commit.c:1669

6272 msgid "could not parse HEAD commit"

6273 msgstr "不能解析 HEAD 提交"

6274

5904 -#: builtin/commit.c:1718

6275 +#: builtin/commit.c:1719

6276 #, c-format

6277 msgid "Corrupt MERGE_HEAD file (%s)"

6278 msgstr "损坏的 MERGE_HEAD 文件（%s）"

6279

5909 -#: builtin/commit.c:1725

6280 +#: builtin/commit.c:1726

6281 msgid "could not read MERGE_MODE"

6282 msgstr "不能读取 MERGE_MODE"

6283

5913 -#: builtin/commit.c:1744

6284 +#: builtin/commit.c:1745

6285 #, c-format

6286 msgid "could not read commit message: %s"

6287 msgstr "不能读取提交说明：%s"

6288

5918 -#: builtin/commit.c:1755

6289 +#: builtin/commit.c:1756

6290 #, c-format

l10n: zh_CN: for git v2.10.0 l10n round 2