1270554665 · matheusbsbs/matheus-bagliano

@@ -8,7 +8,7 @@ msgid ""

8 msgstr ""

9 "Project-Id-Version: PACKAGE VERSION\n"

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

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

11 +"POT-Creation-Date: 2018-11-20 10:05+0800\n"

12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

14 "Language-Team: LANGUAGE <LL@li.org>\n"

@@ -18,59 +18,59 @@ msgstr ""

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

19 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"

20

21 -#: advice.c:97

21 +#: advice.c:99

22 #, c-format

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

24 msgstr ""

25

26 -#: advice.c:150

26 +#: advice.c:152

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

28 msgstr ""

29

30 -#: advice.c:152

30 +#: advice.c:154

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

32 msgstr ""

33

34 -#: advice.c:154

34 +#: advice.c:156

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

36 msgstr ""

37

38 -#: advice.c:156

38 +#: advice.c:158

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

40 msgstr ""

41

42 -#: advice.c:158

42 +#: advice.c:160

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

44 msgstr ""

45

46 -#: advice.c:160

46 +#: advice.c:162

47 #, c-format

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

49 msgstr ""

50

51 -#: advice.c:168

51 +#: advice.c:170

52 msgid ""

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

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

55 msgstr ""

56

57 -#: advice.c:176

57 +#: advice.c:178

58 msgid "Exiting because of an unresolved conflict."

59 msgstr ""

60

61 -#: advice.c:181 builtin/merge.c:1286

61 +#: advice.c:183 builtin/merge.c:1289

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

63 msgstr ""

64

65 -#: advice.c:183

65 +#: advice.c:185

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

67 msgstr ""

68

69 -#: advice.c:184

69 +#: advice.c:186

70 msgid "Exiting because of unfinished merge."

71 msgstr ""

72

73 -#: advice.c:190

73 +#: advice.c:192

74 #, c-format

75 msgid ""

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

@@ -156,22 +156,22 @@ msgstr ""

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

157 msgstr ""

158

159 -#: apply.c:1306

159 +#: apply.c:1307

160 #, c-format

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

162 msgstr ""

163

164 -#: apply.c:1478

164 +#: apply.c:1479

165 #, c-format

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

167 msgstr ""

168

169 -#: apply.c:1547

169 +#: apply.c:1548

170 #, c-format

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

172 msgstr ""

173

174 -#: apply.c:1567

174 +#: apply.c:1568

175 #, c-format

176 msgid ""

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

@@ -182,526 +182,527 @@ msgid_plural ""

182 msgstr[0] ""

183 msgstr[1] ""

184

185 -#: apply.c:1580

185 +#: apply.c:1581

186 #, c-format

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

188 msgstr ""

189

190 -#: apply.c:1768

190 +#: apply.c:1769

191 msgid "new file depends on old contents"

192 msgstr ""

193

194 -#: apply.c:1770

194 +#: apply.c:1771

195 msgid "deleted file still has contents"

196 msgstr ""

197

198 -#: apply.c:1804

198 +#: apply.c:1805

199 #, c-format

200 msgid "corrupt patch at line %d"

201 msgstr ""

202

203 -#: apply.c:1841

203 +#: apply.c:1842

204 #, c-format

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

206 msgstr ""

207

208 -#: apply.c:1843

208 +#: apply.c:1844

209 #, c-format

210 msgid "deleted file %s still has contents"

211 msgstr ""

212

213 -#: apply.c:1846

213 +#: apply.c:1847

214 #, c-format

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

216 msgstr ""

217

218 -#: apply.c:1993

218 +#: apply.c:1994

219 #, c-format

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

221 msgstr ""

222

223 -#: apply.c:2030

223 +#: apply.c:2031

224 #, c-format

225 msgid "unrecognized binary patch at line %d"

226 msgstr ""

227

228 -#: apply.c:2190

228 +#: apply.c:2193

229 #, c-format

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

231 msgstr ""

232

233 -#: apply.c:2276

233 +#: apply.c:2279

234 #, c-format

235 msgid "unable to read symlink %s"

236 msgstr ""

237

238 -#: apply.c:2280

238 +#: apply.c:2283

239 #, c-format

240 msgid "unable to open or read %s"

241 msgstr ""

242

243 -#: apply.c:2939

243 +#: apply.c:2942

244 #, c-format

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

246 msgstr ""

247

248 -#: apply.c:3060

248 +#: apply.c:3063

249 #, c-format

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

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

252 msgstr[0] ""

253 msgstr[1] ""

254

255 -#: apply.c:3072

255 +#: apply.c:3075

256 #, c-format

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

258 msgstr ""

259

260 -#: apply.c:3078

260 +#: apply.c:3081

261 #, c-format

262 msgid ""

263 "while searching for:\n"

264 "%.*s"

265 msgstr ""

266

267 -#: apply.c:3100

267 +#: apply.c:3103

268 #, c-format

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

270 msgstr ""

271

272 -#: apply.c:3108

272 +#: apply.c:3111

273 #, c-format

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

275 msgstr ""

276

277 -#: apply.c:3154

277 +#: apply.c:3158

278 #, c-format

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

280 msgstr ""

281

282 -#: apply.c:3164

282 +#: apply.c:3168

283 #, c-format

284 msgid ""

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

286 msgstr ""

287

288 -#: apply.c:3172

288 +#: apply.c:3176

289 #, c-format

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

291 msgstr ""

292

293 -#: apply.c:3190

293 +#: apply.c:3194

294 #, c-format

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

296 msgstr ""

297

298 -#: apply.c:3203

298 +#: apply.c:3207

299 #, c-format

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

301 msgstr ""

302

303 -#: apply.c:3209

303 +#: apply.c:3213

304 #, c-format

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

306 msgstr ""

307

308 -#: apply.c:3230

308 +#: apply.c:3234

309 #, c-format

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

311 msgstr ""

312

313 -#: apply.c:3352

313 +#: apply.c:3356

314 #, c-format

315 msgid "cannot checkout %s"

316 msgstr ""

317

318 -#: apply.c:3404 apply.c:3415 apply.c:3461 setup.c:278

318 +#: apply.c:3408 apply.c:3419 apply.c:3465 midx.c:58 setup.c:278

319 #, c-format

320 msgid "failed to read %s"

321 msgstr ""

322

323 -#: apply.c:3412

323 +#: apply.c:3416

324 #, c-format

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

326 msgstr ""

327

328 -#: apply.c:3441 apply.c:3681

328 +#: apply.c:3445 apply.c:3688

329 #, c-format

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

331 msgstr ""

332

333 -#: apply.c:3524 apply.c:3696

333 +#: apply.c:3531 apply.c:3703

334 #, c-format

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

336 msgstr ""

337

338 -#: apply.c:3533 apply.c:3704

338 +#: apply.c:3540 apply.c:3711

339 #, c-format

340 msgid "%s: does not match index"

341 msgstr ""

342

343 -#: apply.c:3568

343 +#: apply.c:3575

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

345 msgstr ""

346

347 -#: apply.c:3571

347 +#: apply.c:3578

348 #, c-format

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

350 msgstr ""

351

352 -#: apply.c:3587 apply.c:3591

352 +#: apply.c:3594 apply.c:3598

353 #, c-format

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

355 msgstr ""

356

357 -#: apply.c:3603

357 +#: apply.c:3610

358 #, c-format

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

360 msgstr ""

361

362 -#: apply.c:3617

362 +#: apply.c:3624

363 #, c-format

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

365 msgstr ""

366

367 -#: apply.c:3622

367 +#: apply.c:3629

368 #, c-format

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

370 msgstr ""

371

372 -#: apply.c:3648

372 +#: apply.c:3655

373 msgid "removal patch leaves file contents"

374 msgstr ""

375

376 -#: apply.c:3721

376 +#: apply.c:3728

377 #, c-format

378 msgid "%s: wrong type"

379 msgstr ""

380

381 -#: apply.c:3723

381 +#: apply.c:3730

382 #, c-format

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

384 msgstr ""

385

386 -#: apply.c:3874 apply.c:3876

386 +#: apply.c:3881 apply.c:3883

387 #, c-format

388 msgid "invalid path '%s'"

389 msgstr ""

390

391 -#: apply.c:3932

391 +#: apply.c:3939

392 #, c-format

393 msgid "%s: already exists in index"

394 msgstr ""

395

396 -#: apply.c:3935

396 +#: apply.c:3942

397 #, c-format

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

399 msgstr ""

400

401 -#: apply.c:3955

401 +#: apply.c:3962

402 #, c-format

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

404 msgstr ""

405

406 -#: apply.c:3960

406 +#: apply.c:3967

407 #, c-format

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

409 msgstr ""

410

411 -#: apply.c:3980

411 +#: apply.c:3987

412 #, c-format

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

414 msgstr ""

415

416 -#: apply.c:3984

416 +#: apply.c:3991

417 #, c-format

418 msgid "%s: patch does not apply"

419 msgstr ""

420

421 -#: apply.c:3999

421 +#: apply.c:4006

422 #, c-format

423 msgid "Checking patch %s..."

424 msgstr ""

425

426 -#: apply.c:4091

426 +#: apply.c:4098

427 #, c-format

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

429 msgstr ""

430

431 -#: apply.c:4098

431 +#: apply.c:4105

432 #, c-format

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

434 msgstr ""

435

436 -#: apply.c:4101

436 +#: apply.c:4108

437 #, c-format

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

439 msgstr ""

440

441 -#: apply.c:4106 builtin/checkout.c:237 builtin/reset.c:140

441 +#: apply.c:4113 builtin/checkout.c:244 builtin/reset.c:142

442 #, c-format

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

444 msgstr ""

445

446 -#: apply.c:4110

446 +#: apply.c:4117

447 #, c-format

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

449 msgstr ""

450

451 -#: apply.c:4120

451 +#: apply.c:4127

452 #, c-format

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

454 msgstr ""

455

456 -#: apply.c:4258

456 +#: apply.c:4265

457 #, c-format

458 msgid "unable to remove %s from index"

459 msgstr ""

460

461 -#: apply.c:4292

461 +#: apply.c:4299

462 #, c-format

463 msgid "corrupt patch for submodule %s"

464 msgstr ""

465

466 -#: apply.c:4298

466 +#: apply.c:4305

467 #, c-format

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

469 msgstr ""

470

471 -#: apply.c:4306

471 +#: apply.c:4313

472 #, c-format

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

474 msgstr ""

475

476 -#: apply.c:4312 apply.c:4457

476 +#: apply.c:4319 apply.c:4464

477 #, c-format

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

479 msgstr ""

480

481 -#: apply.c:4355

481 +#: apply.c:4362

482 #, c-format

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

484 msgstr ""

485

486 -#: apply.c:4359

486 +#: apply.c:4366

487 #, c-format

488 msgid "closing file '%s'"

489 msgstr ""

490

491 -#: apply.c:4429

491 +#: apply.c:4436

492 #, c-format

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

494 msgstr ""

495

496 -#: apply.c:4527

496 +#: apply.c:4534

497 #, c-format

498 msgid "Applied patch %s cleanly."

499 msgstr ""

500

501 -#: apply.c:4535

501 +#: apply.c:4542

502 msgid "internal error"

503 msgstr ""

504

505 -#: apply.c:4538

505 +#: apply.c:4545

506 #, c-format

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

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

509 msgstr[0] ""

510 msgstr[1] ""

511

512 -#: apply.c:4549

512 +#: apply.c:4556

513 #, c-format

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

515 msgstr ""

516

517 -#: apply.c:4557 builtin/fetch.c:780 builtin/fetch.c:1048

517 +#: apply.c:4564 builtin/fetch.c:843 builtin/fetch.c:1122

518 #, c-format

519 msgid "cannot open %s"

520 msgstr ""

521

522 -#: apply.c:4571

522 +#: apply.c:4578

523 #, c-format

524 msgid "Hunk #%d applied cleanly."

525 msgstr ""

526

527 -#: apply.c:4575

527 +#: apply.c:4582

528 #, c-format

529 msgid "Rejected hunk #%d."

530 msgstr ""

531

532 -#: apply.c:4685

532 +#: apply.c:4692

533 #, c-format

534 msgid "Skipped patch '%s'."

535 msgstr ""

536

537 -#: apply.c:4693

537 +#: apply.c:4700

538 msgid "unrecognized input"

539 msgstr ""

540

541 -#: apply.c:4712

541 +#: apply.c:4719

542 msgid "unable to read index file"

543 msgstr ""

544

545 -#: apply.c:4849

545 +#: apply.c:4874

546 #, c-format

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

548 msgstr ""

549

550 -#: apply.c:4876

550 +#: apply.c:4901

551 #, c-format

552 msgid "squelched %d whitespace error"

553 msgid_plural "squelched %d whitespace errors"

554 msgstr[0] ""

555 msgstr[1] ""

556

557 -#: apply.c:4882 apply.c:4897

557 +#: apply.c:4907 apply.c:4922

558 #, c-format

559 msgid "%d line adds whitespace errors."

560 msgid_plural "%d lines add whitespace errors."

561 msgstr[0] ""

562 msgstr[1] ""

563

564 -#: apply.c:4890

564 +#: apply.c:4915

565 #, c-format

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

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

568 msgstr[0] ""

569 msgstr[1] ""

570

571 -#: apply.c:4906 builtin/add.c:539 builtin/mv.c:300 builtin/rm.c:389

571 +#: apply.c:4931 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389

572 msgid "Unable to write new index file"

573 msgstr ""

574

575 -#: apply.c:4933 apply.c:4936 builtin/am.c:2254 builtin/am.c:2257

576 -#: builtin/clone.c:121 builtin/fetch.c:115 builtin/merge.c:260

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

578 -#: builtin/submodule--helper.c:1355 builtin/submodule--helper.c:1358

579 -#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732

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

575 +#: apply.c:4958 apply.c:4961 builtin/am.c:2209 builtin/am.c:2212

576 +#: builtin/clone.c:121 builtin/fetch.c:118 builtin/merge.c:262

577 +#: builtin/pull.c:199 builtin/submodule--helper.c:406

578 +#: builtin/submodule--helper.c:1362 builtin/submodule--helper.c:1365

579 +#: builtin/submodule--helper.c:1846 builtin/submodule--helper.c:1849

580 +#: builtin/submodule--helper.c:2088 git-add--interactive.perl:197

581 msgid "path"

582 msgstr ""

583

584 -#: apply.c:4934

584 +#: apply.c:4959

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

586 msgstr ""

587

588 -#: apply.c:4937

588 +#: apply.c:4962

589 msgid "apply changes matching the given path"

590 msgstr ""

591

592 -#: apply.c:4939 builtin/am.c:2263

592 +#: apply.c:4964 builtin/am.c:2218

593 msgid "num"

594 msgstr ""

595

596 -#: apply.c:4940

596 +#: apply.c:4965

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

598 msgstr ""

599

600 -#: apply.c:4943

600 +#: apply.c:4968

601 msgid "ignore additions made by the patch"

602 msgstr ""

603

604 -#: apply.c:4945

604 +#: apply.c:4970

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

606 msgstr ""

607

608 -#: apply.c:4949

608 +#: apply.c:4974

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

610 msgstr ""

611

612 -#: apply.c:4951

612 +#: apply.c:4976

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

614 msgstr ""

615

616 -#: apply.c:4953

616 +#: apply.c:4978

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

618 msgstr ""

619

620 -#: apply.c:4955

620 +#: apply.c:4980

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

622 msgstr ""

623

624 -#: apply.c:4957

624 +#: apply.c:4982

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

626 msgstr ""

627

628 -#: apply.c:4959

628 +#: apply.c:4984

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

630 msgstr ""

631

632 -#: apply.c:4961

632 +#: apply.c:4986

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

634 msgstr ""

635

636 -#: apply.c:4964

636 +#: apply.c:4989

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

638 msgstr ""

639

640 -#: apply.c:4966

640 +#: apply.c:4991

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

642 msgstr ""

643

644 -#: apply.c:4968

644 +#: apply.c:4993

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

646 msgstr ""

647

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

648 +#: apply.c:4996 builtin/checkout-index.c:170 builtin/ls-files.c:523

649 msgid "paths are separated with NUL character"

650 msgstr ""

651

652 -#: apply.c:4973

652 +#: apply.c:4998

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

654 msgstr ""

655

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

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

658 -#: builtin/pack-objects.c:3202

656 +#: apply.c:4999 builtin/am.c:2197 builtin/interpret-trailers.c:97

657 +#: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101

658 +#: builtin/pack-objects.c:3310 builtin/rebase.c:839

659 msgid "action"

660 msgstr ""

661

662 -#: apply.c:4975

662 +#: apply.c:5000

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

664 msgstr ""

665

666 -#: apply.c:4978 apply.c:4981

666 +#: apply.c:5003 apply.c:5006

667 msgid "ignore changes in whitespace when finding context"

668 msgstr ""

669

670 -#: apply.c:4984

670 +#: apply.c:5009

671 msgid "apply the patch in reverse"

672 msgstr ""

673

674 -#: apply.c:4986

674 +#: apply.c:5011

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

676 msgstr ""

677

678 -#: apply.c:4988

678 +#: apply.c:5013

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

680 msgstr ""

681

682 -#: apply.c:4990

682 +#: apply.c:5015

683 msgid "allow overlapping hunks"

684 msgstr ""

685

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

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

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

686 +#: apply.c:5016 builtin/add.c:290 builtin/check-ignore.c:21

687 +#: builtin/commit.c:1309 builtin/count-objects.c:98 builtin/fsck.c:698

688 +#: builtin/log.c:2023 builtin/mv.c:122 builtin/read-tree.c:127

689 +#: builtin/rebase--interactive.c:157

690 msgid "be verbose"

691 msgstr ""

692

692 -#: apply.c:4993

693 +#: apply.c:5018

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

695 msgstr ""

696

696 -#: apply.c:4996

697 +#: apply.c:5021

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

699 msgstr ""

700

700 -#: apply.c:4998 builtin/am.c:2251

701 +#: apply.c:5023 builtin/am.c:2206

702 msgid "root"

703 msgstr ""

704

704 -#: apply.c:4999

705 +#: apply.c:5024

706 msgid "prepend <root> to all filenames"

707 msgstr ""

708

@@ -722,114 +723,114 @@ msgstr ""

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

724 msgstr ""

725

725 -#: archive.c:363 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:298

726 +#: archive.c:370 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298

727 #, c-format

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

729 msgstr ""

730

730 -#: archive.c:446

731 +#: archive.c:453

732 msgid "fmt"

733 msgstr ""

734

734 -#: archive.c:446

735 +#: archive.c:453

736 msgid "archive format"

737 msgstr ""

738

738 -#: archive.c:447 builtin/log.c:1473

