e13da2db28 · 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: 2020-07-10 09:53+0800\n"

11 +"POT-Creation-Date: 2020-10-06 09:14+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"

@@ -23,9 +23,9 @@ msgstr ""

23 msgid "Huh (%s)?"

24 msgstr ""

25

26 -#: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3142

27 -#: sequencer.c:3581 sequencer.c:3723 builtin/rebase.c:1518

28 -#: builtin/rebase.c:1919

26 +#: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3250

27 +#: sequencer.c:3698 sequencer.c:3840 builtin/rebase.c:1526

28 +#: builtin/rebase.c:1944

29 msgid "could not read index"

30 msgstr ""

31

@@ -53,7 +53,7 @@ msgstr ""

53 msgid "could not stage '%s'"

54 msgstr ""

55

56 -#: add-interactive.c:695 add-interactive.c:884 reset.c:89 sequencer.c:3336

56 +#: add-interactive.c:695 add-interactive.c:884 reset.c:89 sequencer.c:3444

57 msgid "could not write index"

58 msgstr ""

59

@@ -69,7 +69,7 @@ msgstr[1] ""

69 msgid "note: %s is untracked now.\n"

70 msgstr ""

71

72 -#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:294

72 +#: add-interactive.c:721 apply.c:4127 builtin/checkout.c:295

73 #: builtin/reset.c:145

74 #, c-format

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

@@ -111,21 +111,21 @@ msgstr[1] ""

111 msgid "ignoring unmerged: %s"

112 msgstr ""

113

114 -#: add-interactive.c:929 add-patch.c:1691 git-add--interactive.perl:1368

114 +#: add-interactive.c:929 add-patch.c:1738 git-add--interactive.perl:1371

115 #, c-format

116 msgid "Only binary files changed.\n"

117 msgstr ""

118

119 -#: add-interactive.c:931 add-patch.c:1689 git-add--interactive.perl:1370

119 +#: add-interactive.c:931 add-patch.c:1736 git-add--interactive.perl:1373

120 #, c-format

121 msgid "No changes.\n"

122 msgstr ""

123

124 -#: add-interactive.c:935 git-add--interactive.perl:1378

124 +#: add-interactive.c:935 git-add--interactive.perl:1381

125 msgid "Patch update"

126 msgstr ""

127

128 -#: add-interactive.c:974 git-add--interactive.perl:1771

128 +#: add-interactive.c:974 git-add--interactive.perl:1794

129 msgid "Review diff"

130 msgstr ""

131

@@ -193,11 +193,11 @@ msgstr ""

193 msgid "(empty) select nothing"

194 msgstr ""

195

196 -#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1868

196 +#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1891

197 msgid "*** Commands ***"

198 msgstr ""

199

200 -#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1865

200 +#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1888

201 msgid "What now"

202 msgstr ""

203

@@ -209,12 +209,12 @@ msgstr ""

209 msgid "unstaged"

210 msgstr ""

211

212 -#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2250

213 -#: builtin/am.c:2253 builtin/clone.c:123 builtin/fetch.c:145

214 -#: builtin/merge.c:276 builtin/pull.c:190 builtin/submodule--helper.c:409

215 -#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397

216 -#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905

217 -#: builtin/submodule--helper.c:2148 bugreport.c:135

212 +#: add-interactive.c:1136 apply.c:4984 apply.c:4987 builtin/am.c:2270

213 +#: builtin/am.c:2273 builtin/bugreport.c:133 builtin/clone.c:123

214 +#: builtin/fetch.c:147 builtin/merge.c:275 builtin/pull.c:190

215 +#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818

216 +#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326

217 +#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572

218 #: git-add--interactive.perl:213

219 msgid "path"

220 msgstr ""

@@ -223,27 +223,27 @@ msgstr ""

223 msgid "could not refresh index"

224 msgstr ""

225

226 -#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1782

226 +#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1805

227 #, c-format

228 msgid "Bye.\n"

229 msgstr ""

230

231 -#: add-patch.c:34 git-add--interactive.perl:1430

231 +#: add-patch.c:34 git-add--interactive.perl:1433

232 #, c-format, perl-format

233 msgid "Stage mode change [y,n,q,a,d%s,?]? "

234 msgstr ""

235

236 -#: add-patch.c:35 git-add--interactive.perl:1431

236 +#: add-patch.c:35 git-add--interactive.perl:1434

237 #, c-format, perl-format

238 msgid "Stage deletion [y,n,q,a,d%s,?]? "

239 msgstr ""

240

241 -#: add-patch.c:36 git-add--interactive.perl:1432

241 +#: add-patch.c:36 git-add--interactive.perl:1435

242 #, c-format, perl-format

243 msgid "Stage addition [y,n,q,a,d%s,?]? "

244 msgstr ""

245

246 -#: add-patch.c:37 git-add--interactive.perl:1433

246 +#: add-patch.c:37 git-add--interactive.perl:1436

247 #, c-format, perl-format

248 msgid "Stage this hunk [y,n,q,a,d%s,?]? "

249 msgstr ""

@@ -263,22 +263,22 @@ msgid ""

263 "d - do not stage this hunk or any of the later hunks in the file\n"

264 msgstr ""

265

266 -#: add-patch.c:56 git-add--interactive.perl:1436

266 +#: add-patch.c:56 git-add--interactive.perl:1439

267 #, c-format, perl-format

268 msgid "Stash mode change [y,n,q,a,d%s,?]? "

269 msgstr ""

270

271 -#: add-patch.c:57 git-add--interactive.perl:1437

271 +#: add-patch.c:57 git-add--interactive.perl:1440

272 #, c-format, perl-format

273 msgid "Stash deletion [y,n,q,a,d%s,?]? "

274 msgstr ""

275

276 -#: add-patch.c:58 git-add--interactive.perl:1438

276 +#: add-patch.c:58 git-add--interactive.perl:1441

277 #, c-format, perl-format

278 msgid "Stash addition [y,n,q,a,d%s,?]? "

279 msgstr ""

280

281 -#: add-patch.c:59 git-add--interactive.perl:1439

281 +#: add-patch.c:59 git-add--interactive.perl:1442

282 #, c-format, perl-format

283 msgid "Stash this hunk [y,n,q,a,d%s,?]? "

284 msgstr ""

@@ -298,22 +298,22 @@ msgid ""

298 "d - do not stash this hunk or any of the later hunks in the file\n"

299 msgstr ""

300

301 -#: add-patch.c:80 git-add--interactive.perl:1442

301 +#: add-patch.c:80 git-add--interactive.perl:1445

302 #, c-format, perl-format

303 msgid "Unstage mode change [y,n,q,a,d%s,?]? "

304 msgstr ""

305

306 -#: add-patch.c:81 git-add--interactive.perl:1443

306 +#: add-patch.c:81 git-add--interactive.perl:1446

307 #, c-format, perl-format

308 msgid "Unstage deletion [y,n,q,a,d%s,?]? "

309 msgstr ""

310

311 -#: add-patch.c:82 git-add--interactive.perl:1444

311 +#: add-patch.c:82 git-add--interactive.perl:1447

312 #, c-format, perl-format

313 msgid "Unstage addition [y,n,q,a,d%s,?]? "

314 msgstr ""

315

316 -#: add-patch.c:83 git-add--interactive.perl:1445

316 +#: add-patch.c:83 git-add--interactive.perl:1448

317 #, c-format, perl-format

318 msgid "Unstage this hunk [y,n,q,a,d%s,?]? "

319 msgstr ""

@@ -333,22 +333,22 @@ msgid ""

333 "d - do not unstage this hunk or any of the later hunks in the file\n"

334 msgstr ""

335

336 -#: add-patch.c:103 git-add--interactive.perl:1448

336 +#: add-patch.c:103 git-add--interactive.perl:1451

337 #, c-format, perl-format

338 msgid "Apply mode change to index [y,n,q,a,d%s,?]? "

339 msgstr ""

340

341 -#: add-patch.c:104 git-add--interactive.perl:1449

341 +#: add-patch.c:104 git-add--interactive.perl:1452

342 #, c-format, perl-format

343 msgid "Apply deletion to index [y,n,q,a,d%s,?]? "

344 msgstr ""

345

346 -#: add-patch.c:105 git-add--interactive.perl:1450

346 +#: add-patch.c:105 git-add--interactive.perl:1453

347 #, c-format, perl-format

348 msgid "Apply addition to index [y,n,q,a,d%s,?]? "

349 msgstr ""

350

351 -#: add-patch.c:106 git-add--interactive.perl:1451

351 +#: add-patch.c:106 git-add--interactive.perl:1454

352 #, c-format, perl-format

353 msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "

354 msgstr ""

@@ -368,26 +368,26 @@ msgid ""

368 "d - do not apply this hunk or any of the later hunks in the file\n"

369 msgstr ""

370

371 -#: add-patch.c:126 git-add--interactive.perl:1454

372 -#: git-add--interactive.perl:1472

371 +#: add-patch.c:126 git-add--interactive.perl:1457

372 +#: git-add--interactive.perl:1475

373 #, c-format, perl-format

374 msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "

375 msgstr ""

376

377 -#: add-patch.c:127 git-add--interactive.perl:1455

378 -#: git-add--interactive.perl:1473

377 +#: add-patch.c:127 git-add--interactive.perl:1458

378 +#: git-add--interactive.perl:1476

379 #, c-format, perl-format

380 msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "

381 msgstr ""

382

383 -#: add-patch.c:128 git-add--interactive.perl:1456

384 -#: git-add--interactive.perl:1474

383 +#: add-patch.c:128 git-add--interactive.perl:1459

384 +#: git-add--interactive.perl:1477

385 #, c-format, perl-format

386 msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "

387 msgstr ""

388

389 -#: add-patch.c:129 git-add--interactive.perl:1457

390 -#: git-add--interactive.perl:1475

389 +#: add-patch.c:129 git-add--interactive.perl:1460

390 +#: git-add--interactive.perl:1478

391 #, c-format, perl-format

392 msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "

393 msgstr ""

@@ -407,22 +407,22 @@ msgid ""

407 "d - do not discard this hunk or any of the later hunks in the file\n"

408 msgstr ""

409

410 -#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1460

410 +#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463

411 #, c-format, perl-format

412 msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "

413 msgstr ""

414

415 -#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1461

415 +#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464

416 #, c-format, perl-format

417 msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "

418 msgstr ""

419

420 -#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1462

420 +#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465

421 #, c-format, perl-format

422 msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "

423 msgstr ""

424

425 -#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1463

425 +#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466

426 #, c-format, perl-format

427 msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "

428 msgstr ""

@@ -436,22 +436,22 @@ msgid ""

436 "d - do not discard this hunk or any of the later hunks in the file\n"

437 msgstr ""

438

439 -#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1466

439 +#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469

440 #, c-format, perl-format

441 msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "

442 msgstr ""

443

444 -#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1467

444 +#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470

445 #, c-format, perl-format

446 msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "

447 msgstr ""

448

449 -#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1468

449 +#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471

450 #, c-format, perl-format

451 msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "

452 msgstr ""

453

454 -#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1469

454 +#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472

455 #, c-format, perl-format

456 msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "

457 msgstr ""

@@ -474,47 +474,47 @@ msgid ""

474 "d - do not apply this hunk or any of the later hunks in the file\n"

475 msgstr ""

476

477 -#: add-patch.c:328

477 +#: add-patch.c:342

478 #, c-format

479 msgid "could not parse hunk header '%.*s'"

480 msgstr ""

481

482 -#: add-patch.c:347 add-patch.c:351

482 +#: add-patch.c:361 add-patch.c:365

483 #, c-format

484 msgid "could not parse colored hunk header '%.*s'"

485 msgstr ""

486

487 -#: add-patch.c:405

487 +#: add-patch.c:419

488 msgid "could not parse diff"

489 msgstr ""

490

491 -#: add-patch.c:424

491 +#: add-patch.c:438

492 msgid "could not parse colored diff"

493 msgstr ""

494

495 -#: add-patch.c:438

495 +#: add-patch.c:452

496 #, c-format

497 msgid "failed to run '%s'"

498 msgstr ""

499

500 -#: add-patch.c:602

500 +#: add-patch.c:611

501 msgid "mismatched output from interactive.diffFilter"

502 msgstr ""

503

504 -#: add-patch.c:603

504 +#: add-patch.c:612

505 msgid ""

506 "Your filter must maintain a one-to-one correspondence\n"

507 "between its input and output lines."

508 msgstr ""

509

510 -#: add-patch.c:776

510 +#: add-patch.c:785

511 #, c-format

512 msgid ""

513 "expected context line #%d in\n"

514 "%.*s"

515 msgstr ""

516

517 -#: add-patch.c:791

517 +#: add-patch.c:800

518 #, c-format

519 msgid ""

520 "hunks do not overlap:\n"

@@ -523,11 +523,11 @@ msgid ""

523 "%.*s"

524 msgstr ""

525

526 -#: add-patch.c:1067 git-add--interactive.perl:1114

526 +#: add-patch.c:1076 git-add--interactive.perl:1117

527 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"

528 msgstr ""

529

530 -#: add-patch.c:1071

530 +#: add-patch.c:1080

531 #, c-format

532 msgid ""

533 "---\n"

@@ -537,18 +537,18 @@ msgid ""

537 msgstr ""

538

539 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.

540 -#: add-patch.c:1085 git-add--interactive.perl:1128

540 +#: add-patch.c:1094 git-add--interactive.perl:1131

541 msgid ""

542 "If it does not apply cleanly, you will be given an opportunity to\n"

543 "edit again. If all lines of the hunk are removed, then the edit is\n"

544 "aborted and the hunk is left unchanged.\n"

545 msgstr ""

546

547 -#: add-patch.c:1118

547 +#: add-patch.c:1127

548 msgid "could not parse hunk header"

549 msgstr ""

550

551 -#: add-patch.c:1163

551 +#: add-patch.c:1172

552 msgid "'git apply --cached' failed"

553 msgstr ""

554

@@ -564,24 +564,24 @@ msgstr ""

564 #. Consider translating (saying "no" discards!) as

565 #. (saying "n" for "no" discards!) if the translation

566 #. of the word "no" does not start with n.

567 -#: add-patch.c:1232 git-add--interactive.perl:1241

567 +#: add-patch.c:1241 git-add--interactive.perl:1244

568 msgid ""

569 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "

570 msgstr ""

571

572 -#: add-patch.c:1275

572 +#: add-patch.c:1284

573 msgid "The selected hunks do not apply to the index!"

574 msgstr ""

575

576 -#: add-patch.c:1276 git-add--interactive.perl:1345

576 +#: add-patch.c:1285 git-add--interactive.perl:1348

577 msgid "Apply them to the worktree anyway? "

578 msgstr ""

579

580 -#: add-patch.c:1283 git-add--interactive.perl:1348

580 +#: add-patch.c:1292 git-add--interactive.perl:1351

581 msgid "Nothing was applied.\n"

582 msgstr ""

583

584 -#: add-patch.c:1340

584 +#: add-patch.c:1349

585 msgid ""

586 "j - leave this hunk undecided, see next undecided hunk\n"

587 "J - leave this hunk undecided, see next hunk\n"

@@ -594,69 +594,69 @@ msgid ""

594 "? - print help\n"

595 msgstr ""

596

597 -#: add-patch.c:1463 add-patch.c:1473

597 +#: add-patch.c:1511 add-patch.c:1521

598 msgid "No previous hunk"

599 msgstr ""

600

601 -#: add-patch.c:1468 add-patch.c:1478

601 +#: add-patch.c:1516 add-patch.c:1526

602 msgid "No next hunk"

603 msgstr ""

604

605 -#: add-patch.c:1484

605 +#: add-patch.c:1532

606 msgid "No other hunks to goto"

607 msgstr ""

608

609 -#: add-patch.c:1495 git-add--interactive.perl:1594

609 +#: add-patch.c:1543 git-add--interactive.perl:1608

610 msgid "go to which hunk (<ret> to see more)? "

611 msgstr ""

612

613 -#: add-patch.c:1496 git-add--interactive.perl:1596

613 +#: add-patch.c:1544 git-add--interactive.perl:1610

614 msgid "go to which hunk? "

615 msgstr ""

616

617 -#: add-patch.c:1507

617 +#: add-patch.c:1555

618 #, c-format

619 msgid "Invalid number: '%s'"

620 msgstr ""

621

622 -#: add-patch.c:1512

622 +#: add-patch.c:1560

623 #, c-format

624 msgid "Sorry, only %d hunk available."

625 msgid_plural "Sorry, only %d hunks available."

626 msgstr[0] ""

627 msgstr[1] ""

628

629 -#: add-patch.c:1521

629 +#: add-patch.c:1569

630 msgid "No other hunks to search"

631 msgstr ""

632

633 -#: add-patch.c:1527 git-add--interactive.perl:1640

633 +#: add-patch.c:1575 git-add--interactive.perl:1663

634 msgid "search for regex? "

635 msgstr ""

636

637 -#: add-patch.c:1542

637 +#: add-patch.c:1590

638 #, c-format

639 msgid "Malformed search regexp %s: %s"

640 msgstr ""

641

642 -#: add-patch.c:1559

642 +#: add-patch.c:1607

643 msgid "No hunk matches the given pattern"

644 msgstr ""

645

646 -#: add-patch.c:1566

646 +#: add-patch.c:1614

647 msgid "Sorry, cannot split this hunk"

648 msgstr ""

649

650 -#: add-patch.c:1570

650 +#: add-patch.c:1618

651 #, c-format

652 msgid "Split into %d hunks."

653 msgstr ""

654

655 -#: add-patch.c:1574

655 +#: add-patch.c:1622

656 msgid "Sorry, cannot edit this hunk"

657 msgstr ""

658

659 -#: add-patch.c:1625

659 +#: add-patch.c:1674

660 msgid "'git apply' failed"

661 msgstr ""

662

@@ -707,7 +707,7 @@ msgstr ""

707 msgid "Exiting because of an unresolved conflict."

708 msgstr ""

709

710 -#: advice.c:278 builtin/merge.c:1353

710 +#: advice.c:278 builtin/merge.c:1349

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

712 msgstr ""

713

@@ -979,7 +979,7 @@ msgstr ""

979 msgid "cannot checkout %s"

980 msgstr ""

981

982 -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:308

982 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:72 setup.c:308

983 #, c-format

984 msgid "failed to read %s"

985 msgstr ""

@@ -999,7 +999,7 @@ msgstr ""

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

1000 msgstr ""

1001

1002 -#: apply.c:3537 apply.c:3708

1002 +#: apply.c:3537 apply.c:3708 apply.c:3953

1003 #, c-format

1004 msgid "%s: does not match index"

1005 msgstr ""

@@ -1047,360 +1047,355 @@ msgstr ""

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

1048 msgstr ""

1049

1050 -#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856

