beb691f770 · matheusbsbs/matheus-bagliano

@@ -8,7 +8,7 @@ msgid ""

8 msgstr ""

9 "Project-Id-Version: PACKAGE VERSION\n"

10 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"

11 -"POT-Creation-Date: 2014-11-20 09:42+0800\n"

11 +"POT-Creation-Date: 2015-01-13 14:05+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,76 +46,76 @@ msgstr ""

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

47 msgstr ""

48

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

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

50 #, c-format

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

52 msgstr ""

53

54 -#: archive.c:419

54 +#: archive.c:427

55 msgid "fmt"

56 msgstr ""

57

58 -#: archive.c:419

58 +#: archive.c:427

59 msgid "archive format"

60 msgstr ""

61

62 -#: archive.c:420 builtin/log.c:1204

62 +#: archive.c:428 builtin/log.c:1204

63 msgid "prefix"

64 msgstr ""

65

66 -#: archive.c:421

66 +#: archive.c:429

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

68 msgstr ""

69

70 -#: archive.c:422 builtin/archive.c:88 builtin/blame.c:2517

70 +#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2517

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

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

73 -#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:411

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

73 +#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:394

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

75 msgid "file"

76 msgstr ""

77

78 -#: archive.c:423 builtin/archive.c:89

78 +#: archive.c:431 builtin/archive.c:89

79 msgid "write the archive to this file"

80 msgstr ""

81

82 -#: archive.c:425

82 +#: archive.c:433

83 msgid "read .gitattributes in working directory"

84 msgstr ""

85

86 -#: archive.c:426

86 +#: archive.c:434

87 msgid "report archived files on stderr"

88 msgstr ""

89

90 -#: archive.c:427

90 +#: archive.c:435

91 msgid "store only"

92 msgstr ""

93

94 -#: archive.c:428

94 +#: archive.c:436

95 msgid "compress faster"

96 msgstr ""

97

98 -#: archive.c:436

98 +#: archive.c:444

99 msgid "compress better"

100 msgstr ""

101

102 -#: archive.c:439

102 +#: archive.c:447

103 msgid "list supported archive formats"

104 msgstr ""

105

106 -#: archive.c:441 builtin/archive.c:90 builtin/clone.c:85

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

107 msgid "repo"

108 msgstr ""

109

110 -#: archive.c:442 builtin/archive.c:91

110 +#: archive.c:450 builtin/archive.c:91

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

112 msgstr ""

113

114 -#: archive.c:443 builtin/archive.c:92 builtin/notes.c:490

114 +#: archive.c:451 builtin/archive.c:92 builtin/notes.c:478

115 msgid "command"

116 msgstr ""

117

118 -#: archive.c:444 builtin/archive.c:93

118 +#: archive.c:452 builtin/archive.c:93

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

120 msgstr ""

121

@@ -236,7 +236,7 @@ msgstr ""

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

237 msgstr ""

238

239 -#: bundle.c:87 builtin/commit.c:788

239 +#: bundle.c:87 builtin/commit.c:770

240 #, c-format

241 msgid "could not open '%s'"

242 msgstr ""

@@ -245,9 +245,9 @@ msgstr ""

245 msgid "Repository lacks these prerequisite commits:"

246 msgstr ""

247

248 -#: bundle.c:163 sequencer.c:641 sequencer.c:1096 builtin/blame.c:2706

249 -#: builtin/branch.c:652 builtin/commit.c:1085 builtin/log.c:330

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

248 +#: bundle.c:163 sequencer.c:645 sequencer.c:1100 builtin/blame.c:2706

249 +#: builtin/branch.c:652 builtin/commit.c:1049 builtin/log.c:330

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

251 #: builtin/shortlog.c:158

252 msgid "revision walk setup failed"

253 msgstr ""

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

305 msgid "index-pack died"

306 msgstr ""

307

308 -#: color.c:157

308 +#: color.c:259

309 #, c-format

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

311 msgstr ""

@@ -354,25 +354,25 @@ msgstr ""

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

355 msgstr ""

356

357 -#: config.c:1201

357 +#: config.c:1211

358 msgid "unable to parse command-line config"

359 msgstr ""

360

361 -#: config.c:1262

361 +#: config.c:1272

362 msgid "unknown error occured while reading the configuration files"

363 msgstr ""

364

365 -#: config.c:1586

365 +#: config.c:1596

366 #, c-format

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

368 msgstr ""

369

370 -#: config.c:1588

370 +#: config.c:1598

371 #, c-format

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

373 msgstr ""

374

375 -#: config.c:1647

375 +#: config.c:1657

376 #, c-format

377 msgid "%s has multiple values"

378 msgstr ""

@@ -604,11 +604,11 @@ msgstr[1] ""

604 msgid "%s: %s - %s"

605 msgstr ""

606

607 -#: lockfile.c:275

607 +#: lockfile.c:283

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

609 msgstr ""

610

611 -#: lockfile.c:277

611 +#: lockfile.c:285

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

613 msgstr ""

614

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

616 msgid "failed to read the cache"

617 msgstr ""

618

619 -#: merge.c:94 builtin/checkout.c:356 builtin/checkout.c:562

620 -#: builtin/clone.c:659

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

620 +#: builtin/clone.c:662

621 msgid "unable to write new index file"

622 msgstr ""

623

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

635 msgid "error building trees"

636 msgstr ""

637

638 -#: merge-recursive.c:691

638 +#: merge-recursive.c:688

639 #, c-format

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

641 msgstr ""

642

643 -#: merge-recursive.c:702

643 +#: merge-recursive.c:699

644 #, c-format

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

646 msgstr ""

647

648 -#: merge-recursive.c:716 merge-recursive.c:737

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

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

650 msgstr ""

651

652 -#: merge-recursive.c:727

652 +#: merge-recursive.c:724

653 #, c-format

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

655 msgstr ""

656

657 -#: merge-recursive.c:767

657 +#: merge-recursive.c:764

658 #, c-format

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

660 msgstr ""

661

662 -#: merge-recursive.c:769

662 +#: merge-recursive.c:766

663 #, c-format

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

665 msgstr ""

666

667 -#: merge-recursive.c:792 builtin/clone.c:318

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

668 #, c-format

669 msgid "failed to open '%s'"

670 msgstr ""

671

672 -#: merge-recursive.c:800

672 +#: merge-recursive.c:797

673 #, c-format

674 msgid "failed to symlink '%s'"

675 msgstr ""

676

677 -#: merge-recursive.c:803

677 +#: merge-recursive.c:800

678 #, c-format

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

680 msgstr ""

681

682 -#: merge-recursive.c:941

682 +#: merge-recursive.c:938

683 msgid "Failed to execute internal merge"

684 msgstr ""

685

686 -#: merge-recursive.c:945

686 +#: merge-recursive.c:942

687 #, c-format

688 msgid "Unable to add %s to database"

689 msgstr ""

690

691 -#: merge-recursive.c:961

691 +#: merge-recursive.c:958

692 msgid "unsupported object type in the tree"

693 msgstr ""

694

695 -#: merge-recursive.c:1036 merge-recursive.c:1050

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

696 #, c-format

697 msgid ""

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

699 "in tree."

700 msgstr ""

701

702 -#: merge-recursive.c:1042 merge-recursive.c:1055

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

703 #, c-format

704 msgid ""

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

706 "in tree at %s."

707 msgstr ""

708

709 -#: merge-recursive.c:1096

709 +#: merge-recursive.c:1093

710 msgid "rename"

711 msgstr ""

712

713 -#: merge-recursive.c:1096

713 +#: merge-recursive.c:1093

714 msgid "renamed"

715 msgstr ""

716

717 -#: merge-recursive.c:1152

717 +#: merge-recursive.c:1149

718 #, c-format

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

720 msgstr ""

721

722 -#: merge-recursive.c:1174

722 +#: merge-recursive.c:1171

723 #, c-format

724 msgid ""

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

726 "\"->\"%s\" in \"%s\"%s"

727 msgstr ""

728

729 -#: merge-recursive.c:1179

729 +#: merge-recursive.c:1176

730 msgid " (left unresolved)"

731 msgstr ""

732

733 -#: merge-recursive.c:1233

733 +#: merge-recursive.c:1230

734 #, c-format

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

736 msgstr ""

737

738 -#: merge-recursive.c:1263

738 +#: merge-recursive.c:1260

739 #, c-format

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

741 msgstr ""

742

743 -#: merge-recursive.c:1462

743 +#: merge-recursive.c:1459

744 #, c-format

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

746 msgstr ""

747

748 -#: merge-recursive.c:1472

748 +#: merge-recursive.c:1469

749 #, c-format

750 msgid "Adding merged %s"

751 msgstr ""

752

753 -#: merge-recursive.c:1477 merge-recursive.c:1675

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

754 #, c-format

755 msgid "Adding as %s instead"

756 msgstr ""

757

758 -#: merge-recursive.c:1528

758 +#: merge-recursive.c:1525

759 #, c-format

760 msgid "cannot read object %s"

761 msgstr ""

762

763 -#: merge-recursive.c:1531

763 +#: merge-recursive.c:1528

764 #, c-format

765 msgid "object %s is not a blob"

766 msgstr ""

767

768 -#: merge-recursive.c:1579

768 +#: merge-recursive.c:1576

769 msgid "modify"

770 msgstr ""

771

772 -#: merge-recursive.c:1579

772 +#: merge-recursive.c:1576

773 msgid "modified"

774 msgstr ""

775

776 -#: merge-recursive.c:1589

776 +#: merge-recursive.c:1586

777 msgid "content"

778 msgstr ""

779

780 -#: merge-recursive.c:1596

780 +#: merge-recursive.c:1593

781 msgid "add/add"

782 msgstr ""

783

784 -#: merge-recursive.c:1630

784 +#: merge-recursive.c:1627

785 #, c-format

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

787 msgstr ""

788

789 -#: merge-recursive.c:1644

789 +#: merge-recursive.c:1641

790 #, c-format

791 msgid "Auto-merging %s"

792 msgstr ""

793

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

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

795 msgid "submodule"

796 msgstr ""

797

798 -#: merge-recursive.c:1649

798 +#: merge-recursive.c:1646

799 #, c-format

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

801 msgstr ""

802

803 -#: merge-recursive.c:1735

803 +#: merge-recursive.c:1732

804 #, c-format

805 msgid "Removing %s"

806 msgstr ""

807

808 -#: merge-recursive.c:1760

808 +#: merge-recursive.c:1757

809 msgid "file/directory"

810 msgstr ""

811

812 -#: merge-recursive.c:1766

812 +#: merge-recursive.c:1763

813 msgid "directory/file"

814 msgstr ""

815

816 -#: merge-recursive.c:1771

816 +#: merge-recursive.c:1768

817 #, c-format

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

819 msgstr ""

820

821 -#: merge-recursive.c:1781

821 +#: merge-recursive.c:1778

822 #, c-format

823 msgid "Adding %s"

824 msgstr ""

825

826 -#: merge-recursive.c:1798

826 +#: merge-recursive.c:1795

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

828 msgstr ""

829

830 -#: merge-recursive.c:1817

830 +#: merge-recursive.c:1814

831 msgid "Already up-to-date!"

832 msgstr ""

833

834 -#: merge-recursive.c:1826

834 +#: merge-recursive.c:1823

835 #, c-format

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

837 msgstr ""

838

839 -#: merge-recursive.c:1856

839 +#: merge-recursive.c:1853

840 #, c-format

841 msgid "Unprocessed path??? %s"

842 msgstr ""

843

844 -#: merge-recursive.c:1901

844 +#: merge-recursive.c:1898

845 msgid "Merging:"

846 msgstr ""

847

848 -#: merge-recursive.c:1914

848 +#: merge-recursive.c:1911

849 #, c-format

850 msgid "found %u common ancestor:"

851 msgid_plural "found %u common ancestors:"

852 msgstr[0] ""

853 msgstr[1] ""

854

855 -#: merge-recursive.c:1951

855 +#: merge-recursive.c:1948

856 msgid "merge returned no commit"

857 msgstr ""

858

859 -#: merge-recursive.c:2008

859 +#: merge-recursive.c:2005

860 #, c-format

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

862 msgstr ""

863

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

864 +#: merge-recursive.c:2016 builtin/merge.c:667

865 msgid "Unable to write index."

866 msgstr ""

867

@@ -869,19 +869,19 @@ msgstr ""

869 msgid "Cannot commit uninitialized/unreferenced notes tree"

870 msgstr ""

871

872 -#: notes-utils.c:83

872 +#: notes-utils.c:82

873 #, c-format

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

875 msgstr ""

876

877 -#: notes-utils.c:93

877 +#: notes-utils.c:92

878 #, c-format

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

880 msgstr ""

881

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

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

884 -#: notes-utils.c:120

884 +#: notes-utils.c:119

885 #, c-format

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

887 msgstr ""

@@ -984,14 +984,14 @@ msgstr ""

984 msgid "done"

985 msgstr ""

986

987 -#: read-cache.c:1261

987 +#: read-cache.c:1267

988 #, c-format

989 msgid ""

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

991 "Using version %i"

992 msgstr ""

993

994 -#: read-cache.c:1271

994 +#: read-cache.c:1277

995 #, c-format

996 msgid ""

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

@@ -1017,32 +1017,32 @@ msgstr ""

1017 msgid "Internal error"

1018 msgstr ""

1019

1020 -#: remote.c:1968

1020 +#: remote.c:1980

1021 #, c-format

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

1023 msgstr ""

1024

1025 -#: remote.c:1972

1025 +#: remote.c:1984

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

1027 msgstr ""

1028

1029 -#: remote.c:1975

1029 +#: remote.c:1987

1030 #, c-format

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

1032 msgstr ""

1033

1034 -#: remote.c:1979

1034 +#: remote.c:1991

1035 #, c-format

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

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

1038 msgstr[0] ""

1039 msgstr[1] ""

1040

1041 -#: remote.c:1985

1041 +#: remote.c:1997

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

1043 msgstr ""

1044

1045 -#: remote.c:1988

1045 +#: remote.c:2000

1046 #, c-format

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

1048 msgid_plural ""

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

1050 msgstr[0] ""

1051 msgstr[1] ""

1052

1053 -#: remote.c:1996

1053 +#: remote.c:2008

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

1055 msgstr ""

1056

1057 -#: remote.c:1999

1057 +#: remote.c:2011

1058 #, c-format

1059 msgid ""

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

@@ -1065,7 +1065,7 @@ msgid_plural ""

1065 msgstr[0] ""

1066 msgstr[1] ""

1067

1068 -#: remote.c:2009

1068 +#: remote.c:2021

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

1070 msgstr ""

1071

@@ -1078,22 +1078,22 @@ msgstr ""

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

1079 msgstr ""

1080

1081 -#: send-pack.c:265

1081 +#: send-pack.c:268

1082 msgid "failed to sign the push certificate"

1083 msgstr ""

1084

1085 -#: send-pack.c:322

1085 +#: send-pack.c:325

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

1087 msgstr ""

1088

1089 -#: sequencer.c:172 builtin/merge.c:781 builtin/merge.c:892

1090 -#: builtin/merge.c:1002 builtin/merge.c:1012

1089 +#: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995

1090 +#: builtin/merge.c:1005

1091 #, c-format

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

1093 msgstr ""

1094

1095 -#: sequencer.c:174 builtin/merge.c:343 builtin/merge.c:784

1096 -#: builtin/merge.c:1004 builtin/merge.c:1017

1095 +#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:785 builtin/merge.c:997

1096 +#: builtin/merge.c:1010

1097 #, c-format

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

1099 msgstr ""

@@ -1111,7 +1111,7 @@ msgid ""

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

1112 msgstr ""

1113

1114 -#: sequencer.c:211 sequencer.c:852 sequencer.c:935

1114 +#: sequencer.c:211 sequencer.c:856 sequencer.c:939

1115 #, c-format

1116 msgid "Could not write to %s"

1117 msgstr ""

@@ -1134,197 +1134,197 @@ msgid "Commit your changes or stash them to proceed."

1134 msgstr ""

1135

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

1137 -#: sequencer.c:304

1137 +#: sequencer.c:321

1138 #, c-format

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

1140 msgstr ""

1141

1142 -#: sequencer.c:335

1142 +#: sequencer.c:339

1143 msgid "Could not resolve HEAD commit\n"

1144 msgstr ""

1145

1146 -#: sequencer.c:355

1146 +#: sequencer.c:359

1147 msgid "Unable to update cache tree\n"

1148 msgstr ""

1149

1150 -#: sequencer.c:402

1150 +#: sequencer.c:406

1151 #, c-format

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

1153 msgstr ""

1154

1155 -#: sequencer.c:407

1155 +#: sequencer.c:411

1156 #, c-format

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

1158 msgstr ""

1159

1160 -#: sequencer.c:473

1160 +#: sequencer.c:477

1161 msgid "Your index file is unmerged."

1162 msgstr ""

1163

1164 -#: sequencer.c:492

1164 +#: sequencer.c:496

1165 #, c-format

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

1167 msgstr ""

1168

1169 -#: sequencer.c:500

1169 +#: sequencer.c:504

1170 #, c-format

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

1172 msgstr ""

1173

1174 -#: sequencer.c:504

1174 +#: sequencer.c:508

1175 #, c-format

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

1177 msgstr ""

1178

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

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

1181 -#: sequencer.c:517

1181 +#: sequencer.c:521

1182 #, c-format

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

1184 msgstr ""

1185

1186 -#: sequencer.c:521

1186 +#: sequencer.c:525

1187 #, c-format

1188 msgid "Cannot get commit message for %s"

1189 msgstr ""

1190

1191 -#: sequencer.c:607

1191 +#: sequencer.c:611

1192 #, c-format

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

1194 msgstr ""

1195

1196 -#: sequencer.c:608

1196 +#: sequencer.c:612

1197 #, c-format

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

1199 msgstr ""

1200

1201 -#: sequencer.c:644

1201 +#: sequencer.c:648

