cc76011eff · 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: 2012-09-05 06:20+0800\n"

11 +"POT-Creation-Date: 2012-09-15 10:21+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"

@@ -35,6 +35,91 @@ msgid ""

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

36 msgstr ""

37

38 +#: archive.c:10

39 +msgid "git archive [options] <tree-ish> [<path>...]"

40 +msgstr ""

41 +

42 +#: archive.c:11

43 +msgid "git archive --list"

44 +msgstr ""

45 +

46 +#: archive.c:12

47 +msgid ""

48 +"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]"

49 +msgstr ""

50 +

51 +#: archive.c:13

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

53 +msgstr ""

54 +

55 +#: archive.c:322

56 +msgid "fmt"

57 +msgstr ""

58 +

59 +#: archive.c:322

60 +msgid "archive format"

61 +msgstr ""

62 +

63 +#: archive.c:323 builtin/log.c:1079

64 +msgid "prefix"

65 +msgstr ""

66 +

67 +#: archive.c:324

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

69 +msgstr ""

70 +

71 +#: archive.c:325 builtin/archive.c:91 builtin/blame.c:2332

72 +#: builtin/blame.c:2333 builtin/config.c:56 builtin/fast-export.c:642

73 +#: builtin/fast-export.c:644 builtin/grep.c:800 builtin/hash-object.c:77

74 +#: builtin/ls-files.c:494 builtin/ls-files.c:497 builtin/notes.c:537

75 +#: builtin/notes.c:694 builtin/read-tree.c:107 parse-options.h:149

76 +msgid "file"

77 +msgstr ""

78 +

79 +#: archive.c:326 builtin/archive.c:92

80 +msgid "write the archive to this file"

81 +msgstr ""

82 +

83 +#: archive.c:328

84 +msgid "read .gitattributes in working directory"

85 +msgstr ""

86 +

87 +#: archive.c:329

88 +msgid "report archived files on stderr"

89 +msgstr ""

90 +

91 +#: archive.c:330

92 +msgid "store only"

93 +msgstr ""

94 +

95 +#: archive.c:331

96 +msgid "compress faster"

97 +msgstr ""

98 +

99 +#: archive.c:339

100 +msgid "compress better"

101 +msgstr ""

102 +

103 +#: archive.c:342

104 +msgid "list supported archive formats"

105 +msgstr ""

106 +

107 +#: archive.c:344 builtin/archive.c:93 builtin/clone.c:85

108 +msgid "repo"

109 +msgstr ""

110 +

111 +#: archive.c:345 builtin/archive.c:94

112 +msgid "retrieve the archive from remote repository <repo>"

113 +msgstr ""

114 +

115 +#: archive.c:346 builtin/archive.c:95 builtin/notes.c:616

116 +msgid "command"

117 +msgstr ""

118 +

119 +#: archive.c:347 builtin/archive.c:96

120 +msgid "path to the remote git-upload-archive command"

121 +msgstr ""

122 +

123 #: bundle.c:36

124 #, c-format

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

@@ -45,7 +130,7 @@ msgstr ""

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

131 msgstr ""

132

48 -#: bundle.c:89 builtin/commit.c:699

133 +#: bundle.c:89 builtin/commit.c:714

134 #, c-format

135 msgid "could not open '%s'"

136 msgstr ""

@@ -54,7 +139,7 @@ msgstr ""

139 msgid "Repository lacks these prerequisite commits:"

140 msgstr ""

141

57 -#: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:290

142 +#: bundle.c:164 sequencer.c:557 sequencer.c:989 builtin/log.c:290

143 #: builtin/log.c:727 builtin/log.c:1313 builtin/log.c:1529 builtin/merge.c:347

144 #: builtin/shortlog.c:181

145 msgid "revision walk setup failed"

@@ -391,189 +476,189 @@ msgstr ""

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

477 msgstr ""

478

394 -#: merge-recursive.c:921

479 +#: merge-recursive.c:922

480 msgid "Failed to execute internal merge"

481 msgstr ""

482

398 -#: merge-recursive.c:925

483 +#: merge-recursive.c:926

484 #, c-format

485 msgid "Unable to add %s to database"

486 msgstr ""

487

403 -#: merge-recursive.c:941

488 +#: merge-recursive.c:942

489 msgid "unsupported object type in the tree"

490 msgstr ""

491

407 -#: merge-recursive.c:1020 merge-recursive.c:1034

492 +#: merge-recursive.c:1021 merge-recursive.c:1035

493 #, c-format

494 msgid ""

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

496 "in tree."

497 msgstr ""

498

414 -#: merge-recursive.c:1026 merge-recursive.c:1039

499 +#: merge-recursive.c:1027 merge-recursive.c:1040

500 #, c-format

501 msgid ""

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

503 "in tree at %s."

504 msgstr ""

505

421 -#: merge-recursive.c:1080

506 +#: merge-recursive.c:1081

507 msgid "rename"

508 msgstr ""

509

425 -#: merge-recursive.c:1080

510 +#: merge-recursive.c:1081

511 msgid "renamed"

512 msgstr ""

513

429 -#: merge-recursive.c:1136

514 +#: merge-recursive.c:1137

515 #, c-format

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

517 msgstr ""

518

434 -#: merge-recursive.c:1158

519 +#: merge-recursive.c:1159

520 #, c-format

521 msgid ""

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

523 "\"->\"%s\" in \"%s\"%s"

524 msgstr ""

525

441 -#: merge-recursive.c:1163

526 +#: merge-recursive.c:1164

527 msgid " (left unresolved)"

528 msgstr ""

529

445 -#: merge-recursive.c:1217

530 +#: merge-recursive.c:1218

531 #, c-format

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

533 msgstr ""

534

450 -#: merge-recursive.c:1247

535 +#: merge-recursive.c:1248

536 #, c-format

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

538 msgstr ""

539

455 -#: merge-recursive.c:1446

540 +#: merge-recursive.c:1447

541 #, c-format

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

543 msgstr ""

544

460 -#: merge-recursive.c:1456

545 +#: merge-recursive.c:1457

546 #, c-format

547 msgid "Adding merged %s"

548 msgstr ""

549

465 -#: merge-recursive.c:1461 merge-recursive.c:1659

550 +#: merge-recursive.c:1462 merge-recursive.c:1660

551 #, c-format

552 msgid "Adding as %s instead"

553 msgstr ""

554

470 -#: merge-recursive.c:1512

555 +#: merge-recursive.c:1513

556 #, c-format

557 msgid "cannot read object %s"

558 msgstr ""

559

475 -#: merge-recursive.c:1515

560 +#: merge-recursive.c:1516

561 #, c-format

562 msgid "object %s is not a blob"

563 msgstr ""

564

480 -#: merge-recursive.c:1563

565 +#: merge-recursive.c:1564

566 msgid "modify"

567 msgstr ""

568

484 -#: merge-recursive.c:1563

569 +#: merge-recursive.c:1564

570 msgid "modified"

571 msgstr ""

572

488 -#: merge-recursive.c:1573

573 +#: merge-recursive.c:1574

574 msgid "content"

575 msgstr ""

576

492 -#: merge-recursive.c:1580

577 +#: merge-recursive.c:1581

578 msgid "add/add"

579 msgstr ""

580

496 -#: merge-recursive.c:1614

581 +#: merge-recursive.c:1615

582 #, c-format

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

584 msgstr ""

585

501 -#: merge-recursive.c:1628

586 +#: merge-recursive.c:1629

587 #, c-format

588 msgid "Auto-merging %s"

589 msgstr ""

590

506 -#: merge-recursive.c:1632 git-submodule.sh:869

591 +#: merge-recursive.c:1633 git-submodule.sh:869

592 msgid "submodule"

593 msgstr ""

594

510 -#: merge-recursive.c:1633

595 +#: merge-recursive.c:1634

596 #, c-format

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

598 msgstr ""

599

515 -#: merge-recursive.c:1723

600 +#: merge-recursive.c:1724

601 #, c-format

602 msgid "Removing %s"

603 msgstr ""

604

520 -#: merge-recursive.c:1748

605 +#: merge-recursive.c:1749

606 msgid "file/directory"

607 msgstr ""

608

524 -#: merge-recursive.c:1754

609 +#: merge-recursive.c:1755

610 msgid "directory/file"

611 msgstr ""

612

528 -#: merge-recursive.c:1759

613 +#: merge-recursive.c:1760

614 #, c-format

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

616 msgstr ""

617

533 -#: merge-recursive.c:1769

618 +#: merge-recursive.c:1770

619 #, c-format

620 msgid "Adding %s"

621 msgstr ""

622

538 -#: merge-recursive.c:1786

623 +#: merge-recursive.c:1787

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

625 msgstr ""

626

542 -#: merge-recursive.c:1805

627 +#: merge-recursive.c:1806

628 msgid "Already up-to-date!"

629 msgstr ""

630

546 -#: merge-recursive.c:1814

631 +#: merge-recursive.c:1815

632 #, c-format

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

634 msgstr ""

635

551 -#: merge-recursive.c:1844

636 +#: merge-recursive.c:1845

637 #, c-format

638 msgid "Unprocessed path??? %s"

639 msgstr ""

640

556 -#: merge-recursive.c:1889

641 +#: merge-recursive.c:1890

642 msgid "Merging:"

643 msgstr ""

644

560 -#: merge-recursive.c:1902

645 +#: merge-recursive.c:1903

646 #, c-format

647 msgid "found %u common ancestor:"

648 msgid_plural "found %u common ancestors:"

649 msgstr[0] ""

650 msgstr[1] ""

651

567 -#: merge-recursive.c:1939

652 +#: merge-recursive.c:1940

653 msgid "merge returned no commit"

654 msgstr ""

655

571 -#: merge-recursive.c:1996

656 +#: merge-recursive.c:1997

657 #, c-format

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

659 msgstr ""

660

576 -#: merge-recursive.c:2008 builtin/merge.c:696

661 +#: merge-recursive.c:2009 builtin/merge.c:696

662 msgid "Unable to write index."

663 msgstr ""

664

@@ -649,7 +734,7 @@ msgid ""

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

735 msgstr ""

736

652 -#: sequencer.c:160 sequencer.c:758 sequencer.c:841

737 +#: sequencer.c:160 sequencer.c:765 sequencer.c:848

738 #, c-format

739 msgid "Could not write to %s"

740 msgstr ""

@@ -685,178 +770,178 @@ msgstr ""

770 msgid "Unable to update cache tree\n"

771 msgstr ""

772

688 -#: sequencer.c:324

773 +#: sequencer.c:327

774 #, c-format

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

776 msgstr ""

777

693 -#: sequencer.c:329

778 +#: sequencer.c:332

779 #, c-format

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

781 msgstr ""

782

698 -#: sequencer.c:395

783 +#: sequencer.c:398

784 msgid "Your index file is unmerged."

785 msgstr ""

786

702 -#: sequencer.c:398

787 +#: sequencer.c:401

788 msgid "You do not have a valid HEAD"

789 msgstr ""

790

706 -#: sequencer.c:413

791 +#: sequencer.c:416

792 #, c-format

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

794 msgstr ""

795

711 -#: sequencer.c:421

796 +#: sequencer.c:424

797 #, c-format

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

799 msgstr ""

800

716 -#: sequencer.c:425

801 +#: sequencer.c:428

802 #, c-format

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

804 msgstr ""

805

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

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

723 -#: sequencer.c:436

808 +#: sequencer.c:439

809 #, c-format

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

811 msgstr ""

812

728 -#: sequencer.c:440

813 +#: sequencer.c:443

814 #, c-format

815 msgid "Cannot get commit message for %s"

816 msgstr ""

817

733 -#: sequencer.c:524

818 +#: sequencer.c:527

819 #, c-format

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

821 msgstr ""

822

738 -#: sequencer.c:525

823 +#: sequencer.c:528

824 #, c-format

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

826 msgstr ""

827

743 -#: sequencer.c:553

828 +#: sequencer.c:560

829 msgid "empty commit set passed"

830 msgstr ""

831

747 -#: sequencer.c:561

832 +#: sequencer.c:568

833 #, c-format

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

835 msgstr ""

836

752 -#: sequencer.c:566

837 +#: sequencer.c:573

838 #, c-format

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

840 msgstr ""

841

757 -#: sequencer.c:624

842 +#: sequencer.c:631

843 #, c-format

844 msgid "Cannot %s during a %s"

845 msgstr ""

846

762 -#: sequencer.c:646

847 +#: sequencer.c:653

848 #, c-format

849 msgid "Could not parse line %d."

850 msgstr ""

851

767 -#: sequencer.c:651

852 +#: sequencer.c:658

853 msgid "No commits parsed."

854 msgstr ""

855

771 -#: sequencer.c:664

856 +#: sequencer.c:671

857 #, c-format

858 msgid "Could not open %s"

859 msgstr ""

860

776 -#: sequencer.c:668

861 +#: sequencer.c:675

862 #, c-format

863 msgid "Could not read %s."

864 msgstr ""

865

781 -#: sequencer.c:675

866 +#: sequencer.c:682

867 #, c-format

868 msgid "Unusable instruction sheet: %s"

869 msgstr ""

870

786 -#: sequencer.c:703

871 +#: sequencer.c:710

872 #, c-format

873 msgid "Invalid key: %s"

874 msgstr ""

875

791 -#: sequencer.c:706

876 +#: sequencer.c:713

877 #, c-format

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

879 msgstr ""

880

796 -#: sequencer.c:718

881 +#: sequencer.c:725

882 #, c-format

883 msgid "Malformed options sheet: %s"

884 msgstr ""

885

801 -#: sequencer.c:739

886 +#: sequencer.c:746

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

888 msgstr ""

889

805 -#: sequencer.c:740

890 +#: sequencer.c:747

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

892 msgstr ""

893

809 -#: sequencer.c:744

894 +#: sequencer.c:751

895 #, c-format

896 msgid "Could not create sequencer directory %s"

897 msgstr ""

898

814 -#: sequencer.c:760 sequencer.c:845

899 +#: sequencer.c:767 sequencer.c:852

900 #, c-format

901 msgid "Error wrapping up %s."

902 msgstr ""

903

819 -#: sequencer.c:779 sequencer.c:913

904 +#: sequencer.c:786 sequencer.c:920

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

906 msgstr ""

907

823 -#: sequencer.c:781

908 +#: sequencer.c:788

909 msgid "cannot resolve HEAD"

910 msgstr ""

911

827 -#: sequencer.c:783

912 +#: sequencer.c:790

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

914 msgstr ""

915

831 -#: sequencer.c:805 builtin/apply.c:3987

916 +#: sequencer.c:812 builtin/apply.c:4005

917 #, c-format

918 msgid "cannot open %s: %s"

919 msgstr ""

920

836 -#: sequencer.c:808

921 +#: sequencer.c:815

922 #, c-format

923 msgid "cannot read %s: %s"

924 msgstr ""

925

841 -#: sequencer.c:809

926 +#: sequencer.c:816

927 msgid "unexpected end of file"

928 msgstr ""

929

845 -#: sequencer.c:815

930 +#: sequencer.c:822

931 #, c-format

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

933 msgstr ""

934

850 -#: sequencer.c:838

935 +#: sequencer.c:845

936 #, c-format

937 msgid "Could not format %s."

938 msgstr ""

939

855 -#: sequencer.c:1000

940 +#: sequencer.c:1007

941 msgid "Can't revert as initial commit"

942 msgstr ""

943

859 -#: sequencer.c:1001

944 +#: sequencer.c:1008

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

946 msgstr ""

947

@@ -879,12 +964,17 @@ msgstr ""

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

965 msgstr ""

966

882 -#: wrapper.c:413

967 +#: wrapper.c:408

968 +#, c-format

969 +msgid "unable to access '%s': %s"

970 +msgstr ""

971 +

972 +#: wrapper.c:426

973 #, c-format

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

975 msgstr ""

976

887 -#: wrapper.c:414

977 +#: wrapper.c:427

978 msgid "no such user"

979 msgstr ""

980

@@ -938,11 +1028,6 @@ msgstr ""

1028 msgid " (commit or discard the untracked or modified content in submodules)"

1029 msgstr ""

1030

941 -#: wt-status.c:224

942 -#, c-format

943 -msgid "%s files:"

944 -msgstr ""

945 -

1031 #: wt-status.c:227

1032 #, c-format

1033 msgid " (use \"git %s <file>...\" to include in what will be committed)"

@@ -1143,11 +1228,11 @@ msgid "Initial commit"

1228 msgstr ""

1229

1230 #: wt-status.c:1011

1146 -msgid "Untracked"

1231 +msgid "Untracked files"

1232 msgstr ""

1233

1234 #: wt-status.c:1013

1150 -msgid "Ignored"

1235 +msgid "Ignored files"

1236 msgstr ""

1237

1238 #: wt-status.c:1015

@@ -1163,58 +1248,65 @@ msgstr ""

1248 msgid "No changes"

1249 msgstr ""

1250

1166 -#: wt-status.c:1027

1251 +#: wt-status.c:1028

1252 #, c-format

1168 -msgid "no changes added to commit%s\n"

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

1254 msgstr ""

1255

1171 -#: wt-status.c:1029

1172 -msgid " (use \"git add\" and/or \"git commit -a\")"

1256 +#: wt-status.c:1031

1257 +#, c-format

1258 +msgid "no changes added to commit\n"

1259 msgstr ""

1260

1175 -#: wt-status.c:1031

1261 +#: wt-status.c:1034

1262 #, c-format

1177 -msgid "nothing added to commit but untracked files present%s\n"

1263 +msgid ""

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

1265 +"track)\n"

1266 msgstr ""

1267

1180 -#: wt-status.c:1033

1181 -msgid " (use \"git add\" to track)"

1268 +#: wt-status.c:1037

1269 +#, c-format

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

1271 msgstr ""

1272

1184 -#: wt-status.c:1035 wt-status.c:1038 wt-status.c:1041

1273 +#: wt-status.c:1040

1274 #, c-format

1186 -msgid "nothing to commit%s\n"

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

1276 msgstr ""

1277

1189 -#: wt-status.c:1036

1190 -msgid " (create/copy files and use \"git add\" to track)"

1278 +#: wt-status.c:1043 wt-status.c:1048

1279 +#, c-format

1280 +msgid "nothing to commit\n"

1281 msgstr ""

1282

1193 -#: wt-status.c:1039

1194 -msgid " (use -u to show untracked files)"

1283 +#: wt-status.c:1046

1284 +#, c-format

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

1286 msgstr ""

1287

1197 -#: wt-status.c:1042

1198 -msgid " (working directory clean)"

1288 +#: wt-status.c:1050

1289 +#, c-format

1290 +msgid "nothing to commit, working directory clean\n"

1291 msgstr ""

1292

1201 -#: wt-status.c:1150

1293 +#: wt-status.c:1158

1294 msgid "HEAD (no branch)"

1295 msgstr ""

1296

1205 -#: wt-status.c:1156

1297 +#: wt-status.c:1164

1298 msgid "Initial commit on "

1299 msgstr ""

1300

1209 -#: wt-status.c:1171

1301 +#: wt-status.c:1179

1302 msgid "behind "

1303 msgstr ""

1304

1213 -#: wt-status.c:1174 wt-status.c:1177

1305 +#: wt-status.c:1182 wt-status.c:1185

1306 msgid "ahead "

1307 msgstr ""

1308

1217 -#: wt-status.c:1179

1309 +#: wt-status.c:1187

1310 msgid ", behind "

1311 msgstr ""

1312

@@ -1223,6 +1315,10 @@ msgstr ""

1315 msgid "failed to unlink '%s'"

1316 msgstr ""

1317

1318 +#: builtin/add.c:19

1319 +msgid "git add [options] [--] <filepattern>..."

1320 +msgstr ""

1321 +

1322 #: builtin/add.c:62

1323 #, c-format

1324 msgid "unexpected diff status %c"

@@ -1246,7 +1342,7 @@ msgstr ""

1342 msgid "Unstaged changes after refreshing the index:"

1343 msgstr ""

1344

1249 -#: builtin/add.c:195 builtin/add.c:459 builtin/rm.c:186

1345 +#: builtin/add.c:195 builtin/add.c:460 builtin/rm.c:186

1346 #, c-format

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

1348 msgstr ""

