d4df71b2b0 · 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: 2021-05-17 16:02+0800\n"

11 +"POT-Creation-Date: 2021-08-03 17:06+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"

@@ -24,7 +24,7 @@ msgid "Huh (%s)?"

24 msgstr ""

25

26 #: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493

27 -#: sequencer.c:3944 sequencer.c:4099 builtin/rebase.c:1528

27 +#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528

28 #: builtin/rebase.c:1953

29 msgid "could not read index"

30 msgstr ""

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

53 msgid "could not stage '%s'"

54 msgstr ""

55

56 -#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3687

56 +#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3707

57 msgid "could not write index"

58 msgstr ""

59

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

111 msgid "ignoring unmerged: %s"

112 msgstr ""

113

114 -#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369

114 +#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369

115 #, c-format

116 msgid "Only binary files changed.\n"

117 msgstr ""

118

119 -#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371

119 +#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371

120 #, c-format

121 msgid "No changes.\n"

122 msgstr ""

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

193 msgid "(empty) select nothing"

194 msgstr ""

195

196 -#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896

196 +#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896

197 msgid "*** Commands ***"

198 msgstr ""

199

200 -#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893

200 +#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893

201 msgid "What now"

202 msgstr ""

203

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

209 msgid "unstaged"

210 msgstr ""

211

212 -#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2308

213 -#: builtin/am.c:2311 builtin/bugreport.c:135 builtin/clone.c:128

212 +#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309

213 +#: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128

214 #: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190

215 -#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819

216 -#: builtin/submodule--helper.c:1822 builtin/submodule--helper.c:2327

217 -#: builtin/submodule--helper.c:2330 builtin/submodule--helper.c:2573

215 +#: builtin/submodule--helper.c:408 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,7 +223,7 @@ msgstr ""

223 msgid "could not refresh index"

224 msgstr ""

225

226 -#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803

226 +#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803

227 #, c-format

228 msgid "Bye.\n"

229 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:342

477 +#: add-patch.c:343

478 #, c-format

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

480 msgstr ""

481

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

482 +#: add-patch.c:362 add-patch.c:366

483 #, c-format

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

485 msgstr ""

486

487 -#: add-patch.c:419

487 +#: add-patch.c:420

488 msgid "could not parse diff"

489 msgstr ""

490

491 -#: add-patch.c:438

491 +#: add-patch.c:439

492 msgid "could not parse colored diff"

493 msgstr ""

494

495 -#: add-patch.c:452

495 +#: add-patch.c:453

496 #, c-format

497 msgid "failed to run '%s'"

498 msgstr ""

499

500 -#: add-patch.c:611

500 +#: add-patch.c:612

501 msgid "mismatched output from interactive.diffFilter"

502 msgstr ""

503

504 -#: add-patch.c:612

504 +#: add-patch.c:613

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:790

510 +#: add-patch.c:791

511 #, c-format

512 msgid ""

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

514 "%.*s"

515 msgstr ""

516

517 -#: add-patch.c:805

517 +#: add-patch.c:806

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:1081 git-add--interactive.perl:1115

526 +#: add-patch.c:1082 git-add--interactive.perl:1115

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

528 msgstr ""

529

530 -#: add-patch.c:1085

530 +#: add-patch.c:1086

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:1099 git-add--interactive.perl:1129

540 +#: add-patch.c:1100 git-add--interactive.perl:1129

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:1132

547 +#: add-patch.c:1133

548 msgid "could not parse hunk header"

549 msgstr ""

550

551 -#: add-patch.c:1177

551 +#: add-patch.c:1178

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:1246 git-add--interactive.perl:1242

567 +#: add-patch.c:1247 git-add--interactive.perl:1242

568 msgid ""

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

570 msgstr ""

571

572 -#: add-patch.c:1289

572 +#: add-patch.c:1290

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

574 msgstr ""

575

576 -#: add-patch.c:1290 git-add--interactive.perl:1346

576 +#: add-patch.c:1291 git-add--interactive.perl:1346

577 msgid "Apply them to the worktree anyway? "

578 msgstr ""

579

580 -#: add-patch.c:1297 git-add--interactive.perl:1349

580 +#: add-patch.c:1298 git-add--interactive.perl:1349

581 msgid "Nothing was applied.\n"

582 msgstr ""

583

584 -#: add-patch.c:1354

584 +#: add-patch.c:1355

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:1516 add-patch.c:1526

597 +#: add-patch.c:1517 add-patch.c:1527

598 msgid "No previous hunk"

599 msgstr ""

600

601 -#: add-patch.c:1521 add-patch.c:1531

601 +#: add-patch.c:1522 add-patch.c:1532

602 msgid "No next hunk"

603 msgstr ""

604

605 -#: add-patch.c:1537

605 +#: add-patch.c:1538

606 msgid "No other hunks to goto"

607 msgstr ""

608

609 -#: add-patch.c:1548 git-add--interactive.perl:1606

609 +#: add-patch.c:1549 git-add--interactive.perl:1606

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

611 msgstr ""

612

613 -#: add-patch.c:1549 git-add--interactive.perl:1608

613 +#: add-patch.c:1550 git-add--interactive.perl:1608

614 msgid "go to which hunk? "

615 msgstr ""

616

617 -#: add-patch.c:1560

617 +#: add-patch.c:1561

618 #, c-format

619 msgid "Invalid number: '%s'"

620 msgstr ""

621

622 -#: add-patch.c:1565

622 +#: add-patch.c:1566

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:1574

629 +#: add-patch.c:1575

630 msgid "No other hunks to search"

631 msgstr ""

632

633 -#: add-patch.c:1580 git-add--interactive.perl:1661

633 +#: add-patch.c:1581 git-add--interactive.perl:1661

634 msgid "search for regex? "

635 msgstr ""

636

637 -#: add-patch.c:1595

637 +#: add-patch.c:1596

638 #, c-format

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

640 msgstr ""

641

642 -#: add-patch.c:1612

642 +#: add-patch.c:1613

643 msgid "No hunk matches the given pattern"

644 msgstr ""

645

646 -#: add-patch.c:1619

646 +#: add-patch.c:1620

647 msgid "Sorry, cannot split this hunk"

648 msgstr ""

649

650 -#: add-patch.c:1623

650 +#: add-patch.c:1624

651 #, c-format

652 msgid "Split into %d hunks."

653 msgstr ""

654

655 -#: add-patch.c:1627

655 +#: add-patch.c:1628

656 msgid "Sorry, cannot edit this hunk"

657 msgstr ""

658

659 -#: add-patch.c:1679

659 +#: add-patch.c:1680

660 msgid "'git apply' failed"

661 msgstr ""

662

@@ -1062,8 +1062,8 @@ msgstr ""

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

1063 msgstr ""

1064

1065 -#: apply.c:3894 apply.c:3896 read-cache.c:861 read-cache.c:890

1066 -#: read-cache.c:1351

1065 +#: apply.c:3894 apply.c:3896 read-cache.c:863 read-cache.c:892

1066 +#: read-cache.c:1353

1067 #, c-format

1068 msgid "invalid path '%s'"

1069 msgstr ""

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

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

1154 msgstr ""

1155

1156 -#: apply.c:4376 builtin/bisect--helper.c:523

1156 +#: apply.c:4376 builtin/bisect--helper.c:525

1157 #, c-format

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

1159 msgstr ""

@@ -1243,7 +1243,7 @@ msgid_plural "%d lines applied after fixing whitespace errors."

1243 msgstr[0] ""

1244 msgstr[1] ""

1245

1246 -#: apply.c:4967 builtin/add.c:679 builtin/mv.c:304 builtin/rm.c:423

1246 +#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423

1247 msgid "Unable to write new index file"

1248 msgstr ""

1249

@@ -1255,7 +1255,7 @@ msgstr ""

1255 msgid "apply changes matching the given path"

1256 msgstr ""

1257

1258 -#: apply.c:5000 builtin/am.c:2317

1258 +#: apply.c:5000 builtin/am.c:2318

1259 msgid "num"

1260 msgstr ""

1261

@@ -1319,9 +1319,9 @@ msgstr ""

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

1320 msgstr ""

1321

1322 -#: apply.c:5035 builtin/am.c:2293 builtin/am.c:2296

1322 +#: apply.c:5035 builtin/am.c:2294 builtin/am.c:2297

1323 #: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100

1324 -#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3831

1324 +#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3991

1325 #: builtin/rebase.c:1347

1326 msgid "action"

1327 msgstr ""

@@ -1351,8 +1351,8 @@ msgid "allow overlapping hunks"

1351 msgstr ""

1352

1353 #: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22

1354 -#: builtin/commit.c:1474 builtin/count-objects.c:98 builtin/fsck.c:755

1355 -#: builtin/log.c:2295 builtin/mv.c:123 builtin/read-tree.c:128

1354 +#: builtin/commit.c:1481 builtin/count-objects.c:98 builtin/fsck.c:756

1355 +#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:128

1356 msgid "be verbose"

1357 msgstr ""

1358

@@ -1364,7 +1364,7 @@ msgstr ""

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

1365 msgstr ""

1366

1367 -#: apply.c:5059 builtin/am.c:2305

1367 +#: apply.c:5059 builtin/am.c:2306

1368 msgid "root"

1369 msgstr ""

1370

@@ -1406,7 +1406,7 @@ msgstr ""

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

1407 msgstr ""

1408

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

1409 +#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368

1410 #, c-format

1411 msgid "deflate error (%d)"

1412 msgstr ""

@@ -1439,13 +1439,13 @@ msgid "cannot read %s"

1439 msgstr ""

1440

1441 #: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095

1442 -#: sequencer.c:3536 sequencer.c:3645 builtin/am.c:261 builtin/commit.c:833

1442 +#: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833

1443 #: builtin/merge.c:1143

1444 #, c-format

1445 msgid "could not read '%s'"

1446 msgstr ""

1447

1448 -#: archive.c:427 builtin/add.c:205 builtin/add.c:646 builtin/rm.c:328

1448 +#: archive.c:427 builtin/add.c:205 builtin/add.c:645 builtin/rm.c:328

1449 #, c-format

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

1451 msgstr ""

@@ -1487,7 +1487,7 @@ msgstr ""

1487 msgid "archive format"

1488 msgstr ""

1489

1490 -#: archive.c:553 builtin/log.c:1772

1490 +#: archive.c:553 builtin/log.c:1775

1491 msgid "prefix"

1492 msgstr ""

1493

@@ -1498,7 +1498,7 @@ msgstr ""

1498 #: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888

1499 #: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135

1500 #: builtin/fast-export.c:1207 builtin/fast-export.c:1209

1501 -#: builtin/fast-export.c:1213 builtin/grep.c:922 builtin/hash-object.c:105

1501 +#: builtin/fast-export.c:1213 builtin/grep.c:921 builtin/hash-object.c:105

1502 #: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412

1503 #: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191

1504 msgid "file"

@@ -1529,7 +1529,7 @@ msgid "list supported archive formats"

1529 msgstr ""

1530

1531 #: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121

1532 -#: builtin/submodule--helper.c:1831 builtin/submodule--helper.c:2336

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

1533 msgid "repo"

1534 msgstr ""

1535

@@ -1537,7 +1537,7 @@ msgstr ""

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

1538 msgstr ""

1539

1540 -#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:718

1540 +#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717

1541 #: builtin/notes.c:498

1542 msgid "command"

1543 msgstr ""

@@ -1705,11 +1705,11 @@ msgstr ""

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

1706 msgstr ""

1707

1708 -#: blame.c:2820 bundle.c:213 ref-filter.c:2207 remote.c:2041 sequencer.c:2333

1709 -#: sequencer.c:4866 submodule.c:857 builtin/commit.c:1106 builtin/log.c:411

1710 -#: builtin/log.c:1018 builtin/log.c:1626 builtin/log.c:2054 builtin/log.c:2344

1711 -#: builtin/merge.c:428 builtin/pack-objects.c:3183 builtin/pack-objects.c:3646

1712 -#: builtin/pack-objects.c:3661 builtin/shortlog.c:255

1708 +#: blame.c:2820 bundle.c:224 ref-filter.c:2274 remote.c:2041 sequencer.c:2333

1709 +#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414

1710 +#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346

1711 +#: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806

1712 +#: builtin/pack-objects.c:3821 builtin/shortlog.c:255

1713 msgid "revision walk setup failed"

1714 msgstr ""

1715

@@ -1852,118 +1852,118 @@ msgstr ""

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

1853 msgstr ""

1854

1855 -#: bundle.c:41

1855 +#: bundle.c:44

1856 #, c-format

1857 msgid "unrecognized bundle hash algorithm: %s"

1858 msgstr ""

1859

1860 -#: bundle.c:45

1860 +#: bundle.c:48

1861 #, c-format

1862 msgid "unknown capability '%s'"

1863 msgstr ""

1864

1865 -#: bundle.c:71

1865 +#: bundle.c:74

1866 #, c-format

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

1868 msgstr ""

1869

1870 -#: bundle.c:110

1870 +#: bundle.c:113

1871 #, c-format

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

1873 msgstr ""

1874

1875 -#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385

1875 +#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385

1876 #: builtin/commit.c:861

1877 #, c-format

1878 msgid "could not open '%s'"

1879 msgstr ""

1880

1881 -#: bundle.c:189

1881 +#: bundle.c:198

1882 msgid "Repository lacks these prerequisite commits:"

1883 msgstr ""

1884

1885 -#: bundle.c:192

1885 +#: bundle.c:201

1886 msgid "need a repository to verify a bundle"

1887 msgstr ""

1888

1889 -#: bundle.c:243

1889 +#: bundle.c:257

1890 #, c-format

1891 msgid "The bundle contains this ref:"

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

1893 msgstr[0] ""

1894 msgstr[1] ""

1895

1896 -#: bundle.c:250

1896 +#: bundle.c:264

1897 msgid "The bundle records a complete history."

1898 msgstr ""

1899

1900 -#: bundle.c:252

1900 +#: bundle.c:266

1901 #, c-format

1902 msgid "The bundle requires this ref:"

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

1904 msgstr[0] ""

1905 msgstr[1] ""

1906

1907 -#: bundle.c:319

1907 +#: bundle.c:333

1908 msgid "unable to dup bundle descriptor"

1909 msgstr ""

1910

1911 -#: bundle.c:326

1911 +#: bundle.c:340

1912 msgid "Could not spawn pack-objects"

1913 msgstr ""

1914

1915 -#: bundle.c:337

1915 +#: bundle.c:351

1916 msgid "pack-objects died"

1917 msgstr ""

1918

1919 -#: bundle.c:386

1919 +#: bundle.c:400

1920 #, c-format

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

1922 msgstr ""

1923

1924 -#: bundle.c:490

1924 +#: bundle.c:504

1925 #, c-format

1926 msgid "unsupported bundle version %d"

1927 msgstr ""

1928

1929 -#: bundle.c:492

1929 +#: bundle.c:506

1930 #, c-format

1931 msgid "cannot write bundle version %d with algorithm %s"

1932 msgstr ""

1933

1934 -#: bundle.c:510 builtin/log.c:210 builtin/log.c:1935 builtin/shortlog.c:396

1934 +#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396

1935 #, c-format

1936 msgid "unrecognized argument: %s"

1937 msgstr ""

1938

1939 -#: bundle.c:539

1939 +#: bundle.c:553

1940 msgid "Refusing to create empty bundle."

1941 msgstr ""

1942

1943 -#: bundle.c:549

1943 +#: bundle.c:563

1944 #, c-format

1945 msgid "cannot create '%s'"

1946 msgstr ""

1947

1948 -#: bundle.c:574

1948 +#: bundle.c:588

1949 msgid "index-pack died"

1950 msgstr ""

1951

1952 -#: chunk-format.c:113

1952 +#: chunk-format.c:117

1953 msgid "terminating chunk id appears earlier than expected"

1954 msgstr ""

1955

1956 -#: chunk-format.c:122

1956 +#: chunk-format.c:126

1957 #, c-format

1958 msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"

1959 msgstr ""

1960

1961 -#: chunk-format.c:129

1961 +#: chunk-format.c:133

1962 #, c-format

1963 msgid "duplicate chunk ID %<PRIx32> found"

1964 msgstr ""

1965

1966 -#: chunk-format.c:143

1966 +#: chunk-format.c:147

1967 #, c-format

1968 msgid "final chunk has non-zero id %<PRIx32>"

1969 msgstr ""

@@ -2031,12 +2031,12 @@ msgstr ""

2031 msgid "commit-graph requires overflow generation data but has none"

2032 msgstr ""

2033

2034 -#: commit-graph.c:1075 builtin/am.c:1340

2034 +#: commit-graph.c:1075 builtin/am.c:1341

2035 #, c-format

2036 msgid "unable to parse commit %s"

2037 msgstr ""

2038

2039 -#: commit-graph.c:1337 builtin/pack-objects.c:2897

2039 +#: commit-graph.c:1337 builtin/pack-objects.c:3057

2040 #, c-format

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

2042 msgstr ""

@@ -2098,7 +2098,7 @@ msgstr ""

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

2099 msgstr ""

2100

2101 -#: commit-graph.c:1812 midx.c:906

2101 +#: commit-graph.c:1812 midx.c:911

2102 #, c-format

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

2104 msgstr ""

@@ -2147,78 +2147,78 @@ msgstr ""

2147 msgid "too many commits to write graph"

2148 msgstr ""

2149

2150 -#: commit-graph.c:2450

2150 +#: commit-graph.c:2449

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

2152 msgstr ""

2153

2154 -#: commit-graph.c:2460

2154 +#: commit-graph.c:2459

2155 #, c-format

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

2157 msgstr ""

2158

2159 -#: commit-graph.c:2470 commit-graph.c:2485

2159 +#: commit-graph.c:2469 commit-graph.c:2484

2160 #, c-format

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

2162 msgstr ""

2163

2164 -#: commit-graph.c:2477

2164 +#: commit-graph.c:2476

2165 #, c-format

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

2167 msgstr ""

2168

2169 -#: commit-graph.c:2495

2169 +#: commit-graph.c:2494

2170 msgid "Verifying commits in commit graph"

2171 msgstr ""

2172

2173 -#: commit-graph.c:2510

2173 +#: commit-graph.c:2509

2174 #, c-format

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

2176 msgstr ""

2177

2178 -#: commit-graph.c:2517

2178 +#: commit-graph.c:2516

2179 #, c-format

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

2181 msgstr ""

2182

2183 -#: commit-graph.c:2527

2183 +#: commit-graph.c:2526

2184 #, c-format

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

2186 msgstr ""

2187