1202 msgid "empty commit set passed"

1203 msgstr ""

1204

1205 -#: sequencer.c:652

1205 +#: sequencer.c:656

1206 #, c-format

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

1208 msgstr ""

1209

1210 -#: sequencer.c:656

1210 +#: sequencer.c:660

1211 #, c-format

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

1213 msgstr ""

1214

1215 -#: sequencer.c:716

1215 +#: sequencer.c:720

1216 #, c-format

1217 msgid "Cannot %s during a %s"

1218 msgstr ""

1219

1220 -#: sequencer.c:738

1220 +#: sequencer.c:742

1221 #, c-format

1222 msgid "Could not parse line %d."

1223 msgstr ""

1224

1225 -#: sequencer.c:743

1225 +#: sequencer.c:747

1226 msgid "No commits parsed."

1227 msgstr ""

1228

1229 -#: sequencer.c:756

1229 +#: sequencer.c:760

1230 #, c-format

1231 msgid "Could not open %s"

1232 msgstr ""

1233

1234 -#: sequencer.c:760

1234 +#: sequencer.c:764

1235 #, c-format

1236 msgid "Could not read %s."

1237 msgstr ""

1238

1239 -#: sequencer.c:767

1239 +#: sequencer.c:771

1240 #, c-format

1241 msgid "Unusable instruction sheet: %s"

1242 msgstr ""

1243

1244 -#: sequencer.c:797

1244 +#: sequencer.c:801

1245 #, c-format

1246 msgid "Invalid key: %s"

1247 msgstr ""

1248

1249 -#: sequencer.c:800

1249 +#: sequencer.c:804

1250 #, c-format

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

1252 msgstr ""

1253

1254 -#: sequencer.c:812

1254 +#: sequencer.c:816

1255 #, c-format

1256 msgid "Malformed options sheet: %s"

1257 msgstr ""

1258

1259 -#: sequencer.c:833

1259 +#: sequencer.c:837

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

1261 msgstr ""

1262

1263 -#: sequencer.c:834

1263 +#: sequencer.c:838

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

1265 msgstr ""

1266

1267 -#: sequencer.c:838

1267 +#: sequencer.c:842

1268 #, c-format

1269 msgid "Could not create sequencer directory %s"

1270 msgstr ""

1271

1272 -#: sequencer.c:854 sequencer.c:939

1272 +#: sequencer.c:858 sequencer.c:943

1273 #, c-format

1274 msgid "Error wrapping up %s."

1275 msgstr ""

1276

1277 -#: sequencer.c:873 sequencer.c:1009

1277 +#: sequencer.c:877 sequencer.c:1013

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

1279 msgstr ""

1280

1281 -#: sequencer.c:875

1281 +#: sequencer.c:879

1282 msgid "cannot resolve HEAD"

1283 msgstr ""

1284

1285 -#: sequencer.c:877

1285 +#: sequencer.c:881

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

1287 msgstr ""

1288

1289 -#: sequencer.c:899 builtin/apply.c:4128

1289 +#: sequencer.c:903 builtin/apply.c:4128

1290 #, c-format

1291 msgid "cannot open %s: %s"

1292 msgstr ""

1293

1294 -#: sequencer.c:902

1294 +#: sequencer.c:906

1295 #, c-format

1296 msgid "cannot read %s: %s"

1297 msgstr ""

1298

1299 -#: sequencer.c:903

1299 +#: sequencer.c:907

1300 msgid "unexpected end of file"

1301 msgstr ""

1302

1303 -#: sequencer.c:909

1303 +#: sequencer.c:913

1304 #, c-format

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

1306 msgstr ""

1307

1308 -#: sequencer.c:932

1308 +#: sequencer.c:936

1309 #, c-format

1310 msgid "Could not format %s."

1311 msgstr ""

1312

1313 -#: sequencer.c:1077

1313 +#: sequencer.c:1081

1314 #, c-format

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

1316 msgstr ""

1317

1318 -#: sequencer.c:1080

1318 +#: sequencer.c:1084

1319 #, c-format

1320 msgid "%s: bad revision"

1321 msgstr ""

1322

1323 -#: sequencer.c:1114

1323 +#: sequencer.c:1118

1324 msgid "Can't revert as initial commit"

1325 msgstr ""

1326

1327 -#: sequencer.c:1115

1327 +#: sequencer.c:1119

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

1329 msgstr ""

1330

@@ -1383,7 +1383,7 @@ msgstr ""

1383 msgid "staging updated .gitmodules failed"

1384 msgstr ""

1385

1386 -#: submodule.c:1111 builtin/init-db.c:363

1386 +#: submodule.c:1111 builtin/init-db.c:371

1387 #, c-format

1388 msgid "Could not create git link %s"

1389 msgstr ""

@@ -1393,28 +1393,28 @@ msgstr ""

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

1394 msgstr ""

1395

1396 -#: trailer.c:499 trailer.c:503 trailer.c:507 trailer.c:561 trailer.c:565

1397 -#: trailer.c:569

1396 +#: trailer.c:500 trailer.c:504 trailer.c:508 trailer.c:562 trailer.c:566

1397 +#: trailer.c:570

1398 #, c-format

1399 msgid "unknown value '%s' for key '%s'"

1400 msgstr ""

1401

1402 -#: trailer.c:551 trailer.c:556 builtin/remote.c:288

1402 +#: trailer.c:552 trailer.c:557 builtin/remote.c:288

1403 #, c-format

1404 msgid "more than one %s"

1405 msgstr ""

1406

1407 -#: trailer.c:589

1407 +#: trailer.c:590

1408 #, c-format

1409 msgid "empty trailer token in trailer '%.*s'"

1410 msgstr ""

1411

1412 -#: trailer.c:709

1412 +#: trailer.c:710

1413 #, c-format

1414 msgid "could not read input file '%s'"

1415 msgstr ""

1416

1417 -#: trailer.c:712

1417 +#: trailer.c:713

1418 msgid "could not read from stdin"

1419 msgstr ""

1420

@@ -1611,193 +1611,193 @@ msgstr ""

1611 msgid "bug: unhandled diff status %c"

1612 msgstr ""

1613

1614 -#: wt-status.c:761

1614 +#: wt-status.c:758

1615 msgid "Submodules changed but not updated:"

1616 msgstr ""

1617

1618 -#: wt-status.c:763

1618 +#: wt-status.c:760

1619 msgid "Submodule changes to be committed:"

1620 msgstr ""

1621

1622 -#: wt-status.c:842

1622 +#: wt-status.c:839

1623 msgid ""

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

1625 "Everything below will be removed."

1626 msgstr ""

1627

1628 -#: wt-status.c:933

1628 +#: wt-status.c:930

1629 msgid "You have unmerged paths."

1630 msgstr ""

1631

1632 -#: wt-status.c:936

1632 +#: wt-status.c:933

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

1634 msgstr ""

1635

1636 -#: wt-status.c:939

1636 +#: wt-status.c:936

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

1638 msgstr ""

1639

1640 -#: wt-status.c:942

1640 +#: wt-status.c:939

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

1642 msgstr ""

1643

1644 -#: wt-status.c:952

1644 +#: wt-status.c:949

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

1646 msgstr ""

1647

1648 -#: wt-status.c:955

1648 +#: wt-status.c:952

1649 msgid "The current patch is empty."

1650 msgstr ""

1651

1652 -#: wt-status.c:959

1652 +#: wt-status.c:956

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

1654 msgstr ""

1655

1656 -#: wt-status.c:961

1656 +#: wt-status.c:958

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

1658 msgstr ""

1659

1660 -#: wt-status.c:963

1660 +#: wt-status.c:960

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

1662 msgstr ""

1663

1664 -#: wt-status.c:1023 wt-status.c:1040

1664 +#: wt-status.c:1020 wt-status.c:1037

1665 #, c-format

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

1667 msgstr ""

1668

1669 -#: wt-status.c:1028 wt-status.c:1045

1669 +#: wt-status.c:1025 wt-status.c:1042

1670 msgid "You are currently rebasing."

1671 msgstr ""

1672

1673 -#: wt-status.c:1031

1673 +#: wt-status.c:1028

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

1675 msgstr ""

1676

1677 -#: wt-status.c:1033

1677 +#: wt-status.c:1030

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

1679 msgstr ""

1680

1681 -#: wt-status.c:1035

1681 +#: wt-status.c:1032

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

1683 msgstr ""

1684

1685 -#: wt-status.c:1048

1685 +#: wt-status.c:1045

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

1687 msgstr ""

1688

1689 -#: wt-status.c:1052

1689 +#: wt-status.c:1049

1690 #, c-format

1691 msgid ""

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

1693 msgstr ""

1694

1695 -#: wt-status.c:1057

1695 +#: wt-status.c:1054

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

1697 msgstr ""

1698

1699 -#: wt-status.c:1060

1699 +#: wt-status.c:1057

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

1701 msgstr ""

1702

1703 -#: wt-status.c:1064

1703 +#: wt-status.c:1061

1704 #, c-format

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

1706 msgstr ""

1707

1708 -#: wt-status.c:1069

1708 +#: wt-status.c:1066

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

1710 msgstr ""

1711

1712 -#: wt-status.c:1072

1712 +#: wt-status.c:1069

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

1714 msgstr ""

1715

1716 -#: wt-status.c:1074

1716 +#: wt-status.c:1071

1717 msgid ""

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

1719 msgstr ""

1720

1721 -#: wt-status.c:1084

1721 +#: wt-status.c:1081

1722 #, c-format

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

1724 msgstr ""

1725

1726 -#: wt-status.c:1089

1726 +#: wt-status.c:1086

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

1728 msgstr ""

1729

1730 -#: wt-status.c:1092

1730 +#: wt-status.c:1089

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

1732 msgstr ""

1733

1734 -#: wt-status.c:1094

1734 +#: wt-status.c:1091

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

1736 msgstr ""

1737

1738 -#: wt-status.c:1103

1738 +#: wt-status.c:1100

1739 #, c-format

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

1741 msgstr ""

1742

1743 -#: wt-status.c:1108

1743 +#: wt-status.c:1105

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

1745 msgstr ""

1746

1747 -#: wt-status.c:1111

1747 +#: wt-status.c:1108

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

1749 msgstr ""

1750

1751 -#: wt-status.c:1113

1751 +#: wt-status.c:1110

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

1753 msgstr ""

1754

1755 -#: wt-status.c:1124

1755 +#: wt-status.c:1121

1756 #, c-format

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

1758 msgstr ""

1759

1760 -#: wt-status.c:1128

1760 +#: wt-status.c:1125

1761 msgid "You are currently bisecting."

1762 msgstr ""

1763

1764 -#: wt-status.c:1131

1764 +#: wt-status.c:1128

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

1766 msgstr ""

1767

1768 -#: wt-status.c:1306

1768 +#: wt-status.c:1303

1769 msgid "On branch "

1770 msgstr ""

1771

1772 -#: wt-status.c:1313

1772 +#: wt-status.c:1310

1773 msgid "rebase in progress; onto "

1774 msgstr ""

1775

1776 -#: wt-status.c:1320

1776 +#: wt-status.c:1317

1777 msgid "HEAD detached at "

1778 msgstr ""

1779

1780 -#: wt-status.c:1322

1780 +#: wt-status.c:1319

1781 msgid "HEAD detached from "

1782 msgstr ""

1783

1784 -#: wt-status.c:1325

1784 +#: wt-status.c:1322

1785 msgid "Not currently on any branch."

1786 msgstr ""

1787

1788 -#: wt-status.c:1342

1788 +#: wt-status.c:1339

1789 msgid "Initial commit"

1790 msgstr ""

1791

1792 -#: wt-status.c:1356

1792 +#: wt-status.c:1353

1793 msgid "Untracked files"

1794 msgstr ""

1795

1796 -#: wt-status.c:1358

1796 +#: wt-status.c:1355

1797 msgid "Ignored files"

1798 msgstr ""

1799

1800 -#: wt-status.c:1362

1800 +#: wt-status.c:1359

1801 #, c-format

1802 msgid ""

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

@@ -1805,78 +1805,78 @@ msgid ""

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

1806 msgstr ""

1807

1808 -#: wt-status.c:1368

1808 +#: wt-status.c:1365

1809 #, c-format

1810 msgid "Untracked files not listed%s"

1811 msgstr ""

1812

1813 -#: wt-status.c:1370

1813 +#: wt-status.c:1367

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

1815 msgstr ""

1816

1817 -#: wt-status.c:1376

1817 +#: wt-status.c:1373

1818 msgid "No changes"

1819 msgstr ""

1820

1821 -#: wt-status.c:1381

1821 +#: wt-status.c:1378

1822 #, c-format

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

1824 msgstr ""

1825

1826 -#: wt-status.c:1384

1826 +#: wt-status.c:1381

1827 #, c-format

1828 msgid "no changes added to commit\n"

1829 msgstr ""

1830

1831 -#: wt-status.c:1387

1831 +#: wt-status.c:1384

1832 #, c-format

1833 msgid ""

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

1835 "track)\n"

1836 msgstr ""

1837

1838 -#: wt-status.c:1390

1838 +#: wt-status.c:1387

1839 #, c-format

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

1841 msgstr ""

1842

1843 -#: wt-status.c:1393

1843 +#: wt-status.c:1390

1844 #, c-format

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

1846 msgstr ""

1847

1848 -#: wt-status.c:1396 wt-status.c:1401

1848 +#: wt-status.c:1393 wt-status.c:1398

1849 #, c-format

1850 msgid "nothing to commit\n"

1851 msgstr ""

1852

1853 -#: wt-status.c:1399

1853 +#: wt-status.c:1396

1854 #, c-format

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

1856 msgstr ""

1857

1858 -#: wt-status.c:1403

1858 +#: wt-status.c:1400

1859 #, c-format

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

1861 msgstr ""

1862

1863 -#: wt-status.c:1512

1863 +#: wt-status.c:1509

1864 msgid "HEAD (no branch)"

1865 msgstr ""

1866

1867 -#: wt-status.c:1518

1867 +#: wt-status.c:1515

1868 msgid "Initial commit on "

1869 msgstr ""

1870

1871 -#: wt-status.c:1550

1871 +#: wt-status.c:1547

1872 msgid "gone"

1873 msgstr ""

1874

1875 -#: wt-status.c:1552 wt-status.c:1560

1875 +#: wt-status.c:1549 wt-status.c:1557

1876 msgid "behind "

1877 msgstr ""

1878

1879 -#: compat/precompose_utf8.c:55 builtin/clone.c:357

1879 +#: compat/precompose_utf8.c:55 builtin/clone.c:360

1880 #, c-format

1881 msgid "failed to unlink '%s'"

1882 msgstr ""

@@ -1935,13 +1935,13 @@ msgid "The following paths are ignored by one of your .gitignore files:\n"

1935 msgstr ""

1936

1937 #: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:110

1938 -#: builtin/prune-packed.c:55 builtin/push.c:499 builtin/remote.c:1375

1938 +#: builtin/prune-packed.c:55 builtin/push.c:499 builtin/remote.c:1370

1939 #: builtin/rm.c:269

1940 msgid "dry run"

1941 msgstr ""

1942

1943 #: builtin/add.c:249 builtin/apply.c:4415 builtin/check-ignore.c:19

1944 -#: builtin/commit.c:1362 builtin/count-objects.c:63 builtin/fsck.c:608

1944 +#: builtin/commit.c:1326 builtin/count-objects.c:63 builtin/fsck.c:608

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

1946 msgid "be verbose"

1947 msgstr ""

@@ -1950,7 +1950,7 @@ msgstr ""

1950 msgid "interactive picking"

1951 msgstr ""

1952

1953 -#: builtin/add.c:252 builtin/checkout.c:1108 builtin/reset.c:286

1953 +#: builtin/add.c:252 builtin/checkout.c:1126 builtin/reset.c:286

1954 msgid "select hunks interactively"

1955 msgstr ""

1956

@@ -1995,10 +1995,6 @@ msgstr ""

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

1996 msgstr ""

1997

1998 -#: builtin/add.c:287

1999 -msgid "no files added"

2000 -msgstr ""

2001 -

1998 #: builtin/add.c:293

1999 msgid "adding files failed"

2000 msgstr ""

@@ -2271,7 +2267,7 @@ msgstr ""

2267 msgid "Checking patch %s..."

2268 msgstr ""

2269

2274 -#: builtin/apply.c:3746 builtin/checkout.c:213 builtin/reset.c:135

2270 +#: builtin/apply.c:3746 builtin/checkout.c:231 builtin/reset.c:135

2271 #, c-format

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

2273 msgstr ""

@@ -2350,7 +2346,7 @@ msgstr ""

2346 msgid "unable to read index file"

2347 msgstr ""

2348

2353 -#: builtin/apply.c:4362 builtin/apply.c:4365 builtin/clone.c:91

2349 +#: builtin/apply.c:4362 builtin/apply.c:4365 builtin/clone.c:92

2350 #: builtin/fetch.c:93

2351 msgid "path"

2352 msgstr ""

@@ -2883,8 +2879,8 @@ msgid "act on remote-tracking branches"

2879 msgstr ""

2880

2881 #: builtin/branch.c:827 builtin/branch.c:833 builtin/branch.c:854

2886 -#: builtin/branch.c:860 builtin/commit.c:1622 builtin/commit.c:1623

2887 -#: builtin/commit.c:1624 builtin/commit.c:1625 builtin/tag.c:616

2882 +#: builtin/branch.c:860 builtin/commit.c:1586 builtin/commit.c:1587

2883 +#: builtin/commit.c:1588 builtin/commit.c:1589 builtin/tag.c:616

2884 #: builtin/tag.c:622

2885 msgid "commit"

2886 msgstr ""

@@ -2930,7 +2926,7 @@ msgid "edit the description for the branch"

2926 msgstr ""

2927

2928 #: builtin/branch.c:851

2933 -msgid "force creation (when already exists)"

2929 +msgid "force creation, move/rename, deletion"

2930 msgstr ""

2931

