dfc182b139 · 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: 2017-02-18 01:00+0800\n"

11 +"POT-Creation-Date: 2017-04-23 09:54+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"

@@ -58,7 +58,7 @@ msgstr ""

58 msgid "Exiting because of an unresolved conflict."

59 msgstr ""

60

61 -#: advice.c:114 builtin/merge.c:1206

61 +#: advice.c:114 builtin/merge.c:1185

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

63 msgstr ""

64

@@ -305,7 +305,7 @@ msgstr ""

305 msgid "cannot checkout %s"

306 msgstr ""

307

308 -#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:248

308 +#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:253

309 #, c-format

310 msgid "failed to read %s"

311 msgstr ""

@@ -428,7 +428,7 @@ msgstr ""

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

429 msgstr ""

430

431 -#: apply.c:4081 builtin/checkout.c:233 builtin/reset.c:135

431 +#: apply.c:4081 builtin/checkout.c:252 builtin/reset.c:135

432 #, c-format

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

434 msgstr ""

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

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

505 msgstr ""

506

507 -#: apply.c:4531 builtin/fetch.c:737 builtin/fetch.c:986

507 +#: apply.c:4531 builtin/fetch.c:739 builtin/fetch.c:988

508 #, c-format

509 msgid "cannot open %s"

510 msgstr ""

@@ -532,160 +532,160 @@ msgstr ""

532 msgid "unable to read index file"

533 msgstr ""

534

535 -#: apply.c:4824

535 +#: apply.c:4823

536 #, c-format

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

538 msgstr ""

539

540 -#: apply.c:4849

540 +#: apply.c:4850

541 #, c-format

542 msgid "squelched %d whitespace error"

543 msgid_plural "squelched %d whitespace errors"

544 msgstr[0] ""

545 msgstr[1] ""

546

547 -#: apply.c:4855 apply.c:4870

547 +#: apply.c:4856 apply.c:4871

548 #, c-format

549 msgid "%d line adds whitespace errors."

550 msgid_plural "%d lines add whitespace errors."

551 msgstr[0] ""

552 msgstr[1] ""

553

554 -#: apply.c:4863

554 +#: apply.c:4864

555 #, c-format

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

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

558 msgstr[0] ""

559 msgstr[1] ""

560

561 -#: apply.c:4879 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391

561 +#: apply.c:4880 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391

562 msgid "Unable to write new index file"

563 msgstr ""

564

565 -#: apply.c:4910 apply.c:4913 builtin/am.c:2277 builtin/am.c:2280

566 -#: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180

567 -#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:591

568 -#: builtin/submodule--helper.c:594 builtin/submodule--helper.c:960

569 -#: builtin/submodule--helper.c:963 builtin/submodule--helper.c:1104

565 +#: apply.c:4911 apply.c:4914 builtin/am.c:2277 builtin/am.c:2280

566 +#: builtin/clone.c:113 builtin/fetch.c:98 builtin/pull.c:180

567 +#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629

568 +#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973

569 +#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161

570 #: git-add--interactive.perl:239

571 msgid "path"

572 msgstr ""

573

574 -#: apply.c:4911

574 +#: apply.c:4912

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

576 msgstr ""

577

578 -#: apply.c:4914

578 +#: apply.c:4915

579 msgid "apply changes matching the given path"

580 msgstr ""

581

582 -#: apply.c:4916 builtin/am.c:2286

582 +#: apply.c:4917 builtin/am.c:2286

583 msgid "num"

584 msgstr ""

585

586 -#: apply.c:4917

586 +#: apply.c:4918

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

588 msgstr ""

589

590 -#: apply.c:4920

590 +#: apply.c:4921

591 msgid "ignore additions made by the patch"

592 msgstr ""

593

594 -#: apply.c:4922

594 +#: apply.c:4923

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

596 msgstr ""

597

598 -#: apply.c:4926

598 +#: apply.c:4927

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

600 msgstr ""

601

602 -#: apply.c:4928

602 +#: apply.c:4929

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

604 msgstr ""

605

606 -#: apply.c:4930

606 +#: apply.c:4931

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

608 msgstr ""

609

610 -#: apply.c:4932

610 +#: apply.c:4933

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

612 msgstr ""

613

614 -#: apply.c:4934

614 +#: apply.c:4935

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

616 msgstr ""

617

618 -#: apply.c:4936

618 +#: apply.c:4937

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

620 msgstr ""

621

622 -#: apply.c:4938

622 +#: apply.c:4939

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

624 msgstr ""

625

626 -#: apply.c:4940

626 +#: apply.c:4941

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

628 msgstr ""

629

630 -#: apply.c:4942

630 +#: apply.c:4943

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

632 msgstr ""

633

634 -#: apply.c:4945 builtin/checkout-index.c:169 builtin/ls-files.c:507

634 +#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:508

635 msgid "paths are separated with NUL character"

636 msgstr ""

637

638 -#: apply.c:4947

638 +#: apply.c:4948

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

640 msgstr ""

641

642 -#: apply.c:4948 builtin/am.c:2265

642 +#: apply.c:4949 builtin/am.c:2265

643 msgid "action"

644 msgstr ""

645

646 -#: apply.c:4949

646 +#: apply.c:4950

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

648 msgstr ""

649

650 -#: apply.c:4952 apply.c:4955

650 +#: apply.c:4953 apply.c:4956

651 msgid "ignore changes in whitespace when finding context"

652 msgstr ""

653

654 -#: apply.c:4958

654 +#: apply.c:4959

655 msgid "apply the patch in reverse"

656 msgstr ""

657

658 -#: apply.c:4960

658 +#: apply.c:4961

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

660 msgstr ""

661

662 -#: apply.c:4962

662 +#: apply.c:4963

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

664 msgstr ""

665

666 -#: apply.c:4964

666 +#: apply.c:4965

667 msgid "allow overlapping hunks"

668 msgstr ""

669

670 -#: apply.c:4965 builtin/add.c:267 builtin/check-ignore.c:19

670 +#: apply.c:4966 builtin/add.c:267 builtin/check-ignore.c:19

671 #: builtin/commit.c:1337 builtin/count-objects.c:94 builtin/fsck.c:651

672 -#: builtin/log.c:1860 builtin/mv.c:122 builtin/read-tree.c:114

672 +#: builtin/log.c:1867 builtin/mv.c:122 builtin/read-tree.c:134

673 msgid "be verbose"

674 msgstr ""

675

676 -#: apply.c:4967

676 +#: apply.c:4968

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

678 msgstr ""

679

680 -#: apply.c:4970

680 +#: apply.c:4971

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

682 msgstr ""

683

684 -#: apply.c:4972 builtin/am.c:2274

684 +#: apply.c:4973 builtin/am.c:2274

685 msgid "root"

686 msgstr ""

687

688 -#: apply.c:4973

688 +#: apply.c:4974

689 msgid "prepend <root> to all filenames"

690 msgstr ""

691

@@ -706,150 +706,155 @@ msgstr ""

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

707 msgstr ""

708

709 -#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300

709 +#: archive.c:332 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300

710 #, c-format

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

712 msgstr ""

713

714 -#: archive.c:429

714 +#: archive.c:417

715 msgid "fmt"

716 msgstr ""

717

718 -#: archive.c:429

718 +#: archive.c:417

719 msgid "archive format"

720 msgstr ""

721

722 -#: archive.c:430 builtin/log.c:1429

722 +#: archive.c:418 builtin/log.c:1436

723 msgid "prefix"

724 msgstr ""

725

726 -#: archive.c:431

726 +#: archive.c:419

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

728 msgstr ""

729

730 -#: archive.c:432 builtin/blame.c:2607 builtin/blame.c:2608 builtin/config.c:59

731 -#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1054

732 -#: builtin/hash-object.c:101 builtin/ls-files.c:541 builtin/ls-files.c:544

733 -#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:109

730 +#: archive.c:420 builtin/blame.c:2598 builtin/blame.c:2599 builtin/config.c:59

731 +#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1061

732 +#: builtin/hash-object.c:101 builtin/ls-files.c:542 builtin/ls-files.c:545

733 +#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:129

734 #: parse-options.h:153

735 msgid "file"

736 msgstr ""

737

738 -#: archive.c:433 builtin/archive.c:89

738 +#: archive.c:421 builtin/archive.c:89

739 msgid "write the archive to this file"

740 msgstr ""

741

742 -#: archive.c:435

742 +#: archive.c:423

743 msgid "read .gitattributes in working directory"

744 msgstr ""

745

746 -#: archive.c:436

746 +#: archive.c:424

747 msgid "report archived files on stderr"

748 msgstr ""

749

750 -#: archive.c:437

750 +#: archive.c:425

751 msgid "store only"

752 msgstr ""

753

754 -#: archive.c:438

754 +#: archive.c:426

755 msgid "compress faster"

756 msgstr ""

757

758 -#: archive.c:446

758 +#: archive.c:434

759 msgid "compress better"

760 msgstr ""

761

762 -#: archive.c:449

762 +#: archive.c:437

763 msgid "list supported archive formats"

764 msgstr ""

765

766 -#: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88

767 -#: builtin/submodule--helper.c:603 builtin/submodule--helper.c:969

766 +#: archive.c:439 builtin/archive.c:90 builtin/clone.c:103 builtin/clone.c:106

767 +#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982

768 msgid "repo"

769 msgstr ""

770

771 -#: archive.c:452 builtin/archive.c:91

771 +#: archive.c:440 builtin/archive.c:91

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

773 msgstr ""

774

775 -#: archive.c:453 builtin/archive.c:92 builtin/notes.c:485

775 +#: archive.c:441 builtin/archive.c:92 builtin/notes.c:485

776 msgid "command"

777 msgstr ""

778

779 -#: archive.c:454 builtin/archive.c:93

779 +#: archive.c:442 builtin/archive.c:93

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

781 msgstr ""

782

783 -#: archive.c:461

783 +#: archive.c:449

784 msgid "Unexpected option --remote"

785 msgstr ""

786

787 -#: archive.c:463

787 +#: archive.c:451

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

789 msgstr ""

790

791 -#: archive.c:465

791 +#: archive.c:453

792 msgid "Unexpected option --output"

793 msgstr ""

794

795 -#: archive.c:487

795 +#: archive.c:475

796 #, c-format

797 msgid "Unknown archive format '%s'"

798 msgstr ""

799

800 -#: archive.c:494

800 +#: archive.c:482

801 #, c-format

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

803 msgstr ""

804

805 -#: attr.c:263

805 +#: attr.c:212

806 +#, c-format

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

808 +msgstr ""

809 +

810 +#: attr.c:408

811 msgid ""

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

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

814 msgstr ""

815

811 -#: bisect.c:441

816 +#: bisect.c:443

817 #, c-format

818 msgid "Could not open file '%s'"

819 msgstr ""

820

816 -#: bisect.c:446

821 +#: bisect.c:448

822 #, c-format

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

824 msgstr ""

825

821 -#: bisect.c:655

826 +#: bisect.c:656

827 #, c-format

828 msgid "We cannot bisect more!\n"

829 msgstr ""

830

826 -#: bisect.c:708

831 +#: bisect.c:709

832 #, c-format

833 msgid "Not a valid commit name %s"

834 msgstr ""

835

831 -#: bisect.c:732

836 +#: bisect.c:733

837 #, c-format

838 msgid ""

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

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

841 msgstr ""

842

838 -#: bisect.c:737

843 +#: bisect.c:738

844 #, c-format

845 msgid ""

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

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

848 msgstr ""

849

845 -#: bisect.c:742

850 +#: bisect.c:743

851 #, c-format

852 msgid ""

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

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

855 msgstr ""

856

852 -#: bisect.c:750

857 +#: bisect.c:751

858 #, c-format

859 msgid ""

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

@@ -857,7 +862,7 @@ msgid ""

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

863 msgstr ""

864

860 -#: bisect.c:763

865 +#: bisect.c:764

866 #, c-format

867 msgid ""

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

@@ -865,43 +870,43 @@ msgid ""

870 "We continue anyway."

871 msgstr ""

872

868 -#: bisect.c:798

873 +#: bisect.c:799

874 #, c-format

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

876 msgstr ""

877

873 -#: bisect.c:849

878 +#: bisect.c:850

879 #, c-format

880 msgid "a %s revision is needed"

881 msgstr ""

882

878 -#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:262

883 +#: bisect.c:867 builtin/notes.c:174 builtin/tag.c:255

884 #, c-format

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

886 msgstr ""

887

883 -#: bisect.c:917

888 +#: bisect.c:918

889 #, c-format

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

891 msgstr ""

892

888 -#: bisect.c:947

893 +#: bisect.c:948

894 msgid "reading bisect refs failed"

895 msgstr ""

896

892 -#: bisect.c:967

897 +#: bisect.c:968

898 #, c-format

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

900 msgstr ""

901

897 -#: bisect.c:975

902 +#: bisect.c:976

903 #, c-format

904 msgid ""

905 "No testable commit found.\n"

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

907 msgstr ""

908

904 -#: bisect.c:994

909 +#: bisect.c:995

910 #, c-format

911 msgid "(roughly %d step)"

912 msgid_plural "(roughly %d steps)"

@@ -910,7 +915,7 @@ msgstr[1] ""

915

916 #. TRANSLATORS: the last %s will be replaced with

917 #. "(roughly %d steps)" translation

913 -#: bisect.c:998

918 +#: bisect.c:999

919 #, c-format

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

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

@@ -1036,7 +1041,7 @@ msgstr ""

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

1042 msgstr ""

1043

1039 -#: branch.c:363

1044 +#: branch.c:364

1045 #, c-format

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

1047 msgstr ""

@@ -1051,7 +1056,7 @@ msgstr ""

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

1057 msgstr ""

1058

1054 -#: bundle.c:87 sequencer.c:1331 sequencer.c:1752 builtin/commit.c:777

1059 +#: bundle.c:87 sequencer.c:1339 sequencer.c:1760 builtin/commit.c:777

1060 #, c-format

1061 msgid "could not open '%s'"

1062 msgstr ""

@@ -1060,10 +1065,10 @@ msgstr ""

1065 msgid "Repository lacks these prerequisite commits:"

1066 msgstr ""

1067

1063 -#: bundle.c:163 ref-filter.c:1499 sequencer.c:1154 sequencer.c:2290

1064 -#: builtin/blame.c:2820 builtin/commit.c:1061 builtin/log.c:348

1065 -#: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909

1066 -#: builtin/merge.c:360 builtin/shortlog.c:177

1068 +#: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2299

1069 +#: builtin/blame.c:2811 builtin/commit.c:1061 builtin/log.c:353

1070 +#: builtin/log.c:897 builtin/log.c:1347 builtin/log.c:1673 builtin/log.c:1916

1071 +#: builtin/merge.c:359 builtin/shortlog.c:176

1072 msgid "revision walk setup failed"

1073 msgstr ""

1074

@@ -1102,7 +1107,7 @@ msgstr ""

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

1108 msgstr ""

1109

1105 -#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:282

1110 +#: bundle.c:443 builtin/log.c:170 builtin/log.c:1579 builtin/shortlog.c:281

1111 #, c-format

1112 msgid "unrecognized argument: %s"

1113 msgstr ""

@@ -1125,7 +1130,7 @@ msgstr ""

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

1131 msgstr ""

1132

1128 -#: commit.c:40 sequencer.c:1564 builtin/am.c:421 builtin/am.c:457

1133 +#: commit.c:40 sequencer.c:1572 builtin/am.c:421 builtin/am.c:457

1134 #: builtin/am.c:1493 builtin/am.c:2127

1135 #, c-format

1136 msgid "could not parse %s"

@@ -1136,7 +1141,7 @@ msgstr ""

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

1142 msgstr ""

1143

1139 -#: commit.c:1514

1144 +#: commit.c:1511

1145 msgid ""

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

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

@@ -1147,133 +1152,152 @@ msgstr ""

1152 msgid "memory exhausted"

1153 msgstr ""

1154

1150 -#: config.c:518

1155 +#: config.c:191

1156 +msgid "relative config include conditionals must come from files"

1157 +msgstr ""

1158 +

1159 +#: config.c:701

1160 #, c-format

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

1162 msgstr ""

1163

1155 -#: config.c:522

1164 +#: config.c:705

1165 #, c-format

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

1167 msgstr ""

1168

1160 -#: config.c:526

1169 +#: config.c:709

1170 #, c-format

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

1172 msgstr ""

1173

1165 -#: config.c:530

1174 +#: config.c:713

1175 #, c-format

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

1177 msgstr ""

1178

1170 -#: config.c:534

1179 +#: config.c:717

1180 #, c-format

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

1182 msgstr ""

1183

1175 -#: config.c:538

1184 +#: config.c:721

1185 #, c-format

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

1187 msgstr ""

1188

1180 -#: config.c:657

1189 +#: config.c:840

1190 msgid "out of range"

1191 msgstr ""

1192

1184 -#: config.c:657

1193 +#: config.c:840

1194 msgid "invalid unit"

1195 msgstr ""

1196

1188 -#: config.c:663

1197 +#: config.c:846

1198 #, c-format

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

1200 msgstr ""

1201

1193 -#: config.c:668

1202 +#: config.c:851

1203 #, c-format

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

1205 msgstr ""

1206

1198 -#: config.c:671

1207 +#: config.c:854

1208 #, c-format

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

1210 msgstr ""

1211

1203 -#: config.c:674

1212 +#: config.c:857

1213 #, c-format

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

1215 msgstr ""

1216

1208 -#: config.c:677

1217 +#: config.c:860

1218 #, c-format

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

1220 msgstr ""

1221

1213 -#: config.c:680

1222 +#: config.c:863

1223 #, c-format

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

1225 msgstr ""

1226

1218 -#: config.c:683

1227 +#: config.c:866

1228 #, c-format

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

1230 msgstr ""

1231

1223 -#: config.c:770

1232 +#: config.c:953

1233 #, c-format

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

1235 msgstr ""

1236

1228 -#: config.c:865 config.c:876

1237 +#: config.c:1048 config.c:1059

1238 #, c-format

1239 msgid "bad zlib compression level %d"

1240 msgstr ""

1241

1233 -#: config.c:993

1242 +#: config.c:1176

1243 #, c-format

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

1245 msgstr ""

1246

1238 -#: config.c:1149

1247 +#: config.c:1332

1248 #, c-format

1249 msgid "bad pack compression level %d"

1250 msgstr ""

1251

1243 -#: config.c:1339

1252 +#: config.c:1522

1253 msgid "unable to parse command-line config"

1254 msgstr ""

1255

1247 -#: config.c:1389

1256 +#: config.c:1572

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

1258 msgstr ""

1259

1251 -#: config.c:1743

1260 +#: config.c:1931

1261 +#, c-format

1262 +msgid "Invalid %s: '%s'"

1263 +msgstr ""

1264 +

1265 +#: config.c:1952

1266 +#, c-format

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

1268 +msgstr ""

1269 +

1270 +#: config.c:1978

1271 +#, c-format

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

1273 +msgstr ""

1274 +

1275 +#: config.c:1989

1276 #, c-format

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

1278 msgstr ""

1279

1256 -#: config.c:1745

1280 +#: config.c:1991

1281 #, c-format

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

