d46c551928 · matheusbsbs/matheus-bagliano

@@ -45,6 +45,7 @@

45 # commit-ish (also committish) | 提交号

46 # conflict | 冲突

47 # core Git | 核心 Git 工具

48 +# cover letter | 附函

49 # DAG | 有向无环图

50 # dangling object | 悬空对象

51 # detached HEAD | 分离头指针

@@ -138,8 +139,8 @@ msgid ""

139 msgstr ""

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

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

141 -"POT-Creation-Date: 2019-02-15 10:09+0800\n"

142 -"PO-Revision-Date: 2019-02-15 10:26+0800\n"

142 +"POT-Creation-Date: 2019-06-04 08:24+0800\n"

143 +"PO-Revision-Date: 2019-06-04 09:04+0800\n"

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

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

146 "Language: zh_CN\n"

@@ -148,37 +149,37 @@ msgstr ""

149 "Content-Transfer-Encoding: 8bit\n"

150 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

151

151 -#: advice.c:101

152 +#: advice.c:103

153 #, c-format

154 msgid "%shint: %.*s%s\n"

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

156

156 -#: advice.c:154

157 +#: advice.c:156

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

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

160

160 -#: advice.c:156

161 +#: advice.c:158

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

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

164

164 -#: advice.c:158

165 +#: advice.c:160

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

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

168

168 -#: advice.c:160

169 +#: advice.c:162

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

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

172

172 -#: advice.c:162

173 +#: advice.c:164

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

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

176

176 -#: advice.c:164

177 +#: advice.c:166

178 #, c-format

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

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

181

181 -#: advice.c:172

182 +#: advice.c:174

183 msgid ""

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

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

@@ -186,23 +187,23 @@ msgstr ""

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

188 "解决方案并提交。"

189

189 -#: advice.c:180

190 +#: advice.c:182

191 msgid "Exiting because of an unresolved conflict."

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

193

193 -#: advice.c:185 builtin/merge.c:1290

194 +#: advice.c:187 builtin/merge.c:1320

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

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

197

197 -#: advice.c:187

198 +#: advice.c:189

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

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

201

201 -#: advice.c:188

202 +#: advice.c:190

203 msgid "Exiting because of unfinished merge."

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

205

205 -#: advice.c:194

206 +#: advice.c:196

207 #, c-format

208 msgid ""

209 "Note: checking out '%s'.\n"

@@ -237,92 +238,92 @@ msgstr "命令行以 \\ 结尾"

238 msgid "unclosed quote"

239 msgstr "未关闭的引号"

240

240 -#: apply.c:59

241 +#: apply.c:63

242 #, c-format

243 msgid "unrecognized whitespace option '%s'"

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

245

245 -#: apply.c:75

246 +#: apply.c:79

247 #, c-format

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

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

250

250 -#: apply.c:125

251 +#: apply.c:129

252 msgid "--reject and --3way cannot be used together."

253 msgstr "--reject 和 --3way 不能同时使用。"

254

254 -#: apply.c:127

255 +#: apply.c:131

256 msgid "--cached and --3way cannot be used together."

257 msgstr "--cached 和 --3way 不能同时使用。"

258

258 -#: apply.c:130

259 +#: apply.c:134

260 msgid "--3way outside a repository"

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

262

262 -#: apply.c:141

263 +#: apply.c:145

264 msgid "--index outside a repository"

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

266

266 -#: apply.c:144

267 +#: apply.c:148

268 msgid "--cached outside a repository"

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

270

270 -#: apply.c:825

271 +#: apply.c:829

272 #, c-format

273 msgid "Cannot prepare timestamp regexp %s"

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

275

275 -#: apply.c:834

276 +#: apply.c:838

277 #, c-format

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

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

280

280 -#: apply.c:908

281 +#: apply.c:912

282 #, c-format

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

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

285

285 -#: apply.c:946

286 +#: apply.c:950

287 #, c-format

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

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

290

290 -#: apply.c:952

291 +#: apply.c:956

292 #, c-format

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

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

295

295 -#: apply.c:953

296 +#: apply.c:957

297 #, c-format

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

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

300

300 -#: apply.c:958

301 +#: apply.c:962

302 #, c-format

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

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

305

305 -#: apply.c:987

306 +#: apply.c:991

307 #, c-format

308 msgid "invalid mode on line %d: %s"

309 msgstr "第 %d 行包含无效文件模式：%s"

310

310 -#: apply.c:1306

311 +#: apply.c:1310

312 #, c-format

313 msgid "inconsistent header lines %d and %d"

314 msgstr "不一致的文件头，%d 行和 %d 行"

315

315 -#: apply.c:1478

316 +#: apply.c:1482

317 #, c-format

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

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

320

320 -#: apply.c:1547

321 +#: apply.c:1551

322 #, c-format

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

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

325

325 -#: apply.c:1567

326 +#: apply.c:1571

327 #, c-format

328 msgid ""

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

@@ -333,82 +334,82 @@ msgid_plural ""

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

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

336

336 -#: apply.c:1580

337 +#: apply.c:1584

338 #, c-format

339 msgid "git diff header lacks filename information (line %d)"

340 msgstr "git diff 的头信息中缺乏文件名信息（第 %d 行）"

341

341 -#: apply.c:1768

342 +#: apply.c:1772

343 msgid "new file depends on old contents"

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

345

345 -#: apply.c:1770

346 +#: apply.c:1774

347 msgid "deleted file still has contents"

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

349

349 -#: apply.c:1804

350 +#: apply.c:1808

351 #, c-format

352 msgid "corrupt patch at line %d"

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

354

354 -#: apply.c:1841

355 +#: apply.c:1845

356 #, c-format

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

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

359

359 -#: apply.c:1843

360 +#: apply.c:1847

361 #, c-format

362 msgid "deleted file %s still has contents"

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

364

364 -#: apply.c:1846

365 +#: apply.c:1850

366 #, c-format

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

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

369

369 -#: apply.c:1993

370 +#: apply.c:1997

371 #, c-format

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

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

374

374 -#: apply.c:2030

375 +#: apply.c:2034

376 #, c-format

377 msgid "unrecognized binary patch at line %d"

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

379

379 -#: apply.c:2192

380 +#: apply.c:2196

381 #, c-format

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

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

384

384 -#: apply.c:2278

385 +#: apply.c:2282

386 #, c-format

387 msgid "unable to read symlink %s"

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

389

389 -#: apply.c:2282

390 +#: apply.c:2286

391 #, c-format

392 msgid "unable to open or read %s"

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

394

394 -#: apply.c:2941

395 +#: apply.c:2945

396 #, c-format

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

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

399

399 -#: apply.c:3062

400 +#: apply.c:3066

401 #, c-format

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

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

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

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

406

406 -#: apply.c:3074

407 +#: apply.c:3078

408 #, c-format

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

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

411

411 -#: apply.c:3080

412 +#: apply.c:3084

413 #, c-format

414 msgid ""

415 "while searching for:\n"

@@ -417,446 +418,445 @@ msgstr ""

418 "当查询：\n"

419 "%.*s"

420

420 -#: apply.c:3102

421 +#: apply.c:3106

422 #, c-format

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

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

425

425 -#: apply.c:3110

426 +#: apply.c:3114

427 #, c-format

428 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"

429 msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁"

430

430 -#: apply.c:3157

431 +#: apply.c:3161

432 #, c-format

433 msgid "cannot apply binary patch to '%s' without full index line"

434 msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁"

435

435 -#: apply.c:3167

436 +#: apply.c:3171

437 #, c-format

438 msgid ""

439 "the patch applies to '%s' (%s), which does not match the current contents."

440 msgstr "补丁应用到 '%s'（%s），但是和当前内容不匹配。"

441

441 -#: apply.c:3175

442 +#: apply.c:3179

443 #, c-format

444 msgid "the patch applies to an empty '%s' but it is not empty"

445 msgstr "补丁应用到空文件 '%s'，但其并非空文件"

446

446 -#: apply.c:3193

447 +#: apply.c:3197

448 #, c-format

449 msgid "the necessary postimage %s for '%s' cannot be read"

450 msgstr "无法读取 '%2$s' 必需的目标文件 %1$s"

451

451 -#: apply.c:3206

452 +#: apply.c:3210

453 #, c-format

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

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

456

456 -#: apply.c:3212

457 +#: apply.c:3216

458 #, c-format

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

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

461

461 -#: apply.c:3233

462 +#: apply.c:3237

463 #, c-format

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

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

466

466 -#: apply.c:3356

467 +#: apply.c:3360

468 #, c-format

469 msgid "cannot checkout %s"

470 msgstr "不能检出 %s"

471

471 -#: apply.c:3408 apply.c:3419 apply.c:3465 midx.c:58 setup.c:278

472 +#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:59 setup.c:279

473 #, c-format

474 msgid "failed to read %s"

475 msgstr "无法读取 %s"

476

476 -#: apply.c:3416

477 +#: apply.c:3420

478 #, c-format

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

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

481

481 -#: apply.c:3445 apply.c:3688

482 +#: apply.c:3449 apply.c:3692

483 #, c-format

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

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

486

486 -#: apply.c:3531 apply.c:3703

487 +#: apply.c:3535 apply.c:3707

488 #, c-format

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

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

491

491 -#: apply.c:3540 apply.c:3711

492 +#: apply.c:3544 apply.c:3715

493 #, c-format

494 msgid "%s: does not match index"

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

496

496 -#: apply.c:3575

497 +#: apply.c:3579

498 msgid "repository lacks the necessary blob to fall back on 3-way merge."

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

500

500 -#: apply.c:3578

501 +#: apply.c:3582

502 #, c-format

503 msgid "Falling back to three-way merge...\n"

504 msgstr "回落到三方合并...\n"

505

505 -#: apply.c:3594 apply.c:3598

506 +#: apply.c:3598 apply.c:3602

507 #, c-format

508 msgid "cannot read the current contents of '%s'"

509 msgstr "无法读取 '%s' 的当前内容"

510

510 -#: apply.c:3610

511 +#: apply.c:3614

512 #, c-format

513 msgid "Failed to fall back on three-way merge...\n"

514 msgstr "无法回落到三方合并...\n"

515

515 -#: apply.c:3624

516 +#: apply.c:3628

517 #, c-format

518 msgid "Applied patch to '%s' with conflicts.\n"

519 msgstr "应用补丁到 '%s' 存在冲突。\n"

520

520 -#: apply.c:3629

521 +#: apply.c:3633

522 #, c-format

523 msgid "Applied patch to '%s' cleanly.\n"

524 msgstr "成功应用补丁到 '%s'。\n"

525

525 -#: apply.c:3655

526 +#: apply.c:3659

527 msgid "removal patch leaves file contents"

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

529

529 -#: apply.c:3728

530 +#: apply.c:3732

531 #, c-format

532 msgid "%s: wrong type"

533 msgstr "%s：错误类型"

534

534 -#: apply.c:3730

535 +#: apply.c:3734

536 #, c-format

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

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

539

539 -#: apply.c:3881 apply.c:3883 read-cache.c:820 read-cache.c:846

540 -#: read-cache.c:1299

540 +#: apply.c:3885 apply.c:3887 read-cache.c:830 read-cache.c:856

541 +#: read-cache.c:1309

542 #, c-format

543 msgid "invalid path '%s'"

544 msgstr "无效路径 '%s'"

545

545 -#: apply.c:3939

546 +#: apply.c:3943

547 #, c-format

548 msgid "%s: already exists in index"

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

550

550 -#: apply.c:3942

551 +#: apply.c:3946

552 #, c-format

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

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

555

555 -#: apply.c:3962

556 +#: apply.c:3966

557 #, c-format

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

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

560

560 -#: apply.c:3967

561 +#: apply.c:3971

562 #, c-format

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

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

565

565 -#: apply.c:3987

566 +#: apply.c:3991

567 #, c-format

568 msgid "affected file '%s' is beyond a symbolic link"

569 msgstr "受影响的文件 '%s' 位于符号链接中"

570

570 -#: apply.c:3991

571 +#: apply.c:3995

572 #, c-format

573 msgid "%s: patch does not apply"

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

575

575 -#: apply.c:4006

576 +#: apply.c:4010

577 #, c-format

578 msgid "Checking patch %s..."

579 msgstr "正在检查补丁 %s..."

580

580 -#: apply.c:4098

581 +#: apply.c:4102

582 #, c-format

583 msgid "sha1 information is lacking or useless for submodule %s"

584 msgstr "子模组 %s 的 sha1 信息缺失或无效"

585

585 -#: apply.c:4105

586 +#: apply.c:4109

587 #, c-format

588 msgid "mode change for %s, which is not in current HEAD"

589 msgstr "%s 的模式变更，但它不在当前 HEAD 中"

590

590 -#: apply.c:4108

591 +#: apply.c:4112

592 #, c-format

593 msgid "sha1 information is lacking or useless (%s)."

594 msgstr "sha1 信息缺失或无效（%s）。"

595

595 -#: apply.c:4113 builtin/checkout.c:248 builtin/reset.c:143

596 +#: apply.c:4117 builtin/checkout.c:257 builtin/reset.c:143

597 #, c-format

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

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

600

600 -#: apply.c:4117

601 +#: apply.c:4121

602 #, c-format

603 msgid "could not add %s to temporary index"

604 msgstr "不能在临时索引中添加 %s"

605

605 -#: apply.c:4127

606 +#: apply.c:4131

607 #, c-format

608 msgid "could not write temporary index to %s"

609 msgstr "不能把临时索引写入到 %s"

610

610 -#: apply.c:4265

611 +#: apply.c:4269

612 #, c-format

613 msgid "unable to remove %s from index"

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

615

615 -#: apply.c:4299

616 +#: apply.c:4303

617 #, c-format

618 msgid "corrupt patch for submodule %s"

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

620

620 -#: apply.c:4305

621 +#: apply.c:4309

622 #, c-format

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

624 msgstr "不能对新建文件 '%s' 调用 stat"

625

625 -#: apply.c:4313

626 +#: apply.c:4317

627 #, c-format

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

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

630

630 -#: apply.c:4319 apply.c:4464

631 +#: apply.c:4323 apply.c:4468

632 #, c-format

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

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

635

635 -#: apply.c:4362

636 +#: apply.c:4366

637 #, c-format

638 msgid "failed to write to '%s'"

639 msgstr "写入 '%s' 失败"

640

640 -#: apply.c:4366

641 +#: apply.c:4370

642 #, c-format

643 msgid "closing file '%s'"

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

645

645 -#: apply.c:4436

646 +#: apply.c:4440

647 #, c-format

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

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

650

650 -#: apply.c:4534

651 +#: apply.c:4538

652 #, c-format

653 msgid "Applied patch %s cleanly."

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

655

655 -#: apply.c:4542

656 +#: apply.c:4546

657 msgid "internal error"

658 msgstr "内部错误"

659

659 -#: apply.c:4545

660 +#: apply.c:4549

661 #, c-format

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

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

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

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

666

666 -#: apply.c:4556

667 +#: apply.c:4560

668 #, c-format

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

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

671

671 -#: apply.c:4564 builtin/fetch.c:837 builtin/fetch.c:1118

672 +#: apply.c:4568 builtin/fetch.c:837 builtin/fetch.c:1118

673 #, c-format

674 msgid "cannot open %s"

675 msgstr "不能打开 %s"

676

676 -#: apply.c:4578

677 +#: apply.c:4582

678 #, c-format

679 msgid "Hunk #%d applied cleanly."

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

681

681 -#: apply.c:4582

682 +#: apply.c:4586

683 #, c-format

684 msgid "Rejected hunk #%d."

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

686

686 -#: apply.c:4692

687 +#: apply.c:4696

688 #, c-format

689 msgid "Skipped patch '%s'."

690 msgstr "略过补丁 '%s'。"

691

691 -#: apply.c:4700

692 +#: apply.c:4704

693 msgid "unrecognized input"

694 msgstr "未能识别的输入"

695

695 -#: apply.c:4720

696 +#: apply.c:4724

697 msgid "unable to read index file"

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

699

699 -#: apply.c:4875

700 +#: apply.c:4879

701 #, c-format

702 msgid "can't open patch '%s': %s"

703 msgstr "不能打开补丁 '%s'：%s"

704

704 -#: apply.c:4902

705 +#: apply.c:4906

706 #, c-format

707 msgid "squelched %d whitespace error"

708 msgid_plural "squelched %d whitespace errors"

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

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

711

711 -#: apply.c:4908 apply.c:4923

712 +#: apply.c:4912 apply.c:4927

713 #, c-format

714 msgid "%d line adds whitespace errors."

715 msgid_plural "%d lines add whitespace errors."

716 msgstr[0] "%d 行新增了空白字符误用。"

717 msgstr[1] "%d 行新增了空白字符误用。"

718

718 -#: apply.c:4916

719 +#: apply.c:4920

720 #, c-format

721 msgid "%d line applied after fixing whitespace errors."

722 msgid_plural "%d lines applied after fixing whitespace errors."

723 msgstr[0] "修复空白错误后，应用了 %d 行。"

724 msgstr[1] "修复空白错误后，应用了 %d 行。"

725

725 -#: apply.c:4932 builtin/add.c:539 builtin/mv.c:301 builtin/rm.c:390

726 +#: apply.c:4936 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390

727 msgid "Unable to write new index file"

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

729

729 -#: apply.c:4959 apply.c:4962 builtin/am.c:2203 builtin/am.c:2206

730 -#: builtin/clone.c:122 builtin/fetch.c:118 builtin/merge.c:263

731 -#: builtin/pull.c:200 builtin/submodule--helper.c:407

730 +#: apply.c:4963 apply.c:4966 builtin/am.c:2210 builtin/am.c:2213

731 +#: builtin/clone.c:120 builtin/fetch.c:118 builtin/merge.c:271

732 +#: builtin/pull.c:207 builtin/submodule--helper.c:407

733 #: builtin/submodule--helper.c:1366 builtin/submodule--helper.c:1369

733 -#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853

734 -#: builtin/submodule--helper.c:2092 git-add--interactive.perl:197

734 +#: builtin/submodule--helper.c:1849 builtin/submodule--helper.c:1852

735 +#: builtin/submodule--helper.c:2091 git-add--interactive.perl:197

736 msgid "path"

737 msgstr "路径"

738

738 -#: apply.c:4960

739 +#: apply.c:4964

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

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

742

742 -#: apply.c:4963

743 +#: apply.c:4967

744 msgid "apply changes matching the given path"

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

746

746 -#: apply.c:4965 builtin/am.c:2212

747 +#: apply.c:4969 builtin/am.c:2219

748 msgid "num"

749 msgstr "数字"

750

750 -#: apply.c:4966

751 +#: apply.c:4970

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

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

754

754 -#: apply.c:4969

755 +#: apply.c:4973

756 msgid "ignore additions made by the patch"

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

758

758 -#: apply.c:4971

759 +#: apply.c:4975

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

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

762

762 -#: apply.c:4975

763 +#: apply.c:4979

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

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

766

766 -#: apply.c:4977

767 +#: apply.c:4981

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

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

770

770 -#: apply.c:4979

771 +#: apply.c:4983

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

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

774

774 -#: apply.c:4981

775 +#: apply.c:4985

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

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

778

778 -#: apply.c:4983

779 +#: apply.c:4987

780 msgid "mark new files with `git add --intent-to-add`"

781 msgstr "使用命令 `git add --intent-to-add` 标记新增文件"

782

782 -#: apply.c:4985

783 +#: apply.c:4989

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

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

786

786 -#: apply.c:4987

787 +#: apply.c:4991

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

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

790

790 -#: apply.c:4990

791 +#: apply.c:4994

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

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

794

794 -#: apply.c:4992

795 +#: apply.c:4996

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

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

798

798 -#: apply.c:4994

799 +#: apply.c:4998

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

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

802

802 -#: apply.c:4997 builtin/checkout-index.c:173 builtin/ls-files.c:524

803 +#: apply.c:5001 builtin/checkout-index.c:173 builtin/ls-files.c:524

804 msgid "paths are separated with NUL character"

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

806

806 -#: apply.c:4999

807 +#: apply.c:5003

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

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

810

810 -#: apply.c:5000 builtin/am.c:2191 builtin/interpret-trailers.c:97

811 +#: apply.c:5004 builtin/am.c:2198 builtin/interpret-trailers.c:97

812 #: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101

812 -#: builtin/pack-objects.c:3314 builtin/rebase.c:1065

813 +#: builtin/pack-objects.c:3317 builtin/rebase.c:1415

814 msgid "action"

815 msgstr "动作"

816

816 -#: apply.c:5001

817 +#: apply.c:5005

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

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

820

820 -#: apply.c:5004 apply.c:5007

821 +#: apply.c:5008 apply.c:5011

822 msgid "ignore changes in whitespace when finding context"

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

824

824 -#: apply.c:5010

825 +#: apply.c:5014

826 msgid "apply the patch in reverse"

827 msgstr "反向应用补丁"

828

828 -#: apply.c:5012

829 +#: apply.c:5016

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

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

832

832 -#: apply.c:5014

833 +#: apply.c:5018

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

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

836

836 -#: apply.c:5016

837 +#: apply.c:5020

838 msgid "allow overlapping hunks"

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

840

840 -#: apply.c:5017 builtin/add.c:291 builtin/check-ignore.c:22

841 -#: builtin/commit.c:1312 builtin/count-objects.c:98 builtin/fsck.c:724

842 -#: builtin/log.c:2037 builtin/mv.c:123 builtin/read-tree.c:128

843 -#: builtin/rebase--interactive.c:159

841 +#: apply.c:5021 builtin/add.c:291 builtin/check-ignore.c:22

842 +#: builtin/commit.c:1317 builtin/count-objects.c:98 builtin/fsck.c:786

