a4f16749d2 · matheusbsbs/matheus-bagliano

@@ -112,7 +112,7 @@

112 # smart HTTP protocol | 智能 HTTP 协议

113 # squash | 压缩

114 # stage | n. 暂存区（即索引）; v. 暂存

115 -# stash | n. 进度保存; v. 保存进度

115 +# stash | n. 贮藏区; v. 贮藏

116 # submodule | 子模组

117 # symref | 符号引用

118 # tag | n. 标签; v. 打标签

@@ -135,8 +135,8 @@ msgid ""

135 msgstr ""

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

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

138 -"POT-Creation-Date: 2017-05-05 09:35+0800\n"

139 -"PO-Revision-Date: 2017-05-09 21:54+0800\n"

138 +"POT-Creation-Date: 2017-07-24 21:54+0800\n"

139 +"PO-Revision-Date: 2017-08-01 09:21+0800\n"

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

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

142 "Language: zh_CN\n"

@@ -145,37 +145,37 @@ msgstr ""

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

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

147

148 -#: advice.c:55

148 +#: advice.c:58

149 #, c-format

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

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

152

153 -#: advice.c:83

153 +#: advice.c:86

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

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

156

157 -#: advice.c:85

157 +#: advice.c:88

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

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

160

161 -#: advice.c:87

161 +#: advice.c:90

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

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

164

165 -#: advice.c:89

165 +#: advice.c:92

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

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

168

169 -#: advice.c:91

169 +#: advice.c:94

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

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

172

173 -#: advice.c:93

173 +#: advice.c:96

174 #, c-format

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

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

177

178 -#: advice.c:101

178 +#: advice.c:104

179 msgid ""

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

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

@@ -183,23 +183,23 @@ msgstr ""

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

184 "解决方案并提交。"

185

186 -#: advice.c:109

186 +#: advice.c:112

187 msgid "Exiting because of an unresolved conflict."

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

189

190 -#: advice.c:114 builtin/merge.c:1185

190 +#: advice.c:117 builtin/merge.c:1184

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

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

193

194 -#: advice.c:116

194 +#: advice.c:119

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

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

197

198 -#: advice.c:117

198 +#: advice.c:120

199 msgid "Exiting because of unfinished merge."

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

201

202 -#: advice.c:123

202 +#: advice.c:126

203 #, c-format

204 msgid ""

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

@@ -226,82 +226,92 @@ msgstr ""

226 " git checkout -b <new-branch-name>\n"

227 "\n"

228

229 -#: apply.c:57

229 +#: apply.c:58

230 #, c-format

231 msgid "unrecognized whitespace option '%s'"

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

233

234 -#: apply.c:73

234 +#: apply.c:74

235 #, c-format

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

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

238

239 -#: apply.c:125

239 +#: apply.c:126

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

241 msgstr "--reject 和 --3say 不能同时使用。"

242

243 -#: apply.c:127

243 +#: apply.c:128

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

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

246

247 -#: apply.c:130

247 +#: apply.c:131

248 msgid "--3way outside a repository"

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

250

251 -#: apply.c:141

251 +#: apply.c:142

252 msgid "--index outside a repository"

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

254

255 -#: apply.c:144

255 +#: apply.c:145

256 msgid "--cached outside a repository"

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

258

259 -#: apply.c:845

259 +#: apply.c:836

260 #, c-format

261 msgid "Cannot prepare timestamp regexp %s"

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

263

264 -#: apply.c:854

264 +#: apply.c:845

265 #, c-format

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

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

268

269 -#: apply.c:938

269 +#: apply.c:929

270 #, c-format

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

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

273

274 -#: apply.c:977

274 +#: apply.c:967

275 #, c-format

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

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

278

279 -#: apply.c:983

279 +#: apply.c:973

280 #, c-format

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

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

283

284 -#: apply.c:984

284 +#: apply.c:974

285 #, c-format

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

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

288

289 -#: apply.c:990

289 +#: apply.c:979

290 #, c-format

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

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

293

294 -#: apply.c:1488

294 +#: apply.c:1008

295 +#, c-format

296 +msgid "invalid mode on line %d: %s"

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

298 +

299 +#: apply.c:1326

300 +#, c-format

301 +msgid "inconsistent header lines %d and %d"

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

303 +

304 +#: apply.c:1498

305 #, c-format

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

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

308

299 -#: apply.c:1557

309 +#: apply.c:1567

310 #, c-format

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

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

313

304 -#: apply.c:1577

314 +#: apply.c:1587

315 #, c-format

316 msgid ""

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

@@ -312,82 +322,82 @@ msgid_plural ""

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

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

324

315 -#: apply.c:1589

325 +#: apply.c:1600

326 #, c-format

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

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

329

320 -#: apply.c:1759

330 +#: apply.c:1770

331 msgid "new file depends on old contents"

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

333

324 -#: apply.c:1761

334 +#: apply.c:1772

335 msgid "deleted file still has contents"

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

337

328 -#: apply.c:1795

338 +#: apply.c:1806

339 #, c-format

340 msgid "corrupt patch at line %d"

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

342

333 -#: apply.c:1832

343 +#: apply.c:1843

344 #, c-format

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

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

347

338 -#: apply.c:1834

348 +#: apply.c:1845

349 #, c-format

350 msgid "deleted file %s still has contents"

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

352

343 -#: apply.c:1837

353 +#: apply.c:1848

354 #, c-format

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

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

357

348 -#: apply.c:1984

358 +#: apply.c:1995

359 #, c-format

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

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

362

353 -#: apply.c:2021

363 +#: apply.c:2032

364 #, c-format

365 msgid "unrecognized binary patch at line %d"

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

367

358 -#: apply.c:2182

368 +#: apply.c:2193

369 #, c-format

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

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

372

363 -#: apply.c:2265

373 +#: apply.c:2276

374 #, c-format

375 msgid "unable to read symlink %s"

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

377

368 -#: apply.c:2269

378 +#: apply.c:2280

379 #, c-format

380 msgid "unable to open or read %s"

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

382

373 -#: apply.c:2922

383 +#: apply.c:2933

384 #, c-format

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

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

387

378 -#: apply.c:3041

388 +#: apply.c:3052

389 #, c-format

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

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

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

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

394

385 -#: apply.c:3053

395 +#: apply.c:3064

396 #, c-format

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

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

399

390 -#: apply.c:3059

400 +#: apply.c:3070

401 #, c-format

402 msgid ""

403 "while searching for:\n"

@@ -396,561 +406,561 @@ msgstr ""

406 "当查询：\n"

407 "%.*s"

408

399 -#: apply.c:3081

409 +#: apply.c:3092

410 #, c-format

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

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

413

404 -#: apply.c:3089

414 +#: apply.c:3100

415 #, c-format

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

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

418

409 -#: apply.c:3135

419 +#: apply.c:3146

420 #, c-format

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

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

423

414 -#: apply.c:3145

424 +#: apply.c:3156

425 #, c-format

426 msgid ""

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

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

429

420 -#: apply.c:3153

430 +#: apply.c:3164

431 #, c-format

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

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

434

425 -#: apply.c:3171

435 +#: apply.c:3182

436 #, c-format

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

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

439

430 -#: apply.c:3184

440 +#: apply.c:3195

441 #, c-format

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

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

444

435 -#: apply.c:3190

445 +#: apply.c:3201

446 #, c-format

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

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

449

440 -#: apply.c:3211

450 +#: apply.c:3222

451 #, c-format

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

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

454

445 -#: apply.c:3333

455 +#: apply.c:3344

456 #, c-format

457 msgid "cannot checkout %s"

458 msgstr "不能检出 %s"

459

450 -#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:253

460 +#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277

461 #, c-format

462 msgid "failed to read %s"

463 msgstr "无法读取 %s"

464

455 -#: apply.c:3389

465 +#: apply.c:3400

466 #, c-format

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

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

469

460 -#: apply.c:3418 apply.c:3658

470 +#: apply.c:3429 apply.c:3669

471 #, c-format

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

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

474

465 -#: apply.c:3501 apply.c:3672

475 +#: apply.c:3512 apply.c:3683

476 #, c-format

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

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

479

470 -#: apply.c:3510 apply.c:3680

480 +#: apply.c:3521 apply.c:3691

481 #, c-format

482 msgid "%s: does not match index"

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

484

475 -#: apply.c:3545

485 +#: apply.c:3556

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

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

488

479 -#: apply.c:3548

489 +#: apply.c:3559

490 #, c-format

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

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

493

484 -#: apply.c:3564 apply.c:3568

494 +#: apply.c:3575 apply.c:3579

495 #, c-format

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

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

498

489 -#: apply.c:3580

499 +#: apply.c:3591

500 #, c-format

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

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

503

494 -#: apply.c:3594

504 +#: apply.c:3605

505 #, c-format

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

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

508

499 -#: apply.c:3599

509 +#: apply.c:3610

510 #, c-format

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

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

513

504 -#: apply.c:3625

514 +#: apply.c:3636

515 msgid "removal patch leaves file contents"

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

517

508 -#: apply.c:3697

518 +#: apply.c:3708

519 #, c-format

520 msgid "%s: wrong type"

521 msgstr "%s：错误类型"

522

513 -#: apply.c:3699

523 +#: apply.c:3710

524 #, c-format

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

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

527

518 -#: apply.c:3850 apply.c:3852

528 +#: apply.c:3860 apply.c:3862

529 #, c-format

530 msgid "invalid path '%s'"

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

532

523 -#: apply.c:3908

533 +#: apply.c:3918

534 #, c-format

535 msgid "%s: already exists in index"

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

537

528 -#: apply.c:3911

538 +#: apply.c:3921

539 #, c-format

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

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

542

533 -#: apply.c:3931

543 +#: apply.c:3941

544 #, c-format

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

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

547

538 -#: apply.c:3936

548 +#: apply.c:3946

549 #, c-format

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

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

552

543 -#: apply.c:3956

553 +#: apply.c:3966

554 #, c-format

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

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

557

548 -#: apply.c:3960

558 +#: apply.c:3970

559 #, c-format

560 msgid "%s: patch does not apply"

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

562

553 -#: apply.c:3975

563 +#: apply.c:3985

564 #, c-format

565 msgid "Checking patch %s..."

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

567

558 -#: apply.c:4066

568 +#: apply.c:4076

569 #, c-format

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

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

572

563 -#: apply.c:4073

573 +#: apply.c:4083

574 #, c-format

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

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

577

568 -#: apply.c:4076

578 +#: apply.c:4086

579 #, c-format

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

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

582

573 -#: apply.c:4081 builtin/checkout.c:252 builtin/reset.c:135

583 +#: apply.c:4091 builtin/checkout.c:235 builtin/reset.c:138

584 #, c-format

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

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

587

578 -#: apply.c:4085

588 +#: apply.c:4095

589 #, c-format

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

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

592

583 -#: apply.c:4095

593 +#: apply.c:4105

594 #, c-format

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

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

597

588 -#: apply.c:4233

598 +#: apply.c:4243

599 #, c-format

600 msgid "unable to remove %s from index"

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

602

593 -#: apply.c:4268

603 +#: apply.c:4278

604 #, c-format

605 msgid "corrupt patch for submodule %s"

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

607

598 -#: apply.c:4274

608 +#: apply.c:4284

609 #, c-format

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

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

612

603 -#: apply.c:4282

613 +#: apply.c:4292

614 #, c-format

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

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

617

608 -#: apply.c:4288 apply.c:4432

618 +#: apply.c:4298 apply.c:4442

619 #, c-format

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

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

622

613 -#: apply.c:4329

623 +#: apply.c:4339

624 #, c-format

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

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

627

618 -#: apply.c:4333

628 +#: apply.c:4343

629 #, c-format

630 msgid "closing file '%s'"

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

632

623 -#: apply.c:4403

633 +#: apply.c:4413

634 #, c-format

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

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

637

628 -#: apply.c:4501

638 +#: apply.c:4511

639 #, c-format

640 msgid "Applied patch %s cleanly."

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

642

633 -#: apply.c:4509

643 +#: apply.c:4519

644 msgid "internal error"

645 msgstr "内部错误"

646

637 -#: apply.c:4512

647 +#: apply.c:4522

648 #, c-format

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

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

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

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

653

644 -#: apply.c:4523

654 +#: apply.c:4533

655 #, c-format

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

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

658

649 -#: apply.c:4531 builtin/fetch.c:739 builtin/fetch.c:988

659 +#: apply.c:4541 builtin/fetch.c:738 builtin/fetch.c:988

660 #, c-format

661 msgid "cannot open %s"

662 msgstr "不能打开 %s"

663

654 -#: apply.c:4545

664 +#: apply.c:4555

665 #, c-format

666 msgid "Hunk #%d applied cleanly."

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

668

659 -#: apply.c:4549

669 +#: apply.c:4559

670 #, c-format

671 msgid "Rejected hunk #%d."

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

673

664 -#: apply.c:4659

674 +#: apply.c:4669

675 #, c-format

676 msgid "Skipped patch '%s'."

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

678

669 -#: apply.c:4667

679 +#: apply.c:4677

680 msgid "unrecognized input"

681 msgstr "未能识别的输入"

682

673 -#: apply.c:4686

683 +#: apply.c:4696

684 msgid "unable to read index file"

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

686

677 -#: apply.c:4823

687 +#: apply.c:4833

688 #, c-format

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

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

691

682 -#: apply.c:4850

692 +#: apply.c:4860

693 #, c-format

694 msgid "squelched %d whitespace error"

695 msgid_plural "squelched %d whitespace errors"

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

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

698

689 -#: apply.c:4856 apply.c:4871

699 +#: apply.c:4866 apply.c:4881

700 #, c-format

701 msgid "%d line adds whitespace errors."

702 msgid_plural "%d lines add whitespace errors."

693 -msgstr[0] "%d 行有空白字符误用。"

694 -msgstr[1] "%d 行有空白字符误用。"

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

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

705

696 -#: apply.c:4864

706 +#: apply.c:4874

707 #, c-format

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

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

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

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

712

703 -#: apply.c:4880 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391

713 +#: apply.c:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391

714 msgid "Unable to write new index file"

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

716

707 -#: apply.c:4911 apply.c:4914 builtin/am.c:2276 builtin/am.c:2279

708 -#: builtin/clone.c:113 builtin/fetch.c:98 builtin/pull.c:180

717 +#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260

718 +#: builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187

719 #: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629

720 #: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973

721 #: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161

712 -#: git-add--interactive.perl:239

722 +#: git-add--interactive.perl:197

723 msgid "path"

724 msgstr "路径"

725

716 -#: apply.c:4912

726 +#: apply.c:4922

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

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

729

720 -#: apply.c:4915

730 +#: apply.c:4925

731 msgid "apply changes matching the given path"

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

733

724 -#: apply.c:4917 builtin/am.c:2285

734 +#: apply.c:4927 builtin/am.c:2266

735 msgid "num"

736 msgstr "数字"

737

728 -#: apply.c:4918

738 +#: apply.c:4928

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

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

741

732 -#: apply.c:4921

742 +#: apply.c:4931

743 msgid "ignore additions made by the patch"

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

745

736 -#: apply.c:4923

746 +#: apply.c:4933

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

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

749

740 -#: apply.c:4927

750 +#: apply.c:4937

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

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

753

744 -#: apply.c:4929

754 +#: apply.c:4939

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

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

757

748 -#: apply.c:4931

758 +#: apply.c:4941

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

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

761

752 -#: apply.c:4933

762 +#: apply.c:4943

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

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

765

756 -#: apply.c:4935

766 +#: apply.c:4945

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

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

769

760 -#: apply.c:4937

770 +#: apply.c:4947

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

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

773

764 -#: apply.c:4939

774 +#: apply.c:4949

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

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

777

768 -#: apply.c:4941

778 +#: apply.c:4951

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

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

781

772 -#: apply.c:4943

782 +#: apply.c:4953

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

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

785

776 -#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:515

786 +#: apply.c:4956 builtin/checkout-index.c:170 builtin/ls-files.c:515

787 msgid "paths are separated with NUL character"

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

789

780 -#: apply.c:4948

790 +#: apply.c:4958

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

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

793

784 -#: apply.c:4949 builtin/am.c:2264

794 +#: apply.c:4959 builtin/am.c:2245

795 msgid "action"

796 msgstr "动作"

797

788 -#: apply.c:4950

798 +#: apply.c:4960

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

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

801

792 -#: apply.c:4953 apply.c:4956

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

803 msgid "ignore changes in whitespace when finding context"

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

805

796 -#: apply.c:4959

806 +#: apply.c:4969

807 msgid "apply the patch in reverse"

808 msgstr "反向应用补丁"

809

800 -#: apply.c:4961

810 +#: apply.c:4971

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

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

813

804 -#: apply.c:4963

814 +#: apply.c:4973

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

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

817

808 -#: apply.c:4965

818 +#: apply.c:4975

819 msgid "allow overlapping hunks"

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

821

812 -#: apply.c:4966 builtin/add.c:267 builtin/check-ignore.c:19

813 -#: builtin/commit.c:1337 builtin/count-objects.c:94 builtin/fsck.c:651

814 -#: builtin/log.c:1867 builtin/mv.c:122 builtin/read-tree.c:134

822 +#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21

823 +#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651

824 +#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125

825 msgid "be verbose"

826 msgstr "冗长输出"

827

818 -#: apply.c:4968

828 +#: apply.c:4978

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

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

831

822 -#: apply.c:4971

832 +#: apply.c:4981

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

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

835

826 -#: apply.c:4973 builtin/am.c:2273

836 +#: apply.c:4983 builtin/am.c:2254

837 msgid "root"

838 msgstr "根目录"

839

830 -#: apply.c:4974

840 +#: apply.c:4984

841 msgid "prepend <root> to all filenames"

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

843

834 -#: archive.c:12

844 +#: archive.c:13

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

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

847

838 -#: archive.c:13

848 +#: archive.c:14

849 msgid "git archive --list"

850 msgstr "git archive --list"

851

842 -#: archive.c:14

852 +#: archive.c:15

853 msgid ""

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

855 msgstr ""

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

857

