28b3cffcec · 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: 2013-04-30 08:25+0800\n"

11 +"POT-Creation-Date: 2013-07-26 14:19+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"

@@ -18,7 +18,7 @@ msgstr ""

18 "Content-Transfer-Encoding: 8bit\n"

19 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"

20

21 -#: advice.c:53

21 +#: advice.c:57

22 #, c-format

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

24 msgstr ""

@@ -27,7 +27,7 @@ msgstr ""

27 #. * Message used both when 'git commit' fails and when

28 #. * other commands doing a merge do.

29 #.

30 -#: advice.c:83

30 +#: advice.c:87

31 msgid ""

32 "Fix them up in the work tree,\n"

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

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

60 msgid "archive format"

61 msgstr ""

62

63 -#: archive.c:324 builtin/log.c:1126

63 +#: archive.c:324 builtin/log.c:1173

64 msgid "prefix"

65 msgstr ""

66

@@ -68,11 +68,11 @@ msgstr ""

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

69 msgstr ""

70

71 -#: archive.c:326 builtin/archive.c:88 builtin/blame.c:2371

72 -#: builtin/blame.c:2372 builtin/config.c:55 builtin/fast-export.c:665

73 -#: builtin/fast-export.c:667 builtin/grep.c:715 builtin/hash-object.c:77

74 -#: builtin/ls-files.c:490 builtin/ls-files.c:493 builtin/notes.c:536

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

71 +#: archive.c:326 builtin/archive.c:88 builtin/blame.c:2292

72 +#: builtin/blame.c:2293 builtin/config.c:56 builtin/fast-export.c:673

73 +#: builtin/fast-export.c:675 builtin/grep.c:714 builtin/hash-object.c:77

74 +#: builtin/ls-files.c:496 builtin/ls-files.c:499 builtin/notes.c:408

75 +#: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:152

76 msgid "file"

77 msgstr ""

78

@@ -104,7 +104,7 @@ msgstr ""

104 msgid "list supported archive formats"

105 msgstr ""

106

107 -#: archive.c:345 builtin/archive.c:90 builtin/clone.c:86

107 +#: archive.c:345 builtin/archive.c:90 builtin/clone.c:85

108 msgid "repo"

109 msgstr ""

110

@@ -112,7 +112,7 @@ msgstr ""

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

113 msgstr ""

114

115 -#: archive.c:347 builtin/archive.c:92 builtin/notes.c:615

115 +#: archive.c:347 builtin/archive.c:92 builtin/notes.c:487

116 msgid "command"

117 msgstr ""

118

@@ -195,17 +195,17 @@ msgstr ""

195 msgid "Cannot force update the current branch."

196 msgstr ""

197

198 -#: branch.c:201

198 +#: branch.c:216

199 #, c-format

200 msgid "Cannot setup tracking information; starting point '%s' is not a branch."

201 msgstr ""

202

203 -#: branch.c:203

203 +#: branch.c:218

204 #, c-format

205 msgid "the requested upstream branch '%s' does not exist"

206 msgstr ""

207

208 -#: branch.c:205

208 +#: branch.c:220

209 msgid ""

210 "\n"

211 "If you are planning on basing your work on an upstream\n"

@@ -217,26 +217,26 @@ msgid ""

217 "\"git push -u\" to set the upstream config as you push."

218 msgstr ""

219

220 -#: branch.c:250

220 +#: branch.c:265

221 #, c-format

222 msgid "Not a valid object name: '%s'."

223 msgstr ""

224

225 -#: branch.c:270

225 +#: branch.c:285

226 #, c-format

227 msgid "Ambiguous object name: '%s'."

228 msgstr ""

229

230 -#: branch.c:275

230 +#: branch.c:290

231 #, c-format

232 msgid "Not a valid branch point: '%s'."

233 msgstr ""

234

235 -#: branch.c:281

235 +#: branch.c:296

236 msgid "Failed to lock ref for update"

237 msgstr ""

238

239 -#: branch.c:299

239 +#: branch.c:314

240 msgid "Failed to write ref"

241 msgstr ""

242

@@ -250,7 +250,7 @@ msgstr ""

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

251 msgstr ""

252

253 -#: bundle.c:89 builtin/commit.c:676

253 +#: bundle.c:89 builtin/commit.c:683

254 #, c-format

255 msgid "could not open '%s'"

256 msgstr ""

@@ -259,9 +259,9 @@ msgstr ""

259 msgid "Repository lacks these prerequisite commits:"

260 msgstr ""

261

262 -#: bundle.c:164 sequencer.c:651 sequencer.c:1101 builtin/log.c:300

263 -#: builtin/log.c:770 builtin/log.c:1344 builtin/log.c:1570 builtin/merge.c:349

264 -#: builtin/shortlog.c:155

262 +#: bundle.c:164 sequencer.c:661 sequencer.c:1111 builtin/log.c:331

263 +#: builtin/log.c:801 builtin/log.c:1399 builtin/log.c:1625 builtin/merge.c:364

264 +#: builtin/shortlog.c:156

265 msgid "revision walk setup failed"

266 msgstr ""

267

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

287 msgid "rev-list died"

288 msgstr ""

289

290 -#: bundle.c:300 builtin/log.c:1255 builtin/shortlog.c:258

290 +#: bundle.c:300 builtin/log.c:1310 builtin/shortlog.c:259

291 #, c-format

292 msgid "unrecognized argument: %s"

293 msgstr ""

@@ -318,12 +318,12 @@ msgstr ""

318 msgid "index-pack died"

319 msgstr ""

320

321 -#: commit.c:50

321 +#: commit.c:53

322 #, c-format

323 msgid "could not parse %s"

324 msgstr ""

325

326 -#: commit.c:52

326 +#: commit.c:55

327 #, c-format

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

329 msgstr ""

@@ -332,16 +332,16 @@ msgstr ""

332 msgid "memory exhausted"

333 msgstr ""

334

335 -#: connected.c:39

335 +#: connected.c:60

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

337 msgstr ""

338

339 -#: connected.c:48

339 +#: connected.c:80

340 #, c-format

341 msgid "failed write to rev-list: %s"

342 msgstr ""

343

344 -#: connected.c:56

344 +#: connected.c:88

345 #, c-format

346 msgid "failed to close rev-list's stdin: %s"

347 msgstr ""

@@ -435,14 +435,14 @@ msgid ""

435 "%s"

436 msgstr ""

437

438 -#: diff.c:3481

438 +#: diff.c:3487

439 #, c-format

440 msgid ""

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

442 "%s"

443 msgstr ""

444

445 -#: diff.c:3495

445 +#: diff.c:3501

446 #, c-format

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

448 msgstr ""

@@ -484,48 +484,48 @@ msgstr ""

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

485 msgstr ""

486

487 -#: help.c:212

487 +#: help.c:213

488 #, c-format

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

490 msgstr ""

491

492 -#: help.c:219

492 +#: help.c:220

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

494 msgstr ""

495

496 -#: help.c:235

496 +#: help.c:236

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

498 msgstr ""

499

500 -#: help.c:292

500 +#: help.c:293

501 #, c-format

502 msgid ""

503 "'%s' appears to be a git command, but we were not\n"

504 "able to execute it. Maybe git-%s is broken?"

505 msgstr ""

506

507 -#: help.c:349

507 +#: help.c:350

508 msgid "Uh oh. Your system reports no Git commands at all."

509 msgstr ""

510

511 -#: help.c:371

511 +#: help.c:372

512 #, c-format

513 msgid ""

514 "WARNING: You called a Git command named '%s', which does not exist.\n"

515 "Continuing under the assumption that you meant '%s'"

516 msgstr ""

517

518 -#: help.c:376

518 +#: help.c:377

519 #, c-format

520 msgid "in %0.1f seconds automatically..."

521 msgstr ""

522

523 -#: help.c:383

523 +#: help.c:384

524 #, c-format

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

526 msgstr ""

527

528 -#: help.c:387

528 +#: help.c:388 help.c:447

529 msgid ""

530 "\n"

531 "Did you mean this?"

@@ -535,12 +535,17 @@ msgid_plural ""

535 msgstr[0] ""

536 msgstr[1] ""

537

538 +#: help.c:443

539 +#, c-format

540 +msgid "%s: %s - %s"

541 +msgstr ""

542 +

543 #: merge.c:56

544 msgid "failed to read the cache"

545 msgstr ""

546

547 #: merge.c:110 builtin/checkout.c:365 builtin/checkout.c:566

543 -#: builtin/clone.c:645

548 +#: builtin/clone.c:656

549 msgid "unable to write new index file"

550 msgstr ""

551

@@ -554,243 +559,264 @@ msgstr ""

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

560 msgstr ""

561

557 -#: merge-recursive.c:268

562 +#: merge-recursive.c:269

563 msgid "error building trees"

564 msgstr ""

565

561 -#: merge-recursive.c:672

566 +#: merge-recursive.c:673

567 #, c-format

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

569 msgstr ""

570

566 -#: merge-recursive.c:683

571 +#: merge-recursive.c:684

572 #, c-format

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

574 msgstr ""

575

576 #. something else exists

577 #. .. but not some other error (who really cares what?)

573 -#: merge-recursive.c:697 merge-recursive.c:718

578 +#: merge-recursive.c:698 merge-recursive.c:719

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

580 msgstr ""

581

577 -#: merge-recursive.c:708

582 +#: merge-recursive.c:709

583 #, c-format

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

585 msgstr ""

586

582 -#: merge-recursive.c:748

587 +#: merge-recursive.c:749

588 #, c-format

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

590 msgstr ""

591

587 -#: merge-recursive.c:750

592 +#: merge-recursive.c:751

593 #, c-format

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

595 msgstr ""

596

592 -#: merge-recursive.c:773 builtin/clone.c:313

597 +#: merge-recursive.c:774 builtin/clone.c:312

598 #, c-format

599 msgid "failed to open '%s'"

600 msgstr ""

601

597 -#: merge-recursive.c:781

602 +#: merge-recursive.c:782

603 #, c-format

604 msgid "failed to symlink '%s'"

605 msgstr ""

606

602 -#: merge-recursive.c:784

607 +#: merge-recursive.c:785

608 #, c-format

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

610 msgstr ""

611

607 -#: merge-recursive.c:922

612 +#: merge-recursive.c:923

613 msgid "Failed to execute internal merge"

614 msgstr ""

615

611 -#: merge-recursive.c:926

616 +#: merge-recursive.c:927

617 #, c-format

618 msgid "Unable to add %s to database"

619 msgstr ""

620

616 -#: merge-recursive.c:942

621 +#: merge-recursive.c:943

622 msgid "unsupported object type in the tree"

623 msgstr ""

624

620 -#: merge-recursive.c:1021 merge-recursive.c:1035

625 +#: merge-recursive.c:1022 merge-recursive.c:1036

626 #, c-format

627 msgid ""

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

629 "in tree."

630 msgstr ""

631

627 -#: merge-recursive.c:1027 merge-recursive.c:1040

632 +#: merge-recursive.c:1028 merge-recursive.c:1041

633 #, c-format

634 msgid ""

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

636 "in tree at %s."

637 msgstr ""

638

634 -#: merge-recursive.c:1081

639 +#: merge-recursive.c:1082

640 msgid "rename"

641 msgstr ""

642

638 -#: merge-recursive.c:1081

643 +#: merge-recursive.c:1082

644 msgid "renamed"

645 msgstr ""

646

642 -#: merge-recursive.c:1137

647 +#: merge-recursive.c:1138

648 #, c-format

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

650 msgstr ""

651

647 -#: merge-recursive.c:1159

652 +#: merge-recursive.c:1160

653 #, c-format

654 msgid ""

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

656 "\"->\"%s\" in \"%s\"%s"

657 msgstr ""

658

654 -#: merge-recursive.c:1164

659 +#: merge-recursive.c:1165

660 msgid " (left unresolved)"

661 msgstr ""

662

658 -#: merge-recursive.c:1218

663 +#: merge-recursive.c:1219

664 #, c-format

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

666 msgstr ""

667

663 -#: merge-recursive.c:1248

668 +#: merge-recursive.c:1249

669 #, c-format

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

671 msgstr ""

672

668 -#: merge-recursive.c:1447

673 +#: merge-recursive.c:1448

674 #, c-format

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

676 msgstr ""

677

673 -#: merge-recursive.c:1457

678 +#: merge-recursive.c:1458

679 #, c-format

680 msgid "Adding merged %s"

681 msgstr ""

682

678 -#: merge-recursive.c:1462 merge-recursive.c:1660

683 +#: merge-recursive.c:1463 merge-recursive.c:1661

684 #, c-format

685 msgid "Adding as %s instead"

686 msgstr ""

687

683 -#: merge-recursive.c:1513

688 +#: merge-recursive.c:1514

689 #, c-format

690 msgid "cannot read object %s"

691 msgstr ""

692

688 -#: merge-recursive.c:1516

693 +#: merge-recursive.c:1517

694 #, c-format

695 msgid "object %s is not a blob"

696 msgstr ""

697

693 -#: merge-recursive.c:1564

698 +#: merge-recursive.c:1565

699 msgid "modify"

700 msgstr ""

701

697 -#: merge-recursive.c:1564

702 +#: merge-recursive.c:1565

703 msgid "modified"

704 msgstr ""

705

701 -#: merge-recursive.c:1574

706 +#: merge-recursive.c:1575

707 msgid "content"

708 msgstr ""

709

705 -#: merge-recursive.c:1581

710 +#: merge-recursive.c:1582

711 msgid "add/add"

712 msgstr ""

713

709 -#: merge-recursive.c:1615

714 +#: merge-recursive.c:1616

715 #, c-format

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

717 msgstr ""

718

714 -#: merge-recursive.c:1629

719 +#: merge-recursive.c:1630

720 #, c-format

721 msgid "Auto-merging %s"

722 msgstr ""

723

719 -#: merge-recursive.c:1633 git-submodule.sh:1029

724 +#: merge-recursive.c:1634 git-submodule.sh:1118

725 msgid "submodule"

726 msgstr ""

727

723 -#: merge-recursive.c:1634

728 +#: merge-recursive.c:1635

729 #, c-format

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

731 msgstr ""

732

728 -#: merge-recursive.c:1724

733 +#: merge-recursive.c:1725

734 #, c-format

735 msgid "Removing %s"

736 msgstr ""

737

733 -#: merge-recursive.c:1749

738 +#: merge-recursive.c:1750

739 msgid "file/directory"

740 msgstr ""

741

737 -#: merge-recursive.c:1755

742 +#: merge-recursive.c:1756

743 msgid "directory/file"

744 msgstr ""

745

741 -#: merge-recursive.c:1760

746 +#: merge-recursive.c:1761

747 #, c-format

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

749 msgstr ""

750

746 -#: merge-recursive.c:1770

751 +#: merge-recursive.c:1771

752 #, c-format

753 msgid "Adding %s"

754 msgstr ""

755

751 -#: merge-recursive.c:1787

756 +#: merge-recursive.c:1788

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

758 msgstr ""

759

755 -#: merge-recursive.c:1806

760 +#: merge-recursive.c:1807

761 msgid "Already up-to-date!"

762 msgstr ""

763

759 -#: merge-recursive.c:1815

764 +#: merge-recursive.c:1816

765 #, c-format

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

767 msgstr ""

768

764 -#: merge-recursive.c:1845

769 +#: merge-recursive.c:1846

770 #, c-format

771 msgid "Unprocessed path??? %s"

772 msgstr ""

773

769 -#: merge-recursive.c:1890

774 +#: merge-recursive.c:1891

775 msgid "Merging:"

776 msgstr ""

777

773 -#: merge-recursive.c:1903

778 +#: merge-recursive.c:1904

779 #, c-format

780 msgid "found %u common ancestor:"

781 msgid_plural "found %u common ancestors:"

782 msgstr[0] ""

783 msgstr[1] ""

784

780 -#: merge-recursive.c:1940

785 +#: merge-recursive.c:1941

786 msgid "merge returned no commit"

787 msgstr ""

788

784 -#: merge-recursive.c:1997

789 +#: merge-recursive.c:1998

790 #, c-format

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

792 msgstr ""

793

789 -#: merge-recursive.c:2009 builtin/merge.c:658

794 +#: merge-recursive.c:2010 builtin/merge.c:672

795 msgid "Unable to write index."

796 msgstr ""

797

793 -#: object.c:195

798 +#: notes-utils.c:40

799 +msgid "Cannot commit uninitialized/unreferenced notes tree"

800 +msgstr ""

801 +

802 +#: notes-utils.c:81

803 +#, c-format

804 +msgid "Bad notes.rewriteMode value: '%s'"

805 +msgstr ""

806 +

807 +#: notes-utils.c:91

808 +#, c-format

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

810 +msgstr ""

811 +

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

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

814 +#: notes-utils.c:118

815 +#, c-format

816 +msgid "Bad %s value: '%s'"

817 +msgstr ""

818 +

819 +#: object.c:204

820 #, c-format

821 msgid "unable to parse object: %s"

822 msgstr ""

@@ -830,18 +856,18 @@ msgstr ""

856 msgid "'%s' is beyond a symbolic link"

857 msgstr ""

858

833 -#: remote.c:1781

859 +#: remote.c:1788

860 #, c-format

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

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

863 msgstr[0] ""

864 msgstr[1] ""

865

840 -#: remote.c:1787

866 +#: remote.c:1794

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

868 msgstr ""

869

844 -#: remote.c:1790

870 +#: remote.c:1797

871 #, c-format

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

873 msgid_plural ""

@@ -849,11 +875,11 @@ msgid_plural ""

875 msgstr[0] ""

876 msgstr[1] ""

877

852 -#: remote.c:1798

878 +#: remote.c:1805

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

880 msgstr ""

881

856 -#: remote.c:1801

882 +#: remote.c:1808

883 #, c-format

884 msgid ""

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

@@ -864,18 +890,27 @@ msgid_plural ""

890 msgstr[0] ""

891 msgstr[1] ""

892

867 -#: remote.c:1811

893 +#: remote.c:1818

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

895 msgstr ""

896

871 -#: sequencer.c:206 builtin/merge.c:776 builtin/merge.c:889 builtin/merge.c:999

872 -#: builtin/merge.c:1009

897 +#: run-command.c:80

898 +msgid "open /dev/null failed"

899 +msgstr ""

900 +

901 +#: run-command.c:82

902 +#, c-format

903 +msgid "dup2(%d,%d) failed"

904 +msgstr ""

905 +

906 +#: sequencer.c:206 builtin/merge.c:790 builtin/merge.c:903

907 +#: builtin/merge.c:1013 builtin/merge.c:1023

908 #, c-format

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

910 msgstr ""

911

877 -#: sequencer.c:208 builtin/merge.c:335 builtin/merge.c:779

878 -#: builtin/merge.c:1001 builtin/merge.c:1014

912 +#: sequencer.c:208 builtin/merge.c:350 builtin/merge.c:793

913 +#: builtin/merge.c:1015 builtin/merge.c:1028

