276ceeaa49 · 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: 2015-12-22 22:50+0800\n"

139 -"PO-Revision-Date: 2015-12-22 23:06+0800\n"

138 +"POT-Creation-Date: 2016-02-28 20:31+0800\n"

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

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

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

142 "Language: zh_CN\n"

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

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

159 "解决方案并提交。"

160

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

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

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

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

164

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

201 msgid "archive format"

202 msgstr "归档格式"

203

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

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

205 msgid "prefix"

206 msgstr "前缀"

207

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

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

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

211

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

213 -#: builtin/blame.c:2536 builtin/config.c:58 builtin/fast-export.c:987

214 -#: builtin/fast-export.c:989 builtin/grep.c:707 builtin/hash-object.c:99

215 -#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:395

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

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

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

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

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

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

217 msgid "file"

218 msgstr "文件"

219

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

245 msgid "list supported archive formats"

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

247

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

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

249 msgid "repo"

250 msgstr "仓库"

251

@@ -253,7 +253,7 @@ msgstr "仓库"

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

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

255

256 -#: archive.c:453 builtin/archive.c:92 builtin/notes.c:479

256 +#: archive.c:453 builtin/archive.c:92 builtin/notes.c:482

257 msgid "command"

258 msgstr "命令"

259

@@ -261,7 +261,7 @@ msgstr "命令"

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

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

263

264 -#: attr.c:265

264 +#: attr.c:263

265 msgid ""

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

267 "Use '\\!' for literal leading exclamation."

@@ -269,81 +269,97 @@ msgstr ""

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

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

271

272 -#: branch.c:61

272 +#: branch.c:53

273 +#, c-format

274 +msgid ""

275 +"\n"

276 +"After fixing the error cause you may try to fix up\n"

277 +"the remote tracking information by invoking\n"

278 +"\"git branch --set-upstream-to=%s%s%s\"."

279 +msgstr ""

280 +"\n"

281 +"在修复错误后，您可以尝试修改远程跟踪分支，通过执行命令\n"

282 +"\"git branch --set-upstream-to=%s%s%s\" 。"

283 +

284 +#: branch.c:67

285 #, c-format

286 msgid "Not setting branch %s as its own upstream."

287 msgstr "未设置分支 %s 作为它自己的上游。"

288

277 -#: branch.c:84

289 +#: branch.c:93

290 #, c-format

291 msgid "Branch %s set up to track remote branch %s from %s by rebasing."

292 msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"

293

282 -#: branch.c:85

294 +#: branch.c:94

295 #, c-format

296 msgid "Branch %s set up to track remote branch %s from %s."

297 msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"

298

287 -#: branch.c:89

299 +#: branch.c:98

300 #, c-format

301 msgid "Branch %s set up to track local branch %s by rebasing."

302 msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"

303

292 -#: branch.c:90

304 +#: branch.c:99

305 #, c-format

306 msgid "Branch %s set up to track local branch %s."

307 msgstr "分支 %s 设置为跟踪本地分支 %s。"

308

297 -#: branch.c:95

309 +#: branch.c:104

310 #, c-format

311 msgid "Branch %s set up to track remote ref %s by rebasing."

312 msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"

313

302 -#: branch.c:96

314 +#: branch.c:105

315 #, c-format

316 msgid "Branch %s set up to track remote ref %s."

317 msgstr "分支 %s 设置为跟踪远程引用 %s。"

318

307 -#: branch.c:100

319 +#: branch.c:109

320 #, c-format

321 msgid "Branch %s set up to track local ref %s by rebasing."

322 msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"

323

312 -#: branch.c:101

324 +#: branch.c:110

325 #, c-format

326 msgid "Branch %s set up to track local ref %s."

327 msgstr "分支 %s 设置为跟踪本地引用 %s。"

328

317 -#: branch.c:134

329 +#: branch.c:119

330 +msgid "Unable to write upstream branch configuration"

331 +msgstr "无法写入上游分支配置"

332 +

333 +#: branch.c:156

334 #, c-format

335 msgid "Not tracking: ambiguous information for ref %s"

336 msgstr "未跟踪：引用 %s 有歧义"

337

322 -#: branch.c:163

338 +#: branch.c:185

339 #, c-format

340 msgid "'%s' is not a valid branch name."

341 msgstr "'%s' 不是一个有效的分支名称。"

342

327 -#: branch.c:168

343 +#: branch.c:190

344 #, c-format

345 msgid "A branch named '%s' already exists."

346 msgstr "一个分支名 '%s' 已经存在。"

347

332 -#: branch.c:176

348 +#: branch.c:198

349 msgid "Cannot force update the current branch."

350 msgstr "无法强制更新当前分支。"

351

336 -#: branch.c:196

352 +#: branch.c:218

353 #, c-format

354 msgid "Cannot setup tracking information; starting point '%s' is not a branch."

355 msgstr "无法设置跟踪信息；起始点 '%s' 不是一个分支。"

356

341 -#: branch.c:198

357 +#: branch.c:220

358 #, c-format

359 msgid "the requested upstream branch '%s' does not exist"

360 msgstr "请求的上游分支 '%s' 不存在"

361

346 -#: branch.c:200

362 +#: branch.c:222

363 msgid ""

364 "\n"

365 "If you are planning on basing your work on an upstream\n"

@@ -361,22 +377,22 @@ msgstr ""

377 "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支，\n"

378 "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"

379

364 -#: branch.c:244

380 +#: branch.c:266

381 #, c-format

382 msgid "Not a valid object name: '%s'."

383 msgstr "不是一个有效的对象名：'%s'。"

384

369 -#: branch.c:264

385 +#: branch.c:286

386 #, c-format

387 msgid "Ambiguous object name: '%s'."

388 msgstr "歧义的对象名：'%s'。"

389

374 -#: branch.c:269

390 +#: branch.c:291

391 #, c-format

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

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

394

379 -#: branch.c:322

395 +#: branch.c:344

396 #, c-format

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

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

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

416 msgid "Repository lacks these prerequisite commits:"

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

418

403 -#: bundle.c:163 ref-filter.c:1372 sequencer.c:636 sequencer.c:1083

404 -#: builtin/blame.c:2734 builtin/commit.c:1045 builtin/log.c:334

405 -#: builtin/log.c:849 builtin/log.c:1461 builtin/log.c:1694 builtin/merge.c:358

406 -#: builtin/shortlog.c:158

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

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

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

422 +#: builtin/shortlog.c:170

423 msgid "revision walk setup failed"

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

425

@@ -442,7 +458,7 @@ msgstr "rev-list 终止"

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

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

460

445 -#: bundle.c:443 builtin/log.c:157 builtin/log.c:1369 builtin/shortlog.c:261

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

462 #, c-format

463 msgid "unrecognized argument: %s"

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

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

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

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

483

468 -#: commit.c:40 builtin/am.c:452 builtin/am.c:488 builtin/am.c:1520

469 -#: builtin/am.c:2149

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

485 +#: builtin/am.c:2135

486 #, c-format

487 msgid "could not parse %s"

488 msgstr "不能解析 %s"

@@ -480,59 +496,64 @@ msgstr "%s %s 不是一个提交!"

496 msgid "memory exhausted"

497 msgstr "内存耗尽"

498

483 -#: config.c:474 config.c:476

499 +#: config.c:475 config.c:477

500 #, c-format

485 -msgid "bad config file line %d in %s"

486 -msgstr "配置文件 %2$s 出错于第 %1$d 行"

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

502 +msgstr "%2$s %3$s 出错于第 %1$d 行"

503

488 -#: config.c:592

504 +#: config.c:593

505 #, c-format

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

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

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

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

508

493 -#: config.c:594

509 +#: config.c:595

510 #, c-format

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

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

513

498 -#: config.c:679

514 +#: config.c:680

515 #, c-format

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

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

518

503 -#: config.c:757 config.c:768

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

520 #, c-format

521 msgid "bad zlib compression level %d"

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

523

508 -#: config.c:890

524 +#: config.c:891

525 #, c-format

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

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

528

513 -#: config.c:1216

529 +#: config.c:1220

530 msgid "unable to parse command-line config"

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

532

517 -#: config.c:1277

533 +#: config.c:1281

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

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

536

521 -#: config.c:1601

537 +#: config.c:1629

538 #, c-format

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

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

541

526 -#: config.c:1603

542 +#: config.c:1631

543 #, c-format

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

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

546

531 -#: config.c:1662

547 +#: config.c:1690

548 #, c-format

549 msgid "%s has multiple values"

550 msgstr "%s 有多个取值"

551

552 +#: config.c:2226

553 +#, c-format

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

555 +msgstr "不能设置 '%s' 为 '%s'"

556 +

557 #: connected.c:69

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

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

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

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

672 "%s"

673

653 -#: diff.c:3000

674 +#: diff.c:2997

675 #, c-format

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

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

678

658 -#: diff.c:3396

679 +#: diff.c:3393

680 msgid "--follow requires exactly one pathspec"

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

682

662 -#: diff.c:3559

683 +#: diff.c:3556

684 #, c-format

685 msgid ""

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

@@ -668,18 +689,18 @@ msgstr ""

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

690 "%s"

691

671 -#: diff.c:3573

692 +#: diff.c:3570

693 #, c-format

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

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

696

676 -#: dir.c:1915

697 +#: dir.c:2004

698 msgid "failed to get kernel name and information"

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

700

680 -#: dir.c:1998

681 -msgid "Untracked cache is disabled on this system."

682 -msgstr "缓存未跟踪文件在本系统被禁用"

701 +#: dir.c:2123

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

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

704

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

706 msgid "could not run gpg."

@@ -718,20 +739,20 @@ msgstr "'%s'：%s"

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

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

741

721 -#: help.c:207

742 +#: help.c:205

743 #, c-format

744 msgid "available git commands in '%s'"

745 msgstr "在 '%s' 下可用的 git 命令"

746

726 -#: help.c:214

747 +#: help.c:212

748 msgid "git commands available from elsewhere on your $PATH"

749 msgstr "在 $PATH 路径中的其他地方可用的 git 命令"

750

730 -#: help.c:246

751 +#: help.c:244

752 msgid "These are common Git commands used in various situations:"

753 msgstr "这些是各种场合常见的 Git 命令："

754

734 -#: help.c:311

755 +#: help.c:309

756 #, c-format

757 msgid ""

758 "'%s' appears to be a git command, but we were not\n"

@@ -740,11 +761,11 @@ msgstr ""

761 "'%s' 像是一个 git 命令，但却无法运行。\n"

762 "可能是 git-%s 受损？"

763

743 -#: help.c:368

764 +#: help.c:366

765 msgid "Uh oh. Your system reports no Git commands at all."

766 msgstr "唉呀，您的系统中未发现 Git 命令。"

767

747 -#: help.c:390

768 +#: help.c:388

769 #, c-format

770 msgid ""

771 "WARNING: You called a Git command named '%s', which does not exist.\n"

@@ -753,17 +774,17 @@ msgstr ""

774 "警告：您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"

775 "是 '%s'"

776

756 -#: help.c:395

777 +#: help.c:393

778 #, c-format

779 msgid "in %0.1f seconds automatically..."

780 msgstr "在 %0.1f 秒钟后自动运行..."

781

761 -#: help.c:402

782 +#: help.c:400

783 #, c-format

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

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

786

766 -#: help.c:406 help.c:466

787 +#: help.c:404 help.c:464

788 msgid ""

789 "\n"

790 "Did you mean this?"

@@ -777,7 +798,7 @@ msgstr[1] ""

798 "\n"

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

800

780 -#: help.c:462

801 +#: help.c:460

802 #, c-format

803 msgid "%s: %s - %s"

804 msgstr "%s：%s - %s"

@@ -786,8 +807,8 @@ msgstr "%s：%s - %s"

807 msgid "failed to read the cache"

808 msgstr "无法读取缓存"

809

789 -#: merge.c:94 builtin/am.c:2022 builtin/am.c:2057 builtin/checkout.c:376

790 -#: builtin/checkout.c:587 builtin/clone.c:722

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

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

812 msgid "unable to write new index file"

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

814

@@ -805,64 +826,64 @@ msgstr "为路径 '%s' addinfo_cache 失败"

826 msgid "error building trees"

827 msgstr "无法创建树"

828

808 -#: merge-recursive.c:686

829 +#: merge-recursive.c:689

830 #, c-format

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

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

833

813 -#: merge-recursive.c:697

834 +#: merge-recursive.c:700

835 #, c-format

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

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

838

818 -#: merge-recursive.c:711 merge-recursive.c:732

839 +#: merge-recursive.c:714 merge-recursive.c:735

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

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

842

822 -#: merge-recursive.c:722

843 +#: merge-recursive.c:725

844 #, c-format

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

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

847

827 -#: merge-recursive.c:762

848 +#: merge-recursive.c:765

849 #, c-format

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

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

852

832 -#: merge-recursive.c:764

853 +#: merge-recursive.c:767

854 #, c-format

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

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

857

837 -#: merge-recursive.c:787 builtin/clone.c:369

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

859 #, c-format

860 msgid "failed to open '%s'"

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

862

842 -#: merge-recursive.c:795

863 +#: merge-recursive.c:798

864 #, c-format

865 msgid "failed to symlink '%s'"

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

867

847 -#: merge-recursive.c:798

868 +#: merge-recursive.c:801

869 #, c-format

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

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

872

852 -#: merge-recursive.c:936

873 +#: merge-recursive.c:939

874 msgid "Failed to execute internal merge"

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

876

856 -#: merge-recursive.c:940

877 +#: merge-recursive.c:943

878 #, c-format

879 msgid "Unable to add %s to database"

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

881

861 -#: merge-recursive.c:956

882 +#: merge-recursive.c:959

883 msgid "unsupported object type in the tree"

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

885

865 -#: merge-recursive.c:1031 merge-recursive.c:1045

886 +#: merge-recursive.c:1034 merge-recursive.c:1048

887 #, c-format

888 msgid ""

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

@@ -871,7 +892,7 @@ msgstr ""

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

893 "的版本被保留。"

894

874 -#: merge-recursive.c:1037 merge-recursive.c:1050

895 +#: merge-recursive.c:1040 merge-recursive.c:1053

896 #, c-format

897 msgid ""

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

@@ -880,20 +901,20 @@ msgstr ""

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

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

903

883 -#: merge-recursive.c:1091

904 +#: merge-recursive.c:1094

905 msgid "rename"

906 msgstr "重命名"

907

887 -#: merge-recursive.c:1091

908 +#: merge-recursive.c:1094

909 msgid "renamed"

910 msgstr "重命名"

911

891 -#: merge-recursive.c:1147

912 +#: merge-recursive.c:1150

913 #, c-format

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

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

916

896 -#: merge-recursive.c:1169

917 +#: merge-recursive.c:1172

918 #, c-format

919 msgid ""

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

@@ -902,144 +923,144 @@ msgstr ""

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

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

925

905 -#: merge-recursive.c:1174

926 +#: merge-recursive.c:1177

927 msgid " (left unresolved)"

928 msgstr "（留下未解决）"

929

909 -#: merge-recursive.c:1228

930 +#: merge-recursive.c:1231

931 #, c-format

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

933 msgstr ""

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

935 "%5$s"

936

916 -#: merge-recursive.c:1258

937 +#: merge-recursive.c:1261

938 #, c-format

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

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

941

921 -#: merge-recursive.c:1457

942 +#: merge-recursive.c:1460

943 #, c-format

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

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

946

926 -#: merge-recursive.c:1467

947 +#: merge-recursive.c:1470

948 #, c-format

949 msgid "Adding merged %s"

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

951

931 -#: merge-recursive.c:1472 merge-recursive.c:1674

952 +#: merge-recursive.c:1475 merge-recursive.c:1677

953 #, c-format

954 msgid "Adding as %s instead"

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

956

936 -#: merge-recursive.c:1523

957 +#: merge-recursive.c:1526

958 #, c-format

959 msgid "cannot read object %s"

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

961

941 -#: merge-recursive.c:1526

962 +#: merge-recursive.c:1529

963 #, c-format

964 msgid "object %s is not a blob"

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

966

946 -#: merge-recursive.c:1578

967 +#: merge-recursive.c:1581

968 msgid "modify"

969 msgstr "修改"

970

950 -#: merge-recursive.c:1578

971 +#: merge-recursive.c:1581

972 msgid "modified"

973 msgstr "修改"

974

954 -#: merge-recursive.c:1588

975 +#: merge-recursive.c:1591

976 msgid "content"

977 msgstr "内容"

978

958 -#: merge-recursive.c:1595

979 +#: merge-recursive.c:1598

980 msgid "add/add"

981 msgstr "添加/添加"

982

962 -#: merge-recursive.c:1629

983 +#: merge-recursive.c:1632

984 #, c-format

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

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

987

967 -#: merge-recursive.c:1643

988 +#: merge-recursive.c:1646

989 #, c-format

990 msgid "Auto-merging %s"

991 msgstr "自动合并 %s"

992

972 -#: merge-recursive.c:1647 git-submodule.sh:1025

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

994 msgid "submodule"

995 msgstr "子模组"

996

976 -#: merge-recursive.c:1648

997 +#: merge-recursive.c:1651

998 #, c-format

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

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

1001

981 -#: merge-recursive.c:1734

1002 +#: merge-recursive.c:1737

1003 #, c-format

1004 msgid "Removing %s"

1005 msgstr "删除 %s"

1006

986 -#: merge-recursive.c:1759

1007 +#: merge-recursive.c:1762

1008 msgid "file/directory"

1009 msgstr "文件/目录"

1010

990 -#: merge-recursive.c:1765

1011 +#: merge-recursive.c:1768

1012 msgid "directory/file"

1013 msgstr "目录/文件"

1014

994 -#: merge-recursive.c:1770

1015 +#: merge-recursive.c:1773

1016 #, c-format

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

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

1019

999 -#: merge-recursive.c:1780

1020 +#: merge-recursive.c:1783

1021 #, c-format

1022 msgid "Adding %s"

1023 msgstr "添加 %s"

1024

1004 -#: merge-recursive.c:1797

1025 +#: merge-recursive.c:1800

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

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

1028

1008 -#: merge-recursive.c:1816

1029 +#: merge-recursive.c:1819

1030 msgid "Already up-to-date!"

1031 msgstr "已经是最新的！"

1032

1012 -#: merge-recursive.c:1825

1033 +#: merge-recursive.c:1828

1034 #, c-format

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

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

1037

1017 -#: merge-recursive.c:1855

1038 +#: merge-recursive.c:1858

1039 #, c-format

1040 msgid "Unprocessed path??? %s"

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

1042

1022 -#: merge-recursive.c:1903

1043 +#: merge-recursive.c:1906

1044 msgid "Merging:"

1045 msgstr "合并："

1046

1026 -#: merge-recursive.c:1916

1047 +#: merge-recursive.c:1919

1048 #, c-format

1049 msgid "found %u common ancestor:"

1050 msgid_plural "found %u common ancestors:"

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

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

1053

1033 -#: merge-recursive.c:1953

1054 +#: merge-recursive.c:1956

1055 msgid "merge returned no commit"

1056 msgstr "合并未返回提交"

1057

1037 -#: merge-recursive.c:2010

1058 +#: merge-recursive.c:2013

1059 #, c-format

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

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

1062

1042 -#: merge-recursive.c:2021 builtin/merge.c:645

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

1064 msgid "Unable to write index."

1065 msgstr "不能写入索引。"

1066

@@ -1154,12 +1175,12 @@ msgstr "路径规格 '%s' 在子模组 '%.*s' 中"

1175 msgid "%s: pathspec magic not supported by this command: %s"

1176 msgstr "%s：路径规格神奇前缀不被此命令支持：%s"

1177

1157 -#: pathspec.c:432

1178 +#: pathspec.c:433

1179 #, c-format

1180 msgid "pathspec '%s' is beyond a symbolic link"

1181 msgstr "路径规格 '%s' 位于符号链接中"

1182

1162 -#: pathspec.c:441

1183 +#: pathspec.c:442

1184 msgid ""

1185 "There is nothing to exclude from by :(exclude) patterns.\n"

1186 "Perhaps you forgot to add either ':/' or '.' ?"

@@ -1193,163 +1214,189 @@ msgstr ""

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

1215 "使用版本 %i"

1216

1196 -#: refs.c:543 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973

1197 -#: builtin/merge.c:983

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

1218 +#: builtin/merge.c:984

1219 #, c-format

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

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

1222

1202 -#: refs/files-backend.c:2359

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

1224 #, c-format

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

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

1227

1207 -#: refs/files-backend.c:2362

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

1229 #, c-format

1230 msgid "could not delete references: %s"

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

1232

1212 -#: refs/files-backend.c:2371

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

1234 #, c-format

1235 msgid "could not remove reference %s"

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

1237

1217 -#: ref-filter.c:245

1238 +#: ref-filter.c:55

1239 #, c-format

1219 -msgid "format: %%(end) atom used without corresponding atom"

1220 -msgstr "格式：使用了 %%(end) 元素却没有它的对应元素"

1240 +msgid "expected format: %%(color:<color>)"

1241 +msgstr "期望的格式：%%(color:<color>)"

1242 +

1243 +#: ref-filter.c:57

1244 +#, c-format

1245 +msgid "unrecognized color: %%(color:%s)"

1246 +msgstr "未能识别的颜色：%%(color:%s)"

1247 +

1248 +#: ref-filter.c:71

1249 +#, c-format

1250 +msgid "unrecognized format: %%(%s)"

1251 +msgstr "未能识别的格式：%%(%s)"

1252

1222 -#: ref-filter.c:704

1253 +#: ref-filter.c:101

1254 #, c-format

1255 msgid "positive value expected contents:lines=%s"

1256 msgstr "要为 contents:lines=%s 提供一个正数"

1257

1227 -#: ref-filter.c:833

1258 +#: ref-filter.c:103

1259 #, c-format

1229 -msgid "expected format: %%(color:<color>)"

