5809aa05f7 · matheusbsbs/matheus-bagliano

@@ -3,6 +3,7 @@

4 # This file is distributed under the same license as the Git package.

5 # Contributors:

6 +# - Fangyi Zhou <fangyi.zhou AT yuriko.moe>

7 # - Jiang Xin <worldhello.net AT gmail.com>

8 # - Lian Cheng <rhythm.mail AT gmail.com>

9 # - Ray Chen <oldsharp AT gmail.com>

@@ -137,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"

140 -"POT-Creation-Date: 2017-10-17 09:44+0800\n"

141 -"PO-Revision-Date: 2017-12-02 17:15+0800\n"

141 +"POT-Creation-Date: 2018-01-07 07:50+0800\n"

142 +"PO-Revision-Date: 2018-01-09 09:53+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"

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

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

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

150

150 -#: advice.c:58

151 +#: advice.c:62

152 #, c-format

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

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

155

155 -#: advice.c:86

156 +#: advice.c:90

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

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

159

159 -#: advice.c:88

160 +#: advice.c:92

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

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

163

163 -#: advice.c:90

164 +#: advice.c:94

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

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

167

167 -#: advice.c:92

168 +#: advice.c:96

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

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

171

171 -#: advice.c:94

172 +#: advice.c:98

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

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

175

175 -#: advice.c:96

176 +#: advice.c:100

177 #, c-format

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

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

180

180 -#: advice.c:104

181 +#: advice.c:108

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

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

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

187 "解决方案并提交。"

188

188 -#: advice.c:112

189 +#: advice.c:116

190 msgid "Exiting because of an unresolved conflict."

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

192

192 -#: advice.c:117 builtin/merge.c:1211

193 +#: advice.c:121 builtin/merge.c:1213

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

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

196

196 -#: advice.c:119

197 +#: advice.c:123

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

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

200

200 -#: advice.c:120

201 +#: advice.c:124

202 msgid "Exiting because of unfinished merge."

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

204

204 -#: advice.c:126

205 +#: advice.c:130

206 #, c-format

207 msgid ""

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

@@ -238,82 +239,82 @@ msgstr "未能识别的空白字符选项 '%s'"

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

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

241

241 -#: apply.c:125

242 +#: apply.c:122

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

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

245

245 -#: apply.c:127

246 +#: apply.c:124

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

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

249

249 -#: apply.c:130

250 +#: apply.c:127

251 msgid "--3way outside a repository"

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

253

253 -#: apply.c:141

254 +#: apply.c:138

255 msgid "--index outside a repository"

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

257

257 -#: apply.c:144

258 +#: apply.c:141

259 msgid "--cached outside a repository"

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

261

261 -#: apply.c:845

262 +#: apply.c:821

263 #, c-format

264 msgid "Cannot prepare timestamp regexp %s"

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

266

266 -#: apply.c:854

267 +#: apply.c:830

268 #, c-format

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

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

271

271 -#: apply.c:928

272 +#: apply.c:904

273 #, c-format

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

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

276

276 -#: apply.c:966

277 +#: apply.c:942

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

281 -#: apply.c:972

282 +#: apply.c:948

283 #, c-format

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

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

286

286 -#: apply.c:973

287 +#: apply.c:949

288 #, c-format

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

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

291

291 -#: apply.c:978

292 +#: apply.c:954

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

296 -#: apply.c:1007

297 +#: apply.c:983

298 #, c-format

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

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

301

301 -#: apply.c:1325

302 +#: apply.c:1301

303 #, c-format

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

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

306

306 -#: apply.c:1497

307 +#: apply.c:1473

308 #, c-format

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

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

311

311 -#: apply.c:1566

312 +#: apply.c:1542

313 #, c-format

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

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

316

316 -#: apply.c:1586

317 +#: apply.c:1562

318 #, c-format

319 msgid ""

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

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

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

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

327

327 -#: apply.c:1599

328 +#: apply.c:1575

329 #, c-format

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

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

332

332 -#: apply.c:1787

333 +#: apply.c:1763

334 msgid "new file depends on old contents"

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

336

336 -#: apply.c:1789

337 +#: apply.c:1765

338 msgid "deleted file still has contents"

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

340

340 -#: apply.c:1823

341 +#: apply.c:1799

342 #, c-format

343 msgid "corrupt patch at line %d"

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

345

345 -#: apply.c:1860

346 +#: apply.c:1836

347 #, c-format

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

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

350

350 -#: apply.c:1862

351 +#: apply.c:1838

352 #, c-format

353 msgid "deleted file %s still has contents"

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

355

355 -#: apply.c:1865

356 +#: apply.c:1841

357 #, c-format

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

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

360

360 -#: apply.c:2012

361 +#: apply.c:1988

362 #, c-format

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

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

365

365 -#: apply.c:2049

366 +#: apply.c:2025

367 #, c-format

368 msgid "unrecognized binary patch at line %d"

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

370

370 -#: apply.c:2209

371 +#: apply.c:2185

372 #, c-format

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

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

375

375 -#: apply.c:2295

376 +#: apply.c:2271

377 #, c-format

378 msgid "unable to read symlink %s"

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

380

380 -#: apply.c:2299

381 +#: apply.c:2275

382 #, c-format

383 msgid "unable to open or read %s"

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

385

385 -#: apply.c:2958

386 +#: apply.c:2934

387 #, c-format

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

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

390

390 -#: apply.c:3077

391 +#: apply.c:3055

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

397 -#: apply.c:3089

398 +#: apply.c:3067

399 #, c-format

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

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

402

402 -#: apply.c:3095

403 +#: apply.c:3073

404 #, c-format

405 msgid ""

406 "while searching for:\n"

@@ -408,439 +409,440 @@ msgstr ""

409 "当查询：\n"

410 "%.*s"

411

411 -#: apply.c:3117

412 +#: apply.c:3095

413 #, c-format

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

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

416

416 -#: apply.c:3125

417 +#: apply.c:3103

418 #, c-format

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

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

421

421 -#: apply.c:3171

422 +#: apply.c:3149

423 #, c-format

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

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

426

426 -#: apply.c:3181

427 +#: apply.c:3159

428 #, c-format

429 msgid ""

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

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

432

432 -#: apply.c:3189

433 +#: apply.c:3167

434 #, c-format

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

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

437

437 -#: apply.c:3207

438 +#: apply.c:3185

439 #, c-format

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

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

442

442 -#: apply.c:3220

443 +#: apply.c:3198

444 #, c-format

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

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

447

447 -#: apply.c:3226

448 +#: apply.c:3204

449 #, c-format

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

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

452

452 -#: apply.c:3247

453 +#: apply.c:3225

454 #, c-format

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

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

457

457 -#: apply.c:3369

458 +#: apply.c:3347

459 #, c-format

460 msgid "cannot checkout %s"

461 msgstr "不能检出 %s"

462

462 -#: apply.c:3418 apply.c:3429 apply.c:3475 setup.c:277

463 +#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:277

464 #, c-format

465 msgid "failed to read %s"

466 msgstr "无法读取 %s"

467

467 -#: apply.c:3426

468 +#: apply.c:3404

469 #, c-format

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

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

472

472 -#: apply.c:3455 apply.c:3695

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

474 #, c-format

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

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

477

477 -#: apply.c:3538 apply.c:3709

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

479 #, c-format

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

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

482

482 -#: apply.c:3547 apply.c:3717

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

484 #, c-format

485 msgid "%s: does not match index"

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

487

487 -#: apply.c:3582

488 +#: apply.c:3560

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

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

491

491 -#: apply.c:3585

492 +#: apply.c:3563

493 #, c-format

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

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

496

496 -#: apply.c:3601 apply.c:3605

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

498 #, c-format

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

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

501

501 -#: apply.c:3617

502 +#: apply.c:3595

503 #, c-format

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

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

506

506 -#: apply.c:3631

507 +#: apply.c:3609

508 #, c-format

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

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

511

511 -#: apply.c:3636

512 +#: apply.c:3614

513 #, c-format

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

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

516

516 -#: apply.c:3662

517 +#: apply.c:3640

518 msgid "removal patch leaves file contents"

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

520

520 -#: apply.c:3734

521 +#: apply.c:3712

522 #, c-format

523 msgid "%s: wrong type"

524 msgstr "%s：错误类型"

525

525 -#: apply.c:3736

526 +#: apply.c:3714

527 #, c-format

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

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

530

530 -#: apply.c:3886 apply.c:3888

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

532 #, c-format

533 msgid "invalid path '%s'"

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

535

535 -#: apply.c:3944

536 +#: apply.c:3922

537 #, c-format

538 msgid "%s: already exists in index"

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

540

540 -#: apply.c:3947

541 +#: apply.c:3925

542 #, c-format

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

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

545

545 -#: apply.c:3967

546 +#: apply.c:3945

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

550 -#: apply.c:3972

551 +#: apply.c:3950

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

555 -#: apply.c:3992

556 +#: apply.c:3970

557 #, c-format

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

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

560

560 -#: apply.c:3996

561 +#: apply.c:3974

562 #, c-format

563 msgid "%s: patch does not apply"

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

565

565 -#: apply.c:4011

566 +#: apply.c:3989

567 #, c-format

568 msgid "Checking patch %s..."

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

570

570 -#: apply.c:4102

571 +#: apply.c:4080

572 #, c-format

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

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

575

575 -#: apply.c:4109

576 +#: apply.c:4087

577 #, c-format

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

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

580

580 -#: apply.c:4112

581 +#: apply.c:4090

582 #, c-format

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

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

585

585 -#: apply.c:4117 builtin/checkout.c:235 builtin/reset.c:148

586 +#: apply.c:4095 builtin/checkout.c:236 builtin/reset.c:148

587 #, c-format

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

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

590

590 -#: apply.c:4121

591 +#: apply.c:4099

592 #, c-format

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

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

595

595 -#: apply.c:4131

596 +#: apply.c:4109

597 #, c-format

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

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

600

600 -#: apply.c:4269

601 +#: apply.c:4247

602 #, c-format

603 msgid "unable to remove %s from index"

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

605

605 -#: apply.c:4304

606 +#: apply.c:4282

607 #, c-format

608 msgid "corrupt patch for submodule %s"

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

610

610 -#: apply.c:4310

611 +#: apply.c:4288

612 #, c-format

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

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

615

615 -#: apply.c:4318

616 +#: apply.c:4296

617 #, c-format

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

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

620

620 -#: apply.c:4324 apply.c:4468

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

622 #, c-format

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

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

625

625 -#: apply.c:4365

626 +#: apply.c:4343

627 #, c-format

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

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

630

630 -#: apply.c:4369

631 +#: apply.c:4347

632 #, c-format

633 msgid "closing file '%s'"

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

635

635 -#: apply.c:4439

636 +#: apply.c:4417

637 #, c-format

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

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

640

640 -#: apply.c:4537

641 +#: apply.c:4515

642 #, c-format

643 msgid "Applied patch %s cleanly."

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

645

645 -#: apply.c:4545

646 +#: apply.c:4523

647 msgid "internal error"

648 msgstr "内部错误"

649

649 -#: apply.c:4548

650 +#: apply.c:4526

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

656 -#: apply.c:4559

657 +#: apply.c:4537

658 #, c-format

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

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

661

661 -#: apply.c:4567 builtin/fetch.c:760 builtin/fetch.c:1010

662 +#: apply.c:4545 builtin/fetch.c:761 builtin/fetch.c:1011

663 #, c-format

664 msgid "cannot open %s"

665 msgstr "不能打开 %s"

666

666 -#: apply.c:4581

667 +#: apply.c:4559

668 #, c-format

669 msgid "Hunk #%d applied cleanly."

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

671

671 -#: apply.c:4585

672 +#: apply.c:4563

673 #, c-format

674 msgid "Rejected hunk #%d."

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

676

676 -#: apply.c:4695

677 +#: apply.c:4673

678 #, c-format

679 msgid "Skipped patch '%s'."

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

681

681 -#: apply.c:4703

682 +#: apply.c:4681

683 msgid "unrecognized input"

684 msgstr "未能识别的输入"

685

685 -#: apply.c:4722

686 +#: apply.c:4700

687 msgid "unable to read index file"

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

689

689 -#: apply.c:4859

690 +#: apply.c:4837

691 #, c-format

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

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

694

694 -#: apply.c:4886

695 +#: apply.c:4864

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

701 -#: apply.c:4892 apply.c:4907

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

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

708 -#: apply.c:4900

709 +#: apply.c:4878

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

715 -#: apply.c:4916 builtin/add.c:515 builtin/mv.c:298 builtin/rm.c:390

716 +#: apply.c:4894 builtin/add.c:539 builtin/mv.c:298 builtin/rm.c:390

717 msgid "Unable to write new index file"

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

719

719 -#: apply.c:4947 apply.c:4950 builtin/am.c:2256 builtin/am.c:2259

720 -#: builtin/clone.c:116 builtin/fetch.c:115 builtin/pull.c:187

721 -#: builtin/submodule--helper.c:301 builtin/submodule--helper.c:622

722 -#: builtin/submodule--helper.c:625 builtin/submodule--helper.c:992

723 -#: builtin/submodule--helper.c:995 builtin/submodule--helper.c:1212

720 +#: apply.c:4921 apply.c:4924 builtin/am.c:2220 builtin/am.c:2223

721 +#: builtin/clone.c:116 builtin/fetch.c:116 builtin/pull.c:193

722 +#: builtin/submodule--helper.c:369 builtin/submodule--helper.c:860

723 +#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1230

724 +#: builtin/submodule--helper.c:1233 builtin/submodule--helper.c:1450

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

726 msgid "path"

727 msgstr "路径"

728

728 -#: apply.c:4948

729 +#: apply.c:4922

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

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

732

732 -#: apply.c:4951

733 +#: apply.c:4925

734 msgid "apply changes matching the given path"

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

736

736 -#: apply.c:4953 builtin/am.c:2265

737 +#: apply.c:4927 builtin/am.c:2229

738 msgid "num"

739 msgstr "数字"

740

740 -#: apply.c:4954

741 +#: apply.c:4928

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

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

744

744 -#: apply.c:4957

745 +#: apply.c:4931

746 msgid "ignore additions made by the patch"

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

748

748 -#: apply.c:4959

749 +#: apply.c:4933

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

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

752

752 -#: apply.c:4963

753 +#: apply.c:4937

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

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

756

756 -#: apply.c:4965

757 +#: apply.c:4939

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

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

760

760 -#: apply.c:4967

761 +#: apply.c:4941

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

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

764

764 -#: apply.c:4969

765 +#: apply.c:4943

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

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

768

768 -#: apply.c:4971

769 +#: apply.c:4945

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

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

772

772 -#: apply.c:4973

773 +#: apply.c:4947

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

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

776

776 -#: apply.c:4975

777 +#: apply.c:4949

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

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

780

780 -#: apply.c:4977

781 +#: apply.c:4951

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

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

784

784 -#: apply.c:4979

785 +#: apply.c:4953

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

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

788

788 -#: apply.c:4982 builtin/checkout-index.c:170 builtin/ls-files.c:513

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

790 msgid "paths are separated with NUL character"

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

792

792 -#: apply.c:4984

793 +#: apply.c:4958

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

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

796

796 -#: apply.c:4985 builtin/am.c:2244 builtin/interpret-trailers.c:95

797 +#: apply.c:4959 builtin/am.c:2208 builtin/interpret-trailers.c:95

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

799 +#: builtin/pack-objects.c:3009

800 msgid "action"

801 msgstr "动作"

802

801 -#: apply.c:4986

803 +#: apply.c:4960

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

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

806

805 -#: apply.c:4989 apply.c:4992

807 +#: apply.c:4963 apply.c:4966

808 msgid "ignore changes in whitespace when finding context"

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

810

809 -#: apply.c:4995

811 +#: apply.c:4969

812 msgid "apply the patch in reverse"

813 msgstr "反向应用补丁"

814

813 -#: apply.c:4997

815 +#: apply.c:4971

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

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

818

817 -#: apply.c:4999

819 +#: apply.c:4973

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

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

822

821 -#: apply.c:5001

823 +#: apply.c:4975

824 msgid "allow overlapping hunks"

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

826

825 -#: apply.c:5002 builtin/add.c:272 builtin/check-ignore.c:21

826 -#: builtin/commit.c:1347 builtin/count-objects.c:96 builtin/fsck.c:640

827 -#: builtin/log.c:1889 builtin/mv.c:123 builtin/read-tree.c:125

827 +#: apply.c:4976 builtin/add.c:292 builtin/check-ignore.c:21

828 +#: builtin/commit.c:1361 builtin/count-objects.c:96 builtin/fsck.c:640

829 +#: builtin/log.c:1896 builtin/mv.c:123 builtin/read-tree.c:125

830 msgid "be verbose"

831 msgstr "冗长输出"

832

831 -#: apply.c:5004

833 +#: apply.c:4978

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

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

836

835 -#: apply.c:5007

837 +#: apply.c:4981

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

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

840

839 -#: apply.c:5009 builtin/am.c:2253

841 +#: apply.c:4983 builtin/am.c:2217

842 msgid "root"

843 msgstr "根目录"

844

843 -#: apply.c:5010

845 +#: apply.c:4984

846 msgid "prepend <root> to all filenames"

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

848

@@ -862,7 +864,7 @@ msgstr ""

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

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

866

865 -#: archive.c:351 builtin/add.c:156 builtin/add.c:494 builtin/rm.c:299

867 +#: archive.c:351 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:299

868 #, c-format

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

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

@@ -875,7 +877,7 @@ msgstr "格式"

877 msgid "archive format"

878 msgstr "归档格式"

879

878 -#: archive.c:437 builtin/log.c:1452

880 +#: archive.c:437 builtin/log.c:1459

881 msgid "prefix"

882 msgstr "前缀"

883

@@ -883,9 +885,9 @@ msgstr "前缀"

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

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

887

886 -#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61

887 -#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:859

888 -#: builtin/hash-object.c:102 builtin/ls-files.c:547 builtin/ls-files.c:550

888 +#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:62

889 +#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:861

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

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

892 #: parse-options.h:153

893 msgid "file"

@@ -920,7 +922,7 @@ msgid "list supported archive formats"

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

923

924 #: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109

923 -#: builtin/submodule--helper.c:634 builtin/submodule--helper.c:1001

925 +#: builtin/submodule--helper.c:872 builtin/submodule--helper.c:1239

926 msgid "repo"

927 msgstr "仓库"

928

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

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

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

975

974 -#: bisect.c:447

976 +#: bisect.c:458

977 #, c-format

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

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

980

979 -#: bisect.c:655

981 +#: bisect.c:666

982 #, c-format

983 msgid "We cannot bisect more!\n"

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

985

984 -#: bisect.c:708

986 +#: bisect.c:720

987 #, c-format

988 msgid "Not a valid commit name %s"

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

990

989 -#: bisect.c:732

991 +#: bisect.c:744

992 #, c-format

993 msgid ""

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

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

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

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

999

998 -#: bisect.c:737

1000 +#: bisect.c:749