848 -#: archive.c:15

858 +#: archive.c:16

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

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

861

852 -#: archive.c:332 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300

862 +#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300

863 #, c-format

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

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

866

857 -#: archive.c:417

867 +#: archive.c:418

868 msgid "fmt"

869 msgstr "格式"

870

861 -#: archive.c:417

871 +#: archive.c:418

872 msgid "archive format"

873 msgstr "归档格式"

874

865 -#: archive.c:418 builtin/log.c:1436

875 +#: archive.c:419 builtin/log.c:1446

876 msgid "prefix"

877 msgstr "前缀"

878

869 -#: archive.c:419

879 +#: archive.c:420

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

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

882

873 -#: archive.c:420 builtin/blame.c:2598 builtin/blame.c:2599 builtin/config.c:60

874 -#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1061

875 -#: builtin/hash-object.c:101 builtin/ls-files.c:549 builtin/ls-files.c:552

876 -#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:129

883 +#: archive.c:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61

884 +#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080

885 +#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552

886 +#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120

887 #: parse-options.h:153

888 msgid "file"

889 msgstr "文件"

890

881 -#: archive.c:421 builtin/archive.c:89

891 +#: archive.c:422 builtin/archive.c:89

892 msgid "write the archive to this file"

893 msgstr "归档写入此文件"

894

885 -#: archive.c:423

895 +#: archive.c:424

896 msgid "read .gitattributes in working directory"

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

898

889 -#: archive.c:424

899 +#: archive.c:425

900 msgid "report archived files on stderr"

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

902

893 -#: archive.c:425

903 +#: archive.c:426

904 msgid "store only"

905 msgstr "只存储"

906

897 -#: archive.c:426

907 +#: archive.c:427

908 msgid "compress faster"

909 msgstr "压缩速度更快"

910

901 -#: archive.c:434

911 +#: archive.c:435

912 msgid "compress better"

913 msgstr "压缩效果更好"

914

905 -#: archive.c:437

915 +#: archive.c:438

916 msgid "list supported archive formats"

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

918

909 -#: archive.c:439 builtin/archive.c:90 builtin/clone.c:103 builtin/clone.c:106

919 +#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108

920 #: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982

921 msgid "repo"

922 msgstr "仓库"

923

914 -#: archive.c:440 builtin/archive.c:91

924 +#: archive.c:441 builtin/archive.c:91

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

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

927

918 -#: archive.c:441 builtin/archive.c:92 builtin/notes.c:485

928 +#: archive.c:442 builtin/archive.c:92 builtin/notes.c:488

929 msgid "command"

930 msgstr "命令"

931

922 -#: archive.c:442 builtin/archive.c:93

932 +#: archive.c:443 builtin/archive.c:93

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

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

935

926 -#: archive.c:449

936 +#: archive.c:450

937 msgid "Unexpected option --remote"

938 msgstr "未知参数 --remote"

939

930 -#: archive.c:451

940 +#: archive.c:452

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

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

943

934 -#: archive.c:453

944 +#: archive.c:454

945 msgid "Unexpected option --output"

946 msgstr "未知参数 --output"

947

938 -#: archive.c:475

948 +#: archive.c:476

949 #, c-format

950 msgid "Unknown archive format '%s'"

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

952

943 -#: archive.c:482

953 +#: archive.c:483

954 #, c-format

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

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

957

948 -#: attr.c:212

958 +#: attr.c:214

959 #, c-format

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

961 msgstr "%.*s 不是一个有效的属性名"

962

953 -#: attr.c:408

963 +#: attr.c:410

964 msgid ""

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

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

@@ -958,27 +968,22 @@ msgstr ""

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

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

970

961 -#: bisect.c:444

962 -#, c-format

963 -msgid "Could not open file '%s'"

964 -msgstr "不能打开文件 '%s'"

965 -

966 -#: bisect.c:449

971 +#: bisect.c:447

972 #, c-format

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

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

975

971 -#: bisect.c:657

976 +#: bisect.c:655

977 #, c-format

978 msgid "We cannot bisect more!\n"

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

980

976 -#: bisect.c:710

981 +#: bisect.c:708

982 #, c-format

983 msgid "Not a valid commit name %s"

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

985

981 -#: bisect.c:734

986 +#: bisect.c:732

987 #, c-format

988 msgid ""

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

@@ -987,7 +992,7 @@ msgstr ""

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

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

994

990 -#: bisect.c:739

995 +#: bisect.c:737

996 #, c-format

997 msgid ""

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

@@ -996,7 +1001,7 @@ msgstr ""

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

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

1003

999 -#: bisect.c:744

1004 +#: bisect.c:742

1005 #, c-format

1006 msgid ""

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

@@ -1005,7 +1010,7 @@ msgstr ""

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

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

1012

1008 -#: bisect.c:752

1013 +#: bisect.c:750

1014 #, c-format

1015 msgid ""

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

@@ -1016,7 +1021,7 @@ msgstr ""

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

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

1023

1019 -#: bisect.c:765

1024 +#: bisect.c:763

1025 #, c-format

1026 msgid ""

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

@@ -1027,36 +1032,36 @@ msgstr ""

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

1033 "我们仍旧继续。"

1034

1030 -#: bisect.c:800

1035 +#: bisect.c:798

1036 #, c-format

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

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

1039

1035 -#: bisect.c:851

1040 +#: bisect.c:849

1041 #, c-format

1042 msgid "a %s revision is needed"

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

1044

1040 -#: bisect.c:868 builtin/notes.c:174 builtin/tag.c:255

1045 +#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256

1046 #, c-format

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

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

1049

1045 -#: bisect.c:919

1050 +#: bisect.c:917

1051 #, c-format

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

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

1054

1050 -#: bisect.c:949

1055 +#: bisect.c:947

1056 msgid "reading bisect refs failed"

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

1058

1054 -#: bisect.c:969

1059 +#: bisect.c:967

1060 #, c-format

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

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

1063

1059 -#: bisect.c:977

1064 +#: bisect.c:975

1065 #, c-format

1066 msgid ""

1067 "No testable commit found.\n"

@@ -1065,15 +1070,16 @@ msgstr ""

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

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

1072

1068 -#: bisect.c:996

1073 +#: bisect.c:994

1074 #, c-format

1075 msgid "(roughly %d step)"

1076 msgid_plural "(roughly %d steps)"

1077 msgstr[0] "（大概 %d 步）"

1078 msgstr[1] "（大概 %d 步）"

1079

1075 -#. TRANSLATORS: the last %s will be replaced with

1076 -#. "(roughly %d steps)" translation

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

1081 +#. steps)" translation.

1082 +#.

1083 #: bisect.c:1000

1084 #, c-format

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

@@ -1081,6 +1087,40 @@ msgid_plural "Bisecting: %d revisions left to test after this %s\n"

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

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

1089

1090 +#: blame.c:1757

1091 +msgid "--contents and --reverse do not blend well."

1092 +msgstr "--contents 和 --reverse 不能混用。"

1093 +

1094 +#: blame.c:1768

1095 +msgid "cannot use --contents with final commit object name"

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

1097 +

1098 +#: blame.c:1788

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

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

1101 +

1102 +#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166

1103 +#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907

1104 +#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926 builtin/merge.c:360

1105 +#: builtin/shortlog.c:177

1106 +msgid "revision walk setup failed"

1107 +msgstr "版本遍历设置失败"

1108 +

1109 +#: blame.c:1815

1110 +msgid ""

1111 +"--reverse --first-parent together require range along first-parent chain"

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

1113 +

1114 +#: blame.c:1826

1115 +#, c-format

1116 +msgid "no such path %s in %s"

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

1118 +

1119 +#: blame.c:1837

1120 +#, c-format

1121 +msgid "cannot read blob %s for path %s"

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

1123 +

1124 #: branch.c:53

1125 #, c-format

1126 msgid ""

@@ -1209,7 +1249,7 @@ msgstr "无效的分支点：'%s'。"

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

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

1251

1212 -#: branch.c:364

1252 +#: branch.c:366

1253 #, c-format

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

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

@@ -1219,92 +1259,85 @@ msgstr "工作区 %s 的 HEAD 指向没有被更新"

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

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

1261

1222 -#: bundle.c:61

1262 +#: bundle.c:62

1263 #, c-format

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

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

1266

1227 -#: bundle.c:87 sequencer.c:1341 sequencer.c:1767 builtin/commit.c:777

1267 +#: bundle.c:88 sequencer.c:1344 sequencer.c:1770 builtin/commit.c:778

1268 #, c-format

1269 msgid "could not open '%s'"

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

1271

1232 -#: bundle.c:139

1272 +#: bundle.c:140

1273 msgid "Repository lacks these prerequisite commits:"

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

1275

1236 -#: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2321

1237 -#: builtin/blame.c:2811 builtin/commit.c:1061 builtin/log.c:353

1238 -#: builtin/log.c:897 builtin/log.c:1347 builtin/log.c:1673 builtin/log.c:1916

1239 -#: builtin/merge.c:359 builtin/shortlog.c:176

1240 -msgid "revision walk setup failed"

1241 -msgstr "版本遍历设置失败"

1242 -

1243 -#: bundle.c:185

1276 +#: bundle.c:186

1277 #, c-format

1278 msgid "The bundle contains this ref:"

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

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

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

1282

1250 -#: bundle.c:192

1283 +#: bundle.c:193

1284 msgid "The bundle records a complete history."

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

1286

1254 -#: bundle.c:194

1287 +#: bundle.c:195

1288 #, c-format

1289 msgid "The bundle requires this ref:"

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

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

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

1293

1261 -#: bundle.c:253

1294 +#: bundle.c:254

1295 msgid "Could not spawn pack-objects"

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

1297

1265 -#: bundle.c:264

1298 +#: bundle.c:265

1299 msgid "pack-objects died"

1300 msgstr "pack-objects 终止"

1301

1269 -#: bundle.c:304

1302 +#: bundle.c:307

1303 msgid "rev-list died"

1304 msgstr "rev-list 终止"

1305

1273 -#: bundle.c:353

1306 +#: bundle.c:356

1307 #, c-format

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

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

1310

1278 -#: bundle.c:443 builtin/log.c:170 builtin/log.c:1579 builtin/shortlog.c:281

1311 +#: bundle.c:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282

1312 #, c-format

1313 msgid "unrecognized argument: %s"

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

1315

1283 -#: bundle.c:451

1316 +#: bundle.c:454

1317 msgid "Refusing to create empty bundle."

1318 msgstr "不能创建空包。"

1319

1287 -#: bundle.c:463

1320 +#: bundle.c:466

1321 #, c-format

1322 msgid "cannot create '%s'"

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

1324

1292 -#: bundle.c:491

1325 +#: bundle.c:494

1326 msgid "index-pack died"

1327 msgstr "index-pack 终止"

1328

1296 -#: color.c:300

1329 +#: color.c:301

1330 #, c-format

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

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

1333

1301 -#: commit.c:40 sequencer.c:1579 builtin/am.c:419 builtin/am.c:455

1302 -#: builtin/am.c:1489 builtin/am.c:2126

1334 +#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456

1335 +#: builtin/am.c:1469 builtin/am.c:2107

1336 #, c-format

1337 msgid "could not parse %s"

1338 msgstr "不能解析 %s"

1339

1307 -#: commit.c:42

1340 +#: commit.c:43

1341 #, c-format

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

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

@@ -1323,161 +1356,161 @@ msgstr ""

1356 msgid "memory exhausted"

1357 msgstr "内存耗尽"

1358

1326 -#: config.c:191

1359 +#: config.c:186

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

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

1362

1330 -#: config.c:711

1363 +#: config.c:720

1364 #, c-format

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

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

1367

1335 -#: config.c:715

1368 +#: config.c:724

1369 #, c-format

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

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

1372

1340 -#: config.c:719

1373 +#: config.c:728

1374 #, c-format

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

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

1377

1345 -#: config.c:723

1378 +#: config.c:732

1379 #, c-format

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

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

1382

1350 -#: config.c:727

1383 +#: config.c:736

1384 #, c-format

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

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

1387

1355 -#: config.c:731

1388 +#: config.c:740

1389 #, c-format

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

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

1392

1360 -#: config.c:859

1393 +#: config.c:868

1394 msgid "out of range"

1395 msgstr "超出范围"

1396

1364 -#: config.c:859

1397 +#: config.c:868

1398 msgid "invalid unit"

1399 msgstr "无效的单位"

1400

1368 -#: config.c:865

1401 +#: config.c:874

1402 #, c-format

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

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

1405

1373 -#: config.c:870

1406 +#: config.c:879

1407 #, c-format

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

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

1410

1378 -#: config.c:873

1411 +#: config.c:882

1412 #, c-format

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

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

1415

1383 -#: config.c:876

1416 +#: config.c:885

1417 #, c-format

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

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

1420

1388 -#: config.c:879

1421 +#: config.c:888

1422 #, c-format

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

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

1425

1393 -#: config.c:882

1426 +#: config.c:891

1427 #, c-format

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

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

1430

1398 -#: config.c:885

1431 +#: config.c:894

1432 #, c-format

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

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

1435

1403 -#: config.c:980

1436 +#: config.c:989

1437 #, c-format

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

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

1440

1408 -#: config.c:1075 config.c:1086

1441 +#: config.c:1084 config.c:1095

1442 #, c-format

1443 msgid "bad zlib compression level %d"

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

1445

1413 -#: config.c:1203

1446 +#: config.c:1212

1447 #, c-format

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

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

1450

1418 -#: config.c:1359

1451 +#: config.c:1368

1452 #, c-format

1453 msgid "bad pack compression level %d"

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

1455

1423 -#: config.c:1557

1456 +#: config.c:1564

1457 msgid "unable to parse command-line config"

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

1459

1427 -#: config.c:1611

1460 +#: config.c:1894

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

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

1463

1431 -#: config.c:1970

1464 +#: config.c:2064

1465 #, c-format

1466 msgid "Invalid %s: '%s'"

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

1468

1436 -#: config.c:1991

1469 +#: config.c:2085

1470 #, c-format

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

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

1473

1441 -#: config.c:2017

1474 +#: config.c:2111

1475 #, c-format

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

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

1478

1446 -#: config.c:2028

1479 +#: config.c:2122

1480 #, c-format

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

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

1483

1451 -#: config.c:2030

1484 +#: config.c:2124

1485 #, c-format

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

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

1488

1456 -#: config.c:2089

1489 +#: config.c:2183

1490 #, c-format

1491 msgid "%s has multiple values"

1492 msgstr "%s 有多个取值"

1493

1461 -#: config.c:2423 config.c:2648

1494 +#: config.c:2517 config.c:2745

1495 #, c-format

1496 msgid "fstat on %s failed"

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

1498

1466 -#: config.c:2541

1499 +#: config.c:2635

1500 #, c-format

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

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

1503

1471 -#: config.c:2543 builtin/remote.c:774

1504 +#: config.c:2637 builtin/remote.c:775

1505 #, c-format

1506 msgid "could not unset '%s'"

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

1508

1476 -#: connect.c:49

1509 +#: connect.c:50

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

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

1512

1480 -#: connect.c:51

1513 +#: connect.c:52

1514 msgid ""

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

1516 "\n"

@@ -1488,7 +1521,7 @@ msgstr ""

1521 "\n"

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

1523

1491 -#: connected.c:63 builtin/fsck.c:190 builtin/prune.c:140

1524 +#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141

1525 msgid "Checking connectivity"

1526 msgstr "检查连接中"

1527

@@ -1504,7 +1537,7 @@ msgstr "无法写入 rev-list"

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

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

1539

1507 -#: convert.c:201

1540 +#: convert.c:205

1541 #, c-format

1542 msgid ""

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

@@ -1513,12 +1546,12 @@ msgstr ""

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

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

1548

1516 -#: convert.c:205

1549 +#: convert.c:209

1550 #, c-format

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

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

1553

1521 -#: convert.c:211

1554 +#: convert.c:215

1555 #, c-format

1556 msgid ""

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

@@ -1527,78 +1560,78 @@ msgstr ""

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

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

1562

1530 -#: convert.c:215

1563 +#: convert.c:219

1564 #, c-format

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

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

1567

1535 -#: date.c:97

1568 +#: date.c:116

1569 msgid "in the future"

1570 msgstr "在将来"

1571

1539 -#: date.c:103

1572 +#: date.c:122

1573 #, c-format

1541 -msgid "%lu second ago"

1542 -msgid_plural "%lu seconds ago"

1543 -msgstr[0] "%lu 秒钟前"

1544 -msgstr[1] "%lu 秒钟前"

1574 +msgid "%<PRIuMAX> second ago"

1575 +msgid_plural "%<PRIuMAX> seconds ago"

1576 +msgstr[0] "%<PRIuMAX> 秒钟前"

1577 +msgstr[1] "%<PRIuMAX> 秒钟前"

1578

1546 -#: date.c:110

1579 +#: date.c:129

1580 #, c-format

1548 -msgid "%lu minute ago"

1549 -msgid_plural "%lu minutes ago"

1550 -msgstr[0] "%lu 分钟前"

1551 -msgstr[1] "%lu 分钟前"

1581 +msgid "%<PRIuMAX> minute ago"

1582 +msgid_plural "%<PRIuMAX> minutes ago"

1583 +msgstr[0] "%<PRIuMAX> 分钟前"

1584 +msgstr[1] "%<PRIuMAX> 分钟前"

1585

1553 -#: date.c:117

1586 +#: date.c:136

1587 #, c-format

1555 -msgid "%lu hour ago"

1556 -msgid_plural "%lu hours ago"

1557 -msgstr[0] "%lu 小时前"

1558 -msgstr[1] "%lu 小时前"

1588 +msgid "%<PRIuMAX> hour ago"

1589 +msgid_plural "%<PRIuMAX> hours ago"

1590 +msgstr[0] "%<PRIuMAX> 小时前"

1591 +msgstr[1] "%<PRIuMAX> 小时前"

1592

1560 -#: date.c:124

1593 +#: date.c:143

1594 #, c-format

1562 -msgid "%lu day ago"

1563 -msgid_plural "%lu days ago"