843 +#: builtin/log.c:2045 builtin/mv.c:123 builtin/read-tree.c:128

844 msgid "be verbose"

845 msgstr "冗长输出"

846

847 -#: apply.c:5019

847 +#: apply.c:5023

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

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

850

851 -#: apply.c:5022

851 +#: apply.c:5026

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

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

854

855 -#: apply.c:5024 builtin/am.c:2200

855 +#: apply.c:5028 builtin/am.c:2207

856 msgid "root"

857 msgstr "根目录"

858

859 -#: apply.c:5025

859 +#: apply.c:5029

860 msgid "prepend <root> to all filenames"

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

862

@@ -878,7 +878,7 @@ msgstr ""

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

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

880

881 -#: archive.c:372 builtin/add.c:177 builtin/add.c:515 builtin/rm.c:299

881 +#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299

882 #, c-format

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

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

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

910 msgid "archive format"

911 msgstr "归档格式"

912

913 -#: archive.c:456 builtin/log.c:1549

913 +#: archive.c:456 builtin/log.c:1557

914 msgid "prefix"

915 msgstr "前缀"

916

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

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

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

920

921 -#: archive.c:458 builtin/blame.c:820 builtin/blame.c:821 builtin/config.c:129

922 -#: builtin/fast-export.c:1091 builtin/fast-export.c:1093 builtin/grep.c:895

923 -#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563

924 -#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123

925 -#: parse-options.h:162

921 +#: archive.c:458 builtin/blame.c:821 builtin/blame.c:822

922 +#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1091

923 +#: builtin/fast-export.c:1093 builtin/grep.c:895 builtin/hash-object.c:105

924 +#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412

925 +#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177

926 msgid "file"

927 msgstr "文件"

928

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

954 msgid "list supported archive formats"

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

956

957 -#: archive.c:477 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115

958 -#: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1859

957 +#: archive.c:477 builtin/archive.c:91 builtin/clone.c:110 builtin/clone.c:113

958 +#: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1858

959 msgid "repo"

960 msgstr "仓库"

961

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

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

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

965

966 -#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:715

966 +#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:707

967 #: builtin/notes.c:498

968 msgid "command"

969 msgstr "命令"

@@ -1009,16 +1009,16 @@ msgstr "不支持的文件模式：0%o (SHA1: %s)"

1009 msgid "cannot read %s"

1010 msgstr "不能读取 %s"

1011

1012 -#: archive-tar.c:458

1012 +#: archive-tar.c:459

1013 #, c-format

1014 msgid "unable to start '%s' filter"

1015 msgstr "无法启动 '%s' 过滤器"

1016

1017 -#: archive-tar.c:461

1017 +#: archive-tar.c:462

1018 msgid "unable to redirect descriptor"

1019 msgstr "无法重定向描述符"

1020

1021 -#: archive-tar.c:468

1021 +#: archive-tar.c:469

1022 #, c-format

1023 msgid "'%s' filter reported error"

1024 msgstr "'%s' 过滤器报告了错误"

@@ -1033,7 +1033,7 @@ msgstr "路径不是有效的 UTF-8：%s"

1033 msgid "path too long (%d chars, SHA1: %s): %s"

1034 msgstr "路径太长（%d 字符，SHA1：%s）：%s"

1035

1036 -#: archive-zip.c:474 builtin/pack-objects.c:225 builtin/pack-objects.c:228

1036 +#: archive-zip.c:474 builtin/pack-objects.c:226 builtin/pack-objects.c:229

1037 #, c-format

1038 msgid "deflate error (%d)"

1039 msgstr "压缩错误 (%d)"

@@ -1135,26 +1135,26 @@ msgstr "二分查找中：合并基线必须是经过测试的\n"

1135 msgid "a %s revision is needed"

1136 msgstr "需要一个 %s 版本"

1137

1138 -#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:237

1138 +#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:248

1139 #, c-format

1140 msgid "could not create file '%s'"

1141 msgstr "不能创建文件 '%s'"

1142

1143 -#: bisect.c:937 builtin/merge.c:139

1143 +#: bisect.c:928 builtin/merge.c:146

1144 #, c-format

1145 msgid "could not read file '%s'"

1146 msgstr "不能读取文件 '%s'"

1147

1148 -#: bisect.c:967

1148 +#: bisect.c:958

1149 msgid "reading bisect refs failed"

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

1151

1152 -#: bisect.c:986

1152 +#: bisect.c:977

1153 #, c-format

1154 msgid "%s was both %s and %s\n"

1155 msgstr "%s 同时为 %s 和 %s\n"

1156

1157 -#: bisect.c:994

1157 +#: bisect.c:985

1158 #, c-format

1159 msgid ""

1160 "No testable commit found.\n"

@@ -1163,7 +1163,7 @@ msgstr ""

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

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

1165

1166 -#: bisect.c:1013

1166 +#: bisect.c:1004

1167 #, c-format

1168 msgid "(roughly %d step)"

1169 msgid_plural "(roughly %d steps)"

@@ -1173,49 +1173,49 @@ msgstr[1] "（大概 %d 步）"

1173 #. TRANSLATORS: the last %s will be replaced with "(roughly %d

1174 #. steps)" translation.

1175 #.

1176 -#: bisect.c:1019

1176 +#: bisect.c:1010

1177 #, c-format

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

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

1180 msgstr[0] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n"

1181 msgstr[1] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n"

1182

1183 -#: blame.c:1792

1183 +#: blame.c:1794

1184 msgid "--contents and --reverse do not blend well."

1185 msgstr "--contents 和 --reverse 不能混用。"

1186

1187 -#: blame.c:1806

1187 +#: blame.c:1808

1188 msgid "cannot use --contents with final commit object name"

1189 msgstr "不能将 --contents 和最终的提交对象名共用"

1190

1191 -#: blame.c:1827

1191 +#: blame.c:1829

1192 msgid "--reverse and --first-parent together require specified latest commit"

1193 msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"

1194

1195 -#: blame.c:1836 bundle.c:164 ref-filter.c:2071 remote.c:1948 sequencer.c:1993

1196 -#: sequencer.c:4064 builtin/commit.c:1004 builtin/log.c:378 builtin/log.c:936

1197 -#: builtin/log.c:1420 builtin/log.c:1796 builtin/log.c:2086 builtin/merge.c:407

1198 -#: builtin/pack-objects.c:3137 builtin/pack-objects.c:3152

1195 +#: blame.c:1838 bundle.c:164 ref-filter.c:2077 remote.c:1938 sequencer.c:2030

1196 +#: sequencer.c:4224 builtin/commit.c:1017 builtin/log.c:382 builtin/log.c:940

1197 +#: builtin/log.c:1428 builtin/log.c:1804 builtin/log.c:2094 builtin/merge.c:415

1198 +#: builtin/pack-objects.c:3140 builtin/pack-objects.c:3155

1199 #: builtin/shortlog.c:192

1200 msgid "revision walk setup failed"

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

1202

1203 -#: blame.c:1854

1203 +#: blame.c:1856

1204 msgid ""

1205 "--reverse --first-parent together require range along first-parent chain"

1206 msgstr "--reverse 和 --first-parent 共用，需要第一祖先链上的提交范围"

1207

1208 -#: blame.c:1865

1208 +#: blame.c:1867

1209 #, c-format

1210 msgid "no such path %s in %s"

1211 msgstr "在 %2$s 中无此路径 %1$s"

1212

1213 -#: blame.c:1876

1213 +#: blame.c:1878

1214 #, c-format

1215 msgid "cannot read blob %s for path %s"

1216 msgstr "不能为路径 %2$s 读取数据对象 %1$s"

1217

1218 -#: branch.c:52

1218 +#: branch.c:53

1219 #, c-format

1220 msgid ""

1221 "\n"

@@ -1227,85 +1227,85 @@ msgstr ""

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

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

1229

1230 -#: branch.c:66

1230 +#: branch.c:67

1231 #, c-format

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

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

1234

1235 -#: branch.c:92

1235 +#: branch.c:93

1236 #, c-format

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

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

1239

1240 -#: branch.c:93

1240 +#: branch.c:94

1241 #, c-format

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

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

1244

1245 -#: branch.c:97

1245 +#: branch.c:98

1246 #, c-format

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

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

1249

1250 -#: branch.c:98

1250 +#: branch.c:99

1251 #, c-format

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

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

1254

1255 -#: branch.c:103

1255 +#: branch.c:104

1256 #, c-format

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

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

1259

1260 -#: branch.c:104

1260 +#: branch.c:105

1261 #, c-format

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

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

1264

1265 -#: branch.c:108

1265 +#: branch.c:109

1266 #, c-format

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

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

1269

1270 -#: branch.c:109

1270 +#: branch.c:110

1271 #, c-format

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

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

1274

1275 -#: branch.c:118

1275 +#: branch.c:119

1276 msgid "Unable to write upstream branch configuration"

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

1278

1279 -#: branch.c:155

1279 +#: branch.c:156

1280 #, c-format

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

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

1283

1284 -#: branch.c:188

1284 +#: branch.c:189

1285 #, c-format

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

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

1288

1289 -#: branch.c:207

1289 +#: branch.c:208

1290 #, c-format

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

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

1293

1294 -#: branch.c:212

1294 +#: branch.c:213

1295 msgid "Cannot force update the current branch."

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

1297

1298 -#: branch.c:232

1298 +#: branch.c:233

1299 #, c-format

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

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

1302

1303 -#: branch.c:234

1303 +#: branch.c:235

1304 #, c-format

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

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

1307

1308 -#: branch.c:236

1308 +#: branch.c:237

1309 msgid ""

1310 "\n"

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

@@ -1323,17 +1323,17 @@ msgstr ""

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

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

1325

1326 -#: branch.c:280

1326 +#: branch.c:281

1327 #, c-format

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

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

1330

1331 -#: branch.c:300

1331 +#: branch.c:301

1332 #, c-format

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

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

1335

1336 -#: branch.c:305

1336 +#: branch.c:306

1337 #, c-format

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

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

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

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

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

1360

1361 -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2215 sequencer.c:2763

1362 -#: builtin/commit.c:776

1361 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2281 sequencer.c:2916

1362 +#: builtin/commit.c:788

1363 #, c-format

1364 msgid "could not open '%s'"

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

@@ -1407,7 +1407,7 @@ msgstr "rev-list 终止"

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

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

1409

1410 -#: bundle.c:457 builtin/log.c:193 builtin/log.c:1701 builtin/shortlog.c:306

1410 +#: bundle.c:457 builtin/log.c:197 builtin/log.c:1709 builtin/shortlog.c:306

1411 #, c-format

1412 msgid "unrecognized argument: %s"

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

@@ -1430,9 +1430,8 @@ msgstr "index-pack 终止"

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

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

1432

1433 -#: commit.c:50 sequencer.c:2567 builtin/am.c:355 builtin/am.c:399

1434 -#: builtin/am.c:1375 builtin/am.c:2019 builtin/replace.c:376

1435 -#: builtin/replace.c:448

1433 +#: commit.c:50 sequencer.c:2697 builtin/am.c:355 builtin/am.c:399

1434 +#: builtin/am.c:1377 builtin/am.c:2022 builtin/replace.c:455

1435 #, c-format

1436 msgid "could not parse %s"

1437 msgstr "不能解析 %s"

@@ -1462,27 +1461,27 @@ msgstr ""

1461 "设置 \"git config advice.graftFileDeprecated false\"\n"

1462 "可关闭本消息"

1463

1465 -#: commit.c:1122

1464 +#: commit.c:1128

1465 #, c-format

1466 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."

1467 msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"

1468

1470 -#: commit.c:1125

1469 +#: commit.c:1131

1470 #, c-format

1471 msgid "Commit %s has a bad GPG signature allegedly by %s."

1472 msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"

1473

1475 -#: commit.c:1128

1474 +#: commit.c:1134

1475 #, c-format

1476 msgid "Commit %s does not have a GPG signature."

1477 msgstr "提交 %s 没有 GPG 签名。"

1478

1480 -#: commit.c:1131

1479 +#: commit.c:1137

1480 #, c-format

1481 msgid "Commit %s has a good GPG signature by %s\n"

1482 msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"

1483

1485 -#: commit.c:1385

1484 +#: commit.c:1391

1485 msgid ""

1486 "Warning: commit message did not conform to UTF-8.\n"

1487 "You may want to amend it after fixing the message, or set the config\n"

@@ -1492,131 +1491,192 @@ msgstr ""

1491 "您可以通过修补提交来改正提交说明，或者将配置变量 i18n.commitencoding\n"

1492 "设置为您项目所用的字符编码。\n"

1493

1495 -#: commit-graph.c:101

1496 -#, c-format

1497 -msgid "graph file %s is too small"

1498 -msgstr "图形文件 %s 太小"

1494 +#: commit-graph.c:105

1495 +msgid "commit-graph file is too small"

1496 +msgstr "提交图形文件太小"

1497

1500 -#: commit-graph.c:136

1498 +#: commit-graph.c:170

1499 #, c-format

1502 -msgid "graph signature %X does not match signature %X"

1503 -msgstr "图形签名 %X 和签名 %X 不匹配"

1500 +msgid "commit-graph signature %X does not match signature %X"

1501 +msgstr "提交图形签名 %X 和签名 %X 不匹配"

1502

1505 -#: commit-graph.c:143

1503 +#: commit-graph.c:177

1504 #, c-format

1507 -msgid "graph version %X does not match version %X"

1508 -msgstr "图形版本 %X 和版本 %X 不匹配"

1505 +msgid "commit-graph version %X does not match version %X"

1506 +msgstr "提交图形版本 %X 和版本 %X 不匹配"

1507

1510 -#: commit-graph.c:150

1508 +#: commit-graph.c:184

1509 #, c-format

1512 -msgid "hash version %X does not match version %X"

1513 -msgstr "散列版本 %X 和版本 %X 不匹配"

1510 +msgid "commit-graph hash version %X does not match version %X"

1511 +msgstr "提交图形哈希版本 %X 和版本 %X 不匹配"

1512

1515 -#: commit-graph.c:173

1516 -msgid "chunk lookup table entry missing; graph file may be incomplete"

1517 -msgstr "块查找表条目丢失，图形文件可能不完整"

1513 +#: commit-graph.c:207

1514 +msgid "commit-graph chunk lookup table entry missing; file may be incomplete"

1515 +msgstr "提交图形块查找表条目丢失，文件可能不完整"

1516

1519 -#: commit-graph.c:184

1517 +#: commit-graph.c:218

1518 #, c-format

1521 -msgid "improper chunk offset %08x%08x"

1522 -msgstr "不正确的块偏移 %08x%08x"

1519 +msgid "commit-graph improper chunk offset %08x%08x"

1520 +msgstr "提交图形不正确的块偏移 %08x%08x"

1521

1524 -#: commit-graph.c:221

1522 +#: commit-graph.c:255

1523 #, c-format

1526 -msgid "chunk id %08x appears multiple times"

1527 -msgstr "块 id %08x 出现了多次"

1524 +msgid "commit-graph chunk id %08x appears multiple times"

1525 +msgstr "提交图形块 id %08x 出现了多次"

1526

1529 -#: commit-graph.c:334

1527 +#: commit-graph.c:390

1528 #, c-format

1529 msgid "could not find commit %s"

1530 msgstr "无法找到提交 %s"

1531

1534 -#: commit-graph.c:671 builtin/pack-objects.c:2646

1532 +#: commit-graph.c:732 builtin/pack-objects.c:2649

1533 #, c-format

1534 msgid "unable to get type of object %s"

1535 msgstr "无法获得对象 %s 类型"

1536

1539 -#: commit-graph.c:704

1537 +#: commit-graph.c:765

1538 msgid "Loading known commits in commit graph"

1539 msgstr "正在加载提交图中的已知提交"

1540

1543 -#: commit-graph.c:720

1541 +#: commit-graph.c:781

1542 msgid "Expanding reachable commits in commit graph"

1543 msgstr "正在扩展提交图中的可达提交"

1544

1547 -#: commit-graph.c:732

1545 +#: commit-graph.c:793

1546 msgid "Clearing commit marks in commit graph"

1547 msgstr "正在清除提交图中的提交标记"

1548

1551 -#: commit-graph.c:752

1549 +#: commit-graph.c:813

1550 msgid "Computing commit graph generation numbers"

1551 msgstr "正在计算提交图世代数字"

1552

1555 -#: commit-graph.c:869

1553 +#: commit-graph.c:930

1554 #, c-format

1555 msgid "Finding commits for commit graph in %d pack"

1556 msgid_plural "Finding commits for commit graph in %d packs"

1557 msgstr[0] "正在 %d 个包中查找提交图的提交"

1558 msgstr[1] "正在 %d 个包中查找提交图的提交"

1559

1562 -#: commit-graph.c:882

1560 +#: commit-graph.c:943

1561 #, c-format

1562 msgid "error adding pack %s"

1563 msgstr "添加包 %s 出错"

1564

1567 -#: commit-graph.c:884

1565 +#: commit-graph.c:945

1566 #, c-format

1567 msgid "error opening index for %s"

1568 msgstr "为 %s 打开索引出错"

1569

1572 -#: commit-graph.c:898

1570 +#: commit-graph.c:959

1571 #, c-format

1572 msgid "Finding commits for commit graph from %d ref"

1573 msgid_plural "Finding commits for commit graph from %d refs"

1574 msgstr[0] "正在从 %d 个引用中查找提交图的提交"

1575 msgstr[1] "正在从 %d 个引用中查找提交图的提交"

1576

1579 -#: commit-graph.c:930

1577 +#: commit-graph.c:991

1578 msgid "Finding commits for commit graph among packed objects"

1579 msgstr "正在打包对象中查找提交图的提交"

1580

1583 -#: commit-graph.c:943

1581 +#: commit-graph.c:1004

1582 msgid "Counting distinct commits in commit graph"

1583 msgstr "正在计算提交图中不同的提交"

1584

1587 -#: commit-graph.c:956

1585 +#: commit-graph.c:1017

1586 #, c-format

1587 msgid "the commit graph format cannot write %d commits"

1588 msgstr "提交图格式不能写入 %d 个提交"

1589

1592 -#: commit-graph.c:965

1590 +#: commit-graph.c:1026

1591 msgid "Finding extra edges in commit graph"

1592 msgstr "正在查找提交图中额外的边"

1593

1596 -#: commit-graph.c:989

1594 +#: commit-graph.c:1050

1595 msgid "too many commits to write graph"

1596 msgstr "提交太多不能画图"

1597

1600 -#: commit-graph.c:996 midx.c:769

1598 +#: commit-graph.c:1057 midx.c:819

1599 #, c-format

1600 msgid "unable to create leading directories of %s"

1601 msgstr "不能为 %s 创建先导目录"

1602

1605 -#: commit-graph.c:1036

1603 +#: commit-graph.c:1097

1604 #, c-format

1605 msgid "Writing out commit graph in %d pass"

1606 msgid_plural "Writing out commit graph in %d passes"

1607 msgstr[0] "正在用 %d 步写出提交图"

1608 msgstr[1] "正在用 %d 步写出提交图"

1609

1612 -#: commit-graph.c:1109

1610 +#: commit-graph.c:1162

1611 msgid "the commit-graph file has incorrect checksum and is likely corrupt"

1612 msgstr "提交图文件的校验码错误，可能已经损坏"

1613

1616 -#: commit-graph.c:1153

1614 +#: commit-graph.c:1172

1615 +#, c-format

1616 +msgid "commit-graph has incorrect OID order: %s then %s"

1617 +msgstr "提交图形的 OID 顺序不正确：%s 然后 %s"

1618 +

1619 +#: commit-graph.c:1182 commit-graph.c:1197

1620 +#, c-format

1621 +msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"

1622 +msgstr "提交图形有不正确的扇出值：fanout[%d] = %u != %u"

1623 +

1624 +#: commit-graph.c:1189

1625 +#, c-format

1626 +msgid "failed to parse commit %s from commit-graph"

1627 +msgstr "无法从提交图形中解析提交 %s"

1628 +

1629 +#: commit-graph.c:1206

1630 msgid "Verifying commits in commit graph"

1631 msgstr "正在校验提交图中的提交"

1632

1633 +#: commit-graph.c:1219

1634 +#, c-format

1635 +msgid "failed to parse commit %s from object database for commit-graph"

1636 +msgstr "无法从提交图形的对象库中解析提交 %s"

1637 +

1638 +#: commit-graph.c:1226

1639 +#, c-format

1640 +msgid "root tree OID for commit %s in commit-graph is %s != %s"

1641 +msgstr "提交图形中的提交 %s 的根树 OID 是 %s != %s"

1642 +

1643 +#: commit-graph.c:1236

1644 +#, c-format

1645 +msgid "commit-graph parent list for commit %s is too long"

1646 +msgstr "提交 %s 的提交图形父提交列表太长了"

1647 +

1648 +#: commit-graph.c:1242

1649 +#, c-format

1650 +msgid "commit-graph parent for %s is %s != %s"

1651 +msgstr "%s 的提交图形父提交是 %s != %s"

1652 +

1653 +#: commit-graph.c:1255

1654 +#, c-format

1655 +msgid "commit-graph parent list for commit %s terminates early"

1656 +msgstr "提交 %s 的提交图形父提交列表过早终止"

1657 +

1658 +#: commit-graph.c:1260

1659 +#, c-format

1660 +msgid ""

1661 +"commit-graph has generation number zero for commit %s, but non-zero elsewhere"

1662 +msgstr "提交图形中提交 %s 的世代号是零，但其它地方非零"

1663 +

1664 +#: commit-graph.c:1264

1665 +#, c-format

1666 +msgid ""

