fe05e196c5 · 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: 2014-04-19 12:50+0800\n"

11 +"POT-Creation-Date: 2014-08-04 14:48+0800\n"

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

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

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

@@ -23,12 +23,11 @@ msgstr ""

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

24 msgstr ""

25

26 -#: advice.c:85

26 +#: advice.c:88

27 msgid ""

28 -"Fix them up in the work tree,\n"

29 -"and then use 'git add/rm <file>' as\n"

30 -"appropriate to mark resolution and make a commit,\n"

31 -"or use 'git commit -a'."

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

29 +"as appropriate to mark resolution and make a commit, or use\n"

30 +"'git commit -a'."

31 msgstr ""

32

33 #: archive.c:10

@@ -48,7 +47,7 @@ msgstr ""

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

48 msgstr ""

49

51 -#: archive.c:243 builtin/add.c:136 builtin/add.c:428 builtin/rm.c:328

50 +#: archive.c:243 builtin/add.c:136 builtin/add.c:427 builtin/rm.c:328

51 #, c-format

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

53 msgstr ""

@@ -61,7 +60,7 @@ msgstr ""

60 msgid "archive format"

61 msgstr ""

62

64 -#: archive.c:329 builtin/log.c:1193

63 +#: archive.c:329 builtin/log.c:1201

64 msgid "prefix"

65 msgstr ""

66

@@ -69,9 +68,9 @@ msgstr ""

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

69 msgstr ""

70

72 -#: archive.c:331 builtin/archive.c:88 builtin/blame.c:2258

73 -#: builtin/blame.c:2259 builtin/config.c:57 builtin/fast-export.c:680

74 -#: builtin/fast-export.c:682 builtin/grep.c:714 builtin/hash-object.c:77

71 +#: archive.c:331 builtin/archive.c:88 builtin/blame.c:2517

72 +#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:709

73 +#: builtin/fast-export.c:711 builtin/grep.c:712 builtin/hash-object.c:77

74 #: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:412

75 #: builtin/notes.c:569 builtin/read-tree.c:108 parse-options.h:151

76 msgid "file"

@@ -246,7 +245,7 @@ msgstr ""

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

246 msgstr ""

247

249 -#: bundle.c:86 builtin/commit.c:706

248 +#: bundle.c:86 builtin/commit.c:755

249 #, c-format

250 msgid "could not open '%s'"

251 msgstr ""

@@ -255,8 +254,8 @@ msgstr ""

254 msgid "Repository lacks these prerequisite commits:"

255 msgstr ""

256

258 -#: bundle.c:162 sequencer.c:669 sequencer.c:1123 builtin/log.c:332

259 -#: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:357

257 +#: bundle.c:162 sequencer.c:630 sequencer.c:1085 builtin/log.c:330

258 +#: builtin/log.c:821 builtin/log.c:1428 builtin/log.c:1665 builtin/merge.c:357

259 #: builtin/shortlog.c:158

260 msgid "revision walk setup failed"

261 msgstr ""

@@ -279,47 +278,47 @@ msgid_plural "The bundle requires these %d refs:"

278 msgstr[0] ""

279 msgstr[1] ""

280

282 -#: bundle.c:293

281 +#: bundle.c:289

282 msgid "rev-list died"

283 msgstr ""

284

286 -#: bundle.c:299 builtin/log.c:1329 builtin/shortlog.c:261

285 +#: bundle.c:295 builtin/log.c:1339 builtin/shortlog.c:261

286 #, c-format

287 msgid "unrecognized argument: %s"

288 msgstr ""

289

291 -#: bundle.c:334

290 +#: bundle.c:330

291 #, c-format

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

293 msgstr ""

294

296 -#: bundle.c:379

295 +#: bundle.c:375

296 msgid "Refusing to create empty bundle."

297 msgstr ""

298

300 -#: bundle.c:395

299 +#: bundle.c:390

300 msgid "Could not spawn pack-objects"

301 msgstr ""

302

304 -#: bundle.c:413

303 +#: bundle.c:408

304 msgid "pack-objects died"

305 msgstr ""

306

308 -#: bundle.c:416

307 +#: bundle.c:411

308 #, c-format

309 msgid "cannot create '%s'"

310 msgstr ""

311

313 -#: bundle.c:438

312 +#: bundle.c:433

313 msgid "index-pack died"

314 msgstr ""

315

317 -#: commit.c:54

316 +#: commit.c:40

317 #, c-format

318 msgid "could not parse %s"

319 msgstr ""

320

322 -#: commit.c:56

321 +#: commit.c:42

322 #, c-format

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

324 msgstr ""

@@ -415,91 +414,100 @@ msgstr[1] ""

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

415 msgstr ""

416

418 -#: diffcore-rename.c:517

417 +#: diffcore-rename.c:514

418 msgid "Performing inexact rename detection"

419 msgstr ""

420

422 -#: diff.c:113

421 +#: diff.c:114

422 #, c-format

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

424 msgstr ""

425

427 -#: diff.c:118

426 +#: diff.c:119

427 #, c-format

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

429 msgstr ""

430

432 -#: diff.c:213

431 +#: diff.c:214

432 #, c-format

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

434 msgstr ""

435

437 -#: diff.c:263

436 +#: diff.c:267

437 #, c-format

438 msgid ""

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

440 "%s"

441 msgstr ""

442

444 -#: diff.c:3495

443 +#: diff.c:2934

444 +#, c-format

445 +msgid "external diff died, stopping at %s"

446 +msgstr ""

447 +

448 +#: diff.c:3329

449 +msgid "--follow requires exactly one pathspec"

450 +msgstr ""

451 +

452 +#: diff.c:3492

453 #, c-format

454 msgid ""

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

456 "%s"

457 msgstr ""

458

451 -#: diff.c:3509

459 +#: diff.c:3506

460 #, c-format

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

462 msgstr ""

463

456 -#: gpg-interface.c:59 gpg-interface.c:131

464 +#: gpg-interface.c:73 gpg-interface.c:145

465 msgid "could not run gpg."

466 msgstr ""

467

460 -#: gpg-interface.c:71

468 +#: gpg-interface.c:85

469 msgid "gpg did not accept the data"

470 msgstr ""

471

464 -#: gpg-interface.c:82

472 +#: gpg-interface.c:96

473 msgid "gpg failed to sign the data"

474 msgstr ""

475

468 -#: gpg-interface.c:115

476 +#: gpg-interface.c:129

477 #, c-format

478 msgid "could not create temporary file '%s': %s"

479 msgstr ""

480

473 -#: gpg-interface.c:118

481 +#: gpg-interface.c:132

482 #, c-format

483 msgid "failed writing detached signature to '%s': %s"

484 msgstr ""

485

478 -#: grep.c:1698

486 +#: grep.c:1703

487 #, c-format

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

489 msgstr ""

490

483 -#: grep.c:1715

491 +#: grep.c:1720

492 #, c-format

493 msgid "'%s': %s"

494 msgstr ""

495

488 -#: grep.c:1726

496 +#: grep.c:1731

497 #, c-format

498 msgid "'%s': short read %s"

499 msgstr ""

500

493 -#: help.c:209

501 +#: help.c:207

502 #, c-format

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

504 msgstr ""

505

498 -#: help.c:216

506 +#: help.c:214

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

508 msgstr ""

509

502 -#: help.c:232

510 +#: help.c:230

511 msgid "The most commonly used git commands are:"

512 msgstr ""

513

@@ -531,7 +539,7 @@ msgstr ""

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

540 msgstr ""

541

534 -#: help.c:384 help.c:443

542 +#: help.c:384 help.c:444

543 msgid ""

544 "\n"

545 "Did you mean this?"

@@ -541,16 +549,16 @@ msgid_plural ""

549 msgstr[0] ""

550 msgstr[1] ""

551

544 -#: help.c:439

552 +#: help.c:440

553 #, c-format

554 msgid "%s: %s - %s"

555 msgstr ""

556

549 -#: merge.c:56

557 +#: merge.c:40

558 msgid "failed to read the cache"

559 msgstr ""

560

553 -#: merge.c:110 builtin/checkout.c:357 builtin/checkout.c:558

561 +#: merge.c:93 builtin/checkout.c:356 builtin/checkout.c:556

562 #: builtin/clone.c:661

563 msgid "unable to write new index file"

564 msgstr ""

@@ -560,7 +568,7 @@ msgstr ""

568 msgid "(bad commit)\n"

569 msgstr ""

570

563 -#: merge-recursive.c:208

571 +#: merge-recursive.c:210

572 #, c-format

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

574 msgstr ""

@@ -569,284 +577,284 @@ msgstr ""

577 msgid "error building trees"

578 msgstr ""

579

572 -#: merge-recursive.c:675

580 +#: merge-recursive.c:692

581 #, c-format

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

583 msgstr ""

584

577 -#: merge-recursive.c:686

585 +#: merge-recursive.c:703

586 #, c-format

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

588 msgstr ""

589

582 -#: merge-recursive.c:700 merge-recursive.c:721

590 +#: merge-recursive.c:717 merge-recursive.c:738

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

592 msgstr ""

593

586 -#: merge-recursive.c:711

594 +#: merge-recursive.c:728

595 #, c-format

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

597 msgstr ""

598

591 -#: merge-recursive.c:751

599 +#: merge-recursive.c:768

600 #, c-format

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

602 msgstr ""

603

596 -#: merge-recursive.c:753

604 +#: merge-recursive.c:770

605 #, c-format

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

607 msgstr ""

608

601 -#: merge-recursive.c:776 builtin/clone.c:317

609 +#: merge-recursive.c:793 builtin/clone.c:317

610 #, c-format

611 msgid "failed to open '%s'"

612 msgstr ""

613

606 -#: merge-recursive.c:784

614 +#: merge-recursive.c:801

615 #, c-format

616 msgid "failed to symlink '%s'"

617 msgstr ""

618

611 -#: merge-recursive.c:787

619 +#: merge-recursive.c:804

620 #, c-format

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

622 msgstr ""

623

616 -#: merge-recursive.c:925

624 +#: merge-recursive.c:942

625 msgid "Failed to execute internal merge"

626 msgstr ""

627

620 -#: merge-recursive.c:929

628 +#: merge-recursive.c:946

629 #, c-format

630 msgid "Unable to add %s to database"

631 msgstr ""

632

625 -#: merge-recursive.c:945

633 +#: merge-recursive.c:962

634 msgid "unsupported object type in the tree"

635 msgstr ""

636

629 -#: merge-recursive.c:1024 merge-recursive.c:1038

637 +#: merge-recursive.c:1037 merge-recursive.c:1051

638 #, c-format

639 msgid ""

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

641 "in tree."

642 msgstr ""

643

636 -#: merge-recursive.c:1030 merge-recursive.c:1043

644 +#: merge-recursive.c:1043 merge-recursive.c:1056

645 #, c-format

646 msgid ""

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

648 "in tree at %s."

649 msgstr ""

650

643 -#: merge-recursive.c:1084

651 +#: merge-recursive.c:1097

652 msgid "rename"

653 msgstr ""

654

647 -#: merge-recursive.c:1084

655 +#: merge-recursive.c:1097

656 msgid "renamed"

657 msgstr ""

658

651 -#: merge-recursive.c:1140

659 +#: merge-recursive.c:1153

660 #, c-format

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

662 msgstr ""

663

656 -#: merge-recursive.c:1162

664 +#: merge-recursive.c:1175

665 #, c-format

666 msgid ""

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

668 "\"->\"%s\" in \"%s\"%s"

669 msgstr ""

670

663 -#: merge-recursive.c:1167

671 +#: merge-recursive.c:1180

672 msgid " (left unresolved)"

673 msgstr ""

674

667 -#: merge-recursive.c:1221

675 +#: merge-recursive.c:1234

676 #, c-format

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

678 msgstr ""

679

672 -#: merge-recursive.c:1251

680 +#: merge-recursive.c:1264

681 #, c-format

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

683 msgstr ""

684

677 -#: merge-recursive.c:1450

685 +#: merge-recursive.c:1463

686 #, c-format

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

688 msgstr ""

689

682 -#: merge-recursive.c:1460

690 +#: merge-recursive.c:1473

691 #, c-format

692 msgid "Adding merged %s"

693 msgstr ""

694

687 -#: merge-recursive.c:1465 merge-recursive.c:1663

695 +#: merge-recursive.c:1478 merge-recursive.c:1676

696 #, c-format

697 msgid "Adding as %s instead"

698 msgstr ""

699

692 -#: merge-recursive.c:1516

700 +#: merge-recursive.c:1529

701 #, c-format

702 msgid "cannot read object %s"

703 msgstr ""

704

697 -#: merge-recursive.c:1519

705 +#: merge-recursive.c:1532

706 #, c-format

707 msgid "object %s is not a blob"

708 msgstr ""

709

702 -#: merge-recursive.c:1567

710 +#: merge-recursive.c:1580

711 msgid "modify"

712 msgstr ""

713

706 -#: merge-recursive.c:1567

714 +#: merge-recursive.c:1580

715 msgid "modified"

716 msgstr ""

717

710 -#: merge-recursive.c:1577

718 +#: merge-recursive.c:1590

719 msgid "content"

720 msgstr ""

721

714 -#: merge-recursive.c:1584

722 +#: merge-recursive.c:1597

723 msgid "add/add"

724 msgstr ""

725

718 -#: merge-recursive.c:1618

726 +#: merge-recursive.c:1631

727 #, c-format

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

729 msgstr ""

730

723 -#: merge-recursive.c:1632

731 +#: merge-recursive.c:1645

732 #, c-format

733 msgid "Auto-merging %s"

734 msgstr ""

735

728 -#: merge-recursive.c:1636 git-submodule.sh:1149

736 +#: merge-recursive.c:1649 git-submodule.sh:1150

737 msgid "submodule"

738 msgstr ""

739

732 -#: merge-recursive.c:1637

740 +#: merge-recursive.c:1650

741 #, c-format

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

743 msgstr ""

744

737 -#: merge-recursive.c:1727

745 +#: merge-recursive.c:1740

746 #, c-format

747 msgid "Removing %s"

748 msgstr ""

749

742 -#: merge-recursive.c:1752

750 +#: merge-recursive.c:1765

751 msgid "file/directory"

752 msgstr ""

753

746 -#: merge-recursive.c:1758

754 +#: merge-recursive.c:1771

755 msgid "directory/file"

756 msgstr ""

757

750 -#: merge-recursive.c:1763

758 +#: merge-recursive.c:1776

759 #, c-format

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

761 msgstr ""

762

755 -#: merge-recursive.c:1773

763 +#: merge-recursive.c:1786

764 #, c-format

765 msgid "Adding %s"

766 msgstr ""

767

760 -#: merge-recursive.c:1790

768 +#: merge-recursive.c:1803

769 msgid "Fatal merge failure, shouldn't happen."

770 msgstr ""

771

764 -#: merge-recursive.c:1809

772 +#: merge-recursive.c:1822

773 msgid "Already up-to-date!"

774 msgstr ""

775

768 -#: merge-recursive.c:1818

776 +#: merge-recursive.c:1831

777 #, c-format

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

779 msgstr ""

780

773 -#: merge-recursive.c:1848

781 +#: merge-recursive.c:1861

782 #, c-format

783 msgid "Unprocessed path??? %s"

784 msgstr ""

785

778 -#: merge-recursive.c:1893

786 +#: merge-recursive.c:1906

787 msgid "Merging:"

788 msgstr ""

789

782 -#: merge-recursive.c:1906

790 +#: merge-recursive.c:1919

791 #, c-format

792 msgid "found %u common ancestor:"

793 msgid_plural "found %u common ancestors:"

794 msgstr[0] ""

795 msgstr[1] ""

796

789 -#: merge-recursive.c:1943

797 +#: merge-recursive.c:1956

798 msgid "merge returned no commit"

799 msgstr ""

800

793 -#: merge-recursive.c:2000

801 +#: merge-recursive.c:2013

802 #, c-format

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

804 msgstr ""

805

798 -#: merge-recursive.c:2012 builtin/merge.c:668

806 +#: merge-recursive.c:2024 builtin/merge.c:666

807 msgid "Unable to write index."

808 msgstr ""

809

802 -#: notes-utils.c:40

810 +#: notes-utils.c:41

811 msgid "Cannot commit uninitialized/unreferenced notes tree"

812 msgstr ""

813

806 -#: notes-utils.c:81

814 +#: notes-utils.c:83

815 #, c-format

816 msgid "Bad notes.rewriteMode value: '%s'"

817 msgstr ""

818

811 -#: notes-utils.c:91

819 +#: notes-utils.c:93

820 #, c-format

821 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"

822 msgstr ""

823

824 #. TRANSLATORS: The first %s is the name of the

825 #. environment variable, the second %s is its value

818 -#: notes-utils.c:118

826 +#: notes-utils.c:120

827 #, c-format

828 msgid "Bad %s value: '%s'"

829 msgstr ""

830

823 -#: object.c:229

831 +#: object.c:234

832 #, c-format

833 msgid "unable to parse object: %s"

834 msgstr ""

835

828 -#: parse-options.c:532

836 +#: parse-options.c:534

837 msgid "..."

838 msgstr ""

839

832 -#: parse-options.c:550

840 +#: parse-options.c:552

841 #, c-format

842 msgid "usage: %s"

843 msgstr ""

844

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

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

839 -#: parse-options.c:554

847 +#: parse-options.c:556

848 #, c-format

849 msgid " or: %s"

850 msgstr ""

851

844 -#: parse-options.c:557

852 +#: parse-options.c:559

853 #, c-format

854 msgid " %s"

855 msgstr ""

856

849 -#: parse-options.c:591

857 +#: parse-options.c:593

858 msgid "-NUM"

859 msgstr ""

860

@@ -899,80 +907,80 @@ msgstr ""

907 msgid "%s: pathspec magic not supported by this command: %s"

908 msgstr ""

909

902 -#: pathspec.c:433

910 +#: pathspec.c:432

911 #, c-format

912 msgid "pathspec '%s' is beyond a symbolic link"

913 msgstr ""

914

907 -#: pathspec.c:442

915 +#: pathspec.c:441

916 msgid ""

917 "There is nothing to exclude from by :(exclude) patterns.\n"

918 "Perhaps you forgot to add either ':/' or '.' ?"

919 msgstr ""

920

913 -#: progress.c:224

921 +#: progress.c:225

922 msgid "done"

923 msgstr ""

924

917 -#: read-cache.c:1238

925 +#: read-cache.c:1260

926 #, c-format

927 msgid ""

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

929 "Using version %i"

930 msgstr ""

931

924 -#: read-cache.c:1248

932 +#: read-cache.c:1270

933 #, c-format

934 msgid ""

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

936 "Using version %i"

937 msgstr ""

938

931 -#: remote.c:758

939 +#: remote.c:753

940 #, c-format

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

942 msgstr ""

943

936 -#: remote.c:762

944 +#: remote.c:757

945 #, c-format

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

947 msgstr ""

948

941 -#: remote.c:766

949 +#: remote.c:761

950 #, c-format

951 msgid "%s tracks both %s and %s"

952 msgstr ""

953

946 -#: remote.c:774

954 +#: remote.c:769

955 msgid "Internal error"

956 msgstr ""

957

950 -#: remote.c:1948

958 +#: remote.c:1943

959 #, c-format

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

961 msgstr ""

962

955 -#: remote.c:1952

963 +#: remote.c:1947

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

965 msgstr ""

966

959 -#: remote.c:1955

967 +#: remote.c:1950

968 #, c-format

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

970 msgstr ""

971

964 -#: remote.c:1959

972 +#: remote.c:1954

973 #, c-format

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

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

976 msgstr[0] ""

977 msgstr[1] ""

978

971 -#: remote.c:1965

979 +#: remote.c:1960

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

981 msgstr ""

982

975 -#: remote.c:1968

983 +#: remote.c:1963

984 #, c-format

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

986 msgid_plural ""

@@ -980,11 +988,11 @@ msgid_plural ""

988 msgstr[0] ""

989 msgstr[1] ""

990

983 -#: remote.c:1976

991 +#: remote.c:1971

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

993 msgstr ""

994

987 -#: remote.c:1979

995 +#: remote.c:1974

996 #, c-format

997 msgid ""

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

@@ -995,7 +1003,7 @@ msgid_plural ""

1003 msgstr[0] ""

1004 msgstr[1] ""

1005

998 -#: remote.c:1989

1006 +#: remote.c:1984

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

1008 msgstr ""

1009

@@ -1008,245 +1016,249 @@ msgstr ""

1016 msgid "dup2(%d,%d) failed"

1017 msgstr ""

