a6cd2cc485 · matheusbsbs/matheus-bagliano

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

139 msgstr ""

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

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

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

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

142 +"POT-Creation-Date: 2019-08-10 20:12+0800\n"

143 +"PO-Revision-Date: 2019-08-13 21:16+0800\n"

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

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

146 "Language: zh_CN\n"

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

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

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

151

152 -#: advice.c:103

152 +#: advice.c:109

153 #, c-format

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

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

156

157 -#: advice.c:156

157 +#: advice.c:162

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

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

160

161 -#: advice.c:158

161 +#: advice.c:164

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

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

164

165 -#: advice.c:160

165 +#: advice.c:166

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

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

168

169 -#: advice.c:162

169 +#: advice.c:168

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

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

172

173 -#: advice.c:164

173 +#: advice.c:170

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

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

176

177 -#: advice.c:166

177 +#: advice.c:172

178 #, c-format

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

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

181

182 -#: advice.c:174

182 +#: advice.c:180

183 msgid ""

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

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

@@ -187,47 +187,59 @@ msgstr ""

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

188 "解决方案并提交。"

189

190 -#: advice.c:182

190 +#: advice.c:188

191 msgid "Exiting because of an unresolved conflict."

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

193

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

194 +#: advice.c:193 builtin/merge.c:1327

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

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

197

198 -#: advice.c:189

198 +#: advice.c:195

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

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

201

202 -#: advice.c:190

202 +#: advice.c:196

203 msgid "Exiting because of unfinished merge."

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

205

206 -#: advice.c:196

206 +#: advice.c:202

207 #, c-format

208 msgid ""

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

209 +"Note: switching to '%s'.\n"

210 "\n"

211 "You are in 'detached HEAD' state. You can look around, make experimental\n"

212 "changes and commit them, and you can discard any commits you make in this\n"

213 -"state without impacting any branches by performing another checkout.\n"

213 +"state without impacting any branches by switching back to a branch.\n"

214 "\n"

215 "If you want to create a new branch to retain commits you create, you may\n"

216 -"do so (now or later) by using -b with the checkout command again. Example:\n"

216 +"do so (now or later) by using -c with the switch command. Example:\n"

217 "\n"

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

218 +" git switch -c <new-branch-name>\n"

219 +"\n"

220 +"Or undo this operation with:\n"

221 +"\n"

222 +" git switch -\n"

223 +"\n"

224 +"Turn off this advice by setting config variable advice.detachedHead to "

225 +"false\n"

226 "\n"

227 msgstr ""

221 -"注意：正在检出 '%s'。\n"

228 +"注意：正在切换到 '%s'。\n"

229 +"\n"

230 +"您正处于分离头指针状态。您可以查看、做试验性的修改及提交，并且您可以在切换\n"

231 +"回一个分支时，丢弃在此状态下所做的提交而不对分支造成影响。\n"

232 "\n"

223 -"您正处于分离头指针状态。您可以查看、做试验性的修改及提交，并且您可以通过另"

224 -"外\n"

225 -"的检出分支操作丢弃在这个状态下所做的任何提交。\n"

233 +"如果您想要通过创建分支来保留在此状态下所做的提交，您可以通过在 switch 命令\n"

234 +"中添加参数 -c 来实现（现在或稍后）。例如：\n"

235 "\n"

227 -"如果您想要通过创建分支来保留在此状态下所做的提交，您可以通过在检出命令添加\n"

228 -"参数 -b 来实现（现在或稍后）。例如：\n"

236 +" git switch -c <新分支名>\n"

237 "\n"

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

238 +"或者撤销此操作：\n"

239 +"\n"

240 +" git switch -\n"

241 +"\n"

242 +"通过将配置变量 advice.detachedHead 设置为 false 来关闭此建议\n"

243 "\n"

244

245 #: alias.c:50

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

250 msgid "unclosed quote"

251 msgstr "未关闭的引号"

252

241 -#: apply.c:63

253 +#: apply.c:69

254 #, c-format

255 msgid "unrecognized whitespace option '%s'"

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

257

246 -#: apply.c:79

258 +#: apply.c:85

259 #, c-format

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

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

262

251 -#: apply.c:129

263 +#: apply.c:135

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

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

266

255 -#: apply.c:131

267 +#: apply.c:137

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

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

270

259 -#: apply.c:134

271 +#: apply.c:140

272 msgid "--3way outside a repository"

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

274

263 -#: apply.c:145

275 +#: apply.c:151

276 msgid "--index outside a repository"

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

278

267 -#: apply.c:148

279 +#: apply.c:154

280 msgid "--cached outside a repository"

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

282

271 -#: apply.c:829

283 +#: apply.c:801

284 #, c-format

285 msgid "Cannot prepare timestamp regexp %s"

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

287

276 -#: apply.c:838

288 +#: apply.c:810

289 #, c-format

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

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

292

281 -#: apply.c:912

293 +#: apply.c:884

294 #, c-format

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

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

297

286 -#: apply.c:950

298 +#: apply.c:922

299 #, c-format

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

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

302

291 -#: apply.c:956

303 +#: apply.c:928

304 #, c-format

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

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

307

296 -#: apply.c:957

308 +#: apply.c:929

309 #, c-format

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

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

312

301 -#: apply.c:962

313 +#: apply.c:934

314 #, c-format

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

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

317

306 -#: apply.c:991

318 +#: apply.c:963

319 #, c-format

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

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

322

311 -#: apply.c:1310

323 +#: apply.c:1282

324 #, c-format

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

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

327

316 -#: apply.c:1482

328 +#: apply.c:1460

329 #, c-format

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

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

332

321 -#: apply.c:1551

333 +#: apply.c:1529

334 #, c-format

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

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

337

326 -#: apply.c:1571

338 +#: apply.c:1551

339 #, c-format

340 msgid ""

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

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

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

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

348

337 -#: apply.c:1584

349 +#: apply.c:1564

350 #, c-format

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

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

353

342 -#: apply.c:1772

354 +#: apply.c:1752

355 msgid "new file depends on old contents"

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

357

346 -#: apply.c:1774

358 +#: apply.c:1754

359 msgid "deleted file still has contents"

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

361

350 -#: apply.c:1808

362 +#: apply.c:1788

363 #, c-format

364 msgid "corrupt patch at line %d"

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

366

355 -#: apply.c:1845

367 +#: apply.c:1825

368 #, c-format

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

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

371

360 -#: apply.c:1847

372 +#: apply.c:1827

373 #, c-format

374 msgid "deleted file %s still has contents"

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

376

365 -#: apply.c:1850

377 +#: apply.c:1830

378 #, c-format

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

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

381

370 -#: apply.c:1997

382 +#: apply.c:1977

383 #, c-format

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

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

386

375 -#: apply.c:2034

387 +#: apply.c:2014

388 #, c-format

389 msgid "unrecognized binary patch at line %d"

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

391

380 -#: apply.c:2196

392 +#: apply.c:2176

393 #, c-format

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

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

396

385 -#: apply.c:2282

397 +#: apply.c:2262

398 #, c-format

399 msgid "unable to read symlink %s"

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

401

390 -#: apply.c:2286

402 +#: apply.c:2266

403 #, c-format

404 msgid "unable to open or read %s"

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

406

395 -#: apply.c:2945

407 +#: apply.c:2925

408 #, c-format

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

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

411

400 -#: apply.c:3066

412 +#: apply.c:3046

413 #, c-format

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

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

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

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

418

407 -#: apply.c:3078

419 +#: apply.c:3058

420 #, c-format

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

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

423

412 -#: apply.c:3084

424 +#: apply.c:3064

425 #, c-format

426 msgid ""

427 "while searching for:\n"

@@ -418,445 +430,445 @@ msgstr ""

430 "当查询：\n"

431 "%.*s"

432

421 -#: apply.c:3106

433 +#: apply.c:3086

434 #, c-format

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

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

437

426 -#: apply.c:3114

438 +#: apply.c:3094

439 #, c-format

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

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

442

431 -#: apply.c:3161

443 +#: apply.c:3141

444 #, c-format

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

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

447

436 -#: apply.c:3171

448 +#: apply.c:3151

449 #, c-format

450 msgid ""

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

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

453

442 -#: apply.c:3179

454 +#: apply.c:3159

455 #, c-format

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

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

458

447 -#: apply.c:3197

459 +#: apply.c:3177

460 #, c-format

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

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

463

452 -#: apply.c:3210

464 +#: apply.c:3190

465 #, c-format

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

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

468

457 -#: apply.c:3216

469 +#: apply.c:3196

470 #, c-format

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

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

473

462 -#: apply.c:3237

474 +#: apply.c:3217

475 #, c-format

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

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

478

467 -#: apply.c:3360

479 +#: apply.c:3340

480 #, c-format

481 msgid "cannot checkout %s"

482 msgstr "不能检出 %s"

483

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

484 +#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279

485 #, c-format

486 msgid "failed to read %s"

487 msgstr "无法读取 %s"

488

477 -#: apply.c:3420

489 +#: apply.c:3400

490 #, c-format

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

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

493

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

494 +#: apply.c:3429 apply.c:3672

495 #, c-format

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

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

498

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

499 +#: apply.c:3515 apply.c:3687

500 #, c-format

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

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

503

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

504 +#: apply.c:3524 apply.c:3695

505 #, c-format

506 msgid "%s: does not match index"

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

508

497 -#: apply.c:3579

509 +#: apply.c:3559

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

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

512

501 -#: apply.c:3582

513 +#: apply.c:3562

514 #, c-format

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

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

517

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

518 +#: apply.c:3578 apply.c:3582

519 #, c-format

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

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

522

511 -#: apply.c:3614

523 +#: apply.c:3594

524 #, c-format

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

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

527

516 -#: apply.c:3628

528 +#: apply.c:3608

529 #, c-format

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

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

532

521 -#: apply.c:3633

533 +#: apply.c:3613

534 #, c-format

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

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

537

526 -#: apply.c:3659

538 +#: apply.c:3639

539 msgid "removal patch leaves file contents"

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

541

530 -#: apply.c:3732

542 +#: apply.c:3712

543 #, c-format

544 msgid "%s: wrong type"

545 msgstr "%s：错误类型"

546

535 -#: apply.c:3734

547 +#: apply.c:3714

548 #, c-format

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

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

551

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

552 +#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856

553 #: read-cache.c:1309

554 #, c-format

555 msgid "invalid path '%s'"

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

557

546 -#: apply.c:3943

558 +#: apply.c:3923

559 #, c-format

560 msgid "%s: already exists in index"

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

562

551 -#: apply.c:3946

563 +#: apply.c:3926

564 #, c-format

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

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

567

556 -#: apply.c:3966

568 +#: apply.c:3946

569 #, c-format

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

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

572

561 -#: apply.c:3971

573 +#: apply.c:3951

574 #, c-format

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

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

577

566 -#: apply.c:3991

578 +#: apply.c:3971

579 #, c-format

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

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

582

571 -#: apply.c:3995

583 +#: apply.c:3975

584 #, c-format

585 msgid "%s: patch does not apply"

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

587

576 -#: apply.c:4010

588 +#: apply.c:3990

589 #, c-format

590 msgid "Checking patch %s..."

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

592

581 -#: apply.c:4102

593 +#: apply.c:4082

594 #, c-format

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

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

597

586 -#: apply.c:4109

598 +#: apply.c:4089

599 #, c-format

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

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

602

591 -#: apply.c:4112

603 +#: apply.c:4092

604 #, c-format

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

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

607

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

608 +#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143

609 #, c-format

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

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

612

601 -#: apply.c:4121

613 +#: apply.c:4101

614 #, c-format

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

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

617

606 -#: apply.c:4131

618 +#: apply.c:4111

619 #, c-format

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

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

622

611 -#: apply.c:4269

623 +#: apply.c:4249

624 #, c-format

625 msgid "unable to remove %s from index"

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

627

616 -#: apply.c:4303

628 +#: apply.c:4283

629 #, c-format

630 msgid "corrupt patch for submodule %s"

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

632

621 -#: apply.c:4309

633 +#: apply.c:4289

634 #, c-format

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

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

637

626 -#: apply.c:4317

638 +#: apply.c:4297

639 #, c-format

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

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

642

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

643 +#: apply.c:4303 apply.c:4448

644 #, c-format

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

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

647

636 -#: apply.c:4366

648 +#: apply.c:4346

649 #, c-format

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

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

652

641 -#: apply.c:4370

653 +#: apply.c:4350

654 #, c-format

655 msgid "closing file '%s'"

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

657

646 -#: apply.c:4440

658 +#: apply.c:4420

659 #, c-format

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

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

662

651 -#: apply.c:4538

663 +#: apply.c:4518

664 #, c-format

665 msgid "Applied patch %s cleanly."

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

667

656 -#: apply.c:4546

668 +#: apply.c:4526

669 msgid "internal error"

670 msgstr "内部错误"

671

660 -#: apply.c:4549

672 +#: apply.c:4529

673 #, c-format

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

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

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

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

678

667 -#: apply.c:4560

679 +#: apply.c:4540

680 #, c-format

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

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

683

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

684 +#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168

685 #, c-format

686 msgid "cannot open %s"

687 msgstr "不能打开 %s"

688

677 -#: apply.c:4582

689 +#: apply.c:4562

690 #, c-format

691 msgid "Hunk #%d applied cleanly."

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

693

682 -#: apply.c:4586

694 +#: apply.c:4566

695 #, c-format

696 msgid "Rejected hunk #%d."

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

698

687 -#: apply.c:4696

699 +#: apply.c:4676

700 #, c-format

701 msgid "Skipped patch '%s'."

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

703

692 -#: apply.c:4704

704 +#: apply.c:4684

705 msgid "unrecognized input"

706 msgstr "未能识别的输入"

707

696 -#: apply.c:4724

708 +#: apply.c:4704

709 msgid "unable to read index file"

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

711

700 -#: apply.c:4879

712 +#: apply.c:4859

713 #, c-format

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

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

716

705 -#: apply.c:4906

717 +#: apply.c:4886

718 #, c-format

719 msgid "squelched %d whitespace error"

720 msgid_plural "squelched %d whitespace errors"

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

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

723

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

724 +#: apply.c:4892 apply.c:4907

725 #, c-format

726 msgid "%d line adds whitespace errors."

727 msgid_plural "%d lines add whitespace errors."

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

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

730

719 -#: apply.c:4920

731 +#: apply.c:4900

732 #, c-format

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

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

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

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

737

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

738 +#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390

739 msgid "Unable to write new index file"

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

741

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

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

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

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

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

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

742 +#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211

743 +#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273

744 +#: builtin/pull.c:208 builtin/submodule--helper.c:407

745 +#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370

746 +#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853

747 +#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211

748 msgid "path"

749 msgstr "路径"

750

739 -#: apply.c:4964

751 +#: apply.c:4944

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

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

754

743 -#: apply.c:4967

755 +#: apply.c:4947

756 msgid "apply changes matching the given path"

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

758

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

759 +#: apply.c:4949 builtin/am.c:2217

760 msgid "num"

761 msgstr "数字"

762

751 -#: apply.c:4970

763 +#: apply.c:4950

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

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

766

755 -#: apply.c:4973

767 +#: apply.c:4953

768 msgid "ignore additions made by the patch"

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

770

759 -#: apply.c:4975

771 +#: apply.c:4955

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

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

774

763 -#: apply.c:4979

775 +#: apply.c:4959

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

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

778

767 -#: apply.c:4981

779 +#: apply.c:4961

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

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

782

771 -#: apply.c:4983

783 +#: apply.c:4963

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

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

786

775 -#: apply.c:4985

787 +#: apply.c:4965

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

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

790

779 -#: apply.c:4987

791 +#: apply.c:4967

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

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

794

783 -#: apply.c:4989

795 +#: apply.c:4969

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

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

798

787 -#: apply.c:4991

799 +#: apply.c:4971

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

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

802

791 -#: apply.c:4994

803 +#: apply.c:4974

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

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

806

795 -#: apply.c:4996

807 +#: apply.c:4976

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

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

810

799 -#: apply.c:4998

811 +#: apply.c:4978

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

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

814

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

815 +#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524

816 msgid "paths are separated with NUL character"

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

818

807 -#: apply.c:5003

819 +#: apply.c:4983

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

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

822

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

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

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

823 +#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98

824 +#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102

825 +#: builtin/pack-objects.c:3330 builtin/rebase.c:1421

826 msgid "action"

827 msgstr "动作"

828

817 -#: apply.c:5005

829 +#: apply.c:4985

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

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

832

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

833 +#: apply.c:4988 apply.c:4991

834 msgid "ignore changes in whitespace when finding context"

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

836

825 -#: apply.c:5014

837 +#: apply.c:4994

838 msgid "apply the patch in reverse"

839 msgstr "反向应用补丁"

840

829 -#: apply.c:5016

841 +#: apply.c:4996

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

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

844

833 -#: apply.c:5018

845 +#: apply.c:4998

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

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

848

837 -#: apply.c:5020

849 +#: apply.c:5000

850 msgid "allow overlapping hunks"

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

852

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

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

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

853 +#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22

854 +#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786

855 +#: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128

856 msgid "be verbose"

857 msgstr "冗长输出"

858

847 -#: apply.c:5023

859 +#: apply.c:5003

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

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

862

851 -#: apply.c:5026

863 +#: apply.c:5006

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

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

866

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

867 +#: apply.c:5008 builtin/am.c:2205

868 msgid "root"

869 msgstr "根目录"

870

859 -#: apply.c:5029

871 +#: apply.c:5009

872 msgid "prepend <root> to all filenames"

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

874

@@ -898,98 +910,98 @@ msgstr "不是一个有效的对象名：%s"

910 msgid "not a tree object: %s"

911 msgstr "不是一个树对象：%s"

912

901 -#: archive.c:424

913 +#: archive.c:426

914 msgid "current working directory is untracked"

915 msgstr "当前工作目录未被跟踪"

916

905 -#: archive.c:455

917 +#: archive.c:457

918 msgid "fmt"

919 msgstr "格式"

920

909 -#: archive.c:455

921 +#: archive.c:457

922 msgid "archive format"

923 msgstr "归档格式"

924

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