1283 msgstr ""

1284

1261 -#: config.c:1804

1285 +#: config.c:2050

1286 #, c-format

1287 msgid "%s has multiple values"

1288 msgstr ""

1289

1266 -#: config.c:2225 config.c:2450

1290 +#: config.c:2384 config.c:2609

1291 #, c-format

1292 msgid "fstat on %s failed"

1293 msgstr ""

1294

1271 -#: config.c:2343

1295 +#: config.c:2502

1296 #, c-format

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

1298 msgstr ""

1299

1276 -#: config.c:2345

1300 +#: config.c:2504 builtin/remote.c:774

1301 #, c-format

1302 msgid "could not unset '%s'"

1303 msgstr ""

@@ -1434,225 +1458,245 @@ msgid ""

1458 "%s"

1459 msgstr ""

1460

1437 -#: diff.c:3085

1461 +#: diff.c:3102

1462 #, c-format

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

1464 msgstr ""

1465

1442 -#: diff.c:3411

1466 +#: diff.c:3428

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

1468 msgstr ""

1469

1446 -#: diff.c:3501

1470 +#: diff.c:3518

1471 msgid "--follow requires exactly one pathspec"

1472 msgstr ""

1473

1450 -#: diff.c:3664

1474 +#: diff.c:3681

1475 #, c-format

1476 msgid ""

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

1478 "%s"

1479 msgstr ""

1480

1457 -#: diff.c:3678

1481 +#: diff.c:3695

1482 #, c-format

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

1484 msgstr ""

1485

1462 -#: diff.c:4696

1486 +#: diff.c:4719

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

1488 msgstr ""

1489

1466 -#: diff.c:4699

1490 +#: diff.c:4722

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

1492 msgstr ""

1493

1470 -#: diff.c:4702

1494 +#: diff.c:4725

1495 #, c-format

1496 msgid ""

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

1498 msgstr ""

1499

1476 -#: dir.c:1862

1500 +#: dir.c:1899

1501 msgid "failed to get kernel name and information"

1502 msgstr ""

1503

1480 -#: dir.c:1981

1504 +#: dir.c:2018

1505 msgid "Untracked cache is disabled on this system or location."

1506 msgstr ""

1507

1484 -#: dir.c:2759

1508 +#: dir.c:2776 dir.c:2781

1509 +#, c-format

1510 +msgid "could not create directories for %s"

1511 +msgstr ""

1512 +

1513 +#: dir.c:2806

1514 #, c-format

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

1516 msgstr ""

1517

1489 -#: fetch-pack.c:213

1518 +#: entry.c:280

1519 +#, c-format

1520 +msgid "could not stat file '%s'"

1521 +msgstr ""

1522 +

1523 +#: fetch-pack.c:249

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

1525 msgstr ""

1526

1493 -#: fetch-pack.c:225

1527 +#: fetch-pack.c:261

1528 msgid "git fetch-pack: expected ACK/NAK, got EOF"

1529 msgstr ""

1530

1497 -#: fetch-pack.c:243

1531 +#: fetch-pack.c:279

1532 #, c-format

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

1534 msgstr ""

1535

1502 -#: fetch-pack.c:295

1536 +#: fetch-pack.c:331

1537 msgid "--stateless-rpc requires multi_ack_detailed"

1538 msgstr ""

1539

1506 -#: fetch-pack.c:381

1540 +#: fetch-pack.c:417

1541 #, c-format

1542 msgid "invalid shallow line: %s"

1543 msgstr ""

1544

1511 -#: fetch-pack.c:387

1545 +#: fetch-pack.c:423

1546 #, c-format

1547 msgid "invalid unshallow line: %s"

1548 msgstr ""

1549

1516 -#: fetch-pack.c:389

1550 +#: fetch-pack.c:425

1551 #, c-format

1552 msgid "object not found: %s"

1553 msgstr ""

1554

1521 -#: fetch-pack.c:392

1555 +#: fetch-pack.c:428

1556 #, c-format

1557 msgid "error in object: %s"

1558 msgstr ""

1559

1526 -#: fetch-pack.c:394

1560 +#: fetch-pack.c:430

1561 #, c-format

1562 msgid "no shallow found: %s"

1563 msgstr ""

1564

1531 -#: fetch-pack.c:397

1565 +#: fetch-pack.c:433

1566 #, c-format

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

1568 msgstr ""

1569

1536 -#: fetch-pack.c:436

1570 +#: fetch-pack.c:472

1571 #, c-format

1572 msgid "got %s %d %s"

1573 msgstr ""

1574

1541 -#: fetch-pack.c:450

1575 +#: fetch-pack.c:486

1576 #, c-format

1577 msgid "invalid commit %s"

1578 msgstr ""

1579

1546 -#: fetch-pack.c:483

1580 +#: fetch-pack.c:519

1581 msgid "giving up"

1582 msgstr ""

1583

1550 -#: fetch-pack.c:493 progress.c:235

1584 +#: fetch-pack.c:529 progress.c:235

1585 msgid "done"

1586 msgstr ""

1587

1554 -#: fetch-pack.c:505

1588 +#: fetch-pack.c:541

1589 #, c-format

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

1591 msgstr ""

1592

1559 -#: fetch-pack.c:551

1593 +#: fetch-pack.c:587

1594 #, c-format

1595 msgid "Marking %s as complete"

1596 msgstr ""

1597

1564 -#: fetch-pack.c:697

1598 +#: fetch-pack.c:735

1599 #, c-format

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

1601 msgstr ""

1602

1569 -#: fetch-pack.c:735

1603 +#: fetch-pack.c:773

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

1605 msgstr ""

1606

1573 -#: fetch-pack.c:743

1607 +#: fetch-pack.c:781

1608 msgid "protocol error: bad pack header"

1609 msgstr ""

1610

1577 -#: fetch-pack.c:799

1611 +#: fetch-pack.c:837

1612 #, c-format

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

1614 msgstr ""

1615

1582 -#: fetch-pack.c:815

1616 +#: fetch-pack.c:853

1617 #, c-format

1618 msgid "%s failed"

1619 msgstr ""

1620

1587 -#: fetch-pack.c:817

1621 +#: fetch-pack.c:855

1622 msgid "error in sideband demultiplexer"

1623 msgstr ""

1624

1591 -#: fetch-pack.c:844

1625 +#: fetch-pack.c:882

1626 msgid "Server does not support shallow clients"

1627 msgstr ""

1628

1595 -#: fetch-pack.c:848

1629 +#: fetch-pack.c:886

1630 msgid "Server supports multi_ack_detailed"

1631 msgstr ""

1632

1599 -#: fetch-pack.c:851

1633 +#: fetch-pack.c:889

1634 msgid "Server supports no-done"

1635 msgstr ""

1636

1603 -#: fetch-pack.c:857

1637 +#: fetch-pack.c:895

1638 msgid "Server supports multi_ack"

1639 msgstr ""

1640

1607 -#: fetch-pack.c:861

1641 +#: fetch-pack.c:899

1642 msgid "Server supports side-band-64k"

1643 msgstr ""

1644

1611 -#: fetch-pack.c:865

1645 +#: fetch-pack.c:903

1646 msgid "Server supports side-band"

1647 msgstr ""

1648

1615 -#: fetch-pack.c:869

1649 +#: fetch-pack.c:907

1650 msgid "Server supports allow-tip-sha1-in-want"

1651 msgstr ""

1652

1619 -#: fetch-pack.c:873

1653 +#: fetch-pack.c:911

1654 msgid "Server supports allow-reachable-sha1-in-want"

1655 msgstr ""

1656

1623 -#: fetch-pack.c:883

1657 +#: fetch-pack.c:921

1658 msgid "Server supports ofs-delta"

1659 msgstr ""

1660

1627 -#: fetch-pack.c:890

1661 +#: fetch-pack.c:928

1662 #, c-format

1663 msgid "Server version is %.*s"

1664 msgstr ""

1665

1632 -#: fetch-pack.c:896

1666 +#: fetch-pack.c:934

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

1668 msgstr ""

1669

1636 -#: fetch-pack.c:900

1670 +#: fetch-pack.c:938

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

1672 msgstr ""

1673

1640 -#: fetch-pack.c:902

1674 +#: fetch-pack.c:940

1675 msgid "Server does not support --deepen"

1676 msgstr ""

1677

1644 -#: fetch-pack.c:913

1678 +#: fetch-pack.c:951

1679 msgid "no common commits"

1680 msgstr ""

1681

1648 -#: fetch-pack.c:925

1682 +#: fetch-pack.c:963

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

1684 msgstr ""

1685

1652 -#: fetch-pack.c:1087

1686 +#: fetch-pack.c:1125

1687 msgid "no matching remote head"

1688 msgstr ""

1689

1690 +#: fetch-pack.c:1147

1691 +#, c-format

1692 +msgid "no such remote ref %s"

1693 +msgstr ""

1694 +

1695 +#: fetch-pack.c:1150

1696 +#, c-format

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

1698 +msgstr ""

1699 +

1700 #: gpg-interface.c:185

1701 msgid "gpg failed to sign the data"

1702 msgstr ""

@@ -1671,17 +1715,17 @@ msgstr ""

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

1716 msgstr ""

1717

1674 -#: grep.c:1794

1718 +#: grep.c:1796

1719 #, c-format

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

1721 msgstr ""

1722

1679 -#: grep.c:1811 builtin/clone.c:381 builtin/diff.c:81 builtin/rm.c:133

1723 +#: grep.c:1813 builtin/clone.c:399 builtin/diff.c:81 builtin/rm.c:133

1724 #, c-format

1725 msgid "failed to stat '%s'"

1726 msgstr ""

1727

1684 -#: grep.c:1822

1728 +#: grep.c:1824

1729 #, c-format

1730 msgid "'%s': short read"

1731 msgstr ""

@@ -1742,7 +1786,7 @@ msgstr[1] ""

1786 msgid "%s: %s - %s"

1787 msgstr ""

1788

1745 -#: ident.c:334

1789 +#: ident.c:343

1790 msgid ""

1791 "\n"

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

@@ -1757,6 +1801,39 @@ msgid ""

1801 "\n"

1802 msgstr ""

1803

1804 +#: ident.c:367

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

1806 +msgstr ""

1807 +

1808 +#: ident.c:372

1809 +#, c-format

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

1811 +msgstr ""

1812 +

1813 +#: ident.c:382

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

1815 +msgstr ""

1816 +

1817 +#: ident.c:388

1818 +#, c-format

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

1820 +msgstr ""

1821 +

1822 +#: ident.c:396

1823 +#, c-format

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

1825 +msgstr ""

1826 +

1827 +#: ident.c:402

1828 +#, c-format

1829 +msgid "name consists only of disallowed characters: %s"

1830 +msgstr ""

1831 +

1832 +#: ident.c:417 builtin/commit.c:611

1833 +#, c-format

1834 +msgid "invalid date format: %s"

1835 +msgstr ""

1836 +

1837 #: lockfile.c:152

1838 #, c-format

1839 msgid ""

@@ -1778,8 +1855,8 @@ msgstr ""

1855 msgid "failed to read the cache"

1856 msgstr ""

1857

1781 -#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:374

1782 -#: builtin/checkout.c:588 builtin/clone.c:731

1858 +#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:393

1859 +#: builtin/checkout.c:607 builtin/clone.c:749

1860 msgid "unable to write new index file"

1861 msgstr ""

1862

@@ -1849,167 +1926,181 @@ msgstr ""

1926 msgid "Unable to add %s to database"

1927 msgstr ""

1928

1852 -#: merge-recursive.c:1088 merge-recursive.c:1102

1929 +#: merge-recursive.c:1092

1930 #, c-format

1931 msgid ""

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

1933 "in tree."

1934 msgstr ""

1935

1859 -#: merge-recursive.c:1094 merge-recursive.c:1107

1936 +#: merge-recursive.c:1097

1937 +#, c-format

1938 +msgid ""

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

1940 +"left in tree."

1941 +msgstr ""

1942 +

1943 +#: merge-recursive.c:1104

1944 #, c-format

1945 msgid ""

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

1947 "in tree at %s."

1948 msgstr ""

1949

1866 -#: merge-recursive.c:1150

1950 +#: merge-recursive.c:1109

1951 +#, c-format

1952 +msgid ""

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

1954 +"left in tree at %s."

1955 +msgstr ""

1956 +

1957 +#: merge-recursive.c:1143

1958 msgid "rename"

1959 msgstr ""

1960

1870 -#: merge-recursive.c:1150

1961 +#: merge-recursive.c:1143

1962 msgid "renamed"

1963 msgstr ""

1964

1874 -#: merge-recursive.c:1207

1965 +#: merge-recursive.c:1200

1966 #, c-format

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

1968 msgstr ""

1969

1879 -#: merge-recursive.c:1232

1970 +#: merge-recursive.c:1225

1971 #, c-format

1972 msgid ""

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

1974 "\"->\"%s\" in \"%s\"%s"

1975 msgstr ""

1976

1886 -#: merge-recursive.c:1237

1977 +#: merge-recursive.c:1230

1978 msgid " (left unresolved)"

1979 msgstr ""

1980

1890 -#: merge-recursive.c:1299

1981 +#: merge-recursive.c:1292

1982 #, c-format

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

1984 msgstr ""

1985

1895 -#: merge-recursive.c:1332

1986 +#: merge-recursive.c:1325

1987 #, c-format

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

1989 msgstr ""

1990

1900 -#: merge-recursive.c:1535

1991 +#: merge-recursive.c:1528

1992 #, c-format

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

1994 msgstr ""

1995

1905 -#: merge-recursive.c:1550

1996 +#: merge-recursive.c:1543

1997 #, c-format

1998 msgid "Adding merged %s"

1999 msgstr ""

2000

1910 -#: merge-recursive.c:1557 merge-recursive.c:1771

2001 +#: merge-recursive.c:1550 merge-recursive.c:1780

2002 #, c-format

2003 msgid "Adding as %s instead"

2004 msgstr ""

2005

1915 -#: merge-recursive.c:1614

2006 +#: merge-recursive.c:1607

2007 #, c-format

2008 msgid "cannot read object %s"

2009 msgstr ""

2010

1920 -#: merge-recursive.c:1617

2011 +#: merge-recursive.c:1610

2012 #, c-format

2013 msgid "object %s is not a blob"

2014 msgstr ""

2015

1925 -#: merge-recursive.c:1670

2016 +#: merge-recursive.c:1679

2017 msgid "modify"

2018 msgstr ""

2019

1929 -#: merge-recursive.c:1670

2020 +#: merge-recursive.c:1679

2021 msgid "modified"

2022 msgstr ""

2023

1933 -#: merge-recursive.c:1680

2024 +#: merge-recursive.c:1689

2025 msgid "content"

2026 msgstr ""

2027

1937 -#: merge-recursive.c:1687

2028 +#: merge-recursive.c:1696

2029 msgid "add/add"

2030 msgstr ""

2031

1941 -#: merge-recursive.c:1723

2032 +#: merge-recursive.c:1732

2033 #, c-format

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

2035 msgstr ""

2036

1946 -#: merge-recursive.c:1737

2037 +#: merge-recursive.c:1746

2038 #, c-format

2039 msgid "Auto-merging %s"

2040 msgstr ""

2041

1951 -#: merge-recursive.c:1741 git-submodule.sh:930

2042 +#: merge-recursive.c:1750 git-submodule.sh:944

2043 msgid "submodule"

2044 msgstr ""

2045

1955 -#: merge-recursive.c:1742

2046 +#: merge-recursive.c:1751

2047 #, c-format

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

2049 msgstr ""

2050

1960 -#: merge-recursive.c:1836

2051 +#: merge-recursive.c:1845

2052 #, c-format

2053 msgid "Removing %s"

2054 msgstr ""

2055

1965 -#: merge-recursive.c:1862

2056 +#: merge-recursive.c:1871

2057 msgid "file/directory"

2058 msgstr ""

2059

1969 -#: merge-recursive.c:1868

2060 +#: merge-recursive.c:1877

2061 msgid "directory/file"

2062 msgstr ""

2063

1973 -#: merge-recursive.c:1874

2064 +#: merge-recursive.c:1883

2065 #, c-format

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

2067 msgstr ""

2068

1978 -#: merge-recursive.c:1883

2069 +#: merge-recursive.c:1892

2070 #, c-format

2071 msgid "Adding %s"

2072 msgstr ""

2073

1983 -#: merge-recursive.c:1920

2074 +#: merge-recursive.c:1929

2075 msgid "Already up-to-date!"

2076 msgstr ""

2077

1987 -#: merge-recursive.c:1929

2078 +#: merge-recursive.c:1938

2079 #, c-format

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

2081 msgstr ""

2082

1992 -#: merge-recursive.c:2012

2083 +#: merge-recursive.c:2021

2084 msgid "Merging:"

2085 msgstr ""

2086

1996 -#: merge-recursive.c:2025

2087 +#: merge-recursive.c:2034

2088 #, c-format

2089 msgid "found %u common ancestor:"

2090 msgid_plural "found %u common ancestors:"

2091 msgstr[0] ""

2092 msgstr[1] ""

2093

2003 -#: merge-recursive.c:2064

2094 +#: merge-recursive.c:2073

2095 msgid "merge returned no commit"

2096 msgstr ""

2097

2007 -#: merge-recursive.c:2127

2098 +#: merge-recursive.c:2136

2099 #, c-format

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

2101 msgstr ""

2102

2012 -#: merge-recursive.c:2141 builtin/merge.c:645 builtin/merge.c:792

2103 +#: merge-recursive.c:2150 builtin/merge.c:645 builtin/merge.c:792

2104 msgid "Unable to write index."

2105 msgstr ""

2106

@@ -2082,82 +2173,93 @@ msgstr ""

2173 msgid "malformed object name '%s'"

2174 msgstr ""

2175

2085 -#: path.c:826

2176 +#: path.c:805

2177 #, c-format

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

2179 msgstr ""

2180

2090 -#: pathspec.c:142

2181 +#: pathspec.c:125

2182 +msgid "Escape character '\\' not allowed as last character in attr value"

2183 +msgstr ""

2184 +

2185 +#: pathspec.c:143

2186 +msgid "Only one 'attr:' specification is allowed."

2187 +msgstr ""

2188 +

2189 +#: pathspec.c:146

2190 +msgid "attr spec must not be empty"

2191 +msgstr ""

2192 +

2193 +#: pathspec.c:189

2194 +#, c-format

2195 +msgid "invalid attribute name %s"

2196 +msgstr ""

2197 +

2198 +#: pathspec.c:254

2199 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"

2200 msgstr ""

2201

2094 -#: pathspec.c:149

2202 +#: pathspec.c:261

2203 msgid ""

2204 "global 'literal' pathspec setting is incompatible with all other global "

2205 "pathspec settings"

2206 msgstr ""

2207

2100 -#: pathspec.c:188

2208 +#: pathspec.c:301

2209 msgid "invalid parameter for pathspec magic 'prefix'"

2210 msgstr ""

2211

2104 -#: pathspec.c:201

2212 +#: pathspec.c:322

2213 #, c-format

2214 msgid "Invalid pathspec magic '%.*s' in '%s'"

2215 msgstr ""