1001 #, c-format

1002 msgid ""

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

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

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

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

1008

1007 -#: bisect.c:742

1009 +#: bisect.c:754

1010 #, c-format

1011 msgid ""

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

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

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

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

1017

1016 -#: bisect.c:750

1018 +#: bisect.c:762

1019 #, c-format

1020 msgid ""

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

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

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

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

1028

1027 -#: bisect.c:763

1029 +#: bisect.c:775

1030 #, c-format

1031 msgid ""

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

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

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

1038 "我们仍旧继续。"

1039

1038 -#: bisect.c:798

1040 +#: bisect.c:810

1041 #, c-format

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

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

1044

1043 -#: bisect.c:850

1045 +#: bisect.c:862

1046 #, c-format

1047 msgid "a %s revision is needed"

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

1049

1048 -#: bisect.c:867 builtin/notes.c:175 builtin/tag.c:234

1050 +#: bisect.c:879 builtin/notes.c:175 builtin/tag.c:234

1051 #, c-format

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

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

1054

1053 -#: bisect.c:918

1055 +#: bisect.c:930

1056 #, c-format

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

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

1059

1058 -#: bisect.c:948

1060 +#: bisect.c:960

1061 msgid "reading bisect refs failed"

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

1063

1062 -#: bisect.c:968

1064 +#: bisect.c:979

1065 #, c-format

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

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

1068

1067 -#: bisect.c:976

1069 +#: bisect.c:987

1070 #, c-format

1071 msgid ""

1072 "No testable commit found.\n"

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

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

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

1077

1076 -#: bisect.c:995

1078 +#: bisect.c:1006

1079 #, c-format

1080 msgid "(roughly %d step)"

1081 msgid_plural "(roughly %d steps)"

@@ -1083,7 +1085,7 @@ msgstr[1] "（大概 %d 步）"

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

1086 #. steps)" translation.

1087 #.

1086 -#: bisect.c:1001

1088 +#: bisect.c:1012

1089 #, c-format

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

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

@@ -1102,9 +1104,9 @@ msgstr "不能将 --contents 和最终的提交对象名共用"

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

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

1106

1105 -#: blame.c:1797 bundle.c:169 ref-filter.c:1947 sequencer.c:1168

1106 -#: sequencer.c:2351 builtin/commit.c:1065 builtin/log.c:357 builtin/log.c:911

1107 -#: builtin/log.c:1361 builtin/log.c:1690 builtin/log.c:1938 builtin/merge.c:369

1107 +#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1177

1108 +#: sequencer.c:2370 builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918

1109 +#: builtin/log.c:1368 builtin/log.c:1697 builtin/log.c:1945 builtin/merge.c:369

1110 #: builtin/shortlog.c:191

1111 msgid "revision walk setup failed"

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

@@ -1190,31 +1192,31 @@ msgstr "无法写入上游分支配置"

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

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

1194

1193 -#: branch.c:185

1195 +#: branch.c:189

1196 #, c-format

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

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

1199

1198 -#: branch.c:190

1200 +#: branch.c:208

1201 #, c-format

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

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

1204

1203 -#: branch.c:197

1205 +#: branch.c:213

1206 msgid "Cannot force update the current branch."

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

1208

1207 -#: branch.c:217

1209 +#: branch.c:233

1210 #, c-format

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

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

1213

1212 -#: branch.c:219

1214 +#: branch.c:235

1215 #, c-format

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

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

1218

1217 -#: branch.c:221

1219 +#: branch.c:237

1220 msgid ""

1221 "\n"

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

@@ -1232,27 +1234,27 @@ msgstr ""

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

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

1236

1235 -#: branch.c:264

1237 +#: branch.c:280

1238 #, c-format

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

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

1241

1240 -#: branch.c:284

1242 +#: branch.c:300

1243 #, c-format

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

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

1246

1245 -#: branch.c:289

1247 +#: branch.c:305

1248 #, c-format

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

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

1251

1250 -#: branch.c:343

1252 +#: branch.c:359

1253 #, c-format

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

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

1256

1255 -#: branch.c:366

1257 +#: branch.c:382

1258 #, c-format

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

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

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

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

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

1271

1270 -#: bundle.c:88 sequencer.c:1346 sequencer.c:1793 sequencer.c:2500

1271 -#: sequencer.c:2583 sequencer.c:2609 sequencer.c:2687 sequencer.c:2807

1272 -#: sequencer.c:2949 builtin/commit.c:782

1272 +#: bundle.c:88 sequencer.c:1360 sequencer.c:1807 sequencer.c:2637

1273 +#: sequencer.c:2663 sequencer.c:2754 sequencer.c:2856 builtin/commit.c:782

1274 #, c-format

1275 msgid "could not open '%s'"

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

@@ -1313,7 +1314,7 @@ msgstr "rev-list 终止"

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

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

1316

1316 -#: bundle.c:453 builtin/log.c:174 builtin/log.c:1597 builtin/shortlog.c:296

1317 +#: bundle.c:453 builtin/log.c:181 builtin/log.c:1604 builtin/shortlog.c:296

1318 #, c-format

1319 msgid "unrecognized argument: %s"

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

@@ -1336,8 +1337,8 @@ msgstr "index-pack 终止"

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

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

1339

1339 -#: commit.c:41 sequencer.c:1600 builtin/am.c:421 builtin/am.c:465

1340 -#: builtin/am.c:1467 builtin/am.c:2105

1340 +#: commit.c:41 sequencer.c:1614 builtin/am.c:421 builtin/am.c:465

1341 +#: builtin/am.c:1434 builtin/am.c:2069

1342 #, c-format

1343 msgid "could not parse %s"

1344 msgstr "不能解析 %s"

@@ -1347,7 +1348,7 @@ msgstr "不能解析 %s"

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

1349 msgstr "%s %s 不是一个提交!"

1350

1350 -#: commit.c:1517

1351 +#: commit.c:1524

1352 msgid ""

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

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

@@ -1357,165 +1358,170 @@ msgstr ""

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

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

1360

1360 -#: compat/obstack.c:406 compat/obstack.c:408

1361 +#: compat/obstack.c:405 compat/obstack.c:407

1362 msgid "memory exhausted"

1363 msgstr "内存耗尽"

1364

1364 -#: config.c:187

1365 +#: config.c:186

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

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

1368

1368 -#: config.c:721

1369 +#: config.c:720

1370 #, c-format

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

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

1373

1373 -#: config.c:725

1374 +#: config.c:724

1375 #, c-format

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

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

1378

1378 -#: config.c:729

1379 +#: config.c:728

1380 #, c-format

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

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

1383

1383 -#: config.c:733

1384 +#: config.c:732

1385 #, c-format

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

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

1388

1388 -#: config.c:737

1389 +#: config.c:736

1390 #, c-format

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

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

1393

1393 -#: config.c:741

1394 +#: config.c:740

1395 #, c-format

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

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

1398

1398 -#: config.c:869

1399 +#: config.c:868

1400 msgid "out of range"

1401 msgstr "超出范围"

1402

1402 -#: config.c:869

1403 +#: config.c:868

1404 msgid "invalid unit"

1405 msgstr "无效的单位"

1406

1406 -#: config.c:875

1407 +#: config.c:874

1408 #, c-format

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

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

1411

1411 -#: config.c:880

1412 +#: config.c:879

1413 #, c-format

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

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

1416

1416 -#: config.c:883

1417 +#: config.c:882

1418 #, c-format

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

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

1421

1421 -#: config.c:886

1422 +#: config.c:885

1423 #, c-format

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

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

1426

1426 -#: config.c:889

1427 +#: config.c:888

1428 #, c-format

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

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

1431

1431 -#: config.c:892

1432 +#: config.c:891

1433 #, c-format

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

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

1436

1436 -#: config.c:895

1437 +#: config.c:894

1438 #, c-format

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

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

1441

1441 -#: config.c:990

1442 +#: config.c:989

1443 #, c-format

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

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

1446

1446 -#: config.c:1085 config.c:1096

1447 +#: config.c:998

1448 +#, c-format

1449 +msgid "'%s' for '%s' is not a valid timestamp"

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

1451 +

1452 +#: config.c:1094 config.c:1105

1453 #, c-format

1454 msgid "bad zlib compression level %d"

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

1456

1451 -#: config.c:1213

1457 +#: config.c:1222

1458 #, c-format

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

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

1461

1456 -#: config.c:1372

1462 +#: config.c:1378

1463 #, c-format

1464 msgid "bad pack compression level %d"

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

1466

1461 -#: config.c:1568

1467 +#: config.c:1574

1468 msgid "unable to parse command-line config"

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

1470

1465 -#: config.c:1900

1471 +#: config.c:1906

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

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

1474

1469 -#: config.c:2087

1475 +#: config.c:2093

1476 #, c-format

1477 msgid "Invalid %s: '%s'"

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

1479

1474 -#: config.c:2130

1480 +#: config.c:2136

1481 #, c-format

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

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

1484

1479 -#: config.c:2156

1485 +#: config.c:2162

1486 #, c-format

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

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

1489

1484 -#: config.c:2167

1490 +#: config.c:2187

1491 #, c-format

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

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

1494

1489 -#: config.c:2169

1495 +#: config.c:2189

1496 #, c-format

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

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

1499

1494 -#: config.c:2228

1500 +#: config.c:2248

1501 #, c-format

1502 msgid "%s has multiple values"

1503 msgstr "%s 有多个取值"

1504

1499 -#: config.c:2571 config.c:2789

1505 +#: config.c:2591 config.c:2808

1506 #, c-format

1507 msgid "fstat on %s failed"

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

1509

1504 -#: config.c:2678

1510 +#: config.c:2698

1511 #, c-format

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

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

1514

1509 -#: config.c:2680 builtin/remote.c:776

1515 +#: config.c:2700 builtin/remote.c:776

1516 #, c-format

1517 msgid "could not unset '%s'"

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

1519

1514 -#: connect.c:50

1520 +#: connect.c:52

1521 msgid "The remote end hung up upon initial contact"

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

1523

1518 -#: connect.c:52

1524 +#: connect.c:54

1525 msgid ""

1526 "Could not read from remote repository.\n"

1527 "\n"

@@ -1643,7 +1649,7 @@ msgstr[1] "%<PRIuMAX> 年前"

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

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

1651

1646 -#: diffcore-rename.c:536

1652 +#: diffcore-rename.c:535

1653 msgid "Performing inexact rename detection"

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

1655

@@ -1668,14 +1674,15 @@ msgstr " 未知的 dirstat 参数 '%s'\n"

1674 msgid ""

1675 "color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', "

1676 "'plain'"

1671 -msgstr "代码移动的颜色设置必须是 'no'、'default'、'zebra'、'dimmed_zebra' 或 'plain'"

1677 +msgstr ""

1678 +"代码移动的颜色设置必须是 'no'、'default'、'zebra'、'dimmed_zebra' 或 'plain'"

1679

1680 #: diff.c:341

1681 #, c-format

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

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

1684

1678 -#: diff.c:398

1685 +#: diff.c:401

1686 #, c-format

1687 msgid ""

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

@@ -1684,20 +1691,20 @@ msgstr ""

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

1692 "%s"

1693

1687 -#: diff.c:3861

1694 +#: diff.c:3799

1695 #, c-format

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

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

1698

1692 -#: diff.c:4189

1699 +#: diff.c:4127

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

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

1702

1696 -#: diff.c:4279

1703 +#: diff.c:4215

1704 msgid "--follow requires exactly one pathspec"

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

1706

1700 -#: diff.c:4445

1707 +#: diff.c:4381

1708 #, c-format

1709 msgid ""

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

@@ -1706,48 +1713,53 @@ msgstr ""

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

1714 "%s"

1715

1709 -#: diff.c:4459

1716 +#: diff.c:4395

1717 #, c-format

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

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

1720

1714 -#: diff.c:5505

1721 +#: diff.c:5446

1722 msgid "inexact rename detection was skipped due to too many files."

1723 msgstr "因为文件太多，略过不严格的重命名检查。"

1724

1718 -#: diff.c:5508

1725 +#: diff.c:5449

1726 msgid "only found copies from modified paths due to too many files."

1727 msgstr "因为文件太多，只在修改的路径中查找拷贝。"

1728

1722 -#: diff.c:5511

1729 +#: diff.c:5452

1730 #, c-format

1731 msgid ""

1732 "you may want to set your %s variable to at least %d and retry the command."

1733 msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。"

1734

1728 -#: dir.c:1983

1735 +#: dir.c:2100

1736 msgid "failed to get kernel name and information"

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

1738

1732 -#: dir.c:2102

1739 +#: dir.c:2219

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

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

1742

1736 -#: dir.c:2885 dir.c:2890

1743 +#: dir.c:3002 dir.c:3007

1744 #, c-format

1745 msgid "could not create directories for %s"

1746 msgstr "不能为 %s 创建目录"

1747

1741 -#: dir.c:2915

1748 +#: dir.c:3032

1749 #, c-format

1750 msgid "could not migrate git directory from '%s' to '%s'"

1751 msgstr "不能从 '%s' 迁移 git 目录到 '%s'"

1752

1746 -#: entry.c:176

1753 +#: editor.c:61

1754 +#, c-format

1755 +msgid "hint: Waiting for your editor to close the file...%c"

1756 +msgstr "提示：等待您的编辑器关闭文件...%c"

1757 +

1758 +#: entry.c:177

1759 msgid "Filtering content"

1760 msgstr "过滤内容"

1761

1750 -#: entry.c:433

1762 +#: entry.c:435

1763 #, c-format

1764 msgid "could not stat file '%s'"

1765 msgstr "不能对文件 '%s' 调用 stat"

@@ -1818,7 +1830,7 @@ msgstr "无效提交 %s"

1830 msgid "giving up"

1831 msgstr "放弃"

1832

1821 -#: fetch-pack.c:534 progress.c:242

1833 +#: fetch-pack.c:534 progress.c:229

1834 msgid "done"

1835 msgstr "完成"

1836

@@ -1832,104 +1844,104 @@ msgstr "得到 %s (%d) %s"

1844 msgid "Marking %s as complete"

1845 msgstr "标记 %s 为完成"

1846

1835 -#: fetch-pack.c:776

1847 +#: fetch-pack.c:777

1848 #, c-format

1849 msgid "already have %s (%s)"

1850 msgstr "已经有 %s（%s）"

1851

1840 -#: fetch-pack.c:814

1852 +#: fetch-pack.c:815

1853 msgid "fetch-pack: unable to fork off sideband demultiplexer"

1854 msgstr "fetch-pack：无法派生 sideband 多路输出"

1855

1844 -#: fetch-pack.c:822

1856 +#: fetch-pack.c:823

1857 msgid "protocol error: bad pack header"

1858 msgstr "协议错误：坏的包头"

1859

1848 -#: fetch-pack.c:878

1860 +#: fetch-pack.c:879

1861 #, c-format

1862 msgid "fetch-pack: unable to fork off %s"

1863 msgstr "fetch-pack：无法派生进程 %s"

1864

1853 -#: fetch-pack.c:894

1865 +#: fetch-pack.c:895

1866 #, c-format

1867 msgid "%s failed"

1868 msgstr "%s 失败"

1869

1858 -#: fetch-pack.c:896

1870 +#: fetch-pack.c:897

1871 msgid "error in sideband demultiplexer"

1872 msgstr "sideband 多路输出出错"

1873

1862 -#: fetch-pack.c:923

1874 +#: fetch-pack.c:924

1875 msgid "Server does not support shallow clients"

1876 msgstr "服务器不支持 shalllow 客户端"

1877

1866 -#: fetch-pack.c:927

1878 +#: fetch-pack.c:928

1879 msgid "Server supports multi_ack_detailed"

1880 msgstr "服务器支持 multi_ack_detailed"

1881

1870 -#: fetch-pack.c:930

1882 +#: fetch-pack.c:931

1883 msgid "Server supports no-done"

1884 msgstr "服务器支持 no-done"

1885

1874 -#: fetch-pack.c:936

1886 +#: fetch-pack.c:937

1887 msgid "Server supports multi_ack"

1888 msgstr "服务器支持 multi_ack"

1889

1878 -#: fetch-pack.c:940

1890 +#: fetch-pack.c:941

1891 msgid "Server supports side-band-64k"

1892 msgstr "服务器支持 side-band-64k"

1893

1882 -#: fetch-pack.c:944

1894 +#: fetch-pack.c:945

1895 msgid "Server supports side-band"

1896 msgstr "服务器支持 side-band"

1897

1886 -#: fetch-pack.c:948

1898 +#: fetch-pack.c:949

1899 msgid "Server supports allow-tip-sha1-in-want"

1900 msgstr "服务器支持 allow-tip-sha1-in-want"

1901

1890 -#: fetch-pack.c:952

1902 +#: fetch-pack.c:953

1903 msgid "Server supports allow-reachable-sha1-in-want"

1904 msgstr "服务器支持 allow-reachable-sha1-in-want"

1905

1894 -#: fetch-pack.c:962

1906 +#: fetch-pack.c:963

1907 msgid "Server supports ofs-delta"

1908 msgstr "服务器支持 ofs-delta"

1909

1898 -#: fetch-pack.c:969

1910 +#: fetch-pack.c:970

1911 #, c-format

1912 msgid "Server version is %.*s"

1913 msgstr "服务器版本 %.*s"

1914

1903 -#: fetch-pack.c:975

1915 +#: fetch-pack.c:976

1916 msgid "Server does not support --shallow-since"

1917 msgstr "服务器不支持 --shallow-since"

1918

1907 -#: fetch-pack.c:979

1919 +#: fetch-pack.c:980

1920 msgid "Server does not support --shallow-exclude"

1921 msgstr "服务器不支持 --shallow-exclude"

1922

1911 -#: fetch-pack.c:981

1923 +#: fetch-pack.c:982

1924 msgid "Server does not support --deepen"

1925 msgstr "服务器不支持 --deepen"

1926

1915 -#: fetch-pack.c:992

1927 +#: fetch-pack.c:993

1928 msgid "no common commits"

1929 msgstr "没有共同的提交"

1930

1919 -#: fetch-pack.c:1004

1931 +#: fetch-pack.c:1005

1932 msgid "git fetch-pack: fetch failed."

1933 msgstr "git fetch-pack：获取失败。"

1934

1923 -#: fetch-pack.c:1166

1935 +#: fetch-pack.c:1167

1936 msgid "no matching remote head"

1937 msgstr "没有匹配的远程分支"

1938

1927 -#: fetch-pack.c:1188

1939 +#: fetch-pack.c:1189

1940 #, c-format

1941 msgid "no such remote ref %s"

1942 msgstr "没有这样的远程引用 %s"

1943

1932 -#: fetch-pack.c:1191

1944 +#: fetch-pack.c:1192

1945 #, c-format

1946 msgid "Server does not allow request for unadvertised object %s"

1947 msgstr "服务器不允许请求未公开的对象 %s"

@@ -1952,17 +1964,17 @@ msgstr "无法将分离式签名写入 '%s'"