1051 -#: read-cache.c:1325

1050 +#: apply.c:3892 apply.c:3894 read-cache.c:832 read-cache.c:858

1051 +#: read-cache.c:1313

1052 #, c-format

1053 msgid "invalid path '%s'"

1054 msgstr ""

1055

1056 -#: apply.c:3936

1056 +#: apply.c:3950

1057 #, c-format

1058 msgid "%s: already exists in index"

1059 msgstr ""

1060

1061 -#: apply.c:3939

1061 +#: apply.c:3956

1062 #, c-format

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

1064 msgstr ""

1065

1066 -#: apply.c:3959

1066 +#: apply.c:3976

1067 #, c-format

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

1069 msgstr ""

1070

1071 -#: apply.c:3964

1071 +#: apply.c:3981

1072 #, c-format

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

1074 msgstr ""

1075

1076 -#: apply.c:3984

1076 +#: apply.c:4001

1077 #, c-format

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

1079 msgstr ""

1080

1081 -#: apply.c:3988

1081 +#: apply.c:4005

1082 #, c-format

1083 msgid "%s: patch does not apply"

1084 msgstr ""

1085

1086 -#: apply.c:4003

1086 +#: apply.c:4020

1087 #, c-format

1088 msgid "Checking patch %s..."

1089 msgstr ""

1090

1091 -#: apply.c:4095

1091 +#: apply.c:4112

1092 #, c-format

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

1094 msgstr ""

1095

1096 -#: apply.c:4102

1096 +#: apply.c:4119

1097 #, c-format

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

1099 msgstr ""

1100

1101 -#: apply.c:4105

1101 +#: apply.c:4122

1102 #, c-format

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

1104 msgstr ""

1105

1106 -#: apply.c:4114

1106 +#: apply.c:4131

1107 #, c-format

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

1109 msgstr ""

1110

1111 -#: apply.c:4124

1111 +#: apply.c:4141

1112 #, c-format

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

1114 msgstr ""

1115

1116 -#: apply.c:4262

1116 +#: apply.c:4279

1117 #, c-format

1118 msgid "unable to remove %s from index"

1119 msgstr ""

1120

1121 -#: apply.c:4296

1121 +#: apply.c:4313

1122 #, c-format

1123 msgid "corrupt patch for submodule %s"

1124 msgstr ""

1125

1126 -#: apply.c:4302

1126 +#: apply.c:4319

1127 #, c-format

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

1129 msgstr ""

1130

1131 -#: apply.c:4310

1131 +#: apply.c:4327

1132 #, c-format

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

1134 msgstr ""

1135

1136 -#: apply.c:4316 apply.c:4461

1136 +#: apply.c:4333 apply.c:4478

1137 #, c-format

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

1139 msgstr ""

1140

1141 -#: apply.c:4359

1141 +#: apply.c:4376 builtin/bisect--helper.c:537

1142 #, c-format

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

1144 msgstr ""

1145

1146 -#: apply.c:4363

1146 +#: apply.c:4380

1147 #, c-format

1148 msgid "closing file '%s'"

1149 msgstr ""

1150

1151 -#: apply.c:4433

1151 +#: apply.c:4450

1152 #, c-format

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

1154 msgstr ""

1155

1156 -#: apply.c:4531

1156 +#: apply.c:4548

1157 #, c-format

1158 msgid "Applied patch %s cleanly."

1159 msgstr ""

1160

1161 -#: apply.c:4539

1161 +#: apply.c:4556

1162 msgid "internal error"

1163 msgstr ""

1164

1165 -#: apply.c:4542

1165 +#: apply.c:4559

1166 #, c-format

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

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

1169 msgstr[0] ""

1170 msgstr[1] ""

1171

1172 -#: apply.c:4553

1172 +#: apply.c:4570

1173 #, c-format

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

1175 msgstr ""

1176

1177 -#: apply.c:4561 builtin/fetch.c:902 builtin/fetch.c:1195

1177 +#: apply.c:4578 builtin/fetch.c:927 builtin/fetch.c:1228

1178 #, c-format

1179 msgid "cannot open %s"

1180 msgstr ""

1181

1182 -#: apply.c:4575

1182 +#: apply.c:4592

1183 #, c-format

1184 msgid "Hunk #%d applied cleanly."

1185 msgstr ""

1186

1187 -#: apply.c:4579

1187 +#: apply.c:4596

1188 #, c-format

1189 msgid "Rejected hunk #%d."

1190 msgstr ""

1191

1192 -#: apply.c:4698

1192 +#: apply.c:4715

1193 #, c-format

1194 msgid "Skipped patch '%s'."

1195 msgstr ""

1196

1197 -#: apply.c:4706

1197 +#: apply.c:4723

1198 msgid "unrecognized input"

1199 msgstr ""

1200

1201 -#: apply.c:4726

1201 +#: apply.c:4743

1202 msgid "unable to read index file"

1203 msgstr ""

1204

1205 -#: apply.c:4883

1205 +#: apply.c:4900

1206 #, c-format

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

1208 msgstr ""

1209

1210 -#: apply.c:4910

1210 +#: apply.c:4927

1211 #, c-format

1212 msgid "squelched %d whitespace error"

1213 msgid_plural "squelched %d whitespace errors"

1214 msgstr[0] ""

1215 msgstr[1] ""

1216

1217 -#: apply.c:4916 apply.c:4931

1217 +#: apply.c:4933 apply.c:4948

1218 #, c-format

1219 msgid "%d line adds whitespace errors."

1220 msgid_plural "%d lines add whitespace errors."

1221 msgstr[0] ""

1222 msgstr[1] ""

1223

1224 -#: apply.c:4924

1224 +#: apply.c:4941

1225 #, c-format

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

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

1228 msgstr[0] ""

1229 msgstr[1] ""

1230

1231 -#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406

1231 +#: apply.c:4957 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406

1232 msgid "Unable to write new index file"

1233 msgstr ""

1234

1235 -#: apply.c:4968

1235 +#: apply.c:4985

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

1237 msgstr ""

1238

1239 -#: apply.c:4971

1239 +#: apply.c:4988

1240 msgid "apply changes matching the given path"

1241 msgstr ""

1242

1243 -#: apply.c:4973 builtin/am.c:2259

1243 +#: apply.c:4990 builtin/am.c:2279

1244 msgid "num"

1245 msgstr ""

1246

1247 -#: apply.c:4974

1247 +#: apply.c:4991

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

1249 msgstr ""

1250

1251 -#: apply.c:4977

1251 +#: apply.c:4994

1252 msgid "ignore additions made by the patch"

1253 msgstr ""

1254

1255 -#: apply.c:4979

1255 +#: apply.c:4996

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

1257 msgstr ""

1258

1259 -#: apply.c:4983

1259 +#: apply.c:5000

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

1261 msgstr ""

1262

1263 -#: apply.c:4985

1263 +#: apply.c:5002

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

1265 msgstr ""

1266

1267 -#: apply.c:4987

1267 +#: apply.c:5004

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

1269 msgstr ""

1270

1271 -#: apply.c:4989

1271 +#: apply.c:5006

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

1273 msgstr ""

1274

1275 -#: apply.c:4991

1275 +#: apply.c:5008

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

1277 msgstr ""

1278

1279 -#: apply.c:4993

1279 +#: apply.c:5010

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

1281 msgstr ""

1282

1283 -#: apply.c:4995

1283 +#: apply.c:5012

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

1285 msgstr ""

1286

1287 -#: apply.c:4998

1287 +#: apply.c:5015

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

1289 msgstr ""

1290

1291 -#: apply.c:5000

1291 +#: apply.c:5017

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

1293 msgstr ""

1294

1295 -#: apply.c:5002

1295 +#: apply.c:5019

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

1297 msgstr ""

1298

1299 -#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:525

1299 +#: apply.c:5022 builtin/checkout-index.c:173 builtin/ls-files.c:525

1300 msgid "paths are separated with NUL character"

1301 msgstr ""

1302

1303 -#: apply.c:5007

1303 +#: apply.c:5024

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

1305 msgstr ""

1306

1307 -#: apply.c:5008 builtin/am.c:2238 builtin/interpret-trailers.c:98

1307 +#: apply.c:5025 builtin/am.c:2258 builtin/interpret-trailers.c:98

1308 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102

1309 -#: builtin/pack-objects.c:3530 builtin/rebase.c:1332

1309 +#: builtin/pack-objects.c:3562 builtin/rebase.c:1340

1310 msgid "action"

1311 msgstr ""

1312

1313 -#: apply.c:5009

1313 +#: apply.c:5026

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

1315 msgstr ""

1316

1317 -#: apply.c:5012 apply.c:5015

1317 +#: apply.c:5029 apply.c:5032

1318 msgid "ignore changes in whitespace when finding context"

1319 msgstr ""

1320

1321 -#: apply.c:5018

1321 +#: apply.c:5035

1322 msgid "apply the patch in reverse"

1323 msgstr ""

1324

1325 -#: apply.c:5020

1325 +#: apply.c:5037

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

1327 msgstr ""

1328

1329 -#: apply.c:5022

1329 +#: apply.c:5039

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

1331 msgstr ""

1332

1333 -#: apply.c:5024

1333 +#: apply.c:5041

1334 msgid "allow overlapping hunks"

1335 msgstr ""

1336

1337 -#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22

1338 -#: builtin/commit.c:1366 builtin/count-objects.c:98 builtin/fsck.c:775

1339 -#: builtin/log.c:2186 builtin/mv.c:123 builtin/read-tree.c:128

1337 +#: apply.c:5042 builtin/add.c:329 builtin/check-ignore.c:22

1338 +#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:775

1339 +#: builtin/log.c:2270 builtin/mv.c:123 builtin/read-tree.c:128

1340 msgid "be verbose"

1341 msgstr ""

1342

1343 -#: apply.c:5027

1343 +#: apply.c:5044

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

1345 msgstr ""

1346

1347 -#: apply.c:5030

1347 +#: apply.c:5047

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

1349 msgstr ""

1350

1351 -#: apply.c:5032 builtin/am.c:2247

1351 +#: apply.c:5049 builtin/am.c:2267

1352 msgid "root"

1353 msgstr ""

1354

1355 -#: apply.c:5033

1355 +#: apply.c:5050

1356 msgid "prepend <root> to all filenames"

1357 msgstr ""

1358

1359 -#: archive-tar.c:125 archive-zip.c:351

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

1360 #, c-format

1361 msgid "cannot stream blob %s"

1362 msgstr ""

1363

1364 -#: archive-tar.c:266 archive-zip.c:369

1364 +#: archive-tar.c:265 archive-zip.c:358

1365 #, c-format

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

1367 msgstr ""

1368

1369 -#: archive-tar.c:293 archive-zip.c:359

1370 -#, c-format

1371 -msgid "cannot read %s"

1372 -msgstr ""

1373 -

1374 -#: archive-tar.c:465

1369 +#: archive-tar.c:449

1370 #, c-format

1371 msgid "unable to start '%s' filter"

1372 msgstr ""

1373

1379 -#: archive-tar.c:468

1374 +#: archive-tar.c:452

1375 msgid "unable to redirect descriptor"

1376 msgstr ""

1377

1383 -#: archive-tar.c:475

1378 +#: archive-tar.c:459

1379 #, c-format

1380 msgid "'%s' filter reported error"

1381 msgstr ""

1382

1388 -#: archive-zip.c:319

1383 +#: archive-zip.c:318

1384 #, c-format

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

1386 msgstr ""

1387

1393 -#: archive-zip.c:323

1388 +#: archive-zip.c:322

1389 #, c-format

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

1391 msgstr ""

1392

1398 -#: archive-zip.c:480 builtin/pack-objects.c:243 builtin/pack-objects.c:246

1393 +#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247

1394 #, c-format

1395 msgid "deflate error (%d)"

1396 msgstr ""

1397

1403 -#: archive-zip.c:615

1398 +#: archive-zip.c:603

1399 #, c-format

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

1401 msgstr ""

@@ -1422,119 +1417,149 @@ msgstr ""

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

1418 msgstr ""

1419

1425 -#: archive.c:377 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315

1420 +#: archive.c:192

1421 +#, c-format

1422 +msgid "cannot read %s"

1423 +msgstr ""

1424 +

1425 +#: archive.c:345 sequencer.c:445 sequencer.c:1706 sequencer.c:2852

1426 +#: sequencer.c:3293 sequencer.c:3402 builtin/am.c:263 builtin/commit.c:786

1427 +#: builtin/merge.c:1124

1428 +#, c-format

1429 +msgid "could not read '%s'"

1430 +msgstr ""

1431 +

1432 +#: archive.c:430 builtin/add.c:181 builtin/add.c:594 builtin/rm.c:315

1433 #, c-format

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

1435 msgstr ""

1436

1430 -#: archive.c:401

1437 +#: archive.c:454

1438 #, c-format

1439 msgid "no such ref: %.*s"

1440 msgstr ""

1441

1435 -#: archive.c:407

1442 +#: archive.c:460

1443 #, c-format

1444 msgid "not a valid object name: %s"

1445 msgstr ""

1446

1440 -#: archive.c:420

1447 +#: archive.c:473

1448 #, c-format

1449 msgid "not a tree object: %s"

1450 msgstr ""

1451

1445 -#: archive.c:432

1452 +#: archive.c:485

1453 msgid "current working directory is untracked"

1454 msgstr ""

1455

1449 -#: archive.c:464

1456 +#: archive.c:526

1457 +#, c-format

1458 +msgid "File not found: %s"

1459 +msgstr ""

1460 +

1461 +#: archive.c:528

1462 +#, c-format

1463 +msgid "Not a regular file: %s"

1464 +msgstr ""

1465 +

1466 +#: archive.c:553

1467 msgid "fmt"

1468 msgstr ""

1469

1453 -#: archive.c:464

1470 +#: archive.c:553

1471 msgid "archive format"

1472 msgstr ""

1473

1457 -#: archive.c:465 builtin/log.c:1674

1474 +#: archive.c:554 builtin/log.c:1760

1475 msgid "prefix"

1476 msgstr ""

1477

1461 -#: archive.c:466

1478 +#: archive.c:555

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

1480 msgstr ""

1481

1465 -#: archive.c:467 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866

1466 -#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1208

1467 -#: builtin/fast-export.c:1210 builtin/fast-export.c:1214 builtin/grep.c:907

1468 -#: builtin/hash-object.c:105 builtin/ls-files.c:561 builtin/ls-files.c:564

1469 -#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123

1470 -#: parse-options.h:190

1482 +#: archive.c:556 archive.c:559 builtin/blame.c:884 builtin/blame.c:888

1483 +#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:133

1484 +#: builtin/fast-export.c:1208 builtin/fast-export.c:1210

1485 +#: builtin/fast-export.c:1214 builtin/grep.c:908 builtin/hash-object.c:105

1486 +#: builtin/ls-files.c:561 builtin/ls-files.c:564 builtin/notes.c:412

1487 +#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190

1488 msgid "file"

1489 msgstr ""

1490

1474 -#: archive.c:468 builtin/archive.c:90

1491 +#: archive.c:557

1492 +msgid "add untracked file to archive"

1493 +msgstr ""

1494 +

1495 +#: archive.c:560 builtin/archive.c:90

1496 msgid "write the archive to this file"

1497 msgstr ""

1498

1478 -#: archive.c:470

1499 +#: archive.c:562

1500 msgid "read .gitattributes in working directory"

1501 msgstr ""

1502

1482 -#: archive.c:471

1503 +#: archive.c:563

1504 msgid "report archived files on stderr"

1505 msgstr ""

1506

1486 -#: archive.c:472

1507 +#: archive.c:564

1508 msgid "store only"

1509 msgstr ""

1510

1490 -#: archive.c:473

1511 +#: archive.c:565

1512 msgid "compress faster"

1513 msgstr ""

1514

1494 -#: archive.c:481

1515 +#: archive.c:573

1516 msgid "compress better"

1517 msgstr ""

1518

1498 -#: archive.c:484

1519 +#: archive.c:576

1520 msgid "list supported archive formats"

1521 msgstr ""

1522

1502 -#: archive.c:486 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116

1503 -#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911

1523 +#: archive.c:578 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116

1524 +#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335

1525 msgid "repo"

1526 msgstr ""

1527

1507 -#: archive.c:487 builtin/archive.c:92

1528 +#: archive.c:579 builtin/archive.c:92

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

1530 msgstr ""

1531

1511 -#: archive.c:488 builtin/archive.c:93 builtin/difftool.c:715

1532 +#: archive.c:580 builtin/archive.c:93 builtin/difftool.c:715

1533 #: builtin/notes.c:498

1534 msgid "command"

1535 msgstr ""

1536

1516 -#: archive.c:489 builtin/archive.c:94

1537 +#: archive.c:581 builtin/archive.c:94

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

1539 msgstr ""

1540

1520 -#: archive.c:496

1541 +#: archive.c:588

1542 msgid "Unexpected option --remote"

1543 msgstr ""

1544

1524 -#: archive.c:498

1545 +#: archive.c:590

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

1547 msgstr ""

1548

1528 -#: archive.c:500

1549 +#: archive.c:592

1550 msgid "Unexpected option --output"

1551 msgstr ""

1552

1532 -#: archive.c:522

1553 +#: archive.c:594

1554 +msgid "Options --add-file and --remote cannot be used together"

1555 +msgstr ""

1556 +

1557 +#: archive.c:616

1558 #, c-format

1559 msgid "Unknown archive format '%s'"

1560 msgstr ""

1561

1537 -#: archive.c:529

1562 +#: archive.c:623

1563 #, c-format

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

1565 msgstr ""

@@ -1555,43 +1580,43 @@ msgid ""

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

1581 msgstr ""

1582

1558 -#: bisect.c:468

1583 +#: bisect.c:476

1584 #, c-format

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

1586 msgstr ""

1587

1563 -#: bisect.c:678

1588 +#: bisect.c:686

1589 #, c-format

1590 msgid "We cannot bisect more!\n"

1591 msgstr ""

1592

1568 -#: bisect.c:745

1593 +#: bisect.c:753

1594 #, c-format

1595 msgid "Not a valid commit name %s"

1596 msgstr ""

1597

1573 -#: bisect.c:770

1598 +#: bisect.c:778

1599 #, c-format

1600 msgid ""

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

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

1603 msgstr ""

1604

1580 -#: bisect.c:775

1605 +#: bisect.c:783

1606 #, c-format

1607 msgid ""

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

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

1610 msgstr ""

1611

1587 -#: bisect.c:780

1612 +#: bisect.c:788

1613 #, c-format

1614 msgid ""

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

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

1617 msgstr ""

1618

1594 -#: bisect.c:788

1619 +#: bisect.c:796

1620 #, c-format

1621 msgid ""

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

@@ -1599,7 +1624,7 @@ msgid ""

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

1625 msgstr ""

