c1ac5258dc · matheusbsbs/matheus-bagliano

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

138 msgstr ""

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

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

141 -"POT-Creation-Date: 2018-06-16 22:06+0800\n"

142 -"PO-Revision-Date: 2018-07-02 10:22+0800\n"

141 +"POT-Creation-Date: 2018-09-04 08:50+0800\n"

142 +"PO-Revision-Date: 2018-09-09 21:07+0800\n"

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

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

145 "Language: zh_CN\n"

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

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

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

150

151 -#: advice.c:92

151 +#: advice.c:97

152 #, c-format

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

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

155

156 -#: advice.c:137

156 +#: advice.c:150

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

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

159

160 -#: advice.c:139

160 +#: advice.c:152

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

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

163

164 -#: advice.c:141

164 +#: advice.c:154

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

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

167

168 -#: advice.c:143

168 +#: advice.c:156

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

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

171

172 -#: advice.c:145

172 +#: advice.c:158

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

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

175

176 -#: advice.c:147

176 +#: advice.c:160

177 #, c-format

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

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

180

181 -#: advice.c:155

181 +#: advice.c:168

182 msgid ""

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

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

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

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

187 "解决方案并提交。"

188

189 -#: advice.c:163

189 +#: advice.c:176

190 msgid "Exiting because of an unresolved conflict."

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

192

193 -#: advice.c:168 builtin/merge.c:1250

193 +#: advice.c:181 builtin/merge.c:1286

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

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

196

197 -#: advice.c:170

197 +#: advice.c:183

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

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

200

201 -#: advice.c:171

201 +#: advice.c:184

202 msgid "Exiting because of unfinished merge."

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

204

205 -#: advice.c:177

205 +#: advice.c:190

206 #, c-format

207 msgid ""

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

@@ -229,92 +229,92 @@ msgstr ""

229 " git checkout -b <新分支名>\n"

230 "\n"

231

232 -#: apply.c:58

232 +#: apply.c:59

233 #, c-format

234 msgid "unrecognized whitespace option '%s'"

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

236

237 -#: apply.c:74

237 +#: apply.c:75

238 #, c-format

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

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

241

242 -#: apply.c:122

242 +#: apply.c:125

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

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

245

246 -#: apply.c:124

246 +#: apply.c:127

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

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

249

250 -#: apply.c:127

250 +#: apply.c:130

251 msgid "--3way outside a repository"

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

253

254 -#: apply.c:138

254 +#: apply.c:141

255 msgid "--index outside a repository"

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

257

258 -#: apply.c:141

258 +#: apply.c:144

259 msgid "--cached outside a repository"

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

261

262 -#: apply.c:821

262 +#: apply.c:826

263 #, c-format

264 msgid "Cannot prepare timestamp regexp %s"

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

266

267 -#: apply.c:830

267 +#: apply.c:835

268 #, c-format

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

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

271

272 -#: apply.c:904

272 +#: apply.c:909

273 #, c-format

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

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

276

277 -#: apply.c:942

277 +#: apply.c:947

278 #, c-format

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

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

281

282 -#: apply.c:948

282 +#: apply.c:953

283 #, c-format

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

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

286

287 -#: apply.c:949

287 +#: apply.c:954

288 #, c-format

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

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

291

292 -#: apply.c:954

292 +#: apply.c:959

293 #, c-format

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

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

296

297 -#: apply.c:983

297 +#: apply.c:988

298 #, c-format

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

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

301

302 -#: apply.c:1301

302 +#: apply.c:1306

303 #, c-format

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

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

306

307 -#: apply.c:1473

307 +#: apply.c:1478

308 #, c-format

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

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

311

312 -#: apply.c:1542

312 +#: apply.c:1547

313 #, c-format

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

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

316

317 -#: apply.c:1562

317 +#: apply.c:1567

318 #, c-format

319 msgid ""

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

@@ -325,82 +325,82 @@ msgid_plural ""

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

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

327

328 -#: apply.c:1575

328 +#: apply.c:1580

329 #, c-format

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

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

332

333 -#: apply.c:1763

333 +#: apply.c:1768

334 msgid "new file depends on old contents"

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

336

337 -#: apply.c:1765

337 +#: apply.c:1770

338 msgid "deleted file still has contents"

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

340

341 -#: apply.c:1799

341 +#: apply.c:1804

342 #, c-format

343 msgid "corrupt patch at line %d"

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

345

346 -#: apply.c:1836

346 +#: apply.c:1841

347 #, c-format

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

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

350

351 -#: apply.c:1838

351 +#: apply.c:1843

352 #, c-format

353 msgid "deleted file %s still has contents"

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

355

356 -#: apply.c:1841

356 +#: apply.c:1846

357 #, c-format

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

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

360

361 -#: apply.c:1988

361 +#: apply.c:1993

362 #, c-format

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

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

365

366 -#: apply.c:2025

366 +#: apply.c:2030

367 #, c-format

368 msgid "unrecognized binary patch at line %d"

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

370

371 -#: apply.c:2185

371 +#: apply.c:2190

372 #, c-format

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

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

375

376 -#: apply.c:2271

376 +#: apply.c:2276

377 #, c-format

378 msgid "unable to read symlink %s"

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

380

381 -#: apply.c:2275

381 +#: apply.c:2280

382 #, c-format

383 msgid "unable to open or read %s"

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

385

386 -#: apply.c:2934

386 +#: apply.c:2939

387 #, c-format

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

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

390

391 -#: apply.c:3055

391 +#: apply.c:3060

392 #, c-format

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

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

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

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

397

398 -#: apply.c:3067

398 +#: apply.c:3072

399 #, c-format

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

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

402

403 -#: apply.c:3073

403 +#: apply.c:3078

404 #, c-format

405 msgid ""

406 "while searching for:\n"

@@ -409,557 +409,611 @@ msgstr ""

409 "当查询：\n"

410 "%.*s"

411

412 -#: apply.c:3095

412 +#: apply.c:3100

413 #, c-format

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

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

416

417 -#: apply.c:3103

417 +#: apply.c:3108

418 #, c-format

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

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

421

422 -#: apply.c:3149

422 +#: apply.c:3154

423 #, c-format

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

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

426

427 -#: apply.c:3159

427 +#: apply.c:3164

428 #, c-format

429 msgid ""

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

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

432

433 -#: apply.c:3167

433 +#: apply.c:3172

434 #, c-format

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

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

437

438 -#: apply.c:3185

438 +#: apply.c:3190

439 #, c-format

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

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

442

443 -#: apply.c:3198

443 +#: apply.c:3203

444 #, c-format

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

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

447

448 -#: apply.c:3204

448 +#: apply.c:3209

449 #, c-format

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

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

452

453 -#: apply.c:3225

453 +#: apply.c:3230

454 #, c-format

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

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

457

458 -#: apply.c:3347

458 +#: apply.c:3352

459 #, c-format

460 msgid "cannot checkout %s"

461 msgstr "不能检出 %s"

462

463 -#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:278

463 +#: apply.c:3404 apply.c:3415 apply.c:3461 setup.c:278

464 #, c-format

465 msgid "failed to read %s"

466 msgstr "无法读取 %s"

467

468 -#: apply.c:3404

468 +#: apply.c:3412

469 #, c-format

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

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

472

473 -#: apply.c:3433 apply.c:3673

473 +#: apply.c:3441 apply.c:3681

474 #, c-format

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

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

477

478 -#: apply.c:3516 apply.c:3687

478 +#: apply.c:3524 apply.c:3696

479 #, c-format

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

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

482

483 -#: apply.c:3525 apply.c:3695

483 +#: apply.c:3533 apply.c:3704

484 #, c-format

485 msgid "%s: does not match index"

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

487

488 -#: apply.c:3560

488 +#: apply.c:3568

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

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

491

492 -#: apply.c:3563

492 +#: apply.c:3571

493 #, c-format

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

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

496

497 -#: apply.c:3579 apply.c:3583

497 +#: apply.c:3587 apply.c:3591

498 #, c-format

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

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

501

502 -#: apply.c:3595

502 +#: apply.c:3603

503 #, c-format

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

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

506

507 -#: apply.c:3609

507 +#: apply.c:3617

508 #, c-format

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

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

511

512 -#: apply.c:3614

512 +#: apply.c:3622

513 #, c-format

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

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

516

517 -#: apply.c:3640

517 +#: apply.c:3648

518 msgid "removal patch leaves file contents"

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

520

521 -#: apply.c:3712

521 +#: apply.c:3721

522 #, c-format

523 msgid "%s: wrong type"

524 msgstr "%s：错误类型"

525

526 -#: apply.c:3714

526 +#: apply.c:3723

527 #, c-format

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

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

530

531 -#: apply.c:3864 apply.c:3866

531 +#: apply.c:3874 apply.c:3876

532 #, c-format

533 msgid "invalid path '%s'"

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

535

536 -#: apply.c:3922

536 +#: apply.c:3932

537 #, c-format

538 msgid "%s: already exists in index"

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

540

541 -#: apply.c:3925

541 +#: apply.c:3935

542 #, c-format

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

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

545

546 -#: apply.c:3945

546 +#: apply.c:3955

547 #, c-format

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

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

550

551 -#: apply.c:3950

551 +#: apply.c:3960

552 #, c-format

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

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

555

556 -#: apply.c:3970

556 +#: apply.c:3980

557 #, c-format

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

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

560

561 -#: apply.c:3974

561 +#: apply.c:3984

562 #, c-format

563 msgid "%s: patch does not apply"

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

565

566 -#: apply.c:3989

566 +#: apply.c:3999

567 #, c-format

568 msgid "Checking patch %s..."

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

570

571 -#: apply.c:4080

571 +#: apply.c:4091

572 #, c-format

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

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

575

576 -#: apply.c:4087

576 +#: apply.c:4098

577 #, c-format

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

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

580

581 -#: apply.c:4090

581 +#: apply.c:4101

582 #, c-format

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

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

585

586 -#: apply.c:4095 builtin/checkout.c:235 builtin/reset.c:140

586 +#: apply.c:4106 builtin/checkout.c:237 builtin/reset.c:140

587 #, c-format

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

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

590

591 -#: apply.c:4099

591 +#: apply.c:4110

592 #, c-format

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

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

595

596 -#: apply.c:4109

596 +#: apply.c:4120

597 #, c-format

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

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

600

601 -#: apply.c:4247

601 +#: apply.c:4258

602 #, c-format

603 msgid "unable to remove %s from index"

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

605

606 -#: apply.c:4282

606 +#: apply.c:4292

607 #, c-format

608 msgid "corrupt patch for submodule %s"

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

610

611 -#: apply.c:4288

611 +#: apply.c:4298

612 #, c-format

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

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

615

616 -#: apply.c:4296

616 +#: apply.c:4306

617 #, c-format

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

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

620

621 -#: apply.c:4302 apply.c:4446

621 +#: apply.c:4312 apply.c:4457

622 #, c-format

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

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

625

626 -#: apply.c:4343

626 +#: apply.c:4355

627 #, c-format

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

629 -msgstr "无法写入 '%s'"

629 +msgstr "写入 '%s' 失败"

630

631 -#: apply.c:4347

631 +#: apply.c:4359

632 #, c-format

633 msgid "closing file '%s'"

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

635

636 -#: apply.c:4417

636 +#: apply.c:4429

637 #, c-format

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

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

640

641 -#: apply.c:4515

641 +#: apply.c:4527

642 #, c-format

643 msgid "Applied patch %s cleanly."

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

645

646 -#: apply.c:4523

646 +#: apply.c:4535

647 msgid "internal error"

648 msgstr "内部错误"

649

650 -#: apply.c:4526

650 +#: apply.c:4538

651 #, c-format

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

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

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

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

656

657 -#: apply.c:4537

657 +#: apply.c:4549

658 #, c-format

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

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

661

662 -#: apply.c:4545 builtin/fetch.c:786 builtin/fetch.c:1036

662 +#: apply.c:4557 builtin/fetch.c:780 builtin/fetch.c:1048

663 #, c-format

664 msgid "cannot open %s"

665 msgstr "不能打开 %s"

666

667 -#: apply.c:4559

667 +#: apply.c:4571

668 #, c-format

669 msgid "Hunk #%d applied cleanly."

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

671

672 -#: apply.c:4563

672 +#: apply.c:4575

673 #, c-format

674 msgid "Rejected hunk #%d."

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

676

677 -#: apply.c:4673

677 +#: apply.c:4685

678 #, c-format

679 msgid "Skipped patch '%s'."

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

681

682 -#: apply.c:4681

682 +#: apply.c:4693

683 msgid "unrecognized input"

684 msgstr "未能识别的输入"

685

686 -#: apply.c:4700

686 +#: apply.c:4712

687 msgid "unable to read index file"

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

689

690 -#: apply.c:4837

690 +#: apply.c:4849

691 #, c-format

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

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

694

695 -#: apply.c:4864

695 +#: apply.c:4876

696 #, c-format

697 msgid "squelched %d whitespace error"

698 msgid_plural "squelched %d whitespace errors"

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

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

701

702 -#: apply.c:4870 apply.c:4885

702 +#: apply.c:4882 apply.c:4897

703 #, c-format

704 msgid "%d line adds whitespace errors."

705 msgid_plural "%d lines add whitespace errors."

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

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

708

709 -#: apply.c:4878

709 +#: apply.c:4890

710 #, c-format

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

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

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

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

715

716 -#: apply.c:4894 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389

716 +#: apply.c:4906 builtin/add.c:539 builtin/mv.c:300 builtin/rm.c:389

717 msgid "Unable to write new index file"

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

719

720 -#: apply.c:4921 apply.c:4924 builtin/am.c:2254 builtin/am.c:2257

721 -#: builtin/clone.c:120 builtin/fetch.c:126 builtin/pull.c:198

722 -#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1210

723 -#: builtin/submodule--helper.c:1213 builtin/submodule--helper.c:1584

724 -#: builtin/submodule--helper.c:1587 builtin/submodule--helper.c:1807

725 -#: git-add--interactive.perl:197

720 +#: apply.c:4933 apply.c:4936 builtin/am.c:2254 builtin/am.c:2257

721 +#: builtin/clone.c:121 builtin/fetch.c:115 builtin/merge.c:260

722 +#: builtin/pull.c:198 builtin/submodule--helper.c:406

723 +#: builtin/submodule--helper.c:1355 builtin/submodule--helper.c:1358

724 +#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732

725 +#: builtin/submodule--helper.c:1952 git-add--interactive.perl:197

726 msgid "path"

727 msgstr "路径"

728

729 -#: apply.c:4922

729 +#: apply.c:4934

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

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

732

733 -#: apply.c:4925

733 +#: apply.c:4937

734 msgid "apply changes matching the given path"

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

736

737 -#: apply.c:4927 builtin/am.c:2263

737 +#: apply.c:4939 builtin/am.c:2263

738 msgid "num"

739 msgstr "数字"

740

741 -#: apply.c:4928

741 +#: apply.c:4940

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

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

744

745 -#: apply.c:4931

745 +#: apply.c:4943

746 msgid "ignore additions made by the patch"

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

748

749 -#: apply.c:4933

749 +#: apply.c:4945

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

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

752

753 -#: apply.c:4937

753 +#: apply.c:4949

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

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

756

757 -#: apply.c:4939

757 +#: apply.c:4951

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

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

760

761 -#: apply.c:4941

761 +#: apply.c:4953

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

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

764

765 -#: apply.c:4943

765 +#: apply.c:4955

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

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

768

769 -#: apply.c:4945

769 +#: apply.c:4957

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

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

772 +

773 +#: apply.c:4959

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

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

776

773 -#: apply.c:4947

777 +#: apply.c:4961

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

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

780

777 -#: apply.c:4950

781 +#: apply.c:4964

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

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

784

781 -#: apply.c:4952

785 +#: apply.c:4966

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

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

788

785 -#: apply.c:4954

789 +#: apply.c:4968

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

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

792

789 -#: apply.c:4957 builtin/checkout-index.c:168 builtin/ls-files.c:515

793 +#: apply.c:4971 builtin/checkout-index.c:168 builtin/ls-files.c:516

794 msgid "paths are separated with NUL character"

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

796

793 -#: apply.c:4959

797 +#: apply.c:4973

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

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

800

797 -#: apply.c:4960 builtin/am.c:2242 builtin/interpret-trailers.c:95

801 +#: apply.c:4974 builtin/am.c:2242 builtin/interpret-trailers.c:95

802 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99

799 -#: builtin/pack-objects.c:3177

803 +#: builtin/pack-objects.c:3202

804 msgid "action"

805 msgstr "动作"

806

803 -#: apply.c:4961

807 +#: apply.c:4975

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

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

810

807 -#: apply.c:4964 apply.c:4967

811 +#: apply.c:4978 apply.c:4981

812 msgid "ignore changes in whitespace when finding context"

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

814

811 -#: apply.c:4970

815 +#: apply.c:4984

816 msgid "apply the patch in reverse"

817 msgstr "反向应用补丁"

818

815 -#: apply.c:4972

819 +#: apply.c:4986

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

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

822

819 -#: apply.c:4974

823 +#: apply.c:4988

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

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

826

823 -#: apply.c:4976

827 +#: apply.c:4990

828 msgid "allow overlapping hunks"

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

830

827 -#: apply.c:4977 builtin/add.c:290 builtin/check-ignore.c:21

828 -#: builtin/commit.c:1301 builtin/count-objects.c:98 builtin/fsck.c:666

829 -#: builtin/log.c:1901 builtin/mv.c:122 builtin/read-tree.c:124

831 +#: apply.c:4991 builtin/add.c:290 builtin/check-ignore.c:21

832 +#: builtin/commit.c:1301 builtin/count-objects.c:98 builtin/fsck.c:671

833 +#: builtin/log.c:1914 builtin/mv.c:122 builtin/read-tree.c:124

834 msgid "be verbose"

835 msgstr "冗长输出"

836

833 -#: apply.c:4979

837 +#: apply.c:4993

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

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

840

837 -#: apply.c:4982

841 +#: apply.c:4996

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

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

844

841 -#: apply.c:4984 builtin/am.c:2251

845 +#: apply.c:4998 builtin/am.c:2251

846 msgid "root"

847 msgstr "根目录"

848

845 -#: apply.c:4985

849 +#: apply.c:4999

850 msgid "prepend <root> to all filenames"

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

852

849 -#: archive.c:13

853 +#: archive.c:14

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

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

856

853 -#: archive.c:14

857 +#: archive.c:15

858 msgid "git archive --list"

859 msgstr "git archive --list"

860

857 -#: archive.c:15

861 +#: archive.c:16

862 msgid ""

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

864 msgstr ""

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

866

863 -#: archive.c:16

867 +#: archive.c:17

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

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

870

867 -#: archive.c:351 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298

871 +#: archive.c:363 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:298

872 #, c-format

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

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

875

872 -#: archive.c:434

876 +#: archive.c:446

877 msgid "fmt"

878 msgstr "格式"

879

876 -#: archive.c:434

880 +#: archive.c:446

881 msgid "archive format"

882 msgstr "归档格式"

883

880 -#: archive.c:435 builtin/log.c:1462

884 +#: archive.c:447 builtin/log.c:1473

885 msgid "prefix"

886 msgstr "前缀"

887

884 -#: archive.c:436

888 +#: archive.c:448

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

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

891