1667 +"commit-graph has non-zero generation number for commit %s, but zero elsewhere"

1668 +msgstr "提交图形中提交 %s 的世代号非零，但其它地方是零"

1669 +

1670 +#: commit-graph.c:1279

1671 +#, c-format

1672 +msgid "commit-graph generation for commit %s is %u != %u"

1673 +msgstr "提交图形中的提交 %s 的世代号是 %u != %u"

1674 +

1675 +#: commit-graph.c:1285

1676 +#, c-format

1677 +msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"

1678 +msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"

1679 +

1680 #: compat/obstack.c:406 compat/obstack.c:408

1681 msgid "memory exhausted"

1682 msgstr "内存耗尽"

@@ -1659,7 +1719,7 @@ msgstr "键名没有包含一个小节名称：%s"

1719 msgid "key does not contain variable name: %s"

1720 msgstr "键名没有包含变量名：%s"

1721

1662 -#: config.c:378 sequencer.c:2330

1722 +#: config.c:378 sequencer.c:2459

1723 #, c-format

1724 msgid "invalid key: %s"

1725 msgstr "无效键名：%s"

@@ -1795,135 +1855,135 @@ msgstr "%s 的取值格式错误：%s"

1855 msgid "must be one of nothing, matching, simple, upstream or current"

1856 msgstr "必须是其中之一：nothing、matching、simple、upstream 或 current"

1857

1798 -#: config.c:1481 builtin/pack-objects.c:3394

1858 +#: config.c:1483 builtin/pack-objects.c:3397

1859 #, c-format

1860 msgid "bad pack compression level %d"

1861 msgstr "错误的打包压缩级别 %d"

1862

1803 -#: config.c:1602

1863 +#: config.c:1604

1864 #, c-format

1865 msgid "unable to load config blob object '%s'"

1866 msgstr "无法从数据对象 '%s' 加载配置"

1867

1808 -#: config.c:1605

1868 +#: config.c:1607

1869 #, c-format

1870 msgid "reference '%s' does not point to a blob"

1871 msgstr "引用 '%s' 没有指向一个数据对象"

1872

1813 -#: config.c:1622

1873 +#: config.c:1624

1874 #, c-format

1875 msgid "unable to resolve config blob '%s'"

1876 msgstr "不能解析配置对象 '%s'"

1877

1818 -#: config.c:1652

1878 +#: config.c:1654

1879 #, c-format

1880 msgid "failed to parse %s"

1881 msgstr "解析 %s 失败"

1882

1823 -#: config.c:1705

1883 +#: config.c:1710

1884 msgid "unable to parse command-line config"

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

1886

1827 -#: config.c:2037

1887 +#: config.c:2059

1888 msgid "unknown error occurred while reading the configuration files"

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

1890

1831 -#: config.c:2207

1891 +#: config.c:2229

1892 #, c-format

1893 msgid "Invalid %s: '%s'"

1894 msgstr "无效 %s：'%s'"

1895

1836 -#: config.c:2250

1896 +#: config.c:2272

1897 #, c-format

1898 msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"

1899 msgstr "未知的 core.untrackedCache 取值 '%s'，使用默认值 'keep'"

1900

1841 -#: config.c:2276

1901 +#: config.c:2298

1902 #, c-format

1903 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"

1904 msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"

1905

1846 -#: config.c:2322

1906 +#: config.c:2344

1907 #, c-format

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

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

1910

1851 -#: config.c:2324

1911 +#: config.c:2346

1912 #, c-format

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

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

1915

1856 -#: config.c:2405

1916 +#: config.c:2427

1917 #, c-format

1918 msgid "invalid section name '%s'"

1919 msgstr "无效的小节名称 '%s'"

1920

1861 -#: config.c:2437

1921 +#: config.c:2459

1922 #, c-format

1923 msgid "%s has multiple values"

1924 msgstr "%s 有多个取值"

1925

1866 -#: config.c:2466

1926 +#: config.c:2488

1927 #, c-format

1928 msgid "failed to write new configuration file %s"

1929 msgstr "写入新的配置文件 %s 失败"

1930

1871 -#: config.c:2716 config.c:3040

1931 +#: config.c:2740 config.c:3064

1932 #, c-format

1933 msgid "could not lock config file %s"

1934 msgstr "不能锁定配置文件 %s"

1935

1876 -#: config.c:2727

1936 +#: config.c:2751

1937 #, c-format

1938 msgid "opening %s"

1939 msgstr "打开 %s"

1940

1881 -#: config.c:2762 builtin/config.c:328

1941 +#: config.c:2786 builtin/config.c:328

1942 #, c-format

1943 msgid "invalid pattern: %s"

1944 msgstr "无效模式：%s"

1945

1886 -#: config.c:2787

1946 +#: config.c:2811

1947 #, c-format

1948 msgid "invalid config file %s"

1949 msgstr "无效的配置文件 %s"

1950

1891 -#: config.c:2800 config.c:3053

1951 +#: config.c:2824 config.c:3077

1952 #, c-format

1953 msgid "fstat on %s failed"

1954 msgstr "对 %s 调用 fstat 失败"

1955

1896 -#: config.c:2811

1956 +#: config.c:2835

1957 #, c-format

1958 msgid "unable to mmap '%s'"

1959 msgstr "不能 mmap '%s'"

1960

1901 -#: config.c:2820 config.c:3058

1961 +#: config.c:2844 config.c:3082

1962 #, c-format

1963 msgid "chmod on %s failed"

1964 msgstr "对 %s 调用 chmod 失败"

1965

1906 -#: config.c:2905 config.c:3155

1966 +#: config.c:2929 config.c:3179

1967 #, c-format

1968 msgid "could not write config file %s"

1969 msgstr "不能写入配置文件 %s"

1970

1911 -#: config.c:2939

1971 +#: config.c:2963

1972 #, c-format

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

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

1975

1916 -#: config.c:2941 builtin/remote.c:782

1976 +#: config.c:2965 builtin/remote.c:782

1977 #, c-format

1978 msgid "could not unset '%s'"

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

1980

1921 -#: config.c:3031

1981 +#: config.c:3055

1982 #, c-format

1983 msgid "invalid section name: %s"

1984 msgstr "无效的小节名称：%s"

1985

1926 -#: config.c:3198

1986 +#: config.c:3222

1987 #, c-format

1988 msgid "missing value for '%s'"

1989 msgstr "%s 的取值缺失"

@@ -2077,28 +2137,28 @@ msgstr "ssh 变体 'simple' 不支持 -6"

2137 msgid "ssh variant 'simple' does not support setting port"

2138 msgstr "ssh 变体 'simple' 不支持设置端口"

2139

2080 -#: connect.c:1259

2140 +#: connect.c:1260

2141 #, c-format

2142 msgid "strange pathname '%s' blocked"

2143 msgstr "已阻止奇怪的路径名 '%s'"

2144

2085 -#: connect.c:1304

2145 +#: connect.c:1307

2146 msgid "unable to fork"

2147 msgstr "无法 fork"

2148

2089 -#: connected.c:68 builtin/fsck.c:221 builtin/prune.c:146

2149 +#: connected.c:85 builtin/fsck.c:221 builtin/prune.c:43

2150 msgid "Checking connectivity"

2151 msgstr "正在检查连通性"

2152

2093 -#: connected.c:80

2153 +#: connected.c:97

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

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

2156

2097 -#: connected.c:100

2157 +#: connected.c:117

2158 msgid "failed write to rev-list"

2159 msgstr "写入 rev-list 失败"

2160

2101 -#: connected.c:107

2161 +#: connected.c:124

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

2163 msgstr "关闭 rev-list 的标准输入失败"

2164

@@ -2326,24 +2386,29 @@ msgstr "读取排序文件 '%s' 失败"

2386 msgid "Performing inexact rename detection"

2387 msgstr "正在进行非精确的重命名探测"

2388

2329 -#: diff.c:108

2330 -#, c-format

2331 -msgid "option '%s' requires a value"

2332 -msgstr "选项 '%s' 需要一个值"

2389 +#: diff-no-index.c:238

2390 +msgid "git diff --no-index [<options>] <path> <path>"

2391 +msgstr "git diff --no-index [<选项>] <路径> <路径>"

2392 +

2393 +#: diff-no-index.c:263

2394 +msgid ""

2395 +"Not a git repository. Use --no-index to compare two paths outside a working "

2396 +"tree"

2397 +msgstr "不是一个 git 仓库。使用 --no-index 比较工作区之外的两个路径"

2398

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

2335 -#: diff.c:158

2400 +#: diff.c:155

2401 #, c-format

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

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

2404

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

2341 -#: diff.c:163

2406 +#: diff.c:160

2407 #, c-format

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

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

2410

2346 -#: diff.c:291

2411 +#: diff.c:296

2412 msgid ""

2413 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "

2414 "'dimmed-zebra', 'plain'"

@@ -2351,7 +2416,7 @@ msgstr ""

2416 "移动的颜色设置必须是 'no'、'default'、'blocks'、'zebra'、'dimmed_zebra' 或 "

2417 "'plain'"

2418

2354 -#: diff.c:319

2419 +#: diff.c:324

2420 #, c-format

2421 msgid ""

2422 "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "

@@ -2360,18 +2425,18 @@ msgstr ""

2425 "未知的 color-moved-ws 模式 '%s'，可能的取值有 'ignore-space-change'、'ignore-"

2426 "space-at-eol'、'ignore-all-space'、'allow-indentation-change'"

2427

2363 -#: diff.c:327

2428 +#: diff.c:332

2429 msgid ""

2430 "color-moved-ws: allow-indentation-change cannot be combined with other "

2431 "whitespace modes"

2432 msgstr "color-moved-ws：allow-indentation-change 不能与其它空白字符模式共用"

2433

2369 -#: diff.c:400

2434 +#: diff.c:405

2435 #, c-format

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

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

2438

2374 -#: diff.c:460

2439 +#: diff.c:465

2440 #, c-format

2441 msgid ""

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

@@ -2380,24 +2445,35 @@ msgstr ""

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

2446 "%s"

2447

2383 -#: diff.c:4211

2448 +#: diff.c:4210

2449 #, c-format

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

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

2452

2388 -#: diff.c:4553

2453 +#: diff.c:4555

2454 msgid "--name-only, --name-status, --check and -s are mutually exclusive"

2455 msgstr "--name-only、--name-status、--check 和 -s 是互斥的"

2456

2392 -#: diff.c:4556

2457 +#: diff.c:4558

2458 msgid "-G, -S and --find-object are mutually exclusive"

2459 msgstr "-G、-S 和 --find-object 是互斥的"

2460

2396 -#: diff.c:4634

2461 +#: diff.c:4636

2462 msgid "--follow requires exactly one pathspec"

2463 msgstr "--follow 明确要求只跟一个路径规格"

2464

2400 -#: diff.c:4800

2465 +#: diff.c:4684

2466 +#, c-format

2467 +msgid "invalid --stat value: %s"

2468 +msgstr "无效的 --stat 值：%s"

2469 +

2470 +#: diff.c:4689 diff.c:4694 diff.c:4699 diff.c:4704 diff.c:5217

2471 +#: parse-options.c:199 parse-options.c:203

2472 +#, c-format

2473 +msgid "%s expects a numerical value"

2474 +msgstr "%s 期望一个数字值"

2475 +

2476 +#: diff.c:4721

2477 #, c-format

2478 msgid ""

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

@@ -2406,59 +2482,530 @@ msgstr ""

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

2483 "%s"

2484

2409 -#: diff.c:4814

2485 +#: diff.c:4806

2486 +#, c-format

2487 +msgid "unknown change class '%c' in --diff-filter=%s"

2488 +msgstr "--diff-filter=%2$s 中未知的变更类 '%1$c'"

2489 +

2490 +#: diff.c:4830

2491 +#, c-format

2492 +msgid "unknown value after ws-error-highlight=%.*s"

2493 +msgstr "ws-error-highlight=%.*s 之后未知的值"

2494 +

2495 +#: diff.c:4844

2496 #, c-format

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

2497 +msgid "unable to resolve '%s'"

2498 +msgstr "不能解析 '%s'"

2499 +

2500 +#: diff.c:4894 diff.c:4900

2501 +#, c-format

2502 +msgid "%s expects <n>/<m> form"

2503 +msgstr "%s 期望 <n>/<m> 格式"

2504 +

2505 +#: diff.c:4912

2506 +#, c-format

2507 +msgid "%s expects a character, got '%s'"

2508 +msgstr "%s 期望一个字符，得到 '%s'"

2509 +

2510 +#: diff.c:4933

2511 +#, c-format

2512 +msgid "bad --color-moved argument: %s"

2513 +msgstr "坏的 --color-moved 参数：%s"

2514 +

2515 +#: diff.c:4952

2516 +#, c-format

2517 +msgid "invalid mode '%s' in --color-moved-ws"

2518 +msgstr "--color-moved-ws 中的无效模式 '%s' "

2519 +

2520 +#: diff.c:4992

2521 +msgid ""

2522 +"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "

2523 +"\"histogram\""

2524 +msgstr ""

2525 +"diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""

2526 +

2527 +#: diff.c:5028 diff.c:5048

2528 +#, c-format

2529 +msgid "invalid argument to %s"

2530 +msgstr "%s 的参数无效"

2531 +

2532 +#: diff.c:5186

2533 +#, c-format

2534 +msgid "failed to parse --submodule option parameter: '%s'"

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

2536

2414 -#: diff.c:5900

2537 +#: diff.c:5242

2538 +#, c-format

2539 +msgid "bad --word-diff argument: %s"

2540 +msgstr "坏的 --word-diff 参数：%s"

2541 +

2542 +#: diff.c:5265

2543 +msgid "Diff output format options"

2544 +msgstr "差异输出格式化选项"

2545 +

2546 +#: diff.c:5267 diff.c:5273

2547 +msgid "generate patch"

2548 +msgstr "生成补丁"

2549 +

2550 +#: diff.c:5270 builtin/log.c:167

2551 +msgid "suppress diff output"

2552 +msgstr "不显示差异输出"

2553 +

2554 +#: diff.c:5275 diff.c:5389 diff.c:5396

2555 +msgid "<n>"

2556 +msgstr "<n>"

2557 +

2558 +#: diff.c:5276 diff.c:5279

2559 +msgid "generate diffs with <n> lines context"

2560 +msgstr "生成含 <n> 行上下文的差异"

2561 +

2562 +#: diff.c:5281

2563 +msgid "generate the diff in raw format"

2564 +msgstr "生成原始格式的差异"

2565 +

2566 +#: diff.c:5284

2567 +msgid "synonym for '-p --raw'"

2568 +msgstr "和 '-p --raw' 同义"

2569 +

2570 +#: diff.c:5288

2571 +msgid "synonym for '-p --stat'"

2572 +msgstr "和 '-p --stat' 同义"

2573 +

2574 +#: diff.c:5292

2575 +msgid "machine friendly --stat"

2576 +msgstr "机器友好的 --stat"

2577 +

2578 +#: diff.c:5295

2579 +msgid "output only the last line of --stat"

2580 +msgstr "只输出 --stat 的最后一行"

2581 +

2582 +#: diff.c:5297 diff.c:5305

2583 +msgid "<param1,param2>..."

2584 +msgstr "<参数1,参数2>..."

2585 +

2586 +#: diff.c:5298

2587 +msgid ""

2588 +"output the distribution of relative amount of changes for each sub-directory"

2589 +msgstr "输出每个子目录相对变更的分布"

2590 +

2591 +#: diff.c:5302

2592 +msgid "synonym for --dirstat=cumulative"

2593 +msgstr "和 --dirstat=cumulative 同义"

2594 +

2595 +#: diff.c:5306

2596 +msgid "synonym for --dirstat=files,param1,param2..."

2597 +msgstr "是 --dirstat=files,param1,param2... 的同义词"

2598 +

2599 +#: diff.c:5310

2600 +msgid "warn if changes introduce conflict markers or whitespace errors"

2601 +msgstr "如果变更中引入冲突定界符或空白错误，给出警告"

2602 +

2603 +#: diff.c:5313

2604 +msgid "condensed summary such as creations, renames and mode changes"

2605 +msgstr "精简摘要，例如创建、重命名和模式变更"

2606 +

2607 +#: diff.c:5316

2608 +msgid "show only names of changed files"

2609 +msgstr "只显示变更文件的文件名"

2610 +

2611 +#: diff.c:5319

2612 +msgid "show only names and status of changed files"

2613 +msgstr "只显示变更文件的文件名和状态"

2614 +

2615 +#: diff.c:5321

2616 +msgid "<width>[,<name-width>[,<count>]]"

2617 +msgstr "<宽度>[,<文件名宽度>[,<次数>]]"

2618 +

2619 +#: diff.c:5322

2620 +msgid "generate diffstat"

2621 +msgstr "生成 diffstat"

2622 +

2623 +#: diff.c:5324 diff.c:5327 diff.c:5330

2624 +msgid "<width>"

2625 +msgstr "<宽度>"

2626 +

2627 +#: diff.c:5325

2628 +msgid "generate diffstat with a given width"

2629 +msgstr "使用给定的长度生成差异统计"

2630 +

2631 +#: diff.c:5328

2632 +msgid "generate diffstat with a given name width"

2633 +msgstr "使用给定的文件名长度生成差异统计"

2634 +

2635 +#: diff.c:5331

2636 +msgid "generate diffstat with a given graph width"

2637 +msgstr "使用给定的图形长度生成差异统计"

2638 +

2639 +#: diff.c:5333

2640 +msgid "<count>"

2641 +msgstr "<次数>"

2642 +

2643 +#: diff.c:5334

2644 +msgid "generate diffstat with limited lines"

2645 +msgstr "生成有限行数的差异统计"

2646 +

2647 +#: diff.c:5337

2648 +msgid "generate compact summary in diffstat"

2649 +msgstr "生成差异统计的简洁摘要"

2650 +

2651 +#: diff.c:5340

2652 +msgid "output a binary diff that can be applied"

2653 +msgstr "输出一个可以应用的二进制差异"

2654 +

2655 +#: diff.c:5343

2656 +msgid "show full pre- and post-image object names on the \"index\" lines"

2657 +msgstr "在 \"index\" 行显示完整的前后对象名称"

2658 +

2659 +#: diff.c:5345

2660 +msgid "show colored diff"

2661 +msgstr "显示带颜色的差异"

2662 +

2663 +#: diff.c:5346

2664 +msgid "<kind>"

2665 +msgstr "<类型>"

2666 +

2667 +#: diff.c:5347

2668 +msgid ""

2669 +"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "

2670 +"diff"

2671 +msgstr "对于差异中的上下文、旧的和新的行，加亮显示错误的空白字符"

2672 +

2673 +#: diff.c:5350

2674 +msgid ""

2675 +"do not munge pathnames and use NULs as output field terminators in --raw or "

2676 +"--numstat"

2677 +msgstr ""

2678 +"在 --raw 或者 --numstat 中，不对路径字符转码并使用 NUL 字符做为输出字段的分隔"

2679 +"符"

2680 +

2681 +#: diff.c:5353 diff.c:5356 diff.c:5359 diff.c:5465

2682 +msgid "<prefix>"

2683 +msgstr "<前缀>"

2684 +

2685 +#: diff.c:5354

2686 +msgid "show the given source prefix instead of \"a/\""

2687 +msgstr "显示给定的源前缀取代 \"a/\""

2688 +

2689 +#: diff.c:5357

2690 +msgid "show the given destination prefix instead of \"b/\""

2691 +msgstr "显示给定的目标前缀取代 \"b/\""

2692 +

2693 +#: diff.c:5360

2694 +msgid "prepend an additional prefix to every line of output"

2695 +msgstr "输出的每一行附加前缀"

2696 +

2697 +#: diff.c:5363

2698 +msgid "do not show any source or destination prefix"

2699 +msgstr "不显示任何源和目标前缀"

2700 +

2701 +#: diff.c:5366

2702 +msgid "show context between diff hunks up to the specified number of lines"

2703 +msgstr "显示指定行数的差异块间的上下文"

2704 +

2705 +#: diff.c:5370 diff.c:5375 diff.c:5380

2706 +msgid "<char>"

2707 +msgstr "<字符>"

2708 +

2709 +#: diff.c:5371

2710 +msgid "specify the character to indicate a new line instead of '+'"

2711 +msgstr "指定一个字符取代 '+' 来表示新的一行"

2712 +

2713 +#: diff.c:5376

2714 +msgid "specify the character to indicate an old line instead of '-'"

2715 +msgstr "指定一个字符取代 '-' 来表示旧的一行"

2716 +

2717 +#: diff.c:5381

2718 +msgid "specify the character to indicate a context instead of ' '"

2719 +msgstr "指定一个字符取代 ' ' 来表示一行上下文"

2720 +

2721 +#: diff.c:5384

2722 +msgid "Diff rename options"

2723 +msgstr "差异重命名选项"

2724 +

2725 +#: diff.c:5385

2726 +msgid "<n>[/<m>]"

2727 +msgstr "<n>[/<m>]"

2728 +

2729 +#: diff.c:5386

2730 +msgid "break complete rewrite changes into pairs of delete and create"

2731 +msgstr "打破完全重写变更为成对的删除和创建"

2732 +

2733 +#: diff.c:5390

2734 +msgid "detect renames"

2735 +msgstr "检测重命名"

2736 +

2737 +#: diff.c:5394

2738 +msgid "omit the preimage for deletes"

2739 +msgstr "省略删除操作的差异输出"

2740 +

2741 +#: diff.c:5397

2742 +msgid "detect copies"

2743 +msgstr "检测拷贝"

2744 +

2745 +#: diff.c:5401

2746 +msgid "use unmodified files as source to find copies"