2188 -#: commit-graph.c:2536

2188 +#: commit-graph.c:2535

2189 #, c-format

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

2191 msgstr ""

2192

2193 -#: commit-graph.c:2550

2193 +#: commit-graph.c:2549

2194 #, c-format

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

2196 msgstr ""

2197

2198 -#: commit-graph.c:2555

2198 +#: commit-graph.c:2554

2199 #, c-format

2200 msgid ""

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

2202 msgstr ""

2203

2204 -#: commit-graph.c:2559

2204 +#: commit-graph.c:2558

2205 #, c-format

2206 msgid ""

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

2208 msgstr ""

2209

2210 -#: commit-graph.c:2576

2210 +#: commit-graph.c:2575

2211 #, c-format

2212 msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"

2213 msgstr ""

2214

2215 -#: commit-graph.c:2582

2215 +#: commit-graph.c:2581

2216 #, c-format

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

2218 msgstr ""

2219

2220 -#: commit.c:52 sequencer.c:3088 builtin/am.c:371 builtin/am.c:416

2221 -#: builtin/am.c:421 builtin/am.c:1419 builtin/am.c:2066 builtin/replace.c:457

2220 +#: commit.c:52 sequencer.c:3088 builtin/am.c:372 builtin/am.c:417

2221 +#: builtin/am.c:422 builtin/am.c:1420 builtin/am.c:2067 builtin/replace.c:457

2222 #, c-format

2223 msgid "could not parse %s"

2224 msgstr ""

@@ -2484,7 +2484,7 @@ msgstr ""

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

2485 msgstr ""

2486

2487 -#: config.c:1687 builtin/pack-objects.c:3924

2487 +#: config.c:1687 builtin/pack-objects.c:4084

2488 #, c-format

2489 msgid "bad pack compression level %d"

2490 msgstr ""

@@ -2504,110 +2504,110 @@ msgstr ""

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

2505 msgstr ""

2506

2507 -#: config.c:1873

2507 +#: config.c:1874

2508 #, c-format

2509 msgid "failed to parse %s"

2510 msgstr ""

2511

2512 -#: config.c:1929

2512 +#: config.c:1930

2513 msgid "unable to parse command-line config"

2514 msgstr ""

2515

2516 -#: config.c:2293

2516 +#: config.c:2294

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

2518 msgstr ""

2519

2520 -#: config.c:2467

2520 +#: config.c:2468

2521 #, c-format

2522 msgid "Invalid %s: '%s'"

2523 msgstr ""

2524

2525 -#: config.c:2512

2525 +#: config.c:2513

2526 #, c-format

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

2528 msgstr ""

2529

2530 -#: config.c:2558

2530 +#: config.c:2559

2531 #, c-format

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

2533 msgstr ""

2534

2535 -#: config.c:2560

2535 +#: config.c:2561

2536 #, c-format

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

2538 msgstr ""

2539

2540 -#: config.c:2644

2540 +#: config.c:2645

2541 #, c-format

2542 msgid "invalid section name '%s'"

2543 msgstr ""

2544

2545 -#: config.c:2676

2545 +#: config.c:2677

2546 #, c-format

2547 msgid "%s has multiple values"

2548 msgstr ""

2549

2550 -#: config.c:2705

2550 +#: config.c:2706

2551 #, c-format

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

2553 msgstr ""

2554

2555 -#: config.c:2957 config.c:3283

2555 +#: config.c:2958 config.c:3285

2556 #, c-format

2557 msgid "could not lock config file %s"

2558 msgstr ""

2559

2560 -#: config.c:2968

2560 +#: config.c:2969

2561 #, c-format

2562 msgid "opening %s"

2563 msgstr ""

2564

2565 -#: config.c:3005 builtin/config.c:361

2565 +#: config.c:3006 builtin/config.c:361

2566 #, c-format

2567 msgid "invalid pattern: %s"

2568 msgstr ""

2569

2570 -#: config.c:3030

2570 +#: config.c:3031

2571 #, c-format

2572 msgid "invalid config file %s"

2573 msgstr ""

2574

2575 -#: config.c:3043 config.c:3296

2575 +#: config.c:3044 config.c:3298

2576 #, c-format

2577 msgid "fstat on %s failed"

2578 msgstr ""

2579

2580 -#: config.c:3054

2580 +#: config.c:3055

2581 #, c-format

2582 -msgid "unable to mmap '%s'"

2582 +msgid "unable to mmap '%s'%s"

2583 msgstr ""

2584

2585 -#: config.c:3063 config.c:3301

2585 +#: config.c:3065 config.c:3303

2586 #, c-format

2587 msgid "chmod on %s failed"

2588 msgstr ""

2589

2590 -#: config.c:3148 config.c:3398

2590 +#: config.c:3150 config.c:3400

2591 #, c-format

2592 msgid "could not write config file %s"

2593 msgstr ""

2594

2595 -#: config.c:3182

2595 +#: config.c:3184

2596 #, c-format

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

2598 msgstr ""

2599

2600 -#: config.c:3184 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863

2600 +#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863

2601 #, c-format

2602 msgid "could not unset '%s'"

2603 msgstr ""

2604

2605 -#: config.c:3274

2605 +#: config.c:3276

2606 #, c-format

2607 msgid "invalid section name: %s"

2608 msgstr ""

2609

2610 -#: config.c:3441

2610 +#: config.c:3443

2611 #, c-format

2612 msgid "missing value for '%s'"

2613 msgstr ""

@@ -2776,7 +2776,7 @@ msgstr ""

2776 msgid "unable to fork"

2777 msgstr ""

2778

2779 -#: connected.c:108 builtin/fsck.c:188 builtin/prune.c:45

2779 +#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45

2780 msgid "Checking connectivity"

2781 msgstr ""

2782

@@ -3029,36 +3029,36 @@ msgstr ""

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

3030 msgstr ""

3031

3032 -#: diff-merges.c:80

3032 +#: diff-merges.c:70

3033 #, c-format

3034 msgid "unknown value for --diff-merges: %s"

3035 msgstr ""

3036

3037 -#: diff-lib.c:538

3037 +#: diff-lib.c:557

3038 msgid "--merge-base does not work with ranges"

3039 msgstr ""

3040

3041 -#: diff-lib.c:540

3041 +#: diff-lib.c:559

3042 msgid "--merge-base only works with commits"

3043 msgstr ""

3044

3045 -#: diff-lib.c:557

3045 +#: diff-lib.c:576

3046 msgid "unable to get HEAD"

3047 msgstr ""

3048

3049 -#: diff-lib.c:564

3049 +#: diff-lib.c:583

3050 msgid "no merge base found"

3051 msgstr ""

3052

3053 -#: diff-lib.c:566

3053 +#: diff-lib.c:585

3054 msgid "multiple merge bases found"

3055 msgstr ""

3056

3057 -#: diff-no-index.c:238

3057 +#: diff-no-index.c:237

3058 msgid "git diff --no-index [<options>] <path> <path>"

3059 msgstr ""

3060

3061 -#: diff-no-index.c:263

3061 +#: diff-no-index.c:262

3062 msgid ""

3063 "Not a git repository. Use --no-index to compare two paths outside a working "

3064 "tree"

@@ -3105,544 +3105,555 @@ msgid ""

3105 "%s"

3106 msgstr ""

3107

3108 -#: diff.c:4278

3108 +#: diff.c:4282

3109 #, c-format

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

3111 msgstr ""

3112

3113 -#: diff.c:4630

3113 +#: diff.c:4634

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

3115 msgstr ""

3116

3117 -#: diff.c:4633

3117 +#: diff.c:4637

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

3119 msgstr ""

3120

3121 -#: diff.c:4712

3121 +#: diff.c:4640

3122 +msgid ""

3123 +"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"

3124 +msgstr ""

3125 +

3126 +#: diff.c:4643

3127 +msgid ""

3128 +"---pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "

3129 +"with -G and -S"

3130 +msgstr ""

3131 +

3132 +#: diff.c:4722

3133 msgid "--follow requires exactly one pathspec"

3134 msgstr ""

3135

3125 -#: diff.c:4760

3136 +#: diff.c:4770

3137 #, c-format

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

3139 msgstr ""

3140

3130 -#: diff.c:4765 diff.c:4770 diff.c:4775 diff.c:4780 diff.c:5308

3141 +#: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318

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

3143 #, c-format

3144 msgid "%s expects a numerical value"

3145 msgstr ""

3146

3136 -#: diff.c:4797

3147 +#: diff.c:4807

3148 #, c-format

3149 msgid ""

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

3151 "%s"

3152 msgstr ""

3153

3143 -#: diff.c:4882

3154 +#: diff.c:4892

3155 #, c-format

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

3157 msgstr ""

3158

3148 -#: diff.c:4906

3159 +#: diff.c:4916

3160 #, c-format

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

3162 msgstr ""

3163

3153 -#: diff.c:4920

3164 +#: diff.c:4930

3165 #, c-format

3166 msgid "unable to resolve '%s'"

3167 msgstr ""

3168

3158 -#: diff.c:4970 diff.c:4976

3169 +#: diff.c:4980 diff.c:4986

3170 #, c-format

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

3172 msgstr ""

3173

3163 -#: diff.c:4988

3174 +#: diff.c:4998

3175 #, c-format

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

3177 msgstr ""

3178

3168 -#: diff.c:5009

3179 +#: diff.c:5019

3180 #, c-format

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

3182 msgstr ""

3183

3173 -#: diff.c:5028

3184 +#: diff.c:5038

3185 #, c-format

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

3187 msgstr ""

3188

3178 -#: diff.c:5068

3189 +#: diff.c:5078

3190 msgid ""

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

3192 "\"histogram\""

3193 msgstr ""

3194

3184 -#: diff.c:5104 diff.c:5124

3195 +#: diff.c:5114 diff.c:5134

3196 #, c-format

3197 msgid "invalid argument to %s"

3198 msgstr ""

3199

3189 -#: diff.c:5228

3200 +#: diff.c:5238

3201 #, c-format

3202 msgid "invalid regex given to -I: '%s'"

3203 msgstr ""

3204

3194 -#: diff.c:5277

3205 +#: diff.c:5287

3206 #, c-format

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

3208 msgstr ""

3209

3199 -#: diff.c:5333

3210 +#: diff.c:5343

3211 #, c-format

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

3213 msgstr ""

3214

3204 -#: diff.c:5369

3215 +#: diff.c:5379

3216 msgid "Diff output format options"

3217 msgstr ""

3218

3208 -#: diff.c:5371 diff.c:5377

3219 +#: diff.c:5381 diff.c:5387

3220 msgid "generate patch"

3221 msgstr ""

3222

3212 -#: diff.c:5374 builtin/log.c:179

3223 +#: diff.c:5384 builtin/log.c:179

3224 msgid "suppress diff output"

3225 msgstr ""

3226

3216 -#: diff.c:5379 diff.c:5493 diff.c:5500

3227 +#: diff.c:5389 diff.c:5503 diff.c:5510

3228 msgid "<n>"

3229 msgstr ""

3230

3220 -#: diff.c:5380 diff.c:5383

3231 +#: diff.c:5390 diff.c:5393

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

3233 msgstr ""

3234

3224 -#: diff.c:5385

3235 +#: diff.c:5395

3236 msgid "generate the diff in raw format"

3237 msgstr ""

3238

3228 -#: diff.c:5388

3239 +#: diff.c:5398

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

3241 msgstr ""

3242

3232 -#: diff.c:5392

3243 +#: diff.c:5402

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

3245 msgstr ""

3246

3236 -#: diff.c:5396

3247 +#: diff.c:5406

3248 msgid "machine friendly --stat"

3249 msgstr ""

3250

3240 -#: diff.c:5399

3251 +#: diff.c:5409

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

3253 msgstr ""

3254

3244 -#: diff.c:5401 diff.c:5409

3255 +#: diff.c:5411 diff.c:5419

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

3257 msgstr ""

3258

3248 -#: diff.c:5402

3259 +#: diff.c:5412

3260 msgid ""

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

3262 msgstr ""

3263

3253 -#: diff.c:5406

3264 +#: diff.c:5416

3265 msgid "synonym for --dirstat=cumulative"

3266 msgstr ""

3267

3257 -#: diff.c:5410

3268 +#: diff.c:5420

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

3270 msgstr ""

3271

3261 -#: diff.c:5414

3272 +#: diff.c:5424

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

3274 msgstr ""

3275

3265 -#: diff.c:5417

3276 +#: diff.c:5427

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

3278 msgstr ""

3279

3269 -#: diff.c:5420

3280 +#: diff.c:5430

3281 msgid "show only names of changed files"

3282 msgstr ""

3283

3273 -#: diff.c:5423

3284 +#: diff.c:5433

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

3286 msgstr ""

3287

3277 -#: diff.c:5425

3288 +#: diff.c:5435

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

3290 msgstr ""

3291

3281 -#: diff.c:5426

3292 +#: diff.c:5436

3293 msgid "generate diffstat"

3294 msgstr ""

3295

3285 -#: diff.c:5428 diff.c:5431 diff.c:5434

3296 +#: diff.c:5438 diff.c:5441 diff.c:5444

3297 msgid "<width>"

3298 msgstr ""

3299

3289 -#: diff.c:5429

3300 +#: diff.c:5439

3301 msgid "generate diffstat with a given width"

3302 msgstr ""

3303

3293 -#: diff.c:5432

3304 +#: diff.c:5442

3305 msgid "generate diffstat with a given name width"

3306 msgstr ""

3307

3297 -#: diff.c:5435

3308 +#: diff.c:5445

3309 msgid "generate diffstat with a given graph width"

3310 msgstr ""

3311

3301 -#: diff.c:5437

3312 +#: diff.c:5447

3313 msgid "<count>"

3314 msgstr ""

3315

3305 -#: diff.c:5438

3316 +#: diff.c:5448

3317 msgid "generate diffstat with limited lines"

3318 msgstr ""

3319

3309 -#: diff.c:5441

3320 +#: diff.c:5451

3321 msgid "generate compact summary in diffstat"

3322 msgstr ""

3323

3313 -#: diff.c:5444

3324 +#: diff.c:5454

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

3326 msgstr ""

3327

3317 -#: diff.c:5447

3328 +#: diff.c:5457

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

3330 msgstr ""

3331

3321 -#: diff.c:5449

3332 +#: diff.c:5459

3333 msgid "show colored diff"

3334 msgstr ""

3335

3325 -#: diff.c:5450

3336 +#: diff.c:5460

3337 msgid "<kind>"

3338 msgstr ""

3339

3329 -#: diff.c:5451

3340 +#: diff.c:5461

3341 msgid ""

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

3343 "diff"

3344 msgstr ""

3345

3335 -#: diff.c:5454

3346 +#: diff.c:5464

3347 msgid ""

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

3349 "--numstat"

3350 msgstr ""

3351

3341 -#: diff.c:5457 diff.c:5460 diff.c:5463 diff.c:5572

3352 +#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582

3353 msgid "<prefix>"

3354 msgstr ""

3355

3345 -#: diff.c:5458

3356 +#: diff.c:5468

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

3358 msgstr ""

3359

3349 -#: diff.c:5461

3360 +#: diff.c:5471

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

3362 msgstr ""

3363

3353 -#: diff.c:5464

3364 +#: diff.c:5474

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

3366 msgstr ""

3367

3357 -#: diff.c:5467

3368 +#: diff.c:5477

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

3370 msgstr ""

3371

3361 -#: diff.c:5470

3372 +#: diff.c:5480

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

3374 msgstr ""

3375

3365 -#: diff.c:5474 diff.c:5479 diff.c:5484

3376 +#: diff.c:5484 diff.c:5489 diff.c:5494

3377 msgid "<char>"

3378 msgstr ""

3379

3369 -#: diff.c:5475

3380 +#: diff.c:5485

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

3382 msgstr ""

3383

3373 -#: diff.c:5480

3384 +#: diff.c:5490

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

3386 msgstr ""

3387

3377 -#: diff.c:5485

3388 +#: diff.c:5495

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

3390 msgstr ""

3391

3381 -#: diff.c:5488

3392 +#: diff.c:5498

3393 msgid "Diff rename options"

3394 msgstr ""

3395

3385 -#: diff.c:5489

3396 +#: diff.c:5499

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

3398 msgstr ""

3399

3389 -#: diff.c:5490

3400 +#: diff.c:5500

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

3402 msgstr ""

3403

3393 -#: diff.c:5494

3404 +#: diff.c:5504

3405 msgid "detect renames"

3406 msgstr ""

3407

3397 -#: diff.c:5498

3408 +#: diff.c:5508

3409 msgid "omit the preimage for deletes"

3410 msgstr ""

3411

3401 -#: diff.c:5501

3412 +#: diff.c:5511

3413 msgid "detect copies"

3414 msgstr ""

3415

3405 -#: diff.c:5505

3416 +#: diff.c:5515

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

3418 msgstr ""

3419

3409 -#: diff.c:5507

3420 +#: diff.c:5517

3421 msgid "disable rename detection"

3422 msgstr ""

3423

3413 -#: diff.c:5510

3424 +#: diff.c:5520

3425 msgid "use empty blobs as rename source"

3426 msgstr ""

3427

3417 -#: diff.c:5512

3428 +#: diff.c:5522

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

3430 msgstr ""

3431

3421 -#: diff.c:5515

3432 +#: diff.c:5525

3433 msgid ""

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

3435 "given limit"

3436 msgstr ""

3437

3427 -#: diff.c:5517

3438 +#: diff.c:5527

3439 msgid "Diff algorithm options"

3440 msgstr ""

3441

3431 -#: diff.c:5519

3442 +#: diff.c:5529

3443 msgid "produce the smallest possible diff"

3444 msgstr ""

3445

3435 -#: diff.c:5522

3446 +#: diff.c:5532

3447 msgid "ignore whitespace when comparing lines"

3448 msgstr ""

3449

3439 -#: diff.c:5525

3450 +#: diff.c:5535

3451 msgid "ignore changes in amount of whitespace"

3452 msgstr ""

3453

3443 -#: diff.c:5528

3454 +#: diff.c:5538

3455 msgid "ignore changes in whitespace at EOL"

3456 msgstr ""

3457

3447 -#: diff.c:5531

3458 +#: diff.c:5541

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

3460 msgstr ""

3461

3451 -#: diff.c:5534

3462 +#: diff.c:5544

3463 msgid "ignore changes whose lines are all blank"

3464 msgstr ""

3465

3455 -#: diff.c:5536 diff.c:5558 diff.c:5561 diff.c:5606

3466 +#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616

3467 msgid "<regex>"

3468 msgstr ""