1964 msgid "ignore invalid color '%.*s' in log.graphColors"

1965 msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"

1966

1955 -#: grep.c:1970

1967 +#: grep.c:2017

1968 #, c-format

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

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

1971

1960 -#: grep.c:1987 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134

1972 +#: grep.c:2034 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134

1973 #, c-format

1974 msgid "failed to stat '%s'"

1975 msgstr "对 '%s' 调用 stat 失败"

1976

1965 -#: grep.c:1998

1977 +#: grep.c:2045

1978 #, c-format

1979 msgid "'%s': short read"

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

@@ -2031,12 +2043,12 @@ msgstr[1] ""

2043 msgid "git version [<options>]"

2044 msgstr "git version [<选项>]"

2045

2034 -#: help.c:456

2046 +#: help.c:462

2047 #, c-format

2048 msgid "%s: %s - %s"

2049 msgstr "%s：%s - %s"

2050

2039 -#: help.c:460

2051 +#: help.c:466

2052 msgid ""

2053 "\n"

2054 "Did you mean this?"

@@ -2108,6 +2120,15 @@ msgstr "姓名中仅包含禁用字符：%s"

2120 msgid "invalid date format: %s"

2121 msgstr "无效的日期格式：%s"

2122

2123 +#: list-objects-filter-options.c:30

2124 +msgid "multiple object filter types cannot be combined"

2125 +msgstr "不能混用多种对象过滤类型"

2126 +

2127 +#: list-objects-filter-options.c:41 list-objects-filter-options.c:68

2128 +#, c-format

2129 +msgid "invalid filter-spec expression '%s'"

2130 +msgstr "无效的 filter-spec 表达式 '%s'"

2131 +

2132 #: lockfile.c:151

2133 #, c-format

2134 msgid ""

@@ -2131,12 +2152,12 @@ msgstr ""

2152 msgid "Unable to create '%s.lock': %s"

2153 msgstr "不能创建 '%s.lock'：%s"

2154

2134 -#: merge.c:41

2155 +#: merge.c:74

2156 msgid "failed to read the cache"

2157 msgstr "无法读取缓存"

2158

2138 -#: merge.c:96 builtin/am.c:1978 builtin/am.c:2013 builtin/checkout.c:380

2139 -#: builtin/checkout.c:595 builtin/clone.c:754

2159 +#: merge.c:128 builtin/am.c:1943 builtin/am.c:1977 builtin/checkout.c:379

2160 +#: builtin/checkout.c:600 builtin/clone.c:754

2161 msgid "unable to write new index file"

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

2163

@@ -2331,7 +2352,7 @@ msgstr "略过 %s（已经做过相同合并）"

2352 msgid "Auto-merging %s"

2353 msgstr "自动合并 %s"

2354

2334 -#: merge-recursive.c:1775 git-submodule.sh:944

2355 +#: merge-recursive.c:1775 git-submodule.sh:932

2356 msgid "submodule"

2357 msgstr "子模组"

2358

@@ -2353,46 +2374,51 @@ msgstr "文件/目录"

2374 msgid "directory/file"

2375 msgstr "目录/文件"

2376

2356 -#: merge-recursive.c:1908

2377 +#: merge-recursive.c:1909

2378 #, c-format

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

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

2381

2361 -#: merge-recursive.c:1917

2382 +#: merge-recursive.c:1918

2383 #, c-format

2384 msgid "Adding %s"

2385 msgstr "添加 %s"

2386

2366 -#: merge-recursive.c:1954

2387 +#: merge-recursive.c:1958

2388 +#, c-format

2389 +msgid "Dirty index: cannot merge (dirty: %s)"

2390 +msgstr "脏索引：不能合并（脏文件：%s）"

2391 +

2392 +#: merge-recursive.c:1962

2393 msgid "Already up to date!"

2394 msgstr "已经是最新的！"

2395

2370 -#: merge-recursive.c:1963

2396 +#: merge-recursive.c:1971

2397 #, c-format

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

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

2400

2375 -#: merge-recursive.c:2060

2401 +#: merge-recursive.c:2068

2402 msgid "Merging:"

2403 msgstr "合并："

2404

2379 -#: merge-recursive.c:2073

2405 +#: merge-recursive.c:2081

2406 #, c-format

2407 msgid "found %u common ancestor:"

2408 msgid_plural "found %u common ancestors:"

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

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

2411

2386 -#: merge-recursive.c:2112

2412 +#: merge-recursive.c:2120

2413 msgid "merge returned no commit"

2414 msgstr "合并未返回提交"

2415

2390 -#: merge-recursive.c:2175

2416 +#: merge-recursive.c:2183

2417 #, c-format

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

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

2420

2395 -#: merge-recursive.c:2189 builtin/merge.c:655 builtin/merge.c:814

2421 +#: merge-recursive.c:2197 builtin/merge.c:656 builtin/merge.c:815

2422 msgid "Unable to write index."

2423 msgstr "不能写入索引。"

2424

@@ -2557,15 +2583,7 @@ msgstr "'%s'（助记符：'%c'）"

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

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

2585

2560 -#: pathspec.c:571

2561 -msgid ""

2562 -"empty strings as pathspecs will be made invalid in upcoming releases. please "

2563 -"use . instead if you meant to match all paths"

2564 -msgstr ""

2565 -"在下一个版本中，使用空字符串作为路径规格将被视作非法。如果要匹配所有路径，\n"

2566 -"请代之以 ."

2567 -

2568 -#: pathspec.c:595

2586 +#: pathspec.c:592

2587 #, c-format

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

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

@@ -2574,7 +2592,7 @@ msgstr "路径规格 '%s' 位于符号链接中"

2592 msgid "unable to parse --pretty format"

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

2594

2577 -#: read-cache.c:1443

2595 +#: read-cache.c:1472

2596 #, c-format

2597 msgid ""

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

@@ -2583,7 +2601,7 @@ msgstr ""

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

2602 "使用版本 %i"

2603

2586 -#: read-cache.c:1453

2604 +#: read-cache.c:1482

2605 #, c-format

2606 msgid ""

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

@@ -2592,52 +2610,52 @@ msgstr ""

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

2611 "使用版本 %i"

2612

2595 -#: read-cache.c:2316 builtin/merge.c:1046

2613 +#: read-cache.c:2370 sequencer.c:2731 wrapper.c:658 builtin/merge.c:1048

2614 #, c-format

2615 msgid "could not close '%s'"

2616 msgstr "不能关闭 '%s'"

2617

2600 -#: read-cache.c:2394 sequencer.c:1355 sequencer.c:2077

2618 +#: read-cache.c:2442 sequencer.c:1369 sequencer.c:2096

2619 #, c-format

2620 msgid "could not stat '%s'"

2621 msgstr "不能对 '%s' 调用 stat"

2622

2605 -#: read-cache.c:2407

2623 +#: read-cache.c:2455

2624 #, c-format

2625 msgid "unable to open git dir: %s"

2626 msgstr "不能打开 git 目录：%s"

2627

2610 -#: read-cache.c:2419

2628 +#: read-cache.c:2467

2629 #, c-format

2630 msgid "unable to unlink: %s"

2631 msgstr "无法删除：%s"

2632

2615 -#: refs.c:638

2633 +#: refs.c:706

2634 #, c-format

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

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

2637

2620 -#: refs.c:1792

2638 +#: refs.c:1850

2639 msgid "ref updates forbidden inside quarantine environment"

2640 msgstr "在隔离环境中禁止更新引用"

2641

2624 -#: refs/files-backend.c:1136

2642 +#: refs/files-backend.c:1189

2643 #, c-format

2644 msgid "could not remove reference %s"

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

2646

2629 -#: refs/files-backend.c:1150 refs/packed-backend.c:1430

2630 -#: refs/packed-backend.c:1440

2647 +#: refs/files-backend.c:1203 refs/packed-backend.c:1524

2648 +#: refs/packed-backend.c:1534

2649 #, c-format

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

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

2652

2635 -#: refs/files-backend.c:1153 refs/packed-backend.c:1443

2653 +#: refs/files-backend.c:1206 refs/packed-backend.c:1537

2654 #, c-format

2655 msgid "could not delete references: %s"

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

2657

2640 -#: ref-filter.c:35 wt-status.c:1811

2658 +#: ref-filter.c:35 wt-status.c:1816

2659 msgid "gone"

2660 msgstr "丢失"

2661

@@ -2656,157 +2674,157 @@ msgstr "落后 %d"

2674 msgid "ahead %d, behind %d"

2675 msgstr "领先 %d，落后 %d"

2676

2659 -#: ref-filter.c:105

2677 +#: ref-filter.c:107

2678 #, c-format

2679 msgid "expected format: %%(color:<color>)"

2680 msgstr "期望的格式：%%(color:<颜色>)"

2681

2664 -#: ref-filter.c:107

2682 +#: ref-filter.c:109

2683 #, c-format

2684 msgid "unrecognized color: %%(color:%s)"

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

2686

2669 -#: ref-filter.c:127

2687 +#: ref-filter.c:129

2688 #, c-format

2689 msgid "Integer value expected refname:lstrip=%s"

2690 msgstr "期望整数值 refname:lstrip=%s"

2691

2674 -#: ref-filter.c:131

2692 +#: ref-filter.c:133

2693 #, c-format

2694 msgid "Integer value expected refname:rstrip=%s"

2695 msgstr "期望整数值 refname:rstrip=%s"

2696

2679 -#: ref-filter.c:133

2697 +#: ref-filter.c:135

2698 #, c-format

2699 msgid "unrecognized %%(%s) argument: %s"

2700 msgstr "未能识别的 %%(%s) 参数：%s"

2701

2684 -#: ref-filter.c:173

2702 +#: ref-filter.c:184

2703 #, c-format

2704 msgid "%%(body) does not take arguments"

2705 msgstr "%%(body) 不带参数"

2706

2689 -#: ref-filter.c:180

2707 +#: ref-filter.c:191

2708 #, c-format

2709 msgid "%%(subject) does not take arguments"

2710 msgstr "%%(subject) 不带参数"

2711

2694 -#: ref-filter.c:198

2712 +#: ref-filter.c:209

2713 #, c-format

2714 msgid "unknown %%(trailers) argument: %s"

2715 msgstr "未知的 %%(trailers) 参数：%s"

2716

2699 -#: ref-filter.c:221

2717 +#: ref-filter.c:232

2718 #, c-format

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

2720 msgstr "期望一个正数 contents:lines=%s"

2721

2704 -#: ref-filter.c:223

2722 +#: ref-filter.c:234

2723 #, c-format

2724 msgid "unrecognized %%(contents) argument: %s"

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

2726

2709 -#: ref-filter.c:236

2727 +#: ref-filter.c:247

2728 #, c-format

2729 msgid "positive value expected objectname:short=%s"

2730 msgstr "期望一个正数 objectname:short=%s"

2731

2714 -#: ref-filter.c:240

2732 +#: ref-filter.c:251

2733 #, c-format

2734 msgid "unrecognized %%(objectname) argument: %s"

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

2736

2719 -#: ref-filter.c:267

2737 +#: ref-filter.c:278

2738 #, c-format

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

2740 msgstr "期望的格式：%%(align:<宽度>,<位置>)"

2741

2724 -#: ref-filter.c:279

2742 +#: ref-filter.c:290

2743 #, c-format

2744 msgid "unrecognized position:%s"

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

2746

2729 -#: ref-filter.c:283

2747 +#: ref-filter.c:294

2748 #, c-format

2749 msgid "unrecognized width:%s"

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

2751

2734 -#: ref-filter.c:289

2752 +#: ref-filter.c:300

2753 #, c-format

2754 msgid "unrecognized %%(align) argument: %s"

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

2756

2739 -#: ref-filter.c:293

2757 +#: ref-filter.c:304

2758 #, c-format

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

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

2761

2744 -#: ref-filter.c:308

2762 +#: ref-filter.c:319

2763 #, c-format

2764 msgid "unrecognized %%(if) argument: %s"

2765 msgstr "未能识别的 %%(if) 参数：%s"

2766

2749 -#: ref-filter.c:398

2767 +#: ref-filter.c:409

2768 #, c-format

2769 msgid "malformed field name: %.*s"

2770 msgstr "非法的字段名：%.*s"

2771

2754 -#: ref-filter.c:424

2772 +#: ref-filter.c:435

2773 #, c-format

2774 msgid "unknown field name: %.*s"

2775 msgstr "未知的字段名：%.*s"

2776

2759 -#: ref-filter.c:536

2777 +#: ref-filter.c:547

2778 #, c-format

2779 msgid "format: %%(if) atom used without a %%(then) atom"

2780 msgstr "格式：使用了 %%(if) 元素而没有 %%(then) 元素"

2781

2764 -#: ref-filter.c:596

2782 +#: ref-filter.c:607

2783 #, c-format

2784 msgid "format: %%(then) atom used without an %%(if) atom"

2785 msgstr "格式：使用了 %%(then) 元素而没有 %%(if) 元素"

2786

2769 -#: ref-filter.c:598

2787 +#: ref-filter.c:609

2788 #, c-format

2789 msgid "format: %%(then) atom used more than once"

2790 msgstr "格式：%%(then) 元素用了多次"

2791

2774 -#: ref-filter.c:600

2792 +#: ref-filter.c:611

2793 #, c-format

2794 msgid "format: %%(then) atom used after %%(else)"

2795 msgstr "格式：%%(then) 元素用在了 %%(else) 之后"

2796

2779 -#: ref-filter.c:626

2797 +#: ref-filter.c:637

2798 #, c-format

2799 msgid "format: %%(else) atom used without an %%(if) atom"

2800 msgstr "格式：使用了 %%(else) 元素而没有 %%(if) 元素"

2801

2784 -#: ref-filter.c:628

2802 +#: ref-filter.c:639

2803 #, c-format

2804 msgid "format: %%(else) atom used without a %%(then) atom"

2805 msgstr "格式：使用了 %%(else) 元素而没有 %%(then) 元素"

2806

2789 -#: ref-filter.c:630

2807 +#: ref-filter.c:641

2808 #, c-format

2809 msgid "format: %%(else) atom used more than once"

2810 msgstr "格式：%%(else) 元素用了多次"

2811

2794 -#: ref-filter.c:643

2812 +#: ref-filter.c:654

2813 #, c-format

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

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

2816

2799 -#: ref-filter.c:698

2817 +#: ref-filter.c:709

2818 #, c-format

2819 msgid "malformed format string %s"

2820 msgstr "非法的格式化字符串 %s"

2821

2804 -#: ref-filter.c:1283

2822 +#: ref-filter.c:1313

2823 #, c-format

2824 msgid "(no branch, rebasing %s)"

2825 msgstr "（非分支，正变基 %s）"

2826

2809 -#: ref-filter.c:1286

2827 +#: ref-filter.c:1316

2828 #, c-format

2829 msgid "(no branch, bisect started on %s)"

2830 msgstr "（非分支，二分查找开始于 %s）"

@@ -2814,7 +2832,7 @@ msgstr "（非分支，二分查找开始于 %s）"

2832 #. TRANSLATORS: make sure this matches "HEAD

2833 #. detached at " in wt-status.c

2834 #.

2817 -#: ref-filter.c:1294

2835 +#: ref-filter.c:1324

2836 #, c-format

2837 msgid "(HEAD detached at %s)"

2838 msgstr "（头指针分离于 %s）"

@@ -2822,137 +2840,137 @@ msgstr "（头指针分离于 %s）"

2840 #. TRANSLATORS: make sure this matches "HEAD

2841 #. detached from " in wt-status.c

2842 #.

2825 -#: ref-filter.c:1301

2843 +#: ref-filter.c:1331

2844 #, c-format

2845 msgid "(HEAD detached from %s)"

2846 msgstr "（头指针分离自 %s）"

2847

2830 -#: ref-filter.c:1305

2848 +#: ref-filter.c:1335

2849 msgid "(no branch)"

2850 msgstr "（非分支）"

2851

2834 -#: ref-filter.c:1454 ref-filter.c:1485

2852 +#: ref-filter.c:1488 ref-filter.c:1519

2853 #, c-format

2854 msgid "missing object %s for %s"

2855 msgstr "缺失 %2$s 的对象 %1$s"

2856

2839 -#: ref-filter.c:1457 ref-filter.c:1488

2857 +#: ref-filter.c:1491 ref-filter.c:1522

2858 #, c-format

2859 msgid "parse_object_buffer failed on %s for %s"

2860 msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"

2861

2844 -#: ref-filter.c:1788

2862 +#: ref-filter.c:1822

2863 #, c-format

2864 msgid "malformed object at '%s'"

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

2866

2849 -#: ref-filter.c:1855

2867 +#: ref-filter.c:1889

2868 #, c-format

2869 msgid "ignoring ref with broken name %s"

2870 msgstr "忽略带有错误名称 %s 的引用"

2871

2854 -#: ref-filter.c:1860

2872 +#: ref-filter.c:1894

2873 #, c-format

2874 msgid "ignoring broken ref %s"

2875 msgstr "忽略损坏的引用 %s"

2876

2859 -#: ref-filter.c:2122

2877 +#: ref-filter.c:2156

2878 #, c-format

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

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

2881

2864 -#: ref-filter.c:2216

2882 +#: ref-filter.c:2250

2883 #, c-format

2884 msgid "malformed object name %s"

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

2886

2869 -#: remote.c:750

2887 +#: remote.c:780

2888 #, c-format

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

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

2891

2874 -#: remote.c:754

2892 +#: remote.c:784

2893 #, c-format

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

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

2896

2879 -#: remote.c:758

2897 +#: remote.c:788

2898 #, c-format

2899 msgid "%s tracks both %s and %s"

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

2901

2884 -#: remote.c:766

2902 +#: remote.c:796

2903 msgid "Internal error"

2904 msgstr "内部错误"

2905

2888 -#: remote.c:1681 remote.c:1783

2906 +#: remote.c:1711 remote.c:1813

2907 msgid "HEAD does not point to a branch"

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

2909

2892 -#: remote.c:1690

2910 +#: remote.c:1720

2911 #, c-format

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

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

2914

2897 -#: remote.c:1693

2915 +#: remote.c:1723

2916 #, c-format

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

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

2919

2902 -#: remote.c:1699

2920 +#: remote.c:1729

2921 #, c-format

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

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

2924

2907 -#: remote.c:1714

2925 +#: remote.c:1744

2926 #, c-format

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

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

2929

2912 -#: remote.c:1726

2930 +#: remote.c:1756

2931 #, c-format

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

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

2934

2917 -#: remote.c:1737

2935 +#: remote.c:1767

2936 #, c-format

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

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

2939

2922 -#: remote.c:1750

2940 +#: remote.c:1780

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

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

2943

2926 -#: remote.c:1772

2944 +#: remote.c:1802

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

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

2947

2930 -#: remote.c:2076

2948 +#: remote.c:2106

2949 #, c-format

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

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

2952

2935 -#: remote.c:2080

2953 +#: remote.c:2110

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

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

2956

2939 -#: remote.c:2083

2957 +#: remote.c:2113