925 +#: archive.c:458 builtin/log.c:1580

926 msgid "prefix"

927 msgstr "前缀"

928

917 -#: archive.c:457

929 +#: archive.c:459

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

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

932

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

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

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

933 +#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875

934 +#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134

935 +#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105

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

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

938 msgid "file"

939 msgstr "文件"

940

929 -#: archive.c:459 builtin/archive.c:90

941 +#: archive.c:461 builtin/archive.c:90

942 msgid "write the archive to this file"

943 msgstr "归档写入此文件"

944

933 -#: archive.c:461

945 +#: archive.c:463

946 msgid "read .gitattributes in working directory"

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

948

937 -#: archive.c:462

949 +#: archive.c:464

950 msgid "report archived files on stderr"

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

952

941 -#: archive.c:463

953 +#: archive.c:465

954 msgid "store only"

955 msgstr "只存储"

956

945 -#: archive.c:464

957 +#: archive.c:466

958 msgid "compress faster"

959 msgstr "压缩速度更快"

960

949 -#: archive.c:472

961 +#: archive.c:474

962 msgid "compress better"

963 msgstr "压缩效果更好"

964

953 -#: archive.c:475

965 +#: archive.c:477

966 msgid "list supported archive formats"

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

968

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

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

969 +#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116

970 +#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859

971 msgid "repo"

972 msgstr "仓库"

973

962 -#: archive.c:478 builtin/archive.c:92

974 +#: archive.c:480 builtin/archive.c:92

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

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

977

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

978 +#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707

979 #: builtin/notes.c:498

980 msgid "command"

981 msgstr "命令"

982

971 -#: archive.c:480 builtin/archive.c:94

983 +#: archive.c:482 builtin/archive.c:94

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

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

986

975 -#: archive.c:487

987 +#: archive.c:489

988 msgid "Unexpected option --remote"

989 msgstr "未知参数 --remote"

990

979 -#: archive.c:489

991 +#: archive.c:491

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

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

994

983 -#: archive.c:491

995 +#: archive.c:493

996 msgid "Unexpected option --output"

997 msgstr "未知参数 --output"

998

987 -#: archive.c:513

999 +#: archive.c:515

1000 #, c-format

1001 msgid "Unknown archive format '%s'"

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

1003

992 -#: archive.c:520

1004 +#: archive.c:522

1005 #, c-format

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

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

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

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

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

1047

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

1048 +#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233

1049 #, c-format

1050 msgid "deflate error (%d)"

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

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

1147 msgid "a %s revision is needed"

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

1149

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

1150 +#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254

1151 #, c-format

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

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

1154

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

1155 +#: bisect.c:928 builtin/merge.c:148

1156 #, c-format

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

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

@@ -1180,37 +1192,37 @@ msgid_plural "Bisecting: %d revisions left to test after this %s\n"

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

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

1194

1183 -#: blame.c:1794

1195 +#: blame.c:2697

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

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

1198

1187 -#: blame.c:1808

1199 +#: blame.c:2711

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

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

1202

1191 -#: blame.c:1829

1203 +#: blame.c:2732

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

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

1206

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

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

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

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

1207 +#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033

1208 +#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963

1209 +#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411

1210 +#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163

1211 #: builtin/shortlog.c:192

1212 msgid "revision walk setup failed"

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

1214

1203 -#: blame.c:1856

1215 +#: blame.c:2759

1216 msgid ""

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

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

1219

1208 -#: blame.c:1867

1220 +#: blame.c:2770

1221 #, c-format

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

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

1224

1213 -#: blame.c:1878

1225 +#: blame.c:2781

1226 #, c-format

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

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

@@ -1338,12 +1350,12 @@ msgstr "歧义的对象名：'%s'。"

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

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

1352

1341 -#: branch.c:359

1353 +#: branch.c:364

1354 #, c-format

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

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

1357

1346 -#: branch.c:382

1358 +#: branch.c:387

1359 #, c-format

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

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

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

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

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

1372

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

1362 -#: builtin/commit.c:788

1373 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024

1374 +#: builtin/commit.c:791

1375 #, c-format

1376 msgid "could not open '%s'"

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

@@ -1368,60 +1380,64 @@ msgstr "不能打开 '%s'"

1380 msgid "Repository lacks these prerequisite commits:"

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

1382

1371 -#: bundle.c:194

1383 +#: bundle.c:146

1384 +msgid "need a repository to verify a bundle"

1385 +msgstr "需要一个仓库来校验一个包"

1386 +

1387 +#: bundle.c:197

1388 #, c-format

1389 msgid "The bundle contains this ref:"

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

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

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

1393

1378 -#: bundle.c:201

1394 +#: bundle.c:204

1395 msgid "The bundle records a complete history."

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

1397

1382 -#: bundle.c:203

1398 +#: bundle.c:206

1399 #, c-format

1400 msgid "The bundle requires this ref:"

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

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

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

1404

1389 -#: bundle.c:269

1405 +#: bundle.c:272

1406 msgid "unable to dup bundle descriptor"

1407 msgstr "无法复制 bundle 描述符"

1408

1393 -#: bundle.c:276

1409 +#: bundle.c:279

1410 msgid "Could not spawn pack-objects"

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

1412

1397 -#: bundle.c:287

1413 +#: bundle.c:290

1414 msgid "pack-objects died"

1415 msgstr "pack-objects 终止"

1416

1401 -#: bundle.c:329

1417 +#: bundle.c:332

1418 msgid "rev-list died"

1419 msgstr "rev-list 终止"

1420

1405 -#: bundle.c:378

1421 +#: bundle.c:381

1422 #, c-format

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

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

1425

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

1426 +#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306

1427 #, c-format

1428 msgid "unrecognized argument: %s"

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

1430

1415 -#: bundle.c:465

1431 +#: bundle.c:468

1432 msgid "Refusing to create empty bundle."

1433 msgstr "不能创建空包。"

1434

1419 -#: bundle.c:475

1435 +#: bundle.c:478

1436 #, c-format

1437 msgid "cannot create '%s'"

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

1439

1424 -#: bundle.c:500

1440 +#: bundle.c:503

1441 msgid "index-pack died"

1442 msgstr "index-pack 终止"

1443

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

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

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

1448

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

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

1449 +#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399

1450 +#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455

1451 #, c-format

1452 msgid "could not parse %s"

1453 msgstr "不能解析 %s"

@@ -1441,7 +1457,7 @@ msgstr "不能解析 %s"

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

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

1459

1444 -#: commit.c:193

1460 +#: commit.c:192

1461 msgid ""

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

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

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

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

1478 "可关闭本消息"

1479

1464 -#: commit.c:1128

1480 +#: commit.c:1127

1481 #, c-format

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

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

1484

1469 -#: commit.c:1131

1485 +#: commit.c:1130

1486 #, c-format

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

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

1489

1474 -#: commit.c:1134

1490 +#: commit.c:1133

1491 #, c-format

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

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

1494

1479 -#: commit.c:1137

1495 +#: commit.c:1136

1496 #, c-format

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

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

1499

1484 -#: commit.c:1391

1500 +#: commit.c:1390

1501 msgid ""

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

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

@@ -1491,188 +1507,243 @@ msgstr ""

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

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

1509

1494 -#: commit-graph.c:105

1510 +#: commit-graph.c:127

1511 msgid "commit-graph file is too small"

1512 msgstr "提交图形文件太小"

1513

1498 -#: commit-graph.c:170

1514 +#: commit-graph.c:192

1515 #, c-format

1516 msgid "commit-graph signature %X does not match signature %X"

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

1518

1503 -#: commit-graph.c:177

1519 +#: commit-graph.c:199

1520 #, c-format

1521 msgid "commit-graph version %X does not match version %X"

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

1523

1508 -#: commit-graph.c:184

1524 +#: commit-graph.c:206

1525 #, c-format

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

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

1528

1513 -#: commit-graph.c:207

1529 +#: commit-graph.c:229

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

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

1532

1517 -#: commit-graph.c:218

1533 +#: commit-graph.c:240

1534 #, c-format

1535 msgid "commit-graph improper chunk offset %08x%08x"

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

1537

1522 -#: commit-graph.c:255

1538 +#: commit-graph.c:283

1539 #, c-format

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

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

1542

1527 -#: commit-graph.c:390

1543 +#: commit-graph.c:347

1544 +msgid "commit-graph has no base graphs chunk"

1545 +msgstr "提交图形没有基础图形块"

1546 +

1547 +#: commit-graph.c:357

1548 +msgid "commit-graph chain does not match"

1549 +msgstr "提交图形链不匹配"

1550 +

1551 +#: commit-graph.c:404

1552 +#, c-format

1553 +msgid "invalid commit-graph chain: line '%s' not a hash"

1554 +msgstr "无效的提交图形链：行 '%s' 不是一个哈希值"

1555 +

1556 +#: commit-graph.c:430

1557 +msgid "unable to find all commit-graph files"

1558 +msgstr "无法找到所有提交图形文件"

1559 +

1560 +#: commit-graph.c:554 commit-graph.c:614

1561 +msgid "invalid commit position. commit-graph is likely corrupt"

1562 +msgstr "无效的提交位置。提交图形可能已损坏"

1563 +

1564 +#: commit-graph.c:575

1565 #, c-format

1566 msgid "could not find commit %s"

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

1568

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

1569 +#: commit-graph.c:1002 builtin/pack-objects.c:2657

1570 #, c-format

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

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

1573

1537 -#: commit-graph.c:765

1574 +#: commit-graph.c:1034

1575 msgid "Loading known commits in commit graph"

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

1577

1541 -#: commit-graph.c:781

1578 +#: commit-graph.c:1051

1579 msgid "Expanding reachable commits in commit graph"

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

1581

1545 -#: commit-graph.c:793

1582 +#: commit-graph.c:1070

1583 msgid "Clearing commit marks in commit graph"

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

1585

1549 -#: commit-graph.c:813

1586 +#: commit-graph.c:1089

1587 msgid "Computing commit graph generation numbers"

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

1589

1553 -#: commit-graph.c:930

1590 +#: commit-graph.c:1163

1591 #, c-format

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

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

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

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

1596

1560 -#: commit-graph.c:943

1597 +#: commit-graph.c:1176

1598 #, c-format

1599 msgid "error adding pack %s"

1600 msgstr "添加包 %s 出错"

1601

1565 -#: commit-graph.c:945

1602 +#: commit-graph.c:1180

1603 #, c-format

1604 msgid "error opening index for %s"

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

1606

1570 -#: commit-graph.c:959

1607 +#: commit-graph.c:1204

1608 #, c-format

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

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

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

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

1613

1577 -#: commit-graph.c:991

1614 +#: commit-graph.c:1238

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

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

1617

1581 -#: commit-graph.c:1004

1618 +#: commit-graph.c:1253

1619 msgid "Counting distinct commits in commit graph"

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

1621

1585 -#: commit-graph.c:1017

1586 -#, c-format

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

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

1589 -

1590 -#: commit-graph.c:1026

1622 +#: commit-graph.c:1284

1623 msgid "Finding extra edges in commit graph"

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

1625

1594 -#: commit-graph.c:1050

1595 -msgid "too many commits to write graph"

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

1626 +#: commit-graph.c:1332

1627 +msgid "failed to write correct number of base graph ids"

1628 +msgstr "无法写入正确数量的基础图形 ID"

1629

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

1630 +#: commit-graph.c:1365 midx.c:811

1631 #, c-format

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

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

1634

1603 -#: commit-graph.c:1097

1635 +#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240

1636 +#, c-format

1637 +msgid "unable to create '%s'"

1638 +msgstr "不能创建 '%s'"

1639 +

1640 +#: commit-graph.c:1437

1641 #, c-format

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

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

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

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

1646

1610 -#: commit-graph.c:1162

1647 +#: commit-graph.c:1478

1648 +msgid "unable to open commit-graph chain file"

1649 +msgstr "无法打开提交图形链文件"

1650 +

1651 +#: commit-graph.c:1490

1652 +msgid "failed to rename base commit-graph file"

1653 +msgstr "无法重命名基础提交图形文件"

1654 +

1655 +#: commit-graph.c:1510

1656 +msgid "failed to rename temporary commit-graph file"

1657 +msgstr "无法重命名临时提交图形文件"

1658 +

1659 +#: commit-graph.c:1621

1660 +msgid "Scanning merged commits"

1661 +msgstr "正在扫描合并提交"

1662 +

1663 +#: commit-graph.c:1632

1664 +#, c-format

1665 +msgid "unexpected duplicate commit id %s"

1666 +msgstr "意外的重复提交 ID %s"

1667 +

1668 +#: commit-graph.c:1657

1669 +msgid "Merging commit-graph"

1670 +msgstr "正在合并提交图形"

1671 +

1672 +#: commit-graph.c:1844

1673 +#, c-format

1674 +msgid "the commit graph format cannot write %d commits"

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

1676 +

1677 +#: commit-graph.c:1855

1678 +msgid "too many commits to write graph"

1679 +msgstr "提交太多不能画图"

1680 +

1681 +#: commit-graph.c:1945

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

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

1684

1614 -#: commit-graph.c:1172

1685 +#: commit-graph.c:1955

1686 #, c-format

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

1688 msgstr "提交图形的对象 ID 顺序不正确：%s 然后 %s"

1689

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

1690 +#: commit-graph.c:1965 commit-graph.c:1980

1691 #, c-format

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

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

1694

1624 -#: commit-graph.c:1189

1695 +#: commit-graph.c:1972

1696 #, c-format

1697 msgid "failed to parse commit %s from commit-graph"

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

1699

1629 -#: commit-graph.c:1206

1700 +#: commit-graph.c:1989

1701 msgid "Verifying commits in commit graph"

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

1703

1633 -#: commit-graph.c:1219

1704 +#: commit-graph.c:2002

1705 #, c-format

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

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

1708

1638 -#: commit-graph.c:1226

1709 +#: commit-graph.c:2009

1710 #, c-format

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

1712 msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s"

1713

1643 -#: commit-graph.c:1236

1714 +#: commit-graph.c:2019

1715 #, c-format

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

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

1718

1648 -#: commit-graph.c:1242

1719 +#: commit-graph.c:2028

1720 #, c-format

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

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

1723

1653 -#: commit-graph.c:1255

1724 +#: commit-graph.c:2041

1725 #, c-format

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

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

1728

1658 -#: commit-graph.c:1260

1729 +#: commit-graph.c:2046

1730 #, c-format

1731 msgid ""

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

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

1734

1664 -#: commit-graph.c:1264

1735 +#: commit-graph.c:2050

1736 #, c-format

1737 msgid ""

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

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

1740

1670 -#: commit-graph.c:1279

1741 +#: commit-graph.c:2065

1742 #, c-format

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

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

1745

1675 -#: commit-graph.c:1285

1746 +#: commit-graph.c:2071

1747 #, c-format

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

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

@@ -1681,7 +1752,7 @@ msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"

1752 msgid "memory exhausted"

1753 msgstr "内存耗尽"

1754

1684 -#: config.c:123

1755 +#: config.c:124

1756 #, c-format

1757 msgid ""

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

@@ -1696,294 +1767,294 @@ msgstr ""

1767 "\t%2$s\n"

1768 "这可能是因为循环包含。"

1769

1699 -#: config.c:139

1770 +#: config.c:140

1771 #, c-format

1772 msgid "could not expand include path '%s'"

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

1774

1704 -#: config.c:150

1775 +#: config.c:151

1776 msgid "relative config includes must come from files"

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

1778

1708 -#: config.c:190

1779 +#: config.c:197

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

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

1782

1712 -#: config.c:348

1783 +#: config.c:376

1784 #, c-format

1785 msgid "key does not contain a section: %s"

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

1787

1717 -#: config.c:354

1788 +#: config.c:382

1789 #, c-format

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

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

1792

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

1793 +#: config.c:406 sequencer.c:2463

1794 #, c-format

1795 msgid "invalid key: %s"

1796 msgstr "无效键名：%s"

1797

1727 -#: config.c:384

1798 +#: config.c:412

1799 #, c-format

1800 msgid "invalid key (newline): %s"

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

1802

1732 -#: config.c:420 config.c:432

1803 +#: config.c:448 config.c:460

1804 #, c-format

1805 msgid "bogus config parameter: %s"

1806 msgstr "伪配置参数：%s"

1807

1737 -#: config.c:467

1808 +#: config.c:495

1809 #, c-format

1810 msgid "bogus format in %s"

1811 msgstr "%s 中格式错误"

1812

1742 -#: config.c:793

1813 +#: config.c:821

1814 #, c-format

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

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

1817

1747 -#: config.c:797

1818 +#: config.c:825

1819 #, c-format

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

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

1822

1752 -#: config.c:801

1823 +#: config.c:829

1824 #, c-format

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

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

1827

1757 -#: config.c:805

1828 +#: config.c:833

1829 #, c-format

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

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

1832

1762 -#: config.c:809

1833 +#: config.c:837

1834 #, c-format

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

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

1837

1767 -#: config.c:813

1838 +#: config.c:841

1839 #, c-format

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

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

1842

1772 -#: config.c:952

1843 +#: config.c:978

1844 msgid "out of range"

1845 msgstr "超出范围"

1846

1776 -#: config.c:952

1847 +#: config.c:978

1848 msgid "invalid unit"

1849 msgstr "无效的单位"

1850

1780 -#: config.c:958

1851 +#: config.c:979

1852 #, c-format

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

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

1855

1785 -#: config.c:963

1856 +#: config.c:998

1857 #, c-format

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

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

1860

1790 -#: config.c:966

1861 +#: config.c:1001

1862 #, c-format

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

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

1865

1795 -#: config.c:969

1866 +#: config.c:1004

1867 #, c-format

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

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

1870

1800 -#: config.c:972

1871 +#: config.c:1007

1872 #, c-format

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

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

1875

1805 -#: config.c:975

1876 +#: config.c:1010

1877 #, c-format

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

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

1880

1810 -#: config.c:978

1881 +#: config.c:1013

1882 #, c-format

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

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

1885

1815 -#: config.c:1073

1886 +#: config.c:1108

1887 #, c-format

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

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

1890

1820 -#: config.c:1082

