220c313cc3 · matheusbsbs/matheus-bagliano

@@ -12,8 +12,8 @@ msgid ""

12 msgstr ""

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

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

15 -"POT-Creation-Date: 2014-08-04 14:48+0800\n"

16 -"PO-Revision-Date: 2014-08-04 16:16+0800\n"

15 +"POT-Creation-Date: 2014-11-01 07:46+0800\n"

16 +"PO-Revision-Date: 2014-11-02 10:58+0800\n"

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

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

19 "Language: zh_CN\n"

@@ -30,104 +30,103 @@ msgstr "提示：%.*s\n"

30 #: advice.c:88

31 msgid ""

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

33 -"as appropriate to mark resolution and make a commit, or use\n"

34 -"'git commit -a'."

33 +"as appropriate to mark resolution and make a commit."

34 msgstr ""

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

37 -"解决方案并提交，或者使用 'git commit -a'。"

36 +"解决方案并提交。"

37

39 -#: archive.c:10

38 +#: archive.c:11

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

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

41

43 -#: archive.c:11

42 +#: archive.c:12

43 msgid "git archive --list"

44 msgstr "git archive --list"

45

47 -#: archive.c:12

46 +#: archive.c:13

47 msgid ""

48 "git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]"

49 msgstr ""

50 "git archive --remote <版本库> [--exec <命令>] [选项] <树或提交> [<路径>...]"

51

53 -#: archive.c:13

52 +#: archive.c:14

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

54 msgstr "git archive --remote <版本库> [--exec <命令>] --list"

55

57 -#: archive.c:243 builtin/add.c:136 builtin/add.c:427 builtin/rm.c:328

56 +#: archive.c:334 builtin/add.c:137 builtin/add.c:427 builtin/rm.c:328

57 #, c-format

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

59 msgstr "路径规则 '%s' 未匹配任何文件"

60

62 -#: archive.c:328

61 +#: archive.c:419

62 msgid "fmt"

63 msgstr "格式"

64

66 -#: archive.c:328

65 +#: archive.c:419

66 msgid "archive format"

67 msgstr "归档格式"

68

70 -#: archive.c:329 builtin/log.c:1201

69 +#: archive.c:420 builtin/log.c:1204

70 msgid "prefix"

71 msgstr "前缀"

72

74 -#: archive.c:330

73 +#: archive.c:421

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

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

76

78 -#: archive.c:331 builtin/archive.c:88 builtin/blame.c:2517

79 -#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:709

80 -#: builtin/fast-export.c:711 builtin/grep.c:712 builtin/hash-object.c:77

81 -#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:412

82 -#: builtin/notes.c:569 builtin/read-tree.c:108 parse-options.h:151

77 +#: archive.c:422 builtin/archive.c:88 builtin/blame.c:2517

78 +#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:986

79 +#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101

80 +#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:411

81 +#: builtin/notes.c:568 builtin/read-tree.c:109 parse-options.h:151

82 msgid "file"

83 msgstr "文件"

84

86 -#: archive.c:332 builtin/archive.c:89

85 +#: archive.c:423 builtin/archive.c:89

86 msgid "write the archive to this file"

87 msgstr "归档写入此文件"

88

90 -#: archive.c:334

89 +#: archive.c:425

90 msgid "read .gitattributes in working directory"

91 msgstr "读取工作区中的 .gitattributes"

92

94 -#: archive.c:335

93 +#: archive.c:426

94 msgid "report archived files on stderr"

95 msgstr "在标准错误上报告归档文件"

96

98 -#: archive.c:336

97 +#: archive.c:427

98 msgid "store only"

99 msgstr "只存储"

100

102 -#: archive.c:337

101 +#: archive.c:428

102 msgid "compress faster"

103 msgstr "压缩速度更快"

104

106 -#: archive.c:345

105 +#: archive.c:436

106 msgid "compress better"

107 msgstr "压缩效果更好"

108

110 -#: archive.c:348

109 +#: archive.c:439

110 msgid "list supported archive formats"

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

112

114 -#: archive.c:350 builtin/archive.c:90 builtin/clone.c:84

113 +#: archive.c:441 builtin/archive.c:90 builtin/clone.c:85

114 msgid "repo"

115 msgstr "版本库"

116

118 -#: archive.c:351 builtin/archive.c:91

117 +#: archive.c:442 builtin/archive.c:91

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

119 msgstr "从远程版本库（<版本库>）提取归档文件"

120

122 -#: archive.c:352 builtin/archive.c:92 builtin/notes.c:491

121 +#: archive.c:443 builtin/archive.c:92 builtin/notes.c:490

122 msgid "command"

123 msgstr "命令"

124

126 -#: archive.c:353 builtin/archive.c:93

125 +#: archive.c:444 builtin/archive.c:93

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

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

128

130 -#: attr.c:259

129 +#: attr.c:258

130 msgid ""

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

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

@@ -185,31 +184,31 @@ msgstr "分支 %s 设置为跟踪本地引用 %s。"

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

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

186

188 -#: branch.c:178

187 +#: branch.c:162

188 #, c-format

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

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

191

193 -#: branch.c:183

192 +#: branch.c:167

193 #, c-format

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

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

196

198 -#: branch.c:191

197 +#: branch.c:175

198 msgid "Cannot force update the current branch."

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

200

202 -#: branch.c:211

201 +#: branch.c:195

202 #, c-format

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

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

205

207 -#: branch.c:213

206 +#: branch.c:197

207 #, c-format

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

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

210

212 -#: branch.c:215

211 +#: branch.c:199

212 msgid ""

213 "\n"

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

@@ -227,107 +226,105 @@ msgstr ""

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

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

228

230 -#: branch.c:260

229 +#: branch.c:243

230 #, c-format

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

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

233

235 -#: branch.c:280

234 +#: branch.c:263

235 #, c-format

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

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

238

240 -#: branch.c:285

239 +#: branch.c:268

240 #, c-format

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

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

243

245 -#: branch.c:291

246 -msgid "Failed to lock ref for update"

247 -msgstr "无法为更新锁定引用"

248 -

249 -#: branch.c:309

250 -msgid "Failed to write ref"

251 -msgstr "不能写引用"

252 -

253 -#: bundle.c:33

244 +#: bundle.c:34

245 #, c-format

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

247 msgstr "'%s' 不像是一个 v2 版本的包文件"

248

258 -#: bundle.c:60

249 +#: bundle.c:61

250 #, c-format

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

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

253

263 -#: bundle.c:86 builtin/commit.c:755

254 +#: bundle.c:87 builtin/commit.c:788

255 #, c-format

256 msgid "could not open '%s'"

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

258

268 -#: bundle.c:138

259 +#: bundle.c:139

260 msgid "Repository lacks these prerequisite commits:"

261 msgstr "版本库缺少这些必备的提交："

262

272 -#: bundle.c:162 sequencer.c:630 sequencer.c:1085 builtin/log.c:330

273 -#: builtin/log.c:821 builtin/log.c:1428 builtin/log.c:1665 builtin/merge.c:357

263 +#: bundle.c:163 sequencer.c:641 sequencer.c:1096 builtin/blame.c:2706

264 +#: builtin/branch.c:652 builtin/commit.c:1085 builtin/log.c:330

265 +#: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:357

266 #: builtin/shortlog.c:158

267 msgid "revision walk setup failed"

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

269

278 -#: bundle.c:184

270 +#: bundle.c:185

271 #, c-format

272 msgid "The bundle contains this ref:"

273 msgid_plural "The bundle contains these %d refs:"

274 msgstr[0] "这个包中含有这个引用："

275 msgstr[1] "这个包中含有 %d 个引用："

276

285 -#: bundle.c:191

277 +#: bundle.c:192

278 msgid "The bundle records a complete history."

279 msgstr "这个包记录一个完整历史。"

280

289 -#: bundle.c:193

281 +#: bundle.c:194

282 #, c-format

283 msgid "The bundle requires this ref:"

284 msgid_plural "The bundle requires these %d refs:"

285 msgstr[0] "这个包需要这个引用："

286 msgstr[1] "这个包需要 %d 个引用："

287

296 -#: bundle.c:289

288 +#: bundle.c:292

289 msgid "rev-list died"

290 msgstr "rev-list 终止"

291

300 -#: bundle.c:295 builtin/log.c:1339 builtin/shortlog.c:261

292 +#: bundle.c:298 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261

293 #, c-format

294 msgid "unrecognized argument: %s"

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

296

305 -#: bundle.c:330

297 +#: bundle.c:333

298 #, c-format

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

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

301

310 -#: bundle.c:375

302 +#: bundle.c:378

303 msgid "Refusing to create empty bundle."

304 msgstr "不能创建空包。"

305

314 -#: bundle.c:390

306 +#: bundle.c:393

307 msgid "Could not spawn pack-objects"

308 msgstr "不能生成 pack-objects 进程"

309

318 -#: bundle.c:408

310 +#: bundle.c:411

311 msgid "pack-objects died"

312 msgstr "pack-objects 终止"

313

322 -#: bundle.c:411

314 +#: bundle.c:414

315 #, c-format

316 msgid "cannot create '%s'"

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

318

327 -#: bundle.c:433

319 +#: bundle.c:435

320 msgid "index-pack died"

321 msgstr "index-pack 终止"

322

323 +#: color.c:157

324 +#, c-format

325 +msgid "invalid color value: %.*s"

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

327 +

328 #: commit.c:40

329 #, c-format

330 msgid "could not parse %s"

@@ -342,16 +339,69 @@ msgstr "%s %s 不是一个提交!"

339 msgid "memory exhausted"

340 msgstr "内存耗尽"

341

345 -#: connected.c:70

342 +#: config.c:469 config.c:471

343 +#, c-format

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

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

346 +

347 +#: config.c:587

348 +#, c-format

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

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

351 +

352 +#: config.c:589

353 +#, c-format

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

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

356 +

357 +#: config.c:674

358 +#, c-format

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

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

361 +

362 +#: config.c:752 config.c:763

363 +#, c-format

364 +msgid "bad zlib compression level %d"

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

366 +

367 +#: config.c:885

368 +#, c-format

369 +msgid "invalid mode for object creation: %s"

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

371 +

372 +#: config.c:1201

373 +msgid "unable to parse command-line config"

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

375 +

376 +#: config.c:1262

377 +msgid "unknown error occured while reading the configuration files"

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

379 +

380 +#: config.c:1586

381 +#, c-format

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

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

384 +

385 +#: config.c:1588

386 +#, c-format

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

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

389 +

390 +#: config.c:1647

391 +#, c-format

392 +msgid "%s has multiple values"

393 +msgstr "%s 有多个取值"

394 +

395 +#: connected.c:69

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

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

398

349 -#: connected.c:90

399 +#: connected.c:89

400 #, c-format

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

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

403

354 -#: connected.c:98

404 +#: connected.c:97

405 #, c-format

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

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

@@ -429,7 +479,7 @@ msgstr[1] "%lu 年前"

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

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

481

432 -#: diffcore-rename.c:514

482 +#: diffcore-rename.c:516

483 msgid "Performing inexact rename detection"

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

485

@@ -450,7 +500,7 @@ msgstr " 未知的 dirstat 参数 '%s'\n"

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

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

502

453 -#: diff.c:267

503 +#: diff.c:266

504 #, c-format

505 msgid ""

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

@@ -459,16 +509,16 @@ msgstr ""

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

510 "%s"

511

462 -#: diff.c:2934

512 +#: diff.c:2957

513 #, c-format

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

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

516

467 -#: diff.c:3329

517 +#: diff.c:3352

518 msgid "--follow requires exactly one pathspec"

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

520

471 -#: diff.c:3492

521 +#: diff.c:3515

522 #, c-format

523 msgid ""

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

@@ -477,44 +527,44 @@ msgstr ""

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

528 "%s"

529

480 -#: diff.c:3506

530 +#: diff.c:3529

531 #, c-format

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

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

534

485 -#: gpg-interface.c:73 gpg-interface.c:145

535 +#: gpg-interface.c:129 gpg-interface.c:200

536 msgid "could not run gpg."

537 msgstr "不能执行 gpg。"

538

489 -#: gpg-interface.c:85

539 +#: gpg-interface.c:141

540 msgid "gpg did not accept the data"

541 msgstr "gpg 没有接受数据"

542

493 -#: gpg-interface.c:96

543 +#: gpg-interface.c:152

544 msgid "gpg failed to sign the data"

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

546

497 -#: gpg-interface.c:129

547 +#: gpg-interface.c:185

548 #, c-format

549 msgid "could not create temporary file '%s': %s"

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

551

502 -#: gpg-interface.c:132

552 +#: gpg-interface.c:188

553 #, c-format

554 msgid "failed writing detached signature to '%s': %s"

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

556

507 -#: grep.c:1703

557 +#: grep.c:1718

558 #, c-format

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

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

561

512 -#: grep.c:1720

562 +#: grep.c:1735

563 #, c-format

564 msgid "'%s': %s"

565 msgstr "'%s'：%s"

566

517 -#: grep.c:1731

567 +#: grep.c:1746

568 #, c-format

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

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

@@ -583,87 +633,95 @@ msgstr[1] ""

633 msgid "%s: %s - %s"

634 msgstr "%s：%s - %s"

635

586 -#: merge.c:40

636 +#: lockfile.c:275

637 +msgid "BUG: reopen a lockfile that is still open"

638 +msgstr "BUG: 重新打开一个仍打开着的锁文件"

639 +

640 +#: lockfile.c:277

641 +msgid "BUG: reopen a lockfile that has been committed"

642 +msgstr "BUG: 重新打开一个已提交的锁文件"

643 +

644 +#: merge.c:41

645 msgid "failed to read the cache"

646 msgstr "无法读取缓存"

647

590 -#: merge.c:93 builtin/checkout.c:356 builtin/checkout.c:556

591 -#: builtin/clone.c:661

648 +#: merge.c:94 builtin/checkout.c:356 builtin/checkout.c:562

649 +#: builtin/clone.c:659

650 msgid "unable to write new index file"

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

652

595 -#: merge-recursive.c:190

653 +#: merge-recursive.c:189

654 #, c-format

655 msgid "(bad commit)\n"

656 msgstr "（坏提交）\n"

657

600 -#: merge-recursive.c:210

658 +#: merge-recursive.c:209

659 #, c-format

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

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

662

605 -#: merge-recursive.c:271

663 +#: merge-recursive.c:270

664 msgid "error building trees"

665 msgstr "无法创建树"

666

609 -#: merge-recursive.c:692

667 +#: merge-recursive.c:691

668 #, c-format

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

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

671

614 -#: merge-recursive.c:703

672 +#: merge-recursive.c:702

673 #, c-format

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

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

676

619 -#: merge-recursive.c:717 merge-recursive.c:738

677 +#: merge-recursive.c:716 merge-recursive.c:737

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

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

680

623 -#: merge-recursive.c:728

681 +#: merge-recursive.c:727

682 #, c-format

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

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

685

628 -#: merge-recursive.c:768

686 +#: merge-recursive.c:767

687 #, c-format

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

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

690

633 -#: merge-recursive.c:770

691 +#: merge-recursive.c:769

692 #, c-format

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

694 msgstr "%s '%s' 应为数据（blob）对象"

695

638 -#: merge-recursive.c:793 builtin/clone.c:317

696 +#: merge-recursive.c:792 builtin/clone.c:318

697 #, c-format

698 msgid "failed to open '%s'"

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

700

643 -#: merge-recursive.c:801

701 +#: merge-recursive.c:800

702 #, c-format

703 msgid "failed to symlink '%s'"

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

705

648 -#: merge-recursive.c:804

706 +#: merge-recursive.c:803

707 #, c-format

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

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

710

653 -#: merge-recursive.c:942

711 +#: merge-recursive.c:941

712 msgid "Failed to execute internal merge"

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

714

657 -#: merge-recursive.c:946

715 +#: merge-recursive.c:945

716 #, c-format

717 msgid "Unable to add %s to database"

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

719

662 -#: merge-recursive.c:962

720 +#: merge-recursive.c:961

721 msgid "unsupported object type in the tree"

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

723

666 -#: merge-recursive.c:1037 merge-recursive.c:1051

724 +#: merge-recursive.c:1036 merge-recursive.c:1050

725 #, c-format

726 msgid ""

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

@@ -672,7 +730,7 @@ msgstr ""

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

731 "的版本被保留。"

732

675 -#: merge-recursive.c:1043 merge-recursive.c:1056

733 +#: merge-recursive.c:1042 merge-recursive.c:1055

734 #, c-format

735 msgid ""

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

@@ -681,20 +739,20 @@ msgstr ""

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

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

741

684 -#: merge-recursive.c:1097

742 +#: merge-recursive.c:1096

743 msgid "rename"

744 msgstr "重命名"

745

688 -#: merge-recursive.c:1097

746 +#: merge-recursive.c:1096

747 msgid "renamed"

748 msgstr "重命名"

749

692 -#: merge-recursive.c:1153

750 +#: merge-recursive.c:1152

751 #, c-format

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

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

754

697 -#: merge-recursive.c:1175

755 +#: merge-recursive.c:1174

756 #, c-format

757 msgid ""

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

@@ -703,144 +761,144 @@ msgstr ""

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

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

763

706 -#: merge-recursive.c:1180

764 +#: merge-recursive.c:1179

765 msgid " (left unresolved)"

766 msgstr "（留下未解决）"

767

710 -#: merge-recursive.c:1234

768 +#: merge-recursive.c:1233

769 #, c-format

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

771 msgstr ""

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

773 "%5$s"

774

717 -#: merge-recursive.c:1264

775 +#: merge-recursive.c:1263

776 #, c-format

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

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

779

722 -#: merge-recursive.c:1463

780 +#: merge-recursive.c:1462

781 #, c-format

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

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

784

727 -#: merge-recursive.c:1473

785 +#: merge-recursive.c:1472

786 #, c-format

787 msgid "Adding merged %s"

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

789

732 -#: merge-recursive.c:1478 merge-recursive.c:1676

790 +#: merge-recursive.c:1477 merge-recursive.c:1675

791 #, c-format

792 msgid "Adding as %s instead"

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

794

737 -#: merge-recursive.c:1529

795 +#: merge-recursive.c:1528

796 #, c-format

797 msgid "cannot read object %s"

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

799

742 -#: merge-recursive.c:1532

800 +#: merge-recursive.c:1531

801 #, c-format

802 msgid "object %s is not a blob"

803 msgstr "对象 %s 不是一个数据（blob）对象"

804

747 -#: merge-recursive.c:1580

805 +#: merge-recursive.c:1579

806 msgid "modify"

807 msgstr "修改"

808

751 -#: merge-recursive.c:1580

809 +#: merge-recursive.c:1579

810 msgid "modified"

811 msgstr "修改"

812

755 -#: merge-recursive.c:1590

813 +#: merge-recursive.c:1589

814 msgid "content"

815 msgstr "内容"

816

759 -#: merge-recursive.c:1597

817 +#: merge-recursive.c:1596

818 msgid "add/add"

819 msgstr "添加/添加"

820

763 -#: merge-recursive.c:1631

821 +#: merge-recursive.c:1630

822 #, c-format

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

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

825

768 -#: merge-recursive.c:1645

826 +#: merge-recursive.c:1644

827 #, c-format

828 msgid "Auto-merging %s"

829 msgstr "自动合并 %s"

830

773 -#: merge-recursive.c:1649 git-submodule.sh:1150

831 +#: merge-recursive.c:1648 git-submodule.sh:1150

832 msgid "submodule"

833 msgstr "子模组"

834

777 -#: merge-recursive.c:1650

835 +#: merge-recursive.c:1649

836 #, c-format

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

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

839

782 -#: merge-recursive.c:1740

840 +#: merge-recursive.c:1735

841 #, c-format

842 msgid "Removing %s"

843 msgstr "删除 %s"

844

787 -#: merge-recursive.c:1765

845 +#: merge-recursive.c:1760

846 msgid "file/directory"

847 msgstr "文件/目录"

848

791 -#: merge-recursive.c:1771

849 +#: merge-recursive.c:1766

850 msgid "directory/file"

851 msgstr "目录/文件"

852

795 -#: merge-recursive.c:1776

853 +#: merge-recursive.c:1771

854 #, c-format

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

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

857

800 -#: merge-recursive.c:1786

858 +#: merge-recursive.c:1781

859 #, c-format

860 msgid "Adding %s"

861 msgstr "添加 %s"

862

805 -#: merge-recursive.c:1803

863 +#: merge-recursive.c:1798

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

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

866

809 -#: merge-recursive.c:1822

867 +#: merge-recursive.c:1817

868 msgid "Already up-to-date!"

869 msgstr "已经是最新的！"

870

813 -#: merge-recursive.c:1831

871 +#: merge-recursive.c:1826

872 #, c-format

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

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

875

818 -#: merge-recursive.c:1861

876 +#: merge-recursive.c:1856

877 #, c-format

878 msgid "Unprocessed path??? %s"

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

880

823 -#: merge-recursive.c:1906

881 +#: merge-recursive.c:1901

882 msgid "Merging:"

883 msgstr "合并："

884

827 -#: merge-recursive.c:1919

885 +#: merge-recursive.c:1914

886 #, c-format

887 msgid "found %u common ancestor:"

888 msgid_plural "found %u common ancestors:"

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

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

891

834 -#: merge-recursive.c:1956