2958 #, c-format

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

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

2961

2944 -#: remote.c:2087

2962 +#: remote.c:2117

2963 #, c-format

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

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

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

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

2968

2951 -#: remote.c:2093

2969 +#: remote.c:2123

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

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

2972

2955 -#: remote.c:2096

2973 +#: remote.c:2126

2974 #, c-format

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

2976 msgid_plural ""

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

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

2980

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

2964 -#: remote.c:2104

2982 +#: remote.c:2134

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

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

2985

2968 -#: remote.c:2107

2986 +#: remote.c:2137

2987 #, c-format

2988 msgid ""

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

@@ -2981,56 +2999,65 @@ msgstr[1] ""

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

3000

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

2984 -#: remote.c:2117

3002 +#: remote.c:2147

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

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

3005

2988 -#: revision.c:2256

3006 +#: revision.c:2268

3007 msgid "your current branch appears to be broken"

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

3009

2992 -#: revision.c:2259

3010 +#: revision.c:2271

3011 #, c-format

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

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

3014

2997 -#: revision.c:2453

3015 +#: revision.c:2465

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

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

3018

3001 -#: run-command.c:644

3019 +#: run-command.c:645

3020 msgid "open /dev/null failed"

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

3022

3005 -#: send-pack.c:151

3023 +#: run-command.c:1188

3024 +#, c-format

3025 +msgid ""

3026 +"The '%s' hook was ignored because it's not set as executable.\n"

3027 +"You can disable this warning with `git config advice.ignoredHook false`."

3028 +msgstr ""

3029 +"因为没有将钩子 '%s' 设置为可执行，钩子被忽略。您可以通过\n"

3030 +"配置 `git config advice.ignoredHook false` 来关闭这条警告。"

3031 +

3032 +#: send-pack.c:141

3033 #, c-format

3034 msgid "unable to parse remote unpack status: %s"

3035 msgstr "不能解析远程解包状态：%s"

3036

3010 -#: send-pack.c:153

3037 +#: send-pack.c:143

3038 #, c-format

3039 msgid "remote unpack failed: %s"

3040 msgstr "远程解包失败：%s"

3041

3015 -#: send-pack.c:316

3042 +#: send-pack.c:306

3043 msgid "failed to sign the push certificate"

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

3045

3019 -#: send-pack.c:429

3046 +#: send-pack.c:419

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

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

3049

3023 -#: send-pack.c:431

3050 +#: send-pack.c:421

3051 msgid ""

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

3053 "signed push"

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

3055

3029 -#: send-pack.c:443

3056 +#: send-pack.c:433

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

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

3059

3033 -#: send-pack.c:448

3060 +#: send-pack.c:438

3061 msgid "the receiving end does not support push options"

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

3063

@@ -3068,13 +3095,13 @@ msgstr ""

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

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

3097

3071 -#: sequencer.c:297 sequencer.c:1704

3098 +#: sequencer.c:297 sequencer.c:1718

3099 #, c-format

3100 msgid "could not lock '%s'"

3101 msgstr "不能锁定 '%s'"

3102

3076 -#: sequencer.c:300 sequencer.c:1581 sequencer.c:1709 sequencer.c:1723

3077 -#: sequencer.c:2733 sequencer.c:2749

3103 +#: sequencer.c:300 sequencer.c:1595 sequencer.c:1723 sequencer.c:1737

3104 +#: sequencer.c:2729 sequencer.c:2800 wrapper.c:656

3105 #, c-format

3106 msgid "could not write to '%s'"

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

@@ -3084,13 +3111,13 @@ msgstr "不能写入 '%s'"

3111 msgid "could not write eol to '%s'"

3112 msgstr "不能将换行符写入 '%s'"

3113

3087 -#: sequencer.c:308 sequencer.c:1586 sequencer.c:1711

3114 +#: sequencer.c:308 sequencer.c:1600 sequencer.c:1725

3115 #, c-format

3116 msgid "failed to finalize '%s'."

3117 msgstr "无法完成 '%s'。"

3118

3092 -#: sequencer.c:332 sequencer.c:819 sequencer.c:1607 builtin/am.c:259

3093 -#: builtin/commit.c:754 builtin/merge.c:1044

3119 +#: sequencer.c:332 sequencer.c:829 sequencer.c:1621 builtin/am.c:259

3120 +#: builtin/commit.c:754 builtin/merge.c:1046

3121 #, c-format

3122 msgid "could not read '%s'"

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

@@ -3112,20 +3139,20 @@ msgstr "%s：快进"

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

3140 #. "rebase -i".

3141 #.

3115 -#: sequencer.c:474

3142 +#: sequencer.c:477

3143 #, c-format

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

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

3146

3120 -#: sequencer.c:493

3121 -msgid "could not resolve HEAD commit\n"

3122 -msgstr "不能解析 HEAD 提交\n"

3147 +#: sequencer.c:496

3148 +msgid "could not resolve HEAD commit"

3149 +msgstr "不能解析 HEAD 提交"

3150

3124 -#: sequencer.c:513

3125 -msgid "unable to update cache tree\n"

3126 -msgstr "不能更新缓存树\n"

3151 +#: sequencer.c:516

3152 +msgid "unable to update cache tree"

3153 +msgstr "不能更新缓存树"

3154

3128 -#: sequencer.c:597

3155 +#: sequencer.c:600

3156 #, c-format

3157 msgid ""

3158 "you have staged changes in your working tree\n"

@@ -3154,17 +3181,17 @@ msgstr ""

3181 "\n"

3182 " git rebase --continue\n"

3183

3157 -#: sequencer.c:699

3184 +#: sequencer.c:702

3185 #, c-format

3159 -msgid "could not parse commit %s\n"

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

3186 +msgid "could not parse commit %s"

3187 +msgstr "不能解析提交 %s"

3188

3162 -#: sequencer.c:704

3189 +#: sequencer.c:707

3190 #, c-format

3164 -msgid "could not parse parent commit %s\n"

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

3191 +msgid "could not parse parent commit %s"

3192 +msgstr "不能解析父提交 %s"

3193

3167 -#: sequencer.c:826

3194 +#: sequencer.c:836

3195 #, c-format

3196 msgid ""

3197 "unexpected 1st line of squash message:\n"

@@ -3175,7 +3202,7 @@ msgstr ""

3202 "\n"

3203 "\t%.*s"

3204

3178 -#: sequencer.c:832

3205 +#: sequencer.c:842

3206 #, c-format

3207 msgid ""

3208 "invalid 1st line of squash message:\n"

@@ -3186,231 +3213,241 @@ msgstr ""

3213 "\n"

3214 "\t%.*s"

3215

3189 -#: sequencer.c:838 sequencer.c:863

3216 +#: sequencer.c:848 sequencer.c:873

3217 #, c-format

3218 msgid "This is a combination of %d commits."

3219 msgstr "这是一个 %d 个提交的组合。"

3220

3194 -#: sequencer.c:847 sequencer.c:2681

3221 +#: sequencer.c:857 sequencer.c:2748

3222 msgid "need a HEAD to fixup"

3223 msgstr "需要一个 HEAD 来修复"

3224

3198 -#: sequencer.c:849

3225 +#: sequencer.c:859

3226 msgid "could not read HEAD"

3227 msgstr "不能读取 HEAD"

3228

3202 -#: sequencer.c:851

3229 +#: sequencer.c:861

3230 msgid "could not read HEAD's commit message"

3231 msgstr "不能读取 HEAD 的提交说明"

3232

3206 -#: sequencer.c:857

3233 +#: sequencer.c:867

3234 #, c-format

3235 msgid "cannot write '%s'"

3236 msgstr "不能写 '%s'"

3237

3211 -#: sequencer.c:866 git-rebase--interactive.sh:446

3238 +#: sequencer.c:876 git-rebase--interactive.sh:446

3239 msgid "This is the 1st commit message:"

3240 msgstr "这是第一个提交说明："

3241

3215 -#: sequencer.c:874

3242 +#: sequencer.c:884

3243 #, c-format

3244 msgid "could not read commit message of %s"

3245 msgstr "不能读取 %s 的提交说明"

3246

3220 -#: sequencer.c:881

3247 +#: sequencer.c:891

3248 #, c-format

3249 msgid "This is the commit message #%d:"

3250 msgstr "这是提交说明 #%d："

3251

3225 -#: sequencer.c:886

3252 +#: sequencer.c:896

3253 #, c-format

3254 msgid "The commit message #%d will be skipped:"

3255 msgstr "提交说明 #%d 将被跳过："

3256

3230 -#: sequencer.c:891

3257 +#: sequencer.c:901

3258 #, c-format

3259 msgid "unknown command: %d"

3260 msgstr "未知命令：%d"

3261

3235 -#: sequencer.c:957

3262 +#: sequencer.c:967

3263 msgid "your index file is unmerged."

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

3265

3239 -#: sequencer.c:975

3266 +#: sequencer.c:986

3267 #, c-format

3268 msgid "commit %s is a merge but no -m option was given."

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

3270

3244 -#: sequencer.c:983

3271 +#: sequencer.c:994

3272 #, c-format

3273 msgid "commit %s does not have parent %d"

3274 msgstr "提交 %s 没有第 %d 个父提交"

3275

3249 -#: sequencer.c:987

3276 +#: sequencer.c:998

3277 #, c-format

3278 msgid "mainline was specified but commit %s is not a merge."

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

3280

3254 -#: sequencer.c:993

3281 +#: sequencer.c:1004

3282 #, c-format

3283 msgid "cannot get commit message for %s"

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

3285

3286 #. TRANSLATORS: The first %s will be a "todo" command like

3287 #. "revert" or "pick", the second %s a SHA1.

3261 -#: sequencer.c:1014

3288 +#: sequencer.c:1023

3289 #, c-format

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

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

3292

3266 -#: sequencer.c:1077 sequencer.c:1853

3293 +#: sequencer.c:1086 sequencer.c:1867

3294 #, c-format

3295 msgid "could not rename '%s' to '%s'"

3296 msgstr "不能将 '%s' 重命名为 '%s'"

3297

3271 -#: sequencer.c:1128

3298 +#: sequencer.c:1137

3299 #, c-format

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

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

3302

3276 -#: sequencer.c:1129

3303 +#: sequencer.c:1138

3304 #, c-format

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

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

3307

3281 -#: sequencer.c:1171

3308 +#: sequencer.c:1180

3309 msgid "empty commit set passed"

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

3311

3285 -#: sequencer.c:1181

3312 +#: sequencer.c:1190

3313 #, c-format

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

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

3316

3290 -#: sequencer.c:1188

3317 +#: sequencer.c:1196

3318 #, c-format

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

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

3321

3295 -#: sequencer.c:1308

3322 +#: sequencer.c:1270

3323 +#, c-format

3324 +msgid "%s does not accept arguments: '%s'"

3325 +msgstr "%s 不接受参数：'%s'"

3326 +

3327 +#: sequencer.c:1279

3328 +#, c-format

3329 +msgid "missing arguments for %s"

3330 +msgstr "缺少 %s 的参数"

3331 +

3332 +#: sequencer.c:1322

3333 #, c-format

3334 msgid "invalid line %d: %.*s"

3335 msgstr "无效行 %d：%.*s"

3336

3300 -#: sequencer.c:1316

3337 +#: sequencer.c:1330

3338 #, c-format

3339 msgid "cannot '%s' without a previous commit"

3340 msgstr "没有父提交的情况下不能 '%s'"

3341

3305 -#: sequencer.c:1349 sequencer.c:2503 sequencer.c:2588 sequencer.c:2614

3306 -#: sequencer.c:2691 sequencer.c:2810 sequencer.c:2951

3342 +#: sequencer.c:1363 sequencer.c:2525 sequencer.c:2560 sequencer.c:2642

3343 +#: sequencer.c:2668 sequencer.c:2758 sequencer.c:2859

3344 #, c-format

3345 msgid "could not read '%s'."

3346 msgstr "不能读取 '%s'。"

3347

3311 -#: sequencer.c:1361

3348 +#: sequencer.c:1375

3349 msgid "please fix this using 'git rebase --edit-todo'."

3350 msgstr "请用 'git rebase --edit-todo' 来修改。"

3351

3315 -#: sequencer.c:1363

3352 +#: sequencer.c:1377

3353 #, c-format

3354 msgid "unusable instruction sheet: '%s'"

3355 msgstr "不可用的指令清单：'%s'"

3356

3320 -#: sequencer.c:1368

3357 +#: sequencer.c:1382

3358 msgid "no commits parsed."

3359 msgstr "没有解析提交。"

3360

3324 -#: sequencer.c:1379

3361 +#: sequencer.c:1393

3362 msgid "cannot cherry-pick during a revert."

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

3364

3328 -#: sequencer.c:1381

3365 +#: sequencer.c:1395

3366 msgid "cannot revert during a cherry-pick."

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

3368

3332 -#: sequencer.c:1448

3369 +#: sequencer.c:1462

3370 #, c-format

3371 msgid "invalid key: %s"

3372 msgstr "无效键名：%s"

3373

3337 -#: sequencer.c:1451

3374 +#: sequencer.c:1465

3375 #, c-format

3376 msgid "invalid value for %s: %s"

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

3378

3342 -#: sequencer.c:1517

3379 +#: sequencer.c:1531

3380 #, c-format

3381 msgid "malformed options sheet: '%s'"

3382 msgstr "非法的选项清单：'%s'"

3383

3347 -#: sequencer.c:1555

3384 +#: sequencer.c:1569

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

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

3387

3351 -#: sequencer.c:1556

3388 +#: sequencer.c:1570

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

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

3391

3355 -#: sequencer.c:1559

3392 +#: sequencer.c:1573

3393 #, c-format

3394 msgid "could not create sequencer directory '%s'"

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

3396

3360 -#: sequencer.c:1574

3397 +#: sequencer.c:1588

3398 msgid "could not lock HEAD"

3399 msgstr "不能锁定 HEAD"

3400

3364 -#: sequencer.c:1632 sequencer.c:2211

3401 +#: sequencer.c:1646 sequencer.c:2230

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

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

3404

3368 -#: sequencer.c:1634

3405 +#: sequencer.c:1648

3406 msgid "cannot resolve HEAD"

3407 msgstr "不能解析 HEAD"

3408

3372 -#: sequencer.c:1636 sequencer.c:1671

3409 +#: sequencer.c:1650 sequencer.c:1685

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

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

3412

3376 -#: sequencer.c:1657 builtin/grep.c:711

3413 +#: sequencer.c:1671 builtin/grep.c:713

3414 #, c-format

3415 msgid "cannot open '%s'"

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

3417

3381 -#: sequencer.c:1659

3418 +#: sequencer.c:1673

3419 #, c-format

3420 msgid "cannot read '%s': %s"

3421 msgstr "不能读取 '%s'：%s"

3422

3386 -#: sequencer.c:1660

3423 +#: sequencer.c:1674

3424 msgid "unexpected end of file"

3425 msgstr "意外的文件结束"

3426

3390 -#: sequencer.c:1666

3427 +#: sequencer.c:1680

3428 #, c-format

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

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

3431

3395 -#: sequencer.c:1677

3432 +#: sequencer.c:1691

3433 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

3434 msgstr "您好像移动了 HEAD。未能回退，检查您的 HEAD！"

3435

3399 -#: sequencer.c:1818 sequencer.c:2109

3436 +#: sequencer.c:1832 sequencer.c:2128

3437 msgid "cannot read HEAD"

3438 msgstr "不能读取 HEAD"

3439

3403 -#: sequencer.c:1858 builtin/difftool.c:640

3440 +#: sequencer.c:1872 builtin/difftool.c:639

3441 #, c-format

3442 msgid "could not copy '%s' to '%s'"

3443 msgstr "不能拷贝 '%s' 至 '%s'"

3444

3408 -#: sequencer.c:1874

3445 +#: sequencer.c:1891

3446 msgid "could not read index"

3447 msgstr "不能读取索引"

3448

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

3413 -#: sequencer.c:1879

3450 +#: sequencer.c:1896

3451 #, c-format

3452 msgid ""

3453 "execution failed: %s\n"

@@ -3425,11 +3462,11 @@ msgstr ""

3462 " git rebase --continue\n"

3463 "\n"

3464

3428 -#: sequencer.c:1885

3465 +#: sequencer.c:1902

3466 msgid "and made changes to the index and/or the working tree\n"

3467 msgstr "并且修改索引和/或工作区\n"

3468

3432 -#: sequencer.c:1891

3469 +#: sequencer.c:1908

3470 #, c-format

3471 msgid ""

3472 "execution succeeded: %s\n"

@@ -3446,17 +3483,17 @@ msgstr ""

3483 " git rebase --continue\n"

3484 "\n"

3485

3449 -#: sequencer.c:1948

3486 +#: sequencer.c:1967

3487 #, c-format

3488 msgid "Applied autostash.\n"

3489 msgstr "已应用 autostash。\n"

3490

3454 -#: sequencer.c:1960

3491 +#: sequencer.c:1979

3492 #, c-format

3493 msgid "cannot store %s"

3494 msgstr "不能存储 %s"

3495

3459 -#: sequencer.c:1963 git-rebase.sh:175

3496 +#: sequencer.c:1982 git-rebase.sh:175

3497 #, c-format

3498 msgid ""

3499 "Applying autostash resulted in conflicts.\n"

@@ -3467,57 +3504,57 @@ msgstr ""

3504 "您的修改安全地保存在贮藏区中。\n"

3505 "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"

3506

3470 -#: sequencer.c:2045

3507 +#: sequencer.c:2064

3508 #, c-format

3509 msgid "Stopped at %s... %.*s\n"

3510 msgstr "停止在 %s... %.*s\n"

3511

3475 -#: sequencer.c:2087

3512 +#: sequencer.c:2106

3513 #, c-format

3514 msgid "unknown command %d"

3515 msgstr "未知命令 %d"

3516

3480 -#: sequencer.c:2117

3517 +#: sequencer.c:2136

3518 msgid "could not read orig-head"

3519 msgstr "不能读取 orig-head"

3520

3484 -#: sequencer.c:2122 sequencer.c:2678

3521 +#: sequencer.c:2141 sequencer.c:2745

3522 msgid "could not read 'onto'"

3523 msgstr "不能读取 'onto'"

3524

3488 -#: sequencer.c:2129

3525 +#: sequencer.c:2148

3526 #, c-format

3527 msgid "could not update %s"

3528 msgstr "不能更新 %s"

3529

3493 -#: sequencer.c:2136

3530 +#: sequencer.c:2155

3531 #, c-format

3532 msgid "could not update HEAD to %s"

3533 msgstr "不能更新 HEAD 为 %s"

3534

3498 -#: sequencer.c:2220

3535 +#: sequencer.c:2239

3536 msgid "cannot rebase: You have unstaged changes."

3537 msgstr "不能变基：您有未暂存的变更。"

3538

3502 -#: sequencer.c:2225

3539 +#: sequencer.c:2244

3540 msgid "could not remove CHERRY_PICK_HEAD"

3541 msgstr "不能删除 CHERRY_PICK_HEAD"