1564 -msgstr[0] "%lu 天前"

1565 -msgstr[1] "%lu 天前"

1595 +msgid "%<PRIuMAX> day ago"

1596 +msgid_plural "%<PRIuMAX> days ago"

1597 +msgstr[0] "%<PRIuMAX> 天前"

1598 +msgstr[1] "%<PRIuMAX> 天前"

1599

1567 -#: date.c:130

1600 +#: date.c:149

1601 #, c-format

1569 -msgid "%lu week ago"

1570 -msgid_plural "%lu weeks ago"

1571 -msgstr[0] "%lu 周前"

1572 -msgstr[1] "%lu 周前"

1602 +msgid "%<PRIuMAX> week ago"

1603 +msgid_plural "%<PRIuMAX> weeks ago"

1604 +msgstr[0] "%<PRIuMAX> 周前"

1605 +msgstr[1] "%<PRIuMAX> 周前"

1606

1574 -#: date.c:137

1607 +#: date.c:156

1608 #, c-format

1576 -msgid "%lu month ago"

1577 -msgid_plural "%lu months ago"

1578 -msgstr[0] "%lu 个月前"

1579 -msgstr[1] "%lu 个月前"

1609 +msgid "%<PRIuMAX> month ago"

1610 +msgid_plural "%<PRIuMAX> months ago"

1611 +msgstr[0] "%<PRIuMAX> 个月前"

1612 +msgstr[1] "%<PRIuMAX> 个月前"

1613

1581 -#: date.c:148

1614 +#: date.c:167

1615 #, c-format

1583 -msgid "%lu year"

1584 -msgid_plural "%lu years"

1585 -msgstr[0] "%lu 年"

1586 -msgstr[1] "%lu 年"

1616 +msgid "%<PRIuMAX> year"

1617 +msgid_plural "%<PRIuMAX> years"

1618 +msgstr[0] "%<PRIuMAX> 年"

1619 +msgstr[1] "%<PRIuMAX> 年"

1620

1621 #. TRANSLATORS: "%s" is "<n> years"

1589 -#: date.c:151

1622 +#: date.c:170

1623 #, c-format

1591 -msgid "%s, %lu month ago"

1592 -msgid_plural "%s, %lu months ago"

1593 -msgstr[0] "%s %lu 个月前"

1594 -msgstr[1] "%s %lu 个月前"

1624 +msgid "%s, %<PRIuMAX> month ago"

1625 +msgid_plural "%s, %<PRIuMAX> months ago"

1626 +msgstr[0] "%s %<PRIuMAX> 个月前"

1627 +msgstr[1] "%s %<PRIuMAX> 个月前"

1628

1596 -#: date.c:156 date.c:161

1629 +#: date.c:175 date.c:180

1630 #, c-format

1598 -msgid "%lu year ago"

1599 -msgid_plural "%lu years ago"

1600 -msgstr[0] "%lu 年前"

1601 -msgstr[1] "%lu 年前"

1631 +msgid "%<PRIuMAX> year ago"

1632 +msgid_plural "%<PRIuMAX> years ago"

1633 +msgstr[0] "%<PRIuMAX> 年前"

1634 +msgstr[1] "%<PRIuMAX> 年前"

1635

1636 #: diffcore-order.c:24

1637 #, c-format

@@ -1609,29 +1642,29 @@ msgstr "无法读取排序文件 '%s'"

1642 msgid "Performing inexact rename detection"

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

1644

1612 -#: diff.c:62

1645 +#: diff.c:63

1646 #, c-format

1647 msgid "option '%s' requires a value"

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

1649

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

1618 -#: diff.c:124

1651 +#: diff.c:125

1652 #, c-format

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

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

1655

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

1624 -#: diff.c:129

1657 +#: diff.c:130

1658 #, c-format

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

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

1661

1629 -#: diff.c:281

1662 +#: diff.c:282

1663 #, c-format

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

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

1666

1634 -#: diff.c:344

1667 +#: diff.c:342

1668 #, c-format

1669 msgid ""

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

@@ -1640,20 +1673,20 @@ msgstr ""

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

1674 "%s"

1675

1643 -#: diff.c:3102

1676 +#: diff.c:3101

1677 #, c-format

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

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

1680

1648 -#: diff.c:3428

1681 +#: diff.c:3427

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

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

1684

1652 -#: diff.c:3518

1685 +#: diff.c:3517

1686 msgid "--follow requires exactly one pathspec"

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

1688

1656 -#: diff.c:3681

1689 +#: diff.c:3680

1690 #, c-format

1691 msgid ""

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

@@ -1662,277 +1695,277 @@ msgstr ""

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

1696 "%s"

1697

1665 -#: diff.c:3695

1698 +#: diff.c:3694

1699 #, c-format

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

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

1702

1670 -#: diff.c:4719

1703 +#: diff.c:4716

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

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

1706

1674 -#: diff.c:4722

1707 +#: diff.c:4719

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

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

1710

1678 -#: diff.c:4725

1711 +#: diff.c:4722

1712 #, c-format

1713 msgid ""

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

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

1716

1684 -#: dir.c:1899

1717 +#: dir.c:1948

1718 msgid "failed to get kernel name and information"

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

1720

1688 -#: dir.c:2018

1721 +#: dir.c:2067

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

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

1724

1692 -#: dir.c:2776 dir.c:2781

1725 +#: dir.c:2846 dir.c:2851

1726 #, c-format

1727 msgid "could not create directories for %s"

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

1729

1697 -#: dir.c:2806

1730 +#: dir.c:2876

1731 #, c-format

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

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

1734

1702 -#: entry.c:280

1735 +#: entry.c:281

1736 #, c-format

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

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

1739

1707 -#: fetch-pack.c:249

1740 +#: fetch-pack.c:251

1741 msgid "git fetch-pack: expected shallow list"

1742 msgstr "git fetch-pack：应为 shallow 列表"

1743

1711 -#: fetch-pack.c:261

1744 +#: fetch-pack.c:263

1745 msgid "git fetch-pack: expected ACK/NAK, got EOF"

1746 msgstr "git fetch-pack：应为 ACK/NAK，却得到 EOF"

1747

1715 -#: fetch-pack.c:280 builtin/archive.c:63

1748 +#: fetch-pack.c:282 builtin/archive.c:63

1749 #, c-format

1750 msgid "remote error: %s"

1751 msgstr "远程错误：%s"

1752

1720 -#: fetch-pack.c:281

1753 +#: fetch-pack.c:283

1754 #, c-format

1755 msgid "git fetch-pack: expected ACK/NAK, got '%s'"

1756 msgstr "git fetch-pack：应为 ACK/NAK，却得到 '%s'"

1757

1725 -#: fetch-pack.c:333

1758 +#: fetch-pack.c:335

1759 msgid "--stateless-rpc requires multi_ack_detailed"

1760 msgstr "--stateless-rpc 需要 multi_ack_detailed"

1761

1729 -#: fetch-pack.c:419

1762 +#: fetch-pack.c:421

1763 #, c-format

1764 msgid "invalid shallow line: %s"

1765 msgstr "无效的 shallow 信息：%s"

1766

1734 -#: fetch-pack.c:425

1767 +#: fetch-pack.c:427

1768 #, c-format

1769 msgid "invalid unshallow line: %s"

1770 msgstr "无效的 unshallow 信息：%s"

1771

1739 -#: fetch-pack.c:427

1772 +#: fetch-pack.c:429

1773 #, c-format

1774 msgid "object not found: %s"

1775 msgstr "对象未找到：%s"

1776

1744 -#: fetch-pack.c:430

1777 +#: fetch-pack.c:432

1778 #, c-format

1779 msgid "error in object: %s"

1780 msgstr "对象中出错：%s"

1781

1749 -#: fetch-pack.c:432

1782 +#: fetch-pack.c:434

1783 #, c-format

1784 msgid "no shallow found: %s"

1785 msgstr "未发现 shallow：%s"

1786

1754 -#: fetch-pack.c:435

1787 +#: fetch-pack.c:437

1788 #, c-format

1789 msgid "expected shallow/unshallow, got %s"

1790 msgstr "应为 shallow/unshallow，却得到 %s"

1791

1759 -#: fetch-pack.c:474

1792 +#: fetch-pack.c:476

1793 #, c-format

1794 msgid "got %s %d %s"

1795 msgstr "得到 %s %d %s"

1796

1764 -#: fetch-pack.c:488

1797 +#: fetch-pack.c:490

1798 #, c-format

1799 msgid "invalid commit %s"

1800 msgstr "无效提交 %s"

1801

1769 -#: fetch-pack.c:521

1802 +#: fetch-pack.c:523

1803 msgid "giving up"

1804 msgstr "放弃"

1805

1773 -#: fetch-pack.c:531 progress.c:235

1806 +#: fetch-pack.c:533 progress.c:237

1807 msgid "done"

1808 msgstr "完成"

1809

1777 -#: fetch-pack.c:543

1810 +#: fetch-pack.c:545

1811 #, c-format

1812 msgid "got %s (%d) %s"

1813 msgstr "得到 %s (%d) %s"

1814

1782 -#: fetch-pack.c:589

1815 +#: fetch-pack.c:591

1816 #, c-format

1817 msgid "Marking %s as complete"

1818 msgstr "标记 %s 为完成"

1819

1787 -#: fetch-pack.c:737

1820 +#: fetch-pack.c:775

1821 #, c-format

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

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

1824

1792 -#: fetch-pack.c:775

1825 +#: fetch-pack.c:813

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

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

1828

1796 -#: fetch-pack.c:783

1829 +#: fetch-pack.c:821

1830 msgid "protocol error: bad pack header"

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

1832

1800 -#: fetch-pack.c:839

1833 +#: fetch-pack.c:877

1834 #, c-format

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

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

1837

1805 -#: fetch-pack.c:855

1838 +#: fetch-pack.c:893

1839 #, c-format

1840 msgid "%s failed"

1841 msgstr "%s 失败"

1842

1810 -#: fetch-pack.c:857

1843 +#: fetch-pack.c:895

1844 msgid "error in sideband demultiplexer"

1845 msgstr "sideband 多路输出出错"

1846

1814 -#: fetch-pack.c:884

1847 +#: fetch-pack.c:922

1848 msgid "Server does not support shallow clients"

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

1850

1818 -#: fetch-pack.c:888

1851 +#: fetch-pack.c:926

1852 msgid "Server supports multi_ack_detailed"

1853 msgstr "服务器支持 multi_ack_detailed"

1854

1822 -#: fetch-pack.c:891

1855 +#: fetch-pack.c:929

1856 msgid "Server supports no-done"

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

1858

1826 -#: fetch-pack.c:897

1859 +#: fetch-pack.c:935

1860 msgid "Server supports multi_ack"

1861 msgstr "服务器支持 multi_ack"

1862

1830 -#: fetch-pack.c:901

1863 +#: fetch-pack.c:939

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

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

1866

1834 -#: fetch-pack.c:905

1867 +#: fetch-pack.c:943

1868 msgid "Server supports side-band"

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

1870

1838 -#: fetch-pack.c:909

1871 +#: fetch-pack.c:947

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

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

1874

1842 -#: fetch-pack.c:913

1875 +#: fetch-pack.c:951

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

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

1878

1846 -#: fetch-pack.c:923

1879 +#: fetch-pack.c:961

1880 msgid "Server supports ofs-delta"

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

1882

1850 -#: fetch-pack.c:930

1883 +#: fetch-pack.c:968

1884 #, c-format

1885 msgid "Server version is %.*s"

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

1887

1855 -#: fetch-pack.c:936

1888 +#: fetch-pack.c:974

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

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

1891

1859 -#: fetch-pack.c:940

1892 +#: fetch-pack.c:978

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

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

1895

1863 -#: fetch-pack.c:942

1896 +#: fetch-pack.c:980

1897 msgid "Server does not support --deepen"

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

1899

1867 -#: fetch-pack.c:953

1900 +#: fetch-pack.c:991

1901 msgid "no common commits"

1902 msgstr "没有共同的提交"

1903

1871 -#: fetch-pack.c:965

1904 +#: fetch-pack.c:1003

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

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

1907

1875 -#: fetch-pack.c:1127

1908 +#: fetch-pack.c:1165

1909 msgid "no matching remote head"

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

1911

1879 -#: fetch-pack.c:1149

1912 +#: fetch-pack.c:1187

1913 #, c-format

1914 msgid "no such remote ref %s"

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

1916

1884 -#: fetch-pack.c:1152

1917 +#: fetch-pack.c:1190

1918 #, c-format

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

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

1921

1889 -#: gpg-interface.c:185

1922 +#: gpg-interface.c:181

1923 msgid "gpg failed to sign the data"

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

1925

1893 -#: gpg-interface.c:215

1926 +#: gpg-interface.c:211

1927 msgid "could not create temporary file"

1928 msgstr "不能创建临时文件"

1929

1897 -#: gpg-interface.c:217

1930 +#: gpg-interface.c:213

1931 #, c-format

1932 msgid "failed writing detached signature to '%s'"

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

1934

1902 -#: graph.c:96

1935 +#: graph.c:97

1936 #, c-format

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

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

1939

1907 -#: grep.c:1796

1940 +#: grep.c:1981

1941 #, c-format

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

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

1944

1912 -#: grep.c:1813 builtin/clone.c:399 builtin/diff.c:81 builtin/rm.c:133

1945 +#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134

1946 #, c-format

1947 msgid "failed to stat '%s'"

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

1949

1917 -#: grep.c:1824

1950 +#: grep.c:2009

1951 #, c-format

1952 msgid "'%s': short read"

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

1954

1922 -#: help.c:218

1955 +#: help.c:179

1956 #, c-format

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

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

1959

1927 -#: help.c:225

1960 +#: help.c:186

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

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

1963

1931 -#: help.c:256

1964 +#: help.c:217

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

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

1967

1935 -#: help.c:321

1968 +#: help.c:281

1969 #, c-format

1970 msgid ""

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

@@ -1941,30 +1974,50 @@ msgstr ""

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

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

1976

1944 -#: help.c:376

1977 +#: help.c:336

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

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

1980

1948 -#: help.c:398

1981 +#: help.c:358

1982 #, c-format

1950 -msgid ""

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

1952 -"Continuing under the assumption that you meant '%s'"

1953 -msgstr ""

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

1955 -"是 '%s'"

1983 +msgid "WARNING: You called a Git command named '%s', which does not exist."

1984 +msgstr "警告：您运行一个 Git 命令 '%s'，但是并不存在。"

1985 +

1986 +#: help.c:363

1987 +#, c-format

1988 +msgid "Continuing under the assumption that you meant '%s'."

1989 +msgstr "继续运行，假定你想要的是 '%s'。"

1990

1957 -#: help.c:403

1991 +#: help.c:368

1992 #, c-format

1959 -msgid "in %0.1f seconds automatically..."

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

1993 +msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."

1994 +msgstr "在 %0.1f 秒钟后继续，假定你想要的是 '%s'。"

1995

1962 -#: help.c:410

1996 +#: help.c:376

1997 #, c-format

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

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

2000

1967 -#: help.c:414 help.c:480

2001 +#: help.c:380

2002 +msgid ""

2003 +"\n"

2004 +"The most similar command is"

2005 +msgid_plural ""

2006 +"\n"

2007 +"The most similar commands are"

2008 +msgstr[0] "\n最相似的命令是"

2009 +msgstr[1] "\n最相似的命令是"

2010 +

2011 +#: help.c:395

2012 +msgid "git version [<options>]"

2013 +msgstr "git version [<选项>]"

2014 +

2015 +#: help.c:456

2016 +#, c-format

2017 +msgid "%s: %s - %s"

2018 +msgstr "%s：%s - %s"

2019 +

2020 +#: help.c:460

2021 msgid ""

2022 "\n"

2023 "Did you mean this?"

@@ -1978,12 +2031,7 @@ msgstr[1] ""

2031 "\n"

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

2033

1981 -#: help.c:476

1982 -#, c-format

1983 -msgid "%s: %s - %s"

1984 -msgstr "%s：%s - %s"

1985 -

1986 -#: ident.c:343

2034 +#: ident.c:342

2035 msgid ""

2036 "\n"

2037 "*** Please tell me who you are.\n"

@@ -2008,35 +2056,35 @@ msgstr ""

2056 "来设置您账号的缺省身份标识。\n"

2057 "如果仅在本仓库设置身份标识，则省略 --global 参数。\n"

2058

2011 -#: ident.c:367

2059 +#: ident.c:366

2060 msgid "no email was given and auto-detection is disabled"

2061 msgstr "未提供邮件地址且自动探测被禁用"

2062

2015 -#: ident.c:372

2063 +#: ident.c:371

2064 #, c-format

2065 msgid "unable to auto-detect email address (got '%s')"

2066 msgstr "无法自动探测邮件地址（得到 '%s'）"

2067

2020 -#: ident.c:382

2068 +#: ident.c:381

2069 msgid "no name was given and auto-detection is disabled"

2070 msgstr "未提供姓名且自动探测被禁用"

2071

2024 -#: ident.c:388

2072 +#: ident.c:387

2073 #, c-format

2074 msgid "unable to auto-detect name (got '%s')"

2075 msgstr "无法自动探测姓名（得到 '%s'）"

2076

2029 -#: ident.c:396

2077 +#: ident.c:395

2078 #, c-format

2079 msgid "empty ident name (for <%s>) not allowed"

2080 msgstr "不允许空的姓名（对于 <%s>）"

2081

2034 -#: ident.c:402

2082 +#: ident.c:401

2083 #, c-format

2084 msgid "name consists only of disallowed characters: %s"

2085 msgstr "姓名中仅包含禁用字符：%s"

2086

2039 -#: ident.c:417 builtin/commit.c:611

2087 +#: ident.c:416 builtin/commit.c:612

2088 #, c-format

2089 msgid "invalid date format: %s"

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

@@ -2068,78 +2116,78 @@ msgstr "不能创建 '%s.lock'：%s"

2116 msgid "failed to read the cache"

2117 msgstr "无法读取缓存"

2118

2071 -#: merge.c:96 builtin/am.c:1999 builtin/am.c:2034 builtin/checkout.c:393