@@ -1283,47 +1379,99 @@ msgstr ""

1379 msgid "Could not apply '%s'"

1380 msgstr ""

1381

1286 -#: builtin/add.c:312

1382 +#: builtin/add.c:313

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

1384 msgstr ""

1385

1290 -#: builtin/add.c:352

1386 +#: builtin/add.c:319 builtin/clean.c:52 builtin/fetch.c:78 builtin/mv.c:63

1387 +#: builtin/prune-packed.c:76 builtin/push.c:388 builtin/remote.c:1253

1388 +#: builtin/rm.c:133

1389 +msgid "dry run"

1390 +msgstr ""

1391 +

1392 +#: builtin/add.c:320 builtin/apply.c:4354 builtin/commit.c:1187

1393 +#: builtin/count-objects.c:82 builtin/fsck.c:613 builtin/log.c:1477

1394 +#: builtin/mv.c:62 builtin/read-tree.c:112

1395 +msgid "be verbose"

1396 +msgstr ""

1397 +

1398 +#: builtin/add.c:322

1399 +msgid "interactive picking"

1400 +msgstr ""

1401 +

1402 +#: builtin/add.c:323 builtin/checkout.c:1028 builtin/reset.c:248

1403 +msgid "select hunks interactively"

1404 +msgstr ""

1405 +

1406 +#: builtin/add.c:324

1407 +msgid "edit current diff and apply"

1408 +msgstr ""

1409 +

1410 +#: builtin/add.c:325

1411 +msgid "allow adding otherwise ignored files"

1412 +msgstr ""

1413 +

1414 +#: builtin/add.c:326

1415 +msgid "update tracked files"

1416 +msgstr ""

1417 +

1418 +#: builtin/add.c:327

1419 +msgid "record only the fact that the path will be added later"

1420 +msgstr ""

1421 +

1422 +#: builtin/add.c:328

1423 +msgid "add changes from all tracked and untracked files"

1424 +msgstr ""

1425 +

1426 +#: builtin/add.c:329

1427 +msgid "don't add, only refresh the index"

1428 +msgstr ""

1429 +

1430 +#: builtin/add.c:330

1431 +msgid "just skip files which cannot be added because of errors"

1432 +msgstr ""

1433 +

1434 +#: builtin/add.c:331

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

1436 +msgstr ""

1437 +

1438 +#: builtin/add.c:353

1439 #, c-format

1440 msgid "Use -f if you really want to add them.\n"

1441 msgstr ""

1442

1295 -#: builtin/add.c:353

1443 +#: builtin/add.c:354

1444 msgid "no files added"

1445 msgstr ""

1446

1299 -#: builtin/add.c:359

1447 +#: builtin/add.c:360

1448 msgid "adding files failed"

1449 msgstr ""

1450

1303 -#: builtin/add.c:391

1451 +#: builtin/add.c:392

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

1453 msgstr ""

1454

1307 -#: builtin/add.c:393

1455 +#: builtin/add.c:394

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

1457 msgstr ""

1458

1311 -#: builtin/add.c:413

1459 +#: builtin/add.c:414

1460 #, c-format

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

1462 msgstr ""

1463

1316 -#: builtin/add.c:414

1464 +#: builtin/add.c:415

1465 #, c-format

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

1467 msgstr ""

1468

1321 -#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:289 builtin/mv.c:82

1469 +#: builtin/add.c:421 builtin/clean.c:95 builtin/commit.c:289 builtin/mv.c:82

1470 #: builtin/rm.c:162

1471 msgid "index file corrupt"

1472 msgstr ""

1473

1326 -#: builtin/add.c:480 builtin/apply.c:4432 builtin/mv.c:229 builtin/rm.c:260

1474 +#: builtin/add.c:481 builtin/apply.c:4450 builtin/mv.c:229 builtin/rm.c:260

1475 msgid "Unable to write new index file"

1476 msgstr ""

1477

@@ -1376,17 +1524,17 @@ msgstr ""

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

1525 msgstr ""

1526

1379 -#: builtin/apply.c:1402

1527 +#: builtin/apply.c:1420

1528 #, c-format

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

1530 msgstr ""

1531

1384 -#: builtin/apply.c:1459

1532 +#: builtin/apply.c:1477

1533 #, c-format

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

1535 msgstr ""

1536

1389 -#: builtin/apply.c:1476

1537 +#: builtin/apply.c:1494

1538 #, c-format

1539 msgid ""

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

@@ -1397,403 +1545,400 @@ msgid_plural ""

1545 msgstr[0] ""

1546 msgstr[1] ""

1547

1400 -#: builtin/apply.c:1636

1548 +#: builtin/apply.c:1654

1549 msgid "new file depends on old contents"

1550 msgstr ""

1551

1404 -#: builtin/apply.c:1638

1552 +#: builtin/apply.c:1656

1553 msgid "deleted file still has contents"

1554 msgstr ""

1555

1408 -#: builtin/apply.c:1664

1556 +#: builtin/apply.c:1682

1557 #, c-format

1558 msgid "corrupt patch at line %d"

1559 msgstr ""

1560

1413 -#: builtin/apply.c:1700

1561 +#: builtin/apply.c:1718

1562 #, c-format

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

1564 msgstr ""

1565

1418 -#: builtin/apply.c:1702

1566 +#: builtin/apply.c:1720

1567 #, c-format

1568 msgid "deleted file %s still has contents"

1569 msgstr ""

1570

1423 -#: builtin/apply.c:1705

1571 +#: builtin/apply.c:1723

1572 #, c-format

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

1574 msgstr ""

1575

1428 -#: builtin/apply.c:1851

1576 +#: builtin/apply.c:1869

1577 #, c-format

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

1579 msgstr ""

1580

1581 #. there has to be one hunk (forward hunk)

1434 -#: builtin/apply.c:1880

1582 +#: builtin/apply.c:1898

1583 #, c-format

1584 msgid "unrecognized binary patch at line %d"

1585 msgstr ""

1586

1439 -#: builtin/apply.c:1966

1587 +#: builtin/apply.c:1984

1588 #, c-format

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

1590 msgstr ""

1591

1444 -#: builtin/apply.c:2056

1592 +#: builtin/apply.c:2074

1593 #, c-format

1594 msgid "unable to read symlink %s"

1595 msgstr ""

1596

1449 -#: builtin/apply.c:2060

1597 +#: builtin/apply.c:2078

1598 #, c-format

1599 msgid "unable to open or read %s"

1600 msgstr ""

1601

1454 -#: builtin/apply.c:2131

1602 +#: builtin/apply.c:2149

1603 msgid "oops"

1604 msgstr ""

1605

1458 -#: builtin/apply.c:2653

1606 +#: builtin/apply.c:2671

1607 #, c-format

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

1609 msgstr ""

1610

1463 -#: builtin/apply.c:2771

1611 +#: builtin/apply.c:2789

1612 #, c-format

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

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

1615 msgstr[0] ""

1616 msgstr[1] ""

1617

1470 -#: builtin/apply.c:2783

1618 +#: builtin/apply.c:2801

1619 #, c-format

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

1621 msgstr ""

1622

1475 -#: builtin/apply.c:2789

1623 +#: builtin/apply.c:2807

1624 #, c-format

1625 msgid ""

1626 "while searching for:\n"

1627 "%.*s"

1628 msgstr ""

1629

1482 -#: builtin/apply.c:2808

1630 +#: builtin/apply.c:2826

1631 #, c-format

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

1633 msgstr ""

1634

1487 -#: builtin/apply.c:2911

1635 +#: builtin/apply.c:2929

1636 #, c-format

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

1638 msgstr ""

1639

1492 -#: builtin/apply.c:2917

1640 +#: builtin/apply.c:2935

1641 #, c-format

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

1643 msgstr ""

1644

1497 -#: builtin/apply.c:2938

1645 +#: builtin/apply.c:2956

1646 #, c-format

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

1648 msgstr ""

1649

1502 -#: builtin/apply.c:3060

1650 +#: builtin/apply.c:3078

1651 #, c-format

1652 msgid "cannot checkout %s"

1653 msgstr ""

1654

1507 -#: builtin/apply.c:3105 builtin/apply.c:3114 builtin/apply.c:3158

1655 +#: builtin/apply.c:3123 builtin/apply.c:3132 builtin/apply.c:3176

1656 #, c-format

1657 msgid "read of %s failed"

1658 msgstr ""

1659

1512 -#: builtin/apply.c:3138 builtin/apply.c:3360

1660 +#: builtin/apply.c:3156 builtin/apply.c:3378

1661 #, c-format

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

1663 msgstr ""

1664

1517 -#: builtin/apply.c:3219 builtin/apply.c:3374

1665 +#: builtin/apply.c:3237 builtin/apply.c:3392

1666 #, c-format

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

1668 msgstr ""

1669

1522 -#: builtin/apply.c:3223 builtin/apply.c:3366 builtin/apply.c:3388

1670 +#: builtin/apply.c:3241 builtin/apply.c:3384 builtin/apply.c:3406

1671 #, c-format

1672 msgid "%s: %s"

1673 msgstr ""

1674

1527 -#: builtin/apply.c:3228 builtin/apply.c:3382

1675 +#: builtin/apply.c:3246 builtin/apply.c:3400

1676 #, c-format

1677 msgid "%s: does not match index"

1678 msgstr ""

1679

1532 -#: builtin/apply.c:3330

1680 +#: builtin/apply.c:3348

1681 msgid "removal patch leaves file contents"

1682 msgstr ""

1683

1536 -#: builtin/apply.c:3399

1684 +#: builtin/apply.c:3417

1685 #, c-format

1686 msgid "%s: wrong type"

1687 msgstr ""

1688

1541 -#: builtin/apply.c:3401

1689 +#: builtin/apply.c:3419

1690 #, c-format

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

1692 msgstr ""

1693

1546 -#: builtin/apply.c:3502

1694 +#: builtin/apply.c:3520

1695 #, c-format

1696 msgid "%s: already exists in index"

1697 msgstr ""

1698

1551 -#: builtin/apply.c:3505

1699 +#: builtin/apply.c:3523

1700 #, c-format

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

1702 msgstr ""

1703

1556 -#: builtin/apply.c:3525

1704 +#: builtin/apply.c:3543

1705 #, c-format

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

1707 msgstr ""

1708

1561 -#: builtin/apply.c:3530

1709 +#: builtin/apply.c:3548

1710 #, c-format

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

1712 msgstr ""

1713

1566 -#: builtin/apply.c:3538

1714 +#: builtin/apply.c:3556

1715 #, c-format

1716 msgid "%s: patch does not apply"

1717 msgstr ""

1718

1571 -#: builtin/apply.c:3551

1719 +#: builtin/apply.c:3569

1720 #, c-format

1721 msgid "Checking patch %s..."

1722 msgstr ""

1723

1576 -#: builtin/apply.c:3606 builtin/checkout.c:213 builtin/reset.c:158

1724 +#: builtin/apply.c:3624 builtin/checkout.c:215 builtin/reset.c:158

1725 #, c-format

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

1727 msgstr ""

1728

1581 -#: builtin/apply.c:3749

1729 +#: builtin/apply.c:3767

1730 #, c-format

1731 msgid "unable to remove %s from index"

1732 msgstr ""

1733

1586 -#: builtin/apply.c:3777

1734 +#: builtin/apply.c:3795

1735 #, c-format

1736 msgid "corrupt patch for subproject %s"

1737 msgstr ""

1738

1591 -#: builtin/apply.c:3781

1739 +#: builtin/apply.c:3799

1740 #, c-format

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

1742 msgstr ""

1743

1596 -#: builtin/apply.c:3786

1744 +#: builtin/apply.c:3804

1745 #, c-format

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

1747 msgstr ""

1748

1601 -#: builtin/apply.c:3789 builtin/apply.c:3897

1749 +#: builtin/apply.c:3807 builtin/apply.c:3915

1750 #, c-format

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

1752 msgstr ""

1753

1606 -#: builtin/apply.c:3822

1754 +#: builtin/apply.c:3840

1755 #, c-format

1756 msgid "closing file '%s'"

1757 msgstr ""

1758

1611 -#: builtin/apply.c:3871

1759 +#: builtin/apply.c:3889

1760 #, c-format

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

1762 msgstr ""

1763

1616 -#: builtin/apply.c:3958

1764 +#: builtin/apply.c:3976

1765 #, c-format

1766 msgid "Applied patch %s cleanly."

1767 msgstr ""

1768

1621 -#: builtin/apply.c:3966

1769 +#: builtin/apply.c:3984

1770 msgid "internal error"

1771 msgstr ""

1772

1773 #. Say this even without --verbose

1626 -#: builtin/apply.c:3969

1774 +#: builtin/apply.c:3987

1775 #, c-format

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

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

1778 msgstr[0] ""

1779 msgstr[1] ""

1780

1633 -#: builtin/apply.c:3979

1781 +#: builtin/apply.c:3997

1782 #, c-format

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

1784 msgstr ""

1785

1638 -#: builtin/apply.c:4000

1786 +#: builtin/apply.c:4018

1787 #, c-format

1788 msgid "Hunk #%d applied cleanly."

1789 msgstr ""

1790

1643 -#: builtin/apply.c:4003

1791 +#: builtin/apply.c:4021

1792 #, c-format

1793 msgid "Rejected hunk #%d."

1794 msgstr ""

1795

1648 -#: builtin/apply.c:4153

1796 +#: builtin/apply.c:4171

1797 msgid "unrecognized input"

1798 msgstr ""

1799

1652 -#: builtin/apply.c:4164

1800 +#: builtin/apply.c:4182

1801 msgid "unable to read index file"

1802 msgstr ""

1803

1656 -#: builtin/apply.c:4283 builtin/apply.c:4286

1804 +#: builtin/apply.c:4301 builtin/apply.c:4304 builtin/clone.c:91

1805 +#: builtin/fetch.c:63

1806 msgid "path"

1807 msgstr ""

1808

1660 -#: builtin/apply.c:4284

1809 +#: builtin/apply.c:4302

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

1811 msgstr ""

1812

1664 -#: builtin/apply.c:4287

1813 +#: builtin/apply.c:4305

1814 msgid "apply changes matching the given path"

1815 msgstr ""

1816

1668 -#: builtin/apply.c:4289

1817 +#: builtin/apply.c:4307

1818 msgid "num"

1819 msgstr ""

1820

1672 -#: builtin/apply.c:4290

1821 +#: builtin/apply.c:4308

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

1823 msgstr ""

1824

1676 -#: builtin/apply.c:4293

1825 +#: builtin/apply.c:4311

1826 msgid "ignore additions made by the patch"

1827 msgstr ""

1828

1680 -#: builtin/apply.c:4295

1829 +#: builtin/apply.c:4313

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

1831 msgstr ""

1832

1684 -#: builtin/apply.c:4299

1685 -msgid "shows number of added and deleted lines in decimal notation"

1833 +#: builtin/apply.c:4317

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

1835 msgstr ""

1836

1688 -#: builtin/apply.c:4301

1837 +#: builtin/apply.c:4319

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

1839 msgstr ""

1840

1692 -#: builtin/apply.c:4303

1841 +#: builtin/apply.c:4321

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

1843 msgstr ""

1844

1696 -#: builtin/apply.c:4305

1845 +#: builtin/apply.c:4323

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

1847 msgstr ""

1848

1700 -#: builtin/apply.c:4307

1849 +#: builtin/apply.c:4325

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

1851 msgstr ""

1852

1704 -#: builtin/apply.c:4309

1853 +#: builtin/apply.c:4327

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

1855 msgstr ""

1856

1708 -#: builtin/apply.c:4311

1857 +#: builtin/apply.c:4329

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

1859 msgstr ""

1860

1712 -#: builtin/apply.c:4313

1861 +#: builtin/apply.c:4331

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

1863 msgstr ""

1864

1716 -#: builtin/apply.c:4315

1865 +#: builtin/apply.c:4333 builtin/checkout-index.c:197 builtin/ls-files.c:460

1866 msgid "paths are separated with NUL character"

1867 msgstr ""

1868

1720 -#: builtin/apply.c:4318

1869 +#: builtin/apply.c:4336

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

1871 msgstr ""

1872

1724 -#: builtin/apply.c:4319

1873 +#: builtin/apply.c:4337

1874 msgid "action"

1875 msgstr ""

1876

1728 -#: builtin/apply.c:4320

1877 +#: builtin/apply.c:4338

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

1879 msgstr ""

1880

1732 -#: builtin/apply.c:4323 builtin/apply.c:4326

1881 +#: builtin/apply.c:4341 builtin/apply.c:4344

1882 msgid "ignore changes in whitespace when finding context"

1883 msgstr ""

1884

1736 -#: builtin/apply.c:4329

1885 +#: builtin/apply.c:4347

1886 msgid "apply the patch in reverse"

1887 msgstr ""

1888

1740 -#: builtin/apply.c:4331

1889 +#: builtin/apply.c:4349

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

1891 msgstr ""

1892

1744 -#: builtin/apply.c:4333

1893 +#: builtin/apply.c:4351

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

1895 msgstr ""

1896

1748 -#: builtin/apply.c:4335

1897 +#: builtin/apply.c:4353

1898 msgid "allow overlapping hunks"

1899 msgstr ""

1900

1752 -#: builtin/apply.c:4336

1753 -msgid "be verbose"

1754 -msgstr ""

1755 -

1756 -#: builtin/apply.c:4338

1901 +#: builtin/apply.c:4356

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

1903 msgstr ""

1904

1760 -#: builtin/apply.c:4341

1905 +#: builtin/apply.c:4359

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

1907 msgstr ""

1908

1764 -#: builtin/apply.c:4343

1909 +#: builtin/apply.c:4361

1910 msgid "root"

1911 msgstr ""

1912

1768 -#: builtin/apply.c:4344

1913 +#: builtin/apply.c:4362

1914 msgid "prepend <root> to all filenames"

1915 msgstr ""

1916

1772 -#: builtin/apply.c:4366

1917 +#: builtin/apply.c:4384

1918 msgid "--3way outside a repository"

1919 msgstr ""

1920

1776 -#: builtin/apply.c:4374

1921 +#: builtin/apply.c:4392

1922 msgid "--index outside a repository"

1923 msgstr ""

1924

1780 -#: builtin/apply.c:4377

1925 +#: builtin/apply.c:4395

1926 msgid "--cached outside a repository"

1927 msgstr ""

1928

1784 -#: builtin/apply.c:4393

1929 +#: builtin/apply.c:4411

1930 #, c-format

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

1932 msgstr ""

1933

1789 -#: builtin/apply.c:4407

1934 +#: builtin/apply.c:4425

1935 #, c-format

1936 msgid "squelched %d whitespace error"

1937 msgid_plural "squelched %d whitespace errors"

1938 msgstr[0] ""

1939 msgstr[1] ""

1940

1796 -#: builtin/apply.c:4413 builtin/apply.c:4423

1941 +#: builtin/apply.c:4431 builtin/apply.c:4441

1942 #, c-format

1943 msgid "%d line adds whitespace errors."

1944 msgid_plural "%d lines add whitespace errors."

@@ -1835,2883 +1980,5817 @@ msgstr ""

1980 msgid "git archive: expected a flush"

1981 msgstr ""

1982

1838 -#: builtin/branch.c:144

1983 +#: builtin/bisect--helper.c:7

1984 +msgid "git bisect--helper --next-all [--no-checkout]"

1985 +msgstr ""

1986 +

1987 +#: builtin/bisect--helper.c:17

1988 +msgid "perform 'git bisect next'"

1989 +msgstr ""

1990 +

1991 +#: builtin/bisect--helper.c:19

1992 +msgid "update BISECT_HEAD instead of checking out the current commit"

1993 +msgstr ""

1994 +

1995 +#: builtin/blame.c:25

1996 +msgid "git blame [options] [rev-opts] [rev] [--] file"

1997 +msgstr ""

1998 +

1999 +#: builtin/blame.c:30 builtin/shortlog.c:15

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

2001 +msgstr ""

2002 +

2003 +#: builtin/blame.c:2316

2004 +msgid "Show blame entries as we find them, incrementally"

2005 +msgstr ""

2006 +

2007 +#: builtin/blame.c:2317

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

2009 +msgstr ""

2010 +

2011 +#: builtin/blame.c:2318

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