3542

3506 -#: sequencer.c:2234

3543 +#: sequencer.c:2253

3544 msgid "cannot amend non-existing commit"

3545 msgstr "不能修补不存在的提交"

3546

3510 -#: sequencer.c:2236

3547 +#: sequencer.c:2255

3548 #, c-format

3549 msgid "invalid file: '%s'"

3550 msgstr "无效文件：'%s'"

3551

3515 -#: sequencer.c:2238

3552 +#: sequencer.c:2257

3553 #, c-format

3554 msgid "invalid contents: '%s'"

3555 msgstr "无效内容：'%s'"

3556

3520 -#: sequencer.c:2241

3557 +#: sequencer.c:2260

3558 msgid ""

3559 "\n"

3560 "You have uncommitted changes in your working tree. Please, commit them\n"

@@ -3526,49 +3563,44 @@ msgstr ""

3563 "\n"

3564 "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"

3565

3529 -#: sequencer.c:2251

3566 +#: sequencer.c:2270

3567 msgid "could not commit staged changes."

3568 msgstr "不能提交暂存的修改。"

3569

3533 -#: sequencer.c:2331

3570 +#: sequencer.c:2350

3571 #, c-format

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

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

3574

3538 -#: sequencer.c:2335

3575 +#: sequencer.c:2354

3576 #, c-format

3577 msgid "%s: bad revision"

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

3579

3543 -#: sequencer.c:2368

3580 +#: sequencer.c:2387

3581 msgid "can't revert as initial commit"

3582 msgstr "不能作为初始提交回退"

3583

3547 -#: sequencer.c:2471

3584 +#: sequencer.c:2492

3585 msgid "make_script: unhandled options"

3586 msgstr "make_script：有未能处理的选项"

3587

3551 -#: sequencer.c:2474

3588 +#: sequencer.c:2495

3589 msgid "make_script: error preparing revisions"

3590 msgstr "make_script：准备版本时错误"

3591

3555 -#: sequencer.c:2510

3592 +#: sequencer.c:2529 sequencer.c:2564

3593 #, c-format

3594 msgid "unusable todo list: '%s'"

3595 msgstr "不可用的待办列表：'%s'"

3596

3560 -#: sequencer.c:2516

3561 -#, c-format

3562 -msgid "unable to open '%s' for writing"

3563 -msgstr "无法以写入方式打开 '%s'"

3564 -

3565 -#: sequencer.c:2561

3597 +#: sequencer.c:2615

3598 #, c-format

3599 msgid ""

3600 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."

3601 msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。"

3602

3571 -#: sequencer.c:2641

3603 +#: sequencer.c:2695

3604 #, c-format

3605 msgid ""

3606 "Warning: some commits may have been dropped accidentally.\n"

@@ -3577,7 +3609,7 @@ msgstr ""

3609 "警告：一些提交可能被意外丢弃。\n"

3610 "丢弃的提交（从新到旧）：\n"

3611

3580 -#: sequencer.c:2648

3612 +#: sequencer.c:2702

3613 #, c-format

3614 msgid ""

3615 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"

@@ -3593,7 +3625,7 @@ msgstr ""

3625 "可选值有：ignore、warn、error。\n"

3626 "\n"

3627

3596 -#: sequencer.c:2660

3628 +#: sequencer.c:2714

3629 #, c-format

3630 msgid ""

3631 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"

@@ -3603,31 +3635,21 @@ msgstr ""

3635 "您可以用 'git rebase --edit-todo' 修正，然后执行 'git rebase --continue'。\n"

3636 "或者您可以用 'git rebase --abort' 终止变基。\n"

3637

3606 -#: sequencer.c:2708

3607 -#, c-format

3608 -msgid "could not parse commit '%s'"

3609 -msgstr "不能解析提交 '%s'"

3610 -

3611 -#: sequencer.c:2727 sequencer.c:2742 wrapper.c:225 wrapper.c:395

3612 -#: builtin/am.c:775

3638 +#: sequencer.c:2727 sequencer.c:2794 wrapper.c:225 wrapper.c:395

3639 +#: builtin/am.c:779

3640 #, c-format

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

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

3643

3617 -#: sequencer.c:2756

3644 +#: sequencer.c:2775

3645 #, c-format

3619 -msgid "could not truncate '%s'"

3620 -msgstr "无法截断 '%s'"

3646 +msgid "could not parse commit '%s'"

3647 +msgstr "不能解析提交 '%s'"

3648

3622 -#: sequencer.c:2848

3649 +#: sequencer.c:2897

3650 msgid "the script was already rearranged."

3651 msgstr "脚本已经重新编排。"

3652

3626 -#: sequencer.c:2953

3627 -#, c-format

3628 -msgid "could not finish '%s'"

3629 -msgstr "无法结束 '%s'"

3630 -

3653 #: setup.c:171

3654 #, c-format

3655 msgid ""

@@ -3659,34 +3681,34 @@ msgstr ""

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

3682 "'git <命令> [<版本>...] -- [<文件>...]'"

3683

3662 -#: setup.c:499

3684 +#: setup.c:501

3685 #, c-format

3686 msgid "Expected git repo version <= %d, found %d"

3687 msgstr "期望 git 仓库版本 <= %d，却得到 %d"

3688

3667 -#: setup.c:507

3689 +#: setup.c:509

3690 msgid "unknown repository extensions found:"

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

3692

3671 -#: setup.c:806

3693 +#: setup.c:811

3694 #, c-format

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

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

3697

3676 -#: setup.c:808 builtin/index-pack.c:1653

3698 +#: setup.c:813 builtin/index-pack.c:1653

3699 msgid "Cannot come back to cwd"

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

3701

3680 -#: setup.c:1046

3702 +#: setup.c:1052

3703 msgid "Unable to read current working directory"

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

3705

3684 -#: setup.c:1058 setup.c:1064

3706 +#: setup.c:1064 setup.c:1070

3707 #, c-format

3708 msgid "Cannot change to '%s'"

3709 msgstr "不能切换到 '%s'"

3710

3689 -#: setup.c:1077

3711 +#: setup.c:1083

3712 #, c-format

3713 msgid ""

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

@@ -3695,7 +3717,7 @@ msgstr ""

3717 "不是一个 git 仓库（或者向上递归至挂载点 %s 的任何祖先目录）\n"

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

3719

3698 -#: setup.c:1159

3720 +#: setup.c:1167

3721 #, c-format

3722 msgid ""

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

@@ -3704,41 +3726,41 @@ msgstr ""

3726 "参数 core.sharedRepository 的文件权限值有错（0%.3o）。\n"

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

3728

3707 -#: sha1_file.c:528

3729 +#: sha1_file.c:598

3730 #, c-format

3731 msgid "path '%s' does not exist"

3732 msgstr "路径 '%s' 不存在"

3733

3712 -#: sha1_file.c:554

3734 +#: sha1_file.c:624

3735 #, c-format

3736 msgid "reference repository '%s' as a linked checkout is not supported yet."

3737 msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"

3738

3717 -#: sha1_file.c:560

3739 +#: sha1_file.c:630

3740 #, c-format

3741 msgid "reference repository '%s' is not a local repository."

3742 msgstr "参考仓库 '%s' 不是一个本地仓库。"

3743

3722 -#: sha1_file.c:566

3744 +#: sha1_file.c:636

3745 #, c-format

3746 msgid "reference repository '%s' is shallow"

3747 msgstr "参考仓库 '%s' 是一个浅克隆"

3748

3727 -#: sha1_file.c:574

3749 +#: sha1_file.c:644

3750 #, c-format

3751 msgid "reference repository '%s' is grafted"

3752 msgstr "参考仓库 '%s' 已被嫁接"

3753

3732 -#: sha1_name.c:420

3754 +#: sha1_name.c:422

3755 #, c-format

3756 msgid "short SHA1 %s is ambiguous"

3757 msgstr "短 SHA1 %s 存在歧义"

3758

3737 -#: sha1_name.c:431

3759 +#: sha1_name.c:433

3760 msgid "The candidates are:"

3761 msgstr "候选者有："

3762

3741 -#: sha1_name.c:590

3763 +#: sha1_name.c:693

3764 msgid ""

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

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

@@ -3759,86 +3781,86 @@ msgstr ""

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

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

3783

3762 -#: submodule.c:93 submodule.c:127

3784 +#: submodule.c:96 submodule.c:130

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

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

3787

3766 -#: submodule.c:97 submodule.c:131

3788 +#: submodule.c:100 submodule.c:134

3789 #, c-format

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

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

3792

3771 -#: submodule.c:105

3793 +#: submodule.c:108

3794 #, c-format

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

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

3797

3776 -#: submodule.c:138

3798 +#: submodule.c:141

3799 #, c-format

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

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

3802

3781 -#: submodule.c:149

3803 +#: submodule.c:152

3804 msgid "staging updated .gitmodules failed"

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

3806

3785 -#: submodule.c:309

3807 +#: submodule.c:312

3808 #, c-format

3809 msgid "in unpopulated submodule '%s'"

3810 msgstr "位于未检出的子模组 '%s'"

3811

3790 -#: submodule.c:340

3812 +#: submodule.c:343

3813 #, c-format

3814 msgid "Pathspec '%s' is in submodule '%.*s'"

3815 msgstr "路径规格 '%s' 在子模组 '%.*s' 中"

3816

3795 -#: submodule.c:799

3817 +#: submodule.c:833

3818 #, c-format

3819 msgid "submodule entry '%s' (%s) is a %s, not a commit"

3820 msgstr "子模组条目 '%s'（%s）是一个 %s，不是一个提交"

3821

3800 -#: submodule.c:1021 builtin/branch.c:641 builtin/submodule--helper.c:1149

3822 +#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1387

3823 msgid "Failed to resolve HEAD as a valid ref."

3824 msgstr "无法将 HEAD 解析为有效引用。"

3825

3804 -#: submodule.c:1304

3826 +#: submodule.c:1370

3827 #, c-format

3828 msgid "'%s' not recognized as a git repository"

3829 msgstr "无法将 '%s' 识别为一个 git 仓库"

3830

3809 -#: submodule.c:1442

3831 +#: submodule.c:1508

3832 #, c-format

3833 msgid "could not start 'git status' in submodule '%s'"

3834 msgstr "无法在子模组 '%s' 中启动 'git status'"

3835

3814 -#: submodule.c:1455

3836 +#: submodule.c:1521

3837 #, c-format

3838 msgid "could not run 'git status' in submodule '%s'"

3839 msgstr "无法在子模组 '%s' 中执行 'git status'"

3840

3819 -#: submodule.c:1548

3841 +#: submodule.c:1614

3842 #, c-format

3843 msgid "submodule '%s' has dirty index"

3844 msgstr "子模组 '%s' 中有脏索引"

3845

3824 -#: submodule.c:1809

3846 +#: submodule.c:1876

3847 #, c-format

3848 msgid ""

3849 "relocate_gitdir for submodule '%s' with more than one worktree not supported"

3850 msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir"

3851

3830 -#: submodule.c:1821 submodule.c:1877

3852 +#: submodule.c:1888 submodule.c:1944

3853 #, c-format

3854 msgid "could not lookup name for submodule '%s'"

3855 msgstr "不能查询子模组 '%s' 的名称"

3856

3835 -#: submodule.c:1825 builtin/submodule--helper.c:671

3836 -#: builtin/submodule--helper.c:681

3857 +#: submodule.c:1892 builtin/submodule--helper.c:909

3858 +#: builtin/submodule--helper.c:919

3859 #, c-format

3860 msgid "could not create directory '%s'"

3861 msgstr "不能创建目录 '%s'"

3862

3841 -#: submodule.c:1828

3863 +#: submodule.c:1895

3864 #, c-format

3865 msgid ""

3866 "Migrating git directory of '%s%s' from\n"

@@ -3849,20 +3871,20 @@ msgstr ""

3871 "'%s' 迁移至\n"

3872 "'%s'\n"

3873

3852 -#: submodule.c:1912

3874 +#: submodule.c:1979

3875 #, c-format

3876 msgid "could not recurse into submodule '%s'"

3877 msgstr "无法递归进子模组路径 '%s'"

3878

3857 -#: submodule.c:1956

3879 +#: submodule.c:2023

3880 msgid "could not start ls-files in .."

3881 msgstr "无法在 .. 中启动 ls-files"

3882

3861 -#: submodule.c:1976

3883 +#: submodule.c:2043

3884 msgid "BUG: returned path string doesn't match cwd?"

3885 msgstr "BUG：返回的路径和当前路径不匹配？"

3886

3865 -#: submodule.c:1995

3887 +#: submodule.c:2062

3888 #, c-format

3889 msgid "ls-tree returned unexpected return code %d"

3890 msgstr "ls-tree 返回未知返回值 %d"

@@ -3930,24 +3952,24 @@ msgstr "不能打开临时文件"

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

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

3954

3933 -#: transport.c:62

3955 +#: transport.c:63

3956 #, c-format

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

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

3959

3938 -#: transport.c:151

3960 +#: transport.c:152

3961 #, c-format

3962 msgid "transport: invalid depth option '%s'"

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

3964

3943 -#: transport.c:888

3965 +#: transport.c:904

3966 #, c-format

3967 msgid ""

3968 "The following submodule paths contain changes that can\n"

3969 "not be found on any remote:\n"

3970 msgstr "下列子模组路径所包含的修改在任何远程源中都找不到：\n"

3971

3950 -#: transport.c:892

3972 +#: transport.c:908

3973 #, c-format

3974 msgid ""

3975 "\n"

@@ -3974,11 +3996,11 @@ msgstr ""

3996 "以推送至远程。\n"

3997 "\n"

3998

3977 -#: transport.c:900

3999 +#: transport.c:916

4000 msgid "Aborting."

4001 msgstr "正在终止。"

4002

3981 -#: transport-helper.c:1071

4003 +#: transport-helper.c:1074

4004 #, c-format

4005 msgid "Could not read ref %s"

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

@@ -3999,7 +4021,7 @@ msgstr "树对象条目中空的文件名"

4021 msgid "too-short tree file"

4022 msgstr "太短的树文件"

4023

4002 -#: unpack-trees.c:106

4024 +#: unpack-trees.c:107

4025 #, c-format

4026 msgid ""

4027 "Your local changes to the following files would be overwritten by checkout:\n"

@@ -4008,7 +4030,7 @@ msgstr ""

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

4031 "%%s请在切换分支前提交或贮藏您的修改。"

4032

4011 -#: unpack-trees.c:108

4033 +#: unpack-trees.c:109

4034 #, c-format

4035 msgid ""

4036 "Your local changes to the following files would be overwritten by checkout:\n"

@@ -4017,7 +4039,7 @@ msgstr ""

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

4040 "%%s"

4041

4020 -#: unpack-trees.c:111

4042 +#: unpack-trees.c:112

4043 #, c-format

4044 msgid ""

4045 "Your local changes to the following files would be overwritten by merge:\n"

@@ -4026,7 +4048,7 @@ msgstr ""

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

4049 "%%s请在合并前提交或贮藏您的修改。"

4050

4029 -#: unpack-trees.c:113

4051 +#: unpack-trees.c:114

4052 #, c-format

4053 msgid ""

4054 "Your local changes to the following files would be overwritten by merge:\n"

@@ -4035,7 +4057,7 @@ msgstr ""

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

4058 "%%s"

4059

4038 -#: unpack-trees.c:116

4060 +#: unpack-trees.c:117

4061 #, c-format

4062 msgid ""

4063 "Your local changes to the following files would be overwritten by %s:\n"

@@ -4044,7 +4066,7 @@ msgstr ""

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

4067 "%%s请在 %s 之前提交或贮藏您的修改。"

4068

4047 -#: unpack-trees.c:118

4069 +#: unpack-trees.c:119

4070 #, c-format

4071 msgid ""

4072 "Your local changes to the following files would be overwritten by %s:\n"

@@ -4053,7 +4075,7 @@ msgstr ""

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

4076 "%%s"

4077

4056 -#: unpack-trees.c:123

4078 +#: unpack-trees.c:124

4079 #, c-format

4080 msgid ""

4081 "Updating the following directories would lose untracked files in them:\n"

@@ -4062,7 +4084,7 @@ msgstr ""

4084 "更新如下目录将会丢失其中未跟踪的文件：\n"

4085 "%s"

4086

4065 -#: unpack-trees.c:127

4087 +#: unpack-trees.c:128

4088 #, c-format

4089 msgid ""

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

@@ -4071,7 +4093,7 @@ msgstr ""

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

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

4095

4074 -#: unpack-trees.c:129

4096 +#: unpack-trees.c:130

4097 #, c-format

4098 msgid ""

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

@@ -4080,7 +4102,7 @@ msgstr ""

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

4103 "%%s"

4104

4083 -#: unpack-trees.c:132

4105 +#: unpack-trees.c:133

4106 #, c-format

4107 msgid ""

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

@@ -4089,7 +4111,7 @@ msgstr ""

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

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

4113

4092 -#: unpack-trees.c:134

4114 +#: unpack-trees.c:135

4115 #, c-format

4116 msgid ""

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

@@ -4098,7 +4120,7 @@ msgstr ""

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

4121 "%%s"

4122

4101 -#: unpack-trees.c:137

4123 +#: unpack-trees.c:138

4124 #, c-format

4125 msgid ""

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

@@ -4107,7 +4129,7 @@ msgstr ""

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

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

4131

4110 -#: unpack-trees.c:139

4132 +#: unpack-trees.c:140

4133 #, c-format

4134 msgid ""

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

@@ -4116,7 +4138,7 @@ msgstr ""

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

4139 "%%s"

4140

4119 -#: unpack-trees.c:144

4141 +#: unpack-trees.c:145

4142 #, c-format

4143 msgid ""

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

@@ -4126,7 +4148,7 @@ msgstr ""

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

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

4150

4129 -#: unpack-trees.c:146

4151 +#: unpack-trees.c:147

4152 #, c-format

4153 msgid ""

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

@@ -4136,7 +4158,7 @@ msgstr ""

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

4159 "%%s"

4160

4139 -#: unpack-trees.c:149

4161 +#: unpack-trees.c:150

4162 #, c-format

4163 msgid ""

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

@@ -4145,7 +4167,7 @@ msgstr ""

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

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

4169

4148 -#: unpack-trees.c:151

4170 +#: unpack-trees.c:152

4171 #, c-format

4172 msgid ""

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

@@ -4154,7 +4176,7 @@ msgstr ""

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

4177 "%%s"

4178

4157 -#: unpack-trees.c:154

4179 +#: unpack-trees.c:155

4180 #, c-format

4181 msgid ""

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

@@ -4163,7 +4185,7 @@ msgstr ""

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

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

4187

4166 -#: unpack-trees.c:156

4188 +#: unpack-trees.c:157

4189 #, c-format

4190 msgid ""

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

@@ -4172,12 +4194,12 @@ msgstr ""

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

4195 "%%s"

4196

4175 -#: unpack-trees.c:163

4197 +#: unpack-trees.c:164

4198 #, c-format