739 +#: archive.c:454 builtin/log.c:1536

740 msgid "prefix"

741 msgstr ""

742

742 -#: archive.c:448

743 +#: archive.c:455

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

745 msgstr ""

746

746 -#: archive.c:449 builtin/blame.c:816 builtin/blame.c:817 builtin/config.c:126

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

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

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

750 -#: parse-options.h:165

747 +#: archive.c:456 builtin/blame.c:820 builtin/blame.c:821 builtin/config.c:129

748 +#: builtin/fast-export.c:1013 builtin/fast-export.c:1015 builtin/grep.c:884

749 +#: builtin/hash-object.c:104 builtin/ls-files.c:559 builtin/ls-files.c:562

750 +#: builtin/notes.c:412 builtin/notes.c:575 builtin/read-tree.c:122

751 +#: parse-options.h:162

752 msgid "file"

753 msgstr ""

754

754 -#: archive.c:450 builtin/archive.c:89

755 +#: archive.c:457 builtin/archive.c:89

756 msgid "write the archive to this file"

757 msgstr ""

758

758 -#: archive.c:452

759 +#: archive.c:459

760 msgid "read .gitattributes in working directory"

761 msgstr ""

762

762 -#: archive.c:453

763 +#: archive.c:460

764 msgid "report archived files on stderr"

765 msgstr ""

766

766 -#: archive.c:454

767 +#: archive.c:461

768 msgid "store only"

769 msgstr ""

770

770 -#: archive.c:455

771 +#: archive.c:462

772 msgid "compress faster"

773 msgstr ""

774

774 -#: archive.c:463

775 +#: archive.c:470

776 msgid "compress better"

777 msgstr ""

778

778 -#: archive.c:466

779 +#: archive.c:473

780 msgid "list supported archive formats"

781 msgstr ""

782

782 -#: archive.c:468 builtin/archive.c:90 builtin/clone.c:111 builtin/clone.c:114

783 -#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1738

783 +#: archive.c:475 builtin/archive.c:90 builtin/clone.c:111 builtin/clone.c:114

784 +#: builtin/submodule--helper.c:1374 builtin/submodule--helper.c:1855

785 msgid "repo"

786 msgstr ""

787

787 -#: archive.c:469 builtin/archive.c:91

788 +#: archive.c:476 builtin/archive.c:91

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

790 msgstr ""

791

791 -#: archive.c:470 builtin/archive.c:92 builtin/difftool.c:714

792 -#: builtin/notes.c:491

792 +#: archive.c:477 builtin/archive.c:92 builtin/difftool.c:714

793 +#: builtin/notes.c:496

794 msgid "command"

795 msgstr ""

796

796 -#: archive.c:471 builtin/archive.c:93

797 +#: archive.c:478 builtin/archive.c:93

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

799 msgstr ""

800

800 -#: archive.c:478

801 +#: archive.c:485

802 msgid "Unexpected option --remote"

803 msgstr ""

804

804 -#: archive.c:480

805 +#: archive.c:487

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

807 msgstr ""

808

808 -#: archive.c:482

809 +#: archive.c:489

810 msgid "Unexpected option --output"

811 msgstr ""

812

812 -#: archive.c:504

813 +#: archive.c:511

814 #, c-format

815 msgid "Unknown archive format '%s'"

816 msgstr ""

817

817 -#: archive.c:511

818 +#: archive.c:518

819 #, c-format

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

821 msgstr ""

822

822 -#: archive-tar.c:125 archive-zip.c:344

823 +#: archive-tar.c:125 archive-zip.c:345

824 #, c-format

825 msgid "cannot stream blob %s"

826 msgstr ""

827

827 -#: archive-tar.c:260 archive-zip.c:361

828 +#: archive-tar.c:260 archive-zip.c:363

829 #, c-format

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

831 msgstr ""

832

832 -#: archive-tar.c:287 archive-zip.c:352

833 +#: archive-tar.c:287 archive-zip.c:353

834 #, c-format

835 msgid "cannot read %s"

836 msgstr ""

@@ -848,74 +849,74 @@ msgstr ""

849 msgid "'%s' filter reported error"

850 msgstr ""

851

851 -#: archive-zip.c:313

852 +#: archive-zip.c:314

853 #, c-format

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

855 msgstr ""

856

856 -#: archive-zip.c:317

857 +#: archive-zip.c:318

858 #, c-format

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

860 msgstr ""

861

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

862 +#: archive-zip.c:474 builtin/pack-objects.c:224 builtin/pack-objects.c:227

863 #, c-format

864 msgid "deflate error (%d)"

865 msgstr ""

866

866 -#: archive-zip.c:605

867 +#: archive-zip.c:609

868 #, c-format

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

870 msgstr ""

871

871 -#: attr.c:218

872 +#: attr.c:212

873 #, c-format

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

875 msgstr ""

876

876 -#: attr.c:415

877 +#: attr.c:409

878 msgid ""

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

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

881 msgstr ""

882

882 -#: bisect.c:467

883 +#: bisect.c:468

884 #, c-format

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

886 msgstr ""

887

887 -#: bisect.c:675

888 +#: bisect.c:676

889 #, c-format

890 msgid "We cannot bisect more!\n"

891 msgstr ""

892

892 -#: bisect.c:729

893 +#: bisect.c:730

894 #, c-format

895 msgid "Not a valid commit name %s"

896 msgstr ""

897

897 -#: bisect.c:753

898 +#: bisect.c:754

899 #, c-format

900 msgid ""

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

902 "This means the bug has been fixed between %s and [%s].\n"

903 msgstr ""

904

904 -#: bisect.c:758

905 +#: bisect.c:759

906 #, c-format

907 msgid ""

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

909 "The property has changed between %s and [%s].\n"

910 msgstr ""

911

911 -#: bisect.c:763

912 +#: bisect.c:764

913 #, c-format

914 msgid ""

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

916 "This means the first '%s' commit is between %s and [%s].\n"

917 msgstr ""

918

918 -#: bisect.c:771

919 +#: bisect.c:772

920 #, c-format

921 msgid ""

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

@@ -923,7 +924,7 @@ msgid ""

924 "Maybe you mistook %s and %s revs?\n"

925 msgstr ""

926

926 -#: bisect.c:784

927 +#: bisect.c:785

928 #, c-format

929 msgid ""

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

@@ -931,43 +932,43 @@ msgid ""

932 "We continue anyway."

933 msgstr ""

934

934 -#: bisect.c:817

935 +#: bisect.c:818

936 #, c-format

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

938 msgstr ""

939

939 -#: bisect.c:857

940 +#: bisect.c:858

941 #, c-format

942 msgid "a %s revision is needed"

943 msgstr ""

944

944 -#: bisect.c:876 builtin/notes.c:177 builtin/tag.c:237

945 +#: bisect.c:877 builtin/notes.c:177 builtin/tag.c:237

946 #, c-format

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

948 msgstr ""

949

949 -#: bisect.c:927 builtin/merge.c:137

950 +#: bisect.c:928 builtin/merge.c:138

951 #, c-format

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

953 msgstr ""

954

954 -#: bisect.c:957

955 +#: bisect.c:958

956 msgid "reading bisect refs failed"

957 msgstr ""

958

958 -#: bisect.c:976

959 +#: bisect.c:977

960 #, c-format

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

962 msgstr ""

963

963 -#: bisect.c:984

964 +#: bisect.c:985

965 #, c-format

966 msgid ""

967 "No testable commit found.\n"

968 "Maybe you started with bad path parameters?\n"

969 msgstr ""

970

970 -#: bisect.c:1003

971 +#: bisect.c:1004

972 #, c-format

973 msgid "(roughly %d step)"

974 msgid_plural "(roughly %d steps)"

@@ -977,44 +978,44 @@ msgstr[1] ""

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

979 #. steps)" translation.

980 #.

980 -#: bisect.c:1009

981 +#: bisect.c:1010

982 #, c-format

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

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

985 msgstr[0] ""

986 msgstr[1] ""

987

987 -#: blame.c:1784

988 +#: blame.c:1787

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

990 msgstr ""

991

991 -#: blame.c:1798

992 +#: blame.c:1801

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

994 msgstr ""

995

995 -#: blame.c:1819

996 +#: blame.c:1822

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

998 msgstr ""

999

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

1000 -#: sequencer.c:3772 builtin/commit.c:994 builtin/log.c:372 builtin/log.c:926

1001 -#: builtin/log.c:1381 builtin/log.c:1713 builtin/log.c:1963 builtin/merge.c:404

1002 -#: builtin/pack-objects.c:3029 builtin/pack-objects.c:3044

1000 +#: blame.c:1831 bundle.c:162 ref-filter.c:2046 sequencer.c:1963

1001 +#: sequencer.c:4002 builtin/commit.c:1001 builtin/log.c:377 builtin/log.c:932

1002 +#: builtin/log.c:1407 builtin/log.c:1783 builtin/log.c:2072 builtin/merge.c:406

1003 +#: builtin/pack-objects.c:3135 builtin/pack-objects.c:3150

1004 #: builtin/shortlog.c:192

1005 msgid "revision walk setup failed"

1006 msgstr ""

1007

1007 -#: blame.c:1846

1008 +#: blame.c:1849

1009 msgid ""

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

1011 msgstr ""

1012

1012 -#: blame.c:1857

1013 +#: blame.c:1860

1014 #, c-format

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

1016 msgstr ""

1017

1017 -#: blame.c:1868

1018 +#: blame.c:1871

1019 #, c-format

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

1021 msgstr ""

@@ -1153,7 +1154,8 @@ msgstr ""

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

1155 msgstr ""

1156

1156 -#: bundle.c:90 sequencer.c:2092 sequencer.c:2578 builtin/commit.c:768

1157 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2182 sequencer.c:2722

1158 +#: builtin/commit.c:774

1159 #, c-format

1160 msgid "could not open '%s'"

1161 msgstr ""

@@ -1180,38 +1182,42 @@ msgid_plural "The bundle requires these %d refs:"

1182 msgstr[0] ""

1183 msgstr[1] ""

1184

1183 -#: bundle.c:260

1185 +#: bundle.c:267

1186 +msgid "unable to dup bundle descriptor"

1187 +msgstr ""

1188 +

1189 +#: bundle.c:274

1190 msgid "Could not spawn pack-objects"

1191 msgstr ""

1192

1187 -#: bundle.c:271

1193 +#: bundle.c:285

1194 msgid "pack-objects died"

1195 msgstr ""

1196

1191 -#: bundle.c:313

1197 +#: bundle.c:327

1198 msgid "rev-list died"

1199 msgstr ""

1200

1195 -#: bundle.c:362

1201 +#: bundle.c:376

1202 #, c-format

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

1204 msgstr ""

1205

1200 -#: bundle.c:453 builtin/log.c:187 builtin/log.c:1618 builtin/shortlog.c:304

1206 +#: bundle.c:456 builtin/log.c:192 builtin/log.c:1688 builtin/shortlog.c:304

1207 #, c-format

1208 msgid "unrecognized argument: %s"

1209 msgstr ""

1210

1205 -#: bundle.c:461

1211 +#: bundle.c:464

1212 msgid "Refusing to create empty bundle."

1213 msgstr ""

1214

1209 -#: bundle.c:473

1215 +#: bundle.c:474

1216 #, c-format

1217 msgid "cannot create '%s'"

1218 msgstr ""

1219

1214 -#: bundle.c:501

1220 +#: bundle.c:498

1221 msgid "index-pack died"

1222 msgstr ""

1223

@@ -1220,19 +1226,19 @@ msgstr ""

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

1227 msgstr ""

1228

1223 -#: commit.c:48 sequencer.c:2384 builtin/am.c:422 builtin/am.c:466

1224 -#: builtin/am.c:1438 builtin/am.c:2072 builtin/replace.c:376

1229 +#: commit.c:50 sequencer.c:2528 builtin/am.c:370 builtin/am.c:414

1230 +#: builtin/am.c:1390 builtin/am.c:2025 builtin/replace.c:376

1231 #: builtin/replace.c:448

1232 #, c-format

1233 msgid "could not parse %s"

1234 msgstr ""

1235

1230 -#: commit.c:50

1236 +#: commit.c:52

1237 #, c-format

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

1239 msgstr ""

1240

1235 -#: commit.c:191

1241 +#: commit.c:193

1242 msgid ""

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

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

@@ -1244,81 +1250,117 @@ msgid ""

1250 "\"git config advice.graftFileDeprecated false\""

1251 msgstr ""

1252

1247 -#: commit.c:1629

1253 +#: commit.c:1115

1254 +#, c-format

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

1256 +msgstr ""

1257 +

1258 +#: commit.c:1118

1259 +#, c-format

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

1261 +msgstr ""

1262 +

1263 +#: commit.c:1121

1264 +#, c-format

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

1266 +msgstr ""

1267 +

1268 +#: commit.c:1124

1269 +#, c-format

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

1271 +msgstr ""

1272 +

1273 +#: commit.c:1378

1274 msgid ""

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

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

1277 "variable i18n.commitencoding to the encoding your project uses.\n"

1278 msgstr ""

1279

1254 -#: commit-graph.c:83

1280 +#: commit-graph.c:108

1281 #, c-format

1282 msgid "graph file %s is too small"

1283 msgstr ""

1284

1259 -#: commit-graph.c:90

1285 +#: commit-graph.c:115

1286 #, c-format

1287 msgid "graph signature %X does not match signature %X"

1288 msgstr ""

1289

1264 -#: commit-graph.c:97

1290 +#: commit-graph.c:122

1291 #, c-format

1292 msgid "graph version %X does not match version %X"

1293 msgstr ""

1294

1269 -#: commit-graph.c:104

1295 +#: commit-graph.c:129

1296 #, c-format

1297 msgid "hash version %X does not match version %X"

1298 msgstr ""

1299

1274 -#: commit-graph.c:128

1300 +#: commit-graph.c:153

1301 #, c-format

1302 msgid "improper chunk offset %08x%08x"

1303 msgstr ""

1304

1279 -#: commit-graph.c:164

1305 +#: commit-graph.c:189

1306 #, c-format

1307 msgid "chunk id %08x appears multiple times"

1308 msgstr ""

1309

1284 -#: commit-graph.c:261

1310 +#: commit-graph.c:308

1311 #, c-format

1312 msgid "could not find commit %s"

1313 msgstr ""

1314

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

1315 +#: commit-graph.c:617 builtin/pack-objects.c:2652

1316 #, c-format

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

1318 msgstr ""

1319

1294 -#: commit-graph.c:730

1320 +#: commit-graph.c:651

1321 +msgid "Annotating commits in commit graph"

1322 +msgstr ""

1323 +

1324 +#: commit-graph.c:691

1325 +msgid "Computing commit graph generation numbers"

1326 +msgstr ""

1327 +

1328 +#: commit-graph.c:803 commit-graph.c:826 commit-graph.c:852

1329 +msgid "Finding commits for commit graph"

1330 +msgstr ""

1331 +

1332 +#: commit-graph.c:812

1333 #, c-format

1334 msgid "error adding pack %s"

1335 msgstr ""

1336

1299 -#: commit-graph.c:732

1337 +#: commit-graph.c:814

1338 #, c-format

1339 msgid "error opening index for %s"

1340 msgstr ""

1341

1304 -#: commit-graph.c:773

1342 +#: commit-graph.c:868

1343 #, c-format

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

1345 msgstr ""

1346

1309 -#: commit-graph.c:800

1347 +#: commit-graph.c:895

1348 msgid "too many commits to write graph"

1349 msgstr ""

1350

1313 -#: commit-graph.c:806

1351 +#: commit-graph.c:902 midx.c:769

1352 #, c-format

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

1354 msgstr ""

1355

1318 -#: commit-graph.c:904

1356 +#: commit-graph.c:1002

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

1358 msgstr ""

1359

1360 +#: commit-graph.c:1046

1361 +msgid "Verifying commits in commit graph"

1362 +msgstr ""

1363 +

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

1365 msgid "memory exhausted"

1366 msgstr ""

@@ -1356,7 +1398,7 @@ msgstr ""

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

1399 msgstr ""

1400

1359 -#: config.c:378 sequencer.c:2206

1401 +#: config.c:378 sequencer.c:2296

1402 #, c-format

1403 msgid "invalid key: %s"

1404 msgstr ""

@@ -1478,149 +1520,149 @@ msgstr ""

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

1521 msgstr ""

1522

1481 -#: config.c:1403

1523 +#: config.c:1395

1524 #, c-format

1525 msgid "malformed value for %s"

1526 msgstr ""

1527

1486 -#: config.c:1429

1528 +#: config.c:1421

1529 #, c-format

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

1531 msgstr ""

1532

1491 -#: config.c:1430

1533 +#: config.c:1422

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

1535 msgstr ""

1536

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

1537 +#: config.c:1481 builtin/pack-objects.c:3389

1538 #, c-format

1539 msgid "bad pack compression level %d"

1540 msgstr ""

1541

1500 -#: config.c:1610

1542 +#: config.c:1602

1543 #, c-format

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

1545 msgstr ""

1546

1505 -#: config.c:1613

1547 +#: config.c:1605

1548 #, c-format

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

1550 msgstr ""

1551

1510 -#: config.c:1630

1552 +#: config.c:1622

1553 #, c-format

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

1555 msgstr ""

1556

1515 -#: config.c:1660

1557 +#: config.c:1652

1558 #, c-format

1559 msgid "failed to parse %s"

1560 msgstr ""

1561

1520 -#: config.c:1700

1562 +#: config.c:1705

1563 msgid "unable to parse command-line config"

1564 msgstr ""

1565

1524 -#: config.c:2032

1566 +#: config.c:2037

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

1568 msgstr ""

1569

1528 -#: config.c:2202

1570 +#: config.c:2207

1571 #, c-format

1572 msgid "Invalid %s: '%s'"

1573 msgstr ""

1574

1533 -#: config.c:2245

1575 +#: config.c:2250

1576 #, c-format

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

1578 msgstr ""

1579

1538 -#: config.c:2271

1580 +#: config.c:2276

1581 #, c-format

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

1583 msgstr ""

1584

1543 -#: config.c:2296

1585 +#: config.c:2319

1586 #, c-format

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

1588 msgstr ""

1589

1548 -#: config.c:2298

1590 +#: config.c:2321

1591 #, c-format

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

1593 msgstr ""

1594

1553 -#: config.c:2379

1595 +#: config.c:2402

1596 #, c-format

1597 msgid "invalid section name '%s'"

1598 msgstr ""

1599

1558 -#: config.c:2411

1600 +#: config.c:2434

1601 #, c-format

1602 msgid "%s has multiple values"

1603 msgstr ""

1604

1563 -#: config.c:2440