2072 -#: builtin/checkout.c:607 builtin/clone.c:749

2119 +#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377

2120 +#: builtin/checkout.c:591 builtin/clone.c:753

2121 msgid "unable to write new index file"

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

2123

2076 -#: merge-recursive.c:209

2124 +#: merge-recursive.c:210

2125 msgid "(bad commit)\n"

2126 msgstr "（坏提交）\n"

2127

2080 -#: merge-recursive.c:231 merge-recursive.c:239

2128 +#: merge-recursive.c:232 merge-recursive.c:240

2129 #, c-format

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

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

2132

2085 -#: merge-recursive.c:303

2133 +#: merge-recursive.c:304

2134 msgid "error building trees"

2135 msgstr "无法创建树"

2136

2089 -#: merge-recursive.c:727

2137 +#: merge-recursive.c:728

2138 #, c-format

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

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

2141

2094 -#: merge-recursive.c:738

2142 +#: merge-recursive.c:739

2143 #, c-format

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

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

2146

2099 -#: merge-recursive.c:752 merge-recursive.c:771

2147 +#: merge-recursive.c:753 merge-recursive.c:772

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

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

2150

2103 -#: merge-recursive.c:761

2151 +#: merge-recursive.c:762

2152 #, c-format

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

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

2155

2108 -#: merge-recursive.c:803 builtin/cat-file.c:34

2156 +#: merge-recursive.c:804 builtin/cat-file.c:36

2157 #, c-format

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

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

2160

2113 -#: merge-recursive.c:805

2161 +#: merge-recursive.c:806

2162 #, c-format

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

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

2165

2118 -#: merge-recursive.c:829

2166 +#: merge-recursive.c:830

2167 #, c-format

2168 msgid "failed to open '%s': %s"

2169 msgstr "无法打开 '%s'：%s"

2170

2123 -#: merge-recursive.c:840

2171 +#: merge-recursive.c:841

2172 #, c-format

2173 msgid "failed to symlink '%s': %s"

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

2175

2128 -#: merge-recursive.c:845

2176 +#: merge-recursive.c:846

2177 #, c-format

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

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

2180

2133 -#: merge-recursive.c:985

2181 +#: merge-recursive.c:986

2182 msgid "Failed to execute internal merge"

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

2184

2137 -#: merge-recursive.c:989

2185 +#: merge-recursive.c:990

2186 #, c-format

2187 msgid "Unable to add %s to database"

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

2189

2142 -#: merge-recursive.c:1092

2190 +#: merge-recursive.c:1093

2191 #, c-format

2192 msgid ""

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

@@ -2148,7 +2196,7 @@ msgstr ""

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

2197 "本被保留。"

2198

2151 -#: merge-recursive.c:1097

2199 +#: merge-recursive.c:1098

2200 #, c-format

2201 msgid ""

2202 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -2157,7 +2205,7 @@ msgstr ""

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

2206 "%7$s 版本被保留。"

2207

2160 -#: merge-recursive.c:1104

2208 +#: merge-recursive.c:1105

2209 #, c-format

2210 msgid ""

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

@@ -2166,7 +2214,7 @@ msgstr ""

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

2215 "本保留在 %8$s 中。"

2216

2169 -#: merge-recursive.c:1109

2217 +#: merge-recursive.c:1110

2218 #, c-format

2219 msgid ""

2220 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -2175,20 +2223,20 @@ msgstr ""

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

2224 "%7$s 版本保留在 %9$s 中。"

2225

2178 -#: merge-recursive.c:1143

2226 +#: merge-recursive.c:1144

2227 msgid "rename"

2228 msgstr "重命名"

2229

2182 -#: merge-recursive.c:1143

2230 +#: merge-recursive.c:1144

2231 msgid "renamed"

2232 msgstr "重命名"

2233

2186 -#: merge-recursive.c:1200

2234 +#: merge-recursive.c:1201

2235 #, c-format

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

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

2238

2191 -#: merge-recursive.c:1225

2239 +#: merge-recursive.c:1226

2240 #, c-format

2241 msgid ""

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

@@ -2197,135 +2245,135 @@ msgstr ""

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

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

2247

2200 -#: merge-recursive.c:1230

2248 +#: merge-recursive.c:1231

2249 msgid " (left unresolved)"

2250 msgstr "（留下未解决）"

2251

2204 -#: merge-recursive.c:1292

2252 +#: merge-recursive.c:1293

2253 #, c-format

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

2255 msgstr ""

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

2257 "%5$s"

2258

2211 -#: merge-recursive.c:1325

2259 +#: merge-recursive.c:1326

2260 #, c-format

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

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

2263

2216 -#: merge-recursive.c:1528

2264 +#: merge-recursive.c:1529

2265 #, c-format

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

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

2268

2221 -#: merge-recursive.c:1543

2269 +#: merge-recursive.c:1544

2270 #, c-format

2271 msgid "Adding merged %s"

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

2273

2226 -#: merge-recursive.c:1550 merge-recursive.c:1780

2274 +#: merge-recursive.c:1551 merge-recursive.c:1781

2275 #, c-format

2276 msgid "Adding as %s instead"

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

2278

2231 -#: merge-recursive.c:1607

2279 +#: merge-recursive.c:1608

2280 #, c-format

2281 msgid "cannot read object %s"

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

2283

2236 -#: merge-recursive.c:1610

2284 +#: merge-recursive.c:1611

2285 #, c-format

2286 msgid "object %s is not a blob"

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

2288

2241 -#: merge-recursive.c:1679

2289 +#: merge-recursive.c:1680

2290 msgid "modify"

2291 msgstr "修改"

2292

2245 -#: merge-recursive.c:1679

2293 +#: merge-recursive.c:1680

2294 msgid "modified"

2295 msgstr "修改"

2296

2249 -#: merge-recursive.c:1689

2297 +#: merge-recursive.c:1690

2298 msgid "content"

2299 msgstr "内容"

2300

2253 -#: merge-recursive.c:1696

2301 +#: merge-recursive.c:1697

2302 msgid "add/add"

2303 msgstr "添加/添加"

2304

2257 -#: merge-recursive.c:1732

2305 +#: merge-recursive.c:1733

2306 #, c-format

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

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

2309

2262 -#: merge-recursive.c:1746

2310 +#: merge-recursive.c:1747

2311 #, c-format

2312 msgid "Auto-merging %s"

2313 msgstr "自动合并 %s"

2314

2267 -#: merge-recursive.c:1750 git-submodule.sh:944

2315 +#: merge-recursive.c:1751 git-submodule.sh:945

2316 msgid "submodule"

2317 msgstr "子模组"

2318

2271 -#: merge-recursive.c:1751

2319 +#: merge-recursive.c:1752

2320 #, c-format

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

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

2323

2276 -#: merge-recursive.c:1845

2324 +#: merge-recursive.c:1846

2325 #, c-format

2326 msgid "Removing %s"

2327 msgstr "删除 %s"

2328

2281 -#: merge-recursive.c:1871

2329 +#: merge-recursive.c:1872

2330 msgid "file/directory"

2331 msgstr "文件/目录"

2332

2285 -#: merge-recursive.c:1877

2333 +#: merge-recursive.c:1878

2334 msgid "directory/file"

2335 msgstr "目录/文件"

2336

2289 -#: merge-recursive.c:1883

2337 +#: merge-recursive.c:1884

2338 #, c-format

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

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

2341

2294 -#: merge-recursive.c:1892

2342 +#: merge-recursive.c:1893

2343 #, c-format

2344 msgid "Adding %s"

2345 msgstr "添加 %s"

2346

2299 -#: merge-recursive.c:1929

2347 +#: merge-recursive.c:1930

2348 msgid "Already up-to-date!"

2349 msgstr "已经是最新的！"

2350

2303 -#: merge-recursive.c:1938

2351 +#: merge-recursive.c:1939

2352 #, c-format

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

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

2355

2308 -#: merge-recursive.c:2021

2356 +#: merge-recursive.c:2022

2357 msgid "Merging:"

2358 msgstr "合并："

2359

2312 -#: merge-recursive.c:2034

2360 +#: merge-recursive.c:2035

2361 #, c-format

2362 msgid "found %u common ancestor:"

2363 msgid_plural "found %u common ancestors:"

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

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

2366

2319 -#: merge-recursive.c:2073

2367 +#: merge-recursive.c:2074

2368 msgid "merge returned no commit"

2369 msgstr "合并未返回提交"

2370

2323 -#: merge-recursive.c:2136

2371 +#: merge-recursive.c:2137

2372 #, c-format

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

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

2375

2328 -#: merge-recursive.c:2150 builtin/merge.c:645 builtin/merge.c:792

2376 +#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793

2377 msgid "Unable to write index."

2378 msgstr "不能写入索引。"

2379

@@ -2345,23 +2393,25 @@ msgstr ""

2393 msgid "You have not concluded your notes merge (%s exists)."

2394 msgstr "您尚未结束注释合并（存在 %s）。"

2395

2348 -#: notes-utils.c:41

2396 +#: notes-utils.c:42

2397 msgid "Cannot commit uninitialized/unreferenced notes tree"

2398 msgstr "不能提交未初始化/未引用的注解树"

2399

2352 -#: notes-utils.c:100

2400 +#: notes-utils.c:101

2401 #, c-format

2402 msgid "Bad notes.rewriteMode value: '%s'"

2403 msgstr "坏的 notes.rewriteMode 值：'%s'"

2404

2357 -#: notes-utils.c:110

2405 +#: notes-utils.c:111

2406 #, c-format

2407 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"

2408 msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解"

2409

2362 -#. TRANSLATORS: The first %s is the name of the

2363 -#. environment variable, the second %s is its value

2364 -#: notes-utils.c:137

2410 +#. TRANSLATORS: The first %s is the name of

2411 +#. the environment variable, the second %s is

2412 +#. its value.

2413 +#.

2414 +#: notes-utils.c:141

2415 #, c-format

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

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

@@ -2371,29 +2421,30 @@ msgstr "坏的 %s 值：'%s'"

2421 msgid "unable to parse object: %s"

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

2423

2374 -#: parse-options.c:572

2424 +#: parse-options.c:573

2425 msgid "..."

2426 msgstr "..."

2427

2378 -#: parse-options.c:590

2428 +#: parse-options.c:591

2429 #, c-format

2430 msgid "usage: %s"

2431 msgstr "用法：%s"

2432

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

2384 -#. one in "usage: %s" translation

2385 -#: parse-options.c:594

2434 +#. one in "usage: %s" translation.

2435 +#.

2436 +#: parse-options.c:597

2437 #, c-format

2438 msgid " or: %s"

2439 msgstr " 或：%s"

2440

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

2391 -#: parse-options.c:597

2442 +#: parse-options.c:600

2443 #, c-format

2444 msgid " %s"

2445 msgstr " %s"

2446

2396 -#: parse-options.c:631

2447 +#: parse-options.c:634

2448 msgid "-NUM"

2449 msgstr "-数字"

2450

@@ -2402,83 +2453,78 @@ msgstr "-数字"

2453 msgid "malformed object name '%s'"

2454 msgstr "非法的对象名 '%s'"

2455

2405 -#: path.c:810

2456 +#: path.c:890

2457 #, c-format

2458 msgid "Could not make %s writable by group"

2459 msgstr "不能设置 %s 为组可写"

2460

2410 -#: pathspec.c:125

2461 +#: pathspec.c:129

2462 msgid "Escape character '\\' not allowed as last character in attr value"

2463 msgstr "转义字符 '\\' 不能作为属性值的最后一个字符"

2464

2414 -#: pathspec.c:143

2465 +#: pathspec.c:147

2466 msgid "Only one 'attr:' specification is allowed."

2467 msgstr "只允许一个 'attr:' 规格。"

2468

2418 -#: pathspec.c:146

2469 +#: pathspec.c:150

2470 msgid "attr spec must not be empty"

2471 msgstr "属性规格不能为空"

2472

2422 -#: pathspec.c:189

2473 +#: pathspec.c:193

2474 #, c-format

2475 msgid "invalid attribute name %s"

2476 msgstr "无效的属性名 %s"

2477

2427 -#: pathspec.c:254

2478 +#: pathspec.c:258

2479 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"

2480 msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"

2481

2431 -#: pathspec.c:261

2482 +#: pathspec.c:265

2483 msgid ""

2484 "global 'literal' pathspec setting is incompatible with all other global "

2485 "pathspec settings"

2486 msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"

2487

2437 -#: pathspec.c:301

2488 +#: pathspec.c:305

2489 msgid "invalid parameter for pathspec magic 'prefix'"

2490 msgstr "路径规格包含无效的神奇前缀"

2491

2441 -#: pathspec.c:322

2492 +#: pathspec.c:326

2493 #, c-format

2494 msgid "Invalid pathspec magic '%.*s' in '%s'"

2495 msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"

2496

2446 -#: pathspec.c:327

2497 +#: pathspec.c:331

2498 #, c-format

2499 msgid "Missing ')' at the end of pathspec magic in '%s'"

2500 msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"

2501

2451 -#: pathspec.c:365

2502 +#: pathspec.c:369

2503 #, c-format

2504 msgid "Unimplemented pathspec magic '%c' in '%s'"

2505 msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"

2506

2456 -#: pathspec.c:421 pathspec.c:443

2457 -#, c-format

2458 -msgid "Pathspec '%s' is in submodule '%.*s'"

2459 -msgstr "路径规格 '%s' 在子模组 '%.*s' 中"

2460 -

2461 -#: pathspec.c:483

2507 +#: pathspec.c:428

2508 #, c-format

2509 msgid "%s: 'literal' and 'glob' are incompatible"

2510 msgstr "%s：'literal' 和 'glob' 不兼容"

2511

2466 -#: pathspec.c:496

2512 +#: pathspec.c:441

2513 #, c-format

2514 msgid "%s: '%s' is outside repository"

2515 msgstr "%s：'%s' 在仓库之外"

2516

2471 -#: pathspec.c:584

2517 +#: pathspec.c:515

2518 #, c-format

2519 msgid "'%s' (mnemonic: '%c')"

2520 msgstr "'%s'（助记符：'%c'）"

2521

2476 -#: pathspec.c:594

2522 +#: pathspec.c:525

2523 #, c-format

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

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

2526

2481 -#: pathspec.c:644

2527 +#: pathspec.c:575

2528 msgid ""

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

2530 "use . instead if you meant to match all paths"

@@ -2486,16 +2532,16 @@ msgstr ""

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

2533 "请代之以 ."

2534

2489 -#: pathspec.c:668

2535 +#: pathspec.c:599

2536 #, c-format

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

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

2539

2494 -#: pretty.c:982

2540 +#: pretty.c:963

2541 msgid "unable to parse --pretty format"

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

2543

2498 -#: read-cache.c:1442

2544 +#: read-cache.c:1443

2545 #, c-format

2546 msgid ""

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

@@ -2504,7 +2550,7 @@ msgstr ""

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

2551 "使用版本 %i"

2552

2507 -#: read-cache.c:1452

2553 +#: read-cache.c:1453

2554 #, c-format

2555 msgid ""

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

@@ -2513,46 +2559,51 @@ msgstr ""

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

2560 "使用版本 %i"

2561

2516 -#: read-cache.c:2375 sequencer.c:1350 sequencer.c:2048

2562 +#: read-cache.c:2308 builtin/merge.c:1019

2563 +#, c-format

2564 +msgid "could not close '%s'"

2565 +msgstr "不能关闭 '%s'"

2566 +

2567 +#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054

2568 #, c-format

2569 msgid "could not stat '%s'"

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

2571

2521 -#: read-cache.c:2388

2572 +#: read-cache.c:2396

2573 #, c-format

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

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

2576

2526 -#: read-cache.c:2400

2577 +#: read-cache.c:2408

2578 #, c-format

2579 msgid "unable to unlink: %s"

2580 msgstr "无法删除：%s"

2581

2531 -#: refs.c:620 builtin/merge.c:844

2582 +#: refs.c:622

2583 #, c-format

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

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

2586

2536 -#: refs.c:1667

2587 +#: refs.c:1769

2588 msgid "ref updates forbidden inside quarantine environment"

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

2590

2540 -#: refs/files-backend.c:1631

2591 +#: refs/files-backend.c:1664

2592 #, c-format

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

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

2595

2545 -#: refs/files-backend.c:1634

2596 +#: refs/files-backend.c:1667

2597 #, c-format

2598 msgid "could not delete references: %s"

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

2600

2550 -#: refs/files-backend.c:1643

2601 +#: refs/files-backend.c:1676

2602 #, c-format

2603 msgid "could not remove reference %s"

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

2605

2555 -#: ref-filter.c:35 wt-status.c:1780

2606 +#: ref-filter.c:35 wt-status.c:1811

2607 msgid "gone"

2608 msgstr "丢失"

2609

@@ -2571,301 +2622,303 @@ msgstr "落后 %d"

2622 msgid "ahead %d, behind %d"

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

2624

2574 -#: ref-filter.c:104

2625 +#: ref-filter.c:105

2626 #, c-format

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

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

2629

2579 -#: ref-filter.c:106

2630 +#: ref-filter.c:107

2631 #, c-format

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

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

2634

2584 -#: ref-filter.c:120

2635 +#: ref-filter.c:121

2636 #, c-format

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

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

2639

2589 -#: ref-filter.c:124

2640 +#: ref-filter.c:125

2641 #, c-format

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

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

2644

2594 -#: ref-filter.c:126

2645 +#: ref-filter.c:127

2646 #, c-format

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

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

2649

2599 -#: ref-filter.c:166

2650 +#: ref-filter.c:167

2651 #, c-format

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

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

2654

2604 -#: ref-filter.c:173

2655 +#: ref-filter.c:174

2656 #, c-format

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

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

2659

2609 -#: ref-filter.c:180

2660 +#: ref-filter.c:181

2661 #, c-format

2662 msgid "%%(trailers) does not take arguments"

2663 msgstr "%%(trailers) 不带参数"

2664

2614 -#: ref-filter.c:199

2665 +#: ref-filter.c:200