4199 msgid "Entry '%s' overlaps with '%s'. Cannot bind."

4200 msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"

4201

4180 -#: unpack-trees.c:166

4202 +#: unpack-trees.c:167

4203 #, c-format

4204 msgid ""

4205 "Cannot update sparse checkout: the following entries are not up to date:\n"

@@ -4186,7 +4208,7 @@ msgstr ""

4208 "无法更新稀疏检出：如下条目不是最新：\n"

4209 "%s"

4210

4189 -#: unpack-trees.c:168

4211 +#: unpack-trees.c:169

4212 #, c-format

4213 msgid ""

4214 "The following working tree files would be overwritten by sparse checkout "

@@ -4196,7 +4218,7 @@ msgstr ""

4218 "工作区中下列文件将被稀疏检出更新所覆盖：\n"

4219 "%s"

4220

4199 -#: unpack-trees.c:170

4221 +#: unpack-trees.c:171

4222 #, c-format

4223 msgid ""

4224 "The following working tree files would be removed by sparse checkout "

@@ -4206,7 +4228,7 @@ msgstr ""

4228 "工作区中下列文件将被稀疏检出更新所删除：\n"

4229 "%s"

4230

4209 -#: unpack-trees.c:172

4231 +#: unpack-trees.c:173

4232 #, c-format

4233 msgid ""

4234 "Cannot update submodule:\n"

@@ -4215,12 +4237,12 @@ msgstr ""

4237 "无法更新子模组：\n"

4238 "%s"

4239

4218 -#: unpack-trees.c:249

4240 +#: unpack-trees.c:250

4241 #, c-format

4242 msgid "Aborting\n"

4243 msgstr "终止中\n"

4244

4223 -#: unpack-trees.c:331

4245 +#: unpack-trees.c:332

4246 msgid "Checking out files"

4247 msgstr "正在检出文件"

4248

@@ -4263,8 +4285,8 @@ msgstr "无法读取 '%s'"

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

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

4287

4266 -#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:766

4267 -#: builtin/am.c:858 builtin/merge.c:1041

4288 +#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770

4289 +#: builtin/am.c:862 builtin/merge.c:1043

4290 #, c-format

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

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

@@ -4278,16 +4300,6 @@ msgstr "不能访问 '%s'"

4300 msgid "unable to get current working directory"

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

4302

4281 -#: wrapper.c:656

4282 -#, c-format

4283 -msgid "could not write to %s"

4284 -msgstr "不能写入 %s"

4285 -

4286 -#: wrapper.c:658

4287 -#, c-format

4288 -msgid "could not close %s"

4289 -msgstr "不能关闭 %s"

4290 -

4303 #: wt-status.c:150

4304 msgid "Unmerged paths:"

4305 msgstr "未合并的路径："

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

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

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

4332

4321 -#: wt-status.c:198 wt-status.c:979

4333 +#: wt-status.c:198 wt-status.c:984

4334 msgid "Changes to be committed:"

4335 msgstr "要提交的变更："

4336

4325 -#: wt-status.c:216 wt-status.c:988

4337 +#: wt-status.c:216 wt-status.c:993

4338 msgid "Changes not staged for commit:"

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

4340

@@ -4428,22 +4440,22 @@ msgstr "修改的内容, "

4440 msgid "untracked content, "

4441 msgstr "未跟踪的内容, "

4442

4431 -#: wt-status.c:819

4443 +#: wt-status.c:824

4444 #, c-format

4445 msgid "Your stash currently has %d entry"

4446 msgid_plural "Your stash currently has %d entries"

4447 msgstr[0] "您的贮藏区当前有 %d 条记录"

4448 msgstr[1] "您的贮藏区当前有 %d 条记录"

4449

4438 -#: wt-status.c:851

4450 +#: wt-status.c:856

4451 msgid "Submodules changed but not updated:"

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

4453

4442 -#: wt-status.c:853

4454 +#: wt-status.c:858

4455 msgid "Submodule changes to be committed:"

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

4457

4446 -#: wt-status.c:935

4458 +#: wt-status.c:940

4459 msgid ""

4460 "Do not modify or remove the line above.\n"

4461 "Everything below it will be ignored."

@@ -4451,77 +4463,77 @@ msgstr ""

4463 "不要改动或删除上面的一行。\n"

4464 "其下所有内容都将被忽略。"

4465

4454 -#: wt-status.c:1048

4466 +#: wt-status.c:1053

4467 msgid "You have unmerged paths."

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

4469

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

4459 -#: wt-status.c:1051

4471 +#: wt-status.c:1056

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

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

4474

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

4464 -#: wt-status.c:1053

4476 +#: wt-status.c:1058

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

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

4479

4468 -#: wt-status.c:1058

4480 +#: wt-status.c:1063

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

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

4483

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

4473 -#: wt-status.c:1061

4485 +#: wt-status.c:1066

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

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

4488

4477 -#: wt-status.c:1071

4489 +#: wt-status.c:1076

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

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

4492

4481 -#: wt-status.c:1074

4493 +#: wt-status.c:1079

4494 msgid "The current patch is empty."

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

4496

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

4486 -#: wt-status.c:1078

4498 +#: wt-status.c:1083

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

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

4501

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

4491 -#: wt-status.c:1080

4503 +#: wt-status.c:1085

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

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

4506

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

4496 -#: wt-status.c:1082

4508 +#: wt-status.c:1087

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

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

4511

4500 -#: wt-status.c:1214

4512 +#: wt-status.c:1219

4513 msgid "git-rebase-todo is missing."

4514 msgstr "git-rebase-todo 丢失。"

4515

4504 -#: wt-status.c:1216

4516 +#: wt-status.c:1221

4517 msgid "No commands done."

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

4519

4508 -#: wt-status.c:1219

4520 +#: wt-status.c:1224

4521 #, c-format

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

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

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

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

4526

4515 -#: wt-status.c:1230

4527 +#: wt-status.c:1235

4528 #, c-format

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

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

4531

4520 -#: wt-status.c:1235

4532 +#: wt-status.c:1240

4533 msgid "No commands remaining."

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

4535

4524 -#: wt-status.c:1238

4536 +#: wt-status.c:1243

4537 #, c-format

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

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

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

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

4542

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

4532 -#: wt-status.c:1246

4544 +#: wt-status.c:1251

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

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

4547

4536 -#: wt-status.c:1259

4548 +#: wt-status.c:1264

4549 #, c-format

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

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

4552

4541 -#: wt-status.c:1264

4553 +#: wt-status.c:1269

4554 msgid "You are currently rebasing."

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

4556

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

4546 -#: wt-status.c:1278

4558 +#: wt-status.c:1283

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

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

4561

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

4551 -#: wt-status.c:1280

4563 +#: wt-status.c:1285

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

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

4566

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

4556 -#: wt-status.c:1282

4568 +#: wt-status.c:1287

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

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

4571

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

4561 -#: wt-status.c:1288

4573 +#: wt-status.c:1293

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

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

4576

4565 -#: wt-status.c:1292

4577 +#: wt-status.c:1297

4578 #, c-format

4579 msgid ""

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

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

4582

4571 -#: wt-status.c:1297

4583 +#: wt-status.c:1302

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

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

4586

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

4576 -#: wt-status.c:1300

4588 +#: wt-status.c:1305

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

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

4591

4580 -#: wt-status.c:1304

4592 +#: wt-status.c:1309

4593 #, c-format

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

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

4596

4585 -#: wt-status.c:1309

4597 +#: wt-status.c:1314

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

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

4600

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

4590 -#: wt-status.c:1312

4602 +#: wt-status.c:1317

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

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

4605

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

4595 -#: wt-status.c:1314

4607 +#: wt-status.c:1319

4608 msgid ""

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

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

4611

4600 -#: wt-status.c:1324

4612 +#: wt-status.c:1329

4613 #, c-format

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

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

4616

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

4606 -#: wt-status.c:1329

4618 +#: wt-status.c:1334

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

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

4621

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

4611 -#: wt-status.c:1332

4623 +#: wt-status.c:1337

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

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

4626

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

4616 -#: wt-status.c:1334

4628 +#: wt-status.c:1339

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

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

4631

4620 -#: wt-status.c:1343

4632 +#: wt-status.c:1348

4633 #, c-format

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

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

4636

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

4626 -#: wt-status.c:1348

4638 +#: wt-status.c:1353

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

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

4641

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

4631 -#: wt-status.c:1351

4643 +#: wt-status.c:1356

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

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

4646

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

4636 -#: wt-status.c:1353

4648 +#: wt-status.c:1358

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

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

4651

4640 -#: wt-status.c:1364

4652 +#: wt-status.c:1369

4653 #, c-format

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

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

4656

4645 -#: wt-status.c:1368

4657 +#: wt-status.c:1373

4658 msgid "You are currently bisecting."

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

4660

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

4650 -#: wt-status.c:1371

4662 +#: wt-status.c:1376

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

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

4665

4654 -#: wt-status.c:1568

4666 +#: wt-status.c:1573

4667 msgid "On branch "

4668 msgstr "位于分支 "

4669

4658 -#: wt-status.c:1574

4670 +#: wt-status.c:1579

4671 msgid "interactive rebase in progress; onto "

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

4673

4662 -#: wt-status.c:1576

4674 +#: wt-status.c:1581

4675 msgid "rebase in progress; onto "

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

4677

4666 -#: wt-status.c:1581

4678 +#: wt-status.c:1586

4679 msgid "HEAD detached at "

4680 msgstr "头指针分离于 "

4681

4670 -#: wt-status.c:1583

4682 +#: wt-status.c:1588

4683 msgid "HEAD detached from "

4684 msgstr "头指针分离自 "

4685

4674 -#: wt-status.c:1586

4686 +#: wt-status.c:1591

4687 msgid "Not currently on any branch."

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

4689

4678 -#: wt-status.c:1606

4690 +#: wt-status.c:1611

4691 msgid "Initial commit"

4692 msgstr "初始提交"

4693

4682 -#: wt-status.c:1607

4694 +#: wt-status.c:1612

4695 msgid "No commits yet"

4696 msgstr "尚无提交"

4697

4686 -#: wt-status.c:1621

4698 +#: wt-status.c:1626

4699 msgid "Untracked files"

4700 msgstr "未跟踪的文件"

4701

4690 -#: wt-status.c:1623

4702 +#: wt-status.c:1628

4703 msgid "Ignored files"

4704 msgstr "忽略的文件"

4705

4694 -#: wt-status.c:1627

4706 +#: wt-status.c:1632

4707 #, c-format

4708 msgid ""

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

@@ -4701,93 +4713,93 @@ msgstr ""

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

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

4715

4704 -#: wt-status.c:1633

4716 +#: wt-status.c:1638

4717 #, c-format

4718 msgid "Untracked files not listed%s"

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

4720

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

4710 -#: wt-status.c:1635

4722 +#: wt-status.c:1640

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

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

4725

4714 -#: wt-status.c:1641

4726 +#: wt-status.c:1646

4727 msgid "No changes"

4728 msgstr "没有修改"

4729

4718 -#: wt-status.c:1646

4730 +#: wt-status.c:1651

4731 #, c-format

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

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

4734

4723 -#: wt-status.c:1649

4735 +#: wt-status.c:1654

4736 #, c-format

4737 msgid "no changes added to commit\n"

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

4739

4728 -#: wt-status.c:1652

4740 +#: wt-status.c:1657

4741 #, c-format

4742 msgid ""

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

4744 "track)\n"

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

4746

4735 -#: wt-status.c:1655

4747 +#: wt-status.c:1660

4748 #, c-format

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

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

4751

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

4741 -#: wt-status.c:1658

4753 +#: wt-status.c:1663

4754 #, c-format

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

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

4757

4746 -#: wt-status.c:1661 wt-status.c:1666

4758 +#: wt-status.c:1666 wt-status.c:1671

4759 #, c-format

4760 msgid "nothing to commit\n"

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

4762

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

4752 -#: wt-status.c:1664

4764 +#: wt-status.c:1669

4765 #, c-format

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

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

4768

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

4758 -#: wt-status.c:1668

4770 +#: wt-status.c:1673

4771 #, c-format

4772 msgid "nothing to commit, working tree clean\n"

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

4774

4763 -#: wt-status.c:1780

4775 +#: wt-status.c:1785

4776 msgid "No commits yet on "

4777 msgstr "尚无提交在 "

4778

4767 -#: wt-status.c:1784

4779 +#: wt-status.c:1789

4780 msgid "HEAD (no branch)"

4781 msgstr "HEAD（非分支）"

4782

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

4772 -#: wt-status.c:1813 wt-status.c:1821

4784 +#: wt-status.c:1818 wt-status.c:1826

4785 msgid "behind "

4786 msgstr "落后 "

4787

4776 -#: wt-status.c:1816 wt-status.c:1819

4788 +#: wt-status.c:1821 wt-status.c:1824

4789 msgid "ahead "

4790 msgstr "领先 "

4791

4792 #. TRANSLATORS: the action is e.g. "pull with rebase"

4781 -#: wt-status.c:2311

4793 +#: wt-status.c:2318

4794 #, c-format

4795 msgid "cannot %s: You have unstaged changes."

4796 msgstr "不能%s：您有未暂存的变更。"

4797

4786 -#: wt-status.c:2317

4798 +#: wt-status.c:2324

4799 msgid "additionally, your index contains uncommitted changes."

4800 msgstr "另外，您的索引中包含未提交的变更。"

4801

4790 -#: wt-status.c:2319

4802 +#: wt-status.c:2326

4803 #, c-format

4804 msgid "cannot %s: Your index contains uncommitted changes."

4805 msgstr "不能%s：您的索引中包含未提交的变更。"

@@ -4801,122 +4813,126 @@ msgstr "无法删除 '%s'"

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

4814 msgstr "git add [<选项>] [--] <路径规格>..."

4815

4804 -#: builtin/add.c:82

4816 +#: builtin/add.c:83

4817 #, c-format

4818 msgid "unexpected diff status %c"

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

4820

4809 -#: builtin/add.c:87 builtin/commit.c:291

4821 +#: builtin/add.c:88 builtin/commit.c:291

4822 msgid "updating files failed"

4823 msgstr "更新文件失败"

4824

4813 -#: builtin/add.c:97

4825 +#: builtin/add.c:98

4826 #, c-format

4827 msgid "remove '%s'\n"

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

4829

4818 -#: builtin/add.c:153

4830 +#: builtin/add.c:173

4831 msgid "Unstaged changes after refreshing the index:"

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

4833

4822 -#: builtin/add.c:213 builtin/rev-parse.c:888

4834 +#: builtin/add.c:233 builtin/rev-parse.c:888

4835 msgid "Could not read the index"

4836 msgstr "不能读取索引"

4837

4826 -#: builtin/add.c:224

4838 +#: builtin/add.c:244

4839 #, c-format

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

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

4842

4831 -#: builtin/add.c:228

4843 +#: builtin/add.c:248

4844 msgid "Could not write patch"

4845 msgstr "不能生成补丁"

4846

4835 -#: builtin/add.c:231

4847 +#: builtin/add.c:251

4848 msgid "editing patch failed"

4849 msgstr "编辑补丁失败"

4850

4839 -#: builtin/add.c:234

4851 +#: builtin/add.c:254

4852 #, c-format

4853 msgid "Could not stat '%s'"

4854 msgstr "不能对 '%s' 调用 stat"

4855

4844 -#: builtin/add.c:236

4856 +#: builtin/add.c:256

4857 msgid "Empty patch. Aborted."

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

4859

4848 -#: builtin/add.c:241

4860 +#: builtin/add.c:261

4861 #, c-format

4862 msgid "Could not apply '%s'"

4863 msgstr "不能应用 '%s'"

4864

4853 -#: builtin/add.c:251

4865 +#: builtin/add.c:271

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

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

4868

4857 -#: builtin/add.c:271 builtin/clean.c:910 builtin/fetch.c:132 builtin/mv.c:124

4858 -#: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529

4869 +#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:133 builtin/mv.c:124

4870 +#: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541

4871 #: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164

4872 msgid "dry run"

4873 msgstr "演习"

4874

4863 -#: builtin/add.c:274

4875 +#: builtin/add.c:294

4876 msgid "interactive picking"

4877 msgstr "交互式拣选"

4878

4867 -#: builtin/add.c:275 builtin/checkout.c:1172 builtin/reset.c:310

4879 +#: builtin/add.c:295 builtin/checkout.c:1137 builtin/reset.c:310

4880 msgid "select hunks interactively"

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

4882

4871 -#: builtin/add.c:276

4883 +#: builtin/add.c:296

4884 msgid "edit current diff and apply"

4885 msgstr "编辑当前差异并应用"

4886

4875 -#: builtin/add.c:277

4887 +#: builtin/add.c:297

4888 msgid "allow adding otherwise ignored files"

4889 msgstr "允许添加忽略的文件"

4890

4879 -#: builtin/add.c:278

4891 +#: builtin/add.c:298

4892 msgid "update tracked files"

4893 msgstr "更新已跟踪的文件"

4894

4883 -#: builtin/add.c:279

4895 +#: builtin/add.c:299

4896 +msgid "renormalize EOL of tracked files (implies -u)"

4897 +msgstr "对已跟踪文件（暗含 -u）重新归一换行符"

4898 +

4899 +#: builtin/add.c:300

4900 msgid "record only the fact that the path will be added later"

4901 msgstr "只记录，该路径稍后再添加"

4902

4887 -#: builtin/add.c:280

4903 +#: builtin/add.c:301

4904 msgid "add changes from all tracked and untracked files"

4905 msgstr "添加所有改变的已跟踪文件和未跟踪文件"

4906

4891 -#: builtin/add.c:283

4907 +#: builtin/add.c:304

4908 msgid "ignore paths removed in the working tree (same as --no-all)"

4909 msgstr "忽略工作区中移除的路径（和 --no-all 相同）"

4910

4895 -#: builtin/add.c:285

4911 +#: builtin/add.c:306

4912 msgid "don't add, only refresh the index"

4913 msgstr "不添加，只刷新索引"

4914

4899 -#: builtin/add.c:286

4915 +#: builtin/add.c:307

4916 msgid "just skip files which cannot be added because of errors"

4917 msgstr "跳过因出错不能添加的文件"

4918

4903 -#: builtin/add.c:287

4919 +#: builtin/add.c:308

4920 msgid "check if - even missing - files are ignored in dry run"

4921 msgstr "检查在演习模式下文件（即使不存在）是否被忽略"

4922

4907 -#: builtin/add.c:288 builtin/update-index.c:954

4923 +#: builtin/add.c:309 builtin/update-index.c:964

4924 msgid "(+/-)x"

4925 msgstr "(+/-)x"

4926

4911 -#: builtin/add.c:288 builtin/update-index.c:955

4927 +#: builtin/add.c:309 builtin/update-index.c:965

4928 msgid "override the executable bit of the listed files"

4929 msgstr "覆盖列表里文件的可执行位"

4930

4915 -#: builtin/add.c:290

4931 +#: builtin/add.c:311