888 -#: archive.c:437 builtin/blame.c:813 builtin/blame.c:814 builtin/config.c:127

889 -#: builtin/fast-export.c:1007 builtin/fast-export.c:1009 builtin/grep.c:869

890 -#: builtin/hash-object.c:103 builtin/ls-files.c:551 builtin/ls-files.c:554

891 -#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:119

892 +#: archive.c:449 builtin/blame.c:816 builtin/blame.c:817 builtin/config.c:126

893 +#: builtin/fast-export.c:1013 builtin/fast-export.c:1015 builtin/grep.c:873

894 +#: builtin/hash-object.c:104 builtin/ls-files.c:552 builtin/ls-files.c:555

895 +#: builtin/notes.c:407 builtin/notes.c:570 builtin/read-tree.c:119

896 #: parse-options.h:165

897 msgid "file"

898 msgstr "文件"

899

896 -#: archive.c:438 builtin/archive.c:89

900 +#: archive.c:450 builtin/archive.c:89

901 msgid "write the archive to this file"

902 msgstr "归档写入此文件"

903

900 -#: archive.c:440

904 +#: archive.c:452

905 msgid "read .gitattributes in working directory"

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

907

904 -#: archive.c:441

908 +#: archive.c:453

909 msgid "report archived files on stderr"

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

911

908 -#: archive.c:442

912 +#: archive.c:454

913 msgid "store only"

914 msgstr "只存储"

915

912 -#: archive.c:443

916 +#: archive.c:455

917 msgid "compress faster"

918 msgstr "压缩速度更快"

919

916 -#: archive.c:451

920 +#: archive.c:463

921 msgid "compress better"

922 msgstr "压缩效果更好"

923

920 -#: archive.c:454

924 +#: archive.c:466

925 msgid "list supported archive formats"

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

927

924 -#: archive.c:456 builtin/archive.c:90 builtin/clone.c:110 builtin/clone.c:113

925 -#: builtin/submodule--helper.c:1222 builtin/submodule--helper.c:1593

928 +#: archive.c:468 builtin/archive.c:90 builtin/clone.c:111 builtin/clone.c:114

929 +#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1738

930 msgid "repo"

931 msgstr "仓库"

932

929 -#: archive.c:457 builtin/archive.c:91

933 +#: archive.c:469 builtin/archive.c:91

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

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

936

933 -#: archive.c:458 builtin/archive.c:92 builtin/notes.c:489

937 +#: archive.c:470 builtin/archive.c:92 builtin/difftool.c:714

938 +#: builtin/notes.c:491

939 msgid "command"

940 msgstr "命令"

941

937 -#: archive.c:459 builtin/archive.c:93

942 +#: archive.c:471 builtin/archive.c:93

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

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

945

941 -#: archive.c:466

946 +#: archive.c:478

947 msgid "Unexpected option --remote"

948 msgstr "未知参数 --remote"

949

945 -#: archive.c:468

950 +#: archive.c:480

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

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

953

949 -#: archive.c:470

954 +#: archive.c:482

955 msgid "Unexpected option --output"

956 msgstr "未知参数 --output"

957

953 -#: archive.c:492

958 +#: archive.c:504

959 #, c-format

960 msgid "Unknown archive format '%s'"

961 msgstr "未知归档格式 '%s'"

962

958 -#: archive.c:499

963 +#: archive.c:511

964 #, c-format

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

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

967

968 +#: archive-tar.c:125 archive-zip.c:344

969 +#, c-format

970 +msgid "cannot stream blob %s"

971 +msgstr "不能为数据对象 %s 打开流"

972 +

973 +#: archive-tar.c:260 archive-zip.c:361

974 +#, c-format

975 +msgid "unsupported file mode: 0%o (SHA1: %s)"

976 +msgstr "不支持的文件属性：0%o (SHA1: %s)"

977 +

978 +#: archive-tar.c:287 archive-zip.c:352

979 +#, c-format

980 +msgid "cannot read %s"

981 +msgstr "不能读取 %s"

982 +

983 +#: archive-tar.c:458

984 +#, c-format

985 +msgid "unable to start '%s' filter"

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

987 +

988 +#: archive-tar.c:461

989 +msgid "unable to redirect descriptor"

990 +msgstr "无法重定向描述符"

991 +

992 +#: archive-tar.c:468

993 +#, c-format

994 +msgid "'%s' filter reported error"

995 +msgstr "'%s' 过滤器报告错误"

996 +

997 +#: archive-zip.c:313

998 +#, c-format

999 +msgid "path is not valid UTF-8: %s"

1000 +msgstr "路径不是有效的 UTF-8：%s"

1001 +

1002 +#: archive-zip.c:317

1003 +#, c-format

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

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

1006 +

1007 +#: archive-zip.c:470 builtin/pack-objects.c:216 builtin/pack-objects.c:219

1008 +#, c-format

1009 +msgid "deflate error (%d)"

1010 +msgstr "压缩错误 (%d)"

1011 +

1012 +#: archive-zip.c:605

1013 +#, c-format

1014 +msgid "timestamp too large for this system: %<PRIuMAX>"

1015 +msgstr "对于本系统时间戳太长：%<PRIuMAX>"

1016 +

1017 #: attr.c:218

1018 #, c-format

1019 msgid "%.*s is not a valid attribute name"

@@ -973,22 +1027,22 @@ msgstr ""

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

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

1029

976 -#: bisect.c:461

1030 +#: bisect.c:467

1031 #, c-format

1032 msgid "Badly quoted content in file '%s': %s"

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

1034

981 -#: bisect.c:669

1035 +#: bisect.c:675

1036 #, c-format

1037 msgid "We cannot bisect more!\n"

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

1039

986 -#: bisect.c:723

1040 +#: bisect.c:729

1041 #, c-format

1042 msgid "Not a valid commit name %s"

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

1044

991 -#: bisect.c:747

1045 +#: bisect.c:753

1046 #, c-format

1047 msgid ""

1048 "The merge base %s is bad.\n"

@@ -997,7 +1051,7 @@ msgstr ""

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

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

1053

1000 -#: bisect.c:752

1054 +#: bisect.c:758

1055 #, c-format

1056 msgid ""

1057 "The merge base %s is new.\n"

@@ -1006,7 +1060,7 @@ msgstr ""

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

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

1062

1009 -#: bisect.c:757

1063 +#: bisect.c:763

1064 #, c-format

1065 msgid ""

1066 "The merge base %s is %s.\n"

@@ -1015,7 +1069,7 @@ msgstr ""

1069 "合并基线 %s 是 %s。\n"

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

1071

1018 -#: bisect.c:765

1072 +#: bisect.c:771

1073 #, c-format

1074 msgid ""

1075 "Some %s revs are not ancestors of the %s rev.\n"

@@ -1026,7 +1080,7 @@ msgstr ""

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

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

1082

1029 -#: bisect.c:778

1083 +#: bisect.c:784

1084 #, c-format

1085 msgid ""

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

@@ -1037,36 +1091,36 @@ msgstr ""

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

1092 "我们仍旧继续。"

1093

1040 -#: bisect.c:811

1094 +#: bisect.c:817

1095 #, c-format

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

1097 msgstr "二分查找中：合并基线必须是经过测试的\n"

1098

1045 -#: bisect.c:851

1099 +#: bisect.c:857

1100 #, c-format

1101 msgid "a %s revision is needed"

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

1103

1050 -#: bisect.c:870 builtin/notes.c:175 builtin/tag.c:236

1104 +#: bisect.c:876 builtin/notes.c:177 builtin/tag.c:237

1105 #, c-format

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

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

1108

1055 -#: bisect.c:921

1109 +#: bisect.c:927 builtin/merge.c:137

1110 #, c-format

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

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

1113

1060 -#: bisect.c:951

1114 +#: bisect.c:957

1115 msgid "reading bisect refs failed"

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

1117

1064 -#: bisect.c:970

1118 +#: bisect.c:976

1119 #, c-format

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

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

1122

1069 -#: bisect.c:978

1123 +#: bisect.c:984

1124 #, c-format

1125 msgid ""

1126 "No testable commit found.\n"

@@ -1075,7 +1129,7 @@ msgstr ""

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

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

1131

1078 -#: bisect.c:997

1132 +#: bisect.c:1003

1133 #, c-format

1134 msgid "(roughly %d step)"

1135 msgid_plural "(roughly %d steps)"

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

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

1140 #. steps)" translation.

1141 #.

1088 -#: bisect.c:1003

1142 +#: bisect.c:1009

1143 #, c-format

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

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

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

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

1148

1095 -#: blame.c:1756

1149 +#: blame.c:1784

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

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

1152

1099 -#: blame.c:1767

1153 +#: blame.c:1798

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

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

1156

1103 -#: blame.c:1787

1157 +#: blame.c:1819

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

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

1160

1107 -#: blame.c:1796 bundle.c:160 ref-filter.c:2075 sequencer.c:1861

1108 -#: sequencer.c:3632 builtin/commit.c:981 builtin/log.c:366 builtin/log.c:920

1109 -#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:372

1161 +#: blame.c:1828 bundle.c:162 ref-filter.c:2154 sequencer.c:1874

1162 +#: sequencer.c:3772 builtin/commit.c:994 builtin/log.c:372 builtin/log.c:926

1163 +#: builtin/log.c:1381 builtin/log.c:1713 builtin/log.c:1963 builtin/merge.c:404

1164 +#: builtin/pack-objects.c:3029 builtin/pack-objects.c:3044

1165 #: builtin/shortlog.c:192

1166 msgid "revision walk setup failed"

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

1168

1114 -#: blame.c:1814

1169 +#: blame.c:1846

1170 msgid ""

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

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

1173

1119 -#: blame.c:1825

1174 +#: blame.c:1857

1175 #, c-format

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

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

1178

1124 -#: blame.c:1836

1179 +#: blame.c:1868

1180 #, c-format

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

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

1183

1129 -#: branch.c:54

1184 +#: branch.c:52

1185 #, c-format

1186 msgid ""

1187 "\n"

@@ -1138,85 +1193,85 @@ msgstr ""

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

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

1195

1141 -#: branch.c:68

1196 +#: branch.c:66

1197 #, c-format

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

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

1200

1146 -#: branch.c:94

1201 +#: branch.c:92

1202 #, c-format

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

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

1205

1151 -#: branch.c:95

1206 +#: branch.c:93

1207 #, c-format

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

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

1210

1156 -#: branch.c:99

1211 +#: branch.c:97

1212 #, c-format

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

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

1215

1161 -#: branch.c:100

1216 +#: branch.c:98

1217 #, c-format

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

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

1220

1166 -#: branch.c:105

1221 +#: branch.c:103

1222 #, c-format

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

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

1225

1171 -#: branch.c:106

1226 +#: branch.c:104

1227 #, c-format

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

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

1230

1176 -#: branch.c:110

1231 +#: branch.c:108

1232 #, c-format

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

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

1235

1181 -#: branch.c:111

1236 +#: branch.c:109

1237 #, c-format

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

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

1240

1186 -#: branch.c:120

1241 +#: branch.c:118

1242 msgid "Unable to write upstream branch configuration"

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

1244

1190 -#: branch.c:157

1245 +#: branch.c:155

1246 #, c-format

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

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

1249

1195 -#: branch.c:190

1250 +#: branch.c:188

1251 #, c-format

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

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

1254

1200 -#: branch.c:209

1255 +#: branch.c:207

1256 #, c-format

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

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

1259

1205 -#: branch.c:214

1260 +#: branch.c:212

1261 msgid "Cannot force update the current branch."

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

1263

1209 -#: branch.c:234

1264 +#: branch.c:232

1265 #, c-format

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

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

1268

1214 -#: branch.c:236

1269 +#: branch.c:234

1270 #, c-format

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

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

1273

1219 -#: branch.c:238

1274 +#: branch.c:236

1275 msgid ""

1276 "\n"

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

@@ -1234,100 +1289,100 @@ msgstr ""

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

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

1291

1237 -#: branch.c:281

1292 +#: branch.c:279

1293 #, c-format

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

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

1296

1242 -#: branch.c:301

1297 +#: branch.c:299

1298 #, c-format

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

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

1301

1247 -#: branch.c:306

1302 +#: branch.c:304

1303 #, c-format

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

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

1306

1252 -#: branch.c:360

1307 +#: branch.c:358

1308 #, c-format

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

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

1311

1257 -#: branch.c:383

1312 +#: branch.c:381

1313 #, c-format

1314 msgid "HEAD of working tree %s is not updated"

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

1316

1262 -#: bundle.c:34

1317 +#: bundle.c:36

1318 #, c-format

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

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

1321

1267 -#: bundle.c:62

1322 +#: bundle.c:64

1323 #, c-format

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

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

1326

1272 -#: bundle.c:88 sequencer.c:2081 sequencer.c:2558 builtin/commit.c:755

1327 +#: bundle.c:90 sequencer.c:2092 sequencer.c:2578 builtin/commit.c:768

1328 #, c-format

1329 msgid "could not open '%s'"

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

1331

1277 -#: bundle.c:139

1332 +#: bundle.c:141

1333 msgid "Repository lacks these prerequisite commits:"

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

1335

1281 -#: bundle.c:190

1336 +#: bundle.c:192

1337 #, c-format

1338 msgid "The bundle contains this ref:"

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

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

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

1342

1288 -#: bundle.c:197

1343 +#: bundle.c:199

1344 msgid "The bundle records a complete history."

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

1346

1292 -#: bundle.c:199

1347 +#: bundle.c:201

1348 #, c-format

1349 msgid "The bundle requires this ref:"

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

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

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

1353

1299 -#: bundle.c:258

1354 +#: bundle.c:260

1355 msgid "Could not spawn pack-objects"

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

1357

1303 -#: bundle.c:269

1358 +#: bundle.c:271

1359 msgid "pack-objects died"

1360 msgstr "pack-objects 终止"

1361

1307 -#: bundle.c:311

1362 +#: bundle.c:313

1363 msgid "rev-list died"

1364 msgstr "rev-list 终止"

1365

1311 -#: bundle.c:360

1366 +#: bundle.c:362

1367 #, c-format

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

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

1370

1316 -#: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:303

1371 +#: bundle.c:453 builtin/log.c:187 builtin/log.c:1618 builtin/shortlog.c:304

1372 #, c-format

1373 msgid "unrecognized argument: %s"

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

1375

1321 -#: bundle.c:458

1376 +#: bundle.c:461

1377 msgid "Refusing to create empty bundle."

1378 msgstr "不能创建空包。"

1379

1325 -#: bundle.c:470

1380 +#: bundle.c:473

1381 #, c-format

1382 msgid "cannot create '%s'"

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

1384

1330 -#: bundle.c:498

1385 +#: bundle.c:501

1386 msgid "index-pack died"

1387 msgstr "index-pack 终止"

1388

@@ -1336,19 +1391,19 @@ msgstr "index-pack 终止"

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

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

1393

1339 -#: commit.c:43 sequencer.c:2364 builtin/am.c:421 builtin/am.c:465

1340 -#: builtin/am.c:1436 builtin/am.c:2072 builtin/replace.c:376

1394 +#: commit.c:48 sequencer.c:2384 builtin/am.c:422 builtin/am.c:466

1395 +#: builtin/am.c:1438 builtin/am.c:2072 builtin/replace.c:376

1396 #: builtin/replace.c:448

1397 #, c-format

1398 msgid "could not parse %s"

1399 msgstr "不能解析 %s"

1400

1346 -#: commit.c:45

1401 +#: commit.c:50

1402 #, c-format

1403 msgid "%s %s is not a commit!"

1404 msgstr "%s %s 不是一个提交！"

1405

1351 -#: commit.c:182

1406 +#: commit.c:191

1407 msgid ""

1408 "Support for <GIT_DIR>/info/grafts is deprecated\n"

1409 "and will be removed in a future Git version.\n"

@@ -1368,7 +1423,7 @@ msgstr ""

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

1424 "可关闭本消息"

1425

1371 -#: commit.c:1540

1426 +#: commit.c:1629

1427 msgid ""

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

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

@@ -1378,182 +1433,388 @@ msgstr ""

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

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

1435

1381 -#: commit-graph.c:669

1436 +#: commit-graph.c:83

1437 +#, c-format

1438 +msgid "graph file %s is too small"

1439 +msgstr "图形文件 %s 太小"

1440 +

1441 +#: commit-graph.c:90

1442 +#, c-format

1443 +msgid "graph signature %X does not match signature %X"

1444 +msgstr "图形签名 %X 和签名 %X 不匹配"

1445 +

1446 +#: commit-graph.c:97

1447 +#, c-format

1448 +msgid "graph version %X does not match version %X"

1449 +msgstr "图形版本 %X 和版本 %X 不匹配"

1450 +

1451 +#: commit-graph.c:104

1452 +#, c-format

1453 +msgid "hash version %X does not match version %X"

1454 +msgstr "散列版本 %X 和版本 %X 不匹配"

1455 +

1456 +#: commit-graph.c:128

1457 +#, c-format

1458 +msgid "improper chunk offset %08x%08x"

1459 +msgstr "不正确的块偏移 %08x%08x"

1460 +

1461 +#: commit-graph.c:164

1462 +#, c-format

1463 +msgid "chunk id %08x appears multiple times"

1464 +msgstr "块 id %08x 出现了多次"

1465 +

1466 +#: commit-graph.c:261

1467 +#, c-format

1468 +msgid "could not find commit %s"

1469 +msgstr "无法找到提交 %s"

1470 +

1471 +#: commit-graph.c:565 builtin/pack-objects.c:2568

1472 +#, c-format

1473 +msgid "unable to get type of object %s"

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

1475 +

1476 +#: commit-graph.c:730

1477 +#, c-format

1478 +msgid "error adding pack %s"

1479 +msgstr "添加包 %s 出错"

1480 +

1481 +#: commit-graph.c:732

1482 +#, c-format

1483 +msgid "error opening index for %s"

1484 +msgstr "为 %s 打开索引出错"

1485 +

1486 +#: commit-graph.c:773

1487 #, c-format

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

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

1490

1386 -#: commit-graph.c:696

1491 +#: commit-graph.c:800

1492 msgid "too many commits to write graph"

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

1494

1390 -#: commit-graph.c:707 builtin/init-db.c:516 builtin/init-db.c:521

1495 +#: commit-graph.c:806

1496 #, c-format

1392 -msgid "cannot mkdir %s"

1393 -msgstr "不能创建目录 %s"

1497 +msgid "unable to create leading directories of %s"

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

1499 +

1500 +#: commit-graph.c:904

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

1502 +msgstr "提交图形文件的校验码错误，好像已经损坏"

1503

1504 #: compat/obstack.c:405 compat/obstack.c:407

1505 msgid "memory exhausted"

1506 msgstr "内存耗尽"

1507

1399 -#: config.c:187

1508 +#: config.c:123

1509 +#, c-format

1510 +msgid ""

1511 +"exceeded maximum include depth (%d) while including\n"

1512 +"\t%s\n"

1513 +"from\n"

1514 +"\t%s\n"

1515 +"This might be due to circular includes."

1516 +msgstr ""

1517 +"超过了最大引用深度（%1$d），当从\n"

1518 +"\t%3$s\n"

1519 +"包含\n"

1520 +"\t%2$s\n"

1521 +"这可能是因为循环引用。"

1522 +