2666 #, c-format

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

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

2669

2619 -#: ref-filter.c:201

2670 +#: ref-filter.c:202

2671 #, c-format

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

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

2674

2624 -#: ref-filter.c:214

2675 +#: ref-filter.c:215

2676 #, c-format

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

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

2679

2629 -#: ref-filter.c:218

2680 +#: ref-filter.c:219

2681 #, c-format

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

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

2684

2634 -#: ref-filter.c:245

2685 +#: ref-filter.c:246

2686 #, c-format

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

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

2689

2639 -#: ref-filter.c:257

2690 +#: ref-filter.c:258

2691 #, c-format

2692 msgid "unrecognized position:%s"

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

2694

2644 -#: ref-filter.c:261

2695 +#: ref-filter.c:262

2696 #, c-format

2697 msgid "unrecognized width:%s"

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

2699

2649 -#: ref-filter.c:267

2700 +#: ref-filter.c:268

2701 #, c-format

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

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

2704

2654 -#: ref-filter.c:271

2705 +#: ref-filter.c:272

2706 #, c-format

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

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

2709

2659 -#: ref-filter.c:286

2710 +#: ref-filter.c:287

2711 #, c-format

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

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

2714

2664 -#: ref-filter.c:371

2715 +#: ref-filter.c:378

2716 #, c-format

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

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

2719

2669 -#: ref-filter.c:397

2720 +#: ref-filter.c:404

2721 #, c-format

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

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

2724

2674 -#: ref-filter.c:501

2725 +#: ref-filter.c:508

2726 #, c-format

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

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

2729

2679 -#: ref-filter.c:561

2730 +#: ref-filter.c:568

2731 #, c-format

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

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

2734

2684 -#: ref-filter.c:563

2735 +#: ref-filter.c:570

2736 #, c-format

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

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

2739

2689 -#: ref-filter.c:565

2740 +#: ref-filter.c:572

2741 #, c-format

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

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

2744

2694 -#: ref-filter.c:591

2745 +#: ref-filter.c:598

2746 #, c-format

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

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

2749

2699 -#: ref-filter.c:593

2750 +#: ref-filter.c:600

2751 #, c-format

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

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

2754

2704 -#: ref-filter.c:595

2755 +#: ref-filter.c:602

2756 #, c-format

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

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

2759

2709 -#: ref-filter.c:608

2760 +#: ref-filter.c:615

2761 #, c-format

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

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

2764

2714 -#: ref-filter.c:663

2765 +#: ref-filter.c:670

2766 #, c-format

2767 msgid "malformed format string %s"

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

2769

2719 -#: ref-filter.c:1247

2770 +#: ref-filter.c:1254

2771 #, c-format

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

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

2774

2724 -#: ref-filter.c:1250

2775 +#: ref-filter.c:1257

2776 #, c-format

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

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

2779

2729 -#. TRANSLATORS: make sure this matches

2730 -#. "HEAD detached at " in wt-status.c

2731 -#: ref-filter.c:1256

2780 +#. TRANSLATORS: make sure this matches "HEAD

2781 +#. detached at " in wt-status.c

2782 +#.

2783 +#: ref-filter.c:1265

2784 #, c-format

2785 msgid "(HEAD detached at %s)"

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

2787

2736 -#. TRANSLATORS: make sure this matches

2737 -#. "HEAD detached from " in wt-status.c

2738 -#: ref-filter.c:1261

2788 +#. TRANSLATORS: make sure this matches "HEAD

2789 +#. detached from " in wt-status.c

2790 +#.

2791 +#: ref-filter.c:1272

2792 #, c-format

2793 msgid "(HEAD detached from %s)"

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

2795

2743 -#: ref-filter.c:1265

2796 +#: ref-filter.c:1276

2797 msgid "(no branch)"

2798 msgstr "（非分支）"

2799

2747 -#: ref-filter.c:1420 ref-filter.c:1451

2800 +#: ref-filter.c:1426 ref-filter.c:1457

2801 #, c-format

2802 msgid "missing object %s for %s"

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

2804

2752 -#: ref-filter.c:1423 ref-filter.c:1454

2805 +#: ref-filter.c:1429 ref-filter.c:1460

2806 #, c-format

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

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

2809

2757 -#: ref-filter.c:1692

2810 +#: ref-filter.c:1760

2811 #, c-format

2812 msgid "malformed object at '%s'"

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

2814

2762 -#: ref-filter.c:1759

2815 +#: ref-filter.c:1827

2816 #, c-format

2817 msgid "ignoring ref with broken name %s"

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

2819

2767 -#: ref-filter.c:1764

2820 +#: ref-filter.c:1832

2821 #, c-format

2822 msgid "ignoring broken ref %s"

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

2824

2772 -#: ref-filter.c:2028

2825 +#: ref-filter.c:2095

2826 #, c-format

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

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

2829

2777 -#: ref-filter.c:2109

2830 +#: ref-filter.c:2176

2831 #, c-format

2832 msgid "malformed object name %s"

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

2834

2782 -#: remote.c:754

2835 +#: remote.c:747

2836 #, c-format

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

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

2839

2787 -#: remote.c:758

2840 +#: remote.c:751

2841 #, c-format

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

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

2844

2792 -#: remote.c:762

2845 +#: remote.c:755

2846 #, c-format

2847 msgid "%s tracks both %s and %s"

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

2849

2797 -#: remote.c:770

2850 +#: remote.c:763

2851 msgid "Internal error"

2852 msgstr "内部错误"

2853

2801 -#: remote.c:1685 remote.c:1787

2854 +#: remote.c:1680 remote.c:1782

2855 msgid "HEAD does not point to a branch"

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

2857

2805 -#: remote.c:1694

2858 +#: remote.c:1689

2859 #, c-format

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

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

2862

2810 -#: remote.c:1697

2863 +#: remote.c:1692

2864 #, c-format

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

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

2867

2815 -#: remote.c:1703

2868 +#: remote.c:1698

2869 #, c-format

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

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

2872

2820 -#: remote.c:1718

2873 +#: remote.c:1713

2874 #, c-format

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

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

2877

2825 -#: remote.c:1730

2878 +#: remote.c:1725

2879 #, c-format

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

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

2882

2830 -#: remote.c:1741

2883 +#: remote.c:1736

2884 #, c-format

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

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

2887

2835 -#: remote.c:1754

2888 +#: remote.c:1749

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

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

2891

2839 -#: remote.c:1776

2892 +#: remote.c:1771

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

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

2895

2843 -#: remote.c:2081

2896 +#: remote.c:2076

2897 #, c-format

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

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

2900

2848 -#: remote.c:2085

2901 +#: remote.c:2080

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

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

2904

2852 -#: remote.c:2088

2905 +#: remote.c:2083

2906 #, c-format

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

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

2909

2857 -#: remote.c:2092

2910 +#: remote.c:2087

2911 #, c-format

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

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

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

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

2916

2864 -#: remote.c:2098

2917 +#: remote.c:2093

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

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

2920

2868 -#: remote.c:2101

2921 +#: remote.c:2096

2922 #, c-format

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

2924 msgid_plural ""

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

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

2928

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

2877 -#: remote.c:2109

2930 +#: remote.c:2104

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

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

2933

2881 -#: remote.c:2112

2934 +#: remote.c:2107

2935 #, c-format

2936 msgid ""

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

@@ -2894,82 +2947,77 @@ msgstr[1] ""

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

2948

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

2897 -#: remote.c:2122

2950 +#: remote.c:2117

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

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

2953

2901 -#: revision.c:2158

2954 +#: revision.c:2187

2955 msgid "your current branch appears to be broken"

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

2957

2905 -#: revision.c:2161

2958 +#: revision.c:2190

2959 #, c-format

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

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

2962

2910 -#: revision.c:2355

2963 +#: revision.c:2384

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

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

2966

2914 -#: run-command.c:125

2967 +#: run-command.c:644

2968 msgid "open /dev/null failed"

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

2970

2918 -#: run-command.c:127

2919 -#, c-format

2920 -msgid "dup2(%d,%d) failed"

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

2922 -

2923 -#: send-pack.c:150

2971 +#: send-pack.c:151

2972 #, c-format

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

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

2975

2928 -#: send-pack.c:152

2976 +#: send-pack.c:153

2977 #, c-format

2978 msgid "remote unpack failed: %s"

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

2980

2933 -#: send-pack.c:315

2981 +#: send-pack.c:316

2982 msgid "failed to sign the push certificate"

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

2984

2937 -#: send-pack.c:428

2985 +#: send-pack.c:429

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

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

2988

2941 -#: send-pack.c:430

2989 +#: send-pack.c:431

2990 msgid ""

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

2992 "signed push"

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

2994

2947 -#: send-pack.c:442

2995 +#: send-pack.c:443

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

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

2998

2951 -#: send-pack.c:447

2999 +#: send-pack.c:448

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

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

3002

2955 -#: sequencer.c:215

3003 +#: sequencer.c:216

3004 msgid "revert"

3005 msgstr "还原"

3006

2959 -#: sequencer.c:217

3007 +#: sequencer.c:218

3008 msgid "cherry-pick"

3009 msgstr "拣选"

3010

2963 -#: sequencer.c:219

3011 +#: sequencer.c:220

3012 msgid "rebase -i"

3013 msgstr "rebase -i"

3014

2967 -#: sequencer.c:221

3015 +#: sequencer.c:222

3016 #, c-format

3017 msgid "Unknown action: %d"

3018 msgstr "未知动作：%d"

3019

2972 -#: sequencer.c:278

3020 +#: sequencer.c:279

3021 msgid ""

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

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

@@ -2977,7 +3025,7 @@ msgstr ""

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

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

3027

2980 -#: sequencer.c:281

3028 +#: sequencer.c:282

3029 msgid ""

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

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

@@ -2986,63 +3034,63 @@ msgstr ""

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

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

3036

2989 -#: sequencer.c:294 sequencer.c:1682

3037 +#: sequencer.c:295 sequencer.c:1685

3038 #, c-format

3039 msgid "could not lock '%s'"

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

3041

2994 -#: sequencer.c:297 sequencer.c:1560 sequencer.c:1687 sequencer.c:1701

3042 +#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704

3043 #, c-format

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

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

3046

2999 -#: sequencer.c:301

3047 +#: sequencer.c:302

3048 #, c-format

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

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

3051

3004 -#: sequencer.c:305 sequencer.c:1565 sequencer.c:1689

3052 +#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692

3053 #, c-format

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

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

3056

3009 -#: sequencer.c:329 sequencer.c:814 sequencer.c:1586 builtin/am.c:257

3010 -#: builtin/commit.c:749 builtin/merge.c:1018

3057 +#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258

3058 +#: builtin/commit.c:750 builtin/merge.c:1017

3059 #, c-format

3060 msgid "could not read '%s'"

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

3062

3015 -#: sequencer.c:355

3063 +#: sequencer.c:356

3064 #, c-format

3065 msgid "your local changes would be overwritten by %s."

3066 msgstr "您的本地修改将被%s覆盖。"

3067

3020 -#: sequencer.c:359

3068 +#: sequencer.c:360

3069 msgid "commit your changes or stash them to proceed."

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

3070 +msgstr "提交您的修改或贮藏后再继续。"

3071

3024 -#: sequencer.c:388

3072 +#: sequencer.c:389

3073 #, c-format

3074 msgid "%s: fast-forward"

3075 msgstr "%s：快进"

3076

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

3030 -#. * "rebase -i".

3078 +#. "rebase -i".

3079 #.

3032 -#: sequencer.c:470

3080 +#: sequencer.c:472

3081 #, c-format

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

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

3084

3037 -#: sequencer.c:489

3085 +#: sequencer.c:491

3086 msgid "could not resolve HEAD commit\n"

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

3088

3041 -#: sequencer.c:509

3089 +#: sequencer.c:511

3090 msgid "unable to update cache tree\n"

3091 msgstr "不能更新缓存树\n"

3092

3045 -#: sequencer.c:592

3093 +#: sequencer.c:595

3094 #, c-format

3095 msgid ""

3096 "you have staged changes in your working tree\n"

@@ -3071,17 +3119,17 @@ msgstr ""

3119 "\n"

3120 " git rebase --continue\n"

3121

3074 -#: sequencer.c:694

3122 +#: sequencer.c:697

3123 #, c-format

3124 msgid "could not parse commit %s\n"

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

3126

3079 -#: sequencer.c:699

3127 +#: sequencer.c:702

3128 #, c-format

3129 msgid "could not parse parent commit %s\n"

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

3131

3084 -#: sequencer.c:821

3132 +#: sequencer.c:824

3133 #, c-format

3134 msgid ""

3135 "unexpected 1st line of squash message:\n"

@@ -3092,7 +3140,7 @@ msgstr ""

3140 "\n"

3141 "\t%.*s"

3142

3095 -#: sequencer.c:827

3143 +#: sequencer.c:830

3144 #, c-format

3145 msgid ""

3146 "invalid 1st line of squash message:\n"

@@ -3103,230 +3151,230 @@ msgstr ""

3151 "\n"

3152 "\t%.*s"

3153

3106 -#: sequencer.c:833 sequencer.c:858

3154 +#: sequencer.c:836 sequencer.c:861

3155 #, c-format

3156 msgid "This is a combination of %d commits."

3157 msgstr "这是一个 %d 个提交的组合。"

3158

3111 -#: sequencer.c:842

3159 +#: sequencer.c:845

3160 msgid "need a HEAD to fixup"

3161 msgstr "需要一个 HEAD 来修复"

3162

3115 -#: sequencer.c:844

3163 +#: sequencer.c:847

3164 msgid "could not read HEAD"

3165 msgstr "不能读取 HEAD"

3166

3119 -#: sequencer.c:846

3167 +#: sequencer.c:849

3168 msgid "could not read HEAD's commit message"

3169 msgstr "不能读取 HEAD 的提交说明"

3170

3123 -#: sequencer.c:852

3171 +#: sequencer.c:855

3172 #, c-format

3173 msgid "cannot write '%s'"

3174 msgstr "不能写 '%s'"

3175

3128 -#: sequencer.c:861 git-rebase--interactive.sh:445

3176 +#: sequencer.c:864 git-rebase--interactive.sh:445

3177 msgid "This is the 1st commit message:"

3178 msgstr "这是第一个提交说明："

3179

3132 -#: sequencer.c:869

3180 +#: sequencer.c:872

3181 #, c-format

3182 msgid "could not read commit message of %s"

3183 msgstr "不能读取 %s 的提交说明"

3184

3137 -#: sequencer.c:876

3185 +#: sequencer.c:879

3186 #, c-format

3187 msgid "This is the commit message #%d:"

3188 msgstr "这是提交说明 #%d："

3189

3142 -#: sequencer.c:881

3190 +#: sequencer.c:884

3191 #, c-format

3192 msgid "The commit message #%d will be skipped:"

3193 msgstr "提交说明 #%d 将被跳过："

3194

3147 -#: sequencer.c:886

3195 +#: sequencer.c:889

3196 #, c-format

3197 msgid "unknown command: %d"

3198 msgstr "未知命令：%d"

3199

3152 -#: sequencer.c:952

3200 +#: sequencer.c:955

3201 msgid "your index file is unmerged."

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

3203

3156 -#: sequencer.c:970

3204 +#: sequencer.c:973

3205 #, c-format

3206 msgid "commit %s is a merge but no -m option was given."

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

3208

3161 -#: sequencer.c:978

3209 +#: sequencer.c:981

3210 #, c-format

3211 msgid "commit %s does not have parent %d"

3212 msgstr "提交 %s 没有第 %d 个父提交"

3213

3166 -#: sequencer.c:982

3214 +#: sequencer.c:985

3215 #, c-format

3216 msgid "mainline was specified but commit %s is not a merge."

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

3218

3171 -#: sequencer.c:988

3219 +#: sequencer.c:991

3220 #, c-format

3221 msgid "cannot get commit message for %s"

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

3223

3224 #. TRANSLATORS: The first %s will be a "todo" command like

3225 #. "revert" or "pick", the second %s a SHA1.

3178 -#: sequencer.c:1009

3226 +#: sequencer.c:1012

3227 #, c-format

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

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

3230

3183 -#: sequencer.c:1071 sequencer.c:1827

3231 +#: sequencer.c:1075 sequencer.c:1830

3232 #, c-format

3233 msgid "could not rename '%s' to '%s'"

3234 msgstr "不能将 '%s' 重命名为 '%s'"

3235

3188 -#: sequencer.c:1122

3236 +#: sequencer.c:1126

3237 #, c-format

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

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

3240

3193 -#: sequencer.c:1123

3241 +#: sequencer.c:1127

3242 #, c-format

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

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

3245

3198 -#: sequencer.c:1165

3246 +#: sequencer.c:1169

3247 msgid "empty commit set passed"

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

3249

3202 -#: sequencer.c:1175

3250 +#: sequencer.c:1179

3251 #, c-format

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

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

3254

3207 -#: sequencer.c:1182

3255 +#: sequencer.c:1186

3256 #, c-format

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

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

3259

3212 -#: sequencer.c:1303

3260 +#: sequencer.c:1306

3261 #, c-format

3262 msgid "invalid line %d: %.*s"

3263 msgstr "无效行 %d：%.*s"

3264

3217 -#: sequencer.c:1311

3265 +#: sequencer.c:1314

3266 #, c-format

3267 msgid "cannot '%s' without a previous commit"

3268 msgstr "没有父提交的情况下不能 '%s'"

3269

3222 -#: sequencer.c:1344

3270 +#: sequencer.c:1347

3271 #, c-format

3272 msgid "could not read '%s'."

3273 msgstr "不能读取 '%s'。"

3274

3227 -#: sequencer.c:1356

3275 +#: sequencer.c:1359

3276 msgid "please fix this using 'git rebase --edit-todo'."

3277 msgstr "请用 'git rebase --edit-todo' 来修改。"

3278

3231 -#: sequencer.c:1358

3279 +#: sequencer.c:1361

3280 #, c-format

3281 msgid "unusable instruction sheet: '%s'"

3282 msgstr "不可用的指令清单：'%s'"

3283