4932 msgid "warn when adding an embedded repository"

4933 msgstr "创建一个嵌入式仓库时给予警告"

4934

4919 -#: builtin/add.c:305

4935 +#: builtin/add.c:326

4936 #, c-format

4937 msgid ""

4938 "You've added another git repository inside your current repository.\n"

@@ -4945,47 +4961,47 @@ msgstr ""

4961 "\n"

4962 "参见 \"git help submodule\" 获取更多信息。"

4963

4948 -#: builtin/add.c:333

4964 +#: builtin/add.c:354

4965 #, c-format

4966 msgid "adding embedded git repository: %s"

4967 msgstr "正在添加嵌入式 git 仓库：%s"

4968

4953 -#: builtin/add.c:351

4969 +#: builtin/add.c:372

4970 #, c-format

4971 msgid "Use -f if you really want to add them.\n"

4972 msgstr "使用 -f 参数如果您确实要添加它们。\n"

4973

4958 -#: builtin/add.c:359

4974 +#: builtin/add.c:380

4975 msgid "adding files failed"

4976 msgstr "添加文件失败"

4977

4962 -#: builtin/add.c:396

4978 +#: builtin/add.c:417

4979 msgid "-A and -u are mutually incompatible"

4980 msgstr "-A 和 -u 选项互斥"

4981

4966 -#: builtin/add.c:403

4982 +#: builtin/add.c:424

4983 msgid "Option --ignore-missing can only be used together with --dry-run"

4984 msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"

4985

4970 -#: builtin/add.c:407

4986 +#: builtin/add.c:428

4987 #, c-format

4988 msgid "--chmod param '%s' must be either -x or +x"

4989 msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x"

4990

4975 -#: builtin/add.c:422

4991 +#: builtin/add.c:443

4992 #, c-format

4993 msgid "Nothing specified, nothing added.\n"

4994 msgstr "没有指定文件，也没有文件被添加。\n"

4995

4980 -#: builtin/add.c:423

4996 +#: builtin/add.c:444

4997 #, c-format

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

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

5000

4985 -#: builtin/add.c:428 builtin/check-ignore.c:176 builtin/checkout.c:282

4986 -#: builtin/checkout.c:479 builtin/clean.c:957 builtin/commit.c:350

4987 -#: builtin/mv.c:143 builtin/reset.c:249 builtin/rm.c:271

4988 -#: builtin/submodule--helper.c:243

5001 +#: builtin/add.c:449 builtin/check-ignore.c:176 builtin/checkout.c:281

5002 +#: builtin/checkout.c:484 builtin/clean.c:958 builtin/commit.c:350

5003 +#: builtin/diff-tree.c:114 builtin/mv.c:143 builtin/reset.c:249

5004 +#: builtin/rm.c:271 builtin/submodule--helper.c:311

5005 msgid "index file corrupt"

5006 msgstr "索引文件损坏"

5007

@@ -5012,82 +5028,82 @@ msgstr "从 '%s' 拷贝注解到 '%s' 时失败"

5028 msgid "fseek failed"

5029 msgstr "fseek 失败"

5030

5015 -#: builtin/am.c:786

5031 +#: builtin/am.c:790

5032 #, c-format

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

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

5035

5020 -#: builtin/am.c:851

5036 +#: builtin/am.c:855

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

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

5039

5024 -#: builtin/am.c:899

5040 +#: builtin/am.c:903

5041 msgid "invalid timestamp"

5042 msgstr "无效的时间戳"

5043

5028 -#: builtin/am.c:904 builtin/am.c:916

5044 +#: builtin/am.c:908 builtin/am.c:920

5045 msgid "invalid Date line"

5046 msgstr "无效的日期行"

5047

5032 -#: builtin/am.c:911

5048 +#: builtin/am.c:915

5049 msgid "invalid timezone offset"

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

5051

5036 -#: builtin/am.c:1004

5052 +#: builtin/am.c:1008

5053 msgid "Patch format detection failed."

5054 msgstr "补丁格式探测失败。"

5055

5040 -#: builtin/am.c:1009 builtin/clone.c:402

5056 +#: builtin/am.c:1013 builtin/clone.c:402

5057 #, c-format

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

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

5060

5045 -#: builtin/am.c:1013

5061 +#: builtin/am.c:1017

5062 msgid "Failed to split patches."

5063 msgstr "无法拆分补丁。"

5064

5049 -#: builtin/am.c:1142 builtin/commit.c:376

5065 +#: builtin/am.c:1146 builtin/commit.c:376

5066 msgid "unable to write index file"

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

5068

5053 -#: builtin/am.c:1193

5069 +#: builtin/am.c:1160

5070 #, c-format

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

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

5073

5058 -#: builtin/am.c:1194

5074 +#: builtin/am.c:1161

5075 #, c-format

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

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

5078

5063 -#: builtin/am.c:1195

5079 +#: builtin/am.c:1162

5080 #, c-format

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

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

5083

5068 -#: builtin/am.c:1302

5084 +#: builtin/am.c:1269

5085 msgid "Patch is empty."

5086 msgstr "补丁为空。"

5087

5072 -#: builtin/am.c:1368

5088 +#: builtin/am.c:1335

5089 #, c-format

5090 msgid "invalid ident line: %.*s"

5091 msgstr "无效的身份标识：%.*s"

5092

5077 -#: builtin/am.c:1390

5093 +#: builtin/am.c:1357

5094 #, c-format

5095 msgid "unable to parse commit %s"

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

5097

5082 -#: builtin/am.c:1584

5098 +#: builtin/am.c:1550

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

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

5101

5086 -#: builtin/am.c:1586

5102 +#: builtin/am.c:1552

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

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

5105

5090 -#: builtin/am.c:1605

5106 +#: builtin/am.c:1571

5107 msgid ""

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

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

@@ -5095,37 +5111,37 @@ msgstr ""

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

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

5113

5098 -#: builtin/am.c:1611

5114 +#: builtin/am.c:1577

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

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

5117

5102 -#: builtin/am.c:1636

5118 +#: builtin/am.c:1602

5119 msgid "Failed to merge in the changes."

5120 msgstr "无法合并变更。"

5121

5106 -#: builtin/am.c:1660 builtin/merge.c:641

5122 +#: builtin/am.c:1626 builtin/merge.c:642

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

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

5125

5110 -#: builtin/am.c:1667

5126 +#: builtin/am.c:1633

5127 msgid "applying to an empty history"

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

5129

5114 -#: builtin/am.c:1680 builtin/commit.c:1776 builtin/merge.c:824

5115 -#: builtin/merge.c:849

5130 +#: builtin/am.c:1646 builtin/commit.c:1798 builtin/merge.c:825

5131 +#: builtin/merge.c:850

5132 msgid "failed to write commit object"

5133 msgstr "无法写提交对象"

5134

5119 -#: builtin/am.c:1713 builtin/am.c:1717

5135 +#: builtin/am.c:1679 builtin/am.c:1683

5136 #, c-format

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

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

5139

5124 -#: builtin/am.c:1733

5140 +#: builtin/am.c:1699

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

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

5143

5128 -#: builtin/am.c:1738

5144 +#: builtin/am.c:1704

5145 msgid "Commit Body is:"

5146 msgstr "提交内容为："

5147

@@ -5134,35 +5150,35 @@ msgstr "提交内容为："

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

5151 #. input at this point.

5152 #.

5137 -#: builtin/am.c:1748

5153 +#: builtin/am.c:1714

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

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

5156

5141 -#: builtin/am.c:1798

5157 +#: builtin/am.c:1764

5158 #, c-format

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

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

5161

5146 -#: builtin/am.c:1838 builtin/am.c:1910

5162 +#: builtin/am.c:1804 builtin/am.c:1876

5163 #, c-format

5164 msgid "Applying: %.*s"

5165 msgstr "应用：%.*s"

5166

5151 -#: builtin/am.c:1854

5167 +#: builtin/am.c:1820

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

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

5170

5155 -#: builtin/am.c:1862

5171 +#: builtin/am.c:1828

5172 #, c-format

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

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

5175

5160 -#: builtin/am.c:1868

5176 +#: builtin/am.c:1834

5177 #, c-format

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

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

5180

5165 -#: builtin/am.c:1913

5181 +#: builtin/am.c:1879

5182 msgid ""

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

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

@@ -5172,7 +5188,7 @@ msgstr ""

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

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

5190

5175 -#: builtin/am.c:1920

5191 +#: builtin/am.c:1886

5192 msgid ""

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

5194 "You should 'git add' each file with resolved conflicts to mark them as "

@@ -5183,149 +5199,149 @@ msgstr ""

5199 "您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n"

5200 "你可以对 \"由他们删除\" 的文件执行 `git rm` 命令。"

5201

5186 -#: builtin/am.c:2029 builtin/am.c:2033 builtin/am.c:2045 builtin/reset.c:332

5202 +#: builtin/am.c:1993 builtin/am.c:1997 builtin/am.c:2009 builtin/reset.c:332

5203 #: builtin/reset.c:340

5204 #, c-format

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

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

5207

5192 -#: builtin/am.c:2081

5208 +#: builtin/am.c:2045

5209 msgid "failed to clean index"

5210 msgstr "无法清空索引"

5211

5196 -#: builtin/am.c:2116

5212 +#: builtin/am.c:2080

5213 msgid ""

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

5215 "Not rewinding to ORIG_HEAD"

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

5217

5202 -#: builtin/am.c:2179

5218 +#: builtin/am.c:2143

5219 #, c-format

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

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

5222

5207 -#: builtin/am.c:2212

5223 +#: builtin/am.c:2176

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

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

5226

5211 -#: builtin/am.c:2213

5227 +#: builtin/am.c:2177

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

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

5230

5215 -#: builtin/am.c:2219

5231 +#: builtin/am.c:2183

5232 msgid "run interactively"

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

5234

5219 -#: builtin/am.c:2221

5235 +#: builtin/am.c:2185

5236 msgid "historical option -- no-op"

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

5238

5223 -#: builtin/am.c:2223

5239 +#: builtin/am.c:2187

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

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

5242

5227 -#: builtin/am.c:2224 builtin/init-db.c:484 builtin/prune-packed.c:57

5243 +#: builtin/am.c:2188 builtin/init-db.c:484 builtin/prune-packed.c:57

5244 #: builtin/repack.c:180

5245 msgid "be quiet"

5246 msgstr "静默模式"

5247

5232 -#: builtin/am.c:2226

5248 +#: builtin/am.c:2190

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

5250 msgstr "在提交说明中添加一个 Signed-off-by 签名"

5251

5236 -#: builtin/am.c:2229

5252 +#: builtin/am.c:2193

5253 msgid "recode into utf8 (default)"

5254 msgstr "使用 utf8 字符集（默认）"

5255

5240 -#: builtin/am.c:2231

5256 +#: builtin/am.c:2195

5257 msgid "pass -k flag to git-mailinfo"

5258 msgstr "向 git-mailinfo 传递 -k 参数"

5259

5244 -#: builtin/am.c:2233

5260 +#: builtin/am.c:2197

5261 msgid "pass -b flag to git-mailinfo"

5262 msgstr "向 git-mailinfo 传递 -b 参数"

5263

5248 -#: builtin/am.c:2235

5264 +#: builtin/am.c:2199

5265 msgid "pass -m flag to git-mailinfo"

5266 msgstr "向 git-mailinfo 传递 -m 参数"

5267

5252 -#: builtin/am.c:2237

5268 +#: builtin/am.c:2201

5269 msgid "pass --keep-cr flag to git-mailsplit for mbox format"

5270 msgstr "针对 mbox 格式，向 git-mailsplit 传递 --keep-cr 参数"

5271

5256 -#: builtin/am.c:2240

5272 +#: builtin/am.c:2204

5273 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"

5274 msgstr "不向 git-mailsplit 传递 --keep-cr 参数，覆盖 am.keepcr 的设置"

5275

5260 -#: builtin/am.c:2243

5276 +#: builtin/am.c:2207

5277 msgid "strip everything before a scissors line"

5278 msgstr "丢弃裁切线前的所有内容"

5279

5264 -#: builtin/am.c:2245 builtin/am.c:2248 builtin/am.c:2251 builtin/am.c:2254

5265 -#: builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263 builtin/am.c:2266

5266 -#: builtin/am.c:2272

5280 +#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218

5281 +#: builtin/am.c:2221 builtin/am.c:2224 builtin/am.c:2227 builtin/am.c:2230

5282 +#: builtin/am.c:2236

5283 msgid "pass it through git-apply"

5284 msgstr "传递给 git-apply"

5285

5270 -#: builtin/am.c:2262 builtin/fmt-merge-msg.c:664 builtin/fmt-merge-msg.c:667

5271 -#: builtin/grep.c:843 builtin/merge.c:205 builtin/pull.c:142 builtin/pull.c:197

5286 +#: builtin/am.c:2226 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668

5287 +#: builtin/grep.c:845 builtin/merge.c:205 builtin/pull.c:145 builtin/pull.c:203

5288 #: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195

5289 #: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377

5290 #: parse-options.h:132 parse-options.h:134 parse-options.h:245

5291 msgid "n"

5292 msgstr "n"

5293

5278 -#: builtin/am.c:2268 builtin/branch.c:622 builtin/for-each-ref.c:38

5294 +#: builtin/am.c:2232 builtin/branch.c:629 builtin/for-each-ref.c:38

5295 #: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39

5296 msgid "format"

5297 msgstr "格式"

5298

5283 -#: builtin/am.c:2269

5299 +#: builtin/am.c:2233

5300 msgid "format the patch(es) are in"

5301 msgstr "补丁的格式"

5302

5287 -#: builtin/am.c:2275

5303 +#: builtin/am.c:2239

5304 msgid "override error message when patch failure occurs"

5305 msgstr "打补丁失败时显示的错误信息"

5306

5291 -#: builtin/am.c:2277

5307 +#: builtin/am.c:2241

5308 msgid "continue applying patches after resolving a conflict"

5309 msgstr "冲突解决后继续应用补丁"

5310

5295 -#: builtin/am.c:2280

5311 +#: builtin/am.c:2244

5312 msgid "synonyms for --continue"

5313 msgstr "和 --continue 同义"

5314

5299 -#: builtin/am.c:2283

5315 +#: builtin/am.c:2247

5316 msgid "skip the current patch"

5317 msgstr "跳过当前补丁"

5318

5303 -#: builtin/am.c:2286

5319 +#: builtin/am.c:2250

5320 msgid "restore the original branch and abort the patching operation."

5321 msgstr "恢复原始分支并终止打补丁操作。"

5322

5307 -#: builtin/am.c:2290

5323 +#: builtin/am.c:2254

5324 msgid "lie about committer date"

5325 msgstr "将作者日期作为提交日期"

5326

5311 -#: builtin/am.c:2292

5327 +#: builtin/am.c:2256

5328 msgid "use current timestamp for author date"

5329 msgstr "用当前时间作为作者日期"

5330

5315 -#: builtin/am.c:2294 builtin/commit.c:1614 builtin/merge.c:236

5316 -#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:392

5331 +#: builtin/am.c:2258 builtin/commit.c:1636 builtin/merge.c:236

5332 +#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:392

5333 msgid "key-id"

5334 msgstr "key-id"

5335

5320 -#: builtin/am.c:2295

5336 +#: builtin/am.c:2259

5337 msgid "GPG-sign commits"

5338 msgstr "使用 GPG 签名提交"

5339

5324 -#: builtin/am.c:2298

5340 +#: builtin/am.c:2262

5341 msgid "(internal use for git-rebase)"

5342 msgstr "（内部使用，用于 git-rebase）"

5343

5328 -#: builtin/am.c:2316

5344 +#: builtin/am.c:2280

5345 msgid ""

5346 "The -b/--binary option has been a no-op for long time, and\n"

5347 "it will be removed. Please do not use it anymore."

@@ -5333,16 +5349,16 @@ msgstr ""

5349 "参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被移除。\n"

5350 "请不要再使用它了。"

5351

5336 -#: builtin/am.c:2323

5352 +#: builtin/am.c:2287

5353 msgid "failed to read the index"

5354 msgstr "无法读取索引"

5355

5340 -#: builtin/am.c:2338

5356 +#: builtin/am.c:2302

5357 #, c-format

5358 msgid "previous rebase directory %s still exists but mbox given."

5359 msgstr "之前的变基目录 %s 仍然存在，但却提供了 mbox。"

5360

5345 -#: builtin/am.c:2362

5361 +#: builtin/am.c:2326

5362 #, c-format

5363 msgid ""

5364 "Stray %s directory found.\n"

@@ -5351,7 +5367,7 @@ msgstr ""

5367 "发现了错误的 %s 目录。\n"

5368 "使用 \"git am --abort\" 删除它。"

5369

5354 -#: builtin/am.c:2368

5370 +#: builtin/am.c:2332

5371 msgid "Resolve operation not in progress, we are not resuming."

5372 msgstr "解决操作未进行，我们不会继续。"

5373

@@ -5389,18 +5405,69 @@ msgstr "git archive：协议错误"

5405 msgid "git archive: expected a flush"

5406 msgstr "git archive：应有一个 flush 刷新"

5407

5392 -#: builtin/bisect--helper.c:7

5408 +#: builtin/bisect--helper.c:12

5409 msgid "git bisect--helper --next-all [--no-checkout]"

5410 msgstr "git bisect--helper --next-all [--no-checkout]"

5411

5396 -#: builtin/bisect--helper.c:17

5412 +#: builtin/bisect--helper.c:13

5413 +msgid "git bisect--helper --write-terms <bad_term> <good_term>"

5414 +msgstr "git bisect--helper --write-terms <坏-术语> <好-术语>"

5415 +

5416 +#: builtin/bisect--helper.c:14

5417 +msgid "git bisect--helper --bisect-clean-state"

5418 +msgstr "git bisect--helper --bisect-clean-state"

5419 +

5420 +#: builtin/bisect--helper.c:46

5421 +#, c-format

5422 +msgid "'%s' is not a valid term"

5423 +msgstr "'%s' 不是一个有效的术语"

5424 +

5425 +#: builtin/bisect--helper.c:50

5426 +#, c-format

5427 +msgid "can't use the builtin command '%s' as a term"

5428 +msgstr "不能使用内置命令 '%s' 作为术语"

5429 +

5430 +#: builtin/bisect--helper.c:60

5431 +#, c-format

5432 +msgid "can't change the meaning of the term '%s'"

5433 +msgstr "不能修改术语 '%s' 的含义"

5434 +

5435 +#: builtin/bisect--helper.c:71

5436 +msgid "please use two different terms"

5437 +msgstr "请使用两个不同的术语"

5438 +

5439 +#: builtin/bisect--helper.c:78

5440 +msgid "could not open the file BISECT_TERMS"

5441 +msgstr "不能打开文件 BISECT_TERMS"

5442 +

5443 +#: builtin/bisect--helper.c:120

5444 msgid "perform 'git bisect next'"

5445 msgstr "执行 'git bisect next'"

5446

5400 -#: builtin/bisect--helper.c:19