2013 +msgstr ""

2014 +

2015 +#: builtin/blame.c:2319

2016 +msgid "Show work cost statistics"

2017 +msgstr ""

2018 +

2019 +#: builtin/blame.c:2320

2020 +msgid "Show output score for blame entries"

2021 +msgstr ""

2022 +

2023 +#: builtin/blame.c:2321

2024 +msgid "Show original filename (Default: auto)"

2025 +msgstr ""

2026 +

2027 +#: builtin/blame.c:2322

2028 +msgid "Show original linenumber (Default: off)"

2029 +msgstr ""

2030 +

2031 +#: builtin/blame.c:2323

2032 +msgid "Show in a format designed for machine consumption"

2033 +msgstr ""

2034 +

2035 +#: builtin/blame.c:2324

2036 +msgid "Show porcelain format with per-line commit information"

2037 +msgstr ""

2038 +

2039 +#: builtin/blame.c:2325

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

2041 +msgstr ""

2042 +

2043 +#: builtin/blame.c:2326

2044 +msgid "Show raw timestamp (Default: off)"

2045 +msgstr ""

2046 +

2047 +#: builtin/blame.c:2327

2048 +msgid "Show long commit SHA1 (Default: off)"

2049 +msgstr ""

2050 +

2051 +#: builtin/blame.c:2328

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

2053 +msgstr ""

2054 +

2055 +#: builtin/blame.c:2329

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

2057 +msgstr ""

2058 +

2059 +#: builtin/blame.c:2330

2060 +msgid "Ignore whitespace differences"

2061 +msgstr ""

2062 +

2063 +#: builtin/blame.c:2331

2064 +msgid "Spend extra cycles to find better match"

2065 +msgstr ""

2066 +

2067 +#: builtin/blame.c:2332

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

2069 +msgstr ""

2070 +

2071 +#: builtin/blame.c:2333

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

2073 +msgstr ""

2074 +

2075 +#: builtin/blame.c:2334 builtin/blame.c:2335

2076 +msgid "score"

2077 +msgstr ""

2078 +

2079 +#: builtin/blame.c:2334

2080 +msgid "Find line copies within and across files"

2081 +msgstr ""

2082 +

2083 +#: builtin/blame.c:2335

2084 +msgid "Find line movements within and across files"

2085 +msgstr ""

2086 +

2087 +#: builtin/blame.c:2336

2088 +msgid "n,m"

2089 +msgstr ""

2090 +

2091 +#: builtin/blame.c:2336

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

2093 +msgstr ""

2094 +

2095 +#: builtin/branch.c:23

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

2097 +msgstr ""

2098 +

2099 +#: builtin/branch.c:24

2100 +msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]"

2101 +msgstr ""

2102 +

2103 +#: builtin/branch.c:25

2104 +msgid "git branch [options] [-r] (-d | -D) <branchname>..."

2105 +msgstr ""

2106 +

2107 +#: builtin/branch.c:26

2108 +msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"

2109 +msgstr ""

2110 +

2111 +#: builtin/branch.c:145

2112 #, c-format

2113 msgid ""

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

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

2116 msgstr ""

2117

1845 -#: builtin/branch.c:148

2118 +#: builtin/branch.c:149

2119 #, c-format

2120 msgid ""

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

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

2123 msgstr ""

2124

1852 -#: builtin/branch.c:180

2125 +#: builtin/branch.c:181

2126 msgid "cannot use -a with -d"

2127 msgstr ""

2128

1856 -#: builtin/branch.c:186

2129 +#: builtin/branch.c:187

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

2131 msgstr ""

2132

1860 -#: builtin/branch.c:191

2133 +#: builtin/branch.c:192

2134 #, c-format

2135 msgid "Cannot delete the branch '%s' which you are currently on."

2136 msgstr ""

2137

1865 -#: builtin/branch.c:202

2138 +#: builtin/branch.c:203

2139 #, c-format

2140 msgid "remote branch '%s' not found."

2141 msgstr ""

2142

1870 -#: builtin/branch.c:203

2143 +#: builtin/branch.c:204

2144 #, c-format

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

2146 msgstr ""

2147

1875 -#: builtin/branch.c:210

2148 +#: builtin/branch.c:211

2149 #, c-format

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

2151 msgstr ""

2152

1880 -#: builtin/branch.c:216

2153 +#: builtin/branch.c:217

2154 #, c-format

2155 msgid ""

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

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

2158 msgstr ""

2159

1887 -#: builtin/branch.c:225

2160 +#: builtin/branch.c:226

2161 #, c-format

2162 msgid "Error deleting remote branch '%s'"

2163 msgstr ""

2164

1892 -#: builtin/branch.c:226

2165 +#: builtin/branch.c:227

2166 #, c-format

2167 msgid "Error deleting branch '%s'"

2168 msgstr ""

2169

1897 -#: builtin/branch.c:233

2170 +#: builtin/branch.c:234

2171 #, c-format

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

2173 msgstr ""

2174

1902 -#: builtin/branch.c:234

2175 +#: builtin/branch.c:235

2176 #, c-format

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

2178 msgstr ""

2179

1907 -#: builtin/branch.c:239

2180 +#: builtin/branch.c:240

2181 msgid "Update of config-file failed"

2182 msgstr ""

2183

1911 -#: builtin/branch.c:337

2184 +#: builtin/branch.c:338

2185 #, c-format

2186 msgid "branch '%s' does not point at a commit"

2187 msgstr ""

2188

1916 -#: builtin/branch.c:409

2189 +#: builtin/branch.c:410

2190 #, c-format

2191 msgid "[%s: behind %d]"

2192 msgstr ""

2193

1921 -#: builtin/branch.c:411

2194 +#: builtin/branch.c:412

2195 #, c-format

2196 msgid "[behind %d]"

2197 msgstr ""

2198

1926 -#: builtin/branch.c:415

2199 +#: builtin/branch.c:416

2200 #, c-format

2201 msgid "[%s: ahead %d]"

2202 msgstr ""

2203

1931 -#: builtin/branch.c:417

2204 +#: builtin/branch.c:418

2205 #, c-format

2206 msgid "[ahead %d]"

2207 msgstr ""

2208

1936 -#: builtin/branch.c:420

2209 +#: builtin/branch.c:421

2210 #, c-format

2211 msgid "[%s: ahead %d, behind %d]"

2212 msgstr ""

2213

1941 -#: builtin/branch.c:423

2214 +#: builtin/branch.c:424

2215 #, c-format

2216 msgid "[ahead %d, behind %d]"

2217 msgstr ""

2218

1946 -#: builtin/branch.c:535

2219 +#: builtin/branch.c:537

2220 msgid "(no branch)"

2221 msgstr ""

2222

1950 -#: builtin/branch.c:600

2223 +#: builtin/branch.c:602

2224 msgid "some refs could not be read"

2225 msgstr ""

2226

1954 -#: builtin/branch.c:613

2227 +#: builtin/branch.c:615

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

2229 msgstr ""

2230

1958 -#: builtin/branch.c:623

2231 +#: builtin/branch.c:625

2232 #, c-format

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

2234 msgstr ""

2235

1963 -#: builtin/branch.c:638

2236 +#: builtin/branch.c:640

2237 msgid "Branch rename failed"

2238 msgstr ""

2239

1967 -#: builtin/branch.c:642

2240 +#: builtin/branch.c:644

2241 #, c-format

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

2243 msgstr ""

2244

1972 -#: builtin/branch.c:646

2245 +#: builtin/branch.c:648

2246 #, c-format

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

2248 msgstr ""

2249

1977 -#: builtin/branch.c:653

2250 +#: builtin/branch.c:655

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

2252 msgstr ""

2253

1981 -#: builtin/branch.c:668

2254 +#: builtin/branch.c:670

2255 #, c-format

2256 msgid "malformed object name %s"

2257 msgstr ""

2258

1986 -#: builtin/branch.c:692

2259 +#: builtin/branch.c:694

2260 #, c-format

2261 msgid "could not write branch description template: %s"

2262 msgstr ""

2263

1991 -#: builtin/branch.c:783

1992 -msgid "Failed to resolve HEAD as a valid ref."

2264 +#: builtin/branch.c:724

2265 +msgid "Generic options"

2266 msgstr ""

2267

1995 -#: builtin/branch.c:788 builtin/clone.c:561

1996 -msgid "HEAD not found below refs/heads!"

2268 +#: builtin/branch.c:726

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

2270 msgstr ""

2271

1999 -#: builtin/branch.c:808

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

2272 +#: builtin/branch.c:727

2273 +msgid "suppress informational messages"

2274 msgstr ""

2275

2003 -#: builtin/branch.c:857

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

2276 +#: builtin/branch.c:728

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

2278 msgstr ""

2279

2007 -#: builtin/bundle.c:47

2008 -#, c-format

2009 -msgid "%s is okay\n"

2280 +#: builtin/branch.c:730

2281 +msgid "change upstream info"

2282 msgstr ""

2283

2012 -#: builtin/bundle.c:56

2013 -msgid "Need a repository to create a bundle."

2284 +#: builtin/branch.c:734

2285 +msgid "use colored output"

2286 msgstr ""

2287

2016 -#: builtin/bundle.c:60

2017 -msgid "Need a repository to unbundle."

2288 +#: builtin/branch.c:735

2289 +msgid "act on remote-tracking branches"

2290 msgstr ""

2291

2020 -#: builtin/checkout.c:114 builtin/checkout.c:147

2021 -#, c-format

2022 -msgid "path '%s' does not have our version"

2292 +#: builtin/branch.c:738 builtin/branch.c:744 builtin/branch.c:765

2293 +#: builtin/branch.c:771 builtin/commit.c:1395 builtin/commit.c:1396

2294 +#: builtin/commit.c:1397 builtin/commit.c:1398 builtin/tag.c:470

2295 +msgid "commit"

2296 msgstr ""

2297

2025 -#: builtin/checkout.c:116 builtin/checkout.c:149

2026 -#, c-format

2027 -msgid "path '%s' does not have their version"

2298 +#: builtin/branch.c:739 builtin/branch.c:745

2299 +msgid "print only branches that contain the commit"

2300 msgstr ""

2301

2030 -#: builtin/checkout.c:132

2031 -#, c-format

2032 -msgid "path '%s' does not have all necessary versions"

2302 +#: builtin/branch.c:751

2303 +msgid "Specific git-branch actions:"

2304 msgstr ""

2305

2035 -#: builtin/checkout.c:176

2036 -#, c-format

2037 -msgid "path '%s' does not have necessary versions"

2306 +#: builtin/branch.c:752

2307 +msgid "list both remote-tracking and local branches"

2308 msgstr ""

2309

2040 -#: builtin/checkout.c:193

2041 -#, c-format

2042 -msgid "path '%s': cannot merge"

2310 +#: builtin/branch.c:754

2311 +msgid "delete fully merged branch"

2312 msgstr ""

2313

2045 -#: builtin/checkout.c:210

2046 -#, c-format

2047 -msgid "Unable to add merge result for '%s'"

2314 +#: builtin/branch.c:755

2315 +msgid "delete branch (even if not merged)"

2316 msgstr ""

2317

2050 -#: builtin/checkout.c:235 builtin/checkout.c:392

2051 -msgid "corrupt index file"

2318 +#: builtin/branch.c:756

2319 +msgid "move/rename a branch and its reflog"

2320 msgstr ""

2321

2054 -#: builtin/checkout.c:265 builtin/checkout.c:272

2055 -#, c-format

2056 -msgid "path '%s' is unmerged"

2322 +#: builtin/branch.c:757

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

2324 msgstr ""

2325

2059 -#: builtin/checkout.c:303 builtin/checkout.c:498 builtin/clone.c:586

2060 -#: builtin/merge.c:811

2061 -msgid "unable to write new index file"

2326 +#: builtin/branch.c:758

2327 +msgid "list branch names"

2328 msgstr ""

2329

2064 -#: builtin/checkout.c:414

2065 -msgid "you need to resolve your current index first"

2330 +#: builtin/branch.c:759

2331 +msgid "create the branch's reflog"

2332 msgstr ""

2333

2068 -#: builtin/checkout.c:533

2069 -#, c-format

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

2334 +#: builtin/branch.c:761

2335 +msgid "edit the description for the branch"

2336 msgstr ""

2337

2073 -#: builtin/checkout.c:566

2074 -msgid "HEAD is now at"

2338 +#: builtin/branch.c:762

2339 +msgid "force creation (when already exists)"

2340 msgstr ""

2341

2077 -#: builtin/checkout.c:573

2078 -#, c-format

2079 -msgid "Reset branch '%s'\n"

2342 +#: builtin/branch.c:765

2343 +msgid "print only not merged branches"

2344 msgstr ""

2345

2082 -#: builtin/checkout.c:576

2083 -#, c-format

2084 -msgid "Already on '%s'\n"

2346 +#: builtin/branch.c:771

2347 +msgid "print only merged branches"

2348 msgstr ""

2349

2087 -#: builtin/checkout.c:580

2088 -#, c-format

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

2350 +#: builtin/branch.c:775

2351 +msgid "list branches in columns"

2352 +msgstr ""

2353 +

2354 +#: builtin/branch.c:788

2355 +msgid "Failed to resolve HEAD as a valid ref."

2356 +msgstr ""

2357 +

2358 +#: builtin/branch.c:793 builtin/clone.c:561

2359 +msgid "HEAD not found below refs/heads!"

2360 +msgstr ""

2361 +

2362 +#: builtin/branch.c:813

2363 +msgid "--column and --verbose are incompatible"

2364 msgstr ""

2365

2092 -#: builtin/checkout.c:582

2366 +#: builtin/branch.c:864

2367 #, c-format

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

2368 +msgid "branch '%s' does not exist"

2369 msgstr ""

2370

2097 -#: builtin/checkout.c:584

2371 +#: builtin/branch.c:876

2372 #, c-format

2099 -msgid "Switched to branch '%s'\n"

2373 +msgid "Branch '%s' has no upstream information"

2374 +msgstr ""

2375 +

2376 +#: builtin/branch.c:891

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

2378 msgstr ""

2379

2102 -#: builtin/checkout.c:640

2380 +#: builtin/branch.c:894

2381 #, c-format

2104 -msgid " ... and %d more.\n"

2382 +msgid ""

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

2384 +"track or --set-upstream-to\n"

2385 msgstr ""

2386

2107 -#. The singular version

2108 -#: builtin/checkout.c:646

2387 +#: builtin/branch.c:911

2388 #, c-format

2389 msgid ""

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

2112 -"any of your branches:\n"

2390 "\n"

2114 -"%s\n"

2115 -msgid_plural ""

2116 -"Warning: you are leaving %d commits behind, not connected to\n"

2117 -"any of your branches:\n"

2391 +"If you wanted to make '%s' track '%s', do this:\n"

2392 "\n"

2119 -"%s\n"

2120 -msgstr[0] ""

2121 -msgstr[1] ""

2393 +msgstr ""

2394

2123 -#: builtin/checkout.c:664

2395 +#: builtin/branch.c:912

2396 #, c-format

2125 -msgid ""

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

2127 -"to do so with:\n"

2128 -"\n"

2129 -" git branch new_branch_name %s\n"

2130 -"\n"

2397 +msgid " git branch -d %s\n"

2398 msgstr ""

2399

2133 -#: builtin/checkout.c:694

2134 -msgid "internal error in revision walk"

2400 +#: builtin/branch.c:913

2401 +#, c-format

2402 +msgid " git branch --set-upstream-to %s\n"

2403 msgstr ""

2404

2137 -#: builtin/checkout.c:698

2138 -msgid "Previous HEAD position was"

2405 +#: builtin/bundle.c:47

2406 +#, c-format

2407 +msgid "%s is okay\n"

2408 msgstr ""

2409

2141 -#: builtin/checkout.c:724 builtin/checkout.c:919

2142 -msgid "You are on a branch yet to be born"

2410 +#: builtin/bundle.c:56

2411 +msgid "Need a repository to create a bundle."

2412 msgstr ""

2413

2145 -#. case (1)

2146 -#: builtin/checkout.c:855

2147 -#, c-format

2148 -msgid "invalid reference: %s"

2414 +#: builtin/bundle.c:60

2415 +msgid "Need a repository to unbundle."

2416 msgstr ""

2417

2151 -#. case (1): want a tree

2152 -#: builtin/checkout.c:894

2153 -#, c-format

2154 -msgid "reference is not a tree: %s"

2418 +#: builtin/cat-file.c:247

2419 +msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"

2420 msgstr ""

2421

2157 -#: builtin/checkout.c:976

2158 -msgid "-B cannot be used with -b"

2422 +#: builtin/cat-file.c:248

2423 +msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"

2424 msgstr ""

2425

2161 -#: builtin/checkout.c:985

2162 -msgid "--patch is incompatible with all other options"

2426 +#: builtin/cat-file.c:266

2427 +msgid "<type> can be one of: blob, tree, commit, tag"

2428 msgstr ""

2429

2165 -#: builtin/checkout.c:988

2166 -msgid "--detach cannot be used with -b/-B/--orphan"

2430 +#: builtin/cat-file.c:267

2431 +msgid "show object type"

2432 msgstr ""

2433

2169 -#: builtin/checkout.c:990

2170 -msgid "--detach cannot be used with -t"

2434 +#: builtin/cat-file.c:268

2435 +msgid "show object size"

2436 msgstr ""

2437

2173 -#: builtin/checkout.c:996

2174 -msgid "--track needs a branch name"

2438 +#: builtin/cat-file.c:270

2439 +msgid "exit with zero when there's no error"

2440 msgstr ""

2441

2177 -#: builtin/checkout.c:1003

2178 -msgid "Missing branch name; try -b"

2442 +#: builtin/cat-file.c:271

2443 +msgid "pretty-print object's content"

2444 msgstr ""

2445

2181 -#: builtin/checkout.c:1009

2182 -msgid "--orphan and -b|-B are mutually exclusive"

2446 +#: builtin/cat-file.c:273

2447 +msgid "for blob objects, run textconv on object's content"

2448 msgstr ""

2449

2185 -#: builtin/checkout.c:1011

2186 -msgid "--orphan cannot be used with -t"

2450 +#: builtin/cat-file.c:275

2451 +msgid "show info and content of objects fed from the standard input"

2452 msgstr ""

2453

2189 -#: builtin/checkout.c:1021

2190 -msgid "git checkout: -f and -m are incompatible"

2454 +#: builtin/cat-file.c:278

2455 +msgid "show info about objects fed from the standard input"

2456 msgstr ""

2457

2193 -#: builtin/checkout.c:1055

2194 -msgid "invalid path specification"

2458 +#: builtin/check-attr.c:11

2459 +msgid "git check-attr [-a | --all | attr...] [--] pathname..."

2460 msgstr ""

2461

2197 -#: builtin/checkout.c:1063

2198 -#, c-format

2199 -msgid ""

2200 -"git checkout: updating paths is incompatible with switching branches.\n"

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

2462 +#: builtin/check-attr.c:12

2463 +msgid "git check-attr --stdin [-a | --all | attr...] < <list-of-paths>"

2464 msgstr ""

2465

2204 -#: builtin/checkout.c:1065

2205 -msgid "git checkout: updating paths is incompatible with switching branches."

2466 +#: builtin/check-attr.c:19

2467 +msgid "report all attributes set on file"

2468 msgstr ""

2469

2208 -#: builtin/checkout.c:1070

2209 -msgid "git checkout: --detach does not take a path argument"

2470 +#: builtin/check-attr.c:20

2471 +msgid "use .gitattributes only from the index"

2472 msgstr ""

2473

2212 -#: builtin/checkout.c:1073

2213 -msgid ""

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

2215 -"checking out of the index."

2474 +#: builtin/check-attr.c:21 builtin/hash-object.c:75

2475 +msgid "read file names from stdin"

2476 msgstr ""

2477

2218 -#: builtin/checkout.c:1092

2219 -msgid "Cannot switch branch to a non-commit."

2478 +#: builtin/check-attr.c:23

2479 +msgid "input paths are terminated by a null character"

2480 msgstr ""

2481

2222 -#: builtin/checkout.c:1095

2223 -msgid "--ours/--theirs is incompatible with switching branches."

2482 +#: builtin/checkout-index.c:126

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