3236 -#: sequencer.c:1363

3284 +#: sequencer.c:1366

3285 msgid "no commits parsed."

3286 msgstr "没有解析提交。"

3287

3240 -#: sequencer.c:1374

3288 +#: sequencer.c:1377

3289 msgid "cannot cherry-pick during a revert."

3290 msgstr "不能在回退中执行拣选。"

3291

3244 -#: sequencer.c:1376

3292 +#: sequencer.c:1379

3293 msgid "cannot revert during a cherry-pick."

3294 msgstr "不能在拣选中执行回退。"

3295

3248 -#: sequencer.c:1439

3296 +#: sequencer.c:1442

3297 #, c-format

3298 msgid "invalid key: %s"

3299 msgstr "无效键名：%s"

3300

3253 -#: sequencer.c:1442

3301 +#: sequencer.c:1445

3302 #, c-format

3303 msgid "invalid value for %s: %s"

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

3305

3258 -#: sequencer.c:1499

3306 +#: sequencer.c:1502

3307 #, c-format

3308 msgid "malformed options sheet: '%s'"

3309 msgstr "非法的选项清单：'%s'"

3310

3263 -#: sequencer.c:1537

3311 +#: sequencer.c:1540

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

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

3314

3267 -#: sequencer.c:1538

3315 +#: sequencer.c:1541

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

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

3318

3271 -#: sequencer.c:1541

3319 +#: sequencer.c:1544

3320 #, c-format

3321 msgid "could not create sequencer directory '%s'"

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

3323

3276 -#: sequencer.c:1555

3324 +#: sequencer.c:1558

3325 msgid "could not lock HEAD"

3326 msgstr "不能锁定 HEAD"

3327

3280 -#: sequencer.c:1611 sequencer.c:2181

3328 +#: sequencer.c:1614 sequencer.c:2188

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

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

3331

3284 -#: sequencer.c:1613

3332 +#: sequencer.c:1616

3333 msgid "cannot resolve HEAD"

3334 msgstr "不能解析 HEAD"

3335

3288 -#: sequencer.c:1615 sequencer.c:1649

3336 +#: sequencer.c:1618 sequencer.c:1652

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

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

3339

3292 -#: sequencer.c:1635 builtin/grep.c:910

3340 +#: sequencer.c:1638 builtin/grep.c:929

3341 #, c-format

3342 msgid "cannot open '%s'"

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

3344

3297 -#: sequencer.c:1637

3345 +#: sequencer.c:1640

3346 #, c-format

3347 msgid "cannot read '%s': %s"

3348 msgstr "不能读取 '%s'：%s"

3349

3302 -#: sequencer.c:1638

3350 +#: sequencer.c:1641

3351 msgid "unexpected end of file"

3352 msgstr "意外的文件结束"

3353

3306 -#: sequencer.c:1644

3354 +#: sequencer.c:1647

3355 #, c-format

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

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

3358

3311 -#: sequencer.c:1655

3359 +#: sequencer.c:1658

3360 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

3361 msgstr "您好像移动了 HEAD。未能回退，检查您的 HEAD！"

3362

3315 -#: sequencer.c:1792 sequencer.c:2080

3363 +#: sequencer.c:1795 sequencer.c:2086

3364 msgid "cannot read HEAD"

3365 msgstr "不能读取 HEAD"

3366

3319 -#: sequencer.c:1832 builtin/difftool.c:616

3367 +#: sequencer.c:1835 builtin/difftool.c:633

3368 #, c-format

3369 msgid "could not copy '%s' to '%s'"

3370 msgstr "不能拷贝 '%s' 至 '%s'"

3371

3324 -#: sequencer.c:1848

3372 +#: sequencer.c:1851

3373 msgid "could not read index"

3374 msgstr "不能读取索引"

3375

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

3329 -#: sequencer.c:1853

3377 +#: sequencer.c:1856

3378 #, c-format

3379 msgid ""

3380 "execution failed: %s\n"

@@ -3341,11 +3389,11 @@ msgstr ""

3389 " git rebase --continue\n"

3390 "\n"

3391

3344 -#: sequencer.c:1859

3392 +#: sequencer.c:1862

3393 msgid "and made changes to the index and/or the working tree\n"

3394 msgstr "并且修改索引和/或工作区\n"

3395

3348 -#: sequencer.c:1865

3396 +#: sequencer.c:1868

3397 #, c-format

3398 msgid ""

3399 "execution succeeded: %s\n"

@@ -3357,22 +3405,22 @@ msgid ""

3405 msgstr ""

3406 "执行成功：%s\n"

3407 "但是在索引和/或工作区中存在变更\n"

3360 -"提交或暂存修改，然后运行\n"

3408 +"提交或贮藏修改，然后运行\n"

3409 "\n"

3410 " git rebase --continue\n"

3411 "\n"

3412

3365 -#: sequencer.c:1920 git-rebase.sh:169

3413 +#: sequencer.c:1925

3414 #, c-format

3367 -msgid "Applied autostash."

3368 -msgstr "成功应用 autostash。"

3415 +msgid "Applied autostash.\n"

3416 +msgstr "已应用 autostash。\n"

3417

3370 -#: sequencer.c:1932

3418 +#: sequencer.c:1937

3419 #, c-format

3420 msgid "cannot store %s"

3421 msgstr "不能存储 %s"

3422

3375 -#: sequencer.c:1934 git-rebase.sh:173

3423 +#: sequencer.c:1940 git-rebase.sh:173

3424 #, c-format

3425 msgid ""

3426 "Applying autostash resulted in conflicts.\n"

@@ -3380,60 +3428,60 @@ msgid ""

3428 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"

3429 msgstr ""

3430 "应用 autostash 导致冲突。\n"

3383 -"您的修改安全地保存在 stash 中。\n"

3431 +"您的修改安全地保存在贮藏区中。\n"

3432 "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"

3433

3386 -#: sequencer.c:2016

3434 +#: sequencer.c:2022

3435 #, c-format

3436 msgid "Stopped at %s... %.*s\n"

3437 msgstr "停止在 %s... %.*s\n"

3438

3391 -#: sequencer.c:2058

3439 +#: sequencer.c:2064

3440 #, c-format

3441 msgid "unknown command %d"

3442 msgstr "未知命令 %d"

3443

3396 -#: sequencer.c:2088

3444 +#: sequencer.c:2094

3445 msgid "could not read orig-head"

3446 msgstr "不能读取 orig-head"

3447

3400 -#: sequencer.c:2092

3448 +#: sequencer.c:2099

3449 msgid "could not read 'onto'"

3450 msgstr "不能读取 'onto'"

3451

3404 -#: sequencer.c:2099

3452 +#: sequencer.c:2106

3453 #, c-format

3454 msgid "could not update %s"

3455 msgstr "不能更新 %s"

3456

3409 -#: sequencer.c:2106

3457 +#: sequencer.c:2113

3458 #, c-format

3459 msgid "could not update HEAD to %s"

3460 msgstr "不能更新 HEAD 为 %s"

3461

3414 -#: sequencer.c:2190

3462 +#: sequencer.c:2197

3463 msgid "cannot rebase: You have unstaged changes."

3464 msgstr "不能变基：您有未暂存的变更。"

3465

3418 -#: sequencer.c:2195

3466 +#: sequencer.c:2202

3467 msgid "could not remove CHERRY_PICK_HEAD"

3468 msgstr "不能删除 CHERRY_PICK_HEAD"

3469

3422 -#: sequencer.c:2204

3470 +#: sequencer.c:2211

3471 msgid "cannot amend non-existing commit"

3472 msgstr "不能修补不存在的提交"

3473

3426 -#: sequencer.c:2206

3474 +#: sequencer.c:2213

3475 #, c-format

3476 msgid "invalid file: '%s'"

3477 msgstr "无效文件：'%s'"

3478

3431 -#: sequencer.c:2208

3479 +#: sequencer.c:2215

3480 #, c-format

3481 msgid "invalid contents: '%s'"

3482 msgstr "无效内容：'%s'"

3483

3436 -#: sequencer.c:2211

3484 +#: sequencer.c:2218

3485 msgid ""

3486 "\n"

3487 "You have uncommitted changes in your working tree. Please, commit them\n"

@@ -3442,25 +3490,25 @@ msgstr ""

3490 "\n"

3491 "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"

3492

3445 -#: sequencer.c:2221

3493 +#: sequencer.c:2228

3494 msgid "could not commit staged changes."

3495 msgstr "不能提交暂存的修改。"

3496

3449 -#: sequencer.c:2301

3497 +#: sequencer.c:2308

3498 #, c-format

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

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

3501

3454 -#: sequencer.c:2305

3502 +#: sequencer.c:2312

3503 #, c-format

3504 msgid "%s: bad revision"

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

3506

3459 -#: sequencer.c:2338

3507 +#: sequencer.c:2345

3508 msgid "can't revert as initial commit"

3509 msgstr "不能作为初始提交回退"

3510

3463 -#: setup.c:165

3511 +#: setup.c:171

3512 #, c-format

3513 msgid ""

3514 "%s: no such path in the working tree.\n"

@@ -3469,7 +3517,7 @@ msgstr ""

3517 "%s：工作区中无此路径。\n"

3518 "使用命令 'git <command> -- <path>...' 来指定本地不存在的路径。"

3519

3472 -#: setup.c:178

3520 +#: setup.c:184

3521 #, c-format

3522 msgid ""

3523 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"

@@ -3480,7 +3528,7 @@ msgstr ""

3528 "使用 '--' 来分隔版本和路径，例如：\n"

3529 "'git <command> [<revision>...] -- [<file>...]'"

3530

3483 -#: setup.c:228

3531 +#: setup.c:252

3532 #, c-format

3533 msgid ""

3534 "ambiguous argument '%s': both revision and filename\n"

@@ -3491,34 +3539,34 @@ msgstr ""

3539 "使用 '--' 来分隔版本和路径，例如：\n"

3540 "'git <command> [<revision>...] -- [<file>...]'"

3541

3494 -#: setup.c:475

3542 +#: setup.c:504

3543 #, c-format

3544 msgid "Expected git repo version <= %d, found %d"

3545 msgstr "期望 git 仓库版本 <= %d，却得到 %d"

3546

3499 -#: setup.c:483

3547 +#: setup.c:512

3548 msgid "unknown repository extensions found:"

3549 msgstr "发现未知的仓库扩展："

3550

3503 -#: setup.c:776

3551 +#: setup.c:810

3552 #, c-format

3553 msgid "Not a git repository (or any of the parent directories): %s"

3554 msgstr "不是一个 git 仓库（或者任何父目录）：%s"

3555

3508 -#: setup.c:778 builtin/index-pack.c:1646

3556 +#: setup.c:812 builtin/index-pack.c:1652

3557 msgid "Cannot come back to cwd"

3558 msgstr "无法返回当前工作目录"

3559

3512 -#: setup.c:1010

3560 +#: setup.c:1050

3561 msgid "Unable to read current working directory"

3562 msgstr "不能读取当前工作目录"

3563

3516 -#: setup.c:1022 setup.c:1028

3564 +#: setup.c:1062 setup.c:1068

3565 #, c-format

3566 msgid "Cannot change to '%s'"

3567 msgstr "不能切换到 '%s'"

3568

3521 -#: setup.c:1041

3569 +#: setup.c:1081

3570 #, c-format

3571 msgid ""

3572 "Not a git repository (or any parent up to mount point %s)\n"

@@ -3527,7 +3575,7 @@ msgstr ""

3575 "不是一个 git 仓库（或者向上递归至挂载点 %s 的任何祖先目录）\n"

3576 "停止在文件系统边界（未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM）。"

3577

3530 -#: setup.c:1106

3578 +#: setup.c:1173

3579 #, c-format

3580 msgid ""

3581 "Problem with core.sharedRepository filemode value (0%.3o).\n"

@@ -3536,27 +3584,27 @@ msgstr ""

3584 "参数 core.sharedRepository 的文件权限值有错（0%.3o）。\n"

3585 "文件属主必须始终拥有读写权限。"

3586

3539 -#: sha1_file.c:559

3587 +#: sha1_file.c:560

3588 #, c-format

3589 msgid "path '%s' does not exist"

3590 msgstr "路径 '%s' 不存在"

3591

3544 -#: sha1_file.c:585

3592 +#: sha1_file.c:586

3593 #, c-format

3594 msgid "reference repository '%s' as a linked checkout is not supported yet."

3595 msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"

3596

3549 -#: sha1_file.c:591

3597 +#: sha1_file.c:592

3598 #, c-format

3599 msgid "reference repository '%s' is not a local repository."

3600 msgstr "参考仓库 '%s' 不是一个本地仓库。"

3601

3554 -#: sha1_file.c:597

3602 +#: sha1_file.c:598

3603 #, c-format

3604 msgid "reference repository '%s' is shallow"

3605 msgstr "参考仓库 '%s' 是一个浅克隆"

3606

3559 -#: sha1_file.c:605

3607 +#: sha1_file.c:606

3608 #, c-format

3609 msgid "reference repository '%s' is grafted"

3610 msgstr "参考仓库 '%s' 已被嫁接"

@@ -3565,26 +3613,26 @@ msgstr "参考仓库 '%s' 已被嫁接"

3613 msgid "offset before end of packfile (broken .idx?)"

3614 msgstr "偏移量在包文件结束之前（损坏的 .idx？）"

3615

3568 -#: sha1_file.c:2721

3616 +#: sha1_file.c:2729

3617 #, c-format

3618 msgid "offset before start of pack index for %s (corrupt index?)"

3619 msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）"

3620

3573 -#: sha1_file.c:2725

3621 +#: sha1_file.c:2733

3622 #, c-format

3623 msgid "offset beyond end of pack index for %s (truncated index?)"

3624 msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）"

3625

3578 -#: sha1_name.c:409

3626 +#: sha1_name.c:419

3627 #, c-format

3628 msgid "short SHA1 %s is ambiguous"

3629 msgstr "短 SHA1 %s 存在歧义"

3630

3583 -#: sha1_name.c:420

3631 +#: sha1_name.c:430

3632 msgid "The candidates are:"

3633 msgstr "候选者有："

3634

3587 -#: sha1_name.c:580

3635 +#: sha1_name.c:589

3636 msgid ""

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

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

@@ -3605,71 +3653,81 @@ msgstr ""

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

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

3655

3608 -#: submodule.c:67 submodule.c:101

3656 +#: submodule.c:70 submodule.c:104

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

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

3659

3612 -#: submodule.c:71 submodule.c:105

3660 +#: submodule.c:74 submodule.c:108

3661 #, c-format

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

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

3664

3617 -#: submodule.c:79

3665 +#: submodule.c:82

3666 #, c-format

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

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

3669

3622 -#: submodule.c:112

3670 +#: submodule.c:115

3671 #, c-format

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

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

3674

3627 -#: submodule.c:123

3675 +#: submodule.c:126

3676 msgid "staging updated .gitmodules failed"

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

3678

3631 -#: submodule.c:161

3679 +#: submodule.c:165

3680 msgid "negative values not allowed for submodule.fetchJobs"

3681 msgstr "submodule.fetchJobs 不允许为负值"

3682

3635 -#: submodule.c:1194

3683 +#: submodule.c:376

3684 +#, c-format

3685 +msgid "in unpopulated submodule '%s'"

3686 +msgstr "位于未检出的子模组 '%s'"

3687 +

3688 +#: submodule.c:407

3689 +#, c-format

3690 +msgid "Pathspec '%s' is in submodule '%.*s'"

3691 +msgstr "路径规格 '%s' 在子模组 '%.*s' 中"

3692 +

3693 +#: submodule.c:1337

3694 #, c-format

3695 msgid "'%s' not recognized as a git repository"

3696 msgstr "无法将 '%s' 识别为一个 git 仓库"

3697

3640 -#: submodule.c:1332

3698 +#: submodule.c:1475

3699 #, c-format

3700 msgid "could not start 'git status' in submodule '%s'"

3701 msgstr "无法在子模组 '%s' 中启动 'git status'"

3702

3645 -#: submodule.c:1345

3703 +#: submodule.c:1488

3704 #, c-format

3705 msgid "could not run 'git status' in submodule '%s'"

3706 msgstr "无法在子模组 '%s' 中执行 'git status'"

3707

3650 -#: submodule.c:1421

3708 +#: submodule.c:1581

3709 #, c-format

3710 msgid "submodule '%s' has dirty index"

3711 msgstr "子模组 '%s' 中有脏索引"

3712

3655 -#: submodule.c:1678

3713 +#: submodule.c:1845

3714 #, c-format

3715 msgid ""

3716 "relocate_gitdir for submodule '%s' with more than one worktree not supported"

3717 msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir"

3718

3661 -#: submodule.c:1690 submodule.c:1746

3719 +#: submodule.c:1857 submodule.c:1913

3720 #, c-format

3721 msgid "could not lookup name for submodule '%s'"

3722 msgstr "不能查询子模组 '%s' 的名称"

3723

3666 -#: submodule.c:1694 builtin/submodule--helper.c:678

3724 +#: submodule.c:1861 builtin/submodule--helper.c:678

3725 #: builtin/submodule--helper.c:688

3726 #, c-format

3727 msgid "could not create directory '%s'"

3728 msgstr "不能创建目录 '%s'"

3729

3672 -#: submodule.c:1697

3730 +#: submodule.c:1864

3731 #, c-format

3732 msgid ""

3733 "Migrating git directory of '%s%s' from\n"

@@ -3680,101 +3738,101 @@ msgstr ""

3738 "'%s' 迁移至\n"

3739 "'%s'\n"

3740

3683 -#: submodule.c:1781

3741 +#: submodule.c:1948

3742 #, c-format

3743 msgid "could not recurse into submodule '%s'"

3744 msgstr "无法递归进子模组路径 '%s'"

3745

3688 -#: submodule.c:1825

3746 +#: submodule.c:1992

3747 msgid "could not start ls-files in .."

3748 msgstr "无法在 .. 中启动 ls-files"

3749

3692 -#: submodule.c:1845

3750 +#: submodule.c:2012