2932 #: builtin/branch.c:854

@@ -2949,7 +2945,7 @@ msgstr ""

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

2946 msgstr ""

2947

2952 -#: builtin/branch.c:881 builtin/clone.c:634

2948 +#: builtin/branch.c:881 builtin/clone.c:637

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

2950 msgstr ""

2951

@@ -2957,81 +2953,81 @@ msgstr ""

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

2954 msgstr ""

2955

2960 -#: builtin/branch.c:909 builtin/branch.c:948

2956 +#: builtin/branch.c:914 builtin/branch.c:953

2957 msgid "branch name required"

2958 msgstr ""

2959

2964 -#: builtin/branch.c:924

2960 +#: builtin/branch.c:929

2961 msgid "Cannot give description to detached HEAD"

2962 msgstr ""

2963

2968 -#: builtin/branch.c:929

2964 +#: builtin/branch.c:934

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

2966 msgstr ""

2967

2972 -#: builtin/branch.c:936

2968 +#: builtin/branch.c:941

2969 #, c-format

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

2971 msgstr ""

2972

2977 -#: builtin/branch.c:939

2973 +#: builtin/branch.c:944

2974 #, c-format

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

2976 msgstr ""

2977

2982 -#: builtin/branch.c:954

2978 +#: builtin/branch.c:959

2979 msgid "too many branches for a rename operation"

2980 msgstr ""

2981

2986 -#: builtin/branch.c:959

2982 +#: builtin/branch.c:964

2983 msgid "too many branches to set new upstream"

2984 msgstr ""

2985

2990 -#: builtin/branch.c:963

2986 +#: builtin/branch.c:968

2987 #, c-format

2988 msgid ""

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

2990 msgstr ""

2991

2996 -#: builtin/branch.c:966 builtin/branch.c:988 builtin/branch.c:1009

2992 +#: builtin/branch.c:971 builtin/branch.c:993 builtin/branch.c:1014

2993 #, c-format

2994 msgid "no such branch '%s'"

2995 msgstr ""

2996

3001 -#: builtin/branch.c:970

2997 +#: builtin/branch.c:975

2998 #, c-format

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

3000 msgstr ""

3001

3006 -#: builtin/branch.c:982

3002 +#: builtin/branch.c:987

3003 msgid "too many branches to unset upstream"

3004 msgstr ""

3005

3010 -#: builtin/branch.c:986

3006 +#: builtin/branch.c:991

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

3008 msgstr ""

3009

3014 -#: builtin/branch.c:992

3010 +#: builtin/branch.c:997

3011 #, c-format

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

3013 msgstr ""

3014

3019 -#: builtin/branch.c:1006

3015 +#: builtin/branch.c:1011

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

3017 msgstr ""

3018

3023 -#: builtin/branch.c:1012

3019 +#: builtin/branch.c:1017

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

3021 msgstr ""

3022

3027 -#: builtin/branch.c:1015

3023 +#: builtin/branch.c:1020

3024 #, c-format

3025 msgid ""

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

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

3028 msgstr ""

3029

3034 -#: builtin/branch.c:1032

3030 +#: builtin/branch.c:1037

3031 #, c-format

3032 msgid ""

3033 "\n"

@@ -3039,12 +3035,12 @@ msgid ""

3035 "\n"

3036 msgstr ""

3037

3042 -#: builtin/branch.c:1033

3038 +#: builtin/branch.c:1038

3039 #, c-format

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

3041 msgstr ""

3042

3047 -#: builtin/branch.c:1034

3043 +#: builtin/branch.c:1039

3044 #, c-format

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

3046 msgstr ""

@@ -3126,7 +3122,7 @@ msgstr ""

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

3123 msgstr ""

3124

3129 -#: builtin/check-ignore.c:18 builtin/checkout.c:1089 builtin/gc.c:274

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

3126 msgid "suppress progress reporting"

3127 msgstr ""

3128

@@ -3231,105 +3227,105 @@ msgstr ""

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

3228 msgstr ""

3229

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

3230 +#: builtin/checkout.c:132 builtin/checkout.c:165

3231 #, c-format

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

3233 msgstr ""

3234

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

3235 +#: builtin/checkout.c:134 builtin/checkout.c:167

3236 #, c-format

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

3238 msgstr ""

3239

3244 -#: builtin/checkout.c:132

3240 +#: builtin/checkout.c:150

3241 #, c-format

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

3243 msgstr ""

3244

3249 -#: builtin/checkout.c:176

3245 +#: builtin/checkout.c:194

3246 #, c-format

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

3248 msgstr ""

3249

3254 -#: builtin/checkout.c:193

3250 +#: builtin/checkout.c:211

3251 #, c-format

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

3253 msgstr ""

3254

3259 -#: builtin/checkout.c:210

3255 +#: builtin/checkout.c:228

3256 #, c-format

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

3258 msgstr ""

3259

3264 -#: builtin/checkout.c:231 builtin/checkout.c:234 builtin/checkout.c:237

3265 -#: builtin/checkout.c:240

3260 +#: builtin/checkout.c:249 builtin/checkout.c:252 builtin/checkout.c:255

3261 +#: builtin/checkout.c:258

3262 #, c-format

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

3264 msgstr ""

3265

3270 -#: builtin/checkout.c:243 builtin/checkout.c:246

3266 +#: builtin/checkout.c:261 builtin/checkout.c:264

3267 #, c-format

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

3269 msgstr ""

3270

3275 -#: builtin/checkout.c:249

3271 +#: builtin/checkout.c:267

3272 #, c-format

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

3274 msgstr ""

3275

3280 -#: builtin/checkout.c:260 builtin/checkout.c:449

3276 +#: builtin/checkout.c:278 builtin/checkout.c:467

3277 msgid "corrupt index file"

3278 msgstr ""

3279

3284 -#: builtin/checkout.c:320 builtin/checkout.c:327

3280 +#: builtin/checkout.c:338 builtin/checkout.c:345

3281 #, c-format

3282 msgid "path '%s' is unmerged"

3283 msgstr ""

3284

3289 -#: builtin/checkout.c:471

3285 +#: builtin/checkout.c:489

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

3287 msgstr ""

3288

3293 -#: builtin/checkout.c:597

3289 +#: builtin/checkout.c:615

3290 #, c-format

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

3292 msgstr ""

3293

3298 -#: builtin/checkout.c:635

3294 +#: builtin/checkout.c:653

3295 msgid "HEAD is now at"

3296 msgstr ""

3297

3302 -#: builtin/checkout.c:642

3298 +#: builtin/checkout.c:660

3299 #, c-format

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

3301 msgstr ""

3302

3307 -#: builtin/checkout.c:645

3303 +#: builtin/checkout.c:663

3304 #, c-format

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

3306 msgstr ""

3307

3312 -#: builtin/checkout.c:649

3308 +#: builtin/checkout.c:667

3309 #, c-format

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

3311 msgstr ""

3312

3317 -#: builtin/checkout.c:651 builtin/checkout.c:1032

3313 +#: builtin/checkout.c:669 builtin/checkout.c:1050

3314 #, c-format

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

3316 msgstr ""

3317

3322 -#: builtin/checkout.c:653

3318 +#: builtin/checkout.c:671

3319 #, c-format

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

3321 msgstr ""

3322

3327 -#: builtin/checkout.c:705

3323 +#: builtin/checkout.c:723

3324 #, c-format

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

3326 msgstr ""

3327

3332 -#: builtin/checkout.c:711

3328 +#: builtin/checkout.c:729

3329 #, c-format

3330 msgid ""

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

@@ -3344,7 +3340,7 @@ msgid_plural ""

3340 msgstr[0] ""

3341 msgstr[1] ""

3342

3347 -#: builtin/checkout.c:729

3343 +#: builtin/checkout.c:747

3344 #, c-format

3345 msgid ""

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

@@ -3354,151 +3350,151 @@ msgid ""

3350 "\n"

3351 msgstr ""

3352

3357 -#: builtin/checkout.c:759

3353 +#: builtin/checkout.c:777

3354 msgid "internal error in revision walk"

3355 msgstr ""

3356

3361 -#: builtin/checkout.c:763

3357 +#: builtin/checkout.c:781

3358 msgid "Previous HEAD position was"

3359 msgstr ""

3360

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

3361 +#: builtin/checkout.c:808 builtin/checkout.c:1045

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

3363 msgstr ""

3364

3369 -#: builtin/checkout.c:934

3365 +#: builtin/checkout.c:952

3366 #, c-format

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

3368 msgstr ""

3369

3374 -#: builtin/checkout.c:973

3370 +#: builtin/checkout.c:991

3371 #, c-format

3372 msgid "invalid reference: %s"

3373 msgstr ""

3374

3379 -#: builtin/checkout.c:1002

3375 +#: builtin/checkout.c:1020

3376 #, c-format

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

3378 msgstr ""

3379

3384 -#: builtin/checkout.c:1041

3380 +#: builtin/checkout.c:1059

3381 msgid "paths cannot be used with switching branches"

3382 msgstr ""

3383

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

3384 +#: builtin/checkout.c:1062 builtin/checkout.c:1066

3385 #, c-format

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

3387 msgstr ""

3388

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

3394 -#: builtin/checkout.c:1063

3389 +#: builtin/checkout.c:1070 builtin/checkout.c:1073 builtin/checkout.c:1078

3390 +#: builtin/checkout.c:1081

3391 #, c-format

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

3393 msgstr ""

3394

3399 -#: builtin/checkout.c:1068

3395 +#: builtin/checkout.c:1086

3396 #, c-format

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

3398 msgstr ""

3399

3404 -#: builtin/checkout.c:1090 builtin/checkout.c:1092 builtin/clone.c:89

3400 +#: builtin/checkout.c:1108 builtin/checkout.c:1110 builtin/clone.c:90

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

3402 msgid "branch"

3403 msgstr ""

3404

3409 -#: builtin/checkout.c:1091

3405 +#: builtin/checkout.c:1109

3406 msgid "create and checkout a new branch"

3407 msgstr ""

3408

3413 -#: builtin/checkout.c:1093

3409 +#: builtin/checkout.c:1111

3410 msgid "create/reset and checkout a branch"

3411 msgstr ""

3412

3417 -#: builtin/checkout.c:1094

3413 +#: builtin/checkout.c:1112

3414 msgid "create reflog for new branch"

3415 msgstr ""

3416

3421 -#: builtin/checkout.c:1095

3417 +#: builtin/checkout.c:1113

3418 msgid "detach the HEAD at named commit"

3419 msgstr ""

3420

3425 -#: builtin/checkout.c:1096

3421 +#: builtin/checkout.c:1114

3422 msgid "set upstream info for new branch"

3423 msgstr ""

3424

3429 -#: builtin/checkout.c:1098

3425 +#: builtin/checkout.c:1116

3426 msgid "new-branch"

3427 msgstr ""

3428

3433 -#: builtin/checkout.c:1098

3429 +#: builtin/checkout.c:1116

3430 msgid "new unparented branch"

3431 msgstr ""

3432

3437 -#: builtin/checkout.c:1099

3433 +#: builtin/checkout.c:1117

3434 msgid "checkout our version for unmerged files"

3435 msgstr ""

3436

3441 -#: builtin/checkout.c:1101

3437 +#: builtin/checkout.c:1119

3438 msgid "checkout their version for unmerged files"

3439 msgstr ""

3440

3445 -#: builtin/checkout.c:1103

3441 +#: builtin/checkout.c:1121

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

3443 msgstr ""

3444

3449 -#: builtin/checkout.c:1104

3445 +#: builtin/checkout.c:1122

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

3447 msgstr ""

3448

3453 -#: builtin/checkout.c:1105 builtin/merge.c:226

3449 +#: builtin/checkout.c:1123 builtin/merge.c:227

3450 msgid "update ignored files (default)"

3451 msgstr ""

3452

3457 -#: builtin/checkout.c:1106 builtin/log.c:1239 parse-options.h:245

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

3454 msgid "style"

3455 msgstr ""

3456

3461 -#: builtin/checkout.c:1107

3457 +#: builtin/checkout.c:1125

3458 msgid "conflict style (merge or diff3)"

3459 msgstr ""

3460

3465 -#: builtin/checkout.c:1110

3461 +#: builtin/checkout.c:1128

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

3463 msgstr ""

3464

3469 -#: builtin/checkout.c:1112

3465 +#: builtin/checkout.c:1130

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

3467 msgstr ""

3468

3473 -#: builtin/checkout.c:1135

3469 +#: builtin/checkout.c:1153

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

3471 msgstr ""

3472

3477 -#: builtin/checkout.c:1152

3473 +#: builtin/checkout.c:1170

3474 msgid "--track needs a branch name"

3475 msgstr ""

3476

3481 -#: builtin/checkout.c:1157

3477 +#: builtin/checkout.c:1175

3478 msgid "Missing branch name; try -b"

3479 msgstr ""

3480

3485 -#: builtin/checkout.c:1194

3481 +#: builtin/checkout.c:1212

3482 msgid "invalid path specification"

3483 msgstr ""

3484

3489 -#: builtin/checkout.c:1201

3485 +#: builtin/checkout.c:1219

3486 #, c-format

3487 msgid ""

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

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

3490 msgstr ""

3491

3496 -#: builtin/checkout.c:1206

3492 +#: builtin/checkout.c:1224

3493 #, c-format

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

3495 msgstr ""

3496

3501 -#: builtin/checkout.c:1210

3497 +#: builtin/checkout.c:1228

3498 msgid ""

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

3500 "checking out of the index."

@@ -3664,254 +3660,270 @@ msgstr ""

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

3661 msgstr ""

3662

3667 -#: builtin/clone.c:65 builtin/fetch.c:112 builtin/merge.c:223

3663 +#: builtin/clone.c:66 builtin/fetch.c:112 builtin/merge.c:224

3664 #: builtin/push.c:514

3665 msgid "force progress reporting"

3666 msgstr ""

3667

3672 -#: builtin/clone.c:67

3668 +#: builtin/clone.c:68

3669 msgid "don't create a checkout"

3670 msgstr ""

3671

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

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

3673 msgid "create a bare repository"

3674 msgstr ""

3675

3680 -#: builtin/clone.c:72

3676 +#: builtin/clone.c:73

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

3678 msgstr ""

3679

3684 -#: builtin/clone.c:74

3680 +#: builtin/clone.c:75

3681 msgid "to clone from a local repository"

3682 msgstr ""

3683

3688 -#: builtin/clone.c:76

3684 +#: builtin/clone.c:77

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

3686 msgstr ""

3687

3692 -#: builtin/clone.c:78

3688 +#: builtin/clone.c:79

3689 msgid "setup as shared repository"

3690 msgstr ""

3691

3696 -#: builtin/clone.c:80 builtin/clone.c:82

3692 +#: builtin/clone.c:81 builtin/clone.c:83

3693 msgid "initialize submodules in the clone"

3694 msgstr ""

3695

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

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

3697 msgid "template-directory"

3698 msgstr ""

3699

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

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

3701 msgid "directory from which templates will be used"

3702 msgstr ""

3703

3708 -#: builtin/clone.c:86

3704 +#: builtin/clone.c:87

3705 msgid "reference repository"

3706 msgstr ""

3707

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

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

3709 msgid "name"

3710 msgstr ""

3711

3716 -#: builtin/clone.c:88

3712 +#: builtin/clone.c:89

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

3714 msgstr ""

3715

3720 -#: builtin/clone.c:90

3716 +#: builtin/clone.c:91

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

3718 msgstr ""

3719

3724 -#: builtin/clone.c:92

3720 +#: builtin/clone.c:93

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

3722 msgstr ""

3723

3728 -#: builtin/clone.c:93 builtin/fetch.c:113 builtin/grep.c:659

3724 +#: builtin/clone.c:94 builtin/fetch.c:113 builtin/grep.c:659

3725 msgid "depth"

3726 msgstr ""

3727

3732 -#: builtin/clone.c:94

3728 +#: builtin/clone.c:95

3729 msgid "create a shallow clone of that depth"

3730 msgstr ""

3731

3736 -#: builtin/clone.c:96

3732 +#: builtin/clone.c:97

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

3734 msgstr ""

3735

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

3736 +#: builtin/clone.c:99

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

3738 +msgstr ""

3739 +

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

3741 msgid "gitdir"

3742 msgstr ""

3743

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

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

3745 msgid "separate git dir from working tree"

3746 msgstr ""

3747

3748 -#: builtin/clone.c:99

3748 +#: builtin/clone.c:102

3749 msgid "key=value"

3750 msgstr ""

3751

3752 -#: builtin/clone.c:100

3752 +#: builtin/clone.c:103

3753 msgid "set config inside the new repository"

3754 msgstr ""

3755

3756 -#: builtin/clone.c:253

3756 +#: builtin/clone.c:256

3757 #, c-format

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

3759 msgstr ""

3760

3761 -#: builtin/clone.c:257

3761 +#: builtin/clone.c:260

3762 #, c-format

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

3764 msgstr ""

3765

3766 -#: builtin/clone.c:260

3766 +#: builtin/clone.c:263

3767 #, c-format

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

3769 msgstr ""

3770

3771 -#: builtin/clone.c:322

3771 +#: builtin/clone.c:325

3772 #, c-format

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

3774 msgstr ""

3775

3776 -#: builtin/clone.c:324 builtin/diff.c:84

3776 +#: builtin/clone.c:327 builtin/diff.c:84

3777 #, c-format

3778 msgid "failed to stat '%s'"

3779 msgstr ""

3780

3781 -#: builtin/clone.c:326

3781 +#: builtin/clone.c:329

3782 #, c-format

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

3784 msgstr ""

3785

3786 -#: builtin/clone.c:340

3786 +#: builtin/clone.c:343

3787 #, c-format

3788 msgid "failed to stat %s\n"

3789 msgstr ""

3790

3791 -#: builtin/clone.c:362

3791 +#: builtin/clone.c:365

3792 #, c-format

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

3794 msgstr ""

3795

3796 -#: builtin/clone.c:366