2484 msgstr ""

2485

2226 -#: builtin/clean.c:78

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

2486 +#: builtin/checkout-index.c:187

2487 +msgid "check out all files in the index"

2488 msgstr ""

2489

2230 -#: builtin/clean.c:82

2231 -msgid ""

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

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

2491 +msgid "force overwrite of existing files"

2492 msgstr ""

2493

2235 -#: builtin/clean.c:85

2236 -msgid ""

2237 -"clean.requireForce defaults to true and neither -n nor -f given; refusing to "

2238 -"clean"

2494 +#: builtin/checkout-index.c:190

2495 +msgid "no warning for existing files and files not in index"

2496 msgstr ""

2497

2241 -#: builtin/clean.c:155 builtin/clean.c:176

2242 -#, c-format

2243 -msgid "Would remove %s\n"

2498 +#: builtin/checkout-index.c:192

2499 +msgid "don't checkout new files"

2500 msgstr ""

2501

2246 -#: builtin/clean.c:159 builtin/clean.c:179

2247 -#, c-format

2248 -msgid "Removing %s\n"

2502 +#: builtin/checkout-index.c:194

2503 +msgid "update stat information in the index file"

2504 msgstr ""

2505

2251 -#: builtin/clean.c:162 builtin/clean.c:182

2252 -#, c-format

2253 -msgid "failed to remove %s"

2506 +#: builtin/checkout-index.c:200

2507 +msgid "read list of paths from the standard input"

2508 msgstr ""

2509

2256 -#: builtin/clean.c:166

2257 -#, c-format

2258 -msgid "Would not remove %s\n"

2510 +#: builtin/checkout-index.c:202

2511 +msgid "write the content to temporary files"

2512 msgstr ""

2513

2261 -#: builtin/clean.c:168

2262 -#, c-format

2263 -msgid "Not removing %s\n"

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

2515 +msgid "string"

2516 msgstr ""

2517

2266 -#: builtin/clone.c:243

2267 -#, c-format

2268 -msgid "reference repository '%s' is not a local directory."

2518 +#: builtin/checkout-index.c:204

2519 +msgid "when creating files, prepend <string>"

2520 msgstr ""

2521

2271 -#: builtin/clone.c:306

2272 -#, c-format

2273 -msgid "failed to create directory '%s'"

2522 +#: builtin/checkout-index.c:207

2523 +msgid "copy out the files from named stage"

2524 msgstr ""

2525

2276 -#: builtin/clone.c:308 builtin/diff.c:77

2277 -#, c-format

2278 -msgid "failed to stat '%s'"

2526 +#: builtin/checkout.c:25

2527 +msgid "git checkout [options] <branch>"

2528 msgstr ""

2529

2281 -#: builtin/clone.c:310

2282 -#, c-format

2283 -msgid "%s exists and is not a directory"

2530 +#: builtin/checkout.c:26

2531 +msgid "git checkout [options] [<branch>] -- <file>..."

2532 msgstr ""

2533

2286 -#: builtin/clone.c:324

2534 +#: builtin/checkout.c:116 builtin/checkout.c:149

2535 #, c-format

2288 -msgid "failed to stat %s\n"

2536 +msgid "path '%s' does not have our version"

2537 msgstr ""

2538

2291 -#: builtin/clone.c:346

2539 +#: builtin/checkout.c:118 builtin/checkout.c:151

2540 #, c-format

2293 -msgid "failed to create link '%s'"

2541 +msgid "path '%s' does not have their version"

2542 msgstr ""

2543

2296 -#: builtin/clone.c:350

2544 +#: builtin/checkout.c:134

2545 #, c-format

2298 -msgid "failed to copy file to '%s'"

2546 +msgid "path '%s' does not have all necessary versions"

2547 msgstr ""

2548

2301 -#: builtin/clone.c:373

2549 +#: builtin/checkout.c:178

2550 #, c-format

2303 -msgid "done.\n"

2551 +msgid "path '%s' does not have necessary versions"

2552 msgstr ""

2553

2306 -#: builtin/clone.c:443

2554 +#: builtin/checkout.c:195

2555 #, c-format

2308 -msgid "Could not find remote branch %s to clone."

2309 -msgstr ""

2310 -

2311 -#: builtin/clone.c:552

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

2556 +msgid "path '%s': cannot merge"

2557 msgstr ""

2558

2315 -#: builtin/clone.c:642

2316 -msgid "Too many arguments."

2559 +#: builtin/checkout.c:212

2560 +#, c-format

2561 +msgid "Unable to add merge result for '%s'"

2562 msgstr ""

2563

2319 -#: builtin/clone.c:646

2320 -msgid "You must specify a repository to clone."

2564 +#: builtin/checkout.c:236 builtin/checkout.c:239 builtin/checkout.c:242

2565 +#: builtin/checkout.c:245

2566 +#, c-format

2567 +msgid "'%s' cannot be used with updating paths"

2568 msgstr ""

2569

2323 -#: builtin/clone.c:657

2570 +#: builtin/checkout.c:248 builtin/checkout.c:251

2571 #, c-format

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

2572 +msgid "'%s' cannot be used with %s"

2573 msgstr ""

2574

2328 -#: builtin/clone.c:671

2575 +#: builtin/checkout.c:254

2576 #, c-format

2330 -msgid "repository '%s' does not exist"

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

2578 msgstr ""

2579

2333 -#: builtin/clone.c:676

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

2580 +#: builtin/checkout.c:265 builtin/checkout.c:426

2581 +msgid "corrupt index file"

2582 msgstr ""

2583

2337 -#: builtin/clone.c:686

2584 +#: builtin/checkout.c:295 builtin/checkout.c:302

2585 #, c-format

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

2586 +msgid "path '%s' is unmerged"

2587 msgstr ""

2588

2342 -#: builtin/clone.c:696

2343 -#, c-format

2344 -msgid "working tree '%s' already exists."

2589 +#: builtin/checkout.c:333 builtin/checkout.c:534 builtin/clone.c:586

2590 +#: builtin/merge.c:811

2591 +msgid "unable to write new index file"

2592 msgstr ""

2593

2347 -#: builtin/clone.c:709 builtin/clone.c:723

2348 -#, c-format

2349 -msgid "could not create leading directories of '%s'"

2594 +#: builtin/checkout.c:448

2595 +msgid "you need to resolve your current index first"

2596 msgstr ""

2597

2352 -#: builtin/clone.c:712

2598 +#: builtin/checkout.c:569

2599 #, c-format

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

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

2601 msgstr ""

2602

2357 -#: builtin/clone.c:731

2603 +#: builtin/checkout.c:602

2604 +msgid "HEAD is now at"

2605 +msgstr ""

2606 +

2607 +#: builtin/checkout.c:609

2608 #, c-format

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

2609 +msgid "Reset branch '%s'\n"

2610 msgstr ""

2611

2362 -#: builtin/clone.c:733

2612 +#: builtin/checkout.c:612

2613 #, c-format

2364 -msgid "Cloning into '%s'...\n"

2614 +msgid "Already on '%s'\n"

2615 msgstr ""

2616

2367 -#: builtin/clone.c:789

2617 +#: builtin/checkout.c:616

2618 #, c-format

2369 -msgid "Don't know how to clone %s"

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

2620 msgstr ""

2621

2372 -#: builtin/clone.c:838

2622 +#: builtin/checkout.c:618

2623 #, c-format

2374 -msgid "Remote branch %s not found in upstream %s"

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

2625 msgstr ""

2626

2377 -#: builtin/clone.c:845

2378 -msgid "You appear to have cloned an empty repository."

2627 +#: builtin/checkout.c:620

2628 +#, c-format

2629 +msgid "Switched to branch '%s'\n"

2630 msgstr ""

2631

2381 -#: builtin/column.c:51

2382 -msgid "--command must be the first argument"

2632 +#: builtin/checkout.c:676

2633 +#, c-format

2634 +msgid " ... and %d more.\n"

2635 msgstr ""

2636

2385 -#: builtin/commit.c:43

2637 +#. The singular version

2638 +#: builtin/checkout.c:682

2639 +#, c-format

2640 msgid ""

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

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

2389 -"You can suppress this message by setting them explicitly:\n"

2390 -"\n"

2391 -" git config --global user.name \"Your Name\"\n"

2392 -" git config --global user.email you@example.com\n"

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

2642 +"any of your branches:\n"

2643 "\n"

2394 -"After doing this, you may fix the identity used for this commit with:\n"

2644 +"%s\n"

2645 +msgid_plural ""

2646 +"Warning: you are leaving %d commits behind, not connected to\n"

2647 +"any of your branches:\n"

2648 "\n"

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

2397 -msgstr ""

2398 -

2399 -#: builtin/commit.c:55

2400 -msgid ""

2401 -"You asked to amend the most recent commit, but doing so would make\n"

2402 -"it empty. You can repeat your command with --allow-empty, or you can\n"

2403 -"remove the commit entirely with \"git reset HEAD^\".\n"

2404 -msgstr ""

2649 +"%s\n"

2650 +msgstr[0] ""

2651 +msgstr[1] ""

2652

2406 -#: builtin/commit.c:60

2653 +#: builtin/checkout.c:700

2654 +#, c-format

2655 msgid ""

2408 -"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"

2409 -"If you wish to commit it anyway, use:\n"

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

2657 +"to do so with:\n"

2658 "\n"

2411 -" git commit --allow-empty\n"

2659 +" git branch new_branch_name %s\n"

2660 "\n"

2413 -"Otherwise, please use 'git reset'\n"

2661 msgstr ""

2662

2416 -#: builtin/commit.c:256

2417 -msgid "failed to unpack HEAD tree object"

2663 +#: builtin/checkout.c:730

2664 +msgid "internal error in revision walk"

2665 msgstr ""

2666

2420 -#: builtin/commit.c:298

2421 -msgid "unable to create temporary index"

2667 +#: builtin/checkout.c:734

2668 +msgid "Previous HEAD position was"

2669 msgstr ""

2670

2424 -#: builtin/commit.c:304

2425 -msgid "interactive add failed"

2671 +#: builtin/checkout.c:761 builtin/checkout.c:950

2672 +msgid "You are on a branch yet to be born"

2673 msgstr ""

2674

2428 -#: builtin/commit.c:337 builtin/commit.c:358 builtin/commit.c:408

2429 -msgid "unable to write new_index file"

2675 +#. case (1)

2676 +#: builtin/checkout.c:886

2677 +#, c-format

2678 +msgid "invalid reference: %s"

2679 msgstr ""

2680

2432 -#: builtin/commit.c:389

2433 -msgid "cannot do a partial commit during a merge."

2681 +#. case (1): want a tree

2682 +#: builtin/checkout.c:925

2683 +#, c-format

2684 +msgid "reference is not a tree: %s"

2685 msgstr ""

2686

2436 -#: builtin/commit.c:391

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

2687 +#: builtin/checkout.c:961

2688 +msgid "paths cannot be used with switching branches"

2689 msgstr ""

2690

2440 -#: builtin/commit.c:401

2441 -msgid "cannot read the index"

2691 +#: builtin/checkout.c:964 builtin/checkout.c:968

2692 +#, c-format

2693 +msgid "'%s' cannot be used with switching branches"

2694 msgstr ""

2695

2444 -#: builtin/commit.c:421

2445 -msgid "unable to write temporary index file"

2696 +#: builtin/checkout.c:972 builtin/checkout.c:975 builtin/checkout.c:980

2697 +#: builtin/checkout.c:983

2698 +#, c-format

2699 +msgid "'%s' cannot be used with '%s'"

2700 msgstr ""

2701

2448 -#: builtin/commit.c:496 builtin/commit.c:502

2702 +#: builtin/checkout.c:988

2703 #, c-format

2450 -msgid "invalid commit: %s"

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

2705 msgstr ""

2706

2453 -#: builtin/commit.c:525

2454 -msgid "malformed --author parameter"

2707 +#: builtin/checkout.c:1009 builtin/gc.c:177

2708 +msgid "suppress progress reporting"

2709 msgstr ""

2710

2457 -#: builtin/commit.c:585

2458 -#, c-format

2459 -msgid "Malformed ident string: '%s'"

2711 +#: builtin/checkout.c:1010 builtin/checkout.c:1012 builtin/clone.c:89

2712 +#: builtin/remote.c:169 builtin/remote.c:171

2713 +msgid "branch"

2714 msgstr ""

2715

2462 -#: builtin/commit.c:623 builtin/commit.c:656 builtin/commit.c:970

2463 -#, c-format

2464 -msgid "could not lookup commit %s"

2716 +#: builtin/checkout.c:1011

2717 +msgid "create and checkout a new branch"

2718 msgstr ""

2719

2467 -#: builtin/commit.c:635 builtin/shortlog.c:296

2468 -#, c-format

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

2720 +#: builtin/checkout.c:1013

2721 +msgid "create/reset and checkout a branch"

2722 msgstr ""

2723

2472 -#: builtin/commit.c:637

2473 -msgid "could not read log from standard input"

2724 +#: builtin/checkout.c:1014

2725 +msgid "create reflog for new branch"

2726 msgstr ""

2727

2476 -#: builtin/commit.c:641

2477 -#, c-format

2478 -msgid "could not read log file '%s'"

2728 +#: builtin/checkout.c:1015

2729 +msgid "detach the HEAD at named commit"

2730 msgstr ""

2731

2481 -#: builtin/commit.c:647

2482 -msgid "commit has empty message"

2732 +#: builtin/checkout.c:1016

2733 +msgid "set upstream info for new branch"

2734 msgstr ""

2735

2485 -#: builtin/commit.c:663

2486 -msgid "could not read MERGE_MSG"

2736 +#: builtin/checkout.c:1018

2737 +msgid "new branch"

2738 msgstr ""

2739

2489 -#: builtin/commit.c:667

2490 -msgid "could not read SQUASH_MSG"

2740 +#: builtin/checkout.c:1018

2741 +msgid "new unparented branch"

2742 msgstr ""

2743

2493 -#: builtin/commit.c:671

2494 -#, c-format

2495 -msgid "could not read '%s'"

2744 +#: builtin/checkout.c:1019

2745 +msgid "checkout our version for unmerged files"

2746 msgstr ""

2747

2498 -#: builtin/commit.c:723

2499 -msgid "could not write commit template"

2748 +#: builtin/checkout.c:1021

2749 +msgid "checkout their version for unmerged files"

2750 msgstr ""

2751

2502 -#: builtin/commit.c:734

2503 -#, c-format

2504 -msgid ""

2505 -"\n"

2506 -"It looks like you may be committing a merge.\n"

2507 -"If this is not correct, please remove the file\n"

2508 -"\t%s\n"

2509 -"and try again.\n"

2752 +#: builtin/checkout.c:1023

2753 +msgid "force checkout (throw away local modifications)"

2754 msgstr ""

2755

2512 -#: builtin/commit.c:739

2513 -#, c-format

2514 -msgid ""

2515 -"\n"

2516 -"It looks like you may be committing a cherry-pick.\n"

2517 -"If this is not correct, please remove the file\n"

2518 -"\t%s\n"

2519 -"and try again.\n"

2756 +#: builtin/checkout.c:1024

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

2758 msgstr ""

2759

2522 -#: builtin/commit.c:751

2523 -msgid ""

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

2525 -"with '#' will be ignored, and an empty message aborts the commit.\n"

2760 +#: builtin/checkout.c:1025 builtin/merge.c:215

2761 +msgid "update ignored files (default)"

2762 msgstr ""

2763

2528 -#: builtin/commit.c:756

2529 -msgid ""

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

2531 -"with '#' will be kept; you may remove them yourself if you want to.\n"

2532 -"An empty message aborts the commit.\n"

2764 +#: builtin/checkout.c:1026 builtin/log.c:1111 parse-options.h:241

2765 +msgid "style"

2766 msgstr ""

2767

2535 -#: builtin/commit.c:769

2536 -#, c-format

2537 -msgid "%sAuthor: %s"

2768 +#: builtin/checkout.c:1027

2769 +msgid "conflict style (merge or diff3)"

2770 msgstr ""

2771

2540 -#: builtin/commit.c:776

2541 -#, c-format

2542 -msgid "%sCommitter: %s"

2772 +#: builtin/checkout.c:1030

2773 +msgid "second guess 'git checkout no-such-branch'"

2774 msgstr ""

2775

2545 -#: builtin/commit.c:796

2546 -msgid "Cannot read index"

2776 +#: builtin/checkout.c:1054

2777 +msgid "-b, -B and --orphan are mutually exclusive"

2778 msgstr ""

2779

2549 -#: builtin/commit.c:833

2550 -msgid "Error building trees"

2780 +#: builtin/checkout.c:1071

2781 +msgid "--track needs a branch name"

2782 msgstr ""

2783

2553 -#: builtin/commit.c:848 builtin/tag.c:361

2554 -#, c-format

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

2784 +#: builtin/checkout.c:1078

2785 +msgid "Missing branch name; try -b"

2786 msgstr ""

2787

2558 -#: builtin/commit.c:945

2559 -#, c-format

2560 -msgid "No existing author found with '%s'"

2788 +#: builtin/checkout.c:1113

2789 +msgid "invalid path specification"

2790 msgstr ""

2791

2563 -#: builtin/commit.c:960 builtin/commit.c:1160

2792 +#: builtin/checkout.c:1120

2793 #, c-format

2565 -msgid "Invalid untracked files mode '%s'"

2566 -msgstr ""

2567 -

2568 -#: builtin/commit.c:1000

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

2570 -msgstr ""

2571 -

2572 -#: builtin/commit.c:1011

2573 -msgid "You have nothing to amend."

2574 -msgstr ""

2575 -

2576 -#: builtin/commit.c:1014

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

2578 -msgstr ""

2579 -

2580 -#: builtin/commit.c:1016

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

2582 -msgstr ""

2583 -

2584 -#: builtin/commit.c:1019

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

2586 -msgstr ""

2587 -

2588 -#: builtin/commit.c:1029

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

2794 +msgid ""

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

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

2797 msgstr ""

2798

2592 -#: builtin/commit.c:1031

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

2799 +#: builtin/checkout.c:1125

2800 +#, c-format

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

2802 msgstr ""

2803

2596 -#: builtin/commit.c:1039

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

2804 +#: builtin/checkout.c:1129

2805 +msgid ""

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

2807 +"checking out of the index."

2808 msgstr ""

2809

2600 -#: builtin/commit.c:1056

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

2810 +#: builtin/clean.c:19

2811 +msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."

2812 msgstr ""

2813

2604 -#: builtin/commit.c:1058

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

2814 +#: builtin/clean.c:51

2815 +msgid "do not print names of files removed"

2816 msgstr ""

2817

2608 -#: builtin/commit.c:1060

2609 -msgid "Clever... amending the last one with dirty index."

2818 +#: builtin/clean.c:53

2819 +msgid "force"

2820 msgstr ""

2821

2612 -#: builtin/commit.c:1062

2613 -msgid "Explicit paths specified without -i nor -o; assuming --only paths..."

2822 +#: builtin/clean.c:55

2823 +msgid "remove whole directories"

2824 msgstr ""

2825

2616 -#: builtin/commit.c:1072 builtin/tag.c:577

2617 -#, c-format

2618 -msgid "Invalid cleanup mode %s"

2826 +#: builtin/clean.c:56 builtin/describe.c:413 builtin/grep.c:802

2827 +#: builtin/ls-files.c:491 builtin/name-rev.c:231 builtin/show-ref.c:199

2828 +msgid "pattern"

2829 msgstr ""

2830

2621 -#: builtin/commit.c:1077

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

2831 +#: builtin/clean.c:57

2832 +msgid "add <pattern> to ignore rules"

2833 msgstr ""

2834

2625 -#: builtin/commit.c:1260

2626 -msgid "couldn't look up newly created commit"

2835 +#: builtin/clean.c:58

2836 +msgid "remove ignored files, too"

2837 msgstr ""

2838

2629 -#: builtin/commit.c:1262

2630 -msgid "could not parse newly created commit"

2839 +#: builtin/clean.c:60

2840 +msgid "remove only ignored files"

2841 msgstr ""

2842

2633 -#: builtin/commit.c:1303

2634 -msgid "detached HEAD"

2843 +#: builtin/clean.c:78