2216

2109 -#: pathspec.c:206

2217 +#: pathspec.c:327

2218 #, c-format

2219 msgid "Missing ')' at the end of pathspec magic in '%s'"

2220 msgstr ""

2221

2114 -#: pathspec.c:238

2222 +#: pathspec.c:365

2223 #, c-format

2224 msgid "Unimplemented pathspec magic '%c' in '%s'"

2225 msgstr ""

2226

2119 -#: pathspec.c:293 pathspec.c:315

2227 +#: pathspec.c:421 pathspec.c:443

2228 #, c-format

2229 msgid "Pathspec '%s' is in submodule '%.*s'"

2230 msgstr ""

2231

2124 -#: pathspec.c:350

2232 +#: pathspec.c:483

2233 #, c-format

2234 msgid "%s: 'literal' and 'glob' are incompatible"

2235 msgstr ""

2236

2129 -#: pathspec.c:363

2237 +#: pathspec.c:496

2238 #, c-format

2239 msgid "%s: '%s' is outside repository"

2240 msgstr ""

2241

2134 -#: pathspec.c:451

2242 +#: pathspec.c:584

2243 #, c-format

2244 msgid "'%s' (mnemonic: '%c')"

2245 msgstr ""

2246

2139 -#: pathspec.c:461

2247 +#: pathspec.c:594

2248 #, c-format

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

2250 msgstr ""

2251

2144 -#: pathspec.c:511

2252 +#: pathspec.c:644

2253 msgid ""

2254 "empty strings as pathspecs will be made invalid in upcoming releases. please "

2255 "use . instead if you meant to match all paths"

2256 msgstr ""

2257

2150 -#: pathspec.c:535

2258 +#: pathspec.c:668

2259 #, c-format

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

2261 msgstr ""

2262

2155 -#: pathspec.c:544

2156 -msgid ""

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

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

2159 -msgstr ""

2160 -

2263 #: pretty.c:982

2264 msgid "unable to parse --pretty format"

2265 msgstr ""

@@ -2176,161 +2278,264 @@ msgid ""

2278 "Using version %i"

2279 msgstr ""

2280

2179 -#: refs.c:576 builtin/merge.c:844

2281 +#: read-cache.c:2232

2282 +#, c-format

2283 +msgid "could not stat '%s"

2284 +msgstr ""

2285 +

2286 +#: read-cache.c:2245

2287 +#, c-format

2288 +msgid "unable to open git dir: %s"

2289 +msgstr ""

2290 +

2291 +#: read-cache.c:2257

2292 +#, c-format

2293 +msgid "unable to unlink: %s"

2294 +msgstr ""

2295 +

2296 +#: refs.c:619 builtin/merge.c:844

2297 #, c-format

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

2299 msgstr ""

2300

2184 -#: refs/files-backend.c:2481

2301 +#: refs/files-backend.c:2531

2302 #, c-format

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

2304 msgstr ""

2305

2189 -#: refs/files-backend.c:2484

2306 +#: refs/files-backend.c:2534

2307 #, c-format

2308 msgid "could not delete references: %s"

2309 msgstr ""

2310

2194 -#: refs/files-backend.c:2493

2311 +#: refs/files-backend.c:2543

2312 #, c-format

2313 msgid "could not remove reference %s"

2314 msgstr ""

2315

2199 -#: ref-filter.c:56

2316 +#: ref-filter.c:35 wt-status.c:1780

2317 +msgid "gone"

2318 +msgstr ""

2319 +

2320 +#: ref-filter.c:36

2321 +#, c-format

2322 +msgid "ahead %d"

2323 +msgstr ""

2324 +

2325 +#: ref-filter.c:37

2326 +#, c-format

2327 +msgid "behind %d"

2328 +msgstr ""

2329 +

2330 +#: ref-filter.c:38

2331 +#, c-format

2332 +msgid "ahead %d, behind %d"

2333 +msgstr ""

2334 +

2335 +#: ref-filter.c:104

2336 #, c-format

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

2338 msgstr ""

2339

2204 -#: ref-filter.c:58

2340 +#: ref-filter.c:106

2341 #, c-format

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

2343 msgstr ""

2344

2209 -#: ref-filter.c:72

2345 +#: ref-filter.c:120

2346 #, c-format

2211 -msgid "unrecognized format: %%(%s)"

2347 +msgid "Integer value expected refname:lstrip=%s"

2348 msgstr ""

2349

2214 -#: ref-filter.c:78

2350 +#: ref-filter.c:124

2351 +#, c-format

2352 +msgid "Integer value expected refname:rstrip=%s"

2353 +msgstr ""

2354 +

2355 +#: ref-filter.c:126

2356 +#, c-format

2357 +msgid "unrecognized %%(%s) argument: %s"

2358 +msgstr ""

2359 +

2360 +#: ref-filter.c:166

2361 #, c-format

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

2363 msgstr ""

2364

2219 -#: ref-filter.c:85

2365 +#: ref-filter.c:173

2366 #, c-format

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

2368 msgstr ""

2369

2224 -#: ref-filter.c:92

2370 +#: ref-filter.c:180

2371 #, c-format

2372 msgid "%%(trailers) does not take arguments"

2373 msgstr ""

2374

2229 -#: ref-filter.c:111

2375 +#: ref-filter.c:199

2376 #, c-format

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

2378 msgstr ""

2379

2234 -#: ref-filter.c:113

2380 +#: ref-filter.c:201

2381 #, c-format

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

2383 msgstr ""

2384

2239 -#: ref-filter.c:123

2385 +#: ref-filter.c:214

2386 +#, c-format

2387 +msgid "positive value expected objectname:short=%s"

2388 +msgstr ""

2389 +

2390 +#: ref-filter.c:218

2391 #, c-format

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

2393 msgstr ""

2394

2244 -#: ref-filter.c:145

2395 +#: ref-filter.c:245

2396 #, c-format

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

2398 msgstr ""

2399

2249 -#: ref-filter.c:157

2400 +#: ref-filter.c:257

2401 #, c-format

2402 msgid "unrecognized position:%s"

2403 msgstr ""

2404

2254 -#: ref-filter.c:161

2405 +#: ref-filter.c:261

2406 #, c-format

2407 msgid "unrecognized width:%s"

2408 msgstr ""

2409

2259 -#: ref-filter.c:167

2410 +#: ref-filter.c:267

2411 #, c-format

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

2413 msgstr ""

2414

2264 -#: ref-filter.c:171

2415 +#: ref-filter.c:271

2416 #, c-format

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

2418 msgstr ""

2419

2269 -#: ref-filter.c:255

2420 +#: ref-filter.c:286

2421 +#, c-format

2422 +msgid "unrecognized %%(if) argument: %s"

2423 +msgstr ""

2424 +

2425 +#: ref-filter.c:371

2426 #, c-format

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

2428 msgstr ""

2429

2274 -#: ref-filter.c:281

2430 +#: ref-filter.c:397

2431 #, c-format

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

2433 msgstr ""

2434

2279 -#: ref-filter.c:383

2435 +#: ref-filter.c:501

2436 +#, c-format

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

2438 +msgstr ""

2439 +

2440 +#: ref-filter.c:561

2441 +#, c-format

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

2443 +msgstr ""

2444 +

2445 +#: ref-filter.c:563

2446 +#, c-format

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

2448 +msgstr ""

2449 +

2450 +#: ref-filter.c:565

2451 +#, c-format

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

2453 +msgstr ""

2454 +

2455 +#: ref-filter.c:591

2456 +#, c-format

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

2458 +msgstr ""

2459 +

2460 +#: ref-filter.c:593

2461 +#, c-format

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

2463 +msgstr ""

2464 +

2465 +#: ref-filter.c:595

2466 +#, c-format

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

2468 +msgstr ""

2469 +

2470 +#: ref-filter.c:608

2471 #, c-format

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

2473 msgstr ""

2474

2284 -#: ref-filter.c:435

2475 +#: ref-filter.c:663

2476 #, c-format

2477 msgid "malformed format string %s"

2478 msgstr ""

2479

2289 -#: ref-filter.c:898

2290 -msgid ":strip= requires a positive integer argument"

2480 +#: ref-filter.c:1247

2481 +#, c-format

2482 +msgid "(no branch, rebasing %s)"

2483 +msgstr ""

2484 +

2485 +#: ref-filter.c:1250

2486 +#, c-format

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

2488 msgstr ""

2489

2293 -#: ref-filter.c:903

2490 +#. TRANSLATORS: make sure this matches

2491 +#. "HEAD detached at " in wt-status.c

2492 +#: ref-filter.c:1256

2493 #, c-format

2295 -msgid "ref '%s' does not have %ld components to :strip"

2494 +msgid "(HEAD detached at %s)"

2495 msgstr ""

2496

2298 -#: ref-filter.c:1066

2497 +#. TRANSLATORS: make sure this matches

2498 +#. "HEAD detached from " in wt-status.c

2499 +#: ref-filter.c:1261

2500 #, c-format

2300 -msgid "unknown %.*s format %s"

2501 +msgid "(HEAD detached from %s)"

2502 msgstr ""

2503

2303 -#: ref-filter.c:1086 ref-filter.c:1117

2504 +#: ref-filter.c:1265

2505 +msgid "(no branch)"

2506 +msgstr ""

2507 +

2508 +#: ref-filter.c:1420 ref-filter.c:1451

2509 #, c-format

2510 msgid "missing object %s for %s"

2511 msgstr ""

2512

2308 -#: ref-filter.c:1089 ref-filter.c:1120

2513 +#: ref-filter.c:1423 ref-filter.c:1454

2514 #, c-format

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

2516 msgstr ""

2517

2313 -#: ref-filter.c:1343

2518 +#: ref-filter.c:1692

2519 #, c-format

2520 msgid "malformed object at '%s'"

2521 msgstr ""

2522

2318 -#: ref-filter.c:1410

2523 +#: ref-filter.c:1759

2524 #, c-format

2525 msgid "ignoring ref with broken name %s"

2526 msgstr ""

2527

2323 -#: ref-filter.c:1415

2528 +#: ref-filter.c:1764

2529 #, c-format

2530 msgid "ignoring broken ref %s"

2531 msgstr ""

2532

2328 -#: ref-filter.c:1670

2533 +#: ref-filter.c:2028

2534 #, c-format

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

2536 msgstr ""

2537

2333 -#: ref-filter.c:1734

2538 +#: ref-filter.c:2109

2539 #, c-format

2540 msgid "malformed object name %s"

2541 msgstr ""

@@ -2470,25 +2675,35 @@ msgstr ""

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

2676 msgstr ""

2677

2473 -#: send-pack.c:297

2678 +#: send-pack.c:150

2679 +#, c-format

2680 +msgid "unable to parse remote unpack status: %s"

2681 +msgstr ""

2682 +

2683 +#: send-pack.c:152

2684 +#, c-format

2685 +msgid "remote unpack failed: %s"

2686 +msgstr ""

2687 +

2688 +#: send-pack.c:315

2689 msgid "failed to sign the push certificate"

2690 msgstr ""

2691

2477 -#: send-pack.c:410

2692 +#: send-pack.c:428

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

2694 msgstr ""

2695

2481 -#: send-pack.c:412

2696 +#: send-pack.c:430

2697 msgid ""

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

2699 "signed push"

2700 msgstr ""

2701

2487 -#: send-pack.c:424

2702 +#: send-pack.c:442

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

2704 msgstr ""

2705

2491 -#: send-pack.c:429

2706 +#: send-pack.c:447

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

2708 msgstr ""

2709

@@ -2522,12 +2737,12 @@ msgid ""

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

2738 msgstr ""

2739

2525 -#: sequencer.c:294 sequencer.c:1667

2740 +#: sequencer.c:294 sequencer.c:1675

2741 #, c-format

2742 msgid "could not lock '%s'"

2743 msgstr ""

2744

2530 -#: sequencer.c:297 sequencer.c:1545 sequencer.c:1672 sequencer.c:1686

2745 +#: sequencer.c:297 sequencer.c:1553 sequencer.c:1680 sequencer.c:1694

2746 #, c-format

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

2748 msgstr ""

@@ -2537,13 +2752,13 @@ msgstr ""

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

2753 msgstr ""

2754

2540 -#: sequencer.c:305 sequencer.c:1550 sequencer.c:1674

2755 +#: sequencer.c:305 sequencer.c:1558 sequencer.c:1682

2756 #, c-format

2757 msgid "failed to finalize '%s'."

2758 msgstr ""

2759

2545 -#: sequencer.c:329 sequencer.c:808 sequencer.c:1571 builtin/am.c:259

2546 -#: builtin/commit.c:749 builtin/merge.c:1036

2760 +#: sequencer.c:329 sequencer.c:814 sequencer.c:1579 builtin/am.c:259

2761 +#: builtin/commit.c:749 builtin/merge.c:1018

2762 #, c-format

2763 msgid "could not read '%s'"

2764 msgstr ""

@@ -2595,17 +2810,17 @@ msgid ""

2810 " git rebase --continue\n"

2811 msgstr ""

2812

2598 -#: sequencer.c:688

2813 +#: sequencer.c:694

2814 #, c-format

2815 msgid "could not parse commit %s\n"

2816 msgstr ""

2817

2603 -#: sequencer.c:693

2818 +#: sequencer.c:699

2819 #, c-format

2820 msgid "could not parse parent commit %s\n"

2821 msgstr ""

2822

2608 -#: sequencer.c:815

2823 +#: sequencer.c:821

2824 #, c-format

2825 msgid ""

2826 "unexpected 1st line of squash message:\n"

@@ -2613,7 +2828,7 @@ msgid ""

2828 "\t%.*s"

2829 msgstr ""

2830

2616 -#: sequencer.c:821

2831 +#: sequencer.c:827

2832 #, c-format

2833 msgid ""

2834 "invalid 1st line of squash message:\n"

@@ -2621,229 +2836,229 @@ msgid ""

2836 "\t%.*s"

2837 msgstr ""

2838

2624 -#: sequencer.c:827 sequencer.c:852

2839 +#: sequencer.c:833 sequencer.c:858

2840 #, c-format

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

2842 msgstr ""

2843

2629 -#: sequencer.c:836

2844 +#: sequencer.c:842

2845 msgid "need a HEAD to fixup"

2846 msgstr ""

2847

2633 -#: sequencer.c:838

2848 +#: sequencer.c:844

2849 msgid "could not read HEAD"

2850 msgstr ""

2851

2637 -#: sequencer.c:840

2852 +#: sequencer.c:846

2853 msgid "could not read HEAD's commit message"

2854 msgstr ""

2855

2641 -#: sequencer.c:846

2856 +#: sequencer.c:852

2857 #, c-format

2858 msgid "cannot write '%s'"

2859 msgstr ""

2860

2646 -#: sequencer.c:855 git-rebase--interactive.sh:445

2861 +#: sequencer.c:861 git-rebase--interactive.sh:445

2862 msgid "This is the 1st commit message:"

2863 msgstr ""

2864

2650 -#: sequencer.c:863

2865 +#: sequencer.c:869

2866 #, c-format

2867 msgid "could not read commit message of %s"

2868 msgstr ""

2869

2655 -#: sequencer.c:870

2870 +#: sequencer.c:876

2871 #, c-format

2872 msgid "This is the commit message #%d:"

2873 msgstr ""

2874

2660 -#: sequencer.c:875

2875 +#: sequencer.c:881

2876 #, c-format

2877 msgid "The commit message #%d will be skipped:"

2878 msgstr ""

2879

2665 -#: sequencer.c:880

2880 +#: sequencer.c:886

2881 #, c-format

2882 msgid "unknown command: %d"

2883 msgstr ""

2884

2670 -#: sequencer.c:946

2885 +#: sequencer.c:952

2886 msgid "your index file is unmerged."

2887 msgstr ""

2888

2674 -#: sequencer.c:964

2889 +#: sequencer.c:970

2890 #, c-format

2891 msgid "commit %s is a merge but no -m option was given."

2892 msgstr ""

2893

2679 -#: sequencer.c:972

2894 +#: sequencer.c:978

2895 #, c-format

2896 msgid "commit %s does not have parent %d"

2897 msgstr ""

2898

2684 -#: sequencer.c:976

2899 +#: sequencer.c:982

2900 #, c-format

2901 msgid "mainline was specified but commit %s is not a merge."

2902 msgstr ""

2903

2689 -#: sequencer.c:982

2904 +#: sequencer.c:988

2905 #, c-format

2906 msgid "cannot get commit message for %s"

2907 msgstr ""

2908

2909 #. TRANSLATORS: The first %s will be a "todo" command like

2910 #. "revert" or "pick", the second %s a SHA1.

2696 -#: sequencer.c:1001

2911 +#: sequencer.c:1009

2912 #, c-format

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

2914 msgstr ""

2915

2701 -#: sequencer.c:1063 sequencer.c:1812

2916 +#: sequencer.c:1071 sequencer.c:1820

2917 #, c-format

2918 msgid "could not rename '%s' to '%s'"

2919 msgstr ""

2920

2706 -#: sequencer.c:1114

2921 +#: sequencer.c:1122

2922 #, c-format

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

2924 msgstr ""

2925

2711 -#: sequencer.c:1115

2926 +#: sequencer.c:1123

2927 #, c-format

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

2929 msgstr ""

2930

2716 -#: sequencer.c:1157

2931 +#: sequencer.c:1165

2932 msgid "empty commit set passed"

2933 msgstr ""

2934

2720 -#: sequencer.c:1167

2935 +#: sequencer.c:1175

2936 #, c-format

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

2938 msgstr ""

2939

2725 -#: sequencer.c:1174

2940 +#: sequencer.c:1182

2941 #, c-format

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

2943 msgstr ""

2944

2730 -#: sequencer.c:1294

2945 +#: sequencer.c:1302

2946 #, c-format

2947 msgid "invalid line %d: %.*s"

2948 msgstr ""

2949

2735 -#: sequencer.c:1302

2950 +#: sequencer.c:1310

2951 #, c-format

2952 msgid "cannot '%s' without a previous commit"

2953 msgstr ""

2954

2740 -#: sequencer.c:1334

2955 +#: sequencer.c:1342

2956 #, c-format

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

2958 msgstr ""

2959

2745 -#: sequencer.c:1341

2960 +#: sequencer.c:1349

2961 msgid "please fix this using 'git rebase --edit-todo'."

2962 msgstr ""

2963

2749 -#: sequencer.c:1343

2964 +#: sequencer.c:1351

2965 #, c-format

2966 msgid "unusable instruction sheet: '%s'"

2967 msgstr ""

2968

2754 -#: sequencer.c:1348

2969 +#: sequencer.c:1356

2970 msgid "no commits parsed."

2971 msgstr ""

2972

2758 -#: sequencer.c:1359

2973 +#: sequencer.c:1367

2974 msgid "cannot cherry-pick during a revert."

2975 msgstr ""

2976

2762 -#: sequencer.c:1361

2977 +#: sequencer.c:1369

2978 msgid "cannot revert during a cherry-pick."

2979 msgstr ""

2980

2766 -#: sequencer.c:1424

2981 +#: sequencer.c:1432

2982 #, c-format

2983 msgid "invalid key: %s"

2984 msgstr ""