1605 +#: config.c:2463

1606 #, c-format

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

1608 msgstr ""

1609

1568 -#: config.c:2691 config.c:3015

1610 +#: config.c:2714 config.c:3038

1611 #, c-format

1612 msgid "could not lock config file %s"

1613 msgstr ""

1614

1573 -#: config.c:2702

1615 +#: config.c:2725

1616 #, c-format

1617 msgid "opening %s"

1618 msgstr ""

1619

1578 -#: config.c:2737 builtin/config.c:324

1620 +#: config.c:2760 builtin/config.c:327

1621 #, c-format

1622 msgid "invalid pattern: %s"

1623 msgstr ""

1624

1583 -#: config.c:2762

1625 +#: config.c:2785

1626 #, c-format

1627 msgid "invalid config file %s"

1628 msgstr ""

1629

1588 -#: config.c:2775 config.c:3028

1630 +#: config.c:2798 config.c:3051

1631 #, c-format

1632 msgid "fstat on %s failed"

1633 msgstr ""

1634

1593 -#: config.c:2786

1635 +#: config.c:2809

1636 #, c-format

1637 msgid "unable to mmap '%s'"

1638 msgstr ""

1639

1598 -#: config.c:2795 config.c:3033

1640 +#: config.c:2818 config.c:3056

1641 #, c-format

1642 msgid "chmod on %s failed"

1643 msgstr ""

1644

1603 -#: config.c:2880 config.c:3130

1645 +#: config.c:2903 config.c:3153

1646 #, c-format

1647 msgid "could not write config file %s"

1648 msgstr ""

1649

1608 -#: config.c:2914

1650 +#: config.c:2937

1651 #, c-format

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

1653 msgstr ""

1654

1613 -#: config.c:2916 builtin/remote.c:781

1655 +#: config.c:2939 builtin/remote.c:782

1656 #, c-format

1657 msgid "could not unset '%s'"

1658 msgstr ""

1659

1618 -#: config.c:3006

1660 +#: config.c:3029

1661 #, c-format

1662 msgid "invalid section name: %s"

1663 msgstr ""

1664

1623 -#: config.c:3173

1665 +#: config.c:3196

1666 #, c-format

1667 msgid "missing value for '%s'"

1668 msgstr ""

@@ -1669,7 +1711,7 @@ msgstr ""

1711 msgid "repository on the other end cannot be shallow"

1712 msgstr ""

1713

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

1714 +#: connect.c:310 fetch-pack.c:182 builtin/archive.c:63

1715 #, c-format

1716 msgid "remote error: %s"

1717 msgstr ""

@@ -1781,7 +1823,7 @@ msgstr ""

1823 msgid "unable to fork"

1824 msgstr ""

1825

1784 -#: connected.c:68 builtin/fsck.c:203 builtin/prune.c:146

1826 +#: connected.c:68 builtin/fsck.c:202 builtin/prune.c:147

1827 msgid "Checking connectivity"

1828 msgstr ""

1829

@@ -1904,12 +1946,12 @@ msgstr ""

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

1947 msgstr ""

1948

1907 -#: convert.c:1402 convert.c:1436

1949 +#: convert.c:1398 convert.c:1432

1950 #, c-format

1951 msgid "%s: clean filter '%s' failed"

1952 msgstr ""

1953

1912 -#: convert.c:1480

1954 +#: convert.c:1476

1955 #, c-format

1956 msgid "%s: smudge filter %s failed"

1957 msgstr ""

@@ -1982,12 +2024,36 @@ msgid_plural "%<PRIuMAX> years ago"

2024 msgstr[0] ""

2025 msgstr[1] ""

2026

2027 +#: delta-islands.c:268

2028 +msgid "Propagating island marks"

2029 +msgstr ""

2030 +

2031 +#: delta-islands.c:286

2032 +#, c-format

2033 +msgid "bad tree object %s"

2034 +msgstr ""

2035 +

2036 +#: delta-islands.c:330

2037 +#, c-format

2038 +msgid "failed to load island regex for '%s': %s"

2039 +msgstr ""

2040 +

2041 +#: delta-islands.c:386

2042 +#, c-format

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

2044 +msgstr ""

2045 +

2046 +#: delta-islands.c:462

2047 +#, c-format

2048 +msgid "Marked %d islands, done.\n"

2049 +msgstr ""

2050 +

2051 #: diffcore-order.c:24

2052 #, c-format

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

2054 msgstr ""

2055

1990 -#: diffcore-rename.c:536

2056 +#: diffcore-rename.c:544

2057 msgid "Performing inexact rename detection"

2058 msgstr ""

2059

@@ -2035,88 +2101,88 @@ msgid ""

2101 "%s"

2102 msgstr ""

2103

2038 -#: diff.c:4096

2104 +#: diff.c:4140

2105 #, c-format

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

2107 msgstr ""

2108

2043 -#: diff.c:4427

2109 +#: diff.c:4482

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

2111 msgstr ""

2112

2047 -#: diff.c:4430

2113 +#: diff.c:4485

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

2115 msgstr ""

2116

2051 -#: diff.c:4508

2117 +#: diff.c:4563

2118 msgid "--follow requires exactly one pathspec"

2119 msgstr ""

2120

2055 -#: diff.c:4674

2121 +#: diff.c:4729

2122 #, c-format

2123 msgid ""

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

2125 "%s"

2126 msgstr ""

2127

2062 -#: diff.c:4688

2128 +#: diff.c:4743

2129 #, c-format

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

2131 msgstr ""

2132

2067 -#: diff.c:5766

2133 +#: diff.c:5823

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

2135 msgstr ""

2136

2071 -#: diff.c:5769

2137 +#: diff.c:5826

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

2139 msgstr ""

2140

2075 -#: diff.c:5772

2141 +#: diff.c:5829

2142 #, c-format

2143 msgid ""

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

2145 msgstr ""

2146

2081 -#: dir.c:569

2147 +#: dir.c:576

2148 #, c-format

2149 msgid "pathspec '%s' did not match any file(s) known to git"

2150 msgstr ""

2151

2086 -#: dir.c:958

2152 +#: dir.c:965

2153 #, c-format

2154 msgid "cannot use %s as an exclude file"

2155 msgstr ""

2156

2091 -#: dir.c:1873

2157 +#: dir.c:1880

2158 #, c-format

2159 msgid "could not open directory '%s'"

2160 msgstr ""

2161

2096 -#: dir.c:2115

2162 +#: dir.c:2122

2163 msgid "failed to get kernel name and information"

2164 msgstr ""

2165

2100 -#: dir.c:2239

2166 +#: dir.c:2246

2167 msgid "untracked cache is disabled on this system or location"

2168 msgstr ""

2169

2104 -#: dir.c:3037

2170 +#: dir.c:3047

2171 #, c-format

2172 msgid "index file corrupt in repo %s"

2173 msgstr ""

2174

2109 -#: dir.c:3082 dir.c:3087

2175 +#: dir.c:3092 dir.c:3097

2176 #, c-format

2177 msgid "could not create directories for %s"

2178 msgstr ""

2179

2114 -#: dir.c:3116

2180 +#: dir.c:3126

2181 #, c-format

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

2183 msgstr ""

2184

2119 -#: editor.c:61

2185 +#: editor.c:73

2186 #, c-format

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

2188 msgstr ""

@@ -2125,7 +2191,7 @@ msgstr ""

2191 msgid "Filtering content"

2192 msgstr ""

2193

2128 -#: entry.c:437

2194 +#: entry.c:465

2195 #, c-format

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

2197 msgstr ""

@@ -2149,77 +2215,77 @@ msgstr ""

2215 msgid "Remote with no URL"

2216 msgstr ""

2217

2152 -#: fetch-pack.c:152

2218 +#: fetch-pack.c:151

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

2220 msgstr ""

2221

2156 -#: fetch-pack.c:164

2222 +#: fetch-pack.c:163

2223 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"

2224 msgstr ""

2225

2160 -#: fetch-pack.c:184

2226 +#: fetch-pack.c:183

2227 #, c-format

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

2229 msgstr ""

2230

2165 -#: fetch-pack.c:254

2231 +#: fetch-pack.c:253

2232 msgid "--stateless-rpc requires multi_ack_detailed"

2233 msgstr ""

2234

2169 -#: fetch-pack.c:342 fetch-pack.c:1257

2235 +#: fetch-pack.c:347 fetch-pack.c:1277

2236 #, c-format

2237 msgid "invalid shallow line: %s"

2238 msgstr ""

2239

2174 -#: fetch-pack.c:348 fetch-pack.c:1263

2240 +#: fetch-pack.c:353 fetch-pack.c:1283

2241 #, c-format

2242 msgid "invalid unshallow line: %s"

2243 msgstr ""

2244

2179 -#: fetch-pack.c:350 fetch-pack.c:1265

2245 +#: fetch-pack.c:355 fetch-pack.c:1285

2246 #, c-format

2247 msgid "object not found: %s"

2248 msgstr ""

2249

2184 -#: fetch-pack.c:353 fetch-pack.c:1268

2250 +#: fetch-pack.c:358 fetch-pack.c:1288

2251 #, c-format

2252 msgid "error in object: %s"

2253 msgstr ""

2254

2189 -#: fetch-pack.c:355 fetch-pack.c:1270

2255 +#: fetch-pack.c:360 fetch-pack.c:1290

2256 #, c-format

2257 msgid "no shallow found: %s"

2258 msgstr ""

2259

2194 -#: fetch-pack.c:358 fetch-pack.c:1273

2260 +#: fetch-pack.c:363 fetch-pack.c:1293

2261 #, c-format

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

2263 msgstr ""

2264

2199 -#: fetch-pack.c:399

2265 +#: fetch-pack.c:404

2266 #, c-format

2267 msgid "got %s %d %s"

2268 msgstr ""

2269

2204 -#: fetch-pack.c:416

2270 +#: fetch-pack.c:421

2271 #, c-format

2272 msgid "invalid commit %s"

2273 msgstr ""

2274

2209 -#: fetch-pack.c:447

2275 +#: fetch-pack.c:452

2276 msgid "giving up"

2277 msgstr ""

2278

2213 -#: fetch-pack.c:459 progress.c:229

2279 +#: fetch-pack.c:464 progress.c:229

2280 msgid "done"

2281 msgstr ""

2282

2217 -#: fetch-pack.c:471

2283 +#: fetch-pack.c:476

2284 #, c-format

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

2286 msgstr ""

2287

2222 -#: fetch-pack.c:517

2288 +#: fetch-pack.c:522

2289 #, c-format

2290 msgid "Marking %s as complete"

2291 msgstr ""

@@ -2287,7 +2353,7 @@ msgstr ""

2353 msgid "Server supports ofs-delta"

2354 msgstr ""

2355

2290 -#: fetch-pack.c:971 fetch-pack.c:1150

2356 +#: fetch-pack.c:971 fetch-pack.c:1158

2357 msgid "Server supports filter"

2358 msgstr ""

2359

@@ -2308,85 +2374,93 @@ msgstr ""

2374 msgid "Server does not support --deepen"

2375 msgstr ""

2376

2311 -#: fetch-pack.c:1004

2377 +#: fetch-pack.c:1008

2378 msgid "no common commits"

2379 msgstr ""

2380

2315 -#: fetch-pack.c:1016 fetch-pack.c:1393

2381 +#: fetch-pack.c:1020 fetch-pack.c:1418

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

2383 msgstr ""

2384

2319 -#: fetch-pack.c:1145

2385 +#: fetch-pack.c:1153

2386 msgid "Server does not support shallow requests"

2387 msgstr ""

2388

2323 -#: fetch-pack.c:1191

2389 +#: fetch-pack.c:1199

2390 #, c-format

2391 msgid "error reading section header '%s'"

2392 msgstr ""

2393

2328 -#: fetch-pack.c:1197

2394 +#: fetch-pack.c:1205

2395 #, c-format

2396 msgid "expected '%s', received '%s'"

2397 msgstr ""

2398

2333 -#: fetch-pack.c:1236

2399 +#: fetch-pack.c:1244

2400 #, c-format

2401 msgid "unexpected acknowledgment line: '%s'"

2402 msgstr ""

2403

2338 -#: fetch-pack.c:1241

2404 +#: fetch-pack.c:1249

2405 #, c-format

2406 msgid "error processing acks: %d"

2407 msgstr ""

2408

2343 -#: fetch-pack.c:1278

2409 +#: fetch-pack.c:1259

2410 +msgid "expected packfile to be sent after 'ready'"

2411 +msgstr ""

2412 +

2413 +#: fetch-pack.c:1261

2414 +msgid "expected no other sections to be sent after no 'ready'"

2415 +msgstr ""

2416 +

2417 +#: fetch-pack.c:1298

2418 #, c-format

2419 msgid "error processing shallow info: %d"

2420 msgstr ""

2421

2348 -#: fetch-pack.c:1294

2422 +#: fetch-pack.c:1314

2423 #, c-format

2424 msgid "expected wanted-ref, got '%s'"

2425 msgstr ""

2426

2353 -#: fetch-pack.c:1304

2427 +#: fetch-pack.c:1324

2428 #, c-format

2429 msgid "unexpected wanted-ref: '%s'"

2430 msgstr ""

2431

2358 -#: fetch-pack.c:1308

2432 +#: fetch-pack.c:1328

2433 #, c-format

2434 msgid "error processing wanted refs: %d"

2435 msgstr ""

2436

2363 -#: fetch-pack.c:1603

2437 +#: fetch-pack.c:1642

2438 msgid "no matching remote head"

2439 msgstr ""

2440

2367 -#: fetch-pack.c:1621 builtin/clone.c:664

2441 +#: fetch-pack.c:1660 builtin/clone.c:664

2442 msgid "remote did not send all necessary objects"

2443 msgstr ""

2444

2371 -#: fetch-pack.c:1647

2445 +#: fetch-pack.c:1686

2446 #, c-format

2447 msgid "no such remote ref %s"

2448 msgstr ""

2449

2376 -#: fetch-pack.c:1650

2450 +#: fetch-pack.c:1689

2451 #, c-format

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

2453 msgstr ""

2454

2381 -#: gpg-interface.c:253

2455 +#: gpg-interface.c:318

2456 msgid "gpg failed to sign the data"

2457 msgstr ""

2458

2385 -#: gpg-interface.c:279

2459 +#: gpg-interface.c:344

2460 msgid "could not create temporary file"

2461 msgstr ""

2462

2389 -#: gpg-interface.c:282

2463 +#: gpg-interface.c:347

2464 #, c-format

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

2466 msgstr ""

@@ -2396,18 +2470,18 @@ msgstr ""

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

2471 msgstr ""

2472

2399 -#: grep.c:2115

2473 +#: grep.c:2113

2474 #, c-format

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

2476 msgstr ""

2477

2404 -#: grep.c:2132 setup.c:164 builtin/clone.c:410 builtin/diff.c:81

2478 +#: grep.c:2130 setup.c:164 builtin/clone.c:410 builtin/diff.c:81

2479 #: builtin/rm.c:134

2480 #, c-format

2481 msgid "failed to stat '%s'"

2482 msgstr ""

2483

2410 -#: grep.c:2143

2484 +#: grep.c:2141

2485 #, c-format

2486 msgid "'%s': short read"

2487 msgstr ""

@@ -2464,60 +2538,72 @@ msgstr ""

2538 msgid "Low-level Commands / Internal Helpers"

2539 msgstr ""

2540

2467 -#: help.c:293

2541 +#: help.c:296

2542 #, c-format

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

2544 msgstr ""

2545

2472 -#: help.c:300

2546 +#: help.c:303

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

2548 msgstr ""

2549

2476 -#: help.c:309

2550 +#: help.c:312

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

2552 msgstr ""

2553

2480 -#: help.c:358 git.c:90

2554 +#: help.c:361 git.c:90

2555 #, c-format

2556 msgid "unsupported command listing type '%s'"

2557 msgstr ""

2558

2485 -#: help.c:405

2559 +#: help.c:408

2560 msgid "The common Git guides are:"

2561 msgstr ""

2562

2489 -#: help.c:552

2563 +#: help.c:517

2564 +msgid "See 'git help <command>' to read about a specific subcommand"

2565 +msgstr ""

2566 +

2567 +#: help.c:522

2568 +msgid "External commands"

2569 +msgstr ""

2570 +

2571 +#: help.c:530

2572 +msgid "Command aliases"

2573 +msgstr ""

2574 +

2575 +#: help.c:594

2576 #, c-format

2577 msgid ""

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

2579 "able to execute it. Maybe git-%s is broken?"

2580 msgstr ""

2581

2496 -#: help.c:611

2582 +#: help.c:653

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

2584 msgstr ""

2585

2500 -#: help.c:633

2586 +#: help.c:675

2587 #, c-format

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

2589 msgstr ""

2590

2505 -#: help.c:638

2591 +#: help.c:680

2592 #, c-format

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

2594 msgstr ""

2595

2510 -#: help.c:643

2596 +#: help.c:685

2597 #, c-format

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

2599 msgstr ""

2600

2515 -#: help.c:651

2601 +#: help.c:693

2602 #, c-format

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

2604 msgstr ""

2605

2520 -#: help.c:655

2606 +#: help.c:697

2607 msgid ""

2608 "\n"

2609 "The most similar command is"

@@ -2527,16 +2613,16 @@ msgid_plural ""

2613 msgstr[0] ""

2614 msgstr[1] ""

2615

2530 -#: help.c:670

2616 +#: help.c:712

2617 msgid "git version [<options>]"

2618 msgstr ""

2619

2534 -#: help.c:738

2620 +#: help.c:780

2621 #, c-format

2622 msgid "%s: %s - %s"

2623 msgstr ""

2624

2539 -#: help.c:742

2625 +#: help.c:784

2626 msgid ""

2627 "\n"

2628 "Did you mean this?"

@@ -2546,7 +2632,7 @@ msgid_plural ""

2632 msgstr[0] ""

2633 msgstr[1] ""

2634

2549 -#: ident.c:342

2635 +#: ident.c:345

2636 msgid ""

2637 "\n"

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

@@ -2561,44 +2647,48 @@ msgid ""

2647 "\n"

2648 msgstr ""

2649

2564 -#: ident.c:366

2650 +#: ident.c:369

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

2652 msgstr ""

2653

2568 -#: ident.c:371

2654 +#: ident.c:374

2655 #, c-format

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

2657 msgstr ""

2658

2573 -#: ident.c:381

2659 +#: ident.c:384

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

2661 msgstr ""

2662

2577 -#: ident.c:387

2663 +#: ident.c:390

2664 #, c-format

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

2666 msgstr ""

2667

2582 -#: ident.c:395

2668 +#: ident.c:398

2669 #, c-format

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