1230 -msgstr "期望的格式：%%(color:<color>)"

1260 +msgid "unrecognized %%(contents) argument: %s"

1261 +msgstr "未能识别的 %%(contents) 参数：%s"

1262

1232 -#: ref-filter.c:835

1233 -msgid "unable to parse format"

1234 -msgstr "不能解析格式"

1263 +#: ref-filter.c:113

1264 +#, c-format

1265 +msgid "unrecognized %%(objectname) argument: %s"

1266 +msgstr "未能识别的 %%(objectname) 参数：%s"

1267

1236 -#: ref-filter.c:870

1268 +#: ref-filter.c:135

1269 #, c-format

1270 msgid "expected format: %%(align:<width>,<position>)"

1271 msgstr "期望的格式：%%(align:<width>,<position>)"

1272

1241 -#: ref-filter.c:893

1273 +#: ref-filter.c:147

1274 +#, c-format

1275 +msgid "unrecognized position:%s"

1276 +msgstr "未能识别的位置：%s"

1277 +

1278 +#: ref-filter.c:151

1279 #, c-format

1243 -msgid "improper format entered align:%s"

1244 -msgstr "输入了不正确的格式 align:%s"

1280 +msgid "unrecognized width:%s"

1281 +msgstr "未能识别的宽度：%s"

1282

1246 -#: ref-filter.c:898

1283 +#: ref-filter.c:157

1284 +#, c-format

1285 +msgid "unrecognized %%(align) argument: %s"

1286 +msgstr "未能识别的 %%(align) 参数：%s"

1287 +

1288 +#: ref-filter.c:161

1289 #, c-format

1290 msgid "positive width expected with the %%(align) atom"

1291 msgstr "元素 %%(align) 需要一个正数的宽度"

1292

1251 -#: ref-filter.c:1219

1293 +#: ref-filter.c:372

1294 +#, c-format

1295 +msgid "format: %%(end) atom used without corresponding atom"

1296 +msgstr "格式：使用了 %%(end) 元素却没有它的对应元素"

1297 +

1298 +#: ref-filter.c:1311

1299 #, c-format

1300 msgid "malformed object at '%s'"

1301 msgstr "非法的对象于 '%s'"

1302

1256 -#: ref-filter.c:1561

1303 +#: ref-filter.c:1651

1304 #, c-format

1305 msgid "format: %%(end) atom missing"

1306 msgstr "格式：缺少 %%(end) 元素"

1307

1261 -#: ref-filter.c:1615

1308 +#: ref-filter.c:1705

1309 #, c-format

1310 msgid "malformed object name %s"

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

1312

1266 -#: remote.c:756

1313 +#: remote.c:745

1314 #, c-format

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

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

1317

1271 -#: remote.c:760

1318 +#: remote.c:749

1319 #, c-format

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

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

1322

1276 -#: remote.c:764

1323 +#: remote.c:753

1324 #, c-format

1325 msgid "%s tracks both %s and %s"

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

1327

1281 -#: remote.c:772

1328 +#: remote.c:761

1329 msgid "Internal error"

1330 msgstr "内部错误"

1331

1285 -#: remote.c:1687 remote.c:1730

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

1333 msgid "HEAD does not point to a branch"

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

1335

1289 -#: remote.c:1696

1336 +#: remote.c:1686

1337 #, c-format

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

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

1340

1294 -#: remote.c:1699

1341 +#: remote.c:1689

1342 #, c-format

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

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

1345

1299 -#: remote.c:1705

1346 +#: remote.c:1695

1347 #, c-format

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

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

1350

1304 -#: remote.c:1720

1351 +#: remote.c:1710

1352 #, c-format

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

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

1355

1309 -#: remote.c:1735

1356 +#: remote.c:1725

1357 #, c-format

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

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

1360

1314 -#: remote.c:1746

1361 +#: remote.c:1736

1362 #, c-format

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

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

1365

1319 -#: remote.c:1759

1366 +#: remote.c:1749

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

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

1369

1323 -#: remote.c:1781

1370 +#: remote.c:1771

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

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

1373

1327 -#: remote.c:2083

1374 +#: remote.c:2073

1375 #, c-format

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

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

1378

1332 -#: remote.c:2087

1379 +#: remote.c:2077

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

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

1382

1336 -#: remote.c:2090

1383 +#: remote.c:2080

1384 #, c-format

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

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

1387

1341 -#: remote.c:2094

1388 +#: remote.c:2084

1389 #, c-format

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

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

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

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

1394

1348 -#: remote.c:2100

1395 +#: remote.c:2090

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

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

1398

1352 -#: remote.c:2103

1399 +#: remote.c:2093

1400 #, c-format

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

1402 msgid_plural ""

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

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

1406

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

1361 -#: remote.c:2111

1408 +#: remote.c:2101

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

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

1411

1365 -#: remote.c:2114

1412 +#: remote.c:2104

1413 #, c-format

1414 msgid ""

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

@@ -1378,28 +1425,28 @@ msgstr[1] ""

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

1426

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

1381 -#: remote.c:2124

1428 +#: remote.c:2114

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

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

1431

1385 -#: revision.c:2193

1432 +#: revision.c:2131

1433 msgid "your current branch appears to be broken"

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

1435

1389 -#: revision.c:2196

1436 +#: revision.c:2134

1437 #, c-format

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

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

1440

1394 -#: revision.c:2390

1441 +#: revision.c:2328

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

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

1444

1398 -#: run-command.c:90

1445 +#: run-command.c:92

1446 msgid "open /dev/null failed"

1447 msgstr "不能打开 /dev/null"

1448

1402 -#: run-command.c:92

1449 +#: run-command.c:94

1450 #, c-format

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

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

@@ -1422,7 +1469,7 @@ msgstr "未发送推送证书，因为接收端不支持签名推送"

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

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

1471

1425 -#: sequencer.c:183

1472 +#: sequencer.c:174

1473 msgid ""

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

1475 "with 'git add <paths>' or 'git rm <paths>'"

@@ -1430,7 +1477,7 @@ msgstr ""

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

1478 "命令标记修正后的文件"

1479

1433 -#: sequencer.c:186

1480 +#: sequencer.c:177

1481 msgid ""

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

1483 "with 'git add <paths>' or 'git rm <paths>'\n"

@@ -1439,229 +1486,229 @@ msgstr ""

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

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

1488

1442 -#: sequencer.c:199 sequencer.c:842 sequencer.c:922

1489 +#: sequencer.c:190 sequencer.c:833 sequencer.c:913

1490 #, c-format

1491 msgid "Could not write to %s"

1492 msgstr "不能写入 %s"

1493

1447 -#: sequencer.c:202

1494 +#: sequencer.c:193

1495 #, c-format

1496 msgid "Error wrapping up %s"

1497 msgstr "错误收尾 %s"

1498

1452 -#: sequencer.c:217

1499 +#: sequencer.c:208

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

1501 msgstr "您的本地修改将被拣选操作覆盖。"

1502

1456 -#: sequencer.c:219

1503 +#: sequencer.c:210

1504 msgid "Your local changes would be overwritten by revert."

1505 msgstr "您的本地修改将被还原操作覆盖。"

1506

1460 -#: sequencer.c:222

1507 +#: sequencer.c:213

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

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

1510

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

1465 -#: sequencer.c:309

1512 +#: sequencer.c:300

1513 #, c-format

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

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

1516

1470 -#: sequencer.c:327

1517 +#: sequencer.c:318

1518 msgid "Could not resolve HEAD commit\n"

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

1520

1474 -#: sequencer.c:347

1521 +#: sequencer.c:338

1522 msgid "Unable to update cache tree\n"

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

1524

1478 -#: sequencer.c:399

1525 +#: sequencer.c:390

1526 #, c-format

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

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

1529

1483 -#: sequencer.c:404

1530 +#: sequencer.c:395

1531 #, c-format

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

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

1534

1488 -#: sequencer.c:469

1535 +#: sequencer.c:460

1536 msgid "Your index file is unmerged."

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

1538

1492 -#: sequencer.c:488

1539 +#: sequencer.c:479

1540 #, c-format

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

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

1543

1497 -#: sequencer.c:496

1544 +#: sequencer.c:487

1545 #, c-format

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

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

1548

1502 -#: sequencer.c:500

1549 +#: sequencer.c:491

1550 #, c-format

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

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

1553

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

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

1509 -#: sequencer.c:513

1556 +#: sequencer.c:504

1557 #, c-format

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

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

1560

1514 -#: sequencer.c:517

1561 +#: sequencer.c:508

1562 #, c-format

1563 msgid "Cannot get commit message for %s"

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

1565

1519 -#: sequencer.c:603

1566 +#: sequencer.c:594

1567 #, c-format

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

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

1570

1524 -#: sequencer.c:604

1571 +#: sequencer.c:595

1572 #, c-format

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

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

1575

1529 -#: sequencer.c:639

1576 +#: sequencer.c:630

1577 msgid "empty commit set passed"

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

1579

1533 -#: sequencer.c:647

1580 +#: sequencer.c:638

1581 #, c-format

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

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

1584

1538 -#: sequencer.c:651

1585 +#: sequencer.c:642

1586 #, c-format

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

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

1589

1543 -#: sequencer.c:711

1590 +#: sequencer.c:702

1591 #, c-format

1592 msgid "Cannot %s during a %s"

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

1594

1548 -#: sequencer.c:733

1595 +#: sequencer.c:724

1596 #, c-format

1597 msgid "Could not parse line %d."

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

1599

1553 -#: sequencer.c:738

1600 +#: sequencer.c:729

1601 msgid "No commits parsed."

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

1603

1557 -#: sequencer.c:750

1604 +#: sequencer.c:741

1605 #, c-format

1606 msgid "Could not open %s"

1607 msgstr "不能打开 %s"

1608

1562 -#: sequencer.c:754

1609 +#: sequencer.c:745

1610 #, c-format

1611 msgid "Could not read %s."

1612 msgstr "不能读取 %s。"

1613

1567 -#: sequencer.c:761

1614 +#: sequencer.c:752

1615 #, c-format

1616 msgid "Unusable instruction sheet: %s"

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

1618

1572 -#: sequencer.c:791

1619 +#: sequencer.c:782

1620 #, c-format

1621 msgid "Invalid key: %s"

1622 msgstr "无效键名：%s"

1623

1577 -#: sequencer.c:794 builtin/pull.c:47 builtin/pull.c:49

1624 +#: sequencer.c:785 builtin/pull.c:50 builtin/pull.c:52

1625 #, c-format

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

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

1628

1582 -#: sequencer.c:804

1629 +#: sequencer.c:795

1630 #, c-format

1631 msgid "Malformed options sheet: %s"

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

1633

1587 -#: sequencer.c:823

1634 +#: sequencer.c:814

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

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

1637

1591 -#: sequencer.c:824

1638 +#: sequencer.c:815

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

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

1641

1595 -#: sequencer.c:828

1642 +#: sequencer.c:819

1643 #, c-format

1644 msgid "Could not create sequencer directory %s"

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

1646

1600 -#: sequencer.c:844 sequencer.c:926

1647 +#: sequencer.c:835 sequencer.c:917

1648 #, c-format

1649 msgid "Error wrapping up %s."

1650 msgstr "错误收尾 %s。"

1651

1605 -#: sequencer.c:863 sequencer.c:996

1652 +#: sequencer.c:854 sequencer.c:987

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

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

1655

1609 -#: sequencer.c:865

1656 +#: sequencer.c:856

1657 msgid "cannot resolve HEAD"

1658 msgstr "不能解析 HEAD"

1659

1613 -#: sequencer.c:867

1660 +#: sequencer.c:858

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

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

1663

1617 -#: sequencer.c:887 builtin/apply.c:4287

1664 +#: sequencer.c:878 builtin/apply.c:4287

1665 #, c-format

1666 msgid "cannot open %s: %s"

1667 msgstr "不能打开 %s：%s"

1668

1622 -#: sequencer.c:890

1669 +#: sequencer.c:881

1670 #, c-format

1671 msgid "cannot read %s: %s"

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

1673

1627 -#: sequencer.c:891

1674 +#: sequencer.c:882

1675 msgid "unexpected end of file"

1676 msgstr "意外的文件结束"

1677

1631 -#: sequencer.c:897

1678 +#: sequencer.c:888

1679 #, c-format

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

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

1682

1636 -#: sequencer.c:919

1683 +#: sequencer.c:910

1684 #, c-format

1685 msgid "Could not format %s."

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

1687

1641 -#: sequencer.c:1064

1688 +#: sequencer.c:1055

1689 #, c-format

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

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

1692

1646 -#: sequencer.c:1067

1693 +#: sequencer.c:1058

1694 #, c-format

1695 msgid "%s: bad revision"

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

1697

1651 -#: sequencer.c:1101

1698 +#: sequencer.c:1092

1699 msgid "Can't revert as initial commit"

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

1701

1655 -#: sequencer.c:1102

1702 +#: sequencer.c:1093

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

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

1705

1659 -#: setup.c:248

1706 +#: setup.c:246

1707 #, c-format

1708 msgid "failed to read %s"

1709 msgstr "无法读取 %s"

1710

1664 -#: sha1_name.c:463

1711 +#: sha1_name.c:462

1712 msgid ""

1713 "Git normally never creates a ref that ends with 40 hex characters\n"

1714 "because it will be ignored when you just specify 40-hex. These refs\n"

@@ -1682,60 +1729,79 @@ msgstr ""

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

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

1731

1685 -#: submodule.c:61 submodule.c:95

1732 +#: submodule.c:62 submodule.c:96

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

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

1735

1689 -#: submodule.c:65 submodule.c:99

1736 +#: submodule.c:66 submodule.c:100

1737 #, c-format

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

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

1740

1694 -#: submodule.c:73

1741 +#: submodule.c:74

1742 #, c-format

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

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

1745

1699 -#: submodule.c:106

1746 +#: submodule.c:107

1747 #, c-format

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

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

1750

1704 -#: submodule.c:117

1751 +#: submodule.c:118

1752 msgid "staging updated .gitmodules failed"

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

1754

1708 -#: submodule.c:1040

1709 -#, c-format

1710 -msgid "Could not set core.worktree in %s"

1711 -msgstr "不能在 %s 中设置 core.worktree"

1712 -

1713 -#: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557

1714 -#: trailer.c:561

1755 +#: trailer.c:492 trailer.c:496 trailer.c:500 trailer.c:554 trailer.c:558

1756 +#: trailer.c:562

1757 #, c-format

1758 msgid "unknown value '%s' for key '%s'"

1759 msgstr "键 '%2$s' 的未知取值 '%1$s'"

1760

1719 -#: trailer.c:543 trailer.c:548 builtin/remote.c:296

1761 +#: trailer.c:544 trailer.c:549 builtin/remote.c:289

1762 #, c-format

1763 msgid "more than one %s"

1764 msgstr "多于一个 %s"

1765

1724 -#: trailer.c:581

1766 +#: trailer.c:582

1767 #, c-format

1768 msgid "empty trailer token in trailer '%.*s'"

1769 msgstr "签名 '%.*s' 的键为空"

1770

1729 -#: trailer.c:701

1771 +#: trailer.c:702

1772 #, c-format

1773 msgid "could not read input file '%s'"

1774 msgstr "不能读取输入文件 '%s'"

1775

1734 -#: trailer.c:704

1776 +#: trailer.c:705

1777 msgid "could not read from stdin"

1778 msgstr "不能自标准输入读取"

1779

1738 -#: transport-helper.c:1025

1780 +#: trailer.c:857 builtin/am.c:42

1781 +#, c-format

1782 +msgid "could not stat %s"

1783 +msgstr "不能获取 %s 的文件状态"

1784 +

1785 +#: trailer.c:859

1786 +#, c-format

1787 +msgid "file %s is not a regular file"

1788 +msgstr "文件 %s 不是一个正规文件"

1789 +

1790 +#: trailer.c:861

1791 +#, c-format

1792 +msgid "file %s is not writable by user"

1793 +msgstr "文件 %s 用户不可写"

1794 +

1795 +#: trailer.c:873

1796 +msgid "could not open temporary file"

1797 +msgstr "不能打开临时文件"

1798 +

1799 +#: trailer.c:912

1800 +#, c-format

1801 +msgid "could not rename temporary file to %s"

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

1803 +

1804 +#: transport-helper.c:1041

1805 #, c-format

1806 msgid "Could not read ref %s"

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

@@ -1773,47 +1839,47 @@ msgstr "无效的端口号"

1839 msgid "invalid '..' path segment"

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

1841

1776 -#: wrapper.c:219 wrapper.c:362

1842 +#: wrapper.c:222 wrapper.c:381

1843 #, c-format

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

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

1846

1781 -#: wrapper.c:221 wrapper.c:364

1847 +#: wrapper.c:224 wrapper.c:383

1848 #, c-format

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

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

1851

1786 -#: wrapper.c:223 wrapper.c:366 builtin/am.c:338 builtin/commit.c:1691

1787 -#: builtin/merge.c:1074 builtin/pull.c:380

1852 +#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691

1853 +#: builtin/merge.c:1075 builtin/pull.c:387

1854 #, c-format

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

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

1857

1792 -#: wrapper.c:579

1858 +#: wrapper.c:611

1859 #, c-format

1860 msgid "unable to access '%s': %s"

1861 msgstr "不能访问 '%s'：%s"

1862

1797 -#: wrapper.c:600

1863 +#: wrapper.c:632

1864 #, c-format

1865 msgid "unable to access '%s'"

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

1867

1802 -#: wrapper.c:608

1868 +#: wrapper.c:640

1869 msgid "unable to get current working directory"

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

1871

1806 -#: wrapper.c:635

1872 +#: wrapper.c:667

1873 #, c-format

1874 msgid "could not open %s for writing"

1875 msgstr "不能写入 %s"

1876

1811 -#: wrapper.c:646 builtin/am.c:425

1877 +#: wrapper.c:678 builtin/am.c:410

1878 #, c-format

1879 msgid "could not write to %s"

1880 msgstr "不能写入 %s"

1881

1816 -#: wrapper.c:652

1882 +#: wrapper.c:684

1883 #, c-format

1884 msgid "could not close %s"

1885 msgstr "不能关闭 %s"

@@ -2298,7 +2364,7 @@ msgstr "丢失"

2364 msgid "behind "

2365 msgstr "落后 "

2366

2301 -#: compat/precompose_utf8.c:56 builtin/clone.c:408

2367 +#: compat/precompose_utf8.c:57 builtin/clone.c:413

2368 #, c-format

2369 msgid "failed to unlink '%s'"

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

@@ -2325,7 +2391,7 @@ msgstr "删除 '%s'\n"

2391 msgid "Unstaged changes after refreshing the index:"

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

2393

2328 -#: builtin/add.c:194 builtin/rev-parse.c:796

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

2395 msgid "Could not read the index"

2396 msgstr "不能读取索引"

2397

@@ -2360,15 +2426,15 @@ msgstr "不能应用 '%s'"

2426 msgid "The following paths are ignored by one of your .gitignore files:\n"

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

2428

2363 -#: builtin/add.c:249 builtin/clean.c:894 builtin/fetch.c:108 builtin/mv.c:110

2364 -#: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:543

2365 -#: builtin/remote.c:1345 builtin/rm.c:268 builtin/send-pack.c:162

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

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

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

2432 msgid "dry run"

2433 msgstr "演习"

2434

2369 -#: builtin/add.c:250 builtin/apply.c:4571 builtin/check-ignore.c:19

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

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

2371 -#: builtin/log.c:1645 builtin/mv.c:109 builtin/read-tree.c:114

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

2438 msgid "be verbose"

2439 msgstr "冗长输出"

2440

@@ -2376,7 +2442,7 @@ msgstr "冗长输出"

2442 msgid "interactive picking"

2443 msgstr "交互式拣选"

2444

2379 -#: builtin/add.c:253 builtin/checkout.c:1153 builtin/reset.c:286

2445 +#: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286

2446 msgid "select hunks interactively"

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

2448

@@ -2443,135 +2509,130 @@ msgstr "没有指定文件，也没有文件被添加。\n"

2509 msgid "Maybe you wanted to say 'git add .'?\n"

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

2511

2446 -#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:938

2447 -#: builtin/commit.c:337 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298

2448 -#: builtin/submodule--helper.c:40

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

2513 +#: builtin/commit.c:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298

2514 +#: builtin/submodule--helper.c:35

2515 msgid "index file corrupt"

2516 msgstr "索引文件损坏"

2517

2452 -#: builtin/add.c:439 builtin/apply.c:4669 builtin/mv.c:279 builtin/rm.c:430

2518 +#: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430

2519 msgid "Unable to write new index file"

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

2521

2456 -#: builtin/am.c:42

2457 -#, c-format

2458 -msgid "could not stat %s"

2459 -msgstr "不能获取 %s 的文件状态"

2460 -

2461 -#: builtin/am.c:271 builtin/commit.c:738 builtin/merge.c:1077

2522 +#: builtin/am.c:256 builtin/commit.c:738 builtin/merge.c:1078

2523 #, c-format

2524 msgid "could not read '%s'"

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

2526

2466 -#: builtin/am.c:445

2527 +#: builtin/am.c:430

2528 msgid "could not parse author script"

2529 msgstr "不能解析作者脚本"

2530

2470 -#: builtin/am.c:522

2531 +#: builtin/am.c:507

2532 #, c-format

2533 msgid "'%s' was deleted by the applypatch-msg hook"

2534 msgstr "'%s' 被 applypatch-msg 钩子删除"

2535

2475 -#: builtin/am.c:563 builtin/notes.c:300

2536 +#: builtin/am.c:548 builtin/notes.c:300

2537 #, c-format

2538 msgid "Malformed input line: '%s'."

2539 msgstr "非法的输入行：'%s'。"

2540

2480 -#: builtin/am.c:600 builtin/notes.c:315

2541 +#: builtin/am.c:585 builtin/notes.c:315

