64f23b0c20 · 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: 2015-04-03 08:13+0800\n"

11 +"POT-Creation-Date: 2015-06-27 19:17+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"

@@ -46,7 +46,7 @@ msgstr ""

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

47 msgstr ""

48

49 -#: archive.c:342 builtin/add.c:137 builtin/add.c:427 builtin/rm.c:328

49 +#: archive.c:342 builtin/add.c:137 builtin/add.c:428 builtin/rm.c:327

50 #, c-format

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

52 msgstr ""

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

69

70 #: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516

71 #: builtin/blame.c:2517 builtin/config.c:57 builtin/fast-export.c:986

72 -#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101

72 +#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:99

73 #: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394

74 -#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:151

74 +#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:150

75 msgid "file"

76 msgstr ""

77

@@ -103,7 +103,7 @@ msgstr ""

103 msgid "list supported archive formats"

104 msgstr ""

105

106 -#: archive.c:449 builtin/archive.c:90 builtin/clone.c:86

106 +#: archive.c:449 builtin/archive.c:90 builtin/clone.c:77

107 msgid "repo"

108 msgstr ""

109

@@ -119,7 +119,7 @@ msgstr ""

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

120 msgstr ""

121

122 -#: attr.c:264

122 +#: attr.c:265

123 msgid ""

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

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

@@ -246,8 +246,8 @@ msgid "Repository lacks these prerequisite commits:"

246 msgstr ""

247

248 #: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705

249 -#: builtin/branch.c:659 builtin/commit.c:1045 builtin/log.c:330

250 -#: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:358

249 +#: builtin/branch.c:651 builtin/commit.c:1045 builtin/log.c:330

250 +#: builtin/log.c:825 builtin/log.c:1432 builtin/log.c:1666 builtin/merge.c:358

251 #: builtin/shortlog.c:158

252 msgid "revision walk setup failed"

253 msgstr ""

@@ -490,27 +490,35 @@ msgid ""

490 "%s"

491 msgstr ""

492

493 -#: diff.c:2956

493 +#: diff.c:2997

494 #, c-format

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

496 msgstr ""

497

498 -#: diff.c:3351

498 +#: diff.c:3393

499 msgid "--follow requires exactly one pathspec"

500 msgstr ""

501

502 -#: diff.c:3514

502 +#: diff.c:3556

503 #, c-format

504 msgid ""

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

506 "%s"

507 msgstr ""

508

509 -#: diff.c:3528

509 +#: diff.c:3570

510 #, c-format

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

512 msgstr ""

513

514 +#: dir.c:1852

515 +msgid "failed to get kernel name and information"

516 +msgstr ""

517 +

518 +#: dir.c:1945

519 +msgid "Untracked cache is disabled on this system."

520 +msgstr ""

521 +

522 #: gpg-interface.c:129 gpg-interface.c:200

523 msgid "could not run gpg."

524 msgstr ""

@@ -557,39 +565,39 @@ msgstr ""

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

566 msgstr ""

567

560 -#: help.c:230

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

568 +#: help.c:246

569 +msgid "These are common Git commands used in various situations:"

570 msgstr ""

571

564 -#: help.c:289

572 +#: help.c:311

573 #, c-format

574 msgid ""

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

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

577 msgstr ""

578

571 -#: help.c:346

579 +#: help.c:368

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

581 msgstr ""

582

575 -#: help.c:368

583 +#: help.c:390

584 #, c-format

585 msgid ""

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

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

588 msgstr ""

589

582 -#: help.c:373

590 +#: help.c:395

591 #, c-format

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

593 msgstr ""

594

587 -#: help.c:380

595 +#: help.c:402

596 #, c-format

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

598 msgstr ""

599

592 -#: help.c:384 help.c:444

600 +#: help.c:406 help.c:466

601 msgid ""

602 "\n"

603 "Did you mean this?"

@@ -599,16 +607,16 @@ msgid_plural ""

607 msgstr[0] ""

608 msgstr[1] ""

609

602 -#: help.c:440

610 +#: help.c:462

611 #, c-format

612 msgid "%s: %s - %s"

613 msgstr ""

614

607 -#: lockfile.c:283

615 +#: lockfile.c:345

616 msgid "BUG: reopen a lockfile that is still open"

617 msgstr ""

618

611 -#: lockfile.c:285

619 +#: lockfile.c:347

620 msgid "BUG: reopen a lockfile that has been committed"

621 msgstr ""

622

@@ -616,8 +624,8 @@ msgstr ""

624 msgid "failed to read the cache"

625 msgstr ""

626

619 -#: merge.c:94 builtin/checkout.c:374 builtin/checkout.c:580

620 -#: builtin/clone.c:662

627 +#: merge.c:94 builtin/checkout.c:383 builtin/checkout.c:594

628 +#: builtin/clone.c:654

629 msgid "unable to write new index file"

630 msgstr ""

631

@@ -635,233 +643,233 @@ msgstr ""

643 msgid "error building trees"

644 msgstr ""

645

638 -#: merge-recursive.c:688

646 +#: merge-recursive.c:687

647 #, c-format

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

649 msgstr ""

650

643 -#: merge-recursive.c:699

651 +#: merge-recursive.c:698

652 #, c-format

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

654 msgstr ""

655

648 -#: merge-recursive.c:713 merge-recursive.c:734

656 +#: merge-recursive.c:712 merge-recursive.c:733

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

658 msgstr ""

659

652 -#: merge-recursive.c:724

660 +#: merge-recursive.c:723

661 #, c-format

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

663 msgstr ""

664

657 -#: merge-recursive.c:764

665 +#: merge-recursive.c:763

666 #, c-format

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

668 msgstr ""

669

662 -#: merge-recursive.c:766

670 +#: merge-recursive.c:765

671 #, c-format

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

673 msgstr ""

674

667 -#: merge-recursive.c:789 builtin/clone.c:321

675 +#: merge-recursive.c:788 builtin/clone.c:313

676 #, c-format

677 msgid "failed to open '%s'"

678 msgstr ""

679

672 -#: merge-recursive.c:797

680 +#: merge-recursive.c:796

681 #, c-format

682 msgid "failed to symlink '%s'"

683 msgstr ""

684

677 -#: merge-recursive.c:800

685 +#: merge-recursive.c:799

686 #, c-format

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

688 msgstr ""

689

682 -#: merge-recursive.c:938

690 +#: merge-recursive.c:937

691 msgid "Failed to execute internal merge"

692 msgstr ""

693

686 -#: merge-recursive.c:942

694 +#: merge-recursive.c:941

695 #, c-format

696 msgid "Unable to add %s to database"

697 msgstr ""

698

691 -#: merge-recursive.c:958

699 +#: merge-recursive.c:957

700 msgid "unsupported object type in the tree"

701 msgstr ""

702

695 -#: merge-recursive.c:1033 merge-recursive.c:1047

703 +#: merge-recursive.c:1032 merge-recursive.c:1046

704 #, c-format

705 msgid ""

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

707 "in tree."

708 msgstr ""

709

702 -#: merge-recursive.c:1039 merge-recursive.c:1052

710 +#: merge-recursive.c:1038 merge-recursive.c:1051

711 #, c-format

712 msgid ""

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

714 "in tree at %s."

715 msgstr ""

716

709 -#: merge-recursive.c:1093

717 +#: merge-recursive.c:1092

718 msgid "rename"

719 msgstr ""

720

713 -#: merge-recursive.c:1093

721 +#: merge-recursive.c:1092

722 msgid "renamed"

723 msgstr ""

724

717 -#: merge-recursive.c:1149

725 +#: merge-recursive.c:1148

726 #, c-format

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

728 msgstr ""

729

722 -#: merge-recursive.c:1171

730 +#: merge-recursive.c:1170

731 #, c-format

732 msgid ""

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

734 "\"->\"%s\" in \"%s\"%s"

735 msgstr ""

736

729 -#: merge-recursive.c:1176

737 +#: merge-recursive.c:1175

738 msgid " (left unresolved)"

739 msgstr ""

740

733 -#: merge-recursive.c:1230

741 +#: merge-recursive.c:1229

742 #, c-format

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

744 msgstr ""

745

738 -#: merge-recursive.c:1260

746 +#: merge-recursive.c:1259

747 #, c-format

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

749 msgstr ""

750

743 -#: merge-recursive.c:1459

751 +#: merge-recursive.c:1458

752 #, c-format

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

754 msgstr ""

755

748 -#: merge-recursive.c:1469

756 +#: merge-recursive.c:1468

757 #, c-format

758 msgid "Adding merged %s"

759 msgstr ""

760

753 -#: merge-recursive.c:1474 merge-recursive.c:1672

761 +#: merge-recursive.c:1473 merge-recursive.c:1671

762 #, c-format

763 msgid "Adding as %s instead"

764 msgstr ""

765

758 -#: merge-recursive.c:1525

766 +#: merge-recursive.c:1524

767 #, c-format

768 msgid "cannot read object %s"

769 msgstr ""

770

763 -#: merge-recursive.c:1528

771 +#: merge-recursive.c:1527

772 #, c-format

773 msgid "object %s is not a blob"

774 msgstr ""

775

768 -#: merge-recursive.c:1576

776 +#: merge-recursive.c:1575

777 msgid "modify"

778 msgstr ""

779

772 -#: merge-recursive.c:1576

780 +#: merge-recursive.c:1575

781 msgid "modified"

782 msgstr ""

783

776 -#: merge-recursive.c:1586

784 +#: merge-recursive.c:1585

785 msgid "content"

786 msgstr ""

787

780 -#: merge-recursive.c:1593

788 +#: merge-recursive.c:1592

789 msgid "add/add"

790 msgstr ""

791

784 -#: merge-recursive.c:1627

792 +#: merge-recursive.c:1626

793 #, c-format

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

795 msgstr ""

796

789 -#: merge-recursive.c:1641

797 +#: merge-recursive.c:1640

798 #, c-format

799 msgid "Auto-merging %s"

800 msgstr ""

801

794 -#: merge-recursive.c:1645 git-submodule.sh:1150

802 +#: merge-recursive.c:1644 git-submodule.sh:1150

803 msgid "submodule"

804 msgstr ""

805

798 -#: merge-recursive.c:1646

806 +#: merge-recursive.c:1645

807 #, c-format

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

809 msgstr ""

810

803 -#: merge-recursive.c:1732

811 +#: merge-recursive.c:1731

812 #, c-format

813 msgid "Removing %s"

814 msgstr ""

815

808 -#: merge-recursive.c:1757

816 +#: merge-recursive.c:1756

817 msgid "file/directory"

818 msgstr ""

819

812 -#: merge-recursive.c:1763

820 +#: merge-recursive.c:1762

821 msgid "directory/file"

822 msgstr ""

823

816 -#: merge-recursive.c:1768

824 +#: merge-recursive.c:1767

825 #, c-format

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

827 msgstr ""

828

821 -#: merge-recursive.c:1778

829 +#: merge-recursive.c:1777

830 #, c-format

831 msgid "Adding %s"

832 msgstr ""

833

826 -#: merge-recursive.c:1795

834 +#: merge-recursive.c:1794

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

836 msgstr ""

837

830 -#: merge-recursive.c:1814

838 +#: merge-recursive.c:1813

839 msgid "Already up-to-date!"

840 msgstr ""

841

834 -#: merge-recursive.c:1823

842 +#: merge-recursive.c:1822

843 #, c-format

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

845 msgstr ""

846

839 -#: merge-recursive.c:1853

847 +#: merge-recursive.c:1852

848 #, c-format

849 msgid "Unprocessed path??? %s"

850 msgstr ""

851

844 -#: merge-recursive.c:1901

852 +#: merge-recursive.c:1900

853 msgid "Merging:"

854 msgstr ""

855

848 -#: merge-recursive.c:1914

856 +#: merge-recursive.c:1913

857 #, c-format

858 msgid "found %u common ancestor:"

859 msgid_plural "found %u common ancestors:"

860 msgstr[0] ""

861 msgstr[1] ""

862

855 -#: merge-recursive.c:1951

863 +#: merge-recursive.c:1950

864 msgid "merge returned no commit"

865 msgstr ""

866

859 -#: merge-recursive.c:2008

867 +#: merge-recursive.c:2007

868 #, c-format

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

870 msgstr ""

871

864 -#: merge-recursive.c:2019 builtin/merge.c:667

872 +#: merge-recursive.c:2018 builtin/merge.c:645

873 msgid "Unable to write index."

874 msgstr ""

875

@@ -886,7 +894,7 @@ msgstr ""

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

895 msgstr ""

896

889 -#: object.c:241

897 +#: object.c:242

898 #, c-format

899 msgid "unable to parse object: %s"

900 msgstr ""

@@ -980,69 +988,111 @@ msgstr ""

988 msgid "unable to parse --pretty format"

989 msgstr ""

990

983 -#: progress.c:225

991 +#: progress.c:236

992 msgid "done"

993 msgstr ""

994

987 -#: read-cache.c:1275

995 +#: read-cache.c:1295

996 #, c-format

997 msgid ""

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

999 "Using version %i"

1000 msgstr ""

1001

994 -#: read-cache.c:1285

1002 +#: read-cache.c:1305

1003 #, c-format

1004 msgid ""

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

1006 "Using version %i"

1007 msgstr ""

1008

1001 -#: remote.c:782

1009 +#: remote.c:792

1010 #, c-format

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

1012 msgstr ""

1013

1006 -#: remote.c:786

1014 +#: remote.c:796

1015 #, c-format

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

1017 msgstr ""

1018

1011 -#: remote.c:790

1019 +#: remote.c:800

1020 #, c-format

1021 msgid "%s tracks both %s and %s"

1022 msgstr ""

1023

1016 -#: remote.c:798

1024 +#: remote.c:808

1025 msgid "Internal error"

1026 msgstr ""

1027

1020 -#: remote.c:1980

1028 +#: remote.c:1723 remote.c:1766

1029 +msgid "HEAD does not point to a branch"

1030 +msgstr ""

1031 +

1032 +#: remote.c:1732

1033 +#, c-format

1034 +msgid "no such branch: '%s'"

1035 +msgstr ""

1036 +

1037 +#: remote.c:1735

1038 +#, c-format

1039 +msgid "no upstream configured for branch '%s'"

1040 +msgstr ""

1041 +

1042 +#: remote.c:1741

1043 +#, c-format

1044 +msgid "upstream branch '%s' not stored as a remote-tracking branch"

1045 +msgstr ""

1046 +

1047 +#: remote.c:1756

1048 +#, c-format

1049 +msgid "push destination '%s' on remote '%s' has no local tracking branch"

1050 +msgstr ""

1051 +

1052 +#: remote.c:1771

1053 +#, c-format

1054 +msgid "branch '%s' has no remote for pushing"

1055 +msgstr ""

1056 +

1057 +#: remote.c:1782

1058 +#, c-format

1059 +msgid "push refspecs for '%s' do not include '%s'"

1060 +msgstr ""

1061 +

1062 +#: remote.c:1795

1063 +msgid "push has no destination (push.default is 'nothing')"

1064 +msgstr ""

1065 +

1066 +#: remote.c:1817

1067 +msgid "cannot resolve 'simple' push to a single destination"

1068 +msgstr ""

1069 +

1070 +#: remote.c:2124

1071 #, c-format

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

1073 msgstr ""

1074

1025 -#: remote.c:1984

1075 +#: remote.c:2128

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

1077 msgstr ""

1078

1029 -#: remote.c:1987

1079 +#: remote.c:2131

1080 #, c-format

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

1082 msgstr ""

1083

1034 -#: remote.c:1991

1084 +#: remote.c:2135

1085 #, c-format

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

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

1088 msgstr[0] ""

1089 msgstr[1] ""

1090

1041 -#: remote.c:1997

1091 +#: remote.c:2141

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

1093 msgstr ""

1094

1045 -#: remote.c:2000

1095 +#: remote.c:2144

1096 #, c-format

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

1098 msgid_plural ""

@@ -1050,11 +1100,11 @@ msgid_plural ""

1100 msgstr[0] ""

1101 msgstr[1] ""

1102

1053 -#: remote.c:2008

1103 +#: remote.c:2152

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

1105 msgstr ""

1106

1057 -#: remote.c:2011

1107 +#: remote.c:2155

1108 #, c-format

1109 msgid ""

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

@@ -1065,11 +1115,11 @@ msgid_plural ""

1115 msgstr[0] ""

1116 msgstr[1] ""

1117

1068 -#: remote.c:2021

1118 +#: remote.c:2165

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

1120 msgstr ""

1121

1072 -#: revision.c:2348

1122 +#: revision.c:2366

1123 msgid "--first-parent is incompatible with --bisect"

1124 msgstr ""

1125

@@ -1086,22 +1136,22 @@ msgstr ""

1136 msgid "failed to sign the push certificate"

1137 msgstr ""

1138

1089 -#: send-pack.c:356

1139 +#: send-pack.c:378

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

1141 msgstr ""

1142

1093 -#: send-pack.c:366

1143 +#: send-pack.c:389

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

1145 msgstr ""

1146

1097 -#: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995

1098 -#: builtin/merge.c:1005

1147 +#: sequencer.c:172 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973

1148 +#: builtin/merge.c:983

1149 #, c-format

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

1151 msgstr ""

1152

1103 -#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:785 builtin/merge.c:997

1104 -#: builtin/merge.c:1010

1153 +#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975

1154 +#: builtin/merge.c:988

1155 #, c-format

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

1157 msgstr ""

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

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

1345 msgstr ""

1346

1297 -#: sequencer.c:908 builtin/apply.c:4288

1347 +#: sequencer.c:908 builtin/apply.c:4291

1348 #, c-format

1349 msgid "cannot open %s: %s"

1350 msgstr ""

@@ -1336,7 +1386,12 @@ msgstr ""

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

1387 msgstr ""

1388

1339 -#: sha1_name.c:440

1389 +#: setup.c:243

1390 +#, c-format

1391 +msgid "failed to read %s"

1392 +msgstr ""

1393 +

1394 +#: sha1_name.c:453

1395 msgid ""

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

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

@@ -1349,25 +1404,6 @@ msgid ""

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

1405 msgstr ""

1406

1352 -#: sha1_name.c:1068

1353 -msgid "HEAD does not point to a branch"

1354 -msgstr ""

1355 -

1356 -#: sha1_name.c:1071

1357 -#, c-format

1358 -msgid "No such branch: '%s'"

1359 -msgstr ""

1360 -

1361 -#: sha1_name.c:1073

1362 -#, c-format

1363 -msgid "No upstream configured for branch '%s'"

1364 -msgstr ""

1365 -

1366 -#: sha1_name.c:1077

1367 -#, c-format

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

1369 -msgstr ""

1370 -

1407 #: submodule.c:64 submodule.c:98

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

1409 msgstr ""

@@ -1391,12 +1427,7 @@ msgstr ""

1427 msgid "staging updated .gitmodules failed"

1428 msgstr ""

1429

1394 -#: submodule.c:1109 builtin/init-db.c:371

1395 -#, c-format

1396 -msgid "Could not create git link %s"

1397 -msgstr ""

1398 -

1399 -#: submodule.c:1120

1430 +#: submodule.c:1115