2844 +msgid "-x and -X cannot be used together"

2845 msgstr ""

2846

2637 -#: builtin/commit.c:1305

2638 -msgid " (root-commit)"

2847 +#: builtin/clean.c:82

2848 +msgid ""

2849 +"clean.requireForce set to true and neither -n nor -f given; refusing to clean"

2850 msgstr ""

2851

2641 -#: builtin/commit.c:1449

2642 -msgid "could not parse HEAD commit"

2852 +#: builtin/clean.c:85

2853 +msgid ""

2854 +"clean.requireForce defaults to true and neither -n nor -f given; refusing to "

2855 +"clean"

2856 msgstr ""

2857

2645 -#: builtin/commit.c:1487 builtin/merge.c:508

2858 +#: builtin/clean.c:155 builtin/clean.c:176

2859 #, c-format

2647 -msgid "could not open '%s' for reading"

2860 +msgid "Would remove %s\n"

2861 msgstr ""

2862

2650 -#: builtin/commit.c:1494

2863 +#: builtin/clean.c:159 builtin/clean.c:179

2864 #, c-format

2652 -msgid "Corrupt MERGE_HEAD file (%s)"

2653 -msgstr ""

2654 -

2655 -#: builtin/commit.c:1501

2656 -msgid "could not read MERGE_MODE"

2865 +msgid "Removing %s\n"

2866 msgstr ""

2867

2659 -#: builtin/commit.c:1520

2868 +#: builtin/clean.c:162 builtin/clean.c:182

2869 #, c-format

2661 -msgid "could not read commit message: %s"

2870 +msgid "failed to remove %s"

2871 msgstr ""

2872

2664 -#: builtin/commit.c:1534

2873 +#: builtin/clean.c:166

2874 #, c-format

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

2875 +msgid "Would not remove %s\n"

2876 msgstr ""

2877

2669 -#: builtin/commit.c:1539

2878 +#: builtin/clean.c:168

2879 #, c-format

2671 -msgid "Aborting commit due to empty commit message.\n"

2880 +msgid "Not removing %s\n"

2881 msgstr ""

2882

2674 -#: builtin/commit.c:1554 builtin/merge.c:935 builtin/merge.c:960

2675 -msgid "failed to write commit object"

2883 +#: builtin/clone.c:36

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

2885 msgstr ""

2886

2678 -#: builtin/commit.c:1575

2679 -msgid "cannot lock HEAD ref"

2887 +#: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:212

2888 +#: builtin/push.c:399

2889 +msgid "force progress reporting"

2890 msgstr ""

2891

2682 -#: builtin/commit.c:1579

2683 -msgid "cannot update HEAD ref"

2892 +#: builtin/clone.c:66

2893 +msgid "don't create a checkout"

2894 msgstr ""

2895

2686 -#: builtin/commit.c:1590

2687 -msgid ""

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

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

2690 -"not exceeded, and then \"git reset HEAD\" to recover."

2896 +#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488

2897 +msgid "create a bare repository"

2898 msgstr ""

2899

2693 -#: builtin/describe.c:234

2694 -#, c-format

2695 -msgid "annotated tag %s not available"

2900 +#: builtin/clone.c:72

2901 +msgid "create a mirror repository (implies bare)"

2902 msgstr ""

2903

2698 -#: builtin/describe.c:238

2699 -#, c-format

2700 -msgid "annotated tag %s has no embedded name"

2904 +#: builtin/clone.c:74

2905 +msgid "to clone from a local repository"

2906 msgstr ""

2907

2703 -#: builtin/describe.c:240

2704 -#, c-format

2705 -msgid "tag '%s' is really '%s' here"

2908 +#: builtin/clone.c:76

2909 +msgid "don't use local hardlinks, always copy"

2910 msgstr ""

2911

2708 -#: builtin/describe.c:267

2709 -#, c-format

2710 -msgid "Not a valid object name %s"

2912 +#: builtin/clone.c:78

2913 +msgid "setup as shared repository"

2914 msgstr ""

2915

2713 -#: builtin/describe.c:270

2714 -#, c-format

2715 -msgid "%s is not a valid '%s' object"

2916 +#: builtin/clone.c:80 builtin/clone.c:82

2917 +msgid "initialize submodules in the clone"

2918 msgstr ""

2919

2718 -#: builtin/describe.c:287

2719 -#, c-format

2720 -msgid "no tag exactly matches '%s'"

2920 +#: builtin/clone.c:83 builtin/init-db.c:485

2921 +msgid "template-directory"

2922 msgstr ""

2923

2723 -#: builtin/describe.c:289

2724 -#, c-format

2725 -msgid "searching to describe %s\n"

2924 +#: builtin/clone.c:84 builtin/init-db.c:486

2925 +msgid "directory from which templates will be used"

2926 msgstr ""

2927

2728 -#: builtin/describe.c:329

2729 -#, c-format

2730 -msgid "finished search at %s\n"

2928 +#: builtin/clone.c:86

2929 +msgid "reference repository"

2930 msgstr ""

2931

2733 -#: builtin/describe.c:353

2734 -#, c-format

2735 -msgid ""

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

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

2932 +#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44

2933 +msgid "name"

2934 msgstr ""

2935

2740 -#: builtin/describe.c:357

2741 -#, c-format

2742 -msgid ""

2743 -"No tags can describe '%s'.\n"

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

2936 +#: builtin/clone.c:88

2937 +msgid "use <name> instead of 'origin' to track upstream"

2938 msgstr ""

2939

2747 -#: builtin/describe.c:378

2748 -#, c-format

2749 -msgid "traversed %lu commits\n"

2940 +#: builtin/clone.c:90

2941 +msgid "checkout <branch> instead of the remote's HEAD"

2942 msgstr ""

2943

2752 -#: builtin/describe.c:381

2753 -#, c-format

2754 -msgid ""

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

2756 -"gave up search at %s\n"

2944 +#: builtin/clone.c:92

2945 +msgid "path to git-upload-pack on the remote"

2946 msgstr ""

2947

2759 -#: builtin/describe.c:436

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

2948 +#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:747

2949 +msgid "depth"

2950 msgstr ""

2951

2763 -#: builtin/describe.c:462

2764 -msgid "No names found, cannot describe anything."

2952 +#: builtin/clone.c:94

2953 +msgid "create a shallow clone of that depth"

2954 msgstr ""

2955

2767 -#: builtin/describe.c:482

2768 -msgid "--dirty is incompatible with committishes"

2956 +#: builtin/clone.c:96

2957 +msgid "clone only one branch, HEAD or --branch"

2958 msgstr ""

2959

2771 -#: builtin/diff.c:79

2772 -#, c-format

2773 -msgid "'%s': not a regular file or symlink"

2960 +#: builtin/clone.c:97 builtin/init-db.c:494

2961 +msgid "gitdir"

2962 msgstr ""

2963

2776 -#: builtin/diff.c:224

2777 -#, c-format

2778 -msgid "invalid option: %s"

2964 +#: builtin/clone.c:98 builtin/init-db.c:495

2965 +msgid "separate git dir from working tree"

2966 msgstr ""

2967

2781 -#: builtin/diff.c:301

2782 -msgid "Not a git repository"

2968 +#: builtin/clone.c:99

2969 +msgid "key=value"

2970 msgstr ""

2971

2785 -#: builtin/diff.c:344

2786 -#, c-format

2787 -msgid "invalid object '%s' given."

2972 +#: builtin/clone.c:100

2973 +msgid "set config inside the new repository"

2974 msgstr ""

2975

2790 -#: builtin/diff.c:349

2976 +#: builtin/clone.c:243

2977 #, c-format

2792 -msgid "more than %d trees given: '%s'"

2978 +msgid "reference repository '%s' is not a local directory."

2979 msgstr ""

2980

2795 -#: builtin/diff.c:359

2981 +#: builtin/clone.c:306

2982 #, c-format

2797 -msgid "more than two blobs given: '%s'"

2983 +msgid "failed to create directory '%s'"

2984 msgstr ""

2985

2800 -#: builtin/diff.c:367

2986 +#: builtin/clone.c:308 builtin/diff.c:77

2987 #, c-format

2802 -msgid "unhandled object '%s' given."

2803 -msgstr ""

2804 -

2805 -#: builtin/fetch.c:200

2806 -msgid "Couldn't find remote ref HEAD"

2988 +msgid "failed to stat '%s'"

2989 msgstr ""

2990

2809 -#: builtin/fetch.c:253

2991 +#: builtin/clone.c:310

2992 #, c-format

2811 -msgid "object %s not found"

2993 +msgid "%s exists and is not a directory"

2994 msgstr ""

2995

2814 -#: builtin/fetch.c:259

2815 -msgid "[up to date]"

2996 +#: builtin/clone.c:324

2997 +#, c-format

2998 +msgid "failed to stat %s\n"

2999 msgstr ""

3000

2818 -#: builtin/fetch.c:273

3001 +#: builtin/clone.c:346

3002 #, c-format

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

3003 +msgid "failed to create link '%s'"

3004 msgstr ""

3005

2823 -#: builtin/fetch.c:274 builtin/fetch.c:360

2824 -msgid "[rejected]"

3006 +#: builtin/clone.c:350

3007 +#, c-format

3008 +msgid "failed to copy file to '%s'"

3009 msgstr ""

3010

2827 -#: builtin/fetch.c:285

2828 -msgid "[tag update]"

3011 +#: builtin/clone.c:373

3012 +#, c-format

3013 +msgid "done.\n"

3014 msgstr ""

3015

2831 -#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340

2832 -msgid " (unable to update local ref)"

3016 +#: builtin/clone.c:443

3017 +#, c-format

3018 +msgid "Could not find remote branch %s to clone."

3019 msgstr ""

3020

2835 -#: builtin/fetch.c:305

2836 -msgid "[new tag]"

3021 +#: builtin/clone.c:552

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

3023 msgstr ""

3024

2839 -#: builtin/fetch.c:308

2840 -msgid "[new branch]"

3025 +#: builtin/clone.c:642

3026 +msgid "Too many arguments."

3027 msgstr ""

3028

2843 -#: builtin/fetch.c:311

2844 -msgid "[new ref]"

3029 +#: builtin/clone.c:646

3030 +msgid "You must specify a repository to clone."

3031 msgstr ""

3032

2847 -#: builtin/fetch.c:356

2848 -msgid "unable to update local ref"

3033 +#: builtin/clone.c:657

3034 +#, c-format

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

3036 msgstr ""

3037

2851 -#: builtin/fetch.c:356

2852 -msgid "forced update"

3038 +#: builtin/clone.c:671

3039 +#, c-format

3040 +msgid "repository '%s' does not exist"

3041 msgstr ""

3042

2855 -#: builtin/fetch.c:362

2856 -msgid "(non-fast-forward)"

3043 +#: builtin/clone.c:676

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

3045 msgstr ""

3046

2859 -#: builtin/fetch.c:393 builtin/fetch.c:685

3047 +#: builtin/clone.c:686

3048 #, c-format

2861 -msgid "cannot open %s: %s\n"

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

3050 msgstr ""

3051

2864 -#: builtin/fetch.c:402

3052 +#: builtin/clone.c:696

3053 #, c-format

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

3054 +msgid "working tree '%s' already exists."

3055 msgstr ""

3056

2869 -#: builtin/fetch.c:488

3057 +#: builtin/clone.c:709 builtin/clone.c:723

3058 #, c-format

2871 -msgid "From %.*s\n"

3059 +msgid "could not create leading directories of '%s'"

3060 msgstr ""

3061

2874 -#: builtin/fetch.c:499

3062 +#: builtin/clone.c:712

3063 #, c-format

2876 -msgid ""

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

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

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

3065 msgstr ""

3066

2881 -#: builtin/fetch.c:549

3067 +#: builtin/clone.c:731

3068 #, c-format

2883 -msgid " (%s will become dangling)"

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

3070 msgstr ""

3071

2886 -#: builtin/fetch.c:550

3072 +#: builtin/clone.c:733

3073 #, c-format

2888 -msgid " (%s has become dangling)"

2889 -msgstr ""

2890 -

2891 -#: builtin/fetch.c:557

2892 -msgid "[deleted]"

2893 -msgstr ""

2894 -

2895 -#: builtin/fetch.c:558 builtin/remote.c:1055

2896 -msgid "(none)"

3074 +msgid "Cloning into '%s'...\n"

3075 msgstr ""

3076

2899 -#: builtin/fetch.c:675

3077 +#: builtin/clone.c:789

3078 #, c-format

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

3079 +msgid "Don't know how to clone %s"

3080 msgstr ""

3081

2904 -#: builtin/fetch.c:709

3082 +#: builtin/clone.c:838

3083 #, c-format

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

3084 +msgid "Remote branch %s not found in upstream %s"

3085 msgstr ""

3086

2909 -#: builtin/fetch.c:786

2910 -#, c-format

2911 -msgid "Option \"%s\" value \"%s\" is not valid for %s"

3087 +#: builtin/clone.c:845

3088 +msgid "You appear to have cloned an empty repository."

3089 msgstr ""

3090

2914 -#: builtin/fetch.c:789

2915 -#, c-format

2916 -msgid "Option \"%s\" is ignored for %s\n"

3091 +#: builtin/column.c:9

3092 +msgid "git column [options]"

3093 msgstr ""

3094

2919 -#: builtin/fetch.c:888

2920 -#, c-format

2921 -msgid "Fetching %s\n"

3095 +#: builtin/column.c:26

3096 +msgid "lookup config vars"

3097 msgstr ""

3098

2924 -#: builtin/fetch.c:890 builtin/remote.c:100

2925 -#, c-format

2926 -msgid "Could not fetch %s"

3099 +#: builtin/column.c:27 builtin/column.c:28

3100 +msgid "layout to use"

3101 msgstr ""

3102

2929 -#: builtin/fetch.c:907

2930 -msgid ""

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

2932 -"remote name from which new revisions should be fetched."

3103 +#: builtin/column.c:29

3104 +msgid "Maximum width"

3105 msgstr ""

3106

2935 -#: builtin/fetch.c:927

2936 -msgid "You need to specify a tag name."

3107 +#: builtin/column.c:30

3108 +msgid "Padding space on left border"

3109 msgstr ""

3110

2939 -#: builtin/fetch.c:979

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

3111 +#: builtin/column.c:31

3112 +msgid "Padding space on right border"

3113 msgstr ""

3114

2943 -#: builtin/fetch.c:981

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

3115 +#: builtin/column.c:32

3116 +msgid "Padding space between columns"

3117 msgstr ""

3118

2947 -#: builtin/fetch.c:992

2948 -#, c-format

2949 -msgid "No such remote or remote group: %s"

3119 +#: builtin/column.c:51

3120 +msgid "--command must be the first argument"

3121 msgstr ""

3122

2952 -#: builtin/fetch.c:1000

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

3123 +#: builtin/commit.c:33

3124 +msgid "git commit [options] [--] <filepattern>..."

3125 msgstr ""

3126

2956 -#: builtin/gc.c:63

2957 -#, c-format

2958 -msgid "Invalid %s: '%s'"

3127 +#: builtin/commit.c:38

3128 +msgid "git status [options] [--] <filepattern>..."

3129 msgstr ""

3130

2961 -#: builtin/gc.c:90

2962 -#, c-format

2963 -msgid "insanely long object directory %.*s"

3131 +#: builtin/commit.c:43

3132 +msgid ""

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

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

3135 +"You can suppress this message by setting them explicitly:\n"

3136 +"\n"

3137 +" git config --global user.name \"Your Name\"\n"

3138 +" git config --global user.email you@example.com\n"

3139 +"\n"

3140 +"After doing this, you may fix the identity used for this commit with:\n"

3141 +"\n"

3142 +" git commit --amend --reset-author\n"

3143 msgstr ""

3144

2966 -#: builtin/gc.c:221

2967 -#, c-format

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

3145 +#: builtin/commit.c:55

3146 +msgid ""

3147 +"You asked to amend the most recent commit, but doing so would make\n"

3148 +"it empty. You can repeat your command with --allow-empty, or you can\n"

3149 +"remove the commit entirely with \"git reset HEAD^\".\n"

3150 msgstr ""

3151

2971 -#: builtin/gc.c:224

2972 -#, c-format

3152 +#: builtin/commit.c:60

3153 msgid ""

2974 -"Auto packing the repository for optimum performance. You may also\n"

2975 -"run \"git gc\" manually. See \"git help gc\" for more information.\n"

3154 +"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"

3155 +"If you wish to commit it anyway, use:\n"

3156 +"\n"

3157 +" git commit --allow-empty\n"

3158 +"\n"

3159 +"Otherwise, please use 'git reset'\n"

3160 msgstr ""

3161

2978 -#: builtin/gc.c:251

2979 -msgid ""

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

3162 +#: builtin/commit.c:256

3163 +msgid "failed to unpack HEAD tree object"

3164 msgstr ""

3165

2983 -#: builtin/grep.c:216

2984 -#, c-format

2985 -msgid "grep: failed to create thread: %s"

3166 +#: builtin/commit.c:298

3167 +msgid "unable to create temporary index"

3168 msgstr ""

3169

2988 -#: builtin/grep.c:454

2989 -#, c-format

2990 -msgid "Failed to chdir: %s"

3170 +#: builtin/commit.c:304

3171 +msgid "interactive add failed"

3172 msgstr ""

3173

2993 -#: builtin/grep.c:530 builtin/grep.c:564

2994 -#, c-format

2995 -msgid "unable to read tree (%s)"

3174 +#: builtin/commit.c:337 builtin/commit.c:358 builtin/commit.c:408

3175 +msgid "unable to write new_index file"

3176 msgstr ""

3177

2998 -#: builtin/grep.c:578

2999 -#, c-format

3000 -msgid "unable to grep from object of type %s"

3178 +#: builtin/commit.c:389

3179 +msgid "cannot do a partial commit during a merge."

3180 msgstr ""

3181

3003 -#: builtin/grep.c:636

3004 -#, c-format

3005 -msgid "switch `%c' expects a numerical value"

3182 +#: builtin/commit.c:391

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

3184 msgstr ""

3185

3008 -#: builtin/grep.c:653

3009 -#, c-format

3010 -msgid "cannot open '%s'"

3186 +#: builtin/commit.c:401

3187 +msgid "cannot read the index"

3188 msgstr ""

3189

3013 -#: builtin/grep.c:917

3014 -msgid "no pattern given."

3190 +#: builtin/commit.c:421

3191 +msgid "unable to write temporary index file"

3192 msgstr ""

3193

3017 -#: builtin/grep.c:931

3194 +#: builtin/commit.c:510 builtin/commit.c:516

3195 #, c-format

3019 -msgid "bad object %s"

3196 +msgid "invalid commit: %s"

3197 msgstr ""

3198

3022 -#: builtin/grep.c:972

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

3199 +#: builtin/commit.c:539

3200 +msgid "malformed --author parameter"

3201 msgstr ""

3202

3026 -#: builtin/grep.c:995

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

3203 +#: builtin/commit.c:600

3204 +#, c-format

3205 +msgid "Malformed ident string: '%s'"

3206 msgstr ""

3207

3030 -#: builtin/grep.c:1000

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

3208 +#: builtin/commit.c:638 builtin/commit.c:671 builtin/commit.c:985

3209 +#, c-format

3210 +msgid "could not lookup commit %s"

3211 msgstr ""

3212

3034 -#: builtin/grep.c:1003

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

3213 +#: builtin/commit.c:650 builtin/shortlog.c:296

3214 +#, c-format

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

3216 msgstr ""

3217

3038 -#: builtin/grep.c:1011

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

3218 +#: builtin/commit.c:652

3219 +msgid "could not read log from standard input"

3220 msgstr ""

3221

3042 -#: builtin/help.c:65

3222 +#: builtin/commit.c:656

3223 #, c-format

3044 -msgid "unrecognized help format '%s'"

3224 +msgid "could not read log file '%s'"

3225 msgstr ""

3226

3047 -#: builtin/help.c:93

3048 -msgid "Failed to start emacsclient."

3227 +#: builtin/commit.c:662

3228 +msgid "commit has empty message"

3229 msgstr ""

3230

3051 -#: builtin/help.c:106

3052 -msgid "Failed to parse emacsclient version."

3231 +#: builtin/commit.c:678