2542 #, c-format

2543 msgid "Failed to copy notes from '%s' to '%s'"

2544 msgstr "从 '%s' 拷贝注解到 '%s' 时失败"

2545

2485 -#: builtin/am.c:626

2546 +#: builtin/am.c:611

2547 msgid "fseek failed"

2548 msgstr "fseek 失败"

2549

2489 -#: builtin/am.c:787 builtin/am.c:875

2550 +#: builtin/am.c:772 builtin/am.c:860

2551 #, c-format

2552 msgid "could not open '%s' for reading: %s"

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

2554

2494 -#: builtin/am.c:794

2555 +#: builtin/am.c:779

2556 #, c-format

2557 msgid "could not open '%s' for writing: %s"

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

2559

2499 -#: builtin/am.c:803

2560 +#: builtin/am.c:788

2561 #, c-format

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

2563 msgstr "无法解析补丁 '%s'"

2564

2504 -#: builtin/am.c:868

2565 +#: builtin/am.c:853

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

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

2568

2508 -#: builtin/am.c:916

2569 +#: builtin/am.c:901

2570 msgid "invalid timestamp"

2571 msgstr "无效的时间戳"

2572

2512 -#: builtin/am.c:919 builtin/am.c:927

2573 +#: builtin/am.c:904 builtin/am.c:912

2574 msgid "invalid Date line"

2575 msgstr "无效的日期行"

2576

2516 -#: builtin/am.c:924

2577 +#: builtin/am.c:909

2578 msgid "invalid timezone offset"

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

2580

2520 -#: builtin/am.c:1011

2581 +#: builtin/am.c:996

2582 msgid "Patch format detection failed."

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

2584

2524 -#: builtin/am.c:1016 builtin/clone.c:373

2585 +#: builtin/am.c:1001 builtin/clone.c:378

2586 #, c-format

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

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

2589

2529 -#: builtin/am.c:1020

2590 +#: builtin/am.c:1005

2591 msgid "Failed to split patches."

2592 msgstr "无法拆分补丁。"

2593

2533 -#: builtin/am.c:1152 builtin/commit.c:363

2594 +#: builtin/am.c:1137 builtin/commit.c:363

2595 msgid "unable to write index file"

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

2597

2537 -#: builtin/am.c:1203

2598 +#: builtin/am.c:1188

2599 #, c-format

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

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

2602

2542 -#: builtin/am.c:1204

2603 +#: builtin/am.c:1189

2604 #, c-format

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

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

2607

2547 -#: builtin/am.c:1205

2608 +#: builtin/am.c:1190

2609 #, c-format

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

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

2612

2552 -#: builtin/am.c:1343

2613 +#: builtin/am.c:1328

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

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

2616

2556 -#: builtin/am.c:1417 builtin/log.c:1347

2617 +#: builtin/am.c:1402 builtin/log.c:1350

2618 #, c-format

2619 msgid "invalid ident line: %s"

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

2621

2561 -#: builtin/am.c:1444

2622 +#: builtin/am.c:1429

2623 #, c-format

2624 msgid "unable to parse commit %s"

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

2626

2566 -#: builtin/am.c:1646

2627 +#: builtin/am.c:1631

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

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

2630

2570 -#: builtin/am.c:1648

2631 +#: builtin/am.c:1633

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

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

2634

2574 -#: builtin/am.c:1667

2635 +#: builtin/am.c:1652

2636 msgid ""

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

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

@@ -2579,37 +2640,37 @@ msgstr ""

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

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

2642

2582 -#: builtin/am.c:1673

2643 +#: builtin/am.c:1658

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

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

2646

2586 -#: builtin/am.c:1688

2647 +#: builtin/am.c:1673

2648 msgid "Failed to merge in the changes."

2649 msgstr "无法合并变更。"

2650

2590 -#: builtin/am.c:1712 builtin/merge.c:632

2651 +#: builtin/am.c:1697 builtin/merge.c:633

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

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

2654

2594 -#: builtin/am.c:1719

2655 +#: builtin/am.c:1704

2656 msgid "applying to an empty history"

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

2658

2598 -#: builtin/am.c:1732 builtin/commit.c:1755 builtin/merge.c:829

2599 -#: builtin/merge.c:854

2659 +#: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830

2660 +#: builtin/merge.c:855

2661 msgid "failed to write commit object"

2662 msgstr "无法写提交对象"

2663

2603 -#: builtin/am.c:1764 builtin/am.c:1768

2664 +#: builtin/am.c:1749 builtin/am.c:1753

2665 #, c-format

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

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

2668

2608 -#: builtin/am.c:1784

2669 +#: builtin/am.c:1769

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

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

2672

2612 -#: builtin/am.c:1789

2673 +#: builtin/am.c:1774

2674 msgid "Commit Body is:"

2675 msgstr "提交内容为："

2676

@@ -2618,35 +2679,35 @@ msgstr "提交内容为："

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

2680 #. input at this point.

2681 #.

2621 -#: builtin/am.c:1799

2682 +#: builtin/am.c:1784

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

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

2685

2625 -#: builtin/am.c:1849

2686 +#: builtin/am.c:1834

2687 #, c-format

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

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

2690

2630 -#: builtin/am.c:1884 builtin/am.c:1955

2691 +#: builtin/am.c:1869 builtin/am.c:1941

2692 #, c-format

2693 msgid "Applying: %.*s"

2694 msgstr "应用：%.*s"

2695

2635 -#: builtin/am.c:1900

2696 +#: builtin/am.c:1885

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

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

2699

2639 -#: builtin/am.c:1908

2700 +#: builtin/am.c:1893

2701 #, c-format

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

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

2704

2644 -#: builtin/am.c:1914

2705 +#: builtin/am.c:1899

2706 #, c-format

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

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

2709

2649 -#: builtin/am.c:1958

2710 +#: builtin/am.c:1944

2711 msgid ""

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

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

@@ -2656,7 +2717,7 @@ msgstr ""

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

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

2719

2659 -#: builtin/am.c:1965

2720 +#: builtin/am.c:1951

2721 msgid ""

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

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

@@ -2664,168 +2725,168 @@ msgstr ""

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

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

2727

2667 -#: builtin/am.c:2073 builtin/am.c:2077 builtin/am.c:2089 builtin/reset.c:308

2728 +#: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308

2729 #: builtin/reset.c:316

2730 #, c-format

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

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

2733

2673 -#: builtin/am.c:2125

2734 +#: builtin/am.c:2111

2735 msgid "failed to clean index"

2736 msgstr "无法清空索引"

2737

2677 -#: builtin/am.c:2159

2738 +#: builtin/am.c:2145

2739 msgid ""

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

2741 "Not rewinding to ORIG_HEAD"

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

2743

2683 -#: builtin/am.c:2220

2744 +#: builtin/am.c:2206

2745 #, c-format

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

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

2748

2688 -#: builtin/am.c:2253

2749 +#: builtin/am.c:2239

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

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

2752

2692 -#: builtin/am.c:2254

2753 +#: builtin/am.c:2240

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

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

2756

2696 -#: builtin/am.c:2260

2757 +#: builtin/am.c:2246

2758 msgid "run interactively"

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

2760

2700 -#: builtin/am.c:2262

2761 +#: builtin/am.c:2248

2762 msgid "historical option -- no-op"

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

2764

2704 -#: builtin/am.c:2264

2765 +#: builtin/am.c:2250

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

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

2768

2708 -#: builtin/am.c:2265 builtin/init-db.c:474 builtin/prune-packed.c:57

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

2770 #: builtin/repack.c:171

2771 msgid "be quiet"

2772 msgstr "静默模式"

2773

2713 -#: builtin/am.c:2267

2774 +#: builtin/am.c:2253

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

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

2777

2717 -#: builtin/am.c:2270

2778 +#: builtin/am.c:2256

2779 msgid "recode into utf8 (default)"

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

2781

2721 -#: builtin/am.c:2272

2782 +#: builtin/am.c:2258

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

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

2785

2725 -#: builtin/am.c:2274

2786 +#: builtin/am.c:2260

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

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

2789

2729 -#: builtin/am.c:2276

2790 +#: builtin/am.c:2262

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

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

2793

2733 -#: builtin/am.c:2278

2794 +#: builtin/am.c:2264

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

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

2797

2737 -#: builtin/am.c:2281

2798 +#: builtin/am.c:2267

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

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

2801

2741 -#: builtin/am.c:2284

2802 +#: builtin/am.c:2270

2803 msgid "strip everything before a scissors line"

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

2805

2745 -#: builtin/am.c:2285 builtin/apply.c:4554

2806 +#: builtin/am.c:2271 builtin/apply.c:4544

2807 msgid "action"

2808 msgstr "动作"

2809

2749 -#: builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292 builtin/am.c:2295

2750 -#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307

2751 -#: builtin/am.c:2313

2810 +#: builtin/am.c:2272 builtin/am.c:2275 builtin/am.c:2278 builtin/am.c:2281

2811 +#: builtin/am.c:2284 builtin/am.c:2287 builtin/am.c:2290 builtin/am.c:2293

2812 +#: builtin/am.c:2299

2813 msgid "pass it through git-apply"

2814 msgstr "传递给 git-apply"

2815

2755 -#: builtin/am.c:2294 builtin/apply.c:4578

2816 +#: builtin/am.c:2280 builtin/apply.c:4568

2817 msgid "root"

2818 msgstr "根目录"

2819

2759 -#: builtin/am.c:2297 builtin/am.c:2300 builtin/apply.c:4516

2760 -#: builtin/apply.c:4519 builtin/clone.c:85 builtin/fetch.c:93

2761 -#: builtin/pull.c:167 builtin/submodule--helper.c:78

2762 -#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169

2820 +#: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506

2821 +#: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95

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

2823 +#: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163

2824 msgid "path"

2825 msgstr "路径"

2826

2766 -#: builtin/am.c:2303 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669

2767 -#: builtin/grep.c:693 builtin/merge.c:198 builtin/pull.c:127

2768 -#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645

2769 -#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132

2770 -#: parse-options.h:134 parse-options.h:244

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

2828 +#: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131

2829 +#: builtin/pull.c:185 builtin/repack.c:178 builtin/repack.c:182

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

2831 +#: parse-options.h:132 parse-options.h:134 parse-options.h:244

2832 msgid "n"

2833 msgstr "n"

2834

2774 -#: builtin/am.c:2306 builtin/apply.c:4522

2835 +#: builtin/am.c:2292 builtin/apply.c:4512

2836 msgid "num"

2837 msgstr "数字"

2838

2778 -#: builtin/am.c:2309 builtin/for-each-ref.c:37 builtin/replace.c:438

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

2840 #: builtin/tag.c:372

2841 msgid "format"

2842 msgstr "格式"

2843

2783 -#: builtin/am.c:2310

2844 +#: builtin/am.c:2296

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

2846 msgstr "补丁的格式"

2847

2787 -#: builtin/am.c:2316

2848 +#: builtin/am.c:2302

2849 msgid "override error message when patch failure occurs"

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

2851

2791 -#: builtin/am.c:2318

2852 +#: builtin/am.c:2304

2853 msgid "continue applying patches after resolving a conflict"

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

2855

2795 -#: builtin/am.c:2321

2856 +#: builtin/am.c:2307

2857 msgid "synonyms for --continue"

2858 msgstr "和 --continue 同义"

2859

2799 -#: builtin/am.c:2324

2860 +#: builtin/am.c:2310

2861 msgid "skip the current patch"

2862 msgstr "跳过当前补丁"

2863

2803 -#: builtin/am.c:2327

2864 +#: builtin/am.c:2313

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

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

2867

2807 -#: builtin/am.c:2331

2868 +#: builtin/am.c:2317

2869 msgid "lie about committer date"

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

2871

2811 -#: builtin/am.c:2333

2872 +#: builtin/am.c:2319

2873 msgid "use current timestamp for author date"

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

2875

2815 -#: builtin/am.c:2335 builtin/commit.c:1593 builtin/merge.c:225

2816 -#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:355

2876 +#: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225

2877 +#: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355

2878 msgid "key-id"

2879 msgstr "key-id"

2880

2820 -#: builtin/am.c:2336

2881 +#: builtin/am.c:2322

2882 msgid "GPG-sign commits"

2883 msgstr "使用 GPG 签名提交"

2884

2824 -#: builtin/am.c:2339

2885 +#: builtin/am.c:2325

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

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

2888

2828 -#: builtin/am.c:2354

2889 +#: builtin/am.c:2340

2890 msgid ""

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

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

@@ -2833,16 +2894,16 @@ msgstr ""

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

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

2896

2836 -#: builtin/am.c:2361

2897 +#: builtin/am.c:2347

2898 msgid "failed to read the index"

2899 msgstr "无法读取索引"

2900

2840 -#: builtin/am.c:2376

2901 +#: builtin/am.c:2362

2902 #, c-format

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

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

2905

2845 -#: builtin/am.c:2400

2906 +#: builtin/am.c:2386

2907 #, c-format

2908 msgid ""

2909 "Stray %s directory found.\n"

@@ -2851,7 +2912,7 @@ msgstr ""

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

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

2914

2854 -#: builtin/am.c:2406

2915 +#: builtin/am.c:2392

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

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

2918

@@ -3192,131 +3253,131 @@ msgstr "未能识别的输入"

3253 msgid "unable to read index file"

3254 msgstr "无法读取索引文件"

3255

3195 -#: builtin/apply.c:4517

3256 +#: builtin/apply.c:4507

3257 msgid "don't apply changes matching the given path"

3258 msgstr "不要应用与给出路径向匹配的变更"

3259

3199 -#: builtin/apply.c:4520

3260 +#: builtin/apply.c:4510

3261 msgid "apply changes matching the given path"

3262 msgstr "应用与给出路径向匹配的变更"

3263

3203 -#: builtin/apply.c:4523

3264 +#: builtin/apply.c:4513

3265 msgid "remove <num> leading slashes from traditional diff paths"

3266 msgstr "从传统的 diff 路径中移除指定数量的前导斜线"

3267

3207 -#: builtin/apply.c:4526

3268 +#: builtin/apply.c:4516

3269 msgid "ignore additions made by the patch"

3270 msgstr "忽略补丁中的添加的文件"

3271

3211 -#: builtin/apply.c:4528

3272 +#: builtin/apply.c:4518

3273 msgid "instead of applying the patch, output diffstat for the input"

3274 msgstr "不应用补丁，而是显示输入的差异统计（diffstat）"

3275

3215 -#: builtin/apply.c:4532

3276 +#: builtin/apply.c:4522

3277 msgid "show number of added and deleted lines in decimal notation"

3278 msgstr "以十进制数显示添加和删除的行数"

3279

3219 -#: builtin/apply.c:4534

3280 +#: builtin/apply.c:4524

3281 msgid "instead of applying the patch, output a summary for the input"

3282 msgstr "不应用补丁，而是显示输入的概要"

3283

3223 -#: builtin/apply.c:4536

3284 +#: builtin/apply.c:4526

3285 msgid "instead of applying the patch, see if the patch is applicable"

3286 msgstr "不应用补丁，而是查看补丁是否可应用"

3287

3227 -#: builtin/apply.c:4538

3288 +#: builtin/apply.c:4528

3289 msgid "make sure the patch is applicable to the current index"

3290 msgstr "确认补丁可以应用到当前索引"

3291

3231 -#: builtin/apply.c:4540

3292 +#: builtin/apply.c:4530

3293 msgid "apply a patch without touching the working tree"

3294 msgstr "应用补丁而不修改工作区"

3295

3235 -#: builtin/apply.c:4542

3296 +#: builtin/apply.c:4532

3297 msgid "accept a patch that touches outside the working area"

3298 msgstr "接受修改工作区之外文件的补丁"

3299

3239 -#: builtin/apply.c:4544

3300 +#: builtin/apply.c:4534

3301 msgid "also apply the patch (use with --stat/--summary/--check)"

3302 msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）"

3303

3243 -#: builtin/apply.c:4546

3304 +#: builtin/apply.c:4536

3305 msgid "attempt three-way merge if a patch does not apply"

3306 msgstr "如果一个补丁不能应用则尝试三方合并"

3307

3247 -#: builtin/apply.c:4548

3308 +#: builtin/apply.c:4538

3309 msgid "build a temporary index based on embedded index information"

3310 msgstr "创建一个临时索引基于嵌入的索引信息"

3311

3251 -#: builtin/apply.c:4550 builtin/checkout-index.c:198 builtin/ls-files.c:412

3312 +#: builtin/apply.c:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425

3313 msgid "paths are separated with NUL character"

3314 msgstr "路径以 NUL 字符分隔"

3315

3255 -#: builtin/apply.c:4553

3316 +#: builtin/apply.c:4543

3317 msgid "ensure at least <n> lines of context match"

3318 msgstr "确保至少匹配 <n> 行上下文"

3319

3259 -#: builtin/apply.c:4555

3320 +#: builtin/apply.c:4545

3321 msgid "detect new or modified lines that have whitespace errors"

3322 msgstr "检查新增和修改的行中间的空白字符滥用"

3323

3263 -#: builtin/apply.c:4558 builtin/apply.c:4561

3324 +#: builtin/apply.c:4548 builtin/apply.c:4551

3325 msgid "ignore changes in whitespace when finding context"

3326 msgstr "查找上下文时忽略空白字符的变更"

3327

3267 -#: builtin/apply.c:4564

3328 +#: builtin/apply.c:4554

3329 msgid "apply the patch in reverse"

3330 msgstr "反向应用补丁"

3331

3271 -#: builtin/apply.c:4566

3332 +#: builtin/apply.c:4556

3333 msgid "don't expect at least one line of context"

3334 msgstr "无需至少一行上下文"

3335

3275 -#: builtin/apply.c:4568

3336 +#: builtin/apply.c:4558

3337 msgid "leave the rejected hunks in corresponding *.rej files"

3338 msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"

3339

3279 -#: builtin/apply.c:4570

3340 +#: builtin/apply.c:4560

3341 msgid "allow overlapping hunks"

3342 msgstr "允许重叠的补丁片段"

3343

3283 -#: builtin/apply.c:4573

3344 +#: builtin/apply.c:4563

3345 msgid "tolerate incorrectly detected missing new-line at the end of file"

3346 msgstr "允许不正确的文件末尾换行符"

3347

3287 -#: builtin/apply.c:4576

3348 +#: builtin/apply.c:4566

3349 msgid "do not trust the line counts in the hunk headers"

3350 msgstr "不信任补丁片段的头信息中的行号"

3351

3291 -#: builtin/apply.c:4579

3352 +#: builtin/apply.c:4569

3353 msgid "prepend <root> to all filenames"

3354 msgstr "为所有文件名前添加 <根目录>"

3355

3295 -#: builtin/apply.c:4601

3356 +#: builtin/apply.c:4591

3357 msgid "--3way outside a repository"

3358 msgstr "--3way 在一个仓库之外"

3359

3299 -#: builtin/apply.c:4609

3360 +#: builtin/apply.c:4599

3361 msgid "--index outside a repository"

3362 msgstr "--index 在一个仓库之外"

3363

3303 -#: builtin/apply.c:4612

3364 +#: builtin/apply.c:4602

3365 msgid "--cached outside a repository"

3366 msgstr "--cached 在一个仓库之外"

3367

3307 -#: builtin/apply.c:4631

3368 +#: builtin/apply.c:4621

3369 #, c-format

3370 msgid "can't open patch '%s'"

3371 msgstr "不能打开补丁 '%s'"

3372

3312 -#: builtin/apply.c:4645

3373 +#: builtin/apply.c:4635

3374 #, c-format

3375 msgid "squelched %d whitespace error"

3376 msgid_plural "squelched %d whitespace errors"

3377 msgstr[0] "抑制下仍有 %d 个空白字符误用"

3378 msgstr[1] "抑制下仍有 %d 个空白字符误用"

3379

3319 -#: builtin/apply.c:4651 builtin/apply.c:4661

3380 +#: builtin/apply.c:4641 builtin/apply.c:4651

3381 #, c-format

3382 msgid "%d line adds whitespace errors."

3383 msgid_plural "%d lines add whitespace errors."

@@ -3370,103 +3431,111 @@ msgstr "执行 'git bisect next'"

3431 msgid "update BISECT_HEAD instead of checking out the current commit"

3432 msgstr "更新 BISECT_HEAD 而非检出当前提交"

3433

3373 -#: builtin/blame.c:32

3434 +#: builtin/blame.c:33

3435 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"

3436 msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"

3437

3377 -#: builtin/blame.c:37

3438 +#: builtin/blame.c:38

3439 msgid "<rev-opts> are documented in git-rev-list(1)"

3440 msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"

3441

3381 -#: builtin/blame.c:2519

3442 +#: builtin/blame.c:1782

3443 +msgid "Blaming lines"

3444 +msgstr "追踪代码行"

3445 +

3446 +#: builtin/blame.c:2530

3447 msgid "Show blame entries as we find them, incrementally"

3448 msgstr "增量式地显示发现的 blame 条目"

3449

3385 -#: builtin/blame.c:2520

3450 +#: builtin/blame.c:2531

3451 msgid "Show blank SHA-1 for boundary commits (Default: off)"

3452 msgstr "边界提交显示空的 SHA-1（默认：关闭）"

3453

3389 -#: builtin/blame.c:2521

3454 +#: builtin/blame.c:2532

3455 msgid "Do not treat root commits as boundaries (Default: off)"

3456 msgstr "不把根提交作为边界（默认：关闭）"

3457

3393 -#: builtin/blame.c:2522

3458 +#: builtin/blame.c:2533

3459 msgid "Show work cost statistics"

3460 msgstr "显示命令消耗统计"

3461

3397 -#: builtin/blame.c:2523

3462 +#: builtin/blame.c:2534

3463 +msgid "Force progress reporting"

3464 +msgstr "强制进度显示"

3465 +

3466 +#: builtin/blame.c:2535

3467 msgid "Show output score for blame entries"