1891 +#: config.c:1117

1892 #, c-format

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

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

1895

1825 -#: config.c:1173

1896 +#: config.c:1208

1897 #, c-format

1898 msgid "abbrev length out of range: %d"

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

1900

1830 -#: config.c:1187 config.c:1198

1901 +#: config.c:1222 config.c:1233

1902 #, c-format

1903 msgid "bad zlib compression level %d"

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

1905

1835 -#: config.c:1290

1906 +#: config.c:1325

1907 msgid "core.commentChar should only be one character"

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

1909

1839 -#: config.c:1323

1910 +#: config.c:1358

1911 #, c-format

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

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

1914

1844 -#: config.c:1395

1915 +#: config.c:1430

1916 #, c-format

1917 msgid "malformed value for %s"

1918 msgstr "%s 的取值格式错误"

1919

1849 -#: config.c:1421

1920 +#: config.c:1456

1921 #, c-format

1922 msgid "malformed value for %s: %s"

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

1924

1854 -#: config.c:1422

1925 +#: config.c:1457

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

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

1928

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

1929 +#: config.c:1518 builtin/pack-objects.c:3410

1930 #, c-format

1931 msgid "bad pack compression level %d"

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

1933

1863 -#: config.c:1604

1934 +#: config.c:1639

1935 #, c-format

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

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

1938

1868 -#: config.c:1607

1939 +#: config.c:1642

1940 #, c-format

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

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

1943

1873 -#: config.c:1624

1944 +#: config.c:1659

1945 #, c-format

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

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

1948

1878 -#: config.c:1654

1949 +#: config.c:1689

1950 #, c-format

1951 msgid "failed to parse %s"

1952 msgstr "解析 %s 失败"

1953

1883 -#: config.c:1710

1954 +#: config.c:1745

1955 msgid "unable to parse command-line config"

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

1957

1887 -#: config.c:2059

1958 +#: config.c:2094

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

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

1961

1891 -#: config.c:2229

1962 +#: config.c:2264

1963 #, c-format

1964 msgid "Invalid %s: '%s'"

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

1966

1896 -#: config.c:2272

1967 +#: config.c:2307

1968 #, c-format

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

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

1971

1901 -#: config.c:2298

1972 +#: config.c:2333

1973 #, c-format

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

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

1976

1906 -#: config.c:2344

1977 +#: config.c:2379

1978 #, c-format

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

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

1981

1911 -#: config.c:2346

1982 +#: config.c:2381

1983 #, c-format

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

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

1986

1916 -#: config.c:2427

1987 +#: config.c:2462

1988 #, c-format

1989 msgid "invalid section name '%s'"

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

1991

1921 -#: config.c:2459

1992 +#: config.c:2494

1993 #, c-format

1994 msgid "%s has multiple values"

1995 msgstr "%s 有多个取值"

1996

1926 -#: config.c:2488

1997 +#: config.c:2523

1998 #, c-format

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

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

2001

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

2002 +#: config.c:2775 config.c:3099

2003 #, c-format

2004 msgid "could not lock config file %s"

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

2006

1936 -#: config.c:2751

2007 +#: config.c:2786

2008 #, c-format

2009 msgid "opening %s"

2010 msgstr "打开 %s"

2011

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

2012 +#: config.c:2821 builtin/config.c:328

2013 #, c-format

2014 msgid "invalid pattern: %s"

2015 msgstr "无效模式：%s"

2016

1946 -#: config.c:2811

2017 +#: config.c:2846

2018 #, c-format

2019 msgid "invalid config file %s"

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

2021

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

2022 +#: config.c:2859 config.c:3112

2023 #, c-format

2024 msgid "fstat on %s failed"

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

2026

1956 -#: config.c:2835

2027 +#: config.c:2870

2028 #, c-format

2029 msgid "unable to mmap '%s'"

2030 msgstr "不能 mmap '%s'"

2031

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

2032 +#: config.c:2879 config.c:3117

2033 #, c-format

2034 msgid "chmod on %s failed"

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

2036

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

2037 +#: config.c:2964 config.c:3214

2038 #, c-format

2039 msgid "could not write config file %s"

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

2041

1971 -#: config.c:2963

2042 +#: config.c:2998

2043 #, c-format

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

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

2046

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

2047 +#: config.c:3000 builtin/remote.c:782

2048 #, c-format

2049 msgid "could not unset '%s'"

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

2051

1981 -#: config.c:3055

2052 +#: config.c:3090

2053 #, c-format

2054 msgid "invalid section name: %s"

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

2056

1986 -#: config.c:3222

2057 +#: config.c:3257

2058 #, c-format

2059 msgid "missing value for '%s'"

2060 msgstr "%s 的取值缺失"

@@ -2146,19 +2217,19 @@ msgstr "已阻止奇怪的路径名 '%s'"

2217 msgid "unable to fork"

2218 msgstr "无法 fork"

2219

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

2220 +#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43

2221 msgid "Checking connectivity"

2222 msgstr "正在检查连通性"

2223

2153 -#: connected.c:97

2224 +#: connected.c:98

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

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

2227

2157 -#: connected.c:117

2228 +#: connected.c:118

2229 msgid "failed write to rev-list"

2230 msgstr "写入 rev-list 失败"

2231

2161 -#: connected.c:124

2232 +#: connected.c:125

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

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

2235

@@ -2372,7 +2443,7 @@ msgstr "未能加载 '%s' 的数据岛正则表达式：%s"

2443 msgid "island regex from config has too many capture groups (max=%d)"

2444 msgstr "来自 config 的数据岛正则表达式有太多的捕获组（最多 %d 个）"

2445

2375 -#: delta-islands.c:466

2446 +#: delta-islands.c:467

2447 #, c-format

2448 msgid "Marked %d islands, done.\n"

2449 msgstr "已标记 %d 个数据岛，结束。\n"

@@ -2445,35 +2516,35 @@ msgstr ""

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

2517 "%s"

2518

2448 -#: diff.c:4210

2519 +#: diff.c:4215

2520 #, c-format

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

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

2523

2453 -#: diff.c:4555

2524 +#: diff.c:4560

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

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

2527

2457 -#: diff.c:4558

2528 +#: diff.c:4563

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

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

2531

2461 -#: diff.c:4636

2532 +#: diff.c:4641

2533 msgid "--follow requires exactly one pathspec"

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

2535

2465 -#: diff.c:4684

2536 +#: diff.c:4689

2537 #, c-format

2538 msgid "invalid --stat value: %s"

2539 msgstr "无效的 --stat 值：%s"

2540

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

2541 +#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222

2542 #: parse-options.c:199 parse-options.c:203

2543 #, c-format

2544 msgid "%s expects a numerical value"

2545 msgstr "%s 期望一个数字值"

2546

2476 -#: diff.c:4721

2547 +#: diff.c:4726

2548 #, c-format

2549 msgid ""

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

@@ -2482,195 +2553,195 @@ msgstr ""

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

2554 "%s"

2555

2485 -#: diff.c:4806

2556 +#: diff.c:4811

2557 #, c-format

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

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

2560

2490 -#: diff.c:4830

2561 +#: diff.c:4835

2562 #, c-format

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

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

2565

2495 -#: diff.c:4844

2566 +#: diff.c:4849

2567 #, c-format

2568 msgid "unable to resolve '%s'"

2569 msgstr "不能解析 '%s'"

2570

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

2571 +#: diff.c:4899 diff.c:4905

2572 #, c-format

2573 msgid "%s expects <n>/<m> form"

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

2575

2505 -#: diff.c:4912

2576 +#: diff.c:4917

2577 #, c-format

2578 msgid "%s expects a character, got '%s'"

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

2580

2510 -#: diff.c:4933

2581 +#: diff.c:4938

2582 #, c-format

2583 msgid "bad --color-moved argument: %s"

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

2585

2515 -#: diff.c:4952

2586 +#: diff.c:4957

2587 #, c-format

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

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

2590

2520 -#: diff.c:4992

2591 +#: diff.c:4997

2592 msgid ""

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

2594 "\"histogram\""

2595 msgstr ""

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

2597

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

2598 +#: diff.c:5033 diff.c:5053

2599 #, c-format

2600 msgid "invalid argument to %s"

2601 msgstr "%s 的参数无效"

2602

2532 -#: diff.c:5186

2603 +#: diff.c:5191

2604 #, c-format

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

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

2607

2537 -#: diff.c:5242

2608 +#: diff.c:5247

2609 #, c-format

2610 msgid "bad --word-diff argument: %s"

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

2612

2542 -#: diff.c:5265

2613 +#: diff.c:5270

2614 msgid "Diff output format options"

2615 msgstr "差异输出格式化选项"

2616

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

2617 +#: diff.c:5272 diff.c:5278

2618 msgid "generate patch"

2619 msgstr "生成补丁"

2620

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

2621 +#: diff.c:5275 builtin/log.c:172

2622 msgid "suppress diff output"

2623 msgstr "不显示差异输出"

2624

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

2625 +#: diff.c:5280 diff.c:5394 diff.c:5401

2626 msgid "<n>"

2627 msgstr "<n>"

2628

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

2629 +#: diff.c:5281 diff.c:5284

2630 msgid "generate diffs with <n> lines context"

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

2632

2562 -#: diff.c:5281

2633 +#: diff.c:5286

2634 msgid "generate the diff in raw format"

2635 msgstr "生成原始格式的差异"

2636

2566 -#: diff.c:5284

2637 +#: diff.c:5289

2638 msgid "synonym for '-p --raw'"

2639 msgstr "和 '-p --raw' 同义"

2640

2570 -#: diff.c:5288

2641 +#: diff.c:5293

2642 msgid "synonym for '-p --stat'"

2643 msgstr "和 '-p --stat' 同义"

2644

2574 -#: diff.c:5292

2645 +#: diff.c:5297

2646 msgid "machine friendly --stat"

2647 msgstr "机器友好的 --stat"

2648

2578 -#: diff.c:5295

2649 +#: diff.c:5300

2650 msgid "output only the last line of --stat"

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

2652

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

2653 +#: diff.c:5302 diff.c:5310

2654 msgid "<param1,param2>..."

2655 msgstr "<参数1,参数2>..."

2656

2586 -#: diff.c:5298

2657 +#: diff.c:5303

2658 msgid ""

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

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

2661

2591 -#: diff.c:5302

2662 +#: diff.c:5307

2663 msgid "synonym for --dirstat=cumulative"

2664 msgstr "和 --dirstat=cumulative 同义"

2665

2595 -#: diff.c:5306

2666 +#: diff.c:5311

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

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

2669

2599 -#: diff.c:5310

2670 +#: diff.c:5315

2671 msgid "warn if changes introduce conflict markers or whitespace errors"

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

2673

2603 -#: diff.c:5313

2674 +#: diff.c:5318

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

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

2677

2607 -#: diff.c:5316

2678 +#: diff.c:5321

2679 msgid "show only names of changed files"

2680 msgstr "只显示变更文件的文件名"

2681

2611 -#: diff.c:5319

2682 +#: diff.c:5324

2683 msgid "show only names and status of changed files"

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

2685

2615 -#: diff.c:5321

2686 +#: diff.c:5326

2687 msgid "<width>[,<name-width>[,<count>]]"

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

2689

2619 -#: diff.c:5322

2690 +#: diff.c:5327

2691 msgid "generate diffstat"

2692 msgstr "生成差异统计（diffstat）"

2693

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

2694 +#: diff.c:5329 diff.c:5332 diff.c:5335

2695 msgid "<width>"

2696 msgstr "<宽度>"

2697

2627 -#: diff.c:5325

2698 +#: diff.c:5330

2699 msgid "generate diffstat with a given width"

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

2701

2631 -#: diff.c:5328

2702 +#: diff.c:5333

2703 msgid "generate diffstat with a given name width"

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

2705

2635 -#: diff.c:5331

2706 +#: diff.c:5336

2707 msgid "generate diffstat with a given graph width"

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

2709

2639 -#: diff.c:5333

2710 +#: diff.c:5338

2711 msgid "<count>"

2712 msgstr "<次数>"

2713

2643 -#: diff.c:5334

2714 +#: diff.c:5339

2715 msgid "generate diffstat with limited lines"

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

2717

2647 -#: diff.c:5337

2718 +#: diff.c:5342

2719 msgid "generate compact summary in diffstat"

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

2721

2651 -#: diff.c:5340

2722 +#: diff.c:5345

2723 msgid "output a binary diff that can be applied"

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

2725

2655 -#: diff.c:5343

2726 +#: diff.c:5348

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

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

2729

2659 -#: diff.c:5345

2730 +#: diff.c:5350

2731 msgid "show colored diff"

2732 msgstr "显示带颜色的差异"

2733

2663 -#: diff.c:5346

2734 +#: diff.c:5351

2735 msgid "<kind>"

2736 msgstr "<类型>"

2737

2667 -#: diff.c:5347

2738 +#: diff.c:5352

2739 msgid ""

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

2741 "diff"

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

2743

2673 -#: diff.c:5350

2744 +#: diff.c:5355

2745 msgid ""

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

2747 "--numstat"

@@ -2678,295 +2749,295 @@ msgstr ""

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

2750 "符"

2751

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

2752 +#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470

2753 msgid "<prefix>"

2754 msgstr "<前缀>"

2755

2685 -#: diff.c:5354

2756 +#: diff.c:5359

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

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

2759

2689 -#: diff.c:5357

2760 +#: diff.c:5362

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

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

2763

2693 -#: diff.c:5360

2764 +#: diff.c:5365

2765 msgid "prepend an additional prefix to every line of output"

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

2767

2697 -#: diff.c:5363

2768 +#: diff.c:5368

2769 msgid "do not show any source or destination prefix"

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

2771

2701 -#: diff.c:5366

2772 +#: diff.c:5371

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

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

2775

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

2776 +#: diff.c:5375 diff.c:5380 diff.c:5385

2777 msgid "<char>"

2778 msgstr "<字符>"

2779

2709 -#: diff.c:5371

2780 +#: diff.c:5376

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

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

2783

2713 -#: diff.c:5376

2784 +#: diff.c:5381

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

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

2787

2717 -#: diff.c:5381

2788 +#: diff.c:5386

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

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

2791

2721 -#: diff.c:5384

2792 +#: diff.c:5389

2793 msgid "Diff rename options"

2794 msgstr "差异重命名选项"

2795

2725 -#: diff.c:5385

2796 +#: diff.c:5390

2797 msgid "<n>[/<m>]"

2798 msgstr "<n>[/<m>]"

2799

2729 -#: diff.c:5386

2800 +#: diff.c:5391

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

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

2803

2733 -#: diff.c:5390

2804 +#: diff.c:5395

2805 msgid "detect renames"

2806 msgstr "检测重命名"

2807

2737 -#: diff.c:5394

2808 +#: diff.c:5399

2809 msgid "omit the preimage for deletes"

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

2811

2741 -#: diff.c:5397

2812 +#: diff.c:5402

2813 msgid "detect copies"

2814 msgstr "检测拷贝"

2815

2745 -#: diff.c:5401

2816 +#: diff.c:5406

2817 msgid "use unmodified files as source to find copies"

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

2819

2749 -#: diff.c:5403

2820 +#: diff.c:5408

2821 msgid "disable rename detection"

2822 msgstr "禁用重命名探测"

2823

2753 -#: diff.c:5406

2824 +#: diff.c:5411

2825 msgid "use empty blobs as rename source"

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

2827

2757 -#: diff.c:5408

2828 +#: diff.c:5413

2829 msgid "continue listing the history of a file beyond renames"

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

2831

2761 -#: diff.c:5411

2832 +#: diff.c:5416

2833 msgid ""

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

2835 "given limit"

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

2837

2767 -#: diff.c:5413

2838 +#: diff.c:5418

2839 msgid "Diff algorithm options"

2840 msgstr "差异算法选项"

2841

2771 -#: diff.c:5415

2842 +#: diff.c:5420

2843 msgid "produce the smallest possible diff"

2844 msgstr "生成尽可能小的差异"

2845

2775 -#: diff.c:5418

2846 +#: diff.c:5423

2847 msgid "ignore whitespace when comparing lines"

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

2849

2779 -#: diff.c:5421

2850 +#: diff.c:5426

2851 msgid "ignore changes in amount of whitespace"

2852 msgstr "忽略空白字符的变更"

2853

2783 -#: diff.c:5424

2854 +#: diff.c:5429

2855 msgid "ignore changes in whitespace at EOL"

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

2857

2787 -#: diff.c:5427

2858 +#: diff.c:5432

2859 msgid "ignore carrier-return at the end of line"

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

2861

2791 -#: diff.c:5430

2862 +#: diff.c:5435

2863 msgid "ignore changes whose lines are all blank"

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

2865

2795 -#: diff.c:5433

2866 +#: diff.c:5438

2867 msgid "heuristic to shift diff hunk boundaries for easy reading"

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

2869

2799 -#: diff.c:5436

2870 +#: diff.c:5441

2871 msgid "generate diff using the \"patience diff\" algorithm"

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

2873

2803 -#: diff.c:5440

2874 +#: diff.c:5445

2875 msgid "generate diff using the \"histogram diff\" algorithm"

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

2877

2807 -#: diff.c:5442

2878 +#: diff.c:5447

2879 msgid "<algorithm>"

2880 msgstr "<算法>"

2881

2811 -#: diff.c:5443

2882 +#: diff.c:5448

2883 msgid "choose a diff algorithm"

2884 msgstr "选择一个差异算法"

2885

2815 -#: diff.c:5445

2886 +#: diff.c:5450

2887 msgid "<text>"

2888 msgstr "<文本>"

2889

2819 -#: diff.c:5446

2890 +#: diff.c:5451

2891 msgid "generate diff using the \"anchored diff\" algorithm"

2892 msgstr "使用 \"anchored diff\" 算法生成差异"

2893

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

2894 +#: diff.c:5453 diff.c:5462 diff.c:5465

2895 msgid "<mode>"

2896 msgstr "<模式>"

2897

2827 -#: diff.c:5449

2898 +#: diff.c:5454

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

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

2901

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

2902 +#: diff.c:5456 diff.c:5459 diff.c:5504

2903 msgid "<regex>"