1523 +#: config.c:139

1524 +#, c-format

1525 +msgid "could not expand include path '%s'"

1526 +msgstr "无法扩展包含路径 '%s'"

1527 +

1528 +#: config.c:150

1529 +msgid "relative config includes must come from files"

1530 +msgstr "相对路径的配置文件引用必须来自于文件"

1531 +

1532 +#: config.c:190

1533 msgid "relative config include conditionals must come from files"

1401 -msgstr "包含相对路径的条件引用必须来自于文件"

1534 +msgstr "相对路径的配置文件条件引用必须来自于文件"

1535 +

1536 +#: config.c:348

1537 +#, c-format

1538 +msgid "key does not contain a section: %s"

1539 +msgstr "键名没有包含一个小节名称：%s"

1540

1403 -#: config.c:788

1541 +#: config.c:354

1542 +#, c-format

1543 +msgid "key does not contain variable name: %s"

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

1545 +

1546 +#: config.c:378 sequencer.c:2206

1547 +#, c-format

1548 +msgid "invalid key: %s"

1549 +msgstr "无效键名：%s"

1550 +

1551 +#: config.c:384

1552 +#, c-format

1553 +msgid "invalid key (newline): %s"

1554 +msgstr "无效键名（有换行符）：%s"

1555 +

1556 +#: config.c:420 config.c:432

1557 +#, c-format

1558 +msgid "bogus config parameter: %s"

1559 +msgstr "伪配置参数：%s"

1560 +

1561 +#: config.c:467

1562 +#, c-format

1563 +msgid "bogus format in %s"

1564 +msgstr "%s 中格式错误"

1565 +

1566 +#: config.c:793

1567 #, c-format

1568 msgid "bad config line %d in blob %s"

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

1570

1408 -#: config.c:792

1571 +#: config.c:797

1572 #, c-format

1573 msgid "bad config line %d in file %s"

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

1575

1413 -#: config.c:796

1576 +#: config.c:801

1577 #, c-format

1578 msgid "bad config line %d in standard input"

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

1580

1418 -#: config.c:800

1581 +#: config.c:805

1582 #, c-format

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

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

1585

1423 -#: config.c:804

1586 +#: config.c:809

1587 #, c-format

1588 msgid "bad config line %d in command line %s"

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

1590

1428 -#: config.c:808

1591 +#: config.c:813

1592 #, c-format

1593 msgid "bad config line %d in %s"

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

1595

1433 -#: config.c:936

1596 +#: config.c:952

1597 msgid "out of range"

1598 msgstr "超出范围"

1599

1437 -#: config.c:936

1600 +#: config.c:952

1601 msgid "invalid unit"

1602 msgstr "无效的单位"

1603

1441 -#: config.c:942

1604 +#: config.c:958

1605 #, c-format

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

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

1608

1446 -#: config.c:947

1609 +#: config.c:963

1610 #, c-format

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

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

1613

1451 -#: config.c:950

1614 +#: config.c:966

1615 #, c-format

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

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

1618

1456 -#: config.c:953

1619 +#: config.c:969

1620 #, c-format

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

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

1623

1461 -#: config.c:956

1624 +#: config.c:972

1625 #, c-format

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

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

1628

1466 -#: config.c:959

1629 +#: config.c:975

1630 #, c-format

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

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

1633

1471 -#: config.c:962

1634 +#: config.c:978

1635 #, c-format

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

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

1638

1476 -#: config.c:1057

1639 +#: config.c:1073

1640 #, c-format

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

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

1642 +msgstr "无法扩展用户目录：'%s'"

1643

1481 -#: config.c:1066

1644 +#: config.c:1082

1645 #, c-format

1646 msgid "'%s' for '%s' is not a valid timestamp"

1647 msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"

1648

1486 -#: config.c:1171 config.c:1182

1649 +#: config.c:1173

1650 +#, c-format

1651 +msgid "abbrev length out of range: %d"

1652 +msgstr "缩写长度超出范围：%d"

1653 +

1654 +#: config.c:1187 config.c:1198

1655 #, c-format

1656 msgid "bad zlib compression level %d"

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

1658

1491 -#: config.c:1307

1659 +#: config.c:1290

1660 +msgid "core.commentChar should only be one character"

1661 +msgstr "core.commentChar 应该是一个字符"

1662 +

1663 +#: config.c:1323

1664 #, c-format

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

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

1667

1496 -#: config.c:1473

1668 +#: config.c:1403

1669 +#, c-format

1670 +msgid "malformed value for %s"

1671 +msgstr "%s 的取值格式错误"

1672 +

1673 +#: config.c:1429

1674 +#, c-format

1675 +msgid "malformed value for %s: %s"

1676 +msgstr "%s 的取值格式错误：%s"

1677 +

1678 +#: config.c:1430

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

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

1681 +

1682 +#: config.c:1489 builtin/pack-objects.c:3279

1683 #, c-format

1684 msgid "bad pack compression level %d"

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

1686

1501 -#: config.c:1681

1687 +#: config.c:1610

1688 +#, c-format

1689 +msgid "unable to load config blob object '%s'"

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

1691 +

1692 +#: config.c:1613

1693 +#, c-format

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

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

1696 +

1697 +#: config.c:1630

1698 +#, c-format

1699 +msgid "unable to resolve config blob '%s'"

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

1701 +

1702 +#: config.c:1660

1703 +#, c-format

1704 +msgid "failed to parse %s"

1705 +msgstr "解析 %s 失败"

1706 +

1707 +#: config.c:1700

1708 msgid "unable to parse command-line config"

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

1710

1505 -#: config.c:2013

1711 +#: config.c:2032

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

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

1714

1509 -#: config.c:2200

1715 +#: config.c:2202

1716 #, c-format

1717 msgid "Invalid %s: '%s'"

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

1719

1514 -#: config.c:2243

1720 +#: config.c:2245

1721 #, c-format

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

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

1724

1519 -#: config.c:2269

1725 +#: config.c:2271

1726 #, c-format

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

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

1729

1524 -#: config.c:2294

1730 +#: config.c:2296

1731 #, c-format

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

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

1734

1529 -#: config.c:2296

1735 +#: config.c:2298

1736 #, c-format

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

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

1739

1534 -#: config.c:2402

1740 +#: config.c:2379

1741 +#, c-format

1742 +msgid "invalid section name '%s'"

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

1744 +

1745 +#: config.c:2411

1746 #, c-format

1747 msgid "%s has multiple values"

1748 msgstr "%s 有多个取值"

1749

1539 -#: config.c:2766 config.c:3019

1750 +#: config.c:2440

1751 +#, c-format

1752 +msgid "failed to write new configuration file %s"

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

1754 +

1755 +#: config.c:2691 config.c:3015

1756 +#, c-format

1757 +msgid "could not lock config file %s"

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

1759 +

1760 +#: config.c:2702

1761 +#, c-format

1762 +msgid "opening %s"

1763 +msgstr "打开 %s"

1764 +

1765 +#: config.c:2737 builtin/config.c:324

1766 +#, c-format

1767 +msgid "invalid pattern: %s"

1768 +msgstr "无效模式：%s"

1769 +

1770 +#: config.c:2762

1771 +#, c-format

1772 +msgid "invalid config file %s"

1773 +msgstr "无效的配置文件 %s"

1774 +

1775 +#: config.c:2775 config.c:3028

1776 #, c-format

1777 msgid "fstat on %s failed"

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

1779

1544 -#: config.c:2905

1780 +#: config.c:2786

1781 +#, c-format

1782 +msgid "unable to mmap '%s'"

1783 +msgstr "不能 mmap '%s'"

1784 +

1785 +#: config.c:2795 config.c:3033

1786 +#, c-format

1787 +msgid "chmod on %s failed"

1788 +msgstr "对 %s 调用 chmod 失败"

1789 +

1790 +#: config.c:2880 config.c:3130

1791 +#, c-format

1792 +msgid "could not write config file %s"

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

1794 +

1795 +#: config.c:2914

1796 #, c-format

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

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

1799

1549 -#: config.c:2907 builtin/remote.c:779

1800 +#: config.c:2916 builtin/remote.c:781

1801 #, c-format

1802 msgid "could not unset '%s'"

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

1804

1805 +#: config.c:3006

1806 +#, c-format

1807 +msgid "invalid section name: %s"

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

1809 +

1810 +#: config.c:3173

1811 +#, c-format

1812 +msgid "missing value for '%s'"

1813 +msgstr "%s 的取值缺失"

1814 +

1815 #: connect.c:61

1555 -msgid "The remote end hung up upon initial contact"

1556 -msgstr "远端在连接发起时即挂断"

1816 +msgid "the remote end hung up upon initial contact"

1817 +msgstr "远端在初始连接时即挂断"

1818

1819 #: connect.c:63

1820 msgid ""

@@ -1566,68 +1827,221 @@ msgstr ""

1827 "\n"

1828 "请确认您有正确的访问权限并且仓库存在。"

1829

1569 -#: connected.c:66 builtin/fsck.c:201 builtin/prune.c:145

1830 +#: connect.c:81

1831 +#, c-format

1832 +msgid "server doesn't support '%s'"

1833 +msgstr "服务器不支持 '%s'"

1834 +

1835 +#: connect.c:103

1836 +#, c-format

1837 +msgid "server doesn't support feature '%s'"

1838 +msgstr "服务器不支持特性 '%s'"

1839 +

1840 +#: connect.c:114

1841 +msgid "expected flush after capabilities"

1842 +msgstr "在能力之后应为一个 flush 包"

1843 +

1844 +#: connect.c:233

1845 +#, c-format

1846 +msgid "ignoring capabilities after first line '%s'"

1847 +msgstr "忽略第一行 '%s' 之后的功能字段"

1848 +

1849 +#: connect.c:252

1850 +msgid "protocol error: unexpected capabilities^{}"

1851 +msgstr "协议错误：意外的 capabilities^{}"

1852 +

1853 +#: connect.c:273

1854 +#, c-format

1855 +msgid "protocol error: expected shallow sha-1, got '%s'"

1856 +msgstr "协议错误：预期浅克隆 sha-1，却得到 '%s'"

1857 +

1858 +#: connect.c:275

1859 +msgid "repository on the other end cannot be shallow"

1860 +msgstr "另一端的仓库不能是浅克隆仓库"

1861 +

1862 +#: connect.c:310 fetch-pack.c:183 builtin/archive.c:63

1863 +#, c-format

1864 +msgid "remote error: %s"

1865 +msgstr "远程错误：%s"

1866 +

1867 +#: connect.c:316

1868 +msgid "invalid packet"

1869 +msgstr "无效数据包"

1870 +

1871 +#: connect.c:336

1872 +#, c-format

1873 +msgid "protocol error: unexpected '%s'"

1874 +msgstr "协议错误：意外的 '%s'"

1875 +

1876 +#: connect.c:444

1877 +#, c-format

1878 +msgid "invalid ls-refs response: %s"

1879 +msgstr "无效的 ls-refs 响应：%s"

1880 +

1881 +#: connect.c:448

1882 +msgid "expected flush after ref listing"

1883 +msgstr "在引用列表之后应该有一个 flush 包"

1884 +

1885 +#: connect.c:547

1886 +#, c-format

1887 +msgid "protocol '%s' is not supported"

1888 +msgstr "不支持 '%s' 协议"

1889 +

1890 +#: connect.c:598

1891 +msgid "unable to set SO_KEEPALIVE on socket"

1892 +msgstr "无法为 socket 设置 SO_KEEPALIVE"

1893 +

1894 +#: connect.c:638 connect.c:701

1895 +#, c-format

1896 +msgid "Looking up %s ... "

1897 +msgstr "查找 %s ..."

1898 +

1899 +#: connect.c:642

1900 +#, c-format

1901 +msgid "unable to look up %s (port %s) (%s)"

1902 +msgstr "无法查找 %s（端口 %s）（%s）"

1903 +

1904 +#. TRANSLATORS: this is the end of "Looking up %s ... "

1905 +#: connect.c:646 connect.c:717

1906 +#, c-format

1907 +msgid ""

1908 +"done.\n"

1909 +"Connecting to %s (port %s) ... "

1910 +msgstr ""

1911 +"完成。\n"

1912 +"连接到 %s（端口 %s）... "

1913 +

1914 +#: connect.c:668 connect.c:745

1915 +#, c-format

1916 +msgid ""

1917 +"unable to connect to %s:\n"

1918 +"%s"

1919 +msgstr ""

1920 +"无法连接到 %s：\n"

1921 +"%s"

1922 +

1923 +#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "

1924 +#: connect.c:674 connect.c:751

1925 +msgid "done."

1926 +msgstr "完成。"

1927 +

1928 +#: connect.c:705

1929 +#, c-format

1930 +msgid "unable to look up %s (%s)"

1931 +msgstr "无法查找 %s（%s）"

1932 +

1933 +#: connect.c:711

1934 +#, c-format

1935 +msgid "unknown port %s"

1936 +msgstr "未知端口 %s"

1937 +

1938 +#: connect.c:848 connect.c:1174

1939 +#, c-format

1940 +msgid "strange hostname '%s' blocked"

1941 +msgstr "已阻止奇怪的主机名 '%s'"

1942 +

1943 +#: connect.c:850

1944 +#, c-format

1945 +msgid "strange port '%s' blocked"

1946 +msgstr "已阻止奇怪的端口号 '%s'"

1947 +

1948 +#: connect.c:860

1949 +#, c-format

1950 +msgid "cannot start proxy %s"

1951 +msgstr "不能启动代理 %s"

1952 +

1953 +#: connect.c:927

1954 +msgid "no path specified; see 'git help pull' for valid url syntax"

1955 +msgstr "未指定路径，执行 'git help pull' 查看有效的 url 语法"

1956 +

1957 +#: connect.c:1122

1958 +msgid "ssh variant 'simple' does not support -4"

1959 +msgstr "ssh 变体 'simple' 不支持 -4"

1960 +

1961 +#: connect.c:1134

1962 +msgid "ssh variant 'simple' does not support -6"

1963 +msgstr "ssh 变体 'simple' 不支持 -6"

1964 +

1965 +#: connect.c:1151

1966 +msgid "ssh variant 'simple' does not support setting port"

1967 +msgstr "'simple' 类型的 ssh 不支持设置端口"

1968 +

1969 +#: connect.c:1262

1970 +#, c-format

1971 +msgid "strange pathname '%s' blocked"

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

1973 +

1974 +#: connect.c:1307

1975 +msgid "unable to fork"

1976 +msgstr "无法 fork"

1977 +

1978 +#: connected.c:68 builtin/fsck.c:203 builtin/prune.c:146

1979 msgid "Checking connectivity"

1980 msgstr "检查连接中"

1981

1573 -#: connected.c:78

1982 +#: connected.c:80

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

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

1985

1577 -#: connected.c:98

1986 +#: connected.c:100

1987 msgid "failed write to rev-list"

1579 -msgstr "无法写入 rev-list"

1988 +msgstr "写入 rev-list 失败"

1989

1581 -#: connected.c:105

1990 +#: connected.c:107

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

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

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

1993 +

1994 +#: convert.c:194

1995 +#, c-format

1996 +msgid "illegal crlf_action %d"

1997 +msgstr "非法的 crlf 动作 %d"

1998

1585 -#: convert.c:206

1999 +#: convert.c:207

2000 #, c-format

1587 -msgid "CRLF would be replaced by LF in %s."

1588 -msgstr "文件 %s 中的 CRLF 将被 LF 替换。"

2001 +msgid "CRLF would be replaced by LF in %s"

2002 +msgstr "%s 中的 CRLF 将被 LF 替换"

2003

1590 -#: convert.c:208

2004 +#: convert.c:209

2005 #, c-format

2006 msgid ""

2007 "CRLF will be replaced by LF in %s.\n"

1594 -"The file will have its original line endings in your working directory."

2008 +"The file will have its original line endings in your working directory"

2009 msgstr ""

1596 -"文件 %s 中的 CRLF 将被 LF 替换。\n"

2010 +"%s 中的 CRLF 将被 LF 替换。<\n"

2011 "在工作区中该文件仍保持原有的换行符。"

2012

1599 -#: convert.c:216

2013 +#: convert.c:217

2014 #, c-format

2015 msgid "LF would be replaced by CRLF in %s"

2016 msgstr "文件 %s 中的 LF 将被 CRLF 替换"

2017

1604 -#: convert.c:218

2018 +#: convert.c:219

2019 #, c-format

2020 msgid ""

2021 "LF will be replaced by CRLF in %s.\n"

1608 -"The file will have its original line endings in your working directory."

2022 +"The file will have its original line endings in your working directory"

2023 msgstr ""

1610 -"文件 %s 中的 LF 将被 CRLF 替换。\n"

1611 -"在工作区中该文件仍保持原有的换行符。"

2024 +"%s 中的 LF 将被 CRLF 替换。\n"

2025 +"在工作区中该文件仍保持原有的换行符"

2026

1613 -#: convert.c:279

2027 +#: convert.c:280

2028 #, c-format

2029 msgid "BOM is prohibited in '%s' if encoded as %s"

2030 msgstr "如果使用 %2$s 编码，禁止在 '%1$s' 中使用 BOM"

2031

1618 -#: convert.c:286

2032 +#: convert.c:287

2033 #, c-format

2034 msgid ""

2035 "The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"

2036 "tree-encoding."

2037 msgstr "文件 '%s' 包含一个字节顺序标记（BOM）。请使用 UTF-%s 作为工作区编码。"

2038

1625 -#: convert.c:304

2039 +#: convert.c:305

2040 #, c-format

2041 msgid "BOM is required in '%s' if encoded as %s"

2042 msgstr "如果编码为 %2$s，需要在 '%1$s' 中使用 BOM"

2043

1630 -#: convert.c:306

2044 +#: convert.c:307

2045 #, c-format

2046 msgid ""

2047 "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"

@@ -1636,20 +2050,70 @@ msgstr ""

2050 "文件 '%s' 缺失一个字节顺序标记（BOM）。请使用 UTF-%sBE or UTF-%sLE（取决于字"

2051 "节序）作为工作区编码。"

2052

1639 -#: convert.c:424

2053 +#: convert.c:425 convert.c:496

2054 #, c-format

2055 msgid "failed to encode '%s' from %s to %s"

2056 msgstr "无法对 '%s' 进行从 %s 到 %s 的编码"

2057

1644 -#: convert.c:467

2058 +#: convert.c:468

2059 #, c-format

2060 msgid "encoding '%s' from %s to %s and back is not the same"

2061 msgstr "将'%s' 的编码从 %s 到 %s 来回转换不一致"

2062

1649 -#: convert.c:1225

2063 +#: convert.c:674

2064 +#, c-format

2065 +msgid "cannot fork to run external filter '%s'"

2066 +msgstr "不能 fork 以执行外部过滤程序 '%s'"

2067 +

2068 +#: convert.c:694

2069 +#, c-format

2070 +msgid "cannot feed the input to external filter '%s'"

2071 +msgstr "不能将标准输入传递给外部过滤器 '%s'"

2072 +

2073 +#: convert.c:701

2074 +#, c-format

2075 +msgid "external filter '%s' failed %d"

2076 +msgstr "外部过滤程序 '%s' 失败码 %d"

2077 +

2078 +#: convert.c:736 convert.c:739

2079 +#, c-format

2080 +msgid "read from external filter '%s' failed"