2747 +msgstr "使用未修改的文件做为发现拷贝的源"

2748 +

2749 +#: diff.c:5403

2750 +msgid "disable rename detection"

2751 +msgstr "禁用重命名探测"

2752 +

2753 +#: diff.c:5406

2754 +msgid "use empty blobs as rename source"

2755 +msgstr "使用空的数据对象做为重命名的源"

2756 +

2757 +#: diff.c:5408

2758 +msgid "continue listing the history of a file beyond renames"

2759 +msgstr "继续列出文件重命名以外的历史记录"

2760 +

2761 +#: diff.c:5411

2762 +msgid ""

2763 +"prevent rename/copy detection if the number of rename/copy targets exceeds "

2764 +"given limit"

2765 +msgstr "如果重命名/拷贝目标超过给定的限制，禁止重命名/拷贝检测"

2766 +

2767 +#: diff.c:5413

2768 +msgid "Diff algorithm options"

2769 +msgstr "差异算法选项"

2770 +

2771 +#: diff.c:5415

2772 +msgid "produce the smallest possible diff"

2773 +msgstr "生成尽可能小的差异"

2774 +

2775 +#: diff.c:5418

2776 +msgid "ignore whitespace when comparing lines"

2777 +msgstr "行比较时忽略空白字符"

2778 +

2779 +#: diff.c:5421

2780 +msgid "ignore changes in amount of whitespace"

2781 +msgstr "忽略空白字符的变更"

2782 +

2783 +#: diff.c:5424

2784 +msgid "ignore changes in whitespace at EOL"

2785 +msgstr "忽略行尾的空白字符变更"

2786 +

2787 +#: diff.c:5427

2788 +msgid "ignore carrier-return at the end of line"

2789 +msgstr "忽略行尾的回车符（CR）"

2790 +

2791 +#: diff.c:5430

2792 +msgid "ignore changes whose lines are all blank"

2793 +msgstr "忽略整行都是空白的变更"

2794 +

2795 +#: diff.c:5433

2796 +msgid "heuristic to shift diff hunk boundaries for easy reading"

2797 +msgstr "启发式转换差异边界以便阅读"

2798 +

2799 +#: diff.c:5436

2800 +msgid "generate diff using the \"patience diff\" algorithm"

2801 +msgstr "使用 \"patience diff\" 算法生成差异"

2802 +

2803 +#: diff.c:5440

2804 +msgid "generate diff using the \"histogram diff\" algorithm"

2805 +msgstr "使用 \"histogram diff\" 算法生成差异"

2806 +

2807 +#: diff.c:5442

2808 +msgid "<algorithm>"

2809 +msgstr "<算法>"

2810 +

2811 +#: diff.c:5443

2812 +msgid "choose a diff algorithm"

2813 +msgstr "选择一个差异算法"

2814 +

2815 +#: diff.c:5445

2816 +msgid "<text>"

2817 +msgstr "<文本>"

2818 +

2819 +#: diff.c:5446

2820 +msgid "generate diff using the \"anchored diff\" algorithm"

2821 +msgstr "使用“锚定差异算法生成差异"

2822 +

2823 +#: diff.c:5448 diff.c:5457 diff.c:5460

2824 +msgid "<mode>"

2825 +msgstr "<模式>"

2826 +

2827 +#: diff.c:5449

2828 +msgid "show word diff, using <mode> to delimit changed words"

2829 +msgstr "显示单词差异，使用 <模式> 分隔变更的单词"

2830 +

2831 +#: diff.c:5451 diff.c:5454 diff.c:5499

2832 +msgid "<regex>"

2833 +msgstr "<正则>"

2834 +

2835 +#: diff.c:5452

2836 +msgid "use <regex> to decide what a word is"

2837 +msgstr "使用 <正则表达式> 确定何为一个词"

2838 +

2839 +#: diff.c:5455

2840 +msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"

2841 +msgstr "相当于 --word-diff=color --word-diff-regex=<正则>"

2842 +

2843 +#: diff.c:5458

2844 +msgid "moved lines of code are colored differently"

2845 +msgstr "移动的代码行用不同方式着色"

2846 +

2847 +#: diff.c:5461

2848 +msgid "how white spaces are ignored in --color-moved"

2849 +msgstr "在 --color-moved 下如何忽略空白字符"

2850 +

2851 +#: diff.c:5464

2852 +msgid "Other diff options"

2853 +msgstr "其它差异选项"

2854 +

2855 +#: diff.c:5466

2856 +msgid "when run from subdir, exclude changes outside and show relative paths"

2857 +msgstr "当从子目录运行，排除目录之外的变更并显示相对路径"

2858 +

2859 +#: diff.c:5470

2860 +msgid "treat all files as text"

2861 +msgstr "把所有文件当做文本处理"

2862 +

2863 +#: diff.c:5472

2864 +msgid "swap two inputs, reverse the diff"

2865 +msgstr "交换两个输入，反转差异"

2866 +

2867 +#: diff.c:5474

2868 +msgid "exit with 1 if there were differences, 0 otherwise"

2869 +msgstr "有差异时退出码为 1，否则为 0"

2870 +

2871 +#: diff.c:5476

2872 +msgid "disable all output of the program"

2873 +msgstr "禁用本程序的所有输出"

2874 +

2875 +#: diff.c:5478

2876 +msgid "allow an external diff helper to be executed"

2877 +msgstr "允许执行一个外置的差异助手"

2878 +

2879 +#: diff.c:5480

2880 +msgid "run external text conversion filters when comparing binary files"

2881 +msgstr "当比较二进制文件时，运行外部的文本转换过滤器"

2882 +

2883 +#: diff.c:5482

2884 +msgid "<when>"

2885 +msgstr "<何时>"

2886 +

2887 +#: diff.c:5483

2888 +msgid "ignore changes to submodules in the diff generation"

2889 +msgstr "在生成差异时，忽略子模组的更改"

2890 +

2891 +#: diff.c:5486

2892 +msgid "<format>"

2893 +msgstr "<格式>"

2894 +

2895 +#: diff.c:5487

2896 +msgid "specify how differences in submodules are shown"

2897 +msgstr "指定子模组的差异如何显示"

2898 +

2899 +#: diff.c:5491

2900 +msgid "hide 'git add -N' entries from the index"

2901 +msgstr "隐藏索引中 'git add -N' 条目"

2902 +

2903 +#: diff.c:5494

2904 +msgid "treat 'git add -N' entries as real in the index"

2905 +msgstr "将索引中 'git add -N' 条目当做真实的"

2906 +

2907 +#: diff.c:5496

2908 +msgid "<string>"

2909 +msgstr "<字符串>"

2910 +

2911 +#: diff.c:5497

2912 +msgid ""

2913 +"look for differences that change the number of occurrences of the specified "

2914 +"string"

2915 +msgstr "查找改变了指定字符串出现次数的差异"

2916 +

2917 +#: diff.c:5500

2918 +msgid ""

2919 +"look for differences that change the number of occurrences of the specified "

2920 +"regex"

2921 +msgstr "查找改变指定正则匹配出现次数的差异"

2922 +

2923 +#: diff.c:5503

2924 +msgid "show all changes in the changeset with -S or -G"

2925 +msgstr "显示使用 -S 或 -G 的变更集的所有变更"

2926 +

2927 +#: diff.c:5506

2928 +msgid "treat <string> in -S as extended POSIX regular expression"

2929 +msgstr "将 -S 的 <string> 当做扩展的 POSIX 正则表达式"

2930 +

2931 +#: diff.c:5509

2932 +msgid "control the order in which files appear in the output"

2933 +msgstr "控制输出中的文件显示顺序"

2934 +

2935 +#: diff.c:5510

2936 +msgid "<object-id>"

2937 +msgstr "<对象ID>"

2938 +

2939 +#: diff.c:5511

2940 +msgid ""

2941 +"look for differences that change the number of occurrences of the specified "

2942 +"object"

2943 +msgstr "查找改变指定对象出现次数的差异"

2944 +

2945 +#: diff.c:5513

2946 +msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"

2947 +msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"

2948 +

2949 +#: diff.c:5514

2950 +msgid "select files by diff type"

2951 +msgstr "通过差异类型选择文件"

2952 +

2953 +#: diff.c:5516

2954 +msgid "<file>"

2955 +msgstr "<文件>"

2956 +

2957 +#: diff.c:5517

2958 +msgid "Output to a specific file"

2959 +msgstr "输出到一个指定的文件"

2960 +

2961 +#: diff.c:6150

2962 msgid "inexact rename detection was skipped due to too many files."

2963 msgstr "因为文件太多，略过不严格的重命名检查。"

2964

2418 -#: diff.c:5903

2965 +#: diff.c:6153

2966 msgid "only found copies from modified paths due to too many files."

2967 msgstr "因为文件太多，只在修改的路径中查找拷贝。"

2968

2422 -#: diff.c:5906

2969 +#: diff.c:6156

2970 #, c-format

2971 msgid ""

2972 "you may want to set your %s variable to at least %d and retry the command."

2973 msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。"

2974

2428 -#: dir.c:538

2975 +#: dir.c:537

2976 #, c-format

2977 msgid "pathspec '%s' did not match any file(s) known to git"

2978 msgstr "路径规格 '%s' 未匹配任何 git 已知文件"

2979

2433 -#: dir.c:927

2980 +#: dir.c:926

2981 #, c-format

2982 msgid "cannot use %s as an exclude file"

2983 msgstr "不能将 %s 用作排除文件"

2984

2438 -#: dir.c:1842

2985 +#: dir.c:1843

2986 #, c-format

2987 msgid "could not open directory '%s'"

2988 msgstr "不能打开目录 '%s'"

2989

2443 -#: dir.c:2084

2990 +#: dir.c:2085

2991 msgid "failed to get kernel name and information"

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

2993

2447 -#: dir.c:2208

2994 +#: dir.c:2209

2995 msgid "untracked cache is disabled on this system or location"

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

2997

2451 -#: dir.c:3009

2998 +#: dir.c:3013

2999 #, c-format

3000 msgid "index file corrupt in repo %s"

3001 msgstr "仓库 %s 中的索引文件损坏"

3002

2456 -#: dir.c:3054 dir.c:3059

3003 +#: dir.c:3058 dir.c:3063

3004 #, c-format

3005 msgid "could not create directories for %s"

3006 msgstr "不能为 %s 创建目录"

3007

2461 -#: dir.c:3088

3008 +#: dir.c:3092

3009 #, c-format

3010 msgid "could not migrate git directory from '%s' to '%s'"

3011 msgstr "不能从 '%s' 迁移 git 目录到 '%s'"

@@ -2472,7 +3019,7 @@ msgstr "提示：等待您的编辑器关闭文件...%c"

3019 msgid "Filtering content"

3020 msgstr "过滤内容"

3021

2475 -#: entry.c:465

3022 +#: entry.c:476

3023 #, c-format

3024 msgid "could not stat file '%s'"

3025 msgstr "不能对文件 '%s' 调用 stat"

@@ -2487,7 +3034,7 @@ msgstr "错误的 git 名字空间路径 \"%s\""

3034 msgid "could not set GIT_DIR to '%s'"

3035 msgstr "不能设置 GIT_DIR 为 '%s'"

3036

2490 -#: exec-cmd.c:361

3037 +#: exec-cmd.c:363

3038 #, c-format

3039 msgid "too many args to run %s"

3040 msgstr "执行 %s 的参数太多"

@@ -2513,226 +3060,234 @@ msgstr "git fetch-pack：期望 ACK/NAK，却得到 flush 包"

3060 msgid "git fetch-pack: expected ACK/NAK, got '%s'"

3061 msgstr "git fetch-pack：应为 ACK/NAK，却得到 '%s'"

3062

2516 -#: fetch-pack.c:256

3063 +#: fetch-pack.c:196

3064 +msgid "unable to write to remote"

3065 +msgstr "无法写到远程"

3066 +

3067 +#: fetch-pack.c:258

3068 msgid "--stateless-rpc requires multi_ack_detailed"

3069 msgstr "--stateless-rpc 需要 multi_ack_detailed"

3070

2520 -#: fetch-pack.c:358 fetch-pack.c:1264

3071 +#: fetch-pack.c:360 fetch-pack.c:1271

3072 #, c-format

3073 msgid "invalid shallow line: %s"

3074 msgstr "无效的 shallow 信息：%s"

3075

2525 -#: fetch-pack.c:364 fetch-pack.c:1271

3076 +#: fetch-pack.c:366 fetch-pack.c:1277

3077 #, c-format

3078 msgid "invalid unshallow line: %s"

3079 msgstr "无效的 unshallow 信息：%s"

3080

2530 -#: fetch-pack.c:366 fetch-pack.c:1273

3081 +#: fetch-pack.c:368 fetch-pack.c:1279

3082 #, c-format

3083 msgid "object not found: %s"

3084 msgstr "对象未找到：%s"

3085

2535 -#: fetch-pack.c:369 fetch-pack.c:1276

3086 +#: fetch-pack.c:371 fetch-pack.c:1282

3087 #, c-format

3088 msgid "error in object: %s"

3089 msgstr "对象中出错：%s"

3090

2540 -#: fetch-pack.c:371 fetch-pack.c:1278

3091 +#: fetch-pack.c:373 fetch-pack.c:1284

3092 #, c-format

3093 msgid "no shallow found: %s"

3094 msgstr "未发现 shallow：%s"

3095

2545 -#: fetch-pack.c:374 fetch-pack.c:1282

3096 +#: fetch-pack.c:376 fetch-pack.c:1288

3097 #, c-format

3098 msgid "expected shallow/unshallow, got %s"

3099 msgstr "应为 shallow/unshallow，却得到 %s"

3100

2550 -#: fetch-pack.c:415

3101 +#: fetch-pack.c:417

3102 #, c-format

3103 msgid "got %s %d %s"

3104 msgstr "得到 %s %d %s"

3105

2555 -#: fetch-pack.c:432

3106 +#: fetch-pack.c:434

3107 #, c-format

3108 msgid "invalid commit %s"

3109 msgstr "无效提交 %s"

3110

2560 -#: fetch-pack.c:463

3111 +#: fetch-pack.c:465

3112 msgid "giving up"

3113 msgstr "放弃"

3114

2564 -#: fetch-pack.c:475 progress.c:229

3115 +#: fetch-pack.c:477 progress.c:284

3116 msgid "done"

3117 msgstr "完成"

3118

2568 -#: fetch-pack.c:487

3119 +#: fetch-pack.c:489

3120 #, c-format

3121 msgid "got %s (%d) %s"

3122 msgstr "得到 %s (%d) %s"

3123

2573 -#: fetch-pack.c:533

3124 +#: fetch-pack.c:535

3125 #, c-format

3126 msgid "Marking %s as complete"

3127 msgstr "标记 %s 为完成"

3128

2578 -#: fetch-pack.c:740

3129 +#: fetch-pack.c:744

3130 #, c-format

3131 msgid "already have %s (%s)"

3132 msgstr "已经有 %s（%s）"

3133

2583 -#: fetch-pack.c:779

3134 +#: fetch-pack.c:783

3135 msgid "fetch-pack: unable to fork off sideband demultiplexer"

3136 msgstr "fetch-pack：无法派生 sideband 多路输出"

3137

2587 -#: fetch-pack.c:787

3138 +#: fetch-pack.c:791

3139 msgid "protocol error: bad pack header"

3140 msgstr "协议错误：坏的包头"

3141

2591 -#: fetch-pack.c:855

3142 +#: fetch-pack.c:859

3143 #, c-format

3144 msgid "fetch-pack: unable to fork off %s"

3145 msgstr "fetch-pack：无法派生进程 %s"

3146

2596 -#: fetch-pack.c:871

3147 +#: fetch-pack.c:875

3148 #, c-format

3149 msgid "%s failed"

3150 msgstr "%s 失败"

3151

2601 -#: fetch-pack.c:873

3152 +#: fetch-pack.c:877

3153 msgid "error in sideband demultiplexer"

3154 msgstr "sideband 多路输出出错"

3155

2605 -#: fetch-pack.c:902

3156 +#: fetch-pack.c:906

3157 msgid "Server does not support shallow clients"

3158 msgstr "服务器不支持 shalllow 客户端"

3159

2609 -#: fetch-pack.c:906

3160 +#: fetch-pack.c:910

3161 msgid "Server supports multi_ack_detailed"

3162 msgstr "服务器支持 multi_ack_detailed"

3163

2613 -#: fetch-pack.c:909

3164 +#: fetch-pack.c:913

3165 msgid "Server supports no-done"

3166 msgstr "服务器支持 no-done"

3167

2617 -#: fetch-pack.c:915

3168 +#: fetch-pack.c:919

3169 msgid "Server supports multi_ack"

3170 msgstr "服务器支持 multi_ack"

3171

2621 -#: fetch-pack.c:919

3172 +#: fetch-pack.c:923

3173 msgid "Server supports side-band-64k"

3174 msgstr "服务器支持 side-band-64k"

3175

2625 -#: fetch-pack.c:923

3176 +#: fetch-pack.c:927

3177 msgid "Server supports side-band"

3178 msgstr "服务器支持 side-band"

3179

2629 -#: fetch-pack.c:927

3180 +#: fetch-pack.c:931

3181 msgid "Server supports allow-tip-sha1-in-want"

3182 msgstr "服务器支持 allow-tip-sha1-in-want"

3183

2633 -#: fetch-pack.c:931

3184 +#: fetch-pack.c:935

3185 msgid "Server supports allow-reachable-sha1-in-want"

3186 msgstr "服务器支持 allow-reachable-sha1-in-want"

3187

2637 -#: fetch-pack.c:941

3188 +#: fetch-pack.c:945

3189 msgid "Server supports ofs-delta"

3190 msgstr "服务器支持 ofs-delta"

3191

2641 -#: fetch-pack.c:947 fetch-pack.c:1140

3192 +#: fetch-pack.c:951 fetch-pack.c:1144

3193 msgid "Server supports filter"

3194 msgstr "服务器支持 filter"

3195

2645 -#: fetch-pack.c:955

3196 +#: fetch-pack.c:959

3197 #, c-format

3198 msgid "Server version is %.*s"

3199 msgstr "服务器版本 %.*s"

3200

2650 -#: fetch-pack.c:961

3201 +#: fetch-pack.c:965

3202 msgid "Server does not support --shallow-since"

3203 msgstr "服务器不支持 --shallow-since"

3204

2654 -#: fetch-pack.c:965

3205 +#: fetch-pack.c:969

3206 msgid "Server does not support --shallow-exclude"

3207 msgstr "服务器不支持 --shallow-exclude"

3208

2658 -#: fetch-pack.c:967

3209 +#: fetch-pack.c:971

3210 msgid "Server does not support --deepen"

3211 msgstr "服务器不支持 --deepen"

3212

2662 -#: fetch-pack.c:984

3213 +#: fetch-pack.c:988

3214 msgid "no common commits"

3215 msgstr "没有共同的提交"

3216

2666 -#: fetch-pack.c:996 fetch-pack.c:1419

3217 +#: fetch-pack.c:1000 fetch-pack.c:1449

3218 msgid "git fetch-pack: fetch failed."

3219 msgstr "git fetch-pack：获取失败。"

3220

2670 -#: fetch-pack.c:1134

3221 +#: fetch-pack.c:1138

3222 msgid "Server does not support shallow requests"

3223 msgstr "服务器不支持 shalllow 请求"

3224

2674 -#: fetch-pack.c:1184

3225 +#: fetch-pack.c:1171

3226 +msgid "unable to write request to remote"

3227 +msgstr "无法将请求写到远程"

3228 +

3229 +#: fetch-pack.c:1189

3230 #, c-format

3231 msgid "error reading section header '%s'"

3232 msgstr "读取节标题 '%s' 出错"

3233

2679 -#: fetch-pack.c:1190

3234 +#: fetch-pack.c:1195

3235 #, c-format

3236 msgid "expected '%s', received '%s'"

3237 msgstr "预期 '%s'，得到 '%s'"

3238

2684 -#: fetch-pack.c:1229

3239 +#: fetch-pack.c:1234

3240 #, c-format

3241 msgid "unexpected acknowledgment line: '%s'"

3242 msgstr "意外的确认行：'%s'"

3243

2689 -#: fetch-pack.c:1234

3244 +#: fetch-pack.c:1239

3245 #, c-format

3246 msgid "error processing acks: %d"

3247 msgstr "处理 ack 出错：%d"

3248

2694 -#: fetch-pack.c:1244

3249 +#: fetch-pack.c:1249

3250 msgid "expected packfile to be sent after 'ready'"

3251 msgstr "预期在 'ready' 之后发送 packfile"

3252

2698 -#: fetch-pack.c:1246

3253 +#: fetch-pack.c:1251

3254 msgid "expected no other sections to be sent after no 'ready'"

3255 msgstr "在没有 'ready' 不应该发送其它小节"

3256

2702 -#: fetch-pack.c:1287

3257 +#: fetch-pack.c:1293

3258 #, c-format

3259 msgid "error processing shallow info: %d"

3260 msgstr "处理浅克隆信息出错：%d"

3261

2707 -#: fetch-pack.c:1308

3262 +#: fetch-pack.c:1340

3263 #, c-format

3264 msgid "expected wanted-ref, got '%s'"

3265 msgstr "预期 wanted-ref，得到 '%s'"

3266

2712 -#: fetch-pack.c:1318

3267 +#: fetch-pack.c:1345

3268 #, c-format

3269 msgid "unexpected wanted-ref: '%s'"

3270 msgstr "意外的 wanted-ref：'%s'"

3271

2717 -#: fetch-pack.c:1322

3272 +#: fetch-pack.c:1350

3273 #, c-format