3232 +msgid "could not read MERGE_MSG"

3233 msgstr ""

3234

3055 -#: builtin/help.c:114

3056 -#, c-format

3057 -msgid "emacsclient version '%d' too old (< 22)."

3235 +#: builtin/commit.c:682

3236 +msgid "could not read SQUASH_MSG"

3237 msgstr ""

3238

3060 -#: builtin/help.c:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177

3239 +#: builtin/commit.c:686

3240 #, c-format

3062 -msgid "failed to exec '%s': %s"

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

3242 msgstr ""

3243

3065 -#: builtin/help.c:217

3244 +#: builtin/commit.c:738

3245 +msgid "could not write commit template"

3246 +msgstr ""

3247 +

3248 +#: builtin/commit.c:749

3249 #, c-format

3250 msgid ""

3068 -"'%s': path for unsupported man viewer.\n"

3069 -"Please consider using 'man.<tool>.cmd' instead."

3251 +"\n"

3252 +"It looks like you may be committing a merge.\n"

3253 +"If this is not correct, please remove the file\n"

3254 +"\t%s\n"

3255 +"and try again.\n"

3256 msgstr ""

3257

3072 -#: builtin/help.c:229

3258 +#: builtin/commit.c:754

3259 #, c-format

3260 msgid ""

3075 -"'%s': cmd for supported man viewer.\n"

3076 -"Please consider using 'man.<tool>.path' instead."

3261 +"\n"

3262 +"It looks like you may be committing a cherry-pick.\n"

3263 +"If this is not correct, please remove the file\n"

3264 +"\t%s\n"

3265 +"and try again.\n"

3266 msgstr ""

3267

3079 -#: builtin/help.c:299

3080 -msgid "The most commonly used git commands are:"

3268 +#: builtin/commit.c:766

3269 +msgid ""

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

3271 +"with '#' will be ignored, and an empty message aborts the commit.\n"

3272 msgstr ""

3273

3083 -#: builtin/help.c:367

3274 +#: builtin/commit.c:771

3275 +msgid ""

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

3277 +"with '#' will be kept; you may remove them yourself if you want to.\n"

3278 +"An empty message aborts the commit.\n"

3279 +msgstr ""

3280 +

3281 +#: builtin/commit.c:784

3282 #, c-format

3085 -msgid "'%s': unknown man viewer."

3283 +msgid "%sAuthor: %s"

3284 msgstr ""

3285

3088 -#: builtin/help.c:384

3089 -msgid "no man viewer handled the request"

3286 +#: builtin/commit.c:791

3287 +#, c-format

3288 +msgid "%sCommitter: %s"

3289 msgstr ""

3290

3092 -#: builtin/help.c:392

3093 -msgid "no info viewer handled the request"

3291 +#: builtin/commit.c:811

3292 +msgid "Cannot read index"

3293 msgstr ""

3294

3096 -#: builtin/help.c:447 builtin/help.c:454

3097 -#, c-format

3098 -msgid "usage: %s%s"

3295 +#: builtin/commit.c:848

3296 +msgid "Error building trees"

3297 msgstr ""

3298

3101 -#: builtin/help.c:470

3299 +#: builtin/commit.c:863 builtin/tag.c:361

3300 #, c-format

3103 -msgid "`git %s' is aliased to `%s'"

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

3302 msgstr ""

3303

3106 -#: builtin/index-pack.c:170

3304 +#: builtin/commit.c:960

3305 #, c-format

3108 -msgid "object type mismatch at %s"

3306 +msgid "No existing author found with '%s'"

3307 msgstr ""

3308

3111 -#: builtin/index-pack.c:190

3112 -msgid "object of unexpected type"

3309 +#: builtin/commit.c:975 builtin/commit.c:1175

3310 +#, c-format

3311 +msgid "Invalid untracked files mode '%s'"

3312 msgstr ""

3313

3115 -#: builtin/index-pack.c:227

3116 -#, c-format

3117 -msgid "cannot fill %d byte"

3118 -msgid_plural "cannot fill %d bytes"

3119 -msgstr[0] ""

3120 -msgstr[1] ""

3314 +#: builtin/commit.c:1015

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

3316 +msgstr ""

3317

3122 -#: builtin/index-pack.c:237

3123 -msgid "early EOF"

3318 +#: builtin/commit.c:1026

3319 +msgid "You have nothing to amend."

3320 msgstr ""

3321

3126 -#: builtin/index-pack.c:238

3127 -msgid "read error on input"

3322 +#: builtin/commit.c:1029

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

3324 msgstr ""

3325

3130 -#: builtin/index-pack.c:250

3131 -msgid "used more bytes than were available"

3326 +#: builtin/commit.c:1031

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

3328 msgstr ""

3329

3134 -#: builtin/index-pack.c:257

3135 -msgid "pack too large for current definition of off_t"

3330 +#: builtin/commit.c:1034

3331 +msgid "Options --squash and --fixup cannot be used together"

3332 msgstr ""

3333

3138 -#: builtin/index-pack.c:273

3139 -#, c-format

3140 -msgid "unable to create '%s'"

3334 +#: builtin/commit.c:1044

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

3336 msgstr ""

3337

3143 -#: builtin/index-pack.c:278

3144 -#, c-format

3145 -msgid "cannot open packfile '%s'"

3338 +#: builtin/commit.c:1046

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

3340 msgstr ""

3341

3148 -#: builtin/index-pack.c:292

3149 -msgid "pack signature mismatch"

3342 +#: builtin/commit.c:1054

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

3344 msgstr ""

3345

3152 -#: builtin/index-pack.c:312

3153 -#, c-format

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

3346 +#: builtin/commit.c:1071

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

3348 msgstr ""

3349

3157 -#: builtin/index-pack.c:434

3158 -#, c-format

3159 -msgid "inflate returned %d"

3350 +#: builtin/commit.c:1073

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

3352 msgstr ""

3353

3162 -#: builtin/index-pack.c:483

3163 -msgid "offset value overflow for delta base object"

3354 +#: builtin/commit.c:1075

3355 +msgid "Clever... amending the last one with dirty index."

3356 msgstr ""

3357

3166 -#: builtin/index-pack.c:491

3167 -msgid "delta base offset is out of bound"

3358 +#: builtin/commit.c:1077

3359 +msgid "Explicit paths specified without -i nor -o; assuming --only paths..."

3360 msgstr ""

3361

3170 -#: builtin/index-pack.c:499

3362 +#: builtin/commit.c:1087 builtin/tag.c:577

3363 #, c-format

3172 -msgid "unknown object type %d"

3364 +msgid "Invalid cleanup mode %s"

3365 msgstr ""

3366

3175 -#: builtin/index-pack.c:530

3176 -msgid "cannot pread pack file"

3367 +#: builtin/commit.c:1092

3368 +msgid "Paths with -a does not make sense."

3369 msgstr ""

3370

3179 -#: builtin/index-pack.c:532

3180 -#, c-format

3181 -msgid "premature end of pack file, %lu byte missing"

3182 -msgid_plural "premature end of pack file, %lu bytes missing"

3183 -msgstr[0] ""

3184 -msgstr[1] ""

3371 +#: builtin/commit.c:1189 builtin/commit.c:1417

3372 +msgid "show status concisely"

3373 +msgstr ""

3374

3186 -#: builtin/index-pack.c:558

3187 -msgid "serious inflate inconsistency"

3375 +#: builtin/commit.c:1191 builtin/commit.c:1419

3376 +msgid "show branch information"

3377 msgstr ""

3378

3190 -#: builtin/index-pack.c:649 builtin/index-pack.c:655 builtin/index-pack.c:678

3191 -#: builtin/index-pack.c:712 builtin/index-pack.c:721

3192 -#, c-format

3193 -msgid "SHA1 COLLISION FOUND WITH %s !"

3379 +#: builtin/commit.c:1193 builtin/commit.c:1421 builtin/push.c:389

3380 +msgid "machine-readable output"

3381 msgstr ""

3382

3196 -#: builtin/index-pack.c:652 builtin/pack-objects.c:170

3197 -#: builtin/pack-objects.c:262

3198 -#, c-format

3199 -msgid "unable to read %s"

3383 +#: builtin/commit.c:1196 builtin/commit.c:1423

3384 +msgid "terminate entries with NUL"

3385 msgstr ""

3386

3202 -#: builtin/index-pack.c:718

3203 -#, c-format

3204 -msgid "cannot read existing object %s"

3387 +#: builtin/commit.c:1198 builtin/commit.c:1426 builtin/fast-export.c:636

3388 +#: builtin/fast-export.c:639 builtin/tag.c:461

3389 +msgid "mode"

3390 msgstr ""

3391

3207 -#: builtin/index-pack.c:732

3208 -#, c-format

3209 -msgid "invalid blob object %s"

3392 +#: builtin/commit.c:1199 builtin/commit.c:1426

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

3394 msgstr ""

3395

3212 -#: builtin/index-pack.c:747

3213 -#, c-format

3214 -msgid "invalid %s"

3396 +#: builtin/commit.c:1202

3397 +msgid "show ignored files"

3398 msgstr ""

3399

3217 -#: builtin/index-pack.c:749

3218 -msgid "Error in object"

3400 +#: builtin/commit.c:1203 parse-options.h:151

3401 +msgid "when"

3402 msgstr ""

3403

3221 -#: builtin/index-pack.c:751

3222 -#, c-format

3223 -msgid "Not all child objects of %s are reachable"

3404 +#: builtin/commit.c:1204

3405 +msgid ""

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

3407 +"(Default: all)"

3408 msgstr ""

3409

3226 -#: builtin/index-pack.c:821 builtin/index-pack.c:847

3227 -msgid "failed to apply delta"

3410 +#: builtin/commit.c:1206

3411 +msgid "list untracked files in columns"

3412 msgstr ""

3413

3230 -#: builtin/index-pack.c:986

3231 -msgid "Receiving objects"

3414 +#: builtin/commit.c:1275

3415 +msgid "couldn't look up newly created commit"

3416 msgstr ""

3417

3234 -#: builtin/index-pack.c:986

3235 -msgid "Indexing objects"

3418 +#: builtin/commit.c:1277

3419 +msgid "could not parse newly created commit"

3420 msgstr ""

3421

3238 -#: builtin/index-pack.c:1012

3239 -msgid "pack is corrupted (SHA1 mismatch)"

3422 +#: builtin/commit.c:1318

3423 +msgid "detached HEAD"

3424 msgstr ""

3425

3242 -#: builtin/index-pack.c:1017

3243 -msgid "cannot fstat packfile"

3426 +#: builtin/commit.c:1320

3427 +msgid " (root-commit)"

3428 msgstr ""

3429

3246 -#: builtin/index-pack.c:1020

3247 -msgid "pack has junk at the end"

3430 +#: builtin/commit.c:1387

3431 +msgid "suppress summary after successful commit"

3432 msgstr ""

3433

3250 -#: builtin/index-pack.c:1031

3251 -msgid "confusion beyond insanity in parse_pack_objects()"

3434 +#: builtin/commit.c:1388

3435 +msgid "show diff in commit message template"

3436 msgstr ""

3437

3254 -#: builtin/index-pack.c:1054

3255 -msgid "Resolving deltas"

3438 +#: builtin/commit.c:1390

3439 +msgid "Commit message options"

3440 msgstr ""

3441

3258 -#: builtin/index-pack.c:1105

3259 -msgid "confusion beyond insanity"

3442 +#: builtin/commit.c:1391 builtin/tag.c:459

3443 +msgid "read message from file"

3444 msgstr ""

3445

3262 -#: builtin/index-pack.c:1124

3263 -#, c-format

3264 -msgid "pack has %d unresolved delta"

3265 -msgid_plural "pack has %d unresolved deltas"

3266 -msgstr[0] ""

3267 -msgstr[1] ""

3268 -

3269 -#: builtin/index-pack.c:1149

3270 -#, c-format

3271 -msgid "unable to deflate appended object (%d)"

3446 +#: builtin/commit.c:1392

3447 +msgid "author"

3448 msgstr ""

3449

3274 -#: builtin/index-pack.c:1228

3275 -#, c-format

3276 -msgid "local object %s is corrupt"

3450 +#: builtin/commit.c:1392

3451 +msgid "override author for commit"

3452 msgstr ""

3453

3279 -#: builtin/index-pack.c:1252

3280 -msgid "error while closing pack file"

3454 +#: builtin/commit.c:1393 builtin/gc.c:178

3455 +msgid "date"

3456 msgstr ""

3457

3283 -#: builtin/index-pack.c:1265

3284 -#, c-format

3285 -msgid "cannot write keep file '%s'"

3458 +#: builtin/commit.c:1393

3459 +msgid "override date for commit"

3460 msgstr ""

3461

3288 -#: builtin/index-pack.c:1273

3289 -#, c-format

3290 -msgid "cannot close written keep file '%s'"

3462 +#: builtin/commit.c:1394 builtin/merge.c:206 builtin/notes.c:534

3463 +#: builtin/notes.c:691 builtin/tag.c:457

3464 +msgid "message"

3465 msgstr ""

3466

3293 -#: builtin/index-pack.c:1286

3294 -msgid "cannot store pack file"

3467 +#: builtin/commit.c:1394

3468 +msgid "commit message"

3469 msgstr ""

3470

3297 -#: builtin/index-pack.c:1297

3298 -msgid "cannot store index file"

3471 +#: builtin/commit.c:1395

3472 +msgid "reuse and edit message from specified commit"

3473 msgstr ""

3474

3301 -#: builtin/index-pack.c:1398

3302 -#, c-format

3303 -msgid "Cannot open existing pack file '%s'"

3475 +#: builtin/commit.c:1396

3476 +msgid "reuse message from specified commit"

3477 msgstr ""

3478

3306 -#: builtin/index-pack.c:1400

3307 -#, c-format

3308 -msgid "Cannot open existing pack idx file for '%s'"

3479 +#: builtin/commit.c:1397

3480 +msgid "use autosquash formatted message to fixup specified commit"

3481 msgstr ""

3482

3311 -#: builtin/index-pack.c:1447

3312 -#, c-format

3313 -msgid "non delta: %d object"

3314 -msgid_plural "non delta: %d objects"

3315 -msgstr[0] ""

3316 -msgstr[1] ""

3483 +#: builtin/commit.c:1398

3484 +msgid "use autosquash formatted message to squash specified commit"

3485 +msgstr ""

3486

3318 -#: builtin/index-pack.c:1454

3319 -#, c-format

3320 -msgid "chain length = %d: %lu object"

3321 -msgid_plural "chain length = %d: %lu objects"

3322 -msgstr[0] ""

3323 -msgstr[1] ""

3487 +#: builtin/commit.c:1399

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

3489 +msgstr ""

3490

3325 -#: builtin/index-pack.c:1481

3326 -msgid "Cannot come back to cwd"

3491 +#: builtin/commit.c:1400 builtin/log.c:1068 builtin/revert.c:109

3492 +msgid "add Signed-off-by:"

3493 msgstr ""

3494

3329 -#: builtin/index-pack.c:1525 builtin/index-pack.c:1528

3330 -#: builtin/index-pack.c:1540 builtin/index-pack.c:1544

3331 -#, c-format

3332 -msgid "bad %s"

3495 +#: builtin/commit.c:1401

3496 +msgid "use specified template file"

3497 msgstr ""

3498

3335 -#: builtin/index-pack.c:1558

3336 -msgid "--fix-thin cannot be used without --stdin"

3499 +#: builtin/commit.c:1402

3500 +msgid "force edit of commit"

3501 msgstr ""

3502

3339 -#: builtin/index-pack.c:1562 builtin/index-pack.c:1572

3340 -#, c-format

3341 -msgid "packfile name '%s' does not end with '.pack'"

3503 +#: builtin/commit.c:1403

3504 +msgid "default"

3505 msgstr ""

3506

3344 -#: builtin/index-pack.c:1581

3345 -msgid "--verify with no packfile name given"

3507 +#: builtin/commit.c:1403 builtin/tag.c:462

3508 +msgid "how to strip spaces and #comments from message"

3509 msgstr ""

3510

3348 -#: builtin/init-db.c:35

3349 -#, c-format

3350 -msgid "Could not make %s writable by group"

3511 +#: builtin/commit.c:1404

3512 +msgid "include status in commit message template"

3513 msgstr ""

3514

3353 -#: builtin/init-db.c:62

3354 -#, c-format

3355 -msgid "insanely long template name %s"

3515 +#: builtin/commit.c:1405 builtin/merge.c:213 builtin/tag.c:463

3516 +msgid "key id"

3517 msgstr ""

3518

3358 -#: builtin/init-db.c:67

3359 -#, c-format

3360 -msgid "cannot stat '%s'"

3519 +#: builtin/commit.c:1406 builtin/merge.c:214

3520 +msgid "GPG sign commit"

3521 msgstr ""

3522

3363 -#: builtin/init-db.c:73

3364 -#, c-format

3365 -msgid "cannot stat template '%s'"

3523 +#. end commit message options

3524 +#: builtin/commit.c:1409

3525 +msgid "Commit contents options"

3526 msgstr ""

3527

3368 -#: builtin/init-db.c:80

3369 -#, c-format

3370 -msgid "cannot opendir '%s'"

3528 +#: builtin/commit.c:1410

3529 +msgid "commit all changed files"

3530 msgstr ""

3531

3373 -#: builtin/init-db.c:97

3374 -#, c-format

3375 -msgid "cannot readlink '%s'"

3532 +#: builtin/commit.c:1411

3533 +msgid "add specified files to index for commit"

3534 msgstr ""

3535

3378 -#: builtin/init-db.c:99

3379 -#, c-format

3380 -msgid "insanely long symlink %s"

3536 +#: builtin/commit.c:1412

3537 +msgid "interactively add files"

3538 msgstr ""

3539

3383 -#: builtin/init-db.c:102

3384 -#, c-format

3385 -msgid "cannot symlink '%s' '%s'"

3540 +#: builtin/commit.c:1413

3541 +msgid "interactively add changes"

3542 msgstr ""

3543

3388 -#: builtin/init-db.c:106

3389 -#, c-format

3390 -msgid "cannot copy '%s' to '%s'"

3544 +#: builtin/commit.c:1414

3545 +msgid "commit only specified files"

3546 msgstr ""

3547

3393 -#: builtin/init-db.c:110

3394 -#, c-format

3395 -msgid "ignoring template %s"

3548 +#: builtin/commit.c:1415

3549 +msgid "bypass pre-commit hook"

3550 msgstr ""

3551

3398 -#: builtin/init-db.c:133

3399 -#, c-format

3400 -msgid "insanely long template path %s"

3552 +#: builtin/commit.c:1416

3553 +msgid "show what would be committed"

3554 msgstr ""

3555

3403 -#: builtin/init-db.c:141

3404 -#, c-format

3405 -msgid "templates not found %s"

3556 +#: builtin/commit.c:1424

3557 +msgid "amend previous commit"

3558 msgstr ""

3559

3408 -#: builtin/init-db.c:154

3409 -#, c-format

3410 -msgid "not copying templates of a wrong format version %d from '%s'"

3560 +#: builtin/commit.c:1425

3561 +msgid "bypass post-rewrite hook"

3562 msgstr ""

3563

3413 -#: builtin/init-db.c:192

3414 -#, c-format

3415 -msgid "insane git directory %s"

3564 +#: builtin/commit.c:1430

3565 +msgid "ok to record an empty change"

3566 msgstr ""

3567

3418 -#: builtin/init-db.c:323 builtin/init-db.c:326

3419 -#, c-format

3420 -msgid "%s already exists"

3568 +#: builtin/commit.c:1433

3569 +msgid "ok to record a change with an empty message"

3570 msgstr ""

3571

3423 -#: builtin/init-db.c:355

3424 -#, c-format

3425 -msgid "unable to handle file type %d"

3572 +#: builtin/commit.c:1464

3573 +msgid "could not parse HEAD commit"

3574 msgstr ""

3575

3428 -#: builtin/init-db.c:358

3576 +#: builtin/commit.c:1502 builtin/merge.c:508

3577 #, c-format

3430 -msgid "unable to move %s to %s"

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

3579 msgstr ""

3580

3433 -#: builtin/init-db.c:363

3581 +#: builtin/commit.c:1509