2985

2771 -#: sequencer.c:1427

2986 +#: sequencer.c:1435

2987 #, c-format

2988 msgid "invalid value for %s: %s"

2989 msgstr ""

2990

2776 -#: sequencer.c:1484

2991 +#: sequencer.c:1492

2992 #, c-format

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

2994 msgstr ""

2995

2781 -#: sequencer.c:1522

2996 +#: sequencer.c:1530

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

2998 msgstr ""

2999

2785 -#: sequencer.c:1523

3000 +#: sequencer.c:1531

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

3002 msgstr ""

3003

2789 -#: sequencer.c:1526

3004 +#: sequencer.c:1534

3005 #, c-format

3006 msgid "could not create sequencer directory '%s'"

3007 msgstr ""

3008

2794 -#: sequencer.c:1540

3009 +#: sequencer.c:1548

3010 msgid "could not lock HEAD"

3011 msgstr ""

3012

2798 -#: sequencer.c:1596 sequencer.c:2150

3013 +#: sequencer.c:1604 sequencer.c:2159

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

3015 msgstr ""

3016

2802 -#: sequencer.c:1598

3017 +#: sequencer.c:1606

3018 msgid "cannot resolve HEAD"

3019 msgstr ""

3020

2806 -#: sequencer.c:1600 sequencer.c:1634

3021 +#: sequencer.c:1608 sequencer.c:1642

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

3023 msgstr ""

3024

2810 -#: sequencer.c:1620 builtin/grep.c:904

3025 +#: sequencer.c:1628 builtin/grep.c:910

3026 #, c-format

3027 msgid "cannot open '%s'"

3028 msgstr ""

3029

2815 -#: sequencer.c:1622

3030 +#: sequencer.c:1630

3031 #, c-format

3032 msgid "cannot read '%s': %s"

3033 msgstr ""

3034

2820 -#: sequencer.c:1623

3035 +#: sequencer.c:1631

3036 msgid "unexpected end of file"

3037 msgstr ""

3038

2824 -#: sequencer.c:1629

3039 +#: sequencer.c:1637

3040 #, c-format

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

3042 msgstr ""

3043

2829 -#: sequencer.c:1640

3044 +#: sequencer.c:1648

3045 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

3046 msgstr ""

3047

2833 -#: sequencer.c:1777 sequencer.c:2049

3048 +#: sequencer.c:1785 sequencer.c:2058

3049 msgid "cannot read HEAD"

3050 msgstr ""

3051

2837 -#: sequencer.c:1817 builtin/difftool.c:574

3052 +#: sequencer.c:1825 builtin/difftool.c:616

3053 #, c-format

3054 msgid "could not copy '%s' to '%s'"

3055 msgstr ""

3056

2842 -#: sequencer.c:1833

3057 +#: sequencer.c:1841

3058 msgid "could not read index"

3059 msgstr ""

3060

2846 -#: sequencer.c:1838

3061 +#: sequencer.c:1846

3062 #, c-format

3063 msgid ""

3064 "execution failed: %s\n"

@@ -2853,11 +3068,11 @@ msgid ""

3068 "\n"

3069 msgstr ""

3070

2856 -#: sequencer.c:1844

3071 +#: sequencer.c:1852

3072 msgid "and made changes to the index and/or the working tree\n"

3073 msgstr ""

3074

2860 -#: sequencer.c:1850

3075 +#: sequencer.c:1858

3076 #, c-format

3077 msgid ""

3078 "execution succeeded: %s\n"

@@ -2868,17 +3083,17 @@ msgid ""

3083 "\n"

3084 msgstr ""

3085

2871 -#: sequencer.c:1905 git-rebase.sh:168

3086 +#: sequencer.c:1913 git-rebase.sh:168

3087 #, c-format

3088 msgid "Applied autostash."

3089 msgstr ""

3090

2876 -#: sequencer.c:1917

3091 +#: sequencer.c:1925

3092 #, c-format

3093 msgid "cannot store %s"

3094 msgstr ""

3095

2881 -#: sequencer.c:1919 git-rebase.sh:172

3096 +#: sequencer.c:1927 git-rebase.sh:172

3097 #, c-format

3098 msgid ""

3099 "Applying autostash resulted in conflicts.\n"

@@ -2886,89 +3101,89 @@ msgid ""

3101 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"

3102 msgstr ""

3103

2889 -#: sequencer.c:2000

3104 +#: sequencer.c:2009

3105 #, c-format

2891 -msgid "stopped at %s... %.*s"

3106 +msgid "Stopped at %s... %.*s\n"

3107 msgstr ""

3108

2894 -#: sequencer.c:2027

3109 +#: sequencer.c:2036

3110 #, c-format

3111 msgid "unknown command %d"

3112 msgstr ""

3113

2899 -#: sequencer.c:2057

3114 +#: sequencer.c:2066

3115 msgid "could not read orig-head"

3116 msgstr ""

3117

2903 -#: sequencer.c:2061

3118 +#: sequencer.c:2070

3119 msgid "could not read 'onto'"

3120 msgstr ""

3121

2907 -#: sequencer.c:2068

3122 +#: sequencer.c:2077

3123 #, c-format

3124 msgid "could not update %s"

3125 msgstr ""

3126

2912 -#: sequencer.c:2075

3127 +#: sequencer.c:2084

3128 #, c-format

3129 msgid "could not update HEAD to %s"

3130 msgstr ""

3131

2917 -#: sequencer.c:2159

3132 +#: sequencer.c:2168

3133 msgid "cannot rebase: You have unstaged changes."

3134 msgstr ""

3135

2921 -#: sequencer.c:2164

3136 +#: sequencer.c:2173

3137 msgid "could not remove CHERRY_PICK_HEAD"

3138 msgstr ""

3139

2925 -#: sequencer.c:2173

3140 +#: sequencer.c:2182

3141 msgid "cannot amend non-existing commit"

3142 msgstr ""

3143

2929 -#: sequencer.c:2175

3144 +#: sequencer.c:2184

3145 #, c-format

3146 msgid "invalid file: '%s'"

3147 msgstr ""

3148

2934 -#: sequencer.c:2177

3149 +#: sequencer.c:2186

3150 #, c-format

3151 msgid "invalid contents: '%s'"

3152 msgstr ""

3153

2939 -#: sequencer.c:2180

3154 +#: sequencer.c:2189

3155 msgid ""

3156 "\n"

3157 "You have uncommitted changes in your working tree. Please, commit them\n"

3158 "first and then run 'git rebase --continue' again."

3159 msgstr ""

3160

2946 -#: sequencer.c:2190

3161 +#: sequencer.c:2199

3162 msgid "could not commit staged changes."

3163 msgstr ""

3164

2950 -#: sequencer.c:2270

3165 +#: sequencer.c:2279

3166 #, c-format

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

3168 msgstr ""

3169

2955 -#: sequencer.c:2274

3170 +#: sequencer.c:2283

3171 #, c-format

3172 msgid "%s: bad revision"

3173 msgstr ""

3174

2960 -#: sequencer.c:2307

3175 +#: sequencer.c:2316

3176 msgid "can't revert as initial commit"

3177 msgstr ""

3178

2964 -#: setup.c:160

3179 +#: setup.c:165

3180 #, c-format

3181 msgid ""

3182 "%s: no such path in the working tree.\n"

3183 "Use 'git <command> -- <path>...' to specify paths that do not exist locally."

3184 msgstr ""

3185

2971 -#: setup.c:173

3186 +#: setup.c:178

3187 #, c-format

3188 msgid ""

3189 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"

@@ -2976,7 +3191,7 @@ msgid ""

3191 "'git <command> [<revision>...] -- [<file>...]'"

3192 msgstr ""

3193

2979 -#: setup.c:223

3194 +#: setup.c:228

3195 #, c-format

3196 msgid ""

3197 "ambiguous argument '%s': both revision and filename\n"

@@ -2984,96 +3199,96 @@ msgid ""

3199 "'git <command> [<revision>...] -- [<file>...]'"

3200 msgstr ""

3201

2987 -#: setup.c:470

3202 +#: setup.c:475

3203 #, c-format

3204 msgid "Expected git repo version <= %d, found %d"

3205 msgstr ""

3206

2992 -#: setup.c:478

3207 +#: setup.c:483

3208 msgid "unknown repository extensions found:"

3209 msgstr ""

3210

2996 -#: setup.c:768

3211 +#: setup.c:776

3212 #, c-format

3213 msgid "Not a git repository (or any of the parent directories): %s"

3214 msgstr ""

3215

3001 -#: setup.c:770 setup.c:922 builtin/index-pack.c:1643

3216 +#: setup.c:778 builtin/index-pack.c:1646

3217 msgid "Cannot come back to cwd"

3218 msgstr ""

3219

3005 -#: setup.c:852

3220 +#: setup.c:1010

3221 msgid "Unable to read current working directory"

3222 msgstr ""

3223

3009 -#: setup.c:927

3224 +#: setup.c:1022 setup.c:1028

3225 #, c-format

3011 -msgid ""

3012 -"Not a git repository (or any parent up to mount point %s)\n"

3013 -"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."

3226 +msgid "Cannot change to '%s'"

3227 msgstr ""

3228

3016 -#: setup.c:934

3229 +#: setup.c:1041

3230 #, c-format

3018 -msgid "Cannot change to '%s/..'"

3231 +msgid ""

3232 +"Not a git repository (or any parent up to mount point %s)\n"

3233 +"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."

3234 msgstr ""

3235

3021 -#: setup.c:996

3236 +#: setup.c:1106

3237 #, c-format

3238 msgid ""

3239 "Problem with core.sharedRepository filemode value (0%.3o).\n"

3240 "The owner of files must always have read and write permissions."

3241 msgstr ""

3242

3028 -#: sha1_file.c:490

3243 +#: sha1_file.c:559

3244 #, c-format

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

3246 msgstr ""

3247

3033 -#: sha1_file.c:516

3248 +#: sha1_file.c:585

3249 #, c-format

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

3251 msgstr ""

3252

3038 -#: sha1_file.c:522

3253 +#: sha1_file.c:591

3254 #, c-format

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

3256 msgstr ""

3257

3043 -#: sha1_file.c:528

3258 +#: sha1_file.c:597

3259 #, c-format

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

3261 msgstr ""

3262

3048 -#: sha1_file.c:536

3263 +#: sha1_file.c:605

3264 #, c-format

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

3266 msgstr ""

3267

3053 -#: sha1_file.c:1176

3268 +#: sha1_file.c:1245

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

3270 msgstr ""

3271

3057 -#: sha1_file.c:2637

3272 +#: sha1_file.c:2721

3273 #, c-format

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

3275 msgstr ""

3276

3062 -#: sha1_file.c:2641

3277 +#: sha1_file.c:2725

3278 #, c-format

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

3280 msgstr ""

3281

3067 -#: sha1_name.c:407

3282 +#: sha1_name.c:409

3283 #, c-format

3284 msgid "short SHA1 %s is ambiguous"

3285 msgstr ""

3286

3072 -#: sha1_name.c:418

3287 +#: sha1_name.c:420

3288 msgid "The candidates are:"

3289 msgstr ""

3290

3076 -#: sha1_name.c:578

3291 +#: sha1_name.c:580

3292 msgid ""

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

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

@@ -3086,61 +3301,71 @@ msgid ""

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

3302 msgstr ""

3303

3089 -#: submodule.c:65 submodule.c:99

3304 +#: submodule.c:67 submodule.c:101

3305 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"

3306 msgstr ""

3307

3093 -#: submodule.c:69 submodule.c:103

3308 +#: submodule.c:71 submodule.c:105

3309 #, c-format

3310 msgid "Could not find section in .gitmodules where path=%s"

3311 msgstr ""

3312

3098 -#: submodule.c:77

3313 +#: submodule.c:79

3314 #, c-format

3315 msgid "Could not update .gitmodules entry %s"

3316 msgstr ""

3317

3103 -#: submodule.c:110

3318 +#: submodule.c:112

3319 #, c-format

3320 msgid "Could not remove .gitmodules entry for %s"

3321 msgstr ""

3322

3108 -#: submodule.c:121

3323 +#: submodule.c:123

3324 msgid "staging updated .gitmodules failed"

3325 msgstr ""

3326

3112 -#: submodule.c:159

3327 +#: submodule.c:161

3328 msgid "negative values not allowed for submodule.fetchJobs"

3329 msgstr ""

3330

3116 -#: submodule.c:1184

3331 +#: submodule.c:1194

3332 #, c-format

3118 -msgid "could not start 'git status in submodule '%s'"

3333 +msgid "'%s' not recognized as a git repository"

3334 msgstr ""

3335

3121 -#: submodule.c:1197

3336 +#: submodule.c:1332

3337 #, c-format

3123 -msgid "could not run 'git status in submodule '%s'"

3338 +msgid "could not start 'git status' in submodule '%s'"

3339 msgstr ""

3340

3126 -#: submodule.c:1398

3341 +#: submodule.c:1345

3342 +#, c-format

3343 +msgid "could not run 'git status' in submodule '%s'"

3344 +msgstr ""

3345 +

3346 +#: submodule.c:1421

3347 +#, c-format

3348 +msgid "submodule '%s' has dirty index"

3349 +msgstr ""

3350 +

3351 +#: submodule.c:1679

3352 #, c-format

3353 msgid ""

3354 "relocate_gitdir for submodule '%s' with more than one worktree not supported"

3355 msgstr ""

3356

3132 -#: submodule.c:1410 submodule.c:1471

3357 +#: submodule.c:1691 submodule.c:1747

3358 #, c-format

3359 msgid "could not lookup name for submodule '%s'"

3360 msgstr ""

3361

3137 -#: submodule.c:1414 submodule.c:1474 builtin/submodule--helper.c:640

3138 -#: builtin/submodule--helper.c:650

3362 +#: submodule.c:1695 builtin/submodule--helper.c:678

3363 +#: builtin/submodule--helper.c:688

3364 #, c-format

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

3366 msgstr ""

3367

3143 -#: submodule.c:1420

3368 +#: submodule.c:1698

3369 #, c-format

3370 msgid ""

3371 "Migrating git directory of '%s%s' from\n"

@@ -3148,12 +3373,25 @@ msgid ""

3373 "'%s'\n"

3374 msgstr ""

3375

3151 -#: submodule.c:1512

3376 +#: submodule.c:1782

3377 #, c-format

3378 msgid "could not recurse into submodule '%s'"

3379 msgstr ""

3380

3156 -#: submodule-config.c:360

3381 +#: submodule.c:1826

3382 +msgid "could not start ls-files in .."

3383 +msgstr ""

3384 +

3385 +#: submodule.c:1846

3386 +msgid "BUG: returned path string doesn't match cwd?"

3387 +msgstr ""

3388 +

3389 +#: submodule.c:1865

3390 +#, c-format

3391 +msgid "ls-tree returned unexpected return code %d"

3392 +msgstr ""

3393 +

3394 +#: submodule-config.c:380

3395 #, c-format

3396 msgid "invalid value for %s"

3397 msgstr ""

@@ -3222,14 +3460,14 @@ msgstr ""

3460 msgid "transport: invalid depth option '%s'"

3461 msgstr ""

3462

3225 -#: transport.c:885

3463 +#: transport.c:889

3464 #, c-format

3465 msgid ""

3466 "The following submodule paths contain changes that can\n"

3467 "not be found on any remote:\n"

3468 msgstr ""

3469

3232 -#: transport.c:889

3470 +#: transport.c:893

3471 #, c-format

3472 msgid ""

3473 "\n"

@@ -3245,11 +3483,11 @@ msgid ""

3483 "\n"

3484 msgstr ""

3485

3248 -#: transport.c:897

3486 +#: transport.c:901

3487 msgid "Aborting."

3488 msgstr ""

3489

3252 -#: transport-helper.c:1082

3490 +#: transport-helper.c:1080

3491 #, c-format

3492 msgid "Could not read ref %s"

3493 msgstr ""

@@ -3270,98 +3508,98 @@ msgstr ""

3508 msgid "too-short tree file"

3509 msgstr ""

3510

3273 -#: unpack-trees.c:99

3511 +#: unpack-trees.c:104

3512 #, c-format

3513 msgid ""

3514 "Your local changes to the following files would be overwritten by checkout:\n"

3515 "%%sPlease commit your changes or stash them before you switch branches."

3516 msgstr ""

3517

3280 -#: unpack-trees.c:101

3518 +#: unpack-trees.c:106

3519 #, c-format

3520 msgid ""

3521 "Your local changes to the following files would be overwritten by checkout:\n"

3522 "%%s"

3523 msgstr ""

3524

3287 -#: unpack-trees.c:104

3525 +#: unpack-trees.c:109

3526 #, c-format

3527 msgid ""

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

3529 "%%sPlease commit your changes or stash them before you merge."

3530 msgstr ""

3531

3294 -#: unpack-trees.c:106

3532 +#: unpack-trees.c:111

3533 #, c-format

3534 msgid ""

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

3536 "%%s"

3537 msgstr ""

3538

3301 -#: unpack-trees.c:109

3539 +#: unpack-trees.c:114

3540 #, c-format

3541 msgid ""

3542 "Your local changes to the following files would be overwritten by %s:\n"

3543 "%%sPlease commit your changes or stash them before you %s."

3544 msgstr ""

3545

3308 -#: unpack-trees.c:111

3546 +#: unpack-trees.c:116

3547 #, c-format

3548 msgid ""

3549 "Your local changes to the following files would be overwritten by %s:\n"

3550 "%%s"

3551 msgstr ""

3552

3315 -#: unpack-trees.c:116

3553 +#: unpack-trees.c:121

3554 #, c-format

3555 msgid ""

3556 "Updating the following directories would lose untracked files in them:\n"

3557 "%s"

3558 msgstr ""

3559

3322 -#: unpack-trees.c:120

3560 +#: unpack-trees.c:125

3561 #, c-format

3562 msgid ""

3563 "The following untracked working tree files would be removed by checkout:\n"

3564 "%%sPlease move or remove them before you switch branches."

3565 msgstr ""

3566

3329 -#: unpack-trees.c:122

3567 +#: unpack-trees.c:127

3568 #, c-format

3569 msgid ""

3570 "The following untracked working tree files would be removed by checkout:\n"

3571 "%%s"

3572 msgstr ""

3573

3336 -#: unpack-trees.c:125

3574 +#: unpack-trees.c:130

3575 #, c-format

3576 msgid ""

3577 "The following untracked working tree files would be removed by merge:\n"

3578 "%%sPlease move or remove them before you merge."

3579 msgstr ""

3580

3343 -#: unpack-trees.c:127

3581 +#: unpack-trees.c:132

3582 #, c-format

3583 msgid ""

3584 "The following untracked working tree files would be removed by merge:\n"

3585 "%%s"

3586 msgstr ""

3587

3350 -#: unpack-trees.c:130

3588 +#: unpack-trees.c:135

3589 #, c-format

3590 msgid ""

3591 "The following untracked working tree files would be removed by %s:\n"

3592 "%%sPlease move or remove them before you %s."

3593 msgstr ""

3594

3357 -#: unpack-trees.c:132

3595 +#: unpack-trees.c:137

3596 #, c-format

3597 msgid ""