2081 +msgstr "从外部过滤器 '%s' 读取失败"

2082 +

2083 +#: convert.c:742 convert.c:796

2084 +#, c-format

2085 +msgid "external filter '%s' failed"

2086 +msgstr "外部过滤器 '%s' 失败"

2087 +

2088 +#: convert.c:844

2089 +msgid "unexpected filter type"

2090 +msgstr "意外的过滤类型"

2091 +

2092 +#: convert.c:855

2093 +msgid "path name too long for external filter"

2094 +msgstr "外部过滤器的路径名太长"

2095 +

2096 +#: convert.c:929

2097 +#, c-format

2098 +msgid ""

2099 +"external filter '%s' is not available anymore although not all paths have "

2100 +"been filtered"

2101 +msgstr "外部过滤器 '%s' 不再可用，但并非所有路径都已过滤"

2102 +

2103 +#: convert.c:1228

2104 msgid "true/false are no valid working-tree-encodings"

2105 msgstr "true/false 不是有效的工作区编码"

2106

2107 +#: convert.c:1402 convert.c:1436

2108 +#, c-format

2109 +msgid "%s: clean filter '%s' failed"

2110 +msgstr "%s：clean 过滤器 '%s' 失败"

2111 +

2112 +#: convert.c:1480

2113 +#, c-format

2114 +msgid "%s: smudge filter %s failed"

2115 +msgstr "%s：smudge 过滤器 %s 失败"

2116 +

2117 #: date.c:116

2118 msgid "in the future"

2119 msgstr "在将来"

@@ -1721,42 +2185,54 @@ msgstr[1] "%<PRIuMAX> 年前"

2185 #: diffcore-order.c:24

2186 #, c-format

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

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

2188 +msgstr "读取排序文件 '%s' 失败"

2189

1726 -#: diffcore-rename.c:535

2190 +#: diffcore-rename.c:536

2191 msgid "Performing inexact rename detection"

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

2193

1730 -#: diff.c:74

2194 +#: diff.c:108

2195 #, c-format

2196 msgid "option '%s' requires a value"

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

2198

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

1736 -#: diff.c:152

2200 +#: diff.c:158

2201 #, c-format

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

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

2204

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

1742 -#: diff.c:157

2206 +#: diff.c:163

2207 #, c-format

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

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

2210

1747 -#: diff.c:281

2211 +#: diff.c:291

2212 msgid ""

1749 -"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', "

1750 -"'plain'"

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

2214 +"'dimmed-zebra', 'plain'"

2215 msgstr ""

1752 -"代码移动的颜色设置必须是 'no'、'default'、'zebra'、'dimmed_zebra' 或 'plain'"

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

2217 +"'plain'"

2218 +

2219 +#: diff.c:316

2220 +#, c-format

2221 +msgid "ignoring unknown color-moved-ws mode '%s'"

2222 +msgstr "忽略未知的 color-moved-ws 模式 '%s'"

2223 +

2224 +#: diff.c:323

2225 +msgid ""

2226 +"color-moved-ws: allow-indentation-change cannot be combined with other white "

2227 +"space modes"

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

2229

1754 -#: diff.c:341

2230 +#: diff.c:394

2231 #, c-format

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

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

2234

1759 -#: diff.c:401

2235 +#: diff.c:454

2236 #, c-format

2237 msgid ""

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

@@ -1765,24 +2241,24 @@ msgstr ""

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

2242 "%s"

2243

1768 -#: diff.c:3823

2244 +#: diff.c:4096

2245 #, c-format

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

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

2248

1773 -#: diff.c:4153

2249 +#: diff.c:4427

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

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

2252

1777 -#: diff.c:4156

2253 +#: diff.c:4430

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

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

2256

1781 -#: diff.c:4244

2257 +#: diff.c:4508

2258 msgid "--follow requires exactly one pathspec"

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

2260

1785 -#: diff.c:4410

2261 +#: diff.c:4674

2262 #, c-format

2263 msgid ""

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

@@ -1791,44 +2267,59 @@ msgstr ""

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

2268 "%s"

2269

1794 -#: diff.c:4424

2270 +#: diff.c:4688

2271 #, c-format

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

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

2274

1799 -#: diff.c:5500

2275 +#: diff.c:5766

2276 msgid "inexact rename detection was skipped due to too many files."

2277 msgstr "因为文件太多，略过不严格的重命名检查。"

2278

1803 -#: diff.c:5503

2279 +#: diff.c:5769

2280 msgid "only found copies from modified paths due to too many files."

2281 msgstr "因为文件太多，只在修改的路径中查找拷贝。"

2282

1807 -#: diff.c:5506

2283 +#: diff.c:5772

2284 #, c-format

2285 msgid ""

2286 "you may want to set your %s variable to at least %d and retry the command."

2287 msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。"

2288

1813 -#: dir.c:1867

2289 +#: dir.c:569

2290 +#, c-format

2291 +msgid "pathspec '%s' did not match any file(s) known to git"

2292 +msgstr "路径规格 '%s' 未匹配任何 git 已知文件"

2293 +

2294 +#: dir.c:958

2295 +#, c-format

2296 +msgid "cannot use %s as an exclude file"

2297 +msgstr "不能将 %s 用作排除文件"

2298 +

2299 +#: dir.c:1873

2300 #, c-format

2301 msgid "could not open directory '%s'"

2302 msgstr "不能打开目录 '%s'"

2303

1818 -#: dir.c:2109

2304 +#: dir.c:2115

2305 msgid "failed to get kernel name and information"

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

2307

1822 -#: dir.c:2233

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

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

2308 +#: dir.c:2239

2309 +msgid "untracked cache is disabled on this system or location"

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

2311 +

2312 +#: dir.c:3037

2313 +#, c-format

2314 +msgid "index file corrupt in repo %s"

2315 +msgstr "仓库 %s 中的索引文件损坏"

2316

1826 -#: dir.c:3075 dir.c:3080

2317 +#: dir.c:3082 dir.c:3087

2318 #, c-format

2319 msgid "could not create directories for %s"

2320 msgstr "不能为 %s 创建目录"

2321

1831 -#: dir.c:3109

2322 +#: dir.c:3116

2323 #, c-format

2324 msgid "could not migrate git directory from '%s' to '%s'"

2325 msgstr "不能从 '%s' 迁移 git 目录到 '%s'"

@@ -1838,218 +2329,272 @@ msgstr "不能从 '%s' 迁移 git 目录到 '%s'"

2329 msgid "hint: Waiting for your editor to close the file...%c"

2330 msgstr "提示：等待您的编辑器关闭文件...%c"

2331

1841 -#: entry.c:177

2332 +#: entry.c:178

2333 msgid "Filtering content"

2334 msgstr "过滤内容"

2335

1845 -#: entry.c:435

2336 +#: entry.c:437

2337 #, c-format

2338 msgid "could not stat file '%s'"

2339 msgstr "不能对文件 '%s' 调用 stat"

2340

2341 +#: environment.c:150

2342 +#, c-format

2343 +msgid "bad git namespace path \"%s\""

2344 +msgstr "糟糕的 git 名字空间路径 \"%s\""

2345 +

2346 +#: environment.c:332

2347 +#, c-format

2348 +msgid "could not set GIT_DIR to '%s'"

2349 +msgstr "不能设置 GIT_DIR 为 '%s'"

2350 +

2351 +#: exec-cmd.c:361

2352 +#, c-format

2353 +msgid "too many args to run %s"

2354 +msgstr "执行 %s 的参数太多"

2355 +

2356 #: fetch-object.c:17

2357 msgid "Remote with no URL"

2358 msgstr "远程未设置 URL"

2359

1854 -#: fetch-pack.c:254

2360 +#: fetch-pack.c:152

2361 msgid "git fetch-pack: expected shallow list"

2362 msgstr "git fetch-pack：应为 shallow 列表"

2363

1858 -#: fetch-pack.c:266

2364 +#: fetch-pack.c:164

2365 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"

2366 msgstr "git fetch-pack：期望 ACK/NAK，却得到 flush 包"

2367

1862 -#: fetch-pack.c:285 builtin/archive.c:63

1863 -#, c-format

1864 -msgid "remote error: %s"

1865 -msgstr "远程错误：%s"

1866 -

1867 -#: fetch-pack.c:286

2368 +#: fetch-pack.c:184

2369 #, c-format

2370 msgid "git fetch-pack: expected ACK/NAK, got '%s'"

2371 msgstr "git fetch-pack：应为 ACK/NAK，却得到 '%s'"

2372

1872 -#: fetch-pack.c:338

2373 +#: fetch-pack.c:254

2374 msgid "--stateless-rpc requires multi_ack_detailed"

2375 msgstr "--stateless-rpc 需要 multi_ack_detailed"

2376

1876 -#: fetch-pack.c:429 fetch-pack.c:1310

2377 +#: fetch-pack.c:342 fetch-pack.c:1257

2378 #, c-format

2379 msgid "invalid shallow line: %s"

2380 msgstr "无效的 shallow 信息：%s"

2381

1881 -#: fetch-pack.c:435 fetch-pack.c:1316

2382 +#: fetch-pack.c:348 fetch-pack.c:1263

2383 #, c-format

2384 msgid "invalid unshallow line: %s"

2385 msgstr "无效的 unshallow 信息：%s"

2386

1886 -#: fetch-pack.c:437 fetch-pack.c:1318

2387 +#: fetch-pack.c:350 fetch-pack.c:1265

2388 #, c-format

2389 msgid "object not found: %s"

2390 msgstr "对象未找到：%s"

2391

1891 -#: fetch-pack.c:440 fetch-pack.c:1321

2392 +#: fetch-pack.c:353 fetch-pack.c:1268

2393 #, c-format

2394 msgid "error in object: %s"

2395 msgstr "对象中出错：%s"

2396

1896 -#: fetch-pack.c:442 fetch-pack.c:1323

2397 +#: fetch-pack.c:355 fetch-pack.c:1270

2398 #, c-format

2399 msgid "no shallow found: %s"

2400 msgstr "未发现 shallow：%s"

2401

1901 -#: fetch-pack.c:445 fetch-pack.c:1326

2402 +#: fetch-pack.c:358 fetch-pack.c:1273

2403 #, c-format

2404 msgid "expected shallow/unshallow, got %s"

2405 msgstr "应为 shallow/unshallow，却得到 %s"

2406

1906 -#: fetch-pack.c:486

2407 +#: fetch-pack.c:399

2408 #, c-format

2409 msgid "got %s %d %s"

2410 msgstr "得到 %s %d %s"

2411

1911 -#: fetch-pack.c:500

2412 +#: fetch-pack.c:416

2413 #, c-format

2414 msgid "invalid commit %s"

2415 msgstr "无效提交 %s"

2416

1916 -#: fetch-pack.c:533

2417 +#: fetch-pack.c:447

2418 msgid "giving up"

2419 msgstr "放弃"

2420

1920 -#: fetch-pack.c:543 progress.c:229

2421 +#: fetch-pack.c:459 progress.c:229

2422 msgid "done"

2423 msgstr "完成"

2424

1924 -#: fetch-pack.c:555

2425 +#: fetch-pack.c:471

2426 #, c-format

2427 msgid "got %s (%d) %s"

2428 msgstr "得到 %s (%d) %s"

2429

1929 -#: fetch-pack.c:601

2430 +#: fetch-pack.c:517

2431 #, c-format

2432 msgid "Marking %s as complete"

2433 msgstr "标记 %s 为完成"

2434

1934 -#: fetch-pack.c:828

2435 +#: fetch-pack.c:764

2436 #, c-format

2437 msgid "already have %s (%s)"

2438 msgstr "已经有 %s（%s）"

2439

1939 -#: fetch-pack.c:869

2440 +#: fetch-pack.c:803

2441 msgid "fetch-pack: unable to fork off sideband demultiplexer"

2442 msgstr "fetch-pack：无法派生 sideband 多路输出"

2443

1943 -#: fetch-pack.c:877

2444 +#: fetch-pack.c:811

2445 msgid "protocol error: bad pack header"

2446 msgstr "协议错误：坏的包头"

2447

1947 -#: fetch-pack.c:944

2448 +#: fetch-pack.c:879

2449 #, c-format

2450 msgid "fetch-pack: unable to fork off %s"

2451 msgstr "fetch-pack：无法派生进程 %s"

2452

1952 -#: fetch-pack.c:960

2453 +#: fetch-pack.c:895

2454 #, c-format

2455 msgid "%s failed"

2456 msgstr "%s 失败"

2457

1957 -#: fetch-pack.c:962

2458 +#: fetch-pack.c:897

2459 msgid "error in sideband demultiplexer"

2460 msgstr "sideband 多路输出出错"

2461

1961 -#: fetch-pack.c:989

2462 +#: fetch-pack.c:926

2463 msgid "Server does not support shallow clients"

2464 msgstr "服务器不支持 shalllow 客户端"

2465

1965 -#: fetch-pack.c:993

2466 +#: fetch-pack.c:930

2467 msgid "Server supports multi_ack_detailed"

2468 msgstr "服务器支持 multi_ack_detailed"

2469

1969 -#: fetch-pack.c:996

2470 +#: fetch-pack.c:933

2471 msgid "Server supports no-done"

2472 msgstr "服务器支持 no-done"

2473

1973 -#: fetch-pack.c:1002

2474 +#: fetch-pack.c:939

2475 msgid "Server supports multi_ack"

2476 msgstr "服务器支持 multi_ack"

2477

1977 -#: fetch-pack.c:1006

2478 +#: fetch-pack.c:943

2479 msgid "Server supports side-band-64k"

2480 msgstr "服务器支持 side-band-64k"

2481

1981 -#: fetch-pack.c:1010

2482 +#: fetch-pack.c:947

2483 msgid "Server supports side-band"

2484 msgstr "服务器支持 side-band"

2485

1985 -#: fetch-pack.c:1014

2486 +#: fetch-pack.c:951

2487 msgid "Server supports allow-tip-sha1-in-want"

2488 msgstr "服务器支持 allow-tip-sha1-in-want"

2489

1989 -#: fetch-pack.c:1018

2490 +#: fetch-pack.c:955

2491 msgid "Server supports allow-reachable-sha1-in-want"

2492 msgstr "服务器支持 allow-reachable-sha1-in-want"

2493

1993 -#: fetch-pack.c:1028

2494 +#: fetch-pack.c:965

2495 msgid "Server supports ofs-delta"

2496 msgstr "服务器支持 ofs-delta"

2497

1997 -#: fetch-pack.c:1034 fetch-pack.c:1204

2498 +#: fetch-pack.c:971 fetch-pack.c:1150

2499 msgid "Server supports filter"

2500 msgstr "服务器支持 filter"

2501

2001 -#: fetch-pack.c:1042

2502 +#: fetch-pack.c:979

2503 #, c-format

2504 msgid "Server version is %.*s"

2505 msgstr "服务器版本 %.*s"

2506

2006 -#: fetch-pack.c:1048

2507 +#: fetch-pack.c:985

2508 msgid "Server does not support --shallow-since"

2509 msgstr "服务器不支持 --shallow-since"

2510

2010 -#: fetch-pack.c:1052

2511 +#: fetch-pack.c:989

2512 msgid "Server does not support --shallow-exclude"

2513 msgstr "服务器不支持 --shallow-exclude"

2514

2014 -#: fetch-pack.c:1054

2515 +#: fetch-pack.c:991

2516 msgid "Server does not support --deepen"

2517 msgstr "服务器不支持 --deepen"

2518

2018 -#: fetch-pack.c:1065

2519 +#: fetch-pack.c:1004

2520 msgid "no common commits"

2521 msgstr "没有共同的提交"

2522

2022 -#: fetch-pack.c:1077 fetch-pack.c:1414

2523 +#: fetch-pack.c:1016 fetch-pack.c:1393

2524 msgid "git fetch-pack: fetch failed."

2525 msgstr "git fetch-pack：获取失败。"

2526

2026 -#: fetch-pack.c:1199

2527 +#: fetch-pack.c:1145

2528 msgid "Server does not support shallow requests"

2529 msgstr "服务器不支持 shalllow 请求"

2530

2030 -#: fetch-pack.c:1584

2531 +#: fetch-pack.c:1191

2532 +#, c-format

2533 +msgid "error reading section header '%s'"

2534 +msgstr "读取节标题 '%s' 出错"

2535 +

2536 +#: fetch-pack.c:1197

2537 +#, c-format

2538 +msgid "expected '%s', received '%s'"

2539 +msgstr "预期 '%s'，得到 '%s'"

2540 +

2541 +#: fetch-pack.c:1236

2542 +#, c-format

2543 +msgid "unexpected acknowledgment line: '%s'"

2544 +msgstr "意外的确认行：'%s'"

2545 +

2546 +#: fetch-pack.c:1241

2547 +#, c-format

2548 +msgid "error processing acks: %d"

2549 +msgstr "处理 ack 出错：%d"

2550 +

2551 +#: fetch-pack.c:1278

2552 +#, c-format

2553 +msgid "error processing shallow info: %d"

2554 +msgstr "处理浅克隆信息出错：%d"

2555 +

2556 +#: fetch-pack.c:1294

2557 +#, c-format

2558 +msgid "expected wanted-ref, got '%s'"

2559 +msgstr "预期 wanted-ref，得到 '%s'"

2560 +

2561 +#: fetch-pack.c:1304

2562 +#, c-format

2563 +msgid "unexpected wanted-ref: '%s'"

2564 +msgstr "意外的 wanted-ref：'%s'"

2565 +

2566 +#: fetch-pack.c:1308

2567 +#, c-format

2568 +msgid "error processing wanted refs: %d"

2569 +msgstr "处理要获取的引用出错：%d"

2570 +

2571 +#: fetch-pack.c:1603

2572 msgid "no matching remote head"

2573 msgstr "没有匹配的远程分支"

2574

2034 -#: fetch-pack.c:1610

2575 +#: fetch-pack.c:1621 builtin/clone.c:664

2576 +msgid "remote did not send all necessary objects"

2577 +msgstr "远程没有发送所有必须的对象"

2578 +

2579 +#: fetch-pack.c:1647

2580 #, c-format

2581 msgid "no such remote ref %s"

2582 msgstr "没有这样的远程引用 %s"

2583

2039 -#: fetch-pack.c:1613

2584 +#: fetch-pack.c:1650

2585 #, c-format

2586 msgid "Server does not allow request for unadvertised object %s"

2587 msgstr "服务器不允许请求未公开的对象 %s"

2588

2044 -#: gpg-interface.c:185

2589 +#: gpg-interface.c:253

2590 msgid "gpg failed to sign the data"

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

2592

2048 -#: gpg-interface.c:210

2593 +#: gpg-interface.c:279

2594 msgid "could not create temporary file"

2595 msgstr "不能创建临时文件"

2596

2052 -#: gpg-interface.c:213

2597 +#: gpg-interface.c:282

2598 #, c-format

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

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

@@ -2059,18 +2604,18 @@ msgstr "无法将分离式签名写入 '%s'"

2604 msgid "ignore invalid color '%.*s' in log.graphColors"

2605 msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"

2606

2062 -#: grep.c:2020

2607 +#: grep.c:2115

2608 #, c-format

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

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

2611

2067 -#: grep.c:2037 setup.c:164 builtin/clone.c:409 builtin/diff.c:81