2904 msgstr "<正则>"

2905

2835 -#: diff.c:5452

2906 +#: diff.c:5457

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

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

2909

2839 -#: diff.c:5455

2910 +#: diff.c:5460

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

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

2913

2843 -#: diff.c:5458

2914 +#: diff.c:5463

2915 msgid "moved lines of code are colored differently"

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

2917

2847 -#: diff.c:5461

2918 +#: diff.c:5466

2919 msgid "how white spaces are ignored in --color-moved"

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

2921

2851 -#: diff.c:5464

2922 +#: diff.c:5469

2923 msgid "Other diff options"

2924 msgstr "其它差异选项"

2925

2855 -#: diff.c:5466

2926 +#: diff.c:5471

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

2928 msgstr "当从子目录运行，排除目录之外的变更并显示相对路径"

2929

2859 -#: diff.c:5470

2930 +#: diff.c:5475

2931 msgid "treat all files as text"

2932 msgstr "把所有文件当做文本处理"

2933

2863 -#: diff.c:5472

2934 +#: diff.c:5477

2935 msgid "swap two inputs, reverse the diff"

2936 msgstr "交换两个输入，反转差异"

2937

2867 -#: diff.c:5474

2938 +#: diff.c:5479

2939 msgid "exit with 1 if there were differences, 0 otherwise"

2940 msgstr "有差异时退出码为 1，否则为 0"

2941

2871 -#: diff.c:5476

2942 +#: diff.c:5481

2943 msgid "disable all output of the program"

2944 msgstr "禁用本程序的所有输出"

2945

2875 -#: diff.c:5478

2946 +#: diff.c:5483

2947 msgid "allow an external diff helper to be executed"

2948 msgstr "允许执行一个外置的差异助手"

2949

2879 -#: diff.c:5480

2950 +#: diff.c:5485

2951 msgid "run external text conversion filters when comparing binary files"

2952 msgstr "当比较二进制文件时，运行外部的文本转换过滤器"

2953

2883 -#: diff.c:5482

2954 +#: diff.c:5487

2955 msgid "<when>"

2956 msgstr "<何时>"

2957

2887 -#: diff.c:5483

2958 +#: diff.c:5488

2959 msgid "ignore changes to submodules in the diff generation"

2960 msgstr "在生成差异时，忽略子模组的更改"

2961

2891 -#: diff.c:5486

2962 +#: diff.c:5491

2963 msgid "<format>"

2964 msgstr "<格式>"

2965

2895 -#: diff.c:5487

2966 +#: diff.c:5492

2967 msgid "specify how differences in submodules are shown"

2968 msgstr "指定子模组的差异如何显示"

2969

2899 -#: diff.c:5491

2970 +#: diff.c:5496

2971 msgid "hide 'git add -N' entries from the index"

2972 msgstr "隐藏索引中 'git add -N' 条目"

2973

2903 -#: diff.c:5494

2974 +#: diff.c:5499

2975 msgid "treat 'git add -N' entries as real in the index"

2976 msgstr "将索引中 'git add -N' 条目当做真实的"

2977

2907 -#: diff.c:5496

2978 +#: diff.c:5501

2979 msgid "<string>"

2980 msgstr "<字符串>"

2981

2911 -#: diff.c:5497

2982 +#: diff.c:5502

2983 msgid ""

2984 "look for differences that change the number of occurrences of the specified "

2985 "string"

2986 msgstr "查找改变了指定字符串出现次数的差异"

2987

2917 -#: diff.c:5500

2988 +#: diff.c:5505

2989 msgid ""

2990 "look for differences that change the number of occurrences of the specified "

2991 "regex"

2992 msgstr "查找改变指定正则匹配出现次数的差异"

2993

2923 -#: diff.c:5503

2994 +#: diff.c:5508

2995 msgid "show all changes in the changeset with -S or -G"

2996 msgstr "显示使用 -S 或 -G 的变更集的所有变更"

2997

2927 -#: diff.c:5506

2998 +#: diff.c:5511

2999 msgid "treat <string> in -S as extended POSIX regular expression"

3000 msgstr "将 -S 的 <string> 当做扩展的 POSIX 正则表达式"

3001

2931 -#: diff.c:5509

3002 +#: diff.c:5514

3003 msgid "control the order in which files appear in the output"

3004 msgstr "控制输出中的文件显示顺序"

3005

2935 -#: diff.c:5510

3006 +#: diff.c:5515

3007 msgid "<object-id>"

3008 msgstr "<对象 ID>"

3009

2939 -#: diff.c:5511

3010 +#: diff.c:5516

3011 msgid ""

3012 "look for differences that change the number of occurrences of the specified "

3013 "object"

3014 msgstr "查找改变指定对象出现次数的差异"

3015

2945 -#: diff.c:5513

3016 +#: diff.c:5518

3017 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"

3018 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"

3019

2949 -#: diff.c:5514

3020 +#: diff.c:5519

3021 msgid "select files by diff type"

3022 msgstr "通过差异类型选择文件"

3023

2953 -#: diff.c:5516

3024 +#: diff.c:5521

3025 msgid "<file>"

3026 msgstr "<文件>"

3027

2957 -#: diff.c:5517

3028 +#: diff.c:5522

3029 msgid "Output to a specific file"

3030 msgstr "输出到一个指定的文件"

3031

2961 -#: diff.c:6150

3032 +#: diff.c:6177

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

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

3035

2965 -#: diff.c:6153

3036 +#: diff.c:6180

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

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

3039

2969 -#: diff.c:6156

3040 +#: diff.c:6183

3041 #, c-format

3042 msgid ""

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

@@ -3068,32 +3139,32 @@ msgstr "无法写到远程"

3139 msgid "--stateless-rpc requires multi_ack_detailed"

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

3141

3071 -#: fetch-pack.c:360 fetch-pack.c:1271

3142 +#: fetch-pack.c:360 fetch-pack.c:1284

3143 #, c-format

3144 msgid "invalid shallow line: %s"

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

3146

3076 -#: fetch-pack.c:366 fetch-pack.c:1277

3147 +#: fetch-pack.c:366 fetch-pack.c:1290

3148 #, c-format

3149 msgid "invalid unshallow line: %s"

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

3151

3081 -#: fetch-pack.c:368 fetch-pack.c:1279

3152 +#: fetch-pack.c:368 fetch-pack.c:1292

3153 #, c-format

3154 msgid "object not found: %s"

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

3156

3086 -#: fetch-pack.c:371 fetch-pack.c:1282

3157 +#: fetch-pack.c:371 fetch-pack.c:1295

3158 #, c-format

3159 msgid "error in object: %s"

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

3161

3091 -#: fetch-pack.c:373 fetch-pack.c:1284

3162 +#: fetch-pack.c:373 fetch-pack.c:1297

3163 #, c-format

3164 msgid "no shallow found: %s"

3165 msgstr "未发现 shallow：%s"

3166

3096 -#: fetch-pack.c:376 fetch-pack.c:1288

3167 +#: fetch-pack.c:376 fetch-pack.c:1301

3168 #, c-format

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

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

@@ -3112,7 +3183,7 @@ msgstr "无效提交 %s"

3183 msgid "giving up"

3184 msgstr "放弃"

3185

3115 -#: fetch-pack.c:477 progress.c:284

3186 +#: fetch-pack.c:477 progress.c:277

3187 msgid "done"

3188 msgstr "完成"

3189

@@ -3153,154 +3224,130 @@ msgstr "%s 失败"

3224 msgid "error in sideband demultiplexer"

3225 msgstr "sideband 多路输出出错"

3226

3156 -#: fetch-pack.c:906

3157 -msgid "Server does not support shallow clients"

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

3159 -

3160 -#: fetch-pack.c:910

3161 -msgid "Server supports multi_ack_detailed"

3162 -msgstr "服务器支持 multi_ack_detailed"

3163 -

3164 -#: fetch-pack.c:913

3165 -msgid "Server supports no-done"

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

3167 -

3168 -#: fetch-pack.c:919

3169 -msgid "Server supports multi_ack"

3170 -msgstr "服务器支持 multi_ack"

3171 -

3172 -#: fetch-pack.c:923

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

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

3175 -

3176 -#: fetch-pack.c:927

3177 -msgid "Server supports side-band"

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

3179 -

3180 -#: fetch-pack.c:931

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

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

3183 -

3184 -#: fetch-pack.c:935

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

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

3187 -

3188 -#: fetch-pack.c:945

3189 -msgid "Server supports ofs-delta"

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

3191 -

3192 -#: fetch-pack.c:951 fetch-pack.c:1144

3193 -msgid "Server supports filter"

3194 -msgstr "服务器支持 filter"

3195 -

3196 -#: fetch-pack.c:959

3227 +#: fetch-pack.c:908

3228 #, c-format

3229 msgid "Server version is %.*s"

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

3231

3201 -#: fetch-pack.c:965

3232 +#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928

3233 +#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944

3234 +#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960

3235 +#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982

3236 +#, c-format

3237 +msgid "Server supports %s"

3238 +msgstr "服务器支持 %s"

3239 +

3240 +#: fetch-pack.c:915

3241 +msgid "Server does not support shallow clients"

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

3243 +

3244 +#: fetch-pack.c:975

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

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

3247

3205 -#: fetch-pack.c:969

3248 +#: fetch-pack.c:980

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

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

3251

3209 -#: fetch-pack.c:971

3252 +#: fetch-pack.c:984

3253 msgid "Server does not support --deepen"

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

3255

3213 -#: fetch-pack.c:988

3256 +#: fetch-pack.c:1001

3257 msgid "no common commits"

3258 msgstr "没有共同的提交"

3259

3217 -#: fetch-pack.c:1000 fetch-pack.c:1449

3260 +#: fetch-pack.c:1013 fetch-pack.c:1462

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

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

3263

3221 -#: fetch-pack.c:1138

3264 +#: fetch-pack.c:1151

3265 msgid "Server does not support shallow requests"

3266 msgstr "服务器不支持 shalllow 请求"

3267

3225 -#: fetch-pack.c:1171

3268 +#: fetch-pack.c:1157

3269 +msgid "Server supports filter"

3270 +msgstr "服务器支持 filter"

3271 +

3272 +#: fetch-pack.c:1184

3273 msgid "unable to write request to remote"

3274 msgstr "无法将请求写到远程"

3275

3229 -#: fetch-pack.c:1189

3276 +#: fetch-pack.c:1202

3277 #, c-format

3278 msgid "error reading section header '%s'"

3279 msgstr "读取节标题 '%s' 出错"

3280

3234 -#: fetch-pack.c:1195

3281 +#: fetch-pack.c:1208

3282 #, c-format

3283 msgid "expected '%s', received '%s'"

3284 msgstr "预期 '%s'，得到 '%s'"

3285

3239 -#: fetch-pack.c:1234

3286 +#: fetch-pack.c:1247

3287 #, c-format

3288 msgid "unexpected acknowledgment line: '%s'"

3289 msgstr "意外的确认行：'%s'"

3290

3244 -#: fetch-pack.c:1239

3291 +#: fetch-pack.c:1252

3292 #, c-format

3293 msgid "error processing acks: %d"

3294 msgstr "处理 ack 出错：%d"

3295

3249 -#: fetch-pack.c:1249

3296 +#: fetch-pack.c:1262

3297 msgid "expected packfile to be sent after 'ready'"

3298 msgstr "预期在 'ready' 之后发送 packfile"

3299

3253 -#: fetch-pack.c:1251

3300 +#: fetch-pack.c:1264

3301 msgid "expected no other sections to be sent after no 'ready'"

3302 msgstr "在没有 'ready' 不应该发送其它小节"

3303

3257 -#: fetch-pack.c:1293

3304 +#: fetch-pack.c:1306

3305 #, c-format

3306 msgid "error processing shallow info: %d"

3307 msgstr "处理浅克隆信息出错：%d"

3308

3262 -#: fetch-pack.c:1340

3309 +#: fetch-pack.c:1353

3310 #, c-format

3311 msgid "expected wanted-ref, got '%s'"

3312 msgstr "预期 wanted-ref，得到 '%s'"

3313

3267 -#: fetch-pack.c:1345

3314 +#: fetch-pack.c:1358

3315 #, c-format

3316 msgid "unexpected wanted-ref: '%s'"

3317 msgstr "意外的 wanted-ref：'%s'"

3318

3272 -#: fetch-pack.c:1350

3319 +#: fetch-pack.c:1363

3320 #, c-format

3321 msgid "error processing wanted refs: %d"

3322 msgstr "处理要获取的引用出错：%d"

3323

3277 -#: fetch-pack.c:1676

3324 +#: fetch-pack.c:1689

3325 msgid "no matching remote head"

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

3327

3281 -#: fetch-pack.c:1699 builtin/clone.c:673

3328 +#: fetch-pack.c:1712 builtin/clone.c:686

3329 msgid "remote did not send all necessary objects"

3330 msgstr "远程没有发送所有必需的对象"

3331

3285 -#: fetch-pack.c:1726

3332 +#: fetch-pack.c:1739

3333 #, c-format

3334 msgid "no such remote ref %s"

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

3336

3290 -#: fetch-pack.c:1729

3337 +#: fetch-pack.c:1742

3338 #, c-format

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

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

3341

3295 -#: gpg-interface.c:318

3342 +#: gpg-interface.c:321

3343 msgid "gpg failed to sign the data"

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

3345

3299 -#: gpg-interface.c:344

3346 +#: gpg-interface.c:347

3347 msgid "could not create temporary file"

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

3349

3303 -#: gpg-interface.c:347

3350 +#: gpg-interface.c:350

3351 #, c-format

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

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

@@ -3310,18 +3357,18 @@ msgstr "无法将分离式签名写入 '%s'"

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

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

3359

3313 -#: grep.c:2113

3360 +#: grep.c:2117

3361 #, c-format

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

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

3364

3318 -#: grep.c:2130 setup.c:164 builtin/clone.c:411 builtin/diff.c:82

3365 +#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82

3366 #: builtin/rm.c:135

3367 #, c-format

3368 msgid "failed to stat '%s'"

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

3370

3324 -#: grep.c:2141

3371 +#: grep.c:2145

3372 #, c-format

3373 msgid "'%s': short read"

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

@@ -3391,7 +3438,7 @@ msgstr "在 $PATH 路径中的其他地方可用的 git 命令"

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

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

3440

3394 -#: help.c:363 git.c:97

3441 +#: help.c:363 git.c:98

3442 #, c-format

3443 msgid "unsupported command listing type '%s'"

3444 msgstr "不支持的命令列表类型 '%s'"

@@ -3535,7 +3582,7 @@ msgstr "不允许空的姓名（对于 <%s>）"

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

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

3584

3538 -#: ident.c:436 builtin/commit.c:608

3585 +#: ident.c:436 builtin/commit.c:611

3586 #, c-format

3587 msgid "invalid date format: %s"

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

@@ -3567,6 +3614,11 @@ msgstr "期望 'tree:<深度>'"

3614 msgid "sparse:path filters support has been dropped"

3615 msgstr "sparse:path 过滤器支持已被删除"

3616

3617 +#: list-objects-filter-options.c:94

3618 +#, c-format

3619 +msgid "invalid filter-spec '%s'"

3620 +msgstr "无效的过滤器表达式 '%s'"

3621 +

3622 #: list-objects-filter-options.c:158

3623 msgid "cannot change partial clone promisor remote"

3624 msgstr "无法修改部分克隆的 promisor 远程仓库"

@@ -3598,8 +3650,8 @@ msgstr "不能创建 '%s.lock'：%s"

3650 msgid "failed to read the cache"

3651 msgstr "读取缓存失败"

3652

3601 -#: merge.c:107 rerere.c:720 builtin/am.c:1887 builtin/am.c:1921

3602 -#: builtin/checkout.c:461 builtin/checkout.c:811 builtin/clone.c:773

3653 +#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919

3654 +#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786

3655 #: builtin/stash.c:264

3656 msgid "unable to write new index file"

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

@@ -3622,90 +3674,90 @@ msgstr "add_cacheinfo 无法刷新路径 '%s'，合并终止。"

3674 msgid "error building trees"

3675 msgstr "创建树出错"

3676

3625 -#: merge-recursive.c:861

3677 +#: merge-recursive.c:863

3678 #, c-format

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

3680 msgstr "创建路径 '%s'%s 失败"

3681

3630 -#: merge-recursive.c:872

3682 +#: merge-recursive.c:874

3683 #, c-format

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

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

3686

3635 -#: merge-recursive.c:886 merge-recursive.c:905

3687 +#: merge-recursive.c:888 merge-recursive.c:907

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

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

3690

3639 -#: merge-recursive.c:895

3691 +#: merge-recursive.c:897

3692 #, c-format

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

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

3695

3644 -#: merge-recursive.c:936 builtin/cat-file.c:40

3696 +#: merge-recursive.c:938 builtin/cat-file.c:40

3697 #, c-format

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

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

3700

3649 -#: merge-recursive.c:939

3701 +#: merge-recursive.c:941

3702 #, c-format

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

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

3705

3654 -#: merge-recursive.c:963

3706 +#: merge-recursive.c:965

3707 #, c-format

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

3709 msgstr "打开 '%s' 失败：%s"

3710

3659 -#: merge-recursive.c:974

3711 +#: merge-recursive.c:976

3712 #, c-format

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

3714 msgstr "创建符号链接 '%s' 失败：%s"

3715

3664 -#: merge-recursive.c:979

3716 +#: merge-recursive.c:981

3717 #, c-format

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

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

3720

3669 -#: merge-recursive.c:1175

3721 +#: merge-recursive.c:1177

3722 #, c-format

3723 msgid "Failed to merge submodule %s (not checked out)"

3724 msgstr "无法合并子模组 %s （没有检出）"

3725

3674 -#: merge-recursive.c:1182

3726 +#: merge-recursive.c:1184

3727 #, c-format

3728 msgid "Failed to merge submodule %s (commits not present)"

3729 msgstr "无法合并子模组 %s（提交不存在）"

3730

3679 -#: merge-recursive.c:1189

3731 +#: merge-recursive.c:1191

3732 #, c-format

3733 msgid "Failed to merge submodule %s (commits don't follow merge-base)"