3468 msgstr "显示判断 blame 条目位移的得分诊断信息"

3469

3401 -#: builtin/blame.c:2524

3470 +#: builtin/blame.c:2536

3471 msgid "Show original filename (Default: auto)"

3472 msgstr "显示原始文件名（默认：自动）"

3473

3405 -#: builtin/blame.c:2525

3474 +#: builtin/blame.c:2537

3475 msgid "Show original linenumber (Default: off)"

3476 msgstr "显示原始的行号（默认：关闭）"

3477

3409 -#: builtin/blame.c:2526

3478 +#: builtin/blame.c:2538

3479 msgid "Show in a format designed for machine consumption"

3480 msgstr "显示为一个适合机器读取的格式"

3481

3413 -#: builtin/blame.c:2527

3482 +#: builtin/blame.c:2539

3483 msgid "Show porcelain format with per-line commit information"

3484 msgstr "为每一行显示机器适用的提交信息"

3485

3417 -#: builtin/blame.c:2528

3486 +#: builtin/blame.c:2540

3487 msgid "Use the same output mode as git-annotate (Default: off)"

3488 msgstr "使用和 git-annotate 相同的输出模式（默认：关闭）"

3489

3421 -#: builtin/blame.c:2529

3490 +#: builtin/blame.c:2541

3491 msgid "Show raw timestamp (Default: off)"

3492 msgstr "显示原始时间戳（默认：关闭）"

3493

3425 -#: builtin/blame.c:2530

3494 +#: builtin/blame.c:2542

3495 msgid "Show long commit SHA1 (Default: off)"

3496 msgstr "显示长的 SHA1 提交号（默认：关闭）"

3497

3429 -#: builtin/blame.c:2531

3498 +#: builtin/blame.c:2543

3499 msgid "Suppress author name and timestamp (Default: off)"

3500 msgstr "隐藏作者名字和时间戳（默认：关闭）"

3501

3433 -#: builtin/blame.c:2532

3502 +#: builtin/blame.c:2544

3503 msgid "Show author email instead of name (Default: off)"

3504 msgstr "显示作者的邮箱而不是名字（默认：关闭）"

3505

3437 -#: builtin/blame.c:2533

3506 +#: builtin/blame.c:2545

3507 msgid "Ignore whitespace differences"

3508 msgstr "忽略空白差异"

3509

3441 -#: builtin/blame.c:2534

3510 +#: builtin/blame.c:2546

3511 msgid "Spend extra cycles to find better match"

3512 msgstr "花费额外的循环来找到更好的匹配"

3513

3445 -#: builtin/blame.c:2535

3514 +#: builtin/blame.c:2547

3515 msgid "Use revisions from <file> instead of calling git-rev-list"

3516 msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"

3517

3449 -#: builtin/blame.c:2536

3518 +#: builtin/blame.c:2548

3519 msgid "Use <file>'s contents as the final image"

3520 msgstr "使用 <文件> 的内容作为最终的图片"

3521

3453 -#: builtin/blame.c:2537 builtin/blame.c:2538

3522 +#: builtin/blame.c:2549 builtin/blame.c:2550

3523 msgid "score"

3524 msgstr "得分"

3525

3457 -#: builtin/blame.c:2537

3526 +#: builtin/blame.c:2549

3527 msgid "Find line copies within and across files"

3528 msgstr "找到文件内及跨文件的行拷贝"

3529

3461 -#: builtin/blame.c:2538

3530 +#: builtin/blame.c:2550

3531 msgid "Find line movements within and across files"

3532 msgstr "找到文件内及跨文件的行移动"

3533

3465 -#: builtin/blame.c:2539

3534 +#: builtin/blame.c:2551

3535 msgid "n,m"

3536 msgstr "n,m"

3537

3469 -#: builtin/blame.c:2539

3538 +#: builtin/blame.c:2551

3539 msgid "Process only line range n,m, counting from 1"

3540 msgstr "只处理行范围在 n 和 m 之间的，从 1 开始"

3541

@@ -3476,7 +3545,7 @@ msgstr "只处理行范围在 n 和 m 之间的，从 1 开始"

3545 #. takes 22 places, is the longest among various forms of

3546 #. relative timestamps, but your language may need more or

3547 #. fewer display columns.

3479 -#: builtin/blame.c:2620

3548 +#: builtin/blame.c:2640

3549 msgid "4 years, 11 months ago"

3550 msgstr "4 年 11 个月前"

3551

@@ -3676,193 +3745,193 @@ msgstr "分支重命名为 %s，但 HEAD 没有更新！"

3745 msgid "Branch is renamed, but update of config-file failed"

3746 msgstr "分支被重命名，但更新 config 文件失败"

3747

3679 -#: builtin/branch.c:587

3748 +#: builtin/branch.c:586

3749 #, c-format

3750 msgid "could not write branch description template: %s"

3751 msgstr "不能写分支描述模版：%s"

3752

3684 -#: builtin/branch.c:616

3753 +#: builtin/branch.c:615

3754 msgid "Generic options"

3755 msgstr "通用选项"

3756

3688 -#: builtin/branch.c:618

3757 +#: builtin/branch.c:617

3758 msgid "show hash and subject, give twice for upstream branch"

3759 msgstr "显示哈希值和主题，若参数出现两次则显示上游分支"

3760

3692 -#: builtin/branch.c:619

3761 +#: builtin/branch.c:618

3762 msgid "suppress informational messages"

3763 msgstr "不显示信息"

3764

3696 -#: builtin/branch.c:620

3765 +#: builtin/branch.c:619

3766 msgid "set up tracking mode (see git-pull(1))"

3767 msgstr "设置跟踪模式（参见 git-pull(1)）"

3768

3700 -#: builtin/branch.c:622

3769 +#: builtin/branch.c:621

3770 msgid "change upstream info"

3771 msgstr "改变上游信息"

3772

3704 -#: builtin/branch.c:626

3773 +#: builtin/branch.c:625

3774 msgid "use colored output"

3775 msgstr "使用彩色输出"

3776

3708 -#: builtin/branch.c:627

3777 +#: builtin/branch.c:626

3778 msgid "act on remote-tracking branches"

3779 msgstr "作用于远程跟踪分支"

3780

3712 -#: builtin/branch.c:629 builtin/branch.c:630

3781 +#: builtin/branch.c:628 builtin/branch.c:629

3782 msgid "print only branches that contain the commit"

3783 msgstr "只打印包含该提交的分支"

3784

3716 -#: builtin/branch.c:633

3785 +#: builtin/branch.c:632

3786 msgid "Specific git-branch actions:"

3787 msgstr "具体的 git-branch 动作："

3788

3720 -#: builtin/branch.c:634

3789 +#: builtin/branch.c:633

3790 msgid "list both remote-tracking and local branches"

3791 msgstr "列出远程跟踪及本地分支"

3792

3724 -#: builtin/branch.c:636

3793 +#: builtin/branch.c:635

3794 msgid "delete fully merged branch"

3795 msgstr "删除完全合并的分支"

3796

3728 -#: builtin/branch.c:637

3797 +#: builtin/branch.c:636

3798 msgid "delete branch (even if not merged)"

3799 msgstr "删除分支（即使没有合并）"

3800

3732 -#: builtin/branch.c:638

3801 +#: builtin/branch.c:637

3802 msgid "move/rename a branch and its reflog"

3803 msgstr "移动/重命名一个分支，以及它的引用日志"

3804

3736 -#: builtin/branch.c:639

3805 +#: builtin/branch.c:638

3806 msgid "move/rename a branch, even if target exists"

3807 msgstr "移动/重命名一个分支，即使目标已存在"

3808

3740 -#: builtin/branch.c:640

3809 +#: builtin/branch.c:639

3810 msgid "list branch names"

3811 msgstr "列出分支名"

3812

3744 -#: builtin/branch.c:641

3813 +#: builtin/branch.c:640

3814 msgid "create the branch's reflog"

3815 msgstr "创建分支的引用日志"

3816

3748 -#: builtin/branch.c:643

3817 +#: builtin/branch.c:642

3818 msgid "edit the description for the branch"

3819 msgstr "标记分支的描述"

3820

3752 -#: builtin/branch.c:644

3821 +#: builtin/branch.c:643

3822 msgid "force creation, move/rename, deletion"

3823 msgstr "强制创建、移动/重命名、删除"

3824

3756 -#: builtin/branch.c:645

3825 +#: builtin/branch.c:644

3826 msgid "print only branches that are merged"

3827 msgstr "只打印已经合并的分支"

3828

3760 -#: builtin/branch.c:646

3829 +#: builtin/branch.c:645

3830 msgid "print only branches that are not merged"

3831 msgstr "只打印尚未合并的分支"

3832

3764 -#: builtin/branch.c:647

3833 +#: builtin/branch.c:646

3834 msgid "list branches in columns"

3835 msgstr "以列的方式显示分支"

3836

3768 -#: builtin/branch.c:648 builtin/for-each-ref.c:38 builtin/tag.c:366

3837 +#: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366

3838 msgid "key"

3839 msgstr "key"

3840

3772 -#: builtin/branch.c:649 builtin/for-each-ref.c:39 builtin/tag.c:367

3841 +#: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367

3842 msgid "field name to sort on"

3843 msgstr "排序的字段名"

3844

3776 -#: builtin/branch.c:651 builtin/for-each-ref.c:41 builtin/notes.c:398

3777 -#: builtin/notes.c:401 builtin/notes.c:561 builtin/notes.c:564

3845 +#: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401

3846 +#: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567

3847 #: builtin/tag.c:369

3848 msgid "object"

3849 msgstr "对象"

3850

3782 -#: builtin/branch.c:652

3851 +#: builtin/branch.c:651

3852 msgid "print only branches of the object"

3853 msgstr "只打印指向该对象的分支"

3854

3786 -#: builtin/branch.c:670

3855 +#: builtin/branch.c:669

3856 msgid "Failed to resolve HEAD as a valid ref."

3857 msgstr "无法将 HEAD 解析为有效引用。"

3858

3790 -#: builtin/branch.c:674 builtin/clone.c:697

3859 +#: builtin/branch.c:673 builtin/clone.c:705

3860 msgid "HEAD not found below refs/heads!"

3861 msgstr "HEAD 没有位于 /refs/heads 之下！"

3862

3794 -#: builtin/branch.c:694

3863 +#: builtin/branch.c:693

3864 msgid "--column and --verbose are incompatible"

3865 msgstr "--column 和 --verbose 不兼容"

3866

3798 -#: builtin/branch.c:705 builtin/branch.c:747

3867 +#: builtin/branch.c:704 builtin/branch.c:746

3868 msgid "branch name required"

3869 msgstr "必须提供分支名"

3870

3802 -#: builtin/branch.c:723

3871 +#: builtin/branch.c:722

3872 msgid "Cannot give description to detached HEAD"

3873 msgstr "不能向分离头指针提供描述"

3874

3806 -#: builtin/branch.c:728

3875 +#: builtin/branch.c:727

3876 msgid "cannot edit description of more than one branch"

3877 msgstr "不能为一个以上的分支编辑描述"

3878

3810 -#: builtin/branch.c:735

3879 +#: builtin/branch.c:734

3880 #, c-format

3881 msgid "No commit on branch '%s' yet."

3882 msgstr "分支 '%s' 尚无提交。"

3883

3815 -#: builtin/branch.c:738

3884 +#: builtin/branch.c:737

3885 #, c-format

3886 msgid "No branch named '%s'."

3887 msgstr "没有分支 '%s'。"

3888

3820 -#: builtin/branch.c:753

3889 +#: builtin/branch.c:752

3890 msgid "too many branches for a rename operation"

3891 msgstr "为重命名操作提供了太多的分支名"

3892

3824 -#: builtin/branch.c:758

3893 +#: builtin/branch.c:757

3894 msgid "too many branches to set new upstream"

3895 msgstr "为设置新上游提供了太多的分支名"

3896

3828 -#: builtin/branch.c:762

3897 +#: builtin/branch.c:761

3898 #, c-format

3899 msgid ""

3900 "could not set upstream of HEAD to %s when it does not point to any branch."

3901 msgstr "无法设置 HEAD 的上游为 %s，因为 HEAD 没有指向任何分支。"

3902

3834 -#: builtin/branch.c:765 builtin/branch.c:787 builtin/branch.c:808

3903 +#: builtin/branch.c:764 builtin/branch.c:786 builtin/branch.c:807

3904 #, c-format

3905 msgid "no such branch '%s'"

3906 msgstr "没有此分支 '%s'"

3907

3839 -#: builtin/branch.c:769

3908 +#: builtin/branch.c:768

3909 #, c-format

3910 msgid "branch '%s' does not exist"

3911 msgstr "分支 '%s' 不存在"

3912

3844 -#: builtin/branch.c:781

3913 +#: builtin/branch.c:780

3914 msgid "too many branches to unset upstream"

3915 msgstr "为取消上游设置操作提供了太多的分支名"

3916

3848 -#: builtin/branch.c:785

3917 +#: builtin/branch.c:784

3918 msgid "could not unset upstream of HEAD when it does not point to any branch."

3919 msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"

3920

3852 -#: builtin/branch.c:791

3921 +#: builtin/branch.c:790

3922 #, c-format

3923 msgid "Branch '%s' has no upstream information"

3924 msgstr "分支 '%s' 没有上游信息"

3925

3857 -#: builtin/branch.c:805

3926 +#: builtin/branch.c:804

3927 msgid "it does not make sense to create 'HEAD' manually"

3928 msgstr "手工创建 'HEAD' 没有意义"

3929

3861 -#: builtin/branch.c:811

3930 +#: builtin/branch.c:810

3931 msgid "-a and -r options to 'git branch' do not make sense with a branch name"

3932 msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"

3933

3865 -#: builtin/branch.c:814

3934 +#: builtin/branch.c:813

3935 #, c-format

3936 msgid ""

3937 "The --set-upstream flag is deprecated and will be removed. Consider using --"

@@ -3870,7 +3939,7 @@ msgid ""

3939 msgstr ""

3940 "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"

3941

3873 -#: builtin/branch.c:831

3942 +#: builtin/branch.c:830

3943 #, c-format

3944 msgid ""

3945 "\n"

@@ -3881,12 +3950,12 @@ msgstr ""

3950 "如果你想用 '%s' 跟踪 '%s', 这么做：\n"

3951 "\n"

3952

3884 -#: builtin/branch.c:832

3953 +#: builtin/branch.c:831

3954 #, c-format

3955 msgid " git branch -d %s\n"

3956 msgstr " git branch -d %s\n"

3957

3889 -#: builtin/branch.c:833

3958 +#: builtin/branch.c:832

3959 #, c-format

3960 msgid " git branch --set-upstream-to %s\n"

3961 msgstr " git branch --set-upstream-to %s\n"

@@ -3980,7 +4049,7 @@ msgstr "报告设置在文件上的所有属性"

4049 msgid "use .gitattributes only from the index"

4050 msgstr "只使用索引中的 .gitattributes"

4051

3983 -#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:96

4052 +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:97

4053 msgid "read file names from stdin"

4054 msgstr "从标准输入读出文件名"

4055

@@ -3988,7 +4057,7 @@ msgstr "从标准输入读出文件名"

4057 msgid "terminate input and output records by a NUL character"

4058 msgstr "输入和输出的记录使用 NUL 字符终结"

4059

3991 -#: builtin/check-ignore.c:18 builtin/checkout.c:1134 builtin/gc.c:325

4060 +#: builtin/check-ignore.c:18 builtin/checkout.c:1136 builtin/gc.c:325

4061 msgid "suppress progress reporting"

4062 msgstr "不显示进度报告"

4063

@@ -4041,49 +4110,53 @@ msgstr "不能解析联系地址：%s"

4110 msgid "no contacts specified"

4111 msgstr "未指定联系地址"

4112

4044 -#: builtin/checkout-index.c:126

4113 +#: builtin/checkout-index.c:127

4114 msgid "git checkout-index [<options>] [--] [<file>...]"

4115 msgstr "git checkout-index [<选项>] [--] [<文件>...]"

4116

4048 -#: builtin/checkout-index.c:188

4117 +#: builtin/checkout-index.c:144

4118 +msgid "stage should be between 1 and 3 or all"

4119 +msgstr "索引值应该取值 1 到 3 或者 all"

4120 +

4121 +#: builtin/checkout-index.c:160

4122 msgid "check out all files in the index"

4123 msgstr "检出索引区的所有文件"

4124

4052 -#: builtin/checkout-index.c:189

4125 +#: builtin/checkout-index.c:161

4126 msgid "force overwrite of existing files"

4127 msgstr "强制覆盖现有的文件"

4128

4056 -#: builtin/checkout-index.c:191

4129 +#: builtin/checkout-index.c:163

4130 msgid "no warning for existing files and files not in index"

4131 msgstr "存在或不在索引中的文件都没有警告"

4132

4060 -#: builtin/checkout-index.c:193

4133 +#: builtin/checkout-index.c:165

4134 msgid "don't checkout new files"

4135 msgstr "不检出新文件"

4136

4064 -#: builtin/checkout-index.c:195

4137 +#: builtin/checkout-index.c:167

4138 msgid "update stat information in the index file"

4139 msgstr "更新索引中文件的状态信息"

4140

4068 -#: builtin/checkout-index.c:201

4141 +#: builtin/checkout-index.c:171

4142 msgid "read list of paths from the standard input"

4143 msgstr "从标准输入读取路径列表"

4144

4072 -#: builtin/checkout-index.c:203

4145 +#: builtin/checkout-index.c:173

4146 msgid "write the content to temporary files"

4147 msgstr "将内容写入临时文件"

4148

4076 -#: builtin/checkout-index.c:204 builtin/column.c:30

4149 +#: builtin/checkout-index.c:174 builtin/column.c:30

4150 +#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169

4151 #: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175

4078 -#: builtin/submodule--helper.c:178 builtin/submodule--helper.c:181

4152 msgid "string"

4153 msgstr "字符串"

4154

4082 -#: builtin/checkout-index.c:205

4155 +#: builtin/checkout-index.c:175

4156 msgid "when creating files, prepend <string>"

4157 msgstr "在创建文件时，在前面加上 <字符串>"

4158

4086 -#: builtin/checkout-index.c:208

4159 +#: builtin/checkout-index.c:177

4160 msgid "copy out the files from named stage"

4161 msgstr "从指定暂存区中拷出文件"

4162

@@ -4163,38 +4236,38 @@ msgstr "不能对 '%s' 执行 reflog 操作：%s\n"

4236 msgid "HEAD is now at"

4237 msgstr "HEAD 目前位于"

4238

4166 -#: builtin/checkout.c:668

4239 +#: builtin/checkout.c:669

4240 #, c-format

4241 msgid "Reset branch '%s'\n"

4242 msgstr "重置分支 '%s'\n"

4243

4171 -#: builtin/checkout.c:671

4244 +#: builtin/checkout.c:672

4245 #, c-format

4246 msgid "Already on '%s'\n"

4247 msgstr "已经位于 '%s'\n"

4248

4176 -#: builtin/checkout.c:675

4249 +#: builtin/checkout.c:676

4250 #, c-format

4251 msgid "Switched to and reset branch '%s'\n"

4252 msgstr "切换并重置分支 '%s'\n"

4253

4181 -#: builtin/checkout.c:677 builtin/checkout.c:1066

4254 +#: builtin/checkout.c:678 builtin/checkout.c:1068

4255 #, c-format

4256 msgid "Switched to a new branch '%s'\n"

4257 msgstr "切换到一个新分支 '%s'\n"

4258

4186 -#: builtin/checkout.c:679

4259 +#: builtin/checkout.c:680

4260 #, c-format

4261 msgid "Switched to branch '%s'\n"

4262 msgstr "切换到分支 '%s'\n"

4263

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

4192 -#: builtin/checkout.c:731

4265 +#: builtin/checkout.c:732

4266 #, c-format

4267 msgid " ... and %d more.\n"

4268 msgstr " ... 及其它 %d 个。\n"

4269

4197 -#: builtin/checkout.c:737

4270 +#: builtin/checkout.c:738

4271 #, c-format

4272 msgid ""

4273 "Warning: you are leaving %d commit behind, not connected to\n"

@@ -4215,7 +4288,7 @@ msgstr[1] ""

4288 "\n"

4289 "%s\n"

4290

4218 -#: builtin/checkout.c:756

4291 +#: builtin/checkout.c:757

4292 #, c-format

4293 msgid ""

4294 "If you want to keep it by creating a new branch, this may be a good time\n"

@@ -4242,150 +4315,150 @@ msgstr[1] ""

4315 " git branch <新分支名> %s\n"

4316 "\n"

4317

4245 -#: builtin/checkout.c:792

4318 +#: builtin/checkout.c:793

4319 msgid "internal error in revision walk"

4320 msgstr "在版本遍历时遇到内部错误"

4321

4249 -#: builtin/checkout.c:796

4322 +#: builtin/checkout.c:797

4323 msgid "Previous HEAD position was"

4324 msgstr "之前的 HEAD 位置是"

4325

4253 -#: builtin/checkout.c:823 builtin/checkout.c:1061

4326 +#: builtin/checkout.c:824 builtin/checkout.c:1063

4327 msgid "You are on a branch yet to be born"

4328 msgstr "您位于一个尚未初始化的分支"

4329

4257 -#: builtin/checkout.c:968

4330 +#: builtin/checkout.c:969

4331 #, c-format

4332 msgid "only one reference expected, %d given."

4333 msgstr "只要一个引用，却给出了 %d 个"

4334

4262 -#: builtin/checkout.c:1007 builtin/worktree.c:213

4335 +#: builtin/checkout.c:1009 builtin/worktree.c:211

4336 #, c-format

4337 msgid "invalid reference: %s"

4338 msgstr "无效引用：%s"

4339

4267 -#: builtin/checkout.c:1036

4340 +#: builtin/checkout.c:1038

4341 #, c-format