1018

1011 -#: sequencer.c:206 builtin/merge.c:786 builtin/merge.c:899

1012 -#: builtin/merge.c:1009 builtin/merge.c:1019

1019 +#: sequencer.c:171 builtin/merge.c:782 builtin/merge.c:893

1020 +#: builtin/merge.c:1003 builtin/merge.c:1013

1021 #, c-format

1022 msgid "Could not open '%s' for writing"

1023 msgstr ""

1024

1017 -#: sequencer.c:208 builtin/merge.c:343 builtin/merge.c:789

1018 -#: builtin/merge.c:1011 builtin/merge.c:1024

1025 +#: sequencer.c:173 builtin/merge.c:343 builtin/merge.c:785

1026 +#: builtin/merge.c:1005 builtin/merge.c:1018

1027 #, c-format

1028 msgid "Could not write to '%s'"

1029 msgstr ""

1030

1023 -#: sequencer.c:229

1031 +#: sequencer.c:194

1032 msgid ""

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

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

1035 msgstr ""

1036

1029 -#: sequencer.c:232

1037 +#: sequencer.c:197

1038 msgid ""

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

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

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

1042 msgstr ""

1043

1036 -#: sequencer.c:245 sequencer.c:879 sequencer.c:962

1044 +#: sequencer.c:210 sequencer.c:841 sequencer.c:924

1045 #, c-format

1046 msgid "Could not write to %s"

1047 msgstr ""

1048

1041 -#: sequencer.c:248

1049 +#: sequencer.c:213

1050 #, c-format

1051 msgid "Error wrapping up %s"

1052 msgstr ""

1053

1046 -#: sequencer.c:263

1054 +#: sequencer.c:228

1055 msgid "Your local changes would be overwritten by cherry-pick."

1056 msgstr ""

1057

1050 -#: sequencer.c:265

1058 +#: sequencer.c:230

1059 msgid "Your local changes would be overwritten by revert."

1060 msgstr ""

1061

1054 -#: sequencer.c:268

1062 +#: sequencer.c:233

1063 msgid "Commit your changes or stash them to proceed."

1064 msgstr ""

1065

1066 +#: sequencer.c:250

1067 +msgid "Failed to lock HEAD during fast_forward_to"

1068 +msgstr ""

1069 +

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

1059 -#: sequencer.c:325

1071 +#: sequencer.c:293

1072 #, c-format

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

1074 msgstr ""

1075

1064 -#: sequencer.c:356

1076 +#: sequencer.c:324

1077 msgid "Could not resolve HEAD commit\n"

1078 msgstr ""

1079

1068 -#: sequencer.c:378

1080 +#: sequencer.c:344

1081 msgid "Unable to update cache tree\n"

1082 msgstr ""

1083

1072 -#: sequencer.c:430

1084 +#: sequencer.c:391

1085 #, c-format

1086 msgid "Could not parse commit %s\n"

1087 msgstr ""

1088

1077 -#: sequencer.c:435

1089 +#: sequencer.c:396

1090 #, c-format

1091 msgid "Could not parse parent commit %s\n"

1092 msgstr ""

1093

1082 -#: sequencer.c:501

1094 +#: sequencer.c:462

1095 msgid "Your index file is unmerged."

1096 msgstr ""

1097

1086 -#: sequencer.c:520

1098 +#: sequencer.c:481

1099 #, c-format

1100 msgid "Commit %s is a merge but no -m option was given."

1101 msgstr ""

1102

1091 -#: sequencer.c:528

1103 +#: sequencer.c:489

1104 #, c-format

1105 msgid "Commit %s does not have parent %d"

1106 msgstr ""

1107

1096 -#: sequencer.c:532

1108 +#: sequencer.c:493

1109 #, c-format

1110 msgid "Mainline was specified but commit %s is not a merge."

1111 msgstr ""

1112

1113 #. TRANSLATORS: The first %s will be "revert" or

1114 #. "cherry-pick", the second %s a SHA1

1103 -#: sequencer.c:545

1115 +#: sequencer.c:506

1116 #, c-format

1117 msgid "%s: cannot parse parent commit %s"

1118 msgstr ""

1119

1108 -#: sequencer.c:549

1120 +#: sequencer.c:510

1121 #, c-format

1122 msgid "Cannot get commit message for %s"

1123 msgstr ""

1124

1113 -#: sequencer.c:635

1125 +#: sequencer.c:596

1126 #, c-format

1127 msgid "could not revert %s... %s"

1128 msgstr ""

1129

1118 -#: sequencer.c:636

1130 +#: sequencer.c:597

1131 #, c-format

1132 msgid "could not apply %s... %s"

1133 msgstr ""

1134

1123 -#: sequencer.c:672

1135 +#: sequencer.c:633

1136 msgid "empty commit set passed"

1137 msgstr ""

1138

1127 -#: sequencer.c:680

1139 +#: sequencer.c:641

1140 #, c-format

1141 msgid "git %s: failed to read the index"

1142 msgstr ""

1143

1132 -#: sequencer.c:685

1144 +#: sequencer.c:645

1145 #, c-format

1146 msgid "git %s: failed to refresh the index"

1147 msgstr ""

1148

1137 -#: sequencer.c:743

1149 +#: sequencer.c:705

1150 #, c-format

1151 msgid "Cannot %s during a %s"

1152 msgstr ""

1153

1142 -#: sequencer.c:765

1154 +#: sequencer.c:727

1155 #, c-format

1156 msgid "Could not parse line %d."

1157 msgstr ""

1158

1147 -#: sequencer.c:770

1159 +#: sequencer.c:732

1160 msgid "No commits parsed."

1161 msgstr ""

1162

1151 -#: sequencer.c:783

1163 +#: sequencer.c:745

1164 #, c-format

1165 msgid "Could not open %s"

1166 msgstr ""

1167

1156 -#: sequencer.c:787

1168 +#: sequencer.c:749

1169 #, c-format

1170 msgid "Could not read %s."

1171 msgstr ""

1172

1161 -#: sequencer.c:794

1173 +#: sequencer.c:756

1174 #, c-format

1175 msgid "Unusable instruction sheet: %s"

1176 msgstr ""

1177

1166 -#: sequencer.c:824

1178 +#: sequencer.c:786

1179 #, c-format

1180 msgid "Invalid key: %s"

1181 msgstr ""

1182

1171 -#: sequencer.c:827

1183 +#: sequencer.c:789

1184 #, c-format

1185 msgid "Invalid value for %s: %s"

1186 msgstr ""

1187

1176 -#: sequencer.c:839

1188 +#: sequencer.c:801

1189 #, c-format

1190 msgid "Malformed options sheet: %s"

1191 msgstr ""

1192

1181 -#: sequencer.c:860

1193 +#: sequencer.c:822

1194 msgid "a cherry-pick or revert is already in progress"

1195 msgstr ""

1196

1185 -#: sequencer.c:861

1197 +#: sequencer.c:823

1198 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""

1199 msgstr ""

1200

1189 -#: sequencer.c:865

1201 +#: sequencer.c:827

1202 #, c-format

1203 msgid "Could not create sequencer directory %s"

1204 msgstr ""

1205

1194 -#: sequencer.c:881 sequencer.c:966

1206 +#: sequencer.c:843 sequencer.c:928

1207 #, c-format

1208 msgid "Error wrapping up %s."

1209 msgstr ""

1210

1199 -#: sequencer.c:900 sequencer.c:1036

1211 +#: sequencer.c:862 sequencer.c:998

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

1213 msgstr ""

1214

1203 -#: sequencer.c:902

1215 +#: sequencer.c:864

1216 msgid "cannot resolve HEAD"

1217 msgstr ""

1218

1207 -#: sequencer.c:904

1219 +#: sequencer.c:866

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

1221 msgstr ""

1222

1211 -#: sequencer.c:926 builtin/apply.c:4061

1223 +#: sequencer.c:888 builtin/apply.c:4062

1224 #, c-format

1225 msgid "cannot open %s: %s"

1226 msgstr ""

1227

1216 -#: sequencer.c:929

1228 +#: sequencer.c:891

1229 #, c-format

1230 msgid "cannot read %s: %s"

1231 msgstr ""

1232

1221 -#: sequencer.c:930

1233 +#: sequencer.c:892

1234 msgid "unexpected end of file"

1235 msgstr ""

1236

1225 -#: sequencer.c:936

1237 +#: sequencer.c:898

1238 #, c-format

1239 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"

1240 msgstr ""

1241

1230 -#: sequencer.c:959

1242 +#: sequencer.c:921

1243 #, c-format

1244 msgid "Could not format %s."

1245 msgstr ""

1246

1235 -#: sequencer.c:1104

1247 +#: sequencer.c:1066

1248 #, c-format

1249 msgid "%s: can't cherry-pick a %s"

1250 msgstr ""

1251

1240 -#: sequencer.c:1107

1252 +#: sequencer.c:1069

1253 #, c-format

1254 msgid "%s: bad revision"

1255 msgstr ""

1256

1245 -#: sequencer.c:1141

1257 +#: sequencer.c:1103

1258 msgid "Can't revert as initial commit"

1259 msgstr ""

1260

1249 -#: sequencer.c:1142

1261 +#: sequencer.c:1104

1262 msgid "Can't cherry-pick into empty head"

1263 msgstr ""

1264

@@ -1263,21 +1275,21 @@ msgid ""

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

1276 msgstr ""

1277

1266 -#: sha1_name.c:1072

1278 +#: sha1_name.c:1060

1279 msgid "HEAD does not point to a branch"

1280 msgstr ""

1281

1270 -#: sha1_name.c:1075

1282 +#: sha1_name.c:1063

1283 #, c-format

1284 msgid "No such branch: '%s'"

1285 msgstr ""

1286

1275 -#: sha1_name.c:1077

1287 +#: sha1_name.c:1065

1288 #, c-format

1289 msgid "No upstream configured for branch '%s'"

1290 msgstr ""

1291

1280 -#: sha1_name.c:1081

1292 +#: sha1_name.c:1069

1293 #, c-format

1294 msgid "Upstream branch '%s' not stored as a remote-tracking branch"

1295 msgstr ""

@@ -1305,17 +1317,17 @@ msgstr ""

1317 msgid "staging updated .gitmodules failed"

1318 msgstr ""

1319

1308 -#: submodule.c:1121 builtin/init-db.c:363

1320 +#: submodule.c:1118 builtin/init-db.c:363

1321 #, c-format

1322 msgid "Could not create git link %s"

1323 msgstr ""

1324

1313 -#: submodule.c:1132

1325 +#: submodule.c:1129

1326 #, c-format

1327 msgid "Could not set core.worktree in %s"

1328 msgstr ""

1329

1318 -#: unpack-trees.c:206

1330 +#: unpack-trees.c:202

1331 msgid "Checking out files"

1332 msgstr ""

1333

@@ -1348,22 +1360,22 @@ msgstr ""

1360 msgid "invalid '..' path segment"

1361 msgstr ""

1362

1351 -#: wrapper.c:422

1363 +#: wrapper.c:460

1364 #, c-format

1365 msgid "unable to access '%s': %s"

1366 msgstr ""

1367

1356 -#: wrapper.c:443

1368 +#: wrapper.c:481

1369 #, c-format

1370 msgid "unable to access '%s'"

1371 msgstr ""

1372

1361 -#: wrapper.c:454

1373 +#: wrapper.c:492

1374 #, c-format

1375 msgid "unable to look up current user in the passwd file: %s"

1376 msgstr ""

1377

1366 -#: wrapper.c:455

1378 +#: wrapper.c:493

1379 msgid "no such user"

1380 msgstr ""

1381

@@ -1504,193 +1516,193 @@ msgstr ""

1516 msgid "bug: unhandled diff status %c"

1517 msgstr ""

1518

1507 -#: wt-status.c:765

1519 +#: wt-status.c:764

1520 msgid "Submodules changed but not updated:"

1521 msgstr ""

1522

1511 -#: wt-status.c:767

1523 +#: wt-status.c:766

1524 msgid "Submodule changes to be committed:"

1525 msgstr ""

1526

1515 -#: wt-status.c:846

1527 +#: wt-status.c:845

1528 msgid ""

1529 "Do not touch the line above.\n"

1530 "Everything below will be removed."

1531 msgstr ""

1532

1521 -#: wt-status.c:937

1533 +#: wt-status.c:936

1534 msgid "You have unmerged paths."

1535 msgstr ""

1536

1525 -#: wt-status.c:940

1537 +#: wt-status.c:939

1538 msgid " (fix conflicts and run \"git commit\")"

1539 msgstr ""

1540

1529 -#: wt-status.c:943

1541 +#: wt-status.c:942

1542 msgid "All conflicts fixed but you are still merging."

1543 msgstr ""

1544

1533 -#: wt-status.c:946

1545 +#: wt-status.c:945

1546 msgid " (use \"git commit\" to conclude merge)"

1547 msgstr ""

1548

1537 -#: wt-status.c:956

1549 +#: wt-status.c:955

1550 msgid "You are in the middle of an am session."

1551 msgstr ""

1552

1541 -#: wt-status.c:959

1553 +#: wt-status.c:958

1554 msgid "The current patch is empty."

1555 msgstr ""

1556

1545 -#: wt-status.c:963

1557 +#: wt-status.c:962

1558 msgid " (fix conflicts and then run \"git am --continue\")"

1559 msgstr ""

1560

1549 -#: wt-status.c:965

1561 +#: wt-status.c:964

1562 msgid " (use \"git am --skip\" to skip this patch)"

1563 msgstr ""

1564

1553 -#: wt-status.c:967

1565 +#: wt-status.c:966

1566 msgid " (use \"git am --abort\" to restore the original branch)"

1567 msgstr ""

1568

1557 -#: wt-status.c:1027 wt-status.c:1044

1569 +#: wt-status.c:1026 wt-status.c:1043

1570 #, c-format

1571 msgid "You are currently rebasing branch '%s' on '%s'."

1572 msgstr ""

1573

1562 -#: wt-status.c:1032 wt-status.c:1049

1574 +#: wt-status.c:1031 wt-status.c:1048

1575 msgid "You are currently rebasing."

1576 msgstr ""

1577

1566 -#: wt-status.c:1035

1578 +#: wt-status.c:1034

1579 msgid " (fix conflicts and then run \"git rebase --continue\")"

1580 msgstr ""

1581

1570 -#: wt-status.c:1037

1582 +#: wt-status.c:1036

1583 msgid " (use \"git rebase --skip\" to skip this patch)"

1584 msgstr ""

1585

1574 -#: wt-status.c:1039

1586 +#: wt-status.c:1038

1587 msgid " (use \"git rebase --abort\" to check out the original branch)"

1588 msgstr ""

1589

1578 -#: wt-status.c:1052

1590 +#: wt-status.c:1051

1591 msgid " (all conflicts fixed: run \"git rebase --continue\")"

1592 msgstr ""

1593

1582 -#: wt-status.c:1056

1594 +#: wt-status.c:1055

1595 #, c-format

1596 msgid ""

1597 "You are currently splitting a commit while rebasing branch '%s' on '%s'."

1598 msgstr ""

1599

1588 -#: wt-status.c:1061

1600 +#: wt-status.c:1060

1601 msgid "You are currently splitting a commit during a rebase."

1602 msgstr ""

1603

1592 -#: wt-status.c:1064

1604 +#: wt-status.c:1063

1605 msgid " (Once your working directory is clean, run \"git rebase --continue\")"

1606 msgstr ""

1607

1596 -#: wt-status.c:1068

1608 +#: wt-status.c:1067

1609 #, c-format

1610 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."

1611 msgstr ""

1612

1601 -#: wt-status.c:1073

1613 +#: wt-status.c:1072

1614 msgid "You are currently editing a commit during a rebase."

1615 msgstr ""

1616

1605 -#: wt-status.c:1076

1617 +#: wt-status.c:1075

1618 msgid " (use \"git commit --amend\" to amend the current commit)"

1619 msgstr ""

1620

1609 -#: wt-status.c:1078

1621 +#: wt-status.c:1077

1622 msgid ""

1623 " (use \"git rebase --continue\" once you are satisfied with your changes)"

1624 msgstr ""

1625

1614 -#: wt-status.c:1088

1626 +#: wt-status.c:1087

1627 #, c-format

1628 msgid "You are currently cherry-picking commit %s."

1629 msgstr ""

1630

1619 -#: wt-status.c:1093

1631 +#: wt-status.c:1092

1632 msgid " (fix conflicts and run \"git cherry-pick --continue\")"

1633 msgstr ""

1634

1623 -#: wt-status.c:1096

1635 +#: wt-status.c:1095

1636 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"

1637 msgstr ""

1638

1627 -#: wt-status.c:1098

1639 +#: wt-status.c:1097

1640 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"

1641 msgstr ""

1642

1631 -#: wt-status.c:1107

1643 +#: wt-status.c:1106

1644 #, c-format

1645 msgid "You are currently reverting commit %s."

1646 msgstr ""

1647

1636 -#: wt-status.c:1112

1648 +#: wt-status.c:1111

1649 msgid " (fix conflicts and run \"git revert --continue\")"

1650 msgstr ""

1651

1640 -#: wt-status.c:1115

1652 +#: wt-status.c:1114

1653 msgid " (all conflicts fixed: run \"git revert --continue\")"

1654 msgstr ""

1655

1644 -#: wt-status.c:1117

1656 +#: wt-status.c:1116

1657 msgid " (use \"git revert --abort\" to cancel the revert operation)"

1658 msgstr ""

1659

1648 -#: wt-status.c:1128

1660 +#: wt-status.c:1127

1661 #, c-format

1662 msgid "You are currently bisecting, started from branch '%s'."

1663 msgstr ""

1664

1653 -#: wt-status.c:1132

1665 +#: wt-status.c:1131

1666 msgid "You are currently bisecting."

1667 msgstr ""

1668

1657 -#: wt-status.c:1135

1669 +#: wt-status.c:1134

1670 msgid " (use \"git bisect reset\" to get back to the original branch)"

1671 msgstr ""

1672

1661 -#: wt-status.c:1310

1673 +#: wt-status.c:1309

1674 msgid "On branch "

1675 msgstr ""

1676

1665 -#: wt-status.c:1317

1677 +#: wt-status.c:1316

1678 msgid "rebase in progress; onto "

1679 msgstr ""

1680

1669 -#: wt-status.c:1324

1681 +#: wt-status.c:1323

1682 msgid "HEAD detached at "

1683 msgstr ""

1684

1673 -#: wt-status.c:1326

1685 +#: wt-status.c:1325

1686 msgid "HEAD detached from "

1687 msgstr ""

1688

1677 -#: wt-status.c:1329

1689 +#: wt-status.c:1328

1690 msgid "Not currently on any branch."

1691 msgstr ""

1692

1681 -#: wt-status.c:1346

1693 +#: wt-status.c:1345

1694 msgid "Initial commit"

1695 msgstr ""

1696

1685 -#: wt-status.c:1360

1697 +#: wt-status.c:1359

1698 msgid "Untracked files"

1699 msgstr ""

1700

1689 -#: wt-status.c:1362

1701 +#: wt-status.c:1361

1702 msgid "Ignored files"

1703 msgstr ""

1704

1693 -#: wt-status.c:1366

1705 +#: wt-status.c:1365

1706 #, c-format

1707 msgid ""

1708 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"

@@ -1698,74 +1710,74 @@ msgid ""

1710 "new files yourself (see 'git help status')."

1711 msgstr ""

1712

1701 -#: wt-status.c:1372

1713 +#: wt-status.c:1371

1714 #, c-format

1715 msgid "Untracked files not listed%s"

1716 msgstr ""

1717

1706 -#: wt-status.c:1374

1718 +#: wt-status.c:1373

1719 msgid " (use -u option to show untracked files)"

1720 msgstr ""

1721

1710 -#: wt-status.c:1380

1722 +#: wt-status.c:1379

1723 msgid "No changes"

1724 msgstr ""

1725

1714 -#: wt-status.c:1385

1726 +#: wt-status.c:1384

1727 #, c-format

1728 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"

1729 msgstr ""

1730

1719 -#: wt-status.c:1388

1731 +#: wt-status.c:1387

1732 #, c-format

1733 msgid "no changes added to commit\n"

1734 msgstr ""

1735

1724 -#: wt-status.c:1391

1736 +#: wt-status.c:1390

1737 #, c-format

1738 msgid ""

1739 "nothing added to commit but untracked files present (use \"git add\" to "

1740 "track)\n"

1741 msgstr ""

1742

1731 -#: wt-status.c:1394

1743 +#: wt-status.c:1393

1744 #, c-format