914 #, c-format

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

916 msgstr ""

@@ -893,7 +928,7 @@ msgid ""

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

929 msgstr ""

930

896 -#: sequencer.c:245 sequencer.c:859 sequencer.c:942

931 +#: sequencer.c:245 sequencer.c:869 sequencer.c:952

932 #, c-format

933 msgid "Could not write to %s"

934 msgstr ""

@@ -916,215 +951,228 @@ msgid "Commit your changes or stash them to proceed."

951 msgstr ""

952

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

919 -#: sequencer.c:319

954 +#: sequencer.c:324

955 #, c-format

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

957 msgstr ""

958

924 -#: sequencer.c:350

959 +#: sequencer.c:355

960 msgid "Could not resolve HEAD commit\n"

961 msgstr ""

962

928 -#: sequencer.c:371

963 +#: sequencer.c:377

964 msgid "Unable to update cache tree\n"

965 msgstr ""

966

932 -#: sequencer.c:416

967 +#: sequencer.c:422

968 #, c-format

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

970 msgstr ""

971

937 -#: sequencer.c:421

972 +#: sequencer.c:427

973 #, c-format

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

975 msgstr ""

976

942 -#: sequencer.c:487

977 +#: sequencer.c:493

978 msgid "Your index file is unmerged."

979 msgstr ""

980

946 -#: sequencer.c:506

981 +#: sequencer.c:512

982 #, c-format

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

984 msgstr ""

985

951 -#: sequencer.c:514

986 +#: sequencer.c:520

987 #, c-format

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

989 msgstr ""

990

956 -#: sequencer.c:518

991 +#: sequencer.c:524

992 #, c-format

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

994 msgstr ""

995

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

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

963 -#: sequencer.c:531

998 +#: sequencer.c:537

999 #, c-format

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

1001 msgstr ""

1002

968 -#: sequencer.c:535

1003 +#: sequencer.c:541

1004 #, c-format

1005 msgid "Cannot get commit message for %s"

1006 msgstr ""

1007

973 -#: sequencer.c:621

1008 +#: sequencer.c:627

1009 #, c-format

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

1011 msgstr ""

1012

978 -#: sequencer.c:622

1013 +#: sequencer.c:628

1014 #, c-format

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

1016 msgstr ""

1017

983 -#: sequencer.c:654

1018 +#: sequencer.c:664

1019 msgid "empty commit set passed"

1020 msgstr ""

1021

987 -#: sequencer.c:662

1022 +#: sequencer.c:672

1023 #, c-format

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

1025 msgstr ""

1026

992 -#: sequencer.c:667

1027 +#: sequencer.c:677

1028 #, c-format

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

1030 msgstr ""

1031

997 -#: sequencer.c:725

1032 +#: sequencer.c:735

1033 #, c-format

1034 msgid "Cannot %s during a %s"

1035 msgstr ""

1036

1002 -#: sequencer.c:747

1037 +#: sequencer.c:757

1038 #, c-format

1039 msgid "Could not parse line %d."

1040 msgstr ""

1041

1007 -#: sequencer.c:752

1042 +#: sequencer.c:762

1043 msgid "No commits parsed."

1044 msgstr ""

1045

1011 -#: sequencer.c:765

1046 +#: sequencer.c:775

1047 #, c-format

1048 msgid "Could not open %s"

1049 msgstr ""

1050

1016 -#: sequencer.c:769

1051 +#: sequencer.c:779

1052 #, c-format

1053 msgid "Could not read %s."

1054 msgstr ""

1055

1021 -#: sequencer.c:776

1056 +#: sequencer.c:786

1057 #, c-format

1058 msgid "Unusable instruction sheet: %s"

1059 msgstr ""

1060

1026 -#: sequencer.c:804

1061 +#: sequencer.c:814

1062 #, c-format

1063 msgid "Invalid key: %s"

1064 msgstr ""

1065

1031 -#: sequencer.c:807

1066 +#: sequencer.c:817

1067 #, c-format

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

1069 msgstr ""

1070

1036 -#: sequencer.c:819

1071 +#: sequencer.c:829

1072 #, c-format

1073 msgid "Malformed options sheet: %s"

1074 msgstr ""

1075

1041 -#: sequencer.c:840

1076 +#: sequencer.c:850

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

1078 msgstr ""

1079

1045 -#: sequencer.c:841

1080 +#: sequencer.c:851

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

1082 msgstr ""

1083

1049 -#: sequencer.c:845

1084 +#: sequencer.c:855

1085 #, c-format

1086 msgid "Could not create sequencer directory %s"

1087 msgstr ""

1088

1054 -#: sequencer.c:861 sequencer.c:946

1089 +#: sequencer.c:871 sequencer.c:956

1090 #, c-format

1091 msgid "Error wrapping up %s."

1092 msgstr ""

1093

1059 -#: sequencer.c:880 sequencer.c:1014

1094 +#: sequencer.c:890 sequencer.c:1024

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

1096 msgstr ""

1097

1063 -#: sequencer.c:882

1098 +#: sequencer.c:892

1099 msgid "cannot resolve HEAD"

1100 msgstr ""

1101

1067 -#: sequencer.c:884

1102 +#: sequencer.c:894

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

1104 msgstr ""

1105

1071 -#: sequencer.c:906 builtin/apply.c:4060

1106 +#: sequencer.c:916 builtin/apply.c:4061

1107 #, c-format

1108 msgid "cannot open %s: %s"

1109 msgstr ""

1110

1076 -#: sequencer.c:909

1111 +#: sequencer.c:919

1112 #, c-format

1113 msgid "cannot read %s: %s"

1114 msgstr ""

1115

1081 -#: sequencer.c:910

1116 +#: sequencer.c:920

1117 msgid "unexpected end of file"

1118 msgstr ""

1119

1085 -#: sequencer.c:916

1120 +#: sequencer.c:926

1121 #, c-format

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

1123 msgstr ""

1124

1090 -#: sequencer.c:939

1125 +#: sequencer.c:949

1126 #, c-format

1127 msgid "Could not format %s."

1128 msgstr ""

1129

1095 -#: sequencer.c:1083

1130 +#: sequencer.c:1092

1131 #, c-format

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

1133 msgstr ""

1134

1100 -#: sequencer.c:1085

1135 +#: sequencer.c:1095

1136 #, c-format

1137 msgid "%s: bad revision"

1138 msgstr ""

1139

1105 -#: sequencer.c:1119

1140 +#: sequencer.c:1129

1141 msgid "Can't revert as initial commit"

1142 msgstr ""

1143

1109 -#: sequencer.c:1120

1144 +#: sequencer.c:1130

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

1146 msgstr ""

1147

1113 -#: sha1_name.c:1036

1148 +#: sha1_name.c:440

1149 +msgid ""

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

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

1152 +"may be created by mistake. For example,\n"

1153 +"\n"

1154 +" git checkout -b $br $(git rev-parse ...)\n"

1155 +"\n"

1156 +"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"

1157 +"examine these refs and maybe delete them. Turn this message off by\n"

1158 +"running \"git config advice.object_name_warning false\""

1159 +msgstr ""

1160 +

1161 +#: sha1_name.c:1097

1162 msgid "HEAD does not point to a branch"

1163 msgstr ""

1164

1117 -#: sha1_name.c:1039

1165 +#: sha1_name.c:1100

1166 #, c-format

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

1168 msgstr ""

1169

1122 -#: sha1_name.c:1041

1170 +#: sha1_name.c:1102

1171 #, c-format

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

1173 msgstr ""

1174

1127 -#: sha1_name.c:1044

1175 +#: sha1_name.c:1106

1176 #, c-format

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

1178 msgstr ""

@@ -1134,160 +1182,160 @@ msgstr ""

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

1183 msgstr ""

1184

1137 -#: wrapper.c:423

1185 +#: wrapper.c:429

1186 #, c-format

1187 msgid "unable to access '%s'"

1188 msgstr ""

1189

1142 -#: wrapper.c:434

1190 +#: wrapper.c:440

1191 #, c-format

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

1193 msgstr ""

1194

1147 -#: wrapper.c:435

1195 +#: wrapper.c:441

1196 msgid "no such user"

1197 msgstr ""

1198

1151 -#: wt-status.c:140

1199 +#: wt-status.c:141

1200 msgid "Unmerged paths:"

1201 msgstr ""

1202

1155 -#: wt-status.c:167 wt-status.c:194

1203 +#: wt-status.c:168 wt-status.c:195

1204 #, c-format

1205 msgid " (use \"git reset %s <file>...\" to unstage)"

1206 msgstr ""

1207

1160 -#: wt-status.c:169 wt-status.c:196

1208 +#: wt-status.c:170 wt-status.c:197

1209 msgid " (use \"git rm --cached <file>...\" to unstage)"

1210 msgstr ""

1211

1164 -#: wt-status.c:173

1212 +#: wt-status.c:174

1213 msgid " (use \"git add <file>...\" to mark resolution)"

1214 msgstr ""

1215

1168 -#: wt-status.c:175 wt-status.c:179

1216 +#: wt-status.c:176 wt-status.c:180

1217 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"

1218 msgstr ""

1219

1172 -#: wt-status.c:177

1220 +#: wt-status.c:178

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

1222 msgstr ""

1223

1176 -#: wt-status.c:188

1224 +#: wt-status.c:189

1225 msgid "Changes to be committed:"

1226 msgstr ""

1227

1180 -#: wt-status.c:206

1228 +#: wt-status.c:207

1229 msgid "Changes not staged for commit:"

1230 msgstr ""

1231

1184 -#: wt-status.c:210

1232 +#: wt-status.c:211

1233 msgid " (use \"git add <file>...\" to update what will be committed)"

1234 msgstr ""

1235

1188 -#: wt-status.c:212

1236 +#: wt-status.c:213

1237 msgid " (use \"git add/rm <file>...\" to update what will be committed)"

1238 msgstr ""

1239

1192 -#: wt-status.c:213

1240 +#: wt-status.c:214

1241 msgid ""

1242 " (use \"git checkout -- <file>...\" to discard changes in working directory)"

1243 msgstr ""

1244

1197 -#: wt-status.c:215

1245 +#: wt-status.c:216

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

1247 msgstr ""

1248

1201 -#: wt-status.c:227

1249 +#: wt-status.c:228

1250 #, c-format

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

1252 msgstr ""

1253

1206 -#: wt-status.c:244

1254 +#: wt-status.c:245

1255 msgid "bug"

1256 msgstr ""

1257

1210 -#: wt-status.c:249

1258 +#: wt-status.c:250

1259 msgid "both deleted:"

1260 msgstr ""

1261

1214 -#: wt-status.c:250

1262 +#: wt-status.c:251

1263 msgid "added by us:"

1264 msgstr ""

1265

1218 -#: wt-status.c:251

1266 +#: wt-status.c:252

1267 msgid "deleted by them:"

1268 msgstr ""

1269

1222 -#: wt-status.c:252

1270 +#: wt-status.c:253

1271 msgid "added by them:"

1272 msgstr ""

1273

1226 -#: wt-status.c:253

1274 +#: wt-status.c:254

1275 msgid "deleted by us:"

1276 msgstr ""

1277

1230 -#: wt-status.c:254

1278 +#: wt-status.c:255

1279 msgid "both added:"

1280 msgstr ""

1281

1234 -#: wt-status.c:255

1282 +#: wt-status.c:256

1283 msgid "both modified:"

1284 msgstr ""

1285

1238 -#: wt-status.c:285

1286 +#: wt-status.c:286

1287 msgid "new commits, "

1288 msgstr ""

1289

1242 -#: wt-status.c:287

1290 +#: wt-status.c:288

1291 msgid "modified content, "

1292 msgstr ""

1293

1246 -#: wt-status.c:289

1294 +#: wt-status.c:290

1295 msgid "untracked content, "

1296 msgstr ""

1297

1250 -#: wt-status.c:306

1298 +#: wt-status.c:307

1299 #, c-format

1300 msgid "new file: %s"

1301 msgstr ""

1302

1255 -#: wt-status.c:309

1303 +#: wt-status.c:310

1304 #, c-format

1305 msgid "copied: %s -> %s"

1306 msgstr ""

1307

1260 -#: wt-status.c:312

1308 +#: wt-status.c:313

1309 #, c-format

1310 msgid "deleted: %s"

1311 msgstr ""

1312

1265 -#: wt-status.c:315

1313 +#: wt-status.c:316

1314 #, c-format

1315 msgid "modified: %s"

1316 msgstr ""

1317

1270 -#: wt-status.c:318

1318 +#: wt-status.c:319

1319 #, c-format

1320 msgid "renamed: %s -> %s"

1321 msgstr ""

1322

1275 -#: wt-status.c:321

1323 +#: wt-status.c:322

1324 #, c-format

1325 msgid "typechange: %s"

1326 msgstr ""

1327

1280 -#: wt-status.c:324

1328 +#: wt-status.c:325

1329 #, c-format

1330 msgid "unknown: %s"

1331 msgstr ""

1332

1285 -#: wt-status.c:327

1333 +#: wt-status.c:328

1334 #, c-format

1335 msgid "unmerged: %s"

1336 msgstr ""

1337

1290 -#: wt-status.c:330

1338 +#: wt-status.c:331

1339 #, c-format

1340 msgid "bug: unhandled diff status %c"

1341 msgstr ""

@@ -1296,7 +1344,7 @@ msgstr ""

1344 msgid "You have unmerged paths."

1345 msgstr ""

1346

1299 -#: wt-status.c:806 wt-status.c:958

1347 +#: wt-status.c:806

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

1349 msgstr ""

1350

@@ -1317,7 +1365,7 @@ msgid "The current patch is empty."

1365 msgstr ""

1366

1367 #: wt-status.c:829

1320 -msgid " (fix conflicts and then run \"git am --resolved\")"

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

1369 msgstr ""

1370

1371 #: wt-status.c:831

@@ -1389,37 +1437,45 @@ msgstr ""

1437 msgid "You are currently cherry-picking."

1438 msgstr ""

1439

1440 +#: wt-status.c:958

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

1442 +msgstr ""

1443 +

1444 #: wt-status.c:961

1393 -msgid " (all conflicts fixed: run \"git commit\")"

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

1446 +msgstr ""

1447 +

1448 +#: wt-status.c:963

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

1450 msgstr ""

1451

1396 -#: wt-status.c:970

1452 +#: wt-status.c:972

1453 #, c-format

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

1455 msgstr ""

1456

1401 -#: wt-status.c:975

1457 +#: wt-status.c:977

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

1459 msgstr ""

1460

1405 -#: wt-status.c:978

1461 +#: wt-status.c:980

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

1463 msgstr ""

1464

1409 -#: wt-status.c:980

1465 +#: wt-status.c:982

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

1467 msgstr ""

1468

1413 -#: wt-status.c:991

1469 +#: wt-status.c:993

1470 #, c-format

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

1472 msgstr ""

1473

1418 -#: wt-status.c:995

1474 +#: wt-status.c:997

1475 msgid "You are currently bisecting."

1476 msgstr ""

1477

1422 -#: wt-status.c:998

1478 +#: wt-status.c:1000

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

1480 msgstr ""

1481

@@ -1427,31 +1483,35 @@ msgstr ""

1483 msgid "On branch "

1484 msgstr ""

1485

1430 -#: wt-status.c:1184

1486 +#: wt-status.c:1180

1487 +msgid "rebase in progress; onto "

1488 +msgstr ""

1489 +

1490 +#: wt-status.c:1187

1491 msgid "HEAD detached at "

1492 msgstr ""

1493

1434 -#: wt-status.c:1186

1494 +#: wt-status.c:1189

1495 msgid "HEAD detached from "

1496 msgstr ""

1497

1438 -#: wt-status.c:1189

1498 +#: wt-status.c:1192

1499 msgid "Not currently on any branch."

1500 msgstr ""

1501

1442 -#: wt-status.c:1206

1502 +#: wt-status.c:1209

1503 msgid "Initial commit"

1504 msgstr ""

1505

1446 -#: wt-status.c:1220

1506 +#: wt-status.c:1223

1507 msgid "Untracked files"

1508 msgstr ""

1509

1450 -#: wt-status.c:1222

1510 +#: wt-status.c:1225

1511 msgid "Ignored files"

1512 msgstr ""

1513

1454 -#: wt-status.c:1226

1514 +#: wt-status.c:1229

1515 #, c-format

1516 msgid ""

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

@@ -1459,82 +1519,82 @@ msgid ""

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

1520 msgstr ""

1521

1462 -#: wt-status.c:1232

1522 +#: wt-status.c:1235

1523 #, c-format

1524 msgid "Untracked files not listed%s"

1525 msgstr ""

1526

1467 -#: wt-status.c:1234

1527 +#: wt-status.c:1237

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

1529 msgstr ""

1530

1471 -#: wt-status.c:1240

1531 +#: wt-status.c:1243

1532 msgid "No changes"

1533 msgstr ""

1534

1475 -#: wt-status.c:1245

1535 +#: wt-status.c:1248

1536 #, c-format

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

1538 msgstr ""

1539

1480 -#: wt-status.c:1248

1540 +#: wt-status.c:1251

1541 #, c-format

1542 msgid "no changes added to commit\n"

1543 msgstr ""

1544

1485 -#: wt-status.c:1251

1545 +#: wt-status.c:1254

1546 #, c-format

1547 msgid ""

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

1549 "track)\n"

1550 msgstr ""

1551

1492 -#: wt-status.c:1254

1552 +#: wt-status.c:1257

1553 #, c-format

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

1555 msgstr ""

1556

1497 -#: wt-status.c:1257

1557 +#: wt-status.c:1260

1558 #, c-format

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

1560 msgstr ""

1561

1502 -#: wt-status.c:1260 wt-status.c:1265

1562 +#: wt-status.c:1263 wt-status.c:1268

1563 #, c-format

1564 msgid "nothing to commit\n"

1565 msgstr ""

1566

1507 -#: wt-status.c:1263

1567 +#: wt-status.c:1266

1568 #, c-format

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

1570 msgstr ""

1571

1512 -#: wt-status.c:1267

1572 +#: wt-status.c:1270

1573 #, c-format

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

1575 msgstr ""

1576

1517 -#: wt-status.c:1375

1577 +#: wt-status.c:1378

1578 msgid "HEAD (no branch)"

1579 msgstr ""

1580

1521 -#: wt-status.c:1381

1581 +#: wt-status.c:1384

1582 msgid "Initial commit on "

1583 msgstr ""

1584

1525 -#: wt-status.c:1396

1585 +#: wt-status.c:1399

1586 msgid "behind "

1587 msgstr ""

1588

1529 -#: wt-status.c:1399 wt-status.c:1402

1589 +#: wt-status.c:1402 wt-status.c:1405

1590 msgid "ahead "

1591 msgstr ""

1592

1533 -#: wt-status.c:1404

1593 +#: wt-status.c:1407

1594 msgid ", behind "

1595 msgstr ""

1596

1537 -#: compat/precompose_utf8.c:58 builtin/clone.c:352