3582 #, c-format

3435 -msgid "Could not create git link %s"

3583 +msgid "Corrupt MERGE_HEAD file (%s)"

3584 msgstr ""

3585

3438 -#.

3439 -#. * TRANSLATORS: The first '%s' is either "Reinitialized

3440 -#. * existing" or "Initialized empty", the second " shared" or

3441 -#. * "", and the last '%s%s' is the verbatim directory name.

3442 -#.

3443 -#: builtin/init-db.c:420

3444 -#, c-format

3445 -msgid "%s%s Git repository in %s%s\n"

3586 +#: builtin/commit.c:1516

3587 +msgid "could not read MERGE_MODE"

3588 msgstr ""

3589

3448 -#: builtin/init-db.c:421

3449 -msgid "Reinitialized existing"

3590 +#: builtin/commit.c:1535

3591 +#, c-format

3592 +msgid "could not read commit message: %s"

3593 msgstr ""

3594

3452 -#: builtin/init-db.c:421

3453 -msgid "Initialized empty"

3595 +#: builtin/commit.c:1549

3596 +#, c-format

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

3598 msgstr ""

3599

3456 -#: builtin/init-db.c:422

3457 -msgid " shared"

3600 +#: builtin/commit.c:1554

3601 +#, c-format

3602 +msgid "Aborting commit due to empty commit message.\n"

3603 msgstr ""

3604

3460 -#: builtin/init-db.c:441

3461 -msgid "cannot tell cwd"

3605 +#: builtin/commit.c:1569 builtin/merge.c:935 builtin/merge.c:960

3606 +msgid "failed to write commit object"

3607 msgstr ""

3608

3464 -#: builtin/init-db.c:522 builtin/init-db.c:529

3465 -#, c-format

3466 -msgid "cannot mkdir %s"

3609 +#: builtin/commit.c:1590

3610 +msgid "cannot lock HEAD ref"

3611 msgstr ""

3612

3469 -#: builtin/init-db.c:533

3470 -#, c-format

3471 -msgid "cannot chdir to %s"

3613 +#: builtin/commit.c:1594

3614 +msgid "cannot update HEAD ref"

3615 msgstr ""

3616

3474 -#: builtin/init-db.c:555

3475 -#, c-format

3617 +#: builtin/commit.c:1605

3618 msgid ""

3477 -"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"

3478 -"dir=<directory>)"

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

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

3621 +"not exceeded, and then \"git reset HEAD\" to recover."

3622 msgstr ""

3623

3481 -#: builtin/init-db.c:579

3482 -msgid "Cannot access current working directory"

3624 +#: builtin/config.c:7

3625 +msgid "git config [options]"

3626 msgstr ""

3627

3485 -#: builtin/init-db.c:586

3486 -#, c-format

3487 -msgid "Cannot access work tree '%s'"

3628 +#: builtin/config.c:52

3629 +msgid "Config file location"

3630 msgstr ""

3631

3490 -#: builtin/log.c:189

3491 -#, c-format

3492 -msgid "Final output: %d %s\n"

3632 +#: builtin/config.c:53

3633 +msgid "use global config file"

3634 msgstr ""

3635

3495 -#: builtin/log.c:403 builtin/log.c:494

3496 -#, c-format

3497 -msgid "Could not read object %s"

3636 +#: builtin/config.c:54

3637 +msgid "use system config file"

3638 msgstr ""

3639

3500 -#: builtin/log.c:518

3501 -#, c-format

3502 -msgid "Unknown type: %d"

3640 +#: builtin/config.c:55

3641 +msgid "use repository config file"

3642 msgstr ""

3643

3505 -#: builtin/log.c:608

3506 -msgid "format.headers without value"

3644 +#: builtin/config.c:56

3645 +msgid "use given config file"

3646 msgstr ""

3647

3509 -#: builtin/log.c:682

3510 -msgid "name of output directory is too long"

3648 +#: builtin/config.c:57

3649 +msgid "Action"

3650 msgstr ""

3651

3513 -#: builtin/log.c:693

3514 -#, c-format

3515 -msgid "Cannot open patch file %s"

3652 +#: builtin/config.c:58

3653 +msgid "get value: name [value-regex]"

3654 msgstr ""

3655

3518 -#: builtin/log.c:707

3519 -msgid "Need exactly one range."

3656 +#: builtin/config.c:59

3657 +msgid "get all values: key [value-regex]"

3658 msgstr ""

3659

3522 -#: builtin/log.c:715

3523 -msgid "Not a range."

3660 +#: builtin/config.c:60

3661 +msgid "get values for regexp: name-regex [value-regex]"

3662 msgstr ""

3663

3526 -#: builtin/log.c:789

3527 -msgid "Cover letter needs email format"

3664 +#: builtin/config.c:61

3665 +msgid "replace all matching variables: name value [value_regex]"

3666 msgstr ""

3667

3530 -#: builtin/log.c:862

3531 -#, c-format

3532 -msgid "insane in-reply-to: %s"

3668 +#: builtin/config.c:62

3669 +msgid "add a new variable: name value"

3670 msgstr ""

3671

3535 -#: builtin/log.c:935

3536 -msgid "Two output directories?"

3672 +#: builtin/config.c:63

3673 +msgid "remove a variable: name [value-regex]"

3674 msgstr ""

3675

3539 -#: builtin/log.c:1157

3540 -#, c-format

3541 -msgid "bogus committer info %s"

3676 +#: builtin/config.c:64

3677 +msgid "remove all matches: name [value-regex]"

3678 msgstr ""

3679

3544 -#: builtin/log.c:1202

3545 -msgid "-n and -k are mutually exclusive."

3680 +#: builtin/config.c:65

3681 +msgid "rename section: old-name new-name"

3682 msgstr ""

3683

3548 -#: builtin/log.c:1204

3549 -msgid "--subject-prefix and -k are mutually exclusive."

3684 +#: builtin/config.c:66

3685 +msgid "remove a section: name"

3686 msgstr ""

3687

3552 -#: builtin/log.c:1212

3553 -msgid "--name-only does not make sense"

3688 +#: builtin/config.c:67

3689 +msgid "list all"

3690 msgstr ""

3691

3556 -#: builtin/log.c:1214

3557 -msgid "--name-status does not make sense"

3692 +#: builtin/config.c:68

3693 +msgid "open an editor"

3694 msgstr ""

3695

3560 -#: builtin/log.c:1216

3561 -msgid "--check does not make sense"

3696 +#: builtin/config.c:69 builtin/config.c:70

3697 +msgid "slot"

3698 msgstr ""

3699

3564 -#: builtin/log.c:1239

3565 -msgid "standard output, or directory, which one?"

3700 +#: builtin/config.c:69

3701 +msgid "find the color configured: [default]"

3702 msgstr ""

3703

3568 -#: builtin/log.c:1241

3569 -#, c-format

3570 -msgid "Could not create directory '%s'"

3704 +#: builtin/config.c:70

3705 +msgid "find the color setting: [stdout-is-tty]"

3706 msgstr ""

3707

3573 -#: builtin/log.c:1394

3574 -msgid "Failed to create output files"

3708 +#: builtin/config.c:71

3709 +msgid "Type"

3710 msgstr ""

3711

3577 -#: builtin/log.c:1498

3578 -#, c-format

3579 -msgid ""

3580 -"Could not find a tracked remote branch, please specify <upstream> manually.\n"

3712 +#: builtin/config.c:72

3713 +msgid "value is \"true\" or \"false\""

3714 msgstr ""

3715

3583 -#: builtin/log.c:1511 builtin/log.c:1513 builtin/log.c:1525

3584 -#, c-format

3585 -msgid "Unknown commit %s"

3716 +#: builtin/config.c:73

3717 +msgid "value is decimal number"

3718 msgstr ""

3719

3588 -#: builtin/merge.c:90

3589 -msgid "switch `m' requires a value"

3720 +#: builtin/config.c:74

3721 +msgid "value is --bool or --int"

3722 msgstr ""

3723

3592 -#: builtin/merge.c:127

3593 -#, c-format

3594 -msgid "Could not find merge strategy '%s'.\n"

3724 +#: builtin/config.c:75

3725 +msgid "value is a path (file or directory name)"

3726 msgstr ""

3727

3597 -#: builtin/merge.c:128

3598 -#, c-format

3599 -msgid "Available strategies are:"

3728 +#: builtin/config.c:76

3729 +msgid "Other"

3730 msgstr ""

3731

3602 -#: builtin/merge.c:133

3603 -#, c-format

3604 -msgid "Available custom strategies are:"

3732 +#: builtin/config.c:77

3733 +msgid "terminate values with NUL byte"

3734 msgstr ""

3735

3607 -#: builtin/merge.c:240

3608 -msgid "could not run stash."

3736 +#: builtin/config.c:78

3737 +msgid "respect include directives on lookup"

3738 msgstr ""

3739

3611 -#: builtin/merge.c:245

3612 -msgid "stash failed"

3740 +#: builtin/count-objects.c:69

3741 +msgid "git count-objects [-v]"

3742 msgstr ""

3743

3615 -#: builtin/merge.c:250

3616 -#, c-format

3617 -msgid "not a valid object: %s"

3744 +#: builtin/describe.c:15

3745 +msgid "git describe [options] <committish>*"

3746 msgstr ""

3747

3620 -#: builtin/merge.c:269 builtin/merge.c:286

3621 -msgid "read-tree failed"

3748 +#: builtin/describe.c:16

3749 +msgid "git describe [options] --dirty"

3750 msgstr ""

3751

3624 -#: builtin/merge.c:316

3625 -msgid " (nothing to squash)"

3752 +#: builtin/describe.c:234

3753 +#, c-format

3754 +msgid "annotated tag %s not available"

3755 msgstr ""

3756

3628 -#: builtin/merge.c:329

3757 +#: builtin/describe.c:238

3758 #, c-format

3630 -msgid "Squash commit -- not updating HEAD\n"

3759 +msgid "annotated tag %s has no embedded name"

3760 msgstr ""

3761

3633 -#: builtin/merge.c:361

3634 -msgid "Writing SQUASH_MSG"

3762 +#: builtin/describe.c:240

3763 +#, c-format

3764 +msgid "tag '%s' is really '%s' here"

3765 msgstr ""

3766

3637 -#: builtin/merge.c:363

3638 -msgid "Finishing SQUASH_MSG"

3767 +#: builtin/describe.c:267

3768 +#, c-format

3769 +msgid "Not a valid object name %s"

3770 msgstr ""

3771

3641 -#: builtin/merge.c:386

3772 +#: builtin/describe.c:270

3773 #, c-format

3643 -msgid "No merge message -- not updating HEAD\n"

3774 +msgid "%s is not a valid '%s' object"

3775 msgstr ""

3776

3646 -#: builtin/merge.c:436

3777 +#: builtin/describe.c:287

3778 #, c-format

3648 -msgid "'%s' does not point to a commit"

3779 +msgid "no tag exactly matches '%s'"

3780 msgstr ""

3781

3651 -#: builtin/merge.c:535

3782 +#: builtin/describe.c:289

3783 #, c-format

3653 -msgid "Bad branch.%s.mergeoptions string: %s"

3784 +msgid "searching to describe %s\n"

3785 msgstr ""

3786

3656 -#: builtin/merge.c:628

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

3787 +#: builtin/describe.c:329

3788 +#, c-format

3789 +msgid "finished search at %s\n"

3790 msgstr ""

3791

3660 -#: builtin/merge.c:678

3661 -msgid "failed to read the cache"

3792 +#: builtin/describe.c:353

3793 +#, c-format

3794 +msgid ""

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

3796 +"However, there were unannotated tags: try --tags."

3797 msgstr ""

3798

3664 -#: builtin/merge.c:709

3665 -msgid "Not handling anything other than two heads merge."

3799 +#: builtin/describe.c:357

3800 +#, c-format

3801 +msgid ""

3802 +"No tags can describe '%s'.\n"

3803 +"Try --always, or create some tags."

3804 msgstr ""

3805

3668 -#: builtin/merge.c:723

3806 +#: builtin/describe.c:378

3807 #, c-format

3670 -msgid "Unknown option for merge-recursive: -X%s"

3808 +msgid "traversed %lu commits\n"

3809 msgstr ""

3810

3673 -#: builtin/merge.c:737

3811 +#: builtin/describe.c:381

3812 #, c-format

3675 -msgid "unable to write %s"

3813 +msgid ""

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

3815 +"gave up search at %s\n"

3816 msgstr ""

3817

3678 -#: builtin/merge.c:876

3679 -#, c-format

3680 -msgid "Could not read from '%s'"

3818 +#: builtin/describe.c:403

3819 +msgid "find the tag that comes after the commit"

3820 msgstr ""

3821

3683 -#: builtin/merge.c:885

3684 -#, c-format

3685 -msgid "Not committing merge; use 'git commit' to complete the merge.\n"

3822 +#: builtin/describe.c:404

3823 +msgid "debug search strategy on stderr"

3824 msgstr ""

3825

3688 -#: builtin/merge.c:891

3689 -msgid ""

3690 -"Please enter a commit message to explain why this merge is necessary,\n"

3691 -"especially if it merges an updated upstream into a topic branch.\n"

3692 -"\n"

3693 -"Lines starting with '#' will be ignored, and an empty message aborts\n"

3694 -"the commit.\n"

3826 +#: builtin/describe.c:405

3827 +msgid "use any ref in .git/refs"

3828 msgstr ""

3829

3697 -#: builtin/merge.c:915

3698 -msgid "Empty commit message."

3830 +#: builtin/describe.c:406

3831 +msgid "use any tag in .git/refs/tags"

3832 msgstr ""

3833

3701 -#: builtin/merge.c:927

3702 -#, c-format

3703 -msgid "Wonderful.\n"

3834 +#: builtin/describe.c:407

3835 +msgid "always use long format"

3836 msgstr ""

3837

3706 -#: builtin/merge.c:992

3707 -#, c-format

3708 -msgid "Automatic merge failed; fix conflicts and then commit the result.\n"

3838 +#: builtin/describe.c:410

3839 +msgid "only output exact matches"

3840 msgstr ""

3841

3711 -#: builtin/merge.c:1008

3712 -#, c-format

3713 -msgid "'%s' is not a commit"

3842 +#: builtin/describe.c:412

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

3844 msgstr ""

3845

3716 -#: builtin/merge.c:1049

3717 -msgid "No current branch."

3846 +#: builtin/describe.c:414

3847 +msgid "only consider tags matching <pattern>"

3848 msgstr ""

3849

3720 -#: builtin/merge.c:1051

3721 -msgid "No remote for the current branch."

3850 +#: builtin/describe.c:416 builtin/name-rev.c:238

3851 +msgid "show abbreviated commit object as fallback"

3852 msgstr ""

3853

3724 -#: builtin/merge.c:1053

3725 -msgid "No default upstream defined for the current branch."

3854 +#: builtin/describe.c:417

3855 +msgid "mark"

3856 msgstr ""

3857

3728 -#: builtin/merge.c:1058

3729 -#, c-format

3730 -msgid "No remote tracking branch for %s from %s"

3858 +#: builtin/describe.c:418

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

3860 msgstr ""

3861

3733 -#: builtin/merge.c:1145 builtin/merge.c:1302

3862 +#: builtin/describe.c:436

3863 +msgid "--long is incompatible with --abbrev=0"

3864 +msgstr ""

3865 +

3866 +#: builtin/describe.c:462

3867 +msgid "No names found, cannot describe anything."

3868 +msgstr ""

3869 +

3870 +#: builtin/describe.c:482

3871 +msgid "--dirty is incompatible with committishes"

3872 +msgstr ""

3873 +

3874 +#: builtin/diff.c:79

3875 #, c-format

3735 -msgid "%s - not something we can merge"

3876 +msgid "'%s': not a regular file or symlink"

3877 msgstr ""

3878

3738 -#: builtin/merge.c:1213

3739 -msgid "There is no merge to abort (MERGE_HEAD missing)."

3879 +#: builtin/diff.c:224

3880 +#, c-format

3881 +msgid "invalid option: %s"

3882 msgstr ""

3883

3742 -#: builtin/merge.c:1229 git-pull.sh:31

3743 -msgid ""

3744 -"You have not concluded your merge (MERGE_HEAD exists).\n"

3745 -"Please, commit your changes before you can merge."

3884 +#: builtin/diff.c:301

3885 +msgid "Not a git repository"

3886 msgstr ""

3887

3748 -#: builtin/merge.c:1232 git-pull.sh:34

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

3888 +#: builtin/diff.c:344

3889 +#, c-format

3890 +msgid "invalid object '%s' given."

3891 msgstr ""

3892

3752 -#: builtin/merge.c:1236

3753 -msgid ""

3754 -"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"

3755 -"Please, commit your changes before you can merge."

3893 +#: builtin/diff.c:349

3894 +#, c-format

3895 +msgid "more than %d trees given: '%s'"

3896 msgstr ""

3897

3758 -#: builtin/merge.c:1239

3759 -msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."

3898 +#: builtin/diff.c:359

3899 +#, c-format

3900 +msgid "more than two blobs given: '%s'"

3901 msgstr ""

3902

3762 -#: builtin/merge.c:1248

3763 -msgid "You cannot combine --squash with --no-ff."

3903 +#: builtin/diff.c:367

3904 +#, c-format

3905 +msgid "unhandled object '%s' given."

3906 msgstr ""

3907

3766 -#: builtin/merge.c:1253

3767 -msgid "You cannot combine --no-ff with --ff-only."

3908 +#: builtin/fast-export.c:22

3909 +msgid "git fast-export [rev-list-opts]"

3910 msgstr ""

3911

3770 -#: builtin/merge.c:1260

3771 -msgid "No commit specified and merge.defaultToUpstream not set."

3912 +#: builtin/fast-export.c:635

3913 +msgid "show progress after <n> objects"

3914 msgstr ""

3915

3774 -#: builtin/merge.c:1292

3775 -msgid "Can merge only exactly one commit into empty head"

3916 +#: builtin/fast-export.c:637

3917 +msgid "select handling of signed tags"

3918 msgstr ""

3919

3778 -#: builtin/merge.c:1295

3779 -msgid "Squash commit into empty head not supported yet"

3920 +#: builtin/fast-export.c:640

3921 +msgid "select handling of tags that tag filtered objects"

3922 msgstr ""

3923

3782 -#: builtin/merge.c:1297

3783 -msgid "Non-fast-forward commit does not make sense into an empty head"

3924 +#: builtin/fast-export.c:643

3925 +msgid "Dump marks to this file"

3926 msgstr ""

3927

3786 -#: builtin/merge.c:1412

3787 -#, c-format

3788 -msgid "Updating %s..%s\n"

3928 +#: builtin/fast-export.c:645

3929 +msgid "Import marks from this file"

3930 msgstr ""

3931

3791 -#: builtin/merge.c:1450

3792 -#, c-format

3793 -msgid "Trying really trivial in-index merge...\n"

3932 +#: builtin/fast-export.c:647

3933 +msgid "Fake a tagger when tags lack one"

3934 msgstr ""

3935

3796 -#: builtin/merge.c:1457

3797 -#, c-format

3798 -msgid "Nope.\n"

3936 +#: builtin/fast-export.c:649

3937 +msgid "Output full tree for each commit"

3938 msgstr ""

3939

3801 -#: builtin/merge.c:1489

3802 -msgid "Not possible to fast-forward, aborting."

3940 +#: builtin/fast-export.c:651

3941 +msgid "Use the done feature to terminate the stream"

3942 msgstr ""

3943

3805 -#: builtin/merge.c:1512 builtin/merge.c:1591

3806 -#, c-format

3807 -msgid "Rewinding the tree to pristine...\n"

3944 +#: builtin/fast-export.c:652

3945 +msgid "Skip output of blob data"

3946 msgstr ""

3947

3810 -#: builtin/merge.c:1516

3811 -#, c-format

3812 -msgid "Trying merge strategy %s...\n"

3948 +#: builtin/fetch.c:20

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

3950 msgstr ""

3951

3815 -#: builtin/merge.c:1582

3816 -#, c-format

3817 -msgid "No merge strategy handled the merge.\n"

3952 +#: builtin/fetch.c:21

3953 +msgid "git fetch [<options>] <group>"

3954 msgstr ""