1431 #, c-format

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

1433 msgstr ""

@@ -1426,7 +1457,7 @@ msgstr ""

1457 msgid "could not read from stdin"

1458 msgstr ""

1459

1429 -#: unpack-trees.c:202

1460 +#: unpack-trees.c:203

1461 msgid "Checking out files"

1462 msgstr ""

1463

@@ -1482,6 +1513,21 @@ msgstr ""

1513 msgid "unable to get current working directory"

1514 msgstr ""

1515

1516 +#: wrapper.c:575

1517 +#, c-format

1518 +msgid "could not open %s for writing"

1519 +msgstr ""

1520 +

1521 +#: wrapper.c:587

1522 +#, c-format

1523 +msgid "could not write to %s"

1524 +msgstr ""

1525 +

1526 +#: wrapper.c:593

1527 +#, c-format

1528 +msgid "could not close %s"

1529 +msgstr ""

1530 +

1531 #: wt-status.c:150

1532 msgid "Unmerged paths:"

1533 msgstr ""

@@ -1507,11 +1553,11 @@ msgstr ""

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

1554 msgstr ""

1555

1510 -#: wt-status.c:198 wt-status.c:878

1556 +#: wt-status.c:198 wt-status.c:881

1557 msgid "Changes to be committed:"

1558 msgstr ""

1559

1514 -#: wt-status.c:216 wt-status.c:887

1560 +#: wt-status.c:216 wt-status.c:890

1561 msgid "Changes not staged for commit:"

1562 msgstr ""

1563

@@ -1619,193 +1665,193 @@ msgstr ""

1665 msgid "bug: unhandled diff status %c"

1666 msgstr ""

1667

1622 -#: wt-status.c:753

1668 +#: wt-status.c:755

1669 msgid "Submodules changed but not updated:"

1670 msgstr ""

1671

1626 -#: wt-status.c:755

1672 +#: wt-status.c:757

1673 msgid "Submodule changes to be committed:"

1674 msgstr ""

1675

1630 -#: wt-status.c:835

1676 +#: wt-status.c:838

1677 msgid ""

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

1679 "Everything below will be removed."

1680 msgstr ""

1681

1636 -#: wt-status.c:946

1682 +#: wt-status.c:949

1683 msgid "You have unmerged paths."

1684 msgstr ""

1685

1640 -#: wt-status.c:949

1686 +#: wt-status.c:952

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

1688 msgstr ""

1689

1644 -#: wt-status.c:952

1690 +#: wt-status.c:955

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

1692 msgstr ""

1693

1648 -#: wt-status.c:955

1694 +#: wt-status.c:958

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

1696 msgstr ""

1697

1652 -#: wt-status.c:965

1698 +#: wt-status.c:968

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

1700 msgstr ""

1701

1656 -#: wt-status.c:968

1702 +#: wt-status.c:971

1703 msgid "The current patch is empty."

1704 msgstr ""

1705

1660 -#: wt-status.c:972

1706 +#: wt-status.c:975

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

1708 msgstr ""

1709

1664 -#: wt-status.c:974

1710 +#: wt-status.c:977

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

1712 msgstr ""

1713

1668 -#: wt-status.c:976

1714 +#: wt-status.c:979

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

1716 msgstr ""

1717

1672 -#: wt-status.c:1036 wt-status.c:1053

1718 +#: wt-status.c:1039 wt-status.c:1056

1719 #, c-format

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

1721 msgstr ""

1722

1677 -#: wt-status.c:1041 wt-status.c:1058

1723 +#: wt-status.c:1044 wt-status.c:1061

1724 msgid "You are currently rebasing."

1725 msgstr ""

1726

1681 -#: wt-status.c:1044

1727 +#: wt-status.c:1047

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

1729 msgstr ""

1730

1685 -#: wt-status.c:1046

1731 +#: wt-status.c:1049

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

1733 msgstr ""

1734

1689 -#: wt-status.c:1048

1735 +#: wt-status.c:1051

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

1737 msgstr ""

1738

1693 -#: wt-status.c:1061

1739 +#: wt-status.c:1064

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

1741 msgstr ""

1742

1697 -#: wt-status.c:1065

1743 +#: wt-status.c:1068

1744 #, c-format

1745 msgid ""

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

1747 msgstr ""

1748

1703 -#: wt-status.c:1070

1749 +#: wt-status.c:1073

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

1751 msgstr ""

1752

1707 -#: wt-status.c:1073

1753 +#: wt-status.c:1076

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

1755 msgstr ""

1756

1711 -#: wt-status.c:1077

1757 +#: wt-status.c:1080

1758 #, c-format

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

1760 msgstr ""

1761

1716 -#: wt-status.c:1082

1762 +#: wt-status.c:1085

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

1764 msgstr ""

1765

1720 -#: wt-status.c:1085

1766 +#: wt-status.c:1088

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

1768 msgstr ""

1769

1724 -#: wt-status.c:1087

1770 +#: wt-status.c:1090

1771 msgid ""

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

1773 msgstr ""

1774

1729 -#: wt-status.c:1097

1775 +#: wt-status.c:1100

1776 #, c-format

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

1778 msgstr ""

1779

1734 -#: wt-status.c:1102

1780 +#: wt-status.c:1105

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

1782 msgstr ""

1783

1738 -#: wt-status.c:1105

1784 +#: wt-status.c:1108

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

1786 msgstr ""

1787

1742 -#: wt-status.c:1107

1788 +#: wt-status.c:1110

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

1790 msgstr ""

1791

1746 -#: wt-status.c:1116

1792 +#: wt-status.c:1119

1793 #, c-format

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

1795 msgstr ""

1796

1751 -#: wt-status.c:1121

1797 +#: wt-status.c:1124

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

1799 msgstr ""

1800

1755 -#: wt-status.c:1124

1801 +#: wt-status.c:1127

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

1803 msgstr ""

1804

1759 -#: wt-status.c:1126

1805 +#: wt-status.c:1129

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

1807 msgstr ""

1808

1763 -#: wt-status.c:1137

1809 +#: wt-status.c:1140

1810 #, c-format

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

1812 msgstr ""

1813

1768 -#: wt-status.c:1141

1814 +#: wt-status.c:1144

1815 msgid "You are currently bisecting."

1816 msgstr ""

1817

1772 -#: wt-status.c:1144

1818 +#: wt-status.c:1147

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

1820 msgstr ""

1821

1776 -#: wt-status.c:1321

1822 +#: wt-status.c:1324

1823 msgid "On branch "

1824 msgstr ""

1825

1780 -#: wt-status.c:1328

1826 +#: wt-status.c:1331

1827 msgid "rebase in progress; onto "

1828 msgstr ""

1829

1784 -#: wt-status.c:1333

1830 +#: wt-status.c:1336

1831 msgid "HEAD detached at "

1832 msgstr ""

1833

1788 -#: wt-status.c:1335

1834 +#: wt-status.c:1338

1835 msgid "HEAD detached from "

1836 msgstr ""

1837

1792 -#: wt-status.c:1338

1838 +#: wt-status.c:1341

1839 msgid "Not currently on any branch."

1840 msgstr ""

1841

1796 -#: wt-status.c:1355

1842 +#: wt-status.c:1358

1843 msgid "Initial commit"

1844 msgstr ""

1845

1800 -#: wt-status.c:1369

1846 +#: wt-status.c:1372

1847 msgid "Untracked files"

1848 msgstr ""

1849

1804 -#: wt-status.c:1371

1850 +#: wt-status.c:1374

1851 msgid "Ignored files"

1852 msgstr ""

1853

1808 -#: wt-status.c:1375

1854 +#: wt-status.c:1378

1855 #, c-format

1856 msgid ""

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

@@ -1813,78 +1859,78 @@ msgid ""

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

1860 msgstr ""

1861

1816 -#: wt-status.c:1381

1862 +#: wt-status.c:1384

1863 #, c-format

1864 msgid "Untracked files not listed%s"

1865 msgstr ""

1866

1821 -#: wt-status.c:1383

1867 +#: wt-status.c:1386

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

1869 msgstr ""

1870

1825 -#: wt-status.c:1389

1871 +#: wt-status.c:1392

1872 msgid "No changes"

1873 msgstr ""

1874

1829 -#: wt-status.c:1394

1875 +#: wt-status.c:1397

1876 #, c-format

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

1878 msgstr ""

1879

1834 -#: wt-status.c:1397

1880 +#: wt-status.c:1400

1881 #, c-format

1882 msgid "no changes added to commit\n"

1883 msgstr ""

1884

1839 -#: wt-status.c:1400

1885 +#: wt-status.c:1403

1886 #, c-format

1887 msgid ""

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

1889 "track)\n"

1890 msgstr ""

1891

1846 -#: wt-status.c:1403

1892 +#: wt-status.c:1406

1893 #, c-format

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

1895 msgstr ""

1896

1851 -#: wt-status.c:1406

1897 +#: wt-status.c:1409

1898 #, c-format

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

1900 msgstr ""

1901

1856 -#: wt-status.c:1409 wt-status.c:1414

1902 +#: wt-status.c:1412 wt-status.c:1417

1903 #, c-format

1904 msgid "nothing to commit\n"

1905 msgstr ""

1906

1861 -#: wt-status.c:1412

1907 +#: wt-status.c:1415

1908 #, c-format

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

1910 msgstr ""

1911

1866 -#: wt-status.c:1416

1912 +#: wt-status.c:1419

1913 #, c-format

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

1915 msgstr ""

1916

1871 -#: wt-status.c:1525

1917 +#: wt-status.c:1528

1918 msgid "HEAD (no branch)"

1919 msgstr ""

1920

1875 -#: wt-status.c:1531

1921 +#: wt-status.c:1534

1922 msgid "Initial commit on "

1923 msgstr ""

1924

1879 -#: wt-status.c:1563

1925 +#: wt-status.c:1561

1926 msgid "gone"

1927 msgstr ""

1928

1883 -#: wt-status.c:1565 wt-status.c:1573

1929 +#: wt-status.c:1563 wt-status.c:1571

1930 msgid "behind "

1931 msgstr ""

1932

1887 -#: compat/precompose_utf8.c:55 builtin/clone.c:360

1933 +#: compat/precompose_utf8.c:55 builtin/clone.c:352

1934 #, c-format

1935 msgid "failed to unlink '%s'"

1936 msgstr ""

@@ -1911,7 +1957,7 @@ msgstr ""

1957 msgid "Unstaged changes after refreshing the index:"

1958 msgstr ""

1959

1914 -#: builtin/add.c:194 builtin/rev-parse.c:785

1960 +#: builtin/add.c:194 builtin/rev-parse.c:796

1961 msgid "Could not read the index"

1962 msgstr ""

1963

@@ -1924,113 +1970,117 @@ msgstr ""

1970 msgid "Could not write patch"

1971 msgstr ""

1972

1927 -#: builtin/add.c:214

1973 +#: builtin/add.c:212

1974 +msgid "editing patch failed"

1975 +msgstr ""

1976 +

1977 +#: builtin/add.c:215

1978 #, c-format

1979 msgid "Could not stat '%s'"

1980 msgstr ""

1981

1932 -#: builtin/add.c:216

1982 +#: builtin/add.c:217

1983 msgid "Empty patch. Aborted."

1984 msgstr ""

1985

1936 -#: builtin/add.c:221

1986 +#: builtin/add.c:222

1987 #, c-format

1988 msgid "Could not apply '%s'"

1989 msgstr ""

1990

1941 -#: builtin/add.c:231

1991 +#: builtin/add.c:232

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

1993 msgstr ""

1994

1945 -#: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:107 builtin/mv.c:110

1946 -#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1372

1947 -#: builtin/rm.c:269

1995 +#: builtin/add.c:249 builtin/clean.c:874 builtin/fetch.c:107 builtin/mv.c:110

1996 +#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1369

1997 +#: builtin/rm.c:268

1998 msgid "dry run"

1999 msgstr ""

2000

1951 -#: builtin/add.c:249 builtin/apply.c:4577 builtin/check-ignore.c:19

1952 -#: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:608

2001 +#: builtin/add.c:250 builtin/apply.c:4580 builtin/check-ignore.c:19

2002 +#: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:616

2003 #: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114

2004 msgid "be verbose"

2005 msgstr ""

2006

1957 -#: builtin/add.c:251

2007 +#: builtin/add.c:252

2008 msgid "interactive picking"

2009 msgstr ""

2010

1961 -#: builtin/add.c:252 builtin/checkout.c:1126 builtin/reset.c:286

2011 +#: builtin/add.c:253 builtin/checkout.c:1364 builtin/reset.c:286

2012 msgid "select hunks interactively"

2013 msgstr ""

2014

1965 -#: builtin/add.c:253

2015 +#: builtin/add.c:254

2016 msgid "edit current diff and apply"

2017 msgstr ""

2018

1969 -#: builtin/add.c:254

2019 +#: builtin/add.c:255

2020 msgid "allow adding otherwise ignored files"

2021 msgstr ""

2022

1973 -#: builtin/add.c:255

2023 +#: builtin/add.c:256

2024 msgid "update tracked files"

2025 msgstr ""

2026

1977 -#: builtin/add.c:256

2027 +#: builtin/add.c:257

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

2029 msgstr ""

2030

1981 -#: builtin/add.c:257

2031 +#: builtin/add.c:258

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

2033 msgstr ""

2034

1985 -#: builtin/add.c:260

2035 +#: builtin/add.c:261

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

2037 msgstr ""

2038

1989 -#: builtin/add.c:262

2039 +#: builtin/add.c:263

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

2041 msgstr ""

2042

1993 -#: builtin/add.c:263

2043 +#: builtin/add.c:264

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

2045 msgstr ""

2046

1997 -#: builtin/add.c:264

2047 +#: builtin/add.c:265

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

2049 msgstr ""

2050

2001 -#: builtin/add.c:286

2051 +#: builtin/add.c:287

2052 #, c-format

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

2054 msgstr ""

2055

2006 -#: builtin/add.c:293

2056 +#: builtin/add.c:294

2057 msgid "adding files failed"

2058 msgstr ""

2059

2010 -#: builtin/add.c:329

2060 +#: builtin/add.c:330

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

2062 msgstr ""

2063

2014 -#: builtin/add.c:336

2064 +#: builtin/add.c:337

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

2066 msgstr ""

2067

2018 -#: builtin/add.c:357

2068 +#: builtin/add.c:358

2069 #, c-format

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

2071 msgstr ""

2072

2023 -#: builtin/add.c:358

2073 +#: builtin/add.c:359

2074 #, c-format

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

2076 msgstr ""

2077

2028 -#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:920

2029 -#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299

2078 +#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:918

2079 +#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298

2080 msgid "index file corrupt"

2081 msgstr ""

2082

2033 -#: builtin/add.c:446 builtin/apply.c:4675 builtin/mv.c:279 builtin/rm.c:431

2083 +#: builtin/add.c:447 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430

2084 msgid "Unable to write new index file"

2085 msgstr ""

2086

@@ -2104,413 +2154,413 @@ msgid_plural ""

2154 msgstr[0] ""

2155 msgstr[1] ""

2156

2107 -#: builtin/apply.c:1656

2157 +#: builtin/apply.c:1659

2158 msgid "new file depends on old contents"

2159 msgstr ""

2160

2111 -#: builtin/apply.c:1658

2161 +#: builtin/apply.c:1661

2162 msgid "deleted file still has contents"

2163 msgstr ""

2164

2115 -#: builtin/apply.c:1684

2165 +#: builtin/apply.c:1687

2166 #, c-format

2167 msgid "corrupt patch at line %d"

2168 msgstr ""

2169

2120 -#: builtin/apply.c:1720

2170 +#: builtin/apply.c:1723

2171 #, c-format

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

2173 msgstr ""

2174

2125 -#: builtin/apply.c:1722

2175 +#: builtin/apply.c:1725

2176 #, c-format

2177 msgid "deleted file %s still has contents"

2178 msgstr ""

2179

2130 -#: builtin/apply.c:1725

2180 +#: builtin/apply.c:1728

2181 #, c-format

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

2183 msgstr ""

2184

2135 -#: builtin/apply.c:1871

2185 +#: builtin/apply.c:1874

2186 #, c-format

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

2188 msgstr ""

2189

2140 -#: builtin/apply.c:1900

2190 +#: builtin/apply.c:1903

2191 #, c-format

2192 msgid "unrecognized binary patch at line %d"

2193 msgstr ""

2194

2145 -#: builtin/apply.c:2051

2195 +#: builtin/apply.c:2054

2196 #, c-format

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

2198 msgstr ""

2199

2150 -#: builtin/apply.c:2141

2200 +#: builtin/apply.c:2144

2201 #, c-format

2202 msgid "unable to read symlink %s"

2203 msgstr ""

2204

2155 -#: builtin/apply.c:2145

2205 +#: builtin/apply.c:2148

2206 #, c-format

2207 msgid "unable to open or read %s"

2208 msgstr ""

2209

2160 -#: builtin/apply.c:2778

2210 +#: builtin/apply.c:2781

2211 #, c-format

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

2213 msgstr ""

2214

2165 -#: builtin/apply.c:2897

2215 +#: builtin/apply.c:2900

2216 #, c-format

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

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

2219 msgstr[0] ""

2220 msgstr[1] ""

2221

2172 -#: builtin/apply.c:2909

2222 +#: builtin/apply.c:2912

2223 #, c-format

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

2225 msgstr ""

2226

2177 -#: builtin/apply.c:2915

2227 +#: builtin/apply.c:2918

2228 #, c-format

2229 msgid ""

2230 "while searching for:\n"

2231 "%.*s"

2232 msgstr ""

2233

2184 -#: builtin/apply.c:2935

2234 +#: builtin/apply.c:2938

2235 #, c-format

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

2237 msgstr ""

2238

2189 -#: builtin/apply.c:3036

2239 +#: builtin/apply.c:3039

2240 #, c-format

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

2242 msgstr ""

2243

2194 -#: builtin/apply.c:3042

2244 +#: builtin/apply.c:3045

2245 #, c-format

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

2247 msgstr ""

2248

2199 -#: builtin/apply.c:3063

2249 +#: builtin/apply.c:3066

2250 #, c-format

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

2252 msgstr ""

2253

2204 -#: builtin/apply.c:3187

2254 +#: builtin/apply.c:3190

2255 #, c-format

2256 msgid "cannot checkout %s"

2257 msgstr ""

2258

2209 -#: builtin/apply.c:3232 builtin/apply.c:3243 builtin/apply.c:3288

2259 +#: builtin/apply.c:3235 builtin/apply.c:3246 builtin/apply.c:3291

2260 #, c-format

2261 msgid "read of %s failed"

2262 msgstr ""

2263

2214 -#: builtin/apply.c:3240

2264 +#: builtin/apply.c:3243

2265 #, c-format

2266 msgid "reading from '%s' beyond a symbolic link"

2267 msgstr ""

2268

2219 -#: builtin/apply.c:3268 builtin/apply.c:3490

2269 +#: builtin/apply.c:3271 builtin/apply.c:3493

2270 #, c-format

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

2272 msgstr ""

2273

2224 -#: builtin/apply.c:3349 builtin/apply.c:3504