892 +#: merge-recursive.c:1951

893 msgid "merge returned no commit"

894 msgstr "合并未返回提交"

895

838 -#: merge-recursive.c:2013

896 +#: merge-recursive.c:2008

897 #, c-format

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

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

900

843 -#: merge-recursive.c:2024 builtin/merge.c:666

901 +#: merge-recursive.c:2019 builtin/merge.c:666

902 msgid "Unable to write index."

903 msgstr "不能写入索引。"

904

@@ -865,34 +923,34 @@ msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解"

923 msgid "Bad %s value: '%s'"

924 msgstr "坏的 %s 值：'%s'"

925

868 -#: object.c:234

926 +#: object.c:241

927 #, c-format

928 msgid "unable to parse object: %s"

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

930

873 -#: parse-options.c:534

931 +#: parse-options.c:546

932 msgid "..."

933 msgstr "..."

934

877 -#: parse-options.c:552

935 +#: parse-options.c:564

936 #, c-format

937 msgid "usage: %s"

938 msgstr "用法：%s"

939

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

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

884 -#: parse-options.c:556

942 +#: parse-options.c:568

943 #, c-format

944 msgid " or: %s"

945 msgstr " 或：%s"

946

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

890 -#: parse-options.c:559

948 +#: parse-options.c:571

949 #, c-format

950 msgid " %s"

951 msgstr " %s"

952

895 -#: parse-options.c:593

953 +#: parse-options.c:605

954 msgid "-NUM"

955 msgstr "-数字"

956

@@ -958,11 +1016,15 @@ msgstr ""

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

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

1018

1019 +#: pretty.c:968

1020 +msgid "unable to parse --pretty format"

1021 +msgstr "不能解析 --pretty 格式"

1022 +

1023 #: progress.c:225

1024 msgid "done"

1025 msgstr "完成"

1026

965 -#: read-cache.c:1260

1027 +#: read-cache.c:1261

1028 #, c-format

1029 msgid ""

1030 "index.version set, but the value is invalid.\n"

@@ -971,7 +1033,7 @@ msgstr ""

1033 "设置了 index.version，但是取值无效。\n"

1034 "使用版本 %i"

1035

974 -#: read-cache.c:1270

1036 +#: read-cache.c:1271

1037 #, c-format

1038 msgid ""

1039 "GIT_INDEX_VERSION set, but the value is invalid.\n"

@@ -980,51 +1042,51 @@ msgstr ""

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

1043 "使用版本 %i"

1044

983 -#: remote.c:753

1045 +#: remote.c:782

1046 #, c-format

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

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

1049

988 -#: remote.c:757

1050 +#: remote.c:786

1051 #, c-format

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

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

1054

993 -#: remote.c:761

1055 +#: remote.c:790

1056 #, c-format

1057 msgid "%s tracks both %s and %s"

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

1059

998 -#: remote.c:769

1060 +#: remote.c:798

1061 msgid "Internal error"

1062 msgstr "内部错误"

1063

1002 -#: remote.c:1943

1064 +#: remote.c:1968

1065 #, c-format

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

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

1068

1007 -#: remote.c:1947

1069 +#: remote.c:1972

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

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

1072

1011 -#: remote.c:1950

1073 +#: remote.c:1975

1074 #, c-format

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

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

1077

1016 -#: remote.c:1954

1078 +#: remote.c:1979

1079 #, c-format

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

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

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

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

1084

1023 -#: remote.c:1960

1085 +#: remote.c:1985

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

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

1088

1027 -#: remote.c:1963

1089 +#: remote.c:1988

1090 #, c-format

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

1092 msgid_plural ""

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

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

1096

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

1036 -#: remote.c:1971

1098 +#: remote.c:1996

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

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

1101

1040 -#: remote.c:1974

1102 +#: remote.c:1999

1103 #, c-format

1104 msgid ""

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

@@ -1053,32 +1115,40 @@ msgstr[1] ""

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

1116

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

1056 -#: remote.c:1984

1118 +#: remote.c:2009

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

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

1121

1060 -#: run-command.c:80

1122 +#: run-command.c:87

1123 msgid "open /dev/null failed"

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

1125

1064 -#: run-command.c:82

1126 +#: run-command.c:89

1127 #, c-format

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

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

1130

1069 -#: sequencer.c:171 builtin/merge.c:782 builtin/merge.c:893

1070 -#: builtin/merge.c:1003 builtin/merge.c:1013

1131 +#: send-pack.c:265

1132 +msgid "failed to sign the push certificate"

1133 +msgstr "无法为推送证书签名"

1134 +

1135 +#: send-pack.c:322

1136 +msgid "the receiving end does not support --signed push"

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

1138 +

1139 +#: sequencer.c:172 builtin/merge.c:781 builtin/merge.c:892

1140 +#: builtin/merge.c:1002 builtin/merge.c:1012

1141 #, c-format

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

1143 msgstr "不能为写入打开 '%s'"

1144

1075 -#: sequencer.c:173 builtin/merge.c:343 builtin/merge.c:785

1076 -#: builtin/merge.c:1005 builtin/merge.c:1018

1145 +#: sequencer.c:174 builtin/merge.c:343 builtin/merge.c:784

1146 +#: builtin/merge.c:1004 builtin/merge.c:1017

1147 #, c-format

1148 msgid "Could not write to '%s'"

1149 msgstr "不能写入 '%s'"

1150

1081 -#: sequencer.c:194

1151 +#: sequencer.c:195

1152 msgid ""

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

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

@@ -1086,7 +1156,7 @@ msgstr ""

1156 "冲突解决完毕后，用 'git add <paths>' 或 'git rm <paths>'\n"

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

1158

1089 -#: sequencer.c:197

1159 +#: sequencer.c:198

1160 msgid ""

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

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

@@ -1095,228 +1165,224 @@ msgstr ""

1165 "冲突解决完毕后，用 'git add <paths>' 或 'git rm <paths>'\n"

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

1167

1098 -#: sequencer.c:210 sequencer.c:841 sequencer.c:924

1168 +#: sequencer.c:211 sequencer.c:852 sequencer.c:935

1169 #, c-format

1170 msgid "Could not write to %s"

1171 msgstr "不能写入 %s"

1172

1103 -#: sequencer.c:213

1173 +#: sequencer.c:214

1174 #, c-format

1175 msgid "Error wrapping up %s"

1176 msgstr "错误收尾 %s"

1177

1108 -#: sequencer.c:228

1178 +#: sequencer.c:229

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

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

1181

1112 -#: sequencer.c:230

1182 +#: sequencer.c:231

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

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

1185

1116 -#: sequencer.c:233

1186 +#: sequencer.c:234

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

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

1189

1120 -#: sequencer.c:250

1121 -msgid "Failed to lock HEAD during fast_forward_to"

1122 -msgstr "在快进时无法为 HEAD 加锁"

1123 -

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

1125 -#: sequencer.c:293

1191 +#: sequencer.c:304

1192 #, c-format

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

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

1195

1130 -#: sequencer.c:324

1196 +#: sequencer.c:335

1197 msgid "Could not resolve HEAD commit\n"

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

1199

1134 -#: sequencer.c:344

1200 +#: sequencer.c:355

1201 msgid "Unable to update cache tree\n"

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

1203

1138 -#: sequencer.c:391

1204 +#: sequencer.c:402

1205 #, c-format

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

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

1208

1143 -#: sequencer.c:396

1209 +#: sequencer.c:407

1210 #, c-format

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

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

1213

1148 -#: sequencer.c:462

1214 +#: sequencer.c:473

1215 msgid "Your index file is unmerged."

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

1217

1152 -#: sequencer.c:481

1218 +#: sequencer.c:492

1219 #, c-format

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

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

1222

1157 -#: sequencer.c:489

1223 +#: sequencer.c:500

1224 #, c-format

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

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

1227

1162 -#: sequencer.c:493

1228 +#: sequencer.c:504

1229 #, c-format

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

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

1232

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

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

1169 -#: sequencer.c:506

1235 +#: sequencer.c:517

1236 #, c-format

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

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

1239

1174 -#: sequencer.c:510

1240 +#: sequencer.c:521

1241 #, c-format

1242 msgid "Cannot get commit message for %s"

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

1244

1179 -#: sequencer.c:596

1245 +#: sequencer.c:607

1246 #, c-format

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

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

1249

1184 -#: sequencer.c:597

1250 +#: sequencer.c:608

1251 #, c-format

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

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

1254

1189 -#: sequencer.c:633

1255 +#: sequencer.c:644

1256 msgid "empty commit set passed"

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

1258

1193 -#: sequencer.c:641

1259 +#: sequencer.c:652

1260 #, c-format

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

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

1263

1198 -#: sequencer.c:645

1264 +#: sequencer.c:656

1265 #, c-format

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

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

1268

1203 -#: sequencer.c:705

1269 +#: sequencer.c:716

1270 #, c-format

1271 msgid "Cannot %s during a %s"

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

1273

1208 -#: sequencer.c:727

1274 +#: sequencer.c:738

1275 #, c-format

1276 msgid "Could not parse line %d."

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

1278

1213 -#: sequencer.c:732

1279 +#: sequencer.c:743

1280 msgid "No commits parsed."

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

1282

1217 -#: sequencer.c:745

1283 +#: sequencer.c:756

1284 #, c-format

1285 msgid "Could not open %s"

1286 msgstr "不能打开 %s"

1287

1222 -#: sequencer.c:749

1288 +#: sequencer.c:760

1289 #, c-format

1290 msgid "Could not read %s."

1291 msgstr "不能读取 %s。"

1292

1227 -#: sequencer.c:756

1293 +#: sequencer.c:767

1294 #, c-format

1295 msgid "Unusable instruction sheet: %s"

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

1297

1232 -#: sequencer.c:786

1298 +#: sequencer.c:797

1299 #, c-format

1300 msgid "Invalid key: %s"

1301 msgstr "无效键名：%s"

1302

1237 -#: sequencer.c:789

1303 +#: sequencer.c:800

1304 #, c-format

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

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

1307

1242 -#: sequencer.c:801

1308 +#: sequencer.c:812

1309 #, c-format

1310 msgid "Malformed options sheet: %s"

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

1312

1247 -#: sequencer.c:822

1313 +#: sequencer.c:833

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

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

1316

1251 -#: sequencer.c:823

1317 +#: sequencer.c:834

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

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

1320

1255 -#: sequencer.c:827

1321 +#: sequencer.c:838

1322 #, c-format

1323 msgid "Could not create sequencer directory %s"

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

1325

1260 -#: sequencer.c:843 sequencer.c:928

1326 +#: sequencer.c:854 sequencer.c:939

1327 #, c-format

1328 msgid "Error wrapping up %s."

1329 msgstr "错误收尾 %s。"

1330

1265 -#: sequencer.c:862 sequencer.c:998

1331 +#: sequencer.c:873 sequencer.c:1009

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

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

1334

1269 -#: sequencer.c:864

1335 +#: sequencer.c:875

1336 msgid "cannot resolve HEAD"

1337 msgstr "不能解析 HEAD"

1338

1273 -#: sequencer.c:866

1339 +#: sequencer.c:877

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

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

1342

1277 -#: sequencer.c:888 builtin/apply.c:4062

1343 +#: sequencer.c:899 builtin/apply.c:4128

1344 #, c-format

1345 msgid "cannot open %s: %s"

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

1347

1282 -#: sequencer.c:891

1348 +#: sequencer.c:902

1349 #, c-format

1350 msgid "cannot read %s: %s"

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

1352

1287 -#: sequencer.c:892

1353 +#: sequencer.c:903

1354 msgid "unexpected end of file"

1355 msgstr "意外的文件结束"

1356

1291 -#: sequencer.c:898

1357 +#: sequencer.c:909

1358 #, c-format

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

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

1361

1296 -#: sequencer.c:921

1362 +#: sequencer.c:932

1363 #, c-format

1364 msgid "Could not format %s."

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

1366

1301 -#: sequencer.c:1066

1367 +#: sequencer.c:1077

1368 #, c-format

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

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

1371

1306 -#: sequencer.c:1069

1372 +#: sequencer.c:1080

1373 #, c-format

1374 msgid "%s: bad revision"

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

1376

1311 -#: sequencer.c:1103

1377 +#: sequencer.c:1114

1378 msgid "Can't revert as initial commit"

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

1380

1315 -#: sequencer.c:1104

1381 +#: sequencer.c:1115

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

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

1384

1319 -#: sha1_name.c:439

1385 +#: sha1_name.c:440

1386 msgid ""

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

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

@@ -1337,21 +1403,21 @@ msgstr ""

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

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

1405

1340 -#: sha1_name.c:1060

1406 +#: sha1_name.c:1068

1407 msgid "HEAD does not point to a branch"

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

1409

1344 -#: sha1_name.c:1063

1410 +#: sha1_name.c:1071

1411 #, c-format

1412 msgid "No such branch: '%s'"

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

1414

1349 -#: sha1_name.c:1065

1415 +#: sha1_name.c:1073

1416 #, c-format

1417 msgid "No upstream configured for branch '%s'"

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

1419

1354 -#: sha1_name.c:1069

1420 +#: sha1_name.c:1077

1421 #, c-format

1422 msgid "Upstream branch '%s' not stored as a remote-tracking branch"

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

@@ -1379,16 +1445,41 @@ msgstr "无法移除 %s 的 .gitmodules 条目"

1445 msgid "staging updated .gitmodules failed"

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

1447

1382 -#: submodule.c:1118 builtin/init-db.c:363

1448 +#: submodule.c:1111 builtin/init-db.c:363

1449 #, c-format

1450 msgid "Could not create git link %s"

1451 msgstr "不能创建 git link %s"

1452

1387 -#: submodule.c:1129

1453 +#: submodule.c:1122

1454 #, c-format

1455 msgid "Could not set core.worktree in %s"

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

1457

1458 +#: trailer.c:500 trailer.c:504 trailer.c:508 trailer.c:562 trailer.c:566

1459 +#: trailer.c:570

1460 +#, c-format

1461 +msgid "unknown value '%s' for key '%s'"

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

1463 +

1464 +#: trailer.c:552 trailer.c:557 builtin/remote.c:288

1465 +#, c-format

1466 +msgid "more than one %s"

1467 +msgstr "多于一个 %s"

1468 +

1469 +#: trailer.c:587

1470 +#, c-format

1471 +msgid "empty trailer token in trailer '%s'"

1472 +msgstr "签名 '%s' 的键为空"

1473 +

1474 +#: trailer.c:706

1475 +#, c-format

1476 +msgid "could not read input file '%s'"

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

1478 +

1479 +#: trailer.c:709

1480 +msgid "could not read from stdin"

1481 +msgstr "不能自标准输入读取"

1482 +

1483 #: unpack-trees.c:202

1484 msgid "Checking out files"

1485 msgstr "正在检出文件"

@@ -1422,25 +1513,29 @@ msgstr "无效的端口号"

1513 msgid "invalid '..' path segment"

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

1515

1425 -#: wrapper.c:460

1516 +#: wrapper.c:509

1517 #, c-format

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

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

1520

1430 -#: wrapper.c:481

1521 +#: wrapper.c:530

1522 #, c-format

1523 msgid "unable to access '%s'"

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

1525

1435 -#: wrapper.c:492

1526 +#: wrapper.c:541

1527 #, c-format

1528 msgid "unable to look up current user in the passwd file: %s"

1529 msgstr "无法在口令文件中查询到当前用户：%s"

1530

1440 -#: wrapper.c:493

1531 +#: wrapper.c:542

1532 msgid "no such user"

1533 msgstr "无此用户"

1534

1535 +#: wrapper.c:550

1536 +msgid "unable to get current working directory"

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

1538 +

1539 #: wt-status.c:150

1540 msgid "Unmerged paths:"

1541 msgstr "未合并的路径："

@@ -1591,15 +1686,15 @@ msgstr "未跟踪的内容, "

1686 msgid "bug: unhandled diff status %c"

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

1688

1594 -#: wt-status.c:764

1689 +#: wt-status.c:761

1690 msgid "Submodules changed but not updated:"

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

1692

1598 -#: wt-status.c:766

1693 +#: wt-status.c:763

1694 msgid "Submodule changes to be committed:"

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

1696

1602 -#: wt-status.c:845

1697 +#: wt-status.c:842

1698 msgid ""

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

1700 "Everything below will be removed."

@@ -1607,198 +1702,198 @@ msgstr ""

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

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

1704

1610 -#: wt-status.c:936

1705 +#: wt-status.c:933

1706 msgid "You have unmerged paths."

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

1708

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

1615 -#: wt-status.c:939

1710 +#: wt-status.c:936

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

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

1713

1619 -#: wt-status.c:942

1714 +#: wt-status.c:939

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

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

1717

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

1624 -#: wt-status.c:945

1719 +#: wt-status.c:942

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

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

1722

1628 -#: wt-status.c:955

1723 +#: wt-status.c:952

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

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

1726

1632 -#: wt-status.c:958

1727 +#: wt-status.c:955

1728 msgid "The current patch is empty."

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

1730

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

1637 -#: wt-status.c:962

1732 +#: wt-status.c:959

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

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

1735

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

1642 -#: wt-status.c:964

1737 +#: wt-status.c:961

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

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

1740

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

1647 -#: wt-status.c:966

1742 +#: wt-status.c:963

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

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

1745

1651 -#: wt-status.c:1026 wt-status.c:1043

1746 +#: wt-status.c:1023 wt-status.c:1040

1747 #, c-format

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

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

1750

1656 -#: wt-status.c:1031 wt-status.c:1048

1751 +#: wt-status.c:1028 wt-status.c:1045

1752 msgid "You are currently rebasing."

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

1754

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

1661 -#: wt-status.c:1034

1756 +#: wt-status.c:1031

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

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

1759

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

1666 -#: wt-status.c:1036

1761 +#: wt-status.c:1033

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

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

1764

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

1671 -#: wt-status.c:1038

1766 +#: wt-status.c:1035

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

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

1769

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

1676 -#: wt-status.c:1051

1771 +#: wt-status.c:1048

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

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

1774

1680 -#: wt-status.c:1055

1775 +#: wt-status.c:1052

1776 #, c-format

1777 msgid ""

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

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

1780

1686 -#: wt-status.c:1060

1781 +#: wt-status.c:1057

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

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

1784

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

1691 -#: wt-status.c:1063

1786 +#: wt-status.c:1060

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

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

1789

1695 -#: wt-status.c:1067

1790 +#: wt-status.c:1064

1791 #, c-format

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

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

1794

1700 -#: wt-status.c:1072

1795 +#: wt-status.c:1069

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

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

1798

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

1705 -#: wt-status.c:1075

1800 +#: wt-status.c:1072

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

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

1803

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

1710 -#: wt-status.c:1077

1805 +#: wt-status.c:1074

1806 msgid ""

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

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

1809

1715 -#: wt-status.c:1087

1810 +#: wt-status.c:1084

1811 #, c-format

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

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

1814

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

1721 -#: wt-status.c:1092

1816 +#: wt-status.c:1089

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

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

1819

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

1726 -#: wt-status.c:1095

1821 +#: wt-status.c:1092

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

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

1824

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

1731 -#: wt-status.c:1097

1826 +#: wt-status.c:1094

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

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

1829

1735 -#: wt-status.c:1106

1830 +#: wt-status.c:1103

1831 #, c-format

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

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

1834

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

1741 -#: wt-status.c:1111

1836 +#: wt-status.c:1108

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

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

1839

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

1746 -#: wt-status.c:1114

1841 +#: wt-status.c:1111

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

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

1844

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

1751 -#: wt-status.c:1116

1846 +#: wt-status.c:1113

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

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

1849

1755 -#: wt-status.c:1127

1850 +#: wt-status.c:1124

1851 #, c-format

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

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

1854

1760 -#: wt-status.c:1131

1855 +#: wt-status.c:1128

1856 msgid "You are currently bisecting."

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

1858

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

1765 -#: wt-status.c:1134

1860 +#: wt-status.c:1131

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

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

1863

1769 -#: wt-status.c:1309

1864 +#: wt-status.c:1306

1865 msgid "On branch "

1866 msgstr "位于分支 "

1867

1773 -#: wt-status.c:1316

1868 +#: wt-status.c:1313

1869 msgid "rebase in progress; onto "

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

1871

1777 -#: wt-status.c:1323

1872 +#: wt-status.c:1320

1873 msgid "HEAD detached at "

1874 msgstr "头指针分离于 "

1875

1781 -#: wt-status.c:1325

1876 +#: wt-status.c:1322

1877 msgid "HEAD detached from "

1878 msgstr "头指针分离自 "

1879

1785 -#: wt-status.c:1328

1880 +#: wt-status.c:1325

1881 msgid "Not currently on any branch."

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

1883

1789 -#: wt-status.c:1345

1884 +#: wt-status.c:1342

1885 msgid "Initial commit"

1886 msgstr "初始提交"

1887

1793 -#: wt-status.c:1359

1888 +#: wt-status.c:1356

1889 msgid "Untracked files"

1890 msgstr "未跟踪的文件"

1891

1797 -#: wt-status.c:1361

1892 +#: wt-status.c:1358

1893 msgid "Ignored files"

1894 msgstr "忽略的文件"

1895

1801 -#: wt-status.c:1365

1896 +#: wt-status.c:1362