1626

1602 -#: bisect.c:801

1627 +#: bisect.c:809

1628 #, c-format

1629 msgid ""

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

@@ -1607,43 +1632,43 @@ msgid ""

1632 "We continue anyway."

1633 msgstr ""

1634

1610 -#: bisect.c:840

1635 +#: bisect.c:848

1636 #, c-format

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

1638 msgstr ""

1639

1615 -#: bisect.c:890

1640 +#: bisect.c:898

1641 #, c-format

1642 msgid "a %s revision is needed"

1643 msgstr ""

1644

1620 -#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:255

1645 +#: bisect.c:928 builtin/notes.c:177 builtin/tag.c:255

1646 #, c-format

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

1648 msgstr ""

1649

1625 -#: bisect.c:966 builtin/merge.c:151

1650 +#: bisect.c:974 builtin/merge.c:150

1651 #, c-format

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

1653 msgstr ""

1654

1630 -#: bisect.c:997

1655 +#: bisect.c:1014

1656 msgid "reading bisect refs failed"

1657 msgstr ""

1658

1634 -#: bisect.c:1019

1659 +#: bisect.c:1044

1660 #, c-format

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

1662 msgstr ""

1663

1639 -#: bisect.c:1028

1664 +#: bisect.c:1053

1665 #, c-format

1666 msgid ""

1667 "No testable commit found.\n"

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

1669 msgstr ""

1670

1646 -#: bisect.c:1057

1671 +#: bisect.c:1082

1672 #, c-format

1673 msgid "(roughly %d step)"

1674 msgid_plural "(roughly %d steps)"

@@ -1653,44 +1678,44 @@ msgstr[1] ""

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

1679 #. steps)" translation.

1680 #.

1656 -#: bisect.c:1063

1681 +#: bisect.c:1088

1682 #, c-format

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

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

1685 msgstr[0] ""

1686 msgstr[1] ""

1687

1663 -#: blame.c:2777

1688 +#: blame.c:2778

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

1690 msgstr ""

1691

1667 -#: blame.c:2791

1692 +#: blame.c:2792

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

1694 msgstr ""

1695

1671 -#: blame.c:2812

1696 +#: blame.c:2813

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

1698 msgstr ""

1699

1675 -#: blame.c:2821 bundle.c:187 ref-filter.c:2200 remote.c:1924 sequencer.c:2018

1676 -#: sequencer.c:4466 submodule.c:847 builtin/commit.c:1047 builtin/log.c:405

1677 -#: builtin/log.c:1012 builtin/log.c:1541 builtin/log.c:1945 builtin/log.c:2235

1678 -#: builtin/merge.c:415 builtin/pack-objects.c:3348 builtin/pack-objects.c:3363

1679 -#: builtin/shortlog.c:192

1700 +#: blame.c:2822 bundle.c:213 ref-filter.c:2264 remote.c:2020 sequencer.c:2105

1701 +#: sequencer.c:4606 submodule.c:855 builtin/commit.c:1045 builtin/log.c:404

1702 +#: builtin/log.c:1020 builtin/log.c:1622 builtin/log.c:2029 builtin/log.c:2319

1703 +#: builtin/merge.c:414 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395

1704 +#: builtin/shortlog.c:320

1705 msgid "revision walk setup failed"

1706 msgstr ""

1707

1683 -#: blame.c:2839

1708 +#: blame.c:2840

1709 msgid ""

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

1711 msgstr ""

1712

1688 -#: blame.c:2850

1713 +#: blame.c:2851

1714 #, c-format

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

1716 msgstr ""

1717

1693 -#: blame.c:2861

1718 +#: blame.c:2862

1719 #, c-format

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

1721 msgstr ""

@@ -1819,88 +1844,104 @@ msgstr ""

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

1845 msgstr ""

1846

1822 -#: bundle.c:47

1847 +#: bundle.c:41

1848 +#, c-format

1849 +msgid "unrecognized bundle hash algorithm: %s"

1850 +msgstr ""

1851 +

1852 +#: bundle.c:45

1853 #, c-format

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

1854 +msgid "unknown capability '%s'"

1855 msgstr ""

1856

1827 -#: bundle.c:69

1828 -msgid "unknown hash algorithm length"

1857 +#: bundle.c:71

1858 +#, c-format

1859 +msgid "'%s' does not look like a v2 or v3 bundle file"

1860 msgstr ""

1861

1831 -#: bundle.c:84

1862 +#: bundle.c:110

1863 #, c-format

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

1865 msgstr ""

1866

1836 -#: bundle.c:110 rerere.c:480 rerere.c:690 sequencer.c:2270 sequencer.c:3034

1867 +#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2357 sequencer.c:3142

1868 #: builtin/commit.c:814

1869 #, c-format

1870 msgid "could not open '%s'"

1871 msgstr ""

1872

1842 -#: bundle.c:163

1873 +#: bundle.c:189

1874 msgid "Repository lacks these prerequisite commits:"

1875 msgstr ""

1876

1846 -#: bundle.c:166

1877 +#: bundle.c:192

1878 msgid "need a repository to verify a bundle"

1879 msgstr ""

1880

1850 -#: bundle.c:217

1881 +#: bundle.c:243

1882 #, c-format

1883 msgid "The bundle contains this ref:"

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

1885 msgstr[0] ""

1886 msgstr[1] ""

1887

1857 -#: bundle.c:224

1888 +#: bundle.c:250

1889 msgid "The bundle records a complete history."

1890 msgstr ""

1891

1861 -#: bundle.c:226

1892 +#: bundle.c:252

1893 #, c-format

1894 msgid "The bundle requires this ref:"

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

1896 msgstr[0] ""

1897 msgstr[1] ""

1898

1868 -#: bundle.c:293

1899 +#: bundle.c:319

1900 msgid "unable to dup bundle descriptor"

1901 msgstr ""

1902

1872 -#: bundle.c:300

1903 +#: bundle.c:326

1904 msgid "Could not spawn pack-objects"

1905 msgstr ""

1906

1876 -#: bundle.c:311

1907 +#: bundle.c:337

1908 msgid "pack-objects died"

1909 msgstr ""

1910

1880 -#: bundle.c:353

1911 +#: bundle.c:379

1912 msgid "rev-list died"

1913 msgstr ""

1914

1884 -#: bundle.c:402

1915 +#: bundle.c:428

1916 #, c-format

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

1918 msgstr ""

1919

1889 -#: bundle.c:481 builtin/log.c:208 builtin/log.c:1834 builtin/shortlog.c:306

1920 +#: bundle.c:498

1921 +#, c-format

1922 +msgid "unsupported bundle version %d"

1923 +msgstr ""

1924 +

1925 +#: bundle.c:500

1926 +#, c-format

1927 +msgid "cannot write bundle version %d with algorithm %s"

1928 +msgstr ""

1929 +

1930 +#: bundle.c:522 builtin/log.c:207 builtin/log.c:1918 builtin/shortlog.c:461

1931 #, c-format

1932 msgid "unrecognized argument: %s"

1933 msgstr ""

1934

1894 -#: bundle.c:489

1935 +#: bundle.c:530

1936 msgid "Refusing to create empty bundle."

1937 msgstr ""

1938

1898 -#: bundle.c:499

1939 +#: bundle.c:540

1940 #, c-format

1941 msgid "cannot create '%s'"

1942 msgstr ""

1943

1903 -#: bundle.c:524

1944 +#: bundle.c:565

1945 msgid "index-pack died"

1946 msgstr ""

1947

@@ -1909,267 +1950,264 @@ msgstr ""

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

1951 msgstr ""

1952

1912 -#: commit-graph.c:238

1953 +#: commit-graph.c:188 midx.c:46

1954 +msgid "invalid hash version"

1955 +msgstr ""

1956 +

1957 +#: commit-graph.c:246

1958 msgid "commit-graph file is too small"

1959 msgstr ""

1960

1916 -#: commit-graph.c:303

1961 +#: commit-graph.c:311

1962 #, c-format

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

1964 msgstr ""

1965

1921 -#: commit-graph.c:310

1966 +#: commit-graph.c:318

1967 #, c-format

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

1969 msgstr ""

1970

1926 -#: commit-graph.c:317

1971 +#: commit-graph.c:325

1972 #, c-format

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

1974 msgstr ""

1975

1931 -#: commit-graph.c:339

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

1976 +#: commit-graph.c:342

1977 +#, c-format

1978 +msgid "commit-graph file is too small to hold %u chunks"

1979 msgstr ""

1980

1935 -#: commit-graph.c:349

1981 +#: commit-graph.c:361

1982 #, c-format

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

1984 msgstr ""

1985

1940 -#: commit-graph.c:417

1986 +#: commit-graph.c:433

1987 #, c-format

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

1989 msgstr ""

1990

1945 -#: commit-graph.c:491

1991 +#: commit-graph.c:499

1992 msgid "commit-graph has no base graphs chunk"

1993 msgstr ""

1994

1949 -#: commit-graph.c:501

1995 +#: commit-graph.c:509

1996 msgid "commit-graph chain does not match"

1997 msgstr ""

1998

1953 -#: commit-graph.c:549

1999 +#: commit-graph.c:557

2000 #, c-format

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

2002 msgstr ""

2003

1958 -#: commit-graph.c:573

2004 +#: commit-graph.c:581

2005 msgid "unable to find all commit-graph files"

2006 msgstr ""

2007

1962 -#: commit-graph.c:706 commit-graph.c:770

2008 +#: commit-graph.c:721 commit-graph.c:785

2009 msgid "invalid commit position. commit-graph is likely corrupt"

2010 msgstr ""

2011

1966 -#: commit-graph.c:727

2012 +#: commit-graph.c:742

2013 #, c-format

2014 msgid "could not find commit %s"

2015 msgstr ""

2016

1971 -#: commit-graph.c:1009 builtin/am.c:1292

2017 +#: commit-graph.c:1042 builtin/am.c:1306

2018 #, c-format

2019 msgid "unable to parse commit %s"

2020 msgstr ""

2021

1976 -#: commit-graph.c:1157

1977 -msgid "Writing changed paths Bloom filters index"

1978 -msgstr ""

1979 -

1980 -#: commit-graph.c:1182

1981 -msgid "Writing changed paths Bloom filters data"

1982 -msgstr ""

1983 -

1984 -#: commit-graph.c:1221 builtin/pack-objects.c:2832

2022 +#: commit-graph.c:1265 builtin/pack-objects.c:2864

2023 #, c-format

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

2025 msgstr ""

2026

1989 -#: commit-graph.c:1257

2027 +#: commit-graph.c:1301

2028 msgid "Loading known commits in commit graph"

2029 msgstr ""

2030

1993 -#: commit-graph.c:1274

2031 +#: commit-graph.c:1318

2032 msgid "Expanding reachable commits in commit graph"

2033 msgstr ""

2034

1997 -#: commit-graph.c:1294

2035 +#: commit-graph.c:1338

2036 msgid "Clearing commit marks in commit graph"

2037 msgstr ""

2038

2001 -#: commit-graph.c:1313

2039 +#: commit-graph.c:1357

2040 msgid "Computing commit graph generation numbers"

2041 msgstr ""

2042

2005 -#: commit-graph.c:1367

2043 +#: commit-graph.c:1424

2044 msgid "Computing commit changed paths Bloom filters"

2045 msgstr ""

2046

2009 -#: commit-graph.c:1423

2047 +#: commit-graph.c:1501

2048 msgid "Collecting referenced commits"

2049 msgstr ""

2050

2013 -#: commit-graph.c:1447

2051 +#: commit-graph.c:1526

2052 #, c-format

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

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

2055 msgstr[0] ""

2056 msgstr[1] ""

2057

2020 -#: commit-graph.c:1460

2058 +#: commit-graph.c:1539

2059 #, c-format

2060 msgid "error adding pack %s"

2061 msgstr ""

2062

2025 -#: commit-graph.c:1464

2063 +#: commit-graph.c:1543

2064 #, c-format

2065 msgid "error opening index for %s"

2066 msgstr ""

2067

2030 -#: commit-graph.c:1503

2068 +#: commit-graph.c:1582

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

2070 msgstr ""

2071

2034 -#: commit-graph.c:1518

2072 +#: commit-graph.c:1597

2073 msgid "Counting distinct commits in commit graph"

2074 msgstr ""

2075

2038 -#: commit-graph.c:1550

2076 +#: commit-graph.c:1629

2077 msgid "Finding extra edges in commit graph"

2078 msgstr ""

2079

2042 -#: commit-graph.c:1599

2080 +#: commit-graph.c:1678

2081 msgid "failed to write correct number of base graph ids"

2082 msgstr ""

2083

2046 -#: commit-graph.c:1633 midx.c:812

2084 +#: commit-graph.c:1720 midx.c:826

2085 #, c-format

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

2087 msgstr ""

2088

2051 -#: commit-graph.c:1646

2089 +#: commit-graph.c:1733

2090 msgid "unable to create temporary graph layer"

2091 msgstr ""

2092

2055 -#: commit-graph.c:1651

2093 +#: commit-graph.c:1738

2094 #, c-format

2095 msgid "unable to adjust shared permissions for '%s'"

2096 msgstr ""

2097

2060 -#: commit-graph.c:1728

2098 +#: commit-graph.c:1808

2099 #, c-format

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

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

2102 msgstr[0] ""

2103 msgstr[1] ""

2104

2067 -#: commit-graph.c:1773

2105 +#: commit-graph.c:1853

2106 msgid "unable to open commit-graph chain file"

2107 msgstr ""

2108

2071 -#: commit-graph.c:1789

2109 +#: commit-graph.c:1869

2110 msgid "failed to rename base commit-graph file"

2111 msgstr ""

2112

2075 -#: commit-graph.c:1809

2113 +#: commit-graph.c:1889

2114 msgid "failed to rename temporary commit-graph file"

2115 msgstr ""

2116

2079 -#: commit-graph.c:1935

2117 +#: commit-graph.c:2015

2118 msgid "Scanning merged commits"

2119 msgstr ""

2120

2083 -#: commit-graph.c:1946

2121 +#: commit-graph.c:2026

2122 #, c-format

2123 msgid "unexpected duplicate commit id %s"

2124 msgstr ""

2125

2088 -#: commit-graph.c:1969

2126 +#: commit-graph.c:2049

2127 msgid "Merging commit-graph"

2128 msgstr ""

2129

2092 -#: commit-graph.c:2156

2130 +#: commit-graph.c:2259

2131 #, c-format

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

2133 msgstr ""

2134

2097 -#: commit-graph.c:2167

2135 +#: commit-graph.c:2270

2136 msgid "too many commits to write graph"

2137 msgstr ""

2138

2101 -#: commit-graph.c:2260

2139 +#: commit-graph.c:2363

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

2141 msgstr ""

2142

2105 -#: commit-graph.c:2270

2143 +#: commit-graph.c:2373

2144 #, c-format

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

2146 msgstr ""

2147

2110 -#: commit-graph.c:2280 commit-graph.c:2295

2148 +#: commit-graph.c:2383 commit-graph.c:2398

2149 #, c-format

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

2151 msgstr ""

2152

2115 -#: commit-graph.c:2287

2153 +#: commit-graph.c:2390

2154 #, c-format

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

2156 msgstr ""

2157

2120 -#: commit-graph.c:2305

2158 +#: commit-graph.c:2408

2159 msgid "Verifying commits in commit graph"

2160 msgstr ""

2161

2124 -#: commit-graph.c:2320

2162 +#: commit-graph.c:2423

2163 #, c-format

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

2165 msgstr ""

2166

2129 -#: commit-graph.c:2327

2167 +#: commit-graph.c:2430

2168 #, c-format

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

2170 msgstr ""

2171

2134 -#: commit-graph.c:2337

2172 +#: commit-graph.c:2440

2173 #, c-format

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

2175 msgstr ""

2176

2139 -#: commit-graph.c:2346

2177 +#: commit-graph.c:2449

2178 #, c-format

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

2180 msgstr ""

2181

2144 -#: commit-graph.c:2360

2182 +#: commit-graph.c:2463

2183 #, c-format

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

2185 msgstr ""

2186

2149 -#: commit-graph.c:2365

2187 +#: commit-graph.c:2468

2188 #, c-format

2189 msgid ""

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

2191 msgstr ""

2192

2155 -#: commit-graph.c:2369

2193 +#: commit-graph.c:2472

2194 #, c-format

2195 msgid ""

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

2197 msgstr ""

2198

2161 -#: commit-graph.c:2385

2199 +#: commit-graph.c:2488

2200 #, c-format

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

2202 msgstr ""

2203

2166 -#: commit-graph.c:2391

2204 +#: commit-graph.c:2494

2205 #, c-format

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

2207 msgstr ""

2208

2171 -#: commit.c:52 sequencer.c:2739 builtin/am.c:359 builtin/am.c:403

2172 -#: builtin/am.c:1371 builtin/am.c:2013 builtin/replace.c:457

2209 +#: commit.c:52 sequencer.c:2845 builtin/am.c:373 builtin/am.c:417

2210 +#: builtin/am.c:1385 builtin/am.c:2031 builtin/replace.c:457

2211 #, c-format

2212 msgid "could not parse %s"

2213 msgstr ""

@@ -2255,7 +2293,7 @@ msgstr ""

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

2294 msgstr ""

2295

2258 -#: config.c:408 sequencer.c:2456

2296 +#: config.c:408 sequencer.c:2547

2297 #, c-format

2298 msgid "invalid key: %s"

2299 msgstr ""

@@ -2391,7 +2429,7 @@ msgstr ""

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

2430 msgstr ""

2431

2394 -#: config.c:1533 builtin/pack-objects.c:3617

2432 +#: config.c:1533 builtin/pack-objects.c:3649

2433 #, c-format

2434 msgid "bad pack compression level %d"

2435 msgstr ""

@@ -2420,101 +2458,101 @@ msgstr ""

2458 msgid "unable to parse command-line config"

2459 msgstr ""

2460

2423 -#: config.c:2113

2461 +#: config.c:2122

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

2463 msgstr ""

2464

2427 -#: config.c:2283

2465 +#: config.c:2296

2466 #, c-format

2467 msgid "Invalid %s: '%s'"

2468 msgstr ""

2469

2432 -#: config.c:2328

2470 +#: config.c:2341

2471 #, c-format

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

2473 msgstr ""

2474

2437 -#: config.c:2374

2475 +#: config.c:2387

2476 #, c-format

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

2478 msgstr ""

2479

2442 -#: config.c:2376

2480 +#: config.c:2389

2481 #, c-format

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

2483 msgstr ""

2484

2447 -#: config.c:2457

2485 +#: config.c:2470

2486 #, c-format

2487 msgid "invalid section name '%s'"

2488 msgstr ""

2489

2452 -#: config.c:2489

2490 +#: config.c:2502

2491 #, c-format

2492 msgid "%s has multiple values"