2671 msgstr ""

2672

2587 -#: ident.c:401

2673 +#: ident.c:404

2674 #, c-format

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

2676 msgstr ""

2677

2592 -#: ident.c:416 builtin/commit.c:600

2678 +#: ident.c:419 builtin/commit.c:606

2679 #, c-format

2680 msgid "invalid date format: %s"

2681 msgstr ""

2682

2597 -#: list-objects-filter-options.c:36

2683 +#: list-objects-filter-options.c:35

2684 msgid "multiple filter-specs cannot be combined"

2685 msgstr ""

2686

2601 -#: list-objects-filter-options.c:126

2687 +#: list-objects-filter-options.c:58

2688 +msgid "only 'tree:0' is supported"

2689 +msgstr ""

2690 +

2691 +#: list-objects-filter-options.c:137

2692 msgid "cannot change partial clone promisor remote"

2693 msgstr ""

2694

@@ -2619,117 +2709,117 @@ msgstr ""

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

2710 msgstr ""

2711

2622 -#: merge.c:40

2712 +#: merge.c:41

2713 msgid "failed to read the cache"

2714 msgstr ""

2715

2626 -#: merge.c:105 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:380

2627 -#: builtin/checkout.c:608 builtin/clone.c:763

2716 +#: merge.c:107 rerere.c:720 builtin/am.c:1899 builtin/am.c:1933

2717 +#: builtin/checkout.c:387 builtin/checkout.c:708 builtin/clone.c:764

2718 msgid "unable to write new index file"

2719 msgstr ""

2720

2631 -#: merge-recursive.c:303

2721 +#: merge-recursive.c:323

2722 msgid "(bad commit)\n"

2723 msgstr ""

2724

2635 -#: merge-recursive.c:325

2725 +#: merge-recursive.c:345

2726 #, c-format

2727 msgid "add_cacheinfo failed for path '%s'; merge aborting."

2728 msgstr ""

2729

2640 -#: merge-recursive.c:333

2730 +#: merge-recursive.c:353

2731 #, c-format

2732 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."

2733 msgstr ""

2734

2645 -#: merge-recursive.c:415

2735 +#: merge-recursive.c:435

2736 msgid "error building trees"

2737 msgstr ""

2738

2649 -#: merge-recursive.c:886

2739 +#: merge-recursive.c:906

2740 #, c-format

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

2742 msgstr ""

2743

2654 -#: merge-recursive.c:897

2744 +#: merge-recursive.c:917

2745 #, c-format

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

2747 msgstr ""

2748

2659 -#: merge-recursive.c:911 merge-recursive.c:930

2749 +#: merge-recursive.c:931 merge-recursive.c:950

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

2751 msgstr ""

2752

2663 -#: merge-recursive.c:920

2753 +#: merge-recursive.c:940

2754 #, c-format

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

2756 msgstr ""

2757

2668 -#: merge-recursive.c:962 builtin/cat-file.c:39

2758 +#: merge-recursive.c:982 builtin/cat-file.c:39

2759 #, c-format

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

2761 msgstr ""

2762

2673 -#: merge-recursive.c:964

2763 +#: merge-recursive.c:984

2764 #, c-format

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

2766 msgstr ""

2767

2678 -#: merge-recursive.c:988

2768 +#: merge-recursive.c:1008

2769 #, c-format

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

2771 msgstr ""

2772

2683 -#: merge-recursive.c:999

2773 +#: merge-recursive.c:1019

2774 #, c-format

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

2776 msgstr ""

2777

2688 -#: merge-recursive.c:1004

2778 +#: merge-recursive.c:1024

2779 #, c-format

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

2781 msgstr ""

2782

2693 -#: merge-recursive.c:1191

2783 +#: merge-recursive.c:1212

2784 #, c-format

2785 msgid "Failed to merge submodule %s (not checked out)"

2786 msgstr ""

2787

2698 -#: merge-recursive.c:1198

2788 +#: merge-recursive.c:1219

2789 #, c-format

2790 msgid "Failed to merge submodule %s (commits not present)"

2791 msgstr ""

2792

2703 -#: merge-recursive.c:1205

2793 +#: merge-recursive.c:1226

2794 #, c-format

2795 msgid "Failed to merge submodule %s (commits don't follow merge-base)"

2796 msgstr ""

2797

2708 -#: merge-recursive.c:1213 merge-recursive.c:1225

2798 +#: merge-recursive.c:1234 merge-recursive.c:1246

2799 #, c-format

2800 msgid "Fast-forwarding submodule %s to the following commit:"

2801 msgstr ""

2802

2713 -#: merge-recursive.c:1216 merge-recursive.c:1228

2803 +#: merge-recursive.c:1237 merge-recursive.c:1249

2804 #, c-format

2805 msgid "Fast-forwarding submodule %s"

2806 msgstr ""

2807

2718 -#: merge-recursive.c:1250

2808 +#: merge-recursive.c:1271

2809 #, c-format

2810 msgid "Failed to merge submodule %s (merge following commits not found)"

2811 msgstr ""

2812

2723 -#: merge-recursive.c:1254

2813 +#: merge-recursive.c:1275

2814 #, c-format

2815 msgid "Failed to merge submodule %s (not fast-forward)"

2816 msgstr ""

2817

2728 -#: merge-recursive.c:1255

2818 +#: merge-recursive.c:1276

2819 msgid "Found a possible merge resolution for the submodule:\n"

2820 msgstr ""

2821

2732 -#: merge-recursive.c:1258

2822 +#: merge-recursive.c:1279

2823 #, c-format

2824 msgid ""

2825 "If this is correct simply add it to the index for example\n"

@@ -2740,109 +2830,109 @@ msgid ""

2830 "which will accept this suggestion.\n"

2831 msgstr ""

2832

2743 -#: merge-recursive.c:1267

2833 +#: merge-recursive.c:1288

2834 #, c-format

2835 msgid "Failed to merge submodule %s (multiple merges found)"

2836 msgstr ""

2837

2748 -#: merge-recursive.c:1326

2838 +#: merge-recursive.c:1358

2839 msgid "Failed to execute internal merge"

2840 msgstr ""

2841

2752 -#: merge-recursive.c:1331

2842 +#: merge-recursive.c:1363

2843 #, c-format

2844 msgid "Unable to add %s to database"

2845 msgstr ""

2846

2757 -#: merge-recursive.c:1363

2847 +#: merge-recursive.c:1395

2848 #, c-format

2849 msgid "Auto-merging %s"

2850 msgstr ""

2851

2762 -#: merge-recursive.c:1434

2852 +#: merge-recursive.c:1416

2853 #, c-format

2854 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."

2855 msgstr ""

2856

2767 -#: merge-recursive.c:1501

2857 +#: merge-recursive.c:1483

2858 #, c-format

2859 msgid ""

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

2861 "in tree."

2862 msgstr ""

2863

2774 -#: merge-recursive.c:1506

2864 +#: merge-recursive.c:1488

2865 #, c-format

2866 msgid ""

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

2868 "left in tree."

2869 msgstr ""

2870

2781 -#: merge-recursive.c:1513

2871 +#: merge-recursive.c:1495

2872 #, c-format

2873 msgid ""

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

2875 "in tree at %s."

2876 msgstr ""

2877

2788 -#: merge-recursive.c:1518

2878 +#: merge-recursive.c:1500

2879 #, c-format

2880 msgid ""

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

2882 "left in tree at %s."

2883 msgstr ""

2884

2795 -#: merge-recursive.c:1552

2885 +#: merge-recursive.c:1534

2886 msgid "rename"

2887 msgstr ""

2888

2799 -#: merge-recursive.c:1552

2889 +#: merge-recursive.c:1534

2890 msgid "renamed"

2891 msgstr ""

2892

2803 -#: merge-recursive.c:1606 merge-recursive.c:1762 merge-recursive.c:2394

2804 -#: merge-recursive.c:3129

2893 +#: merge-recursive.c:1588 merge-recursive.c:1737 merge-recursive.c:2369

2894 +#: merge-recursive.c:3124

2895 #, c-format

2896 msgid "Refusing to lose dirty file at %s"

2897 msgstr ""

2898

2809 -#: merge-recursive.c:1620

2899 +#: merge-recursive.c:1602

2900 #, c-format

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

2902 msgstr ""

2903

2814 -#: merge-recursive.c:1625

2904 +#: merge-recursive.c:1607

2905 #, c-format

2906 msgid "Refusing to lose untracked file at %s; adding as %s instead"

2907 msgstr ""

2908

2819 -#: merge-recursive.c:1651

2909 +#: merge-recursive.c:1633

2910 #, c-format

2911 msgid ""

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

2913 "\"->\"%s\" in \"%s\"%s"

2914 msgstr ""

2915

2826 -#: merge-recursive.c:1656

2916 +#: merge-recursive.c:1638

2917 msgid " (left unresolved)"

2918 msgstr ""

2919

2830 -#: merge-recursive.c:1720

2920 +#: merge-recursive.c:1699

2921 #, c-format

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

2923 msgstr ""

2924

2835 -#: merge-recursive.c:1759

2925 +#: merge-recursive.c:1734

2926 #, c-format

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

2928 msgstr ""

2929

2840 -#: merge-recursive.c:1771

2930 +#: merge-recursive.c:1746

2931 #, c-format

2932 msgid "Refusing to lose untracked file at %s, even though it's in the way."

2933 msgstr ""

2934

2845 -#: merge-recursive.c:1977

2935 +#: merge-recursive.c:1952

2936 #, c-format

2937 msgid ""

2938 "CONFLICT (directory rename split): Unclear where to place %s because "

@@ -2850,153 +2940,280 @@ msgid ""

2940 "getting a majority of the files."

2941 msgstr ""

2942

2853 -#: merge-recursive.c:2009

2943 +#: merge-recursive.c:1984

2944 #, c-format

2945 msgid ""

2946 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "

2947 "implicit directory rename(s) putting the following path(s) there: %s."

2948 msgstr ""

2949

2860 -#: merge-recursive.c:2019

2950 +#: merge-recursive.c:1994

2951 #, c-format

2952 msgid ""

2953 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "

2954 "implicit directory renames tried to put these paths there: %s"

2955 msgstr ""

2956

2867 -#: merge-recursive.c:2111

2957 +#: merge-recursive.c:2086

2958 #, c-format

2959 msgid ""

2960 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"

2961 ">%s in %s"

2962 msgstr ""

2963

2874 -#: merge-recursive.c:2356

2964 +#: merge-recursive.c:2331

2965 #, c-format

2966 msgid ""

2967 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "

2968 "renamed."

2969 msgstr ""

2970

2881 -#: merge-recursive.c:2762

2971 +#: merge-recursive.c:2737

2972 #, c-format

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

2974 msgstr ""

2975

2886 -#: merge-recursive.c:2777

2976 +#: merge-recursive.c:2763

2977 #, c-format

2978 msgid "Adding merged %s"

2979 msgstr ""

2980

2891 -#: merge-recursive.c:2784 merge-recursive.c:3132

2981 +#: merge-recursive.c:2770 merge-recursive.c:3127

2982 #, c-format

2983 msgid "Adding as %s instead"

2984 msgstr ""

2985

2896 -#: merge-recursive.c:2941

2986 +#: merge-recursive.c:2934

2987 #, c-format

2988 msgid "cannot read object %s"

2989 msgstr ""

2990

2901 -#: merge-recursive.c:2944

2991 +#: merge-recursive.c:2937

2992 #, c-format

2993 msgid "object %s is not a blob"

2994 msgstr ""

2995

2906 -#: merge-recursive.c:3013

2996 +#: merge-recursive.c:3006

2997 msgid "modify"

2998 msgstr ""

2999

2910 -#: merge-recursive.c:3013

3000 +#: merge-recursive.c:3006

3001 msgid "modified"

3002 msgstr ""

3003

2914 -#: merge-recursive.c:3024

3004 +#: merge-recursive.c:3017

3005 msgid "content"

3006 msgstr ""

3007

2918 -#: merge-recursive.c:3031

3008 +#: merge-recursive.c:3024

3009 msgid "add/add"

3010 msgstr ""

3011

2922 -#: merge-recursive.c:3076

3012 +#: merge-recursive.c:3071

3013 #, c-format

3014 msgid "Skipped %s (merged same as existing)"

3015 msgstr ""

3016

2927 -#: merge-recursive.c:3098 git-submodule.sh:865

3017 +#: merge-recursive.c:3093 git-submodule.sh:858

3018 msgid "submodule"

3019 msgstr ""

3020

2931 -#: merge-recursive.c:3099

3021 +#: merge-recursive.c:3094

3022 #, c-format

3023 msgid "CONFLICT (%s): Merge conflict in %s"

3024 msgstr ""

3025

2936 -#: merge-recursive.c:3221

3026 +#: merge-recursive.c:3216

3027 #, c-format

3028 msgid "Removing %s"

3029 msgstr ""

3030

2941 -#: merge-recursive.c:3247

3031 +#: merge-recursive.c:3242

3032 msgid "file/directory"

3033 msgstr ""

3034

2945 -#: merge-recursive.c:3253

3035 +#: merge-recursive.c:3248

3036 msgid "directory/file"

3037 msgstr ""

3038

2949 -#: merge-recursive.c:3260

3039 +#: merge-recursive.c:3255

3040 #, c-format

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

3042 msgstr ""

3043

2954 -#: merge-recursive.c:3269

3044 +#: merge-recursive.c:3264

3045 #, c-format

3046 msgid "Adding %s"

3047 msgstr ""

3048

2959 -#: merge-recursive.c:3303

3049 +#: merge-recursive.c:3300

3050 #, c-format

3051 msgid ""

3052 "Your local changes to the following files would be overwritten by merge:\n"

3053 " %s"

3054 msgstr ""

3055

2966 -#: merge-recursive.c:3314

3056 +#: merge-recursive.c:3311

3057 msgid "Already up to date!"

3058 msgstr ""

3059

2970 -#: merge-recursive.c:3323

3060 +#: merge-recursive.c:3320

3061 #, c-format

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

3063 msgstr ""

3064

2975 -#: merge-recursive.c:3422

3065 +#: merge-recursive.c:3419

3066 msgid "Merging:"

3067 msgstr ""

3068

2979 -#: merge-recursive.c:3435

3069 +#: merge-recursive.c:3432

3070 #, c-format

3071 msgid "found %u common ancestor:"

3072 msgid_plural "found %u common ancestors:"

3073 msgstr[0] ""

3074 msgstr[1] ""

3075

2986 -#: merge-recursive.c:3474

3076 +#: merge-recursive.c:3471

3077 msgid "merge returned no commit"

3078 msgstr ""

3079

2990 -#: merge-recursive.c:3540

3080 +#: merge-recursive.c:3537

3081 #, c-format

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

3083 msgstr ""

3084

2995 -#: merge-recursive.c:3556 builtin/merge.c:689 builtin/merge.c:846

3085 +#: merge-recursive.c:3553 builtin/merge.c:691 builtin/merge.c:849

3086 msgid "Unable to write index."

3087 msgstr ""

3088

2999 -#: notes-merge.c:274

3089 +#: midx.c:65

3090 +#, c-format

3091 +msgid "multi-pack-index file %s is too small"

3092 +msgstr ""

3093 +

3094 +#: midx.c:81

3095 +#, c-format

3096 +msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"

3097 +msgstr ""

3098 +

3099 +#: midx.c:86

3100 +#, c-format

3101 +msgid "multi-pack-index version %d not recognized"

3102 +msgstr ""

3103 +

3104 +#: midx.c:91

3105 +#, c-format

3106 +msgid "hash version %u does not match"

3107 +msgstr ""

3108 +

3109 +#: midx.c:105

3110 +msgid "invalid chunk offset (too large)"

3111 +msgstr ""

3112 +

3113 +#: midx.c:129

3114 +msgid "terminating multi-pack-index chunk id appears earlier than expected"

3115 +msgstr ""

3116 +

3117 +#: midx.c:142

3118 +msgid "multi-pack-index missing required pack-name chunk"

3119 +msgstr ""

3120 +

3121 +#: midx.c:144

3122 +msgid "multi-pack-index missing required OID fanout chunk"

3123 +msgstr ""

3124 +

3125 +#: midx.c:146

3126 +msgid "multi-pack-index missing required OID lookup chunk"

3127 +msgstr ""

3128 +

3129 +#: midx.c:148

3130 +msgid "multi-pack-index missing required object offsets chunk"

3131 +msgstr ""

3132 +

3133 +#: midx.c:162

3134 +#, c-format

3135 +msgid "multi-pack-index pack names out of order: '%s' before '%s'"

3136 +msgstr ""

3137 +

3138 +#: midx.c:205

3139 +#, c-format

3140 +msgid "bad pack-int-id: %u (%u total packs"

3141 +msgstr ""

3142 +

3143 +#: midx.c:246

3144 +msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"

3145 +msgstr ""

3146 +

3147 +#: midx.c:271

3148 +msgid "error preparing packfile from multi-pack-index"

3149 +msgstr ""

3150 +

3151 +#: midx.c:407

3152 +#, c-format

3153 +msgid "failed to add packfile '%s'"

3154 +msgstr ""

3155 +

3156 +#: midx.c:413

3157 +#, c-format

3158 +msgid "failed to open pack-index '%s'"

3159 +msgstr ""

3160 +

3161 +#: midx.c:507

3162 +#, c-format

3163 +msgid "failed to locate object %d in packfile"

3164 +msgstr ""

3165 +

3166 +#: midx.c:943

3167 +#, c-format

3168 +msgid "failed to clear multi-pack-index at %s"

3169 +msgstr ""

3170 +

3171 +#: midx.c:981

3172 +#, c-format

3173 +msgid ""

3174 +"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

3175 +msgstr ""

3176 +

3177 +#: midx.c:992

3178 +#, c-format

3179 +msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"

3180 +msgstr ""

3181 +

3182 +#: midx.c:996

3183 +msgid "Verifying object offsets"

3184 +msgstr ""

3185 +

3186 +#: midx.c:1004

3187 +#, c-format

3188 +msgid "failed to load pack entry for oid[%d] = %s"

3189 +msgstr ""

3190 +

3191 +#: midx.c:1010

3192 +#, c-format

3193 +msgid "failed to load pack-index for packfile %s"

3194 +msgstr ""

3195 +

3196 +#: midx.c:1019

3197 +#, c-format

3198 +msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"

3199 +msgstr ""

3200 +

3201 +#: name-hash.c:532

3202 +#, c-format

3203 +msgid "unable to create lazy_dir thread: %s"

3204 +msgstr ""

3205 +

3206 +#: name-hash.c:554

3207 +#, c-format

3208 +msgid "unable to create lazy_name thread: %s"