3469

3459 -#: diff.c:5537

3470 +#: diff.c:5547

3471 msgid "ignore changes whose all lines match <regex>"

3472 msgstr ""

3473

3463 -#: diff.c:5540

3474 +#: diff.c:5550

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

3476 msgstr ""

3477

3467 -#: diff.c:5543

3478 +#: diff.c:5553

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

3480 msgstr ""

3481

3471 -#: diff.c:5547

3482 +#: diff.c:5557

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

3484 msgstr ""

3485

3475 -#: diff.c:5549

3486 +#: diff.c:5559

3487 msgid "<algorithm>"

3488 msgstr ""

3489

3479 -#: diff.c:5550

3490 +#: diff.c:5560

3491 msgid "choose a diff algorithm"

3492 msgstr ""

3493

3483 -#: diff.c:5552

3494 +#: diff.c:5562

3495 msgid "<text>"

3496 msgstr ""

3497

3487 -#: diff.c:5553

3498 +#: diff.c:5563

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

3500 msgstr ""

3501

3491 -#: diff.c:5555 diff.c:5564 diff.c:5567

3502 +#: diff.c:5565 diff.c:5574 diff.c:5577

3503 msgid "<mode>"

3504 msgstr ""

3505

3495 -#: diff.c:5556

3506 +#: diff.c:5566

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

3508 msgstr ""

3509

3499 -#: diff.c:5559

3510 +#: diff.c:5569

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

3512 msgstr ""

3513

3503 -#: diff.c:5562

3514 +#: diff.c:5572

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

3516 msgstr ""

3517

3507 -#: diff.c:5565

3518 +#: diff.c:5575

3519 msgid "moved lines of code are colored differently"

3520 msgstr ""

3521

3511 -#: diff.c:5568

3522 +#: diff.c:5578

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

3524 msgstr ""

3525

3515 -#: diff.c:5571

3526 +#: diff.c:5581

3527 msgid "Other diff options"

3528 msgstr ""

3529

3519 -#: diff.c:5573

3530 +#: diff.c:5583

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

3532 msgstr ""

3533

3523 -#: diff.c:5577

3534 +#: diff.c:5587

3535 msgid "treat all files as text"

3536 msgstr ""

3537

3527 -#: diff.c:5579

3538 +#: diff.c:5589

3539 msgid "swap two inputs, reverse the diff"

3540 msgstr ""

3541

3531 -#: diff.c:5581

3542 +#: diff.c:5591

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

3544 msgstr ""

3545

3535 -#: diff.c:5583

3546 +#: diff.c:5593

3547 msgid "disable all output of the program"

3548 msgstr ""

3549

3539 -#: diff.c:5585

3550 +#: diff.c:5595

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

3552 msgstr ""

3553

3543 -#: diff.c:5587

3554 +#: diff.c:5597

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

3556 msgstr ""

3557

3547 -#: diff.c:5589

3558 +#: diff.c:5599

3559 msgid "<when>"

3560 msgstr ""

3561

3551 -#: diff.c:5590

3562 +#: diff.c:5600

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

3564 msgstr ""

3565

3555 -#: diff.c:5593

3566 +#: diff.c:5603

3567 msgid "<format>"

3568 msgstr ""

3569

3559 -#: diff.c:5594

3570 +#: diff.c:5604

3571 msgid "specify how differences in submodules are shown"

3572 msgstr ""

3573

3563 -#: diff.c:5598

3574 +#: diff.c:5608

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

3576 msgstr ""

3577

3567 -#: diff.c:5601

3578 +#: diff.c:5611

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

3580 msgstr ""

3581

3571 -#: diff.c:5603

3582 +#: diff.c:5613

3583 msgid "<string>"

3584 msgstr ""

3585

3575 -#: diff.c:5604

3586 +#: diff.c:5614

3587 msgid ""

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

3589 "string"

3590 msgstr ""

3591

3581 -#: diff.c:5607

3592 +#: diff.c:5617

3593 msgid ""

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

3595 "regex"

3596 msgstr ""

3597

3587 -#: diff.c:5610

3598 +#: diff.c:5620

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

3600 msgstr ""

3601

3591 -#: diff.c:5613

3602 +#: diff.c:5623

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

3604 msgstr ""

3605

3595 -#: diff.c:5616

3606 +#: diff.c:5626

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

3608 msgstr ""

3609

3599 -#: diff.c:5617 diff.c:5620

3610 +#: diff.c:5627 diff.c:5630

3611 msgid "<path>"

3612 msgstr ""

3613

3603 -#: diff.c:5618

3614 +#: diff.c:5628

3615 msgid "show the change in the specified path first"

3616 msgstr ""

3617

3607 -#: diff.c:5621

3618 +#: diff.c:5631

3619 msgid "skip the output to the specified path"

3620 msgstr ""

3621

3611 -#: diff.c:5623

3622 +#: diff.c:5633

3623 msgid "<object-id>"

3624 msgstr ""

3625

3615 -#: diff.c:5624

3626 +#: diff.c:5634

3627 msgid ""

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

3629 "object"

3630 msgstr ""

3631

3621 -#: diff.c:5626

3632 +#: diff.c:5636

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

3634 msgstr ""

3635

3625 -#: diff.c:5627

3636 +#: diff.c:5637

3637 msgid "select files by diff type"

3638 msgstr ""

3639

3629 -#: diff.c:5629

3640 +#: diff.c:5639

3641 msgid "<file>"

3642 msgstr ""

3643

3633 -#: diff.c:5630

3644 +#: diff.c:5640

3645 msgid "Output to a specific file"

3646 msgstr ""

3647

3637 -#: diff.c:6287

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

3648 +#: diff.c:6298

3649 +msgid "exhaustive rename detection was skipped due to too many files."

3650 msgstr ""

3651

3641 -#: diff.c:6290

3652 +#: diff.c:6301

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

3654 msgstr ""

3655

3645 -#: diff.c:6293

3656 +#: diff.c:6304

3657 #, c-format

3658 msgid ""

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

@@ -3653,7 +3664,7 @@ msgstr ""

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

3665 msgstr ""

3666

3656 -#: diffcore-rename.c:1418

3667 +#: diffcore-rename.c:1510

3668 msgid "Performing inexact rename detection"

3669 msgstr ""

3670

@@ -3662,59 +3673,59 @@ msgstr ""

3673 msgid "No such path '%s' in the diff"

3674 msgstr ""

3675

3665 -#: dir.c:578

3676 +#: dir.c:593

3677 #, c-format

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

3679 msgstr ""

3680

3670 -#: dir.c:718 dir.c:747 dir.c:760

3681 +#: dir.c:733 dir.c:762 dir.c:775

3682 #, c-format

3683 msgid "unrecognized pattern: '%s'"

3684 msgstr ""

3685

3675 -#: dir.c:777 dir.c:791

3686 +#: dir.c:792 dir.c:806

3687 #, c-format

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

3689 msgstr ""

3690

3680 -#: dir.c:809

3691 +#: dir.c:824

3692 #, c-format

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

3694 msgstr ""

3695

3685 -#: dir.c:819

3696 +#: dir.c:834

3697 msgid "disabling cone pattern matching"

3698 msgstr ""

3699

3689 -#: dir.c:1206

3700 +#: dir.c:1221

3701 #, c-format

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

3703 msgstr ""

3704

3694 -#: dir.c:2314

3705 +#: dir.c:2358

3706 #, c-format

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

3708 msgstr ""

3709

3699 -#: dir.c:2614

3710 +#: dir.c:2660

3711 msgid "failed to get kernel name and information"

3712 msgstr ""

3713

3703 -#: dir.c:2738

3714 +#: dir.c:2784

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

3716 msgstr ""

3717

3707 -#: dir.c:3543

3718 +#: dir.c:3617

3719 #, c-format

3720 msgid "index file corrupt in repo %s"

3721 msgstr ""

3722

3712 -#: dir.c:3590 dir.c:3595

3723 +#: dir.c:3664 dir.c:3669

3724 #, c-format

3725 msgid "could not create directories for %s"

3726 msgstr ""

3727

3717 -#: dir.c:3624

3728 +#: dir.c:3698

3729 #, c-format

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

3731 msgstr ""

@@ -3724,11 +3735,11 @@ msgstr ""

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

3736 msgstr ""

3737

3727 -#: entry.c:179

3738 +#: entry.c:176

3739 msgid "Filtering content"

3740 msgstr ""

3741

3731 -#: entry.c:500

3742 +#: entry.c:497

3743 #, c-format

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

3745 msgstr ""

@@ -3903,7 +3914,7 @@ msgstr ""

3914 msgid "source repository is shallow, reject to clone."

3915 msgstr ""

3916

3906 -#: fetch-pack.c:1128 fetch-pack.c:1651

3917 +#: fetch-pack.c:1128 fetch-pack.c:1660

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

3919 msgstr ""

3920

@@ -3925,7 +3936,7 @@ msgstr ""

3936 msgid "Server supports filter"

3937 msgstr ""

3938

3928 -#: fetch-pack.c:1329 fetch-pack.c:2034

3939 +#: fetch-pack.c:1329 fetch-pack.c:2043

3940 msgid "unable to write request to remote"

3941 msgstr ""

3942

@@ -3981,24 +3992,24 @@ msgstr ""

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

3993 msgstr ""

3994

3984 -#: fetch-pack.c:1930

3995 +#: fetch-pack.c:1939

3996 msgid "no matching remote head"

3997 msgstr ""

3998

3988 -#: fetch-pack.c:1953 builtin/clone.c:697

3999 +#: fetch-pack.c:1962 builtin/clone.c:697

4000 msgid "remote did not send all necessary objects"

4001 msgstr ""

4002

3992 -#: fetch-pack.c:2056

4003 +#: fetch-pack.c:2065

4004 msgid "unexpected 'ready' from remote"

4005 msgstr ""

4006

3996 -#: fetch-pack.c:2079

4007 +#: fetch-pack.c:2088

4008 #, c-format

4009 msgid "no such remote ref %s"

4010 msgstr ""

4011

4001 -#: fetch-pack.c:2082

4012 +#: fetch-pack.c:2091

4013 #, c-format

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

4015 msgstr ""

@@ -4018,7 +4029,7 @@ msgstr ""

4029

4030 #: graph.c:98

4031 #, c-format

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

4032 +msgid "ignored invalid color '%.*s' in log.graphColors"

4033 msgstr ""

4034

4035 #: grep.c:531

@@ -4027,18 +4038,18 @@ msgid ""

4038 "with -P under PCRE v2"

4039 msgstr ""

4040

4030 -#: grep.c:1893

4041 +#: grep.c:1895

4042 #, c-format

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

4044 msgstr ""

4045

4035 -#: grep.c:1910 setup.c:176 builtin/clone.c:416 builtin/diff.c:90

4046 +#: grep.c:1912 setup.c:176 builtin/clone.c:416 builtin/diff.c:90

4047 #: builtin/rm.c:136

4048 #, c-format

4049 msgid "failed to stat '%s'"

4050 msgstr ""

4051

4041 -#: grep.c:1921

4052 +#: grep.c:1923

4053 #, c-format

4054 msgid "'%s': short read"

4055 msgstr ""

@@ -4255,7 +4266,7 @@ msgstr ""

4266

4267 #: list-objects-filter-options.c:105

4268 #, c-format

4258 -msgid "'%s' for 'object:type=<type>' isnot a valid object type"

4269 +msgid "'%s' for 'object:type=<type>' is not a valid object type"

4270 msgstr ""

4271

4272 #: list-objects-filter-options.c:124

@@ -4300,7 +4311,7 @@ msgstr ""

4311 msgid "entry '%s' in tree %s has blob mode, but is not a blob"

4312 msgstr ""

4313

4303 -#: list-objects.c:395

4314 +#: list-objects.c:398

4315 #, c-format

4316 msgid "unable to load root tree for commit %s"

4317 msgstr ""

@@ -4340,39 +4351,39 @@ msgstr ""

4351 msgid "bad action '%s' for '%s'"

4352 msgstr ""

4353

4343 -#: merge-ort.c:1116 merge-recursive.c:1205

4354 +#: merge-ort.c:1228 merge-recursive.c:1206

4355 #, c-format

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

4357 msgstr ""

4358

4348 -#: merge-ort.c:1125 merge-recursive.c:1212

4359 +#: merge-ort.c:1237 merge-recursive.c:1213

4360 #, c-format

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

4362 msgstr ""

4363

4353 -#: merge-ort.c:1134 merge-recursive.c:1219

4364 +#: merge-ort.c:1246 merge-recursive.c:1220

4365 #, c-format

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

4367 msgstr ""

4368

4358 -#: merge-ort.c:1144 merge-ort.c:1151

4369 +#: merge-ort.c:1256 merge-ort.c:1263

4370 #, c-format

4371 msgid "Note: Fast-forwarding submodule %s to %s"

4372 msgstr ""

4373

4363 -#: merge-ort.c:1172

4374 +#: merge-ort.c:1284

4375 #, c-format

4376 msgid "Failed to merge submodule %s"

4377 msgstr ""

4378

4368 -#: merge-ort.c:1179

4379 +#: merge-ort.c:1291

4380 #, c-format

4381 msgid ""

4382 "Failed to merge submodule %s, but a possible merge resolution exists:\n"

4383 "%s\n"

4384 msgstr ""

4385

4375 -#: merge-ort.c:1183 merge-recursive.c:1273

4386 +#: merge-ort.c:1295 merge-recursive.c:1274

4387 #, c-format

4388 msgid ""

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

@@ -4383,42 +4394,42 @@ msgid ""

4394 "which will accept this suggestion.\n"

4395 msgstr ""

4396

4386 -#: merge-ort.c:1196

4397 +#: merge-ort.c:1308

4398 #, c-format

4399 msgid ""

4400 "Failed to merge submodule %s, but multiple possible merges exist:\n"

4401 "%s"

4402 msgstr ""

4403

4393 -#: merge-ort.c:1415 merge-recursive.c:1362

4404 +#: merge-ort.c:1527 merge-recursive.c:1363

4405 msgid "Failed to execute internal merge"

4406 msgstr ""

4407

4397 -#: merge-ort.c:1420 merge-recursive.c:1367

4408 +#: merge-ort.c:1532 merge-recursive.c:1368

4409 #, c-format

4410 msgid "Unable to add %s to database"

4411 msgstr ""

4412

4402 -#: merge-ort.c:1427 merge-recursive.c:1400

4413 +#: merge-ort.c:1539 merge-recursive.c:1401

4414 #, c-format

4415 msgid "Auto-merging %s"

4416 msgstr ""

4417

4407 -#: merge-ort.c:1566 merge-recursive.c:2122

4418 +#: merge-ort.c:1678 merge-recursive.c:2123

4419 #, c-format

4420 msgid ""

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

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

4423 msgstr ""

4424

4414 -#: merge-ort.c:1576 merge-recursive.c:2132

4425 +#: merge-ort.c:1688 merge-recursive.c:2133

4426 #, c-format

4427 msgid ""

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

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

4430 msgstr ""

4431

4421 -#: merge-ort.c:1634

4432 +#: merge-ort.c:1746

4433 #, c-format

4434 msgid ""

4435 "CONFLICT (directory rename split): Unclear where to rename %s to; it was "

@@ -4426,47 +4437,47 @@ msgid ""

4437 "majority of the files."

4438 msgstr ""

4439

4429 -#: merge-ort.c:1788 merge-recursive.c:2468

4440 +#: merge-ort.c:1900 merge-recursive.c:2469

4441 #, c-format

4442 msgid ""

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

4444 "renamed."

4445 msgstr ""

4446

4436 -#: merge-ort.c:1932 merge-recursive.c:3244

4447 +#: merge-ort.c:2044 merge-recursive.c:3252

4448 #, c-format

4449 msgid ""

4450 "Path updated: %s added in %s inside a directory that was renamed in %s; "

4451 "moving it to %s."

4452 msgstr ""

4453

4443 -#: merge-ort.c:1939 merge-recursive.c:3251

4454 +#: merge-ort.c:2051 merge-recursive.c:3259

4455 #, c-format

4456 msgid ""

4457 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "

4458 "%s; moving it to %s."

4459 msgstr ""

4460

4450 -#: merge-ort.c:1952 merge-recursive.c:3247

4461 +#: merge-ort.c:2064 merge-recursive.c:3255

4462 #, c-format

4463 msgid ""

4464 "CONFLICT (file location): %s added in %s inside a directory that was renamed "

4465 "in %s, suggesting it should perhaps be moved to %s."

4466 msgstr ""

4467

4457 -#: merge-ort.c:1960 merge-recursive.c:3254

4468 +#: merge-ort.c:2072 merge-recursive.c:3262

4469 #, c-format

4470 msgid ""

4471 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "

4472 "was renamed in %s, suggesting it should perhaps be moved to %s."

4473 msgstr ""

4474

4464 -#: merge-ort.c:2103

4475 +#: merge-ort.c:2228

4476 #, c-format

4477 msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."

4478 msgstr ""

4479

4469 -#: merge-ort.c:2198

4480 +#: merge-ort.c:2323

4481 #, c-format

4482 msgid ""

4483 "CONFLICT (rename involved in collision): rename of %s -> %s has content "

@@ -4474,67 +4485,67 @@ msgid ""

4485 "markers."

4486 msgstr ""

4487

4477 -#: merge-ort.c:2217 merge-ort.c:2241

4488 +#: merge-ort.c:2342 merge-ort.c:2366

4489 #, c-format

4490 msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."

4491 msgstr ""

4492

4482 -#: merge-ort.c:2550 merge-recursive.c:3002

4493 +#: merge-ort.c:2819 merge-recursive.c:3013

4494 #, c-format

4495 msgid "cannot read object %s"

4496 msgstr ""

4497

4487 -#: merge-ort.c:2553 merge-recursive.c:3005

4498 +#: merge-ort.c:2822 merge-recursive.c:3016

4499 #, c-format

4500 msgid "object %s is not a blob"

4501 msgstr ""

4502

4492 -#: merge-ort.c:2981

4503 +#: merge-ort.c:3250

4504 #, c-format

4505 msgid ""

4506 "CONFLICT (file/directory): directory in the way of %s from %s; moving it to "

4507 "%s instead."

4508 msgstr ""

4509

4499 -#: merge-ort.c:3055

4510 +#: merge-ort.c:3326

4511 #, c-format

4512 msgid ""

4513 "CONFLICT (distinct types): %s had different types on each side; renamed both "

4514 "of them so each can be recorded somewhere."

4515 msgstr ""

4516

4506 -#: merge-ort.c:3062