1597 +#: compat/precompose_utf8.c:58 builtin/clone.c:351

1598 #, c-format

1599 msgid "failed to unlink '%s'"

1600 msgstr ""

@@ -1594,7 +1654,7 @@ msgstr ""

1654 msgid "unexpected diff status %c"

1655 msgstr ""

1656

1597 -#: builtin/add.c:149 builtin/commit.c:233

1657 +#: builtin/add.c:149 builtin/commit.c:238

1658 msgid "updating files failed"

1659 msgstr ""

1660

@@ -1607,7 +1667,7 @@ msgstr ""

1667 msgid "Unstaged changes after refreshing the index:"

1668 msgstr ""

1669

1610 -#: builtin/add.c:256 builtin/add.c:572 builtin/rm.c:275

1670 +#: builtin/add.c:256 builtin/add.c:573 builtin/rm.c:337

1671 #, c-format

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

1673 msgstr ""

@@ -1616,127 +1676,127 @@ msgstr ""

1676 msgid "Could not read the index"

1677 msgstr ""

1678

1619 -#: builtin/add.c:349

1679 +#: builtin/add.c:350

1680 #, c-format

1681 msgid "Could not open '%s' for writing."

1682 msgstr ""

1683

1624 -#: builtin/add.c:353

1684 +#: builtin/add.c:354

1685 msgid "Could not write patch"

1686 msgstr ""

1687

1628 -#: builtin/add.c:358

1688 +#: builtin/add.c:359

1689 #, c-format

1690 msgid "Could not stat '%s'"

1691 msgstr ""

1692

1633 -#: builtin/add.c:360

1693 +#: builtin/add.c:361

1694 msgid "Empty patch. Aborted."

1695 msgstr ""

1696

1637 -#: builtin/add.c:366

1697 +#: builtin/add.c:367

1698 #, c-format

1699 msgid "Could not apply '%s'"

1700 msgstr ""

1701

1642 -#: builtin/add.c:376

1702 +#: builtin/add.c:377

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

1704 msgstr ""

1705

1646 -#: builtin/add.c:393 builtin/clean.c:161 builtin/fetch.c:78 builtin/mv.c:63

1647 -#: builtin/prune-packed.c:76 builtin/push.c:425 builtin/remote.c:1253

1648 -#: builtin/rm.c:206

1706 +#: builtin/add.c:394 builtin/clean.c:851 builtin/fetch.c:78 builtin/mv.c:63

1707 +#: builtin/prune-packed.c:73 builtin/push.c:451 builtin/remote.c:1253

1708 +#: builtin/rm.c:268

1709 msgid "dry run"

1710 msgstr ""

1711

1652 -#: builtin/add.c:394 builtin/apply.c:4409 builtin/check-ignore.c:19

1653 -#: builtin/commit.c:1152 builtin/count-objects.c:95 builtin/fsck.c:613

1654 -#: builtin/log.c:1518 builtin/mv.c:62 builtin/read-tree.c:112

1712 +#: builtin/add.c:395 builtin/apply.c:4410 builtin/check-ignore.c:19

1713 +#: builtin/commit.c:1201 builtin/count-objects.c:95 builtin/fsck.c:613

1714 +#: builtin/log.c:1573 builtin/mv.c:62 builtin/read-tree.c:113

1715 msgid "be verbose"

1716 msgstr ""

1717

1658 -#: builtin/add.c:396

1718 +#: builtin/add.c:397

1719 msgid "interactive picking"

1720 msgstr ""

1721

1662 -#: builtin/add.c:397 builtin/checkout.c:1063 builtin/reset.c:258

1722 +#: builtin/add.c:398 builtin/checkout.c:1073 builtin/reset.c:261

1723 msgid "select hunks interactively"

1724 msgstr ""

1725

1666 -#: builtin/add.c:398

1726 +#: builtin/add.c:399

1727 msgid "edit current diff and apply"

1728 msgstr ""

1729

1670 -#: builtin/add.c:399

1730 +#: builtin/add.c:400

1731 msgid "allow adding otherwise ignored files"

1732 msgstr ""

1733

1674 -#: builtin/add.c:400

1734 +#: builtin/add.c:401

1735 msgid "update tracked files"

1736 msgstr ""

1737

1678 -#: builtin/add.c:401

1738 +#: builtin/add.c:402

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

1740 msgstr ""

1741

1682 -#: builtin/add.c:402

1742 +#: builtin/add.c:403

1743 msgid "add changes from all tracked and untracked files"

1744 msgstr ""

1745

1746 #. takes no arguments

1687 -#: builtin/add.c:405

1747 +#: builtin/add.c:406

1748 msgid "ignore paths removed in the working tree (same as --no-all)"

1749 msgstr ""

1750

1691 -#: builtin/add.c:407

1751 +#: builtin/add.c:408

1752 msgid "don't add, only refresh the index"

1753 msgstr ""

1754

1695 -#: builtin/add.c:408

1755 +#: builtin/add.c:409

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

1757 msgstr ""

1758

1699 -#: builtin/add.c:409

1759 +#: builtin/add.c:410

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

1761 msgstr ""

1762

1703 -#: builtin/add.c:431

1763 +#: builtin/add.c:432

1764 #, c-format

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

1766 msgstr ""

1767

1708 -#: builtin/add.c:432

1768 +#: builtin/add.c:433

1769 msgid "no files added"

1770 msgstr ""

1771

1712 -#: builtin/add.c:438

1772 +#: builtin/add.c:439

1773 msgid "adding files failed"

1774 msgstr ""

1775

1716 -#: builtin/add.c:477

1776 +#: builtin/add.c:478

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

1778 msgstr ""

1779

1720 -#: builtin/add.c:495

1780 +#: builtin/add.c:496

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

1782 msgstr ""

1783

1724 -#: builtin/add.c:525

1784 +#: builtin/add.c:526

1785 #, c-format

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

1787 msgstr ""

1788

1729 -#: builtin/add.c:526

1789 +#: builtin/add.c:527

1790 #, c-format

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

1792 msgstr ""

1793

1734 -#: builtin/add.c:532 builtin/check-ignore.c:66 builtin/clean.c:204

1735 -#: builtin/commit.c:293 builtin/mv.c:82 builtin/rm.c:235

1794 +#: builtin/add.c:533 builtin/check-ignore.c:161 builtin/clean.c:895

1795 +#: builtin/commit.c:298 builtin/mv.c:82 builtin/rm.c:297

1796 msgid "index file corrupt"

1797 msgstr ""

1798

1739 -#: builtin/add.c:604 builtin/apply.c:4505 builtin/mv.c:229 builtin/rm.c:370

1799 +#: builtin/add.c:605 builtin/apply.c:4506 builtin/mv.c:229 builtin/rm.c:432

1800 msgid "Unable to write new index file"

1801 msgstr ""

1802

@@ -1913,293 +1973,293 @@ msgstr ""

1973 msgid "cannot checkout %s"

1974 msgstr ""

1975

1916 -#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3193

1976 +#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3194

1977 #, c-format

1978 msgid "read of %s failed"

1979 msgstr ""

1980

1921 -#: builtin/apply.c:3173 builtin/apply.c:3395

1981 +#: builtin/apply.c:3174 builtin/apply.c:3396

1982 #, c-format

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

1984 msgstr ""

1985

1926 -#: builtin/apply.c:3254 builtin/apply.c:3409

1986 +#: builtin/apply.c:3255 builtin/apply.c:3410

1987 #, c-format

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

1989 msgstr ""

1990

1931 -#: builtin/apply.c:3258 builtin/apply.c:3401 builtin/apply.c:3423

1991 +#: builtin/apply.c:3259 builtin/apply.c:3402 builtin/apply.c:3424

1992 #, c-format

1993 msgid "%s: %s"

1994 msgstr ""

1995

1936 -#: builtin/apply.c:3263 builtin/apply.c:3417

1996 +#: builtin/apply.c:3264 builtin/apply.c:3418

1997 #, c-format

1998 msgid "%s: does not match index"

1999 msgstr ""

2000

1941 -#: builtin/apply.c:3365

2001 +#: builtin/apply.c:3366

2002 msgid "removal patch leaves file contents"

2003 msgstr ""

2004

1945 -#: builtin/apply.c:3434

2005 +#: builtin/apply.c:3435

2006 #, c-format

2007 msgid "%s: wrong type"

2008 msgstr ""

2009

1950 -#: builtin/apply.c:3436

2010 +#: builtin/apply.c:3437

2011 #, c-format

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

2013 msgstr ""

2014

1955 -#: builtin/apply.c:3537

2015 +#: builtin/apply.c:3538

2016 #, c-format

2017 msgid "%s: already exists in index"

2018 msgstr ""

2019

1960 -#: builtin/apply.c:3540

2020 +#: builtin/apply.c:3541

2021 #, c-format

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

2023 msgstr ""

2024

1965 -#: builtin/apply.c:3560

2025 +#: builtin/apply.c:3561

2026 #, c-format

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

2028 msgstr ""

2029

1970 -#: builtin/apply.c:3565

2030 +#: builtin/apply.c:3566

2031 #, c-format

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

2033 msgstr ""

2034

1975 -#: builtin/apply.c:3573

2035 +#: builtin/apply.c:3574

2036 #, c-format

2037 msgid "%s: patch does not apply"

2038 msgstr ""

2039

1980 -#: builtin/apply.c:3586

2040 +#: builtin/apply.c:3587

2041 #, c-format

2042 msgid "Checking patch %s..."

2043 msgstr ""

2044

1985 -#: builtin/apply.c:3679 builtin/checkout.c:216 builtin/reset.c:124

2045 +#: builtin/apply.c:3680 builtin/checkout.c:216 builtin/reset.c:127

2046 #, c-format

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

2048 msgstr ""

2049

1990 -#: builtin/apply.c:3822

2050 +#: builtin/apply.c:3823

2051 #, c-format

2052 msgid "unable to remove %s from index"

2053 msgstr ""

2054

1995 -#: builtin/apply.c:3850

2055 +#: builtin/apply.c:3851

2056 #, c-format

1997 -msgid "corrupt patch for subproject %s"

2057 +msgid "corrupt patch for submodule %s"

2058 msgstr ""

2059

2000 -#: builtin/apply.c:3854

2060 +#: builtin/apply.c:3855

2061 #, c-format

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

2063 msgstr ""

2064

2005 -#: builtin/apply.c:3859

2065 +#: builtin/apply.c:3860

2066 #, c-format

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

2068 msgstr ""

2069

2010 -#: builtin/apply.c:3862 builtin/apply.c:3970

2070 +#: builtin/apply.c:3863 builtin/apply.c:3971

2071 #, c-format

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

2073 msgstr ""

2074

2015 -#: builtin/apply.c:3895

2075 +#: builtin/apply.c:3896

2076 #, c-format

2077 msgid "closing file '%s'"

2078 msgstr ""

2079

2020 -#: builtin/apply.c:3944

2080 +#: builtin/apply.c:3945

2081 #, c-format

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

2083 msgstr ""

2084

2025 -#: builtin/apply.c:4031

2085 +#: builtin/apply.c:4032

2086 #, c-format

2087 msgid "Applied patch %s cleanly."

2088 msgstr ""

2089

2030 -#: builtin/apply.c:4039

2090 +#: builtin/apply.c:4040

2091 msgid "internal error"

2092 msgstr ""

2093

2094 #. Say this even without --verbose

2035 -#: builtin/apply.c:4042

2095 +#: builtin/apply.c:4043

2096 #, c-format

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

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

2099 msgstr[0] ""

2100 msgstr[1] ""

2101

2042 -#: builtin/apply.c:4052

2102 +#: builtin/apply.c:4053

2103 #, c-format

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

2105 msgstr ""

2106

2047 -#: builtin/apply.c:4073

2107 +#: builtin/apply.c:4074

2108 #, c-format

2109 msgid "Hunk #%d applied cleanly."

2110 msgstr ""

2111

2052 -#: builtin/apply.c:4076

2112 +#: builtin/apply.c:4077

2113 #, c-format

2114 msgid "Rejected hunk #%d."

2115 msgstr ""

2116

2057 -#: builtin/apply.c:4226

2117 +#: builtin/apply.c:4227

2118 msgid "unrecognized input"

2119 msgstr ""

2120

2061 -#: builtin/apply.c:4237

2121 +#: builtin/apply.c:4238

2122 msgid "unable to read index file"

2123 msgstr ""

2124

2065 -#: builtin/apply.c:4356 builtin/apply.c:4359 builtin/clone.c:92

2125 +#: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:91

2126 #: builtin/fetch.c:63

2127 msgid "path"

2128 msgstr ""

2129

2070 -#: builtin/apply.c:4357

2130 +#: builtin/apply.c:4358

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

2132 msgstr ""

2133

2074 -#: builtin/apply.c:4360

2134 +#: builtin/apply.c:4361

2135 msgid "apply changes matching the given path"

2136 msgstr ""

2137

2078 -#: builtin/apply.c:4362

2138 +#: builtin/apply.c:4363

2139 msgid "num"

2140 msgstr ""

2141

2082 -#: builtin/apply.c:4363

2142 +#: builtin/apply.c:4364

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

2144 msgstr ""

2145

2086 -#: builtin/apply.c:4366

2146 +#: builtin/apply.c:4367

2147 msgid "ignore additions made by the patch"

2148 msgstr ""

2149

2090 -#: builtin/apply.c:4368

2150 +#: builtin/apply.c:4369

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

2152 msgstr ""

2153

2094 -#: builtin/apply.c:4372

2154 +#: builtin/apply.c:4373

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

2156 msgstr ""

2157

2098 -#: builtin/apply.c:4374

2158 +#: builtin/apply.c:4375

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

2160 msgstr ""

2161

2102 -#: builtin/apply.c:4376

2162 +#: builtin/apply.c:4377

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

2164 msgstr ""

2165

2106 -#: builtin/apply.c:4378

2166 +#: builtin/apply.c:4379

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

2168 msgstr ""

2169

2110 -#: builtin/apply.c:4380

2170 +#: builtin/apply.c:4381

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

2172 msgstr ""

2173

2114 -#: builtin/apply.c:4382

2174 +#: builtin/apply.c:4383

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

2176 msgstr ""

2177

2118 -#: builtin/apply.c:4384

2178 +#: builtin/apply.c:4385

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

2180 msgstr ""

2181

2122 -#: builtin/apply.c:4386

2182 +#: builtin/apply.c:4387

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

2184 msgstr ""

2185

2126 -#: builtin/apply.c:4388 builtin/checkout-index.c:197 builtin/ls-files.c:456

2186 +#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:462

2187 msgid "paths are separated with NUL character"

2188 msgstr ""

2189

2130 -#: builtin/apply.c:4391

2190 +#: builtin/apply.c:4392

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

2192 msgstr ""

2193

2134 -#: builtin/apply.c:4392

2194 +#: builtin/apply.c:4393

2195 msgid "action"

2196 msgstr ""

2197

2138 -#: builtin/apply.c:4393

2198 +#: builtin/apply.c:4394

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

2200 msgstr ""

2201

2142 -#: builtin/apply.c:4396 builtin/apply.c:4399

2202 +#: builtin/apply.c:4397 builtin/apply.c:4400

2203 msgid "ignore changes in whitespace when finding context"

2204 msgstr ""

2205

2146 -#: builtin/apply.c:4402

2206 +#: builtin/apply.c:4403

2207 msgid "apply the patch in reverse"

2208 msgstr ""

2209

2150 -#: builtin/apply.c:4404

2210 +#: builtin/apply.c:4405

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

2212 msgstr ""

2213

2154 -#: builtin/apply.c:4406

2214 +#: builtin/apply.c:4407

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

2216 msgstr ""

2217

2158 -#: builtin/apply.c:4408

2218 +#: builtin/apply.c:4409

2219 msgid "allow overlapping hunks"

2220 msgstr ""

2221

2162 -#: builtin/apply.c:4411

2222 +#: builtin/apply.c:4412

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

2224 msgstr ""

2225

2166 -#: builtin/apply.c:4414

2226 +#: builtin/apply.c:4415

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

2228 msgstr ""

2229

2170 -#: builtin/apply.c:4416

2230 +#: builtin/apply.c:4417

2231 msgid "root"

2232 msgstr ""

2233

2174 -#: builtin/apply.c:4417

2234 +#: builtin/apply.c:4418

2235 msgid "prepend <root> to all filenames"

2236 msgstr ""

2237

2178 -#: builtin/apply.c:4439

2238 +#: builtin/apply.c:4440

2239 msgid "--3way outside a repository"

2240 msgstr ""

2241

2182 -#: builtin/apply.c:4447

2242 +#: builtin/apply.c:4448

2243 msgid "--index outside a repository"

2244 msgstr ""

2245

2186 -#: builtin/apply.c:4450

2246 +#: builtin/apply.c:4451

2247 msgid "--cached outside a repository"

2248 msgstr ""

2249

2190 -#: builtin/apply.c:4466

2250 +#: builtin/apply.c:4467

2251 #, c-format

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

2253 msgstr ""

2254

2195 -#: builtin/apply.c:4480

2255 +#: builtin/apply.c:4481

2256 #, c-format

2257 msgid "squelched %d whitespace error"

2258 msgid_plural "squelched %d whitespace errors"

2259 msgstr[0] ""

2260 msgstr[1] ""

2261

2202 -#: builtin/apply.c:4486 builtin/apply.c:4496

2262 +#: builtin/apply.c:4487 builtin/apply.c:4497

2263 #, c-format

2264 msgid "%d line adds whitespace errors."

2265 msgid_plural "%d lines add whitespace errors."

@@ -2253,103 +2313,103 @@ msgstr ""

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

2314 msgstr ""

2315

2256 -#: builtin/blame.c:25

2316 +#: builtin/blame.c:26

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

2318 msgstr ""

2319

2260 -#: builtin/blame.c:30

2320 +#: builtin/blame.c:31

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

2322 msgstr ""

2323

2264 -#: builtin/blame.c:2355

2324 +#: builtin/blame.c:2276

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

2326 msgstr ""

2327

2268 -#: builtin/blame.c:2356

2328 +#: builtin/blame.c:2277

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

2330 msgstr ""

2331

2272 -#: builtin/blame.c:2357

2332 +#: builtin/blame.c:2278

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

2334 msgstr ""

2335

2276 -#: builtin/blame.c:2358

2336 +#: builtin/blame.c:2279

2337 msgid "Show work cost statistics"

2338 msgstr ""

2339

2280 -#: builtin/blame.c:2359

2340 +#: builtin/blame.c:2280

2341 msgid "Show output score for blame entries"

2342 msgstr ""

2343

2284 -#: builtin/blame.c:2360

2344 +#: builtin/blame.c:2281

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

2346 msgstr ""

2347

2288 -#: builtin/blame.c:2361

2348 +#: builtin/blame.c:2282

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

2350 msgstr ""

2351

2292 -#: builtin/blame.c:2362

2352 +#: builtin/blame.c:2283

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

2354 msgstr ""

2355