1745 msgid "nothing added to commit but untracked files present\n"

1746 msgstr ""

1747

1736 -#: wt-status.c:1397

1748 +#: wt-status.c:1396

1749 #, c-format

1750 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"

1751 msgstr ""

1752

1741 -#: wt-status.c:1400 wt-status.c:1405

1753 +#: wt-status.c:1399 wt-status.c:1404

1754 #, c-format

1755 msgid "nothing to commit\n"

1756 msgstr ""

1757

1746 -#: wt-status.c:1403

1758 +#: wt-status.c:1402

1759 #, c-format

1760 msgid "nothing to commit (use -u to show untracked files)\n"

1761 msgstr ""

1762

1751 -#: wt-status.c:1407

1763 +#: wt-status.c:1406

1764 #, c-format

1765 msgid "nothing to commit, working directory clean\n"

1766 msgstr ""

1767

1756 -#: wt-status.c:1516

1768 +#: wt-status.c:1515

1769 msgid "HEAD (no branch)"

1770 msgstr ""

1771

1760 -#: wt-status.c:1522

1772 +#: wt-status.c:1521

1773 msgid "Initial commit on "

1774 msgstr ""

1775

1764 -#: wt-status.c:1554

1776 +#: wt-status.c:1553

1777 msgid "gone"

1778 msgstr ""

1779

1768 -#: wt-status.c:1556 wt-status.c:1564

1780 +#: wt-status.c:1555 wt-status.c:1563

1781 msgid "behind "

1782 msgstr ""

1783

@@ -1796,7 +1808,7 @@ msgstr ""

1808 msgid "Unstaged changes after refreshing the index:"

1809 msgstr ""

1810

1799 -#: builtin/add.c:193

1811 +#: builtin/add.c:193 builtin/rev-parse.c:781

1812 msgid "Could not read the index"

1813 msgstr ""

1814

@@ -1827,15 +1839,15 @@ msgstr ""

1839 msgid "The following paths are ignored by one of your .gitignore files:\n"

1840 msgstr ""

1841

1830 -#: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:93 builtin/mv.c:70

1831 -#: builtin/prune-packed.c:77 builtin/push.c:489 builtin/remote.c:1344

1842 +#: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:70

1843 +#: builtin/prune-packed.c:77 builtin/push.c:488 builtin/remote.c:1367

1844 #: builtin/rm.c:269

1845 msgid "dry run"

1846 msgstr ""

1847

1836 -#: builtin/add.c:249 builtin/apply.c:4410 builtin/check-ignore.c:19

1837 -#: builtin/commit.c:1256 builtin/count-objects.c:95 builtin/fsck.c:612

1838 -#: builtin/log.c:1592 builtin/mv.c:69 builtin/read-tree.c:113

1848 +#: builtin/add.c:249 builtin/apply.c:4411 builtin/check-ignore.c:19

1849 +#: builtin/commit.c:1328 builtin/count-objects.c:95 builtin/fsck.c:606

1850 +#: builtin/log.c:1613 builtin/mv.c:69 builtin/read-tree.c:113

1851 msgid "be verbose"

1852 msgstr ""

1853

@@ -1843,7 +1855,7 @@ msgstr ""

1855 msgid "interactive picking"

1856 msgstr ""

1857

1846 -#: builtin/add.c:252 builtin/checkout.c:1108 builtin/reset.c:283

1858 +#: builtin/add.c:252 builtin/checkout.c:1102 builtin/reset.c:285

1859 msgid "select hunks interactively"

1860 msgstr ""

1861

@@ -1896,30 +1908,30 @@ msgstr ""

1908 msgid "adding files failed"

1909 msgstr ""

1910

1899 -#: builtin/add.c:330

1911 +#: builtin/add.c:329

1912 msgid "-A and -u are mutually incompatible"

1913 msgstr ""

1914

1903 -#: builtin/add.c:337

1915 +#: builtin/add.c:336

1916 msgid "Option --ignore-missing can only be used together with --dry-run"

1917 msgstr ""

1918

1907 -#: builtin/add.c:358

1919 +#: builtin/add.c:357

1920 #, c-format

1921 msgid "Nothing specified, nothing added.\n"

1922 msgstr ""

1923

1912 -#: builtin/add.c:359

1924 +#: builtin/add.c:358

1925 #, c-format

1926 msgid "Maybe you wanted to say 'git add .'?\n"

1927 msgstr ""

1928

1917 -#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:920

1918 -#: builtin/commit.c:320 builtin/mv.c:90 builtin/reset.c:234 builtin/rm.c:299

1929 +#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:919

1930 +#: builtin/commit.c:319 builtin/mv.c:90 builtin/reset.c:234 builtin/rm.c:299

1931 msgid "index file corrupt"

1932 msgstr ""

1933

1922 -#: builtin/add.c:448 builtin/apply.c:4506 builtin/mv.c:280 builtin/rm.c:432

1934 +#: builtin/add.c:446 builtin/apply.c:4506 builtin/mv.c:280 builtin/rm.c:431

1935 msgid "Unable to write new index file"

1936 msgstr ""

1937

@@ -1937,37 +1949,37 @@ msgstr ""

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

1950 msgstr ""

1951

1940 -#: builtin/apply.c:823

1952 +#: builtin/apply.c:825

1953 #, c-format

1954 msgid "Cannot prepare timestamp regexp %s"

1955 msgstr ""

1956

1945 -#: builtin/apply.c:832

1957 +#: builtin/apply.c:834

1958 #, c-format

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

1960 msgstr ""

1961

1950 -#: builtin/apply.c:913

1962 +#: builtin/apply.c:915

1963 #, c-format

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

1965 msgstr ""

1966

1955 -#: builtin/apply.c:945

1967 +#: builtin/apply.c:947

1968 #, c-format

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

1970 msgstr ""

1971

1960 -#: builtin/apply.c:949

1972 +#: builtin/apply.c:951

1973 #, c-format

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

1975 msgstr ""

1976

1965 -#: builtin/apply.c:950

1977 +#: builtin/apply.c:952

1978 #, c-format

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

1980 msgstr ""

1981

1970 -#: builtin/apply.c:957

1982 +#: builtin/apply.c:959

1983 #, c-format

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

1985 msgstr ""

@@ -2075,17 +2087,17 @@ msgstr ""

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

2088 msgstr ""

2089

2078 -#: builtin/apply.c:2946

2090 +#: builtin/apply.c:2944

2091 #, c-format

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

2093 msgstr ""

2094

2083 -#: builtin/apply.c:2952

2095 +#: builtin/apply.c:2950

2096 #, c-format

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

2098 msgstr ""

2099

2088 -#: builtin/apply.c:2973

2100 +#: builtin/apply.c:2971

2101 #, c-format

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

2103 msgstr ""

@@ -2174,213 +2186,213 @@ msgstr ""

2186 msgid "unable to remove %s from index"

2187 msgstr ""

2188

2177 -#: builtin/apply.c:3851

2189 +#: builtin/apply.c:3852

2190 #, c-format

2191 msgid "corrupt patch for submodule %s"

2192 msgstr ""

2193

2182 -#: builtin/apply.c:3855

2194 +#: builtin/apply.c:3856

2195 #, c-format

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

2197 msgstr ""

2198

2187 -#: builtin/apply.c:3860

2199 +#: builtin/apply.c:3861

2200 #, c-format

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

2202 msgstr ""

2203

2192 -#: builtin/apply.c:3863 builtin/apply.c:3971

2204 +#: builtin/apply.c:3864 builtin/apply.c:3972

2205 #, c-format

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

2207 msgstr ""

2208

2197 -#: builtin/apply.c:3896

2209 +#: builtin/apply.c:3897

2210 #, c-format

2211 msgid "closing file '%s'"

2212 msgstr ""

2213

2202 -#: builtin/apply.c:3945

2214 +#: builtin/apply.c:3946

2215 #, c-format

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

2217 msgstr ""

2218

2207 -#: builtin/apply.c:4032

2219 +#: builtin/apply.c:4033

2220 #, c-format

2221 msgid "Applied patch %s cleanly."

2222 msgstr ""

2223

2212 -#: builtin/apply.c:4040

2224 +#: builtin/apply.c:4041

2225 msgid "internal error"

2226 msgstr ""

2227

2216 -#: builtin/apply.c:4043

2228 +#: builtin/apply.c:4044

2229 #, c-format

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

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

2232 msgstr[0] ""

2233 msgstr[1] ""

2234

2223 -#: builtin/apply.c:4053

2235 +#: builtin/apply.c:4054

2236 #, c-format

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

2238 msgstr ""

2239

2228 -#: builtin/apply.c:4074

2240 +#: builtin/apply.c:4075

2241 #, c-format

2242 msgid "Hunk #%d applied cleanly."

2243 msgstr ""

2244

2233 -#: builtin/apply.c:4077

2245 +#: builtin/apply.c:4078

2246 #, c-format

2247 msgid "Rejected hunk #%d."

2248 msgstr ""

2249

2238 -#: builtin/apply.c:4227

2250 +#: builtin/apply.c:4228

2251 msgid "unrecognized input"

2252 msgstr ""

2253

2242 -#: builtin/apply.c:4238

2254 +#: builtin/apply.c:4239

2255 msgid "unable to read index file"

2256 msgstr ""

2257

2246 -#: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:90

2247 -#: builtin/fetch.c:78

2258 +#: builtin/apply.c:4358 builtin/apply.c:4361 builtin/clone.c:90

2259 +#: builtin/fetch.c:93

2260 msgid "path"

2261 msgstr ""

2262

2251 -#: builtin/apply.c:4358

2263 +#: builtin/apply.c:4359

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

2265 msgstr ""

2266

2255 -#: builtin/apply.c:4361

2267 +#: builtin/apply.c:4362

2268 msgid "apply changes matching the given path"

2269 msgstr ""

2270

2259 -#: builtin/apply.c:4363

2271 +#: builtin/apply.c:4364

2272 msgid "num"

2273 msgstr ""

2274

2263 -#: builtin/apply.c:4364

2275 +#: builtin/apply.c:4365

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

2277 msgstr ""

2278

2267 -#: builtin/apply.c:4367

2279 +#: builtin/apply.c:4368

2280 msgid "ignore additions made by the patch"

2281 msgstr ""

2282

2271 -#: builtin/apply.c:4369

2283 +#: builtin/apply.c:4370

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

2285 msgstr ""

2286

2275 -#: builtin/apply.c:4373

2287 +#: builtin/apply.c:4374

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

2289 msgstr ""

2290

2279 -#: builtin/apply.c:4375

2291 +#: builtin/apply.c:4376

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

2293 msgstr ""

2294

2283 -#: builtin/apply.c:4377

2295 +#: builtin/apply.c:4378

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

2297 msgstr ""

2298

2287 -#: builtin/apply.c:4379

2299 +#: builtin/apply.c:4380

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

2301 msgstr ""

2302

2291 -#: builtin/apply.c:4381

2303 +#: builtin/apply.c:4382

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

2305 msgstr ""

2306

2295 -#: builtin/apply.c:4383

2307 +#: builtin/apply.c:4384

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

2309 msgstr ""

2310

2299 -#: builtin/apply.c:4385

2311 +#: builtin/apply.c:4386

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

2313 msgstr ""

2314

2303 -#: builtin/apply.c:4387

2315 +#: builtin/apply.c:4388

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

2317 msgstr ""

2318

2307 -#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:455

2319 +#: builtin/apply.c:4390 builtin/checkout-index.c:198 builtin/ls-files.c:455

2320 msgid "paths are separated with NUL character"

2321 msgstr ""

2322

2311 -#: builtin/apply.c:4392

2323 +#: builtin/apply.c:4393

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

2325 msgstr ""

2326

2315 -#: builtin/apply.c:4393

2327 +#: builtin/apply.c:4394

2328 msgid "action"

2329 msgstr ""

2330

2319 -#: builtin/apply.c:4394

2331 +#: builtin/apply.c:4395

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

2333 msgstr ""

2334

2323 -#: builtin/apply.c:4397 builtin/apply.c:4400

2335 +#: builtin/apply.c:4398 builtin/apply.c:4401

2336 msgid "ignore changes in whitespace when finding context"

2337 msgstr ""

2338

2327 -#: builtin/apply.c:4403

2339 +#: builtin/apply.c:4404

2340 msgid "apply the patch in reverse"

2341 msgstr ""

2342

2331 -#: builtin/apply.c:4405

2343 +#: builtin/apply.c:4406

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

2345 msgstr ""

2346

2335 -#: builtin/apply.c:4407

2347 +#: builtin/apply.c:4408

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

2349 msgstr ""

2350

2339 -#: builtin/apply.c:4409

2351 +#: builtin/apply.c:4410

2352 msgid "allow overlapping hunks"

2353 msgstr ""

2354

2343 -#: builtin/apply.c:4412

2355 +#: builtin/apply.c:4413

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

2357 msgstr ""

2358

2347 -#: builtin/apply.c:4415

2359 +#: builtin/apply.c:4416

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

2361 msgstr ""

2362

2351 -#: builtin/apply.c:4417

2363 +#: builtin/apply.c:4418

2364 msgid "root"

2365 msgstr ""

2366

2355 -#: builtin/apply.c:4418

2367 +#: builtin/apply.c:4419

2368 msgid "prepend <root> to all filenames"

2369 msgstr ""

2370

2359 -#: builtin/apply.c:4440

2371 +#: builtin/apply.c:4441

2372 msgid "--3way outside a repository"

2373 msgstr ""

2374

2363 -#: builtin/apply.c:4448

2375 +#: builtin/apply.c:4449

2376 msgid "--index outside a repository"

2377 msgstr ""

2378

2367 -#: builtin/apply.c:4451

2379 +#: builtin/apply.c:4452

2380 msgid "--cached outside a repository"

2381 msgstr ""

2382

2371 -#: builtin/apply.c:4467

2383 +#: builtin/apply.c:4468

2384 #, c-format

2385 msgid "can't open patch '%s'"

2386 msgstr ""

2387

2376 -#: builtin/apply.c:4481

2388 +#: builtin/apply.c:4482

2389 #, c-format

2390 msgid "squelched %d whitespace error"

2391 msgid_plural "squelched %d whitespace errors"

2392 msgstr[0] ""

2393 msgstr[1] ""

2394

2383 -#: builtin/apply.c:4487 builtin/apply.c:4497

2395 +#: builtin/apply.c:4488 builtin/apply.c:4498

2396 #, c-format

2397 msgid "%d line adds whitespace errors."

2398 msgid_plural "%d lines add whitespace errors."

@@ -2434,106 +2446,116 @@ msgstr ""

2446 msgid "update BISECT_HEAD instead of checking out the current commit"

2447 msgstr ""

2448

2437 -#: builtin/blame.c:27

2449 +#: builtin/blame.c:30

2450 msgid "git blame [options] [rev-opts] [rev] [--] file"

2451 msgstr ""

2452

2441 -#: builtin/blame.c:32

2453 +#: builtin/blame.c:35

2454 msgid "[rev-opts] are documented in git-rev-list(1)"

2455 msgstr ""

2456

2445 -#: builtin/blame.c:2242

2457 +#: builtin/blame.c:2501

2458 msgid "Show blame entries as we find them, incrementally"

2459 msgstr ""

2460

2449 -#: builtin/blame.c:2243

2461 +#: builtin/blame.c:2502

2462 msgid "Show blank SHA-1 for boundary commits (Default: off)"

2463 msgstr ""

2464

2453 -#: builtin/blame.c:2244

2465 +#: builtin/blame.c:2503

2466 msgid "Do not treat root commits as boundaries (Default: off)"

2467 msgstr ""

2468

2457 -#: builtin/blame.c:2245

2469 +#: builtin/blame.c:2504

2470 msgid "Show work cost statistics"

2471 msgstr ""

2472

2461 -#: builtin/blame.c:2246

2473 +#: builtin/blame.c:2505

2474 msgid "Show output score for blame entries"

2475 msgstr ""

2476

2465 -#: builtin/blame.c:2247

2477 +#: builtin/blame.c:2506

2478 msgid "Show original filename (Default: auto)"

2479 msgstr ""

2480

2469 -#: builtin/blame.c:2248

2481 +#: builtin/blame.c:2507

2482 msgid "Show original linenumber (Default: off)"

2483 msgstr ""

2484

2473 -#: builtin/blame.c:2249

2485 +#: builtin/blame.c:2508

2486 msgid "Show in a format designed for machine consumption"

2487 msgstr ""

2488

2477 -#: builtin/blame.c:2250

2489 +#: builtin/blame.c:2509

2490 msgid "Show porcelain format with per-line commit information"

2491 msgstr ""

2492

2481 -#: builtin/blame.c:2251

2493 +#: builtin/blame.c:2510

2494 msgid "Use the same output mode as git-annotate (Default: off)"

2495 msgstr ""

2496

2485 -#: builtin/blame.c:2252

2497 +#: builtin/blame.c:2511

2498 msgid "Show raw timestamp (Default: off)"

2499 msgstr ""

2500

2489 -#: builtin/blame.c:2253

2501 +#: builtin/blame.c:2512

2502 msgid "Show long commit SHA1 (Default: off)"

2503 msgstr ""

2504

2493 -#: builtin/blame.c:2254

2505 +#: builtin/blame.c:2513

2506 msgid "Suppress author name and timestamp (Default: off)"

2507 msgstr ""

2508

2497 -#: builtin/blame.c:2255

2509 +#: builtin/blame.c:2514

2510 msgid "Show author email instead of name (Default: off)"

2511 msgstr ""

2512

2501 -#: builtin/blame.c:2256

2513 +#: builtin/blame.c:2515

2514 msgid "Ignore whitespace differences"

2515 msgstr ""

2516

2505 -#: builtin/blame.c:2257

2517 +#: builtin/blame.c:2516

2518 msgid "Spend extra cycles to find better match"

2519 msgstr ""

2520

2509 -#: builtin/blame.c:2258

2521 +#: builtin/blame.c:2517

2522 msgid "Use revisions from <file> instead of calling git-rev-list"

2523 msgstr ""

2524

2513 -#: builtin/blame.c:2259

2525 +#: builtin/blame.c:2518

2526 msgid "Use <file>'s contents as the final image"

2527 msgstr ""

2528

2517 -#: builtin/blame.c:2260 builtin/blame.c:2261

2529 +#: builtin/blame.c:2519 builtin/blame.c:2520

2530 msgid "score"

2531 msgstr ""

2532

2521 -#: builtin/blame.c:2260

2533 +#: builtin/blame.c:2519

2534 msgid "Find line copies within and across files"

2535 msgstr ""

2536

2525 -#: builtin/blame.c:2261

2537 +#: builtin/blame.c:2520

2538 msgid "Find line movements within and across files"

2539 msgstr ""

2540

2529 -#: builtin/blame.c:2262

2541 +#: builtin/blame.c:2521

2542 msgid "n,m"

2543 msgstr ""

2544

2533 -#: builtin/blame.c:2262

2545 +#: builtin/blame.c:2521

2546 msgid "Process only line range n,m, counting from 1"

2547 msgstr ""

2548

2549 +#. TRANSLATORS: This string is used to tell us the maximum

2550 +#. display width for a relative timestamp in "git blame"

2551 +#. output. For C locale, "4 years, 11 months ago", which

2552 +#. takes 22 places, is the longest among various forms of

2553 +#. relative timestamps, but your language may need more or

2554 +#. fewer display columns.

2555 +#: builtin/blame.c:2599

2556 +msgid "4 years, 11 months ago"

2557 +msgstr ""

2558 +

2559 #: builtin/branch.c:24

2560 msgid "git branch [options] [-r | -a] [--merged | --no-merged]"

2561 msgstr ""

@@ -2766,9 +2788,9 @@ msgid "act on remote-tracking branches"

2788 msgstr ""

2789

2790 #: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844

2769 -#: builtin/branch.c:850 builtin/commit.c:1494 builtin/commit.c:1495

2770 -#: builtin/commit.c:1496 builtin/commit.c:1497 builtin/tag.c:527

2771 -#: builtin/tag.c:533

2791 +#: builtin/branch.c:850 builtin/commit.c:1573 builtin/commit.c:1574

2792 +#: builtin/commit.c:1575 builtin/commit.c:1576 builtin/tag.c:615

2793 +#: builtin/tag.c:621

2794 msgid "commit"

2795 msgstr ""

2796

@@ -2832,7 +2854,7 @@ msgstr ""

2854 msgid "Failed to resolve HEAD as a valid ref."

2855 msgstr ""

2856

2835 -#: builtin/branch.c:872 builtin/clone.c:635