3598 "The following untracked working tree files would be removed by %s:\n"

3599 "%%s"

3600 msgstr ""

3601

3364 -#: unpack-trees.c:137

3602 +#: unpack-trees.c:142

3603 #, c-format

3604 msgid ""

3605 "The following untracked working tree files would be overwritten by "

@@ -3369,7 +3607,7 @@ msgid ""

3607 "%%sPlease move or remove them before you switch branches."

3608 msgstr ""

3609

3372 -#: unpack-trees.c:139

3610 +#: unpack-trees.c:144

3611 #, c-format

3612 msgid ""

3613 "The following untracked working tree files would be overwritten by "

@@ -3377,47 +3615,47 @@ msgid ""

3615 "%%s"

3616 msgstr ""

3617

3380 -#: unpack-trees.c:142

3618 +#: unpack-trees.c:147

3619 #, c-format

3620 msgid ""

3621 "The following untracked working tree files would be overwritten by merge:\n"

3622 "%%sPlease move or remove them before you merge."

3623 msgstr ""

3624

3387 -#: unpack-trees.c:144

3625 +#: unpack-trees.c:149

3626 #, c-format

3627 msgid ""

3628 "The following untracked working tree files would be overwritten by merge:\n"

3629 "%%s"

3630 msgstr ""

3631

3394 -#: unpack-trees.c:147

3632 +#: unpack-trees.c:152

3633 #, c-format

3634 msgid ""

3635 "The following untracked working tree files would be overwritten by %s:\n"

3636 "%%sPlease move or remove them before you %s."

3637 msgstr ""

3638

3401 -#: unpack-trees.c:149

3639 +#: unpack-trees.c:154

3640 #, c-format

3641 msgid ""

3642 "The following untracked working tree files would be overwritten by %s:\n"

3643 "%%s"

3644 msgstr ""

3645

3408 -#: unpack-trees.c:156

3646 +#: unpack-trees.c:161

3647 #, c-format

3648 msgid "Entry '%s' overlaps with '%s'. Cannot bind."

3649 msgstr ""

3650

3413 -#: unpack-trees.c:159

3651 +#: unpack-trees.c:164

3652 #, c-format

3653 msgid ""

3654 "Cannot update sparse checkout: the following entries are not up-to-date:\n"

3655 "%s"

3656 msgstr ""

3657

3420 -#: unpack-trees.c:161

3658 +#: unpack-trees.c:166

3659 #, c-format

3660 msgid ""

3661 "The following working tree files would be overwritten by sparse checkout "

@@ -3425,7 +3663,7 @@ msgid ""

3663 "%s"

3664 msgstr ""

3665

3428 -#: unpack-trees.c:163

3666 +#: unpack-trees.c:168

3667 #, c-format

3668 msgid ""

3669 "The following working tree files would be removed by sparse checkout "

@@ -3433,45 +3671,57 @@ msgid ""

3671 "%s"

3672 msgstr ""

3673

3436 -#: unpack-trees.c:240

3674 +#: unpack-trees.c:170

3675 +#, c-format

3676 +msgid ""

3677 +"Cannot update submodule:\n"

3678 +"%s"

3679 +msgstr ""

3680 +

3681 +#: unpack-trees.c:247

3682 #, c-format

3683 msgid "Aborting\n"

3684 msgstr ""

3685

3441 -#: unpack-trees.c:270

3686 +#: unpack-trees.c:272

3687 +#, c-format

3688 +msgid "submodule update strategy not supported for submodule '%s'"

3689 +msgstr ""

3690 +

3691 +#: unpack-trees.c:340

3692 msgid "Checking out files"

3693 msgstr ""

3694

3445 -#: urlmatch.c:120

3695 +#: urlmatch.c:163

3696 msgid "invalid URL scheme name or missing '://' suffix"

3697 msgstr ""

3698

3449 -#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356

3699 +#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405

3700 #, c-format

3701 msgid "invalid %XX escape sequence"

3702 msgstr ""

3703

3454 -#: urlmatch.c:172

3704 +#: urlmatch.c:215

3705 msgid "missing host and scheme is not 'file:'"

3706 msgstr ""

3707

3458 -#: urlmatch.c:189

3708 +#: urlmatch.c:232

3709 msgid "a 'file:' URL may not have a port number"

3710 msgstr ""

3711

3462 -#: urlmatch.c:199

3712 +#: urlmatch.c:247

3713 msgid "invalid characters in host name"

3714 msgstr ""

3715

3466 -#: urlmatch.c:244 urlmatch.c:255

3716 +#: urlmatch.c:292 urlmatch.c:303

3717 msgid "invalid port number"

3718 msgstr ""

3719

3470 -#: urlmatch.c:322

3720 +#: urlmatch.c:371

3721 msgid "invalid '..' path segment"

3722 msgstr ""

3723

3474 -#: worktree.c:282

3724 +#: worktree.c:285

3725 #, c-format

3726 msgid "failed to read '%s'"

3727 msgstr ""

@@ -3487,27 +3737,27 @@ msgid "could not open '%s' for writing"

3737 msgstr ""

3738

3739 #: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759

3490 -#: builtin/am.c:847 builtin/commit.c:1700 builtin/merge.c:1033

3740 +#: builtin/am.c:847 builtin/commit.c:1700 builtin/merge.c:1015

3741 #: builtin/pull.c:341

3742 #, c-format

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

3744 msgstr ""

3745

3496 -#: wrapper.c:605 wrapper.c:626

3746 +#: wrapper.c:581 wrapper.c:602

3747 #, c-format

3748 msgid "unable to access '%s'"

3749 msgstr ""

3750

3501 -#: wrapper.c:634

3751 +#: wrapper.c:610

3752 msgid "unable to get current working directory"

3753 msgstr ""

3754

3505 -#: wrapper.c:658

3755 +#: wrapper.c:634

3756 #, c-format

3757 msgid "could not write to %s"

3758 msgstr ""

3759

3510 -#: wrapper.c:660

3760 +#: wrapper.c:636

3761 #, c-format

3762 msgid "could not close %s"

3763 msgstr ""

@@ -3537,11 +3787,11 @@ msgstr ""

3787 msgid " (use \"git rm <file>...\" to mark resolution)"

3788 msgstr ""

3789

3540 -#: wt-status.c:199 wt-status.c:945

3790 +#: wt-status.c:199 wt-status.c:958

3791 msgid "Changes to be committed:"

3792 msgstr ""

3793

3544 -#: wt-status.c:217 wt-status.c:954

3794 +#: wt-status.c:217 wt-status.c:967

3795 msgid "Changes not staged for commit:"

3796 msgstr ""

3797

@@ -3639,236 +3889,236 @@ msgstr ""

3889 msgid "untracked content, "

3890 msgstr ""

3891

3642 -#: wt-status.c:818

3892 +#: wt-status.c:831

3893 msgid "Submodules changed but not updated:"

3894 msgstr ""

3895

3646 -#: wt-status.c:820

3896 +#: wt-status.c:833

3897 msgid "Submodule changes to be committed:"

3898 msgstr ""

3899

3650 -#: wt-status.c:901

3900 +#: wt-status.c:914

3901 msgid ""

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

3903 "Everything below will be removed."

3904 msgstr ""

3905

3656 -#: wt-status.c:1013

3906 +#: wt-status.c:1026

3907 msgid "You have unmerged paths."

3908 msgstr ""

3909

3660 -#: wt-status.c:1016

3910 +#: wt-status.c:1029

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

3912 msgstr ""

3913

3664 -#: wt-status.c:1018

3914 +#: wt-status.c:1031

3915 msgid " (use \"git merge --abort\" to abort the merge)"

3916 msgstr ""

3917

3668 -#: wt-status.c:1023

3918 +#: wt-status.c:1036

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

3920 msgstr ""

3921

3672 -#: wt-status.c:1026

3922 +#: wt-status.c:1039

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

3924 msgstr ""

3925

3676 -#: wt-status.c:1036

3926 +#: wt-status.c:1049

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

3928 msgstr ""

3929

3680 -#: wt-status.c:1039

3930 +#: wt-status.c:1052

3931 msgid "The current patch is empty."

3932 msgstr ""

3933

3684 -#: wt-status.c:1043

3934 +#: wt-status.c:1056

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

3936 msgstr ""

3937

3688 -#: wt-status.c:1045

3938 +#: wt-status.c:1058

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

3940 msgstr ""

3941

3692 -#: wt-status.c:1047

3942 +#: wt-status.c:1060

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

3944 msgstr ""

3945

3696 -#: wt-status.c:1176

3946 +#: wt-status.c:1189

3947 msgid "git-rebase-todo is missing."

3948 msgstr ""

3949

3700 -#: wt-status.c:1178

3950 +#: wt-status.c:1191

3951 msgid "No commands done."

3952 msgstr ""

3953

3704 -#: wt-status.c:1181

3954 +#: wt-status.c:1194

3955 #, c-format

3956 msgid "Last command done (%d command done):"

3957 msgid_plural "Last commands done (%d commands done):"

3958 msgstr[0] ""

3959 msgstr[1] ""

3960

3711 -#: wt-status.c:1192

3961 +#: wt-status.c:1205

3962 #, c-format

3963 msgid " (see more in file %s)"

3964 msgstr ""

3965

3716 -#: wt-status.c:1197

3966 +#: wt-status.c:1210

3967 msgid "No commands remaining."

3968 msgstr ""

3969

3720 -#: wt-status.c:1200

3970 +#: wt-status.c:1213

3971 #, c-format

3972 msgid "Next command to do (%d remaining command):"

3973 msgid_plural "Next commands to do (%d remaining commands):"

3974 msgstr[0] ""

3975 msgstr[1] ""

3976

3727 -#: wt-status.c:1208

3977 +#: wt-status.c:1221

3978 msgid " (use \"git rebase --edit-todo\" to view and edit)"

3979 msgstr ""

3980

3731 -#: wt-status.c:1221

3981 +#: wt-status.c:1234

3982 #, c-format

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

3984 msgstr ""

3985

3736 -#: wt-status.c:1226

3986 +#: wt-status.c:1239

3987 msgid "You are currently rebasing."

3988 msgstr ""

3989

3740 -#: wt-status.c:1240

3990 +#: wt-status.c:1253

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

3992 msgstr ""

3993

3744 -#: wt-status.c:1242

3994 +#: wt-status.c:1255

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

3996 msgstr ""

3997

3748 -#: wt-status.c:1244

3998 +#: wt-status.c:1257

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

4000 msgstr ""

4001

3752 -#: wt-status.c:1250

4002 +#: wt-status.c:1263

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

4004 msgstr ""

4005

3756 -#: wt-status.c:1254

4006 +#: wt-status.c:1267

4007 #, c-format

4008 msgid ""

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

4010 msgstr ""

4011

3762 -#: wt-status.c:1259

4012 +#: wt-status.c:1272

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

4014 msgstr ""

4015

3766 -#: wt-status.c:1262

4016 +#: wt-status.c:1275

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

4018 msgstr ""

4019

3770 -#: wt-status.c:1266

4020 +#: wt-status.c:1279

4021 #, c-format

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

4023 msgstr ""

4024

3775 -#: wt-status.c:1271

4025 +#: wt-status.c:1284

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

4027 msgstr ""

4028

3779 -#: wt-status.c:1274

4029 +#: wt-status.c:1287

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

4031 msgstr ""

4032

3783 -#: wt-status.c:1276

4033 +#: wt-status.c:1289

4034 msgid ""

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

4036 msgstr ""

4037

3788 -#: wt-status.c:1286

4038 +#: wt-status.c:1299

4039 #, c-format

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

4041 msgstr ""

4042

3793 -#: wt-status.c:1291

4043 +#: wt-status.c:1304

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

4045 msgstr ""

4046

3797 -#: wt-status.c:1294

4047 +#: wt-status.c:1307

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

4049 msgstr ""

4050

3801 -#: wt-status.c:1296

4051 +#: wt-status.c:1309

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

4053 msgstr ""

4054

3805 -#: wt-status.c:1305

4055 +#: wt-status.c:1318

4056 #, c-format

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

4058 msgstr ""

4059

3810 -#: wt-status.c:1310

4060 +#: wt-status.c:1323

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

4062 msgstr ""

4063

3814 -#: wt-status.c:1313

4064 +#: wt-status.c:1326

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

4066 msgstr ""

4067

3818 -#: wt-status.c:1315

4068 +#: wt-status.c:1328

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

4070 msgstr ""

4071

3822 -#: wt-status.c:1326

4072 +#: wt-status.c:1339

4073 #, c-format

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

4075 msgstr ""

4076

3827 -#: wt-status.c:1330

4077 +#: wt-status.c:1343

4078 msgid "You are currently bisecting."

4079 msgstr ""

4080

3831 -#: wt-status.c:1333

4081 +#: wt-status.c:1346

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

4083 msgstr ""

4084

3835 -#: wt-status.c:1530

4085 +#: wt-status.c:1543

4086 msgid "On branch "

4087 msgstr ""

4088

3839 -#: wt-status.c:1536

4089 +#: wt-status.c:1549

4090 msgid "interactive rebase in progress; onto "

4091 msgstr ""

4092

3843 -#: wt-status.c:1538

4093 +#: wt-status.c:1551

4094 msgid "rebase in progress; onto "

4095 msgstr ""

4096

3847 -#: wt-status.c:1543

4097 +#: wt-status.c:1556

4098 msgid "HEAD detached at "

4099 msgstr ""

4100

3851 -#: wt-status.c:1545

4101 +#: wt-status.c:1558

4102 msgid "HEAD detached from "

4103 msgstr ""

4104

3855 -#: wt-status.c:1548

4105 +#: wt-status.c:1561

4106 msgid "Not currently on any branch."

4107 msgstr ""

4108

3859 -#: wt-status.c:1566

4109 +#: wt-status.c:1579

4110 msgid "Initial commit"

4111 msgstr ""

4112

3863 -#: wt-status.c:1580

4113 +#: wt-status.c:1593

4114 msgid "Untracked files"

4115 msgstr ""

4116

3867 -#: wt-status.c:1582

4117 +#: wt-status.c:1595

4118 msgid "Ignored files"

4119 msgstr ""

4120

3871 -#: wt-status.c:1586

4121 +#: wt-status.c:1599

4122 #, c-format

4123 msgid ""

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

@@ -3876,97 +4126,93 @@ msgid ""

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

4127 msgstr ""

4128

3879 -#: wt-status.c:1592

4129 +#: wt-status.c:1605

4130 #, c-format

4131 msgid "Untracked files not listed%s"

4132 msgstr ""

4133

3884 -#: wt-status.c:1594

4134 +#: wt-status.c:1607

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

4136 msgstr ""

4137

3888 -#: wt-status.c:1600

4138 +#: wt-status.c:1613

4139 msgid "No changes"

4140 msgstr ""

4141

3892 -#: wt-status.c:1605

4142 +#: wt-status.c:1618

4143 #, c-format

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

4145 msgstr ""

4146

3897 -#: wt-status.c:1608

4147 +#: wt-status.c:1621

4148 #, c-format

4149 msgid "no changes added to commit\n"

4150 msgstr ""

4151

3902 -#: wt-status.c:1611

4152 +#: wt-status.c:1624

4153 #, c-format

4154 msgid ""

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

4156 "track)\n"

4157 msgstr ""

4158

3909 -#: wt-status.c:1614

4159 +#: wt-status.c:1627

4160 #, c-format

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

4162 msgstr ""

4163

3914 -#: wt-status.c:1617

4164 +#: wt-status.c:1630

4165 #, c-format

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

4167 msgstr ""

4168

3919 -#: wt-status.c:1620 wt-status.c:1625

4169 +#: wt-status.c:1633 wt-status.c:1638

4170 #, c-format

4171 msgid "nothing to commit\n"

4172 msgstr ""

4173

3924 -#: wt-status.c:1623

4174 +#: wt-status.c:1636

4175 #, c-format

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

4177 msgstr ""

4178

3929 -#: wt-status.c:1627

4179 +#: wt-status.c:1640

4180 #, c-format

4181 msgid "nothing to commit, working tree clean\n"

4182 msgstr ""

4183

3934 -#: wt-status.c:1734

4184 +#: wt-status.c:1749

4185 msgid "Initial commit on "

4186 msgstr ""

4187

3938 -#: wt-status.c:1738

4188 +#: wt-status.c:1753

4189 msgid "HEAD (no branch)"

4190 msgstr ""

4191

3942 -#: wt-status.c:1767

3943 -msgid "gone"

3944 -msgstr ""

3945 -

3946 -#: wt-status.c:1769 wt-status.c:1777

4192 +#: wt-status.c:1782 wt-status.c:1790

4193 msgid "behind "

4194 msgstr ""

4195

3950 -#: wt-status.c:1772 wt-status.c:1775

4196 +#: wt-status.c:1785 wt-status.c:1788

4197 msgid "ahead "

4198 msgstr ""

4199

4200 #. TRANSLATORS: the action is e.g. "pull with rebase"

3955 -#: wt-status.c:2277

4201 +#: wt-status.c:2280

4202 #, c-format

4203 msgid "cannot %s: You have unstaged changes."

4204 msgstr ""

4205

3960 -#: wt-status.c:2283

4206 +#: wt-status.c:2286

4207 msgid "additionally, your index contains uncommitted changes."

4208 msgstr ""

4209

3964 -#: wt-status.c:2285

4210 +#: wt-status.c:2288

4211 #, c-format

4212 msgid "cannot %s: Your index contains uncommitted changes."

4213 msgstr ""

4214

3969 -#: compat/precompose_utf8.c:57 builtin/clone.c:414

4215 +#: compat/precompose_utf8.c:57 builtin/clone.c:432

4216 #, c-format

4217 msgid "failed to unlink '%s'"

4218 msgstr ""

@@ -3993,7 +4239,7 @@ msgstr ""

4239 msgid "Unstaged changes after refreshing the index:"

4240 msgstr ""

4241

3996 -#: builtin/add.c:209 builtin/rev-parse.c:845

4242 +#: builtin/add.c:209 builtin/rev-parse.c:872

4243 msgid "Could not read the index"

4244 msgstr ""

4245

@@ -4028,9 +4274,9 @@ msgstr ""

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

4275 msgstr ""

4276

4031 -#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:123

4277 +#: builtin/add.c:266 builtin/clean.c:876 builtin/fetch.c:115 builtin/mv.c:123

4278 #: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:524

4033 -#: builtin/remote.c:1326 builtin/rm.c:241 builtin/send-pack.c:162

4279 +#: builtin/remote.c:1328 builtin/rm.c:241 builtin/send-pack.c:163

4280 msgid "dry run"

4281 msgstr ""

4282

@@ -4038,7 +4284,7 @@ msgstr ""

4284 msgid "interactive picking"

4285 msgstr ""

4286

4041 -#: builtin/add.c:270 builtin/checkout.c:1159 builtin/reset.c:286

4287 +#: builtin/add.c:270 builtin/checkout.c:1177 builtin/reset.c:286

4288 msgid "select hunks interactively"

4289 msgstr ""

4290

@@ -4078,11 +4324,11 @@ msgstr ""

4324 msgid "check if - even missing - files are ignored in dry run"