3751 msgid "BUG: returned path string doesn't match cwd?"

3752 msgstr "BUG：返回的路径和当前路径不匹配？"

3753

3696 -#: submodule.c:1864

3754 +#: submodule.c:2031

3755 #, c-format

3756 msgid "ls-tree returned unexpected return code %d"

3757 msgstr "ls-tree 返回未知返回值 %d"

3758

3701 -#: submodule-config.c:380

3759 +#: submodule-config.c:420

3760 #, c-format

3761 msgid "invalid value for %s"

3762 msgstr "%s 的值无效"

3763

3706 -#: trailer.c:240

3764 +#: trailer.c:241

3765 #, c-format

3766 msgid "running trailer command '%s' failed"

3767 msgstr "执行 trailer 命令 '%s' 失败"

3768

3711 -#: trailer.c:473 trailer.c:477 trailer.c:481 trailer.c:535 trailer.c:539

3712 -#: trailer.c:543

3769 +#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540

3770 +#: trailer.c:544

3771 #, c-format

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

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

3774

3717 -#: trailer.c:525 trailer.c:530 builtin/remote.c:289

3775 +#: trailer.c:526 trailer.c:531 builtin/remote.c:290

3776 #, c-format

3777 msgid "more than one %s"

3778 msgstr "多于一个 %s"

3779

3722 -#: trailer.c:702

3780 +#: trailer.c:703

3781 #, c-format

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

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

3784

3727 -#: trailer.c:722

3785 +#: trailer.c:723

3786 #, c-format

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

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

3789

3732 -#: trailer.c:725

3790 +#: trailer.c:726

3791 msgid "could not read from stdin"

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

3793

3736 -#: trailer.c:949 builtin/am.c:44

3794 +#: trailer.c:950 builtin/am.c:45

3795 #, c-format

3796 msgid "could not stat %s"

3797 msgstr "不能对 %s 调用 stat"

3798

3741 -#: trailer.c:951

3799 +#: trailer.c:952

3800 #, c-format

3801 msgid "file %s is not a regular file"

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

3803

3746 -#: trailer.c:953

3804 +#: trailer.c:954

3805 #, c-format

3806 msgid "file %s is not writable by user"

3807 msgstr "文件 %s 用户不可写"

3808

3751 -#: trailer.c:965

3809 +#: trailer.c:966

3810 msgid "could not open temporary file"

3811 msgstr "不能打开临时文件"

3812

3755 -#: trailer.c:1001

3813 +#: trailer.c:1002

3814 #, c-format

3815 msgid "could not rename temporary file to %s"

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

3817

3760 -#: transport.c:62

3818 +#: transport.c:63

3819 #, c-format

3820 msgid "Would set upstream of '%s' to '%s' of '%s'\n"

3821 msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"

3822

3765 -#: transport.c:151

3823 +#: transport.c:152

3824 #, c-format

3825 msgid "transport: invalid depth option '%s'"

3826 msgstr "传输：无效的深度选项 '%s'"

3827

3770 -#: transport.c:889

3828 +#: transport.c:890

3829 #, c-format

3830 msgid ""

3831 "The following submodule paths contain changes that can\n"

3832 "not be found on any remote:\n"

3833 msgstr "下列子模组路径所包含的修改在任何远程源中都找不到：\n"

3834

3777 -#: transport.c:893

3835 +#: transport.c:894

3836 #, c-format

3837 msgid ""

3838 "\n"

@@ -3801,11 +3859,11 @@ msgstr ""

3859 "以推送至远程。\n"

3860 "\n"

3861

3804 -#: transport.c:901

3862 +#: transport.c:902

3863 msgid "Aborting."

3864 msgstr "正在终止。"

3865

3808 -#: transport-helper.c:1080

3866 +#: transport-helper.c:1071

3867 #, c-format

3868 msgid "Could not read ref %s"

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

@@ -3826,16 +3884,16 @@ msgstr "树对象条目中空的文件名"

3884 msgid "too-short tree file"

3885 msgstr "太短的树文件"

3886

3829 -#: unpack-trees.c:104

3887 +#: unpack-trees.c:105

3888 #, c-format

3889 msgid ""

3890 "Your local changes to the following files would be overwritten by checkout:\n"

3891 "%%sPlease commit your changes or stash them before you switch branches."

3892 msgstr ""

3893 "您对下列文件的本地修改将被检出操作覆盖：\n"

3836 -"%%s请在切换分支前提交您的修改或者保存进度。"

3894 +"%%s请在切换分支前提交或贮藏您的修改。"

3895

3838 -#: unpack-trees.c:106

3896 +#: unpack-trees.c:107

3897 #, c-format

3898 msgid ""

3899 "Your local changes to the following files would be overwritten by checkout:\n"

@@ -3844,16 +3902,16 @@ msgstr ""

3902 "您对下列文件的本地修改将被检出操作覆盖：\n"

3903 "%%s"

3904

3847 -#: unpack-trees.c:109

3905 +#: unpack-trees.c:110

3906 #, c-format

3907 msgid ""

3908 "Your local changes to the following files would be overwritten by merge:\n"

3909 "%%sPlease commit your changes or stash them before you merge."

3910 msgstr ""

3911 "您对下列文件的本地修改将被合并操作覆盖：\n"

3854 -"%%s请在合并前提交您的修改或者保存进度。"

3912 +"%%s请在合并前提交或贮藏您的修改。"

3913

3856 -#: unpack-trees.c:111

3914 +#: unpack-trees.c:112

3915 #, c-format

3916 msgid ""

3917 "Your local changes to the following files would be overwritten by merge:\n"

@@ -3862,16 +3920,16 @@ msgstr ""

3920 "您对下列文件的本地修改将被合并操作覆盖：\n"

3921 "%%s"

3922

3865 -#: unpack-trees.c:114

3923 +#: unpack-trees.c:115

3924 #, c-format

3925 msgid ""

3926 "Your local changes to the following files would be overwritten by %s:\n"

3927 "%%sPlease commit your changes or stash them before you %s."

3928 msgstr ""

3929 "您对下列文件的本地修改将被 %s 覆盖：\n"

3872 -"%%s请在 %s 之前提交您的修改或者保存进度。"

3930 +"%%s请在 %s 之前提交或贮藏您的修改。"

3931

3874 -#: unpack-trees.c:116

3932 +#: unpack-trees.c:117

3933 #, c-format

3934 msgid ""

3935 "Your local changes to the following files would be overwritten by %s:\n"

@@ -3880,7 +3938,7 @@ msgstr ""

3938 "您对下列文件的本地修改将被 %s 覆盖：\n"

3939 "%%s"

3940

3883 -#: unpack-trees.c:121

3941 +#: unpack-trees.c:122

3942 #, c-format

3943 msgid ""

3944 "Updating the following directories would lose untracked files in them:\n"

@@ -3889,7 +3947,7 @@ msgstr ""

3947 "更新如下目录将会丢失其中未跟踪的文件：\n"

3948 "%s"

3949

3892 -#: unpack-trees.c:125

3950 +#: unpack-trees.c:126

3951 #, c-format

3952 msgid ""

3953 "The following untracked working tree files would be removed by checkout:\n"

@@ -3898,7 +3956,7 @@ msgstr ""

3956 "工作区中下列未跟踪的文件将会因为检出操作而被删除：\n"

3957 "%%s请在切换分支之前移动或删除。"

3958

3901 -#: unpack-trees.c:127

3959 +#: unpack-trees.c:128

3960 #, c-format

3961 msgid ""

3962 "The following untracked working tree files would be removed by checkout:\n"

@@ -3907,7 +3965,7 @@ msgstr ""

3965 "工作区中下列未跟踪的文件将会因为检出操作而被删除：\n"

3966 "%%s"

3967

3910 -#: unpack-trees.c:130

3968 +#: unpack-trees.c:131

3969 #, c-format

3970 msgid ""

3971 "The following untracked working tree files would be removed by merge:\n"

@@ -3916,7 +3974,7 @@ msgstr ""

3974 "工作区中下列未跟踪的文件将会因为合并操作而被删除：\n"

3975 "%%s请在合并前移动或删除。"

3976

3919 -#: unpack-trees.c:132

3977 +#: unpack-trees.c:133

3978 #, c-format

3979 msgid ""

3980 "The following untracked working tree files would be removed by merge:\n"

@@ -3925,7 +3983,7 @@ msgstr ""

3983 "工作区中下列未跟踪的文件将会因为合并操作而被删除：\n"

3984 "%%s"

3985

3928 -#: unpack-trees.c:135

3986 +#: unpack-trees.c:136

3987 #, c-format

3988 msgid ""

3989 "The following untracked working tree files would be removed by %s:\n"

@@ -3934,7 +3992,7 @@ msgstr ""

3992 "工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n"

3993 "%%s请在 %s 前移动或删除。"

3994

3937 -#: unpack-trees.c:137

3995 +#: unpack-trees.c:138

3996 #, c-format

3997 msgid ""

3998 "The following untracked working tree files would be removed by %s:\n"

@@ -3943,7 +4001,7 @@ msgstr ""

4001 "工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n"

4002 "%%s"

4003

3946 -#: unpack-trees.c:142

4004 +#: unpack-trees.c:143

4005 #, c-format

4006 msgid ""

4007 "The following untracked working tree files would be overwritten by "

@@ -3953,7 +4011,7 @@ msgstr ""

4011 "工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n"

4012 "%%s请在切换分支前移动或删除。"

4013

3956 -#: unpack-trees.c:144

4014 +#: unpack-trees.c:145

4015 #, c-format

4016 msgid ""

4017 "The following untracked working tree files would be overwritten by "

@@ -3963,7 +4021,7 @@ msgstr ""

4021 "工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n"

4022 "%%s"

4023

3966 -#: unpack-trees.c:147

4024 +#: unpack-trees.c:148

4025 #, c-format

4026 msgid ""

4027 "The following untracked working tree files would be overwritten by merge:\n"

@@ -3972,7 +4030,7 @@ msgstr ""

4030 "工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n"

4031 "%%s请在合并前移动或删除。"

4032

3975 -#: unpack-trees.c:149

4033 +#: unpack-trees.c:150

4034 #, c-format

4035 msgid ""

4036 "The following untracked working tree files would be overwritten by merge:\n"

@@ -3981,7 +4039,7 @@ msgstr ""

4039 "工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n"

4040 "%%s"

4041

3984 -#: unpack-trees.c:152

4042 +#: unpack-trees.c:153

4043 #, c-format

4044 msgid ""

4045 "The following untracked working tree files would be overwritten by %s:\n"

@@ -3990,7 +4048,7 @@ msgstr ""

4048 "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n"

4049 "%%s请在 %s 前移动或删除。"

4050

3993 -#: unpack-trees.c:154

4051 +#: unpack-trees.c:155

4052 #, c-format

4053 msgid ""

4054 "The following untracked working tree files would be overwritten by %s:\n"

@@ -3999,12 +4057,12 @@ msgstr ""

4057 "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n"

4058 "%%s"

4059

4002 -#: unpack-trees.c:161

4060 +#: unpack-trees.c:162

4061 #, c-format

4062 msgid "Entry '%s' overlaps with '%s'. Cannot bind."

4063 msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"

4064

4007 -#: unpack-trees.c:164

4065 +#: unpack-trees.c:165

4066 #, c-format

4067 msgid ""

4068 "Cannot update sparse checkout: the following entries are not up-to-date:\n"

@@ -4013,7 +4071,7 @@ msgstr ""

4071 "无法更新稀疏检出：如下条目不是最新：\n"

4072 "%s"

4073

4016 -#: unpack-trees.c:166

4074 +#: unpack-trees.c:167

4075 #, c-format

4076 msgid ""

4077 "The following working tree files would be overwritten by sparse checkout "

@@ -4023,7 +4081,7 @@ msgstr ""

4081 "工作区中下列文件将被稀疏检出更新所覆盖：\n"

4082 "%s"

4083

4026 -#: unpack-trees.c:168

4084 +#: unpack-trees.c:169

4085 #, c-format

4086 msgid ""

4087 "The following working tree files would be removed by sparse checkout "

@@ -4033,7 +4091,7 @@ msgstr ""

4091 "工作区中下列文件将被稀疏检出更新所删除：\n"

4092 "%s"

4093

4036 -#: unpack-trees.c:170

4094 +#: unpack-trees.c:171

4095 #, c-format

4096 msgid ""

4097 "Cannot update submodule:\n"

@@ -4042,17 +4100,17 @@ msgstr ""

4100 "无法更新子模组：\n"

4101 "%s"

4102

4045 -#: unpack-trees.c:247

4103 +#: unpack-trees.c:248

4104 #, c-format

4105 msgid "Aborting\n"

4106 msgstr "终止中\n"

4107

4050 -#: unpack-trees.c:272

4108 +#: unpack-trees.c:277

4109 #, c-format

4110 msgid "submodule update strategy not supported for submodule '%s'"

4111 msgstr "子模组 %s 不支持子模组更新策略"

4112

4055 -#: unpack-trees.c:340

4113 +#: unpack-trees.c:346

4114 msgid "Checking out files"

4115 msgstr "正在检出文件"

4116

@@ -4085,196 +4143,202 @@ msgstr "无效的端口号"

4143 msgid "invalid '..' path segment"

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

4145

4088 -#: worktree.c:285

4146 +#: worktree.c:245

4147 #, c-format

4148 msgid "failed to read '%s'"

4149 msgstr "无法读取 '%s'"

4150

4093 -#: wrapper.c:222 wrapper.c:392

4151 +#: wrapper.c:223 wrapper.c:393

4152 #, c-format

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

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

4155

4098 -#: wrapper.c:224 wrapper.c:394 builtin/am.c:766

4156 +#: wrapper.c:225 wrapper.c:395 builtin/am.c:766

4157 #, c-format

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

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

4160

4103 -#: wrapper.c:226 wrapper.c:396 builtin/am.c:318 builtin/am.c:757

4104 -#: builtin/am.c:849 builtin/commit.c:1700 builtin/merge.c:1015

4105 -#: builtin/pull.c:341

4161 +#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757

4162 +#: builtin/am.c:849 builtin/merge.c:1014

4163 #, c-format

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

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

4166

4110 -#: wrapper.c:581 wrapper.c:602

4167 +#: wrapper.c:424 wrapper.c:624

4168 #, c-format

4169 msgid "unable to access '%s'"

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

4171

4115 -#: wrapper.c:610

4172 +#: wrapper.c:632

4173 msgid "unable to get current working directory"

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

4175

4119 -#: wrapper.c:634

4176 +#: wrapper.c:656

4177 #, c-format

4178 msgid "could not write to %s"

4179 msgstr "不能写入 %s"

4180

4124 -#: wrapper.c:636

4181 +#: wrapper.c:658

4182 #, c-format

4183 msgid "could not close %s"

4184 msgstr "不能关闭 %s"

4185

4129 -#: wt-status.c:151

4186 +#: wt-status.c:152

4187 msgid "Unmerged paths:"

4188 msgstr "未合并的路径："

4189

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

4134 -#: wt-status.c:178 wt-status.c:205

4191 +#: wt-status.c:179 wt-status.c:206

4192 #, c-format

4193 msgid " (use \"git reset %s <file>...\" to unstage)"

4194 msgstr " （使用 \"git reset %s <文件>...\" 以取消暂存）"

4195

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

4140 -#: wt-status.c:180 wt-status.c:207

4197 +#: wt-status.c:181 wt-status.c:208

4198 msgid " (use \"git rm --cached <file>...\" to unstage)"

4199 msgstr " （使用 \"git rm --cached <文件>...\" 以取消暂存）"

4200

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

4145 -#: wt-status.c:184

4202 +#: wt-status.c:185

4203 msgid " (use \"git add <file>...\" to mark resolution)"

4204 msgstr " （使用 \"git add <文件>...\" 标记解决方案）"

4205

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

4150 -#: wt-status.c:186 wt-status.c:190

4207 +#: wt-status.c:187 wt-status.c:191

4208 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"

4209 msgstr " （酌情使用 \"git add/rm <文件>...\" 标记解决方案）"

4210

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

4155 -#: wt-status.c:188

4212 +#: wt-status.c:189

4213 msgid " (use \"git rm <file>...\" to mark resolution)"

4214 msgstr " （使用 \"git rm <文件>...\" 标记解决方案）"

4215

4159 -#: wt-status.c:199 wt-status.c:958

4216 +#: wt-status.c:200 wt-status.c:981

4217 msgid "Changes to be committed:"

4218 msgstr "要提交的变更："

4219

4163 -#: wt-status.c:217 wt-status.c:967

4220 +#: wt-status.c:218 wt-status.c:990

4221 msgid "Changes not staged for commit:"

4222 msgstr "尚未暂存以备提交的变更："

4223

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

4168 -#: wt-status.c:221

4225 +#: wt-status.c:222

4226 msgid " (use \"git add <file>...\" to update what will be committed)"

4227 msgstr " （使用 \"git add <文件>...\" 更新要提交的内容）"

4228

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

4173 -#: wt-status.c:223

4230 +#: wt-status.c:224

4231 msgid " (use \"git add/rm <file>...\" to update what will be committed)"

4232 msgstr " （使用 \"git add/rm <文件>...\" 更新要提交的内容）"

4233

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

4178 -#: wt-status.c:224

4235 +#: wt-status.c:225

4236 msgid ""

4237 " (use \"git checkout -- <file>...\" to discard changes in working directory)"

4238 msgstr " （使用 \"git checkout -- <文件>...\" 丢弃工作区的改动）"

4239

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

4184 -#: wt-status.c:226

4241 +#: wt-status.c:227

4242 msgid " (commit or discard the untracked or modified content in submodules)"

4243 msgstr " （提交或丢弃子模组中未跟踪或修改的内容）"

4244

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

4189 -#: wt-status.c:238

4246 +#: wt-status.c:239

4247 #, c-format

4248 msgid " (use \"git %s <file>...\" to include in what will be committed)"

4249 msgstr " （使用 \"git %s <文件>...\" 以包含要提交的内容）"

4250

4194 -#: wt-status.c:253

4251 +#: wt-status.c:254