2857 +#: builtin/branch.c:872 builtin/clone.c:636

2858 msgid "HEAD not found below refs/heads!"

2859 msgstr ""

2860

@@ -3009,7 +3031,7 @@ msgstr ""

3031 msgid "terminate input and output records by a NUL character"

3032 msgstr ""

3033

3012 -#: builtin/check-ignore.c:18 builtin/checkout.c:1089 builtin/gc.c:271

3034 +#: builtin/check-ignore.c:18 builtin/checkout.c:1083 builtin/gc.c:285

3035 msgid "suppress progress reporting"

3036 msgstr ""

3037

@@ -3066,43 +3088,43 @@ msgstr ""

3088 msgid "git checkout-index [options] [--] [<file>...]"

3089 msgstr ""

3090

3069 -#: builtin/checkout-index.c:187

3091 +#: builtin/checkout-index.c:188

3092 msgid "check out all files in the index"

3093 msgstr ""

3094

3073 -#: builtin/checkout-index.c:188

3095 +#: builtin/checkout-index.c:189

3096 msgid "force overwrite of existing files"

3097 msgstr ""

3098

3077 -#: builtin/checkout-index.c:190

3099 +#: builtin/checkout-index.c:191

3100 msgid "no warning for existing files and files not in index"

3101 msgstr ""

3102

3081 -#: builtin/checkout-index.c:192

3103 +#: builtin/checkout-index.c:193

3104 msgid "don't checkout new files"

3105 msgstr ""

3106

3085 -#: builtin/checkout-index.c:194

3107 +#: builtin/checkout-index.c:195

3108 msgid "update stat information in the index file"

3109 msgstr ""

3110

3089 -#: builtin/checkout-index.c:200

3111 +#: builtin/checkout-index.c:201

3112 msgid "read list of paths from the standard input"

3113 msgstr ""

3114

3093 -#: builtin/checkout-index.c:202

3115 +#: builtin/checkout-index.c:203

3116 msgid "write the content to temporary files"

3117 msgstr ""

3118

3097 -#: builtin/checkout-index.c:203 builtin/column.c:30

3119 +#: builtin/checkout-index.c:204 builtin/column.c:30

3120 msgid "string"

3121 msgstr ""

3122

3101 -#: builtin/checkout-index.c:204

3123 +#: builtin/checkout-index.c:205

3124 msgid "when creating files, prepend <string>"

3125 msgstr ""

3126

3105 -#: builtin/checkout-index.c:207

3127 +#: builtin/checkout-index.c:208

3128 msgid "copy out the files from named stage"

3129 msgstr ""

3130

@@ -3144,75 +3166,75 @@ msgstr ""

3166 msgid "Unable to add merge result for '%s'"

3167 msgstr ""

3168

3147 -#: builtin/checkout.c:232 builtin/checkout.c:235 builtin/checkout.c:238

3148 -#: builtin/checkout.c:241

3169 +#: builtin/checkout.c:231 builtin/checkout.c:234 builtin/checkout.c:237

3170 +#: builtin/checkout.c:240

3171 #, c-format

3172 msgid "'%s' cannot be used with updating paths"

3173 msgstr ""

3174

3153 -#: builtin/checkout.c:244 builtin/checkout.c:247

3175 +#: builtin/checkout.c:243 builtin/checkout.c:246

3176 #, c-format

3177 msgid "'%s' cannot be used with %s"

3178 msgstr ""

3179

3158 -#: builtin/checkout.c:250

3180 +#: builtin/checkout.c:249

3181 #, c-format

3182 msgid "Cannot update paths and switch to branch '%s' at the same time."

3183 msgstr ""

3184

3163 -#: builtin/checkout.c:261 builtin/checkout.c:450

3185 +#: builtin/checkout.c:260 builtin/checkout.c:449

3186 msgid "corrupt index file"

3187 msgstr ""

3188

3167 -#: builtin/checkout.c:321 builtin/checkout.c:328

3189 +#: builtin/checkout.c:320 builtin/checkout.c:327

3190 #, c-format

3191 msgid "path '%s' is unmerged"

3192 msgstr ""

3193

3172 -#: builtin/checkout.c:472

3194 +#: builtin/checkout.c:471

3195 msgid "you need to resolve your current index first"

3196 msgstr ""

3197

3176 -#: builtin/checkout.c:593

3198 +#: builtin/checkout.c:591

3199 #, c-format

3200 msgid "Can not do reflog for '%s'\n"

3201 msgstr ""

3202

3181 -#: builtin/checkout.c:631

3203 +#: builtin/checkout.c:629

3204 msgid "HEAD is now at"

3205 msgstr ""

3206

3185 -#: builtin/checkout.c:638

3207 +#: builtin/checkout.c:636

3208 #, c-format

3209 msgid "Reset branch '%s'\n"

3210 msgstr ""

3211

3190 -#: builtin/checkout.c:641

3212 +#: builtin/checkout.c:639

3213 #, c-format

3214 msgid "Already on '%s'\n"

3215 msgstr ""

3216

3195 -#: builtin/checkout.c:645

3217 +#: builtin/checkout.c:643

3218 #, c-format

3219 msgid "Switched to and reset branch '%s'\n"

3220 msgstr ""

3221

3200 -#: builtin/checkout.c:647 builtin/checkout.c:1032

3222 +#: builtin/checkout.c:645 builtin/checkout.c:1026

3223 #, c-format

3224 msgid "Switched to a new branch '%s'\n"

3225 msgstr ""

3226

3205 -#: builtin/checkout.c:649

3227 +#: builtin/checkout.c:647

3228 #, c-format

3229 msgid "Switched to branch '%s'\n"

3230 msgstr ""

3231

3210 -#: builtin/checkout.c:705

3232 +#: builtin/checkout.c:699

3233 #, c-format

3234 msgid " ... and %d more.\n"

3235 msgstr ""

3236

3215 -#: builtin/checkout.c:711

3237 +#: builtin/checkout.c:705

3238 #, c-format

3239 msgid ""

3240 "Warning: you are leaving %d commit behind, not connected to\n"

@@ -3227,7 +3249,7 @@ msgid_plural ""

3249 msgstr[0] ""

3250 msgstr[1] ""

3251

3230 -#: builtin/checkout.c:729

3252 +#: builtin/checkout.c:723

3253 #, c-format

3254 msgid ""

3255 "If you want to keep them by creating a new branch, this may be a good time\n"

@@ -3237,151 +3259,151 @@ msgid ""

3259 "\n"

3260 msgstr ""

3261

3240 -#: builtin/checkout.c:759

3262 +#: builtin/checkout.c:753

3263 msgid "internal error in revision walk"

3264 msgstr ""

3265

3244 -#: builtin/checkout.c:763

3266 +#: builtin/checkout.c:757

3267 msgid "Previous HEAD position was"

3268 msgstr ""

3269

3248 -#: builtin/checkout.c:790 builtin/checkout.c:1027

3270 +#: builtin/checkout.c:784 builtin/checkout.c:1021

3271 msgid "You are on a branch yet to be born"

3272 msgstr ""

3273

3252 -#: builtin/checkout.c:934

3274 +#: builtin/checkout.c:928

3275 #, c-format

3276 msgid "only one reference expected, %d given."

3277 msgstr ""

3278

3257 -#: builtin/checkout.c:973

3279 +#: builtin/checkout.c:967

3280 #, c-format

3281 msgid "invalid reference: %s"

3282 msgstr ""

3283

3262 -#: builtin/checkout.c:1002

3284 +#: builtin/checkout.c:996

3285 #, c-format

3286 msgid "reference is not a tree: %s"

3287 msgstr ""

3288

3267 -#: builtin/checkout.c:1041

3289 +#: builtin/checkout.c:1035

3290 msgid "paths cannot be used with switching branches"

3291 msgstr ""

3292

3271 -#: builtin/checkout.c:1044 builtin/checkout.c:1048

3293 +#: builtin/checkout.c:1038 builtin/checkout.c:1042

3294 #, c-format

3295 msgid "'%s' cannot be used with switching branches"

3296 msgstr ""

3297

3276 -#: builtin/checkout.c:1052 builtin/checkout.c:1055 builtin/checkout.c:1060

3277 -#: builtin/checkout.c:1063

3298 +#: builtin/checkout.c:1046 builtin/checkout.c:1049 builtin/checkout.c:1054

3299 +#: builtin/checkout.c:1057

3300 #, c-format

3301 msgid "'%s' cannot be used with '%s'"

3302 msgstr ""

3303

3282 -#: builtin/checkout.c:1068

3304 +#: builtin/checkout.c:1062

3305 #, c-format

3306 msgid "Cannot switch branch to a non-commit '%s'"

3307 msgstr ""

3308

3287 -#: builtin/checkout.c:1090 builtin/checkout.c:1092 builtin/clone.c:88

3309 +#: builtin/checkout.c:1084 builtin/checkout.c:1086 builtin/clone.c:88

3310 #: builtin/remote.c:159 builtin/remote.c:161

3311 msgid "branch"

3312 msgstr ""

3313

3292 -#: builtin/checkout.c:1091

3314 +#: builtin/checkout.c:1085

3315 msgid "create and checkout a new branch"

3316 msgstr ""

3317

3296 -#: builtin/checkout.c:1093

3318 +#: builtin/checkout.c:1087

3319 msgid "create/reset and checkout a branch"

3320 msgstr ""

3321

3300 -#: builtin/checkout.c:1094

3322 +#: builtin/checkout.c:1088

3323 msgid "create reflog for new branch"

3324 msgstr ""

3325

3304 -#: builtin/checkout.c:1095

3326 +#: builtin/checkout.c:1089

3327 msgid "detach the HEAD at named commit"

3328 msgstr ""

3329

3308 -#: builtin/checkout.c:1096

3330 +#: builtin/checkout.c:1090

3331 msgid "set upstream info for new branch"

3332 msgstr ""

3333

3312 -#: builtin/checkout.c:1098

3334 +#: builtin/checkout.c:1092

3335 msgid "new-branch"

3336 msgstr ""

3337

3316 -#: builtin/checkout.c:1098

3338 +#: builtin/checkout.c:1092

3339 msgid "new unparented branch"

3340 msgstr ""

3341

3320 -#: builtin/checkout.c:1099

3342 +#: builtin/checkout.c:1093

3343 msgid "checkout our version for unmerged files"

3344 msgstr ""

3345

3324 -#: builtin/checkout.c:1101

3346 +#: builtin/checkout.c:1095

3347 msgid "checkout their version for unmerged files"

3348 msgstr ""

3349

3328 -#: builtin/checkout.c:1103

3350 +#: builtin/checkout.c:1097

3351 msgid "force checkout (throw away local modifications)"

3352 msgstr ""

3353

3332 -#: builtin/checkout.c:1104

3354 +#: builtin/checkout.c:1098

3355 msgid "perform a 3-way merge with the new branch"

3356 msgstr ""

3357

3336 -#: builtin/checkout.c:1105 builtin/merge.c:225

3358 +#: builtin/checkout.c:1099 builtin/merge.c:225

3359 msgid "update ignored files (default)"

3360 msgstr ""

3361

3340 -#: builtin/checkout.c:1106 builtin/log.c:1228 parse-options.h:245

3362 +#: builtin/checkout.c:1100 builtin/log.c:1236 parse-options.h:245

3363 msgid "style"

3364 msgstr ""

3365

3344 -#: builtin/checkout.c:1107

3366 +#: builtin/checkout.c:1101

3367 msgid "conflict style (merge or diff3)"

3368 msgstr ""

3369

3348 -#: builtin/checkout.c:1110

3370 +#: builtin/checkout.c:1104

3371 msgid "do not limit pathspecs to sparse entries only"

3372 msgstr ""

3373

3352 -#: builtin/checkout.c:1112

3374 +#: builtin/checkout.c:1106

3375 msgid "second guess 'git checkout no-such-branch'"

3376 msgstr ""

3377

3356 -#: builtin/checkout.c:1135

3378 +#: builtin/checkout.c:1129

3379 msgid "-b, -B and --orphan are mutually exclusive"

3380 msgstr ""

3381

3360 -#: builtin/checkout.c:1152

3382 +#: builtin/checkout.c:1146

3383 msgid "--track needs a branch name"

3384 msgstr ""

3385

3364 -#: builtin/checkout.c:1159

3386 +#: builtin/checkout.c:1153

3387 msgid "Missing branch name; try -b"

3388 msgstr ""

3389

3368 -#: builtin/checkout.c:1196

3390 +#: builtin/checkout.c:1190

3391 msgid "invalid path specification"

3392 msgstr ""

3393

3372 -#: builtin/checkout.c:1203

3394 +#: builtin/checkout.c:1197

3395 #, c-format

3396 msgid ""

3397 "Cannot update paths and switch to branch '%s' at the same time.\n"

3398 "Did you intend to checkout '%s' which can not be resolved as commit?"

3399 msgstr ""

3400

3379 -#: builtin/checkout.c:1208

3401 +#: builtin/checkout.c:1202

3402 #, c-format

3403 msgid "git checkout: --detach does not take a path argument '%s'"

3404 msgstr ""

3405

3384 -#: builtin/checkout.c:1212

3406 +#: builtin/checkout.c:1206

3407 msgid ""

3408 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"

3409 "checking out of the index."

@@ -3442,30 +3464,30 @@ msgstr ""

3464 msgid "Huh (%s)?"

3465 msgstr ""

3466

3445 -#: builtin/clean.c:660

3467 +#: builtin/clean.c:659

3468 #, c-format

3469 msgid "Input ignore patterns>> "

3470 msgstr ""

3471

3450 -#: builtin/clean.c:697

3472 +#: builtin/clean.c:696

3473 #, c-format

3474 msgid "WARNING: Cannot find items matched by: %s"

3475 msgstr ""

3476

3455 -#: builtin/clean.c:718

3477 +#: builtin/clean.c:717

3478 msgid "Select items to delete"

3479 msgstr ""

3480

3459 -#: builtin/clean.c:758

3481 +#: builtin/clean.c:757

3482 #, c-format

3483 msgid "remove %s? "

3484 msgstr ""

3485

3464 -#: builtin/clean.c:783

3486 +#: builtin/clean.c:782

3487 msgid "Bye."

3488 msgstr ""

3489

3468 -#: builtin/clean.c:791

3490 +#: builtin/clean.c:790

3491 msgid ""

3492 "clean - start cleaning\n"

3493 "filter by pattern - exclude items from deletion\n"

@@ -3476,68 +3498,68 @@ msgid ""

3498 "? - help for prompt selection"

3499 msgstr ""

3500

3479 -#: builtin/clean.c:818

3501 +#: builtin/clean.c:817

3502 msgid "*** Commands ***"

3503 msgstr ""

3504

3483 -#: builtin/clean.c:819

3505 +#: builtin/clean.c:818

3506 msgid "What now"

3507 msgstr ""

3508

3487 -#: builtin/clean.c:827

3509 +#: builtin/clean.c:826

3510 msgid "Would remove the following item:"

3511 msgid_plural "Would remove the following items:"

3512 msgstr[0] ""

3513 msgstr[1] ""

3514

3493 -#: builtin/clean.c:844

3515 +#: builtin/clean.c:843

3516 msgid "No more files to clean, exiting."

3517 msgstr ""

3518

3497 -#: builtin/clean.c:875

3519 +#: builtin/clean.c:874

3520 msgid "do not print names of files removed"

3521 msgstr ""

3522

3501 -#: builtin/clean.c:877

3523 +#: builtin/clean.c:876

3524 msgid "force"

3525 msgstr ""

3526

3505 -#: builtin/clean.c:878

3527 +#: builtin/clean.c:877

3528 msgid "interactive cleaning"

3529 msgstr ""

3530

3509 -#: builtin/clean.c:880

3531 +#: builtin/clean.c:879

3532 msgid "remove whole directories"

3533 msgstr ""

3534

3513 -#: builtin/clean.c:881 builtin/describe.c:415 builtin/grep.c:716

3514 -#: builtin/ls-files.c:486 builtin/name-rev.c:314 builtin/show-ref.c:185

3535 +#: builtin/clean.c:880 builtin/describe.c:406 builtin/grep.c:714

3536 +#: builtin/ls-files.c:486 builtin/name-rev.c:311 builtin/show-ref.c:185

3537 msgid "pattern"

3538 msgstr ""

3539

3518 -#: builtin/clean.c:882

3540 +#: builtin/clean.c:881

3541 msgid "add <pattern> to ignore rules"

3542 msgstr ""

3543

3522 -#: builtin/clean.c:883

3544 +#: builtin/clean.c:882

3545 msgid "remove ignored files, too"

3546 msgstr ""

3547

3526 -#: builtin/clean.c:885

3548 +#: builtin/clean.c:884

3549 msgid "remove only ignored files"

3550 msgstr ""

3551

3530 -#: builtin/clean.c:903

3552 +#: builtin/clean.c:902

3553 msgid "-x and -X cannot be used together"

3554 msgstr ""

3555

3534 -#: builtin/clean.c:907

3556 +#: builtin/clean.c:906

3557 msgid ""

3558 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "

3559 "clean"

3560 msgstr ""

3561

3540 -#: builtin/clean.c:910

3562 +#: builtin/clean.c:909

3563 msgid ""

3564 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "

3565 "refusing to clean"

@@ -3547,8 +3569,8 @@ msgstr ""

3569 msgid "git clone [options] [--] <repo> [<dir>]"

3570 msgstr ""

3571

3550 -#: builtin/clone.c:64 builtin/fetch.c:97 builtin/merge.c:222

3551 -#: builtin/push.c:504

3572 +#: builtin/clone.c:64 builtin/fetch.c:112 builtin/merge.c:222

3573 +#: builtin/push.c:503

3574 msgid "force progress reporting"

3575 msgstr ""

3576

@@ -3608,7 +3630,7 @@ msgstr ""

3630 msgid "path to git-upload-pack on the remote"

3631 msgstr ""

3632

3611 -#: builtin/clone.c:92 builtin/fetch.c:98 builtin/grep.c:661

3633 +#: builtin/clone.c:92 builtin/fetch.c:113 builtin/grep.c:659

3634 msgid "depth"

3635 msgstr ""

3636

@@ -3707,94 +3729,94 @@ msgstr ""

3729 msgid "remote did not send all necessary objects"

3730 msgstr ""

3731

3710 -#: builtin/clone.c:626

3732 +#: builtin/clone.c:627

3733 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"

3734 msgstr ""

3735

3714 -#: builtin/clone.c:657

3736 +#: builtin/clone.c:658

3737 msgid "unable to checkout working tree"

3738 msgstr ""

3739

3718 -#: builtin/clone.c:765

3740 +#: builtin/clone.c:768

3741 msgid "Too many arguments."

3742 msgstr ""

3743

3722 -#: builtin/clone.c:769

3744 +#: builtin/clone.c:772

3745 msgid "You must specify a repository to clone."

3746 msgstr ""

3747

3726 -#: builtin/clone.c:780

3748 +#: builtin/clone.c:783

3749 #, c-format

3750 msgid "--bare and --origin %s options are incompatible."

3751 msgstr ""

3752

3731 -#: builtin/clone.c:783

3753 +#: builtin/clone.c:786

3754 msgid "--bare and --separate-git-dir are incompatible."

3755 msgstr ""

3756

3735 -#: builtin/clone.c:796

3757 +#: builtin/clone.c:799

3758 #, c-format

3759 msgid "repository '%s' does not exist"

3760 msgstr ""

3761

3740 -#: builtin/clone.c:802

3741 -msgid "--depth is ignored in local clones; use file:// instead."

3742 -msgstr ""

3743 -

3744 -#: builtin/clone.c:805

3745 -msgid "source repository is shallow, ignoring --local"

3746 -msgstr ""

3747 -

3748 -#: builtin/clone.c:810

3749 -msgid "--local is ignored"

3750 -msgstr ""

3751 -

3752 -#: builtin/clone.c:814 builtin/fetch.c:1119

3762 +#: builtin/clone.c:805 builtin/fetch.c:1143

3763 #, c-format

3764 msgid "depth %s is not a positive number"

3765 msgstr ""

3766

3757 -#: builtin/clone.c:824

3767 +#: builtin/clone.c:815

3768 #, c-format

3769 msgid "destination path '%s' already exists and is not an empty directory."

3770 msgstr ""

3771

3762 -#: builtin/clone.c:834

3772 +#: builtin/clone.c:825

3773 #, c-format

3774 msgid "working tree '%s' already exists."

3775 msgstr ""

3776

3767 -#: builtin/clone.c:847 builtin/clone.c:859

3777 +#: builtin/clone.c:838 builtin/clone.c:850