3734 msgstr "无法合并子模组 %s （提交未跟随合并基线）"

3735

3684 -#: merge-recursive.c:1197 merge-recursive.c:1209

3736 +#: merge-recursive.c:1199 merge-recursive.c:1211

3737 #, c-format

3738 msgid "Fast-forwarding submodule %s to the following commit:"

3739 msgstr "子模组 %s 快进到如下提交："

3740

3689 -#: merge-recursive.c:1200 merge-recursive.c:1212

3741 +#: merge-recursive.c:1202 merge-recursive.c:1214

3742 #, c-format

3743 msgid "Fast-forwarding submodule %s"

3744 msgstr "快进子模组 %s"

3745

3694 -#: merge-recursive.c:1235

3746 +#: merge-recursive.c:1237

3747 #, c-format

3748 msgid "Failed to merge submodule %s (merge following commits not found)"

3749 msgstr "无法合并子模组 %s （没发现合并跟随的提交）"

3750

3699 -#: merge-recursive.c:1239

3751 +#: merge-recursive.c:1241

3752 #, c-format

3753 msgid "Failed to merge submodule %s (not fast-forward)"

3754 msgstr "无法合并子模组 %s（非快进）"

3755

3704 -#: merge-recursive.c:1240

3756 +#: merge-recursive.c:1242

3757 msgid "Found a possible merge resolution for the submodule:\n"

3758 msgstr "找到子模组的一个可能的合并方案：\n"

3759

3708 -#: merge-recursive.c:1243

3760 +#: merge-recursive.c:1245

3761 #, c-format

3762 msgid ""

3763 "If this is correct simply add it to the index for example\n"

@@ -3721,31 +3773,31 @@ msgstr ""

3773 "\n"

3774 "以接受此建议。\n"

3775

3724 -#: merge-recursive.c:1252

3776 +#: merge-recursive.c:1254

3777 #, c-format

3778 msgid "Failed to merge submodule %s (multiple merges found)"

3779 msgstr "无法合并子模组 %s （发现多个合并）"

3780

3729 -#: merge-recursive.c:1325

3781 +#: merge-recursive.c:1327

3782 msgid "Failed to execute internal merge"

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

3784

3733 -#: merge-recursive.c:1330

3785 +#: merge-recursive.c:1332

3786 #, c-format

3787 msgid "Unable to add %s to database"

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

3789

3738 -#: merge-recursive.c:1362

3790 +#: merge-recursive.c:1364

3791 #, c-format

3792 msgid "Auto-merging %s"

3793 msgstr "自动合并 %s"

3794

3743 -#: merge-recursive.c:1385

3795 +#: merge-recursive.c:1387

3796 #, c-format

3797 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."

3798 msgstr "错误：拒绝丢失未跟踪文件 '%s'，而是写入 %s。"

3799

3748 -#: merge-recursive.c:1457

3800 +#: merge-recursive.c:1459

3801 #, c-format

3802 msgid ""

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

@@ -3754,7 +3806,7 @@ msgstr ""

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

3807 "本被保留。"

3808

3757 -#: merge-recursive.c:1462

3809 +#: merge-recursive.c:1464

3810 #, c-format

3811 msgid ""

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

@@ -3763,7 +3815,7 @@ msgstr ""

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

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

3817

3766 -#: merge-recursive.c:1469

3818 +#: merge-recursive.c:1471

3819 #, c-format

3820 msgid ""

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

@@ -3772,7 +3824,7 @@ msgstr ""

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

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

3826

3775 -#: merge-recursive.c:1474

3827 +#: merge-recursive.c:1476

3828 #, c-format

3829 msgid ""

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

@@ -3781,40 +3833,40 @@ msgstr ""

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

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

3835

3784 -#: merge-recursive.c:1509

3836 +#: merge-recursive.c:1511

3837 msgid "rename"

3838 msgstr "重命名"

3839

3788 -#: merge-recursive.c:1509

3840 +#: merge-recursive.c:1511

3841 msgid "renamed"

3842 msgstr "重命名"

3843

3792 -#: merge-recursive.c:1589 merge-recursive.c:2445 merge-recursive.c:3085

3844 +#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094

3845 #, c-format

3846 msgid "Refusing to lose dirty file at %s"

3847 msgstr "拒绝丢失脏文件 '%s'"

3848

3797 -#: merge-recursive.c:1599

3849 +#: merge-recursive.c:1601

3850 #, c-format

3851 msgid "Refusing to lose untracked file at %s, even though it's in the way."

3852 msgstr "拒绝在 '%s' 处失去未跟踪文件，即使它存在于重命名中。"

3853

3802 -#: merge-recursive.c:1657

3854 +#: merge-recursive.c:1659

3855 #, c-format

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

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

3858

3807 -#: merge-recursive.c:1687

3859 +#: merge-recursive.c:1690

3860 #, c-format

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

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

3863

3812 -#: merge-recursive.c:1692

3864 +#: merge-recursive.c:1695

3865 #, c-format

3866 msgid "Refusing to lose untracked file at %s; adding as %s instead"

3867 msgstr "拒绝丢失未跟踪文件 '%s'，而是添加为 %s"

3868

3817 -#: merge-recursive.c:1711

3869 +#: merge-recursive.c:1714

3870 #, c-format

3871 msgid ""

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

@@ -3823,18 +3875,18 @@ msgstr ""

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

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

3877

3826 -#: merge-recursive.c:1716

3878 +#: merge-recursive.c:1719

3879 msgid " (left unresolved)"

3880 msgstr "（留下未解决）"

3881

3830 -#: merge-recursive.c:1825

3882 +#: merge-recursive.c:1828

3883 #, c-format

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

3885 msgstr ""

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

3887 "%5$s"

3888

3837 -#: merge-recursive.c:2030

3889 +#: merge-recursive.c:2035

3890 #, c-format

3891 msgid ""

3892 "CONFLICT (directory rename split): Unclear where to place %s because "

@@ -3844,7 +3896,7 @@ msgstr ""

3896 "冲突（分割的目录重命名）：不清楚 %s 应该放在哪里，因为目录 %s 被重命名到多个"

3897 "其它目录，没有目录包含大部分文件。"

3898

3847 -#: merge-recursive.c:2062

3899 +#: merge-recursive.c:2067

3900 #, c-format

3901 msgid ""

3902 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "

@@ -3853,7 +3905,7 @@ msgstr ""

3905 "冲突（隐式目录重命名）：处于隐式目录重命名的现存文件/目录 %s，将以下路径放"

3906 "在：%s。"

3907

3856 -#: merge-recursive.c:2072

3908 +#: merge-recursive.c:2077

3909 #, c-format

3910 msgid ""

3911 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "

@@ -3862,7 +3914,7 @@ msgstr ""

3914 "冲突（隐式目录重命名）：无法映射一个以上路径到 %s，隐式目录重命名尝试将这些路"

3915 "径放置于此：%s"

3916

3865 -#: merge-recursive.c:2164

3917 +#: merge-recursive.c:2169

3918 #, c-format

3919 msgid ""

3920 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"

@@ -3871,59 +3923,59 @@ msgstr ""

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

3924 "%4$s->%5$s"

3925

3874 -#: merge-recursive.c:2408

3926 +#: merge-recursive.c:2413

3927 #, c-format

3928 msgid ""

3929 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "

3930 "renamed."

3931 msgstr "警告：避免应用 %s -> %s 的重命名到 %s，因为 %s 本身已被重命名。"

3932

3881 -#: merge-recursive.c:2929

3933 +#: merge-recursive.c:2938

3934 #, c-format

3935 msgid "cannot read object %s"

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

3937

3886 -#: merge-recursive.c:2932

3938 +#: merge-recursive.c:2941

3939 #, c-format

3940 msgid "object %s is not a blob"

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

3942

3891 -#: merge-recursive.c:2996

3943 +#: merge-recursive.c:3005

3944 msgid "modify"

3945 msgstr "修改"

3946

3895 -#: merge-recursive.c:2996

3947 +#: merge-recursive.c:3005

3948 msgid "modified"

3949 msgstr "修改"

3950

3899 -#: merge-recursive.c:3008

3951 +#: merge-recursive.c:3017

3952 msgid "content"

3953 msgstr "内容"

3954

3903 -#: merge-recursive.c:3012

3955 +#: merge-recursive.c:3021

3956 msgid "add/add"

3957 msgstr "添加/添加"

3958

3907 -#: merge-recursive.c:3035

3959 +#: merge-recursive.c:3044

3960 #, c-format

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

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

3963

3912 -#: merge-recursive.c:3057 git-submodule.sh:937

3964 +#: merge-recursive.c:3066 git-submodule.sh:937

3965 msgid "submodule"

3966 msgstr "子模组"

3967

3916 -#: merge-recursive.c:3058

3968 +#: merge-recursive.c:3067

3969 #, c-format

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

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

3972

3921 -#: merge-recursive.c:3088

3973 +#: merge-recursive.c:3097

3974 #, c-format

3975 msgid "Adding as %s instead"

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

3977

3926 -#: merge-recursive.c:3170

3978 +#: merge-recursive.c:3179

3979 #, c-format

3980 msgid ""

3981 "Path updated: %s added in %s inside a directory that was renamed in %s; "

@@ -3931,7 +3983,7 @@ msgid ""

3983 msgstr ""

3984 "路径已更新：%s 添加到 %s，位于一个被重命名到 %s 的目录中，将其移动到 %s。"

3985

3934 -#: merge-recursive.c:3173

3986 +#: merge-recursive.c:3182

3987 #, c-format

3988 msgid ""

3989 "CONFLICT (file location): %s added in %s inside a directory that was renamed "

@@ -3940,7 +3992,7 @@ msgstr ""

3992 "冲突（文件位置）：%s 添加到 %s，位于一个被重命名为 %s 的目录中，建议将其移动"

3993 "到 %s。"

3994

3943 -#: merge-recursive.c:3177

3995 +#: merge-recursive.c:3186

3996 #, c-format

3997 msgid ""

3998 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "

@@ -3949,7 +4001,7 @@ msgstr ""

4001 "路径已更新：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，将其移"

4002 "动到 %5$s。"

4003

3952 -#: merge-recursive.c:3180

4004 +#: merge-recursive.c:3189

4005 #, c-format

4006 msgid ""

4007 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "

@@ -3958,35 +4010,35 @@ msgstr ""

4010 "冲突（文件位置）：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，"

4011 "建议将其移动到 %5$s。"

4012

3961 -#: merge-recursive.c:3294

4013 +#: merge-recursive.c:3303

4014 #, c-format

4015 msgid "Removing %s"

4016 msgstr "删除 %s"

4017

3966 -#: merge-recursive.c:3317

4018 +#: merge-recursive.c:3326

4019 msgid "file/directory"

4020 msgstr "文件/目录"

4021

3970 -#: merge-recursive.c:3322

4022 +#: merge-recursive.c:3331

4023 msgid "directory/file"

4024 msgstr "目录/文件"

4025

3974 -#: merge-recursive.c:3329

4026 +#: merge-recursive.c:3338

4027 #, c-format

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

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

4030

3979 -#: merge-recursive.c:3338

4031 +#: merge-recursive.c:3347

4032 #, c-format

4033 msgid "Adding %s"

4034 msgstr "添加 %s"

4035

3984 -#: merge-recursive.c:3347

4036 +#: merge-recursive.c:3356

4037 #, c-format

4038 msgid "CONFLICT (add/add): Merge conflict in %s"

4039 msgstr "冲突（add/add）：合并冲突于 %s"

4040

3989 -#: merge-recursive.c:3385

4041 +#: merge-recursive.c:3394

4042 #, c-format

4043 msgid ""

4044 "Your local changes to the following files would be overwritten by merge:\n"

@@ -3995,174 +4047,187 @@ msgstr ""

4047 "您对下列文件的本地修改将被合并操作覆盖：\n"

4048 " %s"

4049

3998 -#: merge-recursive.c:3396

4050 +#: merge-recursive.c:3405

4051 msgid "Already up to date!"

4052 msgstr "已经是最新的！"

4053

4002 -#: merge-recursive.c:3405

4054 +#: merge-recursive.c:3414

4055 #, c-format

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

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

4058

4007 -#: merge-recursive.c:3504

4059 +#: merge-recursive.c:3513

4060 msgid "Merging:"

4061 msgstr "合并："

4062

4011 -#: merge-recursive.c:3517

4063 +#: merge-recursive.c:3526

4064 #, c-format

4065 msgid "found %u common ancestor:"

4066 msgid_plural "found %u common ancestors:"

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

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

4069

4018 -#: merge-recursive.c:3556

4070 +#: merge-recursive.c:3565

4071 msgid "merge returned no commit"

4072 msgstr "合并未返回提交"

4073

4022 -#: merge-recursive.c:3622

4074 +#: merge-recursive.c:3631

4075 #, c-format

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

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

4078

4027 -#: merge-recursive.c:3638 builtin/merge.c:702 builtin/merge.c:873

4079 +#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869

4080 msgid "Unable to write index."

4081 msgstr "不能写入索引。"

4082

4031 -#: midx.c:66

4083 +#: midx.c:69

4084 #, c-format

4085 msgid "multi-pack-index file %s is too small"

4086 msgstr "多包索引文件 %s 太小"

4087

4036 -#: midx.c:82

4088 +#: midx.c:85

4089 #, c-format

4090 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"

4091 msgstr "多包索引签名 0x%08x 和签名 0x%08x 不匹配"

4092

4041 -#: midx.c:87

4093 +#: midx.c:90

4094 #, c-format

4095 msgid "multi-pack-index version %d not recognized"

4096 msgstr "multi-pack-index 版本 %d 不能被识别"

4097

4046 -#: midx.c:92

4098 +#: midx.c:95

4099 #, c-format

4100 msgid "hash version %u does not match"

4101 msgstr "散列版本 %u 不匹配"

4102

4051 -#: midx.c:106

4103 +#: midx.c:109

4104 msgid "invalid chunk offset (too large)"

4105 msgstr "无效的块偏移（太大）"

4106

4055 -#: midx.c:130

4107 +#: midx.c:133

4108 msgid "terminating multi-pack-index chunk id appears earlier than expected"

4109 msgstr "终止多包索引块 id 出现时间早于预期"

4110

4059 -#: midx.c:143

4111 +#: midx.c:146

4112 msgid "multi-pack-index missing required pack-name chunk"

4113 msgstr "多包索引缺少必需的包名块"

4114

4063 -#: midx.c:145

4115 +#: midx.c:148

4116 msgid "multi-pack-index missing required OID fanout chunk"

4117 msgstr "多包索引缺少必需的对象 ID 扇出块"

4118

4067 -#: midx.c:147

4119 +#: midx.c:150

4120 msgid "multi-pack-index missing required OID lookup chunk"

4121 msgstr "多包索引缺少必需的对象 ID 查询块"

4122

4071 -#: midx.c:149

4123 +#: midx.c:152

4124 msgid "multi-pack-index missing required object offsets chunk"

4125 msgstr "多包索引缺少必需的对象偏移块"

4126

4075 -#: midx.c:163

4127 +#: midx.c:166

4128 #, c-format

4129 msgid "multi-pack-index pack names out of order: '%s' before '%s'"

4130 msgstr "多包索引包名无序：'%s' 在 '%s' 之前"

4131

4080 -#: midx.c:208

4132 +#: midx.c:211

4133 #, c-format

4134 msgid "bad pack-int-id: %u (%u total packs)"

4135 msgstr "错的 pack-int-id：%u（共有 %u 个包）"

4136

4085 -#: midx.c:258

4137 +#: midx.c:261

4138 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"

4139 msgstr "多包索引存储一个64位偏移，但是 off_t 太小"

4140

4089 -#: midx.c:286

4141 +#: midx.c:289

4142 msgid "error preparing packfile from multi-pack-index"

4143 msgstr "从多包索引准备 packfile 出错"

4144

4093 -#: midx.c:457

4145 +#: midx.c:470

4146 #, c-format

4147 msgid "failed to add packfile '%s'"

4148 msgstr "添加包文件 '%s' 失败"

4149

4098 -#: midx.c:463

4150 +#: midx.c:476

4151 #, c-format

4152 msgid "failed to open pack-index '%s'"

4153 msgstr "打开包索引 '%s' 失败"

4154

4103 -#: midx.c:557

4155 +#: midx.c:536

4156 #, c-format

4157 msgid "failed to locate object %d in packfile"

4158 msgstr "在包文件中定位对象 %d 失败"

4159

4108 -#: midx.c:993

4160 +#: midx.c:865

4161 +#, c-format

4162 +msgid "did not see pack-file %s to drop"

4163 +msgstr "没有看到要丢弃的包文件 %s"

4164 +

4165 +#: midx.c:1036

4166 #, c-format

4167 msgid "failed to clear multi-pack-index at %s"

4168 msgstr "清理位于 %s 的多包索引失败"

4169

4113 -#: midx.c:1048

4170 +#: midx.c:1091

4171 msgid "Looking for referenced packfiles"

4172 msgstr "正在查找引用的包文件"

4173

4117 -#: midx.c:1063

4174 +#: midx.c:1106

4175 #, c-format

4176 msgid ""

4177 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

4178 msgstr "对象 ID 扇出无序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

4179

4123 -#: midx.c:1067

4180 +#: midx.c:1110

4181 msgid "Verifying OID order in MIDX"

4182 msgstr "正在校验 MIDX 中的对象 ID 顺序"

4183

4127 -#: midx.c:1076

4184 +#: midx.c:1119

4185 #, c-format

4186 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"

4187 msgstr "对象 ID 查询无序：oid[%d] = %s >= %s = oid[%d]"

4188

4132 -#: midx.c:1095

4189 +#: midx.c:1138

4190 msgid "Sorting objects by packfile"

4191 msgstr "通过包文件为对象排序"

4192

4136 -#: midx.c:1101

4193 +#: midx.c:1144

4194 msgid "Verifying object offsets"

4195 msgstr "校验对象偏移"

4196

4140 -#: midx.c:1117

4197 +#: midx.c:1160

4198 #, c-format

4199 msgid "failed to load pack entry for oid[%d] = %s"