2274 +#: builtin/apply.c:3352 builtin/apply.c:3507

2275 #, c-format

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

2277 msgstr ""

2278

2229 -#: builtin/apply.c:3353 builtin/apply.c:3496 builtin/apply.c:3518

2279 +#: builtin/apply.c:3356 builtin/apply.c:3499 builtin/apply.c:3521

2280 #, c-format

2281 msgid "%s: %s"

2282 msgstr ""

2283

2234 -#: builtin/apply.c:3358 builtin/apply.c:3512

2284 +#: builtin/apply.c:3361 builtin/apply.c:3515

2285 #, c-format

2286 msgid "%s: does not match index"

2287 msgstr ""

2288

2239 -#: builtin/apply.c:3460

2289 +#: builtin/apply.c:3463

2290 msgid "removal patch leaves file contents"

2291 msgstr ""

2292

2243 -#: builtin/apply.c:3529

2293 +#: builtin/apply.c:3532

2294 #, c-format

2295 msgid "%s: wrong type"

2296 msgstr ""

2297

2248 -#: builtin/apply.c:3531

2298 +#: builtin/apply.c:3534

2299 #, c-format

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

2301 msgstr ""

2302

2253 -#: builtin/apply.c:3690 builtin/apply.c:3692

2303 +#: builtin/apply.c:3693 builtin/apply.c:3695

2304 #, c-format

2305 msgid "invalid path '%s'"

2306 msgstr ""

2307

2258 -#: builtin/apply.c:3747

2308 +#: builtin/apply.c:3750

2309 #, c-format

2310 msgid "%s: already exists in index"

2311 msgstr ""

2312

2263 -#: builtin/apply.c:3750

2313 +#: builtin/apply.c:3753

2314 #, c-format

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

2316 msgstr ""

2317

2268 -#: builtin/apply.c:3770

2318 +#: builtin/apply.c:3773

2319 #, c-format

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

2321 msgstr ""

2322

2273 -#: builtin/apply.c:3775

2323 +#: builtin/apply.c:3778

2324 #, c-format

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

2326 msgstr ""

2327

2278 -#: builtin/apply.c:3795

2328 +#: builtin/apply.c:3798

2329 #, c-format

2330 msgid "affected file '%s' is beyond a symbolic link"

2331 msgstr ""

2332

2283 -#: builtin/apply.c:3799

2333 +#: builtin/apply.c:3802

2334 #, c-format

2335 msgid "%s: patch does not apply"

2336 msgstr ""

2337

2288 -#: builtin/apply.c:3813

2338 +#: builtin/apply.c:3816

2339 #, c-format

2340 msgid "Checking patch %s..."

2341 msgstr ""

2342

2293 -#: builtin/apply.c:3906 builtin/checkout.c:231 builtin/reset.c:135

2343 +#: builtin/apply.c:3909 builtin/checkout.c:237 builtin/reset.c:135

2344 #, c-format

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

2346 msgstr ""

2347

2298 -#: builtin/apply.c:4049

2348 +#: builtin/apply.c:4052

2349 #, c-format

2350 msgid "unable to remove %s from index"

2351 msgstr ""

2352

2303 -#: builtin/apply.c:4078

2353 +#: builtin/apply.c:4081

2354 #, c-format

2355 msgid "corrupt patch for submodule %s"

2356 msgstr ""

2357

2308 -#: builtin/apply.c:4082

2358 +#: builtin/apply.c:4085

2359 #, c-format

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

2361 msgstr ""

2362

2313 -#: builtin/apply.c:4087

2363 +#: builtin/apply.c:4090

2364 #, c-format

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

2366 msgstr ""

2367

2318 -#: builtin/apply.c:4090 builtin/apply.c:4198

2368 +#: builtin/apply.c:4093 builtin/apply.c:4201

2369 #, c-format

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

2371 msgstr ""

2372

2323 -#: builtin/apply.c:4123

2373 +#: builtin/apply.c:4126

2374 #, c-format

2375 msgid "closing file '%s'"

2376 msgstr ""

2377

2328 -#: builtin/apply.c:4172

2378 +#: builtin/apply.c:4175

2379 #, c-format

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

2381 msgstr ""

2382

2333 -#: builtin/apply.c:4259

2383 +#: builtin/apply.c:4262

2384 #, c-format

2385 msgid "Applied patch %s cleanly."

2386 msgstr ""

2387

2338 -#: builtin/apply.c:4267

2388 +#: builtin/apply.c:4270

2389 msgid "internal error"

2390 msgstr ""

2391

2342 -#: builtin/apply.c:4270

2392 +#: builtin/apply.c:4273

2393 #, c-format

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

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

2396 msgstr[0] ""

2397 msgstr[1] ""

2398

2349 -#: builtin/apply.c:4280

2399 +#: builtin/apply.c:4283

2400 #, c-format

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

2402 msgstr ""

2403

2354 -#: builtin/apply.c:4301

2404 +#: builtin/apply.c:4304

2405 #, c-format

2406 msgid "Hunk #%d applied cleanly."

2407 msgstr ""

2408

2359 -#: builtin/apply.c:4304

2409 +#: builtin/apply.c:4307

2410 #, c-format

2411 msgid "Rejected hunk #%d."

2412 msgstr ""

2413

2364 -#: builtin/apply.c:4394

2414 +#: builtin/apply.c:4397

2415 msgid "unrecognized input"

2416 msgstr ""

2417

2368 -#: builtin/apply.c:4405

2418 +#: builtin/apply.c:4408

2419 msgid "unable to read index file"

2420 msgstr ""

2421

2372 -#: builtin/apply.c:4522 builtin/apply.c:4525 builtin/clone.c:92

2422 +#: builtin/apply.c:4525 builtin/apply.c:4528 builtin/clone.c:85

2423 #: builtin/fetch.c:92

2424 msgid "path"

2425 msgstr ""

2426

2377 -#: builtin/apply.c:4523

2427 +#: builtin/apply.c:4526

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

2429 msgstr ""

2430

2381 -#: builtin/apply.c:4526

2431 +#: builtin/apply.c:4529

2432 msgid "apply changes matching the given path"

2433 msgstr ""

2434

2385 -#: builtin/apply.c:4528

2435 +#: builtin/apply.c:4531

2436 msgid "num"

2437 msgstr ""

2438

2389 -#: builtin/apply.c:4529

2439 +#: builtin/apply.c:4532

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

2441 msgstr ""

2442

2393 -#: builtin/apply.c:4532

2443 +#: builtin/apply.c:4535

2444 msgid "ignore additions made by the patch"

2445 msgstr ""

2446

2397 -#: builtin/apply.c:4534

2447 +#: builtin/apply.c:4537

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

2449 msgstr ""

2450

2401 -#: builtin/apply.c:4538

2451 +#: builtin/apply.c:4541

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

2453 msgstr ""

2454

2405 -#: builtin/apply.c:4540

2455 +#: builtin/apply.c:4543

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

2457 msgstr ""

2458

2409 -#: builtin/apply.c:4542

2459 +#: builtin/apply.c:4545

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

2461 msgstr ""

2462

2413 -#: builtin/apply.c:4544

2463 +#: builtin/apply.c:4547

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

2465 msgstr ""

2466

2417 -#: builtin/apply.c:4546

2467 +#: builtin/apply.c:4549

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

2469 msgstr ""

2470

2421 -#: builtin/apply.c:4548

2471 +#: builtin/apply.c:4551

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

2473 msgstr ""

2474

2425 -#: builtin/apply.c:4550

2475 +#: builtin/apply.c:4553

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

2477 msgstr ""

2478

2429 -#: builtin/apply.c:4552

2479 +#: builtin/apply.c:4555

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

2481 msgstr ""

2482

2433 -#: builtin/apply.c:4554

2483 +#: builtin/apply.c:4557

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

2485 msgstr ""

2486

2437 -#: builtin/apply.c:4556 builtin/checkout-index.c:198 builtin/ls-files.c:412

2487 +#: builtin/apply.c:4559 builtin/checkout-index.c:198 builtin/ls-files.c:412

2488 msgid "paths are separated with NUL character"

2489 msgstr ""

2490

2441 -#: builtin/apply.c:4559

2491 +#: builtin/apply.c:4562

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

2493 msgstr ""

2494

2445 -#: builtin/apply.c:4560

2495 +#: builtin/apply.c:4563

2496 msgid "action"

2497 msgstr ""

2498

2449 -#: builtin/apply.c:4561

2499 +#: builtin/apply.c:4564

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

2501 msgstr ""

2502

2453 -#: builtin/apply.c:4564 builtin/apply.c:4567

2503 +#: builtin/apply.c:4567 builtin/apply.c:4570

2504 msgid "ignore changes in whitespace when finding context"

2505 msgstr ""

2506

2457 -#: builtin/apply.c:4570

2507 +#: builtin/apply.c:4573

2508 msgid "apply the patch in reverse"

2509 msgstr ""

2510

2461 -#: builtin/apply.c:4572

2511 +#: builtin/apply.c:4575

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

2513 msgstr ""

2514

2465 -#: builtin/apply.c:4574

2515 +#: builtin/apply.c:4577

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

2517 msgstr ""

2518

2469 -#: builtin/apply.c:4576

2519 +#: builtin/apply.c:4579

2520 msgid "allow overlapping hunks"

2521 msgstr ""

2522

2473 -#: builtin/apply.c:4579

2523 +#: builtin/apply.c:4582

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

2525 msgstr ""

2526

2477 -#: builtin/apply.c:4582

2527 +#: builtin/apply.c:4585

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

2529 msgstr ""

2530

2481 -#: builtin/apply.c:4584

2531 +#: builtin/apply.c:4587

2532 msgid "root"

2533 msgstr ""

2534

2485 -#: builtin/apply.c:4585

2535 +#: builtin/apply.c:4588

2536 msgid "prepend <root> to all filenames"

2537 msgstr ""

2538

2489 -#: builtin/apply.c:4607

2539 +#: builtin/apply.c:4610

2540 msgid "--3way outside a repository"

2541 msgstr ""

2542

2493 -#: builtin/apply.c:4615

2543 +#: builtin/apply.c:4618

2544 msgid "--index outside a repository"

2545 msgstr ""

2546

2497 -#: builtin/apply.c:4618

2547 +#: builtin/apply.c:4621

2548 msgid "--cached outside a repository"

2549 msgstr ""

2550

2501 -#: builtin/apply.c:4637

2551 +#: builtin/apply.c:4640

2552 #, c-format

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

2554 msgstr ""

2555

2506 -#: builtin/apply.c:4651

2556 +#: builtin/apply.c:4654

2557 #, c-format

2558 msgid "squelched %d whitespace error"

2559 msgid_plural "squelched %d whitespace errors"

2560 msgstr[0] ""

2561 msgstr[1] ""

2562

2513 -#: builtin/apply.c:4657 builtin/apply.c:4667

2563 +#: builtin/apply.c:4660 builtin/apply.c:4670

2564 #, c-format

2565 msgid "%d line adds whitespace errors."

2566 msgid_plural "%d lines add whitespace errors."

@@ -2564,11 +2614,11 @@ msgstr ""

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

2615 msgstr ""

2616

2567 -#: builtin/blame.c:30

2568 -msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] file"

2617 +#: builtin/blame.c:31

2618 +msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"

2619 msgstr ""

2620

2571 -#: builtin/blame.c:35

2621 +#: builtin/blame.c:36

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

2623 msgstr ""

2624

@@ -2690,376 +2740,376 @@ msgstr ""

2740 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"

2741 msgstr ""

2742

2693 -#: builtin/branch.c:152

2743 +#: builtin/branch.c:150

2744 #, c-format

2745 msgid ""

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

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

2748 msgstr ""

2749

2700 -#: builtin/branch.c:156

2750 +#: builtin/branch.c:154

2751 #, c-format

2752 msgid ""

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

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

2755 msgstr ""

2756

2707 -#: builtin/branch.c:170

2757 +#: builtin/branch.c:168

2758 #, c-format

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

2760 msgstr ""

2761

2712 -#: builtin/branch.c:174

2762 +#: builtin/branch.c:172

2763 #, c-format

2764 msgid ""

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

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

2767 msgstr ""

2768

2719 -#: builtin/branch.c:187

2769 +#: builtin/branch.c:185

2770 msgid "Update of config-file failed"

2771 msgstr ""

2772

2723 -#: builtin/branch.c:215

2773 +#: builtin/branch.c:213

2774 msgid "cannot use -a with -d"

2775 msgstr ""

2776

2727 -#: builtin/branch.c:221

2777 +#: builtin/branch.c:219

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

2779 msgstr ""

2780

2731 -#: builtin/branch.c:229

2781 +#: builtin/branch.c:227

2782 #, c-format

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

2784 msgstr ""

2785

2736 -#: builtin/branch.c:245

2786 +#: builtin/branch.c:243

2787 #, c-format

2738 -msgid "remote branch '%s' not found."

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

2789 msgstr ""

2790

2741 -#: builtin/branch.c:246

2791 +#: builtin/branch.c:244

2792 #, c-format

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

2794 msgstr ""

2795

2746 -#: builtin/branch.c:260

2796 +#: builtin/branch.c:258

2797 #, c-format

2748 -msgid "Error deleting remote branch '%s'"

2798 +msgid "Error deleting remote-tracking branch '%s'"

2799 msgstr ""

2800

2751 -#: builtin/branch.c:261

2801 +#: builtin/branch.c:259

2802 #, c-format

2803 msgid "Error deleting branch '%s'"

2804 msgstr ""

2805

2756 -#: builtin/branch.c:268

2806 +#: builtin/branch.c:266

2807 #, c-format

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

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

2809 msgstr ""

2810

2761 -#: builtin/branch.c:269

2811 +#: builtin/branch.c:267

2812 #, c-format

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

2814 msgstr ""

2815

2766 -#: builtin/branch.c:370

2816 +#: builtin/branch.c:368

2817 #, c-format

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

2819 msgstr ""

2820

2771 -#: builtin/branch.c:459

2821 +#: builtin/branch.c:451

2822 #, c-format

2823 msgid "[%s: gone]"

2824 msgstr ""

2825

2776 -#: builtin/branch.c:464

2826 +#: builtin/branch.c:456

2827 #, c-format

2828 msgid "[%s]"

2829 msgstr ""

2830

2781 -#: builtin/branch.c:469

2831 +#: builtin/branch.c:461

2832 #, c-format

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

2834 msgstr ""

2835

2786 -#: builtin/branch.c:471

2836 +#: builtin/branch.c:463

2837 #, c-format

2838 msgid "[behind %d]"

2839 msgstr ""

2840

2791 -#: builtin/branch.c:475

2841 +#: builtin/branch.c:467

2842 #, c-format

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

2844 msgstr ""

2845

2796 -#: builtin/branch.c:477

2846 +#: builtin/branch.c:469

2847 #, c-format

2848 msgid "[ahead %d]"

2849 msgstr ""

2850

2801 -#: builtin/branch.c:480

2851 +#: builtin/branch.c:472

2852 #, c-format

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

2854 msgstr ""

2855

2806 -#: builtin/branch.c:483

2856 +#: builtin/branch.c:475

2857 #, c-format

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

2859 msgstr ""

2860

2811 -#: builtin/branch.c:496

2861 +#: builtin/branch.c:488

2862 msgid " **** invalid ref ****"

2863 msgstr ""

2864

2815 -#: builtin/branch.c:587

2865 +#: builtin/branch.c:579

2866 #, c-format

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

2868 msgstr ""

2869

2820 -#: builtin/branch.c:590

2870 +#: builtin/branch.c:582

2871 #, c-format

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

2873 msgstr ""

2874

2825 -#: builtin/branch.c:596

2875 +#: builtin/branch.c:588

2876 #, c-format

2877 msgid "(HEAD detached at %s)"

2878 msgstr ""

2879

2830 -#: builtin/branch.c:599

2880 +#: builtin/branch.c:591

2881 #, c-format

2882 msgid "(HEAD detached from %s)"

2883 msgstr ""

2884

2835 -#: builtin/branch.c:603

2885 +#: builtin/branch.c:595

2886 msgid "(no branch)"

2887 msgstr ""

2888

2839 -#: builtin/branch.c:650

2889 +#: builtin/branch.c:642

2890 #, c-format

2891 msgid "object '%s' does not point to a commit"

2892 msgstr ""

2893

2844 -#: builtin/branch.c:698

2894 +#: builtin/branch.c:690

2895 msgid "some refs could not be read"

2896 msgstr ""

2897

2848 -#: builtin/branch.c:711

2898 +#: builtin/branch.c:703

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

2900 msgstr ""

2901

2852 -#: builtin/branch.c:721

2902 +#: builtin/branch.c:713

2903 #, c-format

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

2905 msgstr ""

2906

2857 -#: builtin/branch.c:736

2907 +#: builtin/branch.c:728

2908 msgid "Branch rename failed"

2909 msgstr ""

2910

2861 -#: builtin/branch.c:740

2911 +#: builtin/branch.c:732

2912 #, c-format

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

2914 msgstr ""

2915

2866 -#: builtin/branch.c:744

2916 +#: builtin/branch.c:736

2917 #, c-format

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

2919 msgstr ""

2920

2871 -#: builtin/branch.c:751

2921 +#: builtin/branch.c:743

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

2923 msgstr ""

2924

2875 -#: builtin/branch.c:766

2925 +#: builtin/branch.c:758

2926 #, c-format

2927 msgid "malformed object name %s"

2928 msgstr ""

2929

2880 -#: builtin/branch.c:790

2930 +#: builtin/branch.c:780

2931 #, c-format

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

2933 msgstr ""

2934

2885 -#: builtin/branch.c:820

2935 +#: builtin/branch.c:810

2936 msgid "Generic options"

2937 msgstr ""

2938

2889 -#: builtin/branch.c:822

2939 +#: builtin/branch.c:812

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

2941 msgstr ""

2942

2893 -#: builtin/branch.c:823

2943 +#: builtin/branch.c:813

2944 msgid "suppress informational messages"

2945 msgstr ""

2946

2897 -#: builtin/branch.c:824

2947 +#: builtin/branch.c:814

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

2949 msgstr ""

2950

2901 -#: builtin/branch.c:826

2951 +#: builtin/branch.c:816

2952 msgid "change upstream info"

2953 msgstr ""

2954

2905 -#: builtin/branch.c:830

2955 +#: builtin/branch.c:820

2956 msgid "use colored output"

2957 msgstr ""

2958

2909 -#: builtin/branch.c:831

2959 +#: builtin/branch.c:821

2960 msgid "act on remote-tracking branches"

2961 msgstr ""

2962

2913 -#: builtin/branch.c:834 builtin/branch.c:840 builtin/branch.c:861

2914 -#: builtin/branch.c:867 builtin/commit.c:1582 builtin/commit.c:1583

2915 -#: builtin/commit.c:1584 builtin/commit.c:1585 builtin/tag.c:616

2963 +#: builtin/branch.c:824 builtin/branch.c:830 builtin/branch.c:851

2964 +#: builtin/branch.c:857 builtin/commit.c:1581 builtin/commit.c:1582

2965 +#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/tag.c:616

2966 #: builtin/tag.c:622

2967 msgid "commit"