2612 +#: grep.c:2132 setup.c:164 builtin/clone.c:410 builtin/diff.c:81

2613 #: builtin/rm.c:134

2614 #, c-format

2615 msgid "failed to stat '%s'"

2616 msgstr "对 '%s' 调用 stat 失败"

2617

2073 -#: grep.c:2048

2618 +#: grep.c:2143

2619 #, c-format

2620 msgid "'%s': short read"

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

@@ -2149,7 +2694,7 @@ msgstr "不支持的命令列表类型 '%s'"

2694 msgid "The common Git guides are:"

2695 msgstr "最常用的 Git 向导有："

2696

2152 -#: help.c:467

2697 +#: help.c:552

2698 #, c-format

2699 msgid ""

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

@@ -2158,31 +2703,31 @@ msgstr ""

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

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

2705

2161 -#: help.c:526

2706 +#: help.c:611

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

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

2709

2165 -#: help.c:548

2710 +#: help.c:633

2711 #, c-format

2712 msgid "WARNING: You called a Git command named '%s', which does not exist."

2713 msgstr "警告：您运行了一个并不存在的 Git 命令 '%s'。"

2714

2170 -#: help.c:553

2715 +#: help.c:638

2716 #, c-format

2717 msgid "Continuing under the assumption that you meant '%s'."

2718 msgstr "假定你想要的是 '%s' 并继续。"

2719

2175 -#: help.c:558

2720 +#: help.c:643

2721 #, c-format

2722 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."

2723 msgstr "假定你想要的是 '%2$s'，在 %1$0.1f 秒钟后继续。"

2724

2180 -#: help.c:566

2725 +#: help.c:651

2726 #, c-format

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

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

2729

2185 -#: help.c:570

2730 +#: help.c:655

2731 msgid ""

2732 "\n"

2733 "The most similar command is"

@@ -2196,16 +2741,16 @@ msgstr[1] ""

2741 "\n"

2742 "最相似的命令是"

2743

2199 -#: help.c:585

2744 +#: help.c:670

2745 msgid "git version [<options>]"

2746 msgstr "git version [<选项>]"

2747

2203 -#: help.c:652

2748 +#: help.c:738

2749 #, c-format

2750 msgid "%s: %s - %s"

2751 msgstr "%s：%s - %s"

2752

2208 -#: help.c:656

2753 +#: help.c:742

2754 msgid ""

2755 "\n"

2756 "Did you mean this?"

@@ -2272,7 +2817,7 @@ msgstr "不允许空的姓名（对于 <%s>）"

2817 msgid "name consists only of disallowed characters: %s"

2818 msgstr "姓名中仅包含禁用字符：%s"

2819

2275 -#: ident.c:416 builtin/commit.c:587

2820 +#: ident.c:416 builtin/commit.c:600

2821 #, c-format

2822 msgid "invalid date format: %s"

2823 msgstr "无效的日期格式：%s"

@@ -2308,117 +2853,117 @@ msgstr ""

2853 msgid "Unable to create '%s.lock': %s"

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

2855

2311 -#: merge.c:71

2856 +#: merge.c:40

2857 msgid "failed to read the cache"

2313 -msgstr "无法读取缓存"

2858 +msgstr "读取缓存失败"

2859

2315 -#: merge.c:136 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378

2316 -#: builtin/checkout.c:606 builtin/clone.c:761

2860 +#: merge.c:105 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:380

2861 +#: builtin/checkout.c:608 builtin/clone.c:763

2862 msgid "unable to write new index file"

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

2864

2320 -#: merge-recursive.c:298

2865 +#: merge-recursive.c:303

2866 msgid "(bad commit)\n"

2867 msgstr "（坏提交）\n"

2868

2324 -#: merge-recursive.c:320

2869 +#: merge-recursive.c:325

2870 #, c-format

2871 msgid "add_cacheinfo failed for path '%s'; merge aborting."

2872 msgstr "add_cacheinfo 对路径 '%s' 执行失败，合并终止。"

2873

2329 -#: merge-recursive.c:328

2874 +#: merge-recursive.c:333

2875 #, c-format

2876 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."

2877 msgstr "add_cacheinfo 无法刷新路径 '%s'，合并终止。"

2878

2334 -#: merge-recursive.c:410

2879 +#: merge-recursive.c:415

2880 msgid "error building trees"

2336 -msgstr "无法创建树"

2881 +msgstr "创建树出错"

2882

2338 -#: merge-recursive.c:881

2883 +#: merge-recursive.c:886

2884 #, c-format

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

2341 -msgstr "无法创建路径 '%s'%s"

2886 +msgstr "创建路径 '%s'%s 失败"

2887

2343 -#: merge-recursive.c:892

2888 +#: merge-recursive.c:897

2889 #, c-format

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

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

2892

2348 -#: merge-recursive.c:906 merge-recursive.c:925

2893 +#: merge-recursive.c:911 merge-recursive.c:930

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

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

2896

2352 -#: merge-recursive.c:915

2897 +#: merge-recursive.c:920

2898 #, c-format

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

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

2901

2357 -#: merge-recursive.c:957 builtin/cat-file.c:37

2902 +#: merge-recursive.c:962 builtin/cat-file.c:39

2903 #, c-format

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

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

2906

2362 -#: merge-recursive.c:959

2907 +#: merge-recursive.c:964

2908 #, c-format

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

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

2911

2367 -#: merge-recursive.c:983

2912 +#: merge-recursive.c:988

2913 #, c-format

2914 msgid "failed to open '%s': %s"

2370 -msgstr "无法打开 '%s'：%s"

2915 +msgstr "打开 '%s' 失败：%s"

2916

2372 -#: merge-recursive.c:994

2917 +#: merge-recursive.c:999

2918 #, c-format

2919 msgid "failed to symlink '%s': %s"

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

2920 +msgstr "创建符号链接 '%s' 失败：%s"

2921

2377 -#: merge-recursive.c:999

2922 +#: merge-recursive.c:1004

2923 #, c-format

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

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

2926

2382 -#: merge-recursive.c:1186

2927 +#: merge-recursive.c:1191

2928 #, c-format

2929 msgid "Failed to merge submodule %s (not checked out)"

2930 msgstr "无法合并子模组 %s （没有检出）"

2931

2387 -#: merge-recursive.c:1193

2932 +#: merge-recursive.c:1198

2933 #, c-format

2934 msgid "Failed to merge submodule %s (commits not present)"

2935 msgstr "无法合并子模组 %s（提交不存在）"

2936

2392 -#: merge-recursive.c:1200

2937 +#: merge-recursive.c:1205

2938 #, c-format

2939 msgid "Failed to merge submodule %s (commits don't follow merge-base)"

2940 msgstr "无法合并子模组 %s （提交未跟随合并基线）"

2941

2397 -#: merge-recursive.c:1208 merge-recursive.c:1220

2942 +#: merge-recursive.c:1213 merge-recursive.c:1225

2943 #, c-format

2944 msgid "Fast-forwarding submodule %s to the following commit:"

2945 msgstr "子模组 %s 快进到如下提交："

2946

2402 -#: merge-recursive.c:1211 merge-recursive.c:1223

2947 +#: merge-recursive.c:1216 merge-recursive.c:1228

2948 #, c-format

2949 msgid "Fast-forwarding submodule %s"

2950 msgstr "快进子模组 %s"

2951

2407 -#: merge-recursive.c:1245

2952 +#: merge-recursive.c:1250

2953 #, c-format

2954 msgid "Failed to merge submodule %s (merge following commits not found)"

2955 msgstr "无法合并子模组 %s （没发现合并跟随的提交）"

2956

2412 -#: merge-recursive.c:1249

2957 +#: merge-recursive.c:1254

2958 #, c-format

2959 msgid "Failed to merge submodule %s (not fast-forward)"

2960 msgstr "无法合并子模组 %s（非快进）"

2961

2417 -#: merge-recursive.c:1250

2962 +#: merge-recursive.c:1255

2963 msgid "Found a possible merge resolution for the submodule:\n"

2964 msgstr "找到子模组的一个可能的合并方案：\n"

2965

2421 -#: merge-recursive.c:1253

2966 +#: merge-recursive.c:1258

2967 #, c-format

2968 msgid ""

2969 "If this is correct simply add it to the index for example\n"

@@ -2434,31 +2979,31 @@ msgstr ""

2979 "\n"

2980 "以接受此建议。\n"

2981

2437 -#: merge-recursive.c:1262

2982 +#: merge-recursive.c:1267

2983 #, c-format

2984 msgid "Failed to merge submodule %s (multiple merges found)"

2985 msgstr "无法合并子模组 %s （发现多个合并）"

2986

2442 -#: merge-recursive.c:1321

2987 +#: merge-recursive.c:1326

2988 msgid "Failed to execute internal merge"

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

2990

2446 -#: merge-recursive.c:1326

2991 +#: merge-recursive.c:1331

2992 #, c-format

2993 msgid "Unable to add %s to database"

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

2995

2451 -#: merge-recursive.c:1358

2996 +#: merge-recursive.c:1363

2997 #, c-format

2998 msgid "Auto-merging %s"

2999 msgstr "自动合并 %s"

3000

2456 -#: merge-recursive.c:1423

3001 +#: merge-recursive.c:1434

3002 #, c-format

3003 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."

3004 msgstr "错误：拒绝丢失未跟踪文件 '%s'，而是写入 %s。"

3005

2461 -#: merge-recursive.c:1475

3006 +#: merge-recursive.c:1501

3007 #, c-format

3008 msgid ""

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

@@ -2467,7 +3012,7 @@ msgstr ""

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

3013 "本被保留。"

3014

2470 -#: merge-recursive.c:1480

3015 +#: merge-recursive.c:1506

3016 #, c-format

3017 msgid ""

3018 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -2476,7 +3021,7 @@ msgstr ""

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

3022 "%7$s 版本被保留。"

3023

2479 -#: merge-recursive.c:1487

3024 +#: merge-recursive.c:1513

3025 #, c-format

3026 msgid ""

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

@@ -2485,7 +3030,7 @@ msgstr ""

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

3031 "本保留在 %8$s 中。"

3032

2488 -#: merge-recursive.c:1492

3033 +#: merge-recursive.c:1518

3034 #, c-format

3035 msgid ""

3036 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -2494,31 +3039,31 @@ msgstr ""

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

3040 "%7$s 版本保留在 %9$s 中。"

3041

2497 -#: merge-recursive.c:1526

3042 +#: merge-recursive.c:1552

3043 msgid "rename"

3044 msgstr "重命名"

3045

2501 -#: merge-recursive.c:1526

3046 +#: merge-recursive.c:1552

3047 msgid "renamed"

3048 msgstr "重命名"

3049

2505 -#: merge-recursive.c:1580 merge-recursive.c:1736 merge-recursive.c:2368

2506 -#: merge-recursive.c:3086

3050 +#: merge-recursive.c:1606 merge-recursive.c:1762 merge-recursive.c:2394

3051 +#: merge-recursive.c:3129

3052 #, c-format

3053 msgid "Refusing to lose dirty file at %s"

3054 msgstr "拒绝丢失脏文件 '%s'"

3055

2511 -#: merge-recursive.c:1594

3056 +#: merge-recursive.c:1620

3057 #, c-format

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

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

3060

2516 -#: merge-recursive.c:1599

3061 +#: merge-recursive.c:1625

3062 #, c-format

3063 msgid "Refusing to lose untracked file at %s; adding as %s instead"

3064 msgstr "拒绝丢失未跟踪文件 '%s'，而是添加为 %s"

3065

2521 -#: merge-recursive.c:1625

3066 +#: merge-recursive.c:1651

3067 #, c-format

3068 msgid ""

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

@@ -2527,36 +3072,38 @@ msgstr ""

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

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

3074

2530 -#: merge-recursive.c:1630

3075 +#: merge-recursive.c:1656

3076 msgid " (left unresolved)"

3077 msgstr "（留下未解决）"

3078

2534 -#: merge-recursive.c:1694

3079 +#: merge-recursive.c:1720

3080 #, c-format

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

3082 msgstr ""

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

3084 "%5$s"

3085

2541 -#: merge-recursive.c:1733

3086 +#: merge-recursive.c:1759

3087 #, c-format

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

3089 msgstr "代之以重命名 %s 至 %s，以及 %s 至 %s"

3090

2546 -#: merge-recursive.c:1745

3091 +#: merge-recursive.c:1771

3092 #, c-format

3093 msgid "Refusing to lose untracked file at %s, even though it's in the way."

3094 msgstr "拒绝在 '%s' 处失去未跟踪文件，即使它存在于重命名中。"

3095

2551 -#: merge-recursive.c:1951

3096 +#: merge-recursive.c:1977

3097 #, c-format

3098 msgid ""

3099 "CONFLICT (directory rename split): Unclear where to place %s because "

3100 "directory %s was renamed to multiple other directories, with no destination "

3101 "getting a majority of the files."

2557 -msgstr "冲突（分割的目录重命名）：不清楚 %s 应该放在哪里，因为目录 %s 被重命名到多个其它目录，没有目录包含大部分文件。"

3102 +msgstr ""

3103 +"冲突（分割的目录重命名）：不清楚 %s 应该放在哪里，因为目录 %s 被重命名到多个"

3104 +"其它目录，没有目录包含大部分文件。"

3105

2559 -#: merge-recursive.c:1983

3106 +#: merge-recursive.c:2009

3107 #, c-format

3108 msgid ""

3109 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "

@@ -2565,7 +3112,7 @@ msgstr ""

3112 "冲突（隐式目录重命名）：处于隐式目录重命名的现存文件/目录 %s，将以下路径放"

3113 "在：%s。"

3114

2568 -#: merge-recursive.c:1993

3115 +#: merge-recursive.c:2019

3116 #, c-format

3117 msgid ""

3118 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "

@@ -2574,7 +3121,7 @@ msgstr ""

3121 "冲突（隐式目录重命名）：无法映射一个以上路径到 %s，隐式目录重命名尝试将这些路"

3122 "径放置于此：%s"

3123

2577 -#: merge-recursive.c:2085

3124 +#: merge-recursive.c:2111

3125 #, c-format

3126 msgid ""

3127 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"

@@ -2583,130 +3130,134 @@ msgstr ""

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

3131 "%4$s->%5$s"

3132

2586 -#: merge-recursive.c:2330

3133 +#: merge-recursive.c:2356

3134 #, c-format

3135 msgid ""

3136 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "

3137 "renamed."

3138 msgstr "警告：避免应用 %s -> %s 的重命名到 %s，因为 %s 本身已被重命名。"

3139

2593 -#: merge-recursive.c:2736

3140 +#: merge-recursive.c:2762

3141 #, c-format

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

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

3144

2598 -#: merge-recursive.c:2751

3145 +#: merge-recursive.c:2777

3146 #, c-format

3147 msgid "Adding merged %s"

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

3149

2603 -#: merge-recursive.c:2758 merge-recursive.c:3089

3150 +#: merge-recursive.c:2784 merge-recursive.c:3132

3151 #, c-format

3152 msgid "Adding as %s instead"

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

3154

2608 -#: merge-recursive.c:2914

3155 +#: merge-recursive.c:2941

3156 #, c-format

3157 msgid "cannot read object %s"

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

3159

2613 -#: merge-recursive.c:2917

3160 +#: merge-recursive.c:2944

3161 #, c-format

3162 msgid "object %s is not a blob"

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

3164

2618 -#: merge-recursive.c:2986

3165 +#: merge-recursive.c:3013

3166 msgid "modify"

3167 msgstr "修改"

3168

2622 -#: merge-recursive.c:2986

3169 +#: merge-recursive.c:3013

3170 msgid "modified"

3171 msgstr "修改"

3172

2626 -#: merge-recursive.c:2997

3173 +#: merge-recursive.c:3024

3174 msgid "content"

3175 msgstr "内容"

3176

2630 -#: merge-recursive.c:3004

3177 +#: merge-recursive.c:3031

3178 msgid "add/add"

3179 msgstr "添加/添加"

3180

2634 -#: merge-recursive.c:3046

3181 +#: merge-recursive.c:3076

3182 #, c-format

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

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

3185

2639 -#: merge-recursive.c:3055 git-submodule.sh:895

3186 +#: merge-recursive.c:3098 git-submodule.sh:865

3187 msgid "submodule"

3188 msgstr "子模组"

3189

2643 -#: merge-recursive.c:3056

3190 +#: merge-recursive.c:3099

3191 #, c-format

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

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

3194

2648 -#: merge-recursive.c:3178

3195 +#: merge-recursive.c:3221

3196 #, c-format

3197 msgid "Removing %s"

3198 msgstr "删除 %s"

3199

2653 -#: merge-recursive.c:3204

3200 +#: merge-recursive.c:3247

3201 msgid "file/directory"

3202 msgstr "文件/目录"

3203

2657 -#: merge-recursive.c:3210

3204 +#: merge-recursive.c:3253

3205 msgid "directory/file"

3206 msgstr "目录/文件"

3207

2661 -#: merge-recursive.c:3217

3208 +#: merge-recursive.c:3260

3209 #, c-format

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

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

3212

2666 -#: merge-recursive.c:3226

3213 +#: merge-recursive.c:3269

3214 #, c-format

3215 msgid "Adding %s"

3216 msgstr "添加 %s"

3217

2671 -#: merge-recursive.c:3267

3218 +#: merge-recursive.c:3303

3219 #, c-format

2673 -msgid "Dirty index: cannot merge (dirty: %s)"

2674 -msgstr "脏索引：不能合并（脏文件：%s）"

3220 +msgid ""

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

3222 +" %s"

3223 +msgstr ""

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

3225 +" %s"

3226

2676 -#: merge-recursive.c:3271

3227 +#: merge-recursive.c:3314

3228 msgid "Already up to date!"

3229 msgstr "已经是最新的！"

3230

2680 -#: merge-recursive.c:3280

3231 +#: merge-recursive.c:3323

3232 #, c-format

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

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

3235

2685 -#: merge-recursive.c:3379

3236 +#: merge-recursive.c:3422

3237 msgid "Merging:"

3238 msgstr "合并："

3239

2689 -#: merge-recursive.c:3392

3240 +#: merge-recursive.c:3435

3241 #, c-format

3242 msgid "found %u common ancestor:"

3243 msgid_plural "found %u common ancestors:"

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

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

3246

2696 -#: merge-recursive.c:3431

3247 +#: merge-recursive.c:3474

3248 msgid "merge returned no commit"

3249 msgstr "合并未返回提交"

3250

2700 -#: merge-recursive.c:3495

3251 +#: merge-recursive.c:3540

3252 #, c-format

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

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

3255

2705 -#: merge-recursive.c:3511 builtin/merge.c:659 builtin/merge.c:816

3256 +#: merge-recursive.c:3556 builtin/merge.c:689 builtin/merge.c:846

3257 msgid "Unable to write index."

3258 msgstr "不能写入索引。"

3259

2709 -#: notes-merge.c:272

3260 +#: notes-merge.c:274

3261 #, c-format

3262 msgid ""

3263 "You have not concluded your previous notes merge (%s exists).\n"

@@ -2717,21 +3268,21 @@ msgstr ""

3268 "在开始一个新的注释合并之前，请使用 'git notes merge --commit' 或者 'git "

3269 "notes merge --abort' 来提交/终止前一次合并。"

3270