3796 +#: builtin/clone.c:369

3797 #, c-format

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

3799 msgstr ""

3800

3801 -#: builtin/clone.c:389 builtin/clone.c:563

3801 +#: builtin/clone.c:392 builtin/clone.c:566

3802 #, c-format

3803 msgid "done.\n"

3804 msgstr ""

3805

3806 -#: builtin/clone.c:401

3806 +#: builtin/clone.c:404

3807 msgid ""

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

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

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

3811 msgstr ""

3812

3813 -#: builtin/clone.c:478

3813 +#: builtin/clone.c:481

3814 #, c-format

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

3816 msgstr ""

3817

3818 -#: builtin/clone.c:558

3818 +#: builtin/clone.c:561

3819 #, c-format

3820 msgid "Checking connectivity... "

3821 msgstr ""

3822

3823 -#: builtin/clone.c:561

3823 +#: builtin/clone.c:564

3824 msgid "remote did not send all necessary objects"

3825 msgstr ""

3826

3827 -#: builtin/clone.c:625

3827 +#: builtin/clone.c:628

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

3829 msgstr ""

3830

3831 -#: builtin/clone.c:656

3831 +#: builtin/clone.c:659

3832 msgid "unable to checkout working tree"

3833 msgstr ""

3834

3835 -#: builtin/clone.c:765

3835 +#: builtin/clone.c:746

3836 +msgid "cannot repack to clean up"

3837 +msgstr ""

3838 +

3839 +#: builtin/clone.c:748

3840 +msgid "cannot unlink temporary alternates file"

3841 +msgstr ""

3842 +

3843 +#: builtin/clone.c:778

3844 msgid "Too many arguments."

3845 msgstr ""

3846

3839 -#: builtin/clone.c:769

3847 +#: builtin/clone.c:782

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

3849 msgstr ""

3850

3843 -#: builtin/clone.c:780

3851 +#: builtin/clone.c:793

3852 #, c-format

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

3854 msgstr ""

3855

3848 -#: builtin/clone.c:783

3856 +#: builtin/clone.c:796

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

3858 msgstr ""

3859

3852 -#: builtin/clone.c:796

3860 +#: builtin/clone.c:809

3861 #, c-format

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

3863 msgstr ""

3864

3857 -#: builtin/clone.c:802 builtin/fetch.c:1155

3865 +#: builtin/clone.c:815 builtin/fetch.c:1155

3866 #, c-format

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

3868 msgstr ""

3869

3862 -#: builtin/clone.c:812

3870 +#: builtin/clone.c:825

3871 #, c-format

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

3873 msgstr ""

3874

3867 -#: builtin/clone.c:822

3875 +#: builtin/clone.c:835

3876 #, c-format

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

3878 msgstr ""

3879

3872 -#: builtin/clone.c:835 builtin/clone.c:847

3880 +#: builtin/clone.c:848 builtin/clone.c:860

3881 #, c-format

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

3883 msgstr ""

3884

3877 -#: builtin/clone.c:838

3885 +#: builtin/clone.c:851

3886 #, c-format

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

3888 msgstr ""

3889

3882 -#: builtin/clone.c:857

3890 +#: builtin/clone.c:870

3891 #, c-format

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

3893 msgstr ""

3894

3887 -#: builtin/clone.c:859

3895 +#: builtin/clone.c:872

3896 #, c-format

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

3898 msgstr ""

3899

3892 -#: builtin/clone.c:895

3900 +#: builtin/clone.c:897

3901 +msgid "--dissociate given, but there is no --reference"

3902 +msgstr ""

3903 +

3904 +#: builtin/clone.c:912

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

3906 msgstr ""

3907

3896 -#: builtin/clone.c:898

3908 +#: builtin/clone.c:915

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

3910 msgstr ""

3911

3900 -#: builtin/clone.c:903

3912 +#: builtin/clone.c:920

3913 msgid "--local is ignored"

3914 msgstr ""

3915

3904 -#: builtin/clone.c:907

3916 +#: builtin/clone.c:924

3917 #, c-format

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

3919 msgstr ""

3920

3909 -#: builtin/clone.c:958 builtin/clone.c:966

3921 +#: builtin/clone.c:975 builtin/clone.c:983

3922 #, c-format

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

3924 msgstr ""

3925

3914 -#: builtin/clone.c:969

3926 +#: builtin/clone.c:986

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

3928 msgstr ""

3929

@@ -4058,73 +4070,68 @@ msgstr ""

4070 msgid "unable to write temporary index file"

4071 msgstr ""

4072

4061 -#: builtin/commit.c:592

4073 +#: builtin/commit.c:584

4074 #, c-format

4075 msgid "commit '%s' lacks author header"

4076 msgstr ""

4077

4066 -#: builtin/commit.c:594

4078 +#: builtin/commit.c:586

4079 #, c-format

4080 msgid "commit '%s' has malformed author line"

4081 msgstr ""

4082

4071 -#: builtin/commit.c:613

4083 +#: builtin/commit.c:605

4084 msgid "malformed --author parameter"

4085 msgstr ""

4086

4075 -#: builtin/commit.c:621

4087 +#: builtin/commit.c:613

4088 #, c-format

4089 msgid "invalid date format: %s"

4090 msgstr ""

4091

4080 -#: builtin/commit.c:642

4081 -#, c-format

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

4083 -msgstr ""

4084 -

4085 -#: builtin/commit.c:675

4092 +#: builtin/commit.c:657

4093 msgid ""

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

4095 "in the current commit message"

4096 msgstr ""

4097

4091 -#: builtin/commit.c:712 builtin/commit.c:745 builtin/commit.c:1120

4098 +#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1084

4099 #, c-format

4100 msgid "could not lookup commit %s"

4101 msgstr ""

4102

4096 -#: builtin/commit.c:724 builtin/shortlog.c:273

4103 +#: builtin/commit.c:706 builtin/shortlog.c:273

4104 #, c-format

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

4106 msgstr ""

4107

4101 -#: builtin/commit.c:726

4108 +#: builtin/commit.c:708

4109 msgid "could not read log from standard input"

4110 msgstr ""

4111

4105 -#: builtin/commit.c:730

4112 +#: builtin/commit.c:712

4113 #, c-format

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

4115 msgstr ""

4116

4110 -#: builtin/commit.c:752

4117 +#: builtin/commit.c:734

4118 msgid "could not read MERGE_MSG"

4119 msgstr ""

4120

4114 -#: builtin/commit.c:756

4121 +#: builtin/commit.c:738

4122 msgid "could not read SQUASH_MSG"

4123 msgstr ""

4124

4118 -#: builtin/commit.c:760

4125 +#: builtin/commit.c:742

4126 #, c-format

4127 msgid "could not read '%s'"

4128 msgstr ""

4129

4123 -#: builtin/commit.c:831

4130 +#: builtin/commit.c:789

4131 msgid "could not write commit template"

4132 msgstr ""

4133

4127 -#: builtin/commit.c:849

4134 +#: builtin/commit.c:807

4135 #, c-format

4136 msgid ""

4137 "\n"

@@ -4134,7 +4141,7 @@ msgid ""

4141 "and try again.\n"

4142 msgstr ""

4143

4137 -#: builtin/commit.c:854

4144 +#: builtin/commit.c:812

4145 #, c-format

4146 msgid ""

4147 "\n"

@@ -4144,14 +4151,14 @@ msgid ""

4151 "and try again.\n"

4152 msgstr ""

4153

4147 -#: builtin/commit.c:867

4154 +#: builtin/commit.c:825

4155 #, c-format

4156 msgid ""

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

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

4159 msgstr ""

4160

4154 -#: builtin/commit.c:874

4161 +#: builtin/commit.c:832

4162 #, c-format

4163 msgid ""

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

@@ -4159,348 +4166,348 @@ msgid ""

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

4167 msgstr ""

4168

4162 -#: builtin/commit.c:888

4169 +#: builtin/commit.c:852

4170 #, c-format

4171 msgid "%sAuthor: %.*s <%.*s>"

4172 msgstr ""

4173

4167 -#: builtin/commit.c:896

4174 +#: builtin/commit.c:860

4175 #, c-format

4176 msgid "%sDate: %s"

4177 msgstr ""

4178

4172 -#: builtin/commit.c:903

4179 +#: builtin/commit.c:867

4180 #, c-format

4181 msgid "%sCommitter: %.*s <%.*s>"

4182 msgstr ""

4183

4177 -#: builtin/commit.c:921

4184 +#: builtin/commit.c:885

4185 msgid "Cannot read index"

4186 msgstr ""

4187

4181 -#: builtin/commit.c:978

4188 +#: builtin/commit.c:942

4189 msgid "Error building trees"

4190 msgstr ""

4191

4185 -#: builtin/commit.c:993 builtin/tag.c:495

4192 +#: builtin/commit.c:957 builtin/tag.c:495

4193 #, c-format

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

4195 msgstr ""

4196

4190 -#: builtin/commit.c:1095

4197 +#: builtin/commit.c:1059

4198 #, c-format

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

4200 msgstr ""

4201

4195 -#: builtin/commit.c:1110 builtin/commit.c:1350

4202 +#: builtin/commit.c:1074 builtin/commit.c:1314

4203 #, c-format

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

4205 msgstr ""

4206

4200 -#: builtin/commit.c:1147

4207 +#: builtin/commit.c:1111

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

4209 msgstr ""

4210

4204 -#: builtin/commit.c:1177

4211 +#: builtin/commit.c:1141

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

4213 msgstr ""

4214

4208 -#: builtin/commit.c:1186

4215 +#: builtin/commit.c:1150

4216 msgid "You have nothing to amend."

4217 msgstr ""

4218

4212 -#: builtin/commit.c:1189

4219 +#: builtin/commit.c:1153

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

4221 msgstr ""

4222

4216 -#: builtin/commit.c:1191

4223 +#: builtin/commit.c:1155

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

4225 msgstr ""

4226

4220 -#: builtin/commit.c:1194

4227 +#: builtin/commit.c:1158

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

4229 msgstr ""

4230

4224 -#: builtin/commit.c:1204

4231 +#: builtin/commit.c:1168

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

4233 msgstr ""

4234

4228 -#: builtin/commit.c:1206

4235 +#: builtin/commit.c:1170

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

4237 msgstr ""

4238

4232 -#: builtin/commit.c:1214

4239 +#: builtin/commit.c:1178

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

4241 msgstr ""

4242

4236 -#: builtin/commit.c:1231

4243 +#: builtin/commit.c:1195

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

4245 msgstr ""

4246

4240 -#: builtin/commit.c:1233

4247 +#: builtin/commit.c:1197

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

4249 msgstr ""

4250

4244 -#: builtin/commit.c:1235

4251 +#: builtin/commit.c:1199

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

4253 msgstr ""

4254

4248 -#: builtin/commit.c:1237

4255 +#: builtin/commit.c:1201

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

4257 msgstr ""

4258

4252 -#: builtin/commit.c:1249 builtin/tag.c:728

4259 +#: builtin/commit.c:1213 builtin/tag.c:728

4260 #, c-format

4261 msgid "Invalid cleanup mode %s"

4262 msgstr ""

4263

4257 -#: builtin/commit.c:1254

4264 +#: builtin/commit.c:1218

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

4266 msgstr ""

4267

4261 -#: builtin/commit.c:1364 builtin/commit.c:1644

4268 +#: builtin/commit.c:1328 builtin/commit.c:1608

4269 msgid "show status concisely"

4270 msgstr ""

4271

4265 -#: builtin/commit.c:1366 builtin/commit.c:1646

4272 +#: builtin/commit.c:1330 builtin/commit.c:1610

4273 msgid "show branch information"

4274 msgstr ""

4275

4269 -#: builtin/commit.c:1368 builtin/commit.c:1648 builtin/push.c:500

4276 +#: builtin/commit.c:1332 builtin/commit.c:1612 builtin/push.c:500

4277 msgid "machine-readable output"

4278 msgstr ""

4279

4273 -#: builtin/commit.c:1371 builtin/commit.c:1650

4280 +#: builtin/commit.c:1335 builtin/commit.c:1614

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

4282 msgstr ""

4283

4277 -#: builtin/commit.c:1374 builtin/commit.c:1653

4284 +#: builtin/commit.c:1338 builtin/commit.c:1617

4285 msgid "terminate entries with NUL"

4286 msgstr ""

4287

4281 -#: builtin/commit.c:1376 builtin/commit.c:1656 builtin/fast-export.c:980

4288 +#: builtin/commit.c:1340 builtin/commit.c:1620 builtin/fast-export.c:980

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

4290 msgid "mode"

4291 msgstr ""

4292

4286 -#: builtin/commit.c:1377 builtin/commit.c:1656

4293 +#: builtin/commit.c:1341 builtin/commit.c:1620

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

4295 msgstr ""

4296

4290 -#: builtin/commit.c:1380

4297 +#: builtin/commit.c:1344

4298 msgid "show ignored files"

4299 msgstr ""

4300

4294 -#: builtin/commit.c:1381 parse-options.h:153

4301 +#: builtin/commit.c:1345 parse-options.h:153

4302 msgid "when"

4303 msgstr ""

4304

4298 -#: builtin/commit.c:1382

4305 +#: builtin/commit.c:1346

4306 msgid ""

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

4308 "(Default: all)"

4309 msgstr ""

4310

4304 -#: builtin/commit.c:1384

4311 +#: builtin/commit.c:1348

4312 msgid "list untracked files in columns"

4313 msgstr ""

4314

4308 -#: builtin/commit.c:1471

4315 +#: builtin/commit.c:1435

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

4317 msgstr ""

4318

4312 -#: builtin/commit.c:1473

4319 +#: builtin/commit.c:1437

4320 msgid "could not parse newly created commit"

4321 msgstr ""

4322

4316 -#: builtin/commit.c:1518

4323 +#: builtin/commit.c:1482

4324 msgid "detached HEAD"

4325 msgstr ""

4326

4320 -#: builtin/commit.c:1521

4327 +#: builtin/commit.c:1485

4328 msgid " (root-commit)"

4329 msgstr ""

4330

4324 -#: builtin/commit.c:1614

4331 +#: builtin/commit.c:1578

4332 msgid "suppress summary after successful commit"

4333 msgstr ""

4334

4328 -#: builtin/commit.c:1615

4335 +#: builtin/commit.c:1579

4336 msgid "show diff in commit message template"

4337 msgstr ""

4338

4332 -#: builtin/commit.c:1617

4339 +#: builtin/commit.c:1581

4340 msgid "Commit message options"

4341 msgstr ""

4342

4336 -#: builtin/commit.c:1618 builtin/tag.c:601

4343 +#: builtin/commit.c:1582 builtin/tag.c:601

4344 msgid "read message from file"

4345 msgstr ""

4346

4340 -#: builtin/commit.c:1619

4347 +#: builtin/commit.c:1583

4348 msgid "author"

4349 msgstr ""

4350

4344 -#: builtin/commit.c:1619

4351 +#: builtin/commit.c:1583

4352 msgid "override author for commit"

4353 msgstr ""

4354

4348 -#: builtin/commit.c:1620 builtin/gc.c:275

4355 +#: builtin/commit.c:1584 builtin/gc.c:275

4356 msgid "date"

4357 msgstr ""

4358

4352 -#: builtin/commit.c:1620

4359 +#: builtin/commit.c:1584

4360 msgid "override date for commit"

4361 msgstr ""

4362

4356 -#: builtin/commit.c:1621 builtin/merge.c:217 builtin/notes.c:408

4357 -#: builtin/notes.c:565 builtin/tag.c:599

4363 +#: builtin/commit.c:1585 builtin/merge.c:218 builtin/notes.c:391

4364 +#: builtin/notes.c:554 builtin/tag.c:599

4365 msgid "message"

4366 msgstr ""

4367

4361 -#: builtin/commit.c:1621

4368 +#: builtin/commit.c:1585

4369 msgid "commit message"

4370 msgstr ""

4371

4365 -#: builtin/commit.c:1622

4372 +#: builtin/commit.c:1586

4373 msgid "reuse and edit message from specified commit"

4374 msgstr ""

4375

4369 -#: builtin/commit.c:1623

4376 +#: builtin/commit.c:1587

4377 msgid "reuse message from specified commit"

4378 msgstr ""

4379

4373 -#: builtin/commit.c:1624

4380 +#: builtin/commit.c:1588

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

4382 msgstr ""

4383

4377 -#: builtin/commit.c:1625

4384 +#: builtin/commit.c:1589

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

4386 msgstr ""

4387

4381 -#: builtin/commit.c:1626

4388 +#: builtin/commit.c:1590

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

4390 msgstr ""

4391

4385 -#: builtin/commit.c:1627 builtin/log.c:1191 builtin/revert.c:86

4392 +#: builtin/commit.c:1591 builtin/log.c:1191 builtin/revert.c:86

4393 msgid "add Signed-off-by:"

4394 msgstr ""

4395

4389 -#: builtin/commit.c:1628

4396 +#: builtin/commit.c:1592

4397 msgid "use specified template file"

4398 msgstr ""

4399

4393 -#: builtin/commit.c:1629

4400 +#: builtin/commit.c:1593

4401 msgid "force edit of commit"

4402 msgstr ""

4403

4397 -#: builtin/commit.c:1630

4404 +#: builtin/commit.c:1594

4405 msgid "default"

4406 msgstr ""

4407

4401 -#: builtin/commit.c:1630 builtin/tag.c:604

4408 +#: builtin/commit.c:1594 builtin/tag.c:604

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

4410 msgstr ""

4411

4405 -#: builtin/commit.c:1631

4412 +#: builtin/commit.c:1595

4413 msgid "include status in commit message template"

4414 msgstr ""

4415

4409 -#: builtin/commit.c:1632 builtin/merge.c:224 builtin/revert.c:92

4416 +#: builtin/commit.c:1596 builtin/merge.c:225 builtin/revert.c:92

4417 #: builtin/tag.c:605

4418 msgid "key-id"