3274 msgid "error processing wanted refs: %d"

3275 msgstr "处理要获取的引用出错：%d"

3276

2722 -#: fetch-pack.c:1646

3277 +#: fetch-pack.c:1676

3278 msgid "no matching remote head"

3279 msgstr "没有匹配的远程分支"

3280

2726 -#: fetch-pack.c:1664 builtin/clone.c:671

3281 +#: fetch-pack.c:1699 builtin/clone.c:673

3282 msgid "remote did not send all necessary objects"

3283 msgstr "远程没有发送所有必需的对象"

3284

2730 -#: fetch-pack.c:1690

3285 +#: fetch-pack.c:1726

3286 #, c-format

3287 msgid "no such remote ref %s"

3288 msgstr "没有这样的远程引用 %s"

3289

2735 -#: fetch-pack.c:1693

3290 +#: fetch-pack.c:1729

3291 #, c-format

3292 msgid "Server does not allow request for unadvertised object %s"

3293 msgstr "服务器不允许请求未公开的对象 %s"

@@ -2836,28 +3391,28 @@ msgstr "在 $PATH 路径中的其他地方可用的 git 命令"

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

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

3393

2839 -#: help.c:363 git.c:90

3394 +#: help.c:363 git.c:97

3395 #, c-format

3396 msgid "unsupported command listing type '%s'"

3397 msgstr "不支持的命令列表类型 '%s'"

3398

2844 -#: help.c:410

3399 +#: help.c:403

3400 msgid "The common Git guides are:"

3401 msgstr "最常用的 Git 向导有："

3402

2848 -#: help.c:519

3403 +#: help.c:512

3404 msgid "See 'git help <command>' to read about a specific subcommand"

3405 msgstr "执行　'git help <command>' 来查看特定子命令"

3406

2852 -#: help.c:524

3407 +#: help.c:517

3408 msgid "External commands"

3409 msgstr "外部命令"

3410

2856 -#: help.c:539

3411 +#: help.c:532

3412 msgid "Command aliases"

3413 msgstr "命令别名"

3414

2860 -#: help.c:603

3415 +#: help.c:596

3416 #, c-format

3417 msgid ""

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

@@ -2866,31 +3421,31 @@ msgstr ""

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

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

3423

2869 -#: help.c:662

3424 +#: help.c:655

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

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

3427

2873 -#: help.c:684

3428 +#: help.c:677

3429 #, c-format

3430 msgid "WARNING: You called a Git command named '%s', which does not exist."

3431 msgstr "警告：您运行了一个并不存在的 Git 命令 '%s'。"

3432

2878 -#: help.c:689

3433 +#: help.c:682

3434 #, c-format

3435 msgid "Continuing under the assumption that you meant '%s'."

3436 msgstr "假定你想要的是 '%s' 并继续。"

3437

2883 -#: help.c:694

3438 +#: help.c:687

3439 #, c-format

3440 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."

3441 msgstr "假定你想要的是 '%2$s'，在 %1$0.1f 秒钟后继续。"

3442

2888 -#: help.c:702

3443 +#: help.c:695

3444 #, c-format

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

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

3447

2893 -#: help.c:706

3448 +#: help.c:699

3449 msgid ""

3450 "\n"

3451 "The most similar command is"

@@ -2904,16 +3459,16 @@ msgstr[1] ""

3459 "\n"

3460 "最相似的命令是"

3461

2907 -#: help.c:721

3462 +#: help.c:714

3463 msgid "git version [<options>]"

3464 msgstr "git version [<选项>]"

3465

2911 -#: help.c:789

3466 +#: help.c:782

3467 #, c-format

3468 msgid "%s: %s - %s"

3469 msgstr "%s：%s - %s"

3470

2916 -#: help.c:793

3471 +#: help.c:786

3472 msgid ""

3473 "\n"

3474 "Did you mean this?"

@@ -2927,7 +3482,7 @@ msgstr[1] ""

3482 "\n"

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

3484

2930 -#: ident.c:345

3485 +#: ident.c:349

3486 msgid ""

3487 "\n"

3488 "*** Please tell me who you are.\n"

@@ -2952,39 +3507,54 @@ msgstr ""

3507 "来设置您账号的缺省身份标识。\n"

3508 "如果仅在本仓库设置身份标识，则省略 --global 参数。\n"

3509

2955 -#: ident.c:369

3510 +#: ident.c:379

3511 msgid "no email was given and auto-detection is disabled"

3512 msgstr "未提供邮件地址且自动探测被禁用"

3513

2959 -#: ident.c:374

3514 +#: ident.c:384

3515 #, c-format

3516 msgid "unable to auto-detect email address (got '%s')"

3517 msgstr "无法自动探测邮件地址（得到 '%s'）"

3518

2964 -#: ident.c:384

3519 +#: ident.c:401

3520 msgid "no name was given and auto-detection is disabled"

3521 msgstr "未提供姓名且自动探测被禁用"

3522

2968 -#: ident.c:390

3523 +#: ident.c:407

3524 #, c-format

3525 msgid "unable to auto-detect name (got '%s')"

3526 msgstr "无法自动探测姓名（得到 '%s'）"

3527

2973 -#: ident.c:398

3528 +#: ident.c:415

3529 #, c-format

3530 msgid "empty ident name (for <%s>) not allowed"

3531 msgstr "不允许空的姓名（对于 <%s>）"

3532

2978 -#: ident.c:404

3533 +#: ident.c:421

3534 #, c-format

3535 msgid "name consists only of disallowed characters: %s"

3536 msgstr "姓名中仅包含禁用字符：%s"

3537

2983 -#: ident.c:419 builtin/commit.c:608

3538 +#: ident.c:436 builtin/commit.c:608

3539 #, c-format

3540 msgid "invalid date format: %s"

3541 msgstr "无效的日期格式：%s"

3542

3543 +#: list-objects.c:129

3544 +#, c-format

3545 +msgid "entry '%s' in tree %s has tree mode, but is not a tree"

3546 +msgstr "树 %2$s 中的条目 '%1$s' 具有树的属性，但不是一个树对象"

3547 +

3548 +#: list-objects.c:142

3549 +#, c-format

3550 +msgid "entry '%s' in tree %s has blob mode, but is not a blob"

3551 +msgstr "树 %2$s 中的条目 '%1$s' 具有数据对象的属性，但不是一个数据对象"

3552 +

3553 +#: list-objects.c:378

3554 +#, c-format

3555 +msgid "unable to load root tree for commit %s"

3556 +msgstr "无法为提交 %s 加载根树"

3557 +

3558 #: list-objects-filter-options.c:36

3559 msgid "multiple filter-specs cannot be combined"

3560 msgstr "不能混用多种过滤规格"

@@ -2993,7 +3563,11 @@ msgstr "不能混用多种过滤规格"

3563 msgid "expected 'tree:<depth>'"

3564 msgstr "期望 'tree:<深度>'"

3565

2996 -#: list-objects-filter-options.c:152

3566 +#: list-objects-filter-options.c:84

3567 +msgid "sparse:path filters support has been dropped"

3568 +msgstr "sparse:path 过滤器支持已被删除"

3569 +

3570 +#: list-objects-filter-options.c:158

3571 msgid "cannot change partial clone promisor remote"

3572 msgstr "无法修改部分克隆的 promisor 远程仓库"

3573

@@ -3024,113 +3598,114 @@ msgstr "不能创建 '%s.lock'：%s"

3598 msgid "failed to read the cache"

3599 msgstr "读取缓存失败"

3600

3027 -#: merge.c:107 rerere.c:720 builtin/am.c:1884 builtin/am.c:1918

3028 -#: builtin/checkout.c:416 builtin/checkout.c:745 builtin/clone.c:771

3601 +#: merge.c:107 rerere.c:720 builtin/am.c:1887 builtin/am.c:1921

3602 +#: builtin/checkout.c:461 builtin/checkout.c:811 builtin/clone.c:773

3603 +#: builtin/stash.c:264

3604 msgid "unable to write new index file"

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

3606

3032 -#: merge-recursive.c:332

3607 +#: merge-recursive.c:322

3608 msgid "(bad commit)\n"

3609 msgstr "（坏提交）\n"

3610

3036 -#: merge-recursive.c:355

3611 +#: merge-recursive.c:345

3612 #, c-format

3613 msgid "add_cacheinfo failed for path '%s'; merge aborting."

3614 msgstr "add_cacheinfo 对路径 '%s' 执行失败，合并终止。"

3615

3041 -#: merge-recursive.c:364

3616 +#: merge-recursive.c:354

3617 #, c-format

3618 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."

3619 msgstr "add_cacheinfo 无法刷新路径 '%s'，合并终止。"

3620

3046 -#: merge-recursive.c:447

3621 +#: merge-recursive.c:437

3622 msgid "error building trees"

3623 msgstr "创建树出错"

3624

3050 -#: merge-recursive.c:902

3625 +#: merge-recursive.c:861

3626 #, c-format

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

3628 msgstr "创建路径 '%s'%s 失败"

3629

3055 -#: merge-recursive.c:913

3630 +#: merge-recursive.c:872

3631 #, c-format

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

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

3634

3060 -#: merge-recursive.c:927 merge-recursive.c:946

3635 +#: merge-recursive.c:886 merge-recursive.c:905

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

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

3638

3064 -#: merge-recursive.c:936

3639 +#: merge-recursive.c:895

3640 #, c-format

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

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

3643

3069 -#: merge-recursive.c:978 builtin/cat-file.c:40

3644 +#: merge-recursive.c:936 builtin/cat-file.c:40

3645 #, c-format

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

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

3648

3074 -#: merge-recursive.c:980

3649 +#: merge-recursive.c:939

3650 #, c-format

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

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

3653

3079 -#: merge-recursive.c:1004

3654 +#: merge-recursive.c:963

3655 #, c-format

3656 msgid "failed to open '%s': %s"

3657 msgstr "打开 '%s' 失败：%s"

3658

3084 -#: merge-recursive.c:1015

3659 +#: merge-recursive.c:974

3660 #, c-format

3661 msgid "failed to symlink '%s': %s"

3662 msgstr "创建符号链接 '%s' 失败：%s"

3663

3089 -#: merge-recursive.c:1020

3664 +#: merge-recursive.c:979

3665 #, c-format

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

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

3668

3094 -#: merge-recursive.c:1211

3669 +#: merge-recursive.c:1175

3670 #, c-format

3671 msgid "Failed to merge submodule %s (not checked out)"

3672 msgstr "无法合并子模组 %s （没有检出）"

3673

3099 -#: merge-recursive.c:1218

3674 +#: merge-recursive.c:1182

3675 #, c-format

3676 msgid "Failed to merge submodule %s (commits not present)"

3677 msgstr "无法合并子模组 %s（提交不存在）"

3678

3104 -#: merge-recursive.c:1225

3679 +#: merge-recursive.c:1189

3680 #, c-format

3681 msgid "Failed to merge submodule %s (commits don't follow merge-base)"

3682 msgstr "无法合并子模组 %s （提交未跟随合并基线）"

3683

3109 -#: merge-recursive.c:1233 merge-recursive.c:1245

3684 +#: merge-recursive.c:1197 merge-recursive.c:1209

3685 #, c-format

3686 msgid "Fast-forwarding submodule %s to the following commit:"

3687 msgstr "子模组 %s 快进到如下提交："

3688

3114 -#: merge-recursive.c:1236 merge-recursive.c:1248

3689 +#: merge-recursive.c:1200 merge-recursive.c:1212

3690 #, c-format

3691 msgid "Fast-forwarding submodule %s"

3692 msgstr "快进子模组 %s"

3693

3119 -#: merge-recursive.c:1271

3694 +#: merge-recursive.c:1235

3695 #, c-format

3696 msgid "Failed to merge submodule %s (merge following commits not found)"

3697 msgstr "无法合并子模组 %s （没发现合并跟随的提交）"

3698

3124 -#: merge-recursive.c:1275

3699 +#: merge-recursive.c:1239

3700 #, c-format

3701 msgid "Failed to merge submodule %s (not fast-forward)"

3702 msgstr "无法合并子模组 %s（非快进）"

3703

3129 -#: merge-recursive.c:1276

3704 +#: merge-recursive.c:1240

3705 msgid "Found a possible merge resolution for the submodule:\n"

3706 msgstr "找到子模组的一个可能的合并方案：\n"

3707

3133 -#: merge-recursive.c:1279

3708 +#: merge-recursive.c:1243

3709 #, c-format

3710 msgid ""

3711 "If this is correct simply add it to the index for example\n"

@@ -3146,31 +3721,31 @@ msgstr ""

3721 "\n"

3722 "以接受此建议。\n"

3723

3149 -#: merge-recursive.c:1288

3724 +#: merge-recursive.c:1252

3725 #, c-format

3726 msgid "Failed to merge submodule %s (multiple merges found)"

3727 msgstr "无法合并子模组 %s （发现多个合并）"

3728

3154 -#: merge-recursive.c:1361

3729 +#: merge-recursive.c:1325

3730 msgid "Failed to execute internal merge"

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

3732

3158 -#: merge-recursive.c:1366

3733 +#: merge-recursive.c:1330

3734 #, c-format

3735 msgid "Unable to add %s to database"

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

3737

3163 -#: merge-recursive.c:1398

3738 +#: merge-recursive.c:1362

3739 #, c-format

3740 msgid "Auto-merging %s"

3741 msgstr "自动合并 %s"

3742

3168 -#: merge-recursive.c:1419

3743 +#: merge-recursive.c:1385

3744 #, c-format

3745 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."

3746 msgstr "错误：拒绝丢失未跟踪文件 '%s'，而是写入 %s。"

3747

3173 -#: merge-recursive.c:1486

3748 +#: merge-recursive.c:1457

3749 #, c-format

3750 msgid ""

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

@@ -3179,7 +3754,7 @@ msgstr ""

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

3755 "本被保留。"

3756

3182 -#: merge-recursive.c:1491

3757 +#: merge-recursive.c:1462

3758 #, c-format

3759 msgid ""

3760 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -3188,7 +3763,7 @@ msgstr ""

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

3764 "%7$s 版本被保留。"

3765

3191 -#: merge-recursive.c:1498

3766 +#: merge-recursive.c:1469

3767 #, c-format

3768 msgid ""

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

@@ -3197,7 +3772,7 @@ msgstr ""

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

3773 "本保留在 %8$s 中。"

3774

3200 -#: merge-recursive.c:1503

3775 +#: merge-recursive.c:1474

3776 #, c-format

3777 msgid ""

3778 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -3206,40 +3781,40 @@ msgstr ""

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

3782 "%7$s 版本保留在 %9$s 中。"

3783

3209 -#: merge-recursive.c:1537

3784 +#: merge-recursive.c:1509

3785 msgid "rename"

3786 msgstr "重命名"

3787

3213 -#: merge-recursive.c:1537

3788 +#: merge-recursive.c:1509

3789 msgid "renamed"

3790 msgstr "重命名"

3791

3217 -#: merge-recursive.c:1633 merge-recursive.c:2481 merge-recursive.c:3213

3792 +#: merge-recursive.c:1589 merge-recursive.c:2445 merge-recursive.c:3085

3793 #, c-format

3794 msgid "Refusing to lose dirty file at %s"

3795 msgstr "拒绝丢失脏文件 '%s'"

3796

3222 -#: merge-recursive.c:1643

3797 +#: merge-recursive.c:1599

3798 #, c-format

3799 msgid "Refusing to lose untracked file at %s, even though it's in the way."

3800 msgstr "拒绝在 '%s' 处失去未跟踪文件，即使它存在于重命名中。"

3801

3227 -#: merge-recursive.c:1706

3802 +#: merge-recursive.c:1657

3803 #, c-format

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

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

3806

3232 -#: merge-recursive.c:1734

3807 +#: merge-recursive.c:1687

3808 #, c-format

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

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

3811

3237 -#: merge-recursive.c:1739

3812 +#: merge-recursive.c:1692

3813 #, c-format

3814 msgid "Refusing to lose untracked file at %s; adding as %s instead"

3815 msgstr "拒绝丢失未跟踪文件 '%s'，而是添加为 %s"

3816

3242 -#: merge-recursive.c:1759

3817 +#: merge-recursive.c:1711

3818 #, c-format

3819 msgid ""

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

@@ -3248,18 +3823,18 @@ msgstr ""

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

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

3825

3251 -#: merge-recursive.c:1764

3826 +#: merge-recursive.c:1716

3827 msgid " (left unresolved)"

3828 msgstr "（留下未解决）"

3829

3255 -#: merge-recursive.c:1868

3830 +#: merge-recursive.c:1825

3831 #, c-format

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

3833 msgstr ""

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

3835 "%5$s"

3836

3262 -#: merge-recursive.c:2064

3837 +#: merge-recursive.c:2030

3838 #, c-format

3839 msgid ""

3840 "CONFLICT (directory rename split): Unclear where to place %s because "

@@ -3269,7 +3844,7 @@ msgstr ""

3844 "冲突（分割的目录重命名）：不清楚 %s 应该放在哪里，因为目录 %s 被重命名到多个"

3845 "其它目录，没有目录包含大部分文件。"

3846

3272 -#: merge-recursive.c:2096

3847 +#: merge-recursive.c:2062

3848 #, c-format

3849 msgid ""

3850 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "

@@ -3278,7 +3853,7 @@ msgstr ""

3853 "冲突（隐式目录重命名）：处于隐式目录重命名的现存文件/目录 %s，将以下路径放"

3854 "在：%s。"

3855

3281 -#: merge-recursive.c:2106

3856 +#: merge-recursive.c:2072

3857 #, c-format

3858 msgid ""

3859 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "

@@ -3287,7 +3862,7 @@ msgstr ""

3862 "冲突（隐式目录重命名）：无法映射一个以上路径到 %s，隐式目录重命名尝试将这些路"

3863 "径放置于此：%s"

3864

3290 -#: merge-recursive.c:2198

3865 +#: merge-recursive.c:2164

3866 #, c-format

3867 msgid ""

3868 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"

@@ -3296,87 +3871,122 @@ msgstr ""

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

3872 "%4$s->%5$s"

3873

3299 -#: merge-recursive.c:2443

3874 +#: merge-recursive.c:2408

3875 #, c-format

3876 msgid ""

3877 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "

3878 "renamed."

3879 msgstr "警告：避免应用 %s -> %s 的重命名到 %s，因为 %s 本身已被重命名。"

3880

3306 -#: merge-recursive.c:3022

3881 +#: merge-recursive.c:2929

3882 #, c-format

3883 msgid "cannot read object %s"

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

3885

3311 -#: merge-recursive.c:3025

3886 +#: merge-recursive.c:2932

3887 #, c-format

3888 msgid "object %s is not a blob"

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

3890

3316 -#: merge-recursive.c:3094

3891 +#: merge-recursive.c:2996

3892 msgid "modify"

3893 msgstr "修改"

3894

3320 -#: merge-recursive.c:3094

3895 +#: merge-recursive.c:2996

3896 msgid "modified"

3897 msgstr "修改"

3898

3324 -#: merge-recursive.c:3105

3899 +#: merge-recursive.c:3008

3900 msgid "content"

3901 msgstr "内容"

3902

3328 -#: merge-recursive.c:3112

3903 +#: merge-recursive.c:3012

3904 msgid "add/add"

3905 msgstr "添加/添加"

3906

3332 -#: merge-recursive.c:3160

3907 +#: merge-recursive.c:3035

3908 #, c-format

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

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

3911

3337 -#: merge-recursive.c:3182 git-submodule.sh:861

3912 +#: merge-recursive.c:3057 git-submodule.sh:937

3913 msgid "submodule"

3914 msgstr "子模组"

3915

3341 -#: merge-recursive.c:3183

3916 +#: merge-recursive.c:3058

3917 #, c-format

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

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

3920

3346 -#: merge-recursive.c:3216

3921 +#: merge-recursive.c:3088

3922 #, c-format

3923 msgid "Adding as %s instead"

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

3925

3351 -#: merge-recursive.c:3319

3926 +#: merge-recursive.c:3170

3927 #, c-format

3353 -msgid "Removing %s"

3354 -msgstr "删除 %s"

3928 +msgid ""

3929 +"Path updated: %s added in %s inside a directory that was renamed in %s; "

3930 +"moving it to %s."

3931 +msgstr ""

3932 +"路径更新：%s 添加到 %s，位于一个被重命名到 %s 的目录中，将其移动到 %s。"

3933

3356 -#: merge-recursive.c:3345

3357 -msgid "file/directory"

3358 -msgstr "文件/目录"

3934 +#: merge-recursive.c:3173

3935 +#, c-format

3936 +msgid ""

3937 +"CONFLICT (file location): %s added in %s inside a directory that was renamed "

3938 +"in %s, suggesting it should perhaps be moved to %s."

3939 +msgstr ""

3940 +"冲突（文件位置）：%s 添加到 %s，位于一个被重命名为 %s 的目录中，建议将其移动"

3941 +"到 %s。"

3942 +

3943 +#: merge-recursive.c:3177

3944 +#, c-format

3945 +msgid ""

3946 +"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "

3947 +"%s; moving it to %s."

3948 +msgstr ""

3949 +"路径更新：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，将其移动"

3950 +"到 %5$s。"

3951 +

3952 +#: merge-recursive.c:3180

3953 +#, c-format

3954 +msgid ""

3955 +"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "

3956 +"was renamed in %s, suggesting it should perhaps be moved to %s."

3957 +msgstr ""

3958 +"冲突（文件未知）：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，"

3959 +"建议将其移动到 %5$s。"

3960 +

3961 +#: merge-recursive.c:3294

3962 +#, c-format

3963 +msgid "Removing %s"

3964 +msgstr "删除 %s"

3965 +