4200 msgstr "为 oid[%d] = %s 加载包条目失败"

4201

4145 -#: midx.c:1123

4202 +#: midx.c:1166

4203 #, c-format

4204 msgid "failed to load pack-index for packfile %s"

4205 msgstr "为包文件 %s 加载包索引失败"

4206

4150 -#: midx.c:1132

4207 +#: midx.c:1175

4208 #, c-format

4209 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"

4210 msgstr "oid[%d] = %s 错误的对象偏移：%<PRIx64> != %<PRIx64>"

4211

4155 -#: name-hash.c:531

4212 +#: midx.c:1350

4213 +msgid "could not start pack-objects"

4214 +msgstr "不能开始 pack-objects"

4215 +

4216 +#: midx.c:1369

4217 +msgid "could not finish pack-objects"

4218 +msgstr "不能结束 pack-objects"

4219 +

4220 +#: name-hash.c:532

4221 #, c-format

4222 msgid "unable to create lazy_dir thread: %s"

4223 msgstr "不能创建 lazy_dir 线程：%s"

4224

4160 -#: name-hash.c:553

4225 +#: name-hash.c:554

4226 #, c-format

4227 msgid "unable to create lazy_name thread: %s"

4228 msgstr "不能创建 lazy_name 线程：%s"

4229

4165 -#: name-hash.c:559

4230 +#: name-hash.c:560

4231 #, c-format

4232 msgid "unable to join lazy_name thread: %s"

4233 msgstr "不能加入 lasy_name 线程：%s"

@@ -4231,16 +4296,16 @@ msgstr "不能解析对象：%s"

4296 msgid "hash mismatch %s"

4297 msgstr "哈希值与 %s 不匹配"

4298

4234 -#: packfile.c:617

4299 +#: packfile.c:648

4300 msgid "offset before end of packfile (broken .idx?)"

4301 msgstr "偏移量在包文件结束之前（损坏的 .idx？）"

4302

4238 -#: packfile.c:1868

4303 +#: packfile.c:1899

4304 #, c-format

4305 msgid "offset before start of pack index for %s (corrupt index?)"

4306 msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）"

4307

4243 -#: packfile.c:1872

4308 +#: packfile.c:1903

4309 #, c-format

4310 msgid "offset beyond end of pack index for %s (truncated index?)"

4311 msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）"

@@ -4492,24 +4557,29 @@ msgstr "无法创建线程 lstat：%s"

4557 msgid "unable to parse --pretty format"

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

4559

4495 -#: range-diff.c:56

4560 +#: range-diff.c:70

4561 msgid "could not start `log`"

4562 msgstr "不能启动 `log`"

4563

4499 -#: range-diff.c:59

4564 +#: range-diff.c:72

4565 msgid "could not read `log` output"

4566 msgstr "不能读取 `log` 的输出"

4567

4503 -#: range-diff.c:74 sequencer.c:4897

4568 +#: range-diff.c:91 sequencer.c:5021

4569 #, c-format

4570 msgid "could not parse commit '%s'"

4571 msgstr "不能解析提交 '%s'"

4572

4508 -#: range-diff.c:224

4573 +#: range-diff.c:117

4574 +#, c-format

4575 +msgid "could not parse git header '%.*s'"

4576 +msgstr "无法解析 git 头 '%.*s'"

4577 +

4578 +#: range-diff.c:274

4579 msgid "failed to generate diff"

4580 msgstr "生成 diff 失败"

4581

4512 -#: range-diff.c:455 range-diff.c:457

4582 +#: range-diff.c:506 range-diff.c:508

4583 #, c-format

4584 msgid "could not parse log for '%s'"

4585 msgstr "不能解析 '%s' 的日志"

@@ -4625,11 +4695,10 @@ msgid "unordered stage entries for '%s'"

4695 msgstr "'%s' 的未排序暂存条目"

4696

4697 #: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111

4628 -#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:358

4629 -#: builtin/checkout.c:672 builtin/checkout.c:1060 builtin/clean.c:955

4630 -#: builtin/commit.c:344 builtin/diff-tree.c:120 builtin/grep.c:498

4631 -#: builtin/mv.c:145 builtin/reset.c:245 builtin/rm.c:271

4632 -#: builtin/submodule--helper.c:330

4698 +#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467

4699 +#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347

4700 +#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145

4701 +#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330

4702 msgid "index file corrupt"

4703 msgstr "索引文件损坏"

4704

@@ -4683,12 +4752,12 @@ msgstr "无法刷新共享索引 '%s'"

4752 msgid "broken index, expect %s in %s, got %s"

4753 msgstr "损坏的索引，期望在 %2$s 中的 %1$s，得到 %3$s"

4754

4686 -#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1117

4755 +#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114

4756 #, c-format

4757 msgid "could not close '%s'"

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

4759

4691 -#: read-cache.c:3092 sequencer.c:2354 sequencer.c:3807

4760 +#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928

4761 #, c-format

4762 msgid "could not stat '%s'"

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

@@ -4766,7 +4835,7 @@ msgid_plural "Rebase %s onto %s (%d commands)"

4835 msgstr[0] "变基 %s 到 %s（%d 个提交）"

4836 msgstr[1] "变基 %s 到 %s（%d 个提交）"

4837

4769 -#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:173

4838 +#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228

4839 msgid ""

4840 "\n"

4841 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"

@@ -4774,7 +4843,7 @@ msgstr ""

4843 "\n"

4844 "不要删除任意一行。使用 'drop' 显式地删除一个提交。\n"

4845

4777 -#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:177

4846 +#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232

4847 msgid ""

4848 "\n"

4849 "If you remove a line here THAT COMMIT WILL BE LOST.\n"

@@ -4782,7 +4851,7 @@ msgstr ""

4851 "\n"

4852 "如果您在这里删除一行，对应的提交将会丢失。\n"

4853

4785 -#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:816

4854 +#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871

4855 msgid ""

4856 "\n"

4857 "You are editing the todo file of an ongoing interactive rebase.\n"

@@ -4796,7 +4865,7 @@ msgstr ""

4865 " git rebase --continue\n"

4866 "\n"

4867

4799 -#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:893

4868 +#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948

4869 msgid ""

4870 "\n"

4871 "However, if you remove everything, the rebase will be aborted.\n"

@@ -4806,12 +4875,12 @@ msgstr ""

4875 "然而，如果您删除全部内容，变基操作将会终止。\n"

4876 "\n"

4877

4809 -#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:900

4878 +#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955

4879 msgid "Note that empty commits are commented out"

4880 msgstr "注意空提交已被注释掉"

4881

4813 -#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3339

4814 -#: sequencer.c:3365 sequencer.c:4996 builtin/fsck.c:356 builtin/rebase.c:235

4882 +#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447

4883 +#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235

4884 #, c-format

4885 msgid "could not write '%s'"

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

@@ -4846,97 +4915,98 @@ msgstr ""

4915 "可选值有：ignore、warn、error。\n"

4916 "\n"

4917

4849 -#: refs.c:192

4918 +#: refs.c:262

4919 #, c-format

4920 msgid "%s does not point to a valid object!"

4921 msgstr "%s 没有指向一个有效的对象！"

4922

4854 -#: refs.c:597

4923 +#: refs.c:667

4924 #, c-format

4925 msgid "ignoring dangling symref %s"

4926 msgstr "忽略悬空符号引用 %s"

4927

4859 -#: refs.c:599 ref-filter.c:1982

4928 +#: refs.c:669 ref-filter.c:2092

4929 #, c-format

4930 msgid "ignoring broken ref %s"

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

4932

4864 -#: refs.c:734

4933 +#: refs.c:804

4934 #, c-format

4935 msgid "could not open '%s' for writing: %s"

4936 msgstr "无法为写入打开 '%s'：%s"

4937

4869 -#: refs.c:744 refs.c:795

4938 +#: refs.c:814 refs.c:865

4939 #, c-format

4940 msgid "could not read ref '%s'"

4941 msgstr "无法读取引用 '%s'"

4942

4874 -#: refs.c:750

4943 +#: refs.c:820

4944 #, c-format

4945 msgid "ref '%s' already exists"

4946 msgstr "引用 '%s' 已经存在"

4947

4879 -#: refs.c:755

4948 +#: refs.c:825

4949 #, c-format

4950 msgid "unexpected object ID when writing '%s'"

4951 msgstr "写入 '%s' 时意外的对象 ID"

4952

4884 -#: refs.c:763 sequencer.c:400 sequencer.c:2679 sequencer.c:2805

4885 -#: sequencer.c:2819 sequencer.c:3076 sequencer.c:4913 wrapper.c:656

4953 +#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913

4954 +#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656

4955 #, c-format

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

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

4958

4890 -#: refs.c:790 wrapper.c:225 wrapper.c:395 builtin/am.c:715 builtin/rebase.c:993

4959 +#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715

4960 +#: builtin/rebase.c:1003

4961 #, c-format

4962 msgid "could not open '%s' for writing"

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

4964

4895 -#: refs.c:797

4965 +#: refs.c:867

4966 #, c-format

4967 msgid "unexpected object ID when deleting '%s'"

4968 msgstr "删除 '%s' 时意外的对象 ID"

4969

4900 -#: refs.c:928

4970 +#: refs.c:998

4971 #, c-format

4972 msgid "log for ref %s has gap after %s"

4973 msgstr "引用 %s 的日志在 %s 之后有缺口"

4974

4905 -#: refs.c:934

4975 +#: refs.c:1004

4976 #, c-format

4977 msgid "log for ref %s unexpectedly ended on %s"

4978 msgstr "引用 %s 的日志意外终止于 %s "

4979

4910 -#: refs.c:993

4980 +#: refs.c:1063

4981 #, c-format

4982 msgid "log for %s is empty"

4983 msgstr "%s 的日志为空"

4984

4915 -#: refs.c:1085

4985 +#: refs.c:1155

4986 #, c-format

4987 msgid "refusing to update ref with bad name '%s'"

4988 msgstr "拒绝更新有错误名称 '%s' 的引用"

4989

4920 -#: refs.c:1161

4990 +#: refs.c:1231

4991 #, c-format

4992 msgid "update_ref failed for ref '%s': %s"

4993 msgstr "对引用 '%s' 执行 update_ref 失败：%s"

4994

4925 -#: refs.c:1942

4995 +#: refs.c:2012

4996 #, c-format

4997 msgid "multiple updates for ref '%s' not allowed"

4998 msgstr "不允许对引用 '%s' 多次更新"

4999

4930 -#: refs.c:1974

5000 +#: refs.c:2044

5001 msgid "ref updates forbidden inside quarantine environment"

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

5003

4934 -#: refs.c:2070 refs.c:2100

5004 +#: refs.c:2140 refs.c:2170

5005 #, c-format

5006 msgid "'%s' exists; cannot create '%s'"

5007 msgstr "'%s' 已存在，无法创建 '%s'"

5008

4939 -#: refs.c:2076 refs.c:2111

5009 +#: refs.c:2146 refs.c:2181

5010 #, c-format

5011 msgid "cannot process '%s' and '%s' at the same time"

5012 msgstr "无法同时处理 '%s' 和 '%s'"

@@ -4962,267 +5032,251 @@ msgstr "无法删除引用：%s"

5032 msgid "invalid refspec '%s'"

5033 msgstr "无效的引用表达式：'%s'"

5034

4965 -#: ref-filter.c:39 wt-status.c:1909

5035 +#: ref-filter.c:42 wt-status.c:1934

5036 msgid "gone"

5037 msgstr "丢失"

5038

4969 -#: ref-filter.c:40

5039 +#: ref-filter.c:43

5040 #, c-format

5041 msgid "ahead %d"

5042 msgstr "领先 %d"

5043

4974 -#: ref-filter.c:41

5044 +#: ref-filter.c:44

5045 #, c-format

5046 msgid "behind %d"

5047 msgstr "落后 %d"

5048

4979 -#: ref-filter.c:42

5049 +#: ref-filter.c:45

5050 #, c-format

5051 msgid "ahead %d, behind %d"

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

5053

4984 -#: ref-filter.c:138

5054 +#: ref-filter.c:162

5055 #, c-format

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

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

5058

4989 -#: ref-filter.c:140

5059 +#: ref-filter.c:164

5060 #, c-format

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

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

5063

4994 -#: ref-filter.c:162

5064 +#: ref-filter.c:186

5065 #, c-format

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

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

5068

4999 -#: ref-filter.c:166

5069 +#: ref-filter.c:190

5070 #, c-format

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

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

5073

5004 -#: ref-filter.c:168

5074 +#: ref-filter.c:192

5075 #, c-format

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

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

5078

5009 -#: ref-filter.c:223

5079 +#: ref-filter.c:247

5080 #, c-format

5081 msgid "%%(objecttype) does not take arguments"

5082 msgstr "%%(objecttype) 不带参数"

5083

5014 -#: ref-filter.c:245

5084 +#: ref-filter.c:269

5085 #, c-format

5086 msgid "unrecognized %%(objectsize) argument: %s"

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

5088

5019 -#: ref-filter.c:253

5089 +#: ref-filter.c:277

5090 #, c-format

5091 msgid "%%(deltabase) does not take arguments"

5092 msgstr "%%(deltabase) 不带参数"

5093

5024 -#: ref-filter.c:265

5094 +#: ref-filter.c:289

5095 #, c-format

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

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

5098

5029 -#: ref-filter.c:274

5099 +#: ref-filter.c:298

5100 #, c-format

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

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

5103

5034 -#: ref-filter.c:296

5104 +#: ref-filter.c:320

5105 #, c-format

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

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

5108

5039 -#: ref-filter.c:325

5109 +#: ref-filter.c:349

5110 #, c-format

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

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

5113

5044 -#: ref-filter.c:327

5114 +#: ref-filter.c:351

5115 #, c-format

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

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

5118

5049 -#: ref-filter.c:342

5119 +#: ref-filter.c:366

5120 #, c-format

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

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

5123

5054 -#: ref-filter.c:346

5124 +#: ref-filter.c:370

5125 #, c-format

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

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

5128

5059 -#: ref-filter.c:376

5129 +#: ref-filter.c:400

5130 #, c-format

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

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

5133

5064 -#: ref-filter.c:388

5134 +#: ref-filter.c:412

5135 #, c-format

5136 msgid "unrecognized position:%s"

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

5138

5069 -#: ref-filter.c:395

5139 +#: ref-filter.c:419

5140 #, c-format

5141 msgid "unrecognized width:%s"

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

5143

5074 -#: ref-filter.c:404

5144 +#: ref-filter.c:428

5145 #, c-format

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

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

5148

5079 -#: ref-filter.c:412

5149 +#: ref-filter.c:436

5150 #, c-format

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

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

5153

5084 -#: ref-filter.c:430

5154 +#: ref-filter.c:454

5155 #, c-format

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

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

5158

5089 -#: ref-filter.c:531

5159 +#: ref-filter.c:556

5160 #, c-format

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

5162 msgstr "格式错误的字段名：%.*s"

5163

5094 -#: ref-filter.c:558

5164 +#: ref-filter.c:583

5165 #, c-format

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

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

5168

5099 -#: ref-filter.c:562

5169 +#: ref-filter.c:587

5170 #, c-format

5171 msgid ""

5172 "not a git repository, but the field '%.*s' requires access to object data"

5173 msgstr "不是一个 git 仓库，但是字段 '%.*s' 需要访问对象数据"

5174

5105 -#: ref-filter.c:686

5175 +#: ref-filter.c:711

5176 #, c-format

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

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

5179

5110 -#: ref-filter.c:749

5180 +#: ref-filter.c:774

5181 #, c-format

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

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

5184

5115 -#: ref-filter.c:751

5185 +#: ref-filter.c:776

5186 #, c-format

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

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

5189

5120 -#: ref-filter.c:753

5190 +#: ref-filter.c:778

5191 #, c-format

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

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

5194

5125 -#: ref-filter.c:781

5195 +#: ref-filter.c:806

5196 #, c-format

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

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

5199

5130 -#: ref-filter.c:783

5200 +#: ref-filter.c:808

5201 #, c-format

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

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

5204

5135 -#: ref-filter.c:785

5205 +#: ref-filter.c:810

5206 #, c-format

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

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

5209

5140 -#: ref-filter.c:800

5210 +#: ref-filter.c:825

5211 #, c-format

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

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

5214

5145 -#: ref-filter.c:857

5215 +#: ref-filter.c:882

5216 #, c-format

5217 msgid "malformed format string %s"

5218 msgstr "错误的格式化字符串 %s"

5219

5150 -#: ref-filter.c:1453

5151 -#, c-format

5152 -msgid "(no branch, rebasing %s)"

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

5154 -

5155 -#: ref-filter.c:1456

5156 -#, c-format

5157 -msgid "(no branch, rebasing detached HEAD %s)"

5158 -msgstr "（非分支，正变基分离头指针 %s）"

5159 -

5160 -#: ref-filter.c:1459

5220 +#: ref-filter.c:1485

5221 #, c-format

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

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

5222 +msgid "no branch, rebasing %s"

5223 +msgstr "非分支，正变基 %s"

5224

5165 -#. TRANSLATORS: make sure this matches "HEAD

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

5167 -#.

5168 -#: ref-filter.c:1467

5225 +#: ref-filter.c:1488

5226 #, c-format

5170 -msgid "(HEAD detached at %s)"

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

5227 +msgid "no branch, rebasing detached HEAD %s"

5228 +msgstr "非分支，正变基分离头指针 %s"

5229

5173 -#. TRANSLATORS: make sure this matches "HEAD

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

5175 -#.

5176 -#: ref-filter.c:1474

5230 +#: ref-filter.c:1491

5231 #, c-format

5178 -msgid "(HEAD detached from %s)"

5179 -msgstr "（头指针分离自 %s）"

5232 +msgid "no branch, bisect started on %s"

5233 +msgstr "非分支，二分查找开始于 %s"

5234

5181 -#: ref-filter.c:1478

5182 -msgid "(no branch)"

5183 -msgstr "（非分支）"

5235 +#: ref-filter.c:1501

5236 +msgid "no branch"

5237 +msgstr "非分支"

5238

5185 -#: ref-filter.c:1512 ref-filter.c:1669