2720 -#: notes-merge.c:279

3271 +#: notes-merge.c:281

3272 #, c-format

3273 msgid "You have not concluded your notes merge (%s exists)."

3274 msgstr "您尚未结束注释合并（存在 %s）。"

3275

2725 -#: notes-utils.c:43

3276 +#: notes-utils.c:45

3277 msgid "Cannot commit uninitialized/unreferenced notes tree"

3278 msgstr "不能提交未初始化/未引用的注解树"

3279

2729 -#: notes-utils.c:102

3280 +#: notes-utils.c:104

3281 #, c-format

3282 msgid "Bad notes.rewriteMode value: '%s'"

3283 msgstr "坏的 notes.rewriteMode 值：'%s'"

3284

2734 -#: notes-utils.c:112

3285 +#: notes-utils.c:114

3286 #, c-format

3287 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"

3288 msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解"

@@ -2740,35 +3291,55 @@ msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解"

3291 #. the environment variable, the second %s is

3292 #. its value.

3293 #.

2743 -#: notes-utils.c:142

3294 +#: notes-utils.c:144

3295 #, c-format

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

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

3298

2748 -#: object.c:242

3299 +#: object.c:54

3300 +#, c-format

3301 +msgid "invalid object type \"%s\""

3302 +msgstr "无效的对象类型 \"%s\""

3303 +

3304 +#: object.c:173

3305 +#, c-format

3306 +msgid "object %s is a %s, not a %s"

3307 +msgstr "对象 %s 是一个 %s，不是一个 %s"

3308 +

3309 +#: object.c:233

3310 +#, c-format

3311 +msgid "object %s has unknown type id %d"

3312 +msgstr "对象 %s 有未知的类型 id %d"

3313 +

3314 +#: object.c:246

3315 #, c-format

3316 msgid "unable to parse object: %s"

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

3318

3319 +#: object.c:266 object.c:277

3320 +#, c-format

3321 +msgid "sha1 mismatch %s"

3322 +msgstr "sha1 与 %s 不匹配"

3323 +

3324 #: packfile.c:563

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

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

3327

2757 -#: packfile.c:1742

3328 +#: packfile.c:1745

3329 #, c-format

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

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

3332

2762 -#: packfile.c:1746

3333 +#: packfile.c:1749

3334 #, c-format

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

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

3337

2767 -#: parse-options.c:621

3338 +#: parse-options.c:672

3339 msgid "..."

3340 msgstr "..."

3341

2771 -#: parse-options.c:640

3342 +#: parse-options.c:691

3343 #, c-format

3344 msgid "usage: %s"

3345 msgstr "用法：%s"

@@ -2776,18 +3347,18 @@ msgstr "用法：%s"

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

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

3349 #.

2779 -#: parse-options.c:646

3350 +#: parse-options.c:697

3351 #, c-format

3352 msgid " or: %s"

3353 msgstr " 或：%s"

3354

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

2785 -#: parse-options.c:649

3356 +#: parse-options.c:700

3357 #, c-format

3358 msgid " %s"

3359 msgstr " %s"

3360

2790 -#: parse-options.c:688

3361 +#: parse-options.c:739

3362 msgid "-NUM"

3363 msgstr "-数字"

3364

@@ -2877,11 +3448,71 @@ msgstr "%s：路径规格神奇前缀不被此命令支持：%s"

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

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

3450

3451 +#: pkt-line.c:104

3452 +msgid "flush packet write failed"

3453 +msgstr "flush 包写错误"

3454 +

3455 +#: pkt-line.c:142 pkt-line.c:228

3456 +msgid "protocol error: impossibly long line"

3457 +msgstr "协议错误：不可能的长行"

3458 +

3459 +#: pkt-line.c:158 pkt-line.c:160

3460 +msgid "packet write with format failed"

3461 +msgstr "格式化包写入错误"

3462 +

3463 +#: pkt-line.c:192

3464 +msgid "packet write failed - data exceeds max packet size"

3465 +msgstr "写数据包失败：数据超过了包的最大长度"

3466 +

3467 +#: pkt-line.c:199 pkt-line.c:206

3468 +msgid "packet write failed"

3469 +msgstr "数据包写入失败"

3470 +

3471 +#: pkt-line.c:291

3472 +msgid "read error"

3473 +msgstr "读取错误"

3474 +

3475 +#: pkt-line.c:299

3476 +msgid "the remote end hung up unexpectedly"

3477 +msgstr "远端意外挂断了"

3478 +

3479 +#: pkt-line.c:327

3480 +#, c-format

3481 +msgid "protocol error: bad line length character: %.4s"

3482 +msgstr "协议错误：错误的行长度字符串：%.4s"

3483 +

3484 +#: pkt-line.c:337 pkt-line.c:342

3485 +#, c-format

3486 +msgid "protocol error: bad line length %d"

3487 +msgstr "协议错误：错误的行长度 %d"

3488 +

3489 #: pretty.c:962

3490 msgid "unable to parse --pretty format"

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

3492

2884 -#: read-cache.c:1500

3493 +#: range-diff.c:48

3494 +msgid "could not start `log`"

3495 +msgstr "不能启动 `log`"

3496 +

3497 +#: range-diff.c:51

3498 +msgid "could not read `log` output"

3499 +msgstr "不能读取 `log` 的输出"

3500 +

3501 +#: range-diff.c:66 sequencer.c:4540

3502 +#, c-format

3503 +msgid "could not parse commit '%s'"

3504 +msgstr "不能解析提交 '%s'"

3505 +

3506 +#: range-diff.c:196

3507 +msgid "failed to generate diff"

3508 +msgstr "生成 diff 失败"

3509 +

3510 +#: range-diff.c:421 range-diff.c:423

3511 +#, c-format

3512 +msgid "could not parse log for '%s'"

3513 +msgstr "不能解析 '%s' 的日志"

3514 +

3515 +#: read-cache.c:1579

3516 #, c-format

3517 msgid ""

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

@@ -2890,7 +3521,7 @@ msgstr ""

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

3522 "使用版本 %i"

3523

2893 -#: read-cache.c:1510

3524 +#: read-cache.c:1589

3525 #, c-format

3526 msgid ""

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

@@ -2899,227 +3530,329 @@ msgstr ""

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

3531 "使用版本 %i"

3532

2902 -#: read-cache.c:2404 sequencer.c:4338 wrapper.c:658 builtin/merge.c:1048

3533 +#: read-cache.c:2580 sequencer.c:4503 wrapper.c:658 builtin/merge.c:1083

3534 #, c-format

3535 msgid "could not close '%s'"

3536 msgstr "不能关闭 '%s'"

3537

2907 -#: read-cache.c:2477 sequencer.c:2102 sequencer.c:3234

3538 +#: read-cache.c:2653 sequencer.c:2113 sequencer.c:3374

3539 #, c-format

3540 msgid "could not stat '%s'"

3541 msgstr "不能对 '%s' 调用 stat"

3542

2912 -#: read-cache.c:2490

3543 +#: read-cache.c:2666

3544 #, c-format

3545 msgid "unable to open git dir: %s"

3546 msgstr "不能打开 git 目录：%s"

3547

2917 -#: read-cache.c:2502

3548 +#: read-cache.c:2678

3549 #, c-format

3550 msgid "unable to unlink: %s"

3551 msgstr "无法删除：%s"

3552

2922 -#: refs.c:732 sequencer.c:4334 sequencer.c:4393 wrapper.c:225 wrapper.c:395

2923 -#: builtin/am.c:779

3553 +#: refs.c:192

3554 +#, c-format

3555 +msgid "%s does not point to a valid object!"

3556 +msgstr "%s 没有指向一个有效的对象！"

3557 +

3558 +#: refs.c:579

3559 +#, c-format

3560 +msgid "ignoring dangling symref %s"

3561 +msgstr "忽略摇摆符号引用 %s"

3562 +

3563 +#: refs.c:581 ref-filter.c:2067

3564 +#, c-format

3565 +msgid "ignoring broken ref %s"

3566 +msgstr "忽略损坏的引用 %s"

3567 +

3568 +#: refs.c:685

3569 +#, c-format

3570 +msgid "could not open '%s' for writing: %s"

3571 +msgstr "无法为写入打开 '%s'：%s"

3572 +

3573 +#: refs.c:695 refs.c:746

3574 +#, c-format

3575 +msgid "could not read ref '%s'"

3576 +msgstr "无法读取引用 '%s'"

3577 +

3578 +#: refs.c:701

3579 +#, c-format

3580 +msgid "ref '%s' already exists"

3581 +msgstr "引用 '%s' 已经存在"

3582 +

3583 +#: refs.c:706

3584 +#, c-format

3585 +msgid "unexpected object ID when writing '%s'"

3586 +msgstr "写入 '%s' 时意外的对象 ID"

3587 +

3588 +#: refs.c:714 sequencer.c:385 sequencer.c:2366 sequencer.c:2492

3589 +#: sequencer.c:2506 sequencer.c:2733 sequencer.c:4501 sequencer.c:4564

3590 +#: wrapper.c:656

3591 +#, c-format

3592 +msgid "could not write to '%s'"

3593 +msgstr "不能写入 '%s'"

3594 +

3595 +#: refs.c:741 sequencer.c:4499 sequencer.c:4558 wrapper.c:225 wrapper.c:395

3596 +#: builtin/am.c:780

3597 #, c-format

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

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

3600

2928 -#: refs.c:1880

3601 +#: refs.c:748

3602 +#, c-format

3603 +msgid "unexpected object ID when deleting '%s'"

3604 +msgstr "删除 '%s' 时意外的对象 ID"

3605 +

3606 +#: refs.c:879

3607 +#, c-format

3608 +msgid "log for ref %s has gap after %s"

3609 +msgstr "引用 %s 的日志在 %s 之后有缺口"

3610 +

3611 +#: refs.c:885

3612 +#, c-format

3613 +msgid "log for ref %s unexpectedly ended on %s"

3614 +msgstr "引用 %s 的日志意外终止于 %s "

3615 +

3616 +#: refs.c:943

3617 +#, c-format

3618 +msgid "log for %s is empty"

3619 +msgstr "%s 的日志为空"

3620 +

3621 +#: refs.c:1035

3622 +#, c-format

3623 +msgid "refusing to update ref with bad name '%s'"

3624 +msgstr "拒绝更新有错误名称 '%s' 的引用"

3625 +

3626 +#: refs.c:1111

3627 +#, c-format

3628 +msgid "update_ref failed for ref '%s': %s"

3629 +msgstr "对引用 '%s' 执行 update_ref 失败：%s"

3630 +

3631 +#: refs.c:1853

3632 +#, c-format

3633 +msgid "multiple updates for ref '%s' not allowed"

3634 +msgstr "不允许对引用 '%s' 多次更新"

3635 +

3636 +#: refs.c:1885

3637 msgid "ref updates forbidden inside quarantine environment"

3638 msgstr "在隔离环境中禁止更新引用"

3639

3640 +#: refs.c:1981 refs.c:2011

3641 +#, c-format

3642 +msgid "'%s' exists; cannot create '%s'"

3643 +msgstr "'%s' 已存在，无法创建 '%s'"

3644 +

3645 +#: refs.c:1987 refs.c:2022

3646 +#, c-format

3647 +msgid "cannot process '%s' and '%s' at the same time"

3648 +msgstr "无法同时处理 '%s' 和 '%s'"

3649 +

3650 #: refs/files-backend.c:1191

3651 #, c-format

3652 msgid "could not remove reference %s"

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

3654

2937 -#: refs/files-backend.c:1205 refs/packed-backend.c:1531

2938 -#: refs/packed-backend.c:1541

3655 +#: refs/files-backend.c:1205 refs/packed-backend.c:1532

3656 +#: refs/packed-backend.c:1542

3657 #, c-format

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

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

3660

2943 -#: refs/files-backend.c:1208 refs/packed-backend.c:1544

3661 +#: refs/files-backend.c:1208 refs/packed-backend.c:1545

3662 #, c-format

3663 msgid "could not delete references: %s"

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

3665

2948 -#: ref-filter.c:35 wt-status.c:1850

3666 +#: refspec.c:137

3667 +#, c-format

3668 +msgid "invalid refspec '%s'"

3669 +msgstr "无效的引用表达式：'%s'"

3670 +

3671 +#: ref-filter.c:38 wt-status.c:1850

3672 msgid "gone"

3673 msgstr "丢失"

3674

2952 -#: ref-filter.c:36

3675 +#: ref-filter.c:39

3676 #, c-format

3677 msgid "ahead %d"

3678 msgstr "领先 %d"

3679

2957 -#: ref-filter.c:37

3680 +#: ref-filter.c:40

3681 #, c-format

3682 msgid "behind %d"

3683 msgstr "落后 %d"

3684

2962 -#: ref-filter.c:38

3685 +#: ref-filter.c:41

3686 #, c-format

3687 msgid "ahead %d, behind %d"

3688 msgstr "领先 %d，落后 %d"

3689

2967 -#: ref-filter.c:121

3690 +#: ref-filter.c:137

3691 #, c-format

3692 msgid "expected format: %%(color:<color>)"

3693 msgstr "期望的格式：%%(color:<颜色>)"

3694

2972 -#: ref-filter.c:123

3695 +#: ref-filter.c:139

3696 #, c-format

3697 msgid "unrecognized color: %%(color:%s)"

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

3699

2977 -#: ref-filter.c:145

3700 +#: ref-filter.c:161

3701 #, c-format

3702 msgid "Integer value expected refname:lstrip=%s"

3703 msgstr "期望整数值 refname:lstrip=%s"

3704

2982 -#: ref-filter.c:149

3705 +#: ref-filter.c:165

3706 #, c-format

3707 msgid "Integer value expected refname:rstrip=%s"

3708 msgstr "期望整数值 refname:rstrip=%s"

3709

2987 -#: ref-filter.c:151

3710 +#: ref-filter.c:167

3711 #, c-format

3712 msgid "unrecognized %%(%s) argument: %s"

3713 msgstr "未能识别的 %%(%s) 参数：%s"

3714

2992 -#: ref-filter.c:206

3715 +#: ref-filter.c:222

3716 +#, c-format

3717 +msgid "%%(objecttype) does not take arguments"

3718 +msgstr "%%(objecttype) 不带参数"

3719 +

3720 +#: ref-filter.c:234

3721 +#, c-format

3722 +msgid "%%(objectsize) does not take arguments"

3723 +msgstr "%%(objectsize) 不带参数"

3724 +

3725 +#: ref-filter.c:246

3726 #, c-format

3727 msgid "%%(body) does not take arguments"

3728 msgstr "%%(body) 不带参数"

3729

2997 -#: ref-filter.c:215

3730 +#: ref-filter.c:255

3731 #, c-format

3732 msgid "%%(subject) does not take arguments"

3733 msgstr "%%(subject) 不带参数"

3734

3002 -#: ref-filter.c:235

3735 +#: ref-filter.c:275

3736 #, c-format

3737 msgid "unknown %%(trailers) argument: %s"

3738 msgstr "未知的 %%(trailers) 参数：%s"

3739

3007 -#: ref-filter.c:264

3740 +#: ref-filter.c:304

3741 #, c-format

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

3743 msgstr "期望一个正数 contents:lines=%s"

3744

3012 -#: ref-filter.c:266

3745 +#: ref-filter.c:306

3746 #, c-format

3747 msgid "unrecognized %%(contents) argument: %s"

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

3749

3017 -#: ref-filter.c:281

3750 +#: ref-filter.c:321

3751 #, c-format

3752 msgid "positive value expected objectname:short=%s"

3753 msgstr "期望一个正数 objectname:short=%s"

3754

3022 -#: ref-filter.c:285

3755 +#: ref-filter.c:325

3756 #, c-format

3757 msgid "unrecognized %%(objectname) argument: %s"

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

3759

3027 -#: ref-filter.c:315

3760 +#: ref-filter.c:355

3761 #, c-format

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

3763 msgstr "期望的格式：%%(align:<宽度>,<位置>)"

3764

3032 -#: ref-filter.c:327

3765 +#: ref-filter.c:367

3766 #, c-format

3767 msgid "unrecognized position:%s"

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

3769

3037 -#: ref-filter.c:334

3770 +#: ref-filter.c:374

3771 #, c-format

3772 msgid "unrecognized width:%s"

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

3774

3042 -#: ref-filter.c:343

3775 +#: ref-filter.c:383

3776 #, c-format

3777 msgid "unrecognized %%(align) argument: %s"

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

3779

3047 -#: ref-filter.c:351

3780 +#: ref-filter.c:391

3781 #, c-format

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

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

3784

3052 -#: ref-filter.c:369

3785 +#: ref-filter.c:409

3786 #, c-format

3787 msgid "unrecognized %%(if) argument: %s"

3788 msgstr "未能识别的 %%(if) 参数：%s"

3789

3057 -#: ref-filter.c:464

3790 +#: ref-filter.c:505

3791 #, c-format

3792 msgid "malformed field name: %.*s"

3793 msgstr "格式错误的字段名：%.*s"

3794

3062 -#: ref-filter.c:491

3795 +#: ref-filter.c:532

3796 #, c-format

3797 msgid "unknown field name: %.*s"

3798 msgstr "未知的字段名：%.*s"

3799

3067 -#: ref-filter.c:608

3800 +#: ref-filter.c:656

3801 #, c-format

3802 msgid "format: %%(if) atom used without a %%(then) atom"

3803 msgstr "格式：使用了 %%(if) 元素而没有 %%(then) 元素"

3804

3072 -#: ref-filter.c:671

3805 +#: ref-filter.c:719

3806 #, c-format

3807 msgid "format: %%(then) atom used without an %%(if) atom"

3808 msgstr "格式：使用了 %%(then) 元素而没有 %%(if) 元素"

3809

3077 -#: ref-filter.c:673

3810 +#: ref-filter.c:721

3811 #, c-format

3812 msgid "format: %%(then) atom used more than once"

3813 msgstr "格式：%%(then) 元素用了多次"

3814

3082 -#: ref-filter.c:675

3815 +#: ref-filter.c:723

3816 #, c-format

3817 msgid "format: %%(then) atom used after %%(else)"

3818 msgstr "格式：%%(then) 元素用在了 %%(else) 之后"

3819

3087 -#: ref-filter.c:703

3820 +#: ref-filter.c:751

3821 #, c-format

3822 msgid "format: %%(else) atom used without an %%(if) atom"

3823 msgstr "格式：使用了 %%(else) 元素而没有 %%(if) 元素"

3824

3092 -#: ref-filter.c:705

3825 +#: ref-filter.c:753

3826 #, c-format

3827 msgid "format: %%(else) atom used without a %%(then) atom"

3828 msgstr "格式：使用了 %%(else) 元素而没有 %%(then) 元素"

3829

3097 -#: ref-filter.c:707

3830 +#: ref-filter.c:755

3831 #, c-format

3832 msgid "format: %%(else) atom used more than once"

3833 msgstr "格式：%%(else) 元素用了多次"

3834

3102 -#: ref-filter.c:722

3835 +#: ref-filter.c:770

3836 #, c-format

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

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

3839

3107 -#: ref-filter.c:779

3840 +#: ref-filter.c:827

3841 #, c-format

3842 msgid "malformed format string %s"

3843 msgstr "错误的格式化字符串 %s"

3844

3112 -#: ref-filter.c:1387