2968 msgstr ""

2969

2920 -#: builtin/branch.c:835 builtin/branch.c:841

2970 +#: builtin/branch.c:825 builtin/branch.c:831

2971 msgid "print only branches that contain the commit"

2972 msgstr ""

2973

2924 -#: builtin/branch.c:847

2974 +#: builtin/branch.c:837

2975 msgid "Specific git-branch actions:"

2976 msgstr ""

2977

2928 -#: builtin/branch.c:848

2978 +#: builtin/branch.c:838

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

2980 msgstr ""

2981

2932 -#: builtin/branch.c:850

2982 +#: builtin/branch.c:840

2983 msgid "delete fully merged branch"

2984 msgstr ""

2985

2936 -#: builtin/branch.c:851

2986 +#: builtin/branch.c:841

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

2988 msgstr ""

2989

2940 -#: builtin/branch.c:852

2990 +#: builtin/branch.c:842

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

2992 msgstr ""

2993

2944 -#: builtin/branch.c:853

2994 +#: builtin/branch.c:843

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

2996 msgstr ""

2997

2948 -#: builtin/branch.c:854

2998 +#: builtin/branch.c:844

2999 msgid "list branch names"

3000 msgstr ""

3001

2952 -#: builtin/branch.c:855

3002 +#: builtin/branch.c:845

3003 msgid "create the branch's reflog"

3004 msgstr ""

3005

2956 -#: builtin/branch.c:857

3006 +#: builtin/branch.c:847

3007 msgid "edit the description for the branch"

3008 msgstr ""

3009

2960 -#: builtin/branch.c:858

3010 +#: builtin/branch.c:848

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

3012 msgstr ""

3013

2964 -#: builtin/branch.c:861

3014 +#: builtin/branch.c:851

3015 msgid "print only not merged branches"

3016 msgstr ""

3017

2968 -#: builtin/branch.c:867

3018 +#: builtin/branch.c:857

3019 msgid "print only merged branches"

3020 msgstr ""

3021

2972 -#: builtin/branch.c:871

3022 +#: builtin/branch.c:861

3023 msgid "list branches in columns"

3024 msgstr ""

3025

2976 -#: builtin/branch.c:884

3026 +#: builtin/branch.c:874

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

3028 msgstr ""

3029

2980 -#: builtin/branch.c:888 builtin/clone.c:637

3030 +#: builtin/branch.c:878 builtin/clone.c:629

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

3032 msgstr ""

3033

2984 -#: builtin/branch.c:910

3034 +#: builtin/branch.c:900

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

3036 msgstr ""

3037

2988 -#: builtin/branch.c:921 builtin/branch.c:960

3038 +#: builtin/branch.c:911 builtin/branch.c:950

3039 msgid "branch name required"

3040 msgstr ""

3041

2992 -#: builtin/branch.c:936

3042 +#: builtin/branch.c:926

3043 msgid "Cannot give description to detached HEAD"

3044 msgstr ""

3045

2996 -#: builtin/branch.c:941

3046 +#: builtin/branch.c:931

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

3048 msgstr ""

3049

3000 -#: builtin/branch.c:948

3050 +#: builtin/branch.c:938

3051 #, c-format

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

3053 msgstr ""

3054

3005 -#: builtin/branch.c:951

3055 +#: builtin/branch.c:941

3056 #, c-format

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

3058 msgstr ""

3059

3010 -#: builtin/branch.c:966

3060 +#: builtin/branch.c:956

3061 msgid "too many branches for a rename operation"

3062 msgstr ""

3063

3014 -#: builtin/branch.c:971

3064 +#: builtin/branch.c:961

3065 msgid "too many branches to set new upstream"

3066 msgstr ""

3067

3018 -#: builtin/branch.c:975

3068 +#: builtin/branch.c:965

3069 #, c-format

3070 msgid ""

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

3072 msgstr ""

3073

3024 -#: builtin/branch.c:978 builtin/branch.c:1000 builtin/branch.c:1021

3074 +#: builtin/branch.c:968 builtin/branch.c:990 builtin/branch.c:1011

3075 #, c-format

3076 msgid "no such branch '%s'"

3077 msgstr ""

3078

3029 -#: builtin/branch.c:982

3079 +#: builtin/branch.c:972

3080 #, c-format

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

3082 msgstr ""

3083

3034 -#: builtin/branch.c:994

3084 +#: builtin/branch.c:984

3085 msgid "too many branches to unset upstream"

3086 msgstr ""

3087

3038 -#: builtin/branch.c:998

3088 +#: builtin/branch.c:988

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

3090 msgstr ""

3091

3042 -#: builtin/branch.c:1004

3092 +#: builtin/branch.c:994

3093 #, c-format

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

3095 msgstr ""

3096

3047 -#: builtin/branch.c:1018

3097 +#: builtin/branch.c:1008

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

3099 msgstr ""

3100

3051 -#: builtin/branch.c:1024

3101 +#: builtin/branch.c:1014

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

3103 msgstr ""

3104

3055 -#: builtin/branch.c:1027

3105 +#: builtin/branch.c:1017

3106 #, c-format

3107 msgid ""

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

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

3110 msgstr ""

3111

3062 -#: builtin/branch.c:1044

3112 +#: builtin/branch.c:1034

3113 #, c-format

3114 msgid ""

3115 "\n"

@@ -3067,69 +3117,81 @@ msgid ""

3117 "\n"

3118 msgstr ""

3119

3070 -#: builtin/branch.c:1045

3120 +#: builtin/branch.c:1035

3121 #, c-format

3122 msgid " git branch -d %s\n"

3123 msgstr ""

3124

3075 -#: builtin/branch.c:1046

3125 +#: builtin/branch.c:1036

3126 #, c-format

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

3128 msgstr ""

3129

3080 -#: builtin/bundle.c:47

3130 +#: builtin/bundle.c:51

3131 #, c-format

3132 msgid "%s is okay\n"

3133 msgstr ""

3134

3085 -#: builtin/bundle.c:56

3135 +#: builtin/bundle.c:64

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

3137 msgstr ""

3138

3089 -#: builtin/bundle.c:60

3139 +#: builtin/bundle.c:68

3140 msgid "Need a repository to unbundle."

3141 msgstr ""

3142

3093 -#: builtin/cat-file.c:326

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

3143 +#: builtin/cat-file.c:369

3144 +msgid ""

3145 +"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"

3146 +"<type>|--textconv) <object>"

3147 msgstr ""

3148

3097 -#: builtin/cat-file.c:327

3098 -msgid "git cat-file (--batch | --batch-check) < <list-of-objects>"

3149 +#: builtin/cat-file.c:370

3150 +msgid ""

3151 +"git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-"

3152 +"objects>"

3153 msgstr ""

3154

3101 -#: builtin/cat-file.c:364

3155 +#: builtin/cat-file.c:407

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

3157 msgstr ""

3158

3105 -#: builtin/cat-file.c:365

3159 +#: builtin/cat-file.c:408

3160 msgid "show object type"

3161 msgstr ""

3162

3109 -#: builtin/cat-file.c:366

3163 +#: builtin/cat-file.c:409

3164 msgid "show object size"

3165 msgstr ""

3166

3113 -#: builtin/cat-file.c:368

3167 +#: builtin/cat-file.c:411

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

3169 msgstr ""

3170

3117 -#: builtin/cat-file.c:369

3171 +#: builtin/cat-file.c:412

3172 msgid "pretty-print object's content"

3173 msgstr ""

3174

3121 -#: builtin/cat-file.c:371

3175 +#: builtin/cat-file.c:414

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

3177 msgstr ""

3178

3125 -#: builtin/cat-file.c:373

3179 +#: builtin/cat-file.c:416

3180 +msgid "allow -s and -t to work with broken/corrupt objects"

3181 +msgstr ""

3182 +

3183 +#: builtin/cat-file.c:418

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

3185 msgstr ""

3186

3129 -#: builtin/cat-file.c:376

3187 +#: builtin/cat-file.c:421

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

3189 msgstr ""

3190

3191 +#: builtin/cat-file.c:424

3192 +msgid "follow in-tree symlinks (used with --batch or --batch-check)"

3193 +msgstr ""

3194 +

3195 #: builtin/check-attr.c:11

3196 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."

3197 msgstr ""

@@ -3146,7 +3208,7 @@ msgstr ""

3208 msgid "use .gitattributes only from the index"

3209 msgstr ""

3210

3149 -#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98

3211 +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:96

3212 msgid "read file names from stdin"

3213 msgstr ""

3214

@@ -3154,7 +3216,7 @@ msgstr ""

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

3217 msgstr ""

3218

3157 -#: builtin/check-ignore.c:18 builtin/checkout.c:1107 builtin/gc.c:274

3219 +#: builtin/check-ignore.c:18 builtin/checkout.c:1345 builtin/gc.c:279

3220 msgid "suppress progress reporting"

3221 msgstr ""

3222

@@ -3251,113 +3313,113 @@ msgstr ""

3313 msgid "copy out the files from named stage"

3314 msgstr ""

3315

3254 -#: builtin/checkout.c:25

3316 +#: builtin/checkout.c:26

3317 msgid "git checkout [<options>] <branch>"

3318 msgstr ""

3319

3258 -#: builtin/checkout.c:26

3320 +#: builtin/checkout.c:27

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

3322 msgstr ""

3323

3262 -#: builtin/checkout.c:132 builtin/checkout.c:165

3324 +#: builtin/checkout.c:138 builtin/checkout.c:171

3325 #, c-format

3326 msgid "path '%s' does not have our version"

3327 msgstr ""

3328

3267 -#: builtin/checkout.c:134 builtin/checkout.c:167

3329 +#: builtin/checkout.c:140 builtin/checkout.c:173

3330 #, c-format

3331 msgid "path '%s' does not have their version"

3332 msgstr ""

3333

3272 -#: builtin/checkout.c:150

3334 +#: builtin/checkout.c:156

3335 #, c-format

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

3337 msgstr ""

3338

3277 -#: builtin/checkout.c:194

3339 +#: builtin/checkout.c:200

3340 #, c-format

3341 msgid "path '%s' does not have necessary versions"

3342 msgstr ""

3343

3282 -#: builtin/checkout.c:211

3344 +#: builtin/checkout.c:217

3345 #, c-format

3346 msgid "path '%s': cannot merge"

3347 msgstr ""

3348

3287 -#: builtin/checkout.c:228

3349 +#: builtin/checkout.c:234

3350 #, c-format

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

3352 msgstr ""

3353

3292 -#: builtin/checkout.c:249 builtin/checkout.c:252 builtin/checkout.c:255

3293 -#: builtin/checkout.c:258

3354 +#: builtin/checkout.c:255 builtin/checkout.c:258 builtin/checkout.c:261

3355 +#: builtin/checkout.c:264 builtin/checkout.c:277

3356 #, c-format

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

3358 msgstr ""

3359

3298 -#: builtin/checkout.c:261 builtin/checkout.c:264

3360 +#: builtin/checkout.c:267 builtin/checkout.c:270

3361 #, c-format

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

3363 msgstr ""

3364

3303 -#: builtin/checkout.c:267

3365 +#: builtin/checkout.c:273

3366 #, c-format

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

3368 msgstr ""

3369

3308 -#: builtin/checkout.c:278 builtin/checkout.c:467

3370 +#: builtin/checkout.c:287 builtin/checkout.c:481

3371 msgid "corrupt index file"

3372 msgstr ""

3373

3312 -#: builtin/checkout.c:338 builtin/checkout.c:345

3374 +#: builtin/checkout.c:347 builtin/checkout.c:354

3375 #, c-format

3376 msgid "path '%s' is unmerged"

3377 msgstr ""

3378

3317 -#: builtin/checkout.c:489

3379 +#: builtin/checkout.c:503

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

3381 msgstr ""

3382

3321 -#: builtin/checkout.c:615

3383 +#: builtin/checkout.c:634

3384 #, c-format

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

3386 msgstr ""

3387

3326 -#: builtin/checkout.c:653

3388 +#: builtin/checkout.c:670

3389 msgid "HEAD is now at"

3390 msgstr ""

3391

3330 -#: builtin/checkout.c:660

3392 +#: builtin/checkout.c:677

3393 #, c-format

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

3395 msgstr ""

3396

3335 -#: builtin/checkout.c:663

3397 +#: builtin/checkout.c:680

3398 #, c-format

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

3400 msgstr ""

3401

3340 -#: builtin/checkout.c:667

3402 +#: builtin/checkout.c:684

3403 #, c-format

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

3405 msgstr ""

3406

3345 -#: builtin/checkout.c:669 builtin/checkout.c:1050

3407 +#: builtin/checkout.c:686 builtin/checkout.c:1285

3408 #, c-format

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

3410 msgstr ""

3411

3350 -#: builtin/checkout.c:671

3412 +#: builtin/checkout.c:688

3413 #, c-format

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

3415 msgstr ""

3416

3355 -#: builtin/checkout.c:723

3417 +#: builtin/checkout.c:740

3418 #, c-format

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

3420 msgstr ""

3421

3360 -#: builtin/checkout.c:729

3422 +#: builtin/checkout.c:746

3423 #, c-format

3424 msgid ""

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

@@ -3372,161 +3434,206 @@ msgid_plural ""

3434 msgstr[0] ""

3435 msgstr[1] ""

3436

3375 -#: builtin/checkout.c:747

3437 +#: builtin/checkout.c:765

3438 #, c-format

3439 msgid ""

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

3441 +"to do so with:\n"

3442 +"\n"

3443 +" git branch <new-branch-name> %s\n"

3444 +"\n"

3445 +msgid_plural ""

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

3447 "to do so with:\n"

3448 "\n"

3449 " git branch <new-branch-name> %s\n"

3450 "\n"

3383 -msgstr ""

3451 +msgstr[0] ""

3452 +msgstr[1] ""

3453

3385 -#: builtin/checkout.c:777

3454 +#: builtin/checkout.c:801

3455 msgid "internal error in revision walk"

3456 msgstr ""

3457

3389 -#: builtin/checkout.c:781

3458 +#: builtin/checkout.c:805

3459 msgid "Previous HEAD position was"

3460 msgstr ""

3461

3393 -#: builtin/checkout.c:808 builtin/checkout.c:1045

3462 +#: builtin/checkout.c:832 builtin/checkout.c:1280

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

3464 msgstr ""

3465

3397 -#: builtin/checkout.c:952

3466 +#: builtin/checkout.c:893

3467 +msgid "no branch specified"

3468 +msgstr ""

3469 +

3470 +#: builtin/checkout.c:895

3471 +#, c-format

3472 +msgid "'%s' already exists"

3473 +msgstr ""

3474 +

3475 +#: builtin/checkout.c:910 builtin/checkout.c:937 builtin/clone.c:842

3476 +#: builtin/clone.c:853

3477 +#, c-format

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

3479 +msgstr ""

3480 +

3481 +#: builtin/checkout.c:924

3482 +#, c-format

3483 +msgid "could not create directory of '%s'"

3484 +msgstr ""

3485 +

3486 +#: builtin/checkout.c:960

3487 +#, c-format

3488 +msgid "Enter %s (identifier %s)"

3489 +msgstr ""

3490 +

3491 +#: builtin/checkout.c:1070

3492 +#, c-format

3493 +msgid "'%s' is already checked out at '%s'"

3494 +msgstr ""

3495 +

3496 +#: builtin/checkout.c:1176

3497 #, c-format

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

3499 msgstr ""

3500

3402 -#: builtin/checkout.c:991

3501 +#: builtin/checkout.c:1215

3502 #, c-format

3503 msgid "invalid reference: %s"

3504 msgstr ""

3505

3407 -#: builtin/checkout.c:1020

3506 +#: builtin/checkout.c:1255

3507 #, c-format

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

3509 msgstr ""

3510

3412 -#: builtin/checkout.c:1059

3511 +#: builtin/checkout.c:1294

3512 msgid "paths cannot be used with switching branches"

3513 msgstr ""

3514

3416 -#: builtin/checkout.c:1062 builtin/checkout.c:1066

3515 +#: builtin/checkout.c:1297 builtin/checkout.c:1301

3516 #, c-format

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

3518 msgstr ""

3519

3421 -#: builtin/checkout.c:1070 builtin/checkout.c:1073 builtin/checkout.c:1078

3422 -#: builtin/checkout.c:1081

3520 +#: builtin/checkout.c:1305 builtin/checkout.c:1308 builtin/checkout.c:1313

3521 +#: builtin/checkout.c:1316

3522 #, c-format

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

3524 msgstr ""

3525

3427 -#: builtin/checkout.c:1086

3526 +#: builtin/checkout.c:1321

3527 #, c-format

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

3529 msgstr ""

3530

3432 -#: builtin/checkout.c:1108 builtin/checkout.c:1110 builtin/clone.c:90

3531 +#: builtin/checkout.c:1346 builtin/checkout.c:1348 builtin/clone.c:83

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

3533 msgid "branch"

3534 msgstr ""

3535

3437 -#: builtin/checkout.c:1109

3536 +#: builtin/checkout.c:1347

3537 msgid "create and checkout a new branch"

3538 msgstr ""

3539

3441 -#: builtin/checkout.c:1111

3540 +#: builtin/checkout.c:1349

3541 msgid "create/reset and checkout a branch"

3542 msgstr ""

3543

3445 -#: builtin/checkout.c:1112

3544 +#: builtin/checkout.c:1350

3545 msgid "create reflog for new branch"

3546 msgstr ""

3547

3449 -#: builtin/checkout.c:1113

3548 +#: builtin/checkout.c:1351

3549 msgid "detach the HEAD at named commit"

3550 msgstr ""

3551

3453 -#: builtin/checkout.c:1114

3552 +#: builtin/checkout.c:1352

3553 msgid "set upstream info for new branch"

3554 msgstr ""

3555

3457 -#: builtin/checkout.c:1116

3556 +#: builtin/checkout.c:1354

3557 msgid "new-branch"

3558 msgstr ""

3559

3461 -#: builtin/checkout.c:1116

3560 +#: builtin/checkout.c:1354

3561 msgid "new unparented branch"

3562 msgstr ""

3563

3465 -#: builtin/checkout.c:1117

3564 +#: builtin/checkout.c:1355

3565 msgid "checkout our version for unmerged files"

3566 msgstr ""

3567

3469 -#: builtin/checkout.c:1119

3568 +#: builtin/checkout.c:1357

3569 msgid "checkout their version for unmerged files"

3570 msgstr ""

3571

3473 -#: builtin/checkout.c:1121

3572 +#: builtin/checkout.c:1359

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

3574 msgstr ""

3575

3477 -#: builtin/checkout.c:1122

3576 +#: builtin/checkout.c:1360

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

3578 msgstr ""

3579

3481 -#: builtin/checkout.c:1123 builtin/merge.c:227

3580 +#: builtin/checkout.c:1361 builtin/merge.c:227

3581 msgid "update ignored files (default)"

3582 msgstr ""

3583

3485 -#: builtin/checkout.c:1124 builtin/log.c:1239 parse-options.h:245

3584 +#: builtin/checkout.c:1362 builtin/log.c:1239 parse-options.h:244

3585 msgid "style"

3586 msgstr ""

3587