4517 +#: merge-ort.c:3333

4518 #, c-format

4519 msgid ""

4520 "CONFLICT (distinct types): %s had different types on each side; renamed one "

4521 "of them so each can be recorded somewhere."

4522 msgstr ""

4523

4513 -#: merge-ort.c:3162 merge-recursive.c:3081

4524 +#: merge-ort.c:3433 merge-recursive.c:3092

4525 msgid "content"

4526 msgstr ""

4527

4517 -#: merge-ort.c:3164 merge-recursive.c:3085

4528 +#: merge-ort.c:3435 merge-recursive.c:3096

4529 msgid "add/add"

4530 msgstr ""

4531

4521 -#: merge-ort.c:3166 merge-recursive.c:3130

4532 +#: merge-ort.c:3437 merge-recursive.c:3141

4533 msgid "submodule"

4534 msgstr ""

4535

4525 -#: merge-ort.c:3168 merge-recursive.c:3131

4536 +#: merge-ort.c:3439 merge-recursive.c:3142

4537 #, c-format

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

4539 msgstr ""

4540

4530 -#: merge-ort.c:3198

4541 +#: merge-ort.c:3470

4542 #, c-format

4543 msgid ""

4544 "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "

4545 "of %s left in tree."

4546 msgstr ""

4547

4537 -#: merge-ort.c:3433

4548 +#: merge-ort.c:3757

4549 #, c-format

4550 msgid ""

4551 "Note: %s not up to date and in way of checking out conflicted version; old "

@@ -4544,192 +4555,192 @@ msgstr ""

4555 #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge

4556 #. base, and 2-3) the trees for the two trees we're merging.

4557 #.

4547 -#: merge-ort.c:3730

4558 +#: merge-ort.c:4116

4559 #, c-format

4560 msgid "collecting merge info failed for trees %s, %s, %s"

4561 msgstr ""

4562

4552 -#: merge-ort-wrappers.c:13 merge-recursive.c:3699

4563 +#: merge-ort-wrappers.c:13 merge-recursive.c:3707

4564 #, c-format

4565 msgid ""

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

4567 " %s"

4568 msgstr ""

4569

4559 -#: merge-ort-wrappers.c:33 merge-recursive.c:3465 builtin/merge.c:402

4570 +#: merge-ort-wrappers.c:33 merge-recursive.c:3473 builtin/merge.c:402

4571 msgid "Already up to date."

4572 msgstr ""

4573

4563 -#: merge-recursive.c:356

4574 +#: merge-recursive.c:357

4575 msgid "(bad commit)\n"

4576 msgstr ""

4577

4567 -#: merge-recursive.c:379

4578 +#: merge-recursive.c:380

4579 #, c-format

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

4581 msgstr ""

4582

4572 -#: merge-recursive.c:388

4583 +#: merge-recursive.c:389

4584 #, c-format

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

4586 msgstr ""

4587

4577 -#: merge-recursive.c:876

4588 +#: merge-recursive.c:877

4589 #, c-format

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

4591 msgstr ""

4592

4582 -#: merge-recursive.c:887

4593 +#: merge-recursive.c:888

4594 #, c-format

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

4596 msgstr ""

4597

4587 -#: merge-recursive.c:901 merge-recursive.c:920

4598 +#: merge-recursive.c:902 merge-recursive.c:921

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

4600 msgstr ""

4601

4591 -#: merge-recursive.c:910

4602 +#: merge-recursive.c:911

4603 #, c-format

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

4605 msgstr ""

4606

4596 -#: merge-recursive.c:951 builtin/cat-file.c:41

4607 +#: merge-recursive.c:952 builtin/cat-file.c:41

4608 #, c-format

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

4610 msgstr ""

4611

4601 -#: merge-recursive.c:956

4612 +#: merge-recursive.c:957

4613 #, c-format

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

4615 msgstr ""

4616

4606 -#: merge-recursive.c:981

4617 +#: merge-recursive.c:982

4618 #, c-format

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

4620 msgstr ""

4621

4611 -#: merge-recursive.c:992

4622 +#: merge-recursive.c:993

4623 #, c-format

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

4625 msgstr ""

4626

4616 -#: merge-recursive.c:997

4627 +#: merge-recursive.c:998

4628 #, c-format

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

4630 msgstr ""

4631

4621 -#: merge-recursive.c:1227 merge-recursive.c:1239

4632 +#: merge-recursive.c:1228 merge-recursive.c:1240

4633 #, c-format

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

4635 msgstr ""

4636

4626 -#: merge-recursive.c:1230 merge-recursive.c:1242

4637 +#: merge-recursive.c:1231 merge-recursive.c:1243

4638 #, c-format

4639 msgid "Fast-forwarding submodule %s"

4640 msgstr ""

4641

4631 -#: merge-recursive.c:1265

4642 +#: merge-recursive.c:1266

4643 #, c-format

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

4645 msgstr ""

4646

4636 -#: merge-recursive.c:1269

4647 +#: merge-recursive.c:1270

4648 #, c-format

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

4650 msgstr ""

4651

4641 -#: merge-recursive.c:1270

4652 +#: merge-recursive.c:1271

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

4654 msgstr ""

4655

4645 -#: merge-recursive.c:1282

4656 +#: merge-recursive.c:1283

4657 #, c-format

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

4659 msgstr ""

4660

4650 -#: merge-recursive.c:1424

4661 +#: merge-recursive.c:1425

4662 #, c-format

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

4664 msgstr ""

4665

4655 -#: merge-recursive.c:1496

4666 +#: merge-recursive.c:1497

4667 #, c-format

4668 msgid ""

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

4670 "in tree."

4671 msgstr ""

4672

4662 -#: merge-recursive.c:1501

4673 +#: merge-recursive.c:1502

4674 #, c-format

4675 msgid ""

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

4677 "left in tree."

4678 msgstr ""

4679

4669 -#: merge-recursive.c:1508

4680 +#: merge-recursive.c:1509

4681 #, c-format

4682 msgid ""

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

4684 "in tree at %s."

4685 msgstr ""

4686

4676 -#: merge-recursive.c:1513

4687 +#: merge-recursive.c:1514

4688 #, c-format

4689 msgid ""

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

4691 "left in tree at %s."

4692 msgstr ""

4693

4683 -#: merge-recursive.c:1548

4694 +#: merge-recursive.c:1549

4695 msgid "rename"

4696 msgstr ""

4697

4687 -#: merge-recursive.c:1548

4698 +#: merge-recursive.c:1549

4699 msgid "renamed"

4700 msgstr ""

4701

4691 -#: merge-recursive.c:1599 merge-recursive.c:2505 merge-recursive.c:3158

4702 +#: merge-recursive.c:1600 merge-recursive.c:2506 merge-recursive.c:3169

4703 #, c-format

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

4705 msgstr ""

4706

4696 -#: merge-recursive.c:1609

4707 +#: merge-recursive.c:1610

4708 #, c-format

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

4710 msgstr ""

4711

4701 -#: merge-recursive.c:1667

4712 +#: merge-recursive.c:1668

4713 #, c-format

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

4715 msgstr ""

4716

4706 -#: merge-recursive.c:1698

4717 +#: merge-recursive.c:1699

4718 #, c-format

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

4720 msgstr ""

4721

4711 -#: merge-recursive.c:1703

4722 +#: merge-recursive.c:1704

4723 #, c-format

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

4725 msgstr ""

4726

4716 -#: merge-recursive.c:1730

4727 +#: merge-recursive.c:1731

4728 #, c-format

4729 msgid ""

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

4731 "\"->\"%s\" in \"%s\"%s"

4732 msgstr ""

4733

4723 -#: merge-recursive.c:1735

4734 +#: merge-recursive.c:1736

4735 msgid " (left unresolved)"

4736 msgstr ""

4737

4727 -#: merge-recursive.c:1827

4738 +#: merge-recursive.c:1828

4739 #, c-format

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

4741 msgstr ""

4742

4732 -#: merge-recursive.c:2090

4743 +#: merge-recursive.c:2091

4744 #, c-format

4745 msgid ""

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

@@ -4737,85 +4748,85 @@ msgid ""

4748 "getting a majority of the files."

4749 msgstr ""

4750

4740 -#: merge-recursive.c:2224

4751 +#: merge-recursive.c:2225

4752 #, c-format

4753 msgid ""

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

4755 ">%s in %s"

4756 msgstr ""

4757

4747 -#: merge-recursive.c:3069

4758 +#: merge-recursive.c:3080

4759 msgid "modify"

4760 msgstr ""

4761

4751 -#: merge-recursive.c:3069

4762 +#: merge-recursive.c:3080

4763 msgid "modified"

4764 msgstr ""

4765

4755 -#: merge-recursive.c:3108

4766 +#: merge-recursive.c:3119

4767 #, c-format

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

4769 msgstr ""

4770

4760 -#: merge-recursive.c:3161

4771 +#: merge-recursive.c:3172

4772 #, c-format

4773 msgid "Adding as %s instead"

4774 msgstr ""

4775

4765 -#: merge-recursive.c:3368

4776 +#: merge-recursive.c:3376

4777 #, c-format

4778 msgid "Removing %s"

4779 msgstr ""

4780

4770 -#: merge-recursive.c:3391

4781 +#: merge-recursive.c:3399

4782 msgid "file/directory"

4783 msgstr ""

4784

4774 -#: merge-recursive.c:3396

4785 +#: merge-recursive.c:3404

4786 msgid "directory/file"

4787 msgstr ""

4788

4778 -#: merge-recursive.c:3403

4789 +#: merge-recursive.c:3411

4790 #, c-format

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

4792 msgstr ""

4793

4783 -#: merge-recursive.c:3412

4794 +#: merge-recursive.c:3420

4795 #, c-format

4796 msgid "Adding %s"

4797 msgstr ""

4798

4788 -#: merge-recursive.c:3421

4799 +#: merge-recursive.c:3429

4800 #, c-format

4801 msgid "CONFLICT (add/add): Merge conflict in %s"

4802 msgstr ""

4803

4793 -#: merge-recursive.c:3474

4804 +#: merge-recursive.c:3482

4805 #, c-format

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

4807 msgstr ""

4808

4798 -#: merge-recursive.c:3568

4809 +#: merge-recursive.c:3576

4810 msgid "Merging:"

4811 msgstr ""

4812

4802 -#: merge-recursive.c:3581

4813 +#: merge-recursive.c:3589

4814 #, c-format

4815 msgid "found %u common ancestor:"

4816 msgid_plural "found %u common ancestors:"

4817 msgstr[0] ""

4818 msgstr[1] ""

4819

4809 -#: merge-recursive.c:3631

4820 +#: merge-recursive.c:3639

4821 msgid "merge returned no commit"

4822 msgstr ""

4823

4813 -#: merge-recursive.c:3796

4824 +#: merge-recursive.c:3804

4825 #, c-format

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

4827 msgstr ""

4828

4818 -#: merge-recursive.c:3814 builtin/merge.c:716 builtin/merge.c:900

4829 +#: merge-recursive.c:3822 builtin/merge.c:716 builtin/merge.c:900

4830 #: builtin/stash.c:473

4831 msgid "Unable to write index."

4832 msgstr ""

@@ -4824,7 +4835,7 @@ msgstr ""

4835 msgid "failed to read the cache"

4836 msgstr ""

4837

4827 -#: merge.c:109 rerere.c:704 builtin/am.c:1931 builtin/am.c:1965

4838 +#: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966

4839 #: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821

4840 #: builtin/stash.c:267

4841 msgid "unable to write new index file"

@@ -4899,106 +4910,114 @@ msgstr ""

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

4911 msgstr ""

4912

4902 -#: midx.c:880 builtin/index-pack.c:1535

4913 +#: midx.c:880 builtin/index-pack.c:1533

4914 msgid "cannot store reverse index file"

4915 msgstr ""

4916

4906 -#: midx.c:933

4917 +#: midx.c:920

4918 +msgid "ignoring existing multi-pack-index; checksum mismatch"

4919 +msgstr ""

4920 +

4921 +#: midx.c:943

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

4923 msgstr ""

4924

4910 -#: midx.c:979

4925 +#: midx.c:989

4926 #, c-format

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

4928 msgstr ""

4929

4915 -#: midx.c:1024

4930 +#: midx.c:1034

4931 #, c-format

4932 msgid "unknown preferred pack: '%s'"

4933 msgstr ""

4934

4920 -#: midx.c:1029

4935 +#: midx.c:1039

4936 #, c-format

4937 msgid "preferred pack '%s' is expired"

4938 msgstr ""

4939

4925 -#: midx.c:1045

4940 +#: midx.c:1055

4941 msgid "no pack files to index."

4942 msgstr ""

4943

4929 -#: midx.c:1125 builtin/clean.c:37

4944 +#: midx.c:1135 builtin/clean.c:37

4945 #, c-format

4946 msgid "failed to remove %s"

4947 msgstr ""

4948

4934 -#: midx.c:1156

4949 +#: midx.c:1166

4950 #, c-format

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

4952 msgstr ""

4953

4939 -#: midx.c:1214

4954 +#: midx.c:1225

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

4956 msgstr ""

4957

4943 -#: midx.c:1222

4958 +#: midx.c:1233

4959 +msgid "incorrect checksum"

4960 +msgstr ""

4961 +

4962 +#: midx.c:1236

4963 msgid "Looking for referenced packfiles"

4964 msgstr ""

4965

4947 -#: midx.c:1237

4966 +#: midx.c:1251

4967 #, c-format

4968 msgid ""

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

4970 msgstr ""

4971

4953 -#: midx.c:1242

4972 +#: midx.c:1256

4973 msgid "the midx contains no oid"

4974 msgstr ""

4975

4957 -#: midx.c:1251

4976 +#: midx.c:1265

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

4978 msgstr ""

4979

4961 -#: midx.c:1260

4980 +#: midx.c:1274

4981 #, c-format

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

4983 msgstr ""

4984

4966 -#: midx.c:1280

4985 +#: midx.c:1294

4986 msgid "Sorting objects by packfile"

4987 msgstr ""

4988

4970 -#: midx.c:1287

4989 +#: midx.c:1301

4990 msgid "Verifying object offsets"

4991 msgstr ""

4992

4974 -#: midx.c:1303

4993 +#: midx.c:1317

4994 #, c-format

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

4996 msgstr ""

4997

4979 -#: midx.c:1309

4998 +#: midx.c:1323

4999 #, c-format

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

5001 msgstr ""

5002

4984 -#: midx.c:1318

5003 +#: midx.c:1332

5004 #, c-format

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

5006 msgstr ""

5007

4989 -#: midx.c:1343

5008 +#: midx.c:1357

5009 msgid "Counting referenced objects"

5010 msgstr ""

5011

4993 -#: midx.c:1353

5012 +#: midx.c:1367

5013 msgid "Finding and deleting unreferenced packfiles"

5014 msgstr ""

5015

4997 -#: midx.c:1544

5016 +#: midx.c:1558

5017 msgid "could not start pack-objects"

5018 msgstr ""

5019

5001 -#: midx.c:1564

5020 +#: midx.c:1578

5021 msgid "could not finish pack-objects"

5022 msgstr ""

5023

@@ -5058,265 +5077,266 @@ msgstr ""

5077 msgid "object directory %s does not exist; check .git/objects/info/alternates"

5078 msgstr ""

5079

5061 -#: object-file.c:577

5080 +#: object-file.c:584

5081 #, c-format

5082 msgid "unable to normalize alternate object path: %s"

5083 msgstr ""

5084

5066 -#: object-file.c:649

5085 +#: object-file.c:658

5086 #, c-format

5087 msgid "%s: ignoring alternate object stores, nesting too deep"

5088 msgstr ""

5089

5071 -#: object-file.c:656

5090 +#: object-file.c:665

5091 #, c-format

5092 msgid "unable to normalize object directory: %s"

5093 msgstr ""

5094

5076 -#: object-file.c:699

5095 +#: object-file.c:708

5096 msgid "unable to fdopen alternates lockfile"

5097 msgstr ""

5098

5080 -#: object-file.c:717

5099 +#: object-file.c:726

5100 msgid "unable to read alternates file"

5101 msgstr ""

5102

5084 -#: object-file.c:724

5103 +#: object-file.c:733

5104 msgid "unable to move new alternates file into place"

5105 msgstr ""

5106

5088 -#: object-file.c:759

5107 +#: object-file.c:768

5108 #, c-format

5109 msgid "path '%s' does not exist"

5110 msgstr ""

5111

5093 -#: object-file.c:780

5112 +#: object-file.c:789

5113 #, c-format

5114 msgid "reference repository '%s' as a linked checkout is not supported yet."

5115 msgstr ""

5116

5098 -#: object-file.c:786

5117 +#: object-file.c:795

5118 #, c-format

5119 msgid "reference repository '%s' is not a local repository."

5120 msgstr ""

5121

5103 -#: object-file.c:792

5122 +#: object-file.c:801

5123 #, c-format

5124 msgid "reference repository '%s' is shallow"

5125 msgstr ""

5126

5108 -#: object-file.c:800

5127 +#: object-file.c:809

5128 #, c-format

5129 msgid "reference repository '%s' is grafted"

5130 msgstr ""

5131

5113 -#: object-file.c:860

5132 +#: object-file.c:869

5133 #, c-format

5134 msgid "invalid line while parsing alternate refs: %s"

5135 msgstr ""

5136

5118 -#: object-file.c:1010

5137 +#: object-file.c:1019

5138 #, c-format

5139 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"

5140 msgstr ""

5141

5123 -#: object-file.c:1031

5124 -msgid "mmap failed"

5142 +#: object-file.c:1054

5143 +#, c-format

5144 +msgid "mmap failed%s"

5145 msgstr ""

5146

5127 -#: object-file.c:1195

5147 +#: object-file.c:1218

5148 #, c-format

5149 msgid "object file %s is empty"

5150 msgstr ""

5151

5132 -#: object-file.c:1330 object-file.c:2524

5152 +#: object-file.c:1353 object-file.c:2548

5153 #, c-format

5154 msgid "corrupt loose object '%s'"

5155 msgstr ""

5156

5137 -#: object-file.c:1332 object-file.c:2528

5157 +#: object-file.c:1355 object-file.c:2552

5158 #, c-format

5159 msgid "garbage at end of loose object '%s'"

5160 msgstr ""

5161

5142 -#: object-file.c:1374

5162 +#: object-file.c:1397

5163 msgid "invalid object type"

5164 msgstr ""

5165

5146 -#: object-file.c:1458

5166 +#: object-file.c:1481

5167 #, c-format

5168 msgid "unable to unpack %s header with --allow-unknown-type"