1897 #, c-format

1898 msgid ""

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

@@ -1808,129 +1903,129 @@ msgstr ""

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

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

1905

1811 -#: wt-status.c:1371

1906 +#: wt-status.c:1368

1907 #, c-format

1908 msgid "Untracked files not listed%s"

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

1910

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

1817 -#: wt-status.c:1373

1912 +#: wt-status.c:1370

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

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

1915

1821 -#: wt-status.c:1379

1916 +#: wt-status.c:1376

1917 msgid "No changes"

1918 msgstr "没有修改"

1919

1825 -#: wt-status.c:1384

1920 +#: wt-status.c:1381

1921 #, c-format

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

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

1924

1830 -#: wt-status.c:1387

1925 +#: wt-status.c:1384

1926 #, c-format

1927 msgid "no changes added to commit\n"

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

1929

1835 -#: wt-status.c:1390

1930 +#: wt-status.c:1387

1931 #, c-format

1932 msgid ""

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

1934 "track)\n"

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

1936

1842 -#: wt-status.c:1393

1937 +#: wt-status.c:1390

1938 #, c-format

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

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

1941

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

1848 -#: wt-status.c:1396

1943 +#: wt-status.c:1393

1944 #, c-format

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

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

1947

1853 -#: wt-status.c:1399 wt-status.c:1404

1948 +#: wt-status.c:1396 wt-status.c:1401

1949 #, c-format

1950 msgid "nothing to commit\n"

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

1952

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

1859 -#: wt-status.c:1402

1954 +#: wt-status.c:1399

1955 #, c-format

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

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

1958

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

1865 -#: wt-status.c:1406

1960 +#: wt-status.c:1403

1961 #, c-format

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

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

1964

1870 -#: wt-status.c:1515

1965 +#: wt-status.c:1512

1966 msgid "HEAD (no branch)"

1967 msgstr "HEAD（非分支）"

1968

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

1875 -#: wt-status.c:1521

1970 +#: wt-status.c:1518

1971 msgid "Initial commit on "

1972 msgstr "初始提交于 "

1973

1879 -#: wt-status.c:1553

1974 +#: wt-status.c:1550

1975 msgid "gone"

1976 msgstr "丢失"

1977

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

1884 -#: wt-status.c:1555 wt-status.c:1563

1979 +#: wt-status.c:1552 wt-status.c:1560

1980 msgid "behind "

1981 msgstr "落后 "

1982

1888 -#: compat/precompose_utf8.c:55 builtin/clone.c:356

1983 +#: compat/precompose_utf8.c:55 builtin/clone.c:357

1984 #, c-format

1985 msgid "failed to unlink '%s'"

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

1987

1893 -#: builtin/add.c:21

1988 +#: builtin/add.c:22

1989 msgid "git add [options] [--] <pathspec>..."

1990 msgstr "git add [选项] [--] <路径规则>..."

1991

1897 -#: builtin/add.c:64

1992 +#: builtin/add.c:65

1993 #, c-format

1994 msgid "unexpected diff status %c"

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

1996

1902 -#: builtin/add.c:69 builtin/commit.c:261

1997 +#: builtin/add.c:70 builtin/commit.c:275

1998 msgid "updating files failed"

1999 msgstr "更新文件失败"

2000

1906 -#: builtin/add.c:79

2001 +#: builtin/add.c:80

2002 #, c-format

2003 msgid "remove '%s'\n"

2004 msgstr "删除 '%s'\n"

2005

1911 -#: builtin/add.c:133

2006 +#: builtin/add.c:134

2007 msgid "Unstaged changes after refreshing the index:"

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

2009

1915 -#: builtin/add.c:193 builtin/rev-parse.c:781

2010 +#: builtin/add.c:194 builtin/rev-parse.c:785

2011 msgid "Could not read the index"

2012 msgstr "不能读取索引"

2013

1919 -#: builtin/add.c:204

2014 +#: builtin/add.c:205

2015 #, c-format

2016 msgid "Could not open '%s' for writing."

2017 msgstr "不能打开 '%s' 以写入。"

2018

1924 -#: builtin/add.c:208

2019 +#: builtin/add.c:209

2020 msgid "Could not write patch"

2021 msgstr "不能生成补丁"

2022

1928 -#: builtin/add.c:213

2023 +#: builtin/add.c:214

2024 #, c-format

2025 msgid "Could not stat '%s'"

2026 msgstr "不能查看文件状态 '%s'"

2027

1933 -#: builtin/add.c:215

2028 +#: builtin/add.c:216

2029 msgid "Empty patch. Aborted."

2030 msgstr "空补丁。异常终止。"

2031

@@ -1943,15 +2038,15 @@ msgstr "不能应用 '%s'"

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

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

2040

1946 -#: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:70

1947 -#: builtin/prune-packed.c:77 builtin/push.c:488 builtin/remote.c:1367

2041 +#: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:110

2042 +#: builtin/prune-packed.c:55 builtin/push.c:499 builtin/remote.c:1375

2043 #: builtin/rm.c:269

2044 msgid "dry run"

2045 msgstr "演习"

2046

1952 -#: builtin/add.c:249 builtin/apply.c:4411 builtin/check-ignore.c:19

1953 -#: builtin/commit.c:1328 builtin/count-objects.c:95 builtin/fsck.c:606

1954 -#: builtin/log.c:1613 builtin/mv.c:69 builtin/read-tree.c:113

2047 +#: builtin/add.c:249 builtin/apply.c:4415 builtin/check-ignore.c:19

2048 +#: builtin/commit.c:1362 builtin/count-objects.c:63 builtin/fsck.c:608

2049 +#: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114

2050 msgid "be verbose"

2051 msgstr "冗长输出"

2052

@@ -1959,7 +2054,7 @@ msgstr "冗长输出"

2054 msgid "interactive picking"

2055 msgstr "交互式拣选"

2056

1962 -#: builtin/add.c:252 builtin/checkout.c:1102 builtin/reset.c:285

2057 +#: builtin/add.c:252 builtin/checkout.c:1108 builtin/reset.c:286

2058 msgid "select hunks interactively"

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

2060

@@ -2031,74 +2126,74 @@ msgid "Maybe you wanted to say 'git add .'?\n"

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

2127

2128 #: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:919

2034 -#: builtin/commit.c:319 builtin/mv.c:90 builtin/reset.c:234 builtin/rm.c:299

2129 +#: builtin/commit.c:333 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299

2130 msgid "index file corrupt"

2131 msgstr "索引文件损坏"

2132

2038 -#: builtin/add.c:446 builtin/apply.c:4506 builtin/mv.c:280 builtin/rm.c:431

2133 +#: builtin/add.c:446 builtin/apply.c:4510 builtin/mv.c:279 builtin/rm.c:431

2134 msgid "Unable to write new index file"

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

2136

2042 -#: builtin/apply.c:57

2137 +#: builtin/apply.c:58

2138 msgid "git apply [options] [<patch>...]"

2139 msgstr "git apply [选项] [<补丁>...]"

2140

2046 -#: builtin/apply.c:110

2141 +#: builtin/apply.c:111

2142 #, c-format

2143 msgid "unrecognized whitespace option '%s'"

2144 msgstr "未能识别的空白字符选项 '%s'"

2145

2051 -#: builtin/apply.c:125

2146 +#: builtin/apply.c:126

2147 #, c-format

2148 msgid "unrecognized whitespace ignore option '%s'"

2149 msgstr "未能识别的空白字符忽略选项 '%s'"

2150

2056 -#: builtin/apply.c:825

2151 +#: builtin/apply.c:826

2152 #, c-format

2153 msgid "Cannot prepare timestamp regexp %s"

2154 msgstr "无法准备时间戳正则表达式 %s"

2155

2061 -#: builtin/apply.c:834

2156 +#: builtin/apply.c:835

2157 #, c-format

2158 msgid "regexec returned %d for input: %s"

2159 msgstr "regexec 返回 %d，输入为：%s"

2160

2066 -#: builtin/apply.c:915

2161 +#: builtin/apply.c:916

2162 #, c-format

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

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

2165

2071 -#: builtin/apply.c:947

2166 +#: builtin/apply.c:948

2167 #, c-format

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

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

2170

2076 -#: builtin/apply.c:951

2171 +#: builtin/apply.c:952

2172 #, c-format

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

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

2175

2081 -#: builtin/apply.c:952

2176 +#: builtin/apply.c:953

2177 #, c-format

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

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

2180

2086 -#: builtin/apply.c:959

2181 +#: builtin/apply.c:960

2182 #, c-format

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

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

2185

2091 -#: builtin/apply.c:1422

2186 +#: builtin/apply.c:1423

2187 #, c-format

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

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

2190

2096 -#: builtin/apply.c:1479

2191 +#: builtin/apply.c:1480

2192 #, c-format

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

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

2195

2101 -#: builtin/apply.c:1496

2196 +#: builtin/apply.c:1497

2197 #, c-format

2198 msgid ""

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

@@ -2109,77 +2204,77 @@ msgid_plural ""

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

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

2206

2112 -#: builtin/apply.c:1656

2207 +#: builtin/apply.c:1657

2208 msgid "new file depends on old contents"

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

2210

2116 -#: builtin/apply.c:1658

2211 +#: builtin/apply.c:1659

2212 msgid "deleted file still has contents"

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

2214

2120 -#: builtin/apply.c:1684

2215 +#: builtin/apply.c:1685

2216 #, c-format

2217 msgid "corrupt patch at line %d"

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

2219

2125 -#: builtin/apply.c:1720

2220 +#: builtin/apply.c:1721

2221 #, c-format

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

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

2224

2130 -#: builtin/apply.c:1722

2225 +#: builtin/apply.c:1723

2226 #, c-format

2227 msgid "deleted file %s still has contents"

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

2229

2135 -#: builtin/apply.c:1725

2230 +#: builtin/apply.c:1726

2231 #, c-format

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

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

2234

2140 -#: builtin/apply.c:1871

2235 +#: builtin/apply.c:1872

2236 #, c-format

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

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

2239

2145 -#: builtin/apply.c:1900

2240 +#: builtin/apply.c:1901

2241 #, c-format

2242 msgid "unrecognized binary patch at line %d"

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

2244

2150 -#: builtin/apply.c:1986

2245 +#: builtin/apply.c:2052

2246 #, c-format

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

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

2249

2155 -#: builtin/apply.c:2076

2250 +#: builtin/apply.c:2142

2251 #, c-format

2252 msgid "unable to read symlink %s"

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

2254

2160 -#: builtin/apply.c:2080

2255 +#: builtin/apply.c:2146

2256 #, c-format

2257 msgid "unable to open or read %s"

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

2259

2165 -#: builtin/apply.c:2688

2260 +#: builtin/apply.c:2754

2261 #, c-format

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

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

2264

2170 -#: builtin/apply.c:2806

2265 +#: builtin/apply.c:2872

2266 #, c-format

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

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

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

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

2271

2177 -#: builtin/apply.c:2818

2272 +#: builtin/apply.c:2884

2273 #, c-format

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

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

2276

2182 -#: builtin/apply.c:2824

2277 +#: builtin/apply.c:2890

2278 #, c-format

2279 msgid ""

2280 "while searching for:\n"

@@ -2188,317 +2283,317 @@ msgstr ""

2283 "当查询：\n"

2284 "%.*s"

2285

2191 -#: builtin/apply.c:2843

2286 +#: builtin/apply.c:2909

2287 #, c-format

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

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

2290

2196 -#: builtin/apply.c:2944

2291 +#: builtin/apply.c:3010

2292 #, c-format

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

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

2295

2201 -#: builtin/apply.c:2950

2296 +#: builtin/apply.c:3016

2297 #, c-format

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

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

2300

2206 -#: builtin/apply.c:2971

2301 +#: builtin/apply.c:3037

2302 #, c-format

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

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

2305

2211 -#: builtin/apply.c:3095

2306 +#: builtin/apply.c:3161

2307 #, c-format

2308 msgid "cannot checkout %s"

2309 msgstr "不能检出 %s"

2310

2216 -#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3194

2311 +#: builtin/apply.c:3206 builtin/apply.c:3215 builtin/apply.c:3260

2312 #, c-format

2313 msgid "read of %s failed"

2314 msgstr "读取 %s 失败"

2315

2221 -#: builtin/apply.c:3174 builtin/apply.c:3396

2316 +#: builtin/apply.c:3240 builtin/apply.c:3462

2317 #, c-format

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

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

2320

2226 -#: builtin/apply.c:3255 builtin/apply.c:3410

2321 +#: builtin/apply.c:3321 builtin/apply.c:3476

2322 #, c-format

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

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

2325

2231 -#: builtin/apply.c:3259 builtin/apply.c:3402 builtin/apply.c:3424

2326 +#: builtin/apply.c:3325 builtin/apply.c:3468 builtin/apply.c:3490

2327 #, c-format

2328 msgid "%s: %s"

2329 msgstr "%s：%s"

2330

2236 -#: builtin/apply.c:3264 builtin/apply.c:3418

2331 +#: builtin/apply.c:3330 builtin/apply.c:3484

2332 #, c-format

2333 msgid "%s: does not match index"

2334 msgstr "%s：和索引不匹配"

2335

2241 -#: builtin/apply.c:3366

2336 +#: builtin/apply.c:3432

2337 msgid "removal patch leaves file contents"

2338 msgstr "移除补丁仍留下了文件内容"

2339

2245 -#: builtin/apply.c:3435

2340 +#: builtin/apply.c:3501

2341 #, c-format

2342 msgid "%s: wrong type"

2343 msgstr "%s：错误类型"

2344

2250 -#: builtin/apply.c:3437

2345 +#: builtin/apply.c:3503

2346 #, c-format

2347 msgid "%s has type %o, expected %o"

2348 msgstr "%s 的类型是 %o，应为 %o"

2349

2255 -#: builtin/apply.c:3538

2350 +#: builtin/apply.c:3604

2351 #, c-format

2352 msgid "%s: already exists in index"

2353 msgstr "%s：已经存在于索引中"

2354

2260 -#: builtin/apply.c:3541

2355 +#: builtin/apply.c:3607

2356 #, c-format

2357 msgid "%s: already exists in working directory"

2358 msgstr "%s：已经存在于工作区中"

2359

2265 -#: builtin/apply.c:3561

2360 +#: builtin/apply.c:3627

2361 #, c-format

2362 msgid "new mode (%o) of %s does not match old mode (%o)"

2363 msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配"

2364

2270 -#: builtin/apply.c:3566

2365 +#: builtin/apply.c:3632

2366 #, c-format

2367 msgid "new mode (%o) of %s does not match old mode (%o) of %s"

2368 msgstr "%2$s 的新模式（%1$o）和 %4$s 的旧模式（%3$o）不匹配"

2369

2275 -#: builtin/apply.c:3574

2370 +#: builtin/apply.c:3640

2371 #, c-format

2372 msgid "%s: patch does not apply"

2373 msgstr "%s：补丁未应用"

2374

2280 -#: builtin/apply.c:3587

2375 +#: builtin/apply.c:3653

2376 #, c-format

2377 msgid "Checking patch %s..."

2378 msgstr "检查补丁 %s..."

2379

2285 -#: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:134

2380 +#: builtin/apply.c:3746 builtin/checkout.c:213 builtin/reset.c:135

2381 #, c-format

2382 msgid "make_cache_entry failed for path '%s'"

2383 msgstr "对路径 '%s' 的 make_cache_entry 操作失败"

2384

2290 -#: builtin/apply.c:3823

2385 +#: builtin/apply.c:3889

2386 #, c-format

2387 msgid "unable to remove %s from index"

2388 msgstr "不能从索引中移除 %s"

2389

2295 -#: builtin/apply.c:3852

2390 +#: builtin/apply.c:3918

2391 #, c-format

2392 msgid "corrupt patch for submodule %s"

2393 msgstr "子模组 %s 损坏的补丁"

2394

2300 -#: builtin/apply.c:3856

2395 +#: builtin/apply.c:3922

2396 #, c-format

2397 msgid "unable to stat newly created file '%s'"

2398 msgstr "不能枚举新建文件 '%s' 的状态"

2399

2305 -#: builtin/apply.c:3861

2400 +#: builtin/apply.c:3927

2401 #, c-format

2402 msgid "unable to create backing store for newly created file %s"

2403 msgstr "不能为新建文件 %s 创建后端存储"

2404

2310 -#: builtin/apply.c:3864 builtin/apply.c:3972

2405 +#: builtin/apply.c:3930 builtin/apply.c:4038

2406 #, c-format

2407 msgid "unable to add cache entry for %s"

2408 msgstr "无法为 %s 添加缓存条目"

2409

2315 -#: builtin/apply.c:3897

2410 +#: builtin/apply.c:3963

2411 #, c-format

2412 msgid "closing file '%s'"

2413 msgstr "关闭文件 '%s'"

2414

2320 -#: builtin/apply.c:3946

2415 +#: builtin/apply.c:4012

2416 #, c-format

2417 msgid "unable to write file '%s' mode %o"

2418 msgstr "不能写文件 '%s' 权限 %o"

2419

2325 -#: builtin/apply.c:4033

2420 +#: builtin/apply.c:4099

2421 #, c-format

2422 msgid "Applied patch %s cleanly."

2423 msgstr "成功应用补丁 %s。"

2424

2330 -#: builtin/apply.c:4041

2425 +#: builtin/apply.c:4107

2426 msgid "internal error"

2427 msgstr "内部错误"

2428

2334 -#: builtin/apply.c:4044

2429 +#: builtin/apply.c:4110

2430 #, c-format

2431 msgid "Applying patch %%s with %d reject..."

2432 msgid_plural "Applying patch %%s with %d rejects..."

2433 msgstr[0] "应用 %%s 个补丁，其中 %d 个被拒绝..."

2434 msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..."

2435

2341 -#: builtin/apply.c:4054

2436 +#: builtin/apply.c:4120

2437 #, c-format

2438 msgid "truncating .rej filename to %.*s.rej"

2439 msgstr "截短 .rej 文件名为 %.*s.rej"

2440

2346 -#: builtin/apply.c:4075

2441 +#: builtin/apply.c:4141

2442 #, c-format

2443 msgid "Hunk #%d applied cleanly."

2444 msgstr "第 #%d 个片段成功应用。"

2445

2351 -#: builtin/apply.c:4078

2446 +#: builtin/apply.c:4144

2447 #, c-format

2448 msgid "Rejected hunk #%d."

2449 msgstr "拒绝第 #%d 个片段。"

2450

2356 -#: builtin/apply.c:4228

2451 +#: builtin/apply.c:4234

2452 msgid "unrecognized input"

2453 msgstr "未能识别的输入"

2454

2360 -#: builtin/apply.c:4239

2455 +#: builtin/apply.c:4245

2456 msgid "unable to read index file"

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

2458

2364 -#: builtin/apply.c:4358 builtin/apply.c:4361 builtin/clone.c:90

2459 +#: builtin/apply.c:4362 builtin/apply.c:4365 builtin/clone.c:91

2460 #: builtin/fetch.c:93

2461 msgid "path"

2462 msgstr "路径"

2463

2369 -#: builtin/apply.c:4359

2464 +#: builtin/apply.c:4363

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

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

2467

2373 -#: builtin/apply.c:4362

2468 +#: builtin/apply.c:4366

2469 msgid "apply changes matching the given path"

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

2471

2377 -#: builtin/apply.c:4364

2472 +#: builtin/apply.c:4368

2473 msgid "num"

2474 msgstr "数字"

2475

2381 -#: builtin/apply.c:4365

2476 +#: builtin/apply.c:4369

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

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

2479

2385 -#: builtin/apply.c:4368

2480 +#: builtin/apply.c:4372

2481 msgid "ignore additions made by the patch"

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

2483

2389 -#: builtin/apply.c:4370

2484 +#: builtin/apply.c:4374

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

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

2487

2393 -#: builtin/apply.c:4374

2488 +#: builtin/apply.c:4378

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

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

2491

2397 -#: builtin/apply.c:4376

2492 +#: builtin/apply.c:4380

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

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

2495

2401 -#: builtin/apply.c:4378

2496 +#: builtin/apply.c:4382

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

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

2499

2405 -#: builtin/apply.c:4380

2500 +#: builtin/apply.c:4384

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

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

2503

2409 -#: builtin/apply.c:4382

2504 +#: builtin/apply.c:4386

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

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

2507

2413 -#: builtin/apply.c:4384

2508 +#: builtin/apply.c:4388

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

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

2511

2417 -#: builtin/apply.c:4386

2512 +#: builtin/apply.c:4390

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

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

2515

2421 -#: builtin/apply.c:4388

2516 +#: builtin/apply.c:4392

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

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

2519

2425 -#: builtin/apply.c:4390 builtin/checkout-index.c:198 builtin/ls-files.c:455

2520 +#: builtin/apply.c:4394 builtin/checkout-index.c:198 builtin/ls-files.c:455

2521 msgid "paths are separated with NUL character"

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

2523

2429 -#: builtin/apply.c:4393

2524 +#: builtin/apply.c:4397

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

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

2527

2433 -#: builtin/apply.c:4394

2528 +#: builtin/apply.c:4398

2529 msgid "action"

2530 msgstr "动作"

2531

2437 -#: builtin/apply.c:4395

2532 +#: builtin/apply.c:4399

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

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

2535