4252 msgid "both deleted:"

4253 msgstr "双方删除："

4254

4198 -#: wt-status.c:255

4255 +#: wt-status.c:256

4256 msgid "added by us:"

4257 msgstr "由我们添加："

4258

4202 -#: wt-status.c:257

4259 +#: wt-status.c:258

4260 msgid "deleted by them:"

4261 msgstr "由他们删除："

4262

4206 -#: wt-status.c:259

4263 +#: wt-status.c:260

4264 msgid "added by them:"

4265 msgstr "由他们添加："

4266

4210 -#: wt-status.c:261

4267 +#: wt-status.c:262

4268 msgid "deleted by us:"

4269 msgstr "由我们删除："

4270

4214 -#: wt-status.c:263

4271 +#: wt-status.c:264

4272 msgid "both added:"

4273 msgstr "双方添加："

4274

4218 -#: wt-status.c:265

4275 +#: wt-status.c:266

4276 msgid "both modified:"

4277 msgstr "双方修改："

4278

4222 -#: wt-status.c:275

4279 +#: wt-status.c:276

4280 msgid "new file:"

4281 msgstr "新文件："

4282

4226 -#: wt-status.c:277

4283 +#: wt-status.c:278

4284 msgid "copied:"

4285 msgstr "拷贝："

4286

4230 -#: wt-status.c:279

4287 +#: wt-status.c:280

4288 msgid "deleted:"

4289 msgstr "删除："

4290

4234 -#: wt-status.c:281

4291 +#: wt-status.c:282

4292 msgid "modified:"

4293 msgstr "修改："

4294

4238 -#: wt-status.c:283

4295 +#: wt-status.c:284

4296 msgid "renamed:"

4297 msgstr "重命名："

4298

4242 -#: wt-status.c:285

4299 +#: wt-status.c:286

4300 msgid "typechange:"

4301 msgstr "类型变更："

4302

4246 -#: wt-status.c:287

4303 +#: wt-status.c:288

4304 msgid "unknown:"

4305 msgstr "未知："

4306

4250 -#: wt-status.c:289

4307 +#: wt-status.c:290

4308 msgid "unmerged:"

4309 msgstr "未合并："

4310

4311 # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字

4255 -#: wt-status.c:371

4312 +#: wt-status.c:372

4313 msgid "new commits, "

4314 msgstr "新提交, "

4315

4316 # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字

4260 -#: wt-status.c:373

4317 +#: wt-status.c:374

4318 msgid "modified content, "

4319 msgstr "修改的内容, "

4320

4321 # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字

4265 -#: wt-status.c:375

4322 +#: wt-status.c:376

4323 msgid "untracked content, "

4324 msgstr "未跟踪的内容, "

4325

4269 -#: wt-status.c:831

4326 +#: wt-status.c:821

4327 +#, c-format

4328 +msgid "Your stash currently has %d entry"

4329 +msgid_plural "Your stash currently has %d entries"

4330 +msgstr[0] "您的贮藏区当前有 %d 条记录"

4331 +msgstr[1] "您的贮藏区当前有 %d 条记录"

4332 +

4333 +#: wt-status.c:853

4334 msgid "Submodules changed but not updated:"

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

4336

4273 -#: wt-status.c:833

4337 +#: wt-status.c:855

4338 msgid "Submodule changes to be committed:"

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

4340

4277 -#: wt-status.c:914

4341 +#: wt-status.c:937

4342 msgid ""

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

4344 "Everything below will be removed."

@@ -4282,77 +4346,77 @@ msgstr ""

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

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

4348

4285 -#: wt-status.c:1026

4349 +#: wt-status.c:1049

4350 msgid "You have unmerged paths."

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

4352

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

4290 -#: wt-status.c:1029

4354 +#: wt-status.c:1052

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

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

4357

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

4295 -#: wt-status.c:1031

4359 +#: wt-status.c:1054

4360 msgid " (use \"git merge --abort\" to abort the merge)"

4361 msgstr " （使用 \"git merge --abort\" 终止合并）"

4362

4299 -#: wt-status.c:1036

4363 +#: wt-status.c:1059

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

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

4366

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

4304 -#: wt-status.c:1039

4368 +#: wt-status.c:1062

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

4370 msgstr " （使用 \"git commit\" 结束合并）"

4371

4308 -#: wt-status.c:1049

4372 +#: wt-status.c:1072

4373 msgid "You are in the middle of an am session."

4374 msgstr "您正处于 am 操作过程中。"

4375

4312 -#: wt-status.c:1052

4376 +#: wt-status.c:1075

4377 msgid "The current patch is empty."

4378 msgstr "当前的补丁为空。"

4379

4380 # 译者：注意保持前导空格

4317 -#: wt-status.c:1056

4381 +#: wt-status.c:1079

4382 msgid " (fix conflicts and then run \"git am --continue\")"

4383 msgstr " （解决冲突，然后运行 \"git am --continue\"）"

4384

4385 # 译者：注意保持前导空格

4322 -#: wt-status.c:1058

4386 +#: wt-status.c:1081

4387 msgid " (use \"git am --skip\" to skip this patch)"

4388 msgstr " （使用 \"git am --skip\" 跳过此补丁）"

4389

4390 # 译者：注意保持前导空格

4327 -#: wt-status.c:1060

4391 +#: wt-status.c:1083

4392 msgid " (use \"git am --abort\" to restore the original branch)"

4393 msgstr " （使用 \"git am --abort\" 恢复原有分支）"

4394

4331 -#: wt-status.c:1189

4395 +#: wt-status.c:1214

4396 msgid "git-rebase-todo is missing."

4397 msgstr "git-rebase-todo 丢失。"

4398

4335 -#: wt-status.c:1191

4399 +#: wt-status.c:1216

4400 msgid "No commands done."

4401 msgstr "没有命令被执行。"

4402

4339 -#: wt-status.c:1194

4403 +#: wt-status.c:1219

4404 #, c-format

4405 msgid "Last command done (%d command done):"

4406 msgid_plural "Last commands done (%d commands done):"

4407 msgstr[0] "最后一条命令已完成（%d 条命令被执行）："

4408 msgstr[1] "最后的命令已完成（%d 条命令被执行）："

4409

4346 -#: wt-status.c:1205

4410 +#: wt-status.c:1230

4411 #, c-format

4412 msgid " (see more in file %s)"

4413 msgstr " （更多参见文件 %s）"

4414

4351 -#: wt-status.c:1210

4415 +#: wt-status.c:1235

4416 msgid "No commands remaining."

4417 msgstr "未剩下任何命令。"

4418

4355 -#: wt-status.c:1213

4419 +#: wt-status.c:1238

4420 #, c-format

4421 msgid "Next command to do (%d remaining command):"

4422 msgid_plural "Next commands to do (%d remaining commands):"

@@ -4360,165 +4424,169 @@ msgstr[0] "接下来要执行的命令（剩余 %d 条命令）："

4424 msgstr[1] "接下来要执行的命令（剩余 %d 条命令）："

4425

4426 # 译者：注意保持前导空格

4363 -#: wt-status.c:1221

4427 +#: wt-status.c:1246

4428 msgid " (use \"git rebase --edit-todo\" to view and edit)"

4429 msgstr " （使用 \"git rebase --edit-todo\" 来查看和编辑）"

4430

4367 -#: wt-status.c:1234

4431 +#: wt-status.c:1259

4432 #, c-format

4433 msgid "You are currently rebasing branch '%s' on '%s'."

4434 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"

4435

4372 -#: wt-status.c:1239

4436 +#: wt-status.c:1264

4437 msgid "You are currently rebasing."

4438 msgstr "您在执行变基操作。"

4439

4440 # 译者：注意保持前导空格

4377 -#: wt-status.c:1253

4441 +#: wt-status.c:1278

4442 msgid " (fix conflicts and then run \"git rebase --continue\")"

4443 msgstr " （解决冲突，然后运行 \"git rebase --continue\"）"

4444

4445 # 译者：注意保持前导空格

4382 -#: wt-status.c:1255

4446 +#: wt-status.c:1280

4447 msgid " (use \"git rebase --skip\" to skip this patch)"

4448 msgstr " （使用 \"git rebase --skip\" 跳过此补丁）"

4449

4450 # 译者：注意保持前导空格

4387 -#: wt-status.c:1257

4451 +#: wt-status.c:1282

4452 msgid " (use \"git rebase --abort\" to check out the original branch)"

4453 msgstr " （使用 \"git rebase --abort\" 以检出原有分支）"

4454

4455 # 译者：注意保持前导空格

4392 -#: wt-status.c:1263

4456 +#: wt-status.c:1288

4457 msgid " (all conflicts fixed: run \"git rebase --continue\")"

4458 msgstr " （所有冲突已解决：运行 \"git rebase --continue\"）"

4459

4396 -#: wt-status.c:1267

4460 +#: wt-status.c:1292

4461 #, c-format

4462 msgid ""

4463 "You are currently splitting a commit while rebasing branch '%s' on '%s'."

4464 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"

4465

4402 -#: wt-status.c:1272

4466 +#: wt-status.c:1297

4467 msgid "You are currently splitting a commit during a rebase."

4468 msgstr "您在执行变基操作时拆分提交。"

4469

4470 # 译者：注意保持前导空格

4407 -#: wt-status.c:1275

4471 +#: wt-status.c:1300

4472 msgid " (Once your working directory is clean, run \"git rebase --continue\")"

4473 msgstr " （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）"

4474

4411 -#: wt-status.c:1279

4475 +#: wt-status.c:1304

4476 #, c-format

4477 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."

4478 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"

4479

4416 -#: wt-status.c:1284

4480 +#: wt-status.c:1309

4481 msgid "You are currently editing a commit during a rebase."

4482 msgstr "您在执行变基操作时编辑提交。"

4483

4484 # 译者：注意保持前导空格

4421 -#: wt-status.c:1287

4485 +#: wt-status.c:1312

4486 msgid " (use \"git commit --amend\" to amend the current commit)"

4487 msgstr " （使用 \"git commit --amend\" 修补当前提交）"

4488

4489 # 译者：注意保持前导空格

4426 -#: wt-status.c:1289

4490 +#: wt-status.c:1314

4491 msgid ""

4492 " (use \"git rebase --continue\" once you are satisfied with your changes)"

4493 msgstr " （当您对您的修改满意后执行 \"git rebase --continue\"）"

4494

4431 -#: wt-status.c:1299

4495 +#: wt-status.c:1324

4496 #, c-format

4497 msgid "You are currently cherry-picking commit %s."

4498 msgstr "您在执行拣选提交 %s 的操作。"

4499

4500 # 译者：注意保持前导空格

4437 -#: wt-status.c:1304

4501 +#: wt-status.c:1329

4502 msgid " (fix conflicts and run \"git cherry-pick --continue\")"

4503 msgstr " （解决冲突并运行 \"git cherry-pick --continue\"）"

4504

4505 # 译者：注意保持前导空格

4442 -#: wt-status.c:1307

4506 +#: wt-status.c:1332

4507 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"

4508 msgstr " （所有冲突已解决：运行 \"git cherry-pick --continue\"）"

4509

4510 # 译者：注意保持前导空格

4447 -#: wt-status.c:1309

4511 +#: wt-status.c:1334

4512 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"

4513 msgstr " （使用 \"git cherry-pick --abort\" 以取消拣选操作）"

4514

4451 -#: wt-status.c:1318

4515 +#: wt-status.c:1343

4516 #, c-format

4517 msgid "You are currently reverting commit %s."

4518 msgstr "您在执行反转提交 %s 的操作。"

4519

4520 # 译者：注意保持前导空格

4457 -#: wt-status.c:1323

4521 +#: wt-status.c:1348

4522 msgid " (fix conflicts and run \"git revert --continue\")"

4523 msgstr " （解决冲突并运行 \"git revert --continue\"）"

4524

4525 # 译者：注意保持前导空格

4462 -#: wt-status.c:1326

4526 +#: wt-status.c:1351

4527 msgid " (all conflicts fixed: run \"git revert --continue\")"

4528 msgstr " （所有冲突已解决：运行 \"git revert --continue\"）"

4529

4530 # 译者：注意保持前导空格

4467 -#: wt-status.c:1328

4531 +#: wt-status.c:1353

4532 msgid " (use \"git revert --abort\" to cancel the revert operation)"

4533 msgstr " （使用 \"git revert --abort\" 以取消反转提交操作）"

4534

4471 -#: wt-status.c:1339

4535 +#: wt-status.c:1364

4536 #, c-format

4537 msgid "You are currently bisecting, started from branch '%s'."

4538 msgstr "您在执行从分支 '%s' 开始的二分查找操作。"

4539

4476 -#: wt-status.c:1343

4540 +#: wt-status.c:1368

4541 msgid "You are currently bisecting."

4542 msgstr "您在执行二分查找操作。"

4543

4544 # 译者：注意保持前导空格

4481 -#: wt-status.c:1346

4545 +#: wt-status.c:1371

4546 msgid " (use \"git bisect reset\" to get back to the original branch)"

4547 msgstr " （使用 \"git bisect reset\" 以回到原有分支）"

4548

4485 -#: wt-status.c:1543

4549 +#: wt-status.c:1568

4550 msgid "On branch "

4551 msgstr "位于分支 "

4552

4489 -#: wt-status.c:1549

4553 +#: wt-status.c:1574

4554 msgid "interactive rebase in progress; onto "

4555 msgstr "交互式变基操作正在进行中；至 "

4556

4493 -#: wt-status.c:1551

4557 +#: wt-status.c:1576

4558 msgid "rebase in progress; onto "

4559 msgstr "变基操作正在进行中；至 "

4560

4497 -#: wt-status.c:1556

4561 +#: wt-status.c:1581

4562 msgid "HEAD detached at "

4563 msgstr "头指针分离于 "

4564

4501 -#: wt-status.c:1558

4565 +#: wt-status.c:1583

4566 msgid "HEAD detached from "

4567 msgstr "头指针分离自 "

4568

4505 -#: wt-status.c:1561

4569 +#: wt-status.c:1586

4570 msgid "Not currently on any branch."

4571 msgstr "当前不在任何分支上。"

4572

4509 -#: wt-status.c:1579

4573 +#: wt-status.c:1606

4574 msgid "Initial commit"

4575 msgstr "初始提交"

4576

4513 -#: wt-status.c:1593

4577 +#: wt-status.c:1607

4578 +msgid "No commits yet"

4579 +msgstr "尚无提交"

4580 +

4581 +#: wt-status.c:1621

4582 msgid "Untracked files"

4583 msgstr "未跟踪的文件"

4584

4517 -#: wt-status.c:1595

4585 +#: wt-status.c:1623

4586 msgid "Ignored files"

4587 msgstr "忽略的文件"

4588

4521 -#: wt-status.c:1599

4589 +#: wt-status.c:1627

4590 #, c-format

4591 msgid ""

4592 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"

@@ -4528,258 +4596,294 @@ msgstr ""

4596 "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度，\n"

4597 "但您需要小心不要忘了添加新文件（参见 'git help status'）。"

4598

4531 -#: wt-status.c:1605

4599 +#: wt-status.c:1633

4600 #, c-format

4601 msgid "Untracked files not listed%s"

4602 msgstr "未跟踪的文件没有列出%s"

4603

4604 # 译者：中文字符串拼接，可删除前导空格

4537 -#: wt-status.c:1607

4605 +#: wt-status.c:1635

4606 msgid " (use -u option to show untracked files)"

4607 msgstr "（使用 -u 参数显示未跟踪的文件）"

4608

4541 -#: wt-status.c:1613

4609 +#: wt-status.c:1641

4610 msgid "No changes"

4611 msgstr "没有修改"

4612

4545 -#: wt-status.c:1618

4613 +#: wt-status.c:1646

4614 #, c-format

4615 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"

4616 msgstr "修改尚未加入提交（使用 \"git add\" 和/或 \"git commit -a\"）\n"

4617

4550 -#: wt-status.c:1621

4618 +#: wt-status.c:1649

4619 #, c-format

4620 msgid "no changes added to commit\n"

4621 msgstr "修改尚未加入提交\n"

4622

4555 -#: wt-status.c:1624

4623 +#: wt-status.c:1652

4624 #, c-format

4625 msgid ""

4626 "nothing added to commit but untracked files present (use \"git add\" to "

4627 "track)\n"

4628 msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n"

4629

4562 -#: wt-status.c:1627

4630 +#: wt-status.c:1655

4631 #, c-format

4632 msgid "nothing added to commit but untracked files present\n"

4633 msgstr "提交为空，但是存在尚未跟踪的文件\n"

4634

4635 # 译者：中文字符串拼接，可删除前导空格

4568 -#: wt-status.c:1630

4636 +#: wt-status.c:1658

4637 #, c-format

4638 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"

4639 msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n"

4640

4573 -#: wt-status.c:1633 wt-status.c:1638

4641 +#: wt-status.c:1661 wt-status.c:1666

4642 #, c-format

4643 msgid "nothing to commit\n"

4644 msgstr "无文件要提交\n"

4645

4646 # 译者：中文字符串拼接，可删除前导空格

4579 -#: wt-status.c:1636

4647 +#: wt-status.c:1664

4648 #, c-format

4649 msgid "nothing to commit (use -u to show untracked files)\n"

4650 msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n"

4651

4652 # 译者：中文字符串拼接，可删除前导空格

4585 -#: wt-status.c:1640

4653 +#: wt-status.c:1668

4654 #, c-format

4655 msgid "nothing to commit, working tree clean\n"

4656 msgstr "无文件要提交，干净的工作区\n"

4657

4590 -# 译者：注意保持句尾空格

4591 -#: wt-status.c:1749

4592 -msgid "Initial commit on "

4593 -msgstr "初始提交于 "

4658 +#: wt-status.c:1780

4659 +msgid "No commits yet on "

4660 +msgstr "尚无提交在 "

4661

4595 -#: wt-status.c:1753

4662 +#: wt-status.c:1784

4663 msgid "HEAD (no branch)"

4664 msgstr "HEAD（非分支）"

4665

l10n: zh_CN: for git v2.14.0 l10n round 2