5169 msgstr ""

5170

5151 -#: object-file.c:1461

5171 +#: object-file.c:1484

5172 #, c-format

5173 msgid "unable to unpack %s header"

5174 msgstr ""

5175

5156 -#: object-file.c:1467

5176 +#: object-file.c:1490

5177 #, c-format

5178 msgid "unable to parse %s header with --allow-unknown-type"

5179 msgstr ""

5180

5161 -#: object-file.c:1470

5181 +#: object-file.c:1493

5182 #, c-format

5183 msgid "unable to parse %s header"

5184 msgstr ""

5185

5166 -#: object-file.c:1697

5186 +#: object-file.c:1717

5187 #, c-format

5188 msgid "failed to read object %s"

5189 msgstr ""

5190

5171 -#: object-file.c:1701

5191 +#: object-file.c:1721

5192 #, c-format

5193 msgid "replacement %s not found for %s"

5194 msgstr ""

5195

5176 -#: object-file.c:1705

5196 +#: object-file.c:1725

5197 #, c-format

5198 msgid "loose object %s (stored in %s) is corrupt"

5199 msgstr ""

5200

5181 -#: object-file.c:1709

5201 +#: object-file.c:1729

5202 #, c-format

5203 msgid "packed object %s (stored in %s) is corrupt"

5204 msgstr ""

5205

5186 -#: object-file.c:1814

5206 +#: object-file.c:1834

5207 #, c-format

5208 msgid "unable to write file %s"

5209 msgstr ""

5210

5191 -#: object-file.c:1821

5211 +#: object-file.c:1841

5212 #, c-format

5213 msgid "unable to set permission to '%s'"

5214 msgstr ""

5215

5196 -#: object-file.c:1828

5216 +#: object-file.c:1848

5217 msgid "file write error"

5218 msgstr ""

5219

5200 -#: object-file.c:1848

5220 +#: object-file.c:1868

5221 msgid "error when closing loose object file"

5222 msgstr ""

5223

5204 -#: object-file.c:1913

5224 +#: object-file.c:1933

5225 #, c-format

5226 msgid "insufficient permission for adding an object to repository database %s"

5227 msgstr ""

5228

5209 -#: object-file.c:1915

5229 +#: object-file.c:1935

5230 msgid "unable to create temporary file"

5231 msgstr ""

5232

5213 -#: object-file.c:1939

5233 +#: object-file.c:1959

5234 msgid "unable to write loose object file"

5235 msgstr ""

5236

5217 -#: object-file.c:1945

5237 +#: object-file.c:1965

5238 #, c-format

5239 msgid "unable to deflate new object %s (%d)"

5240 msgstr ""

5241

5222 -#: object-file.c:1949

5242 +#: object-file.c:1969

5243 #, c-format

5244 msgid "deflateEnd on object %s failed (%d)"

5245 msgstr ""

5246

5227 -#: object-file.c:1953

5247 +#: object-file.c:1973

5248 #, c-format

5249 msgid "confused by unstable object source data for %s"

5250 msgstr ""

5251

5232 -#: object-file.c:1963 builtin/pack-objects.c:1097

5252 +#: object-file.c:1983 builtin/pack-objects.c:1237

5253 #, c-format

5254 msgid "failed utime() on %s"

5255 msgstr ""

5256

5237 -#: object-file.c:2040

5257 +#: object-file.c:2060

5258 #, c-format

5259 msgid "cannot read object for %s"

5260 msgstr ""

5261

5242 -#: object-file.c:2091

5262 +#: object-file.c:2111

5263 msgid "corrupt commit"

5264 msgstr ""

5265

5246 -#: object-file.c:2099

5266 +#: object-file.c:2119

5267 msgid "corrupt tag"

5268 msgstr ""

5269

5250 -#: object-file.c:2199

5270 +#: object-file.c:2219

5271 #, c-format

5272 msgid "read error while indexing %s"

5273 msgstr ""

5274

5255 -#: object-file.c:2202

5275 +#: object-file.c:2222

5276 #, c-format

5277 msgid "short read while indexing %s"

5278 msgstr ""

5279

5260 -#: object-file.c:2275 object-file.c:2285

5280 +#: object-file.c:2295 object-file.c:2305

5281 #, c-format

5282 msgid "%s: failed to insert into database"

5283 msgstr ""

5284

5265 -#: object-file.c:2291

5285 +#: object-file.c:2311

5286 #, c-format

5287 msgid "%s: unsupported file type"

5288 msgstr ""

5289

5270 -#: object-file.c:2315

5290 +#: object-file.c:2335

5291 #, c-format

5292 msgid "%s is not a valid object"

5293 msgstr ""

5294

5275 -#: object-file.c:2317

5295 +#: object-file.c:2337

5296 #, c-format

5297 msgid "%s is not a valid '%s' object"

5298 msgstr ""

5299

5280 -#: object-file.c:2344 builtin/index-pack.c:192

5300 +#: object-file.c:2364 builtin/index-pack.c:192

5301 #, c-format

5302 msgid "unable to open %s"

5303 msgstr ""

5304

5285 -#: object-file.c:2535 object-file.c:2588

5305 +#: object-file.c:2559 object-file.c:2612

5306 #, c-format

5307 msgid "hash mismatch for %s (expected %s)"

5308 msgstr ""

5309

5290 -#: object-file.c:2559

5310 +#: object-file.c:2583

5311 #, c-format

5312 msgid "unable to mmap %s"

5313 msgstr ""

5314

5295 -#: object-file.c:2564

5315 +#: object-file.c:2588

5316 #, c-format

5317 msgid "unable to unpack header of %s"

5318 msgstr ""

5319

5300 -#: object-file.c:2570

5320 +#: object-file.c:2594

5321 #, c-format

5322 msgid "unable to parse header of %s"

5323 msgstr ""

5324

5305 -#: object-file.c:2581

5325 +#: object-file.c:2605

5326 #, c-format

5327 msgid "unable to unpack contents of %s"

5328 msgstr ""

5329

5310 -#: object-name.c:486

5330 +#: object-name.c:480

5331 #, c-format

5332 msgid "short object ID %s is ambiguous"

5333 msgstr ""

5334

5315 -#: object-name.c:497

5335 +#: object-name.c:491

5336 msgid "The candidates are:"

5337 msgstr ""

5338

5319 -#: object-name.c:796

5339 +#: object-name.c:790

5340 msgid ""

5341 "Git normally never creates a ref that ends with 40 hex characters\n"

5342 "because it will be ignored when you just specify 40-hex. These refs\n"

@@ -5329,62 +5349,62 @@ msgid ""

5349 "running \"git config advice.objectNameWarning false\""

5350 msgstr ""

5351

5332 -#: object-name.c:916

5352 +#: object-name.c:910

5353 #, c-format

5354 msgid "log for '%.*s' only goes back to %s"

5355 msgstr ""

5356

5337 -#: object-name.c:924

5357 +#: object-name.c:918

5358 #, c-format

5359 msgid "log for '%.*s' only has %d entries"

5360 msgstr ""

5361

5342 -#: object-name.c:1702

5362 +#: object-name.c:1696

5363 #, c-format

5364 msgid "path '%s' exists on disk, but not in '%.*s'"

5365 msgstr ""

5366

5347 -#: object-name.c:1708

5367 +#: object-name.c:1702

5368 #, c-format

5369 msgid ""

5370 "path '%s' exists, but not '%s'\n"

5371 "hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"

5372 msgstr ""

5373

5354 -#: object-name.c:1717

5374 +#: object-name.c:1711

5375 #, c-format

5376 msgid "path '%s' does not exist in '%.*s'"

5377 msgstr ""

5378

5359 -#: object-name.c:1745

5379 +#: object-name.c:1739

5380 #, c-format

5381 msgid ""

5382 "path '%s' is in the index, but not at stage %d\n"

5383 "hint: Did you mean ':%d:%s'?"

5384 msgstr ""

5385

5366 -#: object-name.c:1761

5386 +#: object-name.c:1755

5387 #, c-format

5388 msgid ""

5389 "path '%s' is in the index, but not '%s'\n"

5390 "hint: Did you mean ':%d:%s' aka ':%d:./%s'?"

5391 msgstr ""

5392

5373 -#: object-name.c:1769

5393 +#: object-name.c:1763

5394 #, c-format

5395 msgid "path '%s' exists on disk, but not in the index"

5396 msgstr ""

5397

5378 -#: object-name.c:1771

5398 +#: object-name.c:1765

5399 #, c-format

5400 msgid "path '%s' does not exist (neither on disk nor in the index)"

5401 msgstr ""

5402

5383 -#: object-name.c:1784

5403 +#: object-name.c:1778

5404 msgid "relative path syntax can't be used outside working tree"

5405 msgstr ""

5406

5387 -#: object-name.c:1922

5407 +#: object-name.c:1916

5408 #, c-format

5409 msgid "invalid object name '%.*s'."

5410 msgstr ""

@@ -5399,27 +5419,27 @@ msgstr ""

5419 msgid "object %s is a %s, not a %s"

5420 msgstr ""

5421

5402 -#: object.c:232

5422 +#: object.c:250

5423 #, c-format

5424 msgid "object %s has unknown type id %d"

5425 msgstr ""

5426

5407 -#: object.c:245

5427 +#: object.c:263

5428 #, c-format

5429 msgid "unable to parse object: %s"

5430 msgstr ""

5431

5412 -#: object.c:265 object.c:277

5432 +#: object.c:283 object.c:295

5433 #, c-format

5434 msgid "hash mismatch %s"

5435 msgstr ""

5436

5417 -#: pack-bitmap.c:844 pack-bitmap.c:850 builtin/pack-objects.c:2251

5437 +#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411

5438 #, c-format

5439 msgid "unable to get size of %s"

5440 msgstr ""

5441

5422 -#: pack-bitmap.c:1547 builtin/rev-list.c:92

5442 +#: pack-bitmap.c:1571 builtin/rev-list.c:92

5443 #, c-format

5444 msgid "unable to get disk usage of %s"

5445 msgstr ""

@@ -5472,12 +5492,17 @@ msgstr ""

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

5493 msgstr ""

5494

5475 -#: packfile.c:1937

5495 +#: packfile.c:655

5496 +#, c-format

5497 +msgid "packfile %s cannot be mapped%s"

5498 +msgstr ""

5499 +

5500 +#: packfile.c:1934

5501 #, c-format

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

5503 msgstr ""

5504

5480 -#: packfile.c:1941

5505 +#: packfile.c:1938

5506 #, c-format

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

5508 msgstr ""

@@ -5678,7 +5703,7 @@ msgid "unable to write delim packet"

5703 msgstr ""

5704

5705 #: pkt-line.c:106

5681 -msgid "unable to write stateless separator packet"

5706 +msgid "unable to write response end packet"

5707 msgstr ""

5708

5709 #: pkt-line.c:113

@@ -5738,19 +5763,19 @@ msgstr ""

5763 msgid "unable to parse --pretty format"

5764 msgstr ""

5765

5741 -#: promisor-remote.c:30

5766 +#: promisor-remote.c:31

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

5768 msgstr ""

5769

5745 -#: promisor-remote.c:35 promisor-remote.c:37

5770 +#: promisor-remote.c:38 promisor-remote.c:40

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

5772 msgstr ""

5773

5749 -#: promisor-remote.c:41

5774 +#: promisor-remote.c:44

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

5776 msgstr ""

5777

5753 -#: promisor-remote.c:53

5778 +#: promisor-remote.c:54

5779 #, c-format

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

5781 msgstr ""

@@ -5771,7 +5796,7 @@ msgstr ""

5796 msgid "could not read `log` output"

5797 msgstr ""

5798

5774 -#: range-diff.c:101 sequencer.c:5551

5799 +#: range-diff.c:101 sequencer.c:5550

5800 #, c-format

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

5802 msgstr ""

@@ -5788,213 +5813,213 @@ msgstr ""

5813 msgid "could not parse git header '%.*s'"

5814 msgstr ""

5815

5791 -#: range-diff.c:306

5816 +#: range-diff.c:307

5817 msgid "failed to generate diff"

5818 msgstr ""

5819

5795 -#: range-diff.c:558

5820 +#: range-diff.c:559

5821 msgid "--left-only and --right-only are mutually exclusive"

5822 msgstr ""

5823

5799 -#: range-diff.c:561 range-diff.c:563

5824 +#: range-diff.c:562 range-diff.c:564

5825 #, c-format

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

5827 msgstr ""

5828

5804 -#: read-cache.c:708

5829 +#: read-cache.c:710

5830 #, c-format

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

5832 msgstr ""

5833

5809 -#: read-cache.c:724

5834 +#: read-cache.c:726

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

5836 msgstr ""

5837

5813 -#: read-cache.c:746

5838 +#: read-cache.c:748

5839 #, c-format

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

5841 msgstr ""

5842

5818 -#: read-cache.c:751

5843 +#: read-cache.c:753

5844 #, c-format

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

5846 msgstr ""

5847

5823 -#: read-cache.c:803

5848 +#: read-cache.c:805

5849 #, c-format

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

5851 msgstr ""

5852

5828 -#: read-cache.c:822

5853 +#: read-cache.c:824

5854 #, c-format

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

5856 msgstr ""

5857

5833 -#: read-cache.c:833

5858 +#: read-cache.c:835

5859 #, c-format

5860 msgid "unable to stat '%s'"

5861 msgstr ""

5862

5838 -#: read-cache.c:1356

5863 +#: read-cache.c:1358

5864 #, c-format

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

5866 msgstr ""

5867

5843 -#: read-cache.c:1571

5868 +#: read-cache.c:1573

5869 msgid "Refresh index"

5870 msgstr ""

5871

5847 -#: read-cache.c:1700

5872 +#: read-cache.c:1705

5873 #, c-format

5874 msgid ""

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

5876 "Using version %i"

5877 msgstr ""

5878

5854 -#: read-cache.c:1710

5879 +#: read-cache.c:1715

5880 #, c-format

5881 msgid ""

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

5883 "Using version %i"

5884 msgstr ""

5885

5861 -#: read-cache.c:1766

5886 +#: read-cache.c:1771

5887 #, c-format

5888 msgid "bad signature 0x%08x"

5889 msgstr ""

5890

5866 -#: read-cache.c:1769

5891 +#: read-cache.c:1774

5892 #, c-format

5893 msgid "bad index version %d"

5894 msgstr ""

5895

5871 -#: read-cache.c:1778

5896 +#: read-cache.c:1783

5897 msgid "bad index file sha1 signature"

5898 msgstr ""

5899

5875 -#: read-cache.c:1812

5900 +#: read-cache.c:1817

5901 #, c-format

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

5903 msgstr ""

5904

5880 -#: read-cache.c:1814

5905 +#: read-cache.c:1819

5906 #, c-format

5907 msgid "ignoring %.4s extension"

5908 msgstr ""

5909

5885 -#: read-cache.c:1851

5910 +#: read-cache.c:1856

5911 #, c-format

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

5913 msgstr ""

5914

5890 -#: read-cache.c:1867

5915 +#: read-cache.c:1872

5916 #, c-format

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

5918 msgstr ""

5919

5895 -#: read-cache.c:1924

5920 +#: read-cache.c:1929

5921 msgid "unordered stage entries in index"

5922 msgstr ""

5923

5899 -#: read-cache.c:1927

5924 +#: read-cache.c:1932

5925 #, c-format

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

5927 msgstr ""

5928

5904 -#: read-cache.c:1930

5929 +#: read-cache.c:1935

5930 #, c-format

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

5932 msgstr ""

5933

5909 -#: read-cache.c:2036 read-cache.c:2333 rerere.c:549 rerere.c:583 rerere.c:1095

5910 -#: submodule.c:1635 builtin/add.c:575 builtin/check-ignore.c:183

5911 -#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:991

5934 +#: read-cache.c:2041 read-cache.c:2339 rerere.c:549 rerere.c:583 rerere.c:1095

5935 +#: submodule.c:1622 builtin/add.c:575 builtin/check-ignore.c:183

5936 +#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:987

5937 #: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505

5938 #: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291

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

5939 +#: builtin/submodule--helper.c:331

5940 msgid "index file corrupt"

5941 msgstr ""

5942

5918 -#: read-cache.c:2180

5943 +#: read-cache.c:2185

5944 #, c-format

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

5946 msgstr ""

5947

5923 -#: read-cache.c:2193

5948 +#: read-cache.c:2198

5949 #, c-format

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

5951 msgstr ""

5952

5928 -#: read-cache.c:2226

5953 +#: read-cache.c:2231

5954 #, c-format

5955 msgid "%s: index file open failed"

5956 msgstr ""

5957

5933 -#: read-cache.c:2230

5958 +#: read-cache.c:2235

5959 #, c-format

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

5961 msgstr ""

5962

5938 -#: read-cache.c:2234

5963 +#: read-cache.c:2239

5964 #, c-format

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

5966 msgstr ""

5967

5943 -#: read-cache.c:2238

5968 +#: read-cache.c:2243

5969 #, c-format

5945 -msgid "%s: unable to map index file"

5970 +msgid "%s: unable to map index file%s"

5971 msgstr ""

5972

5948 -#: read-cache.c:2280

5973 +#: read-cache.c:2286

5974 #, c-format

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

5976 msgstr ""

5977

5953 -#: read-cache.c:2307

5978 +#: read-cache.c:2313

5979 #, c-format

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

5981 msgstr ""

5982

5958 -#: read-cache.c:2345

5983 +#: read-cache.c:2351

5984 #, c-format

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

5986 msgstr ""

5987

5963 -#: read-cache.c:2392

5988 +#: read-cache.c:2398

5989 #, c-format

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

5991 msgstr ""

5992

5968 -#: read-cache.c:3095 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145

5993 +#: read-cache.c:3031 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145

5994 #, c-format

5995 msgid "could not close '%s'"

5996 msgstr ""

5997

5973 -#: read-cache.c:3138

5998 +#: read-cache.c:3074

5999 msgid "failed to convert to a sparse-index"

6000 msgstr ""

6001

5977 -#: read-cache.c:3209 sequencer.c:2684 sequencer.c:4441

6002 +#: read-cache.c:3145 sequencer.c:2684 sequencer.c:4440

6003 #, c-format

6004 msgid "could not stat '%s'"

6005 msgstr ""

6006

5982 -#: read-cache.c:3222

6007 +#: read-cache.c:3158

6008 #, c-format

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

6010 msgstr ""

6011

5987 -#: read-cache.c:3234

6012 +#: read-cache.c:3170

6013 #, c-format

6014 msgid "unable to unlink: %s"

6015 msgstr ""