2493 msgstr ""

2494

2457 -#: config.c:2518

2495 +#: config.c:2531

2496 #, c-format

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

2498 msgstr ""

2499

2462 -#: config.c:2770 config.c:3094

2500 +#: config.c:2783 config.c:3107

2501 #, c-format

2502 msgid "could not lock config file %s"

2503 msgstr ""

2504

2467 -#: config.c:2781

2505 +#: config.c:2794

2506 #, c-format

2507 msgid "opening %s"

2508 msgstr ""

2509

2472 -#: config.c:2816 builtin/config.c:344

2510 +#: config.c:2829 builtin/config.c:354

2511 #, c-format

2512 msgid "invalid pattern: %s"

2513 msgstr ""

2514

2477 -#: config.c:2841

2515 +#: config.c:2854

2516 #, c-format

2517 msgid "invalid config file %s"

2518 msgstr ""

2519

2482 -#: config.c:2854 config.c:3107

2520 +#: config.c:2867 config.c:3120

2521 #, c-format

2522 msgid "fstat on %s failed"

2523 msgstr ""

2524

2487 -#: config.c:2865

2525 +#: config.c:2878

2526 #, c-format

2527 msgid "unable to mmap '%s'"

2528 msgstr ""

2529

2492 -#: config.c:2874 config.c:3112

2530 +#: config.c:2887 config.c:3125

2531 #, c-format

2532 msgid "chmod on %s failed"

2533 msgstr ""

2534

2497 -#: config.c:2959 config.c:3209

2535 +#: config.c:2972 config.c:3222

2536 #, c-format

2537 msgid "could not write config file %s"

2538 msgstr ""

2539

2502 -#: config.c:2993

2540 +#: config.c:3006

2541 #, c-format

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

2543 msgstr ""

2544

2507 -#: config.c:2995 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857

2545 +#: config.c:3008 builtin/remote.c:656 builtin/remote.c:850 builtin/remote.c:858

2546 #, c-format

2547 msgid "could not unset '%s'"

2548 msgstr ""

2549

2512 -#: config.c:3085

2550 +#: config.c:3098

2551 #, c-format

2552 msgid "invalid section name: %s"

2553 msgstr ""

2554

2517 -#: config.c:3252

2555 +#: config.c:3265

2556 #, c-format

2557 msgid "missing value for '%s'"

2558 msgstr ""

@@ -2675,23 +2713,23 @@ msgstr ""

2713 msgid "strange pathname '%s' blocked"

2714 msgstr ""

2715

2678 -#: connect.c:1407

2716 +#: connect.c:1408

2717 msgid "unable to fork"

2718 msgstr ""

2719

2682 -#: connected.c:109 builtin/fsck.c:209 builtin/prune.c:45

2720 +#: connected.c:108 builtin/fsck.c:209 builtin/prune.c:45

2721 msgid "Checking connectivity"

2722 msgstr ""

2723

2686 -#: connected.c:121

2724 +#: connected.c:120

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

2726 msgstr ""

2727

2690 -#: connected.c:141

2728 +#: connected.c:144

2729 msgid "failed write to rev-list"

2730 msgstr ""

2731

2694 -#: connected.c:148

2732 +#: connected.c:149

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

2734 msgstr ""

2735

@@ -2758,56 +2796,56 @@ msgstr ""

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

2797 msgstr ""

2798

2761 -#: convert.c:668

2799 +#: convert.c:665

2800 #, c-format

2801 msgid "cannot fork to run external filter '%s'"

2802 msgstr ""

2803

2766 -#: convert.c:688

2804 +#: convert.c:685

2805 #, c-format

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

2807 msgstr ""

2808

2771 -#: convert.c:695

2809 +#: convert.c:692

2810 #, c-format

2811 msgid "external filter '%s' failed %d"

2812 msgstr ""

2813

2776 -#: convert.c:730 convert.c:733

2814 +#: convert.c:727 convert.c:730

2815 #, c-format

2816 msgid "read from external filter '%s' failed"

2817 msgstr ""

2818

2781 -#: convert.c:736 convert.c:791

2819 +#: convert.c:733 convert.c:788

2820 #, c-format

2821 msgid "external filter '%s' failed"

2822 msgstr ""

2823

2786 -#: convert.c:840

2824 +#: convert.c:837

2825 msgid "unexpected filter type"

2826 msgstr ""

2827

2790 -#: convert.c:851

2828 +#: convert.c:848

2829 msgid "path name too long for external filter"

2830 msgstr ""

2831

2794 -#: convert.c:943

2832 +#: convert.c:940

2833 #, c-format

2834 msgid ""

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

2836 "been filtered"

2837 msgstr ""

2838

2801 -#: convert.c:1243

2839 +#: convert.c:1240

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

2841 msgstr ""

2842

2805 -#: convert.c:1431 convert.c:1465

2843 +#: convert.c:1428 convert.c:1462

2844 #, c-format

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

2846 msgstr ""

2847

2810 -#: convert.c:1511

2848 +#: convert.c:1508

2849 #, c-format

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

2851 msgstr ""

@@ -2825,17 +2863,17 @@ msgstr ""

2863 msgid "refusing to work with credential missing protocol field"

2864 msgstr ""

2865

2828 -#: credential.c:396

2866 +#: credential.c:394

2867 #, c-format

2868 msgid "url contains a newline in its %s component: %s"

2869 msgstr ""

2870

2833 -#: credential.c:440

2871 +#: credential.c:438

2872 #, c-format

2873 msgid "url has no scheme: %s"

2874 msgstr ""

2875

2838 -#: credential.c:513

2876 +#: credential.c:511

2877 #, c-format

2878 msgid "credential url cannot be parsed: %s"

2879 msgstr ""

@@ -2983,523 +3021,523 @@ msgid ""

3021 "%s"

3022 msgstr ""

3023

2986 -#: diff.c:4243

3024 +#: diff.c:4269

3025 #, c-format

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

3027 msgstr ""

3028

2991 -#: diff.c:4589

3029 +#: diff.c:4618

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

3031 msgstr ""

3032

2995 -#: diff.c:4592

3033 +#: diff.c:4621

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

3035 msgstr ""

3036

2999 -#: diff.c:4670

3037 +#: diff.c:4699

3038 msgid "--follow requires exactly one pathspec"

3039 msgstr ""

3040

3003 -#: diff.c:4718

3041 +#: diff.c:4747

3042 #, c-format

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

3044 msgstr ""

3045

3008 -#: diff.c:4723 diff.c:4728 diff.c:4733 diff.c:4738 diff.c:5250

3009 -#: parse-options.c:197 parse-options.c:201

3046 +#: diff.c:4752 diff.c:4757 diff.c:4762 diff.c:4767 diff.c:5279

3047 +#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180

3048 #, c-format

3049 msgid "%s expects a numerical value"

3050 msgstr ""

3051

3014 -#: diff.c:4755

3052 +#: diff.c:4784

3053 #, c-format

3054 msgid ""

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

3056 "%s"

3057 msgstr ""

3058

3021 -#: diff.c:4840

3059 +#: diff.c:4869

3060 #, c-format

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

3062 msgstr ""

3063

3026 -#: diff.c:4864

3064 +#: diff.c:4893

3065 #, c-format

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

3067 msgstr ""

3068

3031 -#: diff.c:4878

3069 +#: diff.c:4907

3070 #, c-format

3071 msgid "unable to resolve '%s'"

3072 msgstr ""

3073

3036 -#: diff.c:4928 diff.c:4934

3074 +#: diff.c:4957 diff.c:4963

3075 #, c-format

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

3077 msgstr ""

3078

3041 -#: diff.c:4946

3079 +#: diff.c:4975

3080 #, c-format

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

3082 msgstr ""

3083

3046 -#: diff.c:4967

3084 +#: diff.c:4996

3085 #, c-format

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

3087 msgstr ""

3088

3051 -#: diff.c:4986

3089 +#: diff.c:5015

3090 #, c-format

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

3092 msgstr ""

3093

3056 -#: diff.c:5026

3094 +#: diff.c:5055

3095 msgid ""

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

3097 "\"histogram\""

3098 msgstr ""

3099

3062 -#: diff.c:5062 diff.c:5082

3100 +#: diff.c:5091 diff.c:5111

3101 #, c-format

3102 msgid "invalid argument to %s"

3103 msgstr ""

3104

3067 -#: diff.c:5219

3105 +#: diff.c:5248

3106 #, c-format

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

3108 msgstr ""

3109

3072 -#: diff.c:5275

3110 +#: diff.c:5304

3111 #, c-format

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

3113 msgstr ""

3114

3077 -#: diff.c:5298

3115 +#: diff.c:5327

3116 msgid "Diff output format options"

3117 msgstr ""

3118

3081 -#: diff.c:5300 diff.c:5306

3119 +#: diff.c:5329 diff.c:5335

3120 msgid "generate patch"

3121 msgstr ""

3122

3085 -#: diff.c:5303 builtin/log.c:177

3123 +#: diff.c:5332 builtin/log.c:176

3124 msgid "suppress diff output"

3125 msgstr ""

3126

3089 -#: diff.c:5308 diff.c:5422 diff.c:5429

3127 +#: diff.c:5337 diff.c:5451 diff.c:5458

3128 msgid "<n>"

3129 msgstr ""

3130

3093 -#: diff.c:5309 diff.c:5312

3131 +#: diff.c:5338 diff.c:5341

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

3133 msgstr ""

3134

3097 -#: diff.c:5314

3135 +#: diff.c:5343

3136 msgid "generate the diff in raw format"

3137 msgstr ""

3138

3101 -#: diff.c:5317

3139 +#: diff.c:5346

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

3141 msgstr ""

3142

3105 -#: diff.c:5321

3143 +#: diff.c:5350

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

3145 msgstr ""

3146

3109 -#: diff.c:5325

3147 +#: diff.c:5354

3148 msgid "machine friendly --stat"

3149 msgstr ""

3150

3113 -#: diff.c:5328

3151 +#: diff.c:5357

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

3153 msgstr ""

3154

3117 -#: diff.c:5330 diff.c:5338

3155 +#: diff.c:5359 diff.c:5367

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

3157 msgstr ""

3158

3121 -#: diff.c:5331

3159 +#: diff.c:5360

3160 msgid ""

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

3162 msgstr ""

3163

3126 -#: diff.c:5335

3164 +#: diff.c:5364

3165 msgid "synonym for --dirstat=cumulative"

3166 msgstr ""

3167

3130 -#: diff.c:5339

3168 +#: diff.c:5368

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

3170 msgstr ""

3171

3134 -#: diff.c:5343

3172 +#: diff.c:5372

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

3174 msgstr ""

3175

3138 -#: diff.c:5346

3176 +#: diff.c:5375

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

3178 msgstr ""

3179

3142 -#: diff.c:5349

3180 +#: diff.c:5378

3181 msgid "show only names of changed files"

3182 msgstr ""

3183

3146 -#: diff.c:5352

3184 +#: diff.c:5381

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

3186 msgstr ""

3187

3150 -#: diff.c:5354

3188 +#: diff.c:5383

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

3190 msgstr ""

3191

3154 -#: diff.c:5355

3192 +#: diff.c:5384

3193 msgid "generate diffstat"

3194 msgstr ""

3195

3158 -#: diff.c:5357 diff.c:5360 diff.c:5363

3196 +#: diff.c:5386 diff.c:5389 diff.c:5392

3197 msgid "<width>"

3198 msgstr ""

3199

3162 -#: diff.c:5358

3200 +#: diff.c:5387

3201 msgid "generate diffstat with a given width"

3202 msgstr ""

3203

3166 -#: diff.c:5361

3204 +#: diff.c:5390

3205 msgid "generate diffstat with a given name width"

3206 msgstr ""

3207

3170 -#: diff.c:5364

3208 +#: diff.c:5393

3209 msgid "generate diffstat with a given graph width"

3210 msgstr ""

3211

3174 -#: diff.c:5366

3212 +#: diff.c:5395

3213 msgid "<count>"

3214 msgstr ""

3215

3178 -#: diff.c:5367

3216 +#: diff.c:5396

3217 msgid "generate diffstat with limited lines"

3218 msgstr ""

3219

3182 -#: diff.c:5370

3220 +#: diff.c:5399

3221 msgid "generate compact summary in diffstat"

3222 msgstr ""

3223

3186 -#: diff.c:5373

3224 +#: diff.c:5402

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

3226 msgstr ""

3227

3190 -#: diff.c:5376

3228 +#: diff.c:5405

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

3230 msgstr ""

3231

3194 -#: diff.c:5378

3232 +#: diff.c:5407

3233 msgid "show colored diff"

3234 msgstr ""

3235

3198 -#: diff.c:5379

3236 +#: diff.c:5408

3237 msgid "<kind>"

3238 msgstr ""

3239

3202 -#: diff.c:5380

3240 +#: diff.c:5409

3241 msgid ""

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

3243 "diff"

3244 msgstr ""

3245

3208 -#: diff.c:5383

3246 +#: diff.c:5412

3247 msgid ""

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

3249 "--numstat"

3250 msgstr ""

3251

3214 -#: diff.c:5386 diff.c:5389 diff.c:5392 diff.c:5498

3252 +#: diff.c:5415 diff.c:5418 diff.c:5421 diff.c:5527

3253 msgid "<prefix>"

3254 msgstr ""

3255

3218 -#: diff.c:5387

3256 +#: diff.c:5416

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

3258 msgstr ""

3259

3222 -#: diff.c:5390

3260 +#: diff.c:5419

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

3262 msgstr ""

3263

3226 -#: diff.c:5393

3264 +#: diff.c:5422

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

3266 msgstr ""

3267

3230 -#: diff.c:5396

3268 +#: diff.c:5425

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

3270 msgstr ""

3271

3234 -#: diff.c:5399

3272 +#: diff.c:5428

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

3274 msgstr ""

3275

3238 -#: diff.c:5403 diff.c:5408 diff.c:5413

3276 +#: diff.c:5432 diff.c:5437 diff.c:5442

3277 msgid "<char>"

3278 msgstr ""

3279

3242 -#: diff.c:5404

3280 +#: diff.c:5433

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

3282 msgstr ""

3283

3246 -#: diff.c:5409

3284 +#: diff.c:5438

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

3286 msgstr ""

3287

3250 -#: diff.c:5414

3288 +#: diff.c:5443

3289 msgid "specify the character to indicate a context instead of ' '"

3290 msgstr ""

3291

3254 -#: diff.c:5417

3292 +#: diff.c:5446

3293 msgid "Diff rename options"

3294 msgstr ""

3295

3258 -#: diff.c:5418

3296 +#: diff.c:5447

3297 msgid "<n>[/<m>]"

3298 msgstr ""

3299

3262 -#: diff.c:5419

3300 +#: diff.c:5448

3301 msgid "break complete rewrite changes into pairs of delete and create"

3302 msgstr ""

3303

3266 -#: diff.c:5423

3304 +#: diff.c:5452

3305 msgid "detect renames"

3306 msgstr ""

3307

3270 -#: diff.c:5427

3308 +#: diff.c:5456

3309 msgid "omit the preimage for deletes"

3310 msgstr ""

3311

3274 -#: diff.c:5430

3312 +#: diff.c:5459

3313 msgid "detect copies"

3314 msgstr ""

3315

3278 -#: diff.c:5434

3316 +#: diff.c:5463

3317 msgid "use unmodified files as source to find copies"

3318 msgstr ""

3319

3282 -#: diff.c:5436

3320 +#: diff.c:5465

3321 msgid "disable rename detection"

3322 msgstr ""

3323

3286 -#: diff.c:5439

3324 +#: diff.c:5468

3325 msgid "use empty blobs as rename source"

3326 msgstr ""

3327

3290 -#: diff.c:5441

3328 +#: diff.c:5470

3329 msgid "continue listing the history of a file beyond renames"

3330 msgstr ""

3331

3294 -#: diff.c:5444

3332 +#: diff.c:5473

3333 msgid ""

3334 "prevent rename/copy detection if the number of rename/copy targets exceeds "

3335 "given limit"

3336 msgstr ""

3337

3300 -#: diff.c:5446

3338 +#: diff.c:5475

3339 msgid "Diff algorithm options"

3340 msgstr ""

3341

3304 -#: diff.c:5448

3342 +#: diff.c:5477

3343 msgid "produce the smallest possible diff"

3344 msgstr ""

3345

3308 -#: diff.c:5451

3346 +#: diff.c:5480

3347 msgid "ignore whitespace when comparing lines"

3348 msgstr ""

3349

3312 -#: diff.c:5454

3350 +#: diff.c:5483

3351 msgid "ignore changes in amount of whitespace"

3352 msgstr ""

3353

3316 -#: diff.c:5457

3354 +#: diff.c:5486

3355 msgid "ignore changes in whitespace at EOL"

3356 msgstr ""

3357

3320 -#: diff.c:5460

3358 +#: diff.c:5489

3359 msgid "ignore carrier-return at the end of line"

3360 msgstr ""

3361

3324 -#: diff.c:5463

3362 +#: diff.c:5492

3363 msgid "ignore changes whose lines are all blank"

3364 msgstr ""

3365

3328 -#: diff.c:5466

3366 +#: diff.c:5495

3367 msgid "heuristic to shift diff hunk boundaries for easy reading"

3368 msgstr ""

3369

3332 -#: diff.c:5469

3370 +#: diff.c:5498

3371 msgid "generate diff using the \"patience diff\" algorithm"

3372 msgstr ""

3373

3336 -#: diff.c:5473

3374 +#: diff.c:5502

3375 msgid "generate diff using the \"histogram diff\" algorithm"

3376 msgstr ""

3377

3340 -#: diff.c:5475

3378 +#: diff.c:5504

3379 msgid "<algorithm>"

3380 msgstr ""

3381

3344 -#: diff.c:5476

3382 +#: diff.c:5505

3383 msgid "choose a diff algorithm"

3384 msgstr ""

3385

3348 -#: diff.c:5478

3386 +#: diff.c:5507

3387 msgid "<text>"

3388 msgstr ""

3389

3352 -#: diff.c:5479

3390 +#: diff.c:5508

3391 msgid "generate diff using the \"anchored diff\" algorithm"

3392 msgstr ""

3393

3356 -#: diff.c:5481 diff.c:5490 diff.c:5493

3394 +#: diff.c:5510 diff.c:5519 diff.c:5522

3395 msgid "<mode>"

3396 msgstr ""

3397

3360 -#: diff.c:5482

3398 +#: diff.c:5511

3399 msgid "show word diff, using <mode> to delimit changed words"

3400 msgstr ""

3401

3364 -#: diff.c:5484 diff.c:5487 diff.c:5532

3402 +#: diff.c:5513 diff.c:5516 diff.c:5561

3403 msgid "<regex>"

3404 msgstr ""

3405

3368 -#: diff.c:5485