2441 -#: builtin/apply.c:4398 builtin/apply.c:4401

2536 +#: builtin/apply.c:4402 builtin/apply.c:4405

2537 msgid "ignore changes in whitespace when finding context"

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

2539

2445 -#: builtin/apply.c:4404

2540 +#: builtin/apply.c:4408

2541 msgid "apply the patch in reverse"

2542 msgstr "反向应用补丁"

2543

2449 -#: builtin/apply.c:4406

2544 +#: builtin/apply.c:4410

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

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

2547

2453 -#: builtin/apply.c:4408

2548 +#: builtin/apply.c:4412

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

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

2551

2457 -#: builtin/apply.c:4410

2552 +#: builtin/apply.c:4414

2553 msgid "allow overlapping hunks"

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

2555

2461 -#: builtin/apply.c:4413

2556 +#: builtin/apply.c:4417

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

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

2559

2465 -#: builtin/apply.c:4416

2560 +#: builtin/apply.c:4420

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

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

2563

2469 -#: builtin/apply.c:4418

2564 +#: builtin/apply.c:4422

2565 msgid "root"

2566 msgstr "根目录"

2567

2473 -#: builtin/apply.c:4419

2568 +#: builtin/apply.c:4423

2569 msgid "prepend <root> to all filenames"

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

2571

2477 -#: builtin/apply.c:4441

2572 +#: builtin/apply.c:4445

2573 msgid "--3way outside a repository"

2574 msgstr "--3way 在一个版本库之外"

2575

2481 -#: builtin/apply.c:4449

2576 +#: builtin/apply.c:4453

2577 msgid "--index outside a repository"

2578 msgstr "--index 在一个版本库之外"

2579

2485 -#: builtin/apply.c:4452

2580 +#: builtin/apply.c:4456

2581 msgid "--cached outside a repository"

2582 msgstr "--cached 在一个版本库之外"

2583

2489 -#: builtin/apply.c:4468

2584 +#: builtin/apply.c:4472

2585 #, c-format

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

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

2588

2494 -#: builtin/apply.c:4482

2589 +#: builtin/apply.c:4486

2590 #, c-format

2591 msgid "squelched %d whitespace error"

2592 msgid_plural "squelched %d whitespace errors"

2593 msgstr[0] "抑制下仍有 %d 个空白字符误用"

2594 msgstr[1] "抑制下仍有 %d 个空白字符误用"

2595

2501 -#: builtin/apply.c:4488 builtin/apply.c:4498

2596 +#: builtin/apply.c:4492 builtin/apply.c:4502

2597 #, c-format

2598 msgid "%d line adds whitespace errors."

2599 msgid_plural "%d lines add whitespace errors."

@@ -2658,7 +2753,7 @@ msgstr "只处理行范围在 n 和 m 之间的，从 1 开始"

2753 #. takes 22 places, is the longest among various forms of

2754 #. relative timestamps, but your language may need more or

2755 #. fewer display columns.

2661 -#: builtin/blame.c:2599

2756 +#: builtin/blame.c:2602

2757 msgid "4 years, 11 months ago"

2758 msgstr "4 年 11 个月前"

2759

@@ -2679,7 +2774,7 @@ msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"

2774 msgstr "git branch [选项] (-m | -M) [<旧分支>] <新分支>"

2775

2776 # 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长

2682 -#: builtin/branch.c:150

2777 +#: builtin/branch.c:152

2778 #, c-format

2779 msgid ""

2780 "deleting branch '%s' that has been merged to\n"

@@ -2689,7 +2784,7 @@ msgstr ""

2784 " '%s'，但未合并到 HEAD。"

2785

2786 # 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长

2692 -#: builtin/branch.c:154

2787 +#: builtin/branch.c:156

2788 #, c-format

2789 msgid ""

2790 "not deleting branch '%s' that is not yet merged to\n"

@@ -2698,12 +2793,12 @@ msgstr ""

2793 "并未删除分支 '%s'，虽然它已经合并到 HEAD，\n"

2794 " 然而却尚未被合并到分支 '%s' 。"

2795

2701 -#: builtin/branch.c:168

2796 +#: builtin/branch.c:170

2797 #, c-format

2798 msgid "Couldn't look up commit object for '%s'"

2799 msgstr "无法查询 '%s' 指向的提交对象"

2800

2706 -#: builtin/branch.c:172

2801 +#: builtin/branch.c:174

2802 #, c-format

2803 msgid ""

2804 "The branch '%s' is not fully merged.\n"

@@ -2712,338 +2807,338 @@ msgstr ""

2807 "分支 '%s' 没有完全合并。\n"

2808 "如果您确认要删除它，执行 'git branch -D %s'。"

2809

2715 -#: builtin/branch.c:185

2810 +#: builtin/branch.c:187

2811 msgid "Update of config-file failed"

2812 msgstr "无法更新 config 文件"

2813

2719 -#: builtin/branch.c:213

2814 +#: builtin/branch.c:215

2815 msgid "cannot use -a with -d"

2816 msgstr "不能将 -a 和 -d 同时使用"

2817

2723 -#: builtin/branch.c:219

2818 +#: builtin/branch.c:221

2819 msgid "Couldn't look up commit object for HEAD"

2820 msgstr "无法查询 HEAD 指向的提交对象"

2821

2727 -#: builtin/branch.c:227

2822 +#: builtin/branch.c:229

2823 #, c-format

2824 msgid "Cannot delete the branch '%s' which you are currently on."

2825 msgstr "无法删除您当前所在的分支 '%s'。"

2826

2732 -#: builtin/branch.c:240

2827 +#: builtin/branch.c:245

2828 #, c-format

2829 msgid "remote branch '%s' not found."

2830 msgstr "远程分支 '%s' 未发现。"

2831

2737 -#: builtin/branch.c:241

2832 +#: builtin/branch.c:246

2833 #, c-format

2834 msgid "branch '%s' not found."

2835 msgstr "分支 '%s' 未发现。"

2836

2742 -#: builtin/branch.c:255

2837 +#: builtin/branch.c:260

2838 #, c-format

2839 msgid "Error deleting remote branch '%s'"

2840 msgstr "删除远程分支 '%s' 时出错"

2841

2747 -#: builtin/branch.c:256

2842 +#: builtin/branch.c:261

2843 #, c-format

2844 msgid "Error deleting branch '%s'"

2845 msgstr "删除分支 '%s' 时出错"

2846

2752 -#: builtin/branch.c:263

2847 +#: builtin/branch.c:268

2848 #, c-format

2849 msgid "Deleted remote branch %s (was %s).\n"

2850 msgstr "已删除远程分支 %s（曾为 %s）。\n"

2851

2757 -#: builtin/branch.c:264

2852 +#: builtin/branch.c:269

2853 #, c-format

2854 msgid "Deleted branch %s (was %s).\n"

2855 msgstr "已删除分支 %s（曾为 %s）。\n"

2856

2762 -#: builtin/branch.c:366

2857 +#: builtin/branch.c:370

2858 #, c-format

2859 msgid "branch '%s' does not point at a commit"

2860 msgstr "分支 '%s' 未指向一个提交"

2861

2767 -#: builtin/branch.c:454

2862 +#: builtin/branch.c:459

2863 #, c-format

2864 msgid "[%s: gone]"

2865 msgstr "[%s: 丢失]"

2866

2772 -#: builtin/branch.c:459

2867 +#: builtin/branch.c:464

2868 #, c-format

2869 msgid "[%s]"

2870 msgstr "[%s]"

2871

2777 -#: builtin/branch.c:464

2872 +#: builtin/branch.c:469

2873 #, c-format

2874 msgid "[%s: behind %d]"

2875 msgstr "[%s：落后 %d]"

2876

2782 -#: builtin/branch.c:466

2877 +#: builtin/branch.c:471

2878 #, c-format

2879 msgid "[behind %d]"

2880 msgstr "[落后 %d]"

2881

2787 -#: builtin/branch.c:470

2882 +#: builtin/branch.c:475

2883 #, c-format

2884 msgid "[%s: ahead %d]"

2885 msgstr "[%s：领先 %d]"

2886

2792 -#: builtin/branch.c:472

2887 +#: builtin/branch.c:477

2888 #, c-format

2889 msgid "[ahead %d]"

2890 msgstr "[领先 %d]"

2891

2797 -#: builtin/branch.c:475

2892 +#: builtin/branch.c:480

2893 #, c-format

2894 msgid "[%s: ahead %d, behind %d]"

2895 msgstr "[%s：领先 %d，落后 %d]"

2896

2802 -#: builtin/branch.c:478

2897 +#: builtin/branch.c:483

2898 #, c-format

2899 msgid "[ahead %d, behind %d]"

2900 msgstr "[领先 %d，落后 %d]"

2901

2807 -#: builtin/branch.c:502

2902 +#: builtin/branch.c:496

2903 msgid " **** invalid ref ****"

2904 msgstr " **** 无效引用 ****"

2905

2811 -#: builtin/branch.c:594

2906 +#: builtin/branch.c:587

2907 #, c-format

2908 msgid "(no branch, rebasing %s)"

2909 msgstr "（非分支，正变基 %s）"

2910

2816 -#: builtin/branch.c:597

2911 +#: builtin/branch.c:590

2912 #, c-format

2913 msgid "(no branch, bisect started on %s)"

2914 msgstr "（非分支，二分查找开始于 %s）"

2915

2821 -#: builtin/branch.c:600

2916 +#: builtin/branch.c:593

2917 #, c-format

2918 msgid "(detached from %s)"

2919 msgstr "（分离自 %s）"

2920

2826 -#: builtin/branch.c:603

2921 +#: builtin/branch.c:596

2922 msgid "(no branch)"

2923 msgstr "（非分支）"

2924

2830 -#: builtin/branch.c:649

2925 +#: builtin/branch.c:643

2926 #, c-format

2927 msgid "object '%s' does not point to a commit"

2928 msgstr "对象 '%s' 没有指向一个提交"

2929

2835 -#: builtin/branch.c:681

2930 +#: builtin/branch.c:691

2931 msgid "some refs could not be read"

2932 msgstr "一些引用不能读取"

2933

2839 -#: builtin/branch.c:694

2934 +#: builtin/branch.c:704

2935 msgid "cannot rename the current branch while not on any."

2936 msgstr "无法重命名当前分支因为不处于任何分支上。"

2937

2843 -#: builtin/branch.c:704

2938 +#: builtin/branch.c:714

2939 #, c-format

2940 msgid "Invalid branch name: '%s'"

2941 msgstr "无效的分支名：'%s'"

2942

2848 -#: builtin/branch.c:719

2943 +#: builtin/branch.c:729

2944 msgid "Branch rename failed"

2945 msgstr "分支重命名失败"

2946

2852 -#: builtin/branch.c:723

2947 +#: builtin/branch.c:733

2948 #, c-format

2949 msgid "Renamed a misnamed branch '%s' away"

2950 msgstr "重命名掉一个错误命名的旧分支 '%s'"

2951

2857 -#: builtin/branch.c:727

2952 +#: builtin/branch.c:737

2953 #, c-format

2954 msgid "Branch renamed to %s, but HEAD is not updated!"

2955 msgstr "分支重命名为 %s，但 HEAD 没有更新！"

2956

2862 -#: builtin/branch.c:734

2957 +#: builtin/branch.c:744

2958 msgid "Branch is renamed, but update of config-file failed"

2959 msgstr "分支被重命名，但更新 config 文件失败"

2960

2866 -#: builtin/branch.c:749

2961 +#: builtin/branch.c:759

2962 #, c-format

2963 msgid "malformed object name %s"

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

2965

2871 -#: builtin/branch.c:773

2966 +#: builtin/branch.c:783

2967 #, c-format

2968 msgid "could not write branch description template: %s"

2969 msgstr "不能写分支描述模版：%s"

2970

2876 -#: builtin/branch.c:803

2971 +#: builtin/branch.c:813

2972 msgid "Generic options"

2973 msgstr "通用选项"

2974

2880 -#: builtin/branch.c:805

2975 +#: builtin/branch.c:815

2976 msgid "show hash and subject, give twice for upstream branch"

2977 msgstr "显示哈希值和主题，若参数出现两次则显示上游分支"

2978

2884 -#: builtin/branch.c:806

2979 +#: builtin/branch.c:816

2980 msgid "suppress informational messages"

2981 msgstr "不显示信息"

2982

2888 -#: builtin/branch.c:807

2983 +#: builtin/branch.c:817

2984 msgid "set up tracking mode (see git-pull(1))"

2985 msgstr "设置跟踪模式（参见 git-pull(1)）"

2986

2892 -#: builtin/branch.c:809

2987 +#: builtin/branch.c:819

2988 msgid "change upstream info"

2989 msgstr "改变上游信息"

2990

2896 -#: builtin/branch.c:813

2991 +#: builtin/branch.c:823

2992 msgid "use colored output"

2993 msgstr "使用彩色输出"

2994

2900 -#: builtin/branch.c:814

2995 +#: builtin/branch.c:824

2996 msgid "act on remote-tracking branches"

2997 msgstr "作用于远程跟踪分支"

2998

2904 -#: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844

2905 -#: builtin/branch.c:850 builtin/commit.c:1573 builtin/commit.c:1574

2906 -#: builtin/commit.c:1575 builtin/commit.c:1576 builtin/tag.c:615

2907 -#: builtin/tag.c:621

2999 +#: builtin/branch.c:827 builtin/branch.c:833 builtin/branch.c:854

3000 +#: builtin/branch.c:860 builtin/commit.c:1622 builtin/commit.c:1623

3001 +#: builtin/commit.c:1624 builtin/commit.c:1625 builtin/tag.c:616

3002 +#: builtin/tag.c:622

3003 msgid "commit"

3004 msgstr "提交"

3005

2911 -#: builtin/branch.c:818 builtin/branch.c:824

3006 +#: builtin/branch.c:828 builtin/branch.c:834

3007 msgid "print only branches that contain the commit"

3008 msgstr "只打印包含该提交的分支"

3009

2915 -#: builtin/branch.c:830

3010 +#: builtin/branch.c:840

3011 msgid "Specific git-branch actions:"

3012 msgstr "具体的 git-branch 动作："

3013

2919 -#: builtin/branch.c:831

3014 +#: builtin/branch.c:841

3015 msgid "list both remote-tracking and local branches"

3016 msgstr "列出远程跟踪及本地分支"

3017

2923 -#: builtin/branch.c:833

3018 +#: builtin/branch.c:843

3019 msgid "delete fully merged branch"

3020 msgstr "删除完全合并的分支"

3021

2927 -#: builtin/branch.c:834

3022 +#: builtin/branch.c:844

3023 msgid "delete branch (even if not merged)"

3024 msgstr "删除分支（即使没有合并）"

3025

2931 -#: builtin/branch.c:835

3026 +#: builtin/branch.c:845

3027 msgid "move/rename a branch and its reflog"

3028 msgstr "移动/重命名一个分支，以及它的引用日志"

3029

2935 -#: builtin/branch.c:836

3030 +#: builtin/branch.c:846

3031 msgid "move/rename a branch, even if target exists"

3032 msgstr "移动/重命名一个分支，即使目标已存在"

3033

2939 -#: builtin/branch.c:837

3034 +#: builtin/branch.c:847

3035 msgid "list branch names"

3036 msgstr "列出分支名"

3037

2943 -#: builtin/branch.c:838

3038 +#: builtin/branch.c:848

3039 msgid "create the branch's reflog"

3040 msgstr "创建分支的引用日志"

3041

2947 -#: builtin/branch.c:840

3042 +#: builtin/branch.c:850

3043 msgid "edit the description for the branch"

3044 msgstr "标记分支的描述"

3045

2951 -#: builtin/branch.c:841

3046 +#: builtin/branch.c:851

3047 msgid "force creation (when already exists)"

3048 msgstr "强制创建（当已经存在）"

3049

2955 -#: builtin/branch.c:844

3050 +#: builtin/branch.c:854

3051 msgid "print only not merged branches"

3052 msgstr "只打印没有合并的分支"

3053

2959 -#: builtin/branch.c:850

3054 +#: builtin/branch.c:860

3055 msgid "print only merged branches"

3056 msgstr "只打印合并的分支"

3057

2963 -#: builtin/branch.c:854

3058 +#: builtin/branch.c:864

3059 msgid "list branches in columns"

3060 msgstr "以列的方式显示分支"

3061

2967 -#: builtin/branch.c:867

3062 +#: builtin/branch.c:877

3063 msgid "Failed to resolve HEAD as a valid ref."

3064 msgstr "无法将 HEAD 解析为有效引用。"

3065

2971 -#: builtin/branch.c:872 builtin/clone.c:636

3066 +#: builtin/branch.c:881 builtin/clone.c:634

3067 msgid "HEAD not found below refs/heads!"

3068 msgstr "HEAD 没有位于 /refs/heads 之下！"

3069

2975 -#: builtin/branch.c:896

3070 +#: builtin/branch.c:903

3071 msgid "--column and --verbose are incompatible"

3072 msgstr "--column 和 --verbose 不兼容"

3073

2979 -#: builtin/branch.c:902 builtin/branch.c:941

3074 +#: builtin/branch.c:909 builtin/branch.c:948

3075 msgid "branch name required"

3076 msgstr "必须提供分支名"

3077

2983 -#: builtin/branch.c:917

3078 +#: builtin/branch.c:924

3079 msgid "Cannot give description to detached HEAD"

3080 msgstr "不能向分离头指针提供描述"

3081

2987 -#: builtin/branch.c:922

3082 +#: builtin/branch.c:929

3083 msgid "cannot edit description of more than one branch"

3084 msgstr "不能为一个以上的分支编辑描述"

3085

2991 -#: builtin/branch.c:929

3086 +#: builtin/branch.c:936

3087 #, c-format

3088 msgid "No commit on branch '%s' yet."

3089 msgstr "分支 '%s' 尚无提交。"

3090

2996 -#: builtin/branch.c:932

3091 +#: builtin/branch.c:939

3092 #, c-format

3093 msgid "No branch named '%s'."

3094 msgstr "没有分支 '%s'。"

3095

3001 -#: builtin/branch.c:947

3096 +#: builtin/branch.c:954

3097 msgid "too many branches for a rename operation"

3098 msgstr "为重命名操作提供了太多的分支名"

3099

3005 -#: builtin/branch.c:952

3100 +#: builtin/branch.c:959

3101 msgid "too many branches to set new upstream"

3102 msgstr "为设置新上游提供了太多的分支名"

3103

3009 -#: builtin/branch.c:956

3104 +#: builtin/branch.c:963

3105 #, c-format

3106 msgid ""

3107 "could not set upstream of HEAD to %s when it does not point to any branch."

3108 msgstr "无法设置 HEAD 的上游为 %s，因为 HEAD 没有指向任何分支。"

3109

3015 -#: builtin/branch.c:959 builtin/branch.c:981 builtin/branch.c:1002

3110 +#: builtin/branch.c:966 builtin/branch.c:988 builtin/branch.c:1009

3111 #, c-format

3112 msgid "no such branch '%s'"

3113 msgstr "没有此分支 '%s'"

3114

3020 -#: builtin/branch.c:963

3115 +#: builtin/branch.c:970

3116 #, c-format

3117 msgid "branch '%s' does not exist"

3118 msgstr "分支 '%s' 不存在"

3119

3025 -#: builtin/branch.c:975

3120 +#: builtin/branch.c:982

3121 msgid "too many branches to unset upstream"

3122 msgstr "为取消上游设置操作提供了太多的分支名"

3123

3029 -#: builtin/branch.c:979

3124 +#: builtin/branch.c:986

3125 msgid "could not unset upstream of HEAD when it does not point to any branch."

3126 msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"

3127

3033 -#: builtin/branch.c:985

3128 +#: builtin/branch.c:992

3129 #, c-format

3130 msgid "Branch '%s' has no upstream information"

3131 msgstr "分支 '%s' 没有上游信息"

3132

3038 -#: builtin/branch.c:999

3133 +#: builtin/branch.c:1006

3134 msgid "it does not make sense to create 'HEAD' manually"

3135 msgstr "手工创建 'HEAD' 没有意义"

3136

3042 -#: builtin/branch.c:1005

3137 +#: builtin/branch.c:1012

3138 msgid "-a and -r options to 'git branch' do not make sense with a branch name"

3139 msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"

3140

3046 -#: builtin/branch.c:1008

3141 +#: builtin/branch.c:1015

3142 #, c-format

3143 msgid ""

3144 "The --set-upstream flag is deprecated and will be removed. Consider using --"

@@ -3051,7 +3146,7 @@ msgid ""

3146 msgstr ""

3147 "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"

3148

3054 -#: builtin/branch.c:1025

3149 +#: builtin/branch.c:1032

3150 #, c-format

3151 msgid ""

3152 "\n"

@@ -3062,12 +3157,12 @@ msgstr ""

3157 "如果你想用 '%s' 跟踪 '%s', 这么做：\n"

3158 "\n"

3159

3065 -#: builtin/branch.c:1026

3160 +#: builtin/branch.c:1033

3161 #, c-format

3162 msgid " git branch -d %s\n"

3163 msgstr " git branch -d %s\n"

3164

3070 -#: builtin/branch.c:1027

3165 +#: builtin/branch.c:1034

3166 #, c-format

3167 msgid " git branch --set-upstream-to %s\n"