6016

5992 -#: read-cache.c:3263

6017 +#: read-cache.c:3199

6018 #, c-format

6019 msgid "cannot fix permission bits on '%s'"

6020 msgstr ""

6021

5997 -#: read-cache.c:3412

6022 +#: read-cache.c:3348

6023 #, c-format

6024 msgid "%s: cannot drop to stage #0"

6025 msgstr ""

@@ -6072,8 +6097,8 @@ msgid ""

6097 "\n"

6098 msgstr ""

6099

6075 -#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3816

6076 -#: sequencer.c:3842 sequencer.c:5657 builtin/fsck.c:327 builtin/rebase.c:271

6100 +#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3836

6101 +#: sequencer.c:3862 sequencer.c:5656 builtin/fsck.c:328 builtin/rebase.c:271

6102 #, c-format

6103 msgid "could not write '%s'"

6104 msgstr ""

@@ -6109,7 +6134,7 @@ msgstr ""

6134 msgid "could not read '%s'."

6135 msgstr ""

6136

6112 -#: ref-filter.c:42 wt-status.c:1978

6137 +#: ref-filter.c:42 wt-status.c:2036

6138 msgid "gone"

6139 msgstr ""

6140

@@ -6128,247 +6153,247 @@ msgstr ""

6153 msgid "ahead %d, behind %d"

6154 msgstr ""

6155

6131 -#: ref-filter.c:175

6156 +#: ref-filter.c:230

6157 #, c-format

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

6159 msgstr ""

6160

6136 -#: ref-filter.c:177

6161 +#: ref-filter.c:232

6162 #, c-format

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

6164 msgstr ""

6165

6141 -#: ref-filter.c:199

6166 +#: ref-filter.c:254

6167 #, c-format

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

6169 msgstr ""

6170

6146 -#: ref-filter.c:203

6171 +#: ref-filter.c:258

6172 #, c-format

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

6174 msgstr ""

6175

6151 -#: ref-filter.c:205

6176 +#: ref-filter.c:260

6177 #, c-format

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

6179 msgstr ""

6180

6156 -#: ref-filter.c:260

6181 +#: ref-filter.c:315

6182 #, c-format

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

6184 msgstr ""

6185

6161 -#: ref-filter.c:282

6186 +#: ref-filter.c:339

6187 #, c-format

6188 msgid "unrecognized %%(objectsize) argument: %s"

6189 msgstr ""

6190

6166 -#: ref-filter.c:290

6191 +#: ref-filter.c:347

6192 #, c-format

6193 msgid "%%(deltabase) does not take arguments"

6194 msgstr ""

6195

6171 -#: ref-filter.c:302

6196 +#: ref-filter.c:359

6197 #, c-format

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

6199 msgstr ""

6200

6176 -#: ref-filter.c:315

6201 +#: ref-filter.c:372

6202 #, c-format

6203 msgid "unrecognized %%(subject) argument: %s"

6204 msgstr ""

6205

6181 -#: ref-filter.c:334

6206 +#: ref-filter.c:391

6207 #, c-format

6208 msgid "expected %%(trailers:key=<value>)"

6209 msgstr ""

6210

6186 -#: ref-filter.c:336

6211 +#: ref-filter.c:393

6212 #, c-format

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

6214 msgstr ""

6215

6191 -#: ref-filter.c:367

6216 +#: ref-filter.c:424

6217 #, c-format

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

6219 msgstr ""

6220

6196 -#: ref-filter.c:369

6221 +#: ref-filter.c:426

6222 #, c-format

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

6224 msgstr ""

6225

6201 -#: ref-filter.c:384

6226 +#: ref-filter.c:441

6227 #, c-format

6228 msgid "positive value expected '%s' in %%(%s)"

6229 msgstr ""

6230

6206 -#: ref-filter.c:388

6231 +#: ref-filter.c:445

6232 #, c-format

6233 msgid "unrecognized argument '%s' in %%(%s)"

6234 msgstr ""

6235

6211 -#: ref-filter.c:402

6236 +#: ref-filter.c:459

6237 #, c-format

6238 msgid "unrecognized email option: %s"

6239 msgstr ""

6240

6216 -#: ref-filter.c:432

6241 +#: ref-filter.c:489

6242 #, c-format

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

6244 msgstr ""

6245

6221 -#: ref-filter.c:444

6246 +#: ref-filter.c:501

6247 #, c-format

6248 msgid "unrecognized position:%s"

6249 msgstr ""

6250

6226 -#: ref-filter.c:451

6251 +#: ref-filter.c:508

6252 #, c-format

6253 msgid "unrecognized width:%s"

6254 msgstr ""

6255

6231 -#: ref-filter.c:460

6256 +#: ref-filter.c:517

6257 #, c-format

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

6259 msgstr ""

6260

6236 -#: ref-filter.c:468

6261 +#: ref-filter.c:525

6262 #, c-format

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

6264 msgstr ""

6265

6241 -#: ref-filter.c:486

6266 +#: ref-filter.c:543

6267 #, c-format

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

6269 msgstr ""

6270

6246 -#: ref-filter.c:588

6271 +#: ref-filter.c:645

6272 #, c-format

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

6274 msgstr ""

6275

6251 -#: ref-filter.c:615

6276 +#: ref-filter.c:672

6277 #, c-format

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

6279 msgstr ""

6280

6256 -#: ref-filter.c:619

6281 +#: ref-filter.c:676

6282 #, c-format

6283 msgid ""

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

6285 msgstr ""

6286

6262 -#: ref-filter.c:743

6287 +#: ref-filter.c:801

6288 #, c-format

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

6290 msgstr ""

6291

6267 -#: ref-filter.c:807

6292 +#: ref-filter.c:865

6293 #, c-format

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

6295 msgstr ""

6296

6272 -#: ref-filter.c:809

6297 +#: ref-filter.c:867

6298 #, c-format

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

6300 msgstr ""

6301

6277 -#: ref-filter.c:811

6302 +#: ref-filter.c:869

6303 #, c-format

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

6305 msgstr ""

6306

6282 -#: ref-filter.c:839

6307 +#: ref-filter.c:897

6308 #, c-format

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

6310 msgstr ""

6311

6287 -#: ref-filter.c:841

6312 +#: ref-filter.c:899

6313 #, c-format

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

6315 msgstr ""

6316

6292 -#: ref-filter.c:843

6317 +#: ref-filter.c:901

6318 #, c-format

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

6320 msgstr ""

6321

6297 -#: ref-filter.c:858

6322 +#: ref-filter.c:916

6323 #, c-format

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

6325 msgstr ""

6326

6302 -#: ref-filter.c:915

6327 +#: ref-filter.c:973

6328 #, c-format

6329 msgid "malformed format string %s"

6330 msgstr ""

6331

6307 -#: ref-filter.c:1556

6332 +#: ref-filter.c:1621

6333 #, c-format

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

6335 msgstr ""

6336

6312 -#: ref-filter.c:1559

6337 +#: ref-filter.c:1624

6338 #, c-format

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

6340 msgstr ""

6341

6317 -#: ref-filter.c:1562

6342 +#: ref-filter.c:1627

6343 #, c-format

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

6345 msgstr ""

6346

6322 -#: ref-filter.c:1566

6347 +#: ref-filter.c:1631

6348 #, c-format

6349 msgid "(HEAD detached at %s)"

6350 msgstr ""

6351

6327 -#: ref-filter.c:1569

6352 +#: ref-filter.c:1634

6353 #, c-format

6354 msgid "(HEAD detached from %s)"

6355 msgstr ""

6356

6332 -#: ref-filter.c:1572

6357 +#: ref-filter.c:1637

6358 msgid "(no branch)"

6359 msgstr ""

6360

6336 -#: ref-filter.c:1604 ref-filter.c:1813

6361 +#: ref-filter.c:1669 ref-filter.c:1880

6362 #, c-format

6363 msgid "missing object %s for %s"

6364 msgstr ""

6365

6341 -#: ref-filter.c:1614

6366 +#: ref-filter.c:1679

6367 #, c-format

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

6369 msgstr ""

6370

6346 -#: ref-filter.c:1997

6371 +#: ref-filter.c:2064

6372 #, c-format

6373 msgid "malformed object at '%s'"

6374 msgstr ""

6375

6351 -#: ref-filter.c:2086

6376 +#: ref-filter.c:2153

6377 #, c-format

6378 msgid "ignoring ref with broken name %s"

6379 msgstr ""

6380

6356 -#: ref-filter.c:2091 refs.c:676

6381 +#: ref-filter.c:2158 refs.c:676

6382 #, c-format

6383 msgid "ignoring broken ref %s"

6384 msgstr ""

6385

6361 -#: ref-filter.c:2431

6386 +#: ref-filter.c:2498

6387 #, c-format

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

6389 msgstr ""

6390

6366 -#: ref-filter.c:2525

6391 +#: ref-filter.c:2592

6392 #, c-format

6393 msgid "malformed object name %s"

6394 msgstr ""

6395

6371 -#: ref-filter.c:2530

6396 +#: ref-filter.c:2597

6397 #, c-format

6398 msgid "option `%s' must point to a commit"

6399 msgstr ""

@@ -6787,8 +6812,8 @@ msgstr ""

6812 msgid "Recorded preimage for '%s'"

6813 msgstr ""

6814

6790 -#: rerere.c:865 submodule.c:2089 builtin/log.c:2000

6791 -#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:1891

6815 +#: rerere.c:865 submodule.c:2076 builtin/log.c:2002

6816 +#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890

6817 #, c-format

6818 msgid "could not create directory '%s'"

6819 msgstr ""

@@ -6826,38 +6851,38 @@ msgstr ""

6851 msgid "could not determine HEAD revision"

6852 msgstr ""

6853

6829 -#: reset.c:70 reset.c:76 sequencer.c:3669

6854 +#: reset.c:70 reset.c:76 sequencer.c:3689

6855 #, c-format

6856 msgid "failed to find tree of %s"

6857 msgstr ""

6858

6834 -#: revision.c:2343

6859 +#: revision.c:2344

6860 msgid "--unpacked=<packfile> no longer supported"

6861 msgstr ""

6862

6838 -#: revision.c:2683

6863 +#: revision.c:2684

6864 msgid "your current branch appears to be broken"

6865 msgstr ""

6866

6842 -#: revision.c:2686

6867 +#: revision.c:2687

6868 #, c-format

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

6870 msgstr ""

6871

6847 -#: revision.c:2892

6872 +#: revision.c:2893

6873 msgid "-L does not yet support diff formats besides -p and -s"

6874 msgstr ""

6875

6851 -#: run-command.c:767

6876 +#: run-command.c:766

6877 msgid "open /dev/null failed"

6878 msgstr ""

6879

6855 -#: run-command.c:1275

6880 +#: run-command.c:1274

6881 #, c-format

6882 msgid "cannot create async thread: %s"

6883 msgstr ""

6884

6860 -#: run-command.c:1345

6885 +#: run-command.c:1344

6886 #, c-format

6887 msgid ""

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

@@ -6890,25 +6915,25 @@ msgstr ""

6915 msgid "push negotiation failed; proceeding anyway with push"

6916 msgstr ""

6917

6893 -#: send-pack.c:520

6918 +#: send-pack.c:526

6919 msgid "the receiving end does not support this repository's hash algorithm"

6920 msgstr ""

6921

6897 -#: send-pack.c:529

6922 +#: send-pack.c:535

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

6924 msgstr ""

6925

6901 -#: send-pack.c:531

6926 +#: send-pack.c:537

6927 msgid ""

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

6929 "signed push"

6930 msgstr ""

6931

6907 -#: send-pack.c:543

6932 +#: send-pack.c:544

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

6934 msgstr ""

6935

6911 -#: send-pack.c:548

6936 +#: send-pack.c:549

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

6938 msgstr ""

6939

@@ -6963,7 +6988,7 @@ msgid "could not lock '%s'"

6988 msgstr ""

6989

6990 #: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289

6966 -#: sequencer.c:3546 sequencer.c:5567 strbuf.c:1170 wrapper.c:631

6991 +#: sequencer.c:3547 sequencer.c:5566 strbuf.c:1170 wrapper.c:631

6992 #, c-format

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

6994 msgstr ""

@@ -6974,7 +6999,7 @@ msgid "could not write eol to '%s'"

6999 msgstr ""

7000

7001 #: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291

6977 -#: sequencer.c:3554

7002 +#: sequencer.c:3555

7003 #, c-format

7004 msgid "failed to finalize '%s'"

7005 msgstr ""

@@ -7024,8 +7049,8 @@ msgstr ""

7049 msgid "unable to dequote value of '%s'"

7050 msgstr ""

7051

7027 -#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:728

7028 -#: builtin/am.c:820 builtin/merge.c:1140 builtin/rebase.c:910

7052 +#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:729

7053 +#: builtin/am.c:821 builtin/merge.c:1140 builtin/rebase.c:910

7054 #, c-format

7055 msgid "could not open '%s' for reading"

7056 msgstr ""

@@ -7138,7 +7163,7 @@ msgstr ""

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

7164 msgstr ""

7165

7141 -#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1692

7166 +#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1702

7167 msgid "could not parse HEAD commit"

7168 msgstr ""

7169

@@ -7146,7 +7171,7 @@ msgstr ""

7171 msgid "unable to parse commit author"

7172 msgstr ""

7173

7149 -#: sequencer.c:1421 builtin/am.c:1614 builtin/merge.c:706

7174 +#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:706

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

7176 msgstr ""

7177

@@ -7164,12 +7189,13 @@ msgstr ""

7189 msgid "corrupt author: missing date information"

7190 msgstr ""

7191

7167 -#: sequencer.c:1530 builtin/am.c:1641 builtin/commit.c:1806 builtin/merge.c:909

7192 +#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1816 builtin/merge.c:909

7193 #: builtin/merge.c:934 t/helper/test-fast-rebase.c:78

7194 msgid "failed to write commit object"

7195 msgstr ""

7196

7172 -#: sequencer.c:1557 sequencer.c:4493 t/helper/test-fast-rebase.c:198

7197 +#: sequencer.c:1557 sequencer.c:4492 t/helper/test-fast-rebase.c:199

7198 +#: t/helper/test-fast-rebase.c:217

7199 #, c-format

7200 msgid "could not update %s"

7201 msgstr ""

@@ -7221,7 +7247,7 @@ msgstr ""

7247 msgid "need a HEAD to fixup"

7248 msgstr ""

7249

7224 -#: sequencer.c:1936 sequencer.c:3581

7250 +#: sequencer.c:1936 sequencer.c:3582

7251 msgid "could not read HEAD"

7252 msgstr ""

7253

@@ -7362,7 +7388,7 @@ msgstr ""

7388 msgid "malformed options sheet: '%s'"

7389 msgstr ""

7390

7365 -#: sequencer.c:3012 sequencer.c:4869

7391 +#: sequencer.c:3012 sequencer.c:4868

7392 msgid "empty commit set passed"

7393 msgstr ""

7394

@@ -7393,7 +7419,7 @@ msgstr ""

7419 msgid "could not lock HEAD"

7420 msgstr ""

7421

7396 -#: sequencer.c:3125 sequencer.c:4582

7422 +#: sequencer.c:3125 sequencer.c:4581

7423 msgid "no cherry-pick or revert in progress"

7424 msgstr ""

7425

@@ -7405,7 +7431,7 @@ msgstr ""

7431 msgid "cannot abort from a branch yet to be born"

7432 msgstr ""

7433

7408 -#: sequencer.c:3159 builtin/grep.c:759

7434 +#: sequencer.c:3159 builtin/grep.c:758

7435 #, c-format

7436 msgid "cannot open '%s'"

7437 msgstr ""

@@ -7451,7 +7477,7 @@ msgid ""

7477 "try \"git %s --continue\""

7478 msgstr ""

7479

7454 -#: sequencer.c:3411 sequencer.c:4473

7480 +#: sequencer.c:3411 sequencer.c:4472

7481 msgid "cannot read HEAD"

7482 msgstr ""

7483

@@ -7517,90 +7543,90 @@ msgid ""

7543 "\n"

7544 msgstr ""

7545

7520 -#: sequencer.c:3571

7546 +#: sequencer.c:3572

7547 #, c-format

7548 msgid "illegal label name: '%.*s'"

7549 msgstr ""

7550

7525 -#: sequencer.c:3625

7551 +#: sequencer.c:3645

7552 msgid "writing fake root commit"

7553 msgstr ""

7554

7529 -#: sequencer.c:3630

7555 +#: sequencer.c:3650

7556 msgid "writing squash-onto"

7557 msgstr ""

7558

7533 -#: sequencer.c:3714

7559 +#: sequencer.c:3734

7560 #, c-format

7561 msgid "could not resolve '%s'"

7562 msgstr ""

7563

7538 -#: sequencer.c:3747

7564 +#: sequencer.c:3767

7565 msgid "cannot merge without a current revision"

7566 msgstr ""

7567

7542 -#: sequencer.c:3769

7568 +#: sequencer.c:3789

7569 #, c-format

7570 msgid "unable to parse '%.*s'"

7571 msgstr ""

7572

7547 -#: sequencer.c:3778

7573 +#: sequencer.c:3798

7574 #, c-format

7575 msgid "nothing to merge: '%.*s'"

7576 msgstr ""

7577

7552 -#: sequencer.c:3790

7578 +#: sequencer.c:3810

7579 msgid "octopus merge cannot be executed on top of a [new root]"

7580 msgstr ""

7581

7556 -#: sequencer.c:3806

7582 +#: sequencer.c:3826

7583 #, c-format

7584 msgid "could not get commit message of '%s'"

7585 msgstr ""

7586

7561 -#: sequencer.c:3989

7587 +#: sequencer.c:4009

7588 #, c-format

7589 msgid "could not even attempt to merge '%.*s'"

7590 msgstr ""

7591

7566 -#: sequencer.c:4005

7592 +#: sequencer.c:4025

7593 msgid "merge: Unable to write new index file"

7594 msgstr ""

7595

7570 -#: sequencer.c:4079

7596 +#: sequencer.c:4099

7597 msgid "Cannot autostash"

7598 msgstr ""

7599

7574 -#: sequencer.c:4082

7600 +#: sequencer.c:4102

7601 #, c-format

7602 msgid "Unexpected stash response: '%s'"

7603 msgstr ""

7604

7579 -#: sequencer.c:4088

7605 +#: sequencer.c:4108

7606 #, c-format

7607 msgid "Could not create directory for '%s'"

7608 msgstr ""

7609

7584 -#: sequencer.c:4091

7610 +#: sequencer.c:4111

7611 #, c-format