4342 msgid "reference is not a tree: %s"

4343 msgstr "引用不是一个树：%s"

4344

4272 -#: builtin/checkout.c:1075

4345 +#: builtin/checkout.c:1077

4346 msgid "paths cannot be used with switching branches"

4347 msgstr "路径不能和切换分支同时使用"

4348

4276 -#: builtin/checkout.c:1078 builtin/checkout.c:1082

4349 +#: builtin/checkout.c:1080 builtin/checkout.c:1084

4350 #, c-format

4351 msgid "'%s' cannot be used with switching branches"

4352 msgstr "'%s' 不能和切换分支同时使用"

4353

4281 -#: builtin/checkout.c:1086 builtin/checkout.c:1089 builtin/checkout.c:1094

4282 -#: builtin/checkout.c:1097

4354 +#: builtin/checkout.c:1088 builtin/checkout.c:1091 builtin/checkout.c:1096

4355 +#: builtin/checkout.c:1099

4356 #, c-format

4357 msgid "'%s' cannot be used with '%s'"

4358 msgstr "'%s' 不能和 '%s' 同时使用"

4359

4287 -#: builtin/checkout.c:1102

4360 +#: builtin/checkout.c:1104

4361 #, c-format

4362 msgid "Cannot switch branch to a non-commit '%s'"

4363 msgstr "不能切换分支到一个非提交 '%s'"

4364

4292 -#: builtin/checkout.c:1135 builtin/checkout.c:1137 builtin/clone.c:83

4293 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:320

4294 -#: builtin/worktree.c:322

4365 +#: builtin/checkout.c:1137 builtin/checkout.c:1139 builtin/clone.c:84

4366 +#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318

4367 +#: builtin/worktree.c:320

4368 msgid "branch"

4369 msgstr "分支"

4370

4298 -#: builtin/checkout.c:1136

4371 +#: builtin/checkout.c:1138

4372 msgid "create and checkout a new branch"

4373 msgstr "创建并检出一个新的分支"

4374

4302 -#: builtin/checkout.c:1138

4375 +#: builtin/checkout.c:1140

4376 msgid "create/reset and checkout a branch"

4377 msgstr "创建/重置并检出一个分支"

4378

4306 -#: builtin/checkout.c:1139

4379 +#: builtin/checkout.c:1141

4380 msgid "create reflog for new branch"

4381 msgstr "为新的分支创建引用日志"

4382

4310 -#: builtin/checkout.c:1140

4383 +#: builtin/checkout.c:1142

4384 msgid "detach the HEAD at named commit"

4385 msgstr "成为指向该提交的分离头指针"

4386

4314 -#: builtin/checkout.c:1141

4387 +#: builtin/checkout.c:1143

4388 msgid "set upstream info for new branch"

4389 msgstr "为新的分支设置上游信息"

4390

4318 -#: builtin/checkout.c:1143

4391 +#: builtin/checkout.c:1145

4392 msgid "new-branch"

4393 msgstr "新分支"

4394

4322 -#: builtin/checkout.c:1143

4395 +#: builtin/checkout.c:1145

4396 msgid "new unparented branch"

4397 msgstr "新的没有父提交的分支"

4398

4326 -#: builtin/checkout.c:1144

4399 +#: builtin/checkout.c:1146

4400 msgid "checkout our version for unmerged files"

4401 msgstr "对尚未合并的文件检出我们的版本"

4402

4330 -#: builtin/checkout.c:1146

4403 +#: builtin/checkout.c:1148

4404 msgid "checkout their version for unmerged files"

4405 msgstr "对尚未合并的文件检出他们的版本"

4406

4334 -#: builtin/checkout.c:1148

4407 +#: builtin/checkout.c:1150

4408 msgid "force checkout (throw away local modifications)"

4409 msgstr "强制检出（丢弃本地修改）"

4410

4338 -#: builtin/checkout.c:1149

4411 +#: builtin/checkout.c:1151

4412 msgid "perform a 3-way merge with the new branch"

4413 msgstr "和新的分支执行三方合并"

4414

4342 -#: builtin/checkout.c:1150 builtin/merge.c:227

4415 +#: builtin/checkout.c:1152 builtin/merge.c:227

4416 msgid "update ignored files (default)"

4417 msgstr "更新忽略的文件（默认）"

4418

4346 -#: builtin/checkout.c:1151 builtin/log.c:1266 parse-options.h:250

4419 +#: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250

4420 msgid "style"

4421 msgstr "风格"

4422

4350 -#: builtin/checkout.c:1152

4423 +#: builtin/checkout.c:1154

4424 msgid "conflict style (merge or diff3)"

4425 msgstr "冲突输出风格（merge 或 diff3）"

4426

4354 -#: builtin/checkout.c:1155

4427 +#: builtin/checkout.c:1157

4428 msgid "do not limit pathspecs to sparse entries only"

4429 msgstr "对路径不做稀疏检出的限制"

4430

4358 -#: builtin/checkout.c:1157

4431 +#: builtin/checkout.c:1159

4432 msgid "second guess 'git checkout <no-such-branch>'"

4433 msgstr "二次猜测'git checkout <无此分支>'"

4434

4362 -#: builtin/checkout.c:1159

4435 +#: builtin/checkout.c:1161

4436 msgid "do not check if another worktree is holding the given ref"

4437 msgstr "不检查指定的引用是否被其他工作区所占用"

4438

4366 -#: builtin/checkout.c:1160 builtin/clone.c:57 builtin/fetch.c:112

4367 -#: builtin/merge.c:224 builtin/pull.c:109 builtin/push.c:558

4439 +#: builtin/checkout.c:1162 builtin/clone.c:58 builtin/fetch.c:116

4440 +#: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526

4441 #: builtin/send-pack.c:168

4442 msgid "force progress reporting"

4443 msgstr "强制显示进度报告"

4444

4372 -#: builtin/checkout.c:1191

4445 +#: builtin/checkout.c:1193

4446 msgid "-b, -B and --orphan are mutually exclusive"

4447 msgstr "-b、-B 和 --orphan 是互斥的"

4448

4376 -#: builtin/checkout.c:1208

4449 +#: builtin/checkout.c:1210

4450 msgid "--track needs a branch name"

4451 msgstr "--track 需要一个分支名"

4452

4380 -#: builtin/checkout.c:1213

4453 +#: builtin/checkout.c:1215

4454 msgid "Missing branch name; try -b"

4455 msgstr "缺少分支名；尝试 -b"

4456

4384 -#: builtin/checkout.c:1249

4457 +#: builtin/checkout.c:1251

4458 msgid "invalid path specification"

4459 msgstr "无效的路径规格"

4460

4388 -#: builtin/checkout.c:1256

4461 +#: builtin/checkout.c:1258

4462 #, c-format

4463 msgid ""

4464 "Cannot update paths and switch to branch '%s' at the same time.\n"

@@ -4394,12 +4467,12 @@ msgstr ""

4467 "不能同时更新路径并切换到分支'%s'。\n"

4468 "您是想要检出 '%s' 但其未能解析为提交么？"

4469

4397 -#: builtin/checkout.c:1261

4470 +#: builtin/checkout.c:1263

4471 #, c-format

4472 msgid "git checkout: --detach does not take a path argument '%s'"

4473 msgstr "git checkout：--detach 不能接收路径参数 '%s'"

4474

4402 -#: builtin/checkout.c:1265

4475 +#: builtin/checkout.c:1267

4476 msgid ""

4477 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"

4478 "checking out of the index."

@@ -4437,7 +4510,7 @@ msgstr "将忽略仓库 %s\n"

4510 msgid "failed to remove %s"

4511 msgstr "无法删除 %s"

4512

4440 -#: builtin/clean.c:315

4513 +#: builtin/clean.c:291

4514 msgid ""

4515 "Prompt help:\n"

4516 "1 - select a numbered item\n"

@@ -4449,7 +4522,7 @@ msgstr ""

4522 "foo - 通过标题选择一个选项\n"

4523 " - （空）什么也不选择"

4524

4452 -#: builtin/clean.c:319

4525 +#: builtin/clean.c:295

4526 msgid ""

4527 "Prompt help:\n"

4528 "1 - select a single item\n"

@@ -4469,36 +4542,36 @@ msgstr ""

4542 "* - 选择所有选项\n"

4543 " - （空）结束选择"

4544

4472 -#: builtin/clean.c:535

4545 +#: builtin/clean.c:511

4546 #, c-format

4547 msgid "Huh (%s)?"

4548 msgstr "嗯（%s）？"

4549

4477 -#: builtin/clean.c:677

4550 +#: builtin/clean.c:653

4551 #, c-format

4552 msgid "Input ignore patterns>> "

4553 msgstr "输入模版以排除条目>> "

4554

4482 -#: builtin/clean.c:714

4555 +#: builtin/clean.c:690

4556 #, c-format

4557 msgid "WARNING: Cannot find items matched by: %s"

4558 msgstr "警告：无法找到和 %s 匹配的条目"

4559

4487 -#: builtin/clean.c:735

4560 +#: builtin/clean.c:711

4561 msgid "Select items to delete"

4562 msgstr "选择要删除的条目"

4563

4564 #. TRANSLATORS: Make sure to keep [y/N] as is

4492 -#: builtin/clean.c:776

4565 +#: builtin/clean.c:752

4566 #, c-format

4567 msgid "Remove %s [y/N]? "

4568 msgstr "删除 %s [y/N]？"

4569

4497 -#: builtin/clean.c:801

4570 +#: builtin/clean.c:777

4571 msgid "Bye."

4572 msgstr "再见。"

4573

4501 -#: builtin/clean.c:809

4574 +#: builtin/clean.c:785

4575 msgid ""

4576 "clean - start cleaning\n"

4577 "filter by pattern - exclude items from deletion\n"

@@ -4516,69 +4589,69 @@ msgstr ""

4589 "help - 显示本帮助\n"

4590 "? - 显示如何在提示符下选择的帮助"

4591

4519 -#: builtin/clean.c:836

4592 +#: builtin/clean.c:812

4593 msgid "*** Commands ***"

4594 msgstr "*** 命令 ***"

4595

4523 -#: builtin/clean.c:837

4596 +#: builtin/clean.c:813

4597 msgid "What now"

4598 msgstr "请选择"

4599

4527 -#: builtin/clean.c:845

4600 +#: builtin/clean.c:821

4601 msgid "Would remove the following item:"

4602 msgid_plural "Would remove the following items:"

4603 msgstr[0] "将删除如下条目："

4604 msgstr[1] "将删除如下条目："

4605

4533 -#: builtin/clean.c:862

4606 +#: builtin/clean.c:838

4607 msgid "No more files to clean, exiting."

4608 msgstr "没有要清理的文件，退出。"

4609

4537 -#: builtin/clean.c:893

4610 +#: builtin/clean.c:869

4611 msgid "do not print names of files removed"

4612 msgstr "不打印删除文件的名称"

4613

4541 -#: builtin/clean.c:895

4614 +#: builtin/clean.c:871

4615 msgid "force"

4616 msgstr "强制"

4617

4545 -#: builtin/clean.c:896

4618 +#: builtin/clean.c:872

4619 msgid "interactive cleaning"

4620 msgstr "交互式清除"

4621

4549 -#: builtin/clean.c:898

4622 +#: builtin/clean.c:874

4623 msgid "remove whole directories"

4624 msgstr "删除整个目录"

4625

4553 -#: builtin/clean.c:899 builtin/describe.c:407 builtin/grep.c:709

4554 -#: builtin/ls-files.c:443 builtin/name-rev.c:307 builtin/show-ref.c:182

4626 +#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:722

4627 +#: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182

4628 msgid "pattern"

4629 msgstr "模式"

4630

4558 -#: builtin/clean.c:900

4631 +#: builtin/clean.c:876

4632 msgid "add <pattern> to ignore rules"

4633 msgstr "添加 <模式> 到忽略规则"

4634

4562 -#: builtin/clean.c:901

4635 +#: builtin/clean.c:877

4636 msgid "remove ignored files, too"

4637 msgstr "也删除忽略的文件"

4638

4566 -#: builtin/clean.c:903

4639 +#: builtin/clean.c:879

4640 msgid "remove only ignored files"

4641 msgstr "只删除忽略的文件"

4642

4570 -#: builtin/clean.c:921

4643 +#: builtin/clean.c:897

4644 msgid "-x and -X cannot be used together"

4645 msgstr "-x 和 -X 不能同时使用"

4646

4574 -#: builtin/clean.c:925

4647 +#: builtin/clean.c:901

4648 msgid ""

4649 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "

4650 "clean"

4651 msgstr ""

4652 "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作"

4653

4581 -#: builtin/clean.c:928

4654 +#: builtin/clean.c:904

4655 msgid ""

4656 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "

4657 "refusing to clean"

@@ -4589,146 +4662,154 @@ msgstr ""

4662 msgid "git clone [<options>] [--] <repo> [<dir>]"

4663 msgstr "git clone [<选项>] [--] <仓库> [<路径>]"

4664

4592 -#: builtin/clone.c:59

4665 +#: builtin/clone.c:60

4666 msgid "don't create a checkout"

4667 msgstr "不创建一个检出"

4668

4596 -#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:469

4669 +#: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469

4670 msgid "create a bare repository"

4671 msgstr "创建一个纯仓库"

4672

4600 -#: builtin/clone.c:64

4673 +#: builtin/clone.c:65

4674 msgid "create a mirror repository (implies bare)"

4675 msgstr "创建一个镜像仓库（也是纯仓库）"

4676

4604 -#: builtin/clone.c:66

4677 +#: builtin/clone.c:67

4678 msgid "to clone from a local repository"

4679 msgstr "从本地仓库克隆"

4680

4608 -#: builtin/clone.c:68

4681 +#: builtin/clone.c:69

4682 msgid "don't use local hardlinks, always copy"

4683 msgstr "不使用本地硬链接，始终复制"

4684

4612 -#: builtin/clone.c:70

4685 +#: builtin/clone.c:71

4686 msgid "setup as shared repository"

4687 msgstr "设置为共享仓库"

4688

4616 -#: builtin/clone.c:72 builtin/clone.c:74

4689 +#: builtin/clone.c:73 builtin/clone.c:75

4690 msgid "initialize submodules in the clone"

4691 msgstr "在克隆时初始化子模组"

4692

4620 -#: builtin/clone.c:75 builtin/init-db.c:466

4693 +#: builtin/clone.c:76 builtin/init-db.c:466

4694 msgid "template-directory"

4695 msgstr "模板目录"

4696

4624 -#: builtin/clone.c:76 builtin/init-db.c:467

4697 +#: builtin/clone.c:77 builtin/init-db.c:467

4698 msgid "directory from which templates will be used"

4699 msgstr "模板目录将被使用"

4700

4628 -#: builtin/clone.c:78 builtin/submodule--helper.c:179

4701 +#: builtin/clone.c:79 builtin/submodule--helper.c:173

4702 msgid "reference repository"

4703 msgstr "参考仓库"

4704

4632 -#: builtin/clone.c:80

4705 +#: builtin/clone.c:81

4706 msgid "use --reference only while cloning"

4707 msgstr "仅在克隆时参考 --reference 指向的本地仓库"

4708

4636 -#: builtin/clone.c:81 builtin/column.c:26 builtin/merge-file.c:44

4709 +#: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44

4710 msgid "name"

4711 msgstr "名称"

4712

4640 -#: builtin/clone.c:82

4713 +#: builtin/clone.c:83

4714 msgid "use <name> instead of 'origin' to track upstream"

4715 msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"

4716

4644 -#: builtin/clone.c:84

4717 +#: builtin/clone.c:85

4718 msgid "checkout <branch> instead of the remote's HEAD"

4719 msgstr "检出 <分支> 而不是远程 HEAD"

4720

4648 -#: builtin/clone.c:86

4721 +#: builtin/clone.c:87

4722 msgid "path to git-upload-pack on the remote"

4723 msgstr "远程 git-upload-pack 路径"

4724

4652 -#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:654

4653 -#: builtin/pull.c:186

4725 +#: builtin/clone.c:88 builtin/fetch.c:117 builtin/grep.c:665

4726 +#: builtin/pull.c:193

4727 msgid "depth"

4728 msgstr "深度"

4729

4657 -#: builtin/clone.c:88

4730 +#: builtin/clone.c:89

4731 msgid "create a shallow clone of that depth"

4732 msgstr "创建一个指定深度的浅克隆"

4733

4661 -#: builtin/clone.c:90

4734 +#: builtin/clone.c:91

4735 msgid "clone only one branch, HEAD or --branch"

4736 msgstr "只克隆一个分支、HEAD 或 --branch"

4737

4665 -#: builtin/clone.c:91 builtin/init-db.c:475

4738 +#: builtin/clone.c:92 builtin/init-db.c:475

4739 msgid "gitdir"

4740 msgstr "git目录"

4741

4669 -#: builtin/clone.c:92 builtin/init-db.c:476

4742 +#: builtin/clone.c:93 builtin/init-db.c:476

4743 msgid "separate git dir from working tree"

4744 msgstr "git目录和工作区分离"

4745

4673 -#: builtin/clone.c:93

4746 +#: builtin/clone.c:94

4747 msgid "key=value"

4748 msgstr "key=value"

4749

4677 -#: builtin/clone.c:94

4750 +#: builtin/clone.c:95

4751 msgid "set config inside the new repository"

4752 msgstr "在新仓库中设置配置信息"

4753

4681 -#: builtin/clone.c:300

4754 +#: builtin/clone.c:96 builtin/fetch.c:131 builtin/push.c:536

4755 +msgid "use IPv4 addresses only"

4756 +msgstr "只使用 IPv4 地址"

4757 +

4758 +#: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538

4759 +msgid "use IPv6 addresses only"

4760 +msgstr "只使用 IPv6 地址"

4761 +

4762 +#: builtin/clone.c:305

4763 #, c-format

4764 msgid "reference repository '%s' as a linked checkout is not supported yet."

4765 msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"

4766

4686 -#: builtin/clone.c:302

4767 +#: builtin/clone.c:307

4768 #, c-format

4769 msgid "reference repository '%s' is not a local repository."

4770 msgstr "参考仓库 '%s' 不是一个本地仓库。"

4771

4691 -#: builtin/clone.c:307

4772 +#: builtin/clone.c:312

4773 #, c-format

4774 msgid "reference repository '%s' is shallow"

4775 msgstr "参考仓库 '%s' 是一个浅克隆"

4776

4696 -#: builtin/clone.c:310

4777 +#: builtin/clone.c:315

4778 #, c-format

4779 msgid "reference repository '%s' is grafted"

4780 msgstr "参考仓库 '%s' 已被嫁接"

4781

4701 -#: builtin/clone.c:375 builtin/diff.c:84

4782 +#: builtin/clone.c:380 builtin/diff.c:84

4783 #, c-format

4784 msgid "failed to stat '%s'"

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

4786

4706 -#: builtin/clone.c:377

4787 +#: builtin/clone.c:382

4788 #, c-format

4789 msgid "%s exists and is not a directory"

4790 msgstr "%s 存在且不是一个目录"

4791

4711 -#: builtin/clone.c:391

4792 +#: builtin/clone.c:396

4793 #, c-format

4794 msgid "failed to stat %s\n"

4795 msgstr "无法枚举 %s 状态\n"

4796

4716 -#: builtin/clone.c:413

4797 +#: builtin/clone.c:418

4798 #, c-format

4799 msgid "failed to create link '%s'"

4800 msgstr "无法创建链接 '%s'"

4801

4721 -#: builtin/clone.c:417

4802 +#: builtin/clone.c:422

4803 #, c-format

4804 msgid "failed to copy file to '%s'"

4805 msgstr "无法拷贝文件至 '%s'"

4806

4726 -#: builtin/clone.c:442 builtin/clone.c:626

4807 +#: builtin/clone.c:447 builtin/clone.c:631

4808 #, c-format

4809 msgid "done.\n"

4810 msgstr "完成。\n"

4811

4731 -#: builtin/clone.c:454

4812 +#: builtin/clone.c:459

4813 msgid ""

4814 "Clone succeeded, but checkout failed.\n"

4815 "You can inspect what was checked out with 'git status'\n"

@@ -4738,117 +4819,117 @@ msgstr ""

4819 "您可以通过 'git status' 检查哪些已被检出，然后使用命令\n"

4820 "'git checkout -f HEAD' 重试\n"

4821

4741 -#: builtin/clone.c:531

4822 +#: builtin/clone.c:536

4823 #, c-format

4824 msgid "Could not find remote branch %s to clone."

4825 msgstr "不能发现要克隆的远程分支 %s。"

4826

4746 -#: builtin/clone.c:621

4827 +#: builtin/clone.c:626

4828 #, c-format

4829 msgid "Checking connectivity... "

4830 msgstr "检查连接... "

4831

4751 -#: builtin/clone.c:624

4832 +#: builtin/clone.c:629

4833 msgid "remote did not send all necessary objects"

4834 msgstr "远程没有发送所有必须的对象"

4835

4755 -#: builtin/clone.c:688

4836 +#: builtin/clone.c:696

4837 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"

4838 msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n"

4839

4759 -#: builtin/clone.c:719

4840 +#: builtin/clone.c:727

4841 msgid "unable to checkout working tree"

4842 msgstr "不能检出工作区"

4843

4763 -#: builtin/clone.c:808

4844 +#: builtin/clone.c:816

4845 msgid "cannot repack to clean up"

4846 msgstr "无法执行 repack 来清理"

4847

4767 -#: builtin/clone.c:810

4848 +#: builtin/clone.c:818

4849 msgid "cannot unlink temporary alternates file"

4850 msgstr "无法删除临时的 alternates 文件"

4851

4771 -#: builtin/clone.c:842

4852 +#: builtin/clone.c:850

4853 msgid "Too many arguments."

4854 msgstr "太多参数。"

4855

4775 -#: builtin/clone.c:846

4856 +#: builtin/clone.c:854