4419 msgstr ""

4420

4414 -#: builtin/commit.c:1633 builtin/merge.c:225 builtin/revert.c:93

4421 +#: builtin/commit.c:1597 builtin/merge.c:226 builtin/revert.c:93

4422 msgid "GPG sign commit"

4423 msgstr ""

4424

4418 -#: builtin/commit.c:1636

4425 +#: builtin/commit.c:1600

4426 msgid "Commit contents options"

4427 msgstr ""

4428

4422 -#: builtin/commit.c:1637

4429 +#: builtin/commit.c:1601

4430 msgid "commit all changed files"

4431 msgstr ""

4432

4426 -#: builtin/commit.c:1638

4433 +#: builtin/commit.c:1602

4434 msgid "add specified files to index for commit"

4435 msgstr ""

4436

4430 -#: builtin/commit.c:1639

4437 +#: builtin/commit.c:1603

4438 msgid "interactively add files"

4439 msgstr ""

4440

4434 -#: builtin/commit.c:1640

4441 +#: builtin/commit.c:1604

4442 msgid "interactively add changes"

4443 msgstr ""

4444

4438 -#: builtin/commit.c:1641

4445 +#: builtin/commit.c:1605

4446 msgid "commit only specified files"

4447 msgstr ""

4448

4442 -#: builtin/commit.c:1642

4449 +#: builtin/commit.c:1606

4450 msgid "bypass pre-commit hook"

4451 msgstr ""

4452

4446 -#: builtin/commit.c:1643

4453 +#: builtin/commit.c:1607

4454 msgid "show what would be committed"

4455 msgstr ""

4456

4450 -#: builtin/commit.c:1654

4457 +#: builtin/commit.c:1618

4458 msgid "amend previous commit"

4459 msgstr ""

4460

4454 -#: builtin/commit.c:1655

4461 +#: builtin/commit.c:1619

4462 msgid "bypass post-rewrite hook"

4463 msgstr ""

4464

4458 -#: builtin/commit.c:1660

4465 +#: builtin/commit.c:1624

4466 msgid "ok to record an empty change"

4467 msgstr ""

4468

4462 -#: builtin/commit.c:1662

4469 +#: builtin/commit.c:1626

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

4471 msgstr ""

4472

4466 -#: builtin/commit.c:1691

4473 +#: builtin/commit.c:1655

4474 msgid "could not parse HEAD commit"

4475 msgstr ""

4476

4470 -#: builtin/commit.c:1730 builtin/merge.c:518

4477 +#: builtin/commit.c:1694 builtin/merge.c:519

4478 #, c-format

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

4480 msgstr ""

4481

4475 -#: builtin/commit.c:1737

4482 +#: builtin/commit.c:1701

4483 #, c-format

4484 msgid "Corrupt MERGE_HEAD file (%s)"

4485 msgstr ""

4486

4480 -#: builtin/commit.c:1744

4487 +#: builtin/commit.c:1708

4488 msgid "could not read MERGE_MODE"

4489 msgstr ""

4490

4484 -#: builtin/commit.c:1763

4491 +#: builtin/commit.c:1727

4492 #, c-format

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

4494 msgstr ""

4495

4489 -#: builtin/commit.c:1774

4496 +#: builtin/commit.c:1738

4497 #, c-format

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

4499 msgstr ""

4500

4494 -#: builtin/commit.c:1779

4501 +#: builtin/commit.c:1743

4502 #, c-format

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

4504 msgstr ""

4505

4499 -#: builtin/commit.c:1794 builtin/merge.c:850 builtin/merge.c:875

4506 +#: builtin/commit.c:1758 builtin/merge.c:851 builtin/merge.c:876

4507 msgid "failed to write commit object"

4508 msgstr ""

4509

4503 -#: builtin/commit.c:1827

4510 +#: builtin/commit.c:1791

4511 msgid ""

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

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

@@ -4591,16 +4598,12 @@ msgstr ""

4598 msgid "open an editor"

4599 msgstr ""

4600

4594 -#: builtin/config.c:72 builtin/config.c:73

4595 -msgid "slot"

4596 -msgstr ""

4597 -

4601 #: builtin/config.c:72

4599 -msgid "find the color configured: [default]"

4602 +msgid "find the color configured: slot [default]"

4603 msgstr ""

4604

4605 #: builtin/config.c:73

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

4606 +msgid "find the color setting: slot [stdout-is-tty]"

4607 msgstr ""

4608

4609 #: builtin/config.c:74

@@ -4635,11 +4638,11 @@ msgstr ""

4638 msgid "respect include directives on lookup"

4639 msgstr ""

4640

4638 -#: builtin/config.c:315

4641 +#: builtin/config.c:316

4642 msgid "unable to parse default color value"

4643 msgstr ""

4644

4642 -#: builtin/config.c:455

4645 +#: builtin/config.c:457

4646 #, c-format

4647 msgid ""

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

@@ -4649,7 +4652,7 @@ msgid ""

4652 "#\temail = %s\n"

4653 msgstr ""

4654

4652 -#: builtin/config.c:590

4655 +#: builtin/config.c:589

4656 #, c-format

4657 msgid "cannot create configuration file %s"

4658 msgstr ""

@@ -5068,7 +5071,7 @@ msgstr ""

5071 msgid "[deleted]"

5072 msgstr ""

5073

5071 -#: builtin/fetch.c:799 builtin/remote.c:1063

5074 +#: builtin/fetch.c:799 builtin/remote.c:1058

5075 msgid "(none)"

5076 msgstr ""

5077

@@ -5141,30 +5144,30 @@ msgstr ""

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

5145 msgstr ""

5146

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

5145 -#: builtin/merge.c:197 builtin/repack.c:179 builtin/repack.c:183

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

5148 +#: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182

5149 #: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:590

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

5151 msgid "n"

5152 msgstr ""

5153

5151 -#: builtin/fmt-merge-msg.c:664

5154 +#: builtin/fmt-merge-msg.c:663

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

5156 msgstr ""

5157

5155 -#: builtin/fmt-merge-msg.c:667

5158 +#: builtin/fmt-merge-msg.c:666

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

5160 msgstr ""

5161

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

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

5163 msgid "text"

5164 msgstr ""

5165

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

5166 +#: builtin/fmt-merge-msg.c:670

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

5168 msgstr ""

5169

5167 -#: builtin/fmt-merge-msg.c:672

5170 +#: builtin/fmt-merge-msg.c:671

5171 msgid "file to read from"

5172 msgstr ""

5173

@@ -5189,7 +5192,7 @@ msgid "quote placeholders suitably for python"

5192 msgstr ""

5193

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

5192 -msgid "quote placeholders suitably for tcl"

5195 +msgid "quote placeholders suitably for Tcl"

5196 msgstr ""

5197

5198 #: builtin/for-each-ref.c:1081

@@ -5649,61 +5652,61 @@ msgid ""

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

5653 msgstr ""

5654

5652 -#: builtin/help.c:352

5655 +#: builtin/help.c:354

5656 #, c-format

5657 msgid "'%s': unknown man viewer."

5658 msgstr ""

5659

5657 -#: builtin/help.c:369

5660 +#: builtin/help.c:371

5661 msgid "no man viewer handled the request"

5662 msgstr ""

5663

5661 -#: builtin/help.c:377

5664 +#: builtin/help.c:379

5665 msgid "no info viewer handled the request"

5666 msgstr ""

5667

5665 -#: builtin/help.c:423

5668 +#: builtin/help.c:428

5669 msgid "Defining attributes per path"

5670 msgstr ""

5671

5669 -#: builtin/help.c:424

5672 +#: builtin/help.c:429

5673 msgid "Everyday Git With 20 Commands Or So"

5674 msgstr ""

5675

5673 -#: builtin/help.c:425

5676 +#: builtin/help.c:430

5677 msgid "A Git glossary"

5678 msgstr ""

5679

5677 -#: builtin/help.c:426

5680 +#: builtin/help.c:431

5681 msgid "Specifies intentionally untracked files to ignore"

5682 msgstr ""

5683

5681 -#: builtin/help.c:427

5684 +#: builtin/help.c:432

5685 msgid "Defining submodule properties"

5686 msgstr ""

5687

5685 -#: builtin/help.c:428

5688 +#: builtin/help.c:433

5689 msgid "Specifying revisions and ranges for Git"

5690 msgstr ""

5691

5689 -#: builtin/help.c:429

5692 +#: builtin/help.c:434

5693 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"

5694 msgstr ""

5695

5693 -#: builtin/help.c:430

5696 +#: builtin/help.c:435

5697 msgid "An overview of recommended workflows with Git"

5698 msgstr ""

5699

5697 -#: builtin/help.c:442

5700 +#: builtin/help.c:447

5701 msgid "The common Git guides are:\n"

5702 msgstr ""

5703

5701 -#: builtin/help.c:463 builtin/help.c:480

5704 +#: builtin/help.c:468 builtin/help.c:485

5705 #, c-format

5706 msgid "usage: %s%s"

5707 msgstr ""

5708

5706 -#: builtin/help.c:496

5709 +#: builtin/help.c:501

5710 #, c-format

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

5712 msgstr ""

@@ -6046,37 +6049,37 @@ msgstr ""

6049 msgid "ignoring template %s"

6050 msgstr ""

6051

6049 -#: builtin/init-db.c:133

6052 +#: builtin/init-db.c:136

6053 #, c-format

6054 msgid "insanely long template path %s"

6055 msgstr ""

6056

6054 -#: builtin/init-db.c:141

6057 +#: builtin/init-db.c:144

6058 #, c-format

6059 msgid "templates not found %s"

6060 msgstr ""

6061

6059 -#: builtin/init-db.c:154

6062 +#: builtin/init-db.c:157

6063 #, c-format

6064 msgid "not copying templates of a wrong format version %d from '%s'"

6065 msgstr ""

6066

6064 -#: builtin/init-db.c:192

6067 +#: builtin/init-db.c:197

6068 #, c-format

6069 msgid "insane git directory %s"

6070 msgstr ""

6071

6069 -#: builtin/init-db.c:323 builtin/init-db.c:326

6072 +#: builtin/init-db.c:331 builtin/init-db.c:334

6073 #, c-format

6074 msgid "%s already exists"

6075 msgstr ""

6076

6074 -#: builtin/init-db.c:355

6077 +#: builtin/init-db.c:363

6078 #, c-format

6079 msgid "unable to handle file type %d"

6080 msgstr ""

6081

6079 -#: builtin/init-db.c:358

6082 +#: builtin/init-db.c:366

6083 #, c-format

6084 msgid "unable to move %s to %s"

6085 msgstr ""

@@ -6084,59 +6087,59 @@ msgstr ""

6087 #. TRANSLATORS: The first '%s' is either "Reinitialized

6088 #. existing" or "Initialized empty", the second " shared" or

6089 #. "", and the last '%s%s' is the verbatim directory name.

6087 -#: builtin/init-db.c:418

6090 +#: builtin/init-db.c:426

6091 #, c-format

6092 msgid "%s%s Git repository in %s%s\n"

6093 msgstr ""

6094

6092 -#: builtin/init-db.c:419

6095 +#: builtin/init-db.c:427

6096 msgid "Reinitialized existing"

6097 msgstr ""

6098

6096 -#: builtin/init-db.c:419

6099 +#: builtin/init-db.c:427

6100 msgid "Initialized empty"

6101 msgstr ""

6102

6100 -#: builtin/init-db.c:420

6103 +#: builtin/init-db.c:428

6104 msgid " shared"

6105 msgstr ""

6106

6104 -#: builtin/init-db.c:467

6107 +#: builtin/init-db.c:475

6108 msgid ""

6109 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"

6110 "shared[=<permissions>]] [directory]"

6111 msgstr ""

6112

6110 -#: builtin/init-db.c:490

6113 +#: builtin/init-db.c:498

6114 msgid "permissions"

6115 msgstr ""

6116

6114 -#: builtin/init-db.c:491

6117 +#: builtin/init-db.c:499

6118 msgid "specify that the git repository is to be shared amongst several users"

6119 msgstr ""

6120

6118 -#: builtin/init-db.c:493 builtin/prune-packed.c:57 builtin/repack.c:172

6121 +#: builtin/init-db.c:501 builtin/prune-packed.c:57 builtin/repack.c:171

6122 msgid "be quiet"

6123 msgstr ""

6124

6122 -#: builtin/init-db.c:525 builtin/init-db.c:530

6125 +#: builtin/init-db.c:533 builtin/init-db.c:538

6126 #, c-format

6127 msgid "cannot mkdir %s"

6128 msgstr ""

6129

6127 -#: builtin/init-db.c:534

6130 +#: builtin/init-db.c:542

6131 #, c-format

6132 msgid "cannot chdir to %s"

6133 msgstr ""

6134

6132 -#: builtin/init-db.c:555

6135 +#: builtin/init-db.c:563

6136 #, c-format

6137 msgid ""

6138 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"

6139 "dir=<directory>)"

6140 msgstr ""

6141

6139 -#: builtin/init-db.c:583

6142 +#: builtin/init-db.c:591

6143 #, c-format

6144 msgid "Cannot access work tree '%s'"

6145 msgstr ""

@@ -6536,211 +6539,211 @@ msgstr ""

6539 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"

6540 msgstr ""

6541

6539 -#: builtin/ls-tree.c:126

6542 +#: builtin/ls-tree.c:127

6543 msgid "only show trees"

6544 msgstr ""

6545

6543 -#: builtin/ls-tree.c:128

6546 +#: builtin/ls-tree.c:129

6547 msgid "recurse into subtrees"

6548 msgstr ""

6549

6547 -#: builtin/ls-tree.c:130

6550 +#: builtin/ls-tree.c:131

6551 msgid "show trees when recursing"

6552 msgstr ""

6553

6551 -#: builtin/ls-tree.c:133

6554 +#: builtin/ls-tree.c:134

6555 msgid "terminate entries with NUL byte"

6556 msgstr ""

6557

6555 -#: builtin/ls-tree.c:134

6558 +#: builtin/ls-tree.c:135

6559 msgid "include object size"

6560 msgstr ""

6561

6559 -#: builtin/ls-tree.c:136 builtin/ls-tree.c:138

6562 +#: builtin/ls-tree.c:137 builtin/ls-tree.c:139

6563 msgid "list only filenames"

6564 msgstr ""

6565

6563 -#: builtin/ls-tree.c:141

6566 +#: builtin/ls-tree.c:142

6567 msgid "use full path names"

6568 msgstr ""

6569

6567 -#: builtin/ls-tree.c:143

6570 +#: builtin/ls-tree.c:144

6571 msgid "list entire tree; not just current directory (implies --full-name)"

6572 msgstr ""

6573

6571 -#: builtin/merge.c:44

6574 +#: builtin/merge.c:45

6575 msgid "git merge [options] [<commit>...]"

6576 msgstr ""

6577

6575 -#: builtin/merge.c:45

6578 +#: builtin/merge.c:46

6579 msgid "git merge [options] <msg> HEAD <commit>"

6580 msgstr ""

6581

6579 -#: builtin/merge.c:46

6582 +#: builtin/merge.c:47

6583 msgid "git merge --abort"

6584 msgstr ""

6585

6583 -#: builtin/merge.c:99

6586 +#: builtin/merge.c:100

6587 msgid "switch `m' requires a value"

6588 msgstr ""

6589

6587 -#: builtin/merge.c:136

6590 +#: builtin/merge.c:137

6591 #, c-format

6592 msgid "Could not find merge strategy '%s'.\n"

6593 msgstr ""

6594

6592 -#: builtin/merge.c:137

6595 +#: builtin/merge.c:138

6596 #, c-format

6597 msgid "Available strategies are:"

6598 msgstr ""

6599

6597 -#: builtin/merge.c:142

6600 +#: builtin/merge.c:143

6601 #, c-format

6602 msgid "Available custom strategies are:"

6603 msgstr ""

6604

6602 -#: builtin/merge.c:192

6605 +#: builtin/merge.c:193

6606 msgid "do not show a diffstat at the end of the merge"

6607 msgstr ""

6608

6606 -#: builtin/merge.c:195

6609 +#: builtin/merge.c:196

6610 msgid "show a diffstat at the end of the merge"

6611 msgstr ""

6612

6610 -#: builtin/merge.c:196

6613 +#: builtin/merge.c:197

6614 msgid "(synonym to --stat)"

6615 msgstr ""

6616

6614 -#: builtin/merge.c:198

6617 +#: builtin/merge.c:199

6618 msgid "add (at most <n>) entries from shortlog to merge commit message"

6619 msgstr ""

6620

6618 -#: builtin/merge.c:201

6621 +#: builtin/merge.c:202

6622 msgid "create a single commit instead of doing a merge"

6623 msgstr ""

6624

6622 -#: builtin/merge.c:203

6625 +#: builtin/merge.c:204

6626 msgid "perform a commit if the merge succeeds (default)"

6627 msgstr ""

6628

6626 -#: builtin/merge.c:205

6629 +#: builtin/merge.c:206

6630 msgid "edit message before committing"

6631 msgstr ""

6632

6630 -#: builtin/merge.c:206

6633 +#: builtin/merge.c:207

6634 msgid "allow fast-forward (default)"

6635 msgstr ""

6636

6634 -#: builtin/merge.c:208

6637 +#: builtin/merge.c:209

6638 msgid "abort if fast-forward is not possible"

6639 msgstr ""

6640

6638 -#: builtin/merge.c:212

6641 +#: builtin/merge.c:213

6642 msgid "Verify that the named commit has a valid GPG signature"

6643 msgstr ""

6644

6642 -#: builtin/merge.c:213 builtin/notes.c:741 builtin/revert.c:89

6645 +#: builtin/merge.c:214 builtin/notes.c:753 builtin/revert.c:89

6646 msgid "strategy"

6647 msgstr ""

6648

6646 -#: builtin/merge.c:214

6649 +#: builtin/merge.c:215

6650 msgid "merge strategy to use"

6651 msgstr ""

6652