3778 #, c-format

3779 msgid "could not create leading directories of '%s'"

3780 msgstr ""

3781

3772 -#: builtin/clone.c:850

3782 +#: builtin/clone.c:841

3783 #, c-format

3784 msgid "could not create work tree dir '%s'."

3785 msgstr ""

3786

3777 -#: builtin/clone.c:869

3787 +#: builtin/clone.c:860

3788 #, c-format

3789 msgid "Cloning into bare repository '%s'...\n"

3790 msgstr ""

3791

3782 -#: builtin/clone.c:871

3792 +#: builtin/clone.c:862

3793 #, c-format

3794 msgid "Cloning into '%s'...\n"

3795 msgstr ""

3796

3797 +#: builtin/clone.c:898

3798 +msgid "--depth is ignored in local clones; use file:// instead."

3799 +msgstr ""

3800 +

3801 +#: builtin/clone.c:901

3802 +msgid "source repository is shallow, ignoring --local"

3803 +msgstr ""

3804 +

3805 #: builtin/clone.c:906

3806 +msgid "--local is ignored"

3807 +msgstr ""

3808 +

3809 +#: builtin/clone.c:910

3810 #, c-format

3811 msgid "Don't know how to clone %s"

3812 msgstr ""

3813

3792 -#: builtin/clone.c:957 builtin/clone.c:965

3814 +#: builtin/clone.c:961 builtin/clone.c:969

3815 #, c-format

3816 msgid "Remote branch %s not found in upstream %s"

3817 msgstr ""

3818

3797 -#: builtin/clone.c:968

3819 +#: builtin/clone.c:972

3820 msgid "You appear to have cloned an empty repository."

3821 msgstr ""

3822

@@ -3886,89 +3908,96 @@ msgstr ""

3908 msgid "failed to unpack HEAD tree object"

3909 msgstr ""

3910

3889 -#: builtin/commit.c:330

3911 +#: builtin/commit.c:328

3912 msgid "unable to create temporary index"

3913 msgstr ""

3914

3893 -#: builtin/commit.c:336

3915 +#: builtin/commit.c:334

3916 msgid "interactive add failed"

3917 msgstr ""

3918

3897 -#: builtin/commit.c:369 builtin/commit.c:390 builtin/commit.c:440

3919 +#: builtin/commit.c:366 builtin/commit.c:387 builtin/commit.c:435

3920 msgid "unable to write new_index file"

3921 msgstr ""

3922

3901 -#: builtin/commit.c:421

3923 +#: builtin/commit.c:418

3924 msgid "cannot do a partial commit during a merge."

3925 msgstr ""

3926

3905 -#: builtin/commit.c:423

3927 +#: builtin/commit.c:420

3928 msgid "cannot do a partial commit during a cherry-pick."

3929 msgstr ""

3930

3909 -#: builtin/commit.c:433

3931 +#: builtin/commit.c:429

3932 msgid "cannot read the index"

3933 msgstr ""

3934

3913 -#: builtin/commit.c:453

3935 +#: builtin/commit.c:447

3936 msgid "unable to write temporary index file"

3937 msgstr ""

3938

3917 -#: builtin/commit.c:544 builtin/commit.c:550

3939 +#: builtin/commit.c:557 builtin/commit.c:563

3940 #, c-format

3941 msgid "invalid commit: %s"

3942 msgstr ""

3943

3922 -#: builtin/commit.c:572

3944 +#: builtin/commit.c:585

3945 msgid "malformed --author parameter"

3946 msgstr ""

3947

3948 #: builtin/commit.c:592

3949 #, c-format

3950 +msgid "invalid date format: %s"

3951 +msgstr ""

3952 +

3953 +#: builtin/commit.c:609

3954 +#, c-format

3955 msgid "Malformed ident string: '%s'"

3956 msgstr ""

3957

3931 -#: builtin/commit.c:629 builtin/commit.c:663 builtin/commit.c:1014

3958 +#: builtin/commit.c:642

3959 +msgid ""

3960 +"unable to select a comment character that is not used\n"

3961 +"in the current commit message"

3962 +msgstr ""

3963 +

3964 +#: builtin/commit.c:679 builtin/commit.c:712 builtin/commit.c:1086

3965 #, c-format

3966 msgid "could not lookup commit %s"

3967 msgstr ""

3968

3936 -#: builtin/commit.c:641 builtin/shortlog.c:273

3969 +#: builtin/commit.c:691 builtin/shortlog.c:273

3970 #, c-format

3971 msgid "(reading log message from standard input)\n"

3972 msgstr ""

3973

3941 -#: builtin/commit.c:643

3974 +#: builtin/commit.c:693

3975 msgid "could not read log from standard input"

3976 msgstr ""

3977

3945 -#: builtin/commit.c:647

3978 +#: builtin/commit.c:697

3979 #, c-format

3980 msgid "could not read log file '%s'"

3981 msgstr ""

3982

3950 -#: builtin/commit.c:654

3951 -msgid "commit has empty message"

3952 -msgstr ""

3953 -

3954 -#: builtin/commit.c:670

3983 +#: builtin/commit.c:719

3984 msgid "could not read MERGE_MSG"

3985 msgstr ""

3986

3958 -#: builtin/commit.c:674

3987 +#: builtin/commit.c:723

3988 msgid "could not read SQUASH_MSG"

3989 msgstr ""

3990

3962 -#: builtin/commit.c:678

3991 +#: builtin/commit.c:727

3992 #, c-format

3993 msgid "could not read '%s'"

3994 msgstr ""

3995

3967 -#: builtin/commit.c:749

3996 +#: builtin/commit.c:798

3997 msgid "could not write commit template"

3998 msgstr ""

3999

3971 -#: builtin/commit.c:764

4000 +#: builtin/commit.c:816

4001 #, c-format

4002 msgid ""

4003 "\n"

@@ -3978,7 +4007,7 @@ msgid ""

4007 "and try again.\n"

4008 msgstr ""

4009

3981 -#: builtin/commit.c:769

4010 +#: builtin/commit.c:821

4011 #, c-format

4012 msgid ""

4013 "\n"

@@ -3988,14 +4017,14 @@ msgid ""

4017 "and try again.\n"

4018 msgstr ""

4019

3991 -#: builtin/commit.c:782

4020 +#: builtin/commit.c:834

4021 #, c-format

4022 msgid ""

4023 "Please enter the commit message for your changes. Lines starting\n"

4024 "with '%c' will be ignored, and an empty message aborts the commit.\n"

4025 msgstr ""

4026

3998 -#: builtin/commit.c:789

4027 +#: builtin/commit.c:841

4028 #, c-format

4029 msgid ""

4030 "Please enter the commit message for your changes. Lines starting\n"

@@ -4003,351 +4032,356 @@ msgid ""

4032 "An empty message aborts the commit.\n"

4033 msgstr ""

4034

4006 -#: builtin/commit.c:802

4035 +#: builtin/commit.c:855

4036 +#, c-format

4037 +msgid "%sAuthor: %.*s <%.*s>"

4038 +msgstr ""

4039 +

4040 +#: builtin/commit.c:863

4041 #, c-format

4008 -msgid "%sAuthor: %s"

4042 +msgid "%sDate: %s"

4043 msgstr ""

4044

4011 -#: builtin/commit.c:809

4045 +#: builtin/commit.c:870

4046 #, c-format

4013 -msgid "%sCommitter: %s"

4047 +msgid "%sCommitter: %.*s <%.*s>"

4048 msgstr ""

4049

4016 -#: builtin/commit.c:829

4050 +#: builtin/commit.c:888

4051 msgid "Cannot read index"

4052 msgstr ""

4053

4020 -#: builtin/commit.c:872

4054 +#: builtin/commit.c:945

4055 msgid "Error building trees"

4056 msgstr ""

4057

4024 -#: builtin/commit.c:887 builtin/tag.c:391

4058 +#: builtin/commit.c:960 builtin/tag.c:495

4059 #, c-format

4060 msgid "Please supply the message using either -m or -F option.\n"

4061 msgstr ""

4062

4029 -#: builtin/commit.c:989

4063 +#: builtin/commit.c:1061

4064 #, c-format

4065 msgid "No existing author found with '%s'"

4066 msgstr ""

4067

4034 -#: builtin/commit.c:1004 builtin/commit.c:1244

4068 +#: builtin/commit.c:1076 builtin/commit.c:1316

4069 #, c-format

4070 msgid "Invalid untracked files mode '%s'"

4071 msgstr ""

4072

4039 -#: builtin/commit.c:1041

4073 +#: builtin/commit.c:1113

4074 msgid "--long and -z are incompatible"

4075 msgstr ""

4076

4043 -#: builtin/commit.c:1071

4077 +#: builtin/commit.c:1143

4078 msgid "Using both --reset-author and --author does not make sense"

4079 msgstr ""

4080

4047 -#: builtin/commit.c:1080

4081 +#: builtin/commit.c:1152

4082 msgid "You have nothing to amend."

4083 msgstr ""

4084

4051 -#: builtin/commit.c:1083

4085 +#: builtin/commit.c:1155

4086 msgid "You are in the middle of a merge -- cannot amend."

4087 msgstr ""

4088

4055 -#: builtin/commit.c:1085

4089 +#: builtin/commit.c:1157

4090 msgid "You are in the middle of a cherry-pick -- cannot amend."

4091 msgstr ""

4092

4059 -#: builtin/commit.c:1088

4093 +#: builtin/commit.c:1160

4094 msgid "Options --squash and --fixup cannot be used together"

4095 msgstr ""

4096

4063 -#: builtin/commit.c:1098

4097 +#: builtin/commit.c:1170

4098 msgid "Only one of -c/-C/-F/--fixup can be used."

4099 msgstr ""

4100

4067 -#: builtin/commit.c:1100

4101 +#: builtin/commit.c:1172

4102 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."

4103 msgstr ""

4104

4071 -#: builtin/commit.c:1108

4105 +#: builtin/commit.c:1180

4106 msgid "--reset-author can be used only with -C, -c or --amend."

4107 msgstr ""

4108

4075 -#: builtin/commit.c:1125

4109 +#: builtin/commit.c:1197

4110 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."

4111 msgstr ""

4112

4079 -#: builtin/commit.c:1127

4113 +#: builtin/commit.c:1199

4114 msgid "No paths with --include/--only does not make sense."

4115 msgstr ""

4116

4083 -#: builtin/commit.c:1129

4117 +#: builtin/commit.c:1201

4118 msgid "Clever... amending the last one with dirty index."

4119 msgstr ""

4120

4087 -#: builtin/commit.c:1131

4121 +#: builtin/commit.c:1203

4122 msgid "Explicit paths specified without -i or -o; assuming --only paths..."

4123 msgstr ""

4124

4091 -#: builtin/commit.c:1143 builtin/tag.c:639

4125 +#: builtin/commit.c:1215 builtin/tag.c:727

4126 #, c-format

4127 msgid "Invalid cleanup mode %s"

4128 msgstr ""

4129

4096 -#: builtin/commit.c:1148

4130 +#: builtin/commit.c:1220

4131 msgid "Paths with -a does not make sense."

4132 msgstr ""

4133

4100 -#: builtin/commit.c:1258 builtin/commit.c:1516

4134 +#: builtin/commit.c:1330 builtin/commit.c:1595

4135 msgid "show status concisely"

4136 msgstr ""

4137

4104 -#: builtin/commit.c:1260 builtin/commit.c:1518

4138 +#: builtin/commit.c:1332 builtin/commit.c:1597

4139 msgid "show branch information"

4140 msgstr ""

4141

4108 -#: builtin/commit.c:1262 builtin/commit.c:1520 builtin/push.c:490

4142 +#: builtin/commit.c:1334 builtin/commit.c:1599 builtin/push.c:489

4143 msgid "machine-readable output"

4144 msgstr ""

4145

4112 -#: builtin/commit.c:1265 builtin/commit.c:1522

4146 +#: builtin/commit.c:1337 builtin/commit.c:1601

4147 msgid "show status in long format (default)"

4148 msgstr ""

4149

4116 -#: builtin/commit.c:1268 builtin/commit.c:1525

4150 +#: builtin/commit.c:1340 builtin/commit.c:1604

4151 msgid "terminate entries with NUL"

4152 msgstr ""

4153

4120 -#: builtin/commit.c:1270 builtin/commit.c:1528 builtin/fast-export.c:674

4121 -#: builtin/fast-export.c:677 builtin/tag.c:514

4154 +#: builtin/commit.c:1342 builtin/commit.c:1607 builtin/fast-export.c:703

4155 +#: builtin/fast-export.c:706 builtin/tag.c:602

4156 msgid "mode"

4157 msgstr ""

4158

4125 -#: builtin/commit.c:1271 builtin/commit.c:1528

4159 +#: builtin/commit.c:1343 builtin/commit.c:1607

4160 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"

4161 msgstr ""

4162

4129 -#: builtin/commit.c:1274

4163 +#: builtin/commit.c:1346

4164 msgid "show ignored files"

4165 msgstr ""

4166

4133 -#: builtin/commit.c:1275 parse-options.h:153

4167 +#: builtin/commit.c:1347 parse-options.h:153

4168 msgid "when"

4169 msgstr ""

4170

4137 -#: builtin/commit.c:1276

4171 +#: builtin/commit.c:1348

4172 msgid ""

4173 "ignore changes to submodules, optional when: all, dirty, untracked. "

4174 "(Default: all)"

4175 msgstr ""

4176

4143 -#: builtin/commit.c:1278

4177 +#: builtin/commit.c:1350

4178 msgid "list untracked files in columns"

4179 msgstr ""

4180

4147 -#: builtin/commit.c:1347

4181 +#: builtin/commit.c:1419

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

4183 msgstr ""

4184

4151 -#: builtin/commit.c:1349

4185 +#: builtin/commit.c:1421

4186 msgid "could not parse newly created commit"

4187 msgstr ""

4188

4155 -#: builtin/commit.c:1390

4189 +#: builtin/commit.c:1469

4190 msgid "detached HEAD"

4191 msgstr ""

4192

4159 -#: builtin/commit.c:1392

4193 +#: builtin/commit.c:1471

4194 msgid " (root-commit)"

4195 msgstr ""

4196

4163 -#: builtin/commit.c:1486

4197 +#: builtin/commit.c:1565

4198 msgid "suppress summary after successful commit"

4199 msgstr ""

4200

4167 -#: builtin/commit.c:1487

4201 +#: builtin/commit.c:1566

4202 msgid "show diff in commit message template"

4203 msgstr ""

4204

4171 -#: builtin/commit.c:1489

4205 +#: builtin/commit.c:1568

4206 msgid "Commit message options"

4207 msgstr ""

4208

4175 -#: builtin/commit.c:1490 builtin/tag.c:512

4209 +#: builtin/commit.c:1569 builtin/tag.c:600

4210 msgid "read message from file"

4211 msgstr ""

4212

4179 -#: builtin/commit.c:1491

4213 +#: builtin/commit.c:1570

4214 msgid "author"

4215 msgstr ""

4216

4183 -#: builtin/commit.c:1491

4217 +#: builtin/commit.c:1570

4218 msgid "override author for commit"

4219 msgstr ""

4220

4187 -#: builtin/commit.c:1492 builtin/gc.c:272

4221 +#: builtin/commit.c:1571 builtin/gc.c:286

4222 msgid "date"

4223 msgstr ""

4224

4191 -#: builtin/commit.c:1492

4225 +#: builtin/commit.c:1571

4226 msgid "override date for commit"

4227 msgstr ""

4228

4195 -#: builtin/commit.c:1493 builtin/merge.c:216 builtin/notes.c:409

4196 -#: builtin/notes.c:566 builtin/tag.c:510

4229 +#: builtin/commit.c:1572 builtin/merge.c:216 builtin/notes.c:409

4230 +#: builtin/notes.c:566 builtin/tag.c:598

4231 msgid "message"

4232 msgstr ""

4233

4200 -#: builtin/commit.c:1493

4234 +#: builtin/commit.c:1572

4235 msgid "commit message"

4236 msgstr ""

4237

4204 -#: builtin/commit.c:1494

4238 +#: builtin/commit.c:1573

4239 msgid "reuse and edit message from specified commit"

4240 msgstr ""

4241

4208 -#: builtin/commit.c:1495

4242 +#: builtin/commit.c:1574

4243 msgid "reuse message from specified commit"

4244 msgstr ""

4245

4212 -#: builtin/commit.c:1496

4246 +#: builtin/commit.c:1575

4247 msgid "use autosquash formatted message to fixup specified commit"

4248 msgstr ""

4249

4216 -#: builtin/commit.c:1497

4250 +#: builtin/commit.c:1576

4251 msgid "use autosquash formatted message to squash specified commit"

4252 msgstr ""

4253

4220 -#: builtin/commit.c:1498

4254 +#: builtin/commit.c:1577

4255 msgid "the commit is authored by me now (used with -C/-c/--amend)"

4256 msgstr ""

4257

4224 -#: builtin/commit.c:1499 builtin/log.c:1180 builtin/revert.c:86

4258 +#: builtin/commit.c:1578 builtin/log.c:1188 builtin/revert.c:86

4259 msgid "add Signed-off-by:"

4260 msgstr ""

4261

4228 -#: builtin/commit.c:1500

4262 +#: builtin/commit.c:1579

4263 msgid "use specified template file"

4264 msgstr ""

4265

4232 -#: builtin/commit.c:1501

4266 +#: builtin/commit.c:1580

4267 msgid "force edit of commit"

4268 msgstr ""

4269

4236 -#: builtin/commit.c:1502

4270 +#: builtin/commit.c:1581

4271 msgid "default"

4272 msgstr ""

4273

4240 -#: builtin/commit.c:1502 builtin/tag.c:515

4274 +#: builtin/commit.c:1581 builtin/tag.c:603

4275 msgid "how to strip spaces and #comments from message"

4276 msgstr ""

4277

4244 -#: builtin/commit.c:1503

4278 +#: builtin/commit.c:1582

4279 msgid "include status in commit message template"

4280 msgstr ""

4281

4248 -#: builtin/commit.c:1504 builtin/merge.c:223 builtin/revert.c:92

4249 -#: builtin/tag.c:516

4282 +#: builtin/commit.c:1583 builtin/merge.c:223 builtin/revert.c:92

4283 +#: builtin/tag.c:604

4284 msgid "key-id"

4285 msgstr ""

4286

4253 -#: builtin/commit.c:1505 builtin/merge.c:224 builtin/revert.c:93

4287 +#: builtin/commit.c:1584 builtin/merge.c:224 builtin/revert.c:93

4288 msgid "GPG sign commit"

4289 msgstr ""

4290

4257 -#: builtin/commit.c:1508

4291 +#: builtin/commit.c:1587

4292 msgid "Commit contents options"

4293 msgstr ""

4294

4261 -#: builtin/commit.c:1509

4295 +#: builtin/commit.c:1588

4296 msgid "commit all changed files"

4297 msgstr ""

4298

4265 -#: builtin/commit.c:1510

4299 +#: builtin/commit.c:1589

4300 msgid "add specified files to index for commit"

4301 msgstr ""

4302

4269 -#: builtin/commit.c:1511

4303 +#: builtin/commit.c:1590

4304 msgid "interactively add files"

4305 msgstr ""

4306

4273 -#: builtin/commit.c:1512

4307 +#: builtin/commit.c:1591

4308 msgid "interactively add changes"

4309 msgstr ""

4310

4277 -#: builtin/commit.c:1513

4311 +#: builtin/commit.c:1592

4312 msgid "commit only specified files"

4313 msgstr ""

4314

4281 -#: builtin/commit.c:1514

4315 +#: builtin/commit.c:1593

4316 msgid "bypass pre-commit hook"

4317 msgstr ""

4318

4285 -#: builtin/commit.c:1515

4319 +#: builtin/commit.c:1594

4320 msgid "show what would be committed"

4321 msgstr ""

4322

4289 -#: builtin/commit.c:1526

4323 +#: builtin/commit.c:1605

4324 msgid "amend previous commit"

4325 msgstr ""

4326

4293 -#: builtin/commit.c:1527

4327 +#: builtin/commit.c:1606

4328 msgid "bypass post-rewrite hook"

4329 msgstr ""

4330

4297 -#: builtin/commit.c:1532

4331 +#: builtin/commit.c:1611

4332 msgid "ok to record an empty change"

4333 msgstr ""

4334

4301 -#: builtin/commit.c:1534

4335 +#: builtin/commit.c:1613

4336 msgid "ok to record a change with an empty message"

4337 msgstr ""

4338

4305 -#: builtin/commit.c:1562

4339 +#: builtin/commit.c:1641