7612 msgid "Created autostash: %s\n"

7613 msgstr ""

7614

7589 -#: sequencer.c:4095

7615 +#: sequencer.c:4115

7616 msgid "could not reset --hard"

7617 msgstr ""

7618

7593 -#: sequencer.c:4120

7619 +#: sequencer.c:4140

7620 #, c-format

7621 msgid "Applied autostash.\n"

7622 msgstr ""

7623

7598 -#: sequencer.c:4132

7624 +#: sequencer.c:4152

7625 #, c-format

7626 msgid "cannot store %s"

7627 msgstr ""

7628

7603 -#: sequencer.c:4135

7629 +#: sequencer.c:4155

7630 #, c-format

7631 msgid ""

7632 "%s\n"

@@ -7608,29 +7634,29 @@ msgid ""

7634 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"

7635 msgstr ""

7636

7611 -#: sequencer.c:4140

7637 +#: sequencer.c:4160

7638 msgid "Applying autostash resulted in conflicts."

7639 msgstr ""

7640

7615 -#: sequencer.c:4141

7641 +#: sequencer.c:4161

7642 msgid "Autostash exists; creating a new stash entry."

7643 msgstr ""

7644

7619 -#: sequencer.c:4234 git-rebase--preserve-merges.sh:769

7645 +#: sequencer.c:4233 git-rebase--preserve-merges.sh:769

7646 msgid "could not detach HEAD"

7647 msgstr ""

7648

7623 -#: sequencer.c:4249

7649 +#: sequencer.c:4248

7650 #, c-format

7651 msgid "Stopped at HEAD\n"

7652 msgstr ""

7653

7628 -#: sequencer.c:4251

7654 +#: sequencer.c:4250

7655 #, c-format

7656 msgid "Stopped at %s\n"

7657 msgstr ""

7658

7633 -#: sequencer.c:4259

7659 +#: sequencer.c:4258

7660 #, c-format

7661 msgid ""

7662 "Could not execute the todo command\n"

@@ -7643,108 +7669,108 @@ msgid ""

7669 " git rebase --continue\n"

7670 msgstr ""

7671

7646 -#: sequencer.c:4305

7672 +#: sequencer.c:4304

7673 #, c-format

7674 msgid "Rebasing (%d/%d)%s"

7675 msgstr ""

7676

7651 -#: sequencer.c:4351

7677 +#: sequencer.c:4350

7678 #, c-format

7679 msgid "Stopped at %s... %.*s\n"

7680 msgstr ""

7681

7656 -#: sequencer.c:4422

7682 +#: sequencer.c:4421

7683 #, c-format

7684 msgid "unknown command %d"

7685 msgstr ""

7686

7661 -#: sequencer.c:4481

7687 +#: sequencer.c:4480

7688 msgid "could not read orig-head"

7689 msgstr ""

7690

7665 -#: sequencer.c:4486

7691 +#: sequencer.c:4485

7692 msgid "could not read 'onto'"

7693 msgstr ""

7694

7669 -#: sequencer.c:4500

7695 +#: sequencer.c:4499

7696 #, c-format

7697 msgid "could not update HEAD to %s"

7698 msgstr ""

7699

7674 -#: sequencer.c:4560

7700 +#: sequencer.c:4559

7701 #, c-format

7702 msgid "Successfully rebased and updated %s.\n"

7703 msgstr ""

7704

7679 -#: sequencer.c:4612

7705 +#: sequencer.c:4611

7706 msgid "cannot rebase: You have unstaged changes."

7707 msgstr ""

7708

7683 -#: sequencer.c:4621

7709 +#: sequencer.c:4620

7710 msgid "cannot amend non-existing commit"

7711 msgstr ""

7712

7687 -#: sequencer.c:4623

7713 +#: sequencer.c:4622

7714 #, c-format

7715 msgid "invalid file: '%s'"

7716 msgstr ""

7717

7692 -#: sequencer.c:4625

7718 +#: sequencer.c:4624

7719 #, c-format

7720 msgid "invalid contents: '%s'"

7721 msgstr ""

7722

7697 -#: sequencer.c:4628

7723 +#: sequencer.c:4627

7724 msgid ""

7725 "\n"

7726 "You have uncommitted changes in your working tree. Please, commit them\n"

7727 "first and then run 'git rebase --continue' again."

7728 msgstr ""

7729

7704 -#: sequencer.c:4664 sequencer.c:4703

7730 +#: sequencer.c:4663 sequencer.c:4702

7731 #, c-format

7732 msgid "could not write file: '%s'"

7733 msgstr ""

7734

7709 -#: sequencer.c:4719

7735 +#: sequencer.c:4718

7736 msgid "could not remove CHERRY_PICK_HEAD"

7737 msgstr ""

7738

7713 -#: sequencer.c:4726

7739 +#: sequencer.c:4725

7740 msgid "could not commit staged changes."

7741 msgstr ""

7742

7717 -#: sequencer.c:4846

7743 +#: sequencer.c:4845

7744 #, c-format

7745 msgid "%s: can't cherry-pick a %s"

7746 msgstr ""

7747

7722 -#: sequencer.c:4850

7748 +#: sequencer.c:4849

7749 #, c-format

7750 msgid "%s: bad revision"

7751 msgstr ""

7752

7727 -#: sequencer.c:4885

7753 +#: sequencer.c:4884

7754 msgid "can't revert as initial commit"

7755 msgstr ""

7756

7731 -#: sequencer.c:5362

7757 +#: sequencer.c:5361

7758 msgid "make_script: unhandled options"

7759 msgstr ""

7760

7735 -#: sequencer.c:5365

7761 +#: sequencer.c:5364

7762 msgid "make_script: error preparing revisions"

7763 msgstr ""

7764

7739 -#: sequencer.c:5615 sequencer.c:5632

7765 +#: sequencer.c:5614 sequencer.c:5631

7766 msgid "nothing to do"

7767 msgstr ""

7768

7743 -#: sequencer.c:5651

7769 +#: sequencer.c:5650

7770 msgid "could not skip unnecessary pick commands"

7771 msgstr ""

7772

7747 -#: sequencer.c:5751

7773 +#: sequencer.c:5750

7774 msgid "the script was already rearranged."

7775 msgstr ""

7776

@@ -7785,126 +7811,130 @@ msgstr ""

7811 msgid "unable to set up work tree using invalid config"

7812 msgstr ""

7813

7788 -#: setup.c:423

7814 +#: setup.c:423 builtin/rev-parse.c:895

7815 msgid "this operation must be run in a work tree"

7816 msgstr ""

7817

7792 -#: setup.c:661

7818 +#: setup.c:658

7819 #, c-format

7820 msgid "Expected git repo version <= %d, found %d"

7821 msgstr ""

7822

7797 -#: setup.c:669

7798 -msgid "unknown repository extensions found:"

7799 -msgstr ""

7823 +#: setup.c:666

7824 +msgid "unknown repository extension found:"

7825 +msgid_plural "unknown repository extensions found:"

7826 +msgstr[0] ""

7827 +msgstr[1] ""

7828

7801 -#: setup.c:681

7802 -msgid "repo version is 0, but v1-only extensions found:"

7803 -msgstr ""

7829 +#: setup.c:680

7830 +msgid "repo version is 0, but v1-only extension found:"

7831 +msgid_plural "repo version is 0, but v1-only extensions found:"

7832 +msgstr[0] ""

7833 +msgstr[1] ""

7834

7805 -#: setup.c:700

7835 +#: setup.c:701

7836 #, c-format

7837 msgid "error opening '%s'"

7838 msgstr ""

7839

7810 -#: setup.c:702

7840 +#: setup.c:703

7841 #, c-format

7842 msgid "too large to be a .git file: '%s'"

7843 msgstr ""

7844

7815 -#: setup.c:704

7845 +#: setup.c:705

7846 #, c-format

7847 msgid "error reading %s"

7848 msgstr ""

7849

7820 -#: setup.c:706

7850 +#: setup.c:707

7851 #, c-format

7852 msgid "invalid gitfile format: %s"

7853 msgstr ""

7854

7825 -#: setup.c:708

7855 +#: setup.c:709

7856 #, c-format

7857 msgid "no path in gitfile: %s"

7858 msgstr ""

7859

7830 -#: setup.c:710

7860 +#: setup.c:711

7861 #, c-format

7862 msgid "not a git repository: %s"

7863 msgstr ""

7864

7835 -#: setup.c:812

7865 +#: setup.c:813

7866 #, c-format

7867 msgid "'$%s' too big"

7868 msgstr ""

7869

7840 -#: setup.c:826

7870 +#: setup.c:827

7871 #, c-format

7872 msgid "not a git repository: '%s'"

7873 msgstr ""

7874

7845 -#: setup.c:855 setup.c:857 setup.c:888

7875 +#: setup.c:856 setup.c:858 setup.c:889

7876 #, c-format

7877 msgid "cannot chdir to '%s'"

7878 msgstr ""

7879

7850 -#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973

7880 +#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974

7881 msgid "cannot come back to cwd"

7882 msgstr ""

7883

7854 -#: setup.c:987

7884 +#: setup.c:988

7885 #, c-format

7886 msgid "failed to stat '%*s%s%s'"

7887 msgstr ""

7888

7859 -#: setup.c:1225

7889 +#: setup.c:1231

7890 msgid "Unable to read current working directory"

7891 msgstr ""

7892

7863 -#: setup.c:1234 setup.c:1240

7893 +#: setup.c:1240 setup.c:1246

7894 #, c-format

7895 msgid "cannot change to '%s'"

7896 msgstr ""

7897

7868 -#: setup.c:1245

7898 +#: setup.c:1251

7899 #, c-format

7900 msgid "not a git repository (or any of the parent directories): %s"

7901 msgstr ""

7902

7873 -#: setup.c:1251

7903 +#: setup.c:1257

7904 #, c-format

7905 msgid ""

7906 "not a git repository (or any parent up to mount point %s)\n"

7907 "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."

7908 msgstr ""

7909

7880 -#: setup.c:1370

7910 +#: setup.c:1381

7911 #, c-format

7912 msgid ""

7913 "problem with core.sharedRepository filemode value (0%.3o).\n"

7914 "The owner of files must always have read and write permissions."

7915 msgstr ""

7916

7887 -#: setup.c:1417

7917 +#: setup.c:1430

7918 msgid "open /dev/null or dup failed"

7919 msgstr ""

7920

7891 -#: setup.c:1432

7921 +#: setup.c:1445

7922 msgid "fork failed"

7923 msgstr ""

7924

7895 -#: setup.c:1437 t/helper/test-simple-ipc.c:285

7925 +#: setup.c:1450 t/helper/test-simple-ipc.c:285

7926 msgid "setsid failed"

7927 msgstr ""

7928

7899 -#: sparse-index.c:151

7929 +#: sparse-index.c:162

7930 msgid "attempting to use sparse-index without cone mode"

7931 msgstr ""

7932

7903 -#: sparse-index.c:156

7933 +#: sparse-index.c:174

7934 msgid "unable to update cache-tree, staying full"

7935 msgstr ""

7936

7907 -#: sparse-index.c:239

7937 +#: sparse-index.c:261

7938 #, c-format

7939 msgid "index entry is a directory, but not sparse (%08x)"

7940 msgstr ""

@@ -7961,7 +7991,7 @@ msgid_plural "%u bytes/s"

7991 msgstr[0] ""

7992 msgstr[1] ""

7993

7964 -#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:737

7994 +#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:738

7995 #: builtin/rebase.c:866

7996 #, c-format

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

@@ -8029,132 +8059,132 @@ msgstr ""

8059 msgid "bad --ignore-submodules argument: %s"

8060 msgstr ""

8061

8032 -#: submodule.c:818

8062 +#: submodule.c:805

8063 #, c-format

8064 msgid ""

8065 "Submodule in commit %s at path: '%s' collides with a submodule named the "

8066 "same. Skipping it."

8067 msgstr ""

8068

8039 -#: submodule.c:921

8069 +#: submodule.c:908

8070 #, c-format

8071 msgid "submodule entry '%s' (%s) is a %s, not a commit"

8072 msgstr ""

8073

8044 -#: submodule.c:1006

8074 +#: submodule.c:993

8075 #, c-format

8076 msgid ""

8077 "Could not run 'git rev-list <commits> --not --remotes -n 1' command in "

8078 "submodule %s"

8079 msgstr ""

8080

8051 -#: submodule.c:1129

8081 +#: submodule.c:1116

8082 #, c-format

8083 msgid "process for submodule '%s' failed"

8084 msgstr ""

8085

8056 -#: submodule.c:1158 builtin/branch.c:691 builtin/submodule--helper.c:2470

8086 +#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2469

8087 msgid "Failed to resolve HEAD as a valid ref."

8088 msgstr ""

8089

8060 -#: submodule.c:1169

8090 +#: submodule.c:1156

8091 #, c-format

8092 msgid "Pushing submodule '%s'\n"

8093 msgstr ""

8094

8065 -#: submodule.c:1172

8095 +#: submodule.c:1159

8096 #, c-format

8097 msgid "Unable to push submodule '%s'\n"

8098 msgstr ""

8099

8070 -#: submodule.c:1464

8100 +#: submodule.c:1451

8101 #, c-format

8102 msgid "Fetching submodule %s%s\n"

8103 msgstr ""

8104

8075 -#: submodule.c:1498

8105 +#: submodule.c:1485

8106 #, c-format

8107 msgid "Could not access submodule '%s'\n"

8108 msgstr ""

8109

8080 -#: submodule.c:1653

8110 +#: submodule.c:1640

8111 #, c-format

8112 msgid ""

8113 "Errors during submodule fetch:\n"

8114 "%s"

8115 msgstr ""

8116

8087 -#: submodule.c:1678

8117 +#: submodule.c:1665

8118 #, c-format

8119 msgid "'%s' not recognized as a git repository"

8120 msgstr ""

8121

8092 -#: submodule.c:1695

8122 +#: submodule.c:1682

8123 #, c-format

8124 msgid "Could not run 'git status --porcelain=2' in submodule %s"

8125 msgstr ""

8126

8097 -#: submodule.c:1736

8127 +#: submodule.c:1723

8128 #, c-format

8129 msgid "'git status --porcelain=2' failed in submodule %s"

8130 msgstr ""

8131

8102 -#: submodule.c:1811

8132 +#: submodule.c:1798

8133 #, c-format

8134 msgid "could not start 'git status' in submodule '%s'"

8135 msgstr ""

8136

8107 -#: submodule.c:1824

8137 +#: submodule.c:1811

8138 #, c-format

8139 msgid "could not run 'git status' in submodule '%s'"

8140 msgstr ""

8141

8112 -#: submodule.c:1839

8142 +#: submodule.c:1826

8143 #, c-format

8144 msgid "Could not unset core.worktree setting in submodule '%s'"

8145 msgstr ""

8146

8117 -#: submodule.c:1866 submodule.c:2176

8147 +#: submodule.c:1853 submodule.c:2163

8148 #, c-format

8149 msgid "could not recurse into submodule '%s'"

8150 msgstr ""

8151

8122 -#: submodule.c:1887

8152 +#: submodule.c:1874

8153 msgid "could not reset submodule index"

8154 msgstr ""

8155

8126 -#: submodule.c:1929

8156 +#: submodule.c:1916

8157 #, c-format

8158 msgid "submodule '%s' has dirty index"

8159 msgstr ""

8160

8131 -#: submodule.c:1981

8161 +#: submodule.c:1968

8162 #, c-format

8163 msgid "Submodule '%s' could not be updated."

8164 msgstr ""

8165

8136 -#: submodule.c:2049

8166 +#: submodule.c:2036

8167 #, c-format

8168 msgid "submodule git dir '%s' is inside git dir '%.*s'"

8169 msgstr ""

8170

8141 -#: submodule.c:2070

8171 +#: submodule.c:2057

8172 #, c-format

8173 msgid ""

8174 "relocate_gitdir for submodule '%s' with more than one worktree not supported"

8175 msgstr ""

8176

8147 -#: submodule.c:2082 submodule.c:2141

8177 +#: submodule.c:2069 submodule.c:2128

8178 #, c-format

8179 msgid "could not lookup name for submodule '%s'"

8180 msgstr ""

8181

8152 -#: submodule.c:2086

8182 +#: submodule.c:2073

8183 #, c-format

8184 msgid "refusing to move '%s' into an existing git dir"

8185 msgstr ""

8186

8157 -#: submodule.c:2093

8187 +#: submodule.c:2080

8188 #, c-format

8189 msgid ""

8190 "Migrating git directory of '%s%s' from\n"

@@ -8162,11 +8192,11 @@ msgid ""

8192 "'%s'\n"

8193 msgstr ""

8194

8165 -#: submodule.c:2221

8195 +#: submodule.c:2208

8196 msgid "could not start ls-files in .."

8197 msgstr ""

8198

8169 -#: submodule.c:2261

8199 +#: submodule.c:2248

8200 #, c-format

8201 msgid "ls-tree returned unexpected return code %d"

8202 msgstr ""

@@ -8203,7 +8233,7 @@ msgstr ""

8233 msgid "could not read input file '%s'"

8234 msgstr ""

8235

8206 -#: trailer.c:766 builtin/mktag.c:88

8236 +#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577

8237 msgid "could not read from stdin"

8238 msgstr ""

8239

@@ -8291,7 +8321,7 @@ msgstr ""

8321 msgid "invalid remote service path"

8322 msgstr ""

8323

8294 -#: transport-helper.c:661 transport.c:1471

8324 +#: transport-helper.c:661 transport.c:1477

8325 msgid "operation not supported by protocol"

8326 msgstr ""

8327

@@ -8300,7 +8330,7 @@ msgstr ""

8330 msgid "can't connect to subservice %s"

8331 msgstr ""

8332

8303 -#: transport-helper.c:693 transport.c:397

8333 +#: transport-helper.c:693 transport.c:400

8334 msgid "--negotiate-only requires protocol v2"

8335 msgstr ""

8336

@@ -8431,53 +8461,53 @@ msgstr ""

8461 msgid "could not read bundle '%s'"

8462 msgstr ""

8463

8434 -#: transport.c:220

8464 +#: transport.c:223

8465 #, c-format

8466 msgid "transport: invalid depth option '%s'"

8467 msgstr ""

8468

8439 -#: transport.c:272

8469 +#: transport.c:275

8470 msgid "see protocol.version in 'git help config' for more details"

8471 msgstr ""

8472

8443 -#: transport.c:273

8473 +#: transport.c:276

8474 msgid "server options require protocol version 2 or later"

8475 msgstr ""

8476