4325 msgstr ""

4326

4081 -#: builtin/add.c:283 builtin/update-index.c:947

4327 +#: builtin/add.c:283 builtin/update-index.c:951

4328 msgid "(+/-)x"

4329 msgstr ""

4330

4085 -#: builtin/add.c:283 builtin/update-index.c:948

4331 +#: builtin/add.c:283 builtin/update-index.c:952

4332 msgid "override the executable bit of the listed files"

4333 msgstr ""

4334

@@ -4118,8 +4364,8 @@ msgstr ""

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

4365 msgstr ""

4366

4121 -#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279

4122 -#: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350

4367 +#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:298

4368 +#: builtin/checkout.c:491 builtin/clean.c:920 builtin/commit.c:350

4369 #: builtin/mv.c:143 builtin/reset.c:235 builtin/rm.c:271

4370 #: builtin/submodule--helper.c:244

4371 msgid "index file corrupt"

@@ -4173,7 +4419,7 @@ msgstr ""

4419 msgid "Patch format detection failed."

4420 msgstr ""

4421

4176 -#: builtin/am.c:989 builtin/clone.c:379

4422 +#: builtin/am.c:989 builtin/clone.c:397

4423 #, c-format

4424 msgid "failed to create directory '%s'"

4425 msgstr ""

@@ -4205,7 +4451,7 @@ msgstr ""

4451 msgid "Patch is empty. Was it split wrong?"

4452 msgstr ""

4453

4208 -#: builtin/am.c:1390 builtin/log.c:1550

4454 +#: builtin/am.c:1390 builtin/log.c:1557

4455 #, c-format

4456 msgid "invalid ident line: %s"

4457 msgstr ""

@@ -4237,7 +4483,7 @@ msgstr ""

4483 msgid "Failed to merge in the changes."

4484 msgstr ""

4485

4240 -#: builtin/am.c:1686 builtin/merge.c:632

4486 +#: builtin/am.c:1686 builtin/merge.c:631

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

4488 msgstr ""

4489

@@ -4393,15 +4639,15 @@ msgid "pass it through git-apply"

4639 msgstr ""

4640

4641 #: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665

4396 -#: builtin/grep.c:1038 builtin/merge.c:202 builtin/pull.c:135

4642 +#: builtin/grep.c:1045 builtin/merge.c:201 builtin/pull.c:135

4643 #: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191

4398 -#: builtin/show-branch.c:644 builtin/show-ref.c:169 builtin/tag.c:355

4644 +#: builtin/show-branch.c:637 builtin/show-ref.c:169 builtin/tag.c:398

4645 #: parse-options.h:132 parse-options.h:134 parse-options.h:245

4646 msgid "n"

4647 msgstr ""

4648

4403 -#: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438

4404 -#: builtin/tag.c:387 builtin/verify-tag.c:38

4649 +#: builtin/am.c:2289 builtin/branch.c:592 builtin/for-each-ref.c:37

4650 +#: builtin/replace.c:442 builtin/tag.c:433 builtin/verify-tag.c:38

4651 msgid "format"

4652 msgstr ""

4653

@@ -4437,8 +4683,8 @@ msgstr ""

4683 msgid "use current timestamp for author date"

4684 msgstr ""

4685

4440 -#: builtin/am.c:2315 builtin/commit.c:1600 builtin/merge.c:233

4441 -#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:370

4686 +#: builtin/am.c:2315 builtin/commit.c:1600 builtin/merge.c:232

4687 +#: builtin/pull.c:165 builtin/revert.c:111 builtin/tag.c:413

4688 msgid "key-id"

4689 msgstr ""

4690

@@ -4535,111 +4781,111 @@ msgstr ""

4781 msgid "<rev-opts> are documented in git-rev-list(1)"

4782 msgstr ""

4783

4538 -#: builtin/blame.c:1786

4784 +#: builtin/blame.c:1777

4785 msgid "Blaming lines"

4786 msgstr ""

4787

4542 -#: builtin/blame.c:2582

4788 +#: builtin/blame.c:2573

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

4790 msgstr ""

4791

4546 -#: builtin/blame.c:2583

4792 +#: builtin/blame.c:2574

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

4794 msgstr ""

4795

4550 -#: builtin/blame.c:2584

4796 +#: builtin/blame.c:2575

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

4798 msgstr ""

4799

4554 -#: builtin/blame.c:2585

4800 +#: builtin/blame.c:2576

4801 msgid "Show work cost statistics"

4802 msgstr ""

4803

4558 -#: builtin/blame.c:2586

4804 +#: builtin/blame.c:2577

4805 msgid "Force progress reporting"

4806 msgstr ""

4807

4562 -#: builtin/blame.c:2587

4808 +#: builtin/blame.c:2578

4809 msgid "Show output score for blame entries"

4810 msgstr ""

4811

4566 -#: builtin/blame.c:2588

4812 +#: builtin/blame.c:2579

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

4814 msgstr ""

4815

4570 -#: builtin/blame.c:2589

4816 +#: builtin/blame.c:2580

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

4818 msgstr ""

4819

4574 -#: builtin/blame.c:2590

4820 +#: builtin/blame.c:2581

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

4822 msgstr ""

4823

4578 -#: builtin/blame.c:2591

4824 +#: builtin/blame.c:2582

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

4826 msgstr ""

4827

4582 -#: builtin/blame.c:2592

4828 +#: builtin/blame.c:2583

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

4830 msgstr ""

4831

4586 -#: builtin/blame.c:2593

4832 +#: builtin/blame.c:2584

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

4834 msgstr ""

4835

4590 -#: builtin/blame.c:2594

4836 +#: builtin/blame.c:2585

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

4838 msgstr ""

4839

4594 -#: builtin/blame.c:2595

4840 +#: builtin/blame.c:2586

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

4842 msgstr ""

4843

4598 -#: builtin/blame.c:2596

4844 +#: builtin/blame.c:2587

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

4846 msgstr ""

4847

4602 -#: builtin/blame.c:2597

4848 +#: builtin/blame.c:2588

4849 msgid "Ignore whitespace differences"

4850 msgstr ""

4851

4606 -#: builtin/blame.c:2604

4852 +#: builtin/blame.c:2595

4853 msgid "Use an experimental heuristic to improve diffs"

4854 msgstr ""

4855

4610 -#: builtin/blame.c:2606

4856 +#: builtin/blame.c:2597

4857 msgid "Spend extra cycles to find better match"

4858 msgstr ""

4859

4614 -#: builtin/blame.c:2607

4860 +#: builtin/blame.c:2598

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

4862 msgstr ""

4863

4618 -#: builtin/blame.c:2608

4864 +#: builtin/blame.c:2599

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

4866 msgstr ""

4867

4622 -#: builtin/blame.c:2609 builtin/blame.c:2610

4868 +#: builtin/blame.c:2600 builtin/blame.c:2601

4869 msgid "score"

4870 msgstr ""

4871

4626 -#: builtin/blame.c:2609

4872 +#: builtin/blame.c:2600

4873 msgid "Find line copies within and across files"

4874 msgstr ""

4875

4630 -#: builtin/blame.c:2610

4876 +#: builtin/blame.c:2601

4877 msgid "Find line movements within and across files"

4878 msgstr ""

4879

4634 -#: builtin/blame.c:2611

4880 +#: builtin/blame.c:2602

4881 msgid "n,m"

4882 msgstr ""

4883

4638 -#: builtin/blame.c:2611

4884 +#: builtin/blame.c:2602

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

4886 msgstr ""

4887

4642 -#: builtin/blame.c:2658

4888 +#: builtin/blame.c:2649

4889 msgid "--progress can't be used with --incremental or porcelain formats"

4890 msgstr ""

4891

@@ -4649,38 +4895,38 @@ msgstr ""

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

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

4897 #. fewer display columns.

4652 -#: builtin/blame.c:2706

4898 +#: builtin/blame.c:2697

4899 msgid "4 years, 11 months ago"

4900 msgstr ""

4901

4656 -#: builtin/blame.c:2786

4902 +#: builtin/blame.c:2777

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

4904 msgstr ""

4905

4660 -#: builtin/blame.c:2806

4906 +#: builtin/blame.c:2797

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

4908 msgstr ""

4909

4664 -#: builtin/blame.c:2811

4910 +#: builtin/blame.c:2802

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

4912 msgstr ""

4913

4668 -#: builtin/blame.c:2838

4914 +#: builtin/blame.c:2829

4915 msgid ""

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

4917 msgstr ""

4918

4673 -#: builtin/blame.c:2849

4919 +#: builtin/blame.c:2840

4920 #, c-format

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

4922 msgstr ""

4923

4678 -#: builtin/blame.c:2860

4924 +#: builtin/blame.c:2851

4925 #, c-format

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

4927 msgstr ""

4928

4683 -#: builtin/blame.c:2879

4929 +#: builtin/blame.c:2870

4930 #, c-format

4931 msgid "file %s has only %lu line"

4932 msgid_plural "file %s has only %lu lines"

@@ -4707,189 +4953,121 @@ msgstr ""

4953 msgid "git branch [<options>] [-r | -a] [--points-at]"

4954 msgstr ""

4955

4710 -#: builtin/branch.c:143

4956 +#: builtin/branch.c:31

4957 +msgid "git branch [<options>] [-r | -a] [--format]"

4958 +msgstr ""

4959 +

4960 +#: builtin/branch.c:144

4961 #, c-format

4962 msgid ""

4963 "deleting branch '%s' that has been merged to\n"

4964 " '%s', but not yet merged to HEAD."

4965 msgstr ""

4966

4717 -#: builtin/branch.c:147

4967 +#: builtin/branch.c:148

4968 #, c-format

4969 msgid ""

4970 "not deleting branch '%s' that is not yet merged to\n"

4971 " '%s', even though it is merged to HEAD."

4972 msgstr ""

4973

4724 -#: builtin/branch.c:161

4974 +#: builtin/branch.c:162

4975 #, c-format

4976 msgid "Couldn't look up commit object for '%s'"

4977 msgstr ""

4978

4729 -#: builtin/branch.c:165

4979 +#: builtin/branch.c:166

4980 #, c-format

4981 msgid ""

4982 "The branch '%s' is not fully merged.\n"

4983 "If you are sure you want to delete it, run 'git branch -D %s'."

4984 msgstr ""

4985

4736 -#: builtin/branch.c:178

4986 +#: builtin/branch.c:179

4987 msgid "Update of config-file failed"

4988 msgstr ""

4989

4740 -#: builtin/branch.c:206

4990 +#: builtin/branch.c:210

4991 msgid "cannot use -a with -d"

4992 msgstr ""

4993

4744 -#: builtin/branch.c:212

4994 +#: builtin/branch.c:216

4995 msgid "Couldn't look up commit object for HEAD"

4996 msgstr ""

4997

4748 -#: builtin/branch.c:226

4998 +#: builtin/branch.c:230

4999 #, c-format

5000 msgid "Cannot delete branch '%s' checked out at '%s'"

5001 msgstr ""

5002

4753 -#: builtin/branch.c:241

5003 +#: builtin/branch.c:245

5004 #, c-format

5005 msgid "remote-tracking branch '%s' not found."

5006 msgstr ""

5007

4758 -#: builtin/branch.c:242

5008 +#: builtin/branch.c:246

5009 #, c-format

5010 msgid "branch '%s' not found."

5011 msgstr ""

5012

4763 -#: builtin/branch.c:257

5013 +#: builtin/branch.c:261

5014 #, c-format

5015 msgid "Error deleting remote-tracking branch '%s'"

5016 msgstr ""

5017

4768 -#: builtin/branch.c:258

5018 +#: builtin/branch.c:262

5019 #, c-format

5020 msgid "Error deleting branch '%s'"

5021 msgstr ""

5022

4773 -#: builtin/branch.c:265

5023 +#: builtin/branch.c:269

5024 #, c-format

5025 msgid "Deleted remote-tracking branch %s (was %s).\n"

5026 msgstr ""

5027

4778 -#: builtin/branch.c:266

5028 +#: builtin/branch.c:270

5029 #, c-format

5030 msgid "Deleted branch %s (was %s).\n"

5031 msgstr ""

5032

4783 -#: builtin/branch.c:312

4784 -#, c-format

4785 -msgid "[%s: gone]"

4786 -msgstr ""

4787 -

4788 -#: builtin/branch.c:317

4789 -#, c-format

4790 -msgid "[%s]"

4791 -msgstr ""

4792 -

4793 -#: builtin/branch.c:322

4794 -#, c-format

4795 -msgid "[%s: behind %d]"

4796 -msgstr ""

4797 -

4798 -#: builtin/branch.c:324

4799 -#, c-format

4800 -msgid "[behind %d]"

4801 -msgstr ""

4802 -

4803 -#: builtin/branch.c:328

4804 -#, c-format

4805 -msgid "[%s: ahead %d]"

4806 -msgstr ""

4807 -

4808 -#: builtin/branch.c:330

4809 -#, c-format

4810 -msgid "[ahead %d]"

4811 -msgstr ""

4812 -

4813 -#: builtin/branch.c:333

4814 -#, c-format

4815 -msgid "[%s: ahead %d, behind %d]"

4816 -msgstr ""

4817 -

4818 -#: builtin/branch.c:336

4819 -#, c-format

4820 -msgid "[ahead %d, behind %d]"

4821 -msgstr ""

4822 -

4823 -#: builtin/branch.c:349

4824 -msgid " **** invalid ref ****"

4825 -msgstr ""

4826 -

4827 -#: builtin/branch.c:375

4828 -#, c-format

4829 -msgid "(no branch, rebasing %s)"

4830 -msgstr ""

4831 -

4832 -#: builtin/branch.c:378

4833 -#, c-format

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

4835 -msgstr ""

4836 -

4837 -#. TRANSLATORS: make sure this matches

4838 -#. "HEAD detached at " in wt-status.c

4839 -#: builtin/branch.c:384

4840 -#, c-format

4841 -msgid "(HEAD detached at %s)"

4842 -msgstr ""

4843 -

4844 -#. TRANSLATORS: make sure this matches

4845 -#. "HEAD detached from " in wt-status.c

4846 -#: builtin/branch.c:389

4847 -#, c-format

4848 -msgid "(HEAD detached from %s)"

4849 -msgstr ""

4850 -

4851 -#: builtin/branch.c:393

4852 -msgid "(no branch)"

4853 -msgstr ""

4854 -

4855 -#: builtin/branch.c:535

5033 +#: builtin/branch.c:441

5034 #, c-format

5035 msgid "Branch %s is being rebased at %s"

5036 msgstr ""

5037

4860 -#: builtin/branch.c:539

5038 +#: builtin/branch.c:445

5039 #, c-format

5040 msgid "Branch %s is being bisected at %s"

5041 msgstr ""

5042

4865 -#: builtin/branch.c:554

5043 +#: builtin/branch.c:460

5044 msgid "cannot rename the current branch while not on any."

5045 msgstr ""

5046

4869 -#: builtin/branch.c:564

5047 +#: builtin/branch.c:470

5048 #, c-format

5049 msgid "Invalid branch name: '%s'"

5050 msgstr ""

5051

4874 -#: builtin/branch.c:581

5052 +#: builtin/branch.c:487

5053 msgid "Branch rename failed"

5054 msgstr ""

5055

4878 -#: builtin/branch.c:585

5056 +#: builtin/branch.c:490

5057 #, c-format

5058 msgid "Renamed a misnamed branch '%s' away"

5059 msgstr ""

5060

4883 -#: builtin/branch.c:588

5061 +#: builtin/branch.c:493

5062 #, c-format

5063 msgid "Branch renamed to %s, but HEAD is not updated!"

5064 msgstr ""

5065

4888 -#: builtin/branch.c:595

5066 +#: builtin/branch.c:502

5067 msgid "Branch is renamed, but update of config-file failed"

5068 msgstr ""

5069

4892 -#: builtin/branch.c:611

5070 +#: builtin/branch.c:518

5071 #, c-format

5072 msgid ""

5073 "Please edit the description for the branch\n"

@@ -4897,211 +5075,220 @@ msgid ""

5075 "Lines starting with '%c' will be stripped.\n"

5076 msgstr ""

5077

4900 -#: builtin/branch.c:643

5078 +#: builtin/branch.c:551

5079 msgid "Generic options"

5080 msgstr ""

5081

4904 -#: builtin/branch.c:645

5082 +#: builtin/branch.c:553

5083 msgid "show hash and subject, give twice for upstream branch"

5084 msgstr ""

5085

4908 -#: builtin/branch.c:646

5086 +#: builtin/branch.c:554

5087 msgid "suppress informational messages"

5088 msgstr ""

5089

4912 -#: builtin/branch.c:647

5090 +#: builtin/branch.c:555

5091 msgid "set up tracking mode (see git-pull(1))"

5092 msgstr ""

5093

4916 -#: builtin/branch.c:649

5094 +#: builtin/branch.c:557

5095 msgid "change upstream info"

5096 msgstr ""

5097

4920 -#: builtin/branch.c:651

5098 +#: builtin/branch.c:559

5099 msgid "upstream"

5100 msgstr ""

5101

4924 -#: builtin/branch.c:651

5102 +#: builtin/branch.c:559

5103 msgid "change the upstream info"

5104 msgstr ""

5105

4928 -#: builtin/branch.c:652

5106 +#: builtin/branch.c:560

5107 msgid "Unset the upstream info"

5108 msgstr ""

5109

4932 -#: builtin/branch.c:653

5110 +#: builtin/branch.c:561

5111 msgid "use colored output"

5112 msgstr ""

5113

4936 -#: builtin/branch.c:654

5114 +#: builtin/branch.c:562

5115 msgid "act on remote-tracking branches"

5116 msgstr ""

5117

4940 -#: builtin/branch.c:656 builtin/branch.c:657

5118 +#: builtin/branch.c:564 builtin/branch.c:566

5119 msgid "print only branches that contain the commit"

5120 msgstr ""

5121

4944 -#: builtin/branch.c:660

5122 +#: builtin/branch.c:565 builtin/branch.c:567

5123 +msgid "print only branches that don't contain the commit"

5124 +msgstr ""

5125 +

5126 +#: builtin/branch.c:570

5127 msgid "Specific git-branch actions:"

5128 msgstr ""

5129

4948 -#: builtin/branch.c:661

5130 +#: builtin/branch.c:571

5131 msgid "list both remote-tracking and local branches"

5132 msgstr ""

5133

4952 -#: builtin/branch.c:663

5134 +#: builtin/branch.c:573

5135 msgid "delete fully merged branch"

5136 msgstr ""

5137

4956 -#: builtin/branch.c:664

5138 +#: builtin/branch.c:574

5139 msgid "delete branch (even if not merged)"

5140 msgstr ""

5141

4960 -#: builtin/branch.c:665

5142 +#: builtin/branch.c:575

5143 msgid "move/rename a branch and its reflog"

5144 msgstr ""

5145

4964 -#: builtin/branch.c:666

5146 +#: builtin/branch.c:576

5147 msgid "move/rename a branch, even if target exists"

5148 msgstr ""

5149

4968 -#: builtin/branch.c:667

5150 +#: builtin/branch.c:577

5151 msgid "list branch names"

5152 msgstr ""