4340 msgid "could not parse HEAD commit"

4341 msgstr ""

4342

4309 -#: builtin/commit.c:1601 builtin/merge.c:518

4343 +#: builtin/commit.c:1680 builtin/merge.c:518

4344 #, c-format

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

4346 msgstr ""

4347

4314 -#: builtin/commit.c:1608

4348 +#: builtin/commit.c:1687

4349 #, c-format

4350 msgid "Corrupt MERGE_HEAD file (%s)"

4351 msgstr ""

4352

4319 -#: builtin/commit.c:1615

4353 +#: builtin/commit.c:1694

4354 msgid "could not read MERGE_MODE"

4355 msgstr ""

4356

4323 -#: builtin/commit.c:1634

4357 +#: builtin/commit.c:1713

4358 #, c-format

4359 msgid "could not read commit message: %s"

4360 msgstr ""

4361

4328 -#: builtin/commit.c:1645

4362 +#: builtin/commit.c:1724

4363 #, c-format

4364 msgid "Aborting commit; you did not edit the message.\n"

4365 msgstr ""

4366

4333 -#: builtin/commit.c:1650

4367 +#: builtin/commit.c:1729

4368 #, c-format

4369 msgid "Aborting commit due to empty commit message.\n"

4370 msgstr ""

4371

4338 -#: builtin/commit.c:1665 builtin/merge.c:857 builtin/merge.c:882

4372 +#: builtin/commit.c:1744 builtin/merge.c:851 builtin/merge.c:876

4373 msgid "failed to write commit object"

4374 msgstr ""

4375

4342 -#: builtin/commit.c:1686

4376 +#: builtin/commit.c:1756

4377 msgid "cannot lock HEAD ref"

4378 msgstr ""

4379

4346 -#: builtin/commit.c:1690

4380 +#: builtin/commit.c:1769

4381 msgid "cannot update HEAD ref"

4382 msgstr ""

4383

4350 -#: builtin/commit.c:1701

4384 +#: builtin/commit.c:1780

4385 msgid ""

4386 "Repository has been updated, but unable to write\n"

4387 "new_index file. Check that disk is not full or quota is\n"

@@ -4498,129 +4532,129 @@ msgstr ""

4532 msgid "git describe [options] --dirty"

4533 msgstr ""

4534

4501 -#: builtin/describe.c:225

4535 +#: builtin/describe.c:216

4536 #, c-format

4537 msgid "annotated tag %s not available"

4538 msgstr ""

4539

4506 -#: builtin/describe.c:229

4540 +#: builtin/describe.c:220

4541 #, c-format

4542 msgid "annotated tag %s has no embedded name"

4543 msgstr ""

4544

4511 -#: builtin/describe.c:231

4545 +#: builtin/describe.c:222

4546 #, c-format

4547 msgid "tag '%s' is really '%s' here"

4548 msgstr ""

4549

4516 -#: builtin/describe.c:258

4550 +#: builtin/describe.c:249

4551 #, c-format

4552 msgid "Not a valid object name %s"

4553 msgstr ""

4554

4521 -#: builtin/describe.c:261

4555 +#: builtin/describe.c:252

4556 #, c-format

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

4558 msgstr ""

4559

4526 -#: builtin/describe.c:278

4560 +#: builtin/describe.c:269

4561 #, c-format

4562 msgid "no tag exactly matches '%s'"

4563 msgstr ""

4564

4531 -#: builtin/describe.c:280

4565 +#: builtin/describe.c:271

4566 #, c-format

4567 msgid "searching to describe %s\n"

4568 msgstr ""

4569

4536 -#: builtin/describe.c:327

4570 +#: builtin/describe.c:318

4571 #, c-format

4572 msgid "finished search at %s\n"

4573 msgstr ""

4574

4541 -#: builtin/describe.c:354

4575 +#: builtin/describe.c:345

4576 #, c-format

4577 msgid ""

4578 "No annotated tags can describe '%s'.\n"

4579 "However, there were unannotated tags: try --tags."

4580 msgstr ""

4581

4548 -#: builtin/describe.c:358

4582 +#: builtin/describe.c:349

4583 #, c-format

4584 msgid ""

4585 "No tags can describe '%s'.\n"

4586 "Try --always, or create some tags."

4587 msgstr ""

4588

4555 -#: builtin/describe.c:379

4589 +#: builtin/describe.c:370

4590 #, c-format

4591 msgid "traversed %lu commits\n"

4592 msgstr ""

4593

4560 -#: builtin/describe.c:382

4594 +#: builtin/describe.c:373

4595 #, c-format

4596 msgid ""

4597 "more than %i tags found; listed %i most recent\n"

4598 "gave up search at %s\n"

4599 msgstr ""

4600

4567 -#: builtin/describe.c:404

4601 +#: builtin/describe.c:395

4602 msgid "find the tag that comes after the commit"

4603 msgstr ""

4604

4571 -#: builtin/describe.c:405

4605 +#: builtin/describe.c:396

4606 msgid "debug search strategy on stderr"

4607 msgstr ""

4608

4575 -#: builtin/describe.c:406

4609 +#: builtin/describe.c:397

4610 msgid "use any ref"

4611 msgstr ""

4612

4579 -#: builtin/describe.c:407

4613 +#: builtin/describe.c:398

4614 msgid "use any tag, even unannotated"

4615 msgstr ""

4616

4583 -#: builtin/describe.c:408

4617 +#: builtin/describe.c:399

4618 msgid "always use long format"

4619 msgstr ""

4620

4587 -#: builtin/describe.c:409

4621 +#: builtin/describe.c:400

4622 msgid "only follow first parent"

4623 msgstr ""

4624

4591 -#: builtin/describe.c:412

4625 +#: builtin/describe.c:403

4626 msgid "only output exact matches"

4627 msgstr ""

4628

4595 -#: builtin/describe.c:414

4629 +#: builtin/describe.c:405

4630 msgid "consider <n> most recent tags (default: 10)"

4631 msgstr ""

4632

4599 -#: builtin/describe.c:416

4633 +#: builtin/describe.c:407

4634 msgid "only consider tags matching <pattern>"

4635 msgstr ""

4636

4603 -#: builtin/describe.c:418 builtin/name-rev.c:321

4637 +#: builtin/describe.c:409 builtin/name-rev.c:318

4638 msgid "show abbreviated commit object as fallback"

4639 msgstr ""

4640

4607 -#: builtin/describe.c:419

4641 +#: builtin/describe.c:410

4642 msgid "mark"

4643 msgstr ""

4644

4611 -#: builtin/describe.c:420

4645 +#: builtin/describe.c:411

4646 msgid "append <mark> on dirty working tree (default: \"-dirty\")"

4647 msgstr ""

4648

4615 -#: builtin/describe.c:438

4649 +#: builtin/describe.c:429

4650 msgid "--long is incompatible with --abbrev=0"

4651 msgstr ""

4652

4619 -#: builtin/describe.c:464

4653 +#: builtin/describe.c:455

4654 msgid "No names found, cannot describe anything."

4655 msgstr ""

4656

4623 -#: builtin/describe.c:484

4657 +#: builtin/describe.c:475

4658 msgid "--dirty is incompatible with commit-ishes"

4659 msgstr ""

4660

@@ -4653,46 +4687,54 @@ msgstr ""

4687 msgid "unhandled object '%s' given."

4688 msgstr ""

4689

4656 -#: builtin/fast-export.c:22

4690 +#: builtin/fast-export.c:23

4691 msgid "git fast-export [rev-list-opts]"

4692 msgstr ""

4693

4660 -#: builtin/fast-export.c:673

4694 +#: builtin/fast-export.c:702

4695 msgid "show progress after <n> objects"

4696 msgstr ""

4697

4664 -#: builtin/fast-export.c:675

4698 +#: builtin/fast-export.c:704

4699 msgid "select handling of signed tags"

4700 msgstr ""

4701

4668 -#: builtin/fast-export.c:678

4702 +#: builtin/fast-export.c:707

4703 msgid "select handling of tags that tag filtered objects"

4704 msgstr ""

4705

4672 -#: builtin/fast-export.c:681

4706 +#: builtin/fast-export.c:710

4707 msgid "Dump marks to this file"

4708 msgstr ""

4709

4676 -#: builtin/fast-export.c:683

4710 +#: builtin/fast-export.c:712

4711 msgid "Import marks from this file"

4712 msgstr ""

4713

4680 -#: builtin/fast-export.c:685

4714 +#: builtin/fast-export.c:714

4715 msgid "Fake a tagger when tags lack one"

4716 msgstr ""

4717

4684 -#: builtin/fast-export.c:687

4718 +#: builtin/fast-export.c:716

4719 msgid "Output full tree for each commit"

4720 msgstr ""

4721

4688 -#: builtin/fast-export.c:689

4722 +#: builtin/fast-export.c:718

4723 msgid "Use the done feature to terminate the stream"

4724 msgstr ""

4725

4692 -#: builtin/fast-export.c:690

4726 +#: builtin/fast-export.c:719

4727 msgid "Skip output of blob data"

4728 msgstr ""

4729

4730 +#: builtin/fast-export.c:720

4731 +msgid "refspec"

4732 +msgstr ""

4733 +

4734 +#: builtin/fast-export.c:721

4735 +msgid "Apply refspec to exported refs"

4736 +msgstr ""

4737 +

4738 #: builtin/fetch.c:20

4739 msgid "git fetch [<options>] [<repository> [<refspec>...]]"

4740 msgstr ""

@@ -4709,239 +4751,247 @@ msgstr ""

4751 msgid "git fetch --all [<options>]"

4752 msgstr ""

4753

4712 -#: builtin/fetch.c:75

4754 +#: builtin/fetch.c:90

4755 msgid "fetch from all remotes"

4756 msgstr ""

4757

4716 -#: builtin/fetch.c:77

4758 +#: builtin/fetch.c:92

4759 msgid "append to .git/FETCH_HEAD instead of overwriting"

4760 msgstr ""

4761

4720 -#: builtin/fetch.c:79

4762 +#: builtin/fetch.c:94

4763 msgid "path to upload pack on remote end"

4764 msgstr ""

4765

4724 -#: builtin/fetch.c:80

4766 +#: builtin/fetch.c:95

4767 msgid "force overwrite of local branch"

4768 msgstr ""

4769

4728 -#: builtin/fetch.c:82

4770 +#: builtin/fetch.c:97

4771 msgid "fetch from multiple remotes"

4772 msgstr ""

4773

4732 -#: builtin/fetch.c:84

4774 +#: builtin/fetch.c:99

4775 msgid "fetch all tags and associated objects"

4776 msgstr ""

4777

4736 -#: builtin/fetch.c:86

4778 +#: builtin/fetch.c:101

4779 msgid "do not fetch all tags (--no-tags)"

4780 msgstr ""

4781

4740 -#: builtin/fetch.c:88

4782 +#: builtin/fetch.c:103

4783 msgid "prune remote-tracking branches no longer on remote"

4784 msgstr ""

4785

4744 -#: builtin/fetch.c:89

4786 +#: builtin/fetch.c:104

4787 msgid "on-demand"

4788 msgstr ""

4789

4748 -#: builtin/fetch.c:90

4790 +#: builtin/fetch.c:105

4791 msgid "control recursive fetching of submodules"

4792 msgstr ""

4793

4752 -#: builtin/fetch.c:94

4794 +#: builtin/fetch.c:109

4795 msgid "keep downloaded pack"

4796 msgstr ""

4797

4756 -#: builtin/fetch.c:96

4798 +#: builtin/fetch.c:111

4799 msgid "allow updating of HEAD ref"

4800 msgstr ""

4801

4760 -#: builtin/fetch.c:99

4802 +#: builtin/fetch.c:114

4803 msgid "deepen history of shallow clone"

4804 msgstr ""

4805

4764 -#: builtin/fetch.c:101

4806 +#: builtin/fetch.c:116

4807 msgid "convert to a complete repository"

4808 msgstr ""

4809

4768 -#: builtin/fetch.c:103 builtin/log.c:1197

4810 +#: builtin/fetch.c:118 builtin/log.c:1205

4811 msgid "dir"

4812 msgstr ""

4813

4772 -#: builtin/fetch.c:104

4814 +#: builtin/fetch.c:119

4815 msgid "prepend this to submodule path output"

4816 msgstr ""

4817

4776 -#: builtin/fetch.c:107

4818 +#: builtin/fetch.c:122

4819 msgid "default mode for recursion"

4820 msgstr ""

4821

4780 -#: builtin/fetch.c:109

4822 +#: builtin/fetch.c:124

4823 msgid "accept refs that update .git/shallow"

4824 msgstr ""

4825

4784 -#: builtin/fetch.c:347

4826 +#: builtin/fetch.c:125

4827 +msgid "refmap"

4828 +msgstr ""

4829 +

4830 +#: builtin/fetch.c:126

4831 +msgid "specify fetch refmap"

4832 +msgstr ""

4833 +

4834 +#: builtin/fetch.c:376

4835 msgid "Couldn't find remote ref HEAD"

4836 msgstr ""

4837

4788 -#: builtin/fetch.c:411

4838 +#: builtin/fetch.c:440

4839 #, c-format

4840 msgid "object %s not found"

4841 msgstr ""

4842

4793 -#: builtin/fetch.c:416

4843 +#: builtin/fetch.c:445

4844 msgid "[up to date]"

4845 msgstr ""

4846

4797 -#: builtin/fetch.c:430

4847 +#: builtin/fetch.c:459

4848 #, c-format

4849 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"

4850 msgstr ""

4851

4802 -#: builtin/fetch.c:431 builtin/fetch.c:517

4852 +#: builtin/fetch.c:460 builtin/fetch.c:546

4853 msgid "[rejected]"

4854 msgstr ""

4855

4806 -#: builtin/fetch.c:442

4856 +#: builtin/fetch.c:471

4857 msgid "[tag update]"

4858 msgstr ""

4859

4810 -#: builtin/fetch.c:444 builtin/fetch.c:479 builtin/fetch.c:497

4860 +#: builtin/fetch.c:473 builtin/fetch.c:508 builtin/fetch.c:526

4861 msgid " (unable to update local ref)"

4862 msgstr ""

4863

4814 -#: builtin/fetch.c:462

4864 +#: builtin/fetch.c:491

4865 msgid "[new tag]"

4866 msgstr ""

4867

4818 -#: builtin/fetch.c:465

4868 +#: builtin/fetch.c:494

4869 msgid "[new branch]"

4870 msgstr ""

4871

4822 -#: builtin/fetch.c:468

4872 +#: builtin/fetch.c:497

4873 msgid "[new ref]"

4874 msgstr ""

4875

4826 -#: builtin/fetch.c:513

4876 +#: builtin/fetch.c:542

4877 msgid "unable to update local ref"

4878 msgstr ""

4879

4830 -#: builtin/fetch.c:513

4880 +#: builtin/fetch.c:542

4881 msgid "forced update"

4882 msgstr ""

4883

4834 -#: builtin/fetch.c:519

4884 +#: builtin/fetch.c:548

4885 msgid "(non-fast-forward)"

4886 msgstr ""

4887

4838 -#: builtin/fetch.c:552 builtin/fetch.c:785

4888 +#: builtin/fetch.c:581 builtin/fetch.c:814

4889 #, c-format

4890 msgid "cannot open %s: %s\n"

4891 msgstr ""

4892

4843 -#: builtin/fetch.c:561

4893 +#: builtin/fetch.c:590

4894 #, c-format

4895 msgid "%s did not send all necessary objects\n"

4896 msgstr ""

4897

4848 -#: builtin/fetch.c:579

4898 +#: builtin/fetch.c:608

4899 #, c-format

4900 msgid "reject %s because shallow roots are not allowed to be updated"

4901 msgstr ""

4902

4853 -#: builtin/fetch.c:667 builtin/fetch.c:750

4903 +#: builtin/fetch.c:696 builtin/fetch.c:779

4904 #, c-format

4905 msgid "From %.*s\n"

4906 msgstr ""

4907

4858 -#: builtin/fetch.c:678

4908 +#: builtin/fetch.c:707

4909 #, c-format

4910 msgid ""

4911 "some local refs could not be updated; try running\n"

4912 " 'git remote prune %s' to remove any old, conflicting branches"

4913 msgstr ""

4914

4865 -#: builtin/fetch.c:730

4915 +#: builtin/fetch.c:759

4916 #, c-format

4917 msgid " (%s will become dangling)"

4918 msgstr ""

4919

4870 -#: builtin/fetch.c:731

4920 +#: builtin/fetch.c:760

4921 #, c-format

4922 msgid " (%s has become dangling)"

4923 msgstr ""

4924

4875 -#: builtin/fetch.c:755

4925 +#: builtin/fetch.c:784

4926 msgid "[deleted]"

4927 msgstr ""

4928

4879 -#: builtin/fetch.c:756 builtin/remote.c:1050

4929 +#: builtin/fetch.c:785 builtin/remote.c:1059

4930 msgid "(none)"

4931 msgstr ""

4932

4883 -#: builtin/fetch.c:775

4933 +#: builtin/fetch.c:804

4934 #, c-format

4935 msgid "Refusing to fetch into current branch %s of non-bare repository"

4936 msgstr ""

4937

4888 -#: builtin/fetch.c:794

4938 +#: builtin/fetch.c:823

4939 #, c-format

4940 msgid "Option \"%s\" value \"%s\" is not valid for %s"

4941 msgstr ""

4942

4893 -#: builtin/fetch.c:797

4943 +#: builtin/fetch.c:826

4944 #, c-format

4945 msgid "Option \"%s\" is ignored for %s\n"

4946 msgstr ""

4947

4898 -#: builtin/fetch.c:853

4948 +#: builtin/fetch.c:882

4949 #, c-format

4950 msgid "Don't know how to fetch from %s"

4951 msgstr ""

4952

4903 -#: builtin/fetch.c:1015

4953 +#: builtin/fetch.c:1044

4954 #, c-format

4955 msgid "Fetching %s\n"

4956 msgstr ""

4957

4908 -#: builtin/fetch.c:1017 builtin/remote.c:90

4958 +#: builtin/fetch.c:1046 builtin/remote.c:90

4959 #, c-format

4960 msgid "Could not fetch %s"

4961 msgstr ""

4962

4913 -#: builtin/fetch.c:1035

4963 +#: builtin/fetch.c:1064

4964 msgid ""

4965 "No remote repository specified. Please, specify either a URL or a\n"

4966 "remote name from which new revisions should be fetched."

4967 msgstr ""

4968

4919 -#: builtin/fetch.c:1059

4969 +#: builtin/fetch.c:1087

4970 msgid "You need to specify a tag name."

4971 msgstr ""

4972

4923 -#: builtin/fetch.c:1107

4973 +#: builtin/fetch.c:1131

4974 msgid "--depth and --unshallow cannot be used together"

4975 msgstr ""

4976

4927 -#: builtin/fetch.c:1109

4977 +#: builtin/fetch.c:1133

4978 msgid "--unshallow on a complete repository does not make sense"

4979 msgstr ""

4980

4931 -#: builtin/fetch.c:1132

4981 +#: builtin/fetch.c:1156

4982 msgid "fetch --all does not take a repository argument"

4983 msgstr ""

4984

4935 -#: builtin/fetch.c:1134

4985 +#: builtin/fetch.c:1158

4986 msgid "fetch --all does not make sense with refspecs"

4987 msgstr ""

4988

4939 -#: builtin/fetch.c:1145

4989 +#: builtin/fetch.c:1169

4990 #, c-format

4991 msgid "No such remote or remote group: %s"

4992 msgstr ""

4993

4944 -#: builtin/fetch.c:1153

4994 +#: builtin/fetch.c:1177

4995 msgid "Fetching a group and specifying refspecs does not make sense"

4996 msgstr ""

4997

@@ -4949,9 +4999,9 @@ msgstr ""

4999 msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"

5000 msgstr ""

5001

4952 -#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:700

4953 -#: builtin/merge.c:196 builtin/repack.c:175 builtin/repack.c:179

4954 -#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:501

5002 +#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:698

5003 +#: builtin/merge.c:196 builtin/repack.c:179 builtin/repack.c:183

5004 +#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:589

5005 #: parse-options.h:132 parse-options.h:239

5006 msgid "n"

5007 msgstr ""

@@ -4976,43 +5026,43 @@ msgstr ""

5026 msgid "file to read from"

5027 msgstr ""

5028

4979 -#: builtin/for-each-ref.c:1063

5029 +#: builtin/for-each-ref.c:1051

5030 msgid "git for-each-ref [options] [<pattern>]"

5031 msgstr ""