5447 +#: builtin/bisect--helper.c:122

5448 +msgid "write the terms to .git/BISECT_TERMS"

5449 +msgstr "将术语写入 .git/BISECT_TERMS"

5450 +

5451 +#: builtin/bisect--helper.c:124

5452 +msgid "cleanup the bisection state"

5453 +msgstr "清除二分查找状态"

5454 +

5455 +#: builtin/bisect--helper.c:126

5456 +msgid "check for expected revs"

5457 +msgstr "检查预期的版本"

5458 +

5459 +#: builtin/bisect--helper.c:128

5460 msgid "update BISECT_HEAD instead of checking out the current commit"

5461 msgstr "更新 BISECT_HEAD 而非检出当前提交"

5462

5463 +#: builtin/bisect--helper.c:143

5464 +msgid "--write-terms requires two arguments"

5465 +msgstr "--write-terms 需要两个参数"

5466 +

5467 +#: builtin/bisect--helper.c:147

5468 +msgid "--bisect-clean-state requires no arguments"

5469 +msgstr "--bisect-clean-state 不需要参数"

5470 +

5471 #: builtin/blame.c:27

5472 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"

5473 msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"

@@ -5659,51 +5726,51 @@ msgstr "分支 %s 正被变基到 %s"

5726 msgid "Branch %s is being bisected at %s"

5727 msgstr "分支 %s 正被二分查找于 %s"

5728

5662 -#: builtin/branch.c:470

5729 +#: builtin/branch.c:471

5730 msgid "cannot copy the current branch while not on any."

5731 msgstr "无法拷贝当前分支因为不处于任何分支上。"

5732

5666 -#: builtin/branch.c:472

5733 +#: builtin/branch.c:473

5734 msgid "cannot rename the current branch while not on any."

5735 msgstr "无法重命名当前分支因为不处于任何分支上。"

5736

5670 -#: builtin/branch.c:483

5737 +#: builtin/branch.c:484

5738 #, c-format

5739 msgid "Invalid branch name: '%s'"

5740 msgstr "无效的分支名：'%s'"

5741

5675 -#: builtin/branch.c:504

5742 +#: builtin/branch.c:511

5743 msgid "Branch rename failed"

5744 msgstr "分支重命名失败"

5745

5679 -#: builtin/branch.c:506

5746 +#: builtin/branch.c:513

5747 msgid "Branch copy failed"

5748 msgstr "分支拷贝失败"

5749

5683 -#: builtin/branch.c:510

5750 +#: builtin/branch.c:517

5751 #, c-format

5685 -msgid "Copied a misnamed branch '%s' away"

5686 -msgstr "已将错误命名的分支 '%s' 复制"

5752 +msgid "Created a copy of a misnamed branch '%s'"

5753 +msgstr "已为错误命名的分支 '%s' 创建了一个副本"

5754

5688 -#: builtin/branch.c:513

5755 +#: builtin/branch.c:520

5756 #, c-format

5757 msgid "Renamed a misnamed branch '%s' away"

5758 msgstr "已将错误命名的分支 '%s' 重命名"

5759

5693 -#: builtin/branch.c:519

5760 +#: builtin/branch.c:526

5761 #, c-format

5762 msgid "Branch renamed to %s, but HEAD is not updated!"

5763 msgstr "分支重命名为 %s，但 HEAD 没有更新！"

5764

5698 -#: builtin/branch.c:528

5765 +#: builtin/branch.c:535

5766 msgid "Branch is renamed, but update of config-file failed"

5767 msgstr "分支被重命名，但更新配置文件失败"

5768

5702 -#: builtin/branch.c:530

5769 +#: builtin/branch.c:537

5770 msgid "Branch is copied, but update of config-file failed"

5771 msgstr "分支已拷贝，但更新配置文件失败"

5772

5706 -#: builtin/branch.c:546

5773 +#: builtin/branch.c:553

5774 #, c-format

5775 msgid ""

5776 "Please edit the description for the branch\n"

@@ -5714,221 +5781,217 @@ msgstr ""

5781 " %s\n"

5782 "以 '%c' 开头的行将被过滤。\n"

5783

5717 -#: builtin/branch.c:579

5784 +#: builtin/branch.c:586

5785 msgid "Generic options"

5786 msgstr "通用选项"

5787

5721 -#: builtin/branch.c:581

5788 +#: builtin/branch.c:588

5789 msgid "show hash and subject, give twice for upstream branch"

5790 msgstr "显示哈希值和主题，若参数出现两次则显示上游分支"

5791

5725 -#: builtin/branch.c:582

5792 +#: builtin/branch.c:589

5793 msgid "suppress informational messages"

5794 msgstr "不显示信息"

5795

5729 -#: builtin/branch.c:583

5796 +#: builtin/branch.c:590

5797 msgid "set up tracking mode (see git-pull(1))"

5798 msgstr "设置跟踪模式（参见 git-pull(1)）"

5799

5733 -#: builtin/branch.c:585

5800 +#: builtin/branch.c:592

5801 msgid "do not use"

5802 msgstr "不要使用"

5803

5737 -#: builtin/branch.c:587

5804 +#: builtin/branch.c:594

5805 msgid "upstream"

5806 msgstr "上游"

5807

5741 -#: builtin/branch.c:587

5808 +#: builtin/branch.c:594

5809 msgid "change the upstream info"

5810 msgstr "改变上游信息"

5811

5745 -#: builtin/branch.c:588

5812 +#: builtin/branch.c:595

5813 msgid "Unset the upstream info"

5814 msgstr "取消上游信息的设置"

5815

5749 -#: builtin/branch.c:589

5816 +#: builtin/branch.c:596

5817 msgid "use colored output"

5818 msgstr "使用彩色输出"

5819

5753 -#: builtin/branch.c:590

5820 +#: builtin/branch.c:597

5821 msgid "act on remote-tracking branches"

5822 msgstr "作用于远程跟踪分支"

5823

5757 -#: builtin/branch.c:592 builtin/branch.c:594

5824 +#: builtin/branch.c:599 builtin/branch.c:601

5825 msgid "print only branches that contain the commit"

5826 msgstr "只打印包含该提交的分支"

5827

5761 -#: builtin/branch.c:593 builtin/branch.c:595

5828 +#: builtin/branch.c:600 builtin/branch.c:602

5829 msgid "print only branches that don't contain the commit"

5830 msgstr "只打印不包含该提交的分支"

5831

5765 -#: builtin/branch.c:598

5832 +#: builtin/branch.c:605

5833 msgid "Specific git-branch actions:"

5834 msgstr "具体的 git-branch 动作："

5835

5769 -#: builtin/branch.c:599

5836 +#: builtin/branch.c:606

5837 msgid "list both remote-tracking and local branches"

5838 msgstr "列出远程跟踪及本地分支"

5839

5773 -#: builtin/branch.c:601

5840 +#: builtin/branch.c:608

5841 msgid "delete fully merged branch"

5842 msgstr "删除完全合并的分支"

5843

5777 -#: builtin/branch.c:602

5844 +#: builtin/branch.c:609

5845 msgid "delete branch (even if not merged)"

5846 msgstr "删除分支（即使没有合并）"

5847

5781 -#: builtin/branch.c:603

5848 +#: builtin/branch.c:610

5849 msgid "move/rename a branch and its reflog"

5850 msgstr "移动/重命名一个分支，以及它的引用日志"

5851

5785 -#: builtin/branch.c:604

5852 +#: builtin/branch.c:611

5853 msgid "move/rename a branch, even if target exists"

5854 msgstr "移动/重命名一个分支，即使目标已存在"

5855

5789 -#: builtin/branch.c:605

5856 +#: builtin/branch.c:612

5857 msgid "copy a branch and its reflog"

5858 msgstr "拷贝一个分支和它的引用日志"

5859

5793 -#: builtin/branch.c:606

5860 +#: builtin/branch.c:613

5861 msgid "copy a branch, even if target exists"

5862 msgstr "拷贝一个分支，即使目标已存在"

5863

5797 -#: builtin/branch.c:607

5864 +#: builtin/branch.c:614

5865 msgid "list branch names"

5866 msgstr "列出分支名"

5867

5801 -#: builtin/branch.c:608

5868 +#: builtin/branch.c:615

5869 msgid "create the branch's reflog"

5870 msgstr "创建分支的引用日志"

5871

5805 -#: builtin/branch.c:610

5872 +#: builtin/branch.c:617

5873 msgid "edit the description for the branch"

5874 msgstr "标记分支的描述"

5875

5809 -#: builtin/branch.c:611

5876 +#: builtin/branch.c:618

5877 msgid "force creation, move/rename, deletion"

5878 msgstr "强制创建、移动/重命名、删除"

5879

5813 -#: builtin/branch.c:612

5880 +#: builtin/branch.c:619

5881 msgid "print only branches that are merged"

5882 msgstr "只打印已经合并的分支"

5883

5817 -#: builtin/branch.c:613

5884 +#: builtin/branch.c:620

5885 msgid "print only branches that are not merged"

5886 msgstr "只打印尚未合并的分支"

5887

5821 -#: builtin/branch.c:614

5888 +#: builtin/branch.c:621

5889 msgid "list branches in columns"

5890 msgstr "以列的方式显示分支"

5891

5825 -#: builtin/branch.c:615 builtin/for-each-ref.c:40 builtin/tag.c:405

5892 +#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:405

5893 msgid "key"

5894 msgstr "key"

5895

5829 -#: builtin/branch.c:616 builtin/for-each-ref.c:41 builtin/tag.c:406

5896 +#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:406

5897 msgid "field name to sort on"

5898 msgstr "排序的字段名"

5899

5833 -#: builtin/branch.c:618 builtin/for-each-ref.c:43 builtin/notes.c:408

5900 +#: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408

5901 #: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574

5902 #: builtin/tag.c:408

5903 msgid "object"

5904 msgstr "对象"

5905

5839 -#: builtin/branch.c:619

5906 +#: builtin/branch.c:626

5907 msgid "print only branches of the object"

5908 msgstr "只打印指向该对象的分支"

5909

5843 -#: builtin/branch.c:621 builtin/for-each-ref.c:49 builtin/tag.c:415

5910 +#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:415

5911 msgid "sorting and filtering are case insensitive"

5912 msgstr "排序和过滤属于大小写不敏感"

5913

5847 -#: builtin/branch.c:622 builtin/for-each-ref.c:38 builtin/tag.c:413

5914 +#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:413

5915 #: builtin/verify-tag.c:39

5916 msgid "format to use for the output"

5917 msgstr "输出格式"

5918

5852 -#: builtin/branch.c:645 builtin/clone.c:729

5919 +#: builtin/branch.c:652 builtin/clone.c:730

5920 msgid "HEAD not found below refs/heads!"

5921 msgstr "HEAD 没有位于 /refs/heads 之下！"

5922

5856 -#: builtin/branch.c:668

5923 +#: builtin/branch.c:675

5924 msgid "--column and --verbose are incompatible"

5925 msgstr "--column 和 --verbose 不兼容"

5926

5860 -#: builtin/branch.c:680 builtin/branch.c:732 builtin/branch.c:741

5927 +#: builtin/branch.c:690 builtin/branch.c:742 builtin/branch.c:751

5928 msgid "branch name required"

5929 msgstr "必须提供分支名"

5930

5864 -#: builtin/branch.c:708

5931 +#: builtin/branch.c:718

5932 msgid "Cannot give description to detached HEAD"

5933 msgstr "不能向分离头指针提供描述"

5934

5868 -#: builtin/branch.c:713

5935 +#: builtin/branch.c:723

5936 msgid "cannot edit description of more than one branch"

5937 msgstr "不能为一个以上的分支编辑描述"

5938

5872 -#: builtin/branch.c:720

5939 +#: builtin/branch.c:730

5940 #, c-format

5941 msgid "No commit on branch '%s' yet."

5942 msgstr "分支 '%s' 尚无提交。"

5943

5877 -#: builtin/branch.c:723

5944 +#: builtin/branch.c:733

5945 #, c-format

5946 msgid "No branch named '%s'."

5947 msgstr "没有分支 '%s'。"

5948

5882 -#: builtin/branch.c:738

5949 +#: builtin/branch.c:748

5950 msgid "too many branches for a copy operation"

5951 msgstr "为拷贝操作提供了太多的分支名"

5952

5886 -#: builtin/branch.c:747

5953 +#: builtin/branch.c:757

5954 msgid "too many arguments for a rename operation"

5955 msgstr "为重命名操作提供了太多的参数"

5956

5890 -#: builtin/branch.c:752

5957 +#: builtin/branch.c:762

5958 msgid "too many arguments to set new upstream"

5959 msgstr "为设置新上游提供了太多的参数"

5960

5894 -#: builtin/branch.c:756

5961 +#: builtin/branch.c:766

5962 #, c-format

5963 msgid ""

5964 "could not set upstream of HEAD to %s when it does not point to any branch."

5965 msgstr "无法设置 HEAD 的上游为 %s，因为 HEAD 没有指向任何分支。"

5966

5900 -#: builtin/branch.c:759 builtin/branch.c:781 builtin/branch.c:800

5967 +#: builtin/branch.c:769 builtin/branch.c:791 builtin/branch.c:807

5968 #, c-format

5969 msgid "no such branch '%s'"

5970 msgstr "没有此分支 '%s'"

5971

5905 -#: builtin/branch.c:763

5972 +#: builtin/branch.c:773

5973 #, c-format

5974 msgid "branch '%s' does not exist"

5975 msgstr "分支 '%s' 不存在"

5976

5910 -#: builtin/branch.c:775

5977 +#: builtin/branch.c:785

5978 msgid "too many arguments to unset upstream"

5979 msgstr "为取消上游设置操作提供了太多的参数"

5980

5914 -#: builtin/branch.c:779

5981 +#: builtin/branch.c:789

5982 msgid "could not unset upstream of HEAD when it does not point to any branch."

5983 msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"

5984

5918 -#: builtin/branch.c:785

5985 +#: builtin/branch.c:795

5986 #, c-format

5987 msgid "Branch '%s' has no upstream information"

5988 msgstr "分支 '%s' 没有上游信息"

5989

5923 -#: builtin/branch.c:797

5924 -msgid "it does not make sense to create 'HEAD' manually"

5925 -msgstr "手工创建 'HEAD' 没有意义"

5926 -

5927 -#: builtin/branch.c:803

5990 +#: builtin/branch.c:810

5991 msgid "-a and -r options to 'git branch' do not make sense with a branch name"

5992 msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"

5993

5931 -#: builtin/branch.c:806

5994 +#: builtin/branch.c:813

5995 msgid ""

5996 "the '--set-upstream' option is no longer supported. Please use '--track' or "

5997 "'--set-upstream-to' instead."

@@ -5992,7 +6055,7 @@ msgstr "对于数据对象，对其内容做文本转换"

6055 msgid "for blob objects, run filters on object's content"

6056 msgstr "对于数据对象，对其内容做过滤"

6057

5995 -#: builtin/cat-file.c:569 git-submodule.sh:943

6058 +#: builtin/cat-file.c:569 git-submodule.sh:931

6059 msgid "blob"

6060 msgstr "数据对象"

6061

@@ -6048,7 +6111,7 @@ msgstr "从标准输入读出文件名"

6111 msgid "terminate input and output records by a NUL character"

6112 msgstr "输入和输出的记录使用 NUL 字符终结"

6113

6051 -#: builtin/check-ignore.c:20 builtin/checkout.c:1153 builtin/gc.c:358

6114 +#: builtin/check-ignore.c:20 builtin/checkout.c:1118 builtin/gc.c:358

6115 msgid "suppress progress reporting"

6116 msgstr "不显示进度报告"

6117

@@ -6105,161 +6168,161 @@ msgstr "未指定联系地址"

6168 msgid "git checkout-index [<options>] [--] [<file>...]"

6169 msgstr "git checkout-index [<选项>] [--] [<文件>...]"

6170

6108 -#: builtin/checkout-index.c:145

6171 +#: builtin/checkout-index.c:143

6172 msgid "stage should be between 1 and 3 or all"

6173 msgstr "索引值应该取值 1 到 3 或者 all"

6174

6112 -#: builtin/checkout-index.c:161

6175 +#: builtin/checkout-index.c:159

6176 msgid "check out all files in the index"

6177 msgstr "检出索引区的所有文件"

6178

6116 -#: builtin/checkout-index.c:162

6179 +#: builtin/checkout-index.c:160

6180 msgid "force overwrite of existing files"

6181 msgstr "强制覆盖现有的文件"

6182

6120 -#: builtin/checkout-index.c:164

6183 +#: builtin/checkout-index.c:162

6184 msgid "no warning for existing files and files not in index"

6185 msgstr "存在或不在索引中的文件都没有警告"

6186

6124 -#: builtin/checkout-index.c:166

6187 +#: builtin/checkout-index.c:164

6188 msgid "don't checkout new files"

6189 msgstr "不检出新文件"

6190

6128 -#: builtin/checkout-index.c:168

6191 +#: builtin/checkout-index.c:166

6192 msgid "update stat information in the index file"

6193 msgstr "更新索引中文件的状态信息"

6194

6132 -#: builtin/checkout-index.c:172

6195 +#: builtin/checkout-index.c:170

6196 msgid "read list of paths from the standard input"

6197 msgstr "从标准输入读取路径列表"

6198

6136 -#: builtin/checkout-index.c:174

6199 +#: builtin/checkout-index.c:172

6200 msgid "write the content to temporary files"

6201 msgstr "将内容写入临时文件"

6202

6140 -#: builtin/checkout-index.c:175 builtin/column.c:31

6141 -#: builtin/submodule--helper.c:628 builtin/submodule--helper.c:631

6142 -#: builtin/submodule--helper.c:637 builtin/submodule--helper.c:999

6143 -#: builtin/worktree.c:498

6203 +#: builtin/checkout-index.c:173 builtin/column.c:31

6204 +#: builtin/submodule--helper.c:866 builtin/submodule--helper.c:869

6205 +#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1237

6206 +#: builtin/worktree.c:552

6207 msgid "string"

6208 msgstr "字符串"

6209

6147 -#: builtin/checkout-index.c:176

6210 +#: builtin/checkout-index.c:174

6211 msgid "when creating files, prepend <string>"

6212 msgstr "在创建文件时，在前面加上 <字符串>"

6213

6151 -#: builtin/checkout-index.c:178

6214 +#: builtin/checkout-index.c:176

6215 msgid "copy out the files from named stage"

6216 msgstr "从指定暂存区中拷出文件"

6217

6155 -#: builtin/checkout.c:26

6218 +#: builtin/checkout.c:27

6219 msgid "git checkout [<options>] <branch>"

6220 msgstr "git checkout [<选项>] <分支>"

6221

6159 -#: builtin/checkout.c:27

6222 +#: builtin/checkout.c:28

6223 msgid "git checkout [<options>] [<branch>] -- <file>..."

6224 msgstr "git checkout [<选项>] [<分支>] -- <文件>..."

l10n: zh_CN: for git v2.16.0 l10n round 2