4857 msgid "You must specify a repository to clone."

4858 msgstr "您必须指定一个仓库来克隆。"

4859

4779 -#: builtin/clone.c:857

4860 +#: builtin/clone.c:865

4861 #, c-format

4862 msgid "--bare and --origin %s options are incompatible."

4863 msgstr "--bare 和 --origin %s 选项不兼容。"

4864

4784 -#: builtin/clone.c:860

4865 +#: builtin/clone.c:868

4866 msgid "--bare and --separate-git-dir are incompatible."

4867 msgstr "--bare 和 --separate-git-dir 选项不兼容。"

4868

4788 -#: builtin/clone.c:873

4869 +#: builtin/clone.c:881

4870 #, c-format

4871 msgid "repository '%s' does not exist"

4872 msgstr "仓库 '%s' 不存在"

4873

4793 -#: builtin/clone.c:879 builtin/fetch.c:1166

4874 +#: builtin/clone.c:887 builtin/fetch.c:1174

4875 #, c-format

4876 msgid "depth %s is not a positive number"

4877 msgstr "深度 %s 不是一个正数"

4878

4798 -#: builtin/clone.c:889

4879 +#: builtin/clone.c:897

4880 #, c-format

4881 msgid "destination path '%s' already exists and is not an empty directory."

4882 msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。"

4883

4803 -#: builtin/clone.c:899

4884 +#: builtin/clone.c:907

4885 #, c-format

4886 msgid "working tree '%s' already exists."

4887 msgstr "工作区 '%s' 已经存在。"

4888

4808 -#: builtin/clone.c:914 builtin/clone.c:925 builtin/submodule--helper.c:224

4809 -#: builtin/worktree.c:221 builtin/worktree.c:248

4889 +#: builtin/clone.c:922 builtin/clone.c:933 builtin/submodule--helper.c:218

4890 +#: builtin/worktree.c:219 builtin/worktree.c:246

4891 #, c-format

4892 msgid "could not create leading directories of '%s'"

4893 msgstr "不能为 '%s' 创建先导目录"

4894

4814 -#: builtin/clone.c:917

4895 +#: builtin/clone.c:925

4896 #, c-format

4897 msgid "could not create work tree dir '%s'"

4898 msgstr "不能创建工作区目录 '%s'"

4899

4819 -#: builtin/clone.c:935

4900 +#: builtin/clone.c:943

4901 #, c-format

4902 msgid "Cloning into bare repository '%s'...\n"

4903 msgstr "克隆到纯仓库 '%s'...\n"

4904

4824 -#: builtin/clone.c:937

4905 +#: builtin/clone.c:945

4906 #, c-format

4907 msgid "Cloning into '%s'...\n"

4908 msgstr "正克隆到 '%s'...\n"

4909

4829 -#: builtin/clone.c:975

4910 +#: builtin/clone.c:984

4911 msgid "--depth is ignored in local clones; use file:// instead."

4912 msgstr "--depth 在本地克隆被忽略，改为 file:// 协议试试。"

4913

4833 -#: builtin/clone.c:978

4914 +#: builtin/clone.c:987

4915 msgid "source repository is shallow, ignoring --local"

4916 msgstr "源仓库是浅克隆，忽略 --local"

4917

4837 -#: builtin/clone.c:983

4918 +#: builtin/clone.c:992

4919 msgid "--local is ignored"

4920 msgstr "--local 被忽略"

4921

4841 -#: builtin/clone.c:987

4922 +#: builtin/clone.c:996

4923 #, c-format

4924 msgid "Don't know how to clone %s"

4925 msgstr "不知道如何克隆 %s"

4926

4846 -#: builtin/clone.c:1036 builtin/clone.c:1044

4927 +#: builtin/clone.c:1045 builtin/clone.c:1053

4928 #, c-format

4929 msgid "Remote branch %s not found in upstream %s"

4930 msgstr "远程分支 %s 在上游 %s 未发现"

4931

4851 -#: builtin/clone.c:1047

4932 +#: builtin/clone.c:1056

4933 msgid "You appear to have cloned an empty repository."

4934 msgstr "您似乎克隆了一个空仓库。"

4935

@@ -5052,7 +5133,7 @@ msgstr "无法选择一个未被当前提交说明使用的注释字符"

5133 msgid "could not lookup commit %s"

5134 msgstr "不能查询提交 %s"

5135

5055 -#: builtin/commit.c:702 builtin/shortlog.c:273

5136 +#: builtin/commit.c:702 builtin/shortlog.c:285

5137 #, c-format

5138 msgid "(reading log message from standard input)\n"

5139 msgstr "（正从标准输入中读取日志信息）\n"

@@ -5235,8 +5316,8 @@ msgstr "以简洁的格式显示状态"

5316 msgid "show branch information"

5317 msgstr "显示分支信息"

5318

5238 -#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:544

5239 -#: builtin/worktree.c:423

5319 +#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512

5320 +#: builtin/worktree.c:430

5321 msgid "machine-readable output"

5322 msgstr "机器可读的输出"

5323

@@ -5325,8 +5406,8 @@ msgstr "日期"

5406 msgid "override date for commit"

5407 msgstr "提交时覆盖日期"

5408

5328 -#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:392

5329 -#: builtin/notes.c:555 builtin/tag.c:349

5409 +#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395

5410 +#: builtin/notes.c:558 builtin/tag.c:349

5411 msgid "message"

5412 msgstr "说明"

5413

@@ -5359,7 +5440,7 @@ msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"

5440 msgid "the commit is authored by me now (used with -C/-c/--amend)"

5441 msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）"

5442

5362 -#: builtin/commit.c:1588 builtin/log.c:1216 builtin/revert.c:86

5443 +#: builtin/commit.c:1588 builtin/log.c:1219 builtin/revert.c:86

5444 msgid "add Signed-off-by:"

5445 msgstr "添加 Signed-off-by: 签名"

5446

@@ -5384,7 +5465,7 @@ msgstr "设置如何删除提交说明里的空格和#注释"

5465 msgid "include status in commit message template"

5466 msgstr "在提交说明模板里包含状态信息"

5467

5387 -#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:156

5468 +#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:160

5469 #: builtin/revert.c:93

5470 msgid "GPG sign commit"

5471 msgstr "GPG 提交签名"

@@ -5474,139 +5555,143 @@ msgstr ""

5555 "仓库已更新，但无法写 new_index 文件。检查是否磁盘已满\n"

5556 "或磁盘配额已耗尽，然后执行 \"git reset HEAD\" 恢复。"

5557

5477 -#: builtin/config.c:8

5558 +#: builtin/config.c:9

5559 msgid "git config [<options>]"

5560 msgstr "git config [<选项>]"

5561

5481 -#: builtin/config.c:54

5562 +#: builtin/config.c:56

5563 msgid "Config file location"

5564 msgstr "配置文件位置"

5565

5485 -#: builtin/config.c:55

5566 +#: builtin/config.c:57

5567 msgid "use global config file"

5568 msgstr "使用全局配置文件"

5569

5489 -#: builtin/config.c:56

5570 +#: builtin/config.c:58

5571 msgid "use system config file"

5572 msgstr "使用系统级配置文件"

5573

5493 -#: builtin/config.c:57

5574 +#: builtin/config.c:59

5575 msgid "use repository config file"

5576 msgstr "使用仓库级配置文件"

5577

5497 -#: builtin/config.c:58

5578 +#: builtin/config.c:60

5579 msgid "use given config file"

5580 msgstr "使用指定的配置文件"

5581

5501 -#: builtin/config.c:59

5582 +#: builtin/config.c:61

5583 msgid "blob-id"

5584 msgstr "数据对象 ID"

5585

5505 -#: builtin/config.c:59

5586 +#: builtin/config.c:61

5587 msgid "read config from given blob object"

5588 msgstr "从给定的数据对象读取配置"

5589

5509 -#: builtin/config.c:60

5590 +#: builtin/config.c:62

5591 msgid "Action"

5592 msgstr "操作"

5593

5513 -#: builtin/config.c:61

5594 +#: builtin/config.c:63

5595 msgid "get value: name [value-regex]"

5596 msgstr "获取值：name [value-regex]"

5597

5517 -#: builtin/config.c:62

5598 +#: builtin/config.c:64

5599 msgid "get all values: key [value-regex]"

5600 msgstr "获得所有的值：key [value-regex]"

5601

5521 -#: builtin/config.c:63

5602 +#: builtin/config.c:65

5603 msgid "get values for regexp: name-regex [value-regex]"

5604 msgstr "根据正则表达式获得值：name-regex [value-regex]"

5605

5525 -#: builtin/config.c:64

5606 +#: builtin/config.c:66

5607 msgid "get value specific for the URL: section[.var] URL"

5608 msgstr "获得 URL 取值：section[.var] URL"

5609

5529 -#: builtin/config.c:65

5610 +#: builtin/config.c:67

5611 msgid "replace all matching variables: name value [value_regex]"

5612 msgstr "替换所有匹配的变量：name value [value_regex]"

5613

5533 -#: builtin/config.c:66

5614 +#: builtin/config.c:68

5615 msgid "add a new variable: name value"

5616 msgstr "添加一个新的变量：name value"

5617

5537 -#: builtin/config.c:67

5618 +#: builtin/config.c:69

5619 msgid "remove a variable: name [value-regex]"

5620 msgstr "删除一个变量：name [value-regex]"

5621

5541 -#: builtin/config.c:68

5622 +#: builtin/config.c:70

5623 msgid "remove all matches: name [value-regex]"

5624 msgstr "删除所有匹配项：name [value-regex]"

5625

5545 -#: builtin/config.c:69

5626 +#: builtin/config.c:71

5627 msgid "rename section: old-name new-name"

5628 msgstr "重命名小节：old-name new-name"

5629

5549 -#: builtin/config.c:70

5630 +#: builtin/config.c:72

5631 msgid "remove a section: name"

5632 msgstr "删除一个小节：name"

5633

5553 -#: builtin/config.c:71

5634 +#: builtin/config.c:73

5635 msgid "list all"

5636 msgstr "列出所有"

5637

5557 -#: builtin/config.c:72

5638 +#: builtin/config.c:74

5639 msgid "open an editor"

5640 msgstr "打开一个编辑器"

5641

5561 -#: builtin/config.c:73

5642 +#: builtin/config.c:75

5643 msgid "find the color configured: slot [default]"

5644 msgstr "获得配置的颜色：配置 [默认]"

5645

5565 -#: builtin/config.c:74

5646 +#: builtin/config.c:76

5647 msgid "find the color setting: slot [stdout-is-tty]"

5648 msgstr "获得颜色设置：配置 [stdout-is-tty]"

5649

5569 -#: builtin/config.c:75

5650 +#: builtin/config.c:77

5651 msgid "Type"

5652 msgstr "类型"

5653

5573 -#: builtin/config.c:76

5654 +#: builtin/config.c:78

5655 msgid "value is \"true\" or \"false\""

5656 msgstr "值是 \"true\" 或 \"false\""

5657

5577 -#: builtin/config.c:77

5658 +#: builtin/config.c:79

5659 msgid "value is decimal number"

5660 msgstr "值是十进制数"

5661

5581 -#: builtin/config.c:78

5662 +#: builtin/config.c:80

5663 msgid "value is --bool or --int"

5664 msgstr "值是 --bool or --int"

5665

5585 -#: builtin/config.c:79

5666 +#: builtin/config.c:81

5667 msgid "value is a path (file or directory name)"

5668 msgstr "值是一个路径（文件或目录名）"

5669

5589 -#: builtin/config.c:80

5670 +#: builtin/config.c:82

5671 msgid "Other"

5672 msgstr "其它"

5673

5593 -#: builtin/config.c:81

5674 +#: builtin/config.c:83

5675 msgid "terminate values with NUL byte"

5676 msgstr "终止值是 NUL 字节"

5677

5597 -#: builtin/config.c:82

5678 +#: builtin/config.c:84

5679 msgid "show variable names only"

5680 msgstr "只显示变量名"

5681

5601 -#: builtin/config.c:83

5682 +#: builtin/config.c:85

5683 msgid "respect include directives on lookup"

5684 msgstr "查询时参照 include 指令递归查找"

5685

5605 -#: builtin/config.c:303

5686 +#: builtin/config.c:86

5687 +msgid "show origin of config (file, standard input, blob, command line)"

5688 +msgstr "显示配置的来源（文件、标准输入、数据对象，或命令行）"

5689 +

5690 +#: builtin/config.c:328

5691 msgid "unable to parse default color value"

5692 msgstr "不能解析默认颜色值"

5693

5609 -#: builtin/config.c:441

5694 +#: builtin/config.c:469

5695 #, c-format

5696 msgid ""

5697 "# This is Git's per-user configuration file.\n"

@@ -5621,7 +5706,7 @@ msgstr ""

5706 "#\tname = %s\n"

5707 "#\temail = %s\n"

5708

5624 -#: builtin/config.c:575

5709 +#: builtin/config.c:611

5710 #, c-format

5711 msgid "cannot create configuration file %s"

5712 msgstr "不能创建配置文件 %s"

@@ -5871,163 +5956,167 @@ msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"

5956 msgid "git fetch --all [<options>]"

5957 msgstr "git fetch --all [<选项>]"

5958

5874 -#: builtin/fetch.c:90 builtin/pull.c:162

5959 +#: builtin/fetch.c:92 builtin/pull.c:166

5960 msgid "fetch from all remotes"

5961 msgstr "从所有的远程抓取"

5962

5878 -#: builtin/fetch.c:92 builtin/pull.c:165

5963 +#: builtin/fetch.c:94 builtin/pull.c:169

5964 msgid "append to .git/FETCH_HEAD instead of overwriting"

5965 msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"

5966

5882 -#: builtin/fetch.c:94 builtin/pull.c:168

5967 +#: builtin/fetch.c:96 builtin/pull.c:172

5968 msgid "path to upload pack on remote end"

5969 msgstr "上传包到远程的路径"

5970

5886 -#: builtin/fetch.c:95 builtin/pull.c:170

5971 +#: builtin/fetch.c:97 builtin/pull.c:174

5972 msgid "force overwrite of local branch"

5973 msgstr "强制覆盖本地分支"

5974

5890 -#: builtin/fetch.c:97

5975 +#: builtin/fetch.c:99

5976 msgid "fetch from multiple remotes"

5977 msgstr "从多个远程抓取"

5978

5894 -#: builtin/fetch.c:99 builtin/pull.c:172

5979 +#: builtin/fetch.c:101 builtin/pull.c:176

5980 msgid "fetch all tags and associated objects"

5981 msgstr "抓取所有的标签和关联对象"

5982

5898 -#: builtin/fetch.c:101

5983 +#: builtin/fetch.c:103

5984 msgid "do not fetch all tags (--no-tags)"

5985 msgstr "不抓取任何标签(--no-tags)"

5986

5902 -#: builtin/fetch.c:103 builtin/pull.c:175

5987 +#: builtin/fetch.c:105

5988 +msgid "number of submodules fetched in parallel"

5989 +msgstr "子模组获取的并发数"

5990 +

5991 +#: builtin/fetch.c:107 builtin/pull.c:179

5992 msgid "prune remote-tracking branches no longer on remote"

5993 msgstr "清除远程已经不存在的分支的跟踪分支"

5994

5995 # 译者：可选值，不能翻译

5907 -#: builtin/fetch.c:104 builtin/pull.c:178

5996 +#: builtin/fetch.c:108 builtin/pull.c:182

5997 msgid "on-demand"

5998 msgstr "on-demand"

5999

5911 -#: builtin/fetch.c:105 builtin/pull.c:179

6000 +#: builtin/fetch.c:109 builtin/pull.c:183

6001 msgid "control recursive fetching of submodules"

6002 msgstr "控制子模组的递归抓取"

6003

5915 -#: builtin/fetch.c:109 builtin/pull.c:184

6004 +#: builtin/fetch.c:113 builtin/pull.c:191

6005 msgid "keep downloaded pack"

6006 msgstr "保持下载包"

6007

5919 -#: builtin/fetch.c:111

6008 +#: builtin/fetch.c:115

6009 msgid "allow updating of HEAD ref"

6010 msgstr "允许更新 HEAD 引用"

6011

5923 -#: builtin/fetch.c:114 builtin/pull.c:187

6012 +#: builtin/fetch.c:118 builtin/pull.c:194

6013 msgid "deepen history of shallow clone"

6014 msgstr "深化浅克隆的历史"

6015

5927 -#: builtin/fetch.c:116 builtin/pull.c:190

6016 +#: builtin/fetch.c:120 builtin/pull.c:197

6017 msgid "convert to a complete repository"

6018 msgstr "转换为一个完整的仓库"

6019

5931 -#: builtin/fetch.c:118 builtin/log.c:1233

6020 +#: builtin/fetch.c:122 builtin/log.c:1236

6021 msgid "dir"

6022 msgstr "目录"

6023

5935 -#: builtin/fetch.c:119

6024 +#: builtin/fetch.c:123

6025 msgid "prepend this to submodule path output"

6026 msgstr "在子模组路径输出的前面加上此目录"

6027

5939 -#: builtin/fetch.c:122

6028 +#: builtin/fetch.c:126

6029 msgid "default mode for recursion"

6030 msgstr "递归的默认模式"

6031

5943 -#: builtin/fetch.c:124 builtin/pull.c:193

6032 +#: builtin/fetch.c:128 builtin/pull.c:200

6033 msgid "accept refs that update .git/shallow"

6034 msgstr "接受更新 .git/shallow 的引用"

6035

5947 -#: builtin/fetch.c:125 builtin/pull.c:195

6036 +#: builtin/fetch.c:129 builtin/pull.c:202

6037 msgid "refmap"

6038 msgstr "引用映射"

6039

5951 -#: builtin/fetch.c:126 builtin/pull.c:196

6040 +#: builtin/fetch.c:130 builtin/pull.c:203

6041 msgid "specify fetch refmap"

6042 msgstr "指定获取操作的引用映射"

6043

5955 -#: builtin/fetch.c:378

6044 +#: builtin/fetch.c:386

6045 msgid "Couldn't find remote ref HEAD"

6046 msgstr "无法发现远程 HEAD 引用"

6047

5959 -#: builtin/fetch.c:458

6048 +#: builtin/fetch.c:466

6049 #, c-format

6050 msgid "object %s not found"

6051 msgstr "对象 %s 未发现"

6052

5964 -#: builtin/fetch.c:463

6053 +#: builtin/fetch.c:471

6054 msgid "[up to date]"

6055 msgstr "[最新]"

6056

5968 -#: builtin/fetch.c:477

6057 +#: builtin/fetch.c:485

6058 #, c-format

6059 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"

6060 msgstr "! %-*s %-*s -> %s （在当前分支下不能获取）"

6061

5973 -#: builtin/fetch.c:478 builtin/fetch.c:566

6062 +#: builtin/fetch.c:486 builtin/fetch.c:574

6063 msgid "[rejected]"

6064 msgstr "[已拒绝]"

6065

5977 -#: builtin/fetch.c:489

6066 +#: builtin/fetch.c:497

6067 msgid "[tag update]"

6068 msgstr "[标签更新]"

6069

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

5982 -#: builtin/fetch.c:491 builtin/fetch.c:526 builtin/fetch.c:544

6071 +#: builtin/fetch.c:499 builtin/fetch.c:534 builtin/fetch.c:552

6072 msgid " (unable to update local ref)"

6073 msgstr " （不能更新本地引用）"

6074

5986 -#: builtin/fetch.c:509

6075 +#: builtin/fetch.c:517

6076 msgid "[new tag]"

6077 msgstr "[新标签]"

6078

5990 -#: builtin/fetch.c:512

6079 +#: builtin/fetch.c:520

6080 msgid "[new branch]"

6081 msgstr "[新分支]"

6082

5994 -#: builtin/fetch.c:515

6083 +#: builtin/fetch.c:523

6084 msgid "[new ref]"

6085 msgstr "[新引用]"

6086

5998 -#: builtin/fetch.c:561

6087 +#: builtin/fetch.c:569

6088 msgid "unable to update local ref"

6089 msgstr "不能更新本地引用"

6090

6002 -#: builtin/fetch.c:561

6091 +#: builtin/fetch.c:569

6092 msgid "forced update"

6093 msgstr "强制更新"

6094

6006 -#: builtin/fetch.c:568

6095 +#: builtin/fetch.c:576

6096 msgid "(non-fast-forward)"

6097 msgstr "（非快进式）"

6098

6010 -#: builtin/fetch.c:602 builtin/fetch.c:843

6099 +#: builtin/fetch.c:610 builtin/fetch.c:851

6100 #, c-format

6101 msgid "cannot open %s: %s\n"

6102 msgstr "无法打开 %s：%s\n"

6103

6015 -#: builtin/fetch.c:611

6104 +#: builtin/fetch.c:619

6105 #, c-format

6106 msgid "%s did not send all necessary objects\n"

6107 msgstr "%s 未发送所有必须的对象\n"

6108

6020 -#: builtin/fetch.c:629

6109 +#: builtin/fetch.c:637

6110 #, c-format

6111 msgid "reject %s because shallow roots are not allowed to be updated"

6112 msgstr "拒绝 %s 因为浅克隆不允许被更新"

6113

6025 -#: builtin/fetch.c:716 builtin/fetch.c:808

6114 +#: builtin/fetch.c:724 builtin/fetch.c:816

6115 #, c-format

6116 msgid "From %.*s\n"

6117 msgstr "来自 %.*s\n"

6118

6030 -#: builtin/fetch.c:727

6119 +#: builtin/fetch.c:735

6120 #, c-format

6121 msgid ""

6122 "some local refs could not be updated; try running\n"

@@ -6037,87 +6126,87 @@ msgstr ""

6126 " 'git remote prune %s' 来删除旧的、有冲突的分支"

6127

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

6040 -#: builtin/fetch.c:779

6129 +#: builtin/fetch.c:787