2296 -#: builtin/blame.c:2363

2356 +#: builtin/blame.c:2284

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

2358 msgstr ""

2359

2300 -#: builtin/blame.c:2364

2360 +#: builtin/blame.c:2285

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

2362 msgstr ""

2363

2304 -#: builtin/blame.c:2365

2364 +#: builtin/blame.c:2286

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

2366 msgstr ""

2367

2308 -#: builtin/blame.c:2366

2368 +#: builtin/blame.c:2287

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

2370 msgstr ""

2371

2312 -#: builtin/blame.c:2367

2372 +#: builtin/blame.c:2288

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

2374 msgstr ""

2375

2316 -#: builtin/blame.c:2368

2376 +#: builtin/blame.c:2289

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

2378 msgstr ""

2379

2320 -#: builtin/blame.c:2369

2380 +#: builtin/blame.c:2290

2381 msgid "Ignore whitespace differences"

2382 msgstr ""

2383

2324 -#: builtin/blame.c:2370

2384 +#: builtin/blame.c:2291

2385 msgid "Spend extra cycles to find better match"

2386 msgstr ""

2387

2328 -#: builtin/blame.c:2371

2388 +#: builtin/blame.c:2292

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

2390 msgstr ""

2391

2332 -#: builtin/blame.c:2372

2392 +#: builtin/blame.c:2293

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

2394 msgstr ""

2395

2336 -#: builtin/blame.c:2373 builtin/blame.c:2374

2396 +#: builtin/blame.c:2294 builtin/blame.c:2295

2397 msgid "score"

2398 msgstr ""

2399

2340 -#: builtin/blame.c:2373

2400 +#: builtin/blame.c:2294

2401 msgid "Find line copies within and across files"

2402 msgstr ""

2403

2344 -#: builtin/blame.c:2374

2404 +#: builtin/blame.c:2295

2405 msgid "Find line movements within and across files"

2406 msgstr ""

2407

2348 -#: builtin/blame.c:2375

2408 +#: builtin/blame.c:2296

2409 msgid "n,m"

2410 msgstr ""

2411

2352 -#: builtin/blame.c:2375

2412 +#: builtin/blame.c:2296

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

2414 msgstr ""

2415

@@ -2575,8 +2635,8 @@ msgid "act on remote-tracking branches"

2635 msgstr ""

2636

2637 #: builtin/branch.c:805 builtin/branch.c:811 builtin/branch.c:832

2578 -#: builtin/branch.c:838 builtin/commit.c:1368 builtin/commit.c:1369

2579 -#: builtin/commit.c:1370 builtin/commit.c:1371 builtin/tag.c:468

2638 +#: builtin/branch.c:838 builtin/commit.c:1414 builtin/commit.c:1415

2639 +#: builtin/commit.c:1416 builtin/commit.c:1417 builtin/tag.c:468

2640 msgid "commit"

2641 msgstr ""

2642

@@ -2640,7 +2700,7 @@ msgstr ""

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

2701 msgstr ""

2702

2643 -#: builtin/branch.c:860 builtin/clone.c:619

2703 +#: builtin/branch.c:860 builtin/clone.c:630

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

2705 msgstr ""

2706

@@ -2753,43 +2813,43 @@ msgstr ""

2813 msgid "Need a repository to unbundle."

2814 msgstr ""

2815

2756 -#: builtin/cat-file.c:176

2816 +#: builtin/cat-file.c:303

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

2818 msgstr ""

2819

2760 -#: builtin/cat-file.c:177

2820 +#: builtin/cat-file.c:304

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

2822 msgstr ""

2823

2764 -#: builtin/cat-file.c:195

2824 +#: builtin/cat-file.c:341

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

2826 msgstr ""

2827

2768 -#: builtin/cat-file.c:196

2828 +#: builtin/cat-file.c:342

2829 msgid "show object type"

2830 msgstr ""

2831

2772 -#: builtin/cat-file.c:197

2832 +#: builtin/cat-file.c:343

2833 msgid "show object size"

2834 msgstr ""

2835

2776 -#: builtin/cat-file.c:199

2836 +#: builtin/cat-file.c:345

2837 msgid "exit with zero when there's no error"

2838 msgstr ""

2839

2780 -#: builtin/cat-file.c:200

2840 +#: builtin/cat-file.c:346

2841 msgid "pretty-print object's content"

2842 msgstr ""

2843

2784 -#: builtin/cat-file.c:202

2844 +#: builtin/cat-file.c:348

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

2846 msgstr ""

2847

2788 -#: builtin/cat-file.c:204

2848 +#: builtin/cat-file.c:350

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

2850 msgstr ""

2851

2792 -#: builtin/cat-file.c:207

2852 +#: builtin/cat-file.c:353

2853 msgid "show info about objects fed from the standard input"

2854 msgstr ""

2855

@@ -2817,30 +2877,55 @@ msgstr ""

2877 msgid "input paths are terminated by a null character"

2878 msgstr ""

2879

2820 -#: builtin/check-ignore.c:18 builtin/checkout.c:1044 builtin/gc.c:177

2880 +#: builtin/check-ignore.c:18 builtin/checkout.c:1054 builtin/gc.c:177

2881 msgid "suppress progress reporting"

2882 msgstr ""

2883

2824 -#: builtin/check-ignore.c:146

2884 +#: builtin/check-ignore.c:26

2885 +msgid "show non-matching input paths"

2886 +msgstr ""

2887 +

2888 +#: builtin/check-ignore.c:143

2889 msgid "cannot specify pathnames with --stdin"

2890 msgstr ""

2891

2828 -#: builtin/check-ignore.c:149

2892 +#: builtin/check-ignore.c:146

2893 msgid "-z only makes sense with --stdin"

2894 msgstr ""

2895

2832 -#: builtin/check-ignore.c:151

2896 +#: builtin/check-ignore.c:148

2897 msgid "no path specified"

2898 msgstr ""

2899

2836 -#: builtin/check-ignore.c:155

2900 +#: builtin/check-ignore.c:152

2901 msgid "--quiet is only valid with a single pathname"

2902 msgstr ""

2903

2840 -#: builtin/check-ignore.c:157

2904 +#: builtin/check-ignore.c:154

2905 msgid "cannot have both --quiet and --verbose"

2906 msgstr ""

2907

2908 +#: builtin/check-ignore.c:157

2909 +msgid "--non-matching is only valid with --verbose"

2910 +msgstr ""

2911 +

2912 +#: builtin/check-mailmap.c:8

2913 +msgid "git check-mailmap [options] <contact>..."

2914 +msgstr ""

2915 +

2916 +#: builtin/check-mailmap.c:13

2917 +msgid "also read contacts from stdin"

2918 +msgstr ""

2919 +

2920 +#: builtin/check-mailmap.c:24

2921 +#, c-format

2922 +msgid "unable to parse contact: %s"

2923 +msgstr ""

2924 +

2925 +#: builtin/check-mailmap.c:47

2926 +msgid "no contacts specified"

2927 +msgstr ""

2928 +

2929 #: builtin/checkout-index.c:126

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

2931 msgstr ""

@@ -2957,42 +3042,42 @@ msgstr ""

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

3043 msgstr ""

3044

2960 -#: builtin/checkout.c:634

3045 +#: builtin/checkout.c:639

3046 msgid "HEAD is now at"

3047 msgstr ""

3048

2964 -#: builtin/checkout.c:641

3049 +#: builtin/checkout.c:646

3050 #, c-format

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

3052 msgstr ""

3053

2969 -#: builtin/checkout.c:644

3054 +#: builtin/checkout.c:649

3055 #, c-format

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

3057 msgstr ""

3058

2974 -#: builtin/checkout.c:648

3059 +#: builtin/checkout.c:653

3060 #, c-format

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

3062 msgstr ""

3063

2979 -#: builtin/checkout.c:650 builtin/checkout.c:987

3064 +#: builtin/checkout.c:655 builtin/checkout.c:997

3065 #, c-format

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

3067 msgstr ""

3068

2984 -#: builtin/checkout.c:652

3069 +#: builtin/checkout.c:657

3070 #, c-format

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

3072 msgstr ""

3073

2989 -#: builtin/checkout.c:708

3074 +#: builtin/checkout.c:713

3075 #, c-format

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

3077 msgstr ""

3078

3079 #. The singular version

2995 -#: builtin/checkout.c:714

3080 +#: builtin/checkout.c:719

3081 #, c-format

3082 msgid ""

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

@@ -3007,7 +3092,7 @@ msgid_plural ""

3092 msgstr[0] ""

3093 msgstr[1] ""

3094

3010 -#: builtin/checkout.c:732

3095 +#: builtin/checkout.c:737

3096 #, c-format

3097 msgid ""

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

@@ -3017,450 +3102,547 @@ msgid ""

3102 "\n"

3103 msgstr ""

3104

3020 -#: builtin/checkout.c:762

3105 +#: builtin/checkout.c:767

3106 msgid "internal error in revision walk"

3107 msgstr ""

3108

3024 -#: builtin/checkout.c:766

3109 +#: builtin/checkout.c:771

3110 msgid "Previous HEAD position was"

3111 msgstr ""

3112

3028 -#: builtin/checkout.c:793 builtin/checkout.c:982

3113 +#: builtin/checkout.c:798 builtin/checkout.c:992

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

3115 msgstr ""

3116

3117 #. case (1)

3033 -#: builtin/checkout.c:918

3118 +#: builtin/checkout.c:928

3119 #, c-format

3120 msgid "invalid reference: %s"

3121 msgstr ""

3122

3123 #. case (1): want a tree

3039 -#: builtin/checkout.c:957

3124 +#: builtin/checkout.c:967

3125 #, c-format

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

3127 msgstr ""

3128

3044 -#: builtin/checkout.c:996

3129 +#: builtin/checkout.c:1006

3130 msgid "paths cannot be used with switching branches"

3131 msgstr ""

3132

3048 -#: builtin/checkout.c:999 builtin/checkout.c:1003

3133 +#: builtin/checkout.c:1009 builtin/checkout.c:1013

3134 #, c-format

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

3136 msgstr ""

3137

3053 -#: builtin/checkout.c:1007 builtin/checkout.c:1010 builtin/checkout.c:1015

3054 -#: builtin/checkout.c:1018

3138 +#: builtin/checkout.c:1017 builtin/checkout.c:1020 builtin/checkout.c:1025

3139 +#: builtin/checkout.c:1028

3140 #, c-format

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

3142 msgstr ""

3143

3059 -#: builtin/checkout.c:1023

3144 +#: builtin/checkout.c:1033

3145 #, c-format

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

3147 msgstr ""

3148

3064 -#: builtin/checkout.c:1045 builtin/checkout.c:1047 builtin/clone.c:90

3149 +#: builtin/checkout.c:1055 builtin/checkout.c:1057 builtin/clone.c:89

3150 #: builtin/remote.c:169 builtin/remote.c:171

3151 msgid "branch"

3152 msgstr ""

3153

3069 -#: builtin/checkout.c:1046

3154 +#: builtin/checkout.c:1056

3155 msgid "create and checkout a new branch"

3156 msgstr ""

3157

3073 -#: builtin/checkout.c:1048

3158 +#: builtin/checkout.c:1058

3159 msgid "create/reset and checkout a branch"

3160 msgstr ""

3161

3077 -#: builtin/checkout.c:1049

3162 +#: builtin/checkout.c:1059

3163 msgid "create reflog for new branch"

3164 msgstr ""

3165

3081 -#: builtin/checkout.c:1050

3166 +#: builtin/checkout.c:1060

3167 msgid "detach the HEAD at named commit"

3168 msgstr ""

3169

3085 -#: builtin/checkout.c:1051

3170 +#: builtin/checkout.c:1061

3171 msgid "set upstream info for new branch"

3172 msgstr ""

3173

3089 -#: builtin/checkout.c:1053

3174 +#: builtin/checkout.c:1063

3175 msgid "new branch"

3176 msgstr ""

3177

3093 -#: builtin/checkout.c:1053

3178 +#: builtin/checkout.c:1063

3179 msgid "new unparented branch"

3180 msgstr ""

3181

3097 -#: builtin/checkout.c:1054

3182 +#: builtin/checkout.c:1064

3183 msgid "checkout our version for unmerged files"

3184 msgstr ""

3185

3101 -#: builtin/checkout.c:1056

3186 +#: builtin/checkout.c:1066

3187 msgid "checkout their version for unmerged files"

3188 msgstr ""

3189

3105 -#: builtin/checkout.c:1058

3190 +#: builtin/checkout.c:1068

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

3192 msgstr ""

3193

3109 -#: builtin/checkout.c:1059

3194 +#: builtin/checkout.c:1069

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

3196 msgstr ""

3197

3113 -#: builtin/checkout.c:1060 builtin/merge.c:217

3198 +#: builtin/checkout.c:1070 builtin/merge.c:232

3199 msgid "update ignored files (default)"

3200 msgstr ""

3201

3117 -#: builtin/checkout.c:1061 builtin/log.c:1158 parse-options.h:245

3202 +#: builtin/checkout.c:1071 builtin/log.c:1208 parse-options.h:249

3203 msgid "style"

3204 msgstr ""

3205

3121 -#: builtin/checkout.c:1062

3206 +#: builtin/checkout.c:1072

3207 msgid "conflict style (merge or diff3)"

3208 msgstr ""

3209

3125 -#: builtin/checkout.c:1065

3210 +#: builtin/checkout.c:1075

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

3212 msgstr ""

3213

3129 -#: builtin/checkout.c:1067

3214 +#: builtin/checkout.c:1077

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

3216 msgstr ""

3217

3133 -#: builtin/checkout.c:1091

3218 +#: builtin/checkout.c:1101

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

3220 msgstr ""

3221

3137 -#: builtin/checkout.c:1108

3222 +#: builtin/checkout.c:1118

3223 msgid "--track needs a branch name"

3224 msgstr ""

3225

3141 -#: builtin/checkout.c:1115

3226 +#: builtin/checkout.c:1125

3227 msgid "Missing branch name; try -b"

3228 msgstr ""

3229

3145 -#: builtin/checkout.c:1150

3230 +#: builtin/checkout.c:1160

3231 msgid "invalid path specification"

3232 msgstr ""

3233

3149 -#: builtin/checkout.c:1157

3234 +#: builtin/checkout.c:1167

3235 #, c-format

3236 msgid ""

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

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

3239 msgstr ""

3240

3156 -#: builtin/checkout.c:1162

3241 +#: builtin/checkout.c:1172

3242 #, c-format

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

3244 msgstr ""

3245

3161 -#: builtin/checkout.c:1166

3246 +#: builtin/checkout.c:1176

3247 msgid ""

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

3249 "checking out of the index."

3250 msgstr ""

3251

3167 -#: builtin/clean.c:20

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

3252 +#: builtin/clean.c:25

3253 +msgid ""

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

3255 msgstr ""

3256

3171 -#: builtin/clean.c:24

3257 +#: builtin/clean.c:29

3258 #, c-format

3259 msgid "Removing %s\n"

3260 msgstr ""

3261

3176 -#: builtin/clean.c:25

3262 +#: builtin/clean.c:30

3263 #, c-format

3264 msgid "Would remove %s\n"

3265 msgstr ""

3266

3181 -#: builtin/clean.c:26

3267 +#: builtin/clean.c:31

3268 #, c-format

3269 msgid "Skipping repository %s\n"

3270 msgstr ""

3271

3186 -#: builtin/clean.c:27

3272 +#: builtin/clean.c:32

3273 #, c-format

3274 msgid "Would skip repository %s\n"

3275 msgstr ""

3276

3191 -#: builtin/clean.c:28

3277 +#: builtin/clean.c:33

3278 #, c-format

3279 msgid "failed to remove %s"

3280 msgstr ""

3281

3196 -#: builtin/clean.c:160

3282 +#: builtin/clean.c:293

3283 +msgid ""

3284 +"Prompt help:\n"

3285 +"1 - select a numbered item\n"

3286 +"foo - select item based on unique prefix\n"

3287 +" - (empty) select nothing"

3288 +msgstr ""

3289 +

3290 +#: builtin/clean.c:297

3291 +msgid ""

3292 +"Prompt help:\n"

3293 +"1 - select a single item\n"

3294 +"3-5 - select a range of items\n"

3295 +"2-3,6-9 - select multiple ranges\n"

3296 +"foo - select item based on unique prefix\n"

3297 +"-... - unselect specified items\n"

3298 +"* - choose all items\n"

3299 +" - (empty) finish selecting"

3300 +msgstr ""

3301 +

3302 +#: builtin/clean.c:491

3303 +#, c-format

3304 +msgid "Huh (%s)?"

3305 +msgstr ""

3306 +

3307 +#: builtin/clean.c:634

3308 +#, c-format

3309 +msgid "Input ignore patterns>> "

3310 +msgstr ""

3311 +

3312 +#: builtin/clean.c:671

3313 +#, c-format

3314 +msgid "WARNING: Cannot find items matched by: %s"

3315 +msgstr ""

3316 +

3317 +#: builtin/clean.c:692

3318 +msgid "Select items to delete"

3319 +msgstr ""

3320 +

3321 +#: builtin/clean.c:732

3322 +#, c-format

3323 +msgid "remove %s? "

3324 +msgstr ""

3325 +

3326 +#: builtin/clean.c:757

3327 +msgid "Bye."

3328 +msgstr ""

3329 +

3330 +#: builtin/clean.c:765

3331 +msgid ""

3332 +"clean - start cleaning\n"

3333 +"filter by pattern - exclude items from deletion\n"

3334 +"select by numbers - select items to be deleted by numbers\n"

3335 +"ask each - confirm each deletion (like \"rm -i\")\n"

3336 +"quit - stop cleaning\n"

3337 +"help - this screen\n"

3338 +"? - help for prompt selection"

3339 +msgstr ""

3340 +

3341 +#: builtin/clean.c:792

3342 +msgid "*** Commands ***"

3343 +msgstr ""

3344 +

3345 +#: builtin/clean.c:793

3346 +msgid "What now"

3347 +msgstr ""

3348 +

3349 +#: builtin/clean.c:801

3350 +msgid "Would remove the following item:"

3351 +msgid_plural "Would remove the following items:"

3352 +msgstr[0] ""

3353 +msgstr[1] ""

3354 +

3355 +#: builtin/clean.c:818

3356 +msgid "No more files to clean, exiting."

3357 +msgstr ""

3358 +

3359 +#: builtin/clean.c:850

3360 msgid "do not print names of files removed"

3361 msgstr ""

3362

3200 -#: builtin/clean.c:162

3363 +#: builtin/clean.c:852

3364 msgid "force"

3365 msgstr ""

3366

3204 -#: builtin/clean.c:164

3367 +#: builtin/clean.c:853

3368 +msgid "interactive cleaning"

3369 +msgstr ""

3370 +

3371 +#: builtin/clean.c:855

3372 msgid "remove whole directories"

3373 msgstr ""

3374

3208 -#: builtin/clean.c:165 builtin/describe.c:412 builtin/grep.c:717