5032

4983 -#: builtin/for-each-ref.c:1078

5033 +#: builtin/for-each-ref.c:1066

5034 msgid "quote placeholders suitably for shells"

5035 msgstr ""

5036

4987 -#: builtin/for-each-ref.c:1080

5037 +#: builtin/for-each-ref.c:1068

5038 msgid "quote placeholders suitably for perl"

5039 msgstr ""

5040

4991 -#: builtin/for-each-ref.c:1082

5041 +#: builtin/for-each-ref.c:1070

5042 msgid "quote placeholders suitably for python"

5043 msgstr ""

5044

4995 -#: builtin/for-each-ref.c:1084

5045 +#: builtin/for-each-ref.c:1072

5046 msgid "quote placeholders suitably for tcl"

5047 msgstr ""

5048

4999 -#: builtin/for-each-ref.c:1087

5049 +#: builtin/for-each-ref.c:1075

5050 msgid "show only <n> matched refs"

5051 msgstr ""

5052

5003 -#: builtin/for-each-ref.c:1088 builtin/replace.c:177

5053 +#: builtin/for-each-ref.c:1076 builtin/replace.c:435

5054 msgid "format"

5055 msgstr ""

5056

5007 -#: builtin/for-each-ref.c:1088

5057 +#: builtin/for-each-ref.c:1076

5058 msgid "format to use for the output"

5059 msgstr ""

5060

5011 -#: builtin/for-each-ref.c:1089

5061 +#: builtin/for-each-ref.c:1077

5062 msgid "key"

5063 msgstr ""

5064

5015 -#: builtin/for-each-ref.c:1090

5065 +#: builtin/for-each-ref.c:1078

5066 msgid "field name to sort on"

5067 msgstr ""

5068

@@ -5020,55 +5070,55 @@ msgstr ""

5070 msgid "Checking connectivity"

5071 msgstr ""

5072

5023 -#: builtin/fsck.c:544

5073 +#: builtin/fsck.c:538

5074 msgid "Checking object directories"

5075 msgstr ""

5076

5027 -#: builtin/fsck.c:607

5077 +#: builtin/fsck.c:601

5078 msgid "git fsck [options] [<object>...]"

5079 msgstr ""

5080

5031 -#: builtin/fsck.c:613

5081 +#: builtin/fsck.c:607

5082 msgid "show unreachable objects"

5083 msgstr ""

5084

5035 -#: builtin/fsck.c:614

5085 +#: builtin/fsck.c:608

5086 msgid "show dangling objects"

5087 msgstr ""

5088

5039 -#: builtin/fsck.c:615

5089 +#: builtin/fsck.c:609

5090 msgid "report tags"

5091 msgstr ""

5092

5043 -#: builtin/fsck.c:616

5093 +#: builtin/fsck.c:610

5094 msgid "report root nodes"

5095 msgstr ""

5096

5047 -#: builtin/fsck.c:617

5097 +#: builtin/fsck.c:611

5098 msgid "make index objects head nodes"

5099 msgstr ""

5100

5051 -#: builtin/fsck.c:618

5101 +#: builtin/fsck.c:612

5102 msgid "make reflogs head nodes (default)"

5103 msgstr ""

5104

5055 -#: builtin/fsck.c:619

5105 +#: builtin/fsck.c:613

5106 msgid "also consider packs and alternate objects"

5107 msgstr ""

5108

5059 -#: builtin/fsck.c:620

5109 +#: builtin/fsck.c:614

5110 msgid "enable more strict checking"

5111 msgstr ""

5112

5063 -#: builtin/fsck.c:622

5113 +#: builtin/fsck.c:616

5114 msgid "write dangling objects in .git/lost-found"

5115 msgstr ""

5116

5067 -#: builtin/fsck.c:623 builtin/prune.c:144

5117 +#: builtin/fsck.c:617 builtin/prune.c:144

5118 msgid "show progress"

5119 msgstr ""

5120

5071 -#: builtin/fsck.c:673

5121 +#: builtin/fsck.c:667

5122 msgid "Checking objects"

5123 msgstr ""

5124

@@ -5076,54 +5126,54 @@ msgstr ""

5126 msgid "git gc [options]"

5127 msgstr ""

5128

5079 -#: builtin/gc.c:90

5129 +#: builtin/gc.c:91

5130 #, c-format

5131 msgid "Invalid %s: '%s'"

5132 msgstr ""

5133

5084 -#: builtin/gc.c:117

5134 +#: builtin/gc.c:118

5135 #, c-format

5136 msgid "insanely long object directory %.*s"

5137 msgstr ""

5138

5089 -#: builtin/gc.c:273

5139 +#: builtin/gc.c:287

5140 msgid "prune unreferenced objects"

5141 msgstr ""

5142

5093 -#: builtin/gc.c:275

5143 +#: builtin/gc.c:289

5144 msgid "be more thorough (increased runtime)"

5145 msgstr ""

5146

5097 -#: builtin/gc.c:276

5147 +#: builtin/gc.c:290

5148 msgid "enable auto-gc mode"

5149 msgstr ""

5150

5101 -#: builtin/gc.c:277

5151 +#: builtin/gc.c:291

5152 msgid "force running gc even if there may be another gc running"

5153 msgstr ""

5154

5105 -#: builtin/gc.c:318

5155 +#: builtin/gc.c:332

5156 #, c-format

5157 msgid "Auto packing the repository in background for optimum performance.\n"

5158 msgstr ""

5159

5110 -#: builtin/gc.c:320

5160 +#: builtin/gc.c:334

5161 #, c-format

5162 msgid "Auto packing the repository for optimum performance.\n"

5163 msgstr ""

5164

5115 -#: builtin/gc.c:321

5165 +#: builtin/gc.c:335

5166 #, c-format

5167 msgid "See \"git help gc\" for manual housekeeping.\n"

5168 msgstr ""

5169

5120 -#: builtin/gc.c:336

5170 +#: builtin/gc.c:353

5171 #, c-format

5172 msgid ""

5173 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"

5174 msgstr ""

5175

5126 -#: builtin/gc.c:361

5176 +#: builtin/gc.c:375

5177 msgid ""

5178 "There are too many unreachable loose objects; run 'git prune' to remove them."

5179 msgstr ""

@@ -5137,224 +5187,219 @@ msgstr ""

5187 msgid "grep: failed to create thread: %s"

5188 msgstr ""

5189

5140 -#: builtin/grep.c:365

5141 -#, c-format

5142 -msgid "Failed to chdir: %s"

5143 -msgstr ""

5144 -

5145 -#: builtin/grep.c:443 builtin/grep.c:478

5190 +#: builtin/grep.c:441 builtin/grep.c:476

5191 #, c-format

5192 msgid "unable to read tree (%s)"

5193 msgstr ""

5194

5150 -#: builtin/grep.c:493

5195 +#: builtin/grep.c:491

5196 #, c-format

5197 msgid "unable to grep from object of type %s"

5198 msgstr ""

5199

5155 -#: builtin/grep.c:549

5200 +#: builtin/grep.c:547

5201 #, c-format

5202 msgid "switch `%c' expects a numerical value"

5203 msgstr ""

5204

5160 -#: builtin/grep.c:566

5205 +#: builtin/grep.c:564

5206 #, c-format

5207 msgid "cannot open '%s'"

5208 msgstr ""

5209

5165 -#: builtin/grep.c:640

5210 +#: builtin/grep.c:638

5211 msgid "search in index instead of in the work tree"

5212 msgstr ""

5213

5169 -#: builtin/grep.c:642

5214 +#: builtin/grep.c:640

5215 msgid "find in contents not managed by git"

5216 msgstr ""

5217

5173 -#: builtin/grep.c:644

5218 +#: builtin/grep.c:642

5219 msgid "search in both tracked and untracked files"

5220 msgstr ""

5221

5177 -#: builtin/grep.c:646

5222 +#: builtin/grep.c:644

5223 msgid "search also in ignored files"

5224 msgstr ""

5225

5181 -#: builtin/grep.c:649

5226 +#: builtin/grep.c:647

5227 msgid "show non-matching lines"

5228 msgstr ""

5229

5185 -#: builtin/grep.c:651

5230 +#: builtin/grep.c:649

5231 msgid "case insensitive matching"

5232 msgstr ""

5233

5189 -#: builtin/grep.c:653

5234 +#: builtin/grep.c:651

5235 msgid "match patterns only at word boundaries"

5236 msgstr ""

5237

5193 -#: builtin/grep.c:655

5238 +#: builtin/grep.c:653

5239 msgid "process binary files as text"

5240 msgstr ""

5241

5197 -#: builtin/grep.c:657

5242 +#: builtin/grep.c:655

5243 msgid "don't match patterns in binary files"

5244 msgstr ""

5245

5201 -#: builtin/grep.c:660

5246 +#: builtin/grep.c:658

5247 msgid "process binary files with textconv filters"

5248 msgstr ""

5249

5205 -#: builtin/grep.c:662

5250 +#: builtin/grep.c:660

5251 msgid "descend at most <depth> levels"

5252 msgstr ""

5253

5209 -#: builtin/grep.c:666

5254 +#: builtin/grep.c:664

5255 msgid "use extended POSIX regular expressions"

5256 msgstr ""

5257

5213 -#: builtin/grep.c:669

5258 +#: builtin/grep.c:667

5259 msgid "use basic POSIX regular expressions (default)"

5260 msgstr ""

5261

5217 -#: builtin/grep.c:672

5262 +#: builtin/grep.c:670

5263 msgid "interpret patterns as fixed strings"

5264 msgstr ""

5265

5221 -#: builtin/grep.c:675

5266 +#: builtin/grep.c:673

5267 msgid "use Perl-compatible regular expressions"

5268 msgstr ""

5269

5225 -#: builtin/grep.c:678

5270 +#: builtin/grep.c:676

5271 msgid "show line numbers"

5272 msgstr ""

5273

5229 -#: builtin/grep.c:679

5274 +#: builtin/grep.c:677

5275 msgid "don't show filenames"

5276 msgstr ""

5277

5233 -#: builtin/grep.c:680

5278 +#: builtin/grep.c:678

5279 msgid "show filenames"

5280 msgstr ""

5281

5237 -#: builtin/grep.c:682

5282 +#: builtin/grep.c:680

5283 msgid "show filenames relative to top directory"

5284 msgstr ""

5285

5241 -#: builtin/grep.c:684

5286 +#: builtin/grep.c:682

5287 msgid "show only filenames instead of matching lines"

5288 msgstr ""

5289

5245 -#: builtin/grep.c:686

5290 +#: builtin/grep.c:684

5291 msgid "synonym for --files-with-matches"

5292 msgstr ""

5293

5249 -#: builtin/grep.c:689

5294 +#: builtin/grep.c:687

5295 msgid "show only the names of files without match"

5296 msgstr ""

5297

5253 -#: builtin/grep.c:691

5298 +#: builtin/grep.c:689

5299 msgid "print NUL after filenames"

5300 msgstr ""

5301

5257 -#: builtin/grep.c:693

5302 +#: builtin/grep.c:691

5303 msgid "show the number of matches instead of matching lines"

5304 msgstr ""

5305

5261 -#: builtin/grep.c:694

5306 +#: builtin/grep.c:692

5307 msgid "highlight matches"

5308 msgstr ""

5309

5265 -#: builtin/grep.c:696

5310 +#: builtin/grep.c:694

5311 msgid "print empty line between matches from different files"

5312 msgstr ""

5313

5269 -#: builtin/grep.c:698

5314 +#: builtin/grep.c:696

5315 msgid "show filename only once above matches from same file"

5316 msgstr ""

5317

5273 -#: builtin/grep.c:701

5318 +#: builtin/grep.c:699

5319 msgid "show <n> context lines before and after matches"

5320 msgstr ""

5321

5277 -#: builtin/grep.c:704

5322 +#: builtin/grep.c:702

5323 msgid "show <n> context lines before matches"

5324 msgstr ""

5325

5281 -#: builtin/grep.c:706

5326 +#: builtin/grep.c:704

5327 msgid "show <n> context lines after matches"

5328 msgstr ""

5329

5285 -#: builtin/grep.c:707

5330 +#: builtin/grep.c:705

5331 msgid "shortcut for -C NUM"

5332 msgstr ""

5333

5289 -#: builtin/grep.c:710

5334 +#: builtin/grep.c:708

5335 msgid "show a line with the function name before matches"

5336 msgstr ""

5337

5293 -#: builtin/grep.c:712

5338 +#: builtin/grep.c:710

5339 msgid "show the surrounding function"

5340 msgstr ""

5341

5297 -#: builtin/grep.c:715

5342 +#: builtin/grep.c:713

5343 msgid "read patterns from file"

5344 msgstr ""

5345

5301 -#: builtin/grep.c:717

5346 +#: builtin/grep.c:715

5347 msgid "match <pattern>"

5348 msgstr ""

5349

5305 -#: builtin/grep.c:719

5350 +#: builtin/grep.c:717

5351 msgid "combine patterns specified with -e"

5352 msgstr ""

5353

5309 -#: builtin/grep.c:731

5354 +#: builtin/grep.c:729

5355 msgid "indicate hit with exit status without output"

5356 msgstr ""

5357

5313 -#: builtin/grep.c:733

5358 +#: builtin/grep.c:731

5359 msgid "show only matches from files that match all patterns"

5360 msgstr ""

5361

5317 -#: builtin/grep.c:735

5362 +#: builtin/grep.c:733

5363 msgid "show parse tree for grep expression"

5364 msgstr ""

5365

5321 -#: builtin/grep.c:739

5366 +#: builtin/grep.c:737

5367 msgid "pager"

5368 msgstr ""

5369

5325 -#: builtin/grep.c:739

5370 +#: builtin/grep.c:737

5371 msgid "show matching files in the pager"

5372 msgstr ""

5373

5329 -#: builtin/grep.c:742

5374 +#: builtin/grep.c:740

5375 msgid "allow calling of grep(1) (ignored by this build)"

5376 msgstr ""

5377

5333 -#: builtin/grep.c:743 builtin/show-ref.c:187

5378 +#: builtin/grep.c:741 builtin/show-ref.c:187

5379 msgid "show usage"

5380 msgstr ""

5381

5337 -#: builtin/grep.c:810

5382 +#: builtin/grep.c:808

5383 msgid "no pattern given."

5384 msgstr ""

5385

5341 -#: builtin/grep.c:868

5386 +#: builtin/grep.c:866

5387 msgid "--open-files-in-pager only works on the worktree"

5388 msgstr ""

5389

5345 -#: builtin/grep.c:891

5390 +#: builtin/grep.c:892

5391 msgid "--cached or --untracked cannot be used with --no-index."

5392 msgstr ""

5393

5349 -#: builtin/grep.c:896

5394 +#: builtin/grep.c:897

5395 msgid "--no-index or --untracked cannot be used with revs."

5396 msgstr ""

5397

5353 -#: builtin/grep.c:899

5398 +#: builtin/grep.c:900

5399 msgid "--[no-]exclude-standard cannot be used for tracked contents."

5400 msgstr ""

5401

5357 -#: builtin/grep.c:907

5402 +#: builtin/grep.c:908

5403 msgid "both --cached and trees are given."

5404 msgstr ""

5405

@@ -5368,7 +5413,7 @@ msgstr ""

5413 msgid "git hash-object --stdin-paths < <list-of-paths>"

5414 msgstr ""

5415

5371 -#: builtin/hash-object.c:72 builtin/tag.c:521

5416 +#: builtin/hash-object.c:72 builtin/tag.c:609

5417 msgid "type"

5418 msgstr ""

5419

@@ -5508,280 +5553,291 @@ msgstr ""

5553 msgid "`git %s' is aliased to `%s'"

5554 msgstr ""

5555

5511 -#: builtin/index-pack.c:184

5556 +#: builtin/index-pack.c:145

5557 +#, c-format

5558 +msgid "unable to open %s"

5559 +msgstr ""

5560 +

5561 +#: builtin/index-pack.c:191

5562 #, c-format

5563 msgid "object type mismatch at %s"

5564 msgstr ""

5565

5516 -#: builtin/index-pack.c:204

5517 -msgid "object of unexpected type"

5566 +#: builtin/index-pack.c:211

5567 +#, c-format

5568 +msgid "did not receive expected object %s"

5569 +msgstr ""

5570 +

5571 +#: builtin/index-pack.c:214

5572 +#, c-format

5573 +msgid "object %s: expected type %s, found %s"

5574 msgstr ""

5575

5520 -#: builtin/index-pack.c:244

5576 +#: builtin/index-pack.c:256

5577 #, c-format

5578 msgid "cannot fill %d byte"

5579 msgid_plural "cannot fill %d bytes"

5580 msgstr[0] ""

5581 msgstr[1] ""

5582

5527 -#: builtin/index-pack.c:254

5583 +#: builtin/index-pack.c:266

5584 msgid "early EOF"

5585 msgstr ""

5586

5531 -#: builtin/index-pack.c:255

5587 +#: builtin/index-pack.c:267

5588 msgid "read error on input"

5589 msgstr ""

5590

5535 -#: builtin/index-pack.c:267

5591 +#: builtin/index-pack.c:279

5592 msgid "used more bytes than were available"

5593 msgstr ""

5594

5539 -#: builtin/index-pack.c:274

5595 +#: builtin/index-pack.c:286

5596 msgid "pack too large for current definition of off_t"

5597 msgstr ""

5598

5543 -#: builtin/index-pack.c:290

5599 +#: builtin/index-pack.c:302

5600 #, c-format

5601 msgid "unable to create '%s'"

5602 msgstr ""

5603

5548 -#: builtin/index-pack.c:295

5604 +#: builtin/index-pack.c:307

5605 #, c-format

5606 msgid "cannot open packfile '%s'"

5607 msgstr ""

5608

5553 -#: builtin/index-pack.c:309

5609 +#: builtin/index-pack.c:321

5610 msgid "pack signature mismatch"

5611 msgstr ""

5612

5557 -#: builtin/index-pack.c:311

5613 +#: builtin/index-pack.c:323

5614 #, c-format

5615 msgid "pack version %<PRIu32> unsupported"

5616 msgstr ""

5617

5562 -#: builtin/index-pack.c:329

5618 +#: builtin/index-pack.c:341

5619 #, c-format

5620 msgid "pack has bad object at offset %lu: %s"

5621 msgstr ""

5622

5567 -#: builtin/index-pack.c:451

5623 +#: builtin/index-pack.c:462

5624 #, c-format

5625 msgid "inflate returned %d"

5626 msgstr ""

5627

5572 -#: builtin/index-pack.c:500

5628 +#: builtin/index-pack.c:511

5629 msgid "offset value overflow for delta base object"

5630 msgstr ""

5631

5576 -#: builtin/index-pack.c:508

5632 +#: builtin/index-pack.c:519

5633 msgid "delta base offset is out of bound"

5634 msgstr ""

5635

5580 -#: builtin/index-pack.c:516

5636 +#: builtin/index-pack.c:527

5637 #, c-format

5638 msgid "unknown object type %d"

5639 msgstr ""

5640

5585 -#: builtin/index-pack.c:547

5641 +#: builtin/index-pack.c:558

5642 msgid "cannot pread pack file"

5643 msgstr ""

5644

5589 -#: builtin/index-pack.c:549

5645 +#: builtin/index-pack.c:560

5646 #, c-format

5647 msgid "premature end of pack file, %lu byte missing"

5648 msgid_plural "premature end of pack file, %lu bytes missing"

5649 msgstr[0] ""

5650 msgstr[1] ""

5651

5596 -#: builtin/index-pack.c:575

5652 +#: builtin/index-pack.c:586

5653 msgid "serious inflate inconsistency"

5654 msgstr ""

5655

5600 -#: builtin/index-pack.c:666 builtin/index-pack.c:672 builtin/index-pack.c:695

5601 -#: builtin/index-pack.c:729 builtin/index-pack.c:738

5656 +#: builtin/index-pack.c:677 builtin/index-pack.c:683 builtin/index-pack.c:706

5657 +#: builtin/index-pack.c:740 builtin/index-pack.c:749

5658 #, c-format

5659 msgid "SHA1 COLLISION FOUND WITH %s !"

5660 msgstr ""

5661

5606 -#: builtin/index-pack.c:669 builtin/pack-objects.c:162

5662 +#: builtin/index-pack.c:680 builtin/pack-objects.c:162

5663 #: builtin/pack-objects.c:254

5664 #, c-format

5665 msgid "unable to read %s"

5666 msgstr ""

5667

5612 -#: builtin/index-pack.c:735

5668 +#: builtin/index-pack.c:746

5669 #, c-format