3966 +#: merge-recursive.c:3317

3967 +msgid "file/directory"

3968 +msgstr "文件/目录"

3969

3360 -#: merge-recursive.c:3351

3970 +#: merge-recursive.c:3322

3971 msgid "directory/file"

3972 msgstr "目录/文件"

3973

3364 -#: merge-recursive.c:3358

3974 +#: merge-recursive.c:3329

3975 #, c-format

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

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

3978

3369 -#: merge-recursive.c:3367

3979 +#: merge-recursive.c:3338

3980 #, c-format

3981 msgid "Adding %s"

3982 msgstr "添加 %s"

3983

3374 -#: merge-recursive.c:3376

3984 +#: merge-recursive.c:3347

3985 #, c-format

3986 msgid "CONFLICT (add/add): Merge conflict in %s"

3987 msgstr "冲突（add/add）：合并冲突于 %s"

3988

3379 -#: merge-recursive.c:3417

3989 +#: merge-recursive.c:3385

3990 #, c-format

3991 msgid ""

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

@@ -3385,147 +3995,159 @@ msgstr ""

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

3996 " %s"

3997

3388 -#: merge-recursive.c:3428

3998 +#: merge-recursive.c:3396

3999 msgid "Already up to date!"

4000 msgstr "已经是最新的！"

4001

3392 -#: merge-recursive.c:3437

4002 +#: merge-recursive.c:3405

4003 #, c-format

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

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

4006

3397 -#: merge-recursive.c:3536

4007 +#: merge-recursive.c:3504

4008 msgid "Merging:"

4009 msgstr "合并："

4010

3401 -#: merge-recursive.c:3549

4011 +#: merge-recursive.c:3517

4012 #, c-format

4013 msgid "found %u common ancestor:"

4014 msgid_plural "found %u common ancestors:"

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

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

4017

3408 -#: merge-recursive.c:3588

4018 +#: merge-recursive.c:3556

4019 msgid "merge returned no commit"

4020 msgstr "合并未返回提交"

4021

3412 -#: merge-recursive.c:3654

4022 +#: merge-recursive.c:3622

4023 #, c-format

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

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

4026

3417 -#: merge-recursive.c:3670 builtin/merge.c:692 builtin/merge.c:850

4027 +#: merge-recursive.c:3638 builtin/merge.c:702 builtin/merge.c:873

4028 msgid "Unable to write index."

4029 msgstr "不能写入索引。"

4030

3421 -#: midx.c:65

4031 +#: midx.c:66

4032 #, c-format

4033 msgid "multi-pack-index file %s is too small"

4034 msgstr "多包索引文件 %s 太小"

4035

3426 -#: midx.c:81

4036 +#: midx.c:82

4037 #, c-format

4038 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"

4039 msgstr "多包索引签名 0x%08x 和签名 0x%08x 不匹配"

4040

3431 -#: midx.c:86

4041 +#: midx.c:87

4042 #, c-format

4043 msgid "multi-pack-index version %d not recognized"

4044 msgstr "multi-pack-index 版本 %d 不能被识别"

4045

3436 -#: midx.c:91

4046 +#: midx.c:92

4047 #, c-format

4048 msgid "hash version %u does not match"

4049 msgstr "散列版本 %u 不匹配"

4050

3441 -#: midx.c:105

4051 +#: midx.c:106

4052 msgid "invalid chunk offset (too large)"

4053 msgstr "无效的块偏移（太大）"

4054

3445 -#: midx.c:129

4055 +#: midx.c:130

4056 msgid "terminating multi-pack-index chunk id appears earlier than expected"

4057 msgstr "终止多包索引块 id 出现时间早于预期"

4058

3449 -#: midx.c:142

4059 +#: midx.c:143

4060 msgid "multi-pack-index missing required pack-name chunk"

4061 msgstr "多包索引缺少必需的包名块"

4062

3453 -#: midx.c:144

4063 +#: midx.c:145

4064 msgid "multi-pack-index missing required OID fanout chunk"

4065 msgstr "多包索引缺少必需的 OID 扇出块"

4066

3457 -#: midx.c:146

4067 +#: midx.c:147

4068 msgid "multi-pack-index missing required OID lookup chunk"

4069 msgstr "多包索引缺少必需的 OID 查询块"

4070

3461 -#: midx.c:148

4071 +#: midx.c:149

4072 msgid "multi-pack-index missing required object offsets chunk"

4073 msgstr "多包索引缺少必需的对象偏移块"

4074

3465 -#: midx.c:162

4075 +#: midx.c:163

4076 #, c-format

4077 msgid "multi-pack-index pack names out of order: '%s' before '%s'"

4078 msgstr "多包索引包名无序：'%s' 在 '%s' 之前"

4079

3470 -#: midx.c:205

4080 +#: midx.c:208

4081 #, c-format

4082 msgid "bad pack-int-id: %u (%u total packs)"

4083 msgstr "错的 pack-int-id：%u（共有 %u 个包）"

4084

3475 -#: midx.c:246

4085 +#: midx.c:258

4086 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"

4087 msgstr "多包索引存储一个64位偏移，但是 off_t 太小"

4088

3479 -#: midx.c:271

4089 +#: midx.c:286

4090 msgid "error preparing packfile from multi-pack-index"

4091 msgstr "从多包索引准备 packfile 出错"

4092

3483 -#: midx.c:407

4093 +#: midx.c:457

4094 #, c-format

4095 msgid "failed to add packfile '%s'"

4096 msgstr "添加包文件 '%s' 失败"

4097

3488 -#: midx.c:413

4098 +#: midx.c:463

4099 #, c-format

4100 msgid "failed to open pack-index '%s'"

4101 msgstr "打开包索引 '%s' 失败"

4102

3493 -#: midx.c:507

4103 +#: midx.c:557

4104 #, c-format

4105 msgid "failed to locate object %d in packfile"

4106 msgstr "在包文件中定位对象 %d 失败"

4107

3498 -#: midx.c:943

4108 +#: midx.c:993

4109 #, c-format

4110 msgid "failed to clear multi-pack-index at %s"

4111 msgstr "清理位于 %s 的多包索引失败"

4112

3503 -#: midx.c:981

4113 +#: midx.c:1048

4114 +msgid "Looking for referenced packfiles"

4115 +msgstr "正在查找引用的包文件"

4116 +

4117 +#: midx.c:1063

4118 #, c-format

4119 msgid ""

4120 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

4121 msgstr "对象ID扇出无序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

4122

3509 -#: midx.c:992

4123 +#: midx.c:1067

4124 +msgid "Verifying OID order in MIDX"

4125 +msgstr "正在校验 MIDX 中的 OID 顺序"

4126 +

4127 +#: midx.c:1076

4128 #, c-format

4129 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"

4130 msgstr "对象ID查询无序：oid[%d] = %s >= %s = oid[%d]"

4131

3514 -#: midx.c:996

4132 +#: midx.c:1095

4133 +msgid "Sorting objects by packfile"

4134 +msgstr "通过包文件为对象排序"

4135 +

4136 +#: midx.c:1101

4137 msgid "Verifying object offsets"

4138 msgstr "校验对象偏移"

4139

3518 -#: midx.c:1004

4140 +#: midx.c:1117

4141 #, c-format

4142 msgid "failed to load pack entry for oid[%d] = %s"

4143 msgstr "为 oid[%d] = %s 加载包条目失败"

4144

3523 -#: midx.c:1010

4145 +#: midx.c:1123

4146 #, c-format

4147 msgid "failed to load pack-index for packfile %s"

4148 msgstr "为包文件 %s 加载包索引失败"

4149

3528 -#: midx.c:1019

4150 +#: midx.c:1132

4151 #, c-format

4152 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"

4153 msgstr "oid[%d] = %s 错误的对象偏移：%<PRIx64> != %<PRIx64>"

@@ -3609,85 +4231,80 @@ msgstr "不能解析对象：%s"

4231 msgid "hash mismatch %s"

4232 msgstr "哈希值与 %s 不匹配"

4233

3612 -#: packfile.c:607

4234 +#: packfile.c:617

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

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

4237

3616 -#: packfile.c:1870

4238 +#: packfile.c:1868

4239 #, c-format

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

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

4242

3621 -#: packfile.c:1874

4243 +#: packfile.c:1872

4244 #, c-format

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

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

4247

3626 -#: parse-options.c:35

4248 +#: parse-options.c:38

4249 #, c-format

4250 msgid "%s requires a value"

4251 msgstr "%s 需要一个值"

4252

3631 -#: parse-options.c:69

4253 +#: parse-options.c:73

4254 #, c-format

4255 msgid "%s is incompatible with %s"

4256 msgstr "%s 与 %s 不兼容"

4257

3636 -#: parse-options.c:74

4258 +#: parse-options.c:78

4259 #, c-format

4260 msgid "%s : incompatible with something else"

4261 msgstr "%s：和其它的不兼容"

4262

3641 -#: parse-options.c:88 parse-options.c:92 parse-options.c:260

4263 +#: parse-options.c:92 parse-options.c:96 parse-options.c:319

4264 #, c-format

4265 msgid "%s takes no value"

4266 msgstr "%s 不取值"

4267

3646 -#: parse-options.c:90

4268 +#: parse-options.c:94

4269 #, c-format

4270 msgid "%s isn't available"

4271 msgstr "%s 不可用"

4272

3651 -#: parse-options.c:178

3652 -#, c-format

3653 -msgid "%s expects a numerical value"

3654 -msgstr "%s 期望一个数字值"

3655 -

3656 -#: parse-options.c:194

4273 +#: parse-options.c:219

4274 #, c-format

4275 msgid "%s expects a non-negative integer value with an optional k/m/g suffix"

4276 msgstr "%s 期望一个非负整数和一个可选的 k/m/g 后缀"

4277

3661 -#: parse-options.c:322

4278 +#: parse-options.c:389

4279 #, c-format

4280 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"

4281 msgstr "有歧义的选项：%s（可以是 --%s%s 或 --%s%s）"

4282

3666 -#: parse-options.c:356 parse-options.c:364

4283 +#: parse-options.c:423 parse-options.c:431

4284 #, c-format

4285 msgid "did you mean `--%s` (with two dashes ?)"

4286 msgstr "你的意思是 `--%s`（有两个短线？）"

4287

3671 -#: parse-options.c:649

4288 +#: parse-options.c:859

4289 #, c-format

4290 msgid "unknown option `%s'"

4291 msgstr "未知选项 `%s'"

4292

3676 -#: parse-options.c:651

4293 +#: parse-options.c:861

4294 #, c-format

4295 msgid "unknown switch `%c'"

4296 msgstr "未知开关 `%c'"

4297

3681 -#: parse-options.c:653

4298 +#: parse-options.c:863

4299 #, c-format

4300 msgid "unknown non-ascii option in string: `%s'"

4301 msgstr "字符串中未知的非ascii字符选项：`%s'"

4302

3686 -#: parse-options.c:675

4303 +#: parse-options.c:887

4304 msgid "..."

4305 msgstr "..."

4306

3690 -#: parse-options.c:694

4307 +#: parse-options.c:906

4308 #, c-format

4309 msgid "usage: %s"

4310 msgstr "用法：%s"

@@ -3695,42 +4312,47 @@ msgstr "用法：%s"

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

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

4314 #.

3698 -#: parse-options.c:700

4315 +#: parse-options.c:912

4316 #, c-format

4317 msgid " or: %s"

4318 msgstr " 或：%s"

4319

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

3704 -#: parse-options.c:703

4321 +#: parse-options.c:915

4322 #, c-format

4323 msgid " %s"

4324 msgstr " %s"

4325

3709 -#: parse-options.c:742

4326 +#: parse-options.c:954

4327 msgid "-NUM"

4328 msgstr "-数字"

4329

3713 -#: parse-options-cb.c:21

4330 +#: parse-options.c:968

4331 +#, c-format

4332 +msgid "alias of --%s"

4333 +msgstr "--%s 的别名"

4334 +

4335 +#: parse-options-cb.c:20 parse-options-cb.c:24

4336 #, c-format

4337 msgid "option `%s' expects a numerical value"

4338 msgstr "选项 `%s' 期望一个数字值"

4339

3718 -#: parse-options-cb.c:38

4340 +#: parse-options-cb.c:41

4341 #, c-format

4342 msgid "malformed expiration date '%s'"

4343 msgstr "格式错误的到期时间：'%s'"

4344

3723 -#: parse-options-cb.c:51

4345 +#: parse-options-cb.c:54

4346 #, c-format

4347 msgid "option `%s' expects \"always\", \"auto\", or \"never\""

4348 msgstr "选项 `%s' 期望 \"always\"、\"auto\" 或 \"never\""

4349

3728 -#: parse-options-cb.c:110

4350 +#: parse-options-cb.c:130 parse-options-cb.c:147

4351 #, c-format

4352 msgid "malformed object name '%s'"

4353 msgstr "格式错误的对象名 '%s'"

4354

3733 -#: path.c:894

4355 +#: path.c:897

4356 #, c-format

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

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

@@ -3806,45 +4428,53 @@ msgstr "%s：路径规格神奇前缀不被此命令支持：%s"

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

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

4430

3809 -#: pkt-line.c:104

4431 +#: pkt-line.c:92

4432 +msgid "unable to write flush packet"

4433 +msgstr "无法写 flush 包"

4434 +

4435 +#: pkt-line.c:99

4436 +msgid "unable to write delim packet"

4437 +msgstr "无法写 delim 包"

4438 +

4439 +#: pkt-line.c:106

4440 msgid "flush packet write failed"

4441 msgstr "flush 包写错误"

4442

3813 -#: pkt-line.c:144 pkt-line.c:230

4443 +#: pkt-line.c:146 pkt-line.c:232

4444 msgid "protocol error: impossibly long line"

4445 msgstr "协议错误：不可能的长行"

4446

3817 -#: pkt-line.c:160 pkt-line.c:162

4447 +#: pkt-line.c:162 pkt-line.c:164

4448 msgid "packet write with format failed"

4449 msgstr "格式化包写入错误"

4450

3821 -#: pkt-line.c:194

4451 +#: pkt-line.c:196

4452 msgid "packet write failed - data exceeds max packet size"

4453 msgstr "写数据包失败：数据超过了包的最大长度"

4454

3825 -#: pkt-line.c:201 pkt-line.c:208

4455 +#: pkt-line.c:203 pkt-line.c:210

4456 msgid "packet write failed"

4457 msgstr "数据包写入失败"

4458

3829 -#: pkt-line.c:293

4459 +#: pkt-line.c:295

4460 msgid "read error"

4461 msgstr "读取错误"

4462

3833 -#: pkt-line.c:301

4463 +#: pkt-line.c:303

4464 msgid "the remote end hung up unexpectedly"

4465 msgstr "远端意外挂断了"

4466

3837 -#: pkt-line.c:329

4467 +#: pkt-line.c:331

4468 #, c-format

4469 msgid "protocol error: bad line length character: %.4s"

4470 msgstr "协议错误：错误的行长度字符串：%.4s"

4471

3842 -#: pkt-line.c:339 pkt-line.c:344

4472 +#: pkt-line.c:341 pkt-line.c:346

4473 #, c-format

4474 msgid "protocol error: bad line length %d"

4475 msgstr "协议错误：错误的行长度 %d"

4476

3847 -#: pkt-line.c:353

4477 +#: pkt-line.c:362

4478 #, c-format

4479 msgid "remote error: %s"

4480 msgstr "远程错误：%s"

@@ -3858,7 +4488,7 @@ msgstr "正在刷新索引"

4488 msgid "unable to create threaded lstat: %s"

4489 msgstr "无法创建线程 lstat：%s"

4490

3861 -#: pretty.c:963

4491 +#: pretty.c:966

4492 msgid "unable to parse --pretty format"

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

4494

@@ -3870,7 +4500,7 @@ msgstr "不能启动 `log`"

4500 msgid "could not read `log` output"

4501 msgstr "不能读取 `log` 的输出"

4502

3873 -#: range-diff.c:74 sequencer.c:4828

4503 +#: range-diff.c:74 sequencer.c:4897

4504 #, c-format

4505 msgid "could not parse commit '%s'"

4506 msgstr "不能解析提交 '%s'"

@@ -3884,45 +4514,50 @@ msgstr "生成 diff 失败"

4514 msgid "could not parse log for '%s'"

4515 msgstr "不能解析 '%s' 的日志"

4516

3887 -#: read-cache.c:673

4517 +#: read-cache.c:680

4518 #, c-format

4519 msgid "will not add file alias '%s' ('%s' already exists in index)"

4520 msgstr "将不会添加文件别名 '%s'（'%s' 已经存在于索引中）"

4521

3892 -#: read-cache.c:689

4522 +#: read-cache.c:696

4523 msgid "cannot create an empty blob in the object database"

4524 msgstr "不能在对象数据库中创建空的数据对象"

4525

3896 -#: read-cache.c:710

4526 +#: read-cache.c:718

4527 #, c-format

4528 msgid "%s: can only add regular files, symbolic links or git-directories"

4529 msgstr "%s：只能添加常规文件、符号链接或 git 目录"

4530

3901 -#: read-cache.c:765

4531 +#: read-cache.c:723

4532 +#, c-format

4533 +msgid "'%s' does not have a commit checked out"

4534 +msgstr "'%s' 没有检出一个提交"

4535 +

4536 +#: read-cache.c:775

4537 #, c-format

4538 msgid "unable to index file '%s'"

4539 msgstr "无法索引文件 '%s'"

4540

3906 -#: read-cache.c:784

4541 +#: read-cache.c:794

4542 #, c-format

4543 msgid "unable to add '%s' to index"

4544 msgstr "无法在索引中添加 '%s'"

4545

3911 -#: read-cache.c:795

4546 +#: read-cache.c:805

4547 #, c-format

4548 msgid "unable to stat '%s'"

4549 msgstr "无法对 %s 执行 stat"

4550

3916 -#: read-cache.c:1304

4551 +#: read-cache.c:1314

4552 #, c-format

4553 msgid "'%s' appears as both a file and as a directory"

4554 msgstr "'%s' 既显示为文件又显示为目录"

4555

3921 -#: read-cache.c:1489

4556 +#: read-cache.c:1499

4557 msgid "Refresh index"

4558 msgstr "刷新索引"

4559

3925 -#: read-cache.c:1603

4560 +#: read-cache.c:1613

4561 #, c-format

4562 msgid ""

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

@@ -3931,7 +4566,7 @@ msgstr ""

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

4567 "使用版本 %i"

4568

3934 -#: read-cache.c:1613

4569 +#: read-cache.c:1623

4570 #, c-format

4571 msgid ""

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

@@ -3940,145 +4575,151 @@ msgstr ""

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

4576 "使用版本 %i"

4577

3943 -#: read-cache.c:1684

4578 +#: read-cache.c:1679

4579 #, c-format

4580 msgid "bad signature 0x%08x"

4581 msgstr "坏的签名 0x%08x"

4582

3948 -#: read-cache.c:1687

4583 +#: read-cache.c:1682

4584 #, c-format

4585 msgid "bad index version %d"

4586 msgstr "坏的索引版本 %d"

4587

3953 -#: read-cache.c:1696

4588 +#: read-cache.c:1691

4589 msgid "bad index file sha1 signature"

4590 msgstr "坏的索引文件哈希值签名"

4591

3957 -#: read-cache.c:1726

4592 +#: read-cache.c:1721

4593 #, c-format

4594 msgid "index uses %.4s extension, which we do not understand"

4595 msgstr "索引使用不被支持的 %.4s 扩展"

4596

4597 #

3963 -#: read-cache.c:1728

4598 +#: read-cache.c:1723

4599 #, c-format

4600 msgid "ignoring %.4s extension"

4601 msgstr "忽略 %.4s 扩展"

4602

3968 -#: read-cache.c:1765

4603 +#: read-cache.c:1760

4604 #, c-format

4605 msgid "unknown index entry format 0x%08x"

4606 msgstr "未知的索引条目格式 0x%08x"

4607

3973 -#: read-cache.c:1781

4608 +#: read-cache.c:1776

4609 #, c-format

4610 msgid "malformed name field in the index, near path '%s'"

4611 msgstr "索引中靠近路径 '%s' 有错误的名称字段"

4612

3978 -#: read-cache.c:1836

4613 +#: read-cache.c:1833

4614 msgid "unordered stage entries in index"

4615 msgstr "索引中有未排序的暂存条目"

4616

3982 -#: read-cache.c:1839

4617 +#: read-cache.c:1836

4618 #, c-format

4619 msgid "multiple stage entries for merged file '%s'"

4620 msgstr "合并文件 '%s' 有多个暂存条目"

4621

3987 -#: read-cache.c:1842

4622 +#: read-cache.c:1839

4623 #, c-format

4624 msgid "unordered stage entries for '%s'"

4625 msgstr "'%s' 的未排序暂存条目"

4626

3992 -#: read-cache.c:1949 read-cache.c:2227 rerere.c:565 rerere.c:599 rerere.c:1111

3993 -#: builtin/add.c:459 builtin/check-ignore.c:178 builtin/checkout.c:294

3994 -#: builtin/checkout.c:622 builtin/checkout.c:991 builtin/clean.c:955

3995 -#: builtin/commit.c:344 builtin/diff-tree.c:116 builtin/grep.c:498

4627 +#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111

4628 +#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:358

4629 +#: builtin/checkout.c:672 builtin/checkout.c:1060 builtin/clean.c:955

4630 +#: builtin/commit.c:344 builtin/diff-tree.c:120 builtin/grep.c:498

4631 #: builtin/mv.c:145 builtin/reset.c:245 builtin/rm.c:271

4632 #: builtin/submodule--helper.c:330

4633 msgid "index file corrupt"