3209 -#: builtin/ls-files.c:487 builtin/name-rev.c:231 builtin/show-ref.c:182

3375 +#: builtin/clean.c:856 builtin/describe.c:420 builtin/grep.c:716

3376 +#: builtin/ls-files.c:493 builtin/name-rev.c:315 builtin/show-ref.c:186

3377 msgid "pattern"

3378 msgstr ""

3379

3213 -#: builtin/clean.c:166

3380 +#: builtin/clean.c:857

3381 msgid "add <pattern> to ignore rules"

3382 msgstr ""

3383

3217 -#: builtin/clean.c:167

3384 +#: builtin/clean.c:858

3385 msgid "remove ignored files, too"

3386 msgstr ""

3387

3221 -#: builtin/clean.c:169

3388 +#: builtin/clean.c:860

3389 msgid "remove only ignored files"

3390 msgstr ""

3391

3225 -#: builtin/clean.c:187

3392 +#: builtin/clean.c:878

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

3394 msgstr ""

3395

3229 -#: builtin/clean.c:191

3396 +#: builtin/clean.c:882

3397 msgid ""

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

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

3399 +"clean"

3400 msgstr ""

3401

3234 -#: builtin/clean.c:194

3402 +#: builtin/clean.c:885

3403 msgid ""

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

3237 -"clean"

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

3405 +"refusing to clean"

3406 msgstr ""

3407

3240 -#: builtin/clone.c:37

3408 +#: builtin/clone.c:36

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

3410 msgstr ""

3411

3244 -#: builtin/clone.c:65 builtin/fetch.c:82 builtin/merge.c:214

3245 -#: builtin/push.c:436

3412 +#: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:229

3413 +#: builtin/push.c:462

3414 msgid "force progress reporting"

3415 msgstr ""

3416

3249 -#: builtin/clone.c:67

3417 +#: builtin/clone.c:66

3418 msgid "don't create a checkout"

3419 msgstr ""

3420

3253 -#: builtin/clone.c:68 builtin/clone.c:70 builtin/init-db.c:488

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

3422 msgid "create a bare repository"

3423 msgstr ""

3424

3257 -#: builtin/clone.c:73

3425 +#: builtin/clone.c:72

3426 msgid "create a mirror repository (implies bare)"

3427 msgstr ""

3428

3261 -#: builtin/clone.c:75

3429 +#: builtin/clone.c:74

3430 msgid "to clone from a local repository"

3431 msgstr ""

3432

3265 -#: builtin/clone.c:77

3433 +#: builtin/clone.c:76

3434 msgid "don't use local hardlinks, always copy"

3435 msgstr ""

3436

3269 -#: builtin/clone.c:79

3437 +#: builtin/clone.c:78

3438 msgid "setup as shared repository"

3439 msgstr ""

3440

3273 -#: builtin/clone.c:81 builtin/clone.c:83

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

3442 msgid "initialize submodules in the clone"

3443 msgstr ""

3444

3277 -#: builtin/clone.c:84 builtin/init-db.c:485

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

3446 msgid "template-directory"

3447 msgstr ""

3448

3281 -#: builtin/clone.c:85 builtin/init-db.c:486

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

3450 msgid "directory from which templates will be used"

3451 msgstr ""

3452

3285 -#: builtin/clone.c:87

3453 +#: builtin/clone.c:86

3454 msgid "reference repository"

3455 msgstr ""

3456

3289 -#: builtin/clone.c:88 builtin/column.c:26 builtin/merge-file.c:44

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

3458 msgid "name"

3459 msgstr ""

3460

3293 -#: builtin/clone.c:89

3461 +#: builtin/clone.c:88

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

3463 msgstr ""

3464

3297 -#: builtin/clone.c:91

3465 +#: builtin/clone.c:90

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

3467 msgstr ""

3468

3301 -#: builtin/clone.c:93

3469 +#: builtin/clone.c:92

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

3471 msgstr ""

3472

3305 -#: builtin/clone.c:94 builtin/fetch.c:83 builtin/grep.c:662

3473 +#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:661

3474 msgid "depth"

3475 msgstr ""

3476

3309 -#: builtin/clone.c:95

3477 +#: builtin/clone.c:94

3478 msgid "create a shallow clone of that depth"

3479 msgstr ""

3480

3313 -#: builtin/clone.c:97

3481 +#: builtin/clone.c:96

3482 msgid "clone only one branch, HEAD or --branch"

3483 msgstr ""

3484

3317 -#: builtin/clone.c:98 builtin/init-db.c:494

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

3486 msgid "gitdir"

3487 msgstr ""

3488

3321 -#: builtin/clone.c:99 builtin/init-db.c:495

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

3490 msgid "separate git dir from working tree"

3491 msgstr ""

3492

3325 -#: builtin/clone.c:100

3493 +#: builtin/clone.c:99

3494 msgid "key=value"

3495 msgstr ""

3496

3329 -#: builtin/clone.c:101

3497 +#: builtin/clone.c:100

3498 msgid "set config inside the new repository"

3499 msgstr ""

3500

3333 -#: builtin/clone.c:254

3501 +#: builtin/clone.c:253

3502 #, c-format

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

3504 msgstr ""

3505

3338 -#: builtin/clone.c:317

3506 +#: builtin/clone.c:316

3507 #, c-format

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

3509 msgstr ""

3510

3343 -#: builtin/clone.c:319 builtin/diff.c:77

3511 +#: builtin/clone.c:318 builtin/diff.c:77

3512 #, c-format

3513 msgid "failed to stat '%s'"

3514 msgstr ""

3515

3348 -#: builtin/clone.c:321

3516 +#: builtin/clone.c:320

3517 #, c-format

3518 msgid "%s exists and is not a directory"

3519 msgstr ""

3520

3353 -#: builtin/clone.c:335

3521 +#: builtin/clone.c:334

3522 #, c-format

3523 msgid "failed to stat %s\n"

3524 msgstr ""

3525

3358 -#: builtin/clone.c:357

3526 +#: builtin/clone.c:356

3527 #, c-format

3528 msgid "failed to create link '%s'"

3529 msgstr ""

3530

3363 -#: builtin/clone.c:361

3531 +#: builtin/clone.c:360

3532 #, c-format

3533 msgid "failed to copy file to '%s'"

3534 msgstr ""

3535

3368 -#: builtin/clone.c:384

3536 +#: builtin/clone.c:383

3537 #, c-format

3538 msgid "done.\n"

3539 msgstr ""

3540

3373 -#: builtin/clone.c:397

3541 +#: builtin/clone.c:396

3542 msgid ""

3543 "Clone succeeded, but checkout failed.\n"

3544 "You can inspect what was checked out with 'git status'\n"

3545 "and retry the checkout with 'git checkout -f HEAD'\n"

3546 msgstr ""

3547

3380 -#: builtin/clone.c:476

3548 +#: builtin/clone.c:475

3549 #, c-format

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

3551 msgstr ""

3552

3385 -#: builtin/clone.c:550

3553 +#: builtin/clone.c:555

3554 +#, c-format

3555 +msgid "Checking connectivity... "

3556 +msgstr ""

3557 +

3558 +#: builtin/clone.c:558

3559 msgid "remote did not send all necessary objects"

3560 msgstr ""

3561

3389 -#: builtin/clone.c:610

3562 +#: builtin/clone.c:560

3563 +#, c-format

3564 +msgid "done\n"

3565 +msgstr ""

3566 +

3567 +#: builtin/clone.c:621

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

3569 msgstr ""

3570

3393 -#: builtin/clone.c:641

3571 +#: builtin/clone.c:652

3572 msgid "unable to checkout working tree"

3573 msgstr ""

3574

3397 -#: builtin/clone.c:749

3575 +#: builtin/clone.c:760

3576 msgid "Too many arguments."

3577 msgstr ""

3578

3401 -#: builtin/clone.c:753

3579 +#: builtin/clone.c:764

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

3581 msgstr ""

3582

3405 -#: builtin/clone.c:764

3583 +#: builtin/clone.c:775

3584 #, c-format

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

3586 msgstr ""

3587

3410 -#: builtin/clone.c:767

3588 +#: builtin/clone.c:778

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

3590 msgstr ""

3591

3414 -#: builtin/clone.c:780

3592 +#: builtin/clone.c:791

3593 #, c-format

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

3595 msgstr ""

3596

3419 -#: builtin/clone.c:785

3597 +#: builtin/clone.c:796

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

3599 msgstr ""

3600

3423 -#: builtin/clone.c:795

3601 +#: builtin/clone.c:798

3602 +msgid "--local is ignored"

3603 +msgstr ""

3604 +

3605 +#: builtin/clone.c:808

3606 #, c-format

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

3608 msgstr ""

3609

3428 -#: builtin/clone.c:805

3610 +#: builtin/clone.c:818

3611 #, c-format

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

3613 msgstr ""

3614

3433 -#: builtin/clone.c:818 builtin/clone.c:830

3615 +#: builtin/clone.c:831 builtin/clone.c:843

3616 #, c-format

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

3618 msgstr ""

3619

3438 -#: builtin/clone.c:821

3620 +#: builtin/clone.c:834

3621 #, c-format

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

3623 msgstr ""

3624

3443 -#: builtin/clone.c:840

3625 +#: builtin/clone.c:853

3626 #, c-format

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

3628 msgstr ""

3629

3448 -#: builtin/clone.c:842

3630 +#: builtin/clone.c:855

3631 #, c-format

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

3633 msgstr ""

3634

3453 -#: builtin/clone.c:877

3635 +#: builtin/clone.c:890

3636 #, c-format

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

3638 msgstr ""

3639

3458 -#: builtin/clone.c:926

3640 +#: builtin/clone.c:942

3641 #, c-format

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

3643 msgstr ""

3644

3463 -#: builtin/clone.c:933

3645 +#: builtin/clone.c:949

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

3647 msgstr ""

3648

@@ -3496,15 +3678,15 @@ msgstr ""

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

3679 msgstr ""

3680

3499 -#: builtin/commit.c:34

3681 +#: builtin/commit.c:35

3682 msgid "git commit [options] [--] <pathspec>..."

3683 msgstr ""

3684

3503 -#: builtin/commit.c:39

3685 +#: builtin/commit.c:40

3686 msgid "git status [options] [--] <pathspec>..."

3687 msgstr ""

3688

3507 -#: builtin/commit.c:44

3689 +#: builtin/commit.c:45

3690 msgid ""

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

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

@@ -3518,14 +3700,14 @@ msgid ""

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

3701 msgstr ""

3702

3521 -#: builtin/commit.c:56

3703 +#: builtin/commit.c:57

3704 msgid ""

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

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

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

3708 msgstr ""

3709

3528 -#: builtin/commit.c:61

3710 +#: builtin/commit.c:62

3711 msgid ""

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

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

@@ -3535,93 +3717,93 @@ msgid ""

3717 "Otherwise, please use 'git reset'\n"

3718 msgstr ""

3719

3538 -#: builtin/commit.c:260

3720 +#: builtin/commit.c:265

3721 msgid "failed to unpack HEAD tree object"

3722 msgstr ""

3723

3542 -#: builtin/commit.c:302

3724 +#: builtin/commit.c:307

3725 msgid "unable to create temporary index"

3726 msgstr ""

3727

3546 -#: builtin/commit.c:308

3728 +#: builtin/commit.c:313

3729 msgid "interactive add failed"

3730 msgstr ""

3731

3550 -#: builtin/commit.c:341 builtin/commit.c:362 builtin/commit.c:412

3732 +#: builtin/commit.c:346 builtin/commit.c:367 builtin/commit.c:417

3733 msgid "unable to write new_index file"

3734 msgstr ""

3735

3554 -#: builtin/commit.c:393

3736 +#: builtin/commit.c:398

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

3738 msgstr ""

3739

3558 -#: builtin/commit.c:395

3740 +#: builtin/commit.c:400

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

3742 msgstr ""

3743

3562 -#: builtin/commit.c:405

3744 +#: builtin/commit.c:410

3745 msgid "cannot read the index"

3746 msgstr ""

3747

3566 -#: builtin/commit.c:425

3748 +#: builtin/commit.c:430

3749 msgid "unable to write temporary index file"

3750 msgstr ""

3751

3570 -#: builtin/commit.c:513 builtin/commit.c:519

3752 +#: builtin/commit.c:521 builtin/commit.c:527

3753 #, c-format

3754 msgid "invalid commit: %s"

3755 msgstr ""

3756

3575 -#: builtin/commit.c:542

3757 +#: builtin/commit.c:549

3758 msgid "malformed --author parameter"

3759 msgstr ""

3760

3579 -#: builtin/commit.c:562

3761 +#: builtin/commit.c:569

3762 #, c-format

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

3764 msgstr ""

3765

3584 -#: builtin/commit.c:600 builtin/commit.c:633 builtin/commit.c:956

3766 +#: builtin/commit.c:607 builtin/commit.c:640 builtin/commit.c:963

3767 #, c-format

3768 msgid "could not lookup commit %s"

3769 msgstr ""

3770

3589 -#: builtin/commit.c:612 builtin/shortlog.c:270

3771 +#: builtin/commit.c:619 builtin/shortlog.c:271

3772 #, c-format

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

3774 msgstr ""

3775

3594 -#: builtin/commit.c:614

3776 +#: builtin/commit.c:621

3777 msgid "could not read log from standard input"

3778 msgstr ""

3779

3598 -#: builtin/commit.c:618

3780 +#: builtin/commit.c:625

3781 #, c-format

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

3783 msgstr ""

3784

3603 -#: builtin/commit.c:624

3785 +#: builtin/commit.c:631

3786 msgid "commit has empty message"

3787 msgstr ""

3788

3607 -#: builtin/commit.c:640

3789 +#: builtin/commit.c:647

3790 msgid "could not read MERGE_MSG"

3791 msgstr ""

3792

3611 -#: builtin/commit.c:644

3793 +#: builtin/commit.c:651

3794 msgid "could not read SQUASH_MSG"

3795 msgstr ""

3796

3615 -#: builtin/commit.c:648

3797 +#: builtin/commit.c:655

3798 #, c-format

3799 msgid "could not read '%s'"

3800 msgstr ""

3801

3620 -#: builtin/commit.c:709

3802 +#: builtin/commit.c:716

3803 msgid "could not write commit template"

3804 msgstr ""

3805

3624 -#: builtin/commit.c:720

3806 +#: builtin/commit.c:727

3807 #, c-format

3808 msgid ""

3809 "\n"

@@ -3631,7 +3813,7 @@ msgid ""

3813 "and try again.\n"

3814 msgstr ""

3815

3634 -#: builtin/commit.c:725

3816 +#: builtin/commit.c:732

3817 #, c-format

3818 msgid ""

3819 "\n"

@@ -3641,14 +3823,14 @@ msgid ""

3823 "and try again.\n"

3824 msgstr ""

3825

3644 -#: builtin/commit.c:737

3826 +#: builtin/commit.c:744

3827 #, c-format

3828 msgid ""

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

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

3831 msgstr ""

3832

3651 -#: builtin/commit.c:742

3833 +#: builtin/commit.c:749

3834 #, c-format

3835 msgid ""

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

@@ -3656,351 +3838,351 @@ msgid ""

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

3839 msgstr ""

3840

3659 -#: builtin/commit.c:755

3841 +#: builtin/commit.c:762

3842 #, c-format

3843 msgid "%sAuthor: %s"

3844 msgstr ""

3845

3664 -#: builtin/commit.c:762

3846 +#: builtin/commit.c:769

3847 #, c-format

3848 msgid "%sCommitter: %s"

3849 msgstr ""

3850

3669 -#: builtin/commit.c:782

3851 +#: builtin/commit.c:789

3852 msgid "Cannot read index"

3853 msgstr ""

3854

3673 -#: builtin/commit.c:819

3855 +#: builtin/commit.c:826

3856 msgid "Error building trees"

3857 msgstr ""

3858

3677 -#: builtin/commit.c:834 builtin/tag.c:359

3859 +#: builtin/commit.c:841 builtin/tag.c:359

3860 #, c-format

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

3862 msgstr ""

3863

3682 -#: builtin/commit.c:931

3864 +#: builtin/commit.c:938

3865 #, c-format

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

3867 msgstr ""

3868

3687 -#: builtin/commit.c:946 builtin/commit.c:1140

3869 +#: builtin/commit.c:953 builtin/commit.c:1189

3870 #, c-format

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

3872 msgstr ""

3873

3692 -#: builtin/commit.c:976

3874 +#: builtin/commit.c:990

3875 +msgid "--long and -z are incompatible"

3876 +msgstr ""

3877 +

3878 +#: builtin/commit.c:1020

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

3880 msgstr ""

3881

3696 -#: builtin/commit.c:987

3882 +#: builtin/commit.c:1031

3883 msgid "You have nothing to amend."

3884 msgstr ""

3885

3700 -#: builtin/commit.c:990

3886 +#: builtin/commit.c:1034

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

3888 msgstr ""

3889

3704 -#: builtin/commit.c:992

3890 +#: builtin/commit.c:1036

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

3892 msgstr ""

3893

3708 -#: builtin/commit.c:995

3894 +#: builtin/commit.c:1039

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

3896 msgstr ""

3897

3712 -#: builtin/commit.c:1005

3898 +#: builtin/commit.c:1049

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

3900 msgstr ""

3901

3716 -#: builtin/commit.c:1007

3902 +#: builtin/commit.c:1051

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

3904 msgstr ""

3905

3720 -#: builtin/commit.c:1015

3906 +#: builtin/commit.c:1059

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

3908 msgstr ""

3909

3724 -#: builtin/commit.c:1032

3910 +#: builtin/commit.c:1076

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

3912 msgstr ""

3913

3728 -#: builtin/commit.c:1034

3914 +#: builtin/commit.c:1078

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

3916 msgstr ""

3917

3732 -#: builtin/commit.c:1036

3918 +#: builtin/commit.c:1080

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

3920 msgstr ""

3921

3736 -#: builtin/commit.c:1038

3922 +#: builtin/commit.c:1082

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

3924 msgstr ""

3925

3740 -#: builtin/commit.c:1048 builtin/tag.c:575

3926 +#: builtin/commit.c:1092 builtin/tag.c:575

3927 #, c-format

3928 msgid "Invalid cleanup mode %s"

3929 msgstr ""

3930

3745 -#: builtin/commit.c:1053

3931 +#: builtin/commit.c:1097

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

3933 msgstr ""

3934

3749 -#: builtin/commit.c:1059 builtin/commit.c:1194

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

3751 -msgstr ""

3752 -

3753 -#: builtin/commit.c:1154 builtin/commit.c:1390

3935 +#: builtin/commit.c:1203 builtin/commit.c:1436

3936 msgid "show status concisely"

3937 msgstr ""

3938

3757 -#: builtin/commit.c:1156 builtin/commit.c:1392

3939 +#: builtin/commit.c:1205 builtin/commit.c:1438

3940 msgid "show branch information"

3941 msgstr ""

3942