3489 -#: builtin/checkout.c:1125

3588 +#: builtin/checkout.c:1363

3589 msgid "conflict style (merge or diff3)"

3590 msgstr ""

3591

3493 -#: builtin/checkout.c:1128

3592 +#: builtin/checkout.c:1366

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

3594 msgstr ""

3595

3497 -#: builtin/checkout.c:1130

3596 +#: builtin/checkout.c:1368

3597 msgid "second guess 'git checkout <no-such-branch>'"

3598 msgstr ""

3599

3501 -#: builtin/checkout.c:1153

3600 +#: builtin/checkout.c:1370

3601 +msgid "check a branch out in a separate working directory"

3602 +msgstr ""

3603 +

3604 +#: builtin/checkout.c:1372

3605 +msgid "do not check if another worktree is holding the given ref"

3606 +msgstr ""

3607 +

3608 +#: builtin/checkout.c:1406

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

3610 msgstr ""

3611

3505 -#: builtin/checkout.c:1170

3612 +#: builtin/checkout.c:1423

3613 msgid "--track needs a branch name"

3614 msgstr ""

3615

3509 -#: builtin/checkout.c:1175

3616 +#: builtin/checkout.c:1428

3617 msgid "Missing branch name; try -b"

3618 msgstr ""

3619

3513 -#: builtin/checkout.c:1212

3620 +#: builtin/checkout.c:1464

3621 msgid "invalid path specification"

3622 msgstr ""

3623

3517 -#: builtin/checkout.c:1219

3624 +#: builtin/checkout.c:1471

3625 #, c-format

3626 msgid ""

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

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

3629 msgstr ""

3630

3524 -#: builtin/checkout.c:1224

3631 +#: builtin/checkout.c:1476

3632 #, c-format

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

3634 msgstr ""

3635

3529 -#: builtin/checkout.c:1228

3636 +#: builtin/checkout.c:1480

3637 msgid ""

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

3639 "checking out of the index."

@@ -3582,36 +3689,36 @@ msgid ""

3689 " - (empty) finish selecting"

3690 msgstr ""

3691

3585 -#: builtin/clean.c:517

3692 +#: builtin/clean.c:515

3693 #, c-format

3694 msgid "Huh (%s)?"

3695 msgstr ""

3696

3590 -#: builtin/clean.c:659

3697 +#: builtin/clean.c:657

3698 #, c-format

3699 msgid "Input ignore patterns>> "

3700 msgstr ""

3701

3595 -#: builtin/clean.c:696

3702 +#: builtin/clean.c:694

3703 #, c-format

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

3705 msgstr ""

3706

3600 -#: builtin/clean.c:717

3707 +#: builtin/clean.c:715

3708 msgid "Select items to delete"

3709 msgstr ""

3710

3711 #. TRANSLATORS: Make sure to keep [y/N] as is

3605 -#: builtin/clean.c:758

3712 +#: builtin/clean.c:756

3713 #, c-format

3714 msgid "Remove %s [y/N]? "

3715 msgstr ""

3716

3610 -#: builtin/clean.c:783

3717 +#: builtin/clean.c:781

3718 msgid "Bye."

3719 msgstr ""

3720

3614 -#: builtin/clean.c:791

3721 +#: builtin/clean.c:789

3722 msgid ""

3723 "clean - start cleaning\n"

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

@@ -3622,68 +3729,68 @@ msgid ""

3729 "? - help for prompt selection"

3730 msgstr ""

3731

3625 -#: builtin/clean.c:818

3732 +#: builtin/clean.c:816

3733 msgid "*** Commands ***"

3734 msgstr ""

3735

3629 -#: builtin/clean.c:819

3736 +#: builtin/clean.c:817

3737 msgid "What now"

3738 msgstr ""

3739

3633 -#: builtin/clean.c:827

3740 +#: builtin/clean.c:825

3741 msgid "Would remove the following item:"

3742 msgid_plural "Would remove the following items:"

3743 msgstr[0] ""

3744 msgstr[1] ""

3745

3639 -#: builtin/clean.c:844

3746 +#: builtin/clean.c:842

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

3748 msgstr ""

3749

3643 -#: builtin/clean.c:875

3750 +#: builtin/clean.c:873

3751 msgid "do not print names of files removed"

3752 msgstr ""

3753

3647 -#: builtin/clean.c:877

3754 +#: builtin/clean.c:875

3755 msgid "force"

3756 msgstr ""

3757

3651 -#: builtin/clean.c:878

3758 +#: builtin/clean.c:876

3759 msgid "interactive cleaning"

3760 msgstr ""

3761

3655 -#: builtin/clean.c:880

3762 +#: builtin/clean.c:878

3763 msgid "remove whole directories"

3764 msgstr ""

3765

3659 -#: builtin/clean.c:881 builtin/describe.c:407 builtin/grep.c:714

3660 -#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:185

3766 +#: builtin/clean.c:879 builtin/describe.c:407 builtin/grep.c:714

3767 +#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:187

3768 msgid "pattern"

3769 msgstr ""

3770

3664 -#: builtin/clean.c:882

3771 +#: builtin/clean.c:880

3772 msgid "add <pattern> to ignore rules"

3773 msgstr ""

3774

3668 -#: builtin/clean.c:883

3775 +#: builtin/clean.c:881

3776 msgid "remove ignored files, too"

3777 msgstr ""

3778

3672 -#: builtin/clean.c:885

3779 +#: builtin/clean.c:883

3780 msgid "remove only ignored files"

3781 msgstr ""

3782

3676 -#: builtin/clean.c:903

3783 +#: builtin/clean.c:901

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

3785 msgstr ""

3786

3680 -#: builtin/clean.c:907

3787 +#: builtin/clean.c:905

3788 msgid ""

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

3790 "clean"

3791 msgstr ""

3792

3686 -#: builtin/clean.c:910

3793 +#: builtin/clean.c:908

3794 msgid ""

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

3796 "refusing to clean"

@@ -3693,270 +3800,265 @@ msgstr ""

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

3801 msgstr ""

3802

3696 -#: builtin/clone.c:66 builtin/fetch.c:111 builtin/merge.c:224

3803 +#: builtin/clone.c:57 builtin/fetch.c:111 builtin/merge.c:224

3804 #: builtin/push.c:523

3805 msgid "force progress reporting"

3806 msgstr ""

3807

3701 -#: builtin/clone.c:68

3808 +#: builtin/clone.c:59

3809 msgid "don't create a checkout"

3810 msgstr ""

3811

3705 -#: builtin/clone.c:69 builtin/clone.c:71 builtin/init-db.c:496

3812 +#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:503

3813 msgid "create a bare repository"

3814 msgstr ""

3815

3709 -#: builtin/clone.c:73

3816 +#: builtin/clone.c:64

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

3818 msgstr ""

3819

3713 -#: builtin/clone.c:75

3820 +#: builtin/clone.c:66

3821 msgid "to clone from a local repository"

3822 msgstr ""

3823

3717 -#: builtin/clone.c:77

3824 +#: builtin/clone.c:68

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

3826 msgstr ""

3827

3721 -#: builtin/clone.c:79

3828 +#: builtin/clone.c:70

3829 msgid "setup as shared repository"

3830 msgstr ""

3831

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

3832 +#: builtin/clone.c:72 builtin/clone.c:74

3833 msgid "initialize submodules in the clone"

3834 msgstr ""

3835

3729 -#: builtin/clone.c:84 builtin/init-db.c:493

3836 +#: builtin/clone.c:75 builtin/init-db.c:500

3837 msgid "template-directory"

3838 msgstr ""

3839

3733 -#: builtin/clone.c:85 builtin/init-db.c:494

3840 +#: builtin/clone.c:76 builtin/init-db.c:501

3841 msgid "directory from which templates will be used"

3842 msgstr ""

3843

3737 -#: builtin/clone.c:87

3844 +#: builtin/clone.c:78

3845 msgid "reference repository"

3846 msgstr ""

3847

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

3848 +#: builtin/clone.c:80

3849 +msgid "use --reference only while cloning"

3850 +msgstr ""

3851 +

3852 +#: builtin/clone.c:81 builtin/column.c:26 builtin/merge-file.c:44

3853 msgid "name"

3854 msgstr ""

3855

3745 -#: builtin/clone.c:89

3856 +#: builtin/clone.c:82

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

3858 msgstr ""

3859

3749 -#: builtin/clone.c:91

3860 +#: builtin/clone.c:84

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

3862 msgstr ""

3863

3753 -#: builtin/clone.c:93

3864 +#: builtin/clone.c:86

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

3866 msgstr ""

3867

3757 -#: builtin/clone.c:94 builtin/fetch.c:112 builtin/grep.c:659

3868 +#: builtin/clone.c:87 builtin/fetch.c:112 builtin/grep.c:659

3869 msgid "depth"

3870 msgstr ""

3871

3761 -#: builtin/clone.c:95

3872 +#: builtin/clone.c:88

3873 msgid "create a shallow clone of that depth"

3874 msgstr ""

3875

3765 -#: builtin/clone.c:97

3876 +#: builtin/clone.c:90

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

3878 msgstr ""

3879

3769 -#: builtin/clone.c:99

3770 -msgid "use --reference only while cloning"

3771 -msgstr ""

3772 -

3773 -#: builtin/clone.c:100 builtin/init-db.c:502

3880 +#: builtin/clone.c:91 builtin/init-db.c:509

3881 msgid "gitdir"

3882 msgstr ""

3883

3777 -#: builtin/clone.c:101 builtin/init-db.c:503

3884 +#: builtin/clone.c:92 builtin/init-db.c:510

3885 msgid "separate git dir from working tree"

3886 msgstr ""

3887

3781 -#: builtin/clone.c:102

3888 +#: builtin/clone.c:93

3889 msgid "key=value"

3890 msgstr ""

3891

3785 -#: builtin/clone.c:103

3892 +#: builtin/clone.c:94

3893 msgid "set config inside the new repository"

3894 msgstr ""

3895

3789 -#: builtin/clone.c:256

3896 +#: builtin/clone.c:247

3897 #, c-format

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

3899 msgstr ""

3900

3794 -#: builtin/clone.c:260

3901 +#: builtin/clone.c:251

3902 #, c-format

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

3904 msgstr ""

3905

3799 -#: builtin/clone.c:263

3906 +#: builtin/clone.c:254

3907 #, c-format

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

3909 msgstr ""

3910

3804 -#: builtin/clone.c:325

3911 +#: builtin/clone.c:317

3912 #, c-format

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

3914 msgstr ""

3915

3809 -#: builtin/clone.c:327 builtin/diff.c:84

3916 +#: builtin/clone.c:319 builtin/diff.c:84

3917 #, c-format

3918 msgid "failed to stat '%s'"

3919 msgstr ""

3920

3814 -#: builtin/clone.c:329

3921 +#: builtin/clone.c:321

3922 #, c-format

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

3924 msgstr ""

3925

3819 -#: builtin/clone.c:343

3926 +#: builtin/clone.c:335

3927 #, c-format

3928 msgid "failed to stat %s\n"

3929 msgstr ""

3930

3824 -#: builtin/clone.c:365

3931 +#: builtin/clone.c:357

3932 #, c-format

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

3934 msgstr ""

3935

3829 -#: builtin/clone.c:369

3936 +#: builtin/clone.c:361

3937 #, c-format

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

3939 msgstr ""

3940

3834 -#: builtin/clone.c:392 builtin/clone.c:566

3941 +#: builtin/clone.c:384 builtin/clone.c:558

3942 #, c-format

3943 msgid "done.\n"

3944 msgstr ""

3945

3839 -#: builtin/clone.c:404

3946 +#: builtin/clone.c:396

3947 msgid ""

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

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

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

3951 msgstr ""

3952

3846 -#: builtin/clone.c:481

3953 +#: builtin/clone.c:473

3954 #, c-format

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

3956 msgstr ""

3957

3851 -#: builtin/clone.c:561

3958 +#: builtin/clone.c:553

3959 #, c-format

3960 msgid "Checking connectivity... "

3961 msgstr ""

3962

3856 -#: builtin/clone.c:564

3963 +#: builtin/clone.c:556

3964 msgid "remote did not send all necessary objects"

3965 msgstr ""

3966

3860 -#: builtin/clone.c:628

3967 +#: builtin/clone.c:620

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

3969 msgstr ""

3970

3864 -#: builtin/clone.c:659

3971 +#: builtin/clone.c:651

3972 msgid "unable to checkout working tree"

3973 msgstr ""

3974

3868 -#: builtin/clone.c:746

3975 +#: builtin/clone.c:738

3976 msgid "cannot repack to clean up"

3977 msgstr ""

3978

3872 -#: builtin/clone.c:748

3979 +#: builtin/clone.c:740

3980 msgid "cannot unlink temporary alternates file"

3981 msgstr ""

3982

3876 -#: builtin/clone.c:778

3983 +#: builtin/clone.c:770

3984 msgid "Too many arguments."

3985 msgstr ""

3986

3880 -#: builtin/clone.c:782

3987 +#: builtin/clone.c:774

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

3989 msgstr ""

3990

3884 -#: builtin/clone.c:793

3991 +#: builtin/clone.c:785

3992 #, c-format

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

3994 msgstr ""

3995

3889 -#: builtin/clone.c:796

3996 +#: builtin/clone.c:788

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

3998 msgstr ""

3999

3893 -#: builtin/clone.c:809

4000 +#: builtin/clone.c:801

4001 #, c-format

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

4003 msgstr ""

4004

3898 -#: builtin/clone.c:815 builtin/fetch.c:1156

4005 +#: builtin/clone.c:807 builtin/fetch.c:1160

4006 #, c-format

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

4008 msgstr ""

4009

3903 -#: builtin/clone.c:825

4010 +#: builtin/clone.c:817

4011 #, c-format

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

4013 msgstr ""

4014

3908 -#: builtin/clone.c:835

4015 +#: builtin/clone.c:827

4016 #, c-format

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

4018 msgstr ""

4019

3913 -#: builtin/clone.c:850 builtin/clone.c:861

3914 -#, c-format

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

3916 -msgstr ""

3917 -

3918 -#: builtin/clone.c:853

4020 +#: builtin/clone.c:845

4021 #, c-format

4022 msgid "could not create work tree dir '%s'"

4023 msgstr ""

4024

3923 -#: builtin/clone.c:871

4025 +#: builtin/clone.c:863

4026 #, c-format

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

4028 msgstr ""

4029

3928 -#: builtin/clone.c:873

4030 +#: builtin/clone.c:865

4031 #, c-format

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

4033 msgstr ""

4034

3933 -#: builtin/clone.c:898

4035 +#: builtin/clone.c:890

4036 msgid "--dissociate given, but there is no --reference"

4037 msgstr ""

4038

3937 -#: builtin/clone.c:913

4039 +#: builtin/clone.c:907

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

4041 msgstr ""

4042

3941 -#: builtin/clone.c:916

4043 +#: builtin/clone.c:910

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

4045 msgstr ""

4046

3945 -#: builtin/clone.c:921

4047 +#: builtin/clone.c:915

4048 msgid "--local is ignored"

4049 msgstr ""

4050

3949 -#: builtin/clone.c:925

4051 +#: builtin/clone.c:919

4052 #, c-format

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

4054 msgstr ""

4055

3954 -#: builtin/clone.c:976 builtin/clone.c:984

4056 +#: builtin/clone.c:968 builtin/clone.c:976

4057 #, c-format

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

4059 msgstr ""

4060

3959 -#: builtin/clone.c:987

4061 +#: builtin/clone.c:979

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

4063 msgstr ""

4064

@@ -4155,7 +4257,7 @@ msgstr ""

4257 msgid "could not read SQUASH_MSG"

4258 msgstr ""

4259

4158 -#: builtin/commit.c:738

4260 +#: builtin/commit.c:738 builtin/merge.c:1079

4261 #, c-format

4262 msgid "could not read '%s'"

4263 msgstr ""

@@ -4298,32 +4400,32 @@ msgstr ""

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

4401 msgstr ""

4402

4301 -#: builtin/commit.c:1324 builtin/commit.c:1604

4403 +#: builtin/commit.c:1324 builtin/commit.c:1603

4404 msgid "show status concisely"

4405 msgstr ""

4406

4305 -#: builtin/commit.c:1326 builtin/commit.c:1606

4407 +#: builtin/commit.c:1326 builtin/commit.c:1605

4408 msgid "show branch information"

4409 msgstr ""

4410

4309 -#: builtin/commit.c:1328 builtin/commit.c:1608 builtin/push.c:509

4411 +#: builtin/commit.c:1328 builtin/commit.c:1607 builtin/push.c:509

4412 msgid "machine-readable output"

4413 msgstr ""

4414

4313 -#: builtin/commit.c:1331 builtin/commit.c:1610

4415 +#: builtin/commit.c:1331 builtin/commit.c:1609

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

4417 msgstr ""

4418

4317 -#: builtin/commit.c:1334 builtin/commit.c:1613

4419 +#: builtin/commit.c:1334 builtin/commit.c:1612

4420 msgid "terminate entries with NUL"

4421 msgstr ""

4422

4321 -#: builtin/commit.c:1336 builtin/commit.c:1616 builtin/fast-export.c:980

4423 +#: builtin/commit.c:1336 builtin/commit.c:1615 builtin/fast-export.c:980

4424 #: builtin/fast-export.c:983 builtin/tag.c:603

4425 msgid "mode"

4426 msgstr ""

4427

4326 -#: builtin/commit.c:1337 builtin/commit.c:1616

4428 +#: builtin/commit.c:1337 builtin/commit.c:1615

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

4430 msgstr ""

4431

@@ -4331,7 +4433,7 @@ msgstr ""

4433 msgid "show ignored files"

4434 msgstr ""

4435

4334 -#: builtin/commit.c:1341 parse-options.h:153

4436 +#: builtin/commit.c:1341 parse-options.h:152

4437 msgid "when"

4438 msgstr ""

4439

@@ -4345,202 +4447,202 @@ msgstr ""

4447 msgid "list untracked files in columns"

4448 msgstr ""

4449

4348 -#: builtin/commit.c:1431

4450 +#: builtin/commit.c:1430

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

4452 msgstr ""

4453

4352 -#: builtin/commit.c:1433

4454 +#: builtin/commit.c:1432

4455 msgid "could not parse newly created commit"

4456 msgstr ""

4457

4356 -#: builtin/commit.c:1478

4458 +#: builtin/commit.c:1477

4459 msgid "detached HEAD"

4460 msgstr ""

4461

4360 -#: builtin/commit.c:1481

4462 +#: builtin/commit.c:1480

4463 msgid " (root-commit)"

4464 msgstr ""

4465

4364 -#: builtin/commit.c:1574

4466 +#: builtin/commit.c:1573

4467 msgid "suppress summary after successful commit"

4468 msgstr ""

4469

4368 -#: builtin/commit.c:1575

4470 +#: builtin/commit.c:1574

4471 msgid "show diff in commit message template"

4472 msgstr ""

4473

4372 -#: builtin/commit.c:1577

4474 +#: builtin/commit.c:1576

4475 msgid "Commit message options"

4476 msgstr ""

4477

4376 -#: builtin/commit.c:1578 builtin/tag.c:601