3168 msgstr " git branch --set-upstream-to %s\n"

@@ -3085,43 +3180,43 @@ msgstr "需要一个版本库来创建包。"

3180 msgid "Need a repository to unbundle."

3181 msgstr "需要一个版本库来解包。"

3182

3088 -#: builtin/cat-file.c:331

3183 +#: builtin/cat-file.c:332

3184 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"

3185 msgstr "git cat-file (-t|-s|-e|-p|<类型>|--textconv) <对象>"

3186

3092 -#: builtin/cat-file.c:332

3187 +#: builtin/cat-file.c:333

3188 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"

3189 msgstr "git cat-file (--batch|--batch-check) < <对象列表>"

3190

3096 -#: builtin/cat-file.c:369

3191 +#: builtin/cat-file.c:370

3192 msgid "<type> can be one of: blob, tree, commit, tag"

3193 msgstr "<类型> 可以是其中之一：blob、tree、commit、tag"

3194

3100 -#: builtin/cat-file.c:370

3195 +#: builtin/cat-file.c:371

3196 msgid "show object type"

3197 msgstr "显示对象类型"

3198

3104 -#: builtin/cat-file.c:371

3199 +#: builtin/cat-file.c:372

3200 msgid "show object size"

3201 msgstr "显示对象大小"

3202

3108 -#: builtin/cat-file.c:373

3203 +#: builtin/cat-file.c:374

3204 msgid "exit with zero when there's no error"

3205 msgstr "当没有错误时退出并返回零"

3206

3112 -#: builtin/cat-file.c:374

3207 +#: builtin/cat-file.c:375

3208 msgid "pretty-print object's content"

3209 msgstr "美观地打印对象的内容"

3210

3116 -#: builtin/cat-file.c:376

3211 +#: builtin/cat-file.c:377

3212 msgid "for blob objects, run textconv on object's content"

3213 msgstr "对于数据（blob）对象，对其内容执行 textconv"

3214

3120 -#: builtin/cat-file.c:378

3215 +#: builtin/cat-file.c:379

3216 msgid "show info and content of objects fed from the standard input"

3217 msgstr "显示从标准输入提供的对象的信息和内容"

3218

3124 -#: builtin/cat-file.c:381

3219 +#: builtin/cat-file.c:382

3220 msgid "show info about objects fed from the standard input"

3221 msgstr "显示从标准输入提供的对象的信息"

3222

@@ -3141,7 +3236,7 @@ msgstr "报告设置在文件上的所有属性"

3236 msgid "use .gitattributes only from the index"

3237 msgstr "只使用索引中的 .gitattributes"

3238

3144 -#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75

3239 +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98

3240 msgid "read file names from stdin"

3241 msgstr "从标准输入读出文件名"

3242

@@ -3149,7 +3244,7 @@ msgstr "从标准输入读出文件名"

3244 msgid "terminate input and output records by a NUL character"

3245 msgstr "输入和输出的记录使用 NUL 字符终结"

3246

3152 -#: builtin/check-ignore.c:18 builtin/checkout.c:1083 builtin/gc.c:285

3247 +#: builtin/check-ignore.c:18 builtin/checkout.c:1089 builtin/gc.c:274

3248 msgid "suppress progress reporting"

3249 msgstr "不显示进度报告"

3250

@@ -3313,47 +3408,47 @@ msgstr "路径 '%s' 未合并"

3408 msgid "you need to resolve your current index first"

3409 msgstr "您需要先解决当前索引的冲突"

3410

3316 -#: builtin/checkout.c:591

3411 +#: builtin/checkout.c:597

3412 #, c-format

3413 msgid "Can not do reflog for '%s'\n"

3414 msgstr "不能对 '%s' 执行 reflog 操作\n"

3415

3321 -#: builtin/checkout.c:629

3416 +#: builtin/checkout.c:635

3417 msgid "HEAD is now at"

3418 msgstr "HEAD 目前位于"

3419

3325 -#: builtin/checkout.c:636

3420 +#: builtin/checkout.c:642

3421 #, c-format

3422 msgid "Reset branch '%s'\n"

3423 msgstr "重置分支 '%s'\n"

3424

3330 -#: builtin/checkout.c:639

3425 +#: builtin/checkout.c:645

3426 #, c-format

3427 msgid "Already on '%s'\n"

3428 msgstr "已经位于 '%s'\n"

3429

3335 -#: builtin/checkout.c:643

3430 +#: builtin/checkout.c:649

3431 #, c-format

3432 msgid "Switched to and reset branch '%s'\n"

3433 msgstr "切换并重置分支 '%s'\n"

3434

3340 -#: builtin/checkout.c:645 builtin/checkout.c:1026

3435 +#: builtin/checkout.c:651 builtin/checkout.c:1032

3436 #, c-format

3437 msgid "Switched to a new branch '%s'\n"

3438 msgstr "切换到一个新分支 '%s'\n"

3439

3345 -#: builtin/checkout.c:647

3440 +#: builtin/checkout.c:653

3441 #, c-format

3442 msgid "Switched to branch '%s'\n"

3443 msgstr "切换到分支 '%s'\n"

3444

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

3351 -#: builtin/checkout.c:699

3446 +#: builtin/checkout.c:705

3447 #, c-format

3448 msgid " ... and %d more.\n"

3449 msgstr " ... 及其它 %d 个。\n"

3450

3356 -#: builtin/checkout.c:705

3451 +#: builtin/checkout.c:711

3452 #, c-format

3453 msgid ""

3454 "Warning: you are leaving %d commit behind, not connected to\n"

@@ -3374,7 +3469,7 @@ msgstr[1] ""

3469 "\n"

3470 "%s\n"

3471

3377 -#: builtin/checkout.c:723

3472 +#: builtin/checkout.c:729

3473 #, c-format

3474 msgid ""

3475 "If you want to keep them by creating a new branch, this may be a good time\n"

@@ -3389,139 +3484,139 @@ msgstr ""

3484 " git branch new_branch_name %s\n"

3485 "\n"

3486

3392 -#: builtin/checkout.c:753

3487 +#: builtin/checkout.c:759

3488 msgid "internal error in revision walk"

3489 msgstr "在版本遍历时遇到内部错误"

3490

3396 -#: builtin/checkout.c:757

3491 +#: builtin/checkout.c:763

3492 msgid "Previous HEAD position was"

3493 msgstr "之前的 HEAD 位置是"

3494

3400 -#: builtin/checkout.c:784 builtin/checkout.c:1021

3495 +#: builtin/checkout.c:790 builtin/checkout.c:1027

3496 msgid "You are on a branch yet to be born"

3497 msgstr "您位于一个尚未初始化的分支"

3498

3404 -#: builtin/checkout.c:928

3499 +#: builtin/checkout.c:934

3500 #, c-format

3501 msgid "only one reference expected, %d given."

3502 msgstr "只要一个引用，却给出了 %d 个"

3503

3409 -#: builtin/checkout.c:967

3504 +#: builtin/checkout.c:973

3505 #, c-format

3506 msgid "invalid reference: %s"

3507 msgstr "无效引用：%s"

3508

3414 -#: builtin/checkout.c:996

3509 +#: builtin/checkout.c:1002

3510 #, c-format

3511 msgid "reference is not a tree: %s"

3512 msgstr "引用不是一个树：%s"

3513

3419 -#: builtin/checkout.c:1035

3514 +#: builtin/checkout.c:1041

3515 msgid "paths cannot be used with switching branches"

3516 msgstr "路径不能和切换分支同时使用"

3517

3423 -#: builtin/checkout.c:1038 builtin/checkout.c:1042

3518 +#: builtin/checkout.c:1044 builtin/checkout.c:1048

3519 #, c-format

3520 msgid "'%s' cannot be used with switching branches"

3521 msgstr "'%s' 不能和切换分支同时使用"

3522

3428 -#: builtin/checkout.c:1046 builtin/checkout.c:1049 builtin/checkout.c:1054

3429 -#: builtin/checkout.c:1057

3523 +#: builtin/checkout.c:1052 builtin/checkout.c:1055 builtin/checkout.c:1060

3524 +#: builtin/checkout.c:1063

3525 #, c-format

3526 msgid "'%s' cannot be used with '%s'"

3527 msgstr "'%s' 不能和 '%s' 同时使用"

3528

3434 -#: builtin/checkout.c:1062

3529 +#: builtin/checkout.c:1068

3530 #, c-format

3531 msgid "Cannot switch branch to a non-commit '%s'"

3532 msgstr "不能切换分支到一个非提交 '%s'"

3533

3439 -#: builtin/checkout.c:1084 builtin/checkout.c:1086 builtin/clone.c:88

3534 +#: builtin/checkout.c:1090 builtin/checkout.c:1092 builtin/clone.c:89

3535 #: builtin/remote.c:159 builtin/remote.c:161

3536 msgid "branch"

3537 msgstr "分支"

3538

3444 -#: builtin/checkout.c:1085

3539 +#: builtin/checkout.c:1091

3540 msgid "create and checkout a new branch"

3541 msgstr "创建并检出一个新的分支"

3542

3448 -#: builtin/checkout.c:1087

3543 +#: builtin/checkout.c:1093

3544 msgid "create/reset and checkout a branch"

3545 msgstr "创建/重置并检出一个分支"

3546

3452 -#: builtin/checkout.c:1088

3547 +#: builtin/checkout.c:1094

3548 msgid "create reflog for new branch"

3549 msgstr "为新的分支创建引用日志"

3550

3456 -#: builtin/checkout.c:1089

3551 +#: builtin/checkout.c:1095

3552 msgid "detach the HEAD at named commit"

3553 msgstr "成为指向该提交的分离头指针"

3554

3460 -#: builtin/checkout.c:1090

3555 +#: builtin/checkout.c:1096

3556 msgid "set upstream info for new branch"

3557 msgstr "为新的分支设置上游信息"

3558

3464 -#: builtin/checkout.c:1092

3559 +#: builtin/checkout.c:1098

3560 msgid "new-branch"

3561 msgstr "新分支"

3562

3468 -#: builtin/checkout.c:1092

3563 +#: builtin/checkout.c:1098

3564 msgid "new unparented branch"

3565 msgstr "新的没有父提交的分支"

3566

3472 -#: builtin/checkout.c:1093

3567 +#: builtin/checkout.c:1099

3568 msgid "checkout our version for unmerged files"

3569 msgstr "对尚未合并的文件检出我们的版本"

3570

3476 -#: builtin/checkout.c:1095

3571 +#: builtin/checkout.c:1101

3572 msgid "checkout their version for unmerged files"

3573 msgstr "对尚未合并的文件检出他们的版本"

3574

3480 -#: builtin/checkout.c:1097

3575 +#: builtin/checkout.c:1103

3576 msgid "force checkout (throw away local modifications)"

3577 msgstr "强制检出（丢弃本地修改）"

3578

3484 -#: builtin/checkout.c:1098

3579 +#: builtin/checkout.c:1104

3580 msgid "perform a 3-way merge with the new branch"

3581 msgstr "和新的分支执行三路合并"

3582

3488 -#: builtin/checkout.c:1099 builtin/merge.c:225

3583 +#: builtin/checkout.c:1105 builtin/merge.c:226

3584 msgid "update ignored files (default)"

3585 msgstr "更新忽略的文件（默认）"

3586

3492 -#: builtin/checkout.c:1100 builtin/log.c:1236 parse-options.h:245

3587 +#: builtin/checkout.c:1106 builtin/log.c:1239 parse-options.h:245

3588 msgid "style"

3589 msgstr "风格"

3590

3496 -#: builtin/checkout.c:1101

3591 +#: builtin/checkout.c:1107

3592 msgid "conflict style (merge or diff3)"

3593 msgstr "冲突输出风格（merge 或 diff3）"

3594

3500 -#: builtin/checkout.c:1104

3595 +#: builtin/checkout.c:1110

3596 msgid "do not limit pathspecs to sparse entries only"

3597 msgstr "对路径不做稀疏检出的限制"

3598

3504 -#: builtin/checkout.c:1106

3599 +#: builtin/checkout.c:1112

3600 msgid "second guess 'git checkout no-such-branch'"

3601 msgstr "再者猜测'git checkout no-such-branch'"

3602

3508 -#: builtin/checkout.c:1129

3603 +#: builtin/checkout.c:1135

3604 msgid "-b, -B and --orphan are mutually exclusive"

3605 msgstr "-b、-B 和 --orphan 是互斥的"

3606

3512 -#: builtin/checkout.c:1146

3607 +#: builtin/checkout.c:1152

3608 msgid "--track needs a branch name"

3609 msgstr "--track 需要一个分支名"

3610

3516 -#: builtin/checkout.c:1153

3611 +#: builtin/checkout.c:1157

3612 msgid "Missing branch name; try -b"

3613 msgstr "缺少分支名；尝试 -b"

3614

3520 -#: builtin/checkout.c:1190

3615 +#: builtin/checkout.c:1194

3616 msgid "invalid path specification"

3617 msgstr "无效的路径规格"

3618

3524 -#: builtin/checkout.c:1197

3619 +#: builtin/checkout.c:1201

3620 #, c-format

3621 msgid ""

3622 "Cannot update paths and switch to branch '%s' at the same time.\n"

@@ -3530,12 +3625,12 @@ msgstr ""

3625 "不能同时更新路径并切换到分支'%s'。\n"

3626 "您是想要检出 '%s' 但其未能解析为提交么？"

3627

3533 -#: builtin/checkout.c:1202

3628 +#: builtin/checkout.c:1206

3629 #, c-format

3630 msgid "git checkout: --detach does not take a path argument '%s'"

3631 msgstr "git checkout：--detach 不能接收路径参数 '%s'"

3632

3538 -#: builtin/checkout.c:1206

3633 +#: builtin/checkout.c:1210

3634 msgid ""

3635 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"

3636 "checking out of the index."

@@ -3685,7 +3780,7 @@ msgstr "交互式清除"

3780 msgid "remove whole directories"

3781 msgstr "删除整个目录"

3782

3688 -#: builtin/clean.c:880 builtin/describe.c:406 builtin/grep.c:714

3783 +#: builtin/clean.c:880 builtin/describe.c:407 builtin/grep.c:714

3784 #: builtin/ls-files.c:486 builtin/name-rev.c:311 builtin/show-ref.c:185

3785 msgid "pattern"

3786 msgstr "模式"

@@ -3720,145 +3815,145 @@ msgid ""

3815 msgstr ""

3816 "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作"

3817

3723 -#: builtin/clone.c:36

3818 +#: builtin/clone.c:37

3819 msgid "git clone [options] [--] <repo> [<dir>]"

3820 msgstr "git clone [选项] [--] <版本库> [<路径>]"

3821

3727 -#: builtin/clone.c:64 builtin/fetch.c:112 builtin/merge.c:222

3728 -#: builtin/push.c:503

3822 +#: builtin/clone.c:65 builtin/fetch.c:112 builtin/merge.c:223

3823 +#: builtin/push.c:514

3824 msgid "force progress reporting"

3825 msgstr "强制显示进度报告"

3826

3732 -#: builtin/clone.c:66

3827 +#: builtin/clone.c:67

3828 msgid "don't create a checkout"

3829 msgstr "不创建一个检出"

3830

3736 -#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:486

3831 +#: builtin/clone.c:68 builtin/clone.c:70 builtin/init-db.c:488

3832 msgid "create a bare repository"

3738 -msgstr "创建一个裸版本库"

3833 +msgstr "创建一个纯版本库"

3834

3740 -#: builtin/clone.c:71

3835 +#: builtin/clone.c:72

3836 msgid "create a mirror repository (implies bare)"

3742 -msgstr "创建一个镜像版本库（也是裸版本库）"

3837 +msgstr "创建一个镜像版本库（也是纯版本库）"

3838

3744 -#: builtin/clone.c:73

3839 +#: builtin/clone.c:74

3840 msgid "to clone from a local repository"

3841 msgstr "从本地版本库克隆"

3842

3748 -#: builtin/clone.c:75

3843 +#: builtin/clone.c:76

3844 msgid "don't use local hardlinks, always copy"

3845 msgstr "不使用本地硬链接，始终复制"

3846

3752 -#: builtin/clone.c:77

3847 +#: builtin/clone.c:78

3848 msgid "setup as shared repository"

3849 msgstr "设置为共享版本库"

3850

3756 -#: builtin/clone.c:79 builtin/clone.c:81

3851 +#: builtin/clone.c:80 builtin/clone.c:82

3852 msgid "initialize submodules in the clone"

3853 msgstr "在克隆时初始化子模组"

3854

3760 -#: builtin/clone.c:82 builtin/init-db.c:483

3855 +#: builtin/clone.c:83 builtin/init-db.c:485

3856 msgid "template-directory"

3857 msgstr "模板目录"

3858

3764 -#: builtin/clone.c:83 builtin/init-db.c:484

3859 +#: builtin/clone.c:84 builtin/init-db.c:486

3860 msgid "directory from which templates will be used"

3861 msgstr "模板目录将被使用"

3862

3768 -#: builtin/clone.c:85

3863 +#: builtin/clone.c:86

3864 msgid "reference repository"

3865 msgstr "参考版本库"

3866

3772 -#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44

3867 +#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44

3868 msgid "name"

3869 msgstr "名称"

3870

3776 -#: builtin/clone.c:87

3871 +#: builtin/clone.c:88

3872 msgid "use <name> instead of 'origin' to track upstream"

3873 msgstr "使用<名称>而不是 'origin' 去跟踪上游"

3874

3780 -#: builtin/clone.c:89

3875 +#: builtin/clone.c:90

3876 msgid "checkout <branch> instead of the remote's HEAD"

3877 msgstr "检出<分支>而不是远程HEAD"

3878

3784 -#: builtin/clone.c:91

3879 +#: builtin/clone.c:92

3880 msgid "path to git-upload-pack on the remote"

3881 msgstr "远程 git-upload-pack 路径"

3882

3788 -#: builtin/clone.c:92 builtin/fetch.c:113 builtin/grep.c:659

3883 +#: builtin/clone.c:93 builtin/fetch.c:113 builtin/grep.c:659

3884 msgid "depth"

3885 msgstr "深度"

3886

3792 -#: builtin/clone.c:93

3887 +#: builtin/clone.c:94

3888 msgid "create a shallow clone of that depth"

3889 msgstr "创建一个指定深度的浅克隆"

3890

3796 -#: builtin/clone.c:95

3891 +#: builtin/clone.c:96

3892 msgid "clone only one branch, HEAD or --branch"

3893 msgstr "只克隆一个分支、HEAD 或 --branch"

3894

3800 -#: builtin/clone.c:96 builtin/init-db.c:492

3895 +#: builtin/clone.c:97 builtin/init-db.c:494

3896 msgid "gitdir"

3897 msgstr "git目录"

3898

3804 -#: builtin/clone.c:97 builtin/init-db.c:493

3899 +#: builtin/clone.c:98 builtin/init-db.c:495

3900 msgid "separate git dir from working tree"

3901 msgstr "git目录和工作区分离"

3902

3808 -#: builtin/clone.c:98

3903 +#: builtin/clone.c:99

3904 msgid "key=value"

3905 msgstr "key=value"

3906

3812 -#: builtin/clone.c:99

3907 +#: builtin/clone.c:100

3908 msgid "set config inside the new repository"

3909 msgstr "在新版本库中设置配置信息"

3910

3816 -#: builtin/clone.c:252

3911 +#: builtin/clone.c:253

3912 #, c-format

3913 msgid "reference repository '%s' is not a local repository."

3914 msgstr "参考版本库 '%s' 不是一个本地版本库。"

3915

3821 -#: builtin/clone.c:256

3916 +#: builtin/clone.c:257

3917 #, c-format

3918 msgid "reference repository '%s' is shallow"

3919 msgstr "参考版本库 '%s' 是一个浅克隆"

3920

3826 -#: builtin/clone.c:259

3921 +#: builtin/clone.c:260

3922 #, c-format

3923 msgid "reference repository '%s' is grafted"

3924 msgstr "参考版本库 '%s' 已被嫁接"

3925

3831 -#: builtin/clone.c:321

3926 +#: builtin/clone.c:322

3927 #, c-format

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

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

3930

3836 -#: builtin/clone.c:323 builtin/diff.c:83

3931 +#: builtin/clone.c:324 builtin/diff.c:84

3932 #, c-format

3933 msgid "failed to stat '%s'"

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

3935

3841 -#: builtin/clone.c:325

3936 +#: builtin/clone.c:326

3937 #, c-format

3938 msgid "%s exists and is not a directory"

3939 msgstr "%s 存在且不是一个目录"

3940

3846 -#: builtin/clone.c:339

3941 +#: builtin/clone.c:340

3942 #, c-format

3943 msgid "failed to stat %s\n"

3944 msgstr "无法枚举 %s 状态\n"

3945

3851 -#: builtin/clone.c:361

3946 +#: builtin/clone.c:362

3947 #, c-format

3948 msgid "failed to create link '%s'"

3949 msgstr "无法创建链接 '%s'"

3950

3856 -#: builtin/clone.c:365

3951 +#: builtin/clone.c:366

3952 #, c-format

3953 msgid "failed to copy file to '%s'"

3954 msgstr "无法拷贝文件至 '%s'"

3955

3861 -#: builtin/clone.c:388 builtin/clone.c:565