8447 -#: transport.c:400

8477 +#: transport.c:403

8478 msgid "server does not support wait-for-done"

8479 msgstr ""

8480

8451 -#: transport.c:751

8481 +#: transport.c:755

8482 msgid "could not parse transport.color.* config"

8483 msgstr ""

8484

8455 -#: transport.c:826

8485 +#: transport.c:830

8486 msgid "support for protocol v2 not implemented yet"

8487 msgstr ""

8488

8459 -#: transport.c:960

8489 +#: transport.c:965

8490 #, c-format

8491 msgid "unknown value for config '%s': %s"

8492 msgstr ""

8493

8464 -#: transport.c:1026

8494 +#: transport.c:1031

8495 #, c-format

8496 msgid "transport '%s' not allowed"

8497 msgstr ""

8498

8469 -#: transport.c:1079

8499 +#: transport.c:1084

8500 msgid "git-over-rsync is no longer supported"

8501 msgstr ""

8502

8473 -#: transport.c:1181

8503 +#: transport.c:1187

8504 #, c-format

8505 msgid ""

8506 "The following submodule paths contain changes that can\n"

8507 "not be found on any remote:\n"

8508 msgstr ""

8509

8480 -#: transport.c:1185

8510 +#: transport.c:1191

8511 #, c-format

8512 msgid ""

8513 "\n"

@@ -8493,11 +8523,11 @@ msgid ""

8523 "\n"

8524 msgstr ""

8525

8496 -#: transport.c:1193

8526 +#: transport.c:1199

8527 msgid "Aborting."

8528 msgstr ""

8529

8500 -#: transport.c:1340

8530 +#: transport.c:1346

8531 msgid "failed to push all needed submodules"

8532 msgstr ""

8533

@@ -8710,11 +8740,11 @@ msgid ""

8740 "colliding group is in the working tree:\n"

8741 msgstr ""

8742

8713 -#: unpack-trees.c:1519

8743 +#: unpack-trees.c:1618

8744 msgid "Updating index flags"

8745 msgstr ""

8746

8717 -#: unpack-trees.c:2608

8747 +#: unpack-trees.c:2707

8748 #, c-format

8749 msgid "worktree and untracked commit have duplicate entries: %s"

8750 msgstr ""

@@ -8756,99 +8786,99 @@ msgstr ""

8786 msgid "Fetching objects"

8787 msgstr ""

8788

8759 -#: worktree.c:238 builtin/am.c:2151

8789 +#: worktree.c:236 builtin/am.c:2152

8790 #, c-format

8791 msgid "failed to read '%s'"

8792 msgstr ""

8793

8764 -#: worktree.c:304

8794 +#: worktree.c:303

8795 #, c-format

8796 msgid "'%s' at main working tree is not the repository directory"

8797 msgstr ""

8798

8769 -#: worktree.c:315

8799 +#: worktree.c:314

8800 #, c-format

8801 msgid "'%s' file does not contain absolute path to the working tree location"

8802 msgstr ""

8803

8774 -#: worktree.c:327

8804 +#: worktree.c:326

8805 #, c-format

8806 msgid "'%s' does not exist"

8807 msgstr ""

8808

8779 -#: worktree.c:333

8809 +#: worktree.c:332

8810 #, c-format

8811 msgid "'%s' is not a .git file, error code %d"

8812 msgstr ""

8813

8784 -#: worktree.c:342

8814 +#: worktree.c:341

8815 #, c-format

8816 msgid "'%s' does not point back to '%s'"

8817 msgstr ""

8818

8789 -#: worktree.c:608

8819 +#: worktree.c:603

8820 msgid "not a directory"

8821 msgstr ""

8822

8793 -#: worktree.c:617

8823 +#: worktree.c:612

8824 msgid ".git is not a file"

8825 msgstr ""

8826

8797 -#: worktree.c:619

8827 +#: worktree.c:614

8828 msgid ".git file broken"

8829 msgstr ""

8830

8801 -#: worktree.c:621

8831 +#: worktree.c:616

8832 msgid ".git file incorrect"

8833 msgstr ""

8834

8805 -#: worktree.c:727

8835 +#: worktree.c:722

8836 msgid "not a valid path"

8837 msgstr ""

8838

8809 -#: worktree.c:733

8839 +#: worktree.c:728

8840 msgid "unable to locate repository; .git is not a file"

8841 msgstr ""

8842

8813 -#: worktree.c:737

8843 +#: worktree.c:732

8844 msgid "unable to locate repository; .git file does not reference a repository"

8845 msgstr ""

8846

8817 -#: worktree.c:741

8847 +#: worktree.c:736

8848 msgid "unable to locate repository; .git file broken"

8849 msgstr ""

8850

8821 -#: worktree.c:747

8851 +#: worktree.c:742

8852 msgid "gitdir unreadable"

8853 msgstr ""

8854

8825 -#: worktree.c:751

8855 +#: worktree.c:746

8856 msgid "gitdir incorrect"

8857 msgstr ""

8858

8829 -#: worktree.c:776

8859 +#: worktree.c:771

8860 msgid "not a valid directory"

8861 msgstr ""

8862

8833 -#: worktree.c:782

8863 +#: worktree.c:777

8864 msgid "gitdir file does not exist"

8865 msgstr ""

8866

8837 -#: worktree.c:787 worktree.c:796

8867 +#: worktree.c:782 worktree.c:791

8868 #, c-format

8869 msgid "unable to read gitdir file (%s)"

8870 msgstr ""

8871

8842 -#: worktree.c:806

8872 +#: worktree.c:801

8873 #, c-format

8874 msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"

8875 msgstr ""

8876

8847 -#: worktree.c:814

8877 +#: worktree.c:809

8878 msgid "invalid gitdir file"

8879 msgstr ""

8880

8851 -#: worktree.c:822

8881 +#: worktree.c:817

8882 msgid "gitdir file points to non-existent location"

8883 msgstr ""

8884

@@ -8895,11 +8925,11 @@ msgstr ""

8925 msgid " (use \"git rm <file>...\" to mark resolution)"

8926 msgstr ""

8927

8898 -#: wt-status.c:211 wt-status.c:1075

8928 +#: wt-status.c:211 wt-status.c:1125

8929 msgid "Changes to be committed:"

8930 msgstr ""

8931

8902 -#: wt-status.c:234 wt-status.c:1084

8932 +#: wt-status.c:234 wt-status.c:1134

8933 msgid "Changes not staged for commit:"

8934 msgstr ""

8935

@@ -8997,28 +9027,28 @@ msgstr ""

9027 msgid "untracked content, "

9028 msgstr ""

9029

9000 -#: wt-status.c:908

9030 +#: wt-status.c:958

9031 #, c-format

9032 msgid "Your stash currently has %d entry"

9033 msgid_plural "Your stash currently has %d entries"

9034 msgstr[0] ""

9035 msgstr[1] ""

9036

9007 -#: wt-status.c:939

9037 +#: wt-status.c:989

9038 msgid "Submodules changed but not updated:"

9039 msgstr ""

9040

9011 -#: wt-status.c:941

9041 +#: wt-status.c:991

9042 msgid "Submodule changes to be committed:"

9043 msgstr ""

9044

9015 -#: wt-status.c:1023

9045 +#: wt-status.c:1073

9046 msgid ""

9047 "Do not modify or remove the line above.\n"

9048 "Everything below it will be ignored."

9049 msgstr ""

9050

9021 -#: wt-status.c:1115

9051 +#: wt-status.c:1165

9052 #, c-format

9053 msgid ""

9054 "\n"

@@ -9026,255 +9056,259 @@ msgid ""

9056 "You can use '--no-ahead-behind' to avoid this.\n"

9057 msgstr ""

9058

9029 -#: wt-status.c:1145

9059 +#: wt-status.c:1195

9060 msgid "You have unmerged paths."

9061 msgstr ""

9062

9033 -#: wt-status.c:1148

9063 +#: wt-status.c:1198

9064 msgid " (fix conflicts and run \"git commit\")"

9065 msgstr ""

9066

9037 -#: wt-status.c:1150

9067 +#: wt-status.c:1200

9068 msgid " (use \"git merge --abort\" to abort the merge)"

9069 msgstr ""

9070

9041 -#: wt-status.c:1154

9071 +#: wt-status.c:1204

9072 msgid "All conflicts fixed but you are still merging."

9073 msgstr ""

9074

9045 -#: wt-status.c:1157

9075 +#: wt-status.c:1207

9076 msgid " (use \"git commit\" to conclude merge)"

9077 msgstr ""

9078

9049 -#: wt-status.c:1166

9079 +#: wt-status.c:1216

9080 msgid "You are in the middle of an am session."

9081 msgstr ""

9082

9053 -#: wt-status.c:1169

9083 +#: wt-status.c:1219

9084 msgid "The current patch is empty."

9085 msgstr ""

9086

9057 -#: wt-status.c:1173

9087 +#: wt-status.c:1223

9088 msgid " (fix conflicts and then run \"git am --continue\")"

9089 msgstr ""

9090

9061 -#: wt-status.c:1175

9091 +#: wt-status.c:1225

9092 msgid " (use \"git am --skip\" to skip this patch)"

9093 msgstr ""

9094

9065 -#: wt-status.c:1177

9095 +#: wt-status.c:1227

9096 msgid " (use \"git am --abort\" to restore the original branch)"

9097 msgstr ""

9098

9069 -#: wt-status.c:1310

9099 +#: wt-status.c:1360

9100 msgid "git-rebase-todo is missing."

9101 msgstr ""

9102

9073 -#: wt-status.c:1312

9103 +#: wt-status.c:1362

9104 msgid "No commands done."

9105 msgstr ""

9106

9077 -#: wt-status.c:1315

9107 +#: wt-status.c:1365

9108 #, c-format

9109 msgid "Last command done (%d command done):"

9110 msgid_plural "Last commands done (%d commands done):"

9111 msgstr[0] ""

9112 msgstr[1] ""

9113

9084 -#: wt-status.c:1326

9114 +#: wt-status.c:1376

9115 #, c-format

9116 msgid " (see more in file %s)"

9117 msgstr ""

9118

9089 -#: wt-status.c:1331

9119 +#: wt-status.c:1381

9120 msgid "No commands remaining."

9121 msgstr ""

9122

9093 -#: wt-status.c:1334

9123 +#: wt-status.c:1384

9124 #, c-format

9125 msgid "Next command to do (%d remaining command):"

9126 msgid_plural "Next commands to do (%d remaining commands):"

9127 msgstr[0] ""

9128 msgstr[1] ""

9129

9100 -#: wt-status.c:1342

9130 +#: wt-status.c:1392

9131 msgid " (use \"git rebase --edit-todo\" to view and edit)"

9132 msgstr ""

9133

9104 -#: wt-status.c:1354

9134 +#: wt-status.c:1404

9135 #, c-format

9136 msgid "You are currently rebasing branch '%s' on '%s'."

9137 msgstr ""

9138

9109 -#: wt-status.c:1359

9139 +#: wt-status.c:1409

9140 msgid "You are currently rebasing."

9141 msgstr ""

9142

9113 -#: wt-status.c:1372

9143 +#: wt-status.c:1422

9144 msgid " (fix conflicts and then run \"git rebase --continue\")"

9145 msgstr ""

9146

9117 -#: wt-status.c:1374

9147 +#: wt-status.c:1424

9148 msgid " (use \"git rebase --skip\" to skip this patch)"

9149 msgstr ""

9150

9121 -#: wt-status.c:1376

9151 +#: wt-status.c:1426

9152 msgid " (use \"git rebase --abort\" to check out the original branch)"

9153 msgstr ""

9154

9125 -#: wt-status.c:1383

9155 +#: wt-status.c:1433

9156 msgid " (all conflicts fixed: run \"git rebase --continue\")"

9157 msgstr ""

9158

9129 -#: wt-status.c:1387

9159 +#: wt-status.c:1437

9160 #, c-format

9161 msgid ""

9162 "You are currently splitting a commit while rebasing branch '%s' on '%s'."

9163 msgstr ""

9164

9135 -#: wt-status.c:1392

9165 +#: wt-status.c:1442

9166 msgid "You are currently splitting a commit during a rebase."

9167 msgstr ""

9168

9139 -#: wt-status.c:1395

9169 +#: wt-status.c:1445

9170 msgid " (Once your working directory is clean, run \"git rebase --continue\")"

9171 msgstr ""

9172

9143 -#: wt-status.c:1399

9173 +#: wt-status.c:1449

9174 #, c-format

9175 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."

9176 msgstr ""

9177

9148 -#: wt-status.c:1404

9178 +#: wt-status.c:1454

9179 msgid "You are currently editing a commit during a rebase."

9180 msgstr ""

9181

9152 -#: wt-status.c:1407

9182 +#: wt-status.c:1457

9183 msgid " (use \"git commit --amend\" to amend the current commit)"

9184 msgstr ""

9185

9156 -#: wt-status.c:1409

9186 +#: wt-status.c:1459

9187 msgid ""

9188 " (use \"git rebase --continue\" once you are satisfied with your changes)"

9189 msgstr ""

9190

9161 -#: wt-status.c:1420

9191 +#: wt-status.c:1470

9192 msgid "Cherry-pick currently in progress."

9193 msgstr ""

9194

9165 -#: wt-status.c:1423

9195 +#: wt-status.c:1473

9196 #, c-format

9197 msgid "You are currently cherry-picking commit %s."

9198 msgstr ""

9199

9170 -#: wt-status.c:1430

9200 +#: wt-status.c:1480

9201 msgid " (fix conflicts and run \"git cherry-pick --continue\")"

9202 msgstr ""

9203

9174 -#: wt-status.c:1433

9204 +#: wt-status.c:1483

9205 msgid " (run \"git cherry-pick --continue\" to continue)"

9206 msgstr ""

9207

9178 -#: wt-status.c:1436

9208 +#: wt-status.c:1486

9209 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"

9210 msgstr ""

9211

9182 -#: wt-status.c:1438

9212 +#: wt-status.c:1488

9213 msgid " (use \"git cherry-pick --skip\" to skip this patch)"

9214 msgstr ""

9215

9186 -#: wt-status.c:1440

9216 +#: wt-status.c:1490

9217 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"

9218 msgstr ""

9219

9190 -#: wt-status.c:1450

9220 +#: wt-status.c:1500

9221 msgid "Revert currently in progress."

9222 msgstr ""

9223

9194 -#: wt-status.c:1453

9224 +#: wt-status.c:1503

9225 #, c-format

9226 msgid "You are currently reverting commit %s."

9227 msgstr ""

9228

9199 -#: wt-status.c:1459

9229 +#: wt-status.c:1509

9230 msgid " (fix conflicts and run \"git revert --continue\")"

9231 msgstr ""

9232

9203 -#: wt-status.c:1462

9233 +#: wt-status.c:1512

9234 msgid " (run \"git revert --continue\" to continue)"

9235 msgstr ""

9236

9207 -#: wt-status.c:1465

9237 +#: wt-status.c:1515

9238 msgid " (all conflicts fixed: run \"git revert --continue\")"

9239 msgstr ""

9240

9211 -#: wt-status.c:1467

9241 +#: wt-status.c:1517

9242 msgid " (use \"git revert --skip\" to skip this patch)"

9243 msgstr ""

9244

9215 -#: wt-status.c:1469

9245 +#: wt-status.c:1519

9246 msgid " (use \"git revert --abort\" to cancel the revert operation)"

9247 msgstr ""

9248

9219 -#: wt-status.c:1479

9249 +#: wt-status.c:1529

9250 #, c-format

9251 msgid "You are currently bisecting, started from branch '%s'."

9252 msgstr ""

9253

9224 -#: wt-status.c:1483

9254 +#: wt-status.c:1533

9255 msgid "You are currently bisecting."

9256 msgstr ""

9257

9228 -#: wt-status.c:1486

9258 +#: wt-status.c:1536

9259 msgid " (use \"git bisect reset\" to get back to the original branch)"

9260 msgstr ""

9261

9232 -#: wt-status.c:1497

9262 +#: wt-status.c:1547

9263 +msgid "You are in a sparse checkout."

9264 +msgstr ""

9265 +

9266 +#: wt-status.c:1550

9267 #, c-format

9268 msgid "You are in a sparse checkout with %d%% of tracked files present."

9269 msgstr ""

9270

9237 -#: wt-status.c:1736

9271 +#: wt-status.c:1794

9272 msgid "On branch "

9273 msgstr ""

9274

9241 -#: wt-status.c:1743

9275 +#: wt-status.c:1801

9276 msgid "interactive rebase in progress; onto "

9277 msgstr ""

9278

9245 -#: wt-status.c:1745

9279 +#: wt-status.c:1803

9280 msgid "rebase in progress; onto "

9281 msgstr ""

9282

9249 -#: wt-status.c:1750

9283 +#: wt-status.c:1808

9284 msgid "HEAD detached at "

9285 msgstr ""

9286

9253 -#: wt-status.c:1752

9287 +#: wt-status.c:1810

9288 msgid "HEAD detached from "

9289 msgstr ""

9290

9257 -#: wt-status.c:1755

9291 +#: wt-status.c:1813

9292 msgid "Not currently on any branch."

9293 msgstr ""

9294

9261 -#: wt-status.c:1772

9295 +#: wt-status.c:1830

9296 msgid "Initial commit"

9297 msgstr ""

9298

9265 -#: wt-status.c:1773

9299 +#: wt-status.c:1831

9300 msgid "No commits yet"

9301 msgstr ""

9302

9269 -#: wt-status.c:1787

9303 +#: wt-status.c:1845

9304 msgid "Untracked files"

9305 msgstr ""

9306

9273 -#: wt-status.c:1789

9307 +#: wt-status.c:1847

9308 msgid "Ignored files"

9309 msgstr ""

9310

9277 -#: wt-status.c:1793

9311 +#: wt-status.c:1851

9312 #, c-format

9313 msgid ""

9314 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"

@@ -9282,110 +9316,110 @@ msgid ""

9316 "new files yourself (see 'git help status')."

9317 msgstr ""

9318

9285 -#: wt-status.c:1799

9319 +#: wt-status.c:1857

9320 #, c-format

9321 msgid "Untracked files not listed%s"

9322 msgstr ""

9323

9290 -#: wt-status.c:1801

9324 +#: wt-status.c:1859

9325 msgid " (use -u option to show untracked files)"

9326 msgstr ""

9327

9294 -#: wt-status.c:1807

9328 +#: wt-status.c:1865

9329 msgid "No changes"

9330 msgstr ""

l10n: git.pot: v2.33.0 round 1 (38 new, 15 removed)