4478 +#: builtin/commit.c:1577 builtin/tag.c:601

4479 msgid "read message from file"

4480 msgstr ""

4481

4380 -#: builtin/commit.c:1579

4482 +#: builtin/commit.c:1578

4483 msgid "author"

4484 msgstr ""

4485

4384 -#: builtin/commit.c:1579

4486 +#: builtin/commit.c:1578

4487 msgid "override author for commit"

4488 msgstr ""

4489

4388 -#: builtin/commit.c:1580 builtin/gc.c:275

4490 +#: builtin/commit.c:1579 builtin/gc.c:280

4491 msgid "date"

4492 msgstr ""

4493

4392 -#: builtin/commit.c:1580

4494 +#: builtin/commit.c:1579

4495 msgid "override date for commit"

4496 msgstr ""

4497

4396 -#: builtin/commit.c:1581 builtin/merge.c:218 builtin/notes.c:391

4498 +#: builtin/commit.c:1580 builtin/merge.c:218 builtin/notes.c:391

4499 #: builtin/notes.c:554 builtin/tag.c:599

4500 msgid "message"

4501 msgstr ""

4502

4401 -#: builtin/commit.c:1581

4503 +#: builtin/commit.c:1580

4504 msgid "commit message"

4505 msgstr ""

4506

4405 -#: builtin/commit.c:1582

4507 +#: builtin/commit.c:1581

4508 msgid "reuse and edit message from specified commit"

4509 msgstr ""

4510

4409 -#: builtin/commit.c:1583

4511 +#: builtin/commit.c:1582

4512 msgid "reuse message from specified commit"

4513 msgstr ""

4514

4413 -#: builtin/commit.c:1584

4515 +#: builtin/commit.c:1583

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

4517 msgstr ""

4518

4417 -#: builtin/commit.c:1585

4519 +#: builtin/commit.c:1584

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

4521 msgstr ""

4522

4421 -#: builtin/commit.c:1586

4523 +#: builtin/commit.c:1585

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

4525 msgstr ""

4526

4425 -#: builtin/commit.c:1587 builtin/log.c:1191 builtin/revert.c:86

4527 +#: builtin/commit.c:1586 builtin/log.c:1191 builtin/revert.c:86

4528 msgid "add Signed-off-by:"

4529 msgstr ""

4530

4429 -#: builtin/commit.c:1588

4531 +#: builtin/commit.c:1587

4532 msgid "use specified template file"

4533 msgstr ""

4534

4433 -#: builtin/commit.c:1589

4535 +#: builtin/commit.c:1588

4536 msgid "force edit of commit"

4537 msgstr ""

4538

4437 -#: builtin/commit.c:1590

4539 +#: builtin/commit.c:1589

4540 msgid "default"

4541 msgstr ""

4542

4441 -#: builtin/commit.c:1590 builtin/tag.c:604

4543 +#: builtin/commit.c:1589 builtin/tag.c:604

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

4545 msgstr ""

4546

4445 -#: builtin/commit.c:1591

4547 +#: builtin/commit.c:1590

4548 msgid "include status in commit message template"

4549 msgstr ""

4550

4449 -#: builtin/commit.c:1592 builtin/merge.c:225 builtin/revert.c:92

4551 +#: builtin/commit.c:1591 builtin/merge.c:225 builtin/revert.c:92

4552 #: builtin/tag.c:605

4553 msgid "key-id"

4554 msgstr ""

4555

4454 -#: builtin/commit.c:1593 builtin/merge.c:226 builtin/revert.c:93

4556 +#: builtin/commit.c:1592 builtin/merge.c:226 builtin/revert.c:93

4557 msgid "GPG sign commit"

4558 msgstr ""

4559

4458 -#: builtin/commit.c:1596

4560 +#: builtin/commit.c:1595

4561 msgid "Commit contents options"

4562 msgstr ""

4563

4462 -#: builtin/commit.c:1597

4564 +#: builtin/commit.c:1596

4565 msgid "commit all changed files"

4566 msgstr ""

4567

4466 -#: builtin/commit.c:1598

4568 +#: builtin/commit.c:1597

4569 msgid "add specified files to index for commit"

4570 msgstr ""

4571

4470 -#: builtin/commit.c:1599

4572 +#: builtin/commit.c:1598

4573 msgid "interactively add files"

4574 msgstr ""

4575

4474 -#: builtin/commit.c:1600

4576 +#: builtin/commit.c:1599

4577 msgid "interactively add changes"

4578 msgstr ""

4579

4478 -#: builtin/commit.c:1601

4580 +#: builtin/commit.c:1600

4581 msgid "commit only specified files"

4582 msgstr ""

4583

4482 -#: builtin/commit.c:1602

4584 +#: builtin/commit.c:1601

4585 msgid "bypass pre-commit hook"

4586 msgstr ""

4587

4486 -#: builtin/commit.c:1603

4588 +#: builtin/commit.c:1602

4589 msgid "show what would be committed"

4590 msgstr ""

4591

4490 -#: builtin/commit.c:1614

4592 +#: builtin/commit.c:1613

4593 msgid "amend previous commit"

4594 msgstr ""

4595

4494 -#: builtin/commit.c:1615

4596 +#: builtin/commit.c:1614

4597 msgid "bypass post-rewrite hook"

4598 msgstr ""

4599

4498 -#: builtin/commit.c:1620

4600 +#: builtin/commit.c:1619

4601 msgid "ok to record an empty change"

4602 msgstr ""

4603

4502 -#: builtin/commit.c:1622

4604 +#: builtin/commit.c:1621

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

4606 msgstr ""

4607

4506 -#: builtin/commit.c:1651

4608 +#: builtin/commit.c:1650

4609 msgid "could not parse HEAD commit"

4610 msgstr ""

4611

4510 -#: builtin/commit.c:1690 builtin/merge.c:519

4612 +#: builtin/commit.c:1689 builtin/merge.c:1076

4613 #, c-format

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

4615 msgstr ""

4616

4515 -#: builtin/commit.c:1697

4617 +#: builtin/commit.c:1696

4618 #, c-format

4619 msgid "Corrupt MERGE_HEAD file (%s)"

4620 msgstr ""

4621

4520 -#: builtin/commit.c:1704

4622 +#: builtin/commit.c:1703

4623 msgid "could not read MERGE_MODE"

4624 msgstr ""

4625

4524 -#: builtin/commit.c:1723

4626 +#: builtin/commit.c:1722

4627 #, c-format

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

4629 msgstr ""

4630

4529 -#: builtin/commit.c:1734

4631 +#: builtin/commit.c:1733

4632 #, c-format

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

4634 msgstr ""

4635

4534 -#: builtin/commit.c:1739

4636 +#: builtin/commit.c:1738

4637 #, c-format

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

4639 msgstr ""

4640

4539 -#: builtin/commit.c:1754 builtin/merge.c:851 builtin/merge.c:876

4641 +#: builtin/commit.c:1753 builtin/merge.c:829 builtin/merge.c:854

4642 msgid "failed to write commit object"

4643 msgstr ""

4644

4543 -#: builtin/commit.c:1787

4645 +#: builtin/commit.c:1786

4646 msgid ""

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

4648 "new_index file. Check that disk is not full and quota is\n"

@@ -4679,13 +4781,13 @@ msgstr ""

4781 #, c-format

4782 msgid ""

4783 "# This is Git's per-user configuration file.\n"

4682 -"[core]\n"

4784 +"[user]\n"

4785 "# Please adapt and uncomment the following lines:\n"

4684 -"#\tuser = %s\n"

4786 +"#\tname = %s\n"

4787 "#\temail = %s\n"

4788 msgstr ""

4789

4688 -#: builtin/config.c:589

4790 +#: builtin/config.c:587

4791 #, c-format

4792 msgid "cannot create configuration file %s"

4793 msgstr ""

@@ -5009,167 +5111,167 @@ msgstr ""

5111 msgid "specify fetch refmap"

5112 msgstr ""

5113

5012 -#: builtin/fetch.c:375

5114 +#: builtin/fetch.c:377

5115 msgid "Couldn't find remote ref HEAD"

5116 msgstr ""

5117

5016 -#: builtin/fetch.c:455

5118 +#: builtin/fetch.c:457

5119 #, c-format

5120 msgid "object %s not found"

5121 msgstr ""

5122

5021 -#: builtin/fetch.c:460

5123 +#: builtin/fetch.c:462

5124 msgid "[up to date]"

5125 msgstr ""

5126

5025 -#: builtin/fetch.c:474

5127 +#: builtin/fetch.c:476

5128 #, c-format

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

5130 msgstr ""

5131

5030 -#: builtin/fetch.c:475 builtin/fetch.c:561

5132 +#: builtin/fetch.c:477 builtin/fetch.c:563

5133 msgid "[rejected]"

5134 msgstr ""

5135

5034 -#: builtin/fetch.c:486

5136 +#: builtin/fetch.c:488

5137 msgid "[tag update]"

5138 msgstr ""

5139

5038 -#: builtin/fetch.c:488 builtin/fetch.c:523 builtin/fetch.c:541

5140 +#: builtin/fetch.c:490 builtin/fetch.c:525 builtin/fetch.c:543

5141 msgid " (unable to update local ref)"

5142 msgstr ""

5143

5042 -#: builtin/fetch.c:506

5144 +#: builtin/fetch.c:508

5145 msgid "[new tag]"

5146 msgstr ""

5147

5046 -#: builtin/fetch.c:509

5148 +#: builtin/fetch.c:511

5149 msgid "[new branch]"

5150 msgstr ""

5151

5050 -#: builtin/fetch.c:512

5152 +#: builtin/fetch.c:514

5153 msgid "[new ref]"

5154 msgstr ""

5155

5054 -#: builtin/fetch.c:557

5156 +#: builtin/fetch.c:559

5157 msgid "unable to update local ref"

5158 msgstr ""

5159

5058 -#: builtin/fetch.c:557

5160 +#: builtin/fetch.c:559

5161 msgid "forced update"

5162 msgstr ""

5163

5062 -#: builtin/fetch.c:563

5164 +#: builtin/fetch.c:565

5165 msgid "(non-fast-forward)"

5166 msgstr ""

5167

5066 -#: builtin/fetch.c:596 builtin/fetch.c:829

5168 +#: builtin/fetch.c:599 builtin/fetch.c:832

5169 #, c-format

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

5171 msgstr ""

5172

5071 -#: builtin/fetch.c:605

5173 +#: builtin/fetch.c:608

5174 #, c-format

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

5176 msgstr ""

5177

5076 -#: builtin/fetch.c:623

5178 +#: builtin/fetch.c:626

5179 #, c-format

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

5181 msgstr ""

5182

5081 -#: builtin/fetch.c:711 builtin/fetch.c:794

5183 +#: builtin/fetch.c:714 builtin/fetch.c:797

5184 #, c-format

5185 msgid "From %.*s\n"

5186 msgstr ""

5187

5086 -#: builtin/fetch.c:722

5188 +#: builtin/fetch.c:725

5189 #, c-format

5190 msgid ""

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

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

5193 msgstr ""

5194

5093 -#: builtin/fetch.c:774

5195 +#: builtin/fetch.c:777

5196 #, c-format

5197 msgid " (%s will become dangling)"

5198 msgstr ""

5199

5098 -#: builtin/fetch.c:775

5200 +#: builtin/fetch.c:778

5201 #, c-format

5202 msgid " (%s has become dangling)"

5203 msgstr ""

5204

5103 -#: builtin/fetch.c:799

5205 +#: builtin/fetch.c:802

5206 msgid "[deleted]"

5207 msgstr ""

5208

5107 -#: builtin/fetch.c:800 builtin/remote.c:1060

5209 +#: builtin/fetch.c:803 builtin/remote.c:1057

5210 msgid "(none)"

5211 msgstr ""

5212

5111 -#: builtin/fetch.c:819

5213 +#: builtin/fetch.c:822

5214 #, c-format

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

5216 msgstr ""

5217

5116 -#: builtin/fetch.c:838

5218 +#: builtin/fetch.c:841

5219 #, c-format

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

5221 msgstr ""

5222

5121 -#: builtin/fetch.c:841

5223 +#: builtin/fetch.c:844

5224 #, c-format

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

5226 msgstr ""

5227

5126 -#: builtin/fetch.c:897

5228 +#: builtin/fetch.c:900

5229 #, c-format

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

5231 msgstr ""

5232

5131 -#: builtin/fetch.c:1059

5233 +#: builtin/fetch.c:1063

5234 #, c-format

5235 msgid "Fetching %s\n"

5236 msgstr ""

5237

5136 -#: builtin/fetch.c:1061 builtin/remote.c:90

5238 +#: builtin/fetch.c:1065 builtin/remote.c:90

5239 #, c-format

5240 msgid "Could not fetch %s"

5241 msgstr ""

5242

5141 -#: builtin/fetch.c:1079

5243 +#: builtin/fetch.c:1083

5244 msgid ""

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

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

5247 msgstr ""

5248

5147 -#: builtin/fetch.c:1102

5249 +#: builtin/fetch.c:1106

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

5251 msgstr ""

5252

5151 -#: builtin/fetch.c:1144

5253 +#: builtin/fetch.c:1148

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

5255 msgstr ""

5256

5155 -#: builtin/fetch.c:1146

5257 +#: builtin/fetch.c:1150

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

5259 msgstr ""

5260

5159 -#: builtin/fetch.c:1169

5261 +#: builtin/fetch.c:1173

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

5263 msgstr ""

5264

5163 -#: builtin/fetch.c:1171

5265 +#: builtin/fetch.c:1175

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

5267 msgstr ""

5268

5167 -#: builtin/fetch.c:1182

5269 +#: builtin/fetch.c:1186

5270 #, c-format

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

5272 msgstr ""

5273

5172 -#: builtin/fetch.c:1190

5274 +#: builtin/fetch.c:1194

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

5276 msgstr ""

5277

@@ -5178,130 +5280,130 @@ msgid ""

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

5281 msgstr ""

5282

5181 -#: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698

5283 +#: builtin/fmt-merge-msg.c:668 builtin/fmt-merge-msg.c:671 builtin/grep.c:698

5284 #: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182

5183 -#: builtin/show-branch.c:657 builtin/show-ref.c:178 builtin/tag.c:590

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

5285 +#: builtin/show-branch.c:664 builtin/show-ref.c:180 builtin/tag.c:590

5286 +#: parse-options.h:131 parse-options.h:238

5287 msgid "n"

5288 msgstr ""

5289

5188 -#: builtin/fmt-merge-msg.c:663

5290 +#: builtin/fmt-merge-msg.c:669

5291 msgid "populate log with at most <n> entries from shortlog"

5292 msgstr ""

5293

5192 -#: builtin/fmt-merge-msg.c:666

5294 +#: builtin/fmt-merge-msg.c:672

5295 msgid "alias for --log (deprecated)"

5296 msgstr ""

5297

5196 -#: builtin/fmt-merge-msg.c:669

5298 +#: builtin/fmt-merge-msg.c:675

5299 msgid "text"

5300 msgstr ""

5301

5200 -#: builtin/fmt-merge-msg.c:670

5302 +#: builtin/fmt-merge-msg.c:676

5303 msgid "use <text> as start of message"

5304 msgstr ""

5305

5204 -#: builtin/fmt-merge-msg.c:671

5306 +#: builtin/fmt-merge-msg.c:677

5307 msgid "file to read from"

5308 msgstr ""

5309

5208 -#: builtin/for-each-ref.c:675

5310 +#: builtin/for-each-ref.c:687

5311 msgid "unable to parse format"

5312 msgstr ""

5313

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

5314 +#: builtin/for-each-ref.c:1083

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

5316 msgstr ""

5317

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

5318 +#: builtin/for-each-ref.c:1098

5319 msgid "quote placeholders suitably for shells"

5320 msgstr ""

5321

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

5322 +#: builtin/for-each-ref.c:1100

5323 msgid "quote placeholders suitably for perl"

5324 msgstr ""

5325

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

5326 +#: builtin/for-each-ref.c:1102

5327 msgid "quote placeholders suitably for python"

5328 msgstr ""

5329

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

5330 +#: builtin/for-each-ref.c:1104

5331 msgid "quote placeholders suitably for Tcl"

5332 msgstr ""

5333

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

5334 +#: builtin/for-each-ref.c:1107

5335 msgid "show only <n> matched refs"

5336 msgstr ""

5337

5236 -#: builtin/for-each-ref.c:1088 builtin/replace.c:438

5338 +#: builtin/for-each-ref.c:1108 builtin/replace.c:438

5339 msgid "format"

5340 msgstr ""

5341

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

5342 +#: builtin/for-each-ref.c:1108

5343 msgid "format to use for the output"

5344 msgstr ""

5345

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

5346 +#: builtin/for-each-ref.c:1109

5347 msgid "key"

5348 msgstr ""

5349

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

5350 +#: builtin/for-each-ref.c:1110

5351 msgid "field name to sort on"

5352 msgstr ""

5353

5252 -#: builtin/fsck.c:147 builtin/prune.c:137

5354 +#: builtin/fsck.c:147 builtin/prune.c:236

5355 msgid "Checking connectivity"

5356 msgstr ""

5357

5256 -#: builtin/fsck.c:540

5358 +#: builtin/fsck.c:548

5359 msgid "Checking object directories"

5360 msgstr ""

5361

5260 -#: builtin/fsck.c:603

5362 +#: builtin/fsck.c:611

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

5364 msgstr ""

5365

5264 -#: builtin/fsck.c:609

5366 +#: builtin/fsck.c:617

5367 msgid "show unreachable objects"

5368 msgstr ""

5369

5268 -#: builtin/fsck.c:610

5370 +#: builtin/fsck.c:618

5371 msgid "show dangling objects"

5372 msgstr ""

5373

5272 -#: builtin/fsck.c:611

5374 +#: builtin/fsck.c:619

5375 msgid "report tags"

5376 msgstr ""

5377

5276 -#: builtin/fsck.c:612

5378 +#: builtin/fsck.c:620

5379 msgid "report root nodes"

5380 msgstr ""

5381

5280 -#: builtin/fsck.c:613

5382 +#: builtin/fsck.c:621

5383 msgid "make index objects head nodes"

5384 msgstr ""

5385

5284 -#: builtin/fsck.c:614

5386 +#: builtin/fsck.c:622

5387 msgid "make reflogs head nodes (default)"

5388 msgstr ""

5389

5288 -#: builtin/fsck.c:615

5390 +#: builtin/fsck.c:623

5391 msgid "also consider packs and alternate objects"

5392 msgstr ""

5393

5292 -#: builtin/fsck.c:616

5394 +#: builtin/fsck.c:624

5395 msgid "enable more strict checking"

5396 msgstr ""

5397

5296 -#: builtin/fsck.c:618

5398 +#: builtin/fsck.c:626

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

5400 msgstr ""

5401

5300 -#: builtin/fsck.c:619 builtin/prune.c:108

5402 +#: builtin/fsck.c:627 builtin/prune.c:198

5403 msgid "show progress"

5404 msgstr ""

5405

5304 -#: builtin/fsck.c:669

5406 +#: builtin/fsck.c:677