3209 +msgstr ""

3210 +

3211 +#: name-hash.c:560

3212 +#, c-format

3213 +msgid "unable to join lazy_name thread: %s"

3214 +msgstr ""

3215 +

3216 +#: notes-merge.c:275

3217 #, c-format

3218 msgid ""

3219 "You have not concluded your previous notes merge (%s exists).\n"

@@ -3004,7 +3221,7 @@ msgid ""

3221 "commit/abort the previous merge before you start a new notes merge."

3222 msgstr ""

3223

3007 -#: notes-merge.c:281

3224 +#: notes-merge.c:282

3225 #, c-format

3226 msgid "You have not concluded your notes merge (%s exists)."

3227 msgstr ""

@@ -3057,16 +3274,16 @@ msgstr ""

3274 msgid "sha1 mismatch %s"

3275 msgstr ""

3276

3060 -#: packfile.c:563

3277 +#: packfile.c:607

3278 msgid "offset before end of packfile (broken .idx?)"

3279 msgstr ""

3280

3064 -#: packfile.c:1745

3281 +#: packfile.c:1864

3282 #, c-format

3283 msgid "offset before start of pack index for %s (corrupt index?)"

3284 msgstr ""

3285

3069 -#: packfile.c:1749

3286 +#: packfile.c:1868

3287 #, c-format

3288 msgid "offset beyond end of pack index for %s (truncated index?)"

3289 msgstr ""

@@ -3097,17 +3314,17 @@ msgstr ""

3314 msgid "-NUM"

3315 msgstr ""

3316

3100 -#: parse-options-cb.c:44

3317 +#: parse-options-cb.c:37

3318 #, c-format

3319 msgid "malformed expiration date '%s'"

3320 msgstr ""

3321

3105 -#: parse-options-cb.c:112

3322 +#: parse-options-cb.c:109

3323 #, c-format

3324 msgid "malformed object name '%s'"

3325 msgstr ""

3326

3110 -#: path.c:892

3327 +#: path.c:894

3328 #, c-format

3329 msgid "Could not make %s writable by group"

3330 msgstr ""

@@ -3221,175 +3438,281 @@ msgstr ""

3438 msgid "protocol error: bad line length %d"

3439 msgstr ""

3440

3441 +#: preload-index.c:118

3442 +msgid "Refreshing index"

3443 +msgstr ""

3444 +

3445 +#: preload-index.c:137

3446 +#, c-format

3447 +msgid "unable to create threaded lstat: %s"

3448 +msgstr ""

3449 +

3450 #: pretty.c:962

3451 msgid "unable to parse --pretty format"

3452 msgstr ""

3453

3228 -#: range-diff.c:48

3454 +#: range-diff.c:56

3455 msgid "could not start `log`"

3456 msgstr ""

3457

3232 -#: range-diff.c:51

3458 +#: range-diff.c:59

3459 msgid "could not read `log` output"

3460 msgstr ""

3461

3236 -#: range-diff.c:66 sequencer.c:4540

3462 +#: range-diff.c:74 sequencer.c:4764

3463 #, c-format

3464 msgid "could not parse commit '%s'"

3465 msgstr ""

3466

3241 -#: range-diff.c:196

3467 +#: range-diff.c:224

3468 msgid "failed to generate diff"

3469 msgstr ""

3470

3245 -#: range-diff.c:421 range-diff.c:423

3471 +#: range-diff.c:455 range-diff.c:457

3472 #, c-format

3473 msgid "could not parse log for '%s'"

3474 msgstr ""

3475

3250 -#: read-cache.c:1579

3476 +#: read-cache.c:1490

3477 +msgid "Refresh index"

3478 +msgstr ""

3479 +

3480 +#: read-cache.c:1604

3481 #, c-format

3482 msgid ""

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

3484 "Using version %i"

3485 msgstr ""

3486

3257 -#: read-cache.c:1589

3487 +#: read-cache.c:1614

3488 #, c-format

3489 msgid ""

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

3491 "Using version %i"

3492 msgstr ""

3493

3264 -#: read-cache.c:2580 sequencer.c:4503 wrapper.c:658 builtin/merge.c:1083

3494 +#: read-cache.c:1792

3495 +#, c-format

3496 +msgid "malformed name field in the index, near path '%s'"

3497 +msgstr ""

3498 +

3499 +#: read-cache.c:1960 rerere.c:565 rerere.c:599 rerere.c:1111 builtin/add.c:458

3500 +#: builtin/check-ignore.c:177 builtin/checkout.c:289 builtin/checkout.c:585

3501 +#: builtin/checkout.c:953 builtin/clean.c:954 builtin/commit.c:343

3502 +#: builtin/diff-tree.c:115 builtin/grep.c:489 builtin/mv.c:144

3503 +#: builtin/reset.c:244 builtin/rm.c:270 builtin/submodule--helper.c:329

3504 +msgid "index file corrupt"

3505 +msgstr ""

3506 +

3507 +#: read-cache.c:2101

3508 +#, c-format

3509 +msgid "unable to create load_cache_entries thread: %s"

3510 +msgstr ""

3511 +

3512 +#: read-cache.c:2114

3513 +#, c-format

3514 +msgid "unable to join load_cache_entries thread: %s"

3515 +msgstr ""

3516 +

3517 +#: read-cache.c:2200

3518 +#, c-format

3519 +msgid "unable to create load_index_extensions thread: %s"

3520 +msgstr ""

3521 +

3522 +#: read-cache.c:2227

3523 +#, c-format

3524 +msgid "unable to join load_index_extensions thread: %s"

3525 +msgstr ""

3526 +

3527 +#: read-cache.c:2953 sequencer.c:4727 wrapper.c:658 builtin/merge.c:1086

3528 #, c-format

3529 msgid "could not close '%s'"

3530 msgstr ""

3531

3269 -#: read-cache.c:2653 sequencer.c:2113 sequencer.c:3374

3532 +#: read-cache.c:3026 sequencer.c:2203 sequencer.c:3592

3533 #, c-format

3534 msgid "could not stat '%s'"

3535 msgstr ""

3536

3274 -#: read-cache.c:2666

3537 +#: read-cache.c:3039

3538 #, c-format

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

3540 msgstr ""

3541

3279 -#: read-cache.c:2678

3542 +#: read-cache.c:3051

3543 #, c-format

3544 msgid "unable to unlink: %s"

3545 msgstr ""

3546

3547 +#: rebase-interactive.c:10

3548 +msgid ""

3549 +"\n"

3550 +"Commands:\n"

3551 +"p, pick <commit> = use commit\n"

3552 +"r, reword <commit> = use commit, but edit the commit message\n"

3553 +"e, edit <commit> = use commit, but stop for amending\n"

3554 +"s, squash <commit> = use commit, but meld into previous commit\n"

3555 +"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"

3556 +"x, exec <command> = run command (the rest of the line) using shell\n"

3557 +"b, break = stop here (continue rebase later with 'git rebase --continue')\n"

3558 +"d, drop <commit> = remove commit\n"

3559 +"l, label <label> = label current HEAD with a name\n"

3560 +"t, reset <label> = reset HEAD to a label\n"

3561 +"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"

3562 +". create a merge commit using the original merge commit's\n"

3563 +". message (or the oneline, if no original merge commit was\n"

3564 +". specified). Use -c <commit> to reword the commit message.\n"

3565 +"\n"

3566 +"These lines can be re-ordered; they are executed from top to bottom.\n"

3567 +msgstr ""

3568 +

3569 +#: rebase-interactive.c:31 git-rebase--preserve-merges.sh:173

3570 +msgid ""

3571 +"\n"

3572 +"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"

3573 +msgstr ""

3574 +

3575 +#: rebase-interactive.c:34 git-rebase--preserve-merges.sh:177

3576 +msgid ""

3577 +"\n"

3578 +"If you remove a line here THAT COMMIT WILL BE LOST.\n"

3579 +msgstr ""

3580 +

3581 +#: rebase-interactive.c:40 git-rebase--preserve-merges.sh:816

3582 +msgid ""

3583 +"\n"

3584 +"You are editing the todo file of an ongoing interactive rebase.\n"

3585 +"To continue rebase after editing, run:\n"

3586 +" git rebase --continue\n"

3587 +"\n"

3588 +msgstr ""

3589 +

3590 +#: rebase-interactive.c:45 git-rebase--preserve-merges.sh:893

3591 +msgid ""

3592 +"\n"

3593 +"However, if you remove everything, the rebase will be aborted.\n"

3594 +"\n"

3595 +msgstr ""

3596 +

3597 +#: rebase-interactive.c:51 git-rebase--preserve-merges.sh:900

3598 +msgid "Note that empty commits are commented out"

3599 +msgstr ""

3600 +

3601 +#: rebase-interactive.c:62 rebase-interactive.c:75 sequencer.c:2186

3602 +#: sequencer.c:4505 sequencer.c:4561 sequencer.c:4836

3603 +#, c-format

3604 +msgid "could not read '%s'."

3605 +msgstr ""

3606 +

3607 #: refs.c:192

3608 #, c-format

3609 msgid "%s does not point to a valid object!"

3610 msgstr ""

3611

3289 -#: refs.c:579

3612 +#: refs.c:583

3613 #, c-format

3614 msgid "ignoring dangling symref %s"

3615 msgstr ""

3616

3294 -#: refs.c:581 ref-filter.c:2067

3617 +#: refs.c:585 ref-filter.c:1951

3618 #, c-format

3619 msgid "ignoring broken ref %s"

3620 msgstr ""

3621

3299 -#: refs.c:685

3622 +#: refs.c:711

3623 #, c-format

3624 msgid "could not open '%s' for writing: %s"

3625 msgstr ""

3626

3304 -#: refs.c:695 refs.c:746

3627 +#: refs.c:721 refs.c:772

3628 #, c-format

3629 msgid "could not read ref '%s'"

3630 msgstr ""

3631

3309 -#: refs.c:701

3632 +#: refs.c:727

3633 #, c-format

3634 msgid "ref '%s' already exists"

3635 msgstr ""

3636

3314 -#: refs.c:706

3637 +#: refs.c:732

3638 #, c-format

3639 msgid "unexpected object ID when writing '%s'"

3640 msgstr ""

3641

3319 -#: refs.c:714 sequencer.c:385 sequencer.c:2366 sequencer.c:2492

3320 -#: sequencer.c:2506 sequencer.c:2733 sequencer.c:4501 sequencer.c:4564

3642 +#: refs.c:740 sequencer.c:394 sequencer.c:2510 sequencer.c:2636

3643 +#: sequencer.c:2650 sequencer.c:2877 sequencer.c:4725 sequencer.c:4788

3644 #: wrapper.c:656

3645 #, c-format

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

3647 msgstr ""

3648

3326 -#: refs.c:741 sequencer.c:4499 sequencer.c:4558 wrapper.c:225 wrapper.c:395

3327 -#: builtin/am.c:780

3649 +#: refs.c:767 sequencer.c:4723 sequencer.c:4782 wrapper.c:225 wrapper.c:395

3650 +#: builtin/am.c:728

3651 #, c-format

3652 msgid "could not open '%s' for writing"

3653 msgstr ""

3654

3332 -#: refs.c:748

3655 +#: refs.c:774

3656 #, c-format

3657 msgid "unexpected object ID when deleting '%s'"

3658 msgstr ""

3659

3337 -#: refs.c:879

3660 +#: refs.c:905

3661 #, c-format

3662 msgid "log for ref %s has gap after %s"

3663 msgstr ""

3664

3342 -#: refs.c:885

3665 +#: refs.c:911

3666 #, c-format

3667 msgid "log for ref %s unexpectedly ended on %s"

3668 msgstr ""

3669

3347 -#: refs.c:943

3670 +#: refs.c:969

3671 #, c-format

3672 msgid "log for %s is empty"

3673 msgstr ""

3674

3352 -#: refs.c:1035

3675 +#: refs.c:1061

3676 #, c-format

3677 msgid "refusing to update ref with bad name '%s'"

3678 msgstr ""

3679

3357 -#: refs.c:1111

3680 +#: refs.c:1137

3681 #, c-format

3682 msgid "update_ref failed for ref '%s': %s"

3683 msgstr ""

3684

3362 -#: refs.c:1853

3685 +#: refs.c:1911

3686 #, c-format

3687 msgid "multiple updates for ref '%s' not allowed"

3688 msgstr ""

3689

3367 -#: refs.c:1885

3690 +#: refs.c:1943

3691 msgid "ref updates forbidden inside quarantine environment"

3692 msgstr ""

3693

3371 -#: refs.c:1981 refs.c:2011

3694 +#: refs.c:2039 refs.c:2069

3695 #, c-format

3696 msgid "'%s' exists; cannot create '%s'"

3697 msgstr ""

3698

3376 -#: refs.c:1987 refs.c:2022

3699 +#: refs.c:2045 refs.c:2080

3700 #, c-format

3701 msgid "cannot process '%s' and '%s' at the same time"

3702 msgstr ""

3703

3381 -#: refs/files-backend.c:1191

3704 +#: refs/files-backend.c:1227

3705 #, c-format

3706 msgid "could not remove reference %s"

3707 msgstr ""

3708

3386 -#: refs/files-backend.c:1205 refs/packed-backend.c:1532

3709 +#: refs/files-backend.c:1241 refs/packed-backend.c:1532

3710 #: refs/packed-backend.c:1542

3711 #, c-format

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

3713 msgstr ""

3714

3392 -#: refs/files-backend.c:1208 refs/packed-backend.c:1545

3715 +#: refs/files-backend.c:1244 refs/packed-backend.c:1545

3716 #, c-format

3717 msgid "could not delete references: %s"

3718 msgstr ""

@@ -3399,191 +3722,197 @@ msgstr ""

3722 msgid "invalid refspec '%s'"

3723 msgstr ""

3724

3402 -#: ref-filter.c:38 wt-status.c:1850

3725 +#: ref-filter.c:39 wt-status.c:1855

3726 msgid "gone"

3727 msgstr ""

3728

3406 -#: ref-filter.c:39

3729 +#: ref-filter.c:40

3730 #, c-format

3731 msgid "ahead %d"

3732 msgstr ""

3733

3411 -#: ref-filter.c:40

3734 +#: ref-filter.c:41

3735 #, c-format

3736 msgid "behind %d"

3737 msgstr ""

3738

3416 -#: ref-filter.c:41

3739 +#: ref-filter.c:42

3740 #, c-format

3741 msgid "ahead %d, behind %d"

3742 msgstr ""

3743

3421 -#: ref-filter.c:137

3744 +#: ref-filter.c:138

3745 #, c-format

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

3747 msgstr ""

3748

3426 -#: ref-filter.c:139

3749 +#: ref-filter.c:140

3750 #, c-format

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

3752 msgstr ""

3753

3431 -#: ref-filter.c:161

3754 +#: ref-filter.c:162

3755 #, c-format

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

3757 msgstr ""

3758

3436 -#: ref-filter.c:165

3759 +#: ref-filter.c:166

3760 #, c-format

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

3762 msgstr ""

3763

3441 -#: ref-filter.c:167

3764 +#: ref-filter.c:168

3765 #, c-format

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

3767 msgstr ""

3768

3446 -#: ref-filter.c:222

3769 +#: ref-filter.c:223

3770 #, c-format

3771 msgid "%%(objecttype) does not take arguments"

3772 msgstr ""

3773

3451 -#: ref-filter.c:234

3774 +#: ref-filter.c:235

3775 #, c-format

3776 msgid "%%(objectsize) does not take arguments"

3777 msgstr ""

3778

3456 -#: ref-filter.c:246

3779 +#: ref-filter.c:247

3780 #, c-format

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

3782 msgstr ""

3783

3461 -#: ref-filter.c:255

3784 +#: ref-filter.c:256

3785 #, c-format

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

3787 msgstr ""

3788

3466 -#: ref-filter.c:275

3789 +#: ref-filter.c:278

3790 #, c-format

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

3792 msgstr ""

3793

3471 -#: ref-filter.c:304

3794 +#: ref-filter.c:307

3795 #, c-format

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

3797 msgstr ""

3798

3476 -#: ref-filter.c:306

3799 +#: ref-filter.c:309

3800 #, c-format

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

3802 msgstr ""

3803

3481 -#: ref-filter.c:321

3804 +#: ref-filter.c:324

3805 #, c-format

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

3807 msgstr ""

3808

3486 -#: ref-filter.c:325

3809 +#: ref-filter.c:328

3810 #, c-format

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

3812 msgstr ""

3813

3491 -#: ref-filter.c:355

3814 +#: ref-filter.c:358

3815 #, c-format

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

3817 msgstr ""

3818

3496 -#: ref-filter.c:367

3819 +#: ref-filter.c:370

3820 #, c-format

3821 msgid "unrecognized position:%s"

3822 msgstr ""

3823

3501 -#: ref-filter.c:374

3824 +#: ref-filter.c:377

3825 #, c-format

3826 msgid "unrecognized width:%s"

3827 msgstr ""

3828

3506 -#: ref-filter.c:383

3829 +#: ref-filter.c:386

3830 #, c-format

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

3832 msgstr ""

3833

3511 -#: ref-filter.c:391

3834 +#: ref-filter.c:394

3835 #, c-format

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

3837 msgstr ""

3838

3516 -#: ref-filter.c:409

3839 +#: ref-filter.c:412

3840 #, c-format

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

3842 msgstr ""

3843

3521 -#: ref-filter.c:505

3844 +#: ref-filter.c:508

3845 #, c-format

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

3847 msgstr ""

3848

3526 -#: ref-filter.c:532

3849 +#: ref-filter.c:535

3850 #, c-format

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

3852 msgstr ""

3853

3531 -#: ref-filter.c:656

3854 +#: ref-filter.c:539

3855 +#, c-format

3856 +msgid ""

3857 +"not a git repository, but the field '%.*s' requires access to object data"

3858 +msgstr ""

3859 +

3860 +#: ref-filter.c:663

3861 #, c-format

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

3863 msgstr ""

3864

3536 -#: ref-filter.c:719

3865 +#: ref-filter.c:726

3866 #, c-format

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

3868 msgstr ""

3869

3541 -#: ref-filter.c:721

3870 +#: ref-filter.c:728

3871 #, c-format

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

3873 msgstr ""

3874

3546 -#: ref-filter.c:723

3875 +#: ref-filter.c:730

3876 #, c-format

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

3878 msgstr ""

3879

3551 -#: ref-filter.c:751

3880 +#: ref-filter.c:758

3881 #, c-format

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

3883 msgstr ""

3884

3556 -#: ref-filter.c:753

3885 +#: ref-filter.c:760

3886 #, c-format

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

3888 msgstr ""

3889