5239 +#: ref-filter.c:1537 ref-filter.c:1743

5240 #, c-format

5241 msgid "missing object %s for %s"

5242 msgstr "缺失 %2$s 的对象 %1$s"

5243

5190 -#: ref-filter.c:1522

5244 +#: ref-filter.c:1547

5245 #, c-format

5246 msgid "parse_object_buffer failed on %s for %s"

5247 msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"

5248

5195 -#: ref-filter.c:1888

5249 +#: ref-filter.c:1998

5250 #, c-format

5251 msgid "malformed object at '%s'"

5252 msgstr "格式错误的对象 '%s'"

5253

5200 -#: ref-filter.c:1977

5254 +#: ref-filter.c:2087

5255 #, c-format

5256 msgid "ignoring ref with broken name %s"

5257 msgstr "忽略带有错误名称 %s 的引用"

5258

5205 -#: ref-filter.c:2263

5259 +#: ref-filter.c:2382

5260 #, c-format

5261 msgid "format: %%(end) atom missing"

5262 msgstr "格式：缺少 %%(end) 元素"

5263

5210 -#: ref-filter.c:2363

5264 +#: ref-filter.c:2482

5265 #, c-format

5266 msgid "option `%s' is incompatible with --merged"

5267 msgstr "选项 `%s' 和 --merged 不兼容"

5268

5215 -#: ref-filter.c:2366

5269 +#: ref-filter.c:2485

5270 #, c-format

5271 msgid "option `%s' is incompatible with --no-merged"

5272 msgstr "选项 `%s' 和 --no-merged 不兼容"

5273

5220 -#: ref-filter.c:2376

5274 +#: ref-filter.c:2495

5275 #, c-format

5276 msgid "malformed object name %s"

5277 msgstr "格式错误的对象名 %s"

5278

5225 -#: ref-filter.c:2381

5279 +#: ref-filter.c:2500

5280 #, c-format

5281 msgid "option `%s' must point to a commit"

5282 msgstr "选项 `%s' 必须指向一个提交"

@@ -5559,8 +5613,8 @@ msgstr "不能删除 stray '%s'"

5613 msgid "Recorded preimage for '%s'"

5614 msgstr "为 '%s' 记录 preimage"

5615

5562 -#: rerere.c:881 submodule.c:2024 builtin/log.c:1750

5563 -#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1427

5616 +#: rerere.c:881 submodule.c:2023 builtin/log.c:1773

5617 +#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428

5618 #, c-format

5619 msgid "could not create directory '%s'"

5620 msgstr "不能创建目录 '%s'"

@@ -5594,20 +5648,20 @@ msgstr "忘记 '%s' 的解决方案\n"

5648 msgid "unable to open rr-cache directory"

5649 msgstr "不能打开 rr-cache 目录"

5650

5597 -#: revision.c:2476

5651 +#: revision.c:2507

5652 msgid "your current branch appears to be broken"

5653 msgstr "您的当前分支好像被损坏"

5654

5601 -#: revision.c:2479

5655 +#: revision.c:2510

5656 #, c-format

5657 msgid "your current branch '%s' does not have any commits yet"

5658 msgstr "您的当前分支 '%s' 尚无任何提交"

5659

5606 -#: revision.c:2679

5660 +#: revision.c:2710

5661 msgid "--first-parent is incompatible with --bisect"

5662 msgstr "--first-parent 与 --bisect 不兼容"

5663

5610 -#: revision.c:2683

5664 +#: revision.c:2714

5665 msgid "-L does not yet support diff formats besides -p and -s"

5666 msgstr "-L 尚不支持 -p 和 -s 之外的差异格式"

5667

@@ -5675,24 +5729,29 @@ msgstr "无效的提交信息清理模式 '%s'"

5729 msgid "could not delete '%s'"

5730 msgstr "无法删除 '%s'"

5731

5678 -#: sequencer.c:318

5732 +#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369

5733 +#, c-format

5734 +msgid "could not remove '%s'"

5735 +msgstr "无法删除 '%s'"

5736 +

5737 +#: sequencer.c:321

5738 msgid "revert"

5739 msgstr "还原"

5740

5682 -#: sequencer.c:320

5741 +#: sequencer.c:323

5742 msgid "cherry-pick"

5743 msgstr "拣选"

5744

5686 -#: sequencer.c:322

5745 +#: sequencer.c:325

5746 msgid "rebase -i"

5747 msgstr "rebase -i"

5748

5690 -#: sequencer.c:324

5749 +#: sequencer.c:327

5750 #, c-format

5751 msgid "unknown action: %d"

5752 msgstr "未知动作：%d"

5753

5695 -#: sequencer.c:382

5754 +#: sequencer.c:385

5755 msgid ""

5756 "after resolving the conflicts, mark the corrected paths\n"

5757 "with 'git add <paths>' or 'git rm <paths>'"

@@ -5700,7 +5759,7 @@ msgstr ""

5759 "冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"

5760 "命令标记修正后的文件"

5761

5703 -#: sequencer.c:385

5762 +#: sequencer.c:388

5763 msgid ""

5764 "after resolving the conflicts, mark the corrected paths\n"

5765 "with 'git add <paths>' or 'git rm <paths>'\n"

@@ -5709,44 +5768,44 @@ msgstr ""

5768 "冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"

5769 "对修正后的文件做标记，然后用 'git commit' 提交"

5770

5712 -#: sequencer.c:398 sequencer.c:2801

5771 +#: sequencer.c:401 sequencer.c:2909

5772 #, c-format

5773 msgid "could not lock '%s'"

5774 msgstr "不能锁定 '%s'"

5775

5717 -#: sequencer.c:405

5776 +#: sequencer.c:408

5777 #, c-format

5778 msgid "could not write eol to '%s'"

5779 msgstr "不能将换行符写入 '%s'"

5780

5722 -#: sequencer.c:410 sequencer.c:2684 sequencer.c:2807 sequencer.c:2821

5723 -#: sequencer.c:3084

5781 +#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929

5782 +#: sequencer.c:3192

5783 #, c-format

5784 msgid "failed to finalize '%s'"

5785 msgstr "无法完成 '%s'"

5786

5728 -#: sequencer.c:433 sequencer.c:978 sequencer.c:1652 sequencer.c:2704

5729 -#: sequencer.c:3066 sequencer.c:3175 builtin/am.c:245 builtin/commit.c:760

5730 -#: builtin/merge.c:1115 builtin/rebase.c:567

5787 +#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734

5788 +#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763

5789 +#: builtin/merge.c:1112 builtin/rebase.c:567

5790 #, c-format

5791 msgid "could not read '%s'"

5792 msgstr "不能读取 '%s'"

5793

5735 -#: sequencer.c:459

5794 +#: sequencer.c:462

5795 #, c-format

5796 msgid "your local changes would be overwritten by %s."

5797 msgstr "您的本地修改将被%s覆盖。"

5798

5740 -#: sequencer.c:463

5799 +#: sequencer.c:466

5800 msgid "commit your changes or stash them to proceed."

5801 msgstr "提交您的修改或贮藏后再继续。"

5802

5744 -#: sequencer.c:495

5803 +#: sequencer.c:498

5804 #, c-format

5805 msgid "%s: fast-forward"

5806 msgstr "%s：快进"

5807

5749 -#: sequencer.c:534 builtin/tag.c:555

5808 +#: sequencer.c:537 builtin/tag.c:565

5809 #, c-format

5810 msgid "Invalid cleanup mode %s"

5811 msgstr "无效的清理模式 %s"

@@ -5754,70 +5813,70 @@ msgstr "无效的清理模式 %s"

5813 #. TRANSLATORS: %s will be "revert", "cherry-pick" or

5814 #. "rebase -i".

5815 #.

5757 -#: sequencer.c:629

5816 +#: sequencer.c:632

5817 #, c-format

5818 msgid "%s: Unable to write new index file"

5819 msgstr "%s：无法写入新索引文件"

5820

5762 -#: sequencer.c:646

5821 +#: sequencer.c:649

5822 msgid "unable to update cache tree"

5823 msgstr "不能更新缓存树"

5824

5766 -#: sequencer.c:660

5825 +#: sequencer.c:663

5826 msgid "could not resolve HEAD commit"

5827 msgstr "不能解析 HEAD 提交"

5828

5770 -#: sequencer.c:740

5829 +#: sequencer.c:743

5830 #, c-format

5831 msgid "no key present in '%.*s'"

5832 msgstr "在 '%.*s' 中没有 key"

5833

5775 -#: sequencer.c:751

5834 +#: sequencer.c:754

5835 #, c-format

5836 msgid "unable to dequote value of '%s'"

5837 msgstr "无法为 '%s' 的值去引号"

5838

5780 -#: sequencer.c:788 wrapper.c:227 wrapper.c:397 builtin/am.c:706

5781 -#: builtin/am.c:798 builtin/merge.c:1112 builtin/rebase.c:1035

5839 +#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706

5840 +#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045

5841 #, c-format

5842 msgid "could not open '%s' for reading"

5843 msgstr "无法打开 '%s' 进行读取"

5844

5786 -#: sequencer.c:798

5845 +#: sequencer.c:801

5846 msgid "'GIT_AUTHOR_NAME' already given"

5847 msgstr "已经给出 'GIT_AUTHOR_NAME'"

5848

5790 -#: sequencer.c:803

5849 +#: sequencer.c:806

5850 msgid "'GIT_AUTHOR_EMAIL' already given"

5851 msgstr "已经给出 'GIT_AUTHOR_EMAIL'"

5852

5794 -#: sequencer.c:808

5853 +#: sequencer.c:811

5854 msgid "'GIT_AUTHOR_DATE' already given"

5855 msgstr "已经给出 'GIT_AUTHOR_DATE'"

5856

5798 -#: sequencer.c:812

5857 +#: sequencer.c:815

5858 #, c-format

5859 msgid "unknown variable '%s'"

5860 msgstr "未知变量 '%s'"

5861

5803 -#: sequencer.c:817

5862 +#: sequencer.c:820

5863 msgid "missing 'GIT_AUTHOR_NAME'"

5864 msgstr "缺少 'GIT_AUTHOR_NAME'"

5865

5807 -#: sequencer.c:819

5866 +#: sequencer.c:822

5867 msgid "missing 'GIT_AUTHOR_EMAIL'"

5868 msgstr "缺少 'GIT_AUTHOR_EMAIL'"

5869

5811 -#: sequencer.c:821

5870 +#: sequencer.c:824

5871 msgid "missing 'GIT_AUTHOR_DATE'"

5872 msgstr "缺少 'GIT_AUTHOR_DATE'"

5873

5815 -#: sequencer.c:881

5874 +#: sequencer.c:884

5875 #, c-format

5876 msgid "invalid date format '%s' in '%s'"

5877 msgstr "'%2$s' 中无效的日期格式 '%1$s'"

5878

5820 -#: sequencer.c:898

5879 +#: sequencer.c:901

5880 #, c-format

5881 msgid ""

5882 "you have staged changes in your working tree\n"

@@ -5846,15 +5905,15 @@ msgstr ""

5905 "\n"

5906 " git rebase --continue\n"

5907

5849 -#: sequencer.c:992

5908 +#: sequencer.c:995

5909 msgid "writing root commit"

5910 msgstr "写根提交"

5911

5853 -#: sequencer.c:1213

5912 +#: sequencer.c:1216

5913 msgid "'prepare-commit-msg' hook failed"

5914 msgstr "'prepare-commit-msg' 钩子失败"

5915

5857 -#: sequencer.c:1220

5916 +#: sequencer.c:1223

5917 msgid ""

5918 "Your name and email address were configured automatically based\n"

5919 "on your username and hostname. Please check that they are accurate.\n"

@@ -5878,7 +5937,7 @@ msgstr ""

5937 "\n"

5938 " git commit --amend --reset-author\n"

5939

5881 -#: sequencer.c:1233

5940 +#: sequencer.c:1236

5941 msgid ""

5942 "Your name and email address were configured automatically based\n"

5943 "on your username and hostname. Please check that they are accurate.\n"

@@ -5901,306 +5960,349 @@ msgstr ""

5960 "\n"

5961 " git commit --amend --reset-author\n"

5962

5904 -#: sequencer.c:1275

5963 +#: sequencer.c:1278

5964 msgid "couldn't look up newly created commit"

5965 msgstr "无法找到新创建的提交"

5966

5908 -#: sequencer.c:1277

5967 +#: sequencer.c:1280

5968 msgid "could not parse newly created commit"

5969 msgstr "不能解析新创建的提交"

5970

5912 -#: sequencer.c:1323

5971 +#: sequencer.c:1326

5972 msgid "unable to resolve HEAD after creating commit"

5973 msgstr "创建提交后，不能解析 HEAD"

5974

5916 -#: sequencer.c:1325

5975 +#: sequencer.c:1328

5976 msgid "detached HEAD"

5977 msgstr "分离头指针"

5978

5979 # 译者：中文字符串拼接，可删除前导空格

5921 -#: sequencer.c:1329

5980 +#: sequencer.c:1332

5981 msgid " (root-commit)"

5982 msgstr "（根提交）"

5983

5925 -#: sequencer.c:1350

5984 +#: sequencer.c:1353

5985 msgid "could not parse HEAD"

5986 msgstr "不能解析 HEAD"

5987

5929 -#: sequencer.c:1352

5988 +#: sequencer.c:1355

5989 #, c-format

5990 msgid "HEAD %s is not a commit!"

5991 msgstr "HEAD %s 不是一个提交！"

5992

5934 -#: sequencer.c:1356 builtin/commit.c:1551

5993 +#: sequencer.c:1359 builtin/commit.c:1571

5994 msgid "could not parse HEAD commit"

5995 msgstr "不能解析 HEAD 提交"

5996

5938 -#: sequencer.c:1408 sequencer.c:2001

5997 +#: sequencer.c:1411 sequencer.c:2004

5998 msgid "unable to parse commit author"

5999 msgstr "不能解析提交作者"

6000

5942 -#: sequencer.c:1418 builtin/am.c:1572 builtin/merge.c:688

6001 +#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684

6002 msgid "git write-tree failed to write a tree"

6003 msgstr "git write-tree 无法写入树对象"

6004

5946 -#: sequencer.c:1435 sequencer.c:1496

6005 +#: sequencer.c:1438 sequencer.c:1499

6006 #, c-format

6007 msgid "unable to read commit message from '%s'"

6008 msgstr "不能从 '%s' 读取提交说明"

6009

5951 -#: sequencer.c:1462 builtin/am.c:1594 builtin/commit.c:1650 builtin/merge.c:882

5952 -#: builtin/merge.c:906

6010 +#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878

6011 +#: builtin/merge.c:903

6012 msgid "failed to write commit object"

6013 msgstr "写提交对象失败"

6014

5956 -#: sequencer.c:1523

6015 +#: sequencer.c:1526

6016 #, c-format

6017 msgid "could not parse commit %s"

6018 msgstr "不能解析提交 %s"

6019

5961 -#: sequencer.c:1528

6020 +#: sequencer.c:1531

6021 #, c-format

6022 msgid "could not parse parent commit %s"

6023 msgstr "不能解析父提交 %s"

6024

5966 -#: sequencer.c:1602 sequencer.c:1712

6025 +#: sequencer.c:1605 sequencer.c:1715

6026 #, c-format

6027 msgid "unknown command: %d"

6028 msgstr "未知命令：%d"

6029

5971 -#: sequencer.c:1659 sequencer.c:1684

6030 +#: sequencer.c:1662 sequencer.c:1687

6031 #, c-format

6032 msgid "This is a combination of %d commits."

6033 msgstr "这是一个 %d 个提交的组合。"

6034

5976 -#: sequencer.c:1669

6035 +#: sequencer.c:1672

6036 msgid "need a HEAD to fixup"

6037 msgstr "需要一个 HEAD 来修复"

6038

5980 -#: sequencer.c:1671 sequencer.c:3111

6039 +#: sequencer.c:1674 sequencer.c:3219

6040 msgid "could not read HEAD"

6041 msgstr "不能读取 HEAD"

6042

5984 -#: sequencer.c:1673

6043 +#: sequencer.c:1676

6044 msgid "could not read HEAD's commit message"

6045 msgstr "不能读取 HEAD 的提交说明"

6046

5988 -#: sequencer.c:1679

6047 +#: sequencer.c:1682

6048 #, c-format

6049 msgid "cannot write '%s'"

6050 msgstr "不能写 '%s'"

6051

5993 -#: sequencer.c:1686 git-rebase--preserve-merges.sh:441

6052 +#: sequencer.c:1689 git-rebase--preserve-merges.sh:496

6053 msgid "This is the 1st commit message:"

6054 msgstr "这是第一个提交说明："

6055

5997 -#: sequencer.c:1694

6056 +#: sequencer.c:1697

6057 #, c-format

6058 msgid "could not read commit message of %s"

6059 msgstr "不能读取 %s 的提交说明"

6060

6002 -#: sequencer.c:1701

6061 +#: sequencer.c:1704

6062 #, c-format

6063 msgid "This is the commit message #%d:"

6064 msgstr "这是提交说明 #%d："

6065

6007 -#: sequencer.c:1707

6066 +#: sequencer.c:1710

6067 #, c-format

6068 msgid "The commit message #%d will be skipped:"

6069 msgstr "提交说明 #%d 将被跳过："

6070

6012 -#: sequencer.c:1795

6071 +#: sequencer.c:1798

6072 msgid "your index file is unmerged."

6073 msgstr "您的索引文件未完成合并。"

6074

6016 -#: sequencer.c:1802

6075 +#: sequencer.c:1805

6076 msgid "cannot fixup root commit"

6077 msgstr "不能修复根提交"

6078

6020 -#: sequencer.c:1821

6079 +#: sequencer.c:1824

6080 #, c-format

6081 msgid "commit %s is a merge but no -m option was given."

6082 msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"

6083

6025 -#: sequencer.c:1829 sequencer.c:1837

6084 +#: sequencer.c:1832 sequencer.c:1840

6085 #, c-format

6086 msgid "commit %s does not have parent %d"

6087 msgstr "提交 %s 没有第 %d 个父提交"

6088