6650 -#: builtin/merge.c:215

6653 +#: builtin/merge.c:216

6654 msgid "option=value"

6655 msgstr ""

6656

6654 -#: builtin/merge.c:216

6657 +#: builtin/merge.c:217

6658 msgid "option for selected merge strategy"

6659 msgstr ""

6660

6658 -#: builtin/merge.c:218

6661 +#: builtin/merge.c:219

6662 msgid "merge commit message (for a non-fast-forward merge)"

6663 msgstr ""

6664

6662 -#: builtin/merge.c:222

6665 +#: builtin/merge.c:223

6666 msgid "abort the current in-progress merge"

6667 msgstr ""

6668

6666 -#: builtin/merge.c:250

6669 +#: builtin/merge.c:251

6670 msgid "could not run stash."

6671 msgstr ""

6672

6670 -#: builtin/merge.c:255

6673 +#: builtin/merge.c:256

6674 msgid "stash failed"

6675 msgstr ""

6676

6674 -#: builtin/merge.c:260

6677 +#: builtin/merge.c:261

6678 #, c-format

6679 msgid "not a valid object: %s"

6680 msgstr ""

6681

6679 -#: builtin/merge.c:279 builtin/merge.c:296

6682 +#: builtin/merge.c:280 builtin/merge.c:297

6683 msgid "read-tree failed"

6684 msgstr ""

6685

6683 -#: builtin/merge.c:326

6686 +#: builtin/merge.c:327

6687 msgid " (nothing to squash)"

6688 msgstr ""

6689

6687 -#: builtin/merge.c:339

6690 +#: builtin/merge.c:340

6691 #, c-format

6692 msgid "Squash commit -- not updating HEAD\n"

6693 msgstr ""

6694

6692 -#: builtin/merge.c:371

6695 +#: builtin/merge.c:372

6696 msgid "Writing SQUASH_MSG"

6697 msgstr ""

6698

6696 -#: builtin/merge.c:373

6699 +#: builtin/merge.c:374

6700 msgid "Finishing SQUASH_MSG"

6701 msgstr ""

6702

6700 -#: builtin/merge.c:396

6703 +#: builtin/merge.c:397

6704 #, c-format

6705 msgid "No merge message -- not updating HEAD\n"

6706 msgstr ""

6707

6705 -#: builtin/merge.c:446

6708 +#: builtin/merge.c:447

6709 #, c-format

6710 msgid "'%s' does not point to a commit"

6711 msgstr ""

6712

6710 -#: builtin/merge.c:558

6713 +#: builtin/merge.c:559

6714 #, c-format

6715 msgid "Bad branch.%s.mergeoptions string: %s"

6716 msgstr ""

6717

6715 -#: builtin/merge.c:653

6718 +#: builtin/merge.c:654

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

6720 msgstr ""

6721

6719 -#: builtin/merge.c:677

6722 +#: builtin/merge.c:678

6723 msgid "Not handling anything other than two heads merge."

6724 msgstr ""

6725

6723 -#: builtin/merge.c:691

6726 +#: builtin/merge.c:692

6727 #, c-format

6728 msgid "Unknown option for merge-recursive: -X%s"

6729 msgstr ""

6730

6728 -#: builtin/merge.c:704

6731 +#: builtin/merge.c:705

6732 #, c-format

6733 msgid "unable to write %s"

6734 msgstr ""

6735

6733 -#: builtin/merge.c:793

6736 +#: builtin/merge.c:794

6737 #, c-format

6738 msgid "Could not read from '%s'"

6739 msgstr ""

6740

6738 -#: builtin/merge.c:802

6741 +#: builtin/merge.c:803

6742 #, c-format

6743 msgid "Not committing merge; use 'git commit' to complete the merge.\n"

6744 msgstr ""

6745

6743 -#: builtin/merge.c:808

6746 +#: builtin/merge.c:809

6747 #, c-format

6748 msgid ""

6749 "Please enter a commit message to explain why this merge is necessary,\n"

@@ -6750,156 +6753,156 @@ msgid ""

6753 "the commit.\n"

6754 msgstr ""

6755

6753 -#: builtin/merge.c:832

6756 +#: builtin/merge.c:833

6757 msgid "Empty commit message."

6758 msgstr ""

6759

6757 -#: builtin/merge.c:844

6760 +#: builtin/merge.c:845

6761 #, c-format

6762 msgid "Wonderful.\n"

6763 msgstr ""

6764

6762 -#: builtin/merge.c:907

6765 +#: builtin/merge.c:900

6766 #, c-format

6767 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"

6768 msgstr ""

6769

6767 -#: builtin/merge.c:923

6770 +#: builtin/merge.c:916

6771 #, c-format

6772 msgid "'%s' is not a commit"

6773 msgstr ""

6774

6772 -#: builtin/merge.c:964

6775 +#: builtin/merge.c:957

6776 msgid "No current branch."

6777 msgstr ""

6778

6776 -#: builtin/merge.c:966

6779 +#: builtin/merge.c:959

6780 msgid "No remote for the current branch."

6781 msgstr ""

6782

6780 -#: builtin/merge.c:968

6783 +#: builtin/merge.c:961

6784 msgid "No default upstream defined for the current branch."

6785 msgstr ""

6786

6784 -#: builtin/merge.c:973

6787 +#: builtin/merge.c:966

6788 #, c-format

6789 msgid "No remote-tracking branch for %s from %s"

6790 msgstr ""

6791

6789 -#: builtin/merge.c:1129

6792 +#: builtin/merge.c:1122

6793 msgid "There is no merge to abort (MERGE_HEAD missing)."

6794 msgstr ""

6795

6793 -#: builtin/merge.c:1145

6796 +#: builtin/merge.c:1138

6797 msgid ""

6798 "You have not concluded your merge (MERGE_HEAD exists).\n"

6799 "Please, commit your changes before you merge."

6800 msgstr ""

6801

6799 -#: builtin/merge.c:1148 git-pull.sh:34

6802 +#: builtin/merge.c:1141 git-pull.sh:34

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

6804 msgstr ""

6805

6803 -#: builtin/merge.c:1152

6806 +#: builtin/merge.c:1145

6807 msgid ""

6808 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"

6809 "Please, commit your changes before you merge."

6810 msgstr ""

6811

6809 -#: builtin/merge.c:1155

6812 +#: builtin/merge.c:1148

6813 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."

6814 msgstr ""

6815

6813 -#: builtin/merge.c:1164

6816 +#: builtin/merge.c:1157

6817 msgid "You cannot combine --squash with --no-ff."

6818 msgstr ""

6819

6817 -#: builtin/merge.c:1173

6820 +#: builtin/merge.c:1166

6821 msgid "No commit specified and merge.defaultToUpstream not set."

6822 msgstr ""

6823

6821 -#: builtin/merge.c:1205

6824 +#: builtin/merge.c:1198

6825 msgid "Can merge only exactly one commit into empty head"

6826 msgstr ""

6827

6825 -#: builtin/merge.c:1208

6828 +#: builtin/merge.c:1201

6829 msgid "Squash commit into empty head not supported yet"

6830 msgstr ""

6831

6829 -#: builtin/merge.c:1210

6832 +#: builtin/merge.c:1203

6833 msgid "Non-fast-forward commit does not make sense into an empty head"

6834 msgstr ""

6835

6833 -#: builtin/merge.c:1215

6836 +#: builtin/merge.c:1208

6837 #, c-format

6838 msgid "%s - not something we can merge"

6839 msgstr ""

6840

6838 -#: builtin/merge.c:1266

6841 +#: builtin/merge.c:1259

6842 #, c-format

6843 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."

6844 msgstr ""

6845

6843 -#: builtin/merge.c:1269

6846 +#: builtin/merge.c:1262

6847 #, c-format

6848 msgid "Commit %s has a bad GPG signature allegedly by %s."

6849 msgstr ""

6850

6848 -#: builtin/merge.c:1272

6851 +#: builtin/merge.c:1265

6852 #, c-format

6853 msgid "Commit %s does not have a GPG signature."

6854 msgstr ""

6855

6853 -#: builtin/merge.c:1275

6856 +#: builtin/merge.c:1268

6857 #, c-format

6858 msgid "Commit %s has a good GPG signature by %s\n"

6859 msgstr ""

6860

6858 -#: builtin/merge.c:1356

6861 +#: builtin/merge.c:1349

6862 #, c-format

6863 msgid "Updating %s..%s\n"

6864 msgstr ""

6865

6863 -#: builtin/merge.c:1395

6866 +#: builtin/merge.c:1388

6867 #, c-format

6868 msgid "Trying really trivial in-index merge...\n"

6869 msgstr ""

6870

6868 -#: builtin/merge.c:1402

6871 +#: builtin/merge.c:1395

6872 #, c-format

6873 msgid "Nope.\n"

6874 msgstr ""

6875

6873 -#: builtin/merge.c:1434

6876 +#: builtin/merge.c:1427

6877 msgid "Not possible to fast-forward, aborting."

6878 msgstr ""

6879

6877 -#: builtin/merge.c:1457 builtin/merge.c:1536

6880 +#: builtin/merge.c:1450 builtin/merge.c:1529

6881 #, c-format

6882 msgid "Rewinding the tree to pristine...\n"

6883 msgstr ""

6884

6882 -#: builtin/merge.c:1461

6885 +#: builtin/merge.c:1454

6886 #, c-format

6887 msgid "Trying merge strategy %s...\n"

6888 msgstr ""

6889

6887 -#: builtin/merge.c:1527

6890 +#: builtin/merge.c:1520

6891 #, c-format

6892 msgid "No merge strategy handled the merge.\n"

6893 msgstr ""

6894

6892 -#: builtin/merge.c:1529

6895 +#: builtin/merge.c:1522

6896 #, c-format

6897 msgid "Merge with strategy %s failed.\n"

6898 msgstr ""

6899

6897 -#: builtin/merge.c:1538

6900 +#: builtin/merge.c:1531

6901 #, c-format

6902 msgid "Using the %s to prepare resolving by hand.\n"

6903 msgstr ""

6904

6902 -#: builtin/merge.c:1550

6905 +#: builtin/merge.c:1543

6906 #, c-format

6907 msgid "Automatic merge went well; stopped before committing as requested\n"

6908 msgstr ""

@@ -7085,7 +7088,7 @@ msgstr ""

7088 msgid "Renaming %s to %s\n"

7089 msgstr ""

7090

7088 -#: builtin/mv.c:256 builtin/remote.c:726 builtin/repack.c:358

7091 +#: builtin/mv.c:256 builtin/remote.c:726 builtin/repack.c:355

7092 #, c-format

7093 msgid "renaming '%s' failed"

7094 msgstr ""

@@ -7136,8 +7139,8 @@ msgstr ""

7139

7140 #: builtin/notes.c:25

7141 msgid ""

7139 -"git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) "

7140 -"<object>] [<object>]"

7142 +"git notes [--ref <notes_ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "

7143 +"| (-c | -C) <object>] [<object>]"

7144 msgstr ""

7145

7146 #: builtin/notes.c:26

@@ -7146,12 +7149,12 @@ msgstr ""

7149

7150 #: builtin/notes.c:27

7151 msgid ""

7149 -"git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) "

7150 -"<object>] [<object>]"

7152 +"git notes [--ref <notes_ref>] append [--allow-empty] [-m <msg> | -F <file> | "

7153 +"(-c | -C) <object>] [<object>]"

7154 msgstr ""

7155

7156 #: builtin/notes.c:28

7154 -msgid "git notes [--ref <notes_ref>] edit [<object>]"

7157 +msgid "git notes [--ref <notes_ref>] edit [--allow-empty] [<object>]"

7158 msgstr ""

7159

7160 #: builtin/notes.c:29

@@ -7235,212 +7238,216 @@ msgstr ""

7238 msgid "git notes get-ref"

7239 msgstr ""

7240

7238 -#: builtin/notes.c:136

7241 +#: builtin/notes.c:146

7242 #, c-format

7243 msgid "unable to start 'show' for object '%s'"

7244 msgstr ""

7245

7243 -#: builtin/notes.c:140

7246 +#: builtin/notes.c:150

7247 msgid "could not read 'show' output"

7248 msgstr ""

7249

7247 -#: builtin/notes.c:148

7250 +#: builtin/notes.c:158

7251 #, c-format

7252 msgid "failed to finish 'show' for object '%s'"

7253 msgstr ""

7254

7252 -#: builtin/notes.c:166 builtin/tag.c:477

7255 +#: builtin/notes.c:173 builtin/tag.c:477

7256 #, c-format

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

7258 msgstr ""

7259

7257 -#: builtin/notes.c:185

7260 +#: builtin/notes.c:192

7261 msgid "Please supply the note contents using either -m or -F option"

7262 msgstr ""

7263

7261 -#: builtin/notes.c:206 builtin/notes.c:847

7262 -#, c-format

7263 -msgid "Removing note for object %s\n"

7264 -msgstr ""

7265 -

7266 -#: builtin/notes.c:211

7264 +#: builtin/notes.c:201

7265 msgid "unable to write note object"

7266 msgstr ""

7267

7270 -#: builtin/notes.c:213

7268 +#: builtin/notes.c:203

7269 #, c-format

7270 msgid "The note contents have been left in %s"

7271 msgstr ""

7272

7275 -#: builtin/notes.c:247 builtin/tag.c:693

7273 +#: builtin/notes.c:231 builtin/tag.c:693

7274 #, c-format

7275 msgid "cannot read '%s'"

7276 msgstr ""

7277

7280 -#: builtin/notes.c:249 builtin/tag.c:696

7278 +#: builtin/notes.c:233 builtin/tag.c:696

7279 #, c-format

7280 msgid "could not open or read '%s'"

7281 msgstr ""

7282

7285 -#: builtin/notes.c:268 builtin/notes.c:319 builtin/notes.c:321

7286 -#: builtin/notes.c:381 builtin/notes.c:435 builtin/notes.c:518

7287 -#: builtin/notes.c:523 builtin/notes.c:598 builtin/notes.c:640

7288 -#: builtin/notes.c:842 builtin/tag.c:709

7283 +#: builtin/notes.c:252 builtin/notes.c:303 builtin/notes.c:305

7284 +#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:506

7285 +#: builtin/notes.c:511 builtin/notes.c:589 builtin/notes.c:652

7286 +#: builtin/notes.c:854 builtin/tag.c:709

7287 #, c-format

7288 msgid "Failed to resolve '%s' as a valid ref."

7289 msgstr ""

7290

7293 -#: builtin/notes.c:271

7291 +#: builtin/notes.c:255

7292 #, c-format

7293 msgid "Failed to read object '%s'."

7294 msgstr ""

7295

7298 -#: builtin/notes.c:275

7296 +#: builtin/notes.c:259

7297 #, c-format

7298 msgid "Cannot read note data from non-blob object '%s'."

7299 msgstr ""

7300

7303 -#: builtin/notes.c:315

7301 +#: builtin/notes.c:299

7302 #, c-format

7303 msgid "Malformed input line: '%s'."

7304 msgstr ""

7305

7308 -#: builtin/notes.c:330

7306 +#: builtin/notes.c:314

7307 #, c-format

7308 msgid "Failed to copy notes from '%s' to '%s'"

7309 msgstr ""

7310

7313 -#: builtin/notes.c:374 builtin/notes.c:428 builtin/notes.c:501

7314 -#: builtin/notes.c:513 builtin/notes.c:586 builtin/notes.c:633

7315 -#: builtin/notes.c:907

7311 +#: builtin/notes.c:358 builtin/notes.c:413 builtin/notes.c:489

7312 +#: builtin/notes.c:501 builtin/notes.c:577 builtin/notes.c:645

7313 +#: builtin/notes.c:919

7314 msgid "too many parameters"

7315 msgstr ""

7316

7319 -#: builtin/notes.c:387 builtin/notes.c:646

7317 +#: builtin/notes.c:371 builtin/notes.c:658

7318 #, c-format

7319 msgid "No note found for object %s."

7320 msgstr ""

7321

7324 -#: builtin/notes.c:409 builtin/notes.c:566

7322 +#: builtin/notes.c:392 builtin/notes.c:555

7323 msgid "note contents as a string"

7324 msgstr ""

7325

7328 -#: builtin/notes.c:412 builtin/notes.c:569

7326 +#: builtin/notes.c:395 builtin/notes.c:558

7327 msgid "note contents in a file"

7328 msgstr ""

7329

7332 -#: builtin/notes.c:414 builtin/notes.c:417 builtin/notes.c:571

7333 -#: builtin/notes.c:574 builtin/tag.c:628

7330 +#: builtin/notes.c:397 builtin/notes.c:400 builtin/notes.c:560

7331 +#: builtin/notes.c:563 builtin/tag.c:628

7332 msgid "object"

7333 msgstr ""

7334

7337 -#: builtin/notes.c:415 builtin/notes.c:572

7335 +#: builtin/notes.c:398 builtin/notes.c:561

7336 msgid "reuse and edit specified note object"

7337 msgstr ""

7338

7341 -#: builtin/notes.c:418 builtin/notes.c:575

7339 +#: builtin/notes.c:401 builtin/notes.c:564

7340 msgid "reuse specified note object"

7341 msgstr ""

7342

7345 -#: builtin/notes.c:420 builtin/notes.c:488

7343 +#: builtin/notes.c:404 builtin/notes.c:567

7344 +msgid "allow storing empty note"

7345 +msgstr ""

7346 +

7347 +#: builtin/notes.c:405 builtin/notes.c:476

7348 msgid "replace existing notes"

7349 msgstr ""

7350

7349 -#: builtin/notes.c:454

7351 +#: builtin/notes.c:430

7352 #, c-format

7353 msgid ""

7354 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "

7355 "existing notes"

7356 msgstr ""

7357

7356 -#: builtin/notes.c:459 builtin/notes.c:536

7358 +#: builtin/notes.c:445 builtin/notes.c:524

7359 #, c-format

7360 msgid "Overwriting existing notes for object %s\n"

7361 msgstr ""