4634 msgstr "索引文件损坏"

4635

4001 -#: read-cache.c:2090

4636 +#: read-cache.c:2087

4637 #, c-format

4638 msgid "unable to create load_cache_entries thread: %s"

4639 msgstr "无法创建 load_cache_entries 线程：%s"

4640

4006 -#: read-cache.c:2103

4641 +#: read-cache.c:2100

4642 #, c-format

4643 msgid "unable to join load_cache_entries thread: %s"

4644 msgstr "无法加入 load_cache_entries 线程：%s"

4645

4011 -#: read-cache.c:2136

4646 +#: read-cache.c:2133

4647 #, c-format

4648 msgid "%s: index file open failed"

4649 msgstr "%s：打开索引文件失败"

4650

4016 -#: read-cache.c:2140

4651 +#: read-cache.c:2137

4652 #, c-format

4653 msgid "%s: cannot stat the open index"

4654 msgstr "%s：不能对打开的索引执行 stat 操作"

4655

4021 -#: read-cache.c:2144

4656 +#: read-cache.c:2141

4657 #, c-format

4658 msgid "%s: index file smaller than expected"

4659 msgstr "%s：索引文件比预期的小"

4660

4026 -#: read-cache.c:2148

4661 +#: read-cache.c:2145

4662 #, c-format

4663 msgid "%s: unable to map index file"

4664 msgstr "%s：无法对索引文件执行 map 操作"

4665

4031 -#: read-cache.c:2190

4666 +#: read-cache.c:2187

4667 #, c-format

4668 msgid "unable to create load_index_extensions thread: %s"

4669 msgstr "无法创建 load_index_extensions 线程：%s"

4670

4036 -#: read-cache.c:2217

4671 +#: read-cache.c:2214

4672 #, c-format

4673 msgid "unable to join load_index_extensions thread: %s"

4674 msgstr "无法加入 load_index_extensions 线程：%s"

4675

4041 -#: read-cache.c:2239

4676 +#: read-cache.c:2246

4677 #, c-format

4678 msgid "could not freshen shared index '%s'"

4679 msgstr "无法刷新共享索引 '%s'"

4680

4046 -#: read-cache.c:2274

4681 +#: read-cache.c:2293

4682 #, c-format

4683 msgid "broken index, expect %s in %s, got %s"

4684 msgstr "损坏的索引，期望在 %2$s 中的 %1$s，得到 %3$s"

4685

4051 -#: read-cache.c:2971 sequencer.c:4791 wrapper.c:658 builtin/merge.c:1087

4686 +#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1117

4687 #, c-format

4688 msgid "could not close '%s'"

4689 msgstr "不能关闭 '%s'"

4690

4056 -#: read-cache.c:3044 sequencer.c:2237 sequencer.c:3647

4691 +#: read-cache.c:3092 sequencer.c:2354 sequencer.c:3807

4692 #, c-format

4693 msgid "could not stat '%s'"

4694 msgstr "不能对 '%s' 调用 stat"

4695

4061 -#: read-cache.c:3057

4696 +#: read-cache.c:3105

4697 #, c-format

4698 msgid "unable to open git dir: %s"

4699 msgstr "不能打开 git 目录：%s"

4700

4066 -#: read-cache.c:3069

4701 +#: read-cache.c:3117

4702 #, c-format

4703 msgid "unable to unlink: %s"

4704 msgstr "无法删除：%s"

4705

4071 -#: read-cache.c:3088

4706 +#: read-cache.c:3142

4707 #, c-format

4708 msgid "cannot fix permission bits on '%s'"

4709 msgstr "不能修复 '%s' 的权限位"

4710

4076 -#: read-cache.c:3237

4711 +#: read-cache.c:3291

4712 #, c-format

4713 msgid "%s: cannot drop to stage #0"

4714 msgstr "%s：不能落到暂存区 #0"

4715

4081 -#: rebase-interactive.c:10

4716 +#: rebase-interactive.c:26

4717 +#, c-format

4718 +msgid ""

4719 +"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."

4720 +msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。"

4721 +

4722 +#: rebase-interactive.c:35

4723 msgid ""

4724 "\n"

4725 "Commands:\n"

@@ -4118,7 +4759,14 @@ msgstr ""

4759 "\n"

4760 "可以对这些行重新排序，将从上至下执行。\n"

4761

4121 -#: rebase-interactive.c:31 git-rebase--preserve-merges.sh:173

4762 +#: rebase-interactive.c:56

4763 +#, c-format

4764 +msgid "Rebase %s onto %s (%d command)"

4765 +msgid_plural "Rebase %s onto %s (%d commands)"

4766 +msgstr[0] "变基 %s 到 %s（%d 个提交）"

4767 +msgstr[1] "变基 %s 到 %s（%d 个提交）"

4768 +

4769 +#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:173

4770 msgid ""

4771 "\n"

4772 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"

@@ -4126,7 +4774,7 @@ msgstr ""

4774 "\n"

4775 "不要删除任意一行。使用 'drop' 显式地删除一个提交。\n"

4776

4129 -#: rebase-interactive.c:34 git-rebase--preserve-merges.sh:177

4777 +#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:177

4778 msgid ""

4779 "\n"

4780 "If you remove a line here THAT COMMIT WILL BE LOST.\n"

@@ -4134,7 +4782,7 @@ msgstr ""

4782 "\n"

4783 "如果您在这里删除一行，对应的提交将会丢失。\n"

4784

4137 -#: rebase-interactive.c:40 git-rebase--preserve-merges.sh:816

4785 +#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:816

4786 msgid ""

4787 "\n"

4788 "You are editing the todo file of an ongoing interactive rebase.\n"

@@ -4148,7 +4796,7 @@ msgstr ""

4796 " git rebase --continue\n"

4797 "\n"

4798

4151 -#: rebase-interactive.c:45 git-rebase--preserve-merges.sh:893

4799 +#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:893

4800 msgid ""

4801 "\n"

4802 "However, if you remove everything, the rebase will be aborted.\n"

@@ -4158,125 +4806,153 @@ msgstr ""

4806 "然而，如果您删除全部内容，变基操作将会终止。\n"

4807 "\n"

4808

4161 -#: rebase-interactive.c:51 git-rebase--preserve-merges.sh:900

4809 +#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:900

4810 msgid "Note that empty commits are commented out"

4811 msgstr "注意空提交已被注释掉"

4812

4165 -#: rebase-interactive.c:62 rebase-interactive.c:75 sequencer.c:2219

4166 -#: sequencer.c:4569 sequencer.c:4625 sequencer.c:4900

4813 +#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3339

4814 +#: sequencer.c:3365 sequencer.c:4996 builtin/fsck.c:356 builtin/rebase.c:235

4815 #, c-format

4168 -msgid "could not read '%s'."

4169 -msgstr "不能读取 '%s'。"

4816 +msgid "could not write '%s'"

4817 +msgstr "不能写入 '%s'"

4818 +

4819 +#: rebase-interactive.c:108

4820 +#, c-format

4821 +msgid "could not copy '%s' to '%s'."

4822 +msgstr "不能拷贝 '%s' 至 '%s'。"

4823 +

4824 +#: rebase-interactive.c:173

4825 +#, c-format

4826 +msgid ""

4827 +"Warning: some commits may have been dropped accidentally.\n"

4828 +"Dropped commits (newer to older):\n"

4829 +msgstr ""

4830 +"警告：一些提交可能被意外丢弃。\n"

4831 +"丢弃的提交（从新到旧）：\n"

4832 +

4833 +#: rebase-interactive.c:180

4834 +#, c-format

4835 +msgid ""

4836 +"To avoid this message, use \"drop\" to explicitly remove a commit.\n"

4837 +"\n"

4838 +"Use 'git config rebase.missingCommitsCheck' to change the level of "

4839 +"warnings.\n"

4840 +"The possible behaviours are: ignore, warn, error.\n"

4841 +"\n"

4842 +msgstr ""

4843 +"为避免这条信息，使用 \"drop\" 指令显式地删除一个提交。\n"

4844 +"\n"

4845 +"使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n"

4846 +"可选值有：ignore、warn、error。\n"

4847 +"\n"

4848

4849 #: refs.c:192

4850 #, c-format

4851 msgid "%s does not point to a valid object!"

4852 msgstr "%s 没有指向一个有效的对象！"

4853

4176 -#: refs.c:583

4854 +#: refs.c:597

4855 #, c-format

4856 msgid "ignoring dangling symref %s"

4857 msgstr "忽略悬空符号引用 %s"

4858

4181 -#: refs.c:585 ref-filter.c:1976

4859 +#: refs.c:599 ref-filter.c:1982

4860 #, c-format

4861 msgid "ignoring broken ref %s"

4862 msgstr "忽略损坏的引用 %s"

4863

4186 -#: refs.c:711

4864 +#: refs.c:734

4865 #, c-format

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

4867 msgstr "无法为写入打开 '%s'：%s"

4868

4191 -#: refs.c:721 refs.c:772

4869 +#: refs.c:744 refs.c:795

4870 #, c-format

4871 msgid "could not read ref '%s'"

4872 msgstr "无法读取引用 '%s'"

4873

4196 -#: refs.c:727

4874 +#: refs.c:750

4875 #, c-format

4876 msgid "ref '%s' already exists"

4877 msgstr "引用 '%s' 已经存在"

4878

4201 -#: refs.c:732

4879 +#: refs.c:755

4880 #, c-format

4881 msgid "unexpected object ID when writing '%s'"

4882 msgstr "写入 '%s' 时意外的对象 ID"

4883

4206 -#: refs.c:740 sequencer.c:396 sequencer.c:2549 sequencer.c:2675

4207 -#: sequencer.c:2689 sequencer.c:2923 sequencer.c:4789 sequencer.c:4852

4208 -#: wrapper.c:656

4884 +#: refs.c:763 sequencer.c:400 sequencer.c:2679 sequencer.c:2805

4885 +#: sequencer.c:2819 sequencer.c:3076 sequencer.c:4913 wrapper.c:656

4886 #, c-format

4887 msgid "could not write to '%s'"

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

4889

4213 -#: refs.c:767 sequencer.c:4787 sequencer.c:4846 wrapper.c:225 wrapper.c:395

4214 -#: builtin/am.c:713 builtin/rebase.c:575

4890 +#: refs.c:790 wrapper.c:225 wrapper.c:395 builtin/am.c:715 builtin/rebase.c:993

4891 #, c-format

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

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

4894

4219 -#: refs.c:774

4895 +#: refs.c:797

4896 #, c-format

4897 msgid "unexpected object ID when deleting '%s'"

4898 msgstr "删除 '%s' 时意外的对象 ID"

4899

4224 -#: refs.c:905

4900 +#: refs.c:928

4901 #, c-format

4902 msgid "log for ref %s has gap after %s"

4903 msgstr "引用 %s 的日志在 %s 之后有缺口"

4904

4229 -#: refs.c:911

4905 +#: refs.c:934

4906 #, c-format

4907 msgid "log for ref %s unexpectedly ended on %s"

4908 msgstr "引用 %s 的日志意外终止于 %s "

4909

4234 -#: refs.c:969

4910 +#: refs.c:993

4911 #, c-format

4912 msgid "log for %s is empty"

4913 msgstr "%s 的日志为空"

4914

4239 -#: refs.c:1061

4915 +#: refs.c:1085

4916 #, c-format

4917 msgid "refusing to update ref with bad name '%s'"

4918 msgstr "拒绝更新有错误名称 '%s' 的引用"

4919

4244 -#: refs.c:1137

4920 +#: refs.c:1161

4921 #, c-format

4922 msgid "update_ref failed for ref '%s': %s"

4923 msgstr "对引用 '%s' 执行 update_ref 失败：%s"

4924

4249 -#: refs.c:1911

4925 +#: refs.c:1942

4926 #, c-format

4927 msgid "multiple updates for ref '%s' not allowed"

4928 msgstr "不允许对引用 '%s' 多次更新"

4929

4254 -#: refs.c:1943

4930 +#: refs.c:1974

4931 msgid "ref updates forbidden inside quarantine environment"

4932 msgstr "在隔离环境中禁止更新引用"

4933

4258 -#: refs.c:2039 refs.c:2069

4934 +#: refs.c:2070 refs.c:2100

4935 #, c-format

4936 msgid "'%s' exists; cannot create '%s'"

4937 msgstr "'%s' 已存在，无法创建 '%s'"

4938

4263 -#: refs.c:2045 refs.c:2080

4939 +#: refs.c:2076 refs.c:2111

4940 #, c-format

4941 msgid "cannot process '%s' and '%s' at the same time"

4942 msgstr "无法同时处理 '%s' 和 '%s'"

4943

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

4944 +#: refs/files-backend.c:1234

4945 #, c-format

4946 msgid "could not remove reference %s"

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

4948

4273 -#: refs/files-backend.c:1242 refs/packed-backend.c:1532

4949 +#: refs/files-backend.c:1248 refs/packed-backend.c:1532

4950 #: refs/packed-backend.c:1542

4951 #, c-format

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

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

4954

4279 -#: refs/files-backend.c:1245 refs/packed-backend.c:1545

4955 +#: refs/files-backend.c:1251 refs/packed-backend.c:1545

4956 #, c-format

4957 msgid "could not delete references: %s"

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

@@ -4286,7 +4962,7 @@ msgstr "无法删除引用：%s"

4962 msgid "invalid refspec '%s'"

4963 msgstr "无效的引用表达式：'%s'"

4964

4289 -#: ref-filter.c:39 wt-status.c:1861

4965 +#: ref-filter.c:39 wt-status.c:1909

4966 msgid "gone"

4967 msgstr "丢失"

4968

@@ -4410,78 +5086,78 @@ msgstr "元素 %%(align) 需要一个正数的宽度"

5086 msgid "unrecognized %%(if) argument: %s"

5087 msgstr "未能识别的 %%(if) 参数：%s"

5088

4413 -#: ref-filter.c:527

5089 +#: ref-filter.c:531

5090 #, c-format

5091 msgid "malformed field name: %.*s"

5092 msgstr "格式错误的字段名：%.*s"

5093

4418 -#: ref-filter.c:554

5094 +#: ref-filter.c:558

5095 #, c-format

5096 msgid "unknown field name: %.*s"

5097 msgstr "未知的字段名：%.*s"

5098

4423 -#: ref-filter.c:558

5099 +#: ref-filter.c:562

5100 #, c-format

5101 msgid ""

5102 "not a git repository, but the field '%.*s' requires access to object data"

5103 msgstr "不是一个 git 仓库，但是字段 '%.*s' 需要访问对象数据"

5104

4429 -#: ref-filter.c:682

5105 +#: ref-filter.c:686

5106 #, c-format

5107 msgid "format: %%(if) atom used without a %%(then) atom"

5108 msgstr "格式：使用了 %%(if) 元素而没有 %%(then) 元素"

5109

4434 -#: ref-filter.c:745

5110 +#: ref-filter.c:749

5111 #, c-format

5112 msgid "format: %%(then) atom used without an %%(if) atom"

5113 msgstr "格式：使用了 %%(then) 元素而没有 %%(if) 元素"

5114

4439 -#: ref-filter.c:747

5115 +#: ref-filter.c:751

5116 #, c-format

5117 msgid "format: %%(then) atom used more than once"

5118 msgstr "格式：%%(then) 元素用了多次"

5119

4444 -#: ref-filter.c:749

5120 +#: ref-filter.c:753

5121 #, c-format

5122 msgid "format: %%(then) atom used after %%(else)"

5123 msgstr "格式：%%(then) 元素用在了 %%(else) 之后"

5124

4449 -#: ref-filter.c:777

5125 +#: ref-filter.c:781

5126 #, c-format

5127 msgid "format: %%(else) atom used without an %%(if) atom"

5128 msgstr "格式：使用了 %%(else) 元素而没有 %%(if) 元素"

5129

4454 -#: ref-filter.c:779

5130 +#: ref-filter.c:783

5131 #, c-format

5132 msgid "format: %%(else) atom used without a %%(then) atom"

5133 msgstr "格式：使用了 %%(else) 元素而没有 %%(then) 元素"

5134

4459 -#: ref-filter.c:781

5135 +#: ref-filter.c:785

5136 #, c-format

5137 msgid "format: %%(else) atom used more than once"

5138 msgstr "格式：%%(else) 元素用了多次"

5139

4464 -#: ref-filter.c:796

5140 +#: ref-filter.c:800

5141 #, c-format

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

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

5144

4469 -#: ref-filter.c:853

5145 +#: ref-filter.c:857

5146 #, c-format

5147 msgid "malformed format string %s"

5148 msgstr "错误的格式化字符串 %s"

5149

4474 -#: ref-filter.c:1447

5150 +#: ref-filter.c:1453

5151 #, c-format

5152 msgid "(no branch, rebasing %s)"

5153 msgstr "（非分支，正变基 %s）"

5154

4479 -#: ref-filter.c:1450

5155 +#: ref-filter.c:1456

5156 #, c-format

5157 msgid "(no branch, rebasing detached HEAD %s)"

5158 msgstr "（非分支，正变基分离头指针 %s）"

5159

4484 -#: ref-filter.c:1453

5160 +#: ref-filter.c:1459

5161 #, c-format

5162 msgid "(no branch, bisect started on %s)"

5163 msgstr "（非分支，二分查找开始于 %s）"

@@ -4489,7 +5165,7 @@ msgstr "（非分支，二分查找开始于 %s）"

5165 #. TRANSLATORS: make sure this matches "HEAD

5166 #. detached at " in wt-status.c

5167 #.

4492 -#: ref-filter.c:1461

5168 +#: ref-filter.c:1467

5169 #, c-format

5170 msgid "(HEAD detached at %s)"

5171 msgstr "（头指针分离于 %s）"

@@ -4497,56 +5173,56 @@ msgstr "（头指针分离于 %s）"

5173 #. TRANSLATORS: make sure this matches "HEAD

5174 #. detached from " in wt-status.c

5175 #.

4500 -#: ref-filter.c:1468

5176 +#: ref-filter.c:1474

5177 #, c-format

5178 msgid "(HEAD detached from %s)"

5179 msgstr "（头指针分离自 %s）"

5180

4505 -#: ref-filter.c:1472

5181 +#: ref-filter.c:1478

5182 msgid "(no branch)"

5183 msgstr "（非分支）"

5184

4509 -#: ref-filter.c:1506 ref-filter.c:1663

5185 +#: ref-filter.c:1512 ref-filter.c:1669

5186 #, c-format

5187 msgid "missing object %s for %s"

5188 msgstr "缺失 %2$s 的对象 %1$s"

5189

4514 -#: ref-filter.c:1516

5190 +#: ref-filter.c:1522

5191 #, c-format

5192 msgid "parse_object_buffer failed on %s for %s"

5193 msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"

5194

4519 -#: ref-filter.c:1882

5195 +#: ref-filter.c:1888

5196 #, c-format

5197 msgid "malformed object at '%s'"

5198 msgstr "格式错误的对象 '%s'"

5199

4524 -#: ref-filter.c:1971

5200 +#: ref-filter.c:1977

5201 #, c-format

5202 msgid "ignoring ref with broken name %s"

5203 msgstr "忽略带有错误名称 %s 的引用"

5204

4529 -#: ref-filter.c:2257

5205 +#: ref-filter.c:2263

5206 #, c-format

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

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

5209

4534 -#: ref-filter.c:2352

5210 +#: ref-filter.c:2363

5211 #, c-format

5212 msgid "option `%s' is incompatible with --merged"

5213 msgstr "选项 `%s' 和 --merged 不兼容"

5214

4539 -#: ref-filter.c:2355

5215 +#: ref-filter.c:2366

5216 #, c-format

5217 msgid "option `%s' is incompatible with --no-merged"

5218 msgstr "选项 `%s' 和 --no-merged 不兼容"

5219

4544 -#: ref-filter.c:2365

5220 +#: ref-filter.c:2376

5221 #, c-format

5222 msgid "malformed object name %s"

5223 msgstr "格式错误的对象名 %s"

5224

4549 -#: ref-filter.c:2370

5225 +#: ref-filter.c:2381

5226 #, c-format

5227 msgid "option `%s' must point to a commit"

5228 msgstr "选项 `%s' 必须指向一个提交"

@@ -4589,7 +5265,6 @@ msgstr "模式的键 '%s' 没有 '*'"

5265 msgid "value '%s' of pattern has no '*'"

5266 msgstr "模式的值 '%s' 没有 '*'"

5267

4592 -#

5268 #: remote.c:1000

5269 #, c-format

5270 msgid "src refspec %s does not match any"

@@ -4738,42 +5413,42 @@ msgstr "无法找到远程引用 %s"

5413 msgid "* Ignoring funny ref '%s' locally"

5414 msgstr "* 在本地忽略可笑的引用 '%s'"

5415

4741 -#: remote.c:1990

5416 +#: remote.c:2016

5417 #, c-format

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

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

5420

4746 -#: remote.c:1994

5421 +#: remote.c:2020

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

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

5424

4750 -#: remote.c:1997

5425 +#: remote.c:2023

5426 #, c-format

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

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

5429

4755 -#: remote.c:2001

5430 +#: remote.c:2027

5431 #, c-format

5432 msgid "Your branch and '%s' refer to different commits.\n"

5433 msgstr "您的分支和 '%s' 指向不同的提交。\n"

5434

4760 -#: remote.c:2004

5435 +#: remote.c:2030

5436 #, c-format

5437 msgid " (use \"%s\" for details)\n"

5438 msgstr " （使用 \"%s\" 查看详情）\n"

5439

4765 -#: remote.c:2008

5440 +#: remote.c:2034

5441 #, c-format

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

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

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

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

5446

4772 -#: remote.c:2014