5153

4972 -#: builtin/branch.c:668

5154 +#: builtin/branch.c:578

5155 msgid "create the branch's reflog"

5156 msgstr ""

5157

4976 -#: builtin/branch.c:670

5158 +#: builtin/branch.c:580

5159 msgid "edit the description for the branch"

5160 msgstr ""

5161

4980 -#: builtin/branch.c:671

5162 +#: builtin/branch.c:581

5163 msgid "force creation, move/rename, deletion"

5164 msgstr ""

5165

4984 -#: builtin/branch.c:672

5166 +#: builtin/branch.c:582

5167 msgid "print only branches that are merged"

5168 msgstr ""

5169

4988 -#: builtin/branch.c:673

5170 +#: builtin/branch.c:583

5171 msgid "print only branches that are not merged"

5172 msgstr ""

5173

4992 -#: builtin/branch.c:674

5174 +#: builtin/branch.c:584

5175 msgid "list branches in columns"

5176 msgstr ""

5177

4996 -#: builtin/branch.c:675 builtin/for-each-ref.c:38 builtin/tag.c:381

5178 +#: builtin/branch.c:585 builtin/for-each-ref.c:38 builtin/tag.c:426

5179 msgid "key"

5180 msgstr ""

5181

5000 -#: builtin/branch.c:676 builtin/for-each-ref.c:39 builtin/tag.c:382

5182 +#: builtin/branch.c:586 builtin/for-each-ref.c:39 builtin/tag.c:427

5183 msgid "field name to sort on"

5184 msgstr ""

5185

5004 -#: builtin/branch.c:678 builtin/for-each-ref.c:41 builtin/notes.c:404

5186 +#: builtin/branch.c:588 builtin/for-each-ref.c:41 builtin/notes.c:404

5187 #: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570

5006 -#: builtin/tag.c:384

5188 +#: builtin/tag.c:429

5189 msgid "object"

5190 msgstr ""

5191

5010 -#: builtin/branch.c:679

5192 +#: builtin/branch.c:589

5193 msgid "print only branches of the object"

5194 msgstr ""

5195

5014 -#: builtin/branch.c:681 builtin/for-each-ref.c:46 builtin/tag.c:388

5196 +#: builtin/branch.c:591 builtin/for-each-ref.c:47 builtin/tag.c:434

5197 msgid "sorting and filtering are case insensitive"

5198 msgstr ""

5199

5018 -#: builtin/branch.c:698

5200 +#: builtin/branch.c:592 builtin/for-each-ref.c:37 builtin/tag.c:433

5201 +#: builtin/verify-tag.c:38

5202 +msgid "format to use for the output"

5203 +msgstr ""

5204 +

5205 +#: builtin/branch.c:611

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

5207 msgstr ""

5208

5022 -#: builtin/branch.c:702 builtin/clone.c:706

5209 +#: builtin/branch.c:615 builtin/clone.c:724

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

5211 msgstr ""

5212

5026 -#: builtin/branch.c:724

5213 +#: builtin/branch.c:638

5214 msgid "--column and --verbose are incompatible"

5215 msgstr ""

5216

5030 -#: builtin/branch.c:735 builtin/branch.c:787

5217 +#: builtin/branch.c:649 builtin/branch.c:701

5218 msgid "branch name required"

5219 msgstr ""

5220

5034 -#: builtin/branch.c:763

5221 +#: builtin/branch.c:677

5222 msgid "Cannot give description to detached HEAD"

5223 msgstr ""

5224

5038 -#: builtin/branch.c:768

5225 +#: builtin/branch.c:682

5226 msgid "cannot edit description of more than one branch"

5227 msgstr ""

5228

5042 -#: builtin/branch.c:775

5229 +#: builtin/branch.c:689

5230 #, c-format

5231 msgid "No commit on branch '%s' yet."

5232 msgstr ""

5233

5047 -#: builtin/branch.c:778

5234 +#: builtin/branch.c:692

5235 #, c-format

5236 msgid "No branch named '%s'."

5237 msgstr ""

5238

5052 -#: builtin/branch.c:793

5239 +#: builtin/branch.c:707

5240 msgid "too many branches for a rename operation"

5241 msgstr ""

5242

5056 -#: builtin/branch.c:798

5243 +#: builtin/branch.c:712

5244 msgid "too many branches to set new upstream"

5245 msgstr ""

5246

5060 -#: builtin/branch.c:802

5247 +#: builtin/branch.c:716

5248 #, c-format

5249 msgid ""

5250 "could not set upstream of HEAD to %s when it does not point to any branch."

5251 msgstr ""

5252

5066 -#: builtin/branch.c:805 builtin/branch.c:827 builtin/branch.c:848

5253 +#: builtin/branch.c:719 builtin/branch.c:741 builtin/branch.c:762

5254 #, c-format

5255 msgid "no such branch '%s'"

5256 msgstr ""

5257

5071 -#: builtin/branch.c:809

5258 +#: builtin/branch.c:723

5259 #, c-format

5260 msgid "branch '%s' does not exist"

5261 msgstr ""

5262

5076 -#: builtin/branch.c:821

5263 +#: builtin/branch.c:735

5264 msgid "too many branches to unset upstream"

5265 msgstr ""

5266

5080 -#: builtin/branch.c:825

5267 +#: builtin/branch.c:739

5268 msgid "could not unset upstream of HEAD when it does not point to any branch."

5269 msgstr ""

5270

5084 -#: builtin/branch.c:831

5271 +#: builtin/branch.c:745

5272 #, c-format

5273 msgid "Branch '%s' has no upstream information"

5274 msgstr ""

5275

5089 -#: builtin/branch.c:845

5276 +#: builtin/branch.c:759

5277 msgid "it does not make sense to create 'HEAD' manually"

5278 msgstr ""

5279

5093 -#: builtin/branch.c:851

5280 +#: builtin/branch.c:765

5281 msgid "-a and -r options to 'git branch' do not make sense with a branch name"

5282 msgstr ""

5283

5097 -#: builtin/branch.c:854

5284 +#: builtin/branch.c:768

5285 #, c-format

5286 msgid ""

5287 "The --set-upstream flag is deprecated and will be removed. Consider using --"

5288 "track or --set-upstream-to\n"

5289 msgstr ""

5290

5104 -#: builtin/branch.c:871

5291 +#: builtin/branch.c:785

5292 #, c-format

5293 msgid ""

5294 "\n"

@@ -5109,16 +5296,16 @@ msgid ""

5296 "\n"

5297 msgstr ""

5298

5112 -#: builtin/bundle.c:51

5299 +#: builtin/bundle.c:45

5300 #, c-format

5301 msgid "%s is okay\n"

5302 msgstr ""

5303

5117 -#: builtin/bundle.c:64

5304 +#: builtin/bundle.c:58

5305 msgid "Need a repository to create a bundle."

5306 msgstr ""

5307

5121 -#: builtin/bundle.c:68

5308 +#: builtin/bundle.c:62

5309 msgid "Need a repository to unbundle."

5310 msgstr ""

5311

@@ -5162,7 +5349,7 @@ msgstr ""

5349 msgid "for blob objects, run filters on object's content"

5350 msgstr ""

5351

5165 -#: builtin/cat-file.c:561 git-submodule.sh:929

5352 +#: builtin/cat-file.c:561 git-submodule.sh:943

5353 msgid "blob"

5354 msgstr ""

5355

@@ -5218,7 +5405,7 @@ msgstr ""

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

5406 msgstr ""

5407

5221 -#: builtin/check-ignore.c:18 builtin/checkout.c:1140 builtin/gc.c:332

5408 +#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:352

5409 msgid "suppress progress reporting"

5410 msgstr ""

5411

@@ -5308,9 +5495,9 @@ msgid "write the content to temporary files"

5495 msgstr ""

5496

5497 #: builtin/checkout-index.c:174 builtin/column.c:30

5311 -#: builtin/submodule--helper.c:597 builtin/submodule--helper.c:600

5312 -#: builtin/submodule--helper.c:606 builtin/submodule--helper.c:967

5313 -#: builtin/worktree.c:471

5498 +#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638

5499 +#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980

5500 +#: builtin/worktree.c:472

5501 msgid "string"

5502 msgstr ""

5503

@@ -5322,113 +5509,113 @@ msgstr ""

5509 msgid "copy out the files from named stage"

5510 msgstr ""

5511

5325 -#: builtin/checkout.c:25

5512 +#: builtin/checkout.c:27

5513 msgid "git checkout [<options>] <branch>"

5514 msgstr ""

5515

5329 -#: builtin/checkout.c:26

5516 +#: builtin/checkout.c:28

5517 msgid "git checkout [<options>] [<branch>] -- <file>..."

5518 msgstr ""

5519

5333 -#: builtin/checkout.c:134 builtin/checkout.c:167

5520 +#: builtin/checkout.c:153 builtin/checkout.c:186

5521 #, c-format

5522 msgid "path '%s' does not have our version"

5523 msgstr ""

5524

5338 -#: builtin/checkout.c:136 builtin/checkout.c:169

5525 +#: builtin/checkout.c:155 builtin/checkout.c:188

5526 #, c-format

5527 msgid "path '%s' does not have their version"

5528 msgstr ""

5529

5343 -#: builtin/checkout.c:152

5530 +#: builtin/checkout.c:171

5531 #, c-format

5532 msgid "path '%s' does not have all necessary versions"

5533 msgstr ""

5534

5348 -#: builtin/checkout.c:196

5535 +#: builtin/checkout.c:215

5536 #, c-format

5537 msgid "path '%s' does not have necessary versions"

5538 msgstr ""

5539

5353 -#: builtin/checkout.c:213

5540 +#: builtin/checkout.c:232

5541 #, c-format

5542 msgid "path '%s': cannot merge"

5543 msgstr ""

5544

5358 -#: builtin/checkout.c:230

5545 +#: builtin/checkout.c:249

5546 #, c-format

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

5548 msgstr ""

5549

5363 -#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256

5364 -#: builtin/checkout.c:259

5550 +#: builtin/checkout.c:269 builtin/checkout.c:272 builtin/checkout.c:275

5551 +#: builtin/checkout.c:278

5552 #, c-format

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

5554 msgstr ""

5555

5369 -#: builtin/checkout.c:262 builtin/checkout.c:265

5556 +#: builtin/checkout.c:281 builtin/checkout.c:284

5557 #, c-format

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

5559 msgstr ""

5560

5374 -#: builtin/checkout.c:268

5561 +#: builtin/checkout.c:287

5562 #, c-format

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

5564 msgstr ""

5565

5379 -#: builtin/checkout.c:339 builtin/checkout.c:346

5566 +#: builtin/checkout.c:358 builtin/checkout.c:365

5567 #, c-format

5568 msgid "path '%s' is unmerged"

5569 msgstr ""

5570

5384 -#: builtin/checkout.c:494

5571 +#: builtin/checkout.c:513

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

5573 msgstr ""

5574

5388 -#: builtin/checkout.c:625

5575 +#: builtin/checkout.c:644

5576 #, c-format

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

5578 msgstr ""

5579

5393 -#: builtin/checkout.c:666

5580 +#: builtin/checkout.c:685

5581 msgid "HEAD is now at"

5582 msgstr ""

5583

5397 -#: builtin/checkout.c:670 builtin/clone.c:660

5584 +#: builtin/checkout.c:689 builtin/clone.c:678

5585 msgid "unable to update HEAD"

5586 msgstr ""

5587

5401 -#: builtin/checkout.c:674

5588 +#: builtin/checkout.c:693

5589 #, c-format

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

5591 msgstr ""

5592

5406 -#: builtin/checkout.c:677

5593 +#: builtin/checkout.c:696

5594 #, c-format

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

5596 msgstr ""

5597

5411 -#: builtin/checkout.c:681

5598 +#: builtin/checkout.c:700

5599 #, c-format

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

5601 msgstr ""

5602

5416 -#: builtin/checkout.c:683 builtin/checkout.c:1072

5603 +#: builtin/checkout.c:702 builtin/checkout.c:1090

5604 #, c-format

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

5606 msgstr ""

5607

5421 -#: builtin/checkout.c:685

5608 +#: builtin/checkout.c:704

5609 #, c-format

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

5611 msgstr ""

5612

5426 -#: builtin/checkout.c:736

5613 +#: builtin/checkout.c:755

5614 #, c-format

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

5616 msgstr ""

5617

5431 -#: builtin/checkout.c:742

5618 +#: builtin/checkout.c:761

5619 #, c-format

5620 msgid ""

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

@@ -5443,7 +5630,7 @@ msgid_plural ""

5630 msgstr[0] ""

5631 msgstr[1] ""

5632

5446 -#: builtin/checkout.c:761

5633 +#: builtin/checkout.c:780

5634 #, c-format

5635 msgid ""

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

@@ -5460,162 +5647,162 @@ msgid_plural ""

5647 msgstr[0] ""

5648 msgstr[1] ""

5649

5463 -#: builtin/checkout.c:797

5650 +#: builtin/checkout.c:816

5651 msgid "internal error in revision walk"

5652 msgstr ""

5653

5467 -#: builtin/checkout.c:801

5654 +#: builtin/checkout.c:820

5655 msgid "Previous HEAD position was"

5656 msgstr ""

5657

5471 -#: builtin/checkout.c:828 builtin/checkout.c:1067

5658 +#: builtin/checkout.c:847 builtin/checkout.c:1085

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

5660 msgstr ""

5661

5475 -#: builtin/checkout.c:973

5662 +#: builtin/checkout.c:991

5663 #, c-format

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

5665 msgstr ""

5666

5480 -#: builtin/checkout.c:1013 builtin/worktree.c:214

5667 +#: builtin/checkout.c:1031 builtin/worktree.c:214

5668 #, c-format

5669 msgid "invalid reference: %s"

5670 msgstr ""

5671

5485 -#: builtin/checkout.c:1042

5672 +#: builtin/checkout.c:1060

5673 #, c-format

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

5675 msgstr ""

5676

5490 -#: builtin/checkout.c:1081

5677 +#: builtin/checkout.c:1099

5678 msgid "paths cannot be used with switching branches"

5679 msgstr ""

5680

5494 -#: builtin/checkout.c:1084 builtin/checkout.c:1088

5681 +#: builtin/checkout.c:1102 builtin/checkout.c:1106

5682 #, c-format

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

5684 msgstr ""

5685

5499 -#: builtin/checkout.c:1092 builtin/checkout.c:1095 builtin/checkout.c:1100

5500 -#: builtin/checkout.c:1103

5686 +#: builtin/checkout.c:1110 builtin/checkout.c:1113 builtin/checkout.c:1118

5687 +#: builtin/checkout.c:1121

5688 #, c-format

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

5690 msgstr ""

5691

5505 -#: builtin/checkout.c:1108

5692 +#: builtin/checkout.c:1126

5693 #, c-format

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

5695 msgstr ""

5696

5510 -#: builtin/checkout.c:1141 builtin/checkout.c:1143 builtin/clone.c:93

5511 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324

5512 -#: builtin/worktree.c:326

5697 +#: builtin/checkout.c:1159 builtin/checkout.c:1161 builtin/clone.c:111

5698 +#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:325

5699 +#: builtin/worktree.c:327

5700 msgid "branch"

5701 msgstr ""

5702

5516 -#: builtin/checkout.c:1142

5703 +#: builtin/checkout.c:1160

5704 msgid "create and checkout a new branch"

5705 msgstr ""

5706

5520 -#: builtin/checkout.c:1144

5707 +#: builtin/checkout.c:1162

5708 msgid "create/reset and checkout a branch"

5709 msgstr ""

5710

5524 -#: builtin/checkout.c:1145

5711 +#: builtin/checkout.c:1163

5712 msgid "create reflog for new branch"

5713 msgstr ""

5714

5528 -#: builtin/checkout.c:1146 builtin/worktree.c:328

5715 +#: builtin/checkout.c:1164 builtin/worktree.c:329

5716 msgid "detach HEAD at named commit"

5717 msgstr ""

5718

5532 -#: builtin/checkout.c:1147

5719 +#: builtin/checkout.c:1165

5720 msgid "set upstream info for new branch"

5721 msgstr ""

5722

5536 -#: builtin/checkout.c:1149

5723 +#: builtin/checkout.c:1167

5724 msgid "new-branch"

5725 msgstr ""

5726

5540 -#: builtin/checkout.c:1149

5727 +#: builtin/checkout.c:1167

5728 msgid "new unparented branch"

5729 msgstr ""

5730

5544 -#: builtin/checkout.c:1150

5731 +#: builtin/checkout.c:1168

5732 msgid "checkout our version for unmerged files"

5733 msgstr ""

5734

5548 -#: builtin/checkout.c:1152

5735 +#: builtin/checkout.c:1170

5736 msgid "checkout their version for unmerged files"

5737 msgstr ""

5738

5552 -#: builtin/checkout.c:1154

5739 +#: builtin/checkout.c:1172

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

5741 msgstr ""

5742

5556 -#: builtin/checkout.c:1155

5743 +#: builtin/checkout.c:1173

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

5745 msgstr ""

5746

5560 -#: builtin/checkout.c:1156 builtin/merge.c:235

5747 +#: builtin/checkout.c:1174 builtin/merge.c:234

5748 msgid "update ignored files (default)"

5749 msgstr ""

5750

5564 -#: builtin/checkout.c:1157 builtin/log.c:1466 parse-options.h:251

5751 +#: builtin/checkout.c:1175 builtin/log.c:1473 parse-options.h:251

5752 msgid "style"

5753 msgstr ""

5754

5568 -#: builtin/checkout.c:1158

5755 +#: builtin/checkout.c:1176

5756 msgid "conflict style (merge or diff3)"

5757 msgstr ""

5758

5572 -#: builtin/checkout.c:1161

5759 +#: builtin/checkout.c:1179

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

5761 msgstr ""

5762

5576 -#: builtin/checkout.c:1163

5763 +#: builtin/checkout.c:1181

5764 msgid "second guess 'git checkout <no-such-branch>'"

5765 msgstr ""

5766

5580 -#: builtin/checkout.c:1165

5767 +#: builtin/checkout.c:1183

5768 msgid "do not check if another worktree is holding the given ref"

5769 msgstr ""

5770

5584 -#: builtin/checkout.c:1166 builtin/clone.c:63 builtin/fetch.c:119

5585 -#: builtin/merge.c:232 builtin/pull.c:117 builtin/push.c:539

5586 -#: builtin/send-pack.c:168

5771 +#: builtin/checkout.c:1187 builtin/clone.c:78 builtin/fetch.c:119

5772 +#: builtin/merge.c:231 builtin/pull.c:117 builtin/push.c:539

5773 +#: builtin/send-pack.c:172

5774 msgid "force progress reporting"

5775 msgstr ""

5776

5590 -#: builtin/checkout.c:1197

5777 +#: builtin/checkout.c:1224

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

5779 msgstr ""

5780

5594 -#: builtin/checkout.c:1214

5781 +#: builtin/checkout.c:1241

5782 msgid "--track needs a branch name"

5783 msgstr ""

5784

5598 -#: builtin/checkout.c:1219

5785 +#: builtin/checkout.c:1246

5786 msgid "Missing branch name; try -b"