5407 msgid "Checking objects"

5408 msgstr ""

5409

@@ -5309,54 +5411,54 @@ msgstr ""

5411 msgid "git gc [<options>]"

5412 msgstr ""

5413

5312 -#: builtin/gc.c:79

5414 +#: builtin/gc.c:67

5415 #, c-format

5314 -msgid "Invalid gc.pruneexpire: '%s'"

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

5417 msgstr ""

5418

5317 -#: builtin/gc.c:107

5419 +#: builtin/gc.c:112

5420 #, c-format

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

5422 msgstr ""

5423

5322 -#: builtin/gc.c:276

5424 +#: builtin/gc.c:281

5425 msgid "prune unreferenced objects"

5426 msgstr ""

5427

5326 -#: builtin/gc.c:278

5428 +#: builtin/gc.c:283

5429 msgid "be more thorough (increased runtime)"

5430 msgstr ""

5431

5330 -#: builtin/gc.c:279

5432 +#: builtin/gc.c:284

5433 msgid "enable auto-gc mode"

5434 msgstr ""

5435

5334 -#: builtin/gc.c:280

5436 +#: builtin/gc.c:285

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

5438 msgstr ""

5439

5338 -#: builtin/gc.c:321

5440 +#: builtin/gc.c:327

5441 #, c-format

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

5443 msgstr ""

5444

5343 -#: builtin/gc.c:323

5445 +#: builtin/gc.c:329

5446 #, c-format

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

5448 msgstr ""

5449

5348 -#: builtin/gc.c:324

5450 +#: builtin/gc.c:330

5451 #, c-format

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

5453 msgstr ""

5454

5353 -#: builtin/gc.c:342

5455 +#: builtin/gc.c:348

5456 #, c-format

5457 msgid ""

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

5459 msgstr ""

5460

5359 -#: builtin/gc.c:364

5461 +#: builtin/gc.c:376

5462 msgid ""

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

5464 msgstr ""

@@ -5558,7 +5660,7 @@ msgstr ""

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

5661 msgstr ""

5662

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

5663 +#: builtin/grep.c:741 builtin/show-ref.c:189

5664 msgid "show usage"

5665 msgstr ""

5666

@@ -5586,42 +5688,42 @@ msgstr ""

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

5689 msgstr ""

5690

5589 -#: builtin/hash-object.c:82

5691 +#: builtin/hash-object.c:80

5692 msgid ""

5693 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "

5694 "[--] <file>..."

5695 msgstr ""

5696

5595 -#: builtin/hash-object.c:83

5697 +#: builtin/hash-object.c:81

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

5699 msgstr ""

5700

5599 -#: builtin/hash-object.c:94 builtin/tag.c:612

5701 +#: builtin/hash-object.c:92 builtin/tag.c:612

5702 msgid "type"

5703 msgstr ""

5704

5603 -#: builtin/hash-object.c:94

5705 +#: builtin/hash-object.c:92

5706 msgid "object type"

5707 msgstr ""

5708

5607 -#: builtin/hash-object.c:95

5709 +#: builtin/hash-object.c:93

5710 msgid "write the object into the object database"

5711 msgstr ""

5712

5611 -#: builtin/hash-object.c:97

5713 +#: builtin/hash-object.c:95

5714 msgid "read the object from stdin"

5715 msgstr ""

5716

5615 -#: builtin/hash-object.c:99

5717 +#: builtin/hash-object.c:97

5718 msgid "store file as is without filters"

5719 msgstr ""

5720

5619 -#: builtin/hash-object.c:100

5721 +#: builtin/hash-object.c:98

5722 msgid ""

5723 "just hash any random garbage to create corrupt objects for debugging Git"

5724 msgstr ""

5725

5624 -#: builtin/hash-object.c:101

5726 +#: builtin/hash-object.c:99

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

5728 msgstr ""

5729

@@ -5745,291 +5847,291 @@ msgstr ""

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

5848 msgstr ""

5849

5748 -#: builtin/index-pack.c:150

5850 +#: builtin/index-pack.c:151

5851 #, c-format

5852 msgid "unable to open %s"

5853 msgstr ""

5854

5753 -#: builtin/index-pack.c:200

5855 +#: builtin/index-pack.c:201

5856 #, c-format

5857 msgid "object type mismatch at %s"

5858 msgstr ""

5859

5758 -#: builtin/index-pack.c:220

5860 +#: builtin/index-pack.c:221

5861 #, c-format

5862 msgid "did not receive expected object %s"

5863 msgstr ""

5864

5763 -#: builtin/index-pack.c:223

5865 +#: builtin/index-pack.c:224

5866 #, c-format

5867 msgid "object %s: expected type %s, found %s"

5868 msgstr ""

5869

5768 -#: builtin/index-pack.c:265

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

5871 #, c-format

5872 msgid "cannot fill %d byte"

5873 msgid_plural "cannot fill %d bytes"

5874 msgstr[0] ""

5875 msgstr[1] ""

5876

5775 -#: builtin/index-pack.c:275

5877 +#: builtin/index-pack.c:276

5878 msgid "early EOF"

5879 msgstr ""

5880

5779 -#: builtin/index-pack.c:276

5881 +#: builtin/index-pack.c:277

5882 msgid "read error on input"

5883 msgstr ""

5884

5783 -#: builtin/index-pack.c:288

5885 +#: builtin/index-pack.c:289

5886 msgid "used more bytes than were available"

5887 msgstr ""

5888

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

5889 +#: builtin/index-pack.c:296

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

5891 msgstr ""

5892

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

5893 +#: builtin/index-pack.c:312

5894 #, c-format

5895 msgid "unable to create '%s'"

5896 msgstr ""

5897

5796 -#: builtin/index-pack.c:316

5898 +#: builtin/index-pack.c:317

5899 #, c-format

5900 msgid "cannot open packfile '%s'"

5901 msgstr ""

5902

5801 -#: builtin/index-pack.c:330

5903 +#: builtin/index-pack.c:331

5904 msgid "pack signature mismatch"

5905 msgstr ""

5906

5805 -#: builtin/index-pack.c:332

5907 +#: builtin/index-pack.c:333

5908 #, c-format

5909 msgid "pack version %<PRIu32> unsupported"

5910 msgstr ""

5911

5810 -#: builtin/index-pack.c:350

5912 +#: builtin/index-pack.c:351

5913 #, c-format

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

5915 msgstr ""

5916

5815 -#: builtin/index-pack.c:471

5917 +#: builtin/index-pack.c:472

5918 #, c-format

5919 msgid "inflate returned %d"

5920 msgstr ""

5921

5820 -#: builtin/index-pack.c:520

5922 +#: builtin/index-pack.c:521

5923 msgid "offset value overflow for delta base object"

5924 msgstr ""

5925

5824 -#: builtin/index-pack.c:528

5926 +#: builtin/index-pack.c:529

5927 msgid "delta base offset is out of bound"

5928 msgstr ""

5929

5828 -#: builtin/index-pack.c:536

5930 +#: builtin/index-pack.c:537

5931 #, c-format

5932 msgid "unknown object type %d"

5933 msgstr ""

5934

5833 -#: builtin/index-pack.c:567

5935 +#: builtin/index-pack.c:568

5936 msgid "cannot pread pack file"

5937 msgstr ""

5938

5837 -#: builtin/index-pack.c:569

5939 +#: builtin/index-pack.c:570

5940 #, c-format

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

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

5943 msgstr[0] ""

5944 msgstr[1] ""

5945

5844 -#: builtin/index-pack.c:595

5946 +#: builtin/index-pack.c:596

5947 msgid "serious inflate inconsistency"

5948 msgstr ""

5949

5848 -#: builtin/index-pack.c:686 builtin/index-pack.c:692 builtin/index-pack.c:715

5849 -#: builtin/index-pack.c:749 builtin/index-pack.c:758

5950 +#: builtin/index-pack.c:742 builtin/index-pack.c:748 builtin/index-pack.c:771

5951 +#: builtin/index-pack.c:805 builtin/index-pack.c:814

5952 #, c-format

5953 msgid "SHA1 COLLISION FOUND WITH %s !"

5954 msgstr ""

5955

5854 -#: builtin/index-pack.c:689 builtin/pack-objects.c:162

5956 +#: builtin/index-pack.c:745 builtin/pack-objects.c:162

5957 #: builtin/pack-objects.c:254

5958 #, c-format

5959 msgid "unable to read %s"

5960 msgstr ""

5961

5860 -#: builtin/index-pack.c:755

5962 +#: builtin/index-pack.c:811

5963 #, c-format

5964 msgid "cannot read existing object %s"

5965 msgstr ""

5966

5865 -#: builtin/index-pack.c:769

5967 +#: builtin/index-pack.c:825

5968 #, c-format

5969 msgid "invalid blob object %s"

5970 msgstr ""

5971

5870 -#: builtin/index-pack.c:783

5972 +#: builtin/index-pack.c:839

5973 #, c-format

5974 msgid "invalid %s"

5975 msgstr ""

5976

5875 -#: builtin/index-pack.c:787

5977 +#: builtin/index-pack.c:843

5978 msgid "Error in object"

5979 msgstr ""

5980

5879 -#: builtin/index-pack.c:789

5981 +#: builtin/index-pack.c:845

5982 #, c-format

5983 msgid "Not all child objects of %s are reachable"

5984 msgstr ""

5985

5884 -#: builtin/index-pack.c:861 builtin/index-pack.c:890

5986 +#: builtin/index-pack.c:917 builtin/index-pack.c:948

5987 msgid "failed to apply delta"

5988 msgstr ""

5989

5888 -#: builtin/index-pack.c:1055

5990 +#: builtin/index-pack.c:1118

5991 msgid "Receiving objects"

5992 msgstr ""

5993

5892 -#: builtin/index-pack.c:1055

5994 +#: builtin/index-pack.c:1118

5995 msgid "Indexing objects"

5996 msgstr ""

5997

5896 -#: builtin/index-pack.c:1081

5998 +#: builtin/index-pack.c:1150

5999 msgid "pack is corrupted (SHA1 mismatch)"

6000 msgstr ""

6001

5900 -#: builtin/index-pack.c:1086

6002 +#: builtin/index-pack.c:1155

6003 msgid "cannot fstat packfile"

6004 msgstr ""

6005

5904 -#: builtin/index-pack.c:1089

6006 +#: builtin/index-pack.c:1158

6007 msgid "pack has junk at the end"

6008 msgstr ""

6009

5908 -#: builtin/index-pack.c:1100

6010 +#: builtin/index-pack.c:1169

6011 msgid "confusion beyond insanity in parse_pack_objects()"

6012 msgstr ""

6013

5912 -#: builtin/index-pack.c:1123

6014 +#: builtin/index-pack.c:1194

6015 msgid "Resolving deltas"

6016 msgstr ""

6017

5916 -#: builtin/index-pack.c:1133

6018 +#: builtin/index-pack.c:1205

6019 #, c-format

6020 msgid "unable to create thread: %s"

6021 msgstr ""

6022

5921 -#: builtin/index-pack.c:1175

6023 +#: builtin/index-pack.c:1247

6024 msgid "confusion beyond insanity"

6025 msgstr ""

6026

5925 -#: builtin/index-pack.c:1181

6027 +#: builtin/index-pack.c:1253

6028 #, c-format

6029 msgid "completed with %d local objects"

6030 msgstr ""

6031

5930 -#: builtin/index-pack.c:1191

6032 +#: builtin/index-pack.c:1263

6033 #, c-format

6034 msgid "Unexpected tail checksum for %s (disk corruption?)"

6035 msgstr ""

6036

5935 -#: builtin/index-pack.c:1195

6037 +#: builtin/index-pack.c:1267

6038 #, c-format

6039 msgid "pack has %d unresolved delta"

6040 msgid_plural "pack has %d unresolved deltas"

6041 msgstr[0] ""

6042 msgstr[1] ""

6043

5942 -#: builtin/index-pack.c:1219

6044 +#: builtin/index-pack.c:1291

6045 #, c-format

6046 msgid "unable to deflate appended object (%d)"

6047 msgstr ""

6048

5947 -#: builtin/index-pack.c:1298

6049 +#: builtin/index-pack.c:1367

6050 #, c-format

6051 msgid "local object %s is corrupt"

6052 msgstr ""

6053

5952 -#: builtin/index-pack.c:1322

6054 +#: builtin/index-pack.c:1391

6055 msgid "error while closing pack file"

6056 msgstr ""

6057

5956 -#: builtin/index-pack.c:1335

6058 +#: builtin/index-pack.c:1404

6059 #, c-format

6060 msgid "cannot write keep file '%s'"

6061 msgstr ""

6062

5961 -#: builtin/index-pack.c:1343

6063 +#: builtin/index-pack.c:1412

6064 #, c-format

6065 msgid "cannot close written keep file '%s'"

6066 msgstr ""

6067

5966 -#: builtin/index-pack.c:1356

6068 +#: builtin/index-pack.c:1425

6069 msgid "cannot store pack file"

6070 msgstr ""

6071

5970 -#: builtin/index-pack.c:1367

6072 +#: builtin/index-pack.c:1436

6073 msgid "cannot store index file"

6074 msgstr ""

6075

5974 -#: builtin/index-pack.c:1400

6076 +#: builtin/index-pack.c:1469

6077 #, c-format

6078 msgid "bad pack.indexversion=%<PRIu32>"

6079 msgstr ""

6080

5979 -#: builtin/index-pack.c:1406

6081 +#: builtin/index-pack.c:1475

6082 #, c-format

6083 msgid "invalid number of threads specified (%d)"

6084 msgstr ""

6085

5984 -#: builtin/index-pack.c:1410 builtin/index-pack.c:1589

6086 +#: builtin/index-pack.c:1479 builtin/index-pack.c:1658

6087 #, c-format

6088 msgid "no threads support, ignoring %s"

6089 msgstr ""

6090

5989 -#: builtin/index-pack.c:1468

6091 +#: builtin/index-pack.c:1537

6092 #, c-format

6093 msgid "Cannot open existing pack file '%s'"

6094 msgstr ""

6095

5994 -#: builtin/index-pack.c:1470

6096 +#: builtin/index-pack.c:1539

6097 #, c-format

6098 msgid "Cannot open existing pack idx file for '%s'"

6099 msgstr ""

6100

5999 -#: builtin/index-pack.c:1517

6101 +#: builtin/index-pack.c:1586

6102 #, c-format

6103 msgid "non delta: %d object"

6104 msgid_plural "non delta: %d objects"

6105 msgstr[0] ""

6106 msgstr[1] ""

6107

6006 -#: builtin/index-pack.c:1524

6108 +#: builtin/index-pack.c:1593

6109 #, c-format

6110 msgid "chain length = %d: %lu object"

6111 msgid_plural "chain length = %d: %lu objects"

6112 msgstr[0] ""

6113 msgstr[1] ""

6114

6013 -#: builtin/index-pack.c:1553

6115 +#: builtin/index-pack.c:1622

6116 msgid "Cannot come back to cwd"

6117 msgstr ""

6118

6017 -#: builtin/index-pack.c:1601 builtin/index-pack.c:1604

6018 -#: builtin/index-pack.c:1616 builtin/index-pack.c:1620

6119 +#: builtin/index-pack.c:1670 builtin/index-pack.c:1673

6120 +#: builtin/index-pack.c:1685 builtin/index-pack.c:1689

6121 #, c-format

6122 msgid "bad %s"

6123 msgstr ""

6124

6023 -#: builtin/index-pack.c:1634

6125 +#: builtin/index-pack.c:1703

6126 msgid "--fix-thin cannot be used without --stdin"

6127 msgstr ""

6128

6027 -#: builtin/index-pack.c:1638 builtin/index-pack.c:1647

6129 +#: builtin/index-pack.c:1707 builtin/index-pack.c:1716

6130 #, c-format

6131 msgid "packfile name '%s' does not end with '.pack'"

6132 msgstr ""

6133

6032 -#: builtin/index-pack.c:1655

6134 +#: builtin/index-pack.c:1724

6135 msgid "--verify with no packfile name given"

6136 msgstr ""

6137

@@ -6098,22 +6200,22 @@ msgstr ""

6200 msgid "not copying templates of a wrong format version %d from '%s'"

6201 msgstr ""

6202

6101 -#: builtin/init-db.c:197

6203 +#: builtin/init-db.c:211

6204 #, c-format

6205 msgid "insane git directory %s"

6206 msgstr ""

6207

6106 -#: builtin/init-db.c:331 builtin/init-db.c:334

6208 +#: builtin/init-db.c:343 builtin/init-db.c:346

6209 #, c-format

6210 msgid "%s already exists"

6211 msgstr ""

6212

6111 -#: builtin/init-db.c:363

6213 +#: builtin/init-db.c:374

6214 #, c-format

6215 msgid "unable to handle file type %d"

6216 msgstr ""

6217

6116 -#: builtin/init-db.c:366

6218 +#: builtin/init-db.c:377

6219 #, c-format

6220 msgid "unable to move %s to %s"

6221 msgstr ""

@@ -6121,59 +6223,59 @@ msgstr ""

6223 #. TRANSLATORS: The first '%s' is either "Reinitialized

6224 #. existing" or "Initialized empty", the second " shared" or

6225 #. "", and the last '%s%s' is the verbatim directory name.

6124 -#: builtin/init-db.c:426

6226 +#: builtin/init-db.c:433

6227 #, c-format

6228 msgid "%s%s Git repository in %s%s\n"

6229 msgstr ""

6230

6129 -#: builtin/init-db.c:427

6231 +#: builtin/init-db.c:434

6232 msgid "Reinitialized existing"

6233 msgstr ""

6234

6133 -#: builtin/init-db.c:427

6235 +#: builtin/init-db.c:434

6236 msgid "Initialized empty"

6237 msgstr ""

6238

6137 -#: builtin/init-db.c:428

6239 +#: builtin/init-db.c:435

6240 msgid " shared"

6241 msgstr ""

6242

6141 -#: builtin/init-db.c:475

6243 +#: builtin/init-db.c:482

6244 msgid ""

6245 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"

6246 "shared[=<permissions>]] [<directory>]"

6247 msgstr ""

6248

6147 -#: builtin/init-db.c:498

6249 +#: builtin/init-db.c:505

6250 msgid "permissions"

6251 msgstr ""

6252

6151 -#: builtin/init-db.c:499

6253 +#: builtin/init-db.c:506

6254 msgid "specify that the git repository is to be shared amongst several users"

6255 msgstr ""

6256

6155 -#: builtin/init-db.c:501 builtin/prune-packed.c:57 builtin/repack.c:171

6257 +#: builtin/init-db.c:508 builtin/prune-packed.c:57 builtin/repack.c:171

6258 msgid "be quiet"

6259 msgstr ""

6260

6159 -#: builtin/init-db.c:533 builtin/init-db.c:538

6261 +#: builtin/init-db.c:540 builtin/init-db.c:545

6262 #, c-format

6263 msgid "cannot mkdir %s"

6264 msgstr ""

6265

6164 -#: builtin/init-db.c:542

6266 +#: builtin/init-db.c:549

6267 #, c-format

6268 msgid "cannot chdir to %s"

6269 msgstr ""

6270