3406 +#: diff.c:5514

3407 msgid "use <regex> to decide what a word is"

3408 msgstr ""

3409

3372 -#: diff.c:5488

3410 +#: diff.c:5517

3411 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"

3412 msgstr ""

3413

3376 -#: diff.c:5491

3414 +#: diff.c:5520

3415 msgid "moved lines of code are colored differently"

3416 msgstr ""

3417

3380 -#: diff.c:5494

3418 +#: diff.c:5523

3419 msgid "how white spaces are ignored in --color-moved"

3420 msgstr ""

3421

3384 -#: diff.c:5497

3422 +#: diff.c:5526

3423 msgid "Other diff options"

3424 msgstr ""

3425

3388 -#: diff.c:5499

3426 +#: diff.c:5528

3427 msgid "when run from subdir, exclude changes outside and show relative paths"

3428 msgstr ""

3429

3392 -#: diff.c:5503

3430 +#: diff.c:5532

3431 msgid "treat all files as text"

3432 msgstr ""

3433

3396 -#: diff.c:5505

3434 +#: diff.c:5534

3435 msgid "swap two inputs, reverse the diff"

3436 msgstr ""

3437

3400 -#: diff.c:5507

3438 +#: diff.c:5536

3439 msgid "exit with 1 if there were differences, 0 otherwise"

3440 msgstr ""

3441

3404 -#: diff.c:5509

3442 +#: diff.c:5538

3443 msgid "disable all output of the program"

3444 msgstr ""

3445

3408 -#: diff.c:5511

3446 +#: diff.c:5540

3447 msgid "allow an external diff helper to be executed"

3448 msgstr ""

3449

3412 -#: diff.c:5513

3450 +#: diff.c:5542

3451 msgid "run external text conversion filters when comparing binary files"

3452 msgstr ""

3453

3416 -#: diff.c:5515

3454 +#: diff.c:5544

3455 msgid "<when>"

3456 msgstr ""

3457

3420 -#: diff.c:5516

3458 +#: diff.c:5545

3459 msgid "ignore changes to submodules in the diff generation"

3460 msgstr ""

3461

3424 -#: diff.c:5519

3462 +#: diff.c:5548

3463 msgid "<format>"

3464 msgstr ""

3465

3428 -#: diff.c:5520

3466 +#: diff.c:5549

3467 msgid "specify how differences in submodules are shown"

3468 msgstr ""

3469

3432 -#: diff.c:5524

3470 +#: diff.c:5553

3471 msgid "hide 'git add -N' entries from the index"

3472 msgstr ""

3473

3436 -#: diff.c:5527

3474 +#: diff.c:5556

3475 msgid "treat 'git add -N' entries as real in the index"

3476 msgstr ""

3477

3440 -#: diff.c:5529

3478 +#: diff.c:5558

3479 msgid "<string>"

3480 msgstr ""

3481

3444 -#: diff.c:5530

3482 +#: diff.c:5559

3483 msgid ""

3484 "look for differences that change the number of occurrences of the specified "

3485 "string"

3486 msgstr ""

3487

3450 -#: diff.c:5533

3488 +#: diff.c:5562

3489 msgid ""

3490 "look for differences that change the number of occurrences of the specified "

3491 "regex"

3492 msgstr ""

3493

3456 -#: diff.c:5536

3494 +#: diff.c:5565

3495 msgid "show all changes in the changeset with -S or -G"

3496 msgstr ""

3497

3460 -#: diff.c:5539

3498 +#: diff.c:5568

3499 msgid "treat <string> in -S as extended POSIX regular expression"

3500 msgstr ""

3501

3464 -#: diff.c:5542

3502 +#: diff.c:5571

3503 msgid "control the order in which files appear in the output"

3504 msgstr ""

3505

3468 -#: diff.c:5543

3506 +#: diff.c:5572

3507 msgid "<object-id>"

3508 msgstr ""

3509

3472 -#: diff.c:5544

3510 +#: diff.c:5573

3511 msgid ""

3512 "look for differences that change the number of occurrences of the specified "

3513 "object"

3514 msgstr ""

3515

3478 -#: diff.c:5546

3516 +#: diff.c:5575

3517 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"

3518 msgstr ""

3519

3482 -#: diff.c:5547

3520 +#: diff.c:5576

3521 msgid "select files by diff type"

3522 msgstr ""

3523

3486 -#: diff.c:5549

3524 +#: diff.c:5578

3525 msgid "<file>"

3526 msgstr ""

3527

3490 -#: diff.c:5550

3528 +#: diff.c:5579

3529 msgid "Output to a specific file"

3530 msgstr ""

3531

3494 -#: diff.c:6205

3532 +#: diff.c:6236

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

3534 msgstr ""

3535

3498 -#: diff.c:6208

3536 +#: diff.c:6239

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

3538 msgstr ""

3539

3502 -#: diff.c:6211

3540 +#: diff.c:6242

3541 #, c-format

3542 msgid ""

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

@@ -3514,59 +3552,59 @@ msgstr ""

3552 msgid "Performing inexact rename detection"

3553 msgstr ""

3554

3517 -#: dir.c:573

3555 +#: dir.c:578

3556 #, c-format

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

3558 msgstr ""

3559

3522 -#: dir.c:713 dir.c:742 dir.c:755

3560 +#: dir.c:718 dir.c:747 dir.c:760

3561 #, c-format

3562 msgid "unrecognized pattern: '%s'"

3563 msgstr ""

3564

3527 -#: dir.c:772 dir.c:786

3565 +#: dir.c:777 dir.c:791

3566 #, c-format

3567 msgid "unrecognized negative pattern: '%s'"

3568 msgstr ""

3569

3532 -#: dir.c:804

3570 +#: dir.c:809

3571 #, c-format

3572 msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"

3573 msgstr ""

3574

3537 -#: dir.c:814

3575 +#: dir.c:819

3576 msgid "disabling cone pattern matching"

3577 msgstr ""

3578

3541 -#: dir.c:1191

3579 +#: dir.c:1198

3580 #, c-format

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

3582 msgstr ""

3583

3546 -#: dir.c:2296

3584 +#: dir.c:2305

3585 #, c-format

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

3587 msgstr ""

3588

3551 -#: dir.c:2596

3589 +#: dir.c:2605

3590 msgid "failed to get kernel name and information"

3591 msgstr ""

3592

3555 -#: dir.c:2720

3593 +#: dir.c:2729

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

3595 msgstr ""

3596

3559 -#: dir.c:3502

3597 +#: dir.c:3520

3598 #, c-format

3599 msgid "index file corrupt in repo %s"

3600 msgstr ""

3601

3564 -#: dir.c:3547 dir.c:3552

3602 +#: dir.c:3565 dir.c:3570

3603 #, c-format

3604 msgid "could not create directories for %s"

3605 msgstr ""

3606

3569 -#: dir.c:3581

3607 +#: dir.c:3599

3608 #, c-format

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

3610 msgstr ""

@@ -3600,245 +3638,245 @@ msgstr ""

3638 msgid "too many args to run %s"

3639 msgstr ""

3640

3603 -#: fetch-pack.c:152

3641 +#: fetch-pack.c:176

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

3643 msgstr ""

3644

3607 -#: fetch-pack.c:155

3645 +#: fetch-pack.c:179

3646 msgid "git fetch-pack: expected a flush packet after shallow list"

3647 msgstr ""

3648

3611 -#: fetch-pack.c:166

3649 +#: fetch-pack.c:190

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

3651 msgstr ""

3652

3615 -#: fetch-pack.c:186

3653 +#: fetch-pack.c:210

3654 #, c-format

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

3656 msgstr ""

3657

3620 -#: fetch-pack.c:197

3658 +#: fetch-pack.c:221

3659 msgid "unable to write to remote"

3660 msgstr ""

3661

3624 -#: fetch-pack.c:259

3662 +#: fetch-pack.c:282

3663 msgid "--stateless-rpc requires multi_ack_detailed"

3664 msgstr ""

3665

3628 -#: fetch-pack.c:358 fetch-pack.c:1408

3666 +#: fetch-pack.c:375 fetch-pack.c:1397

3667 #, c-format

3668 msgid "invalid shallow line: %s"

3669 msgstr ""

3670

3633 -#: fetch-pack.c:364 fetch-pack.c:1414

3671 +#: fetch-pack.c:381 fetch-pack.c:1403

3672 #, c-format

3673 msgid "invalid unshallow line: %s"

3674 msgstr ""

3675

3638 -#: fetch-pack.c:366 fetch-pack.c:1416

3676 +#: fetch-pack.c:383 fetch-pack.c:1405

3677 #, c-format

3678 msgid "object not found: %s"

3679 msgstr ""

3680

3643 -#: fetch-pack.c:369 fetch-pack.c:1419

3681 +#: fetch-pack.c:386 fetch-pack.c:1408

3682 #, c-format

3683 msgid "error in object: %s"

3684 msgstr ""

3685

3648 -#: fetch-pack.c:371 fetch-pack.c:1421

3686 +#: fetch-pack.c:388 fetch-pack.c:1410

3687 #, c-format

3688 msgid "no shallow found: %s"

3689 msgstr ""

3690

3653 -#: fetch-pack.c:374 fetch-pack.c:1425

3691 +#: fetch-pack.c:391 fetch-pack.c:1414

3692 #, c-format

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

3694 msgstr ""

3695

3658 -#: fetch-pack.c:416

3696 +#: fetch-pack.c:431

3697 #, c-format

3698 msgid "got %s %d %s"

3699 msgstr ""

3700

3663 -#: fetch-pack.c:433

3701 +#: fetch-pack.c:448

3702 #, c-format

3703 msgid "invalid commit %s"

3704 msgstr ""

3705

3668 -#: fetch-pack.c:464

3706 +#: fetch-pack.c:479

3707 msgid "giving up"

3708 msgstr ""

3709

3672 -#: fetch-pack.c:477 progress.c:336

3710 +#: fetch-pack.c:492 progress.c:339

3711 msgid "done"

3712 msgstr ""

3713

3676 -#: fetch-pack.c:489

3714 +#: fetch-pack.c:504

3715 #, c-format

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

3717 msgstr ""

3718

3681 -#: fetch-pack.c:535

3719 +#: fetch-pack.c:540

3720 #, c-format

3721 msgid "Marking %s as complete"

3722 msgstr ""

3723

3686 -#: fetch-pack.c:756

3724 +#: fetch-pack.c:755

3725 #, c-format

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

3727 msgstr ""

3728

3691 -#: fetch-pack.c:821

3729 +#: fetch-pack.c:824

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

3731 msgstr ""

3732

3695 -#: fetch-pack.c:829

3733 +#: fetch-pack.c:832

3734 msgid "protocol error: bad pack header"

3735 msgstr ""

3736

3699 -#: fetch-pack.c:910

3737 +#: fetch-pack.c:916

3738 #, c-format

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

3740 msgstr ""

3741

3704 -#: fetch-pack.c:927

3742 +#: fetch-pack.c:933

3743 #, c-format

3744 msgid "%s failed"

3745 msgstr ""

3746

3709 -#: fetch-pack.c:929

3747 +#: fetch-pack.c:935

3748 msgid "error in sideband demultiplexer"

3749 msgstr ""

3750

3713 -#: fetch-pack.c:976

3751 +#: fetch-pack.c:978

3752 #, c-format

3753 msgid "Server version is %.*s"

3754 msgstr ""

3755

3718 -#: fetch-pack.c:981 fetch-pack.c:987 fetch-pack.c:990 fetch-pack.c:996

3719 -#: fetch-pack.c:1000 fetch-pack.c:1004 fetch-pack.c:1008 fetch-pack.c:1012

3720 -#: fetch-pack.c:1016 fetch-pack.c:1020 fetch-pack.c:1024 fetch-pack.c:1028

3721 -#: fetch-pack.c:1034 fetch-pack.c:1040 fetch-pack.c:1045 fetch-pack.c:1050

3756 +#: fetch-pack.c:983 fetch-pack.c:989 fetch-pack.c:992 fetch-pack.c:998

3757 +#: fetch-pack.c:1002 fetch-pack.c:1006 fetch-pack.c:1010 fetch-pack.c:1014

3758 +#: fetch-pack.c:1018 fetch-pack.c:1022 fetch-pack.c:1026 fetch-pack.c:1030

3759 +#: fetch-pack.c:1036 fetch-pack.c:1042 fetch-pack.c:1047 fetch-pack.c:1052

3760 #, c-format

3761 msgid "Server supports %s"

3762 msgstr ""

3763

3726 -#: fetch-pack.c:983

3764 +#: fetch-pack.c:985

3765 msgid "Server does not support shallow clients"

3766 msgstr ""

3767

3730 -#: fetch-pack.c:1043

3768 +#: fetch-pack.c:1045

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

3770 msgstr ""

3771

3734 -#: fetch-pack.c:1048

3772 +#: fetch-pack.c:1050

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

3774 msgstr ""

3775

3738 -#: fetch-pack.c:1052

3776 +#: fetch-pack.c:1054

3777 msgid "Server does not support --deepen"

3778 msgstr ""

3779

3742 -#: fetch-pack.c:1054

3780 +#: fetch-pack.c:1056

3781 msgid "Server does not support this repository's object format"

3782 msgstr ""

3783

3746 -#: fetch-pack.c:1071

3784 +#: fetch-pack.c:1069

3785 msgid "no common commits"

3786 msgstr ""

3787

3750 -#: fetch-pack.c:1083 fetch-pack.c:1639

3788 +#: fetch-pack.c:1081 fetch-pack.c:1619

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

3790 msgstr ""

3791

3754 -#: fetch-pack.c:1211

3792 +#: fetch-pack.c:1205

3793 #, c-format

3794 msgid "mismatched algorithms: client %s; server %s"

3795 msgstr ""

3796

3759 -#: fetch-pack.c:1215

3797 +#: fetch-pack.c:1209

3798 #, c-format

3799 msgid "the server does not support algorithm '%s'"

3800 msgstr ""

3801

3764 -#: fetch-pack.c:1235

3802 +#: fetch-pack.c:1229

3803 msgid "Server does not support shallow requests"

3804 msgstr ""

3805

3768 -#: fetch-pack.c:1242

3806 +#: fetch-pack.c:1236

3807 msgid "Server supports filter"

3808 msgstr ""

3809

3772 -#: fetch-pack.c:1286

3810 +#: fetch-pack.c:1275

3811 msgid "unable to write request to remote"

3812 msgstr ""

3813

3776 -#: fetch-pack.c:1304

3814 +#: fetch-pack.c:1293

3815 #, c-format

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

3817 msgstr ""

3818

3781 -#: fetch-pack.c:1310

3819 +#: fetch-pack.c:1299

3820 #, c-format

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

3822 msgstr ""

3823

3786 -#: fetch-pack.c:1371

3824 +#: fetch-pack.c:1360

3825 #, c-format

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

3827 msgstr ""

3828

3791 -#: fetch-pack.c:1376

3829 +#: fetch-pack.c:1365

3830 #, c-format

3831 msgid "error processing acks: %d"

3832 msgstr ""

3833

3796 -#: fetch-pack.c:1386

3834 +#: fetch-pack.c:1375

3835 msgid "expected packfile to be sent after 'ready'"

3836 msgstr ""

3837

3800 -#: fetch-pack.c:1388

3838 +#: fetch-pack.c:1377

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

3840 msgstr ""

3841

3804 -#: fetch-pack.c:1430

3842 +#: fetch-pack.c:1419

3843 #, c-format

3844 msgid "error processing shallow info: %d"

3845 msgstr ""

3846

3809 -#: fetch-pack.c:1477

3847 +#: fetch-pack.c:1466

3848 #, c-format

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

3850 msgstr ""

3851

3814 -#: fetch-pack.c:1482

3852 +#: fetch-pack.c:1471

3853 #, c-format

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

3855 msgstr ""

3856

3819 -#: fetch-pack.c:1487

3857 +#: fetch-pack.c:1476

3858 #, c-format

3859 msgid "error processing wanted refs: %d"

3860 msgstr ""

3861

3824 -#: fetch-pack.c:1517

3862 +#: fetch-pack.c:1506

3863 msgid "git fetch-pack: expected response end packet"

3864 msgstr ""

3865

3828 -#: fetch-pack.c:1921

3866 +#: fetch-pack.c:1887

3867 msgid "no matching remote head"

3868 msgstr ""

3869

3832 -#: fetch-pack.c:1944 builtin/clone.c:692

3870 +#: fetch-pack.c:1910 builtin/clone.c:692

3871 msgid "remote did not send all necessary objects"

3872 msgstr ""

3873

3836 -#: fetch-pack.c:1971

3874 +#: fetch-pack.c:1937

3875 #, c-format

3876 msgid "no such remote ref %s"

3877 msgstr ""

3878

3841 -#: fetch-pack.c:1974

3879 +#: fetch-pack.c:1940

3880 #, c-format

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

3882 msgstr ""

@@ -3954,7 +3992,7 @@ msgid "unsupported command listing type '%s'"

3992 msgstr ""

3993

3994 #: help.c:403

3957 -msgid "The common Git guides are:"

3995 +msgid "The Git concept guides are:"

3996 msgstr ""

3997

3998 #: help.c:427

@@ -4029,7 +4067,15 @@ msgid_plural ""

4067 msgstr[0] ""

4068 msgstr[1] ""

4069

4032 -#: ident.c:349

4070 +#: ident.c:353

4071 +msgid "Author identity unknown\n"

4072 +msgstr ""

4073 +

4074 +#: ident.c:356

4075 +msgid "Committer identity unknown\n"

4076 +msgstr ""

4077 +

4078 +#: ident.c:362

4079 msgid ""

4080 "\n"

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

@@ -4044,66 +4090,66 @@ msgid ""

4090 "\n"

4091 msgstr ""

4092

4047 -#: ident.c:379

4093 +#: ident.c:397

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

4095 msgstr ""

4096

4051 -#: ident.c:384

4097 +#: ident.c:402

4098 #, c-format

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

4100 msgstr ""

4101

4056 -#: ident.c:401

4102 +#: ident.c:419

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

4104 msgstr ""

4105

4060 -#: ident.c:407

4106 +#: ident.c:425

4107 #, c-format

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

4109 msgstr ""

4110

4065 -#: ident.c:415

4111 +#: ident.c:433

4112 #, c-format

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

4114 msgstr ""

4115

4070 -#: ident.c:421

4116 +#: ident.c:439

4117 #, c-format

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

4119 msgstr ""

4120

4075 -#: ident.c:436 builtin/commit.c:634

4121 +#: ident.c:454 builtin/commit.c:634

4122 #, c-format

4123 msgid "invalid date format: %s"

4124 msgstr ""

4125

4080 -#: list-objects-filter-options.c:58

4126 +#: list-objects-filter-options.c:81

4127 msgid "expected 'tree:<depth>'"