3845 +#: ref-filter.c:1416

3846 #, c-format

3847 msgid "(no branch, rebasing %s)"

3848 msgstr "（非分支，正变基 %s）"

3849

3117 -#: ref-filter.c:1390

3850 +#: ref-filter.c:1419

3851 #, c-format

3852 msgid "(no branch, rebasing detached HEAD %s)"

3853 msgstr "（非分支，正变基分离头指针 %s）"

3854

3122 -#: ref-filter.c:1393

3855 +#: ref-filter.c:1422

3856 #, c-format

3857 msgid "(no branch, bisect started on %s)"

3858 msgstr "（非分支，二分查找开始于 %s）"

@@ -3127,7 +3860,7 @@ msgstr "（非分支，二分查找开始于 %s）"

3860 #. TRANSLATORS: make sure this matches "HEAD

3861 #. detached at " in wt-status.c

3862 #.

3130 -#: ref-filter.c:1401

3863 +#: ref-filter.c:1430

3864 #, c-format

3865 msgid "(HEAD detached at %s)"

3866 msgstr "（头指针分离于 %s）"

@@ -3135,147 +3868,142 @@ msgstr "（头指针分离于 %s）"

3868 #. TRANSLATORS: make sure this matches "HEAD

3869 #. detached from " in wt-status.c

3870 #.

3138 -#: ref-filter.c:1408

3871 +#: ref-filter.c:1437

3872 #, c-format

3873 msgid "(HEAD detached from %s)"

3874 msgstr "（头指针分离自 %s）"

3875

3143 -#: ref-filter.c:1412

3876 +#: ref-filter.c:1441

3877 msgid "(no branch)"

3878 msgstr "（非分支）"

3879

3147 -#: ref-filter.c:1442

3880 +#: ref-filter.c:1475 ref-filter.c:1623

3881 #, c-format

3882 msgid "missing object %s for %s"

3883 msgstr "缺失 %2$s 的对象 %1$s"

3884

3152 -#: ref-filter.c:1445

3885 +#: ref-filter.c:1483

3886 #, c-format

3887 msgid "parse_object_buffer failed on %s for %s"

3888 msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"

3889

3157 -#: ref-filter.c:1902

3890 +#: ref-filter.c:1980

3891 #, c-format

3892 msgid "malformed object at '%s'"

3893 msgstr "格式错误的对象 '%s'"

3894

3162 -#: ref-filter.c:1984

3895 +#: ref-filter.c:2062

3896 #, c-format

3897 msgid "ignoring ref with broken name %s"

3898 msgstr "忽略带有错误名称 %s 的引用"

3899

3167 -#: ref-filter.c:1989

3168 -#, c-format

3169 -msgid "ignoring broken ref %s"

3170 -msgstr "忽略损坏的引用 %s"

3171 -

3172 -#: ref-filter.c:2261

3900 +#: ref-filter.c:2340

3901 #, c-format

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

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

3904

3177 -#: ref-filter.c:2365

3905 +#: ref-filter.c:2444

3906 #, c-format

3907 msgid "malformed object name %s"

3908 msgstr "格式错误的对象名 %s"

3909

3182 -#: remote.c:605

3910 +#: remote.c:606

3911 #, c-format

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

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

3914

3187 -#: remote.c:609

3915 +#: remote.c:610

3916 #, c-format

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

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

3919

3192 -#: remote.c:613

3920 +#: remote.c:614

3921 #, c-format

3922 msgid "%s tracks both %s and %s"

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

3924

3197 -#: remote.c:621

3925 +#: remote.c:622

3926 msgid "Internal error"

3927 msgstr "内部错误"

3928

3201 -#: remote.c:1534 remote.c:1635

3929 +#: remote.c:1536 remote.c:1637

3930 msgid "HEAD does not point to a branch"

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

3932

3205 -#: remote.c:1543

3933 +#: remote.c:1545

3934 #, c-format

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

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

3937

3210 -#: remote.c:1546

3938 +#: remote.c:1548

3939 #, c-format

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

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

3942

3215 -#: remote.c:1552

3943 +#: remote.c:1554

3944 #, c-format

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

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

3947

3220 -#: remote.c:1567

3948 +#: remote.c:1569

3949 #, c-format

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

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

3952

3225 -#: remote.c:1579

3953 +#: remote.c:1581

3954 #, c-format

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

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

3957

3230 -#: remote.c:1589

3958 +#: remote.c:1591

3959 #, c-format

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

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

3962

3235 -#: remote.c:1602

3963 +#: remote.c:1604

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

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

3966

3239 -#: remote.c:1624

3967 +#: remote.c:1626

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

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

3970

3243 -#: remote.c:1939

3971 +#: remote.c:1951

3972 #, c-format

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

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

3975

3248 -#: remote.c:1943

3976 +#: remote.c:1955

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

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

3979

3252 -#: remote.c:1946

3980 +#: remote.c:1958

3981 #, c-format

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

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

3984

3257 -#: remote.c:1950

3985 +#: remote.c:1962

3986 #, c-format

3987 msgid "Your branch and '%s' refer to different commits.\n"

3988 msgstr "您的分支和 '%s' 指向不同的提交。\n"

3989

3262 -#: remote.c:1953

3990 +#: remote.c:1965

3991 #, c-format

3992 msgid " (use \"%s\" for details)\n"

3993 msgstr " （使用 \"%s\" 查看详情）\n"

3994

3267 -#: remote.c:1957

3995 +#: remote.c:1969

3996 #, c-format

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

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

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

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

4001

3274 -#: remote.c:1963

4002 +#: remote.c:1975

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

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

4005

3278 -#: remote.c:1966

4006 +#: remote.c:1978

4007 #, c-format

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

4009 msgid_plural ""

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

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

4013

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

3287 -#: remote.c:1974

4015 +#: remote.c:1986

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

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

4018

3291 -#: remote.c:1977

4019 +#: remote.c:1989

4020 #, c-format

4021 msgid ""

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

@@ -3304,20 +4032,35 @@ msgstr[1] ""

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

4033

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

3307 -#: remote.c:1987

4035 +#: remote.c:1999

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

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

4038

3311 -#: revision.c:2289

4039 +#: replace-object.c:20

4040 +#, c-format

4041 +msgid "bad replace ref name: %s"

4042 +msgstr "错误的替换引用名称：%s"

4043 +

4044 +#: replace-object.c:29

4045 +#, c-format

4046 +msgid "duplicate replace ref: %s"

4047 +msgstr "重复的替换引用：%s"

4048 +

4049 +#: replace-object.c:72

4050 +#, c-format

4051 +msgid "replace depth too high for object %s"

4052 +msgstr "对象 %s 的替换层级太深"

4053 +

4054 +#: revision.c:2305

4055 msgid "your current branch appears to be broken"

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

4057

3315 -#: revision.c:2292

4058 +#: revision.c:2308

4059 #, c-format

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

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

4062

3320 -#: revision.c:2489

4063 +#: revision.c:2505

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

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

4066

@@ -3334,70 +4077,70 @@ msgstr ""

4077 "因为没有将钩子 '%s' 设置为可执行，钩子被忽略。您可以通过\n"

4078 "配置 `git config advice.ignoredHook false` 来关闭这条警告。"

4079

3337 -#: send-pack.c:141

4080 +#: send-pack.c:142

4081 msgid "unexpected flush packet while reading remote unpack status"

4082 msgstr "读取远程解包状态时收到意外的 flush 包"

4083

3341 -#: send-pack.c:143

4084 +#: send-pack.c:144

4085 #, c-format

4086 msgid "unable to parse remote unpack status: %s"

4087 msgstr "不能解析远程解包状态：%s"

4088

3346 -#: send-pack.c:145

4089 +#: send-pack.c:146

4090 #, c-format

4091 msgid "remote unpack failed: %s"

4092 msgstr "远程解包失败：%s"

4093

3351 -#: send-pack.c:308

4094 +#: send-pack.c:309

4095 msgid "failed to sign the push certificate"

3353 -msgstr "无法为推送证书签名"

4096 +msgstr "为推送证书签名失败"

4097

3355 -#: send-pack.c:421

4098 +#: send-pack.c:422

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

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

4101

3359 -#: send-pack.c:423

4102 +#: send-pack.c:424

4103 msgid ""

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

4105 "signed push"

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

4107

3365 -#: send-pack.c:435

4108 +#: send-pack.c:436

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

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

4111

3369 -#: send-pack.c:440

4112 +#: send-pack.c:441

4113 msgid "the receiving end does not support push options"

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

4115

3373 -#: sequencer.c:175

4116 +#: sequencer.c:177

4117 #, c-format

4118 msgid "invalid commit message cleanup mode '%s'"

4119 msgstr "无效的提交信息清理模式 '%s'"

4120

3378 -#: sequencer.c:275

4121 +#: sequencer.c:278

4122 #, c-format

4123 msgid "could not delete '%s'"

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

4125

3383 -#: sequencer.c:301

4126 +#: sequencer.c:304

4127 msgid "revert"

4128 msgstr "还原"

4129

3387 -#: sequencer.c:303

4130 +#: sequencer.c:306

4131 msgid "cherry-pick"

4132 msgstr "拣选"

4133

3391 -#: sequencer.c:305

4134 +#: sequencer.c:308

4135 msgid "rebase -i"

4136 msgstr "rebase -i"

4137

3395 -#: sequencer.c:307

4138 +#: sequencer.c:310

4139 #, c-format

3397 -msgid "Unknown action: %d"

4140 +msgid "unknown action: %d"

4141 msgstr "未知动作：%d"

4142

3400 -#: sequencer.c:364

4143 +#: sequencer.c:367

4144 msgid ""

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

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

@@ -3405,7 +4148,7 @@ msgstr ""

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

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

4150

3408 -#: sequencer.c:367

4151 +#: sequencer.c:370

4152 msgid ""

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

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

@@ -3414,45 +4157,39 @@ msgstr ""

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

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

4159

3417 -#: sequencer.c:380 sequencer.c:2468

4160 +#: sequencer.c:383 sequencer.c:2488

4161 #, c-format

4162 msgid "could not lock '%s'"

4163 msgstr "不能锁定 '%s'"

4164

3422 -#: sequencer.c:382 sequencer.c:2346 sequencer.c:2472 sequencer.c:2486

3423 -#: sequencer.c:2694 sequencer.c:4336 sequencer.c:4399 wrapper.c:656

3424 -#, c-format

3425 -msgid "could not write to '%s'"

3426 -msgstr "不能写入 '%s'"

3427 -

3428 -#: sequencer.c:387

4165 +#: sequencer.c:390

4166 #, c-format

4167 msgid "could not write eol to '%s'"

4168 msgstr "不能将换行符写入 '%s'"

4169

3433 -#: sequencer.c:392 sequencer.c:2351 sequencer.c:2474 sequencer.c:2488

3434 -#: sequencer.c:2702

4170 +#: sequencer.c:395 sequencer.c:2371 sequencer.c:2494 sequencer.c:2508

4171 +#: sequencer.c:2741

4172 #, c-format

4173 msgid "failed to finalize '%s'"

4174 msgstr "无法完成 '%s'"

4175

3439 -#: sequencer.c:415 sequencer.c:804 sequencer.c:1493 sequencer.c:2371

3440 -#: sequencer.c:2684 sequencer.c:2788 builtin/am.c:259 builtin/commit.c:727

3441 -#: builtin/merge.c:1046

4176 +#: sequencer.c:418 sequencer.c:816 sequencer.c:1505 sequencer.c:2391

4177 +#: sequencer.c:2723 sequencer.c:2827 builtin/am.c:260 builtin/commit.c:740

4178 +#: builtin/merge.c:1081

4179 #, c-format

4180 msgid "could not read '%s'"

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

4182

3446 -#: sequencer.c:441

4183 +#: sequencer.c:444

4184 #, c-format

4185 msgid "your local changes would be overwritten by %s."

4186 msgstr "您的本地修改将被%s覆盖。"

4187

3451 -#: sequencer.c:445

4188 +#: sequencer.c:448

4189 msgid "commit your changes or stash them to proceed."

4190 msgstr "提交您的修改或贮藏后再继续。"

4191

3455 -#: sequencer.c:474

4192 +#: sequencer.c:477

4193 #, c-format

4194 msgid "%s: fast-forward"

4195 msgstr "%s：快进"

@@ -3460,20 +4197,35 @@ msgstr "%s：快进"

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

4198 #. "rebase -i".

4199 #.

3463 -#: sequencer.c:563

4200 +#: sequencer.c:566

4201 #, c-format

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

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

4204

3468 -#: sequencer.c:579

4205 +#: sequencer.c:582

4206 msgid "unable to update cache tree"

4207 msgstr "不能更新缓存树"

4208

3472 -#: sequencer.c:592

4209 +#: sequencer.c:595

4210 msgid "could not resolve HEAD commit"

4211 msgstr "不能解析 HEAD 提交"

4212

3476 -#: sequencer.c:749

4213 +#: sequencer.c:723 sequencer.c:740

4214 +#, c-format

4215 +msgid "could not parse '%s' (looking for '%s')"

4216 +msgstr "不能解析 '%s'（查找 '%s'）"

4217 +

4218 +#: sequencer.c:731

4219 +#, c-format

4220 +msgid "bad quoting on %s value in '%s'"

4221 +msgstr "'%2$s' 中的值 %1$s 有错误引用"

4222 +

4223 +#: sequencer.c:747

4224 +#, c-format

4225 +msgid "invalid date format '%s' in '%s'"

4226 +msgstr "'%2$s' 中无效的日期格式 '%1$s'"

4227 +

4228 +#: sequencer.c:761

4229 #, c-format

4230 msgid ""

4231 "you have staged changes in your working tree\n"

@@ -3502,15 +4254,15 @@ msgstr ""

4254 "\n"

4255 " git rebase --continue\n"

4256

3505 -#: sequencer.c:818

4257 +#: sequencer.c:830

4258 msgid "writing root commit"

4259 msgstr "写根提交"

4260

3509 -#: sequencer.c:1043

4261 +#: sequencer.c:1055

4262 msgid "'prepare-commit-msg' hook failed"

4263 msgstr "'prepare-commit-msg' 钩子失败"

4264

3513 -#: sequencer.c:1050

4265 +#: sequencer.c:1062

4266 msgid ""

4267 "Your name and email address were configured automatically based\n"

4268 "on your username and hostname. Please check that they are accurate.\n"

@@ -3534,7 +4286,7 @@ msgstr ""

4286 "\n"

4287 " git commit --amend --reset-author\n"

4288

3537 -#: sequencer.c:1063

4289 +#: sequencer.c:1075

4290 msgid ""

4291 "Your name and email address were configured automatically based\n"

4292 "on your username and hostname. Please check that they are accurate.\n"

@@ -3557,315 +4309,344 @@ msgstr ""

4309 "\n"

4310 " git commit --amend --reset-author\n"

4311

3560 -#: sequencer.c:1103

4312 +#: sequencer.c:1115

4313 msgid "couldn't look up newly created commit"

4314 msgstr "无法找到新创建的提交"

4315

3564 -#: sequencer.c:1105

4316 +#: sequencer.c:1117

4317 msgid "could not parse newly created commit"

4318 msgstr "不能解析新创建的提交"

4319

3568 -#: sequencer.c:1151

4320 +#: sequencer.c:1163

4321 msgid "unable to resolve HEAD after creating commit"

4322 msgstr "创建提交后，不能解析 HEAD"

4323

3572 -#: sequencer.c:1153

4324 +#: sequencer.c:1165

4325 msgid "detached HEAD"

4326 msgstr "分离头指针"

4327

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

3577 -#: sequencer.c:1157

4329 +#: sequencer.c:1169

4330 msgid " (root-commit)"

4331 msgstr "（根提交）"

4332

3581 -#: sequencer.c:1178

4333 +#: sequencer.c:1190

4334 msgid "could not parse HEAD"

4335 msgstr "不能解析 HEAD"

4336

3585 -#: sequencer.c:1180

4337 +#: sequencer.c:1192

4338 #, c-format

4339 msgid "HEAD %s is not a commit!"

4340 msgstr "HEAD %s 不是一个提交！"

4341

3590 -#: sequencer.c:1184 builtin/commit.c:1528

4342 +#: sequencer.c:1196 builtin/commit.c:1528

4343 msgid "could not parse HEAD commit"

4344 msgstr "不能解析 HEAD 提交"

4345

3594 -#: sequencer.c:1235 sequencer.c:1832

4346 +#: sequencer.c:1247 sequencer.c:1845

4347 msgid "unable to parse commit author"

4348 msgstr "不能解析提交作者"

4349

3598 -#: sequencer.c:1245 builtin/am.c:1630 builtin/merge.c:645

4350 +#: sequencer.c:1257 builtin/am.c:1632 builtin/merge.c:675

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

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

4353

3602 -#: sequencer.c:1262 sequencer.c:1317

4354 +#: sequencer.c:1274 sequencer.c:1329

4355 #, c-format

4356 msgid "unable to read commit message from '%s'"

4357 msgstr "不能从 '%s' 读取提交说明"

4358

3607 -#: sequencer.c:1284 builtin/am.c:1650 builtin/commit.c:1631 builtin/merge.c:825

3608 -#: builtin/merge.c:850

4359 +#: sequencer.c:1296 builtin/am.c:1653 builtin/commit.c:1631 builtin/merge.c:855

4360 +#: builtin/merge.c:880

4361 msgid "failed to write commit object"

3610 -msgstr "无法写提交对象"

4362 +msgstr "写提交对象失败"

4363

3612 -#: sequencer.c:1344

4364 +#: sequencer.c:1356

4365 #, c-format

4366 msgid "could not parse commit %s"

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

4368

3617 -#: sequencer.c:1349

4369 +#: sequencer.c:1361

4370 #, c-format

4371 msgid "could not parse parent commit %s"

4372 msgstr "不能解析父提交 %s"

4373

3622 -#: sequencer.c:1500 sequencer.c:1525

4374 +#: sequencer.c:1457 sequencer.c:1565

4375 +#, c-format

4376 +msgid "unknown command: %d"

4377 +msgstr "未知命令：%d"

4378 +

4379 +#: sequencer.c:1512 sequencer.c:1537

4380 #, c-format

4381 msgid "This is a combination of %d commits."

4382 msgstr "这是一个 %d 个提交的组合。"

4383

3627 -#: sequencer.c:1510 sequencer.c:4355

4384 +#: sequencer.c:1522 sequencer.c:4520

4385 msgid "need a HEAD to fixup"

4386 msgstr "需要一个 HEAD 来修复"

4387

3631 -#: sequencer.c:1512 sequencer.c:2729

4388 +#: sequencer.c:1524 sequencer.c:2768

4389 msgid "could not read HEAD"

4390 msgstr "不能读取 HEAD"

4391

3635 -#: sequencer.c:1514

4392 +#: sequencer.c:1526

4393 msgid "could not read HEAD's commit message"

4394 msgstr "不能读取 HEAD 的提交说明"

4395

3639 -#: sequencer.c:1520

4396 +#: sequencer.c:1532

4397 #, c-format

4398 msgid "cannot write '%s'"

4399 msgstr "不能写 '%s'"

4400

3644 -#: sequencer.c:1527 git-rebase--interactive.sh:457

4401 +#: sequencer.c:1539 git-rebase--preserve-merges.sh:441