5447 +#: remote.c:2040

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

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

5450

4776 -#: remote.c:2017

5451 +#: remote.c:2043

5452 #, c-format

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

5454 msgid_plural ""

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

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

5458

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

4785 -#: remote.c:2025

5460 +#: remote.c:2051

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

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

5463

4789 -#: remote.c:2028

5464 +#: remote.c:2054

5465 #, c-format

5466 msgid ""

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

@@ -4802,11 +5477,11 @@ msgstr[1] ""

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

5478

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

4805 -#: remote.c:2038

5480 +#: remote.c:2064

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

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

5483

4809 -#: remote.c:2221

5484 +#: remote.c:2247

5485 #, c-format

5486 msgid "cannot parse expected object name '%s'"

5487 msgstr "无法解析期望的对象名 '%s'"

@@ -4834,12 +5509,6 @@ msgstr "损坏的 MERGE_RR"

5509 msgid "unable to write rerere record"

5510 msgstr "无法写入 rerere 记录"

5511

4837 -#: rerere.c:485 rerere.c:692 sequencer.c:3186 sequencer.c:3212

4838 -#: builtin/fsck.c:314

4839 -#, c-format

4840 -msgid "could not write '%s'"

4841 -msgstr "不能写入 '%s'"

4842 -

5512 #: rerere.c:495

5513 #, c-format

5514 msgid "there were errors while writing '%s' (%s)"

@@ -4890,8 +5559,8 @@ msgstr "不能删除 stray '%s'"

5559 msgid "Recorded preimage for '%s'"

5560 msgstr "为 '%s' 记录 preimage"

5561

4893 -#: rerere.c:881 submodule.c:2012 builtin/submodule--helper.c:1417

4894 -#: builtin/submodule--helper.c:1427

5562 +#: rerere.c:881 submodule.c:2024 builtin/log.c:1750

5563 +#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1427

5564 #, c-format

5565 msgid "could not create directory '%s'"

5566 msgstr "不能创建目录 '%s'"

@@ -4925,29 +5594,33 @@ msgstr "忘记 '%s' 的解决方案\n"

5594 msgid "unable to open rr-cache directory"

5595 msgstr "不能打开 rr-cache 目录"

5596

4928 -#: revision.c:2484

5597 +#: revision.c:2476

5598 msgid "your current branch appears to be broken"

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

5600

4932 -#: revision.c:2487

5601 +#: revision.c:2479

5602 #, c-format

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

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

5605

4937 -#: revision.c:2684

5606 +#: revision.c:2679

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

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

5609

4941 -#: run-command.c:742

5610 +#: revision.c:2683

5611 +msgid "-L does not yet support diff formats besides -p and -s"

5612 +msgstr "-L 尚不支持 -p 和 -s 之外的差异格式"

5613 +

5614 +#: run-command.c:763

5615 msgid "open /dev/null failed"

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

5617

4945 -#: run-command.c:1231

5618 +#: run-command.c:1269

5619 #, c-format

5620 msgid "cannot create async thread: %s"

5621 msgstr "不能创建 async 线程：%s"

5622

4950 -#: run-command.c:1295

5623 +#: run-command.c:1333

5624 #, c-format

5625 msgid ""

5626 "The '%s' hook was ignored because it's not set as executable.\n"

@@ -4992,34 +5665,34 @@ msgstr "接收端不支持原子推送"

5665 msgid "the receiving end does not support push options"

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

5667

4995 -#: sequencer.c:184

5668 +#: sequencer.c:187

5669 #, c-format

5670 msgid "invalid commit message cleanup mode '%s'"

5671 msgstr "无效的提交信息清理模式 '%s'"

5672

5000 -#: sequencer.c:288

5673 +#: sequencer.c:292

5674 #, c-format

5675 msgid "could not delete '%s'"

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

5677

5005 -#: sequencer.c:314

5678 +#: sequencer.c:318

5679 msgid "revert"

5680 msgstr "还原"

5681

5009 -#: sequencer.c:316

5682 +#: sequencer.c:320

5683 msgid "cherry-pick"

5684 msgstr "拣选"

5685

5013 -#: sequencer.c:318

5686 +#: sequencer.c:322

5687 msgid "rebase -i"

5688 msgstr "rebase -i"

5689

5017 -#: sequencer.c:320

5690 +#: sequencer.c:324

5691 #, c-format

5692 msgid "unknown action: %d"

5693 msgstr "未知动作：%d"

5694

5022 -#: sequencer.c:378

5695 +#: sequencer.c:382

5696 msgid ""

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

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

@@ -5027,7 +5700,7 @@ msgstr ""

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

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

5702

5030 -#: sequencer.c:381

5703 +#: sequencer.c:385

5704 msgid ""

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

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

@@ -5036,110 +5709,115 @@ msgstr ""

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

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

5711

5039 -#: sequencer.c:394 sequencer.c:2671

5712 +#: sequencer.c:398 sequencer.c:2801

5713 #, c-format

5714 msgid "could not lock '%s'"

5715 msgstr "不能锁定 '%s'"

5716

5044 -#: sequencer.c:401

5717 +#: sequencer.c:405

5718 #, c-format

5719 msgid "could not write eol to '%s'"

5720 msgstr "不能将换行符写入 '%s'"

5721

5049 -#: sequencer.c:406 sequencer.c:2554 sequencer.c:2677 sequencer.c:2691

5050 -#: sequencer.c:2931

5722 +#: sequencer.c:410 sequencer.c:2684 sequencer.c:2807 sequencer.c:2821

5723 +#: sequencer.c:3084

5724 #, c-format

5725 msgid "failed to finalize '%s'"

5726 msgstr "无法完成 '%s'"

5727

5055 -#: sequencer.c:429 sequencer.c:931 sequencer.c:1615 sequencer.c:2574

5056 -#: sequencer.c:2913 sequencer.c:3022 builtin/am.c:245 builtin/commit.c:748

5057 -#: builtin/merge.c:1085 builtin/rebase.c:154

5728 +#: sequencer.c:433 sequencer.c:978 sequencer.c:1652 sequencer.c:2704

5729 +#: sequencer.c:3066 sequencer.c:3175 builtin/am.c:245 builtin/commit.c:760

5730 +#: builtin/merge.c:1115 builtin/rebase.c:567

5731 #, c-format

5732 msgid "could not read '%s'"

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

5734

5062 -#: sequencer.c:455

5735 +#: sequencer.c:459

5736 #, c-format

5737 msgid "your local changes would be overwritten by %s."

5738 msgstr "您的本地修改将被%s覆盖。"

5739

5067 -#: sequencer.c:459

5740 +#: sequencer.c:463

5741 msgid "commit your changes or stash them to proceed."

5742 msgstr "提交您的修改或贮藏后再继续。"

5743

5071 -#: sequencer.c:491

5744 +#: sequencer.c:495

5745 #, c-format

5746 msgid "%s: fast-forward"

5747 msgstr "%s：快进"

5748

5749 +#: sequencer.c:534 builtin/tag.c:555

5750 +#, c-format

5751 +msgid "Invalid cleanup mode %s"

5752 +msgstr "无效的清理模式 %s"

5753 +

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

5755 #. "rebase -i".

5756 #.

5079 -#: sequencer.c:582

5757 +#: sequencer.c:629

5758 #, c-format

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

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

5761

5084 -#: sequencer.c:598

5762 +#: sequencer.c:646

5763 msgid "unable to update cache tree"

5764 msgstr "不能更新缓存树"

5765

5088 -#: sequencer.c:612

5766 +#: sequencer.c:660

5767 msgid "could not resolve HEAD commit"

5768 msgstr "不能解析 HEAD 提交"

5769

5092 -#: sequencer.c:692

5770 +#: sequencer.c:740

5771 #, c-format

5772 msgid "no key present in '%.*s'"

5773 msgstr "在 '%.*s' 中没有 key"

5774

5097 -#: sequencer.c:703

5775 +#: sequencer.c:751

5776 #, c-format

5777 msgid "unable to dequote value of '%s'"

5778 msgstr "无法为 '%s' 的值去引号"

5779

5102 -#: sequencer.c:740 wrapper.c:227 wrapper.c:397 builtin/am.c:704

5103 -#: builtin/am.c:796 builtin/merge.c:1082 builtin/rebase.c:617

5780 +#: sequencer.c:788 wrapper.c:227 wrapper.c:397 builtin/am.c:706

5781 +#: builtin/am.c:798 builtin/merge.c:1112 builtin/rebase.c:1035

5782 #, c-format

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

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

5785

5108 -#: sequencer.c:750

5786 +#: sequencer.c:798

5787 msgid "'GIT_AUTHOR_NAME' already given"

5788 msgstr "已经给出 'GIT_AUTHOR_NAME'"

5789

5112 -#: sequencer.c:755

5790 +#: sequencer.c:803

5791 msgid "'GIT_AUTHOR_EMAIL' already given"

5792 msgstr "已经给出 'GIT_AUTHOR_EMAIL'"

5793

5116 -#: sequencer.c:760

5794 +#: sequencer.c:808

5795 msgid "'GIT_AUTHOR_DATE' already given"

5796 msgstr "已经给出 'GIT_AUTHOR_DATE'"

5797

5120 -#: sequencer.c:764

5798 +#: sequencer.c:812

5799 #, c-format

5800 msgid "unknown variable '%s'"

5801 msgstr "未知变量 '%s'"

5802

5125 -#: sequencer.c:769

5803 +#: sequencer.c:817

5804 msgid "missing 'GIT_AUTHOR_NAME'"

5805 msgstr "缺少 'GIT_AUTHOR_NAME'"

5806

5129 -#: sequencer.c:771

5807 +#: sequencer.c:819

5808 msgid "missing 'GIT_AUTHOR_EMAIL'"

5809 msgstr "缺少 'GIT_AUTHOR_EMAIL'"

5810

5133 -#: sequencer.c:773

5811 +#: sequencer.c:821

5812 msgid "missing 'GIT_AUTHOR_DATE'"

5813 msgstr "缺少 'GIT_AUTHOR_DATE'"

5814

5137 -#: sequencer.c:833

5815 +#: sequencer.c:881

5816 #, c-format

5817 msgid "invalid date format '%s' in '%s'"

5818 msgstr "'%2$s' 中无效的日期格式 '%1$s'"

5819

5142 -#: sequencer.c:850

5820 +#: sequencer.c:898

5821 #, c-format

5822 msgid ""

5823 "you have staged changes in your working tree\n"

@@ -5168,15 +5846,15 @@ msgstr ""

5846 "\n"

5847 " git rebase --continue\n"

5848

5171 -#: sequencer.c:945

5849 +#: sequencer.c:992

5850 msgid "writing root commit"

5851 msgstr "写根提交"

5852

5175 -#: sequencer.c:1155

5853 +#: sequencer.c:1213

5854 msgid "'prepare-commit-msg' hook failed"

5855 msgstr "'prepare-commit-msg' 钩子失败"

5856

5179 -#: sequencer.c:1162

5857 +#: sequencer.c:1220

5858 msgid ""

5859 "Your name and email address were configured automatically based\n"

5860 "on your username and hostname. Please check that they are accurate.\n"

@@ -5200,7 +5878,7 @@ msgstr ""

5878 "\n"

5879 " git commit --amend --reset-author\n"

5880

5203 -#: sequencer.c:1175

5881 +#: sequencer.c:1233

5882 msgid ""

5883 "Your name and email address were configured automatically based\n"

5884 "on your username and hostname. Please check that they are accurate.\n"

@@ -5223,295 +5901,306 @@ msgstr ""

5901 "\n"

5902 " git commit --amend --reset-author\n"

5903

5226 -#: sequencer.c:1217

5904 +#: sequencer.c:1275

5905 msgid "couldn't look up newly created commit"

5906 msgstr "无法找到新创建的提交"

5907

5230 -#: sequencer.c:1219

5908 +#: sequencer.c:1277

5909 msgid "could not parse newly created commit"

5910 msgstr "不能解析新创建的提交"

5911

5234 -#: sequencer.c:1265

5912 +#: sequencer.c:1323

5913 msgid "unable to resolve HEAD after creating commit"

5914 msgstr "创建提交后，不能解析 HEAD"

5915

5238 -#: sequencer.c:1267

5916 +#: sequencer.c:1325

5917 msgid "detached HEAD"

5918 msgstr "分离头指针"

5919

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

5243 -#: sequencer.c:1271

5921 +#: sequencer.c:1329

5922 msgid " (root-commit)"

5923 msgstr "（根提交）"

5924

5247 -#: sequencer.c:1292

5925 +#: sequencer.c:1350

5926 msgid "could not parse HEAD"

5927 msgstr "不能解析 HEAD"

5928

5251 -#: sequencer.c:1294

5929 +#: sequencer.c:1352

5930 #, c-format

5931 msgid "HEAD %s is not a commit!"

5932 msgstr "HEAD %s 不是一个提交！"

5933

5256 -#: sequencer.c:1298 builtin/commit.c:1546

5934 +#: sequencer.c:1356 builtin/commit.c:1551

5935 msgid "could not parse HEAD commit"

5936 msgstr "不能解析 HEAD 提交"

5937

5260 -#: sequencer.c:1350 sequencer.c:1964

5938 +#: sequencer.c:1408 sequencer.c:2001

5939 msgid "unable to parse commit author"

5940 msgstr "不能解析提交作者"

5941

5264 -#: sequencer.c:1360 builtin/am.c:1570 builtin/merge.c:678

5942 +#: sequencer.c:1418 builtin/am.c:1572 builtin/merge.c:688

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

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

5945

5268 -#: sequencer.c:1377 sequencer.c:1433

5946 +#: sequencer.c:1435 sequencer.c:1496

5947 #, c-format

5948 msgid "unable to read commit message from '%s'"

5949 msgstr "不能从 '%s' 读取提交说明"

5950

5273 -#: sequencer.c:1399 builtin/am.c:1591 builtin/commit.c:1649 builtin/merge.c:859

5274 -#: builtin/merge.c:884

5951 +#: sequencer.c:1462 builtin/am.c:1594 builtin/commit.c:1650 builtin/merge.c:882

5952 +#: builtin/merge.c:906

5953 msgid "failed to write commit object"

5954 msgstr "写提交对象失败"

5955

5278 -#: sequencer.c:1460

5956 +#: sequencer.c:1523

5957 #, c-format

5958 msgid "could not parse commit %s"

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

5960

5283 -#: sequencer.c:1465

5961 +#: sequencer.c:1528

5962 #, c-format

5963 msgid "could not parse parent commit %s"

5964 msgstr "不能解析父提交 %s"

5965

5288 -#: sequencer.c:1565 sequencer.c:1675

5966 +#: sequencer.c:1602 sequencer.c:1712

5967 #, c-format

5968 msgid "unknown command: %d"

5969 msgstr "未知命令：%d"

5970

5293 -#: sequencer.c:1622 sequencer.c:1647

5971 +#: sequencer.c:1659 sequencer.c:1684

5972 #, c-format

5973 msgid "This is a combination of %d commits."

5974 msgstr "这是一个 %d 个提交的组合。"

5975

5298 -#: sequencer.c:1632 sequencer.c:4808

5976 +#: sequencer.c:1669

5977 msgid "need a HEAD to fixup"

5978 msgstr "需要一个 HEAD 来修复"

5979

5302 -#: sequencer.c:1634 sequencer.c:2958

5980 +#: sequencer.c:1671 sequencer.c:3111

5981 msgid "could not read HEAD"

5982 msgstr "不能读取 HEAD"

5983

5306 -#: sequencer.c:1636

5984 +#: sequencer.c:1673

5985 msgid "could not read HEAD's commit message"

5986 msgstr "不能读取 HEAD 的提交说明"

5987

5310 -#: sequencer.c:1642

5988 +#: sequencer.c:1679

5989 #, c-format

5990 msgid "cannot write '%s'"

5991 msgstr "不能写 '%s'"

5992

5315 -#: sequencer.c:1649 git-rebase--preserve-merges.sh:441

5993 +#: sequencer.c:1686 git-rebase--preserve-merges.sh:441

5994 msgid "This is the 1st commit message:"

5995 msgstr "这是第一个提交说明："

5996

5319 -#: sequencer.c:1657

5997 +#: sequencer.c:1694

5998 #, c-format

5999 msgid "could not read commit message of %s"

6000 msgstr "不能读取 %s 的提交说明"

6001

5324 -#: sequencer.c:1664

6002 +#: sequencer.c:1701

6003 #, c-format

6004 msgid "This is the commit message #%d:"

6005 msgstr "这是提交说明 #%d："

6006

5329 -#: sequencer.c:1670

6007 +#: sequencer.c:1707

6008 #, c-format

6009 msgid "The commit message #%d will be skipped:"

6010 msgstr "提交说明 #%d 将被跳过："

6011

5334 -#: sequencer.c:1758

6012 +#: sequencer.c:1795

6013 msgid "your index file is unmerged."

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

6015

5338 -#: sequencer.c:1765

6016 +#: sequencer.c:1802

6017 msgid "cannot fixup root commit"

6018 msgstr "不能修复根提交"

6019

5342 -#: sequencer.c:1784

6020 +#: sequencer.c:1821

6021 #, c-format

6022 msgid "commit %s is a merge but no -m option was given."

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

6024

5347 -#: sequencer.c:1792 sequencer.c:1800

6025 +#: sequencer.c:1829 sequencer.c:1837

6026 #, c-format

6027 msgid "commit %s does not have parent %d"

6028 msgstr "提交 %s 没有第 %d 个父提交"

6029

5352 -#: sequencer.c:1806

6030 +#: sequencer.c:1843

6031 #, c-format

6032 msgid "cannot get commit message for %s"

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

6034

6035 #. TRANSLATORS: The first %s will be a "todo" command like

6036 #. "revert" or "pick", the second %s a SHA1.

5359 -#: sequencer.c:1825

6037 +#: sequencer.c:1862

6038 #, c-format

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

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

6041

5364 -#: sequencer.c:1890

6042 +#: sequencer.c:1927

6043 #, c-format

6044 msgid "could not rename '%s' to '%s'"

6045 msgstr "不能将 '%s' 重命名为 '%s'"

6046

5369 -#: sequencer.c:1945

6047 +#: sequencer.c:1982

6048 #, c-format

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

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

6051

5374 -#: sequencer.c:1946

6052 +#: sequencer.c:1983

6053 #, c-format

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

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

6056

5379 -#: sequencer.c:2005

6057 +#: sequencer.c:2042

6058 #, c-format

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

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

6061

5384 -#: sequencer.c:2012

6062 +#: sequencer.c:2049

6063 #, c-format

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

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

6066

5389 -#: sequencer.c:2094

6067 +#: sequencer.c:2118

6068 #, c-format

6069 msgid "%s does not accept arguments: '%s'"

6070 msgstr "%s 不接受参数：'%s'"

6071

5394 -#: sequencer.c:2103

6072 +#: sequencer.c:2127

6073 #, c-format

6074 msgid "missing arguments for %s"

6075 msgstr "缺少 %s 的参数"

6076

5399 -#: sequencer.c:2163

6077 +#: sequencer.c:2164

6078 +#, c-format

6079 +msgid "could not parse '%.*s'"

6080 +msgstr "无法解析 '%.*s'"

6081 +

6082 +#: sequencer.c:2226

6083 #, c-format

6084 msgid "invalid line %d: %.*s"

6085 msgstr "无效行 %d：%.*s"

6086

5404 -#: sequencer.c:2171

6087 +#: sequencer.c:2237

6088 #, c-format

6089 msgid "cannot '%s' without a previous commit"

6090 msgstr "没有父提交的情况下不能 '%s'"

6091

5409 -#: sequencer.c:2243

6092 +#: sequencer.c:2285 builtin/rebase.c:153 builtin/rebase.c:178

6093 +#: builtin/rebase.c:204 builtin/rebase.c:229

6094 +#, c-format

6095 +msgid "could not read '%s'."

6096 +msgstr "不能读取 '%s'。"

6097 +

6098 +#: sequencer.c:2360

6099 msgid "please fix this using 'git rebase --edit-todo'."

6100 msgstr "请用 'git rebase --edit-todo' 来修改。"

6101

5413 -#: sequencer.c:2245

6102 +#: sequencer.c:2362

6103 #, c-format

6104 msgid "unusable instruction sheet: '%s'"

6105 msgstr "不可用的指令清单：'%s'"

6106

5418 -#: sequencer.c:2250

6107 +#: sequencer.c:2367

6108 msgid "no commits parsed."

6109 msgstr "没有解析提交。"

6110

5422 -#: sequencer.c:2261

6111 +#: sequencer.c:2378

6112 msgid "cannot cherry-pick during a revert."

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

6114

5426 -#: sequencer.c:2263

6115 +#: sequencer.c:2380

6116 msgid "cannot revert during a cherry-pick."

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

6118

5430 -#: sequencer.c:2333

6119 +#: sequencer.c:2462

6120 #, c-format

6121 msgid "invalid value for %s: %s"

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

6123

5435 -#: sequencer.c:2420

6124 +#: sequencer.c:2549

6125 msgid "unusable squash-onto"

6126 msgstr "不可用的 squash-onto"

6127

5439 -#: sequencer.c:2436

6128 +#: sequencer.c:2565

6129 #, c-format

6130 msgid "malformed options sheet: '%s'"

6131 msgstr "格式错误的选项清单：'%s'"

6132

5444 -#: sequencer.c:2518 sequencer.c:4067

6133 +#: sequencer.c:2648 sequencer.c:4227

6134 msgid "empty commit set passed"

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

6136

5448 -#: sequencer.c:2526

6137 +#: sequencer.c:2656

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

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

l10n: zh_CN: for git v2.22.0 l10n round 1~3