3956 +#: builtin/clone.c:389 builtin/clone.c:563

3957 #, c-format

3958 msgid "done.\n"

3959 msgstr "完成。\n"

@@ -3873,108 +3968,108 @@ msgstr ""

3968 "您可以通过 'git status' 检查哪些已被检出，然后使用命令\n"

3969 "'git checkout -f HEAD' 重试\n"

3970

3876 -#: builtin/clone.c:480

3971 +#: builtin/clone.c:478

3972 #, c-format

3973 msgid "Could not find remote branch %s to clone."

3974 msgstr "不能发现要克隆的远程分支 %s。"

3975

3881 -#: builtin/clone.c:560

3976 +#: builtin/clone.c:558

3977 #, c-format

3978 msgid "Checking connectivity... "

3979 msgstr "检查连接... "

3980

3886 -#: builtin/clone.c:563

3981 +#: builtin/clone.c:561

3982 msgid "remote did not send all necessary objects"

3983 msgstr "远程没有发送所有必须的对象"

3984

3890 -#: builtin/clone.c:627

3985 +#: builtin/clone.c:625

3986 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"

3987 msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n"

3988

3894 -#: builtin/clone.c:658

3989 +#: builtin/clone.c:656

3990 msgid "unable to checkout working tree"

3991 msgstr "不能检出工作区"

3992

3898 -#: builtin/clone.c:768

3993 +#: builtin/clone.c:765

3994 msgid "Too many arguments."

3995 msgstr "太多参数。"

3996

3902 -#: builtin/clone.c:772

3997 +#: builtin/clone.c:769

3998 msgid "You must specify a repository to clone."

3999 msgstr "您必须指定一个版本库来克隆。"

4000

3906 -#: builtin/clone.c:783

4001 +#: builtin/clone.c:780

4002 #, c-format

4003 msgid "--bare and --origin %s options are incompatible."

4004 msgstr "--bare 和 --origin %s 选项不兼容。"

4005

3911 -#: builtin/clone.c:786

4006 +#: builtin/clone.c:783

4007 msgid "--bare and --separate-git-dir are incompatible."

4008 msgstr "--bare 和 --separate-git-dir 选项不兼容。"

4009

3915 -#: builtin/clone.c:799

4010 +#: builtin/clone.c:796

4011 #, c-format

4012 msgid "repository '%s' does not exist"

4013 msgstr "版本库 '%s' 不存在"

4014

3920 -#: builtin/clone.c:805 builtin/fetch.c:1143

4015 +#: builtin/clone.c:802 builtin/fetch.c:1155

4016 #, c-format

4017 msgid "depth %s is not a positive number"

4018 msgstr "深度 %s 不是一个正数"

4019

3925 -#: builtin/clone.c:815

4020 +#: builtin/clone.c:812

4021 #, c-format

4022 msgid "destination path '%s' already exists and is not an empty directory."

4023 msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。"

4024

3930 -#: builtin/clone.c:825

4025 +#: builtin/clone.c:822

4026 #, c-format

4027 msgid "working tree '%s' already exists."

4028 msgstr "工作区 '%s' 已经存在。"

4029

3935 -#: builtin/clone.c:838 builtin/clone.c:850

4030 +#: builtin/clone.c:835 builtin/clone.c:847

4031 #, c-format

4032 msgid "could not create leading directories of '%s'"

4033 msgstr "不能为 '%s' 创建先导目录"

4034

3940 -#: builtin/clone.c:841

4035 +#: builtin/clone.c:838

4036 #, c-format

4037 msgid "could not create work tree dir '%s'."

4038 msgstr "不能为 '%s' 创建工作区目录。"

4039

3945 -#: builtin/clone.c:860

4040 +#: builtin/clone.c:857

4041 #, c-format

4042 msgid "Cloning into bare repository '%s'...\n"

3948 -msgstr "克隆到裸版本库 '%s'...\n"

4043 +msgstr "克隆到纯版本库 '%s'...\n"

4044

3950 -#: builtin/clone.c:862

4045 +#: builtin/clone.c:859

4046 #, c-format

4047 msgid "Cloning into '%s'...\n"

4048 msgstr "正克隆到 '%s'...\n"

4049

3955 -#: builtin/clone.c:898

4050 +#: builtin/clone.c:895

4051 msgid "--depth is ignored in local clones; use file:// instead."

4052 msgstr "--depth 在本地克隆被忽略，改为 file:// 协议试试。"

4053

3959 -#: builtin/clone.c:901

4054 +#: builtin/clone.c:898

4055 msgid "source repository is shallow, ignoring --local"

4056 msgstr "源版本库是浅克隆，忽略 --local"

4057

3963 -#: builtin/clone.c:906

4058 +#: builtin/clone.c:903

4059 msgid "--local is ignored"

4060 msgstr "--local 被忽略"

4061

3967 -#: builtin/clone.c:910

4062 +#: builtin/clone.c:907

4063 #, c-format

4064 msgid "Don't know how to clone %s"

4065 msgstr "不知道如何克隆 %s"

4066

3972 -#: builtin/clone.c:961 builtin/clone.c:969

4067 +#: builtin/clone.c:958 builtin/clone.c:966

4068 #, c-format

4069 msgid "Remote branch %s not found in upstream %s"

4070 msgstr "远程分支 %s 在上游 %s 未发现"

4071

3977 -#: builtin/clone.c:972

4072 +#: builtin/clone.c:969

4073 msgid "You appear to have cloned an empty repository."

4074 msgstr "您似乎克隆了一个空版本库。"

4075

@@ -4010,15 +4105,39 @@ msgstr "两列之间的填充空间"

4105 msgid "--command must be the first argument"

4106 msgstr "--command 必须是第一个参数"

4107

4013 -#: builtin/commit.c:36

4108 +#: builtin/commit.c:37

4109 msgid "git commit [options] [--] <pathspec>..."

4110 msgstr "git commit [选项] [--] <路径规则>..."

4111

4017 -#: builtin/commit.c:41

4112 +#: builtin/commit.c:42

4113 msgid "git status [options] [--] <pathspec>..."

4114 msgstr "git status [选项] [--] <路径规则>..."

4115

4021 -#: builtin/commit.c:46

4116 +#: builtin/commit.c:47

4117 +msgid ""

4118 +"Your name and email address were configured automatically based\n"

4119 +"on your username and hostname. Please check that they are accurate.\n"

4120 +"You can suppress this message by setting them explicitly. Run the\n"

4121 +"following command and follow the instructions in your editor to edit\n"

4122 +"your configuration file:\n"

4123 +"\n"

4124 +" git config --global --edit\n"

4125 +"\n"

4126 +"After doing this, you may fix the identity used for this commit with:\n"

4127 +"\n"

4128 +" git commit --amend --reset-author\n"

4129 +msgstr ""

4130 +"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"

4131 +"与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"

4132 +"中编辑您的配置文件：\n"

4133 +"\n"

4134 +" git config --global --edit\n"

4135 +"\n"

4136 +"设置完毕后，您可以用下面的命令来修正本次提交所使用的用户身份：\n"

4137 +"\n"

4138 +" git commit --amend --reset-author\n"

4139 +

4140 +#: builtin/commit.c:60

4141 msgid ""

4142 "Your name and email address were configured automatically based\n"

4143 "on your username and hostname. Please check that they are accurate.\n"

@@ -4032,7 +4151,7 @@ msgid ""

4151 " git commit --amend --reset-author\n"

4152 msgstr ""

4153 "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"

4035 -"与否。您可以通过下面的命令对其进行明确地设置以免再出现本提示信息：\n"

4154 +"与否。您可以对其进行设置以免再出现本提示信息：\n"

4155 "\n"

4156 " git config --global user.name \"Your Name\"\n"

4157 " git config --global user.email you@example.com\n"

@@ -4041,7 +4160,7 @@ msgstr ""

4160 "\n"

4161 " git commit --amend --reset-author\n"

4162

4044 -#: builtin/commit.c:58

4163 +#: builtin/commit.c:72

4164 msgid ""

4165 "You asked to amend the most recent commit, but doing so would make\n"

4166 "it empty. You can repeat your command with --allow-empty, or you can\n"

@@ -4050,7 +4169,7 @@ msgstr ""

4169 "您要修补最近的提交，但这么做会让它成为空提交。您可以重复您的命令并带上\n"

4170 "--allow-empty 选项，或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"

4171

4053 -#: builtin/commit.c:63

4172 +#: builtin/commit.c:77

4173 msgid ""

4174 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"

4175 "If you wish to commit it anyway, use:\n"

@@ -4064,11 +4183,11 @@ msgstr ""

4183 " git commit --allow-empty\n"

4184 "\n"

4185

4067 -#: builtin/commit.c:70

4186 +#: builtin/commit.c:84

4187 msgid "Otherwise, please use 'git reset'\n"

4188 msgstr "否则，请使用命令 'git reset'\n"

4189

4071 -#: builtin/commit.c:73

4190 +#: builtin/commit.c:87

4191 msgid ""

4192 "If you wish to skip this commit, use:\n"

4193 "\n"

@@ -4084,100 +4203,117 @@ msgstr ""

4203 "然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"

4204 "操作。\n"

4205

4087 -#: builtin/commit.c:288

4206 +#: builtin/commit.c:302

4207 msgid "failed to unpack HEAD tree object"

4208 msgstr "无法解包 HEAD 树对象"

4209

4091 -#: builtin/commit.c:328

4210 +#: builtin/commit.c:342

4211 msgid "unable to create temporary index"

4212 msgstr "不能创建临时索引"

4213

4095 -#: builtin/commit.c:334

4214 +#: builtin/commit.c:348

4215 msgid "interactive add failed"

4216 msgstr "交互式添加失败"

4217

4099 -#: builtin/commit.c:366 builtin/commit.c:387 builtin/commit.c:435

4218 +#: builtin/commit.c:359

4219 +msgid "unable to write index file"

4220 +msgstr "无法写入索引文件"

4221 +

4222 +#: builtin/commit.c:361

4223 +msgid "unable to update temporary index"

4224 +msgstr "无法更新临时索引"

4225 +

4226 +#: builtin/commit.c:363

4227 +msgid "Failed to update main cache tree"

4228 +msgstr "不能更新树的主缓存"

4229 +

4230 +#: builtin/commit.c:387 builtin/commit.c:412 builtin/commit.c:461

4231 msgid "unable to write new_index file"

4232 msgstr "无法写 new_index 文件"

4233

4103 -#: builtin/commit.c:418

4234 +#: builtin/commit.c:443

4235 msgid "cannot do a partial commit during a merge."

4236 msgstr "在合并过程中不能做部分提交。"

4237

4107 -#: builtin/commit.c:420

4238 +#: builtin/commit.c:445

4239 msgid "cannot do a partial commit during a cherry-pick."

4240 msgstr "在拣选过程中不能做部分提交。"

4241

4111 -#: builtin/commit.c:429

4242 +#: builtin/commit.c:454

4243 msgid "cannot read the index"

4244 msgstr "无法读取索引"

4245

4115 -#: builtin/commit.c:447

4246 +#: builtin/commit.c:473

4247 msgid "unable to write temporary index file"

4248 msgstr "无法写临时索引文件"

4249

4119 -#: builtin/commit.c:557 builtin/commit.c:563

4250 +#: builtin/commit.c:592

4251 +#, c-format

4252 +msgid "commit '%s' lacks author header"

4253 +msgstr "提交 '%s' 缺少作者信息"

4254 +

4255 +#: builtin/commit.c:594

4256 #, c-format

4121 -msgid "invalid commit: %s"

4122 -msgstr "无效的提交：%s"

4257 +msgid "commit '%s' has malformed author line"

4258 +msgstr "提交 '%s' 有非法的作者信息"

4259

4124 -#: builtin/commit.c:585

4260 +#: builtin/commit.c:613

4261 msgid "malformed --author parameter"

4262 msgstr "非法的 --author 参数"

4263

4128 -#: builtin/commit.c:592

4264 +#: builtin/commit.c:621

4265 #, c-format

4266 msgid "invalid date format: %s"

4267 msgstr "无效的日期格式：%s"

4268

4133 -#: builtin/commit.c:609

4269 +#: builtin/commit.c:642

4270 #, c-format

4271 msgid "Malformed ident string: '%s'"

4272 msgstr "非法的身份字符串：'%s'"

4273

4138 -#: builtin/commit.c:642

4274 +#: builtin/commit.c:675

4275 msgid ""

4276 "unable to select a comment character that is not used\n"

4277 "in the current commit message"

4278 msgstr "无法选择一个未被当前提交说明使用的注释字符"

4279

4144 -#: builtin/commit.c:679 builtin/commit.c:712 builtin/commit.c:1086

4280 +#: builtin/commit.c:712 builtin/commit.c:745 builtin/commit.c:1120

4281 #, c-format

4282 msgid "could not lookup commit %s"

4283 msgstr "不能查询提交 %s"

4284

4149 -#: builtin/commit.c:691 builtin/shortlog.c:273

4285 +#: builtin/commit.c:724 builtin/shortlog.c:273

4286 #, c-format

4287 msgid "(reading log message from standard input)\n"

4288 msgstr "（正从标准输入中读取日志信息）\n"

4289

4154 -#: builtin/commit.c:693

4290 +#: builtin/commit.c:726

4291 msgid "could not read log from standard input"

4292 msgstr "不能从标准输入中读取日志信息"

4293

4158 -#: builtin/commit.c:697

4294 +#: builtin/commit.c:730

4295 #, c-format

4296 msgid "could not read log file '%s'"

4297 msgstr "不能读取日志文件 '%s'"

4298

4163 -#: builtin/commit.c:719

4299 +#: builtin/commit.c:752

4300 msgid "could not read MERGE_MSG"

4301 msgstr "不能读取 MERGE_MSG"

4302

4167 -#: builtin/commit.c:723

4303 +#: builtin/commit.c:756

4304 msgid "could not read SQUASH_MSG"

4305 msgstr "不能读取 SQUASH_MSG"

4306

4171 -#: builtin/commit.c:727

4307 +#: builtin/commit.c:760

4308 #, c-format

4309 msgid "could not read '%s'"

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

4311

4176 -#: builtin/commit.c:798

4312 +#: builtin/commit.c:831

4313 msgid "could not write commit template"

4314 msgstr "不能写提交模版"

4315

4180 -#: builtin/commit.c:816

4316 +#: builtin/commit.c:849

4317 #, c-format

4318 msgid ""

4319 "\n"

@@ -4191,7 +4327,7 @@ msgstr ""

4327 "\t%s\n"

4328 "然后重试。\n"

4329

4194 -#: builtin/commit.c:821

4330 +#: builtin/commit.c:854

4331 #, c-format

4332 msgid ""

4333 "\n"

@@ -4205,7 +4341,7 @@ msgstr ""

4341 "\t%s\n"

4342 "然后重试。\n"

4343

4208 -#: builtin/commit.c:834

4344 +#: builtin/commit.c:867

4345 #, c-format

4346 msgid ""

4347 "Please enter the commit message for your changes. Lines starting\n"

@@ -4214,7 +4350,7 @@ msgstr ""

4350 "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n"

4351 "说明将会终止提交。\n"

4352

4217 -#: builtin/commit.c:841

4353 +#: builtin/commit.c:874

4354 #, c-format

4355 msgid ""

4356 "Please enter the commit message for your changes. Lines starting\n"

@@ -4225,364 +4361,356 @@ msgstr ""

4361 "也可以删除它们。一个空的提交说明将会终止提交。\n"

4362

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

4228 -#: builtin/commit.c:855

4364 +#: builtin/commit.c:888

4365 #, c-format

4366 msgid "%sAuthor: %.*s <%.*s>"

4367 msgstr "%s作者： %.*s <%.*s>"

4368

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

4234 -#: builtin/commit.c:863

4370 +#: builtin/commit.c:896

4371 #, c-format

4372 msgid "%sDate: %s"

4373 msgstr "%s日期： %s"

4374

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

4240 -#: builtin/commit.c:870

4376 +#: builtin/commit.c:903

4377 #, c-format

4378 msgid "%sCommitter: %.*s <%.*s>"

4379 msgstr "%s提交者：%.*s <%.*s>"

4380

4245 -#: builtin/commit.c:888

4381 +#: builtin/commit.c:921

4382 msgid "Cannot read index"

4383 msgstr "无法读取索引"

4384

4249 -#: builtin/commit.c:945

4385 +#: builtin/commit.c:978

4386 msgid "Error building trees"

4387 msgstr "无法创建树对象"

4388

4253 -#: builtin/commit.c:960 builtin/tag.c:495

4389 +#: builtin/commit.c:993 builtin/tag.c:495

4390 #, c-format

4391 msgid "Please supply the message using either -m or -F option.\n"

4392 msgstr "请使用 -m 或 -F 选项提供提交说明。\n"

4393

4258 -#: builtin/commit.c:1061

4394 +#: builtin/commit.c:1095

4395 #, c-format

4396 msgid "No existing author found with '%s'"

4397 msgstr "没有找到匹配 '%s' 的作者"

4398

4263 -#: builtin/commit.c:1076 builtin/commit.c:1316

4399 +#: builtin/commit.c:1110 builtin/commit.c:1350

4400 #, c-format

4401 msgid "Invalid untracked files mode '%s'"

4402 msgstr "无效的未追踪文件参数 '%s'"

4403

4268 -#: builtin/commit.c:1113

4404 +#: builtin/commit.c:1147

4405 msgid "--long and -z are incompatible"

4406 msgstr "--long 和 -z 选项不兼容"

4407

4272 -#: builtin/commit.c:1143

4408 +#: builtin/commit.c:1177

4409 msgid "Using both --reset-author and --author does not make sense"

4410 msgstr "同时使用 --reset-author 和 --author 没有意义"

4411

4276 -#: builtin/commit.c:1152

4412 +#: builtin/commit.c:1186

4413 msgid "You have nothing to amend."

4414 msgstr "您没有可修补的提交。"

4415

4280 -#: builtin/commit.c:1155

4416 +#: builtin/commit.c:1189

4417 msgid "You are in the middle of a merge -- cannot amend."

4418 msgstr "您正处于一个合并过程中 -- 无法修补提交。"

4419

4284 -#: builtin/commit.c:1157

4420 +#: builtin/commit.c:1191

4421 msgid "You are in the middle of a cherry-pick -- cannot amend."

4422 msgstr "您正处于一个拣选过程中 -- 无法修补提交。"

4423

4288 -#: builtin/commit.c:1160

4424 +#: builtin/commit.c:1194

4425 msgid "Options --squash and --fixup cannot be used together"

4426 msgstr "选项 --squash 和 --fixup 不能同时使用"

4427

4292 -#: builtin/commit.c:1170

4428 +#: builtin/commit.c:1204

4429 msgid "Only one of -c/-C/-F/--fixup can be used."

4430 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"

4431

4296 -#: builtin/commit.c:1172

4432 +#: builtin/commit.c:1206

4433 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."

4434 msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"

4435

4300 -#: builtin/commit.c:1180

4436 +#: builtin/commit.c:1214

4437 msgid "--reset-author can be used only with -C, -c or --amend."

4438 msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"

4439

4304 -#: builtin/commit.c:1197

4440 +#: builtin/commit.c:1231

4441 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."

4442 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"

4443

4308 -#: builtin/commit.c:1199

4444 +#: builtin/commit.c:1233

4445 msgid "No paths with --include/--only does not make sense."

4446 msgstr "参数 --include/--only 不跟路径没有意义。"

4447

4312 -#: builtin/commit.c:1201

4448 +#: builtin/commit.c:1235

4449 msgid "Clever... amending the last one with dirty index."

4450 msgstr "聪明... 在索引不干净下修补最后的提交。"

4451

4316 -#: builtin/commit.c:1203

4452 +#: builtin/commit.c:1237

4453 msgid "Explicit paths specified without -i or -o; assuming --only paths..."

4454 msgstr "指定了明确的路径而没有使用 -i 或 -o 选项，认为是 --only paths..."

4455

4320 -#: builtin/commit.c:1215 builtin/tag.c:727

4456 +#: builtin/commit.c:1249 builtin/tag.c:728

4457 #, c-format

4458 msgid "Invalid cleanup mode %s"

4459 msgstr "无效的清理模式 %s"

4460

4325 -#: builtin/commit.c:1220

4461 +#: builtin/commit.c:1254

4462 msgid "Paths with -a does not make sense."

4463 msgstr "路径和 -a 选项同时使用没有意义。"

4464

4329 -#: builtin/commit.c:1330 builtin/commit.c:1595

4465 +#: builtin/commit.c:1364 builtin/commit.c:1644

4466 msgid "show status concisely"

4467 msgstr "以简洁的格式显示状态"

4468

4333 -#: builtin/commit.c:1332 builtin/commit.c:1597

4469 +#: builtin/commit.c:1366 builtin/commit.c:1646

4470 msgid "show branch information"

4471 msgstr "显示分支信息"

4472

4337 -#: builtin/commit.c:1334 builtin/commit.c:1599 builtin/push.c:489

4473 +#: builtin/commit.c:1368 builtin/commit.c:1648 builtin/push.c:500

4474 msgid "machine-readable output"

4475 msgstr "机器可读的输出"

4476

4341 -#: builtin/commit.c:1337 builtin/commit.c:1601

4477 +#: builtin/commit.c:1371 builtin/commit.c:1650