4128 msgstr ""

4129

4084 -#: list-objects-filter-options.c:73

4130 +#: list-objects-filter-options.c:96

4131 msgid "sparse:path filters support has been dropped"

4132 msgstr ""

4133

4088 -#: list-objects-filter-options.c:86

4134 +#: list-objects-filter-options.c:109

4135 #, c-format

4136 msgid "invalid filter-spec '%s'"

4137 msgstr ""

4138

4093 -#: list-objects-filter-options.c:102

4139 +#: list-objects-filter-options.c:125

4140 #, c-format

4141 msgid "must escape char in sub-filter-spec: '%c'"

4142 msgstr ""

4143

4098 -#: list-objects-filter-options.c:144

4144 +#: list-objects-filter-options.c:167

4145 msgid "expected something after combine:"

4146 msgstr ""

4147

4102 -#: list-objects-filter-options.c:226

4148 +#: list-objects-filter-options.c:249

4149 msgid "multiple filter-specs cannot be combined"

4150 msgstr ""

4151

4106 -#: list-objects-filter-options.c:330

4152 +#: list-objects-filter-options.c:361

4153 msgid "unable to upgrade repository format to support partial clone"

4154 msgstr ""

4155

@@ -4429,7 +4475,7 @@ msgstr ""

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

4476 msgstr ""

4477

4432 -#: merge-recursive.c:3101 git-submodule.sh:959

4478 +#: merge-recursive.c:3101

4479 msgid "submodule"

4480 msgstr ""

4481

@@ -4508,34 +4554,34 @@ msgstr ""

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

4555 msgstr ""

4556

4511 -#: merge-recursive.c:3549

4557 +#: merge-recursive.c:3550

4558 msgid "Merging:"

4559 msgstr ""

4560

4515 -#: merge-recursive.c:3562

4561 +#: merge-recursive.c:3563

4562 #, c-format

4563 msgid "found %u common ancestor:"

4564 msgid_plural "found %u common ancestors:"

4565 msgstr[0] ""

4566 msgstr[1] ""

4567

4522 -#: merge-recursive.c:3612

4568 +#: merge-recursive.c:3613

4569 msgid "merge returned no commit"

4570 msgstr ""

4571

4526 -#: merge-recursive.c:3671

4572 +#: merge-recursive.c:3672

4573 #, c-format

4574 msgid ""

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

4576 " %s"

4577 msgstr ""

4578

4533 -#: merge-recursive.c:3768

4579 +#: merge-recursive.c:3769

4580 #, c-format

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

4582 msgstr ""

4583

4538 -#: merge-recursive.c:3786 builtin/merge.c:705 builtin/merge.c:885

4584 +#: merge-recursive.c:3787 builtin/merge.c:702 builtin/merge.c:881

4585 msgid "Unable to write index."

4586 msgstr ""

4587

@@ -4543,170 +4589,174 @@ msgstr ""

4589 msgid "failed to read the cache"

4590 msgstr ""

4591

4546 -#: merge.c:108 rerere.c:720 builtin/am.c:1878 builtin/am.c:1912

4547 -#: builtin/checkout.c:559 builtin/checkout.c:822 builtin/clone.c:816

4592 +#: merge.c:109 rerere.c:720 builtin/am.c:1896 builtin/am.c:1930

4593 +#: builtin/checkout.c:560 builtin/checkout.c:816 builtin/clone.c:816

4594 #: builtin/stash.c:265

4595 msgid "unable to write new index file"

4596 msgstr ""

4597

4552 -#: midx.c:68

4598 +#: midx.c:79

4599 #, c-format

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

4601 msgstr ""

4602

4557 -#: midx.c:84

4603 +#: midx.c:95

4604 #, c-format

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

4606 msgstr ""

4607

4562 -#: midx.c:89

4608 +#: midx.c:100

4609 #, c-format

4610 msgid "multi-pack-index version %d not recognized"

4611 msgstr ""

4612

4567 -#: midx.c:94

4613 +#: midx.c:105

4614 #, c-format

4569 -msgid "hash version %u does not match"

4615 +msgid "multi-pack-index hash version %u does not match version %u"

4616 msgstr ""

4617

4572 -#: midx.c:108

4618 +#: midx.c:122

4619 msgid "invalid chunk offset (too large)"

4620 msgstr ""

4621

4576 -#: midx.c:132

4622 +#: midx.c:146

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

4624 msgstr ""

4625

4580 -#: midx.c:145

4626 +#: midx.c:159

4627 msgid "multi-pack-index missing required pack-name chunk"

4628 msgstr ""

4629

4584 -#: midx.c:147

4630 +#: midx.c:161

4631 msgid "multi-pack-index missing required OID fanout chunk"

4632 msgstr ""

4633

4588 -#: midx.c:149

4634 +#: midx.c:163

4635 msgid "multi-pack-index missing required OID lookup chunk"

4636 msgstr ""

4637

4592 -#: midx.c:151

4638 +#: midx.c:165

4639 msgid "multi-pack-index missing required object offsets chunk"

4640 msgstr ""

4641

4596 -#: midx.c:165

4642 +#: midx.c:179

4643 #, c-format

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

4645 msgstr ""

4646

4601 -#: midx.c:208

4647 +#: midx.c:222

4648 #, c-format

4649 msgid "bad pack-int-id: %u (%u total packs)"

4650 msgstr ""

4651

4606 -#: midx.c:258

4652 +#: midx.c:272

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

4654 msgstr ""

4655

4610 -#: midx.c:286

4656 +#: midx.c:300

4657 msgid "error preparing packfile from multi-pack-index"

4658 msgstr ""

4659

4614 -#: midx.c:470

4660 +#: midx.c:485

4661 #, c-format

4662 msgid "failed to add packfile '%s'"

4663 msgstr ""

4664

4619 -#: midx.c:476

4665 +#: midx.c:491

4666 #, c-format

4667 msgid "failed to open pack-index '%s'"

4668 msgstr ""

4669

4624 -#: midx.c:536

4670 +#: midx.c:551

4671 #, c-format

4672 msgid "failed to locate object %d in packfile"

4673 msgstr ""

4674

4629 -#: midx.c:840

4675 +#: midx.c:853

4676 msgid "Adding packfiles to multi-pack-index"

4677 msgstr ""

4678

4633 -#: midx.c:873

4679 +#: midx.c:886

4680 #, c-format

4681 msgid "did not see pack-file %s to drop"

4682 msgstr ""

4683

4638 -#: midx.c:925

4684 +#: midx.c:938

4685 msgid "no pack files to index."

4686 msgstr ""

4687

4642 -#: midx.c:977

4688 +#: midx.c:990

4689 msgid "Writing chunks to multi-pack-index"

4690 msgstr ""

4691

4646 -#: midx.c:1056

4692 +#: midx.c:1068

4693 #, c-format

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

4695 msgstr ""

4696

4651 -#: midx.c:1112

4697 +#: midx.c:1124

4698 +msgid "multi-pack-index file exists, but failed to parse"

4699 +msgstr ""

4700 +

4701 +#: midx.c:1132

4702 msgid "Looking for referenced packfiles"

4703 msgstr ""

4704

4655 -#: midx.c:1127

4705 +#: midx.c:1147

4706 #, c-format

4707 msgid ""

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

4709 msgstr ""

4710

4661 -#: midx.c:1132

4711 +#: midx.c:1152

4712 msgid "the midx contains no oid"

4713 msgstr ""

4714

4665 -#: midx.c:1141

4715 +#: midx.c:1161

4716 msgid "Verifying OID order in multi-pack-index"

4717 msgstr ""

4718

4669 -#: midx.c:1150

4719 +#: midx.c:1170

4720 #, c-format

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

4722 msgstr ""

4723

4674 -#: midx.c:1170

4724 +#: midx.c:1190

4725 msgid "Sorting objects by packfile"

4726 msgstr ""

4727

4678 -#: midx.c:1177

4728 +#: midx.c:1197

4729 msgid "Verifying object offsets"

4730 msgstr ""

4731

4682 -#: midx.c:1193

4732 +#: midx.c:1213

4733 #, c-format

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

4735 msgstr ""

4736

4687 -#: midx.c:1199

4737 +#: midx.c:1219

4738 #, c-format

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

4740 msgstr ""

4741

4692 -#: midx.c:1208

4742 +#: midx.c:1228

4743 #, c-format

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

4745 msgstr ""

4746

4697 -#: midx.c:1233

4747 +#: midx.c:1253

4748 msgid "Counting referenced objects"

4749 msgstr ""

4750

4701 -#: midx.c:1243

4751 +#: midx.c:1263

4752 msgid "Finding and deleting unreferenced packfiles"

4753 msgstr ""

4754

4705 -#: midx.c:1433

4755 +#: midx.c:1454

4756 msgid "could not start pack-objects"

4757 msgstr ""

4758

4709 -#: midx.c:1452

4759 +#: midx.c:1474

4760 msgid "could not finish pack-objects"

4761 msgstr ""

4762

@@ -4786,7 +4836,7 @@ msgstr ""

4836 msgid "hash mismatch %s"

4837 msgstr ""

4838

4789 -#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2184

4839 +#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2216

4840 #, c-format

4841 msgid "unable to get size of %s"

4842 msgstr ""

@@ -4795,12 +4845,12 @@ msgstr ""

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

4846 msgstr ""

4847

4798 -#: packfile.c:1900

4848 +#: packfile.c:1922

4849 #, c-format

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

4851 msgstr ""

4852

4803 -#: packfile.c:1904

4853 +#: packfile.c:1926

4854 #, c-format

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

4856 msgstr ""

@@ -4820,7 +4870,7 @@ msgstr ""

4870 msgid "option `%s' expects \"always\", \"auto\", or \"never\""

4871 msgstr ""

4872

4823 -#: parse-options-cb.c:130 parse-options-cb.c:147

4873 +#: parse-options-cb.c:132 parse-options-cb.c:149

4874 #, c-format

4875 msgid "malformed object name '%s'"

4876 msgstr ""

@@ -4865,31 +4915,31 @@ msgstr ""

4915 msgid "did you mean `--%s` (with two dashes)?"

4916 msgstr ""

4917

4868 -#: parse-options.c:663 parse-options.c:963

4918 +#: parse-options.c:666 parse-options.c:971

4919 #, c-format

4920 msgid "alias of --%s"

4921 msgstr ""

4922

4873 -#: parse-options.c:854

4923 +#: parse-options.c:862

4924 #, c-format

4925 msgid "unknown option `%s'"

4926 msgstr ""

4927

4878 -#: parse-options.c:856

4928 +#: parse-options.c:864

4929 #, c-format

4930 msgid "unknown switch `%c'"

4931 msgstr ""

4932

4883 -#: parse-options.c:858

4933 +#: parse-options.c:866

4934 #, c-format

4935 msgid "unknown non-ascii option in string: `%s'"

4936 msgstr ""

4937

4888 -#: parse-options.c:882

4938 +#: parse-options.c:890

4939 msgid "..."

4940 msgstr ""

4941

4892 -#: parse-options.c:901

4942 +#: parse-options.c:909

4943 #, c-format

4944 msgid "usage: %s"

4945 msgstr ""

@@ -4897,17 +4947,17 @@ msgstr ""

4947 #. TRANSLATORS: the colon here should align with the

4948 #. one in "usage: %s" translation.

4949 #.

4900 -#: parse-options.c:907

4950 +#: parse-options.c:915

4951 #, c-format

4952 msgid " or: %s"

4953 msgstr ""

4954

4905 -#: parse-options.c:910

4955 +#: parse-options.c:918

4956 #, c-format

4957 msgid " %s"

4958 msgstr ""

4959

4910 -#: parse-options.c:949

4960 +#: parse-options.c:957

4961 msgid "-NUM"

4962 msgstr ""

4963

@@ -5042,7 +5092,7 @@ msgstr ""

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

5093 msgstr ""

5094

5045 -#: pkt-line.c:373

5095 +#: pkt-line.c:373 sideband.c:150

5096 #, c-format

5097 msgid "remote error: %s"

5098 msgstr ""

@@ -5056,15 +5106,23 @@ msgstr ""

5106 msgid "unable to create threaded lstat: %s"

5107 msgstr ""

5108

5059 -#: pretty.c:982

5109 +#: pretty.c:983

5110 msgid "unable to parse --pretty format"

5111 msgstr ""

5112

5063 -#: promisor-remote.c:23

5064 -msgid "Remote with no URL"

5113 +#: promisor-remote.c:30

5114 +msgid "promisor-remote: unable to fork off fetch subprocess"

5115 +msgstr ""

5116 +

5117 +#: promisor-remote.c:35 promisor-remote.c:37

5118 +msgid "promisor-remote: could not write to fetch subprocess"

5119 msgstr ""

5120

5067 -#: promisor-remote.c:58

5121 +#: promisor-remote.c:41

5122 +msgid "promisor-remote: could not close stdin to fetch subprocess"

5123 +msgstr ""

5124 +

5125 +#: promisor-remote.c:53

5126 #, c-format

5127 msgid "promisor remote name cannot begin with '/': %s"

5128 msgstr ""

@@ -5081,7 +5139,7 @@ msgstr ""

5139 msgid "could not read `log` output"

5140 msgstr ""

5141

5084 -#: range-diff.c:98 sequencer.c:5143

5142 +#: range-diff.c:98 sequencer.c:5283

5143 #, c-format

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

5145 msgstr ""

@@ -5107,196 +5165,196 @@ msgstr ""

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

5166 msgstr ""

5167

5110 -#: read-cache.c:680

5168 +#: read-cache.c:682

5169 #, c-format

5170 msgid "will not add file alias '%s' ('%s' already exists in index)"

5171 msgstr ""

5172

5115 -#: read-cache.c:696

5173 +#: read-cache.c:698

5174 msgid "cannot create an empty blob in the object database"

5175 msgstr ""

5176

5119 -#: read-cache.c:718

5177 +#: read-cache.c:720

5178 #, c-format

5179 msgid "%s: can only add regular files, symbolic links or git-directories"

5180 msgstr ""

5181

5124 -#: read-cache.c:723

5182 +#: read-cache.c:725

5183 #, c-format

5184 msgid "'%s' does not have a commit checked out"

5185 msgstr ""

5186

5129 -#: read-cache.c:775

5187 +#: read-cache.c:777

5188 #, c-format

5189 msgid "unable to index file '%s'"

5190 msgstr ""

5191

5134 -#: read-cache.c:794

5192 +#: read-cache.c:796

5193 #, c-format

5194 msgid "unable to add '%s' to index"

5195 msgstr ""

5196

5139 -#: read-cache.c:805

5197 +#: read-cache.c:807

5198 #, c-format

5199 msgid "unable to stat '%s'"

5200 msgstr ""

5201

5144 -#: read-cache.c:1330

5202 +#: read-cache.c:1318

5203 #, c-format

5204 msgid "'%s' appears as both a file and as a directory"

5205 msgstr ""

5206

5149 -#: read-cache.c:1536

5207 +#: read-cache.c:1524

5208 msgid "Refresh index"

5209 msgstr ""

5210

5153 -#: read-cache.c:1651

5211 +#: read-cache.c:1639

5212 #, c-format

5213 msgid ""

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

5215 "Using version %i"

5216 msgstr ""

5217

5160 -#: read-cache.c:1661

5218 +#: read-cache.c:1649

5219 #, c-format

5220 msgid ""

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

5222 "Using version %i"

5223 msgstr ""

5224

5167 -#: read-cache.c:1717

5225 +#: read-cache.c:1705

5226 #, c-format

5227 msgid "bad signature 0x%08x"

5228 msgstr ""

5229

5172 -#: read-cache.c:1720

5230 +#: read-cache.c:1708

5231 #, c-format

5232 msgid "bad index version %d"

5233 msgstr ""

5234

5177 -#: read-cache.c:1729

5235 +#: read-cache.c:1717

5236 msgid "bad index file sha1 signature"

5237 msgstr ""

5238

5181 -#: read-cache.c:1759

5239 +#: read-cache.c:1747

5240 #, c-format

5241 msgid "index uses %.4s extension, which we do not understand"

5242 msgstr ""

5243

5186 -#: read-cache.c:1761

5244 +#: read-cache.c:1749

5245 #, c-format

5246 msgid "ignoring %.4s extension"

5247 msgstr ""

5248

5191 -#: read-cache.c:1798

5249 +#: read-cache.c:1786

5250 #, c-format

5251 msgid "unknown index entry format 0x%08x"

5252 msgstr ""

5253

5196 -#: read-cache.c:1814

5254 +#: read-cache.c:1802

5255 #, c-format

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

5257 msgstr ""

5258

5201 -#: read-cache.c:1871

5259 +#: read-cache.c:1859

5260 msgid "unordered stage entries in index"

5261 msgstr ""

5262

5205 -#: read-cache.c:1874

5263 +#: read-cache.c:1862

5264 #, c-format

5265 msgid "multiple stage entries for merged file '%s'"

5266 msgstr ""

5267

5210 -#: read-cache.c:1877

5268 +#: read-cache.c:1865

5269 #, c-format

5270 msgid "unordered stage entries for '%s'"

5271 msgstr ""

5272

5215 -#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111

5216 -#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181

5217 -#: builtin/checkout.c:488 builtin/checkout.c:674 builtin/clean.c:991

5273 +#: read-cache.c:1971 read-cache.c:2262 rerere.c:565 rerere.c:599 rerere.c:1111

5274 +#: submodule.c:1628 builtin/add.c:538 builtin/check-ignore.c:181

5275 +#: builtin/checkout.c:489 builtin/checkout.c:675 builtin/clean.c:991

5276 #: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507

5219 -#: builtin/mv.c:145 builtin/reset.c:247 builtin/rm.c:290

5277 +#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290

5278 #: builtin/submodule--helper.c:332

5279 msgid "index file corrupt"

5280 msgstr ""

5281

5224 -#: read-cache.c:2124

5282 +#: read-cache.c:2115

5283 #, c-format

5284 msgid "unable to create load_cache_entries thread: %s"

5285 msgstr ""

5286

5229 -#: read-cache.c:2137

5287 +#: read-cache.c:2128

5288 #, c-format

5289 msgid "unable to join load_cache_entries thread: %s"

5290 msgstr ""

5291

5234 -#: read-cache.c:2170

5292 +#: read-cache.c:2161

5293 #, c-format

5294 msgid "%s: index file open failed"

5295 msgstr ""

5296

5239 -#: read-cache.c:2174

5297 +#: read-cache.c:2165

5298 #, c-format

5299 msgid "%s: cannot stat the open index"

5300 msgstr ""

5301

5244 -#: read-cache.c:2178

5302 +#: read-cache.c:2169

5303 #, c-format

5304 msgid "%s: index file smaller than expected"

5305 msgstr ""

5306

5249 -#: read-cache.c:2182