5787 msgstr ""

5788

5602 -#: builtin/checkout.c:1255

5789 +#: builtin/checkout.c:1282

5790 msgid "invalid path specification"

5791 msgstr ""

5792

5606 -#: builtin/checkout.c:1262

5793 +#: builtin/checkout.c:1289

5794 #, c-format

5795 msgid ""

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

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

5798 msgstr ""

5799

5613 -#: builtin/checkout.c:1267

5800 +#: builtin/checkout.c:1294

5801 #, c-format

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

5803 msgstr ""

5804

5618 -#: builtin/checkout.c:1271

5805 +#: builtin/checkout.c:1298

5806 msgid ""

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

5808 "checking out of the index."

@@ -5651,7 +5838,7 @@ msgstr ""

5838 msgid "failed to remove %s"

5839 msgstr ""

5840

5654 -#: builtin/clean.c:291 git-add--interactive.perl:623

5841 +#: builtin/clean.c:297 git-add--interactive.perl:614

5842 #, c-format

5843 msgid ""

5844 "Prompt help:\n"

@@ -5660,7 +5847,7 @@ msgid ""

5847 " - (empty) select nothing\n"

5848 msgstr ""

5849

5663 -#: builtin/clean.c:295 git-add--interactive.perl:632

5850 +#: builtin/clean.c:301 git-add--interactive.perl:623

5851 #, c-format

5852 msgid ""

5853 "Prompt help:\n"

@@ -5673,38 +5860,38 @@ msgid ""

5860 " - (empty) finish selecting\n"

5861 msgstr ""

5862

5676 -#: builtin/clean.c:511 git-add--interactive.perl:598

5677 -#: git-add--interactive.perl:603

5863 +#: builtin/clean.c:517 git-add--interactive.perl:589

5864 +#: git-add--interactive.perl:594

5865 #, c-format, perl-format

5866 msgid "Huh (%s)?\n"

5867 msgstr ""

5868

5682 -#: builtin/clean.c:653

5869 +#: builtin/clean.c:659

5870 #, c-format

5871 msgid "Input ignore patterns>> "

5872 msgstr ""

5873

5687 -#: builtin/clean.c:690

5874 +#: builtin/clean.c:696

5875 #, c-format

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

5877 msgstr ""

5878

5692 -#: builtin/clean.c:711

5879 +#: builtin/clean.c:717

5880 msgid "Select items to delete"

5881 msgstr ""

5882

5883 #. TRANSLATORS: Make sure to keep [y/N] as is

5697 -#: builtin/clean.c:752

5884 +#: builtin/clean.c:758

5885 #, c-format

5886 msgid "Remove %s [y/N]? "

5887 msgstr ""

5888

5702 -#: builtin/clean.c:777 git-add--interactive.perl:1669

5889 +#: builtin/clean.c:783 git-add--interactive.perl:1660

5890 #, c-format

5891 msgid "Bye.\n"

5892 msgstr ""

5893

5707 -#: builtin/clean.c:785

5894 +#: builtin/clean.c:791

5895 msgid ""

5896 "clean - start cleaning\n"

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

@@ -5715,68 +5902,69 @@ msgid ""

5902 "? - help for prompt selection"

5903 msgstr ""

5904

5718 -#: builtin/clean.c:812 git-add--interactive.perl:1745

5905 +#: builtin/clean.c:818 git-add--interactive.perl:1736

5906 msgid "*** Commands ***"

5907 msgstr ""

5908

5722 -#: builtin/clean.c:813 git-add--interactive.perl:1742

5909 +#: builtin/clean.c:819 git-add--interactive.perl:1733

5910 msgid "What now"

5911 msgstr ""

5912

5726 -#: builtin/clean.c:821

5913 +#: builtin/clean.c:827

5914 msgid "Would remove the following item:"

5915 msgid_plural "Would remove the following items:"

5916 msgstr[0] ""

5917 msgstr[1] ""

5918

5732 -#: builtin/clean.c:838

5919 +#: builtin/clean.c:844

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

5921 msgstr ""

5922

5736 -#: builtin/clean.c:869

5923 +#: builtin/clean.c:875

5924 msgid "do not print names of files removed"

5925 msgstr ""

5926

5740 -#: builtin/clean.c:871

5927 +#: builtin/clean.c:877

5928 msgid "force"

5929 msgstr ""

5930

5744 -#: builtin/clean.c:872

5931 +#: builtin/clean.c:878

5932 msgid "interactive cleaning"

5933 msgstr ""

5934

5748 -#: builtin/clean.c:874

5935 +#: builtin/clean.c:880

5936 msgid "remove whole directories"

5937 msgstr ""

5938

5752 -#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:1056

5753 -#: builtin/ls-files.c:538 builtin/name-rev.c:313 builtin/show-ref.c:176

5939 +#: builtin/clean.c:881 builtin/describe.c:449 builtin/describe.c:451

5940 +#: builtin/grep.c:1063 builtin/ls-files.c:539 builtin/name-rev.c:348

5941 +#: builtin/name-rev.c:350 builtin/show-ref.c:176

5942 msgid "pattern"

5943 msgstr ""

5944

5757 -#: builtin/clean.c:876

5945 +#: builtin/clean.c:882

5946 msgid "add <pattern> to ignore rules"

5947 msgstr ""

5948

5761 -#: builtin/clean.c:877

5949 +#: builtin/clean.c:883

5950 msgid "remove ignored files, too"

5951 msgstr ""

5952

5765 -#: builtin/clean.c:879

5953 +#: builtin/clean.c:885

5954 msgid "remove only ignored files"

5955 msgstr ""

5956

5769 -#: builtin/clean.c:897

5957 +#: builtin/clean.c:903

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

5959 msgstr ""

5960

5773 -#: builtin/clean.c:901

5961 +#: builtin/clean.c:907

5962 msgid ""

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

5964 "clean"

5965 msgstr ""

5966

5779 -#: builtin/clean.c:904

5967 +#: builtin/clean.c:910

5968 msgid ""

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

5970 "refusing to clean"

@@ -5786,307 +5974,310 @@ msgstr ""

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

5975 msgstr ""

5976

5789 -#: builtin/clone.c:65

5977 +#: builtin/clone.c:80

5978 msgid "don't create a checkout"

5979 msgstr ""

5980

5793 -#: builtin/clone.c:66 builtin/clone.c:68 builtin/init-db.c:478

5981 +#: builtin/clone.c:81 builtin/clone.c:83 builtin/init-db.c:478

5982 msgid "create a bare repository"

5983 msgstr ""

5984

5797 -#: builtin/clone.c:70

5985 +#: builtin/clone.c:85

5986 msgid "create a mirror repository (implies bare)"

5987 msgstr ""

5988

5801 -#: builtin/clone.c:72

5989 +#: builtin/clone.c:87

5990 msgid "to clone from a local repository"

5991 msgstr ""

5992

5805 -#: builtin/clone.c:74

5993 +#: builtin/clone.c:89

5994 msgid "don't use local hardlinks, always copy"

5995 msgstr ""

5996

5809 -#: builtin/clone.c:76

5997 +#: builtin/clone.c:91

5998 msgid "setup as shared repository"

5999 msgstr ""

6000

5813 -#: builtin/clone.c:78 builtin/clone.c:80

6001 +#: builtin/clone.c:93 builtin/clone.c:97

6002 +msgid "pathspec"

6003 +msgstr ""

6004 +

6005 +#: builtin/clone.c:93 builtin/clone.c:97

6006 msgid "initialize submodules in the clone"

6007 msgstr ""

6008

5817 -#: builtin/clone.c:82

6009 +#: builtin/clone.c:100

6010 msgid "number of submodules cloned in parallel"

6011 msgstr ""

6012

5821 -#: builtin/clone.c:83 builtin/init-db.c:475

6013 +#: builtin/clone.c:101 builtin/init-db.c:475

6014 msgid "template-directory"

6015 msgstr ""

6016

5825 -#: builtin/clone.c:84 builtin/init-db.c:476

6017 +#: builtin/clone.c:102 builtin/init-db.c:476

6018 msgid "directory from which templates will be used"

6019 msgstr ""

6020

5829 -#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:604

5830 -#: builtin/submodule--helper.c:970

6021 +#: builtin/clone.c:104 builtin/clone.c:106 builtin/submodule--helper.c:642

6022 +#: builtin/submodule--helper.c:983

6023 msgid "reference repository"

6024 msgstr ""

6025

5834 -#: builtin/clone.c:90

6026 +#: builtin/clone.c:108

6027 msgid "use --reference only while cloning"

6028 msgstr ""

6029

5838 -#: builtin/clone.c:91 builtin/column.c:26 builtin/merge-file.c:44

6030 +#: builtin/clone.c:109 builtin/column.c:26 builtin/merge-file.c:43

6031 msgid "name"

6032 msgstr ""

6033

5842 -#: builtin/clone.c:92

6034 +#: builtin/clone.c:110

6035 msgid "use <name> instead of 'origin' to track upstream"

6036 msgstr ""

6037

5846 -#: builtin/clone.c:94

6038 +#: builtin/clone.c:112

6039 msgid "checkout <branch> instead of the remote's HEAD"

6040 msgstr ""

6041

5850 -#: builtin/clone.c:96

6042 +#: builtin/clone.c:114

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

6044 msgstr ""

6045

5854 -#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:999

6046 +#: builtin/clone.c:115 builtin/fetch.c:120 builtin/grep.c:1006

6047 #: builtin/pull.c:202

6048 msgid "depth"

6049 msgstr ""

6050

5859 -#: builtin/clone.c:98

6051 +#: builtin/clone.c:116

6052 msgid "create a shallow clone of that depth"

6053 msgstr ""

6054

5863 -#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2836

6055 +#: builtin/clone.c:117 builtin/fetch.c:122 builtin/pack-objects.c:2918

6056 #: parse-options.h:142

6057 msgid "time"

6058 msgstr ""

6059

5868 -#: builtin/clone.c:100

6060 +#: builtin/clone.c:118

6061 msgid "create a shallow clone since a specific time"

6062 msgstr ""

6063

5872 -#: builtin/clone.c:101 builtin/fetch.c:124

6064 +#: builtin/clone.c:119 builtin/fetch.c:124

6065 msgid "revision"

6066 msgstr ""

6067

5876 -#: builtin/clone.c:102 builtin/fetch.c:125

6068 +#: builtin/clone.c:120 builtin/fetch.c:125

6069 msgid "deepen history of shallow clone, excluding rev"

6070 msgstr ""

6071

5880 -#: builtin/clone.c:104

6072 +#: builtin/clone.c:122

6073 msgid "clone only one branch, HEAD or --branch"

6074 msgstr ""

6075

5884 -#: builtin/clone.c:106

6076 +#: builtin/clone.c:124

6077 msgid "any cloned submodules will be shallow"

6078 msgstr ""

6079

5888 -#: builtin/clone.c:107 builtin/init-db.c:484

6080 +#: builtin/clone.c:125 builtin/init-db.c:484

6081 msgid "gitdir"

6082 msgstr ""

6083

5892 -#: builtin/clone.c:108 builtin/init-db.c:485

6084 +#: builtin/clone.c:126 builtin/init-db.c:485

6085 msgid "separate git dir from working tree"

6086 msgstr ""

6087

5896 -#: builtin/clone.c:109

6088 +#: builtin/clone.c:127

6089 msgid "key=value"

6090 msgstr ""

6091

5900 -#: builtin/clone.c:110

6092 +#: builtin/clone.c:128

6093 msgid "set config inside the new repository"

6094 msgstr ""

6095

5904 -#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:550

6096 +#: builtin/clone.c:129 builtin/fetch.c:140 builtin/push.c:550

6097 msgid "use IPv4 addresses only"

6098 msgstr ""

6099

5908 -#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:552

6100 +#: builtin/clone.c:131 builtin/fetch.c:142 builtin/push.c:552

6101 msgid "use IPv6 addresses only"

6102 msgstr ""

6103

5912 -#: builtin/clone.c:250

6104 +#: builtin/clone.c:268

6105 msgid ""

6106 "No directory name could be guessed.\n"

6107 "Please specify a directory on the command line"

6108 msgstr ""

6109

5918 -#: builtin/clone.c:303

6110 +#: builtin/clone.c:321

6111 #, c-format

6112 msgid "info: Could not add alternate for '%s': %s\n"

6113 msgstr ""

6114

5923 -#: builtin/clone.c:375

6115 +#: builtin/clone.c:393

6116 #, c-format

6117 msgid "failed to open '%s'"

6118 msgstr ""

6119

5928 -#: builtin/clone.c:383

6120 +#: builtin/clone.c:401

6121 #, c-format

6122 msgid "%s exists and is not a directory"

6123 msgstr ""

6124

5933 -#: builtin/clone.c:397

6125 +#: builtin/clone.c:415

6126 #, c-format

6127 msgid "failed to stat %s\n"

6128 msgstr ""

6129

5938 -#: builtin/clone.c:419

6130 +#: builtin/clone.c:437

6131 #, c-format

6132 msgid "failed to create link '%s'"

6133 msgstr ""

6134

5943 -#: builtin/clone.c:423

6135 +#: builtin/clone.c:441

6136 #, c-format

6137 msgid "failed to copy file to '%s'"

6138 msgstr ""

6139

5948 -#: builtin/clone.c:448

6140 +#: builtin/clone.c:466

6141 #, c-format

6142 msgid "done.\n"

6143 msgstr ""

6144

5953 -#: builtin/clone.c:460

6145 +#: builtin/clone.c:478

6146 msgid ""

6147 "Clone succeeded, but checkout failed.\n"

6148 "You can inspect what was checked out with 'git status'\n"

6149 "and retry the checkout with 'git checkout -f HEAD'\n"

6150 msgstr ""

6151

5960 -#: builtin/clone.c:537

6152 +#: builtin/clone.c:555

6153 #, c-format

6154 msgid "Could not find remote branch %s to clone."

6155 msgstr ""

6156

5965 -#: builtin/clone.c:632

6157 +#: builtin/clone.c:650

6158 msgid "remote did not send all necessary objects"

6159 msgstr ""

6160

5969 -#: builtin/clone.c:648

6161 +#: builtin/clone.c:666

6162 #, c-format

6163 msgid "unable to update %s"

6164 msgstr ""

6165

5974 -#: builtin/clone.c:697

6166 +#: builtin/clone.c:715

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

6168 msgstr ""

6169

5978 -#: builtin/clone.c:728

6170 +#: builtin/clone.c:746

6171 msgid "unable to checkout working tree"

6172 msgstr ""

6173

5982 -#: builtin/clone.c:768

6174 +#: builtin/clone.c:786

6175 msgid "unable to write parameters to config file"

6176 msgstr ""

6177

5986 -#: builtin/clone.c:831

6178 +#: builtin/clone.c:849

6179 msgid "cannot repack to clean up"

6180 msgstr ""

6181

5990 -#: builtin/clone.c:833

6182 +#: builtin/clone.c:851

6183 msgid "cannot unlink temporary alternates file"

6184 msgstr ""

6185

5994 -#: builtin/clone.c:866 builtin/receive-pack.c:1895

6186 +#: builtin/clone.c:884 builtin/receive-pack.c:1901

6187 msgid "Too many arguments."

6188 msgstr ""

6189

5998 -#: builtin/clone.c:870

6190 +#: builtin/clone.c:888

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

6192 msgstr ""

6193

6002 -#: builtin/clone.c:883

6194 +#: builtin/clone.c:901

6195 #, c-format

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

6197 msgstr ""

6198

6007 -#: builtin/clone.c:886

6199 +#: builtin/clone.c:904

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

6201 msgstr ""

6202

6011 -#: builtin/clone.c:899

6203 +#: builtin/clone.c:917

6204 #, c-format

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

6206 msgstr ""

6207

6016 -#: builtin/clone.c:905 builtin/fetch.c:1335

6208 +#: builtin/clone.c:923 builtin/fetch.c:1337

6209 #, c-format

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

6211 msgstr ""

6212

6021 -#: builtin/clone.c:915

6213 +#: builtin/clone.c:933

6214 #, c-format

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

6216 msgstr ""

6217

6026 -#: builtin/clone.c:925

6218 +#: builtin/clone.c:943

6219 #, c-format

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

6221 msgstr ""

6222

6031 -#: builtin/clone.c:940 builtin/clone.c:951 builtin/difftool.c:252

6032 -#: builtin/submodule--helper.c:659 builtin/worktree.c:222

6033 -#: builtin/worktree.c:249

6223 +#: builtin/clone.c:958 builtin/clone.c:969 builtin/difftool.c:252

6224 +#: builtin/worktree.c:222 builtin/worktree.c:249

6225 #, c-format

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

6227 msgstr ""

6228

6038 -#: builtin/clone.c:943

6229 +#: builtin/clone.c:961

6230 #, c-format

6231 msgid "could not create work tree dir '%s'"

6232 msgstr ""

6233

6043 -#: builtin/clone.c:955

6234 +#: builtin/clone.c:973

6235 #, c-format

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

6237 msgstr ""

6238

6048 -#: builtin/clone.c:957

6239 +#: builtin/clone.c:975

6240 #, c-format

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

6242 msgstr ""

6243

6053 -#: builtin/clone.c:963

6244 +#: builtin/clone.c:999

6245 msgid ""

6246 "clone --recursive is not compatible with both --reference and --reference-if-"

6247 "able"

6248 msgstr ""

6249

6059 -#: builtin/clone.c:1019

6250 +#: builtin/clone.c:1055

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

6252 msgstr ""

6253

6063 -#: builtin/clone.c:1021

6254 +#: builtin/clone.c:1057

6255 msgid "--shallow-since is ignored in local clones; use file:// instead."

6256 msgstr ""

6257

6067 -#: builtin/clone.c:1023

6258 +#: builtin/clone.c:1059

6259 msgid "--shallow-exclude is ignored in local clones; use file:// instead."

6260 msgstr ""

6261

6071 -#: builtin/clone.c:1026

6262 +#: builtin/clone.c:1062

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

6264 msgstr ""

6265

6075 -#: builtin/clone.c:1031

6266 +#: builtin/clone.c:1067

6267 msgid "--local is ignored"

6268 msgstr ""

6269

6079 -#: builtin/clone.c:1035

6270 +#: builtin/clone.c:1071

6271 #, c-format

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

6273 msgstr ""

6274

6084 -#: builtin/clone.c:1090 builtin/clone.c:1098

6275 +#: builtin/clone.c:1126 builtin/clone.c:1134

6276 #, c-format

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

6278 msgstr ""

6279

6089 -#: builtin/clone.c:1101

6280 +#: builtin/clone.c:1137

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

6282 msgstr ""

6283

@@ -6243,11 +6434,6 @@ msgstr ""

6434 msgid "malformed --author parameter"

6435 msgstr ""

6436

6246 -#: builtin/commit.c:611

6247 -#, c-format

6248 -msgid "invalid date format: %s"

6249 -msgstr ""

6250 -

6437 #: builtin/commit.c:655

6438 msgid ""

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

@@ -6259,7 +6445,7 @@ msgstr ""

6445 msgid "could not lookup commit %s"

l10n: git.pot: v2.13.0 round 1 (96 new, 37 removed)