6169 -#: builtin/init-db.c:563

6271 +#: builtin/init-db.c:570

6272 #, c-format

6273 msgid ""

6274 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"

6275 "dir=<directory>)"

6276 msgstr ""

6277

6176 -#: builtin/init-db.c:591

6278 +#: builtin/init-db.c:598

6279 #, c-format

6280 msgid "Cannot access work tree '%s'"

6281 msgstr ""

@@ -6197,7 +6299,7 @@ msgid "trailer(s) to add"

6299 msgstr ""

6300

6301 #: builtin/log.c:41

6200 -msgid "git log [<options>] [<revision range>] [[--] <path>...]"

6302 +msgid "git log [<options>] [<revision-range>] [[--] <path>...]"

6303 msgstr ""

6304

6305 #: builtin/log.c:42

@@ -6266,7 +6368,7 @@ msgstr ""

6368 msgid "Need exactly one range."

6369 msgstr ""

6370

6269 -#: builtin/log.c:811

6371 +#: builtin/log.c:813

6372 msgid "Not a range."

6373 msgstr ""

6374

@@ -6466,13 +6568,13 @@ msgstr ""

6568 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"

6569 msgstr ""

6570

6469 -#: builtin/log.c:1638

6571 +#: builtin/log.c:1637

6572 #, c-format

6573 msgid ""

6574 "Could not find a tracked remote branch, please specify <upstream> manually.\n"

6575 msgstr ""

6576

6475 -#: builtin/log.c:1651 builtin/log.c:1653 builtin/log.c:1665

6577 +#: builtin/log.c:1648 builtin/log.c:1650 builtin/log.c:1662

6578 #, c-format

6579 msgid "Unknown commit %s"

6580 msgstr ""

@@ -6744,40 +6846,40 @@ msgstr ""

6846 msgid "'%s' does not point to a commit"

6847 msgstr ""

6848

6747 -#: builtin/merge.c:559

6849 +#: builtin/merge.c:537

6850 #, c-format

6851 msgid "Bad branch.%s.mergeoptions string: %s"

6852 msgstr ""

6853

6752 -#: builtin/merge.c:654

6854 +#: builtin/merge.c:632

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

6856 msgstr ""

6857

6756 -#: builtin/merge.c:678

6858 +#: builtin/merge.c:656

6859 msgid "Not handling anything other than two heads merge."

6860 msgstr ""

6861

6760 -#: builtin/merge.c:692

6862 +#: builtin/merge.c:670

6863 #, c-format

6864 msgid "Unknown option for merge-recursive: -X%s"

6865 msgstr ""

6866

6765 -#: builtin/merge.c:705

6867 +#: builtin/merge.c:683

6868 #, c-format

6869 msgid "unable to write %s"

6870 msgstr ""

6871

6770 -#: builtin/merge.c:794

6872 +#: builtin/merge.c:772

6873 #, c-format

6874 msgid "Could not read from '%s'"

6875 msgstr ""

6876

6775 -#: builtin/merge.c:803

6877 +#: builtin/merge.c:781

6878 #, c-format

6879 msgid "Not committing merge; use 'git commit' to complete the merge.\n"

6880 msgstr ""

6881

6780 -#: builtin/merge.c:809

6882 +#: builtin/merge.c:787

6883 #, c-format

6884 msgid ""

6885 "Please enter a commit message to explain why this merge is necessary,\n"

@@ -6787,156 +6889,161 @@ msgid ""

6889 "the commit.\n"

6890 msgstr ""

6891

6790 -#: builtin/merge.c:833

6892 +#: builtin/merge.c:811

6893 msgid "Empty commit message."

6894 msgstr ""

6895

6794 -#: builtin/merge.c:845

6896 +#: builtin/merge.c:823

6897 #, c-format

6898 msgid "Wonderful.\n"

6899 msgstr ""

6900

6799 -#: builtin/merge.c:900

6901 +#: builtin/merge.c:878

6902 #, c-format

6903 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"

6904 msgstr ""

6905

6804 -#: builtin/merge.c:916

6906 +#: builtin/merge.c:894

6907 #, c-format

6908 msgid "'%s' is not a commit"

6909 msgstr ""

6910

6809 -#: builtin/merge.c:957

6911 +#: builtin/merge.c:935

6912 msgid "No current branch."

6913 msgstr ""

6914

6813 -#: builtin/merge.c:959

6915 +#: builtin/merge.c:937

6916 msgid "No remote for the current branch."

6917 msgstr ""

6918

6817 -#: builtin/merge.c:961

6919 +#: builtin/merge.c:939

6920 msgid "No default upstream defined for the current branch."

6921 msgstr ""

6922

6821 -#: builtin/merge.c:966

6923 +#: builtin/merge.c:944

6924 #, c-format

6925 msgid "No remote-tracking branch for %s from %s"

6926 msgstr ""

6927

6826 -#: builtin/merge.c:1122

6928 +#: builtin/merge.c:1081

6929 +#, c-format

6930 +msgid "could not close '%s'"

6931 +msgstr ""

6932 +

6933 +#: builtin/merge.c:1208

6934 msgid "There is no merge to abort (MERGE_HEAD missing)."

6935 msgstr ""

6936

6830 -#: builtin/merge.c:1138

6937 +#: builtin/merge.c:1224

6938 msgid ""

6939 "You have not concluded your merge (MERGE_HEAD exists).\n"

6940 "Please, commit your changes before you merge."

6941 msgstr ""

6942

6836 -#: builtin/merge.c:1141 git-pull.sh:34

6943 +#: builtin/merge.c:1227 git-pull.sh:74

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

6945 msgstr ""

6946

6840 -#: builtin/merge.c:1145

6947 +#: builtin/merge.c:1231

6948 msgid ""

6949 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"

6950 "Please, commit your changes before you merge."

6951 msgstr ""

6952

6846 -#: builtin/merge.c:1148

6953 +#: builtin/merge.c:1234

6954 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."

6955 msgstr ""

6956

6850 -#: builtin/merge.c:1157

6957 +#: builtin/merge.c:1243

6958 msgid "You cannot combine --squash with --no-ff."

6959 msgstr ""

6960

6854 -#: builtin/merge.c:1166

6961 +#: builtin/merge.c:1251

6962 msgid "No commit specified and merge.defaultToUpstream not set."

6963 msgstr ""

6964

6858 -#: builtin/merge.c:1198

6859 -msgid "Can merge only exactly one commit into empty head"

6860 -msgstr ""

6861 -

6862 -#: builtin/merge.c:1201

6965 +#: builtin/merge.c:1268

6966 msgid "Squash commit into empty head not supported yet"

6967 msgstr ""

6968

6866 -#: builtin/merge.c:1203

6969 +#: builtin/merge.c:1270

6970 msgid "Non-fast-forward commit does not make sense into an empty head"

6971 msgstr ""

6972

6870 -#: builtin/merge.c:1208

6973 +#: builtin/merge.c:1276

6974 #, c-format

6975 msgid "%s - not something we can merge"

6976 msgstr ""

6977

6875 -#: builtin/merge.c:1259

6978 +#: builtin/merge.c:1278

6979 +msgid "Can merge only exactly one commit into empty head"

6980 +msgstr ""

6981 +

6982 +#: builtin/merge.c:1333

6983 #, c-format

6984 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."

6985 msgstr ""

6986

6880 -#: builtin/merge.c:1262

6987 +#: builtin/merge.c:1336

6988 #, c-format

6989 msgid "Commit %s has a bad GPG signature allegedly by %s."

6990 msgstr ""

6991

6885 -#: builtin/merge.c:1265

6992 +#: builtin/merge.c:1339

6993 #, c-format

6994 msgid "Commit %s does not have a GPG signature."

6995 msgstr ""

6996

6890 -#: builtin/merge.c:1268

6997 +#: builtin/merge.c:1342

6998 #, c-format

6999 msgid "Commit %s has a good GPG signature by %s\n"

7000 msgstr ""

7001

6895 -#: builtin/merge.c:1349

7002 +#: builtin/merge.c:1423

7003 #, c-format

7004 msgid "Updating %s..%s\n"

7005 msgstr ""

7006

6900 -#: builtin/merge.c:1388

7007 +#: builtin/merge.c:1462

7008 #, c-format

7009 msgid "Trying really trivial in-index merge...\n"

7010 msgstr ""

7011

6905 -#: builtin/merge.c:1395

7012 +#: builtin/merge.c:1469

7013 #, c-format

7014 msgid "Nope.\n"

7015 msgstr ""

7016

6910 -#: builtin/merge.c:1427

7017 +#: builtin/merge.c:1501

7018 msgid "Not possible to fast-forward, aborting."

7019 msgstr ""

7020

6914 -#: builtin/merge.c:1450 builtin/merge.c:1529

7021 +#: builtin/merge.c:1524 builtin/merge.c:1603

7022 #, c-format

7023 msgid "Rewinding the tree to pristine...\n"

7024 msgstr ""

7025

6919 -#: builtin/merge.c:1454

7026 +#: builtin/merge.c:1528

7027 #, c-format

7028 msgid "Trying merge strategy %s...\n"

7029 msgstr ""

7030

6924 -#: builtin/merge.c:1520

7031 +#: builtin/merge.c:1594

7032 #, c-format

7033 msgid "No merge strategy handled the merge.\n"

7034 msgstr ""

7035

6929 -#: builtin/merge.c:1522

7036 +#: builtin/merge.c:1596

7037 #, c-format

7038 msgid "Merge with strategy %s failed.\n"

7039 msgstr ""

7040

6934 -#: builtin/merge.c:1531

7041 +#: builtin/merge.c:1605

7042 #, c-format

7043 msgid "Using the %s to prepare resolving by hand.\n"

7044 msgstr ""

7045

6939 -#: builtin/merge.c:1543

7046 +#: builtin/merge.c:1617

7047 #, c-format

7048 msgid "Automatic merge went well; stopped before committing as requested\n"

7049 msgstr ""

@@ -7122,7 +7229,7 @@ msgstr ""

7229 msgid "Renaming %s to %s\n"

7230 msgstr ""

7231

7125 -#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:359

7232 +#: builtin/mv.c:256 builtin/remote.c:725 builtin/repack.c:361

7233 #, c-format

7234 msgid "renaming '%s' failed"

7235 msgstr ""

@@ -7481,7 +7588,7 @@ msgstr ""

7588 msgid "use notes from <notes-ref>"

7589 msgstr ""

7590

7484 -#: builtin/notes.c:989 builtin/remote.c:1621

7591 +#: builtin/notes.c:989 builtin/remote.c:1618

7592 #, c-format

7593 msgid "Unknown subcommand: %s"

7594 msgstr ""

@@ -7503,171 +7610,171 @@ msgstr ""

7610 msgid "Writing objects"

7611 msgstr ""

7612

7506 -#: builtin/pack-objects.c:1013

7613 +#: builtin/pack-objects.c:1011

7614 msgid "disabling bitmap writing, as some objects are not being packed"

7615 msgstr ""

7616

7510 -#: builtin/pack-objects.c:2173

7617 +#: builtin/pack-objects.c:2171

7618 msgid "Compressing objects"

7619 msgstr ""

7620

7514 -#: builtin/pack-objects.c:2570

7621 +#: builtin/pack-objects.c:2568

7622 #, c-format

7623 msgid "unsupported index version %s"

7624 msgstr ""

7625

7519 -#: builtin/pack-objects.c:2574

7626 +#: builtin/pack-objects.c:2572

7627 #, c-format

7628 msgid "bad index version '%s'"

7629 msgstr ""

7630

7524 -#: builtin/pack-objects.c:2597

7631 +#: builtin/pack-objects.c:2595

7632 #, c-format

7633 msgid "option %s does not accept negative form"

7634 msgstr ""

7635

7529 -#: builtin/pack-objects.c:2601

7636 +#: builtin/pack-objects.c:2599

7637 #, c-format

7638 msgid "unable to parse value '%s' for option %s"

7639 msgstr ""

7640

7534 -#: builtin/pack-objects.c:2621

7641 +#: builtin/pack-objects.c:2619

7642 msgid "do not show progress meter"

7643 msgstr ""

7644

7538 -#: builtin/pack-objects.c:2623

7645 +#: builtin/pack-objects.c:2621

7646 msgid "show progress meter"

7647 msgstr ""

7648

7542 -#: builtin/pack-objects.c:2625

7649 +#: builtin/pack-objects.c:2623

7650 msgid "show progress meter during object writing phase"

7651 msgstr ""

7652

7546 -#: builtin/pack-objects.c:2628

7653 +#: builtin/pack-objects.c:2626

7654 msgid "similar to --all-progress when progress meter is shown"

7655 msgstr ""

7656

7550 -#: builtin/pack-objects.c:2629

7657 +#: builtin/pack-objects.c:2627

7658 msgid "version[,offset]"

7659 msgstr ""

7660

7554 -#: builtin/pack-objects.c:2630

7661 +#: builtin/pack-objects.c:2628

7662 msgid "write the pack index file in the specified idx format version"

7663 msgstr ""

7664

7558 -#: builtin/pack-objects.c:2633

7665 +#: builtin/pack-objects.c:2631

7666 msgid "maximum size of each output pack file"

7667 msgstr ""

7668

7562 -#: builtin/pack-objects.c:2635

7669 +#: builtin/pack-objects.c:2633

7670 msgid "ignore borrowed objects from alternate object store"

7671 msgstr ""

7672

7566 -#: builtin/pack-objects.c:2637

7673 +#: builtin/pack-objects.c:2635

7674 msgid "ignore packed objects"

7675 msgstr ""

7676

7570 -#: builtin/pack-objects.c:2639

7677 +#: builtin/pack-objects.c:2637

7678 msgid "limit pack window by objects"

7679 msgstr ""

7680

7574 -#: builtin/pack-objects.c:2641

7681 +#: builtin/pack-objects.c:2639

7682 msgid "limit pack window by memory in addition to object limit"

7683 msgstr ""

7684

7578 -#: builtin/pack-objects.c:2643

7685 +#: builtin/pack-objects.c:2641

7686 msgid "maximum length of delta chain allowed in the resulting pack"

7687 msgstr ""

7688

7582 -#: builtin/pack-objects.c:2645

7689 +#: builtin/pack-objects.c:2643

7690 msgid "reuse existing deltas"

7691 msgstr ""

7692

7586 -#: builtin/pack-objects.c:2647

7693 +#: builtin/pack-objects.c:2645

7694 msgid "reuse existing objects"

7695 msgstr ""

7696

7590 -#: builtin/pack-objects.c:2649

7697 +#: builtin/pack-objects.c:2647

7698 msgid "use OFS_DELTA objects"

7699 msgstr ""

7700

7594 -#: builtin/pack-objects.c:2651

7701 +#: builtin/pack-objects.c:2649

7702 msgid "use threads when searching for best delta matches"

7703 msgstr ""

7704

7598 -#: builtin/pack-objects.c:2653

7705 +#: builtin/pack-objects.c:2651

7706 msgid "do not create an empty pack output"

7707 msgstr ""

7708

7602 -#: builtin/pack-objects.c:2655

7709 +#: builtin/pack-objects.c:2653

7710 msgid "read revision arguments from standard input"

7711 msgstr ""

7712

7606 -#: builtin/pack-objects.c:2657

7713 +#: builtin/pack-objects.c:2655

7714 msgid "limit the objects to those that are not yet packed"

7715 msgstr ""

7716

7610 -#: builtin/pack-objects.c:2660

7717 +#: builtin/pack-objects.c:2658

7718 msgid "include objects reachable from any reference"

7719 msgstr ""

7720

7614 -#: builtin/pack-objects.c:2663

7721 +#: builtin/pack-objects.c:2661

7722 msgid "include objects referred by reflog entries"

7723 msgstr ""

7724

7618 -#: builtin/pack-objects.c:2666

7725 +#: builtin/pack-objects.c:2664

7726 msgid "include objects referred to by the index"

7727 msgstr ""

7728

7622 -#: builtin/pack-objects.c:2669

7729 +#: builtin/pack-objects.c:2667

7730 msgid "output pack to stdout"

7731 msgstr ""

7732

7626 -#: builtin/pack-objects.c:2671

7733 +#: builtin/pack-objects.c:2669

7734 msgid "include tag objects that refer to objects to be packed"

7735 msgstr ""

7736

7630 -#: builtin/pack-objects.c:2673

7737 +#: builtin/pack-objects.c:2671

7738 msgid "keep unreachable objects"

7739 msgstr ""

7740

7634 -#: builtin/pack-objects.c:2674 parse-options.h:140

7741 +#: builtin/pack-objects.c:2672 parse-options.h:139

7742 msgid "time"

7743 msgstr ""

7744

7638 -#: builtin/pack-objects.c:2675

7745 +#: builtin/pack-objects.c:2673

7746 msgid "unpack unreachable objects newer than <time>"

7747 msgstr ""

7748

7642 -#: builtin/pack-objects.c:2678

7749 +#: builtin/pack-objects.c:2676

7750 msgid "create thin packs"

7751 msgstr ""

7752

7646 -#: builtin/pack-objects.c:2680

7753 +#: builtin/pack-objects.c:2678

7754 msgid "create packs suitable for shallow fetches"

7755 msgstr ""

7756

7650 -#: builtin/pack-objects.c:2682

7757 +#: builtin/pack-objects.c:2680

7758 msgid "ignore packs that have companion .keep file"

7759 msgstr ""

7760

7654 -#: builtin/pack-objects.c:2684

7761 +#: builtin/pack-objects.c:2682

7762 msgid "pack compression level"

7763 msgstr ""

7764

7658 -#: builtin/pack-objects.c:2686

7765 +#: builtin/pack-objects.c:2684

7766 msgid "do not hide commits by grafts"

7767 msgstr ""

7768

7662 -#: builtin/pack-objects.c:2688

7769 +#: builtin/pack-objects.c:2686

7770 msgid "use a bitmap index if available to speed up counting objects"

7771 msgstr ""

7772

7666 -#: builtin/pack-objects.c:2690

7773 +#: builtin/pack-objects.c:2688

7774 msgid "write a bitmap index together with the pack index"

7775 msgstr ""

7776

7670 -#: builtin/pack-objects.c:2781

7777 +#: builtin/pack-objects.c:2779

7778 msgid "Counting objects"

7779 msgstr ""

7780

@@ -7695,18 +7802,56 @@ msgstr ""

7802 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"

7803 msgstr ""

7804

7698 -#: builtin/prune.c:106

7805 +#: builtin/prune.c:86

7806 +#, c-format

7807 +msgid "Removing worktrees/%s: not a valid directory"

7808 +msgstr ""

7809 +

7810 +#: builtin/prune.c:92

7811 +#, c-format

7812 +msgid "Removing worktrees/%s: gitdir file does not exist"

7813 +msgstr ""

7814 +

7815 +#: builtin/prune.c:97

7816 +#, c-format

7817 +msgid "Removing worktrees/%s: unable to read gitdir file (%s)"

7818 +msgstr ""

7819 +

7820 +#: builtin/prune.c:108

7821 +#, c-format

7822 +msgid "Removing worktrees/%s: invalid gitdir file"

l10n: git.pot: v2.5.0 round 1 (65 new, 15 removed)