6130 #, c-format

6131 msgid " (%s will become dangling)"

6132 msgstr " （%s 将成为摇摆状态）"

6133

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

6046 -#: builtin/fetch.c:780

6135 +#: builtin/fetch.c:788

6136 #, c-format

6137 msgid " (%s has become dangling)"

6138 msgstr " （%s 已成为摇摆状态）"

6139

6051 -#: builtin/fetch.c:812

6140 +#: builtin/fetch.c:820

6141 msgid "[deleted]"

6142 msgstr "[已删除]"

6143

6055 -#: builtin/fetch.c:813 builtin/remote.c:1040

6144 +#: builtin/fetch.c:821 builtin/remote.c:1025

6145 msgid "(none)"

6146 msgstr "（无）"

6147

6059 -#: builtin/fetch.c:833

6148 +#: builtin/fetch.c:841

6149 #, c-format

6150 msgid "Refusing to fetch into current branch %s of non-bare repository"

6151 msgstr "拒绝获取到非纯仓库的当前分支 %s"

6152

6064 -#: builtin/fetch.c:852

6153 +#: builtin/fetch.c:860

6154 #, c-format

6155 msgid "Option \"%s\" value \"%s\" is not valid for %s"

6156 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"

6157

6069 -#: builtin/fetch.c:855

6158 +#: builtin/fetch.c:863

6159 #, c-format

6160 msgid "Option \"%s\" is ignored for %s\n"

6161 msgstr "选项 \"%s\" 为 %s 所忽略\n"

6162

6074 -#: builtin/fetch.c:911

6163 +#: builtin/fetch.c:920

6164 #, c-format

6165 msgid "Don't know how to fetch from %s"

6166 msgstr "不知道如何从 %s 获取"

6167

6079 -#: builtin/fetch.c:1072

6168 +#: builtin/fetch.c:1080

6169 #, c-format

6170 msgid "Fetching %s\n"

6171 msgstr "正在获取 %s\n"

6172

6084 -#: builtin/fetch.c:1074 builtin/remote.c:96

6173 +#: builtin/fetch.c:1082 builtin/remote.c:96

6174 #, c-format

6175 msgid "Could not fetch %s"

6176 msgstr "不能获取 %s"

6177

6089 -#: builtin/fetch.c:1092

6178 +#: builtin/fetch.c:1100

6179 msgid ""

6180 "No remote repository specified. Please, specify either a URL or a\n"

6181 "remote name from which new revisions should be fetched."

6182 msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定，用以获取新提交。"

6183

6095 -#: builtin/fetch.c:1115

6184 +#: builtin/fetch.c:1123

6185 msgid "You need to specify a tag name."

6186 msgstr "您需要指定一个标签名称。"

6187

6099 -#: builtin/fetch.c:1157

6188 +#: builtin/fetch.c:1165

6189 msgid "--depth and --unshallow cannot be used together"

6190 msgstr "--depth 和 --unshallow 不能同时使用"

6191

6103 -#: builtin/fetch.c:1159

6192 +#: builtin/fetch.c:1167

6193 msgid "--unshallow on a complete repository does not make sense"

6194 msgstr "对于一个完整的仓库，参数 --unshallow 没有意义"

6195

6107 -#: builtin/fetch.c:1179

6196 +#: builtin/fetch.c:1187

6197 msgid "fetch --all does not take a repository argument"

6198 msgstr "fetch --all 不能带一个仓库参数"

6199

6111 -#: builtin/fetch.c:1181

6200 +#: builtin/fetch.c:1189

6201 msgid "fetch --all does not make sense with refspecs"

6202 msgstr "fetch --all 带引用规格没有任何意义"

6203

6115 -#: builtin/fetch.c:1192

6204 +#: builtin/fetch.c:1200

6205 #, c-format

6206 msgid "No such remote or remote group: %s"

6207 msgstr "没有这样的远程或远程组：%s"

6208

6120 -#: builtin/fetch.c:1200

6209 +#: builtin/fetch.c:1208

6210 msgid "Fetching a group and specifying refspecs does not make sense"

6211 msgstr "获取组并指定引用规格没有意义"

6212

@@ -6337,225 +6426,239 @@ msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。"

6426 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"

6427 msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"

6428

6340 -#: builtin/grep.c:218

6429 +#: builtin/grep.c:219

6430 #, c-format

6431 msgid "grep: failed to create thread: %s"

6432 msgstr "grep：无法创建线程：%s"

6433

6345 -#: builtin/grep.c:441 builtin/grep.c:476

6434 +#: builtin/grep.c:277

6435 +#, c-format

6436 +msgid "invalid number of threads specified (%d) for %s"

6437 +msgstr "为 %2$s 设定的线程数 (%1$d) 无效"

6438 +

6439 +#: builtin/grep.c:452 builtin/grep.c:487

6440 #, c-format

6441 msgid "unable to read tree (%s)"

6442 msgstr "无法读取树（%s）"

6443

6350 -#: builtin/grep.c:491

6444 +#: builtin/grep.c:502

6445 #, c-format

6446 msgid "unable to grep from object of type %s"

6447 msgstr "无法抓取来自于 %s 类型的对象"

6448

6355 -#: builtin/grep.c:547

6449 +#: builtin/grep.c:558

6450 #, c-format

6451 msgid "switch `%c' expects a numerical value"

6452 msgstr "开关 `%c' 期望一个数字值"

6453

6360 -#: builtin/grep.c:564

6454 +#: builtin/grep.c:575

6455 #, c-format

6456 msgid "cannot open '%s'"

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

6458

6365 -#: builtin/grep.c:633

6459 +#: builtin/grep.c:644

6460 msgid "search in index instead of in the work tree"

6461 msgstr "在索引区搜索而不是在工作区"

6462

6369 -#: builtin/grep.c:635

6463 +#: builtin/grep.c:646

6464 msgid "find in contents not managed by git"

6465 msgstr "在未被 git 管理的内容中查找"

6466

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

6374 -#: builtin/grep.c:637

6468 +#: builtin/grep.c:648

6469 msgid "search in both tracked and untracked files"

6470 msgstr "在跟踪和未跟踪的文件中搜索"

6471

6378 -#: builtin/grep.c:639

6472 +#: builtin/grep.c:650

6473 msgid "ignore files specified via '.gitignore'"

6474 msgstr "忽略 '.gitignore' 包含的文件"

6475

6382 -#: builtin/grep.c:642

6476 +#: builtin/grep.c:653

6477 msgid "show non-matching lines"

6478 msgstr "显示未匹配的行"

6479

6386 -#: builtin/grep.c:644

6480 +#: builtin/grep.c:655

6481 msgid "case insensitive matching"

6482 msgstr "不区分大小写匹配"

6483

6390 -#: builtin/grep.c:646

6484 +#: builtin/grep.c:657

6485 msgid "match patterns only at word boundaries"

6486 msgstr "只在单词边界匹配模式"

6487

6394 -#: builtin/grep.c:648

6488 +#: builtin/grep.c:659

6489 msgid "process binary files as text"

6490 msgstr "把二进制文件当做文本处理"

6491

6398 -#: builtin/grep.c:650

6492 +#: builtin/grep.c:661

6493 msgid "don't match patterns in binary files"

6494 msgstr "不在二进制文件中匹配模式"

6495

6402 -#: builtin/grep.c:653

6496 +#: builtin/grep.c:664

6497 msgid "process binary files with textconv filters"

6498 msgstr "用 textconv 过滤器处理二进制文件"

6499

6406 -#: builtin/grep.c:655

6500 +#: builtin/grep.c:666

6501 msgid "descend at most <depth> levels"

6502 msgstr "最多以指定的深度向下寻找"

6503

6410 -#: builtin/grep.c:659

6504 +#: builtin/grep.c:670

6505 msgid "use extended POSIX regular expressions"

6506 msgstr "使用扩展的 POSIX 正则表达式"

6507

6414 -#: builtin/grep.c:662

6508 +#: builtin/grep.c:673

6509 msgid "use basic POSIX regular expressions (default)"

6510 msgstr "使用基本的 POSIX 正则表达式（默认）"

6511

6418 -#: builtin/grep.c:665

6512 +#: builtin/grep.c:676

6513 msgid "interpret patterns as fixed strings"

6514 msgstr "把模式解析为固定的字符串"

6515

6422 -#: builtin/grep.c:668

6516 +#: builtin/grep.c:679

6517 msgid "use Perl-compatible regular expressions"

6518 msgstr "使用 Perl 兼容的正则表达式"

6519

6426 -#: builtin/grep.c:671

6520 +#: builtin/grep.c:682

6521 msgid "show line numbers"

6522 msgstr "显示行号"

6523

6430 -#: builtin/grep.c:672

6524 +#: builtin/grep.c:683

6525 msgid "don't show filenames"

6526 msgstr "不显示文件名"

6527

6434 -#: builtin/grep.c:673

6528 +#: builtin/grep.c:684

6529 msgid "show filenames"

6530 msgstr "显示文件名"

6531

6438 -#: builtin/grep.c:675

6532 +#: builtin/grep.c:686

6533 msgid "show filenames relative to top directory"

6534 msgstr "显示相对于顶级目录的文件名"

6535

6442 -#: builtin/grep.c:677

6536 +#: builtin/grep.c:688

6537 msgid "show only filenames instead of matching lines"

6538 msgstr "只显示文件名而不显示匹配的行"

6539

6446 -#: builtin/grep.c:679

6540 +#: builtin/grep.c:690

6541 msgid "synonym for --files-with-matches"

6542 msgstr "和 --files-with-matches 同义"

6543

6450 -#: builtin/grep.c:682

6544 +#: builtin/grep.c:693

6545 msgid "show only the names of files without match"

6546 msgstr "只显示未匹配的文件名"

6547

6454 -#: builtin/grep.c:684

6548 +#: builtin/grep.c:695

6549 msgid "print NUL after filenames"

6550 msgstr "在文件名后输出 NUL 字符"

6551

6458 -#: builtin/grep.c:686

6552 +#: builtin/grep.c:697

6553 msgid "show the number of matches instead of matching lines"

6554 msgstr "显示总匹配行数，而不显示匹配的行"

6555

6462 -#: builtin/grep.c:687

6556 +#: builtin/grep.c:698

6557 msgid "highlight matches"

6558 msgstr "高亮显示匹配项"

6559

6466 -#: builtin/grep.c:689

6560 +#: builtin/grep.c:700

6561 msgid "print empty line between matches from different files"

6562 msgstr "在不同文件的匹配项之间打印空行"

6563

6470 -#: builtin/grep.c:691

6564 +#: builtin/grep.c:702

6565 msgid "show filename only once above matches from same file"

6566 msgstr "只在同一文件的匹配项的上面显示一次文件名"

6567

6474 -#: builtin/grep.c:694

6568 +#: builtin/grep.c:705

6569 msgid "show <n> context lines before and after matches"

6570 msgstr "显示匹配项前后的 <n> 行上下文"

6571

6478 -#: builtin/grep.c:697

6572 +#: builtin/grep.c:708

6573 msgid "show <n> context lines before matches"

6574 msgstr "显示匹配项前 <n> 行上下文"

6575

6482 -#: builtin/grep.c:699

6576 +#: builtin/grep.c:710

6577 msgid "show <n> context lines after matches"

6578 msgstr "显示匹配项后 <n> 行上下文"

6579

6486 -#: builtin/grep.c:700

6580 +#: builtin/grep.c:712

6581 +msgid "use <n> worker threads"

6582 +msgstr "使用 <n> 个工作线程"

6583 +

6584 +#: builtin/grep.c:713

6585 msgid "shortcut for -C NUM"

6586 msgstr "快捷键 -C 数字"

6587

6490 -#: builtin/grep.c:703

6588 +#: builtin/grep.c:716

6589 msgid "show a line with the function name before matches"

6590 msgstr "在匹配的前面显示一行函数名"

6591

6494 -#: builtin/grep.c:705

6592 +#: builtin/grep.c:718

6593 msgid "show the surrounding function"

6594 msgstr "显示所在函数的前后内容"

6595

6498 -#: builtin/grep.c:708

6596 +#: builtin/grep.c:721

6597 msgid "read patterns from file"

6598 msgstr "从文件读取模式"

6599

6502 -#: builtin/grep.c:710

6600 +#: builtin/grep.c:723

6601 msgid "match <pattern>"

6602 msgstr "匹配 <模式>"

6603

6506 -#: builtin/grep.c:712

6604 +#: builtin/grep.c:725

6605 msgid "combine patterns specified with -e"

6606 msgstr "组合用 -e 参数设定的模式"

6607

6510 -#: builtin/grep.c:724

6608 +#: builtin/grep.c:737

6609 msgid "indicate hit with exit status without output"

6610 msgstr "不输出，而用退出码标识命中状态"

6611

6514 -#: builtin/grep.c:726

6612 +#: builtin/grep.c:739

6613 msgid "show only matches from files that match all patterns"

6614 msgstr "只显示匹配所有模式的文件中的匹配"

6615

6518 -#: builtin/grep.c:728

6616 +#: builtin/grep.c:741

6617 msgid "show parse tree for grep expression"

6618 msgstr "显示 grep 表达式的解析树"

6619

6522 -#: builtin/grep.c:732

6620 +#: builtin/grep.c:745

6621 msgid "pager"

6622 msgstr "分页"

6623

6526 -#: builtin/grep.c:732

6624 +#: builtin/grep.c:745

6625 msgid "show matching files in the pager"

6626 msgstr "分页显示匹配的文件"

6627

6530 -#: builtin/grep.c:735

6628 +#: builtin/grep.c:748

6629 msgid "allow calling of grep(1) (ignored by this build)"

6630 msgstr "允许调用 grep(1)（本次构建忽略）"

6631

6534 -#: builtin/grep.c:793

6632 +#: builtin/grep.c:811

6633 msgid "no pattern given."

6634 msgstr "未提供模式匹配。"

6635

6538 -#: builtin/grep.c:851

6636 +#: builtin/grep.c:843 builtin/index-pack.c:1475

6637 +#, c-format

6638 +msgid "invalid number of threads specified (%d)"

6639 +msgstr "指定的线程数无效（%d）"

6640 +

6641 +#: builtin/grep.c:873

6642 msgid "--open-files-in-pager only works on the worktree"

6643 msgstr "--open-files-in-pager 仅用于工作区"

6644

6542 -#: builtin/grep.c:877

6645 +#: builtin/grep.c:899

6646 msgid "--cached or --untracked cannot be used with --no-index."

6647 msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"

6648

6546 -#: builtin/grep.c:882

6649 +#: builtin/grep.c:904

6650 msgid "--no-index or --untracked cannot be used with revs."

6651 msgstr "--no-index 或 --untracked 不能和版本同时使用。"

6652

6550 -#: builtin/grep.c:885

6653 +#: builtin/grep.c:907

6654 msgid "--[no-]exclude-standard cannot be used for tracked contents."

6655 msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"

6656

6554 -#: builtin/grep.c:893

6657 +#: builtin/grep.c:915

6658 msgid "both --cached and trees are given."

6659 msgstr "同时给出了 --cached 和树对象。"

6660

6558 -#: builtin/hash-object.c:80

6661 +#: builtin/hash-object.c:81

6662 msgid ""

6663 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "

6664 "[--] <file>..."

@@ -6563,36 +6666,36 @@ msgstr ""

6666 "git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "

6667 "[--] <文件>..."

6668

6566 -#: builtin/hash-object.c:81

6669 +#: builtin/hash-object.c:82

6670 msgid "git hash-object --stdin-paths"

6671 msgstr "git hash-object --stdin-paths"

6672

6570 -#: builtin/hash-object.c:92

6673 +#: builtin/hash-object.c:93

6674 msgid "type"

6675 msgstr "类型"

6676

6574 -#: builtin/hash-object.c:92

6677 +#: builtin/hash-object.c:93

6678 msgid "object type"

6679 msgstr "对象类型"

6680

6578 -#: builtin/hash-object.c:93

6681 +#: builtin/hash-object.c:94

6682 msgid "write the object into the object database"

6683 msgstr "将对象写入对象数据库"

6684

6582 -#: builtin/hash-object.c:95

6685 +#: builtin/hash-object.c:96

6686 msgid "read the object from stdin"

6687 msgstr "从标准输入读取对象"

6688

6586 -#: builtin/hash-object.c:97

6689 +#: builtin/hash-object.c:98

6690 msgid "store file as is without filters"

6691 msgstr "原样存储文件不使用过滤器"

6692

6590 -#: builtin/hash-object.c:98

6693 +#: builtin/hash-object.c:99

6694 msgid ""

6695 "just hash any random garbage to create corrupt objects for debugging Git"

6696 msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"

6697

6595 -#: builtin/hash-object.c:99

6698 +#: builtin/hash-object.c:100

6699 msgid "process file as it were from this path"

6700 msgstr "处理文件并假设其来自于此路径"

6701

@@ -6643,7 +6746,7 @@ msgstr "emacsclient 版本 '%d' 太老（< 22）。"

6746 msgid "failed to exec '%s': %s"

6747 msgstr "无法执行 '%s'：%s"

6748

6646 -#: builtin/help.c:208

6749 +#: builtin/help.c:205

6750 #, c-format

6751 msgid ""

6752 "'%s': path for unsupported man viewer.\n"

@@ -6652,7 +6755,7 @@ msgstr ""

6755 "'%s'：不支持的 man 手册查看器的路径。\n"

6756 "请使用 'man.<工具>.cmd'。"

6757

6655 -#: builtin/help.c:220

6758 +#: builtin/help.c:217

6759 #, c-format

6760 msgid ""

6761 "'%s': cmd for supported man viewer.\n"

@@ -6661,61 +6764,61 @@ msgstr ""

6764 "'%s': 支持的 man 手册查看器命令。\n"

6765 "请使用 'man.<工具>.path'。"

6766

6664 -#: builtin/help.c:337

6767 +#: builtin/help.c:334

6768 #, c-format

6769 msgid "'%s': unknown man viewer."

6770 msgstr "'%s'：未知的 man 查看器。"

6771

6669 -#: builtin/help.c:354

6772 +#: builtin/help.c:351

6773 msgid "no man viewer handled the request"

6774 msgstr "没有 man 查看器处理此请求"

6775

6673 -#: builtin/help.c:362

6776 +#: builtin/help.c:359

6777 msgid "no info viewer handled the request"

6778 msgstr "没有 info 查看器处理此请求"

6779

6677 -#: builtin/help.c:411

6780 +#: builtin/help.c:408

6781 msgid "Defining attributes per path"

6782 msgstr "定义路径的属性"

6783

6681 -#: builtin/help.c:412

6784 +#: builtin/help.c:409

6785 msgid "Everyday Git With 20 Commands Or So"

6786 msgstr "每一天 Git 常用的约 20 条命令"

6787

6685 -#: builtin/help.c:413

6788 +#: builtin/help.c:410

6789 msgid "A Git glossary"

6790 msgstr "Git 词汇表"

6791

6689 -#: builtin/help.c:414

6792 +#: builtin/help.c:411

6793 msgid "Specifies intentionally untracked files to ignore"

6794 msgstr "忽略指定的未跟踪文件"

6795

6693 -#: builtin/help.c:415

6796 +#: builtin/help.c:412

6797 msgid "Defining submodule properties"

6798 msgstr "定义子模组属性"

6799

6697 -#: builtin/help.c:416

6800 +#: builtin/help.c:413

6801 msgid "Specifying revisions and ranges for Git"

6802 msgstr "指定 Git 的版本和版本范围"

6803

6701 -#: builtin/help.c:417

6804 +#: builtin/help.c:414

6805 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"

6806 msgstr "一个 Git 教程（针对 1.5.1 或更新版本）"

6807

6705 -#: builtin/help.c:418

6808 +#: builtin/help.c:415

6809 msgid "An overview of recommended workflows with Git"

6810 msgstr "Git 推荐的工作流概览"

6811

6709 -#: builtin/help.c:430

6812 +#: builtin/help.c:427

6813 msgid "The common Git guides are:\n"

6814 msgstr "最常用的 Git 向导有：\n"

6815

6713 -#: builtin/help.c:451 builtin/help.c:468

6816 +#: builtin/help.c:448 builtin/help.c:465

6817 #, c-format

6818 msgid "usage: %s%s"

6819 msgstr "用法：%s%s"

6820

6718 -#: builtin/help.c:484

6821 +#: builtin/help.c:481

6822 #, c-format

6823 msgid "`git %s' is aliased to `%s'"

6824 msgstr "`git %s' 是 `%s' 的别名"

@@ -6951,11 +7054,6 @@ msgstr "无法存储索引文件"

7054 msgid "bad pack.indexversion=%<PRIu32>"

7055 msgstr "坏的 pack.indexversion=%<PRIu32>"

7056

6954 -#: builtin/index-pack.c:1475

6955 -#, c-format

6956 -msgid "invalid number of threads specified (%d)"

6957 -msgstr "指定的线程数无效（%d）"

6958 -

7057 #: builtin/index-pack.c:1479 builtin/index-pack.c:1663

7058 #, c-format

7059 msgid "no threads support, ignoring %s"

@@ -7129,24 +7227,30 @@ msgstr "不能访问工作区 '%s'"

7227

7228 #: builtin/interpret-trailers.c:15

7229 msgid ""

7132 -"git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] "

7133 -"[<file>...]"

7134 -msgstr ""

7135 -"git interpret-trailers [--trim-empty] [(--trailer <键>[(=|:)<值>])...] [<文件"

7136 -">...]"

7230 +"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "

7231 +"<token>[(=|:)<value>])...] [<file>...]"

7232 +msgstr "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值>])...] [<文件>...]"

7233 +

7234 +#: builtin/interpret-trailers.c:26

7235 +msgid "edit files in place"

7236 +msgstr "在原位编辑文件"

7237

7138 -#: builtin/interpret-trailers.c:25

7238 +#: builtin/interpret-trailers.c:27