4402 msgid "This is the 1st commit message:"

4403 msgstr "这是第一个提交说明："

4404

3648 -#: sequencer.c:1535

4405 +#: sequencer.c:1547

4406 #, c-format

4407 msgid "could not read commit message of %s"

4408 msgstr "不能读取 %s 的提交说明"

4409

3653 -#: sequencer.c:1542

4410 +#: sequencer.c:1554

4411 #, c-format

4412 msgid "This is the commit message #%d:"

4413 msgstr "这是提交说明 #%d："

4414

3658 -#: sequencer.c:1548

4415 +#: sequencer.c:1560

4416 #, c-format

4417 msgid "The commit message #%d will be skipped:"

4418 msgstr "提交说明 #%d 将被跳过："

4419

3663 -#: sequencer.c:1553

3664 -#, c-format

3665 -msgid "unknown command: %d"

3666 -msgstr "未知命令：%d"

3667 -

3668 -#: sequencer.c:1631

4420 +#: sequencer.c:1643

4421 msgid "your index file is unmerged."

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

4423

3672 -#: sequencer.c:1638

4424 +#: sequencer.c:1650

4425 msgid "cannot fixup root commit"

4426 msgstr "不能修复根提交"

4427

3676 -#: sequencer.c:1657

4428 +#: sequencer.c:1669

4429 #, c-format

4430 msgid "commit %s is a merge but no -m option was given."

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

4432

3681 -#: sequencer.c:1665

4433 +#: sequencer.c:1677

4434 #, c-format

4435 msgid "commit %s does not have parent %d"

4436 msgstr "提交 %s 没有第 %d 个父提交"

4437

3686 -#: sequencer.c:1669

4438 +#: sequencer.c:1681

4439 #, c-format

4440 msgid "mainline was specified but commit %s is not a merge."

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

4442

3691 -#: sequencer.c:1675

4443 +#: sequencer.c:1687

4444 #, c-format

4445 msgid "cannot get commit message for %s"

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

4447

4448 #. TRANSLATORS: The first %s will be a "todo" command like

4449 #. "revert" or "pick", the second %s a SHA1.

3698 -#: sequencer.c:1694

4450 +#: sequencer.c:1706

4451 #, c-format

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

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

4454

3703 -#: sequencer.c:1759

4455 +#: sequencer.c:1771

4456 #, c-format

4457 msgid "could not rename '%s' to '%s'"

4458 msgstr "不能将 '%s' 重命名为 '%s'"

4459

3708 -#: sequencer.c:1813

4460 +#: sequencer.c:1826

4461 #, c-format

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

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

4464

3713 -#: sequencer.c:1814

4465 +#: sequencer.c:1827

4466 #, c-format

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

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

4469

3718 -#: sequencer.c:1864

3719 -msgid "empty commit set passed"

3720 -msgstr "提供了空的提交集"

3721 -

3722 -#: sequencer.c:1874

4470 +#: sequencer.c:1885

4471 #, c-format

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

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

4474

3727 -#: sequencer.c:1881

4475 +#: sequencer.c:1892

4476 #, c-format

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

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

4479

3732 -#: sequencer.c:1961

4480 +#: sequencer.c:1972

4481 #, c-format

4482 msgid "%s does not accept arguments: '%s'"

4483 msgstr "%s 不接受参数：'%s'"

4484

3737 -#: sequencer.c:1970

4485 +#: sequencer.c:1981

4486 #, c-format

4487 msgid "missing arguments for %s"

4488 msgstr "缺少 %s 的参数"

4489

3742 -#: sequencer.c:2029

4490 +#: sequencer.c:2040

4491 #, c-format

4492 msgid "invalid line %d: %.*s"

4493 msgstr "无效行 %d：%.*s"

4494

3747 -#: sequencer.c:2037

4495 +#: sequencer.c:2048

4496 #, c-format

4497 msgid "cannot '%s' without a previous commit"

4498 msgstr "没有父提交的情况下不能 '%s'"

4499

3752 -#: sequencer.c:2085 sequencer.c:4138 sequencer.c:4173

4500 +#: sequencer.c:2096 sequencer.c:4277 sequencer.c:4333

4501 #, c-format

4502 msgid "could not read '%s'."

4503 msgstr "不能读取 '%s'。"

4504

3757 -#: sequencer.c:2108

4505 +#: sequencer.c:2119

4506 msgid "please fix this using 'git rebase --edit-todo'."

4507 msgstr "请用 'git rebase --edit-todo' 来修改。"

4508

3761 -#: sequencer.c:2110

4509 +#: sequencer.c:2121

4510 #, c-format

4511 msgid "unusable instruction sheet: '%s'"

4512 msgstr "不可用的指令清单：'%s'"

4513

3766 -#: sequencer.c:2115

4514 +#: sequencer.c:2126

4515 msgid "no commits parsed."

4516 msgstr "没有解析提交。"

4517

3770 -#: sequencer.c:2126

4518 +#: sequencer.c:2137

4519 msgid "cannot cherry-pick during a revert."

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

4521

3774 -#: sequencer.c:2128

4522 +#: sequencer.c:2139

4523 msgid "cannot revert during a cherry-pick."

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

4525

3778 -#: sequencer.c:2195

3779 -#, c-format

3780 -msgid "invalid key: %s"

3781 -msgstr "无效键名：%s"

3782 -

3783 -#: sequencer.c:2198

4526 +#: sequencer.c:2209

4527 #, c-format

4528 msgid "invalid value for %s: %s"

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

4530

3788 -#: sequencer.c:2269

4531 +#: sequencer.c:2285

4532 msgid "unusable squash-onto"

4533 msgstr "不可用的 squash-onto"

4534

3792 -#: sequencer.c:2285

4535 +#: sequencer.c:2301

4536 #, c-format

4537 msgid "malformed options sheet: '%s'"

4538 msgstr "格式错误的选项清单：'%s'"

4539

3797 -#: sequencer.c:2323

4540 +#: sequencer.c:2335 sequencer.c:3775

4541 +msgid "empty commit set passed"

4542 +msgstr "提供了空的提交集"

4543 +

4544 +#: sequencer.c:2343

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

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

4547

3801 -#: sequencer.c:2324

4548 +#: sequencer.c:2344

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

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

4551

3805 -#: sequencer.c:2327

4552 +#: sequencer.c:2347

4553 #, c-format

4554 msgid "could not create sequencer directory '%s'"

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

4556

3810 -#: sequencer.c:2341

4557 +#: sequencer.c:2361

4558 msgid "could not lock HEAD"

4559 msgstr "不能锁定 HEAD"

4560

3814 -#: sequencer.c:2396 sequencer.c:3403

4561 +#: sequencer.c:2416 sequencer.c:3543

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

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

4564

3818 -#: sequencer.c:2398

4565 +#: sequencer.c:2418

4566 msgid "cannot resolve HEAD"

4567 msgstr "不能解析 HEAD"

4568

3822 -#: sequencer.c:2400 sequencer.c:2435

4569 +#: sequencer.c:2420 sequencer.c:2455

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

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

4572

3826 -#: sequencer.c:2421 builtin/grep.c:720

4573 +#: sequencer.c:2441 builtin/grep.c:721

4574 #, c-format

4575 msgid "cannot open '%s'"

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

4577

3831 -#: sequencer.c:2423

4578 +#: sequencer.c:2443

4579 #, c-format

4580 msgid "cannot read '%s': %s"

4581 msgstr "不能读取 '%s'：%s"

4582

3836 -#: sequencer.c:2424

4583 +#: sequencer.c:2444

4584 msgid "unexpected end of file"

4585 msgstr "意外的文件结束"

4586

3840 -#: sequencer.c:2430

4587 +#: sequencer.c:2450

4588 #, c-format

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

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

4591

3845 -#: sequencer.c:2441

4592 +#: sequencer.c:2461

4593 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

4594 msgstr "您好像移动了 HEAD。未能回退，检查您的 HEAD！"

4595

3849 -#: sequencer.c:2545 sequencer.c:3321

4596 +#: sequencer.c:2565 sequencer.c:3461

4597 #, c-format

4598 msgid "could not update %s"

4599 msgstr "不能更新 %s"

4600

3854 -#: sequencer.c:2583 sequencer.c:3301

4601 +#: sequencer.c:2603 sequencer.c:3441

4602 msgid "cannot read HEAD"

4603 msgstr "不能读取 HEAD"

4604

3858 -#: sequencer.c:2618 sequencer.c:2622 builtin/difftool.c:639

4605 +#: sequencer.c:2618

4606 +#, c-format

4607 +msgid "unable to copy '%s' to '%s'"

4608 +msgstr "无法拷贝 '%s' 至 '%s'"

4609 +

4610 +#: sequencer.c:2626

4611 +#, c-format

4612 +msgid ""

4613 +"You can amend the commit now, with\n"

4614 +"\n"

4615 +" git commit --amend %s\n"

4616 +"\n"

4617 +"Once you are satisfied with your changes, run\n"

4618 +"\n"

4619 +" git rebase --continue\n"

4620 +msgstr ""

4621 +"您现在可以修补这个提交，使用\n"

4622 +"\n"

4623 +" git commit --amend %s\n"

4624 +"\n"

4625 +"当您对变更感到满意，执行\n"

4626 +"\n"

4627 +" git rebase --continue\n"

4628 +

4629 +#: sequencer.c:2636

4630 +#, c-format

4631 +msgid "Could not apply %s... %.*s"

4632 +msgstr "不能应用 %s... %.*s"

4633 +

4634 +#: sequencer.c:2643

4635 +#, c-format

4636 +msgid "Could not merge %.*s"

4637 +msgstr "不能合并 %.*s"

4638 +

4639 +#: sequencer.c:2654 sequencer.c:2658 builtin/difftool.c:640

4640 #, c-format

4641 msgid "could not copy '%s' to '%s'"

4642 msgstr "不能拷贝 '%s' 至 '%s'"

4643

3863 -#: sequencer.c:2641

4644 +#: sequencer.c:2680 sequencer.c:3095

4645 msgid "could not read index"

4646 msgstr "不能读取索引"

4647

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

3868 -#: sequencer.c:2646

4649 +#: sequencer.c:2685

4650 #, c-format

4651 msgid ""

4652 "execution failed: %s\n"

@@ -3880,11 +4661,11 @@ msgstr ""

4661 " git rebase --continue\n"

4662 "\n"

4663

3883 -#: sequencer.c:2652

4664 +#: sequencer.c:2691

4665 msgid "and made changes to the index and/or the working tree\n"

4666 msgstr "并且修改索引和/或工作区\n"

4667

3887 -#: sequencer.c:2658

4668 +#: sequencer.c:2697

4669 #, c-format

4670 msgid ""

4671 "execution succeeded: %s\n"

@@ -3901,62 +4682,81 @@ msgstr ""

4682 " git rebase --continue\n"

4683 "\n"

4684

3904 -#: sequencer.c:2771

4685 +#: sequencer.c:2758

4686 +#, c-format

4687 +msgid "illegal label name: '%.*s'"

4688 +msgstr "非法的标签名称：'%.*s'"

4689 +

4690 +#: sequencer.c:2810

4691 msgid "writing fake root commit"

4692 msgstr "写伪根提交"

4693

3908 -#: sequencer.c:2776

4694 +#: sequencer.c:2815

4695 msgid "writing squash-onto"

4696 msgstr "写入 squash-onto"

4697

3912 -#: sequencer.c:2811

4698 +#: sequencer.c:2850

4699 #, c-format

4700 msgid "failed to find tree of %s"

4701 msgstr "无法找到 %s 指向的树。"

4702

3917 -#: sequencer.c:2829

4703 +#: sequencer.c:2868

4704 msgid "could not write index"

4705 msgstr "不能写入索引"

4706

3921 -#: sequencer.c:2861

4707 +#: sequencer.c:2895

4708 +#, c-format

4709 +msgid "could not resolve '%s'"

4710 +msgstr "无法解析 '%s'"

4711 +

4712 +#: sequencer.c:2921

4713 msgid "cannot merge without a current revision"

4714 msgstr "没有当前版本不能合并"

4715

3925 -#: sequencer.c:2884

4716 +#: sequencer.c:2943

4717 #, c-format

3927 -msgid "could not resolve '%s'"

3928 -msgstr "无法解析 '%s'"

4718 +msgid "unable to parse '%.*s'"

4719 +msgstr "无法解析 '%.*s'"

4720 +

4721 +#: sequencer.c:2952

4722 +#, c-format

4723 +msgid "nothing to merge: '%.*s'"

4724 +msgstr "无可用合并：'%.*s'"

4725 +

4726 +#: sequencer.c:2964

4727 +msgid "octopus merge cannot be executed on top of a [new root]"

4728 +msgstr "章鱼合并不能在一个新的根提交上执行"

4729

3930 -#: sequencer.c:2906

4730 +#: sequencer.c:2979

4731 #, c-format

4732 msgid "could not get commit message of '%s'"

4733 msgstr "不能获取 '%s' 的提交说明"

4734

3935 -#: sequencer.c:2916 sequencer.c:2941

4735 +#: sequencer.c:2989 sequencer.c:3015

4736 #, c-format

4737 msgid "could not write '%s'"

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

4739

3940 -#: sequencer.c:3005

4740 +#: sequencer.c:3127

4741 #, c-format

4742 msgid "could not even attempt to merge '%.*s'"

4743 msgstr "甚至不能尝试合并 '%.*s'"

4744

3945 -#: sequencer.c:3021

4745 +#: sequencer.c:3143

4746 msgid "merge: Unable to write new index file"

4747 msgstr "合并：无法写入新索引文件"

4748

3949 -#: sequencer.c:3088

4749 +#: sequencer.c:3211

4750 #, c-format

4751 msgid "Applied autostash.\n"

4752 msgstr "已应用 autostash。\n"

4753

3954 -#: sequencer.c:3100

4754 +#: sequencer.c:3223

4755 #, c-format

4756 msgid "cannot store %s"

4757 msgstr "不能存储 %s"

4758

3959 -#: sequencer.c:3103 git-rebase.sh:188

4759 +#: sequencer.c:3226 git-rebase.sh:188

4760 #, c-format

4761 msgid ""

4762 "Applying autostash resulted in conflicts.\n"

@@ -3967,7 +4767,7 @@ msgstr ""

4767 "您的修改安全地保存在贮藏区中。\n"

4768 "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"

4769

3970 -#: sequencer.c:3134

4770 +#: sequencer.c:3257

4771 #, c-format

4772 msgid ""

4773 "Could not execute the todo command\n"

@@ -3987,48 +4787,48 @@ msgstr ""

4787 " git rebase --edit-todo\n"

4788 " git rebase --continue\n"

4789

3990 -#: sequencer.c:3202

4790 +#: sequencer.c:3325

4791 #, c-format

4792 msgid "Stopped at %s... %.*s\n"

4793 msgstr "停止在 %s... %.*s\n"

4794

3995 -#: sequencer.c:3264

4795 +#: sequencer.c:3404

4796 #, c-format

4797 msgid "unknown command %d"

4798 msgstr "未知命令 %d"

4799

4000 -#: sequencer.c:3309

4800 +#: sequencer.c:3449

4801 msgid "could not read orig-head"

4802 msgstr "不能读取 orig-head"

4803

4004 -#: sequencer.c:3314 sequencer.c:4352

4804 +#: sequencer.c:3454 sequencer.c:4517

4805 msgid "could not read 'onto'"

4806 msgstr "不能读取 'onto'"

4807

4008 -#: sequencer.c:3328

4808 +#: sequencer.c:3468

4809 #, c-format

4810 msgid "could not update HEAD to %s"

4811 msgstr "不能更新 HEAD 为 %s"

4812

4013 -#: sequencer.c:3414

4813 +#: sequencer.c:3554

4814 msgid "cannot rebase: You have unstaged changes."

4815 msgstr "不能变基：您有未暂存的变更。"

4816

4017 -#: sequencer.c:3423

4817 +#: sequencer.c:3563

4818 msgid "cannot amend non-existing commit"

4819 msgstr "不能修补不存在的提交"

4820

4021 -#: sequencer.c:3425

4821 +#: sequencer.c:3565

4822 #, c-format

4823 msgid "invalid file: '%s'"

4824 msgstr "无效文件：'%s'"

4825

4026 -#: sequencer.c:3427

4826 +#: sequencer.c:3567

4827 #, c-format

4828 msgid "invalid contents: '%s'"

4829 msgstr "无效内容：'%s'"

4830

4031 -#: sequencer.c:3430

4831 +#: sequencer.c:3570

4832 msgid ""

4833 "\n"

4834 "You have uncommitted changes in your working tree. Please, commit them\n"

@@ -4037,53 +4837,53 @@ msgstr ""

4837 "\n"

4838 "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"

4839

4040 -#: sequencer.c:3455 sequencer.c:3493

4840 +#: sequencer.c:3595 sequencer.c:3633

4841 #, c-format

4842 msgid "could not write file: '%s'"

4843 msgstr "不能写入文件：'%s'"

4844

4045 -#: sequencer.c:3508

4845 +#: sequencer.c:3648

4846 msgid "could not remove CHERRY_PICK_HEAD"

4847 msgstr "不能删除 CHERRY_PICK_HEAD"

4848

4049 -#: sequencer.c:3515

4849 +#: sequencer.c:3655

4850 msgid "could not commit staged changes."

4851 msgstr "不能提交暂存的修改。"

4852

4053 -#: sequencer.c:3612

4853 +#: sequencer.c:3752

4854 #, c-format

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

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

4857

4058 -#: sequencer.c:3616

4858 +#: sequencer.c:3756

4859 #, c-format

4860 msgid "%s: bad revision"

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

4862

4063 -#: sequencer.c:3649

4863 +#: sequencer.c:3791

4864 msgid "can't revert as initial commit"

4865 msgstr "不能作为初始提交回退"

4866

4067 -#: sequencer.c:4098

4867 +#: sequencer.c:4238

4868 msgid "make_script: unhandled options"

4869 msgstr "make_script：有未能处理的选项"

4870

4071 -#: sequencer.c:4101

4871 +#: sequencer.c:4241

4872 msgid "make_script: error preparing revisions"

4873 msgstr "make_script：准备版本时错误"

4874

4075 -#: sequencer.c:4142 sequencer.c:4177

4875 +#: sequencer.c:4281 sequencer.c:4337

4876 #, c-format

4877 msgid "unusable todo list: '%s'"

4878 msgstr "不可用的待办列表：'%s'"

4879

4080 -#: sequencer.c:4236

4880 +#: sequencer.c:4396

4881 #, c-format

4882 msgid ""

4883 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."

4884 msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。"

4885

4086 -#: sequencer.c:4302

4886 +#: sequencer.c:4466

4887 #, c-format

4888 msgid ""

4889 "Warning: some commits may have been dropped accidentally.\n"

@@ -4092,7 +4892,7 @@ msgstr ""

4892 "警告：一些提交可能被意外丢弃。\n"

4893 "丢弃的提交（从新到旧）：\n"

4894

4095 -#: sequencer.c:4309

4895 +#: sequencer.c:4473

4896 #, c-format

4897 msgid ""

4898 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"

@@ -4108,7 +4908,7 @@ msgstr ""

4908 "可选值有：ignore、warn、error。\n"

l10n: zh_CN: for git v2.19.0 l10n round 1 to 2