3761 -#: builtin/commit.c:1158 builtin/commit.c:1394 builtin/push.c:426

3943 +#: builtin/commit.c:1207 builtin/commit.c:1440 builtin/push.c:452

3944 msgid "machine-readable output"

3945 msgstr ""

3946

3765 -#: builtin/commit.c:1161 builtin/commit.c:1396

3947 +#: builtin/commit.c:1210 builtin/commit.c:1442

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

3949 msgstr ""

3950

3769 -#: builtin/commit.c:1164 builtin/commit.c:1399

3951 +#: builtin/commit.c:1213 builtin/commit.c:1445

3952 msgid "terminate entries with NUL"

3953 msgstr ""

3954

3773 -#: builtin/commit.c:1166 builtin/commit.c:1402 builtin/fast-export.c:659

3774 -#: builtin/fast-export.c:662 builtin/tag.c:459

3955 +#: builtin/commit.c:1215 builtin/commit.c:1448 builtin/fast-export.c:667

3956 +#: builtin/fast-export.c:670 builtin/tag.c:459

3957 msgid "mode"

3958 msgstr ""

3959

3778 -#: builtin/commit.c:1167 builtin/commit.c:1402

3960 +#: builtin/commit.c:1216 builtin/commit.c:1448

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

3962 msgstr ""

3963

3782 -#: builtin/commit.c:1170

3964 +#: builtin/commit.c:1219

3965 msgid "show ignored files"

3966 msgstr ""

3967

3786 -#: builtin/commit.c:1171 parse-options.h:151

3968 +#: builtin/commit.c:1220 parse-options.h:154

3969 msgid "when"

3970 msgstr ""

3971

3790 -#: builtin/commit.c:1172

3972 +#: builtin/commit.c:1221

3973 msgid ""

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

3975 "(Default: all)"

3976 msgstr ""

3977

3796 -#: builtin/commit.c:1174

3978 +#: builtin/commit.c:1223

3979 msgid "list untracked files in columns"

3980 msgstr ""

3981

3800 -#: builtin/commit.c:1248

3982 +#: builtin/commit.c:1294

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

3984 msgstr ""

3985

3804 -#: builtin/commit.c:1250

3986 +#: builtin/commit.c:1296

3987 msgid "could not parse newly created commit"

3988 msgstr ""

3989

3808 -#: builtin/commit.c:1291

3990 +#: builtin/commit.c:1337

3991 msgid "detached HEAD"

3992 msgstr ""

3993

3812 -#: builtin/commit.c:1293

3994 +#: builtin/commit.c:1339

3995 msgid " (root-commit)"

3996 msgstr ""

3997

3816 -#: builtin/commit.c:1360

3998 +#: builtin/commit.c:1406

3999 msgid "suppress summary after successful commit"

4000 msgstr ""

4001

3820 -#: builtin/commit.c:1361

4002 +#: builtin/commit.c:1407

4003 msgid "show diff in commit message template"

4004 msgstr ""

4005

3824 -#: builtin/commit.c:1363

4006 +#: builtin/commit.c:1409

4007 msgid "Commit message options"

4008 msgstr ""

4009

3828 -#: builtin/commit.c:1364 builtin/tag.c:457

4010 +#: builtin/commit.c:1410 builtin/tag.c:457

4011 msgid "read message from file"

4012 msgstr ""

4013

3832 -#: builtin/commit.c:1365

4014 +#: builtin/commit.c:1411

4015 msgid "author"

4016 msgstr ""

4017

3836 -#: builtin/commit.c:1365

4018 +#: builtin/commit.c:1411

4019 msgid "override author for commit"

4020 msgstr ""

4021

3840 -#: builtin/commit.c:1366 builtin/gc.c:178

4022 +#: builtin/commit.c:1412 builtin/gc.c:178

4023 msgid "date"

4024 msgstr ""

4025

3844 -#: builtin/commit.c:1366

4026 +#: builtin/commit.c:1412

4027 msgid "override date for commit"

4028 msgstr ""

4029

3848 -#: builtin/commit.c:1367 builtin/merge.c:208 builtin/notes.c:533

3849 -#: builtin/notes.c:690 builtin/tag.c:455

4030 +#: builtin/commit.c:1413 builtin/merge.c:223 builtin/notes.c:405

4031 +#: builtin/notes.c:562 builtin/tag.c:455

4032 msgid "message"

4033 msgstr ""

4034

3853 -#: builtin/commit.c:1367

4035 +#: builtin/commit.c:1413

4036 msgid "commit message"

4037 msgstr ""

4038

3857 -#: builtin/commit.c:1368

4039 +#: builtin/commit.c:1414

4040 msgid "reuse and edit message from specified commit"

4041 msgstr ""

4042

3861 -#: builtin/commit.c:1369

4043 +#: builtin/commit.c:1415

4044 msgid "reuse message from specified commit"

4045 msgstr ""

4046

3865 -#: builtin/commit.c:1370

4047 +#: builtin/commit.c:1416

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

4049 msgstr ""

4050

3869 -#: builtin/commit.c:1371

4051 +#: builtin/commit.c:1417

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

4053 msgstr ""

4054

3873 -#: builtin/commit.c:1372

4055 +#: builtin/commit.c:1418

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

4057 msgstr ""

4058

3877 -#: builtin/commit.c:1373 builtin/log.c:1113 builtin/revert.c:109

4059 +#: builtin/commit.c:1419 builtin/log.c:1160 builtin/revert.c:111

4060 msgid "add Signed-off-by:"

4061 msgstr ""

4062

3881 -#: builtin/commit.c:1374

4063 +#: builtin/commit.c:1420

4064 msgid "use specified template file"

4065 msgstr ""

4066

3885 -#: builtin/commit.c:1375

4067 +#: builtin/commit.c:1421

4068 msgid "force edit of commit"

4069 msgstr ""

4070

3889 -#: builtin/commit.c:1376

4071 +#: builtin/commit.c:1422

4072 msgid "default"

4073 msgstr ""

4074

3893 -#: builtin/commit.c:1376 builtin/tag.c:460

4075 +#: builtin/commit.c:1422 builtin/tag.c:460

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

4077 msgstr ""

4078

3897 -#: builtin/commit.c:1377

4079 +#: builtin/commit.c:1423

4080 msgid "include status in commit message template"

4081 msgstr ""

4082

3901 -#: builtin/commit.c:1378 builtin/merge.c:215 builtin/tag.c:461

4083 +#: builtin/commit.c:1424 builtin/merge.c:230 builtin/tag.c:461

4084 msgid "key id"

4085 msgstr ""

4086

3905 -#: builtin/commit.c:1379 builtin/merge.c:216

4087 +#: builtin/commit.c:1425 builtin/merge.c:231

4088 msgid "GPG sign commit"

4089 msgstr ""

4090

4091 #. end commit message options

3910 -#: builtin/commit.c:1382

4092 +#: builtin/commit.c:1428

4093 msgid "Commit contents options"

4094 msgstr ""

4095

3914 -#: builtin/commit.c:1383

4096 +#: builtin/commit.c:1429

4097 msgid "commit all changed files"

4098 msgstr ""

4099

3918 -#: builtin/commit.c:1384

4100 +#: builtin/commit.c:1430

4101 msgid "add specified files to index for commit"

4102 msgstr ""

4103

3922 -#: builtin/commit.c:1385

4104 +#: builtin/commit.c:1431

4105 msgid "interactively add files"

4106 msgstr ""

4107

3926 -#: builtin/commit.c:1386

4108 +#: builtin/commit.c:1432

4109 msgid "interactively add changes"

4110 msgstr ""

4111

3930 -#: builtin/commit.c:1387

4112 +#: builtin/commit.c:1433

4113 msgid "commit only specified files"

4114 msgstr ""

4115

3934 -#: builtin/commit.c:1388

4116 +#: builtin/commit.c:1434

4117 msgid "bypass pre-commit hook"

4118 msgstr ""

4119

3938 -#: builtin/commit.c:1389

4120 +#: builtin/commit.c:1435

4121 msgid "show what would be committed"

4122 msgstr ""

4123

3942 -#: builtin/commit.c:1400

4124 +#: builtin/commit.c:1446

4125 msgid "amend previous commit"

4126 msgstr ""

4127

3946 -#: builtin/commit.c:1401

4128 +#: builtin/commit.c:1447

4129 msgid "bypass post-rewrite hook"

4130 msgstr ""

4131

3950 -#: builtin/commit.c:1406

4132 +#: builtin/commit.c:1452

4133 msgid "ok to record an empty change"

4134 msgstr ""

4135

3954 -#: builtin/commit.c:1409

4136 +#: builtin/commit.c:1455

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

4138 msgstr ""

4139

3958 -#: builtin/commit.c:1441

4140 +#: builtin/commit.c:1488

4141 msgid "could not parse HEAD commit"

4142 msgstr ""

4143

3962 -#: builtin/commit.c:1479 builtin/merge.c:510

4144 +#: builtin/commit.c:1526 builtin/merge.c:525

4145 #, c-format

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

4147 msgstr ""

4148

3967 -#: builtin/commit.c:1486

4149 +#: builtin/commit.c:1533

4150 #, c-format

4151 msgid "Corrupt MERGE_HEAD file (%s)"

4152 msgstr ""

4153

3972 -#: builtin/commit.c:1493

4154 +#: builtin/commit.c:1540

4155 msgid "could not read MERGE_MODE"

4156 msgstr ""

4157

3976 -#: builtin/commit.c:1512

4158 +#: builtin/commit.c:1559

4159 #, c-format

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

4161 msgstr ""

4162

3981 -#: builtin/commit.c:1526

4163 +#: builtin/commit.c:1573

4164 #, c-format

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

4166 msgstr ""

4167

3986 -#: builtin/commit.c:1531

4168 +#: builtin/commit.c:1578

4169 #, c-format

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

4171 msgstr ""

4172

3991 -#: builtin/commit.c:1546 builtin/merge.c:847 builtin/merge.c:872

4173 +#: builtin/commit.c:1593 builtin/merge.c:861 builtin/merge.c:886

4174 msgid "failed to write commit object"

4175 msgstr ""

4176

3995 -#: builtin/commit.c:1567

4177 +#: builtin/commit.c:1614

4178 msgid "cannot lock HEAD ref"

4179 msgstr ""

4180

3999 -#: builtin/commit.c:1571

4181 +#: builtin/commit.c:1618

4182 msgid "cannot update HEAD ref"

4183 msgstr ""

4184

4003 -#: builtin/commit.c:1582

4185 +#: builtin/commit.c:1629

4186 msgid ""

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

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

@@ -4011,115 +4193,123 @@ msgstr ""

4193 msgid "git config [options]"

4194 msgstr ""

4195

4014 -#: builtin/config.c:51

4196 +#: builtin/config.c:52

4197 msgid "Config file location"

4198 msgstr ""

4199

4018 -#: builtin/config.c:52

4200 +#: builtin/config.c:53

4201 msgid "use global config file"

4202 msgstr ""

4203

4022 -#: builtin/config.c:53

4204 +#: builtin/config.c:54

4205 msgid "use system config file"

4206 msgstr ""

4207

4026 -#: builtin/config.c:54

4208 +#: builtin/config.c:55

4209 msgid "use repository config file"

4210 msgstr ""

4211

4030 -#: builtin/config.c:55

4212 +#: builtin/config.c:56

4213 msgid "use given config file"

4214 msgstr ""

4215

4034 -#: builtin/config.c:56

4035 -msgid "Action"

4216 +#: builtin/config.c:57

4217 +msgid "blob-id"

4218 msgstr ""

4219

4220 #: builtin/config.c:57

4039 -msgid "get value: name [value-regex]"

4221 +msgid "read config from given blob object"

4222 msgstr ""

4223

4224 #: builtin/config.c:58

4043 -msgid "get all values: key [value-regex]"

4225 +msgid "Action"

4226 msgstr ""

4227

4228 #: builtin/config.c:59

4047 -msgid "get values for regexp: name-regex [value-regex]"

4229 +msgid "get value: name [value-regex]"

4230 msgstr ""

4231

4232 #: builtin/config.c:60

4051 -msgid "replace all matching variables: name value [value_regex]"

4233 +msgid "get all values: key [value-regex]"

4234 msgstr ""

4235

4236 #: builtin/config.c:61

4055 -msgid "add a new variable: name value"

4237 +msgid "get values for regexp: name-regex [value-regex]"

4238 msgstr ""

4239

4240 #: builtin/config.c:62

4059 -msgid "remove a variable: name [value-regex]"

4241 +msgid "replace all matching variables: name value [value_regex]"

4242 msgstr ""

4243

4244 #: builtin/config.c:63

4063 -msgid "remove all matches: name [value-regex]"

4245 +msgid "add a new variable: name value"

4246 msgstr ""

4247

4248 #: builtin/config.c:64

4067 -msgid "rename section: old-name new-name"

4249 +msgid "remove a variable: name [value-regex]"

4250 msgstr ""

4251

4252 #: builtin/config.c:65

4071 -msgid "remove a section: name"

4253 +msgid "remove all matches: name [value-regex]"

4254 msgstr ""

4255

4256 #: builtin/config.c:66

4075 -msgid "list all"

4257 +msgid "rename section: old-name new-name"

4258 msgstr ""

4259

4260 #: builtin/config.c:67

4261 +msgid "remove a section: name"

4262 +msgstr ""

4263 +

4264 +#: builtin/config.c:68

4265 +msgid "list all"

4266 +msgstr ""

4267 +

4268 +#: builtin/config.c:69

4269 msgid "open an editor"

4270 msgstr ""

4271

4082 -#: builtin/config.c:68 builtin/config.c:69

4272 +#: builtin/config.c:70 builtin/config.c:71

4273 msgid "slot"

4274 msgstr ""

4275

4086 -#: builtin/config.c:68

4276 +#: builtin/config.c:70

4277 msgid "find the color configured: [default]"

4278 msgstr ""

4279

4090 -#: builtin/config.c:69

4280 +#: builtin/config.c:71

4281 msgid "find the color setting: [stdout-is-tty]"

4282 msgstr ""

4283

4094 -#: builtin/config.c:70

4284 +#: builtin/config.c:72

4285 msgid "Type"

4286 msgstr ""

4287

4098 -#: builtin/config.c:71

4288 +#: builtin/config.c:73

4289 msgid "value is \"true\" or \"false\""

4290 msgstr ""

4291

4102 -#: builtin/config.c:72

4292 +#: builtin/config.c:74

4293 msgid "value is decimal number"

4294 msgstr ""

4295

4106 -#: builtin/config.c:73

4296 +#: builtin/config.c:75

4297 msgid "value is --bool or --int"

4298 msgstr ""

4299

4110 -#: builtin/config.c:74

4300 +#: builtin/config.c:76

4301 msgid "value is a path (file or directory name)"

4302 msgstr ""

4303

4114 -#: builtin/config.c:75

4304 +#: builtin/config.c:77

4305 msgid "Other"

4306 msgstr ""

4307

4118 -#: builtin/config.c:76

4308 +#: builtin/config.c:78

4309 msgid "terminate values with NUL byte"

4310 msgstr ""

4311

4122 -#: builtin/config.c:77

4312 +#: builtin/config.c:79

4313 msgid "respect include directives on lookup"

4314 msgstr ""

4315

@@ -4131,133 +4321,137 @@ msgstr ""

4321 msgid "print sizes in human readable format"

4322 msgstr ""

4323

4134 -#: builtin/describe.c:15

4324 +#: builtin/describe.c:16

4325 msgid "git describe [options] <committish>*"

4326 msgstr ""

4327

4138 -#: builtin/describe.c:16

4328 +#: builtin/describe.c:17

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

4330 msgstr ""

4331

4142 -#: builtin/describe.c:233

4332 +#: builtin/describe.c:237

4333 #, c-format

4334 msgid "annotated tag %s not available"

4335 msgstr ""

4336

4147 -#: builtin/describe.c:237

4337 +#: builtin/describe.c:241

4338 #, c-format

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

4340 msgstr ""

4341

4152 -#: builtin/describe.c:239

4342 +#: builtin/describe.c:243

4343 #, c-format

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

4345 msgstr ""

4346

4157 -#: builtin/describe.c:266

4347 +#: builtin/describe.c:270

4348 #, c-format

4349 msgid "Not a valid object name %s"

4350 msgstr ""

4351

4162 -#: builtin/describe.c:269

4352 +#: builtin/describe.c:273

4353 #, c-format

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

4355 msgstr ""

4356

4167 -#: builtin/describe.c:286

4357 +#: builtin/describe.c:290

4358 #, c-format

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

4360 msgstr ""

4361

4172 -#: builtin/describe.c:288

4362 +#: builtin/describe.c:292

4363 #, c-format

4364 msgid "searching to describe %s\n"

4365 msgstr ""

4366

4177 -#: builtin/describe.c:328

4367 +#: builtin/describe.c:332

4368 #, c-format

4369 msgid "finished search at %s\n"

4370 msgstr ""

4371

4182 -#: builtin/describe.c:352

4372 +#: builtin/describe.c:359

4373 #, c-format

4374 msgid ""

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

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

4377 msgstr ""

4378

4189 -#: builtin/describe.c:356

4379 +#: builtin/describe.c:363

4380 #, c-format

4381 msgid ""

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

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

4384 msgstr ""

4385

4196 -#: builtin/describe.c:377

4386 +#: builtin/describe.c:384

4387 #, c-format

4388 msgid "traversed %lu commits\n"

4389 msgstr ""

4390

4201 -#: builtin/describe.c:380

4391 +#: builtin/describe.c:387

4392 #, c-format

4393 msgid ""

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

4395 "gave up search at %s\n"

4396 msgstr ""

4397

4208 -#: builtin/describe.c:402

4398 +#: builtin/describe.c:409

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

4400 msgstr ""

4401

4212 -#: builtin/describe.c:403

4402 +#: builtin/describe.c:410

4403 msgid "debug search strategy on stderr"

4404 msgstr ""

4405

4216 -#: builtin/describe.c:404

4406 +#: builtin/describe.c:411

4407 msgid "use any ref"

4408 msgstr ""

4409

4220 -#: builtin/describe.c:405

4410 +#: builtin/describe.c:412

4411 msgid "use any tag, even unannotated"

4412 msgstr ""

4413

4224 -#: builtin/describe.c:406

4414 +#: builtin/describe.c:413

4415 msgid "always use long format"

4416 msgstr ""

4417

4228 -#: builtin/describe.c:409

4418 +#: builtin/describe.c:414

4419 +msgid "only follow first parent"

4420 +msgstr ""

4421 +

4422 +#: builtin/describe.c:417

4423 msgid "only output exact matches"

4424 msgstr ""

4425

4232 -#: builtin/describe.c:411

4426 +#: builtin/describe.c:419

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

4428 msgstr ""

4429

4236 -#: builtin/describe.c:413

4430 +#: builtin/describe.c:421

4431 msgid "only consider tags matching <pattern>"

4432 msgstr ""

4433