3561 -#: ref-filter.c:755

3890 +#: ref-filter.c:762

3891 #, c-format

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

3893 msgstr ""

3894

3566 -#: ref-filter.c:770

3895 +#: ref-filter.c:777

3896 #, c-format

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

3898 msgstr ""

3899

3571 -#: ref-filter.c:827

3900 +#: ref-filter.c:834

3901 #, c-format

3902 msgid "malformed format string %s"

3903 msgstr ""

3904

3576 -#: ref-filter.c:1416

3905 +#: ref-filter.c:1424

3906 #, c-format

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

3908 msgstr ""

3909

3581 -#: ref-filter.c:1419

3910 +#: ref-filter.c:1427

3911 #, c-format

3912 msgid "(no branch, rebasing detached HEAD %s)"

3913 msgstr ""

3914

3586 -#: ref-filter.c:1422

3915 +#: ref-filter.c:1430

3916 #, c-format

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

3918 msgstr ""

@@ -3591,7 +3920,7 @@ msgstr ""

3920 #. TRANSLATORS: make sure this matches "HEAD

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

3922 #.

3594 -#: ref-filter.c:1430

3923 +#: ref-filter.c:1438

3924 #, c-format

3925 msgid "(HEAD detached at %s)"

3926 msgstr ""

@@ -3599,142 +3928,142 @@ msgstr ""

3928 #. TRANSLATORS: make sure this matches "HEAD

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

3930 #.

3602 -#: ref-filter.c:1437

3931 +#: ref-filter.c:1445

3932 #, c-format

3933 msgid "(HEAD detached from %s)"

3934 msgstr ""

3935

3607 -#: ref-filter.c:1441

3936 +#: ref-filter.c:1449

3937 msgid "(no branch)"

3938 msgstr ""

3939

3611 -#: ref-filter.c:1475 ref-filter.c:1623

3940 +#: ref-filter.c:1483 ref-filter.c:1638

3941 #, c-format

3942 msgid "missing object %s for %s"

3943 msgstr ""

3944

3616 -#: ref-filter.c:1483

3945 +#: ref-filter.c:1491

3946 #, c-format

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

3948 msgstr ""

3949

3621 -#: ref-filter.c:1980

3950 +#: ref-filter.c:1857

3951 #, c-format

3952 msgid "malformed object at '%s'"

3953 msgstr ""

3954

3626 -#: ref-filter.c:2062

3955 +#: ref-filter.c:1946

3956 #, c-format

3957 msgid "ignoring ref with broken name %s"

3958 msgstr ""

3959

3631 -#: ref-filter.c:2340

3960 +#: ref-filter.c:2232

3961 #, c-format

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

3963 msgstr ""

3964

3636 -#: ref-filter.c:2444

3965 +#: ref-filter.c:2338

3966 #, c-format

3967 msgid "malformed object name %s"

3968 msgstr ""

3969

3641 -#: remote.c:606

3970 +#: remote.c:607

3971 #, c-format

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

3973 msgstr ""

3974

3646 -#: remote.c:610

3975 +#: remote.c:611

3976 #, c-format

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

3978 msgstr ""

3979

3651 -#: remote.c:614

3980 +#: remote.c:615

3981 #, c-format

3982 msgid "%s tracks both %s and %s"

3983 msgstr ""

3984

3656 -#: remote.c:622

3985 +#: remote.c:623

3986 msgid "Internal error"

3987 msgstr ""

3988

3660 -#: remote.c:1536 remote.c:1637

3989 +#: remote.c:1569 remote.c:1670

3990 msgid "HEAD does not point to a branch"

3991 msgstr ""

3992

3664 -#: remote.c:1545

3993 +#: remote.c:1578

3994 #, c-format

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

3996 msgstr ""

3997

3669 -#: remote.c:1548

3998 +#: remote.c:1581

3999 #, c-format

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

4001 msgstr ""

4002

3674 -#: remote.c:1554

4003 +#: remote.c:1587

4004 #, c-format

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

4006 msgstr ""

4007

3679 -#: remote.c:1569

4008 +#: remote.c:1602

4009 #, c-format

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

4011 msgstr ""

4012

3684 -#: remote.c:1581

4013 +#: remote.c:1614

4014 #, c-format

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

4016 msgstr ""

4017

3689 -#: remote.c:1591

4018 +#: remote.c:1624

4019 #, c-format

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

4021 msgstr ""

4022

3694 -#: remote.c:1604

4023 +#: remote.c:1637

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

4025 msgstr ""

4026

3698 -#: remote.c:1626

4027 +#: remote.c:1659

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

4029 msgstr ""

4030

3702 -#: remote.c:1951

4031 +#: remote.c:1935

4032 #, c-format

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

4034 msgstr ""

4035

3707 -#: remote.c:1955

4036 +#: remote.c:1939

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

4038 msgstr ""

4039

3711 -#: remote.c:1958

4040 +#: remote.c:1942

4041 #, c-format

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

4043 msgstr ""

4044

3716 -#: remote.c:1962

4045 +#: remote.c:1946

4046 #, c-format

4047 msgid "Your branch and '%s' refer to different commits.\n"

4048 msgstr ""

4049

3721 -#: remote.c:1965

4050 +#: remote.c:1949

4051 #, c-format

4052 msgid " (use \"%s\" for details)\n"

4053 msgstr ""

4054

3726 -#: remote.c:1969

4055 +#: remote.c:1953

4056 #, c-format

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

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

4059 msgstr[0] ""

4060 msgstr[1] ""

4061

3733 -#: remote.c:1975

4062 +#: remote.c:1959

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

4064 msgstr ""

4065

3737 -#: remote.c:1978

4066 +#: remote.c:1962

4067 #, c-format

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

4069 msgid_plural ""

@@ -3742,11 +4071,11 @@ msgid_plural ""

4071 msgstr[0] ""

4072 msgstr[1] ""

4073

3745 -#: remote.c:1986

4074 +#: remote.c:1970

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

4076 msgstr ""

4077

3749 -#: remote.c:1989

4078 +#: remote.c:1973

4079 #, c-format

4080 msgid ""

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

@@ -3757,43 +4086,146 @@ msgid_plural ""

4086 msgstr[0] ""

4087 msgstr[1] ""

4088

3760 -#: remote.c:1999

4089 +#: remote.c:1983

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

4091 msgstr ""

4092

3764 -#: replace-object.c:20

4093 +#: replace-object.c:21

4094 #, c-format

4095 msgid "bad replace ref name: %s"

4096 msgstr ""

4097

3769 -#: replace-object.c:29

4098 +#: replace-object.c:30

4099 #, c-format

4100 msgid "duplicate replace ref: %s"

4101 msgstr ""

4102

3774 -#: replace-object.c:72

4103 +#: replace-object.c:73

4104 #, c-format

4105 msgid "replace depth too high for object %s"

4106 msgstr ""

4107

3779 -#: revision.c:2305

3780 -msgid "your current branch appears to be broken"

4108 +#: rerere.c:217 rerere.c:226 rerere.c:229

4109 +msgid "corrupt MERGE_RR"

4110 msgstr ""

4111

3783 -#: revision.c:2308

3784 -#, c-format

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

4112 +#: rerere.c:264 rerere.c:269

4113 +msgid "unable to write rerere record"

4114 msgstr ""

4115

3788 -#: revision.c:2505

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

4116 +#: rerere.c:485 rerere.c:692 sequencer.c:3136 sequencer.c:3162

4117 +#, c-format

4118 +msgid "could not write '%s'"

4119 msgstr ""

4120

3792 -#: run-command.c:728

3793 -msgid "open /dev/null failed"

4121 +#: rerere.c:495

4122 +#, c-format

4123 +msgid "there were errors while writing '%s' (%s)"

4124 msgstr ""

4125

3796 -#: run-command.c:1271

4126 +#: rerere.c:498

4127 +#, c-format

4128 +msgid "failed to flush '%s'"

4129 +msgstr ""

4130 +

4131 +#: rerere.c:503 rerere.c:1039

4132 +#, c-format

4133 +msgid "could not parse conflict hunks in '%s'"

4134 +msgstr ""

4135 +

4136 +#: rerere.c:684

4137 +#, c-format

4138 +msgid "failed utime() on '%s'"

4139 +msgstr ""

4140 +

4141 +#: rerere.c:694

4142 +#, c-format

4143 +msgid "writing '%s' failed"

4144 +msgstr ""

4145 +

4146 +#: rerere.c:714

4147 +#, c-format

4148 +msgid "Staged '%s' using previous resolution."

4149 +msgstr ""

4150 +

4151 +#: rerere.c:753

4152 +#, c-format

4153 +msgid "Recorded resolution for '%s'."

4154 +msgstr ""

4155 +

4156 +#: rerere.c:788

4157 +#, c-format

4158 +msgid "Resolved '%s' using previous resolution."

4159 +msgstr ""

4160 +

4161 +#: rerere.c:803

4162 +#, c-format

4163 +msgid "cannot unlink stray '%s'"

4164 +msgstr ""

4165 +

4166 +#: rerere.c:807

4167 +#, c-format

4168 +msgid "Recorded preimage for '%s'"

4169 +msgstr ""

4170 +

4171 +#: rerere.c:881 submodule.c:1763 builtin/submodule--helper.c:1413

4172 +#: builtin/submodule--helper.c:1423

4173 +#, c-format

4174 +msgid "could not create directory '%s'"

4175 +msgstr ""

4176 +

4177 +#: rerere.c:1057

4178 +#, c-format

4179 +msgid "failed to update conflicted state in '%s'"

4180 +msgstr ""

4181 +

4182 +#: rerere.c:1068 rerere.c:1075

4183 +#, c-format

4184 +msgid "no remembered resolution for '%s'"

4185 +msgstr ""

4186 +

4187 +#: rerere.c:1077

4188 +#, c-format

4189 +msgid "cannot unlink '%s'"

4190 +msgstr ""

4191 +

4192 +#: rerere.c:1087

4193 +#, c-format

4194 +msgid "Updated preimage for '%s'"

4195 +msgstr ""

4196 +

4197 +#: rerere.c:1096

4198 +#, c-format

4199 +msgid "Forgot resolution for '%s'\n"

4200 +msgstr ""

4201 +

4202 +#: rerere.c:1199

4203 +msgid "unable to open rr-cache directory"

4204 +msgstr ""

4205 +

4206 +#: revision.c:2324

4207 +msgid "your current branch appears to be broken"

4208 +msgstr ""

4209 +

4210 +#: revision.c:2327

4211 +#, c-format

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

4213 +msgstr ""

4214 +

4215 +#: revision.c:2523

4216 +msgid "--first-parent is incompatible with --bisect"

4217 +msgstr ""

4218 +

4219 +#: run-command.c:740

4220 +msgid "open /dev/null failed"

4221 +msgstr ""

4222 +

4223 +#: run-command.c:1229

4224 +#, c-format

4225 +msgid "cannot create async thread: %s"

4226 +msgstr ""

4227 +

4228 +#: run-command.c:1293

4229 #, c-format

4230 msgid ""

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

@@ -3814,101 +4246,101 @@ msgstr ""

4246 msgid "remote unpack failed: %s"

4247 msgstr ""

4248

3817 -#: send-pack.c:309

4249 +#: send-pack.c:308

4250 msgid "failed to sign the push certificate"

4251 msgstr ""

4252

3821 -#: send-pack.c:422

4253 +#: send-pack.c:421

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

4255 msgstr ""

4256

3825 -#: send-pack.c:424

4257 +#: send-pack.c:423

4258 msgid ""

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

4260 "signed push"

4261 msgstr ""

4262

3831 -#: send-pack.c:436

4263 +#: send-pack.c:435

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

4265 msgstr ""

4266

3835 -#: send-pack.c:441

4267 +#: send-pack.c:440

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

4269 msgstr ""

4270

3839 -#: sequencer.c:177

4271 +#: sequencer.c:183

4272 #, c-format

4273 msgid "invalid commit message cleanup mode '%s'"

4274 msgstr ""

4275

3844 -#: sequencer.c:278

4276 +#: sequencer.c:287

4277 #, c-format

4278 msgid "could not delete '%s'"

4279 msgstr ""

4280

3849 -#: sequencer.c:304

4281 +#: sequencer.c:313

4282 msgid "revert"

4283 msgstr ""

4284

3853 -#: sequencer.c:306

4285 +#: sequencer.c:315

4286 msgid "cherry-pick"

4287 msgstr ""

4288

3857 -#: sequencer.c:308

4289 +#: sequencer.c:317

4290 msgid "rebase -i"

4291 msgstr ""

4292

3861 -#: sequencer.c:310

4293 +#: sequencer.c:319

4294 #, c-format

4295 msgid "unknown action: %d"

4296 msgstr ""

4297

3866 -#: sequencer.c:367

4298 +#: sequencer.c:376

4299 msgid ""

4300 "after resolving the conflicts, mark the corrected paths\n"

4301 "with 'git add <paths>' or 'git rm <paths>'"

4302 msgstr ""

4303

3872 -#: sequencer.c:370

4304 +#: sequencer.c:379

4305 msgid ""

4306 "after resolving the conflicts, mark the corrected paths\n"

4307 "with 'git add <paths>' or 'git rm <paths>'\n"

4308 "and commit the result with 'git commit'"

4309 msgstr ""

4310

3879 -#: sequencer.c:383 sequencer.c:2488

4311 +#: sequencer.c:392 sequencer.c:2632

4312 #, c-format

4313 msgid "could not lock '%s'"

4314 msgstr ""

4315

3884 -#: sequencer.c:390

4316 +#: sequencer.c:399

4317 #, c-format

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

4319 msgstr ""

4320

3889 -#: sequencer.c:395 sequencer.c:2371 sequencer.c:2494 sequencer.c:2508

3890 -#: sequencer.c:2741

4321 +#: sequencer.c:404 sequencer.c:2515 sequencer.c:2638 sequencer.c:2652

4322 +#: sequencer.c:2885

4323 #, c-format

4324 msgid "failed to finalize '%s'"

4325 msgstr ""

4326

3895 -#: sequencer.c:418 sequencer.c:816 sequencer.c:1505 sequencer.c:2391

3896 -#: sequencer.c:2723 sequencer.c:2827 builtin/am.c:260 builtin/commit.c:740

3897 -#: builtin/merge.c:1081

4327 +#: sequencer.c:427 sequencer.c:921 sequencer.c:1594 sequencer.c:2535

4328 +#: sequencer.c:2867 sequencer.c:2974 builtin/am.c:260 builtin/commit.c:746

4329 +#: builtin/merge.c:1084 builtin/rebase.c:152

4330 #, c-format

4331 msgid "could not read '%s'"

4332 msgstr ""

4333

3902 -#: sequencer.c:444

4334 +#: sequencer.c:453

4335 #, c-format

4336 msgid "your local changes would be overwritten by %s."

4337 msgstr ""

4338

3907 -#: sequencer.c:448

4339 +#: sequencer.c:457

4340 msgid "commit your changes or stash them to proceed."

4341 msgstr ""

4342

3911 -#: sequencer.c:477

4343 +#: sequencer.c:486

4344 #, c-format

4345 msgid "%s: fast-forward"

4346 msgstr ""

@@ -3916,35 +4348,70 @@ msgstr ""

4348 #. TRANSLATORS: %s will be "revert", "cherry-pick" or

4349 #. "rebase -i".

4350 #.

3919 -#: sequencer.c:566

4351 +#: sequencer.c:575

4352 #, c-format

4353 msgid "%s: Unable to write new index file"

4354 msgstr ""

4355

3924 -#: sequencer.c:582

4356 +#: sequencer.c:591

4357 msgid "unable to update cache tree"

4358 msgstr ""

4359

3928 -#: sequencer.c:595

4360 +#: sequencer.c:604

4361 msgid "could not resolve HEAD commit"

4362 msgstr ""

4363

3932 -#: sequencer.c:723 sequencer.c:740

4364 +#: sequencer.c:684

4365 #, c-format

3934 -msgid "could not parse '%s' (looking for '%s')"

4366 +msgid "no key present in '%.*s'"

4367 msgstr ""

4368

3937 -#: sequencer.c:731

4369 +#: sequencer.c:695

4370 #, c-format

3939 -msgid "bad quoting on %s value in '%s'"

4371 +msgid "unable to dequote value of '%s'"

4372 +msgstr ""

4373 +

4374 +#: sequencer.c:732 wrapper.c:227 wrapper.c:397 builtin/am.c:719

4375 +#: builtin/am.c:811 builtin/merge.c:1081

4376 +#, c-format

4377 +msgid "could not open '%s' for reading"

4378 +msgstr ""

4379 +

4380 +#: sequencer.c:742

4381 +msgid "'GIT_AUTHOR_NAME' already given"

4382 msgstr ""

4383

4384 #: sequencer.c:747

4385 +msgid "'GIT_AUTHOR_EMAIL' already given"

4386 +msgstr ""

4387 +

4388 +#: sequencer.c:752

4389 +msgid "'GIT_AUTHOR_DATE' already given"

4390 +msgstr ""

4391 +

4392 +#: sequencer.c:756

4393 #, c-format

3944 -msgid "invalid date format '%s' in '%s'"

4394 +msgid "unknown variable '%s'"

4395 msgstr ""

4396

4397 #: sequencer.c:761

4398 +msgid "missing 'GIT_AUTHOR_NAME'"

4399 +msgstr ""

4400 +

4401 +#: sequencer.c:763

4402 +msgid "missing 'GIT_AUTHOR_EMAIL'"

4403 +msgstr ""

4404 +

4405 +#: sequencer.c:765

4406 +msgid "missing 'GIT_AUTHOR_DATE'"

4407 +msgstr ""

4408 +

4409 +#: sequencer.c:825

4410 +#, c-format

4411 +msgid "invalid date format '%s' in '%s'"

4412 +msgstr ""

4413 +

4414 +#: sequencer.c:842

4415 #, c-format

4416 msgid ""

4417 "you have staged changes in your working tree\n"

@@ -3961,15 +4428,15 @@ msgid ""

4428 " git rebase --continue\n"

4429 msgstr ""

4430

3964 -#: sequencer.c:830

4431 +#: sequencer.c:935

4432 msgid "writing root commit"

4433 msgstr ""

4434

3968 -#: sequencer.c:1055

4435 +#: sequencer.c:1142

4436 msgid "'prepare-commit-msg' hook failed"

4437 msgstr ""

4438

3972 -#: sequencer.c:1062

4439 +#: sequencer.c:1149

4440 msgid ""

4441 "Your name and email address were configured automatically based\n"

4442 "on your username and hostname. Please check that they are accurate.\n"

@@ -3984,7 +4451,7 @@ msgid ""

4451 " git commit --amend --reset-author\n"