5670 msgid "cannot read existing object %s"

5671 msgstr ""

5672

5617 -#: builtin/index-pack.c:749

5673 +#: builtin/index-pack.c:760

5674 #, c-format

5675 msgid "invalid blob object %s"

5676 msgstr ""

5677

5622 -#: builtin/index-pack.c:763

5678 +#: builtin/index-pack.c:774

5679 #, c-format

5680 msgid "invalid %s"

5681 msgstr ""

5682

5627 -#: builtin/index-pack.c:766

5683 +#: builtin/index-pack.c:777

5684 msgid "Error in object"

5685 msgstr ""

5686

5631 -#: builtin/index-pack.c:768

5687 +#: builtin/index-pack.c:779

5688 #, c-format

5689 msgid "Not all child objects of %s are reachable"

5690 msgstr ""

5691

5636 -#: builtin/index-pack.c:839 builtin/index-pack.c:869

5692 +#: builtin/index-pack.c:851 builtin/index-pack.c:881

5693 msgid "failed to apply delta"

5694 msgstr ""

5695

5640 -#: builtin/index-pack.c:1010

5696 +#: builtin/index-pack.c:1022

5697 msgid "Receiving objects"

5698 msgstr ""

5699

5644 -#: builtin/index-pack.c:1010

5700 +#: builtin/index-pack.c:1022

5701 msgid "Indexing objects"

5702 msgstr ""

5703

5648 -#: builtin/index-pack.c:1036

5704 +#: builtin/index-pack.c:1048

5705 msgid "pack is corrupted (SHA1 mismatch)"

5706 msgstr ""

5707

5652 -#: builtin/index-pack.c:1041

5708 +#: builtin/index-pack.c:1053

5709 msgid "cannot fstat packfile"

5710 msgstr ""

5711

5656 -#: builtin/index-pack.c:1044

5712 +#: builtin/index-pack.c:1056

5713 msgid "pack has junk at the end"

5714 msgstr ""

5715

5660 -#: builtin/index-pack.c:1055

5716 +#: builtin/index-pack.c:1067

5717 msgid "confusion beyond insanity in parse_pack_objects()"

5718 msgstr ""

5719

5664 -#: builtin/index-pack.c:1078

5720 +#: builtin/index-pack.c:1090

5721 msgid "Resolving deltas"

5722 msgstr ""

5723

5668 -#: builtin/index-pack.c:1088

5724 +#: builtin/index-pack.c:1100

5725 #, c-format

5726 msgid "unable to create thread: %s"

5727 msgstr ""

5728

5673 -#: builtin/index-pack.c:1130

5729 +#: builtin/index-pack.c:1142

5730 msgid "confusion beyond insanity"

5731 msgstr ""

5732

5677 -#: builtin/index-pack.c:1138

5733 +#: builtin/index-pack.c:1150

5734 #, c-format

5735 msgid "completed with %d local objects"

5736 msgstr ""

5737

5682 -#: builtin/index-pack.c:1148

5738 +#: builtin/index-pack.c:1160

5739 #, c-format

5740 msgid "Unexpected tail checksum for %s (disk corruption?)"

5741 msgstr ""

5742

5687 -#: builtin/index-pack.c:1152

5743 +#: builtin/index-pack.c:1164

5744 #, c-format

5745 msgid "pack has %d unresolved delta"

5746 msgid_plural "pack has %d unresolved deltas"

5747 msgstr[0] ""

5748 msgstr[1] ""

5749

5694 -#: builtin/index-pack.c:1177

5750 +#: builtin/index-pack.c:1189

5751 #, c-format

5752 msgid "unable to deflate appended object (%d)"

5753 msgstr ""

5754

5699 -#: builtin/index-pack.c:1256

5755 +#: builtin/index-pack.c:1268

5756 #, c-format

5757 msgid "local object %s is corrupt"

5758 msgstr ""

5759

5704 -#: builtin/index-pack.c:1280

5760 +#: builtin/index-pack.c:1292

5761 msgid "error while closing pack file"

5762 msgstr ""

5763

5708 -#: builtin/index-pack.c:1293

5764 +#: builtin/index-pack.c:1305

5765 #, c-format

5766 msgid "cannot write keep file '%s'"

5767 msgstr ""

5768

5713 -#: builtin/index-pack.c:1301

5769 +#: builtin/index-pack.c:1313

5770 #, c-format

5771 msgid "cannot close written keep file '%s'"

5772 msgstr ""

5773

5718 -#: builtin/index-pack.c:1314

5774 +#: builtin/index-pack.c:1326

5775 msgid "cannot store pack file"

5776 msgstr ""

5777

5722 -#: builtin/index-pack.c:1325

5778 +#: builtin/index-pack.c:1337

5779 msgid "cannot store index file"

5780 msgstr ""

5781

5726 -#: builtin/index-pack.c:1358

5782 +#: builtin/index-pack.c:1370

5783 #, c-format

5784 msgid "bad pack.indexversion=%<PRIu32>"

5785 msgstr ""

5786

5731 -#: builtin/index-pack.c:1364

5787 +#: builtin/index-pack.c:1376

5788 #, c-format

5789 msgid "invalid number of threads specified (%d)"

5790 msgstr ""

5791

5736 -#: builtin/index-pack.c:1368 builtin/index-pack.c:1546

5792 +#: builtin/index-pack.c:1380 builtin/index-pack.c:1559

5793 #, c-format

5794 msgid "no threads support, ignoring %s"

5795 msgstr ""

5796

5741 -#: builtin/index-pack.c:1426

5797 +#: builtin/index-pack.c:1438

5798 #, c-format

5799 msgid "Cannot open existing pack file '%s'"

5800 msgstr ""

5801

5746 -#: builtin/index-pack.c:1428

5802 +#: builtin/index-pack.c:1440

5803 #, c-format

5804 msgid "Cannot open existing pack idx file for '%s'"

5805 msgstr ""

5806

5751 -#: builtin/index-pack.c:1475

5807 +#: builtin/index-pack.c:1487

5808 #, c-format

5809 msgid "non delta: %d object"

5810 msgid_plural "non delta: %d objects"

5811 msgstr[0] ""

5812 msgstr[1] ""

5813

5758 -#: builtin/index-pack.c:1482

5814 +#: builtin/index-pack.c:1494

5815 #, c-format

5816 msgid "chain length = %d: %lu object"

5817 msgid_plural "chain length = %d: %lu objects"

5818 msgstr[0] ""

5819 msgstr[1] ""

5820

5765 -#: builtin/index-pack.c:1510

5821 +#: builtin/index-pack.c:1523

5822 msgid "Cannot come back to cwd"

5823 msgstr ""

5824

5769 -#: builtin/index-pack.c:1558 builtin/index-pack.c:1561

5770 -#: builtin/index-pack.c:1573 builtin/index-pack.c:1577

5825 +#: builtin/index-pack.c:1571 builtin/index-pack.c:1574

5826 +#: builtin/index-pack.c:1586 builtin/index-pack.c:1590

5827 #, c-format

5828 msgid "bad %s"

5829 msgstr ""

5830

5775 -#: builtin/index-pack.c:1591

5831 +#: builtin/index-pack.c:1604

5832 msgid "--fix-thin cannot be used without --stdin"

5833 msgstr ""

5834

5779 -#: builtin/index-pack.c:1595 builtin/index-pack.c:1605

5835 +#: builtin/index-pack.c:1608 builtin/index-pack.c:1617

5836 #, c-format

5837 msgid "packfile name '%s' does not end with '.pack'"

5838 msgstr ""

5839

5784 -#: builtin/index-pack.c:1614

5840 +#: builtin/index-pack.c:1625

5841 msgid "--verify with no packfile name given"

5842 msgstr ""

5843

@@ -5908,7 +5964,7 @@ msgstr ""

5964 msgid "specify that the git repository is to be shared amongst several users"

5965 msgstr ""

5966

5911 -#: builtin/init-db.c:491 builtin/prune-packed.c:79 builtin/repack.c:168

5967 +#: builtin/init-db.c:491 builtin/prune-packed.c:79 builtin/repack.c:172

5968 msgid "be quiet"

5969 msgstr ""

5970

@@ -5946,38 +6002,38 @@ msgstr ""

6002 msgid " or: git show [options] <object>..."

6003 msgstr ""

6004

5949 -#: builtin/log.c:125

6005 +#: builtin/log.c:127

6006 msgid "suppress diff output"

6007 msgstr ""

6008

5953 -#: builtin/log.c:126

6009 +#: builtin/log.c:128

6010 msgid "show source"

6011 msgstr ""

6012

5957 -#: builtin/log.c:127

6013 +#: builtin/log.c:129

6014 msgid "Use mail map file"

6015 msgstr ""

6016

5961 -#: builtin/log.c:128

6017 +#: builtin/log.c:130

6018 msgid "decorate options"

6019 msgstr ""

6020

5965 -#: builtin/log.c:231

6021 +#: builtin/log.c:229

6022 #, c-format

6023 msgid "Final output: %d %s\n"

6024 msgstr ""

6025

5970 -#: builtin/log.c:473 builtin/log.c:565

6026 +#: builtin/log.c:470 builtin/log.c:562

6027 #, c-format

6028 msgid "Could not read object %s"

6029 msgstr ""

6030

5975 -#: builtin/log.c:589

6031 +#: builtin/log.c:586

6032 #, c-format

6033 msgid "Unknown type: %d"

6034 msgstr ""

6035

5980 -#: builtin/log.c:689

6036 +#: builtin/log.c:687

6037 msgid "format.headers without value"

6038 msgstr ""

6039

@@ -5998,200 +6054,209 @@ msgstr ""

6054 msgid "Not a range."

6055 msgstr ""

6056

6001 -#: builtin/log.c:911

6057 +#: builtin/log.c:916

6058 msgid "Cover letter needs email format"

6059 msgstr ""

6060

6005 -#: builtin/log.c:987

6061 +#: builtin/log.c:995

6062 #, c-format

6063 msgid "insane in-reply-to: %s"

6064 msgstr ""

6065

6010 -#: builtin/log.c:1015

6066 +#: builtin/log.c:1023

6067 msgid "git format-patch [options] [<since> | <revision range>]"

6068 msgstr ""

6069

6014 -#: builtin/log.c:1060

6070 +#: builtin/log.c:1068

6071 msgid "Two output directories?"

6072 msgstr ""

6073

6018 -#: builtin/log.c:1175

6074 +#: builtin/log.c:1183

6075 msgid "use [PATCH n/m] even with a single patch"

6076 msgstr ""

6077

6022 -#: builtin/log.c:1178

6078 +#: builtin/log.c:1186

6079 msgid "use [PATCH] even with multiple patches"

6080 msgstr ""

6081

6026 -#: builtin/log.c:1182

6082 +#: builtin/log.c:1190

6083 msgid "print patches to standard out"

6084 msgstr ""

6085

6030 -#: builtin/log.c:1184

6086 +#: builtin/log.c:1192

6087 msgid "generate a cover letter"

6088 msgstr ""

6089

6034 -#: builtin/log.c:1186

6090 +#: builtin/log.c:1194

6091 msgid "use simple number sequence for output file names"

6092 msgstr ""

6093

6038 -#: builtin/log.c:1187

6094 +#: builtin/log.c:1195

6095 msgid "sfx"

6096 msgstr ""

6097

6042 -#: builtin/log.c:1188

6098 +#: builtin/log.c:1196

6099 msgid "use <sfx> instead of '.patch'"

6100 msgstr ""

6101

6046 -#: builtin/log.c:1190

6102 +#: builtin/log.c:1198

6103 msgid "start numbering patches at <n> instead of 1"

6104 msgstr ""

6105

6050 -#: builtin/log.c:1192

6106 +#: builtin/log.c:1200

6107 msgid "mark the series as Nth re-roll"

6108 msgstr ""

6109

6054 -#: builtin/log.c:1194

6110 +#: builtin/log.c:1202

6111 msgid "Use [<prefix>] instead of [PATCH]"

6112 msgstr ""

6113

6058 -#: builtin/log.c:1197

6114 +#: builtin/log.c:1205

6115 msgid "store resulting files in <dir>"

6116 msgstr ""

6117

6062 -#: builtin/log.c:1200

6118 +#: builtin/log.c:1208

6119 msgid "don't strip/add [PATCH]"

6120 msgstr ""

6121

6066 -#: builtin/log.c:1203

6122 +#: builtin/log.c:1211

6123 msgid "don't output binary diffs"

6124 msgstr ""

6125

6070 -#: builtin/log.c:1205

6126 +#: builtin/log.c:1213

6127 msgid "don't include a patch matching a commit upstream"

6128 msgstr ""

6129

6074 -#: builtin/log.c:1207

6130 +#: builtin/log.c:1215

6131 msgid "show patch format instead of default (patch + stat)"

6132 msgstr ""

6133

6078 -#: builtin/log.c:1209

6134 +#: builtin/log.c:1217

6135 msgid "Messaging"

6136 msgstr ""

6137

6082 -#: builtin/log.c:1210

6138 +#: builtin/log.c:1218

6139 msgid "header"

6140 msgstr ""

6141

6086 -#: builtin/log.c:1211

6142 +#: builtin/log.c:1219

6143 msgid "add email header"

6144 msgstr ""

6145

6090 -#: builtin/log.c:1212 builtin/log.c:1214

6146 +#: builtin/log.c:1220 builtin/log.c:1222

6147 msgid "email"

6148 msgstr ""

6149

6094 -#: builtin/log.c:1212

6150 +#: builtin/log.c:1220

6151 msgid "add To: header"

6152 msgstr ""

6153

6098 -#: builtin/log.c:1214

6154 +#: builtin/log.c:1222

6155 msgid "add Cc: header"

6156 msgstr ""

6157

6102 -#: builtin/log.c:1216

6158 +#: builtin/log.c:1224

6159 msgid "ident"

6160 msgstr ""

6161

6106 -#: builtin/log.c:1217

6162 +#: builtin/log.c:1225

6163 msgid "set From address to <ident> (or committer ident if absent)"

6164 msgstr ""

6165

6110 -#: builtin/log.c:1219

6166 +#: builtin/log.c:1227

6167 msgid "message-id"

6168 msgstr ""

6169

6114 -#: builtin/log.c:1220

6170 +#: builtin/log.c:1228

6171 msgid "make first mail a reply to <message-id>"

6172 msgstr ""

6173

6118 -#: builtin/log.c:1221 builtin/log.c:1224

6174 +#: builtin/log.c:1229 builtin/log.c:1232

6175 msgid "boundary"

6176 msgstr ""

6177

6122 -#: builtin/log.c:1222

6178 +#: builtin/log.c:1230

6179 msgid "attach the patch"

6180 msgstr ""

6181

6126 -#: builtin/log.c:1225

6182 +#: builtin/log.c:1233

6183 msgid "inline the patch"

6184 msgstr ""

6185

6130 -#: builtin/log.c:1229

6186 +#: builtin/log.c:1237

6187 msgid "enable message threading, styles: shallow, deep"

6188 msgstr ""

6189

6134 -#: builtin/log.c:1231

6190 +#: builtin/log.c:1239

6191 msgid "signature"

6192 msgstr ""

6193

6138 -#: builtin/log.c:1232

6194 +#: builtin/log.c:1240

6195 msgid "add a signature"

6196 msgstr ""

6197

6142 -#: builtin/log.c:1233

6198 +#: builtin/log.c:1242

6199 +msgid "add a signature from a file"

6200 +msgstr ""

6201 +

6202 +#: builtin/log.c:1243

6203 msgid "don't print the patch filenames"

6204 msgstr ""

6205

6146 -#: builtin/log.c:1307

6206 +#: builtin/log.c:1317

6207 #, c-format

6208 msgid "invalid ident line: %s"

6209 msgstr ""

6210

6151 -#: builtin/log.c:1322

6211 +#: builtin/log.c:1332

6212 msgid "-n and -k are mutually exclusive."

6213 msgstr ""

6214

6155 -#: builtin/log.c:1324

6215 +#: builtin/log.c:1334

6216 msgid "--subject-prefix and -k are mutually exclusive."

6217 msgstr ""

6218

6159 -#: builtin/log.c:1332

6219 +#: builtin/log.c:1342

6220 msgid "--name-only does not make sense"

6221 msgstr ""

6222

6163 -#: builtin/log.c:1334

6223 +#: builtin/log.c:1344

6224 msgid "--name-status does not make sense"

6225 msgstr ""

6226

6167 -#: builtin/log.c:1336

6227 +#: builtin/log.c:1346

6228 msgid "--check does not make sense"

6229 msgstr ""

6230

6171 -#: builtin/log.c:1359

6231 +#: builtin/log.c:1369

6232 msgid "standard output, or directory, which one?"

6233 msgstr ""

6234

6175 -#: builtin/log.c:1361

6235 +#: builtin/log.c:1371

6236 #, c-format

6237 msgid "Could not create directory '%s'"

6238 msgstr ""

6239

6180 -#: builtin/log.c:1509

6240 +#: builtin/log.c:1468

6241 +#, c-format

6242 +msgid "unable to read signature file '%s'"

6243 +msgstr ""

6244 +

6245 +#: builtin/log.c:1531

6246 msgid "Failed to create output files"

6247 msgstr ""

6248

6184 -#: builtin/log.c:1558

6249 +#: builtin/log.c:1579

6250 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"

6251 msgstr ""

6252

6188 -#: builtin/log.c:1613

6253 +#: builtin/log.c:1634

6254 #, c-format

6255 msgid ""

6256 "Could not find a tracked remote branch, please specify <upstream> manually.\n"

6257 msgstr ""

6258

6194 -#: builtin/log.c:1626 builtin/log.c:1628 builtin/log.c:1640

6259 +#: builtin/log.c:1647 builtin/log.c:1649 builtin/log.c:1661

6260 #, c-format

6261 msgid "Unknown commit %s"

6262 msgstr ""

@@ -6472,31 +6537,31 @@ msgstr ""

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

6538 msgstr ""

6539

6475 -#: builtin/merge.c:681

6540 +#: builtin/merge.c:678

6541 msgid "Not handling anything other than two heads merge."

6542 msgstr ""

6543

6479 -#: builtin/merge.c:695

6544 +#: builtin/merge.c:692

6545 #, c-format

6546 msgid "Unknown option for merge-recursive: -X%s"

6547 msgstr ""

6548

6484 -#: builtin/merge.c:709

6549 +#: builtin/merge.c:705

6550 #, c-format

6551 msgid "unable to write %s"

6552 msgstr ""

6553

6489 -#: builtin/merge.c:798

6554 +#: builtin/merge.c:794

6555 #, c-format

6556 msgid "Could not read from '%s'"

6557 msgstr ""

6558

6494 -#: builtin/merge.c:807

6559 +#: builtin/merge.c:803

6560 #, c-format

6561 msgid "Not committing merge; use 'git commit' to complete the merge.\n"

6562 msgstr ""

6563

6499 -#: builtin/merge.c:813

6564 +#: builtin/merge.c:809

6565 #, c-format

6566 msgid ""

6567 "Please enter a commit message to explain why this merge is necessary,\n"

@@ -6506,156 +6571,156 @@ msgid ""

6571 "the commit.\n"

6572 msgstr ""

6573

6509 -#: builtin/merge.c:837

6574 +#: builtin/merge.c:833

6575 msgid "Empty commit message."

6576 msgstr ""

6577

6513 -#: builtin/merge.c:849

6578 +#: builtin/merge.c:845

6579 #, c-format

6580 msgid "Wonderful.\n"

6581 msgstr ""

6582

6518 -#: builtin/merge.c:914

6583 +#: builtin/merge.c:908

6584 #, c-format

6585 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"

6586 msgstr ""

6587

6523 -#: builtin/merge.c:930

6588 +#: builtin/merge.c:924

6589 #, c-format

6590 msgid "'%s' is not a commit"

6591 msgstr ""

6592

6528 -#: builtin/merge.c:971

6593 +#: builtin/merge.c:965

6594 msgid "No current branch."

6595 msgstr ""

6596

6532 -#: builtin/merge.c:973

6597 +#: builtin/merge.c:967

6598 msgid "No remote for the current branch."

6599 msgstr ""

6600

6536 -#: builtin/merge.c:975

6601 +#: builtin/merge.c:969

6602 msgid "No default upstream defined for the current branch."

6603 msgstr ""

6604

6540 -#: builtin/merge.c:980

6605 +#: builtin/merge.c:974

6606 #, c-format

6607 msgid "No remote-tracking branch for %s from %s"

6608 msgstr ""

l10n: git.pot: v2.1.0 round 1 (38 new, 9 removed)