7239 msgid "trim empty trailers"

7240 msgstr "删除空签名"

7241

7142 -#: builtin/interpret-trailers.c:26

7242 +#: builtin/interpret-trailers.c:28

7243 msgid "trailer"

7244 msgstr "签名"

7245

7146 -#: builtin/interpret-trailers.c:27

7246 +#: builtin/interpret-trailers.c:29

7247 msgid "trailer(s) to add"

7248 msgstr "要添加的签名"

7249

7250 +#: builtin/interpret-trailers.c:42

7251 +msgid "no input file given for in-place editing"

7252 +msgstr "没有给出要原位编辑的文件"

7253 +

7254 #: builtin/log.c:43

7255 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"

7256 msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"

@@ -7200,325 +7304,375 @@ msgstr "不能读取对象 %s"

7304 msgid "Unknown type: %d"

7305 msgstr "未知类型：%d"

7306

7203 -#: builtin/log.c:714

7307 +#: builtin/log.c:715

7308 msgid "format.headers without value"

7309 msgstr "format.headers 没有值"

7310

7207 -#: builtin/log.c:798

7311 +#: builtin/log.c:801

7312 msgid "name of output directory is too long"

7313 msgstr "输出目录名太长"

7314

7211 -#: builtin/log.c:813

7315 +#: builtin/log.c:816

7316 #, c-format

7317 msgid "Cannot open patch file %s"

7318 msgstr "无法打开补丁文件 %s"

7319

7216 -#: builtin/log.c:827

7320 +#: builtin/log.c:830

7321 msgid "Need exactly one range."

7322 msgstr "只需要一个范围。"

7323

7220 -#: builtin/log.c:837

7324 +#: builtin/log.c:840

7325 msgid "Not a range."

7326 msgstr "不是一个范围。"

7327

7224 -#: builtin/log.c:943

7328 +#: builtin/log.c:946

7329 msgid "Cover letter needs email format"

7330 msgstr "信封需要邮件地址格式"

7331

7228 -#: builtin/log.c:1022

7332 +#: builtin/log.c:1025

7333 #, c-format

7334 msgid "insane in-reply-to: %s"

7335 msgstr "不正常的 in-reply-to：%s"

7336

7233 -#: builtin/log.c:1050

7337 +#: builtin/log.c:1053

7338 msgid "git format-patch [<options>] [<since> | <revision-range>]"

7339 msgstr "git format-patch [<选项>] [<从> | <版本范围>]"

7340

7237 -#: builtin/log.c:1095

7341 +#: builtin/log.c:1098

7342 msgid "Two output directories?"

7343 msgstr "两个输出目录？"

7344

7241 -#: builtin/log.c:1211

7345 +#: builtin/log.c:1214

7346 msgid "use [PATCH n/m] even with a single patch"

7347 msgstr "使用 [PATCH n/m]，即使只有一个补丁"

7348

7245 -#: builtin/log.c:1214

7349 +#: builtin/log.c:1217

7350 msgid "use [PATCH] even with multiple patches"

7351 msgstr "使用 [PATCH]，即使有多个补丁"

7352

7249 -#: builtin/log.c:1218

7353 +#: builtin/log.c:1221

7354 msgid "print patches to standard out"

7355 msgstr "打印补丁到标准输出"

7356

7253 -#: builtin/log.c:1220

7357 +#: builtin/log.c:1223

7358 msgid "generate a cover letter"

7359 msgstr "生成一封附信"

7360

7257 -#: builtin/log.c:1222

7361 +#: builtin/log.c:1225

7362 msgid "use simple number sequence for output file names"

7363 msgstr "使用简单的数字序列作为输出文件名"

7364

7261 -#: builtin/log.c:1223

7365 +#: builtin/log.c:1226

7366 msgid "sfx"

7367 msgstr "后缀"

7368

7265 -#: builtin/log.c:1224

7369 +#: builtin/log.c:1227

7370 msgid "use <sfx> instead of '.patch'"

7371 msgstr "使用 <后缀> 代替 '.patch'"

7372

7269 -#: builtin/log.c:1226

7373 +#: builtin/log.c:1229

7374 msgid "start numbering patches at <n> instead of 1"

7375 msgstr "补丁以 <n> 开始编号，而不是1"

7376

7273 -#: builtin/log.c:1228

7377 +#: builtin/log.c:1231

7378 msgid "mark the series as Nth re-roll"

7379 msgstr "标记补丁系列是第几次重制"

7380

7277 -#: builtin/log.c:1230

7381 +#: builtin/log.c:1233

7382 msgid "Use [<prefix>] instead of [PATCH]"

7383 msgstr "使用 [<前缀>] 代替 [PATCH]"

7384

7281 -#: builtin/log.c:1233

7385 +#: builtin/log.c:1236

7386 msgid "store resulting files in <dir>"

7387 msgstr "把结果文件存储在 <目录>"

7388

7285 -#: builtin/log.c:1236

7389 +#: builtin/log.c:1239

7390 msgid "don't strip/add [PATCH]"

7391 msgstr "不删除/添加 [PATCH]"

7392

7289 -#: builtin/log.c:1239

7393 +#: builtin/log.c:1242

7394 msgid "don't output binary diffs"

7395 msgstr "不输出二进制差异"

7396

7293 -#: builtin/log.c:1241

7397 +#: builtin/log.c:1244

7398 msgid "output all-zero hash in From header"

7399 msgstr "在 From 头信息中输出全为零的哈希值"

7400

7297 -#: builtin/log.c:1243

7401 +#: builtin/log.c:1246

7402 msgid "don't include a patch matching a commit upstream"

7403 msgstr "不包含已在上游提交中的补丁"

7404

7301 -#: builtin/log.c:1245

7405 +#: builtin/log.c:1248

7406 msgid "show patch format instead of default (patch + stat)"

7407 msgstr "显示纯补丁格式而非默认的（补丁+状态）"

7408

7305 -#: builtin/log.c:1247

7409 +#: builtin/log.c:1250

7410 msgid "Messaging"

7411 msgstr "邮件发送"

7412

7309 -#: builtin/log.c:1248

7413 +#: builtin/log.c:1251

7414 msgid "header"

7415 msgstr "header"

7416

7313 -#: builtin/log.c:1249

7417 +#: builtin/log.c:1252

7418 msgid "add email header"

7419 msgstr "添加邮件头"

7420

7317 -#: builtin/log.c:1250 builtin/log.c:1252

7421 +#: builtin/log.c:1253 builtin/log.c:1255

7422 msgid "email"

7423 msgstr "邮件地址"

7424

7321 -#: builtin/log.c:1250

7425 +#: builtin/log.c:1253

7426 msgid "add To: header"

7427 msgstr "添加收件人"

7428

7325 -#: builtin/log.c:1252

7429 +#: builtin/log.c:1255

7430 msgid "add Cc: header"

7431 msgstr "添加抄送"

7432

7329 -#: builtin/log.c:1254

7433 +#: builtin/log.c:1257

7434 msgid "ident"

7435 msgstr "标识"

7436

7333 -#: builtin/log.c:1255

7437 +#: builtin/log.c:1258

7438 msgid "set From address to <ident> (or committer ident if absent)"

7439 msgstr "将 From 地址设置为 <标识>（如若不提供，则用提交者 ID 做为地址）"

7440

7337 -#: builtin/log.c:1257

7441 +#: builtin/log.c:1260

7442 msgid "message-id"

7443 msgstr "邮件标识"

7444

7341 -#: builtin/log.c:1258

7445 +#: builtin/log.c:1261

7446 msgid "make first mail a reply to <message-id>"

7447 msgstr "使第一封邮件作为对 <邮件标识> 的回复"

7448

7345 -#: builtin/log.c:1259 builtin/log.c:1262

7449 +#: builtin/log.c:1262 builtin/log.c:1265

7450 msgid "boundary"

7451 msgstr "边界"

7452

7349 -#: builtin/log.c:1260

7453 +#: builtin/log.c:1263

7454 msgid "attach the patch"

7455 msgstr "附件方式添加补丁"

7456

7353 -#: builtin/log.c:1263

7457 +#: builtin/log.c:1266

7458 msgid "inline the patch"

7459 msgstr "内联显示补丁"

7460

7357 -#: builtin/log.c:1267

7461 +#: builtin/log.c:1270

7462 msgid "enable message threading, styles: shallow, deep"

7463 msgstr "启用邮件线索，风格：浅，深"

7464

7361 -#: builtin/log.c:1269

7465 +#: builtin/log.c:1272

7466 msgid "signature"

7467 msgstr "签名"

7468

7365 -#: builtin/log.c:1270

7469 +#: builtin/log.c:1273

7470 msgid "add a signature"

7471 msgstr "添加一个签名"

7472

7369 -#: builtin/log.c:1272

7473 +#: builtin/log.c:1275

7474 msgid "add a signature from a file"

7475 msgstr "从文件添加一个签名"

7476

7373 -#: builtin/log.c:1273

7477 +#: builtin/log.c:1276

7478 msgid "don't print the patch filenames"

7479 msgstr "不要打印补丁文件名"

7480

7377 -#: builtin/log.c:1362

7481 +#: builtin/log.c:1365

7482 msgid "-n and -k are mutually exclusive."

7483 msgstr "-n 和 -k 互斥。"

7484

7381 -#: builtin/log.c:1364

7485 +#: builtin/log.c:1367

7486 msgid "--subject-prefix and -k are mutually exclusive."

7487 msgstr "--subject-prefix 和 -k 互斥。"

7488

7385 -#: builtin/log.c:1372

7489 +#: builtin/log.c:1375

7490 msgid "--name-only does not make sense"

7491 msgstr "--name-only 无意义"

7492

7389 -#: builtin/log.c:1374

7493 +#: builtin/log.c:1377

7494 msgid "--name-status does not make sense"

7495 msgstr "--name-status 无意义"

7496

7393 -#: builtin/log.c:1376

7497 +#: builtin/log.c:1379

7498 msgid "--check does not make sense"

7499 msgstr "--check 无意义"

7500

7397 -#: builtin/log.c:1401

7501 +#: builtin/log.c:1407

7502 msgid "standard output, or directory, which one?"

7503 msgstr "标准输出或目录，哪一个？"

7504

7401 -#: builtin/log.c:1403

7505 +#: builtin/log.c:1409

7506 #, c-format

7507 msgid "Could not create directory '%s'"

7508 msgstr "不能创建目录 '%s'"

7509

7406 -#: builtin/log.c:1500

7510 +#: builtin/log.c:1506

7511 #, c-format

7512 msgid "unable to read signature file '%s'"

7513 msgstr "无法读取签名文件 '%s'"

7514

7411 -#: builtin/log.c:1563

7515 +#: builtin/log.c:1569

7516 msgid "Failed to create output files"

7517 msgstr "无法创建输出文件"

7518

7415 -#: builtin/log.c:1611

7519 +#: builtin/log.c:1617

7520 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"

7521 msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"

7522

7419 -#: builtin/log.c:1665

7523 +#: builtin/log.c:1671

7524 #, c-format

7525 msgid ""

7526 "Could not find a tracked remote branch, please specify <upstream> manually.\n"

7527 msgstr "不能找到跟踪的远程分支，请手工指定 <上游>。\n"

7528

7425 -#: builtin/log.c:1676 builtin/log.c:1678 builtin/log.c:1690

7529 +#: builtin/log.c:1682 builtin/log.c:1684 builtin/log.c:1696

7530 #, c-format

7531 msgid "Unknown commit %s"

7532 msgstr "未知提交 %s"

7533

7430 -#: builtin/ls-files.c:358

7534 +#: builtin/ls-files.c:378

7535 msgid "git ls-files [<options>] [<file>...]"

7536 msgstr "git ls-files [<选项>] [<文件>...]"

7537

7434 -#: builtin/ls-files.c:415

7538 +#: builtin/ls-files.c:427

7539 msgid "identify the file status with tags"

7540 msgstr "用标签标识文件的状态"

7541

7438 -#: builtin/ls-files.c:417

7542 +#: builtin/ls-files.c:429

7543 msgid "use lowercase letters for 'assume unchanged' files"

7544 msgstr "使用小写字母表示 '假设未改变的' 文件"

7545

7442 -#: builtin/ls-files.c:419

7546 +#: builtin/ls-files.c:431

7547 msgid "show cached files in the output (default)"

7548 msgstr "显示缓存的文件（默认）"

7549

7446 -#: builtin/ls-files.c:421

7550 +#: builtin/ls-files.c:433

7551 msgid "show deleted files in the output"

7552 msgstr "显示已删除的文件"

7553

7450 -#: builtin/ls-files.c:423

7554 +#: builtin/ls-files.c:435

7555 msgid "show modified files in the output"

7556 msgstr "显示已修改的文件"

7557

7454 -#: builtin/ls-files.c:425

7558 +#: builtin/ls-files.c:437

7559 msgid "show other files in the output"

7560 msgstr "显示其它文件"

7561

7458 -#: builtin/ls-files.c:427

7562 +#: builtin/ls-files.c:439

7563 msgid "show ignored files in the output"

7564 msgstr "显示忽略的文件"

7565

7462 -#: builtin/ls-files.c:430

7566 +#: builtin/ls-files.c:442

7567 msgid "show staged contents' object name in the output"

7568 msgstr "显示暂存区内容的对象名称"

7569

7466 -#: builtin/ls-files.c:432

7570 +#: builtin/ls-files.c:444

7571 msgid "show files on the filesystem that need to be removed"

7572 msgstr "显示文件系统需要删除的文件"

7573

7470 -#: builtin/ls-files.c:434

7574 +#: builtin/ls-files.c:446

7575 msgid "show 'other' directories' names only"

7576 msgstr "只显示“其他”目录的名称"

7577

7474 -#: builtin/ls-files.c:437

7578 +#: builtin/ls-files.c:448

7579 +msgid "show line endings of files"

7580 +msgstr "显示文件换行符格式"

7581 +

7582 +#: builtin/ls-files.c:450

7583 msgid "don't show empty directories"

7584 msgstr "不显示空目录"

7585

7478 -#: builtin/ls-files.c:440

7586 +#: builtin/ls-files.c:453

7587 msgid "show unmerged files in the output"

7588 msgstr "显示未合并的文件"

7589

7482 -#: builtin/ls-files.c:442

7590 +#: builtin/ls-files.c:455

7591 msgid "show resolve-undo information"

7592 msgstr "显示 resolve-undo 信息"

7593

7486 -#: builtin/ls-files.c:444

7594 +#: builtin/ls-files.c:457

7595 msgid "skip files matching pattern"

7596 msgstr "匹配排除文件的模式"

7597

7490 -#: builtin/ls-files.c:447

7598 +#: builtin/ls-files.c:460

7599 msgid "exclude patterns are read from <file>"

7600 msgstr "从 <文件> 中读取排除模式"

7601

7494 -#: builtin/ls-files.c:450

7602 +#: builtin/ls-files.c:463

7603 msgid "read additional per-directory exclude patterns in <file>"

7604 msgstr "从 <文件> 读取额外的每个目录的排除模式"

7605

7498 -#: builtin/ls-files.c:452

7606 +#: builtin/ls-files.c:465

7607 msgid "add the standard git exclusions"

7608 msgstr "添加标准的 git 排除"

7609

7502 -#: builtin/ls-files.c:455

7610 +#: builtin/ls-files.c:468

7611 msgid "make the output relative to the project top directory"

7612 msgstr "显示相对于顶级目录的文件名"

7613

7506 -#: builtin/ls-files.c:458

7614 +#: builtin/ls-files.c:471

7615 msgid "if any <file> is not in the index, treat this as an error"

7616 msgstr "如果任何 <文件> 都不在索引区，视为错误"

7617

7510 -#: builtin/ls-files.c:459

7618 +#: builtin/ls-files.c:472

7619 msgid "tree-ish"

7620 msgstr "树或提交"

7621

7514 -#: builtin/ls-files.c:460

7622 +#: builtin/ls-files.c:473

7623 msgid "pretend that paths removed since <tree-ish> are still present"

7624 msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"

7625

7518 -#: builtin/ls-files.c:462

7626 +#: builtin/ls-files.c:475

7627 msgid "show debugging data"

7628 msgstr "显示调试数据"

7629

7630 +#: builtin/ls-remote.c:7

7631 +msgid ""

7632 +"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"

7633 +" [-q | --quiet] [--exit-code] [--get-url]\n"

7634 +" [--symref] [<repository> [<refs>...]]"

7635 +msgstr ""

7636 +"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"

7637 +" [-q | --quiet] [--exit-code] [--get-url]\n"

7638 +" [--symref] [<仓库> [<引用>...]]"

7639 +

7640 +#: builtin/ls-remote.c:50

7641 +msgid "do not print remote URL"

7642 +msgstr "不打印远程 URL"

7643 +

7644 +#: builtin/ls-remote.c:51 builtin/ls-remote.c:53

7645 +msgid "exec"

7646 +msgstr "exec"

7647 +

7648 +#: builtin/ls-remote.c:52 builtin/ls-remote.c:54

7649 +msgid "path of git-upload-pack on the remote host"

7650 +msgstr "远程主机上的 git-upload-pack 路径"

7651 +

7652 +#: builtin/ls-remote.c:56

7653 +msgid "limit to tags"

7654 +msgstr "仅限于标签"

7655 +

7656 +#: builtin/ls-remote.c:57

7657 +msgid "limit to heads"

7658 +msgstr "仅限于分支"

7659 +

7660 +#: builtin/ls-remote.c:58

7661 +msgid "do not show peeled tags"

7662 +msgstr "不显示已解析的标签"

7663 +

7664 +#: builtin/ls-remote.c:60

7665 +msgid "take url.<base>.insteadOf into account"

7666 +msgstr "参考 url.<base>.insteadOf 设置"

7667 +

7668 +#: builtin/ls-remote.c:62

7669 +msgid "exit with exit code 2 if no matching refs are found"

7670 +msgstr "若未找到匹配的引用则以退出码2退出"

7671 +

7672 +#: builtin/ls-remote.c:64

7673 +msgid "show underlying ref in addition to the object pointed by it"

7674 +msgstr "除了显示指向的对象外，显示指向的引用名"

7675 +

7676 #: builtin/ls-tree.c:28

7677 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"

7678 msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"

@@ -7586,31 +7740,31 @@ msgstr "可用的策略有："

7740 msgid "Available custom strategies are:"

7741 msgstr "可用的自定义策略有："

7742

7589 -#: builtin/merge.c:193 builtin/pull.c:119

7743 +#: builtin/merge.c:193 builtin/pull.c:123

7744 msgid "do not show a diffstat at the end of the merge"

7745 msgstr "在合并的最后不显示差异统计"

7746

7593 -#: builtin/merge.c:196 builtin/pull.c:122

7747 +#: builtin/merge.c:196 builtin/pull.c:126

7748 msgid "show a diffstat at the end of the merge"

7749 msgstr "在合并的最后显示差异统计"

7750

7597 -#: builtin/merge.c:197 builtin/pull.c:125

7751 +#: builtin/merge.c:197 builtin/pull.c:129

7752 msgid "(synonym to --stat)"

7753 msgstr "（和 --stat 同义）"

7754

7601 -#: builtin/merge.c:199 builtin/pull.c:128

7755 +#: builtin/merge.c:199 builtin/pull.c:132

7756 msgid "add (at most <n>) entries from shortlog to merge commit message"

7757 msgstr "在合并提交信息中添加（最多 <n> 条）精简提交记录"

7758

7605 -#: builtin/merge.c:202 builtin/pull.c:131

7759 +#: builtin/merge.c:202 builtin/pull.c:135

7760 msgid "create a single commit instead of doing a merge"

7761 msgstr "创建一个单独的提交而不是做一次合并"

7762

7609 -#: builtin/merge.c:204 builtin/pull.c:134

7763 +#: builtin/merge.c:204 builtin/pull.c:138

7764 msgid "perform a commit if the merge succeeds (default)"

7765 msgstr "如果合并成功，执行一次提交（默认）"

7766

7613 -#: builtin/merge.c:206 builtin/pull.c:137

7767 +#: builtin/merge.c:206 builtin/pull.c:141

7768 msgid "edit message before committing"

7769 msgstr "在提交前编辑提交说明"

7770

@@ -7618,7 +7772,7 @@ msgstr "在提交前编辑提交说明"

7772 msgid "allow fast-forward (default)"

7773 msgstr "允许快进（默认）"

7774

7621 -#: builtin/merge.c:209 builtin/pull.c:143

7775 +#: builtin/merge.c:209 builtin/pull.c:147

7776 msgid "abort if fast-forward is not possible"

7777 msgstr "如果不能快进就放弃合并"

7778

@@ -7626,20 +7780,20 @@ msgstr "如果不能快进就放弃合并"

7780 msgid "Verify that the named commit has a valid GPG signature"

7781 msgstr "验证指定的提交是否包含一个有效的 GPG 签名"

7782

7629 -#: builtin/merge.c:214 builtin/notes.c:767 builtin/pull.c:148

7783 +#: builtin/merge.c:214 builtin/notes.c:770 builtin/pull.c:152

7784 #: builtin/revert.c:89

7785 msgid "strategy"

7786 msgstr "策略"

7787

7634 -#: builtin/merge.c:215 builtin/pull.c:149

7788 +#: builtin/merge.c:215 builtin/pull.c:153

7789 msgid "merge strategy to use"

7790 msgstr "要使用的合并策略"

7791

7638 -#: builtin/merge.c:216 builtin/pull.c:152

7792 +#: builtin/merge.c:216 builtin/pull.c:156

7793 msgid "option=value"

7794 msgstr "option=value"

7795

7642 -#: builtin/merge.c:217 builtin/pull.c:153

7796 +#: builtin/merge.c:217 builtin/pull.c:157

7797 msgid "option for selected merge strategy"

7798 msgstr "所选的合并策略的选项"

l10n: zh_CN: for git v2.8.0 l10n round 1