7362

7361 -#: builtin/notes.c:489

7363 +#: builtin/notes.c:456 builtin/notes.c:617 builtin/notes.c:859

7364 +#, c-format

7365 +msgid "Removing note for object %s\n"

7366 +msgstr ""

7367 +

7368 +#: builtin/notes.c:477

7369 msgid "read objects from stdin"

7370 msgstr ""

7371

7365 -#: builtin/notes.c:491

7372 +#: builtin/notes.c:479

7373 msgid "load rewriting config for <command> (implies --stdin)"

7374 msgstr ""

7375

7369 -#: builtin/notes.c:509

7376 +#: builtin/notes.c:497

7377 msgid "too few parameters"

7378 msgstr ""

7379

7373 -#: builtin/notes.c:530

7380 +#: builtin/notes.c:518

7381 #, c-format

7382 msgid ""

7383 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "

7384 "existing notes"

7385 msgstr ""

7386

7380 -#: builtin/notes.c:542

7387 +#: builtin/notes.c:530

7388 #, c-format

7389 msgid "Missing notes on source object %s. Cannot copy."

7390 msgstr ""

7391

7385 -#: builtin/notes.c:591

7392 +#: builtin/notes.c:582

7393 #, c-format

7394 msgid ""

7395 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"

7396 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"

7397 msgstr ""

7398

7392 -#: builtin/notes.c:738

7399 +#: builtin/notes.c:750

7400 msgid "General options"

7401 msgstr ""

7402

7396 -#: builtin/notes.c:740

7403 +#: builtin/notes.c:752

7404 msgid "Merge options"

7405 msgstr ""

7406

7400 -#: builtin/notes.c:742

7407 +#: builtin/notes.c:754

7408 msgid ""

7409 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"

7410 "cat_sort_uniq)"

7411 msgstr ""

7412

7406 -#: builtin/notes.c:744

7413 +#: builtin/notes.c:756

7414 msgid "Committing unmerged notes"

7415 msgstr ""

7416

7410 -#: builtin/notes.c:746

7417 +#: builtin/notes.c:758

7418 msgid "finalize notes merge by committing unmerged notes"

7419 msgstr ""

7420

7414 -#: builtin/notes.c:748

7421 +#: builtin/notes.c:760

7422 msgid "Aborting notes merge resolution"

7423 msgstr ""

7424

7418 -#: builtin/notes.c:750

7425 +#: builtin/notes.c:762

7426 msgid "abort notes merge"

7427 msgstr ""

7428

7422 -#: builtin/notes.c:845

7429 +#: builtin/notes.c:857

7430 #, c-format

7431 msgid "Object %s has no note\n"

7432 msgstr ""

7433

7427 -#: builtin/notes.c:857

7434 +#: builtin/notes.c:869

7435 msgid "attempt to remove non-existent note is not an error"

7436 msgstr ""

7437

7431 -#: builtin/notes.c:860

7438 +#: builtin/notes.c:872

7439 msgid "read object names from the standard input"

7440 msgstr ""

7441

7435 -#: builtin/notes.c:941

7442 +#: builtin/notes.c:953

7443 msgid "notes-ref"

7444 msgstr ""

7445

7439 -#: builtin/notes.c:942

7446 +#: builtin/notes.c:954

7447 msgid "use notes from <notes_ref>"

7448 msgstr ""

7449

7443 -#: builtin/notes.c:977 builtin/remote.c:1624

7450 +#: builtin/notes.c:989 builtin/remote.c:1619

7451 #, c-format

7452 msgid "Unknown subcommand: %s"

7453 msgstr ""

@@ -7490,139 +7497,143 @@ msgstr ""

7497 msgid "unable to parse value '%s' for option %s"

7498 msgstr ""

7499

7493 -#: builtin/pack-objects.c:2622

7500 +#: builtin/pack-objects.c:2623

7501 msgid "do not show progress meter"

7502 msgstr ""

7503

7497 -#: builtin/pack-objects.c:2624

7504 +#: builtin/pack-objects.c:2625

7505 msgid "show progress meter"

7506 msgstr ""

7507

7501 -#: builtin/pack-objects.c:2626

7508 +#: builtin/pack-objects.c:2627

7509 msgid "show progress meter during object writing phase"

7510 msgstr ""

7511

7505 -#: builtin/pack-objects.c:2629

7512 +#: builtin/pack-objects.c:2630

7513 msgid "similar to --all-progress when progress meter is shown"

7514 msgstr ""

7515

7509 -#: builtin/pack-objects.c:2630

7516 +#: builtin/pack-objects.c:2631

7517 msgid "version[,offset]"

7518 msgstr ""

7519

7513 -#: builtin/pack-objects.c:2631

7520 +#: builtin/pack-objects.c:2632

7521 msgid "write the pack index file in the specified idx format version"

7522 msgstr ""

7523

7517 -#: builtin/pack-objects.c:2634

7524 +#: builtin/pack-objects.c:2635

7525 msgid "maximum size of each output pack file"

7526 msgstr ""

7527

7521 -#: builtin/pack-objects.c:2636

7528 +#: builtin/pack-objects.c:2637

7529 msgid "ignore borrowed objects from alternate object store"

7530 msgstr ""

7531

7525 -#: builtin/pack-objects.c:2638

7532 +#: builtin/pack-objects.c:2639

7533 msgid "ignore packed objects"

7534 msgstr ""

7535

7529 -#: builtin/pack-objects.c:2640

7536 +#: builtin/pack-objects.c:2641

7537 msgid "limit pack window by objects"

7538 msgstr ""

7539

7533 -#: builtin/pack-objects.c:2642

7540 +#: builtin/pack-objects.c:2643

7541 msgid "limit pack window by memory in addition to object limit"

7542 msgstr ""

7543

7537 -#: builtin/pack-objects.c:2644

7544 +#: builtin/pack-objects.c:2645

7545 msgid "maximum length of delta chain allowed in the resulting pack"

7546 msgstr ""

7547

7541 -#: builtin/pack-objects.c:2646

7548 +#: builtin/pack-objects.c:2647

7549 msgid "reuse existing deltas"

7550 msgstr ""

7551

7545 -#: builtin/pack-objects.c:2648

7552 +#: builtin/pack-objects.c:2649

7553 msgid "reuse existing objects"

7554 msgstr ""

7555

7549 -#: builtin/pack-objects.c:2650

7556 +#: builtin/pack-objects.c:2651

7557 msgid "use OFS_DELTA objects"

7558 msgstr ""

7559

7553 -#: builtin/pack-objects.c:2652

7560 +#: builtin/pack-objects.c:2653

7561 msgid "use threads when searching for best delta matches"

7562 msgstr ""

7563

7557 -#: builtin/pack-objects.c:2654

7564 +#: builtin/pack-objects.c:2655

7565 msgid "do not create an empty pack output"

7566 msgstr ""

7567

7561 -#: builtin/pack-objects.c:2656

7568 +#: builtin/pack-objects.c:2657

7569 msgid "read revision arguments from standard input"

7570 msgstr ""

7571

7565 -#: builtin/pack-objects.c:2658

7572 +#: builtin/pack-objects.c:2659

7573 msgid "limit the objects to those that are not yet packed"

7574 msgstr ""

7575

7569 -#: builtin/pack-objects.c:2661

7576 +#: builtin/pack-objects.c:2662

7577 msgid "include objects reachable from any reference"

7578 msgstr ""

7579

7573 -#: builtin/pack-objects.c:2664

7580 +#: builtin/pack-objects.c:2665

7581 msgid "include objects referred by reflog entries"

7582 msgstr ""

7583

7577 -#: builtin/pack-objects.c:2667

7584 +#: builtin/pack-objects.c:2668

7585 msgid "include objects referred to by the index"

7586 msgstr ""

7587

7581 -#: builtin/pack-objects.c:2670

7588 +#: builtin/pack-objects.c:2671

7589 msgid "output pack to stdout"

7590 msgstr ""

7591

7585 -#: builtin/pack-objects.c:2672

7592 +#: builtin/pack-objects.c:2673

7593 msgid "include tag objects that refer to objects to be packed"

7594 msgstr ""

7595

7589 -#: builtin/pack-objects.c:2674

7596 +#: builtin/pack-objects.c:2675

7597 msgid "keep unreachable objects"

7598 msgstr ""

7599

7593 -#: builtin/pack-objects.c:2675 parse-options.h:140

7600 +#: builtin/pack-objects.c:2676 parse-options.h:140

7601 msgid "time"

7602 msgstr ""

7603

7597 -#: builtin/pack-objects.c:2676

7604 +#: builtin/pack-objects.c:2677

7605 msgid "unpack unreachable objects newer than <time>"

7606 msgstr ""

7607

7601 -#: builtin/pack-objects.c:2679

7608 +#: builtin/pack-objects.c:2680

7609 msgid "create thin packs"

7610 msgstr ""

7611

7605 -#: builtin/pack-objects.c:2681

7612 +#: builtin/pack-objects.c:2682

7613 +msgid "create packs suitable for shallow fetches"

7614 +msgstr ""

7615 +

7616 +#: builtin/pack-objects.c:2684

7617 msgid "ignore packs that have companion .keep file"

7618 msgstr ""

7619

7609 -#: builtin/pack-objects.c:2683

7620 +#: builtin/pack-objects.c:2686

7621 msgid "pack compression level"

7622 msgstr ""

7623

7613 -#: builtin/pack-objects.c:2685

7624 +#: builtin/pack-objects.c:2688

7625 msgid "do not hide commits by grafts"

7626 msgstr ""

7627

7617 -#: builtin/pack-objects.c:2687

7628 +#: builtin/pack-objects.c:2690

7629 msgid "use a bitmap index if available to speed up counting objects"

7630 msgstr ""

7631

7621 -#: builtin/pack-objects.c:2689

7632 +#: builtin/pack-objects.c:2692

7633 msgid "write a bitmap index together with the pack index"

7634 msgstr ""

7635

7625 -#: builtin/pack-objects.c:2778

7636 +#: builtin/pack-objects.c:2783

7637 msgid "Counting objects"

7638 msgstr ""

7639

@@ -7873,10 +7884,6 @@ msgstr ""

7884 msgid "require old value of ref to be at this value"

7885 msgstr ""

7886

7876 -#: builtin/push.c:506

7877 -msgid "check"

7878 -msgstr ""

7879 -

7887 #: builtin/push.c:507

7888 msgid "control recursive pushing of submodules"

7889 msgstr ""

@@ -8162,7 +8169,7 @@ msgstr ""

8169 msgid "Could not append '%s' to '%s'"

8170 msgstr ""

8171

8165 -#: builtin/remote.c:634 builtin/remote.c:798 builtin/remote.c:898

8172 +#: builtin/remote.c:634 builtin/remote.c:793 builtin/remote.c:893

8173 #, c-format

8174 msgid "No such remote: %s"

8175 msgstr ""

@@ -8172,7 +8179,7 @@ msgstr ""

8179 msgid "Could not rename config section '%s' to '%s'"

8180 msgstr ""

8181

8175 -#: builtin/remote.c:657 builtin/remote.c:850

8182 +#: builtin/remote.c:657 builtin/remote.c:845

8183 #, c-format

8184 msgid "Could not remove config section '%s'"

8185 msgstr ""

@@ -8205,12 +8212,12 @@ msgstr ""

8212 msgid "creating '%s' failed"

8213 msgstr ""

8214

8208 -#: builtin/remote.c:769

8215 +#: builtin/remote.c:764

8216 #, c-format

8217 msgid "Could not remove branch %s"

8218 msgstr ""

8219

8213 -#: builtin/remote.c:836

8220 +#: builtin/remote.c:831

8221 msgid ""

8222 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"

8223 "to delete it, use:"

@@ -8220,262 +8227,262 @@ msgid_plural ""

8227 msgstr[0] ""

8228 msgstr[1] ""

8229

8223 -#: builtin/remote.c:951

8230 +#: builtin/remote.c:946

8231 #, c-format

8232 msgid " new (next fetch will store in remotes/%s)"

8233 msgstr ""

8234

8228 -#: builtin/remote.c:954

8235 +#: builtin/remote.c:949

8236 msgid " tracked"

8237 msgstr ""

8238

8232 -#: builtin/remote.c:956

8239 +#: builtin/remote.c:951

8240 msgid " stale (use 'git remote prune' to remove)"

8241 msgstr ""

8242

8236 -#: builtin/remote.c:958

8243 +#: builtin/remote.c:953

8244 msgid " ???"

8245 msgstr ""

8246

8240 -#: builtin/remote.c:999

8247 +#: builtin/remote.c:994

8248 #, c-format

8249 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"

8250 msgstr ""

8251

8245 -#: builtin/remote.c:1006

8252 +#: builtin/remote.c:1001

8253 #, c-format

8254 msgid "rebases onto remote %s"

8255 msgstr ""

8256

8250 -#: builtin/remote.c:1009

8257 +#: builtin/remote.c:1004

8258 #, c-format

8259 msgid " merges with remote %s"

8260 msgstr ""

8261

8255 -#: builtin/remote.c:1010

8262 +#: builtin/remote.c:1005

8263 msgid " and with remote"

8264 msgstr ""

8265

8259 -#: builtin/remote.c:1012

8266 +#: builtin/remote.c:1007

8267 #, c-format

8268 msgid "merges with remote %s"

8269 msgstr ""

8270

8264 -#: builtin/remote.c:1013

8271 +#: builtin/remote.c:1008

8272 msgid " and with remote"

8273 msgstr ""

8274

8268 -#: builtin/remote.c:1059

8275 +#: builtin/remote.c:1054

8276 msgid "create"

8277 msgstr ""

8278

8272 -#: builtin/remote.c:1062

8279 +#: builtin/remote.c:1057

8280 msgid "delete"

8281 msgstr ""

8282

8276 -#: builtin/remote.c:1066

8283 +#: builtin/remote.c:1061

8284 msgid "up to date"

8285 msgstr ""

8286

8280 -#: builtin/remote.c:1069

8287 +#: builtin/remote.c:1064

8288 msgid "fast-forwardable"

8289 msgstr ""

8290

8284 -#: builtin/remote.c:1072

8291 +#: builtin/remote.c:1067

8292 msgid "local out of date"

8293 msgstr ""

8294

8288 -#: builtin/remote.c:1079

8295 +#: builtin/remote.c:1074

8296 #, c-format

8297 msgid " %-*s forces to %-*s (%s)"

8298 msgstr ""

8299

8293 -#: builtin/remote.c:1082

8300 +#: builtin/remote.c:1077

8301 #, c-format

8302 msgid " %-*s pushes to %-*s (%s)"

8303 msgstr ""

8304

8298 -#: builtin/remote.c:1086

8305 +#: builtin/remote.c:1081

8306 #, c-format

8307 msgid " %-*s forces to %s"

8308 msgstr ""

8309

8303 -#: builtin/remote.c:1089

8310 +#: builtin/remote.c:1084

8311 #, c-format

8312 msgid " %-*s pushes to %s"

8313 msgstr ""

8314

8308 -#: builtin/remote.c:1157

8315 +#: builtin/remote.c:1152

8316 msgid "do not query remotes"

8317 msgstr ""

8318

8312 -#: builtin/remote.c:1184

8319 +#: builtin/remote.c:1179

8320 #, c-format

8321 msgid "* remote %s"

8322 msgstr ""

8323

8317 -#: builtin/remote.c:1185

8324 +#: builtin/remote.c:1180

8325 #, c-format

8326 msgid " Fetch URL: %s"

8327 msgstr ""

8328

8322 -#: builtin/remote.c:1186 builtin/remote.c:1333

8329 +#: builtin/remote.c:1181 builtin/remote.c:1332

8330 msgid "(no URL)"

8331 msgstr ""

8332

8326 -#: builtin/remote.c:1195 builtin/remote.c:1197

8333 +#: builtin/remote.c:1190 builtin/remote.c:1192

8334 #, c-format

8335 msgid " Push URL: %s"

8336 msgstr ""

8337

8331 -#: builtin/remote.c:1199 builtin/remote.c:1201 builtin/remote.c:1203

8338 +#: builtin/remote.c:1194 builtin/remote.c:1196 builtin/remote.c:1198

8339 #, c-format

8340 msgid " HEAD branch: %s"

8341 msgstr ""

8342

8336 -#: builtin/remote.c:1205

8343 +#: builtin/remote.c:1200

8344 #, c-format

8345 msgid ""

8346 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"

8347 msgstr ""

8348

8342 -#: builtin/remote.c:1217

8349 +#: builtin/remote.c:1212

8350 #, c-format

8351 msgid " Remote branch:%s"

8352 msgid_plural " Remote branches:%s"

8353 msgstr[0] ""

8354 msgstr[1] ""

8355

8349 -#: builtin/remote.c:1220 builtin/remote.c:1247

8356 +#: builtin/remote.c:1215 builtin/remote.c:1242

8357 msgid " (status not queried)"

8358 msgstr ""

8359

8353 -#: builtin/remote.c:1229

8360 +#: builtin/remote.c:1224

8361 msgid " Local branch configured for 'git pull':"

8362 msgid_plural " Local branches configured for 'git pull':"

8363 msgstr[0] ""

8364 msgstr[1] ""

8365

8359 -#: builtin/remote.c:1237

8366 +#: builtin/remote.c:1232

8367 msgid " Local refs will be mirrored by 'git push'"

8368 msgstr ""

8369

8363 -#: builtin/remote.c:1244

8370 +#: builtin/remote.c:1239

8371 #, c-format

8372 msgid " Local ref configured for 'git push'%s:"

8373 msgid_plural " Local refs configured for 'git push'%s:"

8374 msgstr[0] ""

8375 msgstr[1] ""

8376

8370 -#: builtin/remote.c:1265

8377 +#: builtin/remote.c:1260

8378 msgid "set refs/remotes/<name>/HEAD according to remote"

8379 msgstr ""

8380

8374 -#: builtin/remote.c:1267

8381 +#: builtin/remote.c:1262