5307 +#: read-cache.c:2173

5308 #, c-format

5309 msgid "%s: unable to map index file"

5310 msgstr ""

5311

5254 -#: read-cache.c:2224

5312 +#: read-cache.c:2215

5313 #, c-format

5314 msgid "unable to create load_index_extensions thread: %s"

5315 msgstr ""

5316

5259 -#: read-cache.c:2251

5317 +#: read-cache.c:2242

5318 #, c-format

5319 msgid "unable to join load_index_extensions thread: %s"

5320 msgstr ""

5321

5264 -#: read-cache.c:2283

5322 +#: read-cache.c:2274

5323 #, c-format

5324 msgid "could not freshen shared index '%s'"

5325 msgstr ""

5326

5269 -#: read-cache.c:2330

5327 +#: read-cache.c:2321

5328 #, c-format

5329 msgid "broken index, expect %s in %s, got %s"

5330 msgstr ""

5331

5274 -#: read-cache.c:3026 strbuf.c:1171 wrapper.c:630 builtin/merge.c:1130

5332 +#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1126

5333 #, c-format

5334 msgid "could not close '%s'"

5335 msgstr ""

5336

5279 -#: read-cache.c:3129 sequencer.c:2355 sequencer.c:4066

5337 +#: read-cache.c:3120 sequencer.c:2446 sequencer.c:4185

5338 #, c-format

5339 msgid "could not stat '%s'"

5340 msgstr ""

5341

5284 -#: read-cache.c:3142

5342 +#: read-cache.c:3133

5343 #, c-format

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

5345 msgstr ""

5346

5289 -#: read-cache.c:3154

5347 +#: read-cache.c:3145

5348 #, c-format

5349 msgid "unable to unlink: %s"

5350 msgstr ""

5351

5294 -#: read-cache.c:3179

5352 +#: read-cache.c:3170

5353 #, c-format

5354 msgid "cannot fix permission bits on '%s'"

5355 msgstr ""

5356

5299 -#: read-cache.c:3328

5357 +#: read-cache.c:3319

5358 #, c-format

5359 msgid "%s: cannot drop to stage #0"

5360 msgstr ""

@@ -5343,19 +5401,19 @@ msgid_plural "Rebase %s onto %s (%d commands)"

5401 msgstr[0] ""

5402 msgstr[1] ""

5403

5346 -#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228

5404 +#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218

5405 msgid ""

5406 "\n"

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

5408 msgstr ""

5409

5352 -#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232

5410 +#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222

5411 msgid ""

5412 "\n"

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

5414 msgstr ""

5415

5358 -#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871

5416 +#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861

5417 msgid ""

5418 "\n"

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

@@ -5364,21 +5422,21 @@ msgid ""

5422 "\n"

5423 msgstr ""

5424

5367 -#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948

5425 +#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:938

5426 msgid ""

5427 "\n"

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

5429 "\n"

5430 msgstr ""

5431

5374 -#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3463

5375 -#: sequencer.c:3489 sequencer.c:5248 builtin/fsck.c:347 builtin/rebase.c:258

5432 +#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3571

5433 +#: sequencer.c:3597 sequencer.c:5389 builtin/fsck.c:347 builtin/rebase.c:264

5434 #, c-format

5435 msgid "could not write '%s'"

5436 msgstr ""

5437

5380 -#: rebase-interactive.c:116 builtin/rebase.c:190 builtin/rebase.c:216

5381 -#: builtin/rebase.c:240

5438 +#: rebase-interactive.c:116 builtin/rebase.c:196 builtin/rebase.c:222

5439 +#: builtin/rebase.c:246

5440 #, c-format

5441 msgid "could not write '%s'."

5442 msgstr ""

@@ -5401,14 +5459,14 @@ msgid ""

5459 "\n"

5460 msgstr ""

5461

5404 -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2274

5405 -#: builtin/rebase.c:176 builtin/rebase.c:201 builtin/rebase.c:227

5406 -#: builtin/rebase.c:252

5462 +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2361

5463 +#: builtin/rebase.c:182 builtin/rebase.c:207 builtin/rebase.c:233

5464 +#: builtin/rebase.c:258

5465 #, c-format

5466 msgid "could not read '%s'."

5467 msgstr ""

5468

5411 -#: ref-filter.c:42 wt-status.c:1977

5469 +#: ref-filter.c:42 wt-status.c:1973

5470 msgid "gone"

5471 msgstr ""

5472

@@ -5427,237 +5485,232 @@ msgstr ""

5485 msgid "ahead %d, behind %d"

5486 msgstr ""

5487

5430 -#: ref-filter.c:165

5488 +#: ref-filter.c:169

5489 #, c-format

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

5491 msgstr ""

5492

5435 -#: ref-filter.c:167

5493 +#: ref-filter.c:171

5494 #, c-format

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

5496 msgstr ""

5497

5440 -#: ref-filter.c:189

5498 +#: ref-filter.c:193

5499 #, c-format

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

5501 msgstr ""

5502

5445 -#: ref-filter.c:193

5503 +#: ref-filter.c:197

5504 #, c-format

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

5506 msgstr ""

5507

5450 -#: ref-filter.c:195

5508 +#: ref-filter.c:199

5509 #, c-format

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

5511 msgstr ""

5512

5455 -#: ref-filter.c:250

5513 +#: ref-filter.c:254

5514 #, c-format

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

5516 msgstr ""

5517

5460 -#: ref-filter.c:272

5518 +#: ref-filter.c:276

5519 #, c-format

5520 msgid "unrecognized %%(objectsize) argument: %s"

5521 msgstr ""

5522

5465 -#: ref-filter.c:280

5523 +#: ref-filter.c:284

5524 #, c-format

5525 msgid "%%(deltabase) does not take arguments"

5526 msgstr ""

5527

5470 -#: ref-filter.c:292

5528 +#: ref-filter.c:296

5529 #, c-format

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

5531 msgstr ""

5532

5475 -#: ref-filter.c:301

5533 +#: ref-filter.c:309

5534 #, c-format

5477 -msgid "%%(subject) does not take arguments"

5535 +msgid "unrecognized %%(subject) argument: %s"

5536 msgstr ""

5537

5480 -#: ref-filter.c:323

5538 +#: ref-filter.c:330

5539 #, c-format

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

5541 msgstr ""

5542

5485 -#: ref-filter.c:352

5543 +#: ref-filter.c:363

5544 #, c-format

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

5546 msgstr ""

5547

5490 -#: ref-filter.c:354

5548 +#: ref-filter.c:365

5549 #, c-format

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

5551 msgstr ""

5552

5495 -#: ref-filter.c:369

5553 +#: ref-filter.c:380

5554 +#, c-format

5555 +msgid "positive value expected '%s' in %%(%s)"

5556 +msgstr ""

5557 +

5558 +#: ref-filter.c:384

5559 #, c-format

5497 -msgid "positive value expected objectname:short=%s"

5560 +msgid "unrecognized argument '%s' in %%(%s)"

5561 msgstr ""

5562

5500 -#: ref-filter.c:373

5563 +#: ref-filter.c:398

5564 #, c-format

5502 -msgid "unrecognized %%(objectname) argument: %s"

5565 +msgid "unrecognized email option: %s"

5566 msgstr ""

5567

5505 -#: ref-filter.c:403

5568 +#: ref-filter.c:428

5569 #, c-format

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

5571 msgstr ""

5572

5510 -#: ref-filter.c:415

5573 +#: ref-filter.c:440

5574 #, c-format

5575 msgid "unrecognized position:%s"

5576 msgstr ""

5577

5515 -#: ref-filter.c:422

5578 +#: ref-filter.c:447

5579 #, c-format

5580 msgid "unrecognized width:%s"

5581 msgstr ""

5582

5520 -#: ref-filter.c:431

5583 +#: ref-filter.c:456

5584 #, c-format

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

5586 msgstr ""

5587

5525 -#: ref-filter.c:439

5588 +#: ref-filter.c:464

5589 #, c-format

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

5591 msgstr ""

5592

5530 -#: ref-filter.c:457

5593 +#: ref-filter.c:482

5594 #, c-format

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

5596 msgstr ""

5597

5535 -#: ref-filter.c:559

5598 +#: ref-filter.c:584

5599 #, c-format

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

5601 msgstr ""

5602

5540 -#: ref-filter.c:586

5603 +#: ref-filter.c:611

5604 #, c-format

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

5606 msgstr ""

5607

5545 -#: ref-filter.c:590

5608 +#: ref-filter.c:615

5609 #, c-format

5610 msgid ""

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

5612 msgstr ""

5613

5551 -#: ref-filter.c:714

5614 +#: ref-filter.c:739

5615 #, c-format

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

5617 msgstr ""

5618

5556 -#: ref-filter.c:777

5619 +#: ref-filter.c:802

5620 #, c-format

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

5622 msgstr ""

5623

5561 -#: ref-filter.c:779

5624 +#: ref-filter.c:804

5625 #, c-format

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

5627 msgstr ""

5628

5566 -#: ref-filter.c:781

5629 +#: ref-filter.c:806

5630 #, c-format

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

5632 msgstr ""

5633

5571 -#: ref-filter.c:809

5634 +#: ref-filter.c:834

5635 #, c-format

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

5637 msgstr ""

5638

5576 -#: ref-filter.c:811

5639 +#: ref-filter.c:836

5640 #, c-format

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

5642 msgstr ""

5643

5581 -#: ref-filter.c:813

5644 +#: ref-filter.c:838

5645 #, c-format

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

5647 msgstr ""

5648

5586 -#: ref-filter.c:828

5649 +#: ref-filter.c:853

5650 #, c-format

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

5652 msgstr ""

5653

5591 -#: ref-filter.c:885

5654 +#: ref-filter.c:910

5655 #, c-format

5656 msgid "malformed format string %s"

5657 msgstr ""

5658

5596 -#: ref-filter.c:1486

5659 +#: ref-filter.c:1541

5660 #, c-format

5661 msgid "no branch, rebasing %s"

5662 msgstr ""

5663

5601 -#: ref-filter.c:1489

5664 +#: ref-filter.c:1544

5665 #, c-format

5666 msgid "no branch, rebasing detached HEAD %s"

5667 msgstr ""

5668

5606 -#: ref-filter.c:1492

5669 +#: ref-filter.c:1547

5670 #, c-format

5671 msgid "no branch, bisect started on %s"

5672 msgstr ""

5673

5611 -#: ref-filter.c:1502

5674 +#: ref-filter.c:1557

5675 msgid "no branch"

5676 msgstr ""

5677

5615 -#: ref-filter.c:1538 ref-filter.c:1747

5678 +#: ref-filter.c:1591 ref-filter.c:1800

5679 #, c-format

5680 msgid "missing object %s for %s"

5681 msgstr ""

5682

5620 -#: ref-filter.c:1548

5683 +#: ref-filter.c:1601

5684 #, c-format

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

5686 msgstr ""

5687

5625 -#: ref-filter.c:2001

5688 +#: ref-filter.c:2054

5689 #, c-format

5690 msgid "malformed object at '%s'"

5691 msgstr ""

5692

5630 -#: ref-filter.c:2090

5693 +#: ref-filter.c:2143

5694 #, c-format

5695 msgid "ignoring ref with broken name %s"

5696 msgstr ""

5697

5635 -#: ref-filter.c:2095 refs.c:657

5698 +#: ref-filter.c:2148 refs.c:657

5699 #, c-format

5700 msgid "ignoring broken ref %s"

5701 msgstr ""

5702

5640 -#: ref-filter.c:2395

5703 +#: ref-filter.c:2464

5704 #, c-format

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

5706 msgstr ""

5707

5645 -#: ref-filter.c:2495

5646 -#, c-format

5647 -msgid "option `%s' is incompatible with --merged"

5648 -msgstr ""

5649 -

5650 -#: ref-filter.c:2498

5651 -#, c-format

5652 -msgid "option `%s' is incompatible with --no-merged"

5653 -msgstr ""

5654 -

5655 -#: ref-filter.c:2508

5708 +#: ref-filter.c:2563

5709 #, c-format

5710 msgid "malformed object name %s"

5711 msgstr ""

5712

5660 -#: ref-filter.c:2513

5713 +#: ref-filter.c:2568

5714 #, c-format

5715 msgid "option `%s' must point to a commit"

5716 msgstr ""

@@ -5682,157 +5735,119 @@ msgstr ""

5735 msgid "ignoring dangling symref %s"

5736 msgstr ""

5737

5685 -#: refs.c:792

5686 -#, c-format

5687 -msgid "could not open '%s' for writing: %s"

5688 -msgstr ""

5689 -

5690 -#: refs.c:802 refs.c:853

5691 -#, c-format

5692 -msgid "could not read ref '%s'"

5693 -msgstr ""

5694 -

5695 -#: refs.c:808

5696 -#, c-format

5697 -msgid "ref '%s' already exists"

5698 -msgstr ""

5699 -

5700 -#: refs.c:813

5701 -#, c-format

5702 -msgid "unexpected object ID when writing '%s'"

5703 -msgstr ""

5704 -

5705 -#: refs.c:821 sequencer.c:408 sequencer.c:2721 sequencer.c:2925

5706 -#: sequencer.c:2939 sequencer.c:3195 sequencer.c:5159 strbuf.c:1168

5707 -#: wrapper.c:628

5708 -#, c-format

5709 -msgid "could not write to '%s'"

5710 -msgstr ""

5711 -

5712 -#: refs.c:848 strbuf.c:1166 wrapper.c:196 wrapper.c:366 builtin/am.c:719

5713 -#: builtin/rebase.c:852

5714 -#, c-format

5715 -msgid "could not open '%s' for writing"

5716 -msgstr ""

5717 -

5718 -#: refs.c:855

5719 -#, c-format

5720 -msgid "unexpected object ID when deleting '%s'"

5721 -msgstr ""

5722 -

5723 -#: refs.c:986

5738 +#: refs.c:892

5739 #, c-format

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

5741 msgstr ""

5742

5728 -#: refs.c:992

5743 +#: refs.c:898

5744 #, c-format

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

5746 msgstr ""

5747

5733 -#: refs.c:1051

5748 +#: refs.c:957

5749 #, c-format

5750 msgid "log for %s is empty"

5751 msgstr ""

5752

5738 -#: refs.c:1143

5753 +#: refs.c:1049

5754 #, c-format

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

5756 msgstr ""

5757

5743 -#: refs.c:1219

5758 +#: refs.c:1120

5759 #, c-format

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

5761 msgstr ""

5762

5748 -#: refs.c:2011

5763 +#: refs.c:1944

5764 #, c-format

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

5766 msgstr ""

5767

5753 -#: refs.c:2098

5768 +#: refs.c:2024

5769 msgid "ref updates forbidden inside quarantine environment"

5770 msgstr ""

5771

5757 -#: refs.c:2109

5772 +#: refs.c:2035

5773 msgid "ref updates aborted by hook"

5774 msgstr ""

5775

5761 -#: refs.c:2209 refs.c:2239

5776 +#: refs.c:2135 refs.c:2165

5777 #, c-format

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

5779 msgstr ""

5780

5766 -#: refs.c:2215 refs.c:2250

5781 +#: refs.c:2141 refs.c:2176

5782 #, c-format

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

5784 msgstr ""

5785

5771 -#: refs/files-backend.c:1233

5786 +#: refs/files-backend.c:1228

5787 #, c-format

5788 msgid "could not remove reference %s"

5789 msgstr ""

5790

5776 -#: refs/files-backend.c:1247 refs/packed-backend.c:1541

5777 -#: refs/packed-backend.c:1551

5791 +#: refs/files-backend.c:1242 refs/packed-backend.c:1542

5792 +#: refs/packed-backend.c:1552

5793 #, c-format

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

5795 msgstr ""

5796

5782 -#: refs/files-backend.c:1250 refs/packed-backend.c:1554

5797 +#: refs/files-backend.c:1245 refs/packed-backend.c:1555

5798 #, c-format

5799 msgid "could not delete references: %s"

5800 msgstr ""

5801

5787 -#: refspec.c:137

5802 +#: refspec.c:167

5803 #, c-format

5804 msgid "invalid refspec '%s'"

5805 msgstr ""

5806

5792 -#: remote.c:355

5807 +#: remote.c:351

5808 #, c-format

5809 msgid "config remote shorthand cannot begin with '/': %s"

5810 msgstr ""

5811

5797 -#: remote.c:403

5812 +#: remote.c:399

5813 msgid "more than one receivepack given, using the first"

5814 msgstr ""

5815

5801 -#: remote.c:411

5816 +#: remote.c:407

5817 msgid "more than one uploadpack given, using the first"

5818 msgstr ""

5819

5805 -#: remote.c:594

5820 +#: remote.c:590

5821 #, c-format

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

5823 msgstr ""

5824

5810 -#: remote.c:598

5825 +#: remote.c:594

5826 #, c-format

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

5828 msgstr ""

5829

5815 -#: remote.c:602

5830 +#: remote.c:598

5831 #, c-format

5832 msgid "%s tracks both %s and %s"

5833 msgstr ""

5834

5820 -#: remote.c:670

5835 +#: remote.c:666

5836 #, c-format

5837 msgid "key '%s' of pattern had no '*'"

5838 msgstr ""

5839

5825 -#: remote.c:680

5840 +#: remote.c:676

5841 #, c-format

5842 msgid "value '%s' of pattern has no '*'"

5843 msgstr ""

5844

5830 -#: remote.c:986

5845 +#: remote.c:1073

5846 #, c-format

5847 msgid "src refspec %s does not match any"

5848 msgstr ""

5849

5835 -#: remote.c:991

5850 +#: remote.c:1078

5851 #, c-format

5852 msgid "src refspec %s matches more than one"

5853 msgstr ""

@@ -5841,7 +5856,7 @@ msgstr ""

5856 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is

5857 #. the <src>.

5858 #.

5844 -#: remote.c:1006

5859 +#: remote.c:1093

5860 #, c-format

5861 msgid ""

5862 "The destination you provided is not a full refname (i.e.,\n"

@@ -5855,7 +5870,7 @@ msgid ""

5870 "Neither worked, so we gave up. You must fully qualify the ref."

5871 msgstr ""

5872

5858 -#: remote.c:1026

5873 +#: remote.c:1113

5874 #, c-format

5875 msgid ""

5876 "The <src> part of the refspec is a commit object.\n"

@@ -5863,7 +5878,7 @@ msgid ""

5878 "'%s:refs/heads/%s'?"

5879 msgstr ""

5880

5866 -#: remote.c:1031

5881 +#: remote.c:1118

5882 #, c-format

5883 msgid ""

5884 "The <src> part of the refspec is a tag object.\n"

@@ -5871,7 +5886,7 @@ msgid ""

5886 "'%s:refs/tags/%s'?"

5887 msgstr ""

5888

5874 -#: remote.c:1036

5889 +#: remote.c:1123