4478 msgid "show status in long format (default)"

4479 msgstr "以长格式显示状态（默认）"

4480

4345 -#: builtin/commit.c:1340 builtin/commit.c:1604

4481 +#: builtin/commit.c:1374 builtin/commit.c:1653

4482 msgid "terminate entries with NUL"

4483 msgstr "条目以NUL字符结尾"

4484

4349 -#: builtin/commit.c:1342 builtin/commit.c:1607 builtin/fast-export.c:703

4350 -#: builtin/fast-export.c:706 builtin/tag.c:602

4485 +#: builtin/commit.c:1376 builtin/commit.c:1656 builtin/fast-export.c:980

4486 +#: builtin/fast-export.c:983 builtin/tag.c:603

4487 msgid "mode"

4488 msgstr "模式"

4489

4354 -#: builtin/commit.c:1343 builtin/commit.c:1607

4490 +#: builtin/commit.c:1377 builtin/commit.c:1656

4491 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"

4492 msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）"

4493

4358 -#: builtin/commit.c:1346

4494 +#: builtin/commit.c:1380

4495 msgid "show ignored files"

4496 msgstr "显示忽略的文件"

4497

4362 -#: builtin/commit.c:1347 parse-options.h:153

4498 +#: builtin/commit.c:1381 parse-options.h:153

4499 msgid "when"

4500 msgstr "何时"

4501

4366 -#: builtin/commit.c:1348

4502 +#: builtin/commit.c:1382

4503 msgid ""

4504 "ignore changes to submodules, optional when: all, dirty, untracked. "

4505 "(Default: all)"

4506 msgstr ""

4507 "忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）"

4508

4373 -#: builtin/commit.c:1350

4509 +#: builtin/commit.c:1384

4510 msgid "list untracked files in columns"

4511 msgstr "以列的方式显示未跟踪的文件"

4512

4377 -#: builtin/commit.c:1419

4513 +#: builtin/commit.c:1471

4514 msgid "couldn't look up newly created commit"

4515 msgstr "无法找到新创建的提交"

4516

4381 -#: builtin/commit.c:1421

4517 +#: builtin/commit.c:1473

4518 msgid "could not parse newly created commit"

4519 msgstr "不能解析新创建的提交"

4520

4385 -#: builtin/commit.c:1469

4521 +#: builtin/commit.c:1518

4522 msgid "detached HEAD"

4523 msgstr "分离头指针"

4524

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

4390 -#: builtin/commit.c:1471

4526 +#: builtin/commit.c:1521

4527 msgid " (root-commit)"

4528 msgstr "（根提交）"

4529

4394 -#: builtin/commit.c:1565

4530 +#: builtin/commit.c:1614

4531 msgid "suppress summary after successful commit"

4532 msgstr "提交成功后不显示概述信息"

4533

4398 -#: builtin/commit.c:1566

4534 +#: builtin/commit.c:1615

4535 msgid "show diff in commit message template"

4536 msgstr "在提交说明模板里显示差异"

4537

4402 -#: builtin/commit.c:1568

4538 +#: builtin/commit.c:1617

4539 msgid "Commit message options"

4540 msgstr "提交说明选项"

4541

4406 -#: builtin/commit.c:1569 builtin/tag.c:600

4542 +#: builtin/commit.c:1618 builtin/tag.c:601

4543 msgid "read message from file"

4544 msgstr "从文件中读取提交说明"

4545

4410 -#: builtin/commit.c:1570

4546 +#: builtin/commit.c:1619

4547 msgid "author"

4548 msgstr "作者"

4549

4414 -#: builtin/commit.c:1570

4550 +#: builtin/commit.c:1619

4551 msgid "override author for commit"

4552 msgstr "提交时覆盖作者"

4553

4418 -#: builtin/commit.c:1571 builtin/gc.c:286

4554 +#: builtin/commit.c:1620 builtin/gc.c:275

4555 msgid "date"

4556 msgstr "日期"

4557

4422 -#: builtin/commit.c:1571

4558 +#: builtin/commit.c:1620

4559 msgid "override date for commit"

4560 msgstr "提交时覆盖日期"

4561

4426 -#: builtin/commit.c:1572 builtin/merge.c:216 builtin/notes.c:409

4427 -#: builtin/notes.c:566 builtin/tag.c:598

4562 +#: builtin/commit.c:1621 builtin/merge.c:217 builtin/notes.c:408

4563 +#: builtin/notes.c:565 builtin/tag.c:599

4564 msgid "message"

4565 msgstr "说明"

4566

4431 -#: builtin/commit.c:1572

4567 +#: builtin/commit.c:1621

4568 msgid "commit message"

4569 msgstr "提交说明"

4570

4435 -#: builtin/commit.c:1573

4571 +#: builtin/commit.c:1622

4572 msgid "reuse and edit message from specified commit"

4573 msgstr "重用并编辑指定提交的提交说明"

4574

4439 -#: builtin/commit.c:1574

4575 +#: builtin/commit.c:1623

4576 msgid "reuse message from specified commit"

4577 msgstr "重用指定提交的提交说明"

4578

4443 -#: builtin/commit.c:1575

4579 +#: builtin/commit.c:1624

4580 msgid "use autosquash formatted message to fixup specified commit"

4581 msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"

4582

4447 -#: builtin/commit.c:1576

4583 +#: builtin/commit.c:1625

4584 msgid "use autosquash formatted message to squash specified commit"

4585 msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"

4586

4451 -#: builtin/commit.c:1577

4587 +#: builtin/commit.c:1626

4588 msgid "the commit is authored by me now (used with -C/-c/--amend)"

4589 msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）"

4590

4455 -#: builtin/commit.c:1578 builtin/log.c:1188 builtin/revert.c:86

4591 +#: builtin/commit.c:1627 builtin/log.c:1191 builtin/revert.c:86

4592 msgid "add Signed-off-by:"

4593 msgstr "添加 Signed-off-by: 签名"

4594

4459 -#: builtin/commit.c:1579

4595 +#: builtin/commit.c:1628

4596 msgid "use specified template file"

4597 msgstr "使用指定的模板文件"

4598

4463 -#: builtin/commit.c:1580

4599 +#: builtin/commit.c:1629

4600 msgid "force edit of commit"

4601 msgstr "强制编辑提交"

4602

4603 # 译者：可选值，不能翻译（或是原文中笔误，应为 mode）

4468 -#: builtin/commit.c:1581

4604 +#: builtin/commit.c:1630

4605 msgid "default"

4606 msgstr "default"

4607

4472 -#: builtin/commit.c:1581 builtin/tag.c:603

4608 +#: builtin/commit.c:1630 builtin/tag.c:604

4609 msgid "how to strip spaces and #comments from message"

4610 msgstr "设置如何删除提交说明里的空格和#注释"

4611

4476 -#: builtin/commit.c:1582

4612 +#: builtin/commit.c:1631

4613 msgid "include status in commit message template"

4614 msgstr "在提交说明模板里包含状态信息"

4615

4480 -#: builtin/commit.c:1583 builtin/merge.c:223 builtin/revert.c:92

4481 -#: builtin/tag.c:604

4616 +#: builtin/commit.c:1632 builtin/merge.c:224 builtin/revert.c:92

4617 +#: builtin/tag.c:605

4618 msgid "key-id"

4619 msgstr "key-id"

4620

4485 -#: builtin/commit.c:1584 builtin/merge.c:224 builtin/revert.c:93

4621 +#: builtin/commit.c:1633 builtin/merge.c:225 builtin/revert.c:93

4622 msgid "GPG sign commit"

4623 msgstr "GPG 提交签名"

4624

4489 -#: builtin/commit.c:1587

4625 +#: builtin/commit.c:1636

4626 msgid "Commit contents options"

4627 msgstr "提交内容选项"

4628

4493 -#: builtin/commit.c:1588

4629 +#: builtin/commit.c:1637

4630 msgid "commit all changed files"

4631 msgstr "提交所有改动的文件"

4632

4497 -#: builtin/commit.c:1589

4633 +#: builtin/commit.c:1638

4634 msgid "add specified files to index for commit"

4635 msgstr "添加指定的文件到索引区等待提交"

4636

4501 -#: builtin/commit.c:1590

4637 +#: builtin/commit.c:1639

4638 msgid "interactively add files"

4639 msgstr "交互式添加文件"

4640

4505 -#: builtin/commit.c:1591

4641 +#: builtin/commit.c:1640

4642 msgid "interactively add changes"

4643 msgstr "交互式添加变更"

4644

4509 -#: builtin/commit.c:1592

4645 +#: builtin/commit.c:1641

4646 msgid "commit only specified files"

4647 msgstr "只提交指定的文件"

4648

4513 -#: builtin/commit.c:1593

4649 +#: builtin/commit.c:1642

4650 msgid "bypass pre-commit hook"

4651 msgstr "绕过 pre-commit 钩子"

4652

4517 -#: builtin/commit.c:1594

4653 +#: builtin/commit.c:1643

4654 msgid "show what would be committed"

4655 msgstr "显示将要提交的内容"

4656

4521 -#: builtin/commit.c:1605

4657 +#: builtin/commit.c:1654

4658 msgid "amend previous commit"

4659 msgstr "修改先前的提交"

4660

4525 -#: builtin/commit.c:1606

4661 +#: builtin/commit.c:1655

4662 msgid "bypass post-rewrite hook"

4663 msgstr "绕过 post-rewrite 钩子"

4664

4529 -#: builtin/commit.c:1611

4665 +#: builtin/commit.c:1660

4666 msgid "ok to record an empty change"

4667 msgstr "允许一个空提交"

4668

4533 -#: builtin/commit.c:1613

4669 +#: builtin/commit.c:1662

4670 msgid "ok to record a change with an empty message"

4671 msgstr "允许空的提交说明"

4672

4537 -#: builtin/commit.c:1641

4673 +#: builtin/commit.c:1691

4674 msgid "could not parse HEAD commit"

4675 msgstr "不能解析 HEAD 提交"

4676

4541 -#: builtin/commit.c:1680 builtin/merge.c:518

4677 +#: builtin/commit.c:1730 builtin/merge.c:518

4678 #, c-format

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

4680 msgstr "不能为读入打开 '%s'"

4681

4546 -#: builtin/commit.c:1687

4682 +#: builtin/commit.c:1737

4683 #, c-format

4684 msgid "Corrupt MERGE_HEAD file (%s)"

4685 msgstr "损坏的 MERGE_HEAD 文件（%s）"

4686

4551 -#: builtin/commit.c:1694

4687 +#: builtin/commit.c:1744

4688 msgid "could not read MERGE_MODE"

4689 msgstr "不能读取 MERGE_MODE"

4690

4555 -#: builtin/commit.c:1713

4691 +#: builtin/commit.c:1763

4692 #, c-format

4693 msgid "could not read commit message: %s"

4694 msgstr "不能读取提交说明：%s"

4695

4560 -#: builtin/commit.c:1724

4696 +#: builtin/commit.c:1774

4697 #, c-format

4698 msgid "Aborting commit; you did not edit the message.\n"

4699 msgstr "终止提交；您未更改来自模版的提交说明。\n"

4700

4565 -#: builtin/commit.c:1729

4701 +#: builtin/commit.c:1779

4702 #, c-format

4703 msgid "Aborting commit due to empty commit message.\n"

4704 msgstr "终止提交因为提交说明为空。\n"

4705

4570 -#: builtin/commit.c:1744 builtin/merge.c:851 builtin/merge.c:876

4706 +#: builtin/commit.c:1794 builtin/merge.c:850 builtin/merge.c:875

4707 msgid "failed to write commit object"

4708 msgstr "无法写提交对象"

4709

4574 -#: builtin/commit.c:1756

4575 -msgid "cannot lock HEAD ref"

4576 -msgstr "无法锁定 HEAD 引用"

4577 -

4578 -#: builtin/commit.c:1769

4579 -msgid "cannot update HEAD ref"

4580 -msgstr "无法更新 HEAD 引用"

4581 -

4582 -#: builtin/commit.c:1780

4710 +#: builtin/commit.c:1827

4711 msgid ""

4712 "Repository has been updated, but unable to write\n"

4585 -"new_index file. Check that disk is not full or quota is\n"

4713 +"new_index file. Check that disk is not full and quota is\n"

4714 "not exceeded, and then \"git reset HEAD\" to recover."

4715 msgstr ""

4716 "版本库已更新，但无法写 new_index 文件。检查是否磁盘已满\n"

@@ -4716,63 +4844,87 @@ msgstr "终止值是NUL字节"

4844 msgid "respect include directives on lookup"

4845 msgstr "查询时参照 include 指令递归查找"

4846

4719 -#: builtin/count-objects.c:82

4847 +#: builtin/config.c:315

4848 +msgid "unable to parse default color value"

4849 +msgstr "不能解析缺省的颜色值"

4850 +

4851 +#: builtin/config.c:455

4852 +#, c-format

4853 +msgid ""

4854 +"# This is Git's per-user configuration file.\n"

4855 +"[core]\n"

4856 +"# Please adapt and uncomment the following lines:\n"

4857 +"#\tuser = %s\n"

4858 +"#\temail = %s\n"

4859 +msgstr ""

4860 +"# This is Git's per-user configuration file.\n"

4861 +"[core]\n"

4862 +"# Please adapt and uncomment the following lines:\n"

4863 +"#\tuser = %s\n"

4864 +"#\temail = %s\n"

4865 +

4866 +#: builtin/config.c:590

4867 +#, c-format

4868 +msgid "cannot create configuration file %s"

4869 +msgstr "不能创建配置文件 %s"

4870 +

4871 +#: builtin/count-objects.c:55

4872 msgid "git count-objects [-v] [-H | --human-readable]"

4873 msgstr "git count-objects [-v] [-H | --human-readable]"

4874

4723 -#: builtin/count-objects.c:97

4875 +#: builtin/count-objects.c:65

4876 msgid "print sizes in human readable format"

4877 msgstr "以用户可读的格式显示大小"

4878

4727 -#: builtin/describe.c:16

4879 +#: builtin/describe.c:17

4880 msgid "git describe [options] <commit-ish>*"

4881 msgstr "git describe [选项] <提交号>*"

4882

4731 -#: builtin/describe.c:17

4883 +#: builtin/describe.c:18

4884 msgid "git describe [options] --dirty"

4885 msgstr "git describe [选项] --dirty"

4886

4735 -#: builtin/describe.c:216

4887 +#: builtin/describe.c:217

4888 #, c-format

4889 msgid "annotated tag %s not available"

4890 msgstr "注释 tag %s 无效"

4891

4740 -#: builtin/describe.c:220

4892 +#: builtin/describe.c:221

4893 #, c-format

4894 msgid "annotated tag %s has no embedded name"

4895 msgstr "注释 tag %s 没有嵌入名称"

4896

4745 -#: builtin/describe.c:222

4897 +#: builtin/describe.c:223

4898 #, c-format

4899 msgid "tag '%s' is really '%s' here"

4900 msgstr "tag '%s' 的确是在 '%s'"

4901

4750 -#: builtin/describe.c:249

4902 +#: builtin/describe.c:250 builtin/log.c:452

4903 #, c-format

4904 msgid "Not a valid object name %s"

4905 msgstr "不是一个有效的对象名 %s"

4906

4755 -#: builtin/describe.c:252

4907 +#: builtin/describe.c:253

4908 #, c-format

4909 msgid "%s is not a valid '%s' object"

4910 msgstr "%s 不是一个有效的 '%s' 对象"

4911

4760 -#: builtin/describe.c:269

4912 +#: builtin/describe.c:270

4913 #, c-format

4914 msgid "no tag exactly matches '%s'"

4915 msgstr "没有 tag 准确匹配 '%s'"

4916

4765 -#: builtin/describe.c:271

4917 +#: builtin/describe.c:272

4918 #, c-format

4919 msgid "searching to describe %s\n"

4920 msgstr "搜索描述 %s\n"

4921

4770 -#: builtin/describe.c:318

4922 +#: builtin/describe.c:319

4923 #, c-format

4924 msgid "finished search at %s\n"

4925 msgstr "完成搜索 %s\n"

4926

4775 -#: builtin/describe.c:345

4927 +#: builtin/describe.c:346

4928 #, c-format

4929 msgid ""

4930 "No annotated tags can describe '%s'.\n"

@@ -4781,7 +4933,7 @@ msgstr ""

4933 "没有注释 tag 能描述 '%s'。\n"

4934 "然而，有非注释 tag：尝试 --tags。"

4935

4784 -#: builtin/describe.c:349

4936 +#: builtin/describe.c:350

4937 #, c-format

4938 msgid ""

4939 "No tags can describe '%s'.\n"

@@ -4790,12 +4942,12 @@ msgstr ""

4942 "没有注释 tag 能描述 '%s'。\n"

4943 "尝试 --always，或者创建一些 tag。"

4944

4793 -#: builtin/describe.c:370

4945 +#: builtin/describe.c:371

4946 #, c-format

4947 msgid "traversed %lu commits\n"

4948 msgstr "已遍历 %lu 个提交\n"

4949

4798 -#: builtin/describe.c:373

4950 +#: builtin/describe.c:374

4951 #, c-format

4952 msgid ""

4953 "more than %i tags found; listed %i most recent\n"

@@ -4804,143 +4956,147 @@ msgstr ""

4956 "发现多于 %i 个 tag，列出最近的 %i 个\n"

4957 "在 %s 放弃搜索\n"

4958

4807 -#: builtin/describe.c:395

4959 +#: builtin/describe.c:396

4960 msgid "find the tag that comes after the commit"

4961 msgstr "寻找提交之后的 tag（用于描述提交）"

4962

4811 -#: builtin/describe.c:396

4963 +#: builtin/describe.c:397

4964 msgid "debug search strategy on stderr"

4965 msgstr "在标准错误上调试搜索策略"

4966

4815 -#: builtin/describe.c:397

4967 +#: builtin/describe.c:398

4968 msgid "use any ref"

4969 msgstr "使用任意引用"

4970

4819 -#: builtin/describe.c:398

4971 +#: builtin/describe.c:399

4972 msgid "use any tag, even unannotated"

4973 msgstr "使用任意 tag，即使未带注解"

4974

4823 -#: builtin/describe.c:399

4975 +#: builtin/describe.c:400

4976 msgid "always use long format"

4977 msgstr "始终使用长提交号格式"

4978

4827 -#: builtin/describe.c:400

4979 +#: builtin/describe.c:401

4980 msgid "only follow first parent"

4981 msgstr "只跟随第一个父提交"

4982

4831 -#: builtin/describe.c:403

4983 +#: builtin/describe.c:404

4984 msgid "only output exact matches"

4985 msgstr "只输出精确匹配"

4986

4835 -#: builtin/describe.c:405

4987 +#: builtin/describe.c:406

4988 msgid "consider <n> most recent tags (default: 10)"

4989 msgstr "考虑最近 <n> 个 tags（默认：10）"

4990

4839 -#: builtin/describe.c:407

4991 +#: builtin/describe.c:408

4992 msgid "only consider tags matching <pattern>"

4993 msgstr "只考虑匹配 <模式> 的 tags"

4994

4843 -#: builtin/describe.c:409 builtin/name-rev.c:318

4995 +#: builtin/describe.c:410 builtin/name-rev.c:318

4996 msgid "show abbreviated commit object as fallback"

4997 msgstr "显示简写的提交号作为后备"

4998

4847 -#: builtin/describe.c:410

4999 +#: builtin/describe.c:411

5000 msgid "mark"

5001 msgstr "标记"

5002

4851 -#: builtin/describe.c:411

5003 +#: builtin/describe.c:412

5004 msgid "append <mark> on dirty working tree (default: \"-dirty\")"

5005 msgstr "若工作区脏（有变更）在结尾添加 <标记>（默认：\"-dirty\"）"

5006

4855 -#: builtin/describe.c:429

5007 +#: builtin/describe.c:430

5008 msgid "--long is incompatible with --abbrev=0"

5009 msgstr "--long 与 --abbrev=0 不兼容"

5010

4859 -#: builtin/describe.c:455

5011 +#: builtin/describe.c:456

5012 msgid "No names found, cannot describe anything."

5013 msgstr "没有发现名称，无法描述任何东西。"

5014

4863 -#: builtin/describe.c:475

5015 +#: builtin/describe.c:476

5016 msgid "--dirty is incompatible with commit-ishes"

5017 msgstr "--dirty 不能与提交同时使用"

5018

4867 -#: builtin/diff.c:85

5019 +#: builtin/diff.c:86

5020 #, c-format

5021 msgid "'%s': not a regular file or symlink"

5022 msgstr "'%s'：不是一个正规文件或符号链接"

5023

4872 -#: builtin/diff.c:236

5024 +#: builtin/diff.c:237

5025 #, c-format

5026 msgid "invalid option: %s"

5027 msgstr "无效选项：%s"

5028

4877 -#: builtin/diff.c:357

5029 +#: builtin/diff.c:358

5030 msgid "Not a git repository"

5031 msgstr "不是一个 git 版本库"

5032

4881 -#: builtin/diff.c:400

5033 +#: builtin/diff.c:401

5034 #, c-format

5035 msgid "invalid object '%s' given."

5036 msgstr "提供了无效对象 '%s'。"

5037

4886 -#: builtin/diff.c:409

5038 +#: builtin/diff.c:410