4452 msgstr ""

4453

3987 -#: sequencer.c:1075

4454 +#: sequencer.c:1162

4455 msgid ""

4456 "Your name and email address were configured automatically based\n"

4457 "on your username and hostname. Please check that they are accurate.\n"

@@ -3998,304 +4465,299 @@ msgid ""

4465 " git commit --amend --reset-author\n"

4466 msgstr ""

4467

4001 -#: sequencer.c:1115

4468 +#: sequencer.c:1202

4469 msgid "couldn't look up newly created commit"

4470 msgstr ""

4471

4005 -#: sequencer.c:1117

4472 +#: sequencer.c:1204

4473 msgid "could not parse newly created commit"

4474 msgstr ""

4475

4009 -#: sequencer.c:1163

4476 +#: sequencer.c:1250

4477 msgid "unable to resolve HEAD after creating commit"

4478 msgstr ""

4479

4013 -#: sequencer.c:1165

4480 +#: sequencer.c:1252

4481 msgid "detached HEAD"

4482 msgstr ""

4483

4017 -#: sequencer.c:1169

4484 +#: sequencer.c:1256

4485 msgid " (root-commit)"

4486 msgstr ""

4487

4021 -#: sequencer.c:1190

4488 +#: sequencer.c:1277

4489 msgid "could not parse HEAD"

4490 msgstr ""

4491

4025 -#: sequencer.c:1192

4492 +#: sequencer.c:1279

4493 #, c-format

4494 msgid "HEAD %s is not a commit!"

4495 msgstr ""

4496

4030 -#: sequencer.c:1196 builtin/commit.c:1528

4497 +#: sequencer.c:1283 builtin/commit.c:1543

4498 msgid "could not parse HEAD commit"

4499 msgstr ""

4500

4034 -#: sequencer.c:1247 sequencer.c:1845

4501 +#: sequencer.c:1334 sequencer.c:1934

4502 msgid "unable to parse commit author"

4503 msgstr ""

4504

4038 -#: sequencer.c:1257 builtin/am.c:1632 builtin/merge.c:675

4505 +#: sequencer.c:1344 builtin/am.c:1585 builtin/merge.c:677

4506 msgid "git write-tree failed to write a tree"

4507 msgstr ""

4508

4042 -#: sequencer.c:1274 sequencer.c:1329

4509 +#: sequencer.c:1361 sequencer.c:1416

4510 #, c-format

4511 msgid "unable to read commit message from '%s'"

4512 msgstr ""

4513

4047 -#: sequencer.c:1296 builtin/am.c:1653 builtin/commit.c:1631 builtin/merge.c:855

4048 -#: builtin/merge.c:880

4514 +#: sequencer.c:1383 builtin/am.c:1606 builtin/commit.c:1646 builtin/merge.c:858

4515 +#: builtin/merge.c:883

4516 msgid "failed to write commit object"

4517 msgstr ""

4518

4052 -#: sequencer.c:1356

4519 +#: sequencer.c:1443

4520 #, c-format

4521 msgid "could not parse commit %s"

4522 msgstr ""

4523

4057 -#: sequencer.c:1361

4524 +#: sequencer.c:1448

4525 #, c-format

4526 msgid "could not parse parent commit %s"

4527 msgstr ""

4528

4062 -#: sequencer.c:1457 sequencer.c:1565

4529 +#: sequencer.c:1546 sequencer.c:1654

4530 #, c-format

4531 msgid "unknown command: %d"

4532 msgstr ""

4533

4067 -#: sequencer.c:1512 sequencer.c:1537

4534 +#: sequencer.c:1601 sequencer.c:1626

4535 #, c-format

4536 msgid "This is a combination of %d commits."

4537 msgstr ""

4538

4072 -#: sequencer.c:1522 sequencer.c:4520

4539 +#: sequencer.c:1611 sequencer.c:4744

4540 msgid "need a HEAD to fixup"

4541 msgstr ""

4542

4076 -#: sequencer.c:1524 sequencer.c:2768

4543 +#: sequencer.c:1613 sequencer.c:2912

4544 msgid "could not read HEAD"

4545 msgstr ""

4546

4080 -#: sequencer.c:1526

4547 +#: sequencer.c:1615

4548 msgid "could not read HEAD's commit message"

4549 msgstr ""

4550

4084 -#: sequencer.c:1532

4551 +#: sequencer.c:1621

4552 #, c-format

4553 msgid "cannot write '%s'"

4554 msgstr ""

4555

4089 -#: sequencer.c:1539 git-rebase--preserve-merges.sh:441

4556 +#: sequencer.c:1628 git-rebase--preserve-merges.sh:441

4557 msgid "This is the 1st commit message:"

4558 msgstr ""

4559

4093 -#: sequencer.c:1547

4560 +#: sequencer.c:1636

4561 #, c-format

4562 msgid "could not read commit message of %s"

4563 msgstr ""

4564

4098 -#: sequencer.c:1554

4565 +#: sequencer.c:1643

4566 #, c-format

4567 msgid "This is the commit message #%d:"

4568 msgstr ""

4569

4103 -#: sequencer.c:1560

4570 +#: sequencer.c:1649

4571 #, c-format

4572 msgid "The commit message #%d will be skipped:"

4573 msgstr ""

4574

4108 -#: sequencer.c:1643

4575 +#: sequencer.c:1732

4576 msgid "your index file is unmerged."

4577 msgstr ""

4578

4112 -#: sequencer.c:1650

4579 +#: sequencer.c:1739

4580 msgid "cannot fixup root commit"

4581 msgstr ""

4582

4116 -#: sequencer.c:1669

4583 +#: sequencer.c:1758

4584 #, c-format

4585 msgid "commit %s is a merge but no -m option was given."

4586 msgstr ""

4587

4121 -#: sequencer.c:1677

4588 +#: sequencer.c:1766

4589 #, c-format

4590 msgid "commit %s does not have parent %d"

4591 msgstr ""

4592

4126 -#: sequencer.c:1681

4593 +#: sequencer.c:1770

4594 #, c-format

4595 msgid "mainline was specified but commit %s is not a merge."

4596 msgstr ""

4597

4131 -#: sequencer.c:1687

4598 +#: sequencer.c:1776

4599 #, c-format

4600 msgid "cannot get commit message for %s"

4601 msgstr ""

4602

4603 #. TRANSLATORS: The first %s will be a "todo" command like

4604 #. "revert" or "pick", the second %s a SHA1.

4138 -#: sequencer.c:1706

4605 +#: sequencer.c:1795

4606 #, c-format

4607 msgid "%s: cannot parse parent commit %s"

4608 msgstr ""

4609

4143 -#: sequencer.c:1771

4610 +#: sequencer.c:1860

4611 #, c-format

4612 msgid "could not rename '%s' to '%s'"

4613 msgstr ""

4614

4148 -#: sequencer.c:1826

4615 +#: sequencer.c:1915

4616 #, c-format

4617 msgid "could not revert %s... %s"

4618 msgstr ""

4619

4153 -#: sequencer.c:1827

4620 +#: sequencer.c:1916

4621 #, c-format

4622 msgid "could not apply %s... %s"

4623 msgstr ""

4624

4158 -#: sequencer.c:1885

4625 +#: sequencer.c:1974

4626 #, c-format

4627 msgid "git %s: failed to read the index"

4628 msgstr ""

4629

4163 -#: sequencer.c:1892

4630 +#: sequencer.c:1981

4631 #, c-format

4632 msgid "git %s: failed to refresh the index"

4633 msgstr ""

4634

4168 -#: sequencer.c:1972

4635 +#: sequencer.c:2062

4636 #, c-format

4637 msgid "%s does not accept arguments: '%s'"

4638 msgstr ""

4639

4173 -#: sequencer.c:1981

4640 +#: sequencer.c:2071

4641 #, c-format

4642 msgid "missing arguments for %s"

4643 msgstr ""

4644

4178 -#: sequencer.c:2040

4645 +#: sequencer.c:2130

4646 #, c-format

4647 msgid "invalid line %d: %.*s"

4648 msgstr ""

4649

4183 -#: sequencer.c:2048

4650 +#: sequencer.c:2138

4651 #, c-format

4652 msgid "cannot '%s' without a previous commit"

4653 msgstr ""

4654

4188 -#: sequencer.c:2096 sequencer.c:4277 sequencer.c:4333

4189 -#, c-format

4190 -msgid "could not read '%s'."

4191 -msgstr ""

4192 -

4193 -#: sequencer.c:2119

4655 +#: sequencer.c:2209

4656 msgid "please fix this using 'git rebase --edit-todo'."

4657 msgstr ""

4658

4197 -#: sequencer.c:2121

4659 +#: sequencer.c:2211

4660 #, c-format

4661 msgid "unusable instruction sheet: '%s'"

4662 msgstr ""

4663

4202 -#: sequencer.c:2126

4664 +#: sequencer.c:2216

4665 msgid "no commits parsed."

4666 msgstr ""

4667

4206 -#: sequencer.c:2137

4668 +#: sequencer.c:2227

4669 msgid "cannot cherry-pick during a revert."

4670 msgstr ""

4671

4210 -#: sequencer.c:2139

4672 +#: sequencer.c:2229

4673 msgid "cannot revert during a cherry-pick."

4674 msgstr ""

4675

4214 -#: sequencer.c:2209

4676 +#: sequencer.c:2299

4677 #, c-format

4678 msgid "invalid value for %s: %s"

4679 msgstr ""

4680

4219 -#: sequencer.c:2285

4681 +#: sequencer.c:2380

4682 msgid "unusable squash-onto"

4683 msgstr ""

4684

4223 -#: sequencer.c:2301

4685 +#: sequencer.c:2396

4686 #, c-format

4687 msgid "malformed options sheet: '%s'"

4688 msgstr ""

4689

4228 -#: sequencer.c:2335 sequencer.c:3775

4690 +#: sequencer.c:2479 sequencer.c:4005

4691 msgid "empty commit set passed"

4692 msgstr ""

4693

4232 -#: sequencer.c:2343

4694 +#: sequencer.c:2487

4695 msgid "a cherry-pick or revert is already in progress"

4696 msgstr ""

4697

4236 -#: sequencer.c:2344

4698 +#: sequencer.c:2488

4699 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""

4700 msgstr ""

4701

4240 -#: sequencer.c:2347

4702 +#: sequencer.c:2491

4703 #, c-format

4704 msgid "could not create sequencer directory '%s'"

4705 msgstr ""

4706

4245 -#: sequencer.c:2361

4707 +#: sequencer.c:2505

4708 msgid "could not lock HEAD"

4709 msgstr ""

4710

4249 -#: sequencer.c:2416 sequencer.c:3543

4711 +#: sequencer.c:2560 sequencer.c:3761

4712 msgid "no cherry-pick or revert in progress"

4713 msgstr ""

4714

4253 -#: sequencer.c:2418

4715 +#: sequencer.c:2562

4716 msgid "cannot resolve HEAD"

4717 msgstr ""

4718

4257 -#: sequencer.c:2420 sequencer.c:2455

4719 +#: sequencer.c:2564 sequencer.c:2599

4720 msgid "cannot abort from a branch yet to be born"

4721 msgstr ""

4722

4261 -#: sequencer.c:2441 builtin/grep.c:721

4723 +#: sequencer.c:2585 builtin/grep.c:721

4724 #, c-format

4725 msgid "cannot open '%s'"

4726 msgstr ""

4727

4266 -#: sequencer.c:2443

4728 +#: sequencer.c:2587

4729 #, c-format

4730 msgid "cannot read '%s': %s"

4731 msgstr ""

4732

4271 -#: sequencer.c:2444

4733 +#: sequencer.c:2588

4734 msgid "unexpected end of file"

4735 msgstr ""

4736

4275 -#: sequencer.c:2450

4737 +#: sequencer.c:2594

4738 #, c-format

4739 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"

4740 msgstr ""

4741

4280 -#: sequencer.c:2461

4742 +#: sequencer.c:2605

4743 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

4744 msgstr ""

4745

4284 -#: sequencer.c:2565 sequencer.c:3461

4746 +#: sequencer.c:2709 sequencer.c:3679

4747 #, c-format

4748 msgid "could not update %s"

4749 msgstr ""

4750

4289 -#: sequencer.c:2603 sequencer.c:3441

4751 +#: sequencer.c:2747 sequencer.c:3659

4752 msgid "cannot read HEAD"

4753 msgstr ""

4754

4293 -#: sequencer.c:2618

4755 +#: sequencer.c:2762

4756 #, c-format

4757 msgid "unable to copy '%s' to '%s'"

4758 msgstr ""

4759

4298 -#: sequencer.c:2626

4760 +#: sequencer.c:2770

4761 #, c-format

4762 msgid ""

4763 "You can amend the commit now, with\n"

@@ -4307,26 +4769,27 @@ msgid ""

4769 " git rebase --continue\n"

4770 msgstr ""

4771

4310 -#: sequencer.c:2636

4772 +#: sequencer.c:2780

4773 #, c-format

4774 msgid "Could not apply %s... %.*s"

4775 msgstr ""

4776

4315 -#: sequencer.c:2643

4777 +#: sequencer.c:2787

4778 #, c-format

4779 msgid "Could not merge %.*s"

4780 msgstr ""

4781

4320 -#: sequencer.c:2654 sequencer.c:2658 builtin/difftool.c:640

4782 +#: sequencer.c:2798 sequencer.c:2802 builtin/difftool.c:640

4783 #, c-format

4784 msgid "could not copy '%s' to '%s'"

4785 msgstr ""

4786

4325 -#: sequencer.c:2680 sequencer.c:3095

4787 +#: sequencer.c:2824 sequencer.c:3242 builtin/rebase.c:580 builtin/rebase.c:999

4788 +#: builtin/rebase.c:1350 builtin/rebase.c:1404

4789 msgid "could not read index"

4790 msgstr ""

4791

4329 -#: sequencer.c:2685

4792 +#: sequencer.c:2829

4793 #, c-format

4794 msgid ""

4795 "execution failed: %s\n"

@@ -4336,11 +4799,11 @@ msgid ""

4799 "\n"

4800 msgstr ""

4801

4339 -#: sequencer.c:2691

4802 +#: sequencer.c:2835

4803 msgid "and made changes to the index and/or the working tree\n"

4804 msgstr ""

4805

4343 -#: sequencer.c:2697

4806 +#: sequencer.c:2841

4807 #, c-format

4808 msgid ""

4809 "execution succeeded: %s\n"

@@ -4351,81 +4814,76 @@ msgid ""

4814 "\n"

4815 msgstr ""

4816

4354 -#: sequencer.c:2758

4817 +#: sequencer.c:2902

4818 #, c-format

4819 msgid "illegal label name: '%.*s'"

4820 msgstr ""

4821

4359 -#: sequencer.c:2810

4822 +#: sequencer.c:2954

4823 msgid "writing fake root commit"

4824 msgstr ""

4825

4363 -#: sequencer.c:2815

4826 +#: sequencer.c:2959

4827 msgid "writing squash-onto"

4828 msgstr ""

4829

4367 -#: sequencer.c:2850

4830 +#: sequencer.c:2997 builtin/rebase.c:585 builtin/rebase.c:590

4831 #, c-format

4832 msgid "failed to find tree of %s"

4833 msgstr ""

4834

4372 -#: sequencer.c:2868

4835 +#: sequencer.c:3015 builtin/rebase.c:603

4836 msgid "could not write index"

4837 msgstr ""

4838

4376 -#: sequencer.c:2895

4839 +#: sequencer.c:3042

4840 #, c-format

4841 msgid "could not resolve '%s'"

4842 msgstr ""

4843

4381 -#: sequencer.c:2921

4844 +#: sequencer.c:3068

4845 msgid "cannot merge without a current revision"

4846 msgstr ""

4847

4385 -#: sequencer.c:2943

4848 +#: sequencer.c:3090

4849 #, c-format

4850 msgid "unable to parse '%.*s'"

4851 msgstr ""

4852

4390 -#: sequencer.c:2952

4853 +#: sequencer.c:3099

4854 #, c-format

4855 msgid "nothing to merge: '%.*s'"

4856 msgstr ""

4857

4395 -#: sequencer.c:2964

4858 +#: sequencer.c:3111

4859 msgid "octopus merge cannot be executed on top of a [new root]"

4860 msgstr ""

4861

4399 -#: sequencer.c:2979

4862 +#: sequencer.c:3126

4863 #, c-format

4864 msgid "could not get commit message of '%s'"

4865 msgstr ""

4866

4404 -#: sequencer.c:2989 sequencer.c:3015

4405 -#, c-format

4406 -msgid "could not write '%s'"

4407 -msgstr ""

4408 -

4409 -#: sequencer.c:3127

4867 +#: sequencer.c:3274

4868 #, c-format

4869 msgid "could not even attempt to merge '%.*s'"

4870 msgstr ""

4871

4414 -#: sequencer.c:3143

4872 +#: sequencer.c:3290

4873 msgid "merge: Unable to write new index file"

4874 msgstr ""

4875

4418 -#: sequencer.c:3211

4876 +#: sequencer.c:3358 builtin/rebase.c:268

4877 #, c-format

4878 msgid "Applied autostash.\n"

4879 msgstr ""

4880

4423 -#: sequencer.c:3223

4881 +#: sequencer.c:3370

4882 #, c-format

4883 msgid "cannot store %s"

4884 msgstr ""

4885

4428 -#: sequencer.c:3226 git-rebase.sh:188

4886 +#: sequencer.c:3373 builtin/rebase.c:284

4887 #, c-format

4888 msgid ""

4889 "Applying autostash resulted in conflicts.\n"

@@ -4433,7 +4891,31 @@ msgid ""

4891 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"

4892 msgstr ""

4893

4436 -#: sequencer.c:3257

4894 +#: sequencer.c:3427

4895 +#, c-format

4896 +msgid "could not checkout %s"

4897 +msgstr ""

4898 +

4899 +#: sequencer.c:3441

4900 +#, c-format

4901 +msgid "%s: not a valid OID"

4902 +msgstr ""

4903 +

4904 +#: sequencer.c:3446 git-rebase--preserve-merges.sh:724

4905 +msgid "could not detach HEAD"

4906 +msgstr ""

4907 +

4908 +#: sequencer.c:3461

4909 +#, c-format

4910 +msgid "Stopped at HEAD\n"

4911 +msgstr ""

4912 +

4913 +#: sequencer.c:3463

4914 +#, c-format

4915 +msgid "Stopped at %s\n"

4916 +msgstr ""

4917 +

4918 +#: sequencer.c:3471

4919 #, c-format

4920 msgid ""

4921 "Could not execute the todo command\n"

@@ -4446,108 +4928,108 @@ msgid ""