4240 -#: builtin/describe.c:415 builtin/name-rev.c:238

4434 +#: builtin/describe.c:423 builtin/name-rev.c:322

4435 msgid "show abbreviated commit object as fallback"

4436 msgstr ""

4437

4244 -#: builtin/describe.c:416

4438 +#: builtin/describe.c:424

4439 msgid "mark"

4440 msgstr ""

4441

4248 -#: builtin/describe.c:417

4442 +#: builtin/describe.c:425

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

4444 msgstr ""

4445

4252 -#: builtin/describe.c:435

4446 +#: builtin/describe.c:443

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

4448 msgstr ""

4449

4256 -#: builtin/describe.c:461

4450 +#: builtin/describe.c:469

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

4452 msgstr ""

4453

4260 -#: builtin/describe.c:481

4454 +#: builtin/describe.c:489

4455 msgid "--dirty is incompatible with committishes"

4456 msgstr ""

4457

@@ -4266,31 +4460,26 @@ msgstr ""

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

4461 msgstr ""

4462

4269 -#: builtin/diff.c:228

4463 +#: builtin/diff.c:230

4464 #, c-format

4465 msgid "invalid option: %s"

4466 msgstr ""

4467

4274 -#: builtin/diff.c:305

4468 +#: builtin/diff.c:307

4469 msgid "Not a git repository"

4470 msgstr ""

4471

4278 -#: builtin/diff.c:348

4472 +#: builtin/diff.c:350

4473 #, c-format

4474 msgid "invalid object '%s' given."

4475 msgstr ""

4476

4283 -#: builtin/diff.c:353

4284 -#, c-format

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

4286 -msgstr ""

4287 -

4288 -#: builtin/diff.c:363

4477 +#: builtin/diff.c:359

4478 #, c-format

4479 msgid "more than two blobs given: '%s'"

4480 msgstr ""

4481

4293 -#: builtin/diff.c:371

4482 +#: builtin/diff.c:366

4483 #, c-format

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

4485 msgstr ""

@@ -4299,39 +4488,39 @@ msgstr ""

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

4489 msgstr ""

4490

4302 -#: builtin/fast-export.c:658

4491 +#: builtin/fast-export.c:666

4492 msgid "show progress after <n> objects"

4493 msgstr ""

4494

4306 -#: builtin/fast-export.c:660

4495 +#: builtin/fast-export.c:668

4496 msgid "select handling of signed tags"

4497 msgstr ""

4498

4310 -#: builtin/fast-export.c:663

4499 +#: builtin/fast-export.c:671

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

4501 msgstr ""

4502

4314 -#: builtin/fast-export.c:666

4503 +#: builtin/fast-export.c:674

4504 msgid "Dump marks to this file"

4505 msgstr ""

4506

4318 -#: builtin/fast-export.c:668

4507 +#: builtin/fast-export.c:676

4508 msgid "Import marks from this file"

4509 msgstr ""

4510

4322 -#: builtin/fast-export.c:670

4511 +#: builtin/fast-export.c:678

4512 msgid "Fake a tagger when tags lack one"

4513 msgstr ""

4514

4326 -#: builtin/fast-export.c:672

4515 +#: builtin/fast-export.c:680

4516 msgid "Output full tree for each commit"

4517 msgstr ""

4518

4330 -#: builtin/fast-export.c:674

4519 +#: builtin/fast-export.c:682

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

4521 msgstr ""

4522

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

4523 +#: builtin/fast-export.c:683

4524 msgid "Skip output of blob data"

4525 msgstr ""

4526

@@ -4407,7 +4596,7 @@ msgstr ""

4596 msgid "convert to a complete repository"

4597 msgstr ""

4598

4410 -#: builtin/fetch.c:88 builtin/log.c:1130

4599 +#: builtin/fetch.c:88 builtin/log.c:1177

4600 msgid "dir"

4601 msgstr ""

4602

@@ -4419,162 +4608,162 @@ msgstr ""

4608 msgid "default mode for recursion"

4609 msgstr ""

4610

4422 -#: builtin/fetch.c:204

4611 +#: builtin/fetch.c:220

4612 msgid "Couldn't find remote ref HEAD"

4613 msgstr ""

4614

4426 -#: builtin/fetch.c:257

4615 +#: builtin/fetch.c:273

4616 #, c-format

4617 msgid "object %s not found"

4618 msgstr ""

4619

4431 -#: builtin/fetch.c:262

4620 +#: builtin/fetch.c:278

4621 msgid "[up to date]"

4622 msgstr ""

4623

4435 -#: builtin/fetch.c:276

4624 +#: builtin/fetch.c:292

4625 #, c-format

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

4627 msgstr ""

4628

4440 -#: builtin/fetch.c:277 builtin/fetch.c:363

4629 +#: builtin/fetch.c:293 builtin/fetch.c:379

4630 msgid "[rejected]"

4631 msgstr ""

4632

4444 -#: builtin/fetch.c:288

4633 +#: builtin/fetch.c:304

4634 msgid "[tag update]"

4635 msgstr ""

4636

4448 -#: builtin/fetch.c:290 builtin/fetch.c:325 builtin/fetch.c:343

4637 +#: builtin/fetch.c:306 builtin/fetch.c:341 builtin/fetch.c:359

4638 msgid " (unable to update local ref)"

4639 msgstr ""

4640

4452 -#: builtin/fetch.c:308

4641 +#: builtin/fetch.c:324

4642 msgid "[new tag]"

4643 msgstr ""

4644

4456 -#: builtin/fetch.c:311

4645 +#: builtin/fetch.c:327

4646 msgid "[new branch]"

4647 msgstr ""

4648

4460 -#: builtin/fetch.c:314

4649 +#: builtin/fetch.c:330

4650 msgid "[new ref]"

4651 msgstr ""

4652

4464 -#: builtin/fetch.c:359

4653 +#: builtin/fetch.c:375

4654 msgid "unable to update local ref"

4655 msgstr ""

4656

4468 -#: builtin/fetch.c:359

4657 +#: builtin/fetch.c:375

4658 msgid "forced update"

4659 msgstr ""

4660

4472 -#: builtin/fetch.c:365

4661 +#: builtin/fetch.c:381

4662 msgid "(non-fast-forward)"

4663 msgstr ""

4664

4476 -#: builtin/fetch.c:396 builtin/fetch.c:688

4665 +#: builtin/fetch.c:412 builtin/fetch.c:718

4666 #, c-format

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

4668 msgstr ""

4669

4481 -#: builtin/fetch.c:405

4670 +#: builtin/fetch.c:421

4671 #, c-format

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

4673 msgstr ""

4674

4486 -#: builtin/fetch.c:491

4675 +#: builtin/fetch.c:520

4676 #, c-format

4677 msgid "From %.*s\n"

4678 msgstr ""

4679

4491 -#: builtin/fetch.c:502

4680 +#: builtin/fetch.c:531

4681 #, c-format

4682 msgid ""

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

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

4685 msgstr ""

4686

4498 -#: builtin/fetch.c:552

4687 +#: builtin/fetch.c:581

4688 #, c-format

4689 msgid " (%s will become dangling)"

4690 msgstr ""

4691

4503 -#: builtin/fetch.c:553

4692 +#: builtin/fetch.c:582

4693 #, c-format

4694 msgid " (%s has become dangling)"

4695 msgstr ""

4696

4508 -#: builtin/fetch.c:560

4697 +#: builtin/fetch.c:589

4698 msgid "[deleted]"

4699 msgstr ""

4700

4512 -#: builtin/fetch.c:561 builtin/remote.c:1055

4701 +#: builtin/fetch.c:590 builtin/remote.c:1055

4702 msgid "(none)"

4703 msgstr ""

4704

4516 -#: builtin/fetch.c:678

4705 +#: builtin/fetch.c:708

4706 #, c-format

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

4708 msgstr ""

4709

4521 -#: builtin/fetch.c:712

4710 +#: builtin/fetch.c:742

4711 #, c-format

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

4713 msgstr ""

4714

4526 -#: builtin/fetch.c:789

4715 +#: builtin/fetch.c:823

4716 #, c-format

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

4718 msgstr ""

4719

4531 -#: builtin/fetch.c:792

4720 +#: builtin/fetch.c:826

4721 #, c-format

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

4723 msgstr ""

4724

4536 -#: builtin/fetch.c:894

4725 +#: builtin/fetch.c:928

4726 #, c-format

4727 msgid "Fetching %s\n"

4728 msgstr ""

4729

4541 -#: builtin/fetch.c:896 builtin/remote.c:100

4730 +#: builtin/fetch.c:930 builtin/remote.c:100

4731 #, c-format

4732 msgid "Could not fetch %s"

4733 msgstr ""

4734

4546 -#: builtin/fetch.c:915

4735 +#: builtin/fetch.c:949

4736 msgid ""

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

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

4739 msgstr ""

4740

4552 -#: builtin/fetch.c:935

4741 +#: builtin/fetch.c:969

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

4743 msgstr ""

4744

4556 -#: builtin/fetch.c:981

4745 +#: builtin/fetch.c:1015

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

4747 msgstr ""

4748

4560 -#: builtin/fetch.c:983

4749 +#: builtin/fetch.c:1017

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

4751 msgstr ""

4752

4564 -#: builtin/fetch.c:1002

4753 +#: builtin/fetch.c:1036

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

4755 msgstr ""

4756

4568 -#: builtin/fetch.c:1004

4757 +#: builtin/fetch.c:1038

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

4759 msgstr ""

4760

4572 -#: builtin/fetch.c:1015

4761 +#: builtin/fetch.c:1049

4762 #, c-format

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

4764 msgstr ""

4765

4577 -#: builtin/fetch.c:1023

4766 +#: builtin/fetch.c:1057

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

4768 msgstr ""

4769

@@ -4582,9 +4771,9 @@ msgstr ""

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

4772 msgstr ""

4773

4585 -#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:701

4586 -#: builtin/merge.c:188 builtin/show-branch.c:655 builtin/show-ref.c:175

4587 -#: builtin/tag.c:446 parse-options.h:133 parse-options.h:239

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

4775 +#: builtin/merge.c:203 builtin/show-branch.c:655 builtin/show-ref.c:179

4776 +#: builtin/tag.c:446 parse-options.h:133 parse-options.h:243

4777 msgid "n"

4778 msgstr ""

4779

@@ -4739,220 +4928,220 @@ msgstr ""

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

4929 msgstr ""

4930

4742 -#: builtin/grep.c:365

4931 +#: builtin/grep.c:364

4932 #, c-format

4933 msgid "Failed to chdir: %s"

4934 msgstr ""

4935

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

4936 +#: builtin/grep.c:442 builtin/grep.c:477

4937 #, c-format

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

4939 msgstr ""

4940

4752 -#: builtin/grep.c:493

4941 +#: builtin/grep.c:492

4942 #, c-format

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

4944 msgstr ""

4945

4757 -#: builtin/grep.c:551

4946 +#: builtin/grep.c:550

4947 #, c-format

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

4949 msgstr ""

4950

4762 -#: builtin/grep.c:568

4951 +#: builtin/grep.c:567

4952 #, c-format

4953 msgid "cannot open '%s'"

4954 msgstr ""

4955

4767 -#: builtin/grep.c:643

4956 +#: builtin/grep.c:642

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

4958 msgstr ""

4959

4771 -#: builtin/grep.c:645

4960 +#: builtin/grep.c:644

4961 msgid "find in contents not managed by git"

4962 msgstr ""

4963

4775 -#: builtin/grep.c:647

4964 +#: builtin/grep.c:646

4965 msgid "search in both tracked and untracked files"

4966 msgstr ""

4967

4779 -#: builtin/grep.c:649

4968 +#: builtin/grep.c:648

4969 msgid "search also in ignored files"

4970 msgstr ""

4971

4783 -#: builtin/grep.c:652

4972 +#: builtin/grep.c:651

4973 msgid "show non-matching lines"

4974 msgstr ""

4975

4787 -#: builtin/grep.c:654

4976 +#: builtin/grep.c:653

4977 msgid "case insensitive matching"

4978 msgstr ""

4979

4791 -#: builtin/grep.c:656

4980 +#: builtin/grep.c:655

4981 msgid "match patterns only at word boundaries"

4982 msgstr ""

4983

4795 -#: builtin/grep.c:658

4984 +#: builtin/grep.c:657

4985 msgid "process binary files as text"

4986 msgstr ""

4987

4799 -#: builtin/grep.c:660

4988 +#: builtin/grep.c:659

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

4990 msgstr ""

4991

4803 -#: builtin/grep.c:663

4992 +#: builtin/grep.c:662

4993 msgid "descend at most <depth> levels"

4994 msgstr ""

4995

4807 -#: builtin/grep.c:667

4996 +#: builtin/grep.c:666

4997 msgid "use extended POSIX regular expressions"

4998 msgstr ""

4999

4811 -#: builtin/grep.c:670

5000 +#: builtin/grep.c:669

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

5002 msgstr ""

5003

4815 -#: builtin/grep.c:673

5004 +#: builtin/grep.c:672

5005 msgid "interpret patterns as fixed strings"

5006 msgstr ""

5007

4819 -#: builtin/grep.c:676

5008 +#: builtin/grep.c:675

5009 msgid "use Perl-compatible regular expressions"

5010 msgstr ""

5011

4823 -#: builtin/grep.c:679

5012 +#: builtin/grep.c:678

5013 msgid "show line numbers"

5014 msgstr ""

5015

4827 -#: builtin/grep.c:680

5016 +#: builtin/grep.c:679

5017 msgid "don't show filenames"

5018 msgstr ""

5019

4831 -#: builtin/grep.c:681

5020 +#: builtin/grep.c:680

5021 msgid "show filenames"

5022 msgstr ""

5023

4835 -#: builtin/grep.c:683

5024 +#: builtin/grep.c:682

5025 msgid "show filenames relative to top directory"

5026 msgstr ""

5027

4839 -#: builtin/grep.c:685

5028 +#: builtin/grep.c:684

5029 msgid "show only filenames instead of matching lines"

5030 msgstr ""

5031

4843 -#: builtin/grep.c:687

5032 +#: builtin/grep.c:686

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

5034 msgstr ""

5035

4847 -#: builtin/grep.c:690

5036 +#: builtin/grep.c:689

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

5038 msgstr ""

5039

4851 -#: builtin/grep.c:692

5040 +#: builtin/grep.c:691

5041 msgid "print NUL after filenames"

5042 msgstr ""

5043

4855 -#: builtin/grep.c:694

5044 +#: builtin/grep.c:693

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

5046 msgstr ""

5047

4859 -#: builtin/grep.c:695

5048 +#: builtin/grep.c:694

5049 msgid "highlight matches"

5050 msgstr ""

5051

4863 -#: builtin/grep.c:697

5052 +#: builtin/grep.c:696

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

5054 msgstr ""

5055

4867 -#: builtin/grep.c:699

5056 +#: builtin/grep.c:698

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

5058 msgstr ""

5059

4871 -#: builtin/grep.c:702

5060 +#: builtin/grep.c:701

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

5062 msgstr ""

5063

4875 -#: builtin/grep.c:705

5064 +#: builtin/grep.c:704

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

5066 msgstr ""

5067

4879 -#: builtin/grep.c:707

5068 +#: builtin/grep.c:706

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

5070 msgstr ""

5071

4883 -#: builtin/grep.c:708

5072 +#: builtin/grep.c:707

5073 msgid "shortcut for -C NUM"

5074 msgstr ""

5075

4887 -#: builtin/grep.c:711

5076 +#: builtin/grep.c:710

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

5078 msgstr ""

5079

4891 -#: builtin/grep.c:713

5080 +#: builtin/grep.c:712

5081 msgid "show the surrounding function"

5082 msgstr ""

5083

4895 -#: builtin/grep.c:716

5084 +#: builtin/grep.c:715

5085 msgid "read patterns from file"

5086 msgstr ""

5087

4899 -#: builtin/grep.c:718

5088 +#: builtin/grep.c:717

5089 msgid "match <pattern>"

5090 msgstr ""

5091

4903 -#: builtin/grep.c:720

5092 +#: builtin/grep.c:719

5093 msgid "combine patterns specified with -e"

5094 msgstr ""

5095

4907 -#: builtin/grep.c:732

5096 +#: builtin/grep.c:731

5097 msgid "indicate hit with exit status without output"

5098 msgstr ""

5099

4911 -#: builtin/grep.c:734

5100 +#: builtin/grep.c:733

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

5102 msgstr ""

5103

4915 -#: builtin/grep.c:736

5104 +#: builtin/grep.c:735

5105 msgid "show parse tree for grep expression"

5106 msgstr ""

5107

4919 -#: builtin/grep.c:740

5108 +#: builtin/grep.c:739

5109 msgid "pager"

5110 msgstr ""

5111

4923 -#: builtin/grep.c:740

5112 +#: builtin/grep.c:739

5113 msgid "show matching files in the pager"

5114 msgstr ""

5115

4927 -#: builtin/grep.c:743

5116 +#: builtin/grep.c:742

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

5118 msgstr ""

5119

4931 -#: builtin/grep.c:744 builtin/show-ref.c:184

5120 +#: builtin/grep.c:743 builtin/show-ref.c:188

5121 msgid "show usage"

5122 msgstr ""

5123

4935 -#: builtin/grep.c:811

5124 +#: builtin/grep.c:810

5125 msgid "no pattern given."

5126 msgstr ""

5127

4939 -#: builtin/grep.c:866

5128 +#: builtin/grep.c:865

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

5130 msgstr ""

5131

4943 -#: builtin/grep.c:889

5132 +#: builtin/grep.c:888

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

5134 msgstr ""

5135

4947 -#: builtin/grep.c:894

5136 +#: builtin/grep.c:893

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

5138 msgstr ""

5139

4951 -#: builtin/grep.c:897

5140 +#: builtin/grep.c:896

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

5142 msgstr ""

5143

4955 -#: builtin/grep.c:905

5144 +#: builtin/grep.c:904

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

5146 msgstr ""

5147

@@ -4990,396 +5179,396 @@ msgstr ""

5179 msgid "process file as it were from this path"

5180 msgstr ""

5181

4993 -#: builtin/help.c:43

5182 +#: builtin/help.c:41

5183 msgid "print all available commands"

5184 msgstr ""

5185

4997 -#: builtin/help.c:44

5186 +#: builtin/help.c:42

5187 msgid "print list of useful guides"

5188 msgstr ""

5189

5001 -#: builtin/help.c:45

5190 +#: builtin/help.c:43

5191 msgid "show man page"

5192 msgstr ""

5193

5005 -#: builtin/help.c:46

5194 +#: builtin/help.c:44

5195 msgid "show manual in web browser"

5196 msgstr ""

5197

5009 -#: builtin/help.c:48

5198 +#: builtin/help.c:46

5199 msgid "show info page"

5200 msgstr ""

5201

5013 -#: builtin/help.c:54

5202 +#: builtin/help.c:52

5203 msgid "git help [--all] [--guides] [--man|--web|--info] [command]"