8382 msgid "delete refs/remotes/<name>/HEAD"

8383 msgstr ""

8384

8378 -#: builtin/remote.c:1282

8385 +#: builtin/remote.c:1277

8386 msgid "Cannot determine remote HEAD"

8387 msgstr ""

8388

8382 -#: builtin/remote.c:1284

8389 +#: builtin/remote.c:1279

8390 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"

8391 msgstr ""

8392

8386 -#: builtin/remote.c:1294

8393 +#: builtin/remote.c:1289

8394 #, c-format

8395 msgid "Could not delete %s"

8396 msgstr ""

8397

8391 -#: builtin/remote.c:1302

8398 +#: builtin/remote.c:1297

8399 #, c-format

8400 msgid "Not a valid ref: %s"

8401 msgstr ""

8402

8396 -#: builtin/remote.c:1304

8403 +#: builtin/remote.c:1299

8404 #, c-format

8405 msgid "Could not setup %s"

8406 msgstr ""

8407

8401 -#: builtin/remote.c:1322

8408 +#: builtin/remote.c:1317

8409 #, c-format

8410 msgid " %s will become dangling!"

8411 msgstr ""

8412

8406 -#: builtin/remote.c:1323

8413 +#: builtin/remote.c:1318

8414 #, c-format

8415 msgid " %s has become dangling!"

8416 msgstr ""

8417

8411 -#: builtin/remote.c:1329

8418 +#: builtin/remote.c:1328

8419 #, c-format

8420 msgid "Pruning %s"

8421 msgstr ""

8422

8416 -#: builtin/remote.c:1330

8423 +#: builtin/remote.c:1329

8424 #, c-format

8425 msgid "URL: %s"

8426 msgstr ""

8427

8421 -#: builtin/remote.c:1357

8428 +#: builtin/remote.c:1352

8429 #, c-format

8430 msgid " * [would prune] %s"

8431 msgstr ""

8432

8426 -#: builtin/remote.c:1360

8433 +#: builtin/remote.c:1355

8434 #, c-format

8435 msgid " * [pruned] %s"

8436 msgstr ""

8437

8431 -#: builtin/remote.c:1405

8438 +#: builtin/remote.c:1400

8439 msgid "prune remotes after fetching"

8440 msgstr ""

8441

8435 -#: builtin/remote.c:1471 builtin/remote.c:1545

8442 +#: builtin/remote.c:1466 builtin/remote.c:1540

8443 #, c-format

8444 msgid "No such remote '%s'"

8445 msgstr ""

8446

8440 -#: builtin/remote.c:1491

8447 +#: builtin/remote.c:1486

8448 msgid "add branch"

8449 msgstr ""

8450

8444 -#: builtin/remote.c:1498

8451 +#: builtin/remote.c:1493

8452 msgid "no remote specified"

8453 msgstr ""

8454

8448 -#: builtin/remote.c:1520

8455 +#: builtin/remote.c:1515

8456 msgid "manipulate push URLs"

8457 msgstr ""

8458

8452 -#: builtin/remote.c:1522

8459 +#: builtin/remote.c:1517

8460 msgid "add URL"

8461 msgstr ""

8462

8456 -#: builtin/remote.c:1524

8463 +#: builtin/remote.c:1519

8464 msgid "delete URLs"

8465 msgstr ""

8466

8460 -#: builtin/remote.c:1531

8467 +#: builtin/remote.c:1526

8468 msgid "--add --delete doesn't make sense"

8469 msgstr ""

8470

8464 -#: builtin/remote.c:1571

8471 +#: builtin/remote.c:1566

8472 #, c-format

8473 msgid "Invalid old URL pattern: %s"

8474 msgstr ""

8475

8469 -#: builtin/remote.c:1579

8476 +#: builtin/remote.c:1574

8477 #, c-format

8478 msgid "No such URL found: %s"

8479 msgstr ""

8480

8474 -#: builtin/remote.c:1581

8481 +#: builtin/remote.c:1576

8482 msgid "Will not delete all non-push URLs"

8483 msgstr ""

8484

8478 -#: builtin/remote.c:1595

8485 +#: builtin/remote.c:1590

8486 msgid "be verbose; must be placed before a subcommand"

8487 msgstr ""

8488

@@ -8483,71 +8490,71 @@ msgstr ""

8490 msgid "git repack [options]"

8491 msgstr ""

8492

8486 -#: builtin/repack.c:160

8493 +#: builtin/repack.c:159

8494 msgid "pack everything in a single pack"

8495 msgstr ""

8496

8490 -#: builtin/repack.c:162

8497 +#: builtin/repack.c:161

8498 msgid "same as -a, and turn unreachable objects loose"

8499 msgstr ""

8500

8494 -#: builtin/repack.c:165

8501 +#: builtin/repack.c:164

8502 msgid "remove redundant packs, and run git-prune-packed"

8503 msgstr ""

8504

8498 -#: builtin/repack.c:167

8505 +#: builtin/repack.c:166

8506 msgid "pass --no-reuse-delta to git-pack-objects"

8507 msgstr ""

8508

8502 -#: builtin/repack.c:169

8509 +#: builtin/repack.c:168

8510 msgid "pass --no-reuse-object to git-pack-objects"

8511 msgstr ""

8512

8506 -#: builtin/repack.c:171

8513 +#: builtin/repack.c:170

8514 msgid "do not run git-update-server-info"

8515 msgstr ""

8516

8510 -#: builtin/repack.c:174

8517 +#: builtin/repack.c:173

8518 msgid "pass --local to git-pack-objects"

8519 msgstr ""

8520

8514 -#: builtin/repack.c:176

8521 +#: builtin/repack.c:175

8522 msgid "write bitmap index"

8523 msgstr ""

8524

8518 -#: builtin/repack.c:177

8525 +#: builtin/repack.c:176

8526 msgid "approxidate"

8527 msgstr ""

8528

8522 -#: builtin/repack.c:178

8529 +#: builtin/repack.c:177

8530 msgid "with -A, do not loosen objects older than this"

8531 msgstr ""

8532

8526 -#: builtin/repack.c:180

8533 +#: builtin/repack.c:179

8534 msgid "size of the window used for delta compression"

8535 msgstr ""

8536

8530 -#: builtin/repack.c:181 builtin/repack.c:185

8537 +#: builtin/repack.c:180 builtin/repack.c:184

8538 msgid "bytes"

8539 msgstr ""

8540

8534 -#: builtin/repack.c:182

8541 +#: builtin/repack.c:181

8542 msgid "same as the above, but limit memory size instead of entries count"

8543 msgstr ""

8544

8538 -#: builtin/repack.c:184

8545 +#: builtin/repack.c:183

8546 msgid "limits the maximum delta depth"

8547 msgstr ""

8548

8542 -#: builtin/repack.c:186

8549 +#: builtin/repack.c:185

8550 msgid "maximum size of each packfile"

8551 msgstr ""

8552

8546 -#: builtin/repack.c:188

8553 +#: builtin/repack.c:187

8554 msgid "repack objects in packs marked with .keep"

8555 msgstr ""

8556

8550 -#: builtin/repack.c:374

8557 +#: builtin/repack.c:371

8558 #, c-format

8559 msgid "removing '%s' failed"

8560 msgstr ""

@@ -9143,11 +9150,11 @@ msgstr ""

9150 msgid "shorten ref output"

9151 msgstr ""

9152

9146 -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362

9153 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:358

9154 msgid "reason"

9155 msgstr ""

9156

9150 -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362

9157 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:358

9158 msgid "reason of the update"

9159 msgstr ""

9160

@@ -9493,19 +9500,19 @@ msgstr ""

9500 msgid "git update-ref [options] --stdin [-z]"

9501 msgstr ""

9502

9496 -#: builtin/update-ref.c:363

9503 +#: builtin/update-ref.c:359

9504 msgid "delete the reference"

9505 msgstr ""

9506

9500 -#: builtin/update-ref.c:365

9507 +#: builtin/update-ref.c:361

9508 msgid "update <refname> not the one it points to"

9509 msgstr ""

9510

9504 -#: builtin/update-ref.c:366

9511 +#: builtin/update-ref.c:362

9512 msgid "stdin has NUL-terminated arguments"

9513 msgstr ""

9514

9508 -#: builtin/update-ref.c:367

9515 +#: builtin/update-ref.c:363

9516 msgid "read updates from stdin"

9517 msgstr ""

9518

@@ -9680,17 +9687,17 @@ msgstr ""

9687 msgid "update the index with reused conflict resolution if possible"

9688 msgstr ""

9689

9683 -#: git-am.sh:52

9690 +#: git-am.sh:53

9691 msgid "You need to set your committer info first"

9692 msgstr ""

9693

9687 -#: git-am.sh:97

9694 +#: git-am.sh:98

9695 msgid ""

9696 "You seem to have moved HEAD since the last 'am' failure.\n"

9697 "Not rewinding to ORIG_HEAD"

9698 msgstr ""

9699

9693 -#: git-am.sh:107

9700 +#: git-am.sh:108

9701 #, sh-format

9702 msgid ""

9703 "When you have resolved this problem, run \"$cmdline --continue\".\n"

@@ -9698,77 +9705,77 @@ msgid ""

9705 "To restore the original branch and stop patching, run \"$cmdline --abort\"."

9706 msgstr ""

9707

9701 -#: git-am.sh:123

9708 +#: git-am.sh:124

9709 msgid "Cannot fall back to three-way merge."

9710 msgstr ""

9711

9705 -#: git-am.sh:139

9712 +#: git-am.sh:140

9713 msgid "Repository lacks necessary blobs to fall back on 3-way merge."

9714 msgstr ""

9715

9709 -#: git-am.sh:141

9716 +#: git-am.sh:142

9717 msgid "Using index info to reconstruct a base tree..."

9718 msgstr ""

9719

9713 -#: git-am.sh:156

9720 +#: git-am.sh:157

9721 msgid ""

9722 "Did you hand edit your patch?\n"

9723 "It does not apply to blobs recorded in its index."

9724 msgstr ""

9725

9719 -#: git-am.sh:165

9726 +#: git-am.sh:166

9727 msgid "Falling back to patching base and 3-way merge..."

9728 msgstr ""

9729

9723 -#: git-am.sh:181

9730 +#: git-am.sh:182

9731 msgid "Failed to merge in the changes."

9732 msgstr ""

9733

9727 -#: git-am.sh:276

9734 +#: git-am.sh:277

9735 msgid "Only one StGIT patch series can be applied at once"

9736 msgstr ""

9737

9731 -#: git-am.sh:363

9738 +#: git-am.sh:364

9739 #, sh-format

9740 msgid "Patch format $patch_format is not supported."

9741 msgstr ""

9742

9736 -#: git-am.sh:365

9743 +#: git-am.sh:366

9744 msgid "Patch format detection failed."

9745 msgstr ""

9746

9740 -#: git-am.sh:392

9747 +#: git-am.sh:398

9748 msgid ""

9749 "The -b/--binary option has been a no-op for long time, and\n"

9750 "it will be removed. Please do not use it anymore."

9751 msgstr ""

9752

9746 -#: git-am.sh:486

9753 +#: git-am.sh:496

9754 #, sh-format

9755 msgid "previous rebase directory $dotest still exists but mbox given."

9756 msgstr ""

9757

9751 -#: git-am.sh:491

9758 +#: git-am.sh:501

9759 msgid "Please make up your mind. --skip or --abort?"

9760 msgstr ""

9761

9755 -#: git-am.sh:527

9762 +#: git-am.sh:537

9763 #, sh-format

9764 msgid ""

9765 "Stray $dotest directory found.\n"

9766 "Use \"git am --abort\" to remove it."

9767 msgstr ""

9768

9762 -#: git-am.sh:535

9769 +#: git-am.sh:545

9770 msgid "Resolve operation not in progress, we are not resuming."

9771 msgstr ""

9772

9766 -#: git-am.sh:601

9773 +#: git-am.sh:612

9774 #, sh-format

9775 msgid "Dirty index: cannot apply patches (dirty: $files)"

9776 msgstr ""

9777

9771 -#: git-am.sh:705

9778 +#: git-am.sh:722

9779 #, sh-format

9780 msgid ""

9781 "Patch is empty. Was it split wrong?\n"

@@ -9776,60 +9783,60 @@ msgid ""

9783 "To restore the original branch and stop patching run \"$cmdline --abort\"."

9784 msgstr ""

9785

9779 -#: git-am.sh:732

9786 +#: git-am.sh:749

9787 msgid "Patch does not have a valid e-mail address."

9788 msgstr ""

9789

9783 -#: git-am.sh:779

9790 +#: git-am.sh:796

9791 msgid "cannot be interactive without stdin connected to a terminal."

9792 msgstr ""

9793

9787 -#: git-am.sh:783

9794 +#: git-am.sh:800

9795 msgid "Commit Body is:"

9796 msgstr ""

9797

9798 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]

9799 #. in your translation. The program will only accept English

9800 #. input at this point.

9794 -#: git-am.sh:790

9801 +#: git-am.sh:807

9802 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "

9803 msgstr ""

9804

9798 -#: git-am.sh:826

9805 +#: git-am.sh:843

9806 #, sh-format

9807 msgid "Applying: $FIRSTLINE"

9808 msgstr ""

9809

9803 -#: git-am.sh:847

9810 +#: git-am.sh:864

9811 msgid ""

9812 "No changes - did you forget to use 'git add'?\n"

9813 "If there is nothing left to stage, chances are that something else\n"

9814 "already introduced the same changes; you might want to skip this patch."

9815 msgstr ""

9816

9810 -#: git-am.sh:855

9817 +#: git-am.sh:872

9818 msgid ""

9819 "You still have unmerged paths in your index\n"

9820 "did you forget to use 'git add'?"

9821 msgstr ""

9822

9816 -#: git-am.sh:871

9823 +#: git-am.sh:888

9824 msgid "No changes -- Patch already applied."

9825 msgstr ""

9826

9820 -#: git-am.sh:881

9827 +#: git-am.sh:898

9828 #, sh-format

9829 msgid "Patch failed at $msgnum $FIRSTLINE"

9830 msgstr ""

9831

9825 -#: git-am.sh:884

9832 +#: git-am.sh:901

9833 #, sh-format

9834 msgid ""

9835 "The copy of the patch that failed is found in:\n"

9836 " $dotest/patch"

9837 msgstr ""

9838

9832 -#: git-am.sh:902

9839 +#: git-am.sh:919

9840 msgid "applying to an empty history"

9841 msgstr ""

9842

@@ -9891,87 +9898,87 @@ msgstr ""

9898 msgid "Bad rev input: $rev"

9899 msgstr ""

9900

9894 -#: git-bisect.sh:250

9901 +#: git-bisect.sh:253

9902 msgid "'git bisect bad' can take only one argument."

9903 msgstr ""

9904

9898 -#: git-bisect.sh:273

9905 +#: git-bisect.sh:276

9906 msgid "Warning: bisecting only with a bad commit."

9907 msgstr ""

9908

9909 #. TRANSLATORS: Make sure to include [Y] and [n] in your

9910 #. translation. The program will only accept English input

9911 #. at this point.

9905 -#: git-bisect.sh:279

9912 +#: git-bisect.sh:282

9913 msgid "Are you sure [Y/n]? "

9914 msgstr ""

9915

9909 -#: git-bisect.sh:289

9916 +#: git-bisect.sh:292

9917 msgid ""

9918 "You need to give me at least one good and one bad revision.\n"

9919 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"

9920 msgstr ""

9921

9915 -#: git-bisect.sh:292

9922 +#: git-bisect.sh:295

9923 msgid ""

9924 "You need to start by \"git bisect start\".\n"

9925 "You then need to give me at least one good and one bad revision.\n"

9926 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"

9927 msgstr ""

9928

9922 -#: git-bisect.sh:363 git-bisect.sh:490

9929 +#: git-bisect.sh:366 git-bisect.sh:493

9930 msgid "We are not bisecting."

9931 msgstr ""

9932

9926 -#: git-bisect.sh:370

9933 +#: git-bisect.sh:373

9934 #, sh-format

9935 msgid "'$invalid' is not a valid commit"

9936 msgstr ""

9937

9931 -#: git-bisect.sh:379

9938 +#: git-bisect.sh:382

9939 #, sh-format

9940 msgid ""

9941 "Could not check out original HEAD '$branch'.\n"

9942 "Try 'git bisect reset <commit>'."

9943 msgstr ""

9944

9938 -#: git-bisect.sh:406

9945 +#: git-bisect.sh:409

9946 msgid "No logfile given"

9947 msgstr ""

9948

9942 -#: git-bisect.sh:407

9949 +#: git-bisect.sh:410

9950 #, sh-format

9951 msgid "cannot read $file for replaying"

9952 msgstr ""

9953

9947 -#: git-bisect.sh:424

9954 +#: git-bisect.sh:427

9955 msgid "?? what are you talking about?"

9956 msgstr ""

9957

9951 -#: git-bisect.sh:436

9958 +#: git-bisect.sh:439

9959 #, sh-format

9960 msgid "running $command"

9961 msgstr ""

9962

9956 -#: git-bisect.sh:443

9963 +#: git-bisect.sh:446

9964 #, sh-format

9965 msgid ""

9966 "bisect run failed:\n"

9967 "exit code $res from '$command' is < 0 or >= 128"

9968 msgstr ""

9969

9963 -#: git-bisect.sh:469

9970 +#: git-bisect.sh:472

9971 msgid "bisect run cannot continue any more"

9972 msgstr ""

9973

9967 -#: git-bisect.sh:475

9974 +#: git-bisect.sh:478

9975 #, sh-format

9976 msgid ""

9977 "bisect run failed:\n"

9978 "'bisect_state $state' exited with error code $res"

9979 msgstr ""

9980

9974 -#: git-bisect.sh:482

9981 +#: git-bisect.sh:485

9982 msgid "bisect run success"

9983 msgstr ""

9984

l10n: git.pot: v2.3.0 round 1 (13 new, 11 removed)