6030 -#: sequencer.c:1843

6089 +#: sequencer.c:1846

6090 #, c-format

6091 msgid "cannot get commit message for %s"

6092 msgstr "不能得到 %s 的提交说明"

6093

6094 #. TRANSLATORS: The first %s will be a "todo" command like

6095 #. "revert" or "pick", the second %s a SHA1.

6037 -#: sequencer.c:1862

6096 +#: sequencer.c:1865

6097 #, c-format

6098 msgid "%s: cannot parse parent commit %s"

6099 msgstr "%s：不能解析父提交 %s"

6100

6042 -#: sequencer.c:1927

6101 +#: sequencer.c:1930

6102 #, c-format

6103 msgid "could not rename '%s' to '%s'"

6104 msgstr "不能将 '%s' 重命名为 '%s'"

6105

6047 -#: sequencer.c:1982

6106 +#: sequencer.c:1985

6107 #, c-format

6108 msgid "could not revert %s... %s"

6109 msgstr "不能还原 %s... %s"

6110

6052 -#: sequencer.c:1983

6111 +#: sequencer.c:1986

6112 #, c-format

6113 msgid "could not apply %s... %s"

6114 msgstr "不能应用 %s... %s"

6115

6057 -#: sequencer.c:2042

6116 +#: sequencer.c:2045

6117 #, c-format

6118 msgid "git %s: failed to read the index"

6119 msgstr "git %s：无法读取索引"

6120

6062 -#: sequencer.c:2049

6121 +#: sequencer.c:2052

6122 #, c-format

6123 msgid "git %s: failed to refresh the index"

6124 msgstr "git %s：无法刷新索引"

6125

6067 -#: sequencer.c:2118

6126 +#: sequencer.c:2128

6127 #, c-format

6128 msgid "%s does not accept arguments: '%s'"

6129 msgstr "%s 不接受参数：'%s'"

6130

6072 -#: sequencer.c:2127

6131 +#: sequencer.c:2137

6132 #, c-format

6133 msgid "missing arguments for %s"

6134 msgstr "缺少 %s 的参数"

6135

6077 -#: sequencer.c:2164

6136 +#: sequencer.c:2174

6137 #, c-format

6138 msgid "could not parse '%.*s'"

6139 msgstr "无法解析 '%.*s'"

6140

6082 -#: sequencer.c:2226

6141 +#: sequencer.c:2228

6142 #, c-format

6143 msgid "invalid line %d: %.*s"

6144 msgstr "无效行 %d：%.*s"

6145

6087 -#: sequencer.c:2237

6146 +#: sequencer.c:2239

6147 #, c-format

6148 msgid "cannot '%s' without a previous commit"

6149 msgstr "没有父提交的情况下不能 '%s'"

6150

6092 -#: sequencer.c:2285 builtin/rebase.c:153 builtin/rebase.c:178

6151 +#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178

6152 #: builtin/rebase.c:204 builtin/rebase.c:229

6153 #, c-format

6154 msgid "could not read '%s'."

6155 msgstr "不能读取 '%s'。"

6156

6098 -#: sequencer.c:2360

6157 +#: sequencer.c:2323

6158 +msgid "cancelling a cherry picking in progress"

6159 +msgstr "正在取消一个进行中的拣选"

6160 +

6161 +#: sequencer.c:2330

6162 +msgid "cancelling a revert in progress"

6163 +msgstr "正在取消一个进行中的还原"

6164 +

6165 +#: sequencer.c:2364

6166 msgid "please fix this using 'git rebase --edit-todo'."

6167 msgstr "请用 'git rebase --edit-todo' 来修改。"

6168

6102 -#: sequencer.c:2362

6169 +#: sequencer.c:2366

6170 #, c-format

6171 msgid "unusable instruction sheet: '%s'"

6172 msgstr "不可用的指令清单：'%s'"

6173

6107 -#: sequencer.c:2367

6174 +#: sequencer.c:2371

6175 msgid "no commits parsed."

6176 msgstr "没有解析提交。"

6177

6111 -#: sequencer.c:2378

6178 +#: sequencer.c:2382

6179 msgid "cannot cherry-pick during a revert."

6180 msgstr "不能在回退中执行拣选。"

6181

6115 -#: sequencer.c:2380

6182 +#: sequencer.c:2384

6183 msgid "cannot revert during a cherry-pick."

6184 msgstr "不能在拣选中执行回退。"

6185

6119 -#: sequencer.c:2462

6186 +#: sequencer.c:2466

6187 #, c-format

6188 msgid "invalid value for %s: %s"

6189 msgstr "%s 的值无效：%s"

6190

6124 -#: sequencer.c:2549

6191 +#: sequencer.c:2553

6192 msgid "unusable squash-onto"

6193 msgstr "不可用的 squash-onto"

6194

6128 -#: sequencer.c:2565

6195 +#: sequencer.c:2569

6196 #, c-format

6197 msgid "malformed options sheet: '%s'"

6198 msgstr "格式错误的选项清单：'%s'"

6199

6133 -#: sequencer.c:2648 sequencer.c:4227

6200 +#: sequencer.c:2652 sequencer.c:4351

6201 msgid "empty commit set passed"

6202 msgstr "提供了空的提交集"

6203

6137 -#: sequencer.c:2656

6138 -msgid "a cherry-pick or revert is already in progress"

6139 -msgstr "一个拣选或还原操作已在进行"

6204 +#: sequencer.c:2668

6205 +msgid "revert is already in progress"

6206 +msgstr "一个还原操作已在进行"

6207

6141 -#: sequencer.c:2657

6142 -msgid "try \"git cherry-pick (--continue | --quit | --abort)\""

6143 -msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""

6208 +#: sequencer.c:2670

6209 +#, c-format

6210 +msgid "try \"git revert (--continue | %s--abort | --quit)\""

6211 +msgstr "尝试 \"git revert (--continue | %s--abort | --quit)\""

6212 +

6213 +#: sequencer.c:2673

6214 +msgid "cherry-pick is already in progress"

6215 +msgstr "拣选操作已在进行"

6216 +

6217 +#: sequencer.c:2675

6218 +#, c-format

6219 +msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""

6220 +msgstr "尝试 \"git cherry-pick (--continue | %s--abort | --quit)\""

6221

6145 -#: sequencer.c:2660

6222 +#: sequencer.c:2689

6223 #, c-format

6224 msgid "could not create sequencer directory '%s'"

6225 msgstr "不能创建序列目录 '%s'"

6226

6150 -#: sequencer.c:2674

6227 +#: sequencer.c:2704

6228 msgid "could not lock HEAD"

6229 msgstr "不能锁定 HEAD"

6230

6154 -#: sequencer.c:2729 sequencer.c:3979

6231 +#: sequencer.c:2764 sequencer.c:4103

6232 msgid "no cherry-pick or revert in progress"

6233 msgstr "拣选或还原操作并未进行"

6234

6158 -#: sequencer.c:2731

6235 +#: sequencer.c:2766 sequencer.c:2777

6236 msgid "cannot resolve HEAD"

6237 msgstr "不能解析 HEAD"

6238

6162 -#: sequencer.c:2733 sequencer.c:2768

6239 +#: sequencer.c:2768 sequencer.c:2812

6240 msgid "cannot abort from a branch yet to be born"

6241 msgstr "不能从尚未建立的分支终止"

6242

6166 -#: sequencer.c:2754 builtin/grep.c:732

6243 +#: sequencer.c:2798 builtin/grep.c:734

6244 #, c-format

6245 msgid "cannot open '%s'"

6246 msgstr "不能打开 '%s'"

6247

6171 -#: sequencer.c:2756

6248 +#: sequencer.c:2800

6249 #, c-format

6250 msgid "cannot read '%s': %s"

6251 msgstr "不能读取 '%s'：%s"

6252

6176 -#: sequencer.c:2757

6253 +#: sequencer.c:2801

6254 msgid "unexpected end of file"

6255 msgstr "意外的文件结束"

6256

6180 -#: sequencer.c:2763

6257 +#: sequencer.c:2807

6258 #, c-format

6259 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"

6260 msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"

6261

6185 -#: sequencer.c:2774

6262 +#: sequencer.c:2818

6263 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

6264 msgstr "您好像移动了 HEAD。未能回退，检查您的 HEAD！"

6265

6189 -#: sequencer.c:2903 sequencer.c:3894

6266 +#: sequencer.c:2859

6267 +msgid "no revert in progress"

6268 +msgstr "没有正在进行的还原"

6269 +

6270 +#: sequencer.c:2867

6271 +msgid "no cherry-pick in progress"

6272 +msgstr "没有正在进行的拣选"

6273 +

6274 +#: sequencer.c:2877

6275 +msgid "failed to skip the commit"

6276 +msgstr "无法跳过这个提交"

6277 +

6278 +#: sequencer.c:2884

6279 +msgid "there is nothing to skip"

6280 +msgstr "没有要跳过的"

6281 +

6282 +#: sequencer.c:2887

6283 +#, c-format

6284 +msgid ""

6285 +"have you committed already?\n"

6286 +"try \"git %s --continue\""

6287 +msgstr ""

6288 +"您已经提交了么？\n"

6289 +"试试 \"git %s --continue\""

6290 +

6291 +#: sequencer.c:3011 sequencer.c:4015

6292 #, c-format

6293 msgid "could not update %s"

6294 msgstr "不能更新 %s"

6295

6194 -#: sequencer.c:2941 sequencer.c:3874

6296 +#: sequencer.c:3049 sequencer.c:3995

6297 msgid "cannot read HEAD"

6298 msgstr "不能读取 HEAD"

6299

6198 -#: sequencer.c:2958

6300 +#: sequencer.c:3066

6301 #, c-format

6302 msgid "unable to copy '%s' to '%s'"

6303 msgstr "无法拷贝 '%s' 至 '%s'"

6304

6203 -#: sequencer.c:2966

6305 +#: sequencer.c:3074

6306 #, c-format

6307 msgid ""

6308 "You can amend the commit now, with\n"

@@ -6219,28 +6321,28 @@ msgstr ""

6321 "\n"

6322 " git rebase --continue\n"

6323

6222 -#: sequencer.c:2976

6324 +#: sequencer.c:3084

6325 #, c-format

6326 msgid "Could not apply %s... %.*s"

6327 msgstr "不能应用 %s... %.*s"

6328

6227 -#: sequencer.c:2983

6329 +#: sequencer.c:3091

6330 #, c-format

6331 msgid "Could not merge %.*s"

6332 msgstr "不能合并 %.*s"

6333

6232 -#: sequencer.c:2997 sequencer.c:3001 builtin/difftool.c:633

6334 +#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633

6335 #, c-format

6336 msgid "could not copy '%s' to '%s'"

6337 msgstr "不能拷贝 '%s' 至 '%s'"

6338

6237 -#: sequencer.c:3023 sequencer.c:3446 builtin/rebase.c:839 builtin/rebase.c:1580

6238 -#: builtin/rebase.c:1940 builtin/rebase.c:1995

6339 +#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582

6340 +#: builtin/rebase.c:1953 builtin/rebase.c:2008

6341 msgid "could not read index"

6342 msgstr "不能读取索引"

6343

6344 # 译者：注意保持前导空格

6243 -#: sequencer.c:3028

6345 +#: sequencer.c:3136

6346 #, c-format

6347 msgid ""

6348 "execution failed: %s\n"

@@ -6255,11 +6357,11 @@ msgstr ""

6357 " git rebase --continue\n"

6358 "\n"

6359

6258 -#: sequencer.c:3034

6360 +#: sequencer.c:3142

6361 msgid "and made changes to the index and/or the working tree\n"

6362 msgstr "并且修改索引和/或工作区\n"

6363

6262 -#: sequencer.c:3040

6364 +#: sequencer.c:3148

6365 #, c-format

6366 msgid ""

6367 "execution succeeded: %s\n"

@@ -6276,76 +6378,76 @@ msgstr ""

6378 " git rebase --continue\n"

6379 "\n"

6380

6279 -#: sequencer.c:3101

6381 +#: sequencer.c:3209

6382 #, c-format

6383 msgid "illegal label name: '%.*s'"

6384 msgstr "非法的标签名称：'%.*s'"

6385

6284 -#: sequencer.c:3155

6386 +#: sequencer.c:3263

6387 msgid "writing fake root commit"

6388 msgstr "写伪根提交"

6389

6288 -#: sequencer.c:3160

6390 +#: sequencer.c:3268

6391 msgid "writing squash-onto"

6392 msgstr "写入 squash-onto"

6393

6292 -#: sequencer.c:3198 builtin/rebase.c:844 builtin/rebase.c:850

6394 +#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860

6395 #, c-format

6396 msgid "failed to find tree of %s"

6397 msgstr "无法找到 %s 指向的树。"

6398

6297 -#: sequencer.c:3216 builtin/rebase.c:863

6399 +#: sequencer.c:3324 builtin/rebase.c:873

6400 msgid "could not write index"

6401 msgstr "不能写入索引"

6402

6301 -#: sequencer.c:3243

6403 +#: sequencer.c:3351

6404 #, c-format

6405 msgid "could not resolve '%s'"

6406 msgstr "无法解析 '%s'"

6407

6306 -#: sequencer.c:3271

6408 +#: sequencer.c:3379

6409 msgid "cannot merge without a current revision"

6410 msgstr "没有当前版本不能合并"

6411

6310 -#: sequencer.c:3293

6412 +#: sequencer.c:3401

6413 #, c-format

6414 msgid "unable to parse '%.*s'"

6415 msgstr "无法解析 '%.*s'"

6416

6315 -#: sequencer.c:3302

6417 +#: sequencer.c:3410

6418 #, c-format

6419 msgid "nothing to merge: '%.*s'"

6420 msgstr "无可用合并：'%.*s'"

6421

6320 -#: sequencer.c:3314

6422 +#: sequencer.c:3422

6423 msgid "octopus merge cannot be executed on top of a [new root]"

6424 msgstr "章鱼合并不能在一个新的根提交上执行"

6425

6324 -#: sequencer.c:3329

6426 +#: sequencer.c:3437

6427 #, c-format

6428 msgid "could not get commit message of '%s'"

6429 msgstr "不能获取 '%s' 的提交说明"

6430

6329 -#: sequencer.c:3478

6431 +#: sequencer.c:3590

6432 #, c-format

6433 msgid "could not even attempt to merge '%.*s'"

6434 msgstr "甚至不能尝试合并 '%.*s'"

6435

6334 -#: sequencer.c:3494

6436 +#: sequencer.c:3606

6437 msgid "merge: Unable to write new index file"

6438 msgstr "合并：无法写入新索引文件"

6439

6338 -#: sequencer.c:3562 builtin/rebase.c:711

6440 +#: sequencer.c:3675 builtin/rebase.c:711

6441 #, c-format

6442 msgid "Applied autostash.\n"

6443 msgstr "已应用 autostash。\n"

6444

6343 -#: sequencer.c:3574

6445 +#: sequencer.c:3687

6446 #, c-format

6447 msgid "cannot store %s"

6448 msgstr "不能存储 %s"

6449

6348 -#: sequencer.c:3577 builtin/rebase.c:727

6450 +#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113

6451 #, c-format

6452 msgid ""

6453 "Applying autostash resulted in conflicts.\n"

@@ -6356,31 +6458,31 @@ msgstr ""

6458 "您的修改安全地保存在贮藏区中。\n"

6459 "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"

6460

6359 -#: sequencer.c:3638

6461 +#: sequencer.c:3751

6462 #, c-format

6463 msgid "could not checkout %s"

6464 msgstr "不能检出 %s"

6465

6364 -#: sequencer.c:3652

6466 +#: sequencer.c:3765

6467 #, c-format

6468 msgid "%s: not a valid OID"

6469 msgstr "%s：不是一个有效的对象 ID"

6470

6369 -#: sequencer.c:3657 git-rebase--preserve-merges.sh:724

6471 +#: sequencer.c:3770 git-rebase--preserve-merges.sh:779

6472 msgid "could not detach HEAD"

6473 msgstr "不能分离头指针"

6474

6373 -#: sequencer.c:3672

6475 +#: sequencer.c:3785

6476 #, c-format

6477 msgid "Stopped at HEAD\n"

6478 msgstr "停止在 HEAD\n"

6479

6378 -#: sequencer.c:3674

6480 +#: sequencer.c:3787

6481 #, c-format

6482 msgid "Stopped at %s\n"

6483 msgstr "停止在 %s\n"

6484

6383 -#: sequencer.c:3682

6485 +#: sequencer.c:3795

6486 #, c-format

6487 msgid ""

6488 "Could not execute the todo command\n"

@@ -6400,48 +6502,48 @@ msgstr ""

6502 " git rebase --edit-todo\n"

6503 " git rebase --continue\n"

6504

6403 -#: sequencer.c:3759

6505 +#: sequencer.c:3877

6506 #, c-format

6507 msgid "Stopped at %s... %.*s\n"

6508 msgstr "停止在 %s... %.*s\n"

6509

6408 -#: sequencer.c:3837

6510 +#: sequencer.c:3958

6511 #, c-format

6512 msgid "unknown command %d"

6513 msgstr "未知命令 %d"

6514

6413 -#: sequencer.c:3882

6515 +#: sequencer.c:4003

6516 msgid "could not read orig-head"

6517 msgstr "不能读取 orig-head"

6518

6417 -#: sequencer.c:3887

6519 +#: sequencer.c:4008

6520 msgid "could not read 'onto'"

6521 msgstr "不能读取 'onto'"

6522

6421 -#: sequencer.c:3901

6523 +#: sequencer.c:4022

6524 #, c-format

6525 msgid "could not update HEAD to %s"

6526 msgstr "不能更新 HEAD 为 %s"

6527

6426 -#: sequencer.c:3991

6528 +#: sequencer.c:4115

6529 msgid "cannot rebase: You have unstaged changes."

6530 msgstr "不能变基：您有未暂存的变更。"

6531

6430 -#: sequencer.c:4000

6532 +#: sequencer.c:4124

6533 msgid "cannot amend non-existing commit"

6534 msgstr "不能修补不存在的提交"

l10n: zh_CN: for git v2.23.0 l10n round 1~2