3955

3820 -#: builtin/merge.c:1584

3821 -#, c-format

3822 -msgid "Merge with strategy %s failed.\n"

3956 +#: builtin/fetch.c:22

3957 +msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"

3958 msgstr ""

3959

3825 -#: builtin/merge.c:1593

3826 -#, c-format

3827 -msgid "Using the %s to prepare resolving by hand.\n"

3960 +#: builtin/fetch.c:23

3961 +msgid "git fetch --all [<options>]"

3962 msgstr ""

3963

3830 -#: builtin/merge.c:1605

3831 -#, c-format

3832 -msgid "Automatic merge went well; stopped before committing as requested\n"

3964 +#: builtin/fetch.c:60

3965 +msgid "fetch from all remotes"

3966 msgstr ""

3967

3835 -#: builtin/mv.c:108

3836 -#, c-format

3837 -msgid "Checking rename of '%s' to '%s'\n"

3968 +#: builtin/fetch.c:62

3969 +msgid "append to .git/FETCH_HEAD instead of overwriting"

3970 msgstr ""

3971

3840 -#: builtin/mv.c:112

3841 -msgid "bad source"

3972 +#: builtin/fetch.c:64

3973 +msgid "path to upload pack on remote end"

3974 msgstr ""

3975

3844 -#: builtin/mv.c:115

3845 -msgid "can not move directory into itself"

3976 +#: builtin/fetch.c:65

3977 +msgid "force overwrite of local branch"

3978 msgstr ""

3979

3848 -#: builtin/mv.c:118

3849 -msgid "cannot move directory over file"

3980 +#: builtin/fetch.c:67

3981 +msgid "fetch from multiple remotes"

3982 msgstr ""

3983

3852 -#: builtin/mv.c:128

3853 -#, c-format

3854 -msgid "Huh? %.*s is in index?"

3984 +#: builtin/fetch.c:69

3985 +msgid "fetch all tags and associated objects"

3986 msgstr ""

3987

3857 -#: builtin/mv.c:140

3858 -msgid "source directory is empty"

3988 +#: builtin/fetch.c:71

3989 +msgid "do not fetch all tags (--no-tags)"

3990 msgstr ""

3991

3861 -#: builtin/mv.c:171

3862 -msgid "not under version control"

3992 +#: builtin/fetch.c:73

3993 +msgid "prune remote-tracking branches no longer on remote"

3994 msgstr ""

3995

3865 -#: builtin/mv.c:173

3866 -msgid "destination exists"

3996 +#: builtin/fetch.c:74

3997 +msgid "on-demand"

3998 msgstr ""

3999

3869 -#: builtin/mv.c:181

3870 -#, c-format

3871 -msgid "overwriting '%s'"

4000 +#: builtin/fetch.c:75

4001 +msgid "control recursive fetching of submodules"

4002 msgstr ""

4003

3874 -#: builtin/mv.c:184

3875 -msgid "Cannot overwrite"

4004 +#: builtin/fetch.c:79

4005 +msgid "keep downloaded pack"

4006 msgstr ""

4007

3878 -#: builtin/mv.c:187

3879 -msgid "multiple sources for the same target"

4008 +#: builtin/fetch.c:81

4009 +msgid "allow updating of HEAD ref"

4010 msgstr ""

4011

3882 -#: builtin/mv.c:202

3883 -#, c-format

3884 -msgid "%s, source=%s, destination=%s"

4012 +#: builtin/fetch.c:84

4013 +msgid "deepen history of shallow clone"

4014 msgstr ""

4015

3887 -#: builtin/mv.c:212

3888 -#, c-format

3889 -msgid "Renaming %s to %s\n"

4016 +#: builtin/fetch.c:85 builtin/log.c:1083

4017 +msgid "dir"

4018 msgstr ""

4019

3892 -#: builtin/mv.c:215 builtin/remote.c:731

3893 -#, c-format

3894 -msgid "renaming '%s' failed"

4020 +#: builtin/fetch.c:86

4021 +msgid "prepend this to submodule path output"

4022 msgstr ""

4023

3897 -#: builtin/notes.c:139

3898 -#, c-format

3899 -msgid "unable to start 'show' for object '%s'"

4024 +#: builtin/fetch.c:89

4025 +msgid "default mode for recursion"

4026 msgstr ""

4027

3902 -#: builtin/notes.c:145

3903 -msgid "can't fdopen 'show' output fd"

4028 +#: builtin/fetch.c:201

4029 +msgid "Couldn't find remote ref HEAD"

4030 msgstr ""

4031

3906 -#: builtin/notes.c:155

4032 +#: builtin/fetch.c:254

4033 #, c-format

3908 -msgid "failed to close pipe to 'show' for object '%s'"

4034 +msgid "object %s not found"

4035 msgstr ""

4036

3911 -#: builtin/notes.c:158

3912 -#, c-format

3913 -msgid "failed to finish 'show' for object '%s'"

4037 +#: builtin/fetch.c:260

4038 +msgid "[up to date]"

4039 msgstr ""

4040

3916 -#: builtin/notes.c:175 builtin/tag.c:347

4041 +#: builtin/fetch.c:274

4042 #, c-format

3918 -msgid "could not create file '%s'"

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

4044 msgstr ""

4045

3921 -#: builtin/notes.c:189

3922 -msgid "Please supply the note contents using either -m or -F option"

4046 +#: builtin/fetch.c:275 builtin/fetch.c:361

4047 +msgid "[rejected]"

4048 msgstr ""

4049

3925 -#: builtin/notes.c:210 builtin/notes.c:973

3926 -#, c-format

3927 -msgid "Removing note for object %s\n"

4050 +#: builtin/fetch.c:286

4051 +msgid "[tag update]"

4052 msgstr ""

4053

3930 -#: builtin/notes.c:215

3931 -msgid "unable to write note object"

4054 +#: builtin/fetch.c:288 builtin/fetch.c:323 builtin/fetch.c:341

4055 +msgid " (unable to update local ref)"

4056 msgstr ""

4057

3934 -#: builtin/notes.c:217

3935 -#, c-format

3936 -msgid "The note contents has been left in %s"

4058 +#: builtin/fetch.c:306

4059 +msgid "[new tag]"

4060 msgstr ""

4061

3939 -#: builtin/notes.c:251 builtin/tag.c:542

3940 -#, c-format

3941 -msgid "cannot read '%s'"

4062 +#: builtin/fetch.c:309

4063 +msgid "[new branch]"

4064 msgstr ""

4065

3944 -#: builtin/notes.c:253 builtin/tag.c:545

3945 -#, c-format

3946 -msgid "could not open or read '%s'"

4066 +#: builtin/fetch.c:312

4067 +msgid "[new ref]"

4068 msgstr ""

4069

3949 -#: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447

3950 -#: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644

3951 -#: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766

3952 -#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:558

3953 -#, c-format

3954 -msgid "Failed to resolve '%s' as a valid ref."

4070 +#: builtin/fetch.c:357

4071 +msgid "unable to update local ref"

4072 msgstr ""

4073

3957 -#: builtin/notes.c:275

3958 -#, c-format

3959 -msgid "Failed to read object '%s'."

4074 +#: builtin/fetch.c:357

4075 +msgid "forced update"

4076 msgstr ""

4077

3962 -#: builtin/notes.c:299

3963 -msgid "Cannot commit uninitialized/unreferenced notes tree"

4078 +#: builtin/fetch.c:363

4079 +msgid "(non-fast-forward)"

4080 msgstr ""

4081

3966 -#: builtin/notes.c:340

4082 +#: builtin/fetch.c:394 builtin/fetch.c:686

4083 #, c-format

3968 -msgid "Bad notes.rewriteMode value: '%s'"

4084 +msgid "cannot open %s: %s\n"

4085 msgstr ""

4086

3971 -#: builtin/notes.c:350

4087 +#: builtin/fetch.c:403

4088 #, c-format

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

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

4090 msgstr ""

4091

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

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

3978 -#: builtin/notes.c:377

4092 +#: builtin/fetch.c:489

4093 #, c-format

3980 -msgid "Bad %s value: '%s'"

4094 +msgid "From %.*s\n"

4095 msgstr ""

4096

3983 -#: builtin/notes.c:441

4097 +#: builtin/fetch.c:500

4098 #, c-format

3985 -msgid "Malformed input line: '%s'."

4099 +msgid ""

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

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

4102 msgstr ""

4103

3988 -#: builtin/notes.c:456

4104 +#: builtin/fetch.c:550

4105 +#, c-format

4106 +msgid " (%s will become dangling)"

4107 +msgstr ""

4108 +

4109 +#: builtin/fetch.c:551

4110 +#, c-format

4111 +msgid " (%s has become dangling)"

4112 +msgstr ""

4113 +

4114 +#: builtin/fetch.c:558

4115 +msgid "[deleted]"

4116 +msgstr ""

4117 +

4118 +#: builtin/fetch.c:559 builtin/remote.c:1055

4119 +msgid "(none)"

4120 +msgstr ""

4121 +

4122 +#: builtin/fetch.c:676

4123 +#, c-format

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

4125 +msgstr ""

4126 +

4127 +#: builtin/fetch.c:710

4128 +#, c-format

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

4130 +msgstr ""

4131 +

4132 +#: builtin/fetch.c:787

4133 +#, c-format

4134 +msgid "Option \"%s\" value \"%s\" is not valid for %s"

4135 +msgstr ""

4136 +

4137 +#: builtin/fetch.c:790

4138 +#, c-format

4139 +msgid "Option \"%s\" is ignored for %s\n"

4140 +msgstr ""

4141 +

4142 +#: builtin/fetch.c:892

4143 +#, c-format

4144 +msgid "Fetching %s\n"

4145 +msgstr ""

4146 +

4147 +#: builtin/fetch.c:894 builtin/remote.c:100

4148 +#, c-format

4149 +msgid "Could not fetch %s"

4150 +msgstr ""

4151 +

4152 +#: builtin/fetch.c:913

4153 +msgid ""

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

4155 +"remote name from which new revisions should be fetched."

4156 +msgstr ""

4157 +

4158 +#: builtin/fetch.c:933

4159 +msgid "You need to specify a tag name."

4160 +msgstr ""

4161 +

4162 +#: builtin/fetch.c:985

4163 +msgid "fetch --all does not take a repository argument"

4164 +msgstr ""

4165 +

4166 +#: builtin/fetch.c:987

4167 +msgid "fetch --all does not make sense with refspecs"

4168 +msgstr ""

4169 +

4170 +#: builtin/fetch.c:998

4171 +#, c-format

4172 +msgid "No such remote or remote group: %s"

4173 +msgstr ""

4174 +

4175 +#: builtin/fetch.c:1006

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

4177 +msgstr ""

4178 +

4179 +#: builtin/fmt-merge-msg.c:13

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

4181 +msgstr ""

4182 +

4183 +#: builtin/fmt-merge-msg.c:653 builtin/fmt-merge-msg.c:656 builtin/grep.c:786

4184 +#: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:192

4185 +#: builtin/tag.c:448 parse-options.h:133 parse-options.h:235

4186 +msgid "n"

4187 +msgstr ""

4188 +

4189 +#: builtin/fmt-merge-msg.c:654

4190 +msgid "populate log with at most <n> entries from shortlog"

4191 +msgstr ""

4192 +

4193 +#: builtin/fmt-merge-msg.c:657

4194 +msgid "alias for --log (deprecated)"

4195 +msgstr ""

4196 +

4197 +#: builtin/fmt-merge-msg.c:660

4198 +msgid "text"

4199 +msgstr ""

4200 +

4201 +#: builtin/fmt-merge-msg.c:661

4202 +msgid "use <text> as start of message"

4203 +msgstr ""

4204 +

4205 +#: builtin/fmt-merge-msg.c:662

4206 +msgid "file to read from"

4207 +msgstr ""

4208 +

4209 +#: builtin/for-each-ref.c:979

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

4211 +msgstr ""

4212 +

4213 +#: builtin/for-each-ref.c:994

4214 +msgid "quote placeholders suitably for shells"

4215 +msgstr ""

4216 +

4217 +#: builtin/for-each-ref.c:996

4218 +msgid "quote placeholders suitably for perl"

4219 +msgstr ""

4220 +

4221 +#: builtin/for-each-ref.c:998

4222 +msgid "quote placeholders suitably for python"

4223 +msgstr ""

4224 +

4225 +#: builtin/for-each-ref.c:1000

4226 +msgid "quote placeholders suitably for tcl"

4227 +msgstr ""

4228 +

4229 +#: builtin/for-each-ref.c:1003

4230 +msgid "show only <n> matched refs"

4231 +msgstr ""

4232 +

4233 +#: builtin/for-each-ref.c:1004

4234 +msgid "format"

4235 +msgstr ""

4236 +

4237 +#: builtin/for-each-ref.c:1004

4238 +msgid "format to use for the output"

4239 +msgstr ""

4240 +

4241 +#: builtin/for-each-ref.c:1005

4242 +msgid "key"

4243 +msgstr ""

4244 +

4245 +#: builtin/for-each-ref.c:1006

4246 +msgid "field name to sort on"

4247 +msgstr ""

4248 +

4249 +#: builtin/fsck.c:608

4250 +msgid "git fsck [options] [<object>...]"

4251 +msgstr ""

4252 +

4253 +#: builtin/fsck.c:614

4254 +msgid "show unreachable objects"

4255 +msgstr ""

4256 +

4257 +#: builtin/fsck.c:615

4258 +msgid "show dangling objects"

4259 +msgstr ""

4260 +

4261 +#: builtin/fsck.c:616

4262 +msgid "report tags"

4263 +msgstr ""

4264 +

4265 +#: builtin/fsck.c:617

4266 +msgid "report root nodes"

4267 +msgstr ""

4268 +

4269 +#: builtin/fsck.c:618

4270 +msgid "make index objects head nodes"

4271 +msgstr ""

4272 +

4273 +#: builtin/fsck.c:619

4274 +msgid "make reflogs head nodes (default)"

4275 +msgstr ""

4276 +

4277 +#: builtin/fsck.c:620

4278 +msgid "also consider packs and alternate objects"

4279 +msgstr ""

4280 +

4281 +#: builtin/fsck.c:621

4282 +msgid "enable more strict checking"

4283 +msgstr ""

4284 +

4285 +#: builtin/fsck.c:623

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

4287 +msgstr ""

4288 +

4289 +#: builtin/fsck.c:624 builtin/prune.c:134

4290 +msgid "show progress"

4291 +msgstr ""

4292 +

4293 +#: builtin/gc.c:22

4294 +msgid "git gc [options]"

4295 +msgstr ""

4296 +

4297 +#: builtin/gc.c:63

4298 +#, c-format

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

4300 +msgstr ""

4301 +

4302 +#: builtin/gc.c:90

4303 +#, c-format

4304 +msgid "insanely long object directory %.*s"

4305 +msgstr ""

4306 +

4307 +#: builtin/gc.c:179

4308 +msgid "prune unreferenced objects"

4309 +msgstr ""

4310 +

4311 +#: builtin/gc.c:181

4312 +msgid "be more thorough (increased runtime)"

4313 +msgstr ""

4314 +

4315 +#: builtin/gc.c:182

4316 +msgid "enable auto-gc mode"

4317 +msgstr ""

4318 +

4319 +#: builtin/gc.c:221

4320 +#, c-format

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

4322 +msgstr ""

4323 +

4324 +#: builtin/gc.c:224

4325 +#, c-format

4326 +msgid ""

4327 +"Auto packing the repository for optimum performance. You may also\n"

4328 +"run \"git gc\" manually. See \"git help gc\" for more information.\n"

4329 +msgstr ""

4330 +

4331 +#: builtin/gc.c:251

4332 +msgid ""

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

4334 +msgstr ""

4335 +

4336 +#: builtin/grep.c:22

4337 +msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"

4338 +msgstr ""

4339 +

4340 +#: builtin/grep.c:216

4341 +#, c-format

4342 +msgid "grep: failed to create thread: %s"

4343 +msgstr ""

4344 +

4345 +#: builtin/grep.c:454

4346 +#, c-format

4347 +msgid "Failed to chdir: %s"

4348 +msgstr ""

4349 +

4350 +#: builtin/grep.c:530 builtin/grep.c:564

4351 +#, c-format

4352 +msgid "unable to read tree (%s)"

4353 +msgstr ""

4354 +

4355 +#: builtin/grep.c:578

4356 +#, c-format

4357 +msgid "unable to grep from object of type %s"

4358 +msgstr ""

4359 +

4360 +#: builtin/grep.c:636

4361 +#, c-format

4362 +msgid "switch `%c' expects a numerical value"

4363 +msgstr ""

4364 +

4365 +#: builtin/grep.c:653

4366 +#, c-format

4367 +msgid "cannot open '%s'"

4368 +msgstr ""

4369 +

4370 +#: builtin/grep.c:728

4371 +msgid "search in index instead of in the work tree"

4372 +msgstr ""

4373 +

4374 +#: builtin/grep.c:730

4375 +msgid "find in contents not managed by git"

4376 +msgstr ""

4377 +

4378 +#: builtin/grep.c:732

4379 +msgid "search in both tracked and untracked files"

4380 +msgstr ""

4381 +

4382 +#: builtin/grep.c:734

4383 +msgid "search also in ignored files"

4384 +msgstr ""

4385 +

4386 +#: builtin/grep.c:737

4387 +msgid "show non-matching lines"

4388 +msgstr ""

4389 +

4390 +#: builtin/grep.c:739

4391 +msgid "case insensitive matching"

4392 +msgstr ""

4393 +

4394 +#: builtin/grep.c:741

4395 +msgid "match patterns only at word boundaries"

4396 +msgstr ""

4397 +

4398 +#: builtin/grep.c:743

4399 +msgid "process binary files as text"

4400 +msgstr ""

4401 +

4402 +#: builtin/grep.c:745

4403 +msgid "don't match patterns in binary files"

4404 +msgstr ""

4405 +

4406 +#: builtin/grep.c:748

4407 +msgid "descend at most <depth> levels"

4408 +msgstr ""

4409 +

4410 +#: builtin/grep.c:752

4411 +msgid "use extended POSIX regular expressions"

4412 +msgstr ""

4413 +

4414 +#: builtin/grep.c:755

4415 +msgid "use basic POSIX regular expressions (default)"

4416 +msgstr ""

4417 +

4418 +#: builtin/grep.c:758

4419 +msgid "interpret patterns as fixed strings"

4420 +msgstr ""

4421 +

4422 +#: builtin/grep.c:761

4423 +msgid "use Perl-compatible regular expressions"

4424 +msgstr ""

4425 +

4426 +#: builtin/grep.c:764

4427 +msgid "show line numbers"

4428 +msgstr ""

4429 +

4430 +#: builtin/grep.c:765

4431 +msgid "don't show filenames"

4432 +msgstr ""

4433 +

4434 +#: builtin/grep.c:766

4435 +msgid "show filenames"

4436 +msgstr ""

4437 +

4438 +#: builtin/grep.c:768

4439 +msgid "show filenames relative to top directory"

4440 +msgstr ""

4441 +

4442 +#: builtin/grep.c:770

4443 +msgid "show only filenames instead of matching lines"

4444 +msgstr ""

4445 +

4446 +#: builtin/grep.c:772

4447 +msgid "synonym for --files-with-matches"

4448 +msgstr ""

4449 +

4450 +#: builtin/grep.c:775

4451 +msgid "show only the names of files without match"

4452 +msgstr ""

4453 +

4454 +#: builtin/grep.c:777

4455 +msgid "print NUL after filenames"

4456 +msgstr ""

4457 +

4458 +#: builtin/grep.c:779

4459 +msgid "show the number of matches instead of matching lines"

4460 +msgstr ""

4461 +

4462 +#: builtin/grep.c:780

4463 +msgid "highlight matches"

4464 +msgstr ""

4465 +

4466 +#: builtin/grep.c:782

4467 +msgid "print empty line between matches from different files"

4468 +msgstr ""

4469 +

4470 +#: builtin/grep.c:784

4471 +msgid "show filename only once above matches from same file"

4472 +msgstr ""

4473 +

4474 +#: builtin/grep.c:787

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

4476 +msgstr ""

l10n: Update git.pot (825 new, 24 removed messages)