4928 " git rebase --continue\n"

4929 msgstr ""

4930

4449 -#: sequencer.c:3325

4931 +#: sequencer.c:3543

4932 #, c-format

4933 msgid "Stopped at %s... %.*s\n"

4934 msgstr ""

4935

4454 -#: sequencer.c:3404

4936 +#: sequencer.c:3622

4937 #, c-format

4938 msgid "unknown command %d"

4939 msgstr ""

4940

4459 -#: sequencer.c:3449

4941 +#: sequencer.c:3667

4942 msgid "could not read orig-head"

4943 msgstr ""

4944

4463 -#: sequencer.c:3454 sequencer.c:4517

4945 +#: sequencer.c:3672 sequencer.c:4741

4946 msgid "could not read 'onto'"

4947 msgstr ""

4948

4467 -#: sequencer.c:3468

4949 +#: sequencer.c:3686

4950 #, c-format

4951 msgid "could not update HEAD to %s"

4952 msgstr ""

4953

4472 -#: sequencer.c:3554

4954 +#: sequencer.c:3772

4955 msgid "cannot rebase: You have unstaged changes."

4956 msgstr ""

4957

4476 -#: sequencer.c:3563

4958 +#: sequencer.c:3781

4959 msgid "cannot amend non-existing commit"

4960 msgstr ""

4961

4480 -#: sequencer.c:3565

4962 +#: sequencer.c:3783

4963 #, c-format

4964 msgid "invalid file: '%s'"

4965 msgstr ""

4966

4485 -#: sequencer.c:3567

4967 +#: sequencer.c:3785

4968 #, c-format

4969 msgid "invalid contents: '%s'"

4970 msgstr ""

4971

4490 -#: sequencer.c:3570

4972 +#: sequencer.c:3788

4973 msgid ""

4974 "\n"

4975 "You have uncommitted changes in your working tree. Please, commit them\n"

4976 "first and then run 'git rebase --continue' again."

4977 msgstr ""

4978

4497 -#: sequencer.c:3595 sequencer.c:3633

4979 +#: sequencer.c:3824 sequencer.c:3862

4980 #, c-format

4981 msgid "could not write file: '%s'"

4982 msgstr ""

4983

4502 -#: sequencer.c:3648

4984 +#: sequencer.c:3877

4985 msgid "could not remove CHERRY_PICK_HEAD"

4986 msgstr ""

4987

4506 -#: sequencer.c:3655

4988 +#: sequencer.c:3884

4989 msgid "could not commit staged changes."

4990 msgstr ""

4991

4510 -#: sequencer.c:3752

4992 +#: sequencer.c:3982

4993 #, c-format

4994 msgid "%s: can't cherry-pick a %s"

4995 msgstr ""

4996

4515 -#: sequencer.c:3756

4997 +#: sequencer.c:3986

4998 #, c-format

4999 msgid "%s: bad revision"

5000 msgstr ""

5001

4520 -#: sequencer.c:3791

5002 +#: sequencer.c:4021

5003 msgid "can't revert as initial commit"

5004 msgstr ""

5005

4524 -#: sequencer.c:4238

5006 +#: sequencer.c:4466

5007 msgid "make_script: unhandled options"

5008 msgstr ""

5009

4528 -#: sequencer.c:4241

5010 +#: sequencer.c:4469

5011 msgid "make_script: error preparing revisions"

5012 msgstr ""

5013

4532 -#: sequencer.c:4281 sequencer.c:4337

5014 +#: sequencer.c:4509 sequencer.c:4565 sequencer.c:4840

5015 #, c-format

5016 msgid "unusable todo list: '%s'"

5017 msgstr ""

5018

4537 -#: sequencer.c:4396

5019 +#: sequencer.c:4620

5020 #, c-format

5021 msgid ""

5022 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."

5023 msgstr ""

5024

4543 -#: sequencer.c:4466

5025 +#: sequencer.c:4690

5026 #, c-format

5027 msgid ""

5028 "Warning: some commits may have been dropped accidentally.\n"

5029 "Dropped commits (newer to older):\n"

5030 msgstr ""

5031

4550 -#: sequencer.c:4473

5032 +#: sequencer.c:4697

5033 #, c-format

5034 msgid ""

5035 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"

@@ -4558,7 +5040,7 @@ msgid ""

5040 "\n"

5041 msgstr ""

5042

4561 -#: sequencer.c:4486

5043 +#: sequencer.c:4710

5044 #, c-format

5045 msgid ""

5046 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"

@@ -4566,7 +5048,31 @@ msgid ""

5048 "Or you can abort the rebase with 'git rebase --abort'.\n"

5049 msgstr ""

5050

4569 -#: sequencer.c:4660

5051 +#: sequencer.c:4848 sequencer.c:4886

5052 +msgid "nothing to do"

5053 +msgstr ""

5054 +

5055 +#: sequencer.c:4852

5056 +#, c-format

5057 +msgid "Rebase %s onto %s (%d command)"

5058 +msgid_plural "Rebase %s onto %s (%d commands)"

5059 +msgstr[0] ""

5060 +msgstr[1] ""

5061 +

5062 +#: sequencer.c:4864

5063 +#, c-format

5064 +msgid "could not copy '%s' to '%s'."

5065 +msgstr ""

5066 +

5067 +#: sequencer.c:4868 sequencer.c:4897

5068 +msgid "could not transform the todo list"

5069 +msgstr ""

5070 +

5071 +#: sequencer.c:4900

5072 +msgid "could not skip unnecessary pick commands"

5073 +msgstr ""

5074 +

5075 +#: sequencer.c:4983

5076 msgid "the script was already rearranged."

5077 msgstr ""

5078

@@ -4611,106 +5117,106 @@ msgstr ""

5117 msgid "this operation must be run in a work tree"

5118 msgstr ""

5119

4614 -#: setup.c:503

5120 +#: setup.c:527

5121 #, c-format

5122 msgid "Expected git repo version <= %d, found %d"

5123 msgstr ""

5124

4619 -#: setup.c:511

5125 +#: setup.c:535

5126 msgid "unknown repository extensions found:"

5127 msgstr ""

5128

4623 -#: setup.c:530

5129 +#: setup.c:554

5130 #, c-format

5131 msgid "error opening '%s'"

5132 msgstr ""

5133

4628 -#: setup.c:532

5134 +#: setup.c:556

5135 #, c-format

5136 msgid "too large to be a .git file: '%s'"

5137 msgstr ""

5138

4633 -#: setup.c:534

5139 +#: setup.c:558

5140 #, c-format

5141 msgid "error reading %s"

5142 msgstr ""

5143

4638 -#: setup.c:536

5144 +#: setup.c:560

5145 #, c-format

5146 msgid "invalid gitfile format: %s"

5147 msgstr ""

5148

4643 -#: setup.c:538

5149 +#: setup.c:562

5150 #, c-format

5151 msgid "no path in gitfile: %s"

5152 msgstr ""

5153

4648 -#: setup.c:540

5154 +#: setup.c:564

5155 #, c-format

5156 msgid "not a git repository: %s"

5157 msgstr ""

5158

4653 -#: setup.c:639

5159 +#: setup.c:663

5160 #, c-format

5161 msgid "'$%s' too big"

5162 msgstr ""

5163

4658 -#: setup.c:653

5164 +#: setup.c:677

5165 #, c-format

5166 msgid "not a git repository: '%s'"

5167 msgstr ""

5168

4663 -#: setup.c:682 setup.c:684 setup.c:715

5169 +#: setup.c:706 setup.c:708 setup.c:739

5170 #, c-format

5171 msgid "cannot chdir to '%s'"

5172 msgstr ""

5173

4668 -#: setup.c:687 setup.c:743 setup.c:753 setup.c:792 setup.c:800 setup.c:815

5174 +#: setup.c:711 setup.c:767 setup.c:777 setup.c:816 setup.c:824 setup.c:839

5175 msgid "cannot come back to cwd"

5176 msgstr ""

5177

4672 -#: setup.c:813

5178 +#: setup.c:837

5179 #, c-format

5180 msgid "not a git repository (or any of the parent directories): %s"

5181 msgstr ""

5182

4677 -#: setup.c:824

5183 +#: setup.c:848

5184 #, c-format

5185 msgid "failed to stat '%*s%s%s'"

5186 msgstr ""

5187

4682 -#: setup.c:1054

5188 +#: setup.c:1078

5189 msgid "Unable to read current working directory"

5190 msgstr ""

5191

4686 -#: setup.c:1066 setup.c:1072

5192 +#: setup.c:1090 setup.c:1096

5193 #, c-format

5194 msgid "cannot change to '%s'"

5195 msgstr ""

5196

4691 -#: setup.c:1085

5197 +#: setup.c:1109

5198 #, c-format

5199 msgid ""

5200 "not a git repository (or any parent up to mount point %s)\n"

5201 "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."

5202 msgstr ""

5203

4698 -#: setup.c:1168

5204 +#: setup.c:1192

5205 #, c-format

5206 msgid ""

5207 "problem with core.sharedRepository filemode value (0%.3o).\n"

5208 "The owner of files must always have read and write permissions."

5209 msgstr ""

5210

4705 -#: setup.c:1211

5211 +#: setup.c:1235

5212 msgid "open /dev/null or dup failed"

5213 msgstr ""

5214

4709 -#: setup.c:1226

5215 +#: setup.c:1250

5216 msgid "fork failed"

5217 msgstr ""

5218

4713 -#: setup.c:1231

5219 +#: setup.c:1255

5220 msgid "setsid failed"

5221 msgstr ""

5222

@@ -4785,12 +5291,12 @@ msgstr ""

5291 msgid "object file %s is empty"

5292 msgstr ""

5293

4788 -#: sha1-file.c:1093 sha1-file.c:2206

5294 +#: sha1-file.c:1093 sha1-file.c:2215

5295 #, c-format

5296 msgid "corrupt loose object '%s'"

5297 msgstr ""

5298

4793 -#: sha1-file.c:1095 sha1-file.c:2210

5299 +#: sha1-file.c:1095 sha1-file.c:2219

5300 #, c-format

5301 msgid "garbage at end of loose object '%s'"

5302 msgstr ""

@@ -4885,7 +5391,7 @@ msgstr ""

5391 msgid "confused by unstable object source data for %s"

5392 msgstr ""

5393

4888 -#: sha1-file.c:1685 builtin/pack-objects.c:899

5394 +#: sha1-file.c:1685 builtin/pack-objects.c:918

5395 #, c-format

5396 msgid "failed utime() on %s"

5397 msgstr ""

@@ -4903,76 +5409,76 @@ msgstr ""

5409 msgid "corrupt tag"

5410 msgstr ""

5411

4906 -#: sha1-file.c:1906

5412 +#: sha1-file.c:1912

5413 #, c-format

5414 msgid "read error while indexing %s"

5415 msgstr ""

5416

4911 -#: sha1-file.c:1909

5417 +#: sha1-file.c:1915

5418 #, c-format

5419 msgid "short read while indexing %s"

5420 msgstr ""

5421

4916 -#: sha1-file.c:1980 sha1-file.c:1989

5422 +#: sha1-file.c:1988 sha1-file.c:1997

5423 #, c-format

5424 msgid "%s: failed to insert into database"

5425 msgstr ""

5426

4921 -#: sha1-file.c:1995

5427 +#: sha1-file.c:2003

5428 #, c-format

5429 msgid "%s: unsupported file type"

5430 msgstr ""

5431

4926 -#: sha1-file.c:2019

5432 +#: sha1-file.c:2027

5433 #, c-format

5434 msgid "%s is not a valid object"

5435 msgstr ""

5436

4931 -#: sha1-file.c:2021

5437 +#: sha1-file.c:2029

5438 #, c-format

5439 msgid "%s is not a valid '%s' object"

5440 msgstr ""

5441

4936 -#: sha1-file.c:2048 builtin/index-pack.c:158

5442 +#: sha1-file.c:2056 builtin/index-pack.c:154

5443 #, c-format

5444 msgid "unable to open %s"

5445 msgstr ""

5446

4941 -#: sha1-file.c:2217 sha1-file.c:2269

5447 +#: sha1-file.c:2226 sha1-file.c:2278

5448 #, c-format

5449 msgid "sha1 mismatch for %s (expected %s)"

5450 msgstr ""

5451

4946 -#: sha1-file.c:2241

5452 +#: sha1-file.c:2250

5453 #, c-format

5454 msgid "unable to mmap %s"

5455 msgstr ""

5456

4951 -#: sha1-file.c:2246

5457 +#: sha1-file.c:2255

5458 #, c-format

5459 msgid "unable to unpack header of %s"

5460 msgstr ""

5461

4956 -#: sha1-file.c:2252

5462 +#: sha1-file.c:2261

5463 #, c-format

5464 msgid "unable to parse header of %s"

5465 msgstr ""

5466

4961 -#: sha1-file.c:2263

5467 +#: sha1-file.c:2272

5468 #, c-format

5469 msgid "unable to unpack contents of %s"

5470 msgstr ""

5471

4966 -#: sha1-name.c:444

5472 +#: sha1-name.c:476

5473 #, c-format

5474 msgid "short SHA1 %s is ambiguous"

5475 msgstr ""

5476

4971 -#: sha1-name.c:455

5477 +#: sha1-name.c:487

5478 msgid "The candidates are:"

5479 msgstr ""

5480

4975 -#: sha1-name.c:699

5481 +#: sha1-name.c:770

5482 msgid ""

5483 "Git normally never creates a ref that ends with 40 hex characters\n"

5484 "because it will be ignored when you just specify 40-hex. These refs\n"

@@ -4985,96 +5491,80 @@ msgid ""

5491 "running \"git config advice.objectNameWarning false\""

5492 msgstr ""

5493

4988 -#: submodule.c:97 submodule.c:131

5494 +#: submodule.c:116 submodule.c:145

5495 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"

5496 msgstr ""

5497

4992 -#: submodule.c:101 submodule.c:135

5498 +#: submodule.c:120 submodule.c:149

5499 #, c-format

5500 msgid "Could not find section in .gitmodules where path=%s"

5501 msgstr ""

5502

4997 -#: submodule.c:109

4998 -#, c-format

4999 -msgid "Could not update .gitmodules entry %s"

5000 -msgstr ""

5001 -

5002 -#: submodule.c:142

5503 +#: submodule.c:156

5504 #, c-format

5505 msgid "Could not remove .gitmodules entry for %s"

5506 msgstr ""

5507

5007 -#: submodule.c:153

5508 +#: submodule.c:167

5509 msgid "staging updated .gitmodules failed"

5510 msgstr ""

5511

5011 -#: submodule.c:315

5512 +#: submodule.c:329

5513 #, c-format

5514 msgid "in unpopulated submodule '%s'"

5515 msgstr ""

5516

5016 -#: submodule.c:346

5517 +#: submodule.c:360

5518 #, c-format

5519 msgid "Pathspec '%s' is in submodule '%.*s'"

5520 msgstr ""

5521

5021 -#: submodule.c:839

5522 +#: submodule.c:857

5523 #, c-format

5524 msgid "submodule entry '%s' (%s) is a %s, not a commit"

5525 msgstr ""

5526

5026 -#: submodule.c:1071 builtin/branch.c:670 builtin/submodule--helper.c:1888

5527 +#: submodule.c:1097 builtin/branch.c:656 builtin/submodule--helper.c:1985

5528 msgid "Failed to resolve HEAD as a valid ref."

5529 msgstr ""

5530

5030 -#: submodule.c:1377

5531 +#: submodule.c:1404

5532 #, c-format

5533 msgid "'%s' not recognized as a git repository"

5534 msgstr ""

5535

5035 -#: submodule.c:1515

5536 +#: submodule.c:1542

5537 #, c-format

5538 msgid "could not start 'git status' in submodule '%s'"

5539 msgstr ""

5540

5040 -#: submodule.c:1528

5541 +#: submodule.c:1555

5542 #, c-format

5543 msgid "could not run 'git status' in submodule '%s'"

5544 msgstr ""

5545

5045 -#: submodule.c:1543

5046 -#, c-format

5047 -msgid "Could not unset core.worktree setting in submodule '%s'"

5048 -msgstr ""

5049 -

5050 -#: submodule.c:1633

5546 +#: submodule.c:1648

5547 #, c-format

5548 msgid "submodule '%s' has dirty index"

5549 msgstr ""

5550

5055 -#: submodule.c:1685

5551 +#: submodule.c:1700

5552 #, c-format

5553 msgid "Submodule '%s' could not be updated."

5554 msgstr ""

5555

5060 -#: submodule.c:1734

5556 +#: submodule.c:1747

5557 #, c-format

5558 msgid ""

5559 "relocate_gitdir for submodule '%s' with more than one worktree not supported"

5560 msgstr ""

5561

5066 -#: submodule.c:1746 submodule.c:1802

5562 +#: submodule.c:1759 submodule.c:1815

5563 #, c-format

5564 msgid "could not lookup name for submodule '%s'"

5565 msgstr ""

5566

5071 -#: submodule.c:1750 builtin/submodule--helper.c:1406

5072 -#: builtin/submodule--helper.c:1416

5073 -#, c-format

5074 -msgid "could not create directory '%s'"

5075 -msgstr ""

5076 -

5077 -#: submodule.c:1753

5567 +#: submodule.c:1766

5568 #, c-format

5569 msgid ""

5570 "Migrating git directory of '%s%s' from\n"

@@ -5082,34 +5572,44 @@ msgid ""

5572 "'%s'\n"

5573 msgstr ""

5574

5085 -#: submodule.c:1837

5575 +#: submodule.c:1850

5576 #, c-format

5577 msgid "could not recurse into submodule '%s'"

5578 msgstr ""

5579

5090 -#: submodule.c:1881

5580 +#: submodule.c:1894

5581 msgid "could not start ls-files in .."

5582 msgstr ""

5583

5094 -#: submodule.c:1920

5584 +#: submodule.c:1933

5585 #, c-format

5586 msgid "ls-tree returned unexpected return code %d"

5587 msgstr ""

5588

5099 -#: submodule-config.c:231

5589 +#: submodule-config.c:232

5590 #, c-format

5591 msgid "ignoring suspicious submodule name: %s"

5592 msgstr ""

5593

5104 -#: submodule-config.c:295

5594 +#: submodule-config.c:296

5595 msgid "negative values not allowed for submodule.fetchjobs"

5596 msgstr ""

5597

5108 -#: submodule-config.c:468

5598 +#: submodule-config.c:390

5599 +#, c-format

5600 +msgid "ignoring '%s' which may be interpreted as a command-line option: %s"

5601 +msgstr ""

5602 +

l10n: git.pot: v2.20.0 round 1 (254 new, 27 removed)