5890 #, c-format

5891 msgid ""

5892 "The <src> part of the refspec is a tree object.\n"

@@ -5879,7 +5894,7 @@ msgid ""

5894 "'%s:refs/tags/%s'?"

5895 msgstr ""

5896

5882 -#: remote.c:1041

5897 +#: remote.c:1128

5898 #, c-format

5899 msgid ""

5900 "The <src> part of the refspec is a blob object.\n"

@@ -5887,114 +5902,114 @@ msgid ""

5902 "'%s:refs/tags/%s'?"

5903 msgstr ""

5904

5890 -#: remote.c:1077

5905 +#: remote.c:1164

5906 #, c-format

5907 msgid "%s cannot be resolved to branch"

5908 msgstr ""

5909

5895 -#: remote.c:1088

5910 +#: remote.c:1175

5911 #, c-format

5912 msgid "unable to delete '%s': remote ref does not exist"

5913 msgstr ""

5914

5900 -#: remote.c:1100

5915 +#: remote.c:1187

5916 #, c-format

5917 msgid "dst refspec %s matches more than one"

5918 msgstr ""

5919

5905 -#: remote.c:1107

5920 +#: remote.c:1194

5921 #, c-format

5922 msgid "dst ref %s receives from more than one src"

5923 msgstr ""

5924

5910 -#: remote.c:1610 remote.c:1711

5925 +#: remote.c:1703 remote.c:1804

5926 msgid "HEAD does not point to a branch"

5927 msgstr ""

5928

5914 -#: remote.c:1619

5929 +#: remote.c:1712

5930 #, c-format

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

5932 msgstr ""

5933

5919 -#: remote.c:1622

5934 +#: remote.c:1715

5935 #, c-format

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

5937 msgstr ""

5938

5924 -#: remote.c:1628

5939 +#: remote.c:1721

5940 #, c-format

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

5942 msgstr ""

5943

5929 -#: remote.c:1643

5944 +#: remote.c:1736

5945 #, c-format

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

5947 msgstr ""

5948

5934 -#: remote.c:1655

5949 +#: remote.c:1748

5950 #, c-format

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

5952 msgstr ""

5953

5939 -#: remote.c:1665

5954 +#: remote.c:1758

5955 #, c-format

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

5957 msgstr ""

5958

5944 -#: remote.c:1678

5959 +#: remote.c:1771

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

5961 msgstr ""

5962

5948 -#: remote.c:1700

5963 +#: remote.c:1793

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

5965 msgstr ""

5966

5952 -#: remote.c:1826

5967 +#: remote.c:1922

5968 #, c-format

5969 msgid "couldn't find remote ref %s"

5970 msgstr ""

5971

5957 -#: remote.c:1839

5972 +#: remote.c:1935

5973 #, c-format

5974 msgid "* Ignoring funny ref '%s' locally"

5975 msgstr ""

5976

5962 -#: remote.c:2002

5977 +#: remote.c:2098

5978 #, c-format

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

5980 msgstr ""

5981

5967 -#: remote.c:2006

5982 +#: remote.c:2102

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

5984 msgstr ""

5985

5971 -#: remote.c:2009

5986 +#: remote.c:2105

5987 #, c-format

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

5989 msgstr ""

5990

5976 -#: remote.c:2013

5991 +#: remote.c:2109

5992 #, c-format

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

5994 msgstr ""

5995

5981 -#: remote.c:2016

5996 +#: remote.c:2112

5997 #, c-format

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

5999 msgstr ""

6000

5986 -#: remote.c:2020

6001 +#: remote.c:2116

6002 #, c-format

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

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

6005 msgstr[0] ""

6006 msgstr[1] ""

6007

5993 -#: remote.c:2026

6008 +#: remote.c:2122

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

6010 msgstr ""

6011

5997 -#: remote.c:2029

6012 +#: remote.c:2125

6013 #, c-format

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

6015 msgid_plural ""

@@ -6002,11 +6017,11 @@ msgid_plural ""

6017 msgstr[0] ""

6018 msgstr[1] ""

6019

6005 -#: remote.c:2037

6020 +#: remote.c:2133

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

6022 msgstr ""

6023

6009 -#: remote.c:2040

6024 +#: remote.c:2136

6025 #, c-format

6026 msgid ""

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

@@ -6017,11 +6032,11 @@ msgid_plural ""

6032 msgstr[0] ""

6033 msgstr[1] ""

6034

6020 -#: remote.c:2050

6035 +#: remote.c:2146

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

6037 msgstr ""

6038

6024 -#: remote.c:2241

6039 +#: remote.c:2337

6040 #, c-format

6041 msgid "cannot parse expected object name '%s'"

6042 msgstr ""

@@ -6041,11 +6056,6 @@ msgstr ""

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

6057 msgstr ""

6058

6044 -#: repository.c:94 builtin/init-db.c:188

6045 -#, c-format

6046 -msgid "The hash algorithm %s is not supported in this build."

6047 -msgstr ""

6048 -

6059 #: rerere.c:217 rerere.c:226 rerere.c:229

6060 msgid "corrupt MERGE_RR"

6061 msgstr ""

@@ -6104,8 +6114,8 @@ msgstr ""

6114 msgid "Recorded preimage for '%s'"

6115 msgstr ""

6116

6107 -#: rerere.c:881 submodule.c:2078 builtin/log.c:1891

6108 -#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466

6117 +#: rerere.c:881 submodule.c:2082 builtin/log.c:1975

6118 +#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890

6119 #, c-format

6120 msgid "could not create directory '%s'"

6121 msgstr ""

@@ -6143,25 +6153,30 @@ msgstr ""

6153 msgid "could not determine HEAD revision"

6154 msgstr ""

6155

6146 -#: reset.c:70 reset.c:76 sequencer.c:3318

6156 +#: reset.c:70 reset.c:76 sequencer.c:3426

6157 #, c-format

6158 msgid "failed to find tree of %s"

6159 msgstr ""

6160

6151 -#: revision.c:2661

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

6161 +#: revision.c:2344

6162 +msgid "--unpacked=<packfile> no longer supported"

6163 msgstr ""

6164

6155 -#: revision.c:2664

6165 +#: revision.c:2364

6166 #, c-format

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

6167 +msgid "unknown value for --diff-merges: %s"

6168 +msgstr ""

6169 +

6170 +#: revision.c:2702

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

6172 msgstr ""

6173

6160 -#: revision.c:2873

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

6174 +#: revision.c:2705

6175 +#, c-format

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

6177 msgstr ""

6178

6164 -#: revision.c:2877

6179 +#: revision.c:2915

6180 msgid "-L does not yet support diff formats besides -p and -s"

6181 msgstr ""

6182

@@ -6169,12 +6184,12 @@ msgstr ""

6184 msgid "open /dev/null failed"

6185 msgstr ""

6186

6172 -#: run-command.c:1269

6187 +#: run-command.c:1270

6188 #, c-format

6189 msgid "cannot create async thread: %s"

6190 msgstr ""

6191

6177 -#: run-command.c:1333

6192 +#: run-command.c:1334

6193 #, c-format

6194 msgid ""

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

@@ -6195,114 +6210,114 @@ msgstr ""

6210 msgid "remote unpack failed: %s"

6211 msgstr ""

6212

6198 -#: send-pack.c:308

6213 +#: send-pack.c:372

6214 msgid "failed to sign the push certificate"

6215 msgstr ""

6216

6202 -#: send-pack.c:394

6217 +#: send-pack.c:460

6218 msgid "the receiving end does not support this repository's hash algorithm"

6219 msgstr ""

6220

6206 -#: send-pack.c:403

6221 +#: send-pack.c:469

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

6223 msgstr ""

6224

6210 -#: send-pack.c:405

6225 +#: send-pack.c:471

6226 msgid ""

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

6228 "signed push"

6229 msgstr ""

6230

6216 -#: send-pack.c:417

6231 +#: send-pack.c:483

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

6233 msgstr ""

6234

6220 -#: send-pack.c:422

6235 +#: send-pack.c:488

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

6237 msgstr ""

6238

6224 -#: sequencer.c:192

6239 +#: sequencer.c:194

6240 #, c-format

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

6242 msgstr ""

6243

6229 -#: sequencer.c:297

6244 +#: sequencer.c:308

6245 #, c-format

6246 msgid "could not delete '%s'"

6247 msgstr ""

6248

6234 -#: sequencer.c:316 builtin/rebase.c:743 builtin/rebase.c:1582 builtin/rm.c:385

6249 +#: sequencer.c:329 builtin/rebase.c:749 builtin/rebase.c:1590 builtin/rm.c:385

6250 #, c-format

6251 msgid "could not remove '%s'"

6252 msgstr ""

6253

6239 -#: sequencer.c:326

6254 +#: sequencer.c:339

6255 msgid "revert"

6256 msgstr ""

6257

6243 -#: sequencer.c:328

6258 +#: sequencer.c:341

6259 msgid "cherry-pick"

6260 msgstr ""

6261

6247 -#: sequencer.c:330

6262 +#: sequencer.c:343

6263 msgid "rebase"

6264 msgstr ""

6265

6251 -#: sequencer.c:332

6266 +#: sequencer.c:345

6267 #, c-format

6268 msgid "unknown action: %d"

6269 msgstr ""

6270

6256 -#: sequencer.c:390

6271 +#: sequencer.c:404

6272 msgid ""

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

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

6275 msgstr ""

6276

6262 -#: sequencer.c:393

6277 +#: sequencer.c:407

6278 msgid ""

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

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

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

6282 msgstr ""

6283

6269 -#: sequencer.c:406 sequencer.c:2921

6284 +#: sequencer.c:420 sequencer.c:3028

6285 #, c-format

6286 msgid "could not lock '%s'"

6287 msgstr ""

6288

6274 -#: sequencer.c:413

6289 +#: sequencer.c:422 sequencer.c:2827 sequencer.c:3032 sequencer.c:3046

6290 +#: sequencer.c:3303 sequencer.c:5299 strbuf.c:1168 wrapper.c:631

6291 #, c-format

6276 -msgid "could not write eol to '%s'"

6292 +msgid "could not write to '%s'"

6293 msgstr ""

6294

6279 -#: sequencer.c:418 sequencer.c:2726 sequencer.c:2927 sequencer.c:2941

6280 -#: sequencer.c:3203

6295 +#: sequencer.c:427

6296 #, c-format

6282 -msgid "failed to finalize '%s'"

6297 +msgid "could not write eol to '%s'"

6298 msgstr ""

6299

6285 -#: sequencer.c:431 sequencer.c:1620 sequencer.c:2746 sequencer.c:3185

6286 -#: sequencer.c:3294 builtin/am.c:249 builtin/commit.c:786 builtin/merge.c:1128

6300 +#: sequencer.c:432 sequencer.c:2832 sequencer.c:3034 sequencer.c:3048

6301 +#: sequencer.c:3311

6302 #, c-format

6288 -msgid "could not read '%s'"

6303 +msgid "failed to finalize '%s'"

6304 msgstr ""

6305

6291 -#: sequencer.c:457

6306 +#: sequencer.c:471

6307 #, c-format

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

6309 msgstr ""

6310

6296 -#: sequencer.c:461

6311 +#: sequencer.c:475

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

6313 msgstr ""

6314

6300 -#: sequencer.c:493

6315 +#: sequencer.c:507

6316 #, c-format

6317 msgid "%s: fast-forward"

6318 msgstr ""

6319

6305 -#: sequencer.c:532 builtin/tag.c:566

6320 +#: sequencer.c:546 builtin/tag.c:566

6321 #, c-format

6322 msgid "Invalid cleanup mode %s"

6323 msgstr ""

@@ -6310,65 +6325,65 @@ msgstr ""

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

6326 #. "rebase".

6327 #.

6313 -#: sequencer.c:626

6328 +#: sequencer.c:640

6329 #, c-format

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

6331 msgstr ""

6332

6318 -#: sequencer.c:643

6333 +#: sequencer.c:657

6334 msgid "unable to update cache tree"

6335 msgstr ""

6336

6322 -#: sequencer.c:657

6337 +#: sequencer.c:671

6338 msgid "could not resolve HEAD commit"

6339 msgstr ""

6340

6326 -#: sequencer.c:737

6341 +#: sequencer.c:751

6342 #, c-format

6343 msgid "no key present in '%.*s'"

6344 msgstr ""

6345

6331 -#: sequencer.c:748

6346 +#: sequencer.c:762

6347 #, c-format

6348 msgid "unable to dequote value of '%s'"

6349 msgstr ""

6350

6336 -#: sequencer.c:785 wrapper.c:198 wrapper.c:368 builtin/am.c:710

6337 -#: builtin/am.c:802 builtin/merge.c:1125 builtin/rebase.c:896

6351 +#: sequencer.c:799 wrapper.c:201 wrapper.c:371 builtin/am.c:724

6352 +#: builtin/am.c:816 builtin/merge.c:1121 builtin/rebase.c:902

6353 #, c-format

6354 msgid "could not open '%s' for reading"

6355 msgstr ""

6356

6342 -#: sequencer.c:795

6357 +#: sequencer.c:809

6358 msgid "'GIT_AUTHOR_NAME' already given"

6359 msgstr ""

6360

6346 -#: sequencer.c:800

6361 +#: sequencer.c:814

6362 msgid "'GIT_AUTHOR_EMAIL' already given"

6363 msgstr ""

6364

6350 -#: sequencer.c:805

6365 +#: sequencer.c:819

6366 msgid "'GIT_AUTHOR_DATE' already given"

6367 msgstr ""

6368

6354 -#: sequencer.c:809

6369 +#: sequencer.c:823

6370 #, c-format

6371 msgid "unknown variable '%s'"

6372 msgstr ""

6373

6359 -#: sequencer.c:814

6374 +#: sequencer.c:828

6375 msgid "missing 'GIT_AUTHOR_NAME'"

6376 msgstr ""

6377

6363 -#: sequencer.c:816

6378 +#: sequencer.c:830

6379 msgid "missing 'GIT_AUTHOR_EMAIL'"

6380 msgstr ""

6381

6367 -#: sequencer.c:818

6382 +#: sequencer.c:832

6383 msgid "missing 'GIT_AUTHOR_DATE'"

6384 msgstr ""

6385

6371 -#: sequencer.c:867

6386 +#: sequencer.c:897

6387 #, c-format

6388 msgid ""

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

@@ -6385,11 +6400,11 @@ msgid ""

6400 " git rebase --continue\n"

6401 msgstr ""

6402

6388 -#: sequencer.c:1141

6403 +#: sequencer.c:1178

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

6405 msgstr ""

6406

6392 -#: sequencer.c:1147

6407 +#: sequencer.c:1184

6408 msgid ""

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

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

@@ -6404,7 +6419,7 @@ msgid ""

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

6420 msgstr ""

6421

6407 -#: sequencer.c:1160

6422 +#: sequencer.c:1197

6423 msgid ""

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

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

@@ -6418,345 +6433,354 @@ msgid ""

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

6434 msgstr ""

6435

6421 -#: sequencer.c:1202

6436 +#: sequencer.c:1239

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

6438 msgstr ""

6439

6425 -#: sequencer.c:1204

6440 +#: sequencer.c:1241

6441 msgid "could not parse newly created commit"

6442 msgstr ""

6443

6429 -#: sequencer.c:1250

6444 +#: sequencer.c:1287

6445 msgid "unable to resolve HEAD after creating commit"

6446 msgstr ""

6447

6433 -#: sequencer.c:1252

6448 +#: sequencer.c:1289

6449 msgid "detached HEAD"

6450 msgstr ""

6451

6437 -#: sequencer.c:1256

6452 +#: sequencer.c:1293

6453 msgid " (root-commit)"

6454 msgstr ""

6455

6441 -#: sequencer.c:1277

6456 +#: sequencer.c:1314

6457 msgid "could not parse HEAD"

6458 msgstr ""

6459

6445 -#: sequencer.c:1279

6460 +#: sequencer.c:1316

6461 #, c-format

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

6463 msgstr ""

6464

6450 -#: sequencer.c:1283 sequencer.c:1357 builtin/commit.c:1579

6465 +#: sequencer.c:1320 sequencer.c:1395 builtin/commit.c:1577

6466 msgid "could not parse HEAD commit"

6467 msgstr ""

6468

6454 -#: sequencer.c:1335 sequencer.c:1980

6469 +#: sequencer.c:1373 sequencer.c:2067

6470 msgid "unable to parse commit author"

6471 msgstr ""

6472

6458 -#: sequencer.c:1346 builtin/am.c:1566 builtin/merge.c:695

6473 +#: sequencer.c:1384 builtin/am.c:1580 builtin/merge.c:692

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

6475 msgstr ""

6476

6462 -#: sequencer.c:1379 sequencer.c:1450

6477 +#: sequencer.c:1417 sequencer.c:1535

6478 #, c-format

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

6480 msgstr ""

6481

6467 -#: sequencer.c:1406 builtin/am.c:1588 builtin/commit.c:1680 builtin/merge.c:894

6468 -#: builtin/merge.c:919

6482 +#: sequencer.c:1446 sequencer.c:1478

6483 +#, c-format

6484 +msgid "invalid author identity '%s'"

6485 +msgstr ""

6486 +

6487 +#: sequencer.c:1452

6488 +msgid "corrupt author: missing date information"

6489 +msgstr ""

6490 +

6491 +#: sequencer.c:1491 builtin/am.c:1606 builtin/commit.c:1678 builtin/merge.c:890

6492 +#: builtin/merge.c:915

6493 msgid "failed to write commit object"

6494 msgstr ""

6495

6472 -#: sequencer.c:1433 sequencer.c:4118

6496 +#: sequencer.c:1518 sequencer.c:4237

6497 #, c-format

6498 msgid "could not update %s"

6499 msgstr ""

6500

6477 -#: sequencer.c:1481

6501 +#: sequencer.c:1567

6502 #, c-format

6503 msgid "could not parse commit %s"

6504 msgstr ""

6505

6482 -#: sequencer.c:1486

6506 +#: sequencer.c:1572

6507 #, c-format

6508 msgid "could not parse parent commit %s"

6509 msgstr ""

6510

6487 -#: sequencer.c:1569 sequencer.c:1680

6511 +#: sequencer.c:1655 sequencer.c:1766

6512 #, c-format

6513 msgid "unknown command: %d"

6514 msgstr ""

6515

6492 -#: sequencer.c:1627 sequencer.c:1652

6516 +#: sequencer.c:1713 sequencer.c:1738

6517 #, c-format

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

6519 msgstr ""

6520

6497 -#: sequencer.c:1637

6521 +#: sequencer.c:1723

6522 msgid "need a HEAD to fixup"

6523 msgstr ""

6524

6501 -#: sequencer.c:1639 sequencer.c:3230

l10n: git.pot: v2.29.0 round 1 (124 new, 42 removed)