5204 msgstr ""

5205

5017 -#: builtin/help.c:66

5206 +#: builtin/help.c:64

5207 #, c-format

5208 msgid "unrecognized help format '%s'"

5209 msgstr ""

5210

5022 -#: builtin/help.c:94

5211 +#: builtin/help.c:92

5212 msgid "Failed to start emacsclient."

5213 msgstr ""

5214

5026 -#: builtin/help.c:107

5215 +#: builtin/help.c:105

5216 msgid "Failed to parse emacsclient version."

5217 msgstr ""

5218

5030 -#: builtin/help.c:115

5219 +#: builtin/help.c:113

5220 #, c-format

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

5222 msgstr ""

5223

5035 -#: builtin/help.c:133 builtin/help.c:161 builtin/help.c:170 builtin/help.c:178

5224 +#: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176

5225 #, c-format

5226 msgid "failed to exec '%s': %s"

5227 msgstr ""

5228

5040 -#: builtin/help.c:218

5229 +#: builtin/help.c:216

5230 #, c-format

5231 msgid ""

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

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

5234 msgstr ""

5235

5047 -#: builtin/help.c:230

5236 +#: builtin/help.c:228

5237 #, c-format

5238 msgid ""

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

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

5241 msgstr ""

5242

5054 -#: builtin/help.c:351

5243 +#: builtin/help.c:349

5244 #, c-format

5245 msgid "'%s': unknown man viewer."

5246 msgstr ""

5247

5059 -#: builtin/help.c:368

5248 +#: builtin/help.c:366

5249 msgid "no man viewer handled the request"

5250 msgstr ""

5251

5063 -#: builtin/help.c:376

5252 +#: builtin/help.c:374

5253 msgid "no info viewer handled the request"

5254 msgstr ""

5255

5067 -#: builtin/help.c:422

5256 +#: builtin/help.c:420

5257 msgid "Defining attributes per path"

5258 msgstr ""

5259

5071 -#: builtin/help.c:423

5260 +#: builtin/help.c:421

5261 msgid "A Git glossary"

5262 msgstr ""

5263

5075 -#: builtin/help.c:424

5264 +#: builtin/help.c:422

5265 msgid "Specifies intentionally untracked files to ignore"

5266 msgstr ""

5267

5079 -#: builtin/help.c:425

5268 +#: builtin/help.c:423

5269 msgid "Defining submodule properties"

5270 msgstr ""

5271

5083 -#: builtin/help.c:426

5272 +#: builtin/help.c:424

5273 msgid "Specifying revisions and ranges for Git"

5274 msgstr ""

5275

5087 -#: builtin/help.c:427

5276 +#: builtin/help.c:425

5277 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"

5278 msgstr ""

5279

5091 -#: builtin/help.c:428

5280 +#: builtin/help.c:426

5281 msgid "An overview of recommended workflows with Git"

5282 msgstr ""

5283

5095 -#: builtin/help.c:440

5284 +#: builtin/help.c:438

5285 msgid "The common Git guides are:\n"

5286 msgstr ""

5287

5099 -#: builtin/help.c:462 builtin/help.c:478

5288 +#: builtin/help.c:460 builtin/help.c:476

5289 #, c-format

5290 msgid "usage: %s%s"

5291 msgstr ""

5292

5104 -#: builtin/help.c:494

5293 +#: builtin/help.c:492

5294 #, c-format

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

5296 msgstr ""

5297

5109 -#: builtin/index-pack.c:182

5298 +#: builtin/index-pack.c:184

5299 #, c-format

5300 msgid "object type mismatch at %s"

5301 msgstr ""

5302

5114 -#: builtin/index-pack.c:202

5303 +#: builtin/index-pack.c:204

5304 msgid "object of unexpected type"

5305 msgstr ""

5306

5118 -#: builtin/index-pack.c:239

5307 +#: builtin/index-pack.c:244

5308 #, c-format

5309 msgid "cannot fill %d byte"

5310 msgid_plural "cannot fill %d bytes"

5311 msgstr[0] ""

5312 msgstr[1] ""

5313

5125 -#: builtin/index-pack.c:249

5314 +#: builtin/index-pack.c:254

5315 msgid "early EOF"

5316 msgstr ""

5317

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

5318 +#: builtin/index-pack.c:255

5319 msgid "read error on input"

5320 msgstr ""

5321

5133 -#: builtin/index-pack.c:262

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

5323 msgid "used more bytes than were available"

5324 msgstr ""

5325

5137 -#: builtin/index-pack.c:269

5326 +#: builtin/index-pack.c:274

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

5328 msgstr ""

5329

5141 -#: builtin/index-pack.c:285

5330 +#: builtin/index-pack.c:290

5331 #, c-format

5332 msgid "unable to create '%s'"

5333 msgstr ""

5334

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

5335 +#: builtin/index-pack.c:295

5336 #, c-format

5337 msgid "cannot open packfile '%s'"

5338 msgstr ""

5339

5151 -#: builtin/index-pack.c:304

5340 +#: builtin/index-pack.c:309

5341 msgid "pack signature mismatch"

5342 msgstr ""

5343

5155 -#: builtin/index-pack.c:306

5344 +#: builtin/index-pack.c:311

5345 #, c-format

5346 msgid "pack version %<PRIu32> unsupported"

5347 msgstr ""

5348

5160 -#: builtin/index-pack.c:324

5349 +#: builtin/index-pack.c:329

5350 #, c-format

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

5352 msgstr ""

5353

5165 -#: builtin/index-pack.c:446

5354 +#: builtin/index-pack.c:451

5355 #, c-format

5356 msgid "inflate returned %d"

5357 msgstr ""

5358

5170 -#: builtin/index-pack.c:495

5359 +#: builtin/index-pack.c:500

5360 msgid "offset value overflow for delta base object"

5361 msgstr ""

5362

5174 -#: builtin/index-pack.c:503

5363 +#: builtin/index-pack.c:508

5364 msgid "delta base offset is out of bound"

5365 msgstr ""

5366

5178 -#: builtin/index-pack.c:511

5367 +#: builtin/index-pack.c:516

5368 #, c-format

5369 msgid "unknown object type %d"

5370 msgstr ""

5371

5183 -#: builtin/index-pack.c:542

5372 +#: builtin/index-pack.c:547

5373 msgid "cannot pread pack file"

5374 msgstr ""

5375

5187 -#: builtin/index-pack.c:544

5376 +#: builtin/index-pack.c:549

5377 #, c-format

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

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

5380 msgstr[0] ""

5381 msgstr[1] ""

5382

5194 -#: builtin/index-pack.c:570

5383 +#: builtin/index-pack.c:575

5384 msgid "serious inflate inconsistency"

5385 msgstr ""

5386

5198 -#: builtin/index-pack.c:661 builtin/index-pack.c:667 builtin/index-pack.c:690

5199 -#: builtin/index-pack.c:724 builtin/index-pack.c:733

5387 +#: builtin/index-pack.c:666 builtin/index-pack.c:672 builtin/index-pack.c:695

5388 +#: builtin/index-pack.c:729 builtin/index-pack.c:738

5389 #, c-format

5390 msgid "SHA1 COLLISION FOUND WITH %s !"

5391 msgstr ""

5392

5204 -#: builtin/index-pack.c:664 builtin/pack-objects.c:170

5393 +#: builtin/index-pack.c:669 builtin/pack-objects.c:170

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

5395 #, c-format

5396 msgid "unable to read %s"

5397 msgstr ""

5398

5210 -#: builtin/index-pack.c:730

5399 +#: builtin/index-pack.c:735

5400 #, c-format

5401 msgid "cannot read existing object %s"

5402 msgstr ""

5403

5215 -#: builtin/index-pack.c:744

5404 +#: builtin/index-pack.c:749

5405 #, c-format

5406 msgid "invalid blob object %s"

5407 msgstr ""

5408

5220 -#: builtin/index-pack.c:759

5409 +#: builtin/index-pack.c:763

5410 #, c-format

5411 msgid "invalid %s"

5412 msgstr ""

5413

5225 -#: builtin/index-pack.c:761

5414 +#: builtin/index-pack.c:766

5415 msgid "Error in object"

5416 msgstr ""

5417

5229 -#: builtin/index-pack.c:763

5418 +#: builtin/index-pack.c:768

5419 #, c-format

5420 msgid "Not all child objects of %s are reachable"

5421 msgstr ""

5422

5234 -#: builtin/index-pack.c:833 builtin/index-pack.c:863

5423 +#: builtin/index-pack.c:838 builtin/index-pack.c:868

5424 msgid "failed to apply delta"

5425 msgstr ""

5426

5238 -#: builtin/index-pack.c:1004

5427 +#: builtin/index-pack.c:1009

5428 msgid "Receiving objects"

5429 msgstr ""

5430

5242 -#: builtin/index-pack.c:1004

5431 +#: builtin/index-pack.c:1009

5432 msgid "Indexing objects"

5433 msgstr ""

5434

5246 -#: builtin/index-pack.c:1030

5435 +#: builtin/index-pack.c:1035

5436 msgid "pack is corrupted (SHA1 mismatch)"

5437 msgstr ""

5438

5250 -#: builtin/index-pack.c:1035

5439 +#: builtin/index-pack.c:1040

5440 msgid "cannot fstat packfile"

5441 msgstr ""

5442

5254 -#: builtin/index-pack.c:1038

5443 +#: builtin/index-pack.c:1043

5444 msgid "pack has junk at the end"

5445 msgstr ""

5446

5258 -#: builtin/index-pack.c:1049

5447 +#: builtin/index-pack.c:1054

5448 msgid "confusion beyond insanity in parse_pack_objects()"

5449 msgstr ""

5450

5262 -#: builtin/index-pack.c:1072

5451 +#: builtin/index-pack.c:1077

5452 msgid "Resolving deltas"

5453 msgstr ""

5454

5266 -#: builtin/index-pack.c:1082

5455 +#: builtin/index-pack.c:1087

5456 #, c-format

5457 msgid "unable to create thread: %s"

5458 msgstr ""

5459

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

5460 +#: builtin/index-pack.c:1129

5461 msgid "confusion beyond insanity"

5462 msgstr ""

5463

5275 -#: builtin/index-pack.c:1132

5464 +#: builtin/index-pack.c:1137

5465 #, c-format

5466 msgid "completed with %d local objects"

5467 msgstr ""

5468

5280 -#: builtin/index-pack.c:1142

5469 +#: builtin/index-pack.c:1147

5470 #, c-format

5471 msgid "Unexpected tail checksum for %s (disk corruption?)"

5472 msgstr ""

5473

5285 -#: builtin/index-pack.c:1146

5474 +#: builtin/index-pack.c:1151

5475 #, c-format

5476 msgid "pack has %d unresolved delta"

5477 msgid_plural "pack has %d unresolved deltas"

5478 msgstr[0] ""

5479 msgstr[1] ""

5480

5292 -#: builtin/index-pack.c:1171

5481 +#: builtin/index-pack.c:1176

5482 #, c-format

5483 msgid "unable to deflate appended object (%d)"

5484 msgstr ""

5485

5297 -#: builtin/index-pack.c:1250

5486 +#: builtin/index-pack.c:1255

5487 #, c-format

5488 msgid "local object %s is corrupt"

5489 msgstr ""

5490

5302 -#: builtin/index-pack.c:1274

5491 +#: builtin/index-pack.c:1279

5492 msgid "error while closing pack file"

5493 msgstr ""

5494

5306 -#: builtin/index-pack.c:1287

5495 +#: builtin/index-pack.c:1292

5496 #, c-format

5497 msgid "cannot write keep file '%s'"

5498 msgstr ""

5499

5311 -#: builtin/index-pack.c:1295

5500 +#: builtin/index-pack.c:1300

5501 #, c-format

5502 msgid "cannot close written keep file '%s'"

5503 msgstr ""

5504

5316 -#: builtin/index-pack.c:1308

5505 +#: builtin/index-pack.c:1313

5506 msgid "cannot store pack file"

5507 msgstr ""

5508

5320 -#: builtin/index-pack.c:1319

5509 +#: builtin/index-pack.c:1324

5510 msgid "cannot store index file"

5511 msgstr ""

5512

5324 -#: builtin/index-pack.c:1352

5513 +#: builtin/index-pack.c:1357

5514 #, c-format

5515 msgid "bad pack.indexversion=%<PRIu32>"

5516 msgstr ""

5517

5329 -#: builtin/index-pack.c:1358

5518 +#: builtin/index-pack.c:1363

5519 #, c-format

5520 msgid "invalid number of threads specified (%d)"

5521 msgstr ""

5522

5334 -#: builtin/index-pack.c:1362 builtin/index-pack.c:1535

5523 +#: builtin/index-pack.c:1367 builtin/index-pack.c:1545

5524 #, c-format

5525 msgid "no threads support, ignoring %s"

5526 msgstr ""

5527

5339 -#: builtin/index-pack.c:1420

5528 +#: builtin/index-pack.c:1425

5529 #, c-format

5530 msgid "Cannot open existing pack file '%s'"

5531 msgstr ""

5532

5344 -#: builtin/index-pack.c:1422

5533 +#: builtin/index-pack.c:1427

5534 #, c-format

5535 msgid "Cannot open existing pack idx file for '%s'"

5536 msgstr ""

5537

5349 -#: builtin/index-pack.c:1469

5538 +#: builtin/index-pack.c:1474

5539 #, c-format

5540 msgid "non delta: %d object"

5541 msgid_plural "non delta: %d objects"

5542 msgstr[0] ""

5543 msgstr[1] ""

5544

5356 -#: builtin/index-pack.c:1476

5545 +#: builtin/index-pack.c:1481

5546 #, c-format

5547 msgid "chain length = %d: %lu object"

5548 msgid_plural "chain length = %d: %lu objects"

5549 msgstr[0] ""

5550 msgstr[1] ""

5551

5363 -#: builtin/index-pack.c:1503

5552 +#: builtin/index-pack.c:1509

5553 msgid "Cannot come back to cwd"

5554 msgstr ""

5555

5367 -#: builtin/index-pack.c:1547 builtin/index-pack.c:1550

5368 -#: builtin/index-pack.c:1562 builtin/index-pack.c:1566

5556 +#: builtin/index-pack.c:1557 builtin/index-pack.c:1560

5557 +#: builtin/index-pack.c:1572 builtin/index-pack.c:1576

5558 #, c-format

5559 msgid "bad %s"

5560 msgstr ""

5561

5373 -#: builtin/index-pack.c:1580

5562 +#: builtin/index-pack.c:1590

5563 msgid "--fix-thin cannot be used without --stdin"

5564 msgstr ""

5565

5377 -#: builtin/index-pack.c:1584 builtin/index-pack.c:1594

5566 +#: builtin/index-pack.c:1594 builtin/index-pack.c:1604

5567 #, c-format

5568 msgid "packfile name '%s' does not end with '.pack'"

5569 msgstr ""

5570

5382 -#: builtin/index-pack.c:1603

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

5572 msgid "--verify with no packfile name given"

5573 msgstr ""

5574

@@ -5513,7 +5702,7 @@ msgstr ""

5702 msgid "specify that the git repository is to be shared amongst several users"

5703 msgstr ""

5704

5516 -#: builtin/init-db.c:493 builtin/prune-packed.c:77

5705 +#: builtin/init-db.c:493 builtin/prune-packed.c:75

5706 msgid "be quiet"

5707 msgstr ""

5708

@@ -5543,340 +5732,353 @@ msgstr ""

5732 msgid "Cannot access work tree '%s'"

5733 msgstr ""

5734

5546 -#: builtin/log.c:40

5735 +#: builtin/log.c:41

5736 msgid "git log [<options>] [<revision range>] [[--] <path>...]\n"

5737 msgstr ""

5738

5550 -#: builtin/log.c:41

5739 +#: builtin/log.c:42

5740 msgid " or: git show [options] <object>..."

5741 msgstr ""

5742

5554 -#: builtin/log.c:103

5743 +#: builtin/log.c:124

5744 msgid "suppress diff output"

5745 msgstr ""

5746

5558 -#: builtin/log.c:104

5747 +#: builtin/log.c:125

5748 msgid "show source"

5749 msgstr ""

5750

5562 -#: builtin/log.c:105

5751 +#: builtin/log.c:126

5752 msgid "Use mail map file"

5753 msgstr ""

5754

5566 -#: builtin/log.c:106

5755 +#: builtin/log.c:127

5756 msgid "decorate options"

5757 msgstr ""

5758

5570 -#: builtin/log.c:199

5759 +#: builtin/log.c:230

5760 #, c-format

5761 msgid "Final output: %d %s\n"

5762 msgstr ""

5763

5575 -#: builtin/log.c:422 builtin/log.c:514

5764 +#: builtin/log.c:453 builtin/log.c:545

5765 #, c-format

5766 msgid "Could not read object %s"

5767 msgstr ""

5768

5580 -#: builtin/log.c:538

5769 +#: builtin/log.c:569

5770 #, c-format

5771 msgid "Unknown type: %d"

5772 msgstr ""

5773

5585 -#: builtin/log.c:638

5774 +#: builtin/log.c:669

5775 msgid "format.headers without value"

5776 msgstr ""

5777

5589 -#: builtin/log.c:720

5778 +#: builtin/log.c:751

5779 msgid "name of output directory is too long"

5780 msgstr ""

5781

5593 -#: builtin/log.c:736

5782 +#: builtin/log.c:767

5783 #, c-format

5784 msgid "Cannot open patch file %s"

5785 msgstr ""

5786

5598 -#: builtin/log.c:750

5787 +#: builtin/log.c:781

5788 msgid "Need exactly one range."

5789 msgstr ""

5790

5602 -#: builtin/log.c:758

5791 +#: builtin/log.c:789

5792 msgid "Not a range."

5793 msgstr ""

5794

5606 -#: builtin/log.c:860

5795 +#: builtin/log.c:891

5796 msgid "Cover letter needs email format"

5797 msgstr ""

5798

5610 -#: builtin/log.c:936

5799 +#: builtin/log.c:967

5800 #, c-format

5801 msgid "insane in-reply-to: %s"

5802 msgstr ""

5803

5615 -#: builtin/log.c:964

5804 +#: builtin/log.c:995

5805 msgid "git format-patch [options] [<since> | <revision range>]"

5806 msgstr ""

5807

5619 -#: builtin/log.c:1009

5808 +#: builtin/log.c:1040

5809 msgid "Two output directories?"

5810 msgstr ""

5811

5623 -#: builtin/log.c:1108

5812 +#: builtin/log.c:1155

5813 msgid "use [PATCH n/m] even with a single patch"

5814 msgstr ""

5815

5627 -#: builtin/log.c:1111

5816 +#: builtin/log.c:1158

5817 msgid "use [PATCH] even with multiple patches"

5818 msgstr ""

5819

5631 -#: builtin/log.c:1115

5820 +#: builtin/log.c:1162

5821 msgid "print patches to standard out"

l10n: git.pot: v1.8.4 round 1 (99 new, 46 removed)