5039 #, c-format

5040 msgid "more than two blobs given: '%s'"

5041 msgstr "提供了超过两个数据（blob）对象：'%s'"

5042

4891 -#: builtin/diff.c:416

5043 +#: builtin/diff.c:417

5044 #, c-format

5045 msgid "unhandled object '%s' given."

5046 msgstr "无法处理的对象 '%s'。"

5047

4896 -#: builtin/fast-export.c:23

5048 +#: builtin/fast-export.c:24

5049 msgid "git fast-export [rev-list-opts]"

5050 msgstr "git fast-export [rev-list-opts]"

5051

4900 -#: builtin/fast-export.c:702

5052 +#: builtin/fast-export.c:979

5053 msgid "show progress after <n> objects"

5054 msgstr "在 <n> 个对象之后显示进度"

5055

4904 -#: builtin/fast-export.c:704

5056 +#: builtin/fast-export.c:981

5057 msgid "select handling of signed tags"

5058 msgstr "选择如何处理签名 tags"

5059

4908 -#: builtin/fast-export.c:707

5060 +#: builtin/fast-export.c:984

5061 msgid "select handling of tags that tag filtered objects"

5062 msgstr "选择当 tag 指向被过滤时 tags 的处理方式"

5063

4912 -#: builtin/fast-export.c:710

5064 +#: builtin/fast-export.c:987

5065 msgid "Dump marks to this file"

5066 msgstr "把标记存储到这个文件"

5067

4916 -#: builtin/fast-export.c:712

5068 +#: builtin/fast-export.c:989

5069 msgid "Import marks from this file"

5070 msgstr "从这个文件导入标记"

5071

4920 -#: builtin/fast-export.c:714

5072 +#: builtin/fast-export.c:991

5073 msgid "Fake a tagger when tags lack one"

5074 msgstr "当 tags 缺少标记者字段时，假装提供一个"

5075

4924 -#: builtin/fast-export.c:716

5076 +#: builtin/fast-export.c:993

5077 msgid "Output full tree for each commit"

5078 msgstr "每次提交都输出整个树"

5079

4928 -#: builtin/fast-export.c:718

5080 +#: builtin/fast-export.c:995

5081 msgid "Use the done feature to terminate the stream"

5082 msgstr "使用 done 功能来终止流"

5083

4932 -#: builtin/fast-export.c:719

5084 +#: builtin/fast-export.c:996

5085 msgid "Skip output of blob data"

5086 msgstr "跳过数据对象的输出"

5087

4936 -#: builtin/fast-export.c:720

5088 +#: builtin/fast-export.c:997

5089 msgid "refspec"

5090 msgstr "引用表达式"

5091

4940 -#: builtin/fast-export.c:721

5092 +#: builtin/fast-export.c:998

5093 msgid "Apply refspec to exported refs"

5094 msgstr "对导出的引用应用引用表达式"

5095

5096 +#: builtin/fast-export.c:999

5097 +msgid "anonymize output"

5098 +msgstr "匿名输出"

5099 +

5100 #: builtin/fetch.c:20

5101 msgid "git fetch [<options>] [<repository> [<refspec>...]]"

5102 msgstr "git fetch [<选项>] [<版本库> [<引用规则>...]]"

@@ -5014,7 +5170,7 @@ msgstr "深化浅克隆的历史"

5170 msgid "convert to a complete repository"

5171 msgstr "转换为一个完整的版本库"

5172

5017 -#: builtin/fetch.c:118 builtin/log.c:1205

5173 +#: builtin/fetch.c:118 builtin/log.c:1208

5174 msgid "dir"

5175 msgstr "目录"

5176

@@ -5042,78 +5198,78 @@ msgstr "指定获取操作的引用映射"

5198 msgid "Couldn't find remote ref HEAD"

5199 msgstr "无法发现远程 HEAD 引用"

5200

5045 -#: builtin/fetch.c:440

5201 +#: builtin/fetch.c:454

5202 #, c-format

5203 msgid "object %s not found"

5204 msgstr "对象 %s 未发现"

5205

5050 -#: builtin/fetch.c:445

5206 +#: builtin/fetch.c:459

5207 msgid "[up to date]"

5208 msgstr "[最新]"

5209

5054 -#: builtin/fetch.c:459

5210 +#: builtin/fetch.c:473

5211 #, c-format

5212 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"

5213 msgstr "! %-*s %-*s -> %s （在当前分支下不能获取）"

5214

5059 -#: builtin/fetch.c:460 builtin/fetch.c:546

5215 +#: builtin/fetch.c:474 builtin/fetch.c:560

5216 msgid "[rejected]"

5217 msgstr "[已拒绝]"

5218

5063 -#: builtin/fetch.c:471

5219 +#: builtin/fetch.c:485

5220 msgid "[tag update]"

5221 msgstr "[tag更新]"

5222

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

5068 -#: builtin/fetch.c:473 builtin/fetch.c:508 builtin/fetch.c:526

5224 +#: builtin/fetch.c:487 builtin/fetch.c:522 builtin/fetch.c:540

5225 msgid " (unable to update local ref)"

5226 msgstr " （不能更新本地引用）"

5227

5072 -#: builtin/fetch.c:491

5228 +#: builtin/fetch.c:505

5229 msgid "[new tag]"

5230 msgstr "[新tag]"

5231

5076 -#: builtin/fetch.c:494

5232 +#: builtin/fetch.c:508

5233 msgid "[new branch]"

5234 msgstr "[新分支]"

5235

5080 -#: builtin/fetch.c:497

5236 +#: builtin/fetch.c:511

5237 msgid "[new ref]"

5238 msgstr "[新引用]"

5239

5084 -#: builtin/fetch.c:542

5240 +#: builtin/fetch.c:556

5241 msgid "unable to update local ref"

5242 msgstr "不能更新本地引用"

5243

5088 -#: builtin/fetch.c:542

5244 +#: builtin/fetch.c:556

5245 msgid "forced update"

5246 msgstr "强制更新"

5247

5092 -#: builtin/fetch.c:548

5248 +#: builtin/fetch.c:562

5249 msgid "(non-fast-forward)"

5250 msgstr "（非快进式）"

5251

5096 -#: builtin/fetch.c:581 builtin/fetch.c:814

5252 +#: builtin/fetch.c:595 builtin/fetch.c:828

5253 #, c-format

5254 msgid "cannot open %s: %s\n"

5255 msgstr "无法打开 %s：%s\n"

5256

5101 -#: builtin/fetch.c:590

5257 +#: builtin/fetch.c:604

5258 #, c-format

5259 msgid "%s did not send all necessary objects\n"

5260 msgstr "%s 未发送所有必须的对象\n"

5261

5106 -#: builtin/fetch.c:608

5262 +#: builtin/fetch.c:622

5263 #, c-format

5264 msgid "reject %s because shallow roots are not allowed to be updated"

5265 msgstr "拒绝 %s 因为浅克隆不允许被更新"

5266

5111 -#: builtin/fetch.c:696 builtin/fetch.c:779

5267 +#: builtin/fetch.c:710 builtin/fetch.c:793

5268 #, c-format

5269 msgid "From %.*s\n"

5270 msgstr "来自 %.*s\n"

5271

5116 -#: builtin/fetch.c:707

5272 +#: builtin/fetch.c:721

5273 #, c-format

5274 msgid ""

5275 "some local refs could not be updated; try running\n"

@@ -5123,87 +5279,87 @@ msgstr ""

5279 " 'git remote prune %s' 来删除旧的、有冲突的分支"

5280

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

5126 -#: builtin/fetch.c:759

5282 +#: builtin/fetch.c:773

5283 #, c-format

5284 msgid " (%s will become dangling)"

5285 msgstr " （%s 将成为摇摆状态）"

5286

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

5132 -#: builtin/fetch.c:760

5288 +#: builtin/fetch.c:774

5289 #, c-format

5290 msgid " (%s has become dangling)"

5291 msgstr " （%s 已成为摇摆状态）"

5292

5137 -#: builtin/fetch.c:784

5293 +#: builtin/fetch.c:798

5294 msgid "[deleted]"

5295 msgstr "[已删除]"

5296

5141 -#: builtin/fetch.c:785 builtin/remote.c:1059

5297 +#: builtin/fetch.c:799 builtin/remote.c:1063

5298 msgid "(none)"

5299 msgstr "（无）"

5300

5145 -#: builtin/fetch.c:804

5301 +#: builtin/fetch.c:818

5302 #, c-format

5303 msgid "Refusing to fetch into current branch %s of non-bare repository"

5148 -msgstr "拒绝获取到非裸版本库的当前分支 %s"

5304 +msgstr "拒绝获取到非纯版本库的当前分支 %s"

5305

5150 -#: builtin/fetch.c:823

5306 +#: builtin/fetch.c:837

5307 #, c-format

5308 msgid "Option \"%s\" value \"%s\" is not valid for %s"

5309 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"

5310

5155 -#: builtin/fetch.c:826

5311 +#: builtin/fetch.c:840

5312 #, c-format

5313 msgid "Option \"%s\" is ignored for %s\n"

5314 msgstr "选项 \"%s\" 为 %s 所忽略\n"

5315

5160 -#: builtin/fetch.c:882

5316 +#: builtin/fetch.c:896

5317 #, c-format

5318 msgid "Don't know how to fetch from %s"

5319 msgstr "不知道如何从 %s 获取"

5320

5165 -#: builtin/fetch.c:1044

5321 +#: builtin/fetch.c:1058

5322 #, c-format

5323 msgid "Fetching %s\n"

5324 msgstr "正在获取 %s\n"

5325

5170 -#: builtin/fetch.c:1046 builtin/remote.c:90

5326 +#: builtin/fetch.c:1060 builtin/remote.c:90

5327 #, c-format

5328 msgid "Could not fetch %s"

5329 msgstr "不能获取 %s"

5330

5175 -#: builtin/fetch.c:1064

5331 +#: builtin/fetch.c:1078

5332 msgid ""

5333 "No remote repository specified. Please, specify either a URL or a\n"

5334 "remote name from which new revisions should be fetched."

5335 msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定，用以获取新提交。"

5336

5181 -#: builtin/fetch.c:1087

5337 +#: builtin/fetch.c:1101

5338 msgid "You need to specify a tag name."

5339 msgstr "您需要指定一个 tag 名称。"

5340

5185 -#: builtin/fetch.c:1131

5341 +#: builtin/fetch.c:1143

5342 msgid "--depth and --unshallow cannot be used together"

5343 msgstr "--depth 和 --unshallow 不能同时使用"

5344

5189 -#: builtin/fetch.c:1133

5345 +#: builtin/fetch.c:1145

5346 msgid "--unshallow on a complete repository does not make sense"

5347 msgstr "对于一个完整的版本库，参数 --unshallow 没有意义"

5348

5193 -#: builtin/fetch.c:1156

5349 +#: builtin/fetch.c:1168

5350 msgid "fetch --all does not take a repository argument"

5351 msgstr "fetch --all 不能带一个版本库参数"

5352

5197 -#: builtin/fetch.c:1158

5353 +#: builtin/fetch.c:1170

5354 msgid "fetch --all does not make sense with refspecs"

5355 msgstr "fetch --all 带引用规则没有任何意义"

5356

5201 -#: builtin/fetch.c:1169

5357 +#: builtin/fetch.c:1181

5358 #, c-format

5359 msgid "No such remote or remote group: %s"

5360 msgstr "没有这样的远程或远程组：%s"

5361

5206 -#: builtin/fetch.c:1177

5362 +#: builtin/fetch.c:1189

5363 msgid "Fetching a group and specifying refspecs does not make sense"

5364 msgstr "获取组并指定引用规则没有意义"

5365

@@ -5213,8 +5369,8 @@ msgstr ""

5369 "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"

5370

5371 #: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:698

5216 -#: builtin/merge.c:196 builtin/repack.c:179 builtin/repack.c:183

5217 -#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:589

5372 +#: builtin/merge.c:197 builtin/repack.c:179 builtin/repack.c:183

5373 +#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:590

5374 #: parse-options.h:132 parse-options.h:239

5375 msgid "n"

5376 msgstr "n"

@@ -5239,99 +5395,103 @@ msgstr "使用 <文本> 作为提交说明的开始"

5395 msgid "file to read from"

5396 msgstr "从文件中读取"

5397

5242 -#: builtin/for-each-ref.c:1051

5398 +#: builtin/for-each-ref.c:676

5399 +msgid "unable to parse format"

5400 +msgstr "不能解析格式"

5401 +

5402 +#: builtin/for-each-ref.c:1057

5403 msgid "git for-each-ref [options] [<pattern>]"

5404 msgstr "git for-each-ref [选项] [<模式>]"

5405

5246 -#: builtin/for-each-ref.c:1066

5406 +#: builtin/for-each-ref.c:1072

5407 msgid "quote placeholders suitably for shells"

5408 msgstr "引用占位符适用于 shells"

5409

5250 -#: builtin/for-each-ref.c:1068

5410 +#: builtin/for-each-ref.c:1074

5411 msgid "quote placeholders suitably for perl"

5412 msgstr "引用占位符适用于 perl"

5413

5254 -#: builtin/for-each-ref.c:1070

5414 +#: builtin/for-each-ref.c:1076

5415 msgid "quote placeholders suitably for python"

5416 msgstr "引用占位符适用于 python"

5417

5258 -#: builtin/for-each-ref.c:1072

5418 +#: builtin/for-each-ref.c:1078

5419 msgid "quote placeholders suitably for tcl"

5420 msgstr "引用占位符适用于 tcl"

5421

5262 -#: builtin/for-each-ref.c:1075

5422 +#: builtin/for-each-ref.c:1081

5423 msgid "show only <n> matched refs"

5424 msgstr "只显示 <n> 个匹配的引用"

5425

5266 -#: builtin/for-each-ref.c:1076 builtin/replace.c:435

5426 +#: builtin/for-each-ref.c:1082 builtin/replace.c:438

5427 msgid "format"

5428 msgstr "格式"

5429

5270 -#: builtin/for-each-ref.c:1076

5430 +#: builtin/for-each-ref.c:1082

5431 msgid "format to use for the output"

5432 msgstr "输出格式"

5433

5274 -#: builtin/for-each-ref.c:1077

5434 +#: builtin/for-each-ref.c:1083

5435 msgid "key"

5436 msgstr "key"

5437

5278 -#: builtin/for-each-ref.c:1078

5438 +#: builtin/for-each-ref.c:1084

5439 msgid "field name to sort on"

5440 msgstr "排序的字段名"

5441

5282 -#: builtin/fsck.c:147 builtin/prune.c:172

5442 +#: builtin/fsck.c:147 builtin/prune.c:136

5443 msgid "Checking connectivity"

5444 msgstr "检查连接中"

5445

5286 -#: builtin/fsck.c:538

5446 +#: builtin/fsck.c:540

5447 msgid "Checking object directories"

5448 msgstr "检查对象目录中"

5449

5290 -#: builtin/fsck.c:601

5450 +#: builtin/fsck.c:603

5451 msgid "git fsck [options] [<object>...]"

5452 msgstr "git fsck [选项] [<对象>...]"

5453

5294 -#: builtin/fsck.c:607

5454 +#: builtin/fsck.c:609

5455 msgid "show unreachable objects"

5456 msgstr "显示不可达的对象"

5457

5298 -#: builtin/fsck.c:608

5458 +#: builtin/fsck.c:610

5459 msgid "show dangling objects"

5460 msgstr "显示摇摆的对象"

5461

5302 -#: builtin/fsck.c:609

5462 +#: builtin/fsck.c:611

5463 msgid "report tags"

5464 msgstr "报告 tags"

5465

5306 -#: builtin/fsck.c:610

5466 +#: builtin/fsck.c:612

5467 msgid "report root nodes"

5468 msgstr "报告根节点"

5469

5310 -#: builtin/fsck.c:611

5470 +#: builtin/fsck.c:613

5471 msgid "make index objects head nodes"

5472 msgstr "将索引亦作为检查的头节点"

5473

5314 -#: builtin/fsck.c:612

5474 +#: builtin/fsck.c:614

5475 msgid "make reflogs head nodes (default)"

5476 msgstr "将引用日志作为检查的头节点（默认）"

5477

5318 -#: builtin/fsck.c:613

5478 +#: builtin/fsck.c:615

5479 msgid "also consider packs and alternate objects"

5480 msgstr "也考虑包和备用对象"

5481

5322 -#: builtin/fsck.c:614

5482 +#: builtin/fsck.c:616

5483 msgid "enable more strict checking"

5484 msgstr "启用更严格的检查"

5485

5326 -#: builtin/fsck.c:616

5486 +#: builtin/fsck.c:618

5487 msgid "write dangling objects in .git/lost-found"

5488 msgstr "将摇摆对象写入 .git/lost-found 中"

5489

5330 -#: builtin/fsck.c:617 builtin/prune.c:144

5490 +#: builtin/fsck.c:619 builtin/prune.c:108

5491 msgid "show progress"

5492 msgstr "显示进度"

5493

5334 -#: builtin/fsck.c:667

5494 +#: builtin/fsck.c:669

5495 msgid "Checking objects"

5496 msgstr "检查对象中"

5497

@@ -5339,55 +5499,55 @@ msgstr "检查对象中"

5499 msgid "git gc [options]"

5500 msgstr "git gc [选项]"

5501

5342 -#: builtin/gc.c:91

5502 +#: builtin/gc.c:79

5503 #, c-format

5344 -msgid "Invalid %s: '%s'"

5345 -msgstr "无效的 %s：'%s'"

5504 +msgid "Invalid gc.pruneexpire: '%s'"

5505 +msgstr "无效的 gc.pruneexpire：'%s'"

5506

5347 -#: builtin/gc.c:118

5507 +#: builtin/gc.c:107

5508 #, c-format

5509 msgid "insanely long object directory %.*s"

5510 msgstr "不正常的长对象目录 %.*s"

5511

5352 -#: builtin/gc.c:287

5512 +#: builtin/gc.c:276

5513 msgid "prune unreferenced objects"

5514 msgstr "清除未引用的对象"

5515

5356 -#: builtin/gc.c:289

5516 +#: builtin/gc.c:278

5517 msgid "be more thorough (increased runtime)"

5518 msgstr "更彻底（增加运行时间）"

5519

5360 -#: builtin/gc.c:290

5520 +#: builtin/gc.c:279

5521 msgid "enable auto-gc mode"

5522 msgstr "启用自动垃圾回收模式"

5523

5364 -#: builtin/gc.c:291

5524 +#: builtin/gc.c:280

5525 msgid "force running gc even if there may be another gc running"

5526 msgstr "强制执行 gc 即使另外一个 gc 正在执行"

5527

5368 -#: builtin/gc.c:332

5528 +#: builtin/gc.c:321

5529 #, c-format

5530 msgid "Auto packing the repository in background for optimum performance.\n"

5531 msgstr "自动在后台执行版本库打包以求最佳性能。\n"

5532

5373 -#: builtin/gc.c:334

5533 +#: builtin/gc.c:323

5534 #, c-format

5535 msgid "Auto packing the repository for optimum performance.\n"

5536 msgstr "自动打包版本库以求最佳性能。\n"

5537

5378 -#: builtin/gc.c:335

5538 +#: builtin/gc.c:324

5539 #, c-format

5540 msgid "See \"git help gc\" for manual housekeeping.\n"

5541 msgstr "手工维护参见 \"git help gc\"。\n"

5542

5383 -#: builtin/gc.c:353

5543 +#: builtin/gc.c:342

5544 #, c-format

5545 msgid ""

5546 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"

5547 msgstr ""

5548 "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> （如果不是，使用 --force）"

5549

5390 -#: builtin/gc.c:375

5550 +#: builtin/gc.c:364

5551 msgid ""

5552 "There are too many unreachable loose objects; run 'git prune' to remove them."

5553 msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。"

@@ -5618,7 +5778,7 @@ msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"

5778 msgid "both --cached and trees are given."

5779 msgstr "同时给出了 --cached 和树对象。"

5780

5621 -#: builtin/hash-object.c:60

5781 +#: builtin/hash-object.c:82

5782 msgid ""

5783 "git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "

5784 "<file>..."

@@ -5626,31 +5786,36 @@ msgstr ""

5786 "git hash-object [-t <类型>] [-w] [--path=<文件>|--no-filters] [--stdin] [--] "

5787 "<文件>..."

5788

5629 -#: builtin/hash-object.c:61

5789 +#: builtin/hash-object.c:83

5790 msgid "git hash-object --stdin-paths < <list-of-paths>"

5791 msgstr "git hash-object --stdin-paths < <路径列表>"

5792

5633 -#: builtin/hash-object.c:72 builtin/tag.c:609

5793 +#: builtin/hash-object.c:94 builtin/tag.c:610

5794 msgid "type"

5795 msgstr "类型"

5796

5637 -#: builtin/hash-object.c:72

5797 +#: builtin/hash-object.c:94

5798 msgid "object type"

5799 msgstr "对象类型"

5800

5641 -#: builtin/hash-object.c:73

5801 +#: builtin/hash-object.c:95

5802 msgid "write the object into the object database"

5803 msgstr "将对象写入对象数据库"

5804

5645 -#: builtin/hash-object.c:74

5805 +#: builtin/hash-object.c:97

l10n: zh_CN: translations for git v2.2.0-rc0