c138af56da · matheusbsbs/matheus-bagliano

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

8 msgstr ""

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

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

11 -"POT-Creation-Date: 2013-03-05 12:36+0800\n"

11 +"POT-Creation-Date: 2013-04-10 15:16+0800\n"

12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

14 "Language-Team: LANGUAGE <LL@li.org>\n"

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

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

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

20

21 -#: advice.c:49

21 +#: advice.c:53

22 #, c-format

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

24 msgstr ""

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

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

28 #. * other commands doing a merge do.

29 #.

30 -#: advice.c:79

30 +#: advice.c:83

31 msgid ""

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

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

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

60 msgid "archive format"

61 msgstr ""

62

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

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

64 msgid "prefix"

65 msgstr ""

66

@@ -68,15 +68,15 @@ msgstr ""

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

69 msgstr ""

70

71 -#: archive.c:326 builtin/archive.c:91 builtin/blame.c:2366

72 -#: builtin/blame.c:2367 builtin/config.c:55 builtin/fast-export.c:653

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

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

72 +#: builtin/blame.c:2367 builtin/config.c:55 builtin/fast-export.c:659

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

74 #: builtin/ls-files.c:497 builtin/ls-files.c:500 builtin/notes.c:536

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

76 msgid "file"

77 msgstr ""

78

79 -#: archive.c:327 builtin/archive.c:92

79 +#: archive.c:327 builtin/archive.c:89

80 msgid "write the archive to this file"

81 msgstr ""

82

@@ -104,19 +104,19 @@ msgstr ""

104 msgid "list supported archive formats"

105 msgstr ""

106

107 -#: archive.c:345 builtin/archive.c:93 builtin/clone.c:85

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

108 msgid "repo"

109 msgstr ""

110

111 -#: archive.c:346 builtin/archive.c:94

111 +#: archive.c:346 builtin/archive.c:91

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

113 msgstr ""

114

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

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

116 msgid "command"

117 msgstr ""

118

119 -#: archive.c:348 builtin/archive.c:96

119 +#: archive.c:348 builtin/archive.c:93

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

121 msgstr ""

122

@@ -126,6 +126,28 @@ msgid ""

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

127 msgstr ""

128

129 +#: branch.c:201

130 +#, c-format

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

132 +msgstr ""

133 +

134 +#: branch.c:203

135 +#, c-format

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

137 +msgstr ""

138 +

139 +#: branch.c:205

140 +msgid ""

141 +"\n"

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

143 +"branch that already exists at the remote, you may need to\n"

144 +"run \"git fetch\" to retrieve it.\n"

145 +"\n"

146 +"If you are planning to push out a new local branch that\n"

147 +"will track its remote counterpart, you may want to use\n"

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

149 +msgstr ""

150 +

151 #: bundle.c:36

152 #, c-format

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

@@ -136,7 +158,7 @@ msgstr ""

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

159 msgstr ""

160

139 -#: bundle.c:89 builtin/commit.c:674

161 +#: bundle.c:89 builtin/commit.c:676

162 #, c-format

163 msgid "could not open '%s'"

164 msgstr ""

@@ -145,27 +167,27 @@ msgstr ""

167 msgid "Repository lacks these prerequisite commits:"

168 msgstr ""

169

148 -#: bundle.c:164 sequencer.c:566 sequencer.c:998 builtin/log.c:299

149 -#: builtin/log.c:751 builtin/log.c:1358 builtin/log.c:1574 builtin/merge.c:347

170 +#: bundle.c:164 sequencer.c:651 sequencer.c:1083 builtin/log.c:300

171 +#: builtin/log.c:754 builtin/log.c:1350 builtin/log.c:1566 builtin/merge.c:349

172 #: builtin/shortlog.c:157

173 msgid "revision walk setup failed"

174 msgstr ""

175

176 #: bundle.c:186

177 #, c-format

156 -msgid "The bundle contains %d ref"

157 -msgid_plural "The bundle contains %d refs"

178 +msgid "The bundle contains this ref:"

179 +msgid_plural "The bundle contains these %d refs:"

180 msgstr[0] ""

181 msgstr[1] ""

182

161 -#: bundle.c:192

183 +#: bundle.c:193

184 msgid "The bundle records a complete history."

185 msgstr ""

186

187 #: bundle.c:195

188 #, c-format

167 -msgid "The bundle requires this ref"

168 -msgid_plural "The bundle requires these %d refs"

189 +msgid "The bundle requires this ref:"

190 +msgid_plural "The bundle requires these %d refs:"

191 msgstr[0] ""

192 msgstr[1] ""

193

@@ -173,7 +195,7 @@ msgstr[1] ""

195 msgid "rev-list died"

196 msgstr ""

197

176 -#: bundle.c:300 builtin/log.c:1254 builtin/shortlog.c:260

198 +#: bundle.c:300 builtin/log.c:1246 builtin/shortlog.c:260

199 #, c-format

200 msgid "unrecognized argument: %s"

201 msgstr ""

@@ -321,19 +343,19 @@ msgid ""

343 "%s"

344 msgstr ""

345

324 -#: diff.c:3468

346 +#: diff.c:3480

347 #, c-format

348 msgid ""

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

350 "%s"

351 msgstr ""

352

331 -#: diff.c:3482

353 +#: diff.c:3494

354 #, c-format

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

356 msgstr ""

357

336 -#: gpg-interface.c:59 gpg-interface.c:127

358 +#: gpg-interface.c:59 gpg-interface.c:131

359 msgid "could not run gpg."

360 msgstr ""

361

@@ -345,27 +367,27 @@ msgstr ""

367 msgid "gpg failed to sign the data"

368 msgstr ""

369

348 -#: gpg-interface.c:112

370 +#: gpg-interface.c:115

371 #, c-format

372 msgid "could not create temporary file '%s': %s"

373 msgstr ""

374

353 -#: gpg-interface.c:115

375 +#: gpg-interface.c:118

376 #, c-format

377 msgid "failed writing detached signature to '%s': %s"

378 msgstr ""

379

358 -#: grep.c:1622

380 +#: grep.c:1623

381 #, c-format

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

383 msgstr ""

384

363 -#: grep.c:1639

385 +#: grep.c:1640

386 #, c-format

387 msgid "'%s': %s"

388 msgstr ""

389

368 -#: grep.c:1650

390 +#: grep.c:1651

391 #, c-format

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

393 msgstr ""

@@ -425,8 +447,8 @@ msgstr[1] ""

447 msgid "failed to read the cache"

448 msgstr ""

449

428 -#: merge.c:110 builtin/checkout.c:333 builtin/checkout.c:534

429 -#: builtin/clone.c:586

450 +#: merge.c:110 builtin/checkout.c:362 builtin/checkout.c:563

451 +#: builtin/clone.c:635

452 msgid "unable to write new index file"

453 msgstr ""

454

@@ -475,7 +497,7 @@ msgstr ""

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

498 msgstr ""

499

478 -#: merge-recursive.c:773 builtin/clone.c:302

500 +#: merge-recursive.c:773 builtin/clone.c:303

501 #, c-format

502 msgid "failed to open '%s'"

503 msgstr ""

@@ -602,7 +624,7 @@ msgstr ""

624 msgid "Auto-merging %s"

625 msgstr ""

626

605 -#: merge-recursive.c:1633 git-submodule.sh:942

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

628 msgid "submodule"

629 msgstr ""

630

@@ -672,10 +694,15 @@ msgstr ""

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

695 msgstr ""

696

675 -#: merge-recursive.c:2009 builtin/merge.c:643

697 +#: merge-recursive.c:2009 builtin/merge.c:658

698 msgid "Unable to write index."

699 msgstr ""

700

701 +#: object.c:195

702 +#, c-format

703 +msgid "unable to parse object: %s"

704 +msgstr ""

705 +

706 #: parse-options.c:489

707 msgid "..."

708 msgstr ""

@@ -711,18 +738,18 @@ msgstr ""

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

739 msgstr ""

740

714 -#: remote.c:1653

741 +#: remote.c:1781

742 #, c-format

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

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

745 msgstr[0] ""

746 msgstr[1] ""

747

721 -#: remote.c:1659

748 +#: remote.c:1787

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

750 msgstr ""

751

725 -#: remote.c:1662

752 +#: remote.c:1790

753 #, c-format

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

755 msgid_plural ""

@@ -730,11 +757,11 @@ msgid_plural ""

757 msgstr[0] ""

758 msgstr[1] ""

759

733 -#: remote.c:1670

760 +#: remote.c:1798

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

762 msgstr ""

763

737 -#: remote.c:1673

764 +#: remote.c:1801

765 #, c-format

766 msgid ""

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

@@ -745,257 +772,257 @@ msgid_plural ""

772 msgstr[0] ""

773 msgstr[1] ""

774

748 -#: remote.c:1683

775 +#: remote.c:1811

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

777 msgstr ""

778

752 -#: sequencer.c:123 builtin/merge.c:761 builtin/merge.c:874 builtin/merge.c:984

753 -#: builtin/merge.c:994

779 +#: sequencer.c:206 builtin/merge.c:776 builtin/merge.c:889 builtin/merge.c:999

780 +#: builtin/merge.c:1009

781 #, c-format

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

783 msgstr ""

784

758 -#: sequencer.c:125 builtin/merge.c:333 builtin/merge.c:764 builtin/merge.c:986

759 -#: builtin/merge.c:999

785 +#: sequencer.c:208 builtin/merge.c:335 builtin/merge.c:779

786 +#: builtin/merge.c:1001 builtin/merge.c:1014

787 #, c-format

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

789 msgstr ""

790

764 -#: sequencer.c:146

791 +#: sequencer.c:229

792 msgid ""

793 "after resolving the conflicts, mark the corrected paths\n"

794 "with 'git add <paths>' or 'git rm <paths>'"

795 msgstr ""

796

770 -#: sequencer.c:149

797 +#: sequencer.c:232

798 msgid ""

799 "after resolving the conflicts, mark the corrected paths\n"

800 "with 'git add <paths>' or 'git rm <paths>'\n"

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

802 msgstr ""

803

777 -#: sequencer.c:162 sequencer.c:774 sequencer.c:857

804 +#: sequencer.c:245 sequencer.c:859 sequencer.c:942

805 #, c-format

806 msgid "Could not write to %s"

807 msgstr ""

808

782 -#: sequencer.c:165

809 +#: sequencer.c:248

810 #, c-format

811 msgid "Error wrapping up %s"

812 msgstr ""

813

787 -#: sequencer.c:180

814 +#: sequencer.c:263

815 msgid "Your local changes would be overwritten by cherry-pick."

816 msgstr ""

817

791 -#: sequencer.c:182

818 +#: sequencer.c:265

819 msgid "Your local changes would be overwritten by revert."

820 msgstr ""

821

795 -#: sequencer.c:185

822 +#: sequencer.c:268

823 msgid "Commit your changes or stash them to proceed."

824 msgstr ""

825

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

800 -#: sequencer.c:236

827 +#: sequencer.c:319

828 #, c-format

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

830 msgstr ""

831

805 -#: sequencer.c:267

832 +#: sequencer.c:350

833 msgid "Could not resolve HEAD commit\n"

834 msgstr ""

835

809 -#: sequencer.c:288

836 +#: sequencer.c:371

837 msgid "Unable to update cache tree\n"

838 msgstr ""

839

813 -#: sequencer.c:333

840 +#: sequencer.c:416

841 #, c-format

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

843 msgstr ""

844

818 -#: sequencer.c:338

845 +#: sequencer.c:421

846 #, c-format

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

848 msgstr ""

849

823 -#: sequencer.c:404

850 +#: sequencer.c:487

851 msgid "Your index file is unmerged."

852 msgstr ""

853

827 -#: sequencer.c:423

854 +#: sequencer.c:506

855 #, c-format

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

857 msgstr ""

858

832 -#: sequencer.c:431

859 +#: sequencer.c:514

860 #, c-format

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

862 msgstr ""

863

837 -#: sequencer.c:435

864 +#: sequencer.c:518

865 #, c-format

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

867 msgstr ""

868

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

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

844 -#: sequencer.c:448

871 +#: sequencer.c:531

872 #, c-format

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

874 msgstr ""

875

849 -#: sequencer.c:452

876 +#: sequencer.c:535

877 #, c-format

878 msgid "Cannot get commit message for %s"

879 msgstr ""

880

854 -#: sequencer.c:536

881 +#: sequencer.c:621

882 #, c-format

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

884 msgstr ""

885

859 -#: sequencer.c:537

886 +#: sequencer.c:622

887 #, c-format

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

889 msgstr ""

890

864 -#: sequencer.c:569

891 +#: sequencer.c:654

892 msgid "empty commit set passed"

893 msgstr ""

894

868 -#: sequencer.c:577

895 +#: sequencer.c:662

896 #, c-format

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

898 msgstr ""

899

873 -#: sequencer.c:582

900 +#: sequencer.c:667

901 #, c-format

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

903 msgstr ""

904

878 -#: sequencer.c:640

905 +#: sequencer.c:725

906 #, c-format

907 msgid "Cannot %s during a %s"

908 msgstr ""

909

883 -#: sequencer.c:662

910 +#: sequencer.c:747

911 #, c-format

912 msgid "Could not parse line %d."

913 msgstr ""

914

888 -#: sequencer.c:667

915 +#: sequencer.c:752

916 msgid "No commits parsed."

917 msgstr ""

918

892 -#: sequencer.c:680

919 +#: sequencer.c:765

920 #, c-format

921 msgid "Could not open %s"

922 msgstr ""

923

897 -#: sequencer.c:684

924 +#: sequencer.c:769

925 #, c-format

926 msgid "Could not read %s."

927 msgstr ""

928

902 -#: sequencer.c:691

929 +#: sequencer.c:776

930 #, c-format

931 msgid "Unusable instruction sheet: %s"

932 msgstr ""

933

907 -#: sequencer.c:719

934 +#: sequencer.c:804

935 #, c-format

936 msgid "Invalid key: %s"

937 msgstr ""

938

912 -#: sequencer.c:722

939 +#: sequencer.c:807

940 #, c-format

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

942 msgstr ""

943

917 -#: sequencer.c:734

944 +#: sequencer.c:819

945 #, c-format

946 msgid "Malformed options sheet: %s"

947 msgstr ""

948

922 -#: sequencer.c:755

949 +#: sequencer.c:840

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

951 msgstr ""

952

926 -#: sequencer.c:756

953 +#: sequencer.c:841

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

955 msgstr ""

956

930 -#: sequencer.c:760

957 +#: sequencer.c:845

958 #, c-format

959 msgid "Could not create sequencer directory %s"

960 msgstr ""

961

935 -#: sequencer.c:776 sequencer.c:861

962 +#: sequencer.c:861 sequencer.c:946

963 #, c-format

964 msgid "Error wrapping up %s."

965 msgstr ""

966

940 -#: sequencer.c:795 sequencer.c:929

967 +#: sequencer.c:880 sequencer.c:1014

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

969 msgstr ""

970

944 -#: sequencer.c:797

971 +#: sequencer.c:882

972 msgid "cannot resolve HEAD"

973 msgstr ""

974

948 -#: sequencer.c:799

975 +#: sequencer.c:884

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

977 msgstr ""

978

952 -#: sequencer.c:821 builtin/apply.c:4056

979 +#: sequencer.c:906 builtin/apply.c:4060

980 #, c-format

981 msgid "cannot open %s: %s"

982 msgstr ""

983

957 -#: sequencer.c:824

984 +#: sequencer.c:909

985 #, c-format

986 msgid "cannot read %s: %s"

987 msgstr ""

988

962 -#: sequencer.c:825

989 +#: sequencer.c:910

990 msgid "unexpected end of file"

991 msgstr ""

992

966 -#: sequencer.c:831

993 +#: sequencer.c:916

994 #, c-format

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

996 msgstr ""

997

971 -#: sequencer.c:854

998 +#: sequencer.c:939

999 #, c-format

1000 msgid "Could not format %s."

1001 msgstr ""

1002

976 -#: sequencer.c:1016

1003 +#: sequencer.c:1101

1004 msgid "Can't revert as initial commit"

1005 msgstr ""

1006

980 -#: sequencer.c:1017

1007 +#: sequencer.c:1102

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

1009 msgstr ""

1010

984 -#: sha1_name.c:1044

1011 +#: sha1_name.c:1036

1012 msgid "HEAD does not point to a branch"

1013 msgstr ""

1014

988 -#: sha1_name.c:1047

1015 +#: sha1_name.c:1039

1016 #, c-format

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

1018 msgstr ""

1019

993 -#: sha1_name.c:1049

1020 +#: sha1_name.c:1041

1021 #, c-format

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

1023 msgstr ""

1024

998 -#: sha1_name.c:1052

1025 +#: sha1_name.c:1044

1026 #, c-format

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

1028 msgstr ""

@@ -1118,261 +1145,299 @@ msgstr ""

1145 msgid "untracked content, "

1146 msgstr ""

1147

1121 -#: wt-status.c:303

1148 +#: wt-status.c:306

1149 #, c-format

1150 msgid "new file: %s"

1151 msgstr ""

1152

1126 -#: wt-status.c:306

1153 +#: wt-status.c:309

1154 #, c-format

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

1156 msgstr ""

1157

1131 -#: wt-status.c:309

1158 +#: wt-status.c:312

1159 #, c-format

1160 msgid "deleted: %s"

1161 msgstr ""

1162

1136 -#: wt-status.c:312

1163 +#: wt-status.c:315

1164 #, c-format

1165 msgid "modified: %s"

1166 msgstr ""

1167

1141 -#: wt-status.c:315

1168 +#: wt-status.c:318

1169 #, c-format

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

1171 msgstr ""

1172

1146 -#: wt-status.c:318

1173 +#: wt-status.c:321

1174 #, c-format

1175 msgid "typechange: %s"

1176 msgstr ""

1177

1151 -#: wt-status.c:321

1178 +#: wt-status.c:324

1179 #, c-format

1180 msgid "unknown: %s"

1181 msgstr ""

1182

1156 -#: wt-status.c:324

1183 +#: wt-status.c:327

1184 #, c-format

1185 msgid "unmerged: %s"

1186 msgstr ""

1187

1161 -#: wt-status.c:327

1188 +#: wt-status.c:330

1189 #, c-format

1190 msgid "bug: unhandled diff status %c"

1191 msgstr ""

1192

1166 -#: wt-status.c:789

1193 +#: wt-status.c:805

1194 msgid "You have unmerged paths."

1195 msgstr ""

1196

1170 -#: wt-status.c:792 wt-status.c:944

1197 +#: wt-status.c:808 wt-status.c:960

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

1199 msgstr ""

1200

1174 -#: wt-status.c:795

1201 +#: wt-status.c:811

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

1203 msgstr ""

1204

1178 -#: wt-status.c:798

1205 +#: wt-status.c:814

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

1207 msgstr ""

1208

1182 -#: wt-status.c:808

1209 +#: wt-status.c:824

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

1211 msgstr ""

1212

1186 -#: wt-status.c:811

1213 +#: wt-status.c:827

1214 msgid "The current patch is empty."

1215 msgstr ""

1216

1190 -#: wt-status.c:815

1217 +#: wt-status.c:831

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

1219 msgstr ""

1220

1194 -#: wt-status.c:817

1221 +#: wt-status.c:833

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

1223 msgstr ""

1224

1198 -#: wt-status.c:819

1225 +#: wt-status.c:835

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

1227 msgstr ""

1228

1202 -#: wt-status.c:879 wt-status.c:896

1229 +#: wt-status.c:895 wt-status.c:912

1230 #, c-format

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

1232 msgstr ""

1233

1207 -#: wt-status.c:884 wt-status.c:901

1234 +#: wt-status.c:900 wt-status.c:917

1235 msgid "You are currently rebasing."

1236 msgstr ""

1237

1211 -#: wt-status.c:887

1238 +#: wt-status.c:903

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

1240 msgstr ""

1241

1215 -#: wt-status.c:889

1242 +#: wt-status.c:905

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

1244 msgstr ""

1245

1219 -#: wt-status.c:891

1246 +#: wt-status.c:907

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

1248 msgstr ""

1249

1223 -#: wt-status.c:904

1250 +#: wt-status.c:920

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

1252 msgstr ""

1253

1227 -#: wt-status.c:908

1254 +#: wt-status.c:924

1255 #, c-format

1256 msgid ""

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

1258 msgstr ""

1259

1233 -#: wt-status.c:913

1260 +#: wt-status.c:929

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

1262 msgstr ""

1263

1237 -#: wt-status.c:916

1264 +#: wt-status.c:932

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

1266 msgstr ""

1267

1241 -#: wt-status.c:920

1268 +#: wt-status.c:936

1269 #, c-format

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

1271 msgstr ""

1272

1246 -#: wt-status.c:925

1273 +#: wt-status.c:941

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

1275 msgstr ""

1276

1250 -#: wt-status.c:928

1277 +#: wt-status.c:944

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

1279 msgstr ""

1280

1254 -#: wt-status.c:930

1281 +#: wt-status.c:946

1282 msgid ""

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

1284 msgstr ""

1285

1259 -#: wt-status.c:940

1286 +#: wt-status.c:956

1287 msgid "You are currently cherry-picking."

1288 msgstr ""

1289

1263 -#: wt-status.c:947

1290 +#: wt-status.c:963

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

1292 msgstr ""

1293

1267 -#: wt-status.c:958

1294 +#: wt-status.c:972

1295 #, c-format

1269 -msgid "You are currently bisecting branch '%s'."

1296 +msgid "You are currently reverting commit %s."

1297 +msgstr ""

1298 +

1299 +#: wt-status.c:977

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

1301 msgstr ""

1302

1272 -#: wt-status.c:962

1303 +#: wt-status.c:980

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

1305 +msgstr ""

1306 +

1307 +#: wt-status.c:982

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

1309 +msgstr ""

1310 +

1311 +#: wt-status.c:993

1312 +#, c-format

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

1314 +msgstr ""

1315 +

1316 +#: wt-status.c:997

1317 msgid "You are currently bisecting."

1318 msgstr ""

1319

1276 -#: wt-status.c:965

1320 +#: wt-status.c:1000

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

1322 msgstr ""

1323

1280 -#: wt-status.c:1064

1324 +#: wt-status.c:1175

1325 msgid "On branch "

1326 msgstr ""

1327

1284 -#: wt-status.c:1071

1328 +#: wt-status.c:1186

1329 +msgid "HEAD detached at "

1330 +msgstr ""

1331 +

1332 +#: wt-status.c:1188

1333 +msgid "HEAD detached from "

1334 +msgstr ""

1335 +

1336 +#: wt-status.c:1191

1337 msgid "Not currently on any branch."

1338 msgstr ""

1339

1288 -#: wt-status.c:1083

1340 +#: wt-status.c:1208

1341 msgid "Initial commit"

1342 msgstr ""

1343

1292 -#: wt-status.c:1097

1344 +#: wt-status.c:1222

1345 msgid "Untracked files"

1346 msgstr ""

1347

1296 -#: wt-status.c:1099

1348 +#: wt-status.c:1224

1349 msgid "Ignored files"

1350 msgstr ""

1351

1300 -#: wt-status.c:1101

1352 +#: wt-status.c:1228

1353 +#, c-format

1354 +msgid "It took %.2f seconds to enumerate untracked files. 'status -uno'"

1355 +msgstr ""

1356 +

1357 +#: wt-status.c:1232

1358 +msgid "may speed it up, but you have to be careful not to forget to add"

1359 +msgstr ""

1360 +

1361 +#: wt-status.c:1235

1362 +msgid "new files yourself (see 'git help status')."

1363 +msgstr ""

1364 +

1365 +#: wt-status.c:1238

1366 #, c-format

1367 msgid "Untracked files not listed%s"

1368 msgstr ""

1369

1305 -#: wt-status.c:1103

1370 +#: wt-status.c:1240

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

1372 msgstr ""

1373

1309 -#: wt-status.c:1109

1374 +#: wt-status.c:1246

1375 msgid "No changes"

1376 msgstr ""

1377

1313 -#: wt-status.c:1114

1378 +#: wt-status.c:1251

1379 #, c-format

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

1381 msgstr ""

1382

1318 -#: wt-status.c:1117

1383 +#: wt-status.c:1254

1384 #, c-format

1385 msgid "no changes added to commit\n"

1386 msgstr ""

1387

1323 -#: wt-status.c:1120

1388 +#: wt-status.c:1257

1389 #, c-format

1390 msgid ""

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

1392 "track)\n"

1393 msgstr ""

1394

1330 -#: wt-status.c:1123

1395 +#: wt-status.c:1260

1396 #, c-format

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

1398 msgstr ""

1399

1335 -#: wt-status.c:1126

1400 +#: wt-status.c:1263

1401 #, c-format

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

1403 msgstr ""

1404

1340 -#: wt-status.c:1129 wt-status.c:1134

1405 +#: wt-status.c:1266 wt-status.c:1271

1406 #, c-format

1407 msgid "nothing to commit\n"

1408 msgstr ""

1409

1345 -#: wt-status.c:1132

1410 +#: wt-status.c:1269

1411 #, c-format

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

1413 msgstr ""

1414

1350 -#: wt-status.c:1136

1415 +#: wt-status.c:1273

1416 #, c-format

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

1418 msgstr ""

1419

1355 -#: wt-status.c:1244

1420 +#: wt-status.c:1381

1421 msgid "HEAD (no branch)"

1422 msgstr ""

1423

1359 -#: wt-status.c:1250

1424 +#: wt-status.c:1387

1425 msgid "Initial commit on "

1426 msgstr ""

1427

1363 -#: wt-status.c:1265

1428 +#: wt-status.c:1402

1429 msgid "behind "

1430 msgstr ""

1431

1367 -#: wt-status.c:1268 wt-status.c:1271

1432 +#: wt-status.c:1405 wt-status.c:1408

1433 msgid "ahead "

1434 msgstr ""

1435

1371 -#: wt-status.c:1273

1436 +#: wt-status.c:1410

1437 msgid ", behind "

1438 msgstr ""

1439

1375 -#: compat/precompose_utf8.c:58 builtin/clone.c:341

1440 +#: compat/precompose_utf8.c:58 builtin/clone.c:342

1441 #, c-format

1442 msgid "failed to unlink '%s'"

1443 msgstr ""

@@ -1386,7 +1451,7 @@ msgstr ""

1451 msgid "unexpected diff status %c"

1452 msgstr ""

1453

1389 -#: builtin/add.c:68 builtin/commit.c:231

1454 +#: builtin/add.c:68 builtin/commit.c:233

1455 msgid "updating files failed"

1456 msgstr ""

1457

@@ -1441,9 +1506,9 @@ msgstr ""

1506 msgid "dry run"

1507 msgstr ""

1508

1444 -#: builtin/add.c:278 builtin/apply.c:4405 builtin/check-ignore.c:19

1445 -#: builtin/commit.c:1150 builtin/count-objects.c:82 builtin/fsck.c:613

1446 -#: builtin/log.c:1522 builtin/mv.c:62 builtin/read-tree.c:112

1509 +#: builtin/add.c:278 builtin/apply.c:4409 builtin/check-ignore.c:19

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

1511 +#: builtin/log.c:1514 builtin/mv.c:62 builtin/read-tree.c:112

1512 msgid "be verbose"

1513 msgstr ""

1514

@@ -1451,7 +1516,7 @@ msgstr ""

1516 msgid "interactive picking"

1517 msgstr ""

1518

1454 -#: builtin/add.c:281 builtin/checkout.c:1031 builtin/reset.c:258

1519 +#: builtin/add.c:281 builtin/checkout.c:1060 builtin/reset.c:258

1520 msgid "select hunks interactively"

1521 msgstr ""

1522

@@ -1506,9 +1571,9 @@ msgstr ""

1571 #. * this is not the original behavior and can't be

1572 #. * changed until users trained themselves not to type

1573 #. * "git add -u" or "git add -A". For now, we warn and

1509 -#. * keep the old behavior. Later, this warning can be

1510 -#. * turned into a die(...), and eventually we may

1511 -#. * reallow the command with a new behavior.

1574 +#. * keep the old behavior. Later, the behavior can be changed

1575 +#. * to tree-wide, keeping the warning for a while, and

1576 +#. * eventually we can drop the warning.

1577 #.

1578 #: builtin/add.c:335

1579 #, c-format

@@ -1549,11 +1614,11 @@ msgid "Maybe you wanted to say 'git add .'?\n"

1614 msgstr ""

1615

1616 #: builtin/add.c:421 builtin/check-ignore.c:67 builtin/clean.c:204

1552 -#: builtin/commit.c:291 builtin/mv.c:82 builtin/rm.c:235

1617 +#: builtin/commit.c:293 builtin/mv.c:82 builtin/rm.c:235

1618 msgid "index file corrupt"

1619 msgstr ""

1620

1556 -#: builtin/add.c:481 builtin/apply.c:4501 builtin/mv.c:229 builtin/rm.c:370

1621 +#: builtin/add.c:481 builtin/apply.c:4505 builtin/mv.c:229 builtin/rm.c:370

1622 msgid "Unable to write new index file"

1623 msgstr ""

1624

@@ -1681,342 +1746,342 @@ msgstr ""

1746 msgid "unable to open or read %s"

1747 msgstr ""

1748

1684 -#: builtin/apply.c:2684

1749 +#: builtin/apply.c:2688

1750 #, c-format

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

1752 msgstr ""

1753

1689 -#: builtin/apply.c:2802

1754 +#: builtin/apply.c:2806

1755 #, c-format

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

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

1758 msgstr[0] ""

1759 msgstr[1] ""

1760

1696 -#: builtin/apply.c:2814

1761 +#: builtin/apply.c:2818

1762 #, c-format

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

1764 msgstr ""

1765

1701 -#: builtin/apply.c:2820

1766 +#: builtin/apply.c:2824

1767 #, c-format

1768 msgid ""

1769 "while searching for:\n"

1770 "%.*s"

1771 msgstr ""

1772

1708 -#: builtin/apply.c:2839

1773 +#: builtin/apply.c:2843

1774 #, c-format

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

1776 msgstr ""

1777

1713 -#: builtin/apply.c:2942

1778 +#: builtin/apply.c:2946

1779 #, c-format

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

1781 msgstr ""

1782

1718 -#: builtin/apply.c:2948

1783 +#: builtin/apply.c:2952

1784 #, c-format

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

1786 msgstr ""

1787

1723 -#: builtin/apply.c:2969

1788 +#: builtin/apply.c:2973

1789 #, c-format

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

1791 msgstr ""

1792

1728 -#: builtin/apply.c:3091

1793 +#: builtin/apply.c:3095

1794 #, c-format

1795 msgid "cannot checkout %s"

1796 msgstr ""

1797

1733 -#: builtin/apply.c:3136 builtin/apply.c:3145 builtin/apply.c:3189

1798 +#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3193

1799 #, c-format

1800 msgid "read of %s failed"

1801 msgstr ""

1802

1738 -#: builtin/apply.c:3169 builtin/apply.c:3391

1803 +#: builtin/apply.c:3173 builtin/apply.c:3395

1804 #, c-format

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

1806 msgstr ""

1807

1743 -#: builtin/apply.c:3250 builtin/apply.c:3405

1808 +#: builtin/apply.c:3254 builtin/apply.c:3409

1809 #, c-format

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

1811 msgstr ""

1812

1748 -#: builtin/apply.c:3254 builtin/apply.c:3397 builtin/apply.c:3419

1813 +#: builtin/apply.c:3258 builtin/apply.c:3401 builtin/apply.c:3423

1814 #, c-format

1815 msgid "%s: %s"

1816 msgstr ""

1817

1753 -#: builtin/apply.c:3259 builtin/apply.c:3413

1818 +#: builtin/apply.c:3263 builtin/apply.c:3417

1819 #, c-format

1820 msgid "%s: does not match index"

1821 msgstr ""

1822

1758 -#: builtin/apply.c:3361

1823 +#: builtin/apply.c:3365

1824 msgid "removal patch leaves file contents"

1825 msgstr ""

1826

1762 -#: builtin/apply.c:3430

1827 +#: builtin/apply.c:3434

1828 #, c-format

1829 msgid "%s: wrong type"

1830 msgstr ""

1831

1767 -#: builtin/apply.c:3432

1832 +#: builtin/apply.c:3436

1833 #, c-format

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

1835 msgstr ""

1836

1772 -#: builtin/apply.c:3533

1837 +#: builtin/apply.c:3537

1838 #, c-format

1839 msgid "%s: already exists in index"

1840 msgstr ""

1841

1777 -#: builtin/apply.c:3536

1842 +#: builtin/apply.c:3540

1843 #, c-format

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

1845 msgstr ""

1846

1782 -#: builtin/apply.c:3556

1847 +#: builtin/apply.c:3560

1848 #, c-format

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

1850 msgstr ""

1851

1787 -#: builtin/apply.c:3561

1852 +#: builtin/apply.c:3565

1853 #, c-format

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

1855 msgstr ""

1856

1792 -#: builtin/apply.c:3569

1857 +#: builtin/apply.c:3573

1858 #, c-format

1859 msgid "%s: patch does not apply"

1860 msgstr ""

1861

1797 -#: builtin/apply.c:3582

1862 +#: builtin/apply.c:3586

1863 #, c-format

1864 msgid "Checking patch %s..."

1865 msgstr ""

1866

1802 -#: builtin/apply.c:3675 builtin/checkout.c:215 builtin/reset.c:124

1867 +#: builtin/apply.c:3679 builtin/checkout.c:215 builtin/reset.c:124

1868 #, c-format

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

1870 msgstr ""

1871

1807 -#: builtin/apply.c:3818

1872 +#: builtin/apply.c:3822

1873 #, c-format

1874 msgid "unable to remove %s from index"

1875 msgstr ""

1876

1812 -#: builtin/apply.c:3846

1877 +#: builtin/apply.c:3850

1878 #, c-format

1879 msgid "corrupt patch for subproject %s"

1880 msgstr ""

1881

1817 -#: builtin/apply.c:3850

1882 +#: builtin/apply.c:3854

1883 #, c-format

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

1885 msgstr ""

1886

1822 -#: builtin/apply.c:3855

1887 +#: builtin/apply.c:3859

1888 #, c-format

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

1890 msgstr ""

1891

1827 -#: builtin/apply.c:3858 builtin/apply.c:3966

1892 +#: builtin/apply.c:3862 builtin/apply.c:3970

1893 #, c-format

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

1895 msgstr ""

1896

1832 -#: builtin/apply.c:3891

1897 +#: builtin/apply.c:3895

1898 #, c-format

1899 msgid "closing file '%s'"

1900 msgstr ""

1901

1837 -#: builtin/apply.c:3940

1902 +#: builtin/apply.c:3944

1903 #, c-format

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

1905 msgstr ""

1906

1842 -#: builtin/apply.c:4027

1907 +#: builtin/apply.c:4031

1908 #, c-format

1909 msgid "Applied patch %s cleanly."

1910 msgstr ""

1911

1847 -#: builtin/apply.c:4035

1912 +#: builtin/apply.c:4039

1913 msgid "internal error"

1914 msgstr ""

1915

1916 #. Say this even without --verbose

1852 -#: builtin/apply.c:4038

1917 +#: builtin/apply.c:4042

1918 #, c-format

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

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

1921 msgstr[0] ""

1922 msgstr[1] ""

1923

1859 -#: builtin/apply.c:4048

1924 +#: builtin/apply.c:4052

1925 #, c-format

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

1927 msgstr ""

1928

1864 -#: builtin/apply.c:4069

1929 +#: builtin/apply.c:4073

1930 #, c-format

1931 msgid "Hunk #%d applied cleanly."

1932 msgstr ""

1933

1869 -#: builtin/apply.c:4072

1934 +#: builtin/apply.c:4076

1935 #, c-format

1936 msgid "Rejected hunk #%d."

1937 msgstr ""

1938

1874 -#: builtin/apply.c:4222

1939 +#: builtin/apply.c:4226

1940 msgid "unrecognized input"

1941 msgstr ""

1942

1878 -#: builtin/apply.c:4233

1943 +#: builtin/apply.c:4237

1944 msgid "unable to read index file"

1945 msgstr ""

1946

1882 -#: builtin/apply.c:4352 builtin/apply.c:4355 builtin/clone.c:91

1947 +#: builtin/apply.c:4356 builtin/apply.c:4359 builtin/clone.c:92

1948 #: builtin/fetch.c:63

1949 msgid "path"

1950 msgstr ""

1951

1887 -#: builtin/apply.c:4353

1952 +#: builtin/apply.c:4357

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

1954 msgstr ""

1955

1891 -#: builtin/apply.c:4356

1956 +#: builtin/apply.c:4360

1957 msgid "apply changes matching the given path"

1958 msgstr ""

1959

1895 -#: builtin/apply.c:4358

1960 +#: builtin/apply.c:4362

1961 msgid "num"

1962 msgstr ""

1963

1899 -#: builtin/apply.c:4359

1964 +#: builtin/apply.c:4363

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

1966 msgstr ""

1967

1903 -#: builtin/apply.c:4362

1968 +#: builtin/apply.c:4366

1969 msgid "ignore additions made by the patch"

1970 msgstr ""

1971

1907 -#: builtin/apply.c:4364

1972 +#: builtin/apply.c:4368

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

1974 msgstr ""

1975

1911 -#: builtin/apply.c:4368

1976 +#: builtin/apply.c:4372

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

1978 msgstr ""

1979

1915 -#: builtin/apply.c:4370

1980 +#: builtin/apply.c:4374

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

1982 msgstr ""

1983

1919 -#: builtin/apply.c:4372

1984 +#: builtin/apply.c:4376

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

1986 msgstr ""

1987

1923 -#: builtin/apply.c:4374

1988 +#: builtin/apply.c:4378

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

1990 msgstr ""

1991

1927 -#: builtin/apply.c:4376

1992 +#: builtin/apply.c:4380

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

1994 msgstr ""

1995

1931 -#: builtin/apply.c:4378

1996 +#: builtin/apply.c:4382

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

1998 msgstr ""

1999

1935 -#: builtin/apply.c:4380

2000 +#: builtin/apply.c:4384

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

2002 msgstr ""

2003

1939 -#: builtin/apply.c:4382

2004 +#: builtin/apply.c:4386

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

2006 msgstr ""

2007

1943 -#: builtin/apply.c:4384 builtin/checkout-index.c:197 builtin/ls-files.c:463

2008 +#: builtin/apply.c:4388 builtin/checkout-index.c:197 builtin/ls-files.c:463

2009 msgid "paths are separated with NUL character"

2010 msgstr ""

2011

1947 -#: builtin/apply.c:4387

2012 +#: builtin/apply.c:4391

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

2014 msgstr ""

2015

1951 -#: builtin/apply.c:4388

2016 +#: builtin/apply.c:4392

2017 msgid "action"

2018 msgstr ""

2019

1955 -#: builtin/apply.c:4389

2020 +#: builtin/apply.c:4393

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

2022 msgstr ""

2023

1959 -#: builtin/apply.c:4392 builtin/apply.c:4395

2024 +#: builtin/apply.c:4396 builtin/apply.c:4399

2025 msgid "ignore changes in whitespace when finding context"

2026 msgstr ""

2027

1963 -#: builtin/apply.c:4398

2028 +#: builtin/apply.c:4402

2029 msgid "apply the patch in reverse"

2030 msgstr ""

2031

1967 -#: builtin/apply.c:4400

2032 +#: builtin/apply.c:4404

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

2034 msgstr ""

2035

1971 -#: builtin/apply.c:4402

2036 +#: builtin/apply.c:4406

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

2038 msgstr ""

2039

1975 -#: builtin/apply.c:4404

2040 +#: builtin/apply.c:4408

2041 msgid "allow overlapping hunks"

2042 msgstr ""

2043

1979 -#: builtin/apply.c:4407

2044 +#: builtin/apply.c:4411

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

2046 msgstr ""

2047

1983 -#: builtin/apply.c:4410

2048 +#: builtin/apply.c:4414

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

2050 msgstr ""

2051

1987 -#: builtin/apply.c:4412

2052 +#: builtin/apply.c:4416

2053 msgid "root"

2054 msgstr ""

2055

1991 -#: builtin/apply.c:4413

2056 +#: builtin/apply.c:4417

2057 msgid "prepend <root> to all filenames"

2058 msgstr ""

2059

1995 -#: builtin/apply.c:4435

2060 +#: builtin/apply.c:4439

2061 msgid "--3way outside a repository"

2062 msgstr ""

2063

1999 -#: builtin/apply.c:4443

2064 +#: builtin/apply.c:4447

2065 msgid "--index outside a repository"

2066 msgstr ""

2067

2003 -#: builtin/apply.c:4446

2068 +#: builtin/apply.c:4450

2069 msgid "--cached outside a repository"

2070 msgstr ""

2071

2007 -#: builtin/apply.c:4462

2072 +#: builtin/apply.c:4466

2073 #, c-format

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

2075 msgstr ""

2076

2012 -#: builtin/apply.c:4476

2077 +#: builtin/apply.c:4480

2078 #, c-format

2079 msgid "squelched %d whitespace error"

2080 msgid_plural "squelched %d whitespace errors"

2081 msgstr[0] ""

2082 msgstr[1] ""

2083

2019 -#: builtin/apply.c:4482 builtin/apply.c:4492

2084 +#: builtin/apply.c:4486 builtin/apply.c:4496

2085 #, c-format

2086 msgid "%d line adds whitespace errors."

2087 msgid_plural "%d lines add whitespace errors."

@@ -2040,21 +2105,21 @@ msgstr ""

2105 msgid "git archive: expected ACK/NAK, got EOF"

2106 msgstr ""

2107

2043 -#: builtin/archive.c:63

2108 +#: builtin/archive.c:61

2109 #, c-format

2110 msgid "git archive: NACK %s"

2111 msgstr ""

2112

2048 -#: builtin/archive.c:65

2113 +#: builtin/archive.c:63

2114 #, c-format

2115 msgid "remote error: %s"

2116 msgstr ""

2117

2053 -#: builtin/archive.c:66

2118 +#: builtin/archive.c:64

2119 msgid "git archive: protocol error"

2120 msgstr ""

2121

2057 -#: builtin/archive.c:71

2122 +#: builtin/archive.c:68

2123 msgid "git archive: expected a flush"

2124 msgstr ""

2125

@@ -2170,334 +2235,376 @@ msgstr ""

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

2236 msgstr ""

2237

2173 -#: builtin/branch.c:23

2238 +#: builtin/branch.c:24

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

2240 msgstr ""

2241

2177 -#: builtin/branch.c:24

2242 +#: builtin/branch.c:25

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

2244 msgstr ""

2245

2181 -#: builtin/branch.c:25

2246 +#: builtin/branch.c:26

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

2248 msgstr ""

2249

2185 -#: builtin/branch.c:26

2250 +#: builtin/branch.c:27

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

2252 msgstr ""

2253

2189 -#: builtin/branch.c:145

2254 +#: builtin/branch.c:146

2255 #, c-format

2256 msgid ""

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

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

2259 msgstr ""

2260

2196 -#: builtin/branch.c:149

2261 +#: builtin/branch.c:150

2262 #, c-format

2263 msgid ""

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

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

2266 msgstr ""

2267

2203 -#: builtin/branch.c:163

2268 +#: builtin/branch.c:164

2269 #, c-format

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

2271 msgstr ""

2272

2208 -#: builtin/branch.c:167

2273 +#: builtin/branch.c:168

2274 #, c-format

2275 msgid ""

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

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

2278 msgstr ""

2279

2215 -#: builtin/branch.c:180

2280 +#: builtin/branch.c:181

2281 msgid "Update of config-file failed"

2282 msgstr ""

2283

2219 -#: builtin/branch.c:208

2284 +#: builtin/branch.c:209

2285 msgid "cannot use -a with -d"

2286 msgstr ""

2287

2223 -#: builtin/branch.c:214

2288 +#: builtin/branch.c:215

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

2290 msgstr ""

2291

2227 -#: builtin/branch.c:222

2292 +#: builtin/branch.c:223

2293 #, c-format

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

2295 msgstr ""

2296

2232 -#: builtin/branch.c:235

2297 +#: builtin/branch.c:236

2298 #, c-format

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

2300 msgstr ""

2301

2237 -#: builtin/branch.c:236

2302 +#: builtin/branch.c:237

2303 #, c-format

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

2305 msgstr ""

2306

2242 -#: builtin/branch.c:250

2307 +#: builtin/branch.c:251

2308 #, c-format

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

2310 msgstr ""

2311

2247 -#: builtin/branch.c:251

2312 +#: builtin/branch.c:252

2313 #, c-format

2314 msgid "Error deleting branch '%s'"

2315 msgstr ""

2316

2252 -#: builtin/branch.c:258

2317 +#: builtin/branch.c:259

2318 #, c-format

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

2320 msgstr ""

2321

2257 -#: builtin/branch.c:259

2322 +#: builtin/branch.c:260

2323 #, c-format

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

2325 msgstr ""

2326

2262 -#: builtin/branch.c:361

2327 +#: builtin/branch.c:362

2328 #, c-format

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

2330 msgstr ""

2331

2267 -#: builtin/branch.c:433

2332 +#: builtin/branch.c:434

2333 #, c-format

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

2335 msgstr ""

2336

2272 -#: builtin/branch.c:435

2337 +#: builtin/branch.c:436

2338 #, c-format

2339 msgid "[behind %d]"

2340 msgstr ""

2341

2277 -#: builtin/branch.c:439

2342 +#: builtin/branch.c:440

2343 #, c-format

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

2345 msgstr ""

2346

2282 -#: builtin/branch.c:441

2347 +#: builtin/branch.c:442

2348 #, c-format

2349 msgid "[ahead %d]"

2350 msgstr ""

2351

2287 -#: builtin/branch.c:444

2352 +#: builtin/branch.c:445

2353 #, c-format

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

2355 msgstr ""

2356

2292 -#: builtin/branch.c:447

2357 +#: builtin/branch.c:448

2358 #, c-format

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

2360 msgstr ""

2361

2297 -#: builtin/branch.c:469

2362 +#: builtin/branch.c:470

2363 msgid " **** invalid ref ****"

2364 msgstr ""

2365

2301 -#: builtin/branch.c:560

2366 +#: builtin/branch.c:562

2367 +#, c-format

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

2369 +msgstr ""

2370 +

2371 +#: builtin/branch.c:565

2372 +#, c-format

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

2374 +msgstr ""

2375 +

2376 +#: builtin/branch.c:568

2377 +#, c-format

2378 +msgid "(detached from %s)"

2379 +msgstr ""

2380 +

2381 +#: builtin/branch.c:571

2382 msgid "(no branch)"

2383 msgstr ""

2384

2305 -#: builtin/branch.c:593

2385 +#: builtin/branch.c:617

2386 #, c-format

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

2388 msgstr ""

2389

2310 -#: builtin/branch.c:625

2390 +#: builtin/branch.c:649

2391 msgid "some refs could not be read"

2392 msgstr ""

2393

2314 -#: builtin/branch.c:638

2394 +#: builtin/branch.c:662

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

2396 msgstr ""

2397

2318 -#: builtin/branch.c:648

2398 +#: builtin/branch.c:672

2399 #, c-format

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

2401 msgstr ""

2402

2323 -#: builtin/branch.c:663

2403 +#: builtin/branch.c:687

2404 msgid "Branch rename failed"

2405 msgstr ""

2406

2327 -#: builtin/branch.c:667

2407 +#: builtin/branch.c:691

2408 #, c-format

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

2410 msgstr ""

2411

2332 -#: builtin/branch.c:671

2412 +#: builtin/branch.c:695

2413 #, c-format

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

2415 msgstr ""

2416

2337 -#: builtin/branch.c:678

2417 +#: builtin/branch.c:702

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

2419 msgstr ""

2420

2341 -#: builtin/branch.c:693

2421 +#: builtin/branch.c:717

2422 #, c-format

2423 msgid "malformed object name %s"

2424 msgstr ""

2425

2346 -#: builtin/branch.c:717

2426 +#: builtin/branch.c:741

2427 #, c-format

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

2429 msgstr ""

2430

2351 -#: builtin/branch.c:747

2431 +#: builtin/branch.c:771

2432 msgid "Generic options"

2433 msgstr ""

2434

2355 -#: builtin/branch.c:749

2435 +#: builtin/branch.c:773

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

2437 msgstr ""

2438

2359 -#: builtin/branch.c:750

2439 +#: builtin/branch.c:774

2440 msgid "suppress informational messages"

2441 msgstr ""

2442

2363 -#: builtin/branch.c:751

2443 +#: builtin/branch.c:775

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

2445 msgstr ""

2446

2367 -#: builtin/branch.c:753

2447 +#: builtin/branch.c:777

2448 msgid "change upstream info"

2449 msgstr ""

2450

2371 -#: builtin/branch.c:757

2451 +#: builtin/branch.c:781

2452 msgid "use colored output"

2453 msgstr ""

2454

2375 -#: builtin/branch.c:758

2455 +#: builtin/branch.c:782

2456 msgid "act on remote-tracking branches"

2457 msgstr ""

2458

2379 -#: builtin/branch.c:761 builtin/branch.c:767 builtin/branch.c:788

2380 -#: builtin/branch.c:794 builtin/commit.c:1366 builtin/commit.c:1367

2381 -#: builtin/commit.c:1368 builtin/commit.c:1369 builtin/tag.c:468

2459 +#: builtin/branch.c:785 builtin/branch.c:791 builtin/branch.c:812

2460 +#: builtin/branch.c:818 builtin/commit.c:1368 builtin/commit.c:1369

2461 +#: builtin/commit.c:1370 builtin/commit.c:1371 builtin/tag.c:468

2462 msgid "commit"

2463 msgstr ""

2464

2385 -#: builtin/branch.c:762 builtin/branch.c:768

2465 +#: builtin/branch.c:786 builtin/branch.c:792

2466 msgid "print only branches that contain the commit"

2467 msgstr ""

2468

2389 -#: builtin/branch.c:774

2469 +#: builtin/branch.c:798

2470 msgid "Specific git-branch actions:"

2471 msgstr ""

2472

2393 -#: builtin/branch.c:775

2473 +#: builtin/branch.c:799

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

2475 msgstr ""

2476

2397 -#: builtin/branch.c:777

2477 +#: builtin/branch.c:801

2478 msgid "delete fully merged branch"

2479 msgstr ""

2480

2401 -#: builtin/branch.c:778

2481 +#: builtin/branch.c:802

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

2483 msgstr ""

2484

2405 -#: builtin/branch.c:779

2485 +#: builtin/branch.c:803

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

2487 msgstr ""

2488

2409 -#: builtin/branch.c:780

2489 +#: builtin/branch.c:804

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

2491 msgstr ""

2492

2413 -#: builtin/branch.c:781

2493 +#: builtin/branch.c:805

2494 msgid "list branch names"

2495 msgstr ""

2496

2417 -#: builtin/branch.c:782

2497 +#: builtin/branch.c:806

2498 msgid "create the branch's reflog"

2499 msgstr ""

2500

2421 -#: builtin/branch.c:784

2501 +#: builtin/branch.c:808

2502 msgid "edit the description for the branch"

2503 msgstr ""

2504

2425 -#: builtin/branch.c:785

2505 +#: builtin/branch.c:809

2506 msgid "force creation (when already exists)"

2507 msgstr ""

2508

2429 -#: builtin/branch.c:788

2509 +#: builtin/branch.c:812

2510 msgid "print only not merged branches"

2511 msgstr ""

2512

2433 -#: builtin/branch.c:794

2513 +#: builtin/branch.c:818

2514 msgid "print only merged branches"

2515 msgstr ""

2516

2437 -#: builtin/branch.c:798

2517 +#: builtin/branch.c:822

2518 msgid "list branches in columns"

2519 msgstr ""

2520

2441 -#: builtin/branch.c:811

2521 +#: builtin/branch.c:835

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

2523 msgstr ""

2524

2445 -#: builtin/branch.c:816 builtin/clone.c:561

2525 +#: builtin/branch.c:840 builtin/clone.c:609

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

2527 msgstr ""

2528

2449 -#: builtin/branch.c:839

2529 +#: builtin/branch.c:863

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

2531 msgstr ""

2532

2453 -#: builtin/branch.c:845

2533 +#: builtin/branch.c:869 builtin/branch.c:908

2534 msgid "branch name required"

2535 msgstr ""

2536

2457 -#: builtin/branch.c:860

2537 +#: builtin/branch.c:884

2538 msgid "Cannot give description to detached HEAD"

2539 msgstr ""

2540

2461 -#: builtin/branch.c:865

2541 +#: builtin/branch.c:889

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

2543 msgstr ""

2544

2465 -#: builtin/branch.c:872

2545 +#: builtin/branch.c:896

2546 #, c-format

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

2548 msgstr ""

2549

2470 -#: builtin/branch.c:875

2550 +#: builtin/branch.c:899

2551 #, c-format

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

2553 msgstr ""

2554

2475 -#: builtin/branch.c:888

2555 +#: builtin/branch.c:914

2556 msgid "too many branches for a rename operation"

2557 msgstr ""

2558

2479 -#: builtin/branch.c:893

2559 +#: builtin/branch.c:919

2560 +msgid "too many branches to set new upstream"

2561 +msgstr ""

2562 +

2563 +#: builtin/branch.c:923

2564 +#, c-format

2565 +msgid ""

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

2567 +msgstr ""

2568 +

2569 +#: builtin/branch.c:926 builtin/branch.c:948 builtin/branch.c:970

2570 +#, c-format

2571 +msgid "no such branch '%s'"

2572 +msgstr ""

2573 +

2574 +#: builtin/branch.c:930

2575 #, c-format

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

2577 msgstr ""

2578

2484 -#: builtin/branch.c:905

2579 +#: builtin/branch.c:942

2580 +msgid "too many branches to unset upstream"

2581 +msgstr ""

2582 +

2583 +#: builtin/branch.c:946

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

2585 +msgstr ""

2586 +

2587 +#: builtin/branch.c:952

2588 #, c-format

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

2590 msgstr ""

2591

2489 -#: builtin/branch.c:920

2592 +#: builtin/branch.c:967

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

2594 +msgstr ""

2595 +

2596 +#: builtin/branch.c:973

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

2598 msgstr ""

2599

2493 -#: builtin/branch.c:923

2600 +#: builtin/branch.c:976

2601 #, c-format

2602 msgid ""

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

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

2605 msgstr ""

2606

2500 -#: builtin/branch.c:940

2607 +#: builtin/branch.c:993

2608 #, c-format

2609 msgid ""

2610 "\n"

@@ -2505,12 +2612,12 @@ msgid ""

2612 "\n"

2613 msgstr ""

2614

2508 -#: builtin/branch.c:941

2615 +#: builtin/branch.c:994

2616 #, c-format

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

2618 msgstr ""

2619

2513 -#: builtin/branch.c:942

2620 +#: builtin/branch.c:995

2621 #, c-format

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

2623 msgstr ""

@@ -2592,7 +2699,7 @@ msgstr ""

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

2700 msgstr ""

2701

2595 -#: builtin/check-ignore.c:18 builtin/checkout.c:1012 builtin/gc.c:177

2702 +#: builtin/check-ignore.c:18 builtin/checkout.c:1041 builtin/gc.c:177

2703 msgid "suppress progress reporting"

2704 msgstr ""

2705

@@ -2714,60 +2821,60 @@ msgstr ""

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

2822 msgstr ""

2823

2717 -#: builtin/checkout.c:265 builtin/checkout.c:426

2824 +#: builtin/checkout.c:265 builtin/checkout.c:455

2825 msgid "corrupt index file"

2826 msgstr ""

2827

2721 -#: builtin/checkout.c:295 builtin/checkout.c:302

2828 +#: builtin/checkout.c:326 builtin/checkout.c:333

2829 #, c-format

2830 msgid "path '%s' is unmerged"

2831 msgstr ""

2832

2726 -#: builtin/checkout.c:448

2833 +#: builtin/checkout.c:477

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

2835 msgstr ""

2836

2730 -#: builtin/checkout.c:569

2837 +#: builtin/checkout.c:598

2838 #, c-format

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

2840 msgstr ""

2841

2735 -#: builtin/checkout.c:602

2842 +#: builtin/checkout.c:631

2843 msgid "HEAD is now at"

2844 msgstr ""

2845

2739 -#: builtin/checkout.c:609

2846 +#: builtin/checkout.c:638

2847 #, c-format

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

2849 msgstr ""

2850

2744 -#: builtin/checkout.c:612

2851 +#: builtin/checkout.c:641

2852 #, c-format

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

2854 msgstr ""

2855

2749 -#: builtin/checkout.c:616

2856 +#: builtin/checkout.c:645

2857 #, c-format

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

2859 msgstr ""

2860

2754 -#: builtin/checkout.c:618 builtin/checkout.c:955

2861 +#: builtin/checkout.c:647 builtin/checkout.c:984

2862 #, c-format

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

2864 msgstr ""

2865

2759 -#: builtin/checkout.c:620

2866 +#: builtin/checkout.c:649

2867 #, c-format

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

2869 msgstr ""

2870

2764 -#: builtin/checkout.c:676

2871 +#: builtin/checkout.c:705

2872 #, c-format

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

2874 msgstr ""

2875

2876 #. The singular version

2770 -#: builtin/checkout.c:682

2877 +#: builtin/checkout.c:711

2878 #, c-format

2879 msgid ""

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

@@ -2782,7 +2889,7 @@ msgid_plural ""

2889 msgstr[0] ""

2890 msgstr[1] ""

2891

2785 -#: builtin/checkout.c:700

2892 +#: builtin/checkout.c:729

2893 #, c-format

2894 msgid ""

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

@@ -2792,144 +2899,144 @@ msgid ""

2899 "\n"

2900 msgstr ""

2901

2795 -#: builtin/checkout.c:730

2902 +#: builtin/checkout.c:759

2903 msgid "internal error in revision walk"

2904 msgstr ""

2905

2799 -#: builtin/checkout.c:734

2906 +#: builtin/checkout.c:763

2907 msgid "Previous HEAD position was"

2908 msgstr ""

2909

2803 -#: builtin/checkout.c:761 builtin/checkout.c:950

2910 +#: builtin/checkout.c:790 builtin/checkout.c:979

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

2912 msgstr ""

2913

2914 #. case (1)

2808 -#: builtin/checkout.c:886

2915 +#: builtin/checkout.c:915

2916 #, c-format

2917 msgid "invalid reference: %s"

2918 msgstr ""

2919

2920 #. case (1): want a tree

2814 -#: builtin/checkout.c:925

2921 +#: builtin/checkout.c:954

2922 #, c-format

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

2924 msgstr ""

2925

2819 -#: builtin/checkout.c:964

2926 +#: builtin/checkout.c:993

2927 msgid "paths cannot be used with switching branches"

2928 msgstr ""

2929

2823 -#: builtin/checkout.c:967 builtin/checkout.c:971

2930 +#: builtin/checkout.c:996 builtin/checkout.c:1000

2931 #, c-format

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

2933 msgstr ""

2934

2828 -#: builtin/checkout.c:975 builtin/checkout.c:978 builtin/checkout.c:983

2829 -#: builtin/checkout.c:986

2935 +#: builtin/checkout.c:1004 builtin/checkout.c:1007 builtin/checkout.c:1012

2936 +#: builtin/checkout.c:1015

2937 #, c-format

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

2939 msgstr ""

2940

2834 -#: builtin/checkout.c:991

2941 +#: builtin/checkout.c:1020

2942 #, c-format

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

2944 msgstr ""

2945

2839 -#: builtin/checkout.c:1013 builtin/checkout.c:1015 builtin/clone.c:89

2946 +#: builtin/checkout.c:1042 builtin/checkout.c:1044 builtin/clone.c:90

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

2948 msgid "branch"

2949 msgstr ""

2950

2844 -#: builtin/checkout.c:1014

2951 +#: builtin/checkout.c:1043

2952 msgid "create and checkout a new branch"

2953 msgstr ""

2954

2848 -#: builtin/checkout.c:1016

2955 +#: builtin/checkout.c:1045

2956 msgid "create/reset and checkout a branch"

2957 msgstr ""

2958

2852 -#: builtin/checkout.c:1017

2959 +#: builtin/checkout.c:1046

2960 msgid "create reflog for new branch"

2961 msgstr ""

2962

2856 -#: builtin/checkout.c:1018

2963 +#: builtin/checkout.c:1047

2964 msgid "detach the HEAD at named commit"

2965 msgstr ""

2966

2860 -#: builtin/checkout.c:1019

2967 +#: builtin/checkout.c:1048

2968 msgid "set upstream info for new branch"

2969 msgstr ""

2970

2864 -#: builtin/checkout.c:1021

2971 +#: builtin/checkout.c:1050

2972 msgid "new branch"

2973 msgstr ""

2974

2868 -#: builtin/checkout.c:1021

2975 +#: builtin/checkout.c:1050

2976 msgid "new unparented branch"

2977 msgstr ""

2978

2872 -#: builtin/checkout.c:1022

2979 +#: builtin/checkout.c:1051

2980 msgid "checkout our version for unmerged files"

2981 msgstr ""

2982

2876 -#: builtin/checkout.c:1024

2983 +#: builtin/checkout.c:1053

2984 msgid "checkout their version for unmerged files"

2985 msgstr ""

2986

2880 -#: builtin/checkout.c:1026

2987 +#: builtin/checkout.c:1055

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

2989 msgstr ""

2990

2884 -#: builtin/checkout.c:1027

2991 +#: builtin/checkout.c:1056

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

2993 msgstr ""

2994

2888 -#: builtin/checkout.c:1028 builtin/merge.c:215

2995 +#: builtin/checkout.c:1057 builtin/merge.c:217

2996 msgid "update ignored files (default)"

2997 msgstr ""

2998

2892 -#: builtin/checkout.c:1029 builtin/log.c:1147 parse-options.h:245

2999 +#: builtin/checkout.c:1058 builtin/log.c:1149 parse-options.h:245

3000 msgid "style"

3001 msgstr ""

3002

2896 -#: builtin/checkout.c:1030

3003 +#: builtin/checkout.c:1059

3004 msgid "conflict style (merge or diff3)"

3005 msgstr ""

3006

2900 -#: builtin/checkout.c:1033

3007 +#: builtin/checkout.c:1062

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

3009 msgstr ""

3010

2904 -#: builtin/checkout.c:1057

3011 +#: builtin/checkout.c:1086

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

3013 msgstr ""

3014

2908 -#: builtin/checkout.c:1074

3015 +#: builtin/checkout.c:1103

3016 msgid "--track needs a branch name"

3017 msgstr ""

3018

2912 -#: builtin/checkout.c:1081

3019 +#: builtin/checkout.c:1110

3020 msgid "Missing branch name; try -b"

3021 msgstr ""

3022

2916 -#: builtin/checkout.c:1116

3023 +#: builtin/checkout.c:1145

3024 msgid "invalid path specification"

3025 msgstr ""

3026

2920 -#: builtin/checkout.c:1123

3027 +#: builtin/checkout.c:1152

3028 #, c-format

3029 msgid ""

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

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

3032 msgstr ""

3033

2927 -#: builtin/checkout.c:1128

3034 +#: builtin/checkout.c:1157

3035 #, c-format

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

3037 msgstr ""

3038

2932 -#: builtin/checkout.c:1132

3039 +#: builtin/checkout.c:1161

3040 msgid ""

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

3042 "checking out of the index."

@@ -2976,7 +3083,7 @@ msgstr ""

3083 msgid "remove whole directories"

3084 msgstr ""

3085

2979 -#: builtin/clean.c:165 builtin/describe.c:413 builtin/grep.c:717

3086 +#: builtin/clean.c:165 builtin/describe.c:412 builtin/grep.c:717

3087 #: builtin/ls-files.c:494 builtin/name-rev.c:231 builtin/show-ref.c:182

3088 msgid "pattern"

3089 msgstr ""

@@ -3008,215 +3115,230 @@ msgid ""

3115 "clean"

3116 msgstr ""

3117

3011 -#: builtin/clone.c:36

3118 +#: builtin/clone.c:37

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

3120 msgstr ""

3121

3015 -#: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:212

3122 +#: builtin/clone.c:65 builtin/fetch.c:82 builtin/merge.c:214

3123 #: builtin/push.c:436

3124 msgid "force progress reporting"

3125 msgstr ""

3126

3020 -#: builtin/clone.c:66

3127 +#: builtin/clone.c:67

3128 msgid "don't create a checkout"

3129 msgstr ""

3130

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

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

3132 msgid "create a bare repository"

3133 msgstr ""

3134

3028 -#: builtin/clone.c:72

3135 +#: builtin/clone.c:73

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

3137 msgstr ""

3138

3032 -#: builtin/clone.c:74

3139 +#: builtin/clone.c:75

3140 msgid "to clone from a local repository"

3141 msgstr ""

3142

3036 -#: builtin/clone.c:76

3143 +#: builtin/clone.c:77

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

3145 msgstr ""

3146

3040 -#: builtin/clone.c:78

3147 +#: builtin/clone.c:79

3148 msgid "setup as shared repository"

3149 msgstr ""

3150

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

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

3152 msgid "initialize submodules in the clone"

3153 msgstr ""

3154

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

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

3156 msgid "template-directory"

3157 msgstr ""

3158

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

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

3160 msgid "directory from which templates will be used"

3161 msgstr ""

3162

3056 -#: builtin/clone.c:86

3163 +#: builtin/clone.c:87

3164 msgid "reference repository"

3165 msgstr ""

3166

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

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

3168 msgid "name"

3169 msgstr ""

3170

3064 -#: builtin/clone.c:88

3171 +#: builtin/clone.c:89

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

3173 msgstr ""

3174

3068 -#: builtin/clone.c:90

3175 +#: builtin/clone.c:91

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

3177 msgstr ""

3178

3072 -#: builtin/clone.c:92

3179 +#: builtin/clone.c:93

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

3181 msgstr ""

3182

3076 -#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:662

3183 +#: builtin/clone.c:94 builtin/fetch.c:83 builtin/grep.c:662

3184 msgid "depth"

3185 msgstr ""

3186

3080 -#: builtin/clone.c:94

3187 +#: builtin/clone.c:95

3188 msgid "create a shallow clone of that depth"

3189 msgstr ""

3190

3084 -#: builtin/clone.c:96

3191 +#: builtin/clone.c:97

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

3193 msgstr ""

3194

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

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

3196 msgid "gitdir"

3197 msgstr ""

3198

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

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

3200 msgid "separate git dir from working tree"

3201 msgstr ""

3202

3096 -#: builtin/clone.c:99

3203 +#: builtin/clone.c:100

3204 msgid "key=value"

3205 msgstr ""

3206

3100 -#: builtin/clone.c:100

3207 +#: builtin/clone.c:101

3208 msgid "set config inside the new repository"

3209 msgstr ""

3210

3104 -#: builtin/clone.c:243

3211 +#: builtin/clone.c:244

3212 #, c-format

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

3214 msgstr ""

3215

3109 -#: builtin/clone.c:306

3216 +#: builtin/clone.c:307

3217 #, c-format

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

3219 msgstr ""

3220

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

3221 +#: builtin/clone.c:309 builtin/diff.c:77

3222 #, c-format

3223 msgid "failed to stat '%s'"

3224 msgstr ""

3225

3119 -#: builtin/clone.c:310

3226 +#: builtin/clone.c:311

3227 #, c-format

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

3229 msgstr ""

3230

3124 -#: builtin/clone.c:324

3231 +#: builtin/clone.c:325

3232 #, c-format

3233 msgid "failed to stat %s\n"

3234 msgstr ""

3235

3129 -#: builtin/clone.c:346

3236 +#: builtin/clone.c:347

3237 #, c-format

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

3239 msgstr ""

3240

3134 -#: builtin/clone.c:350

3241 +#: builtin/clone.c:351

3242 #, c-format

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

3244 msgstr ""

3245

3139 -#: builtin/clone.c:373

3246 +#: builtin/clone.c:374

3247 #, c-format

3248 msgid "done.\n"

3249 msgstr ""

3250

3144 -#: builtin/clone.c:443

3251 +#: builtin/clone.c:387

3252 +msgid ""

3253 +"Clone succeeded, but checkout failed.\n"

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

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

3256 +msgstr ""

3257 +

3258 +#: builtin/clone.c:466

3259 #, c-format

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

3261 msgstr ""

3262

3149 -#: builtin/clone.c:552

3263 +#: builtin/clone.c:540

3264 +msgid "remote did not send all necessary objects"

3265 +msgstr ""

3266 +

3267 +#: builtin/clone.c:600

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

3269 msgstr ""

3270

3153 -#: builtin/clone.c:690

3271 +#: builtin/clone.c:631

3272 +msgid "unable to checkout working tree"

3273 +msgstr ""

3274 +

3275 +#: builtin/clone.c:739

3276 msgid "Too many arguments."

3277 msgstr ""

3278

3157 -#: builtin/clone.c:694

3279 +#: builtin/clone.c:743

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

3281 msgstr ""

3282

3161 -#: builtin/clone.c:705

3283 +#: builtin/clone.c:754

3284 #, c-format

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

3286 msgstr ""

3287

3166 -#: builtin/clone.c:708

3288 +#: builtin/clone.c:757

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

3290 msgstr ""

3291

3170 -#: builtin/clone.c:721

3292 +#: builtin/clone.c:770

3293 #, c-format

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

3295 msgstr ""

3296

3175 -#: builtin/clone.c:726

3297 +#: builtin/clone.c:775

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

3299 msgstr ""

3300

3179 -#: builtin/clone.c:736

3301 +#: builtin/clone.c:785

3302 #, c-format

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

3304 msgstr ""

3305

3184 -#: builtin/clone.c:746

3306 +#: builtin/clone.c:795

3307 #, c-format

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

3309 msgstr ""

3310

3189 -#: builtin/clone.c:759 builtin/clone.c:771

3311 +#: builtin/clone.c:808 builtin/clone.c:820

3312 #, c-format

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

3314 msgstr ""

3315

3194 -#: builtin/clone.c:762

3316 +#: builtin/clone.c:811

3317 #, c-format

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

3319 msgstr ""

3320

3199 -#: builtin/clone.c:781

3321 +#: builtin/clone.c:830

3322 #, c-format

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

3324 msgstr ""

3325

3204 -#: builtin/clone.c:783

3326 +#: builtin/clone.c:832

3327 #, c-format

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

3329 msgstr ""

3330

3209 -#: builtin/clone.c:818

3331 +#: builtin/clone.c:867

3332 #, c-format

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

3334 msgstr ""

3335

3214 -#: builtin/clone.c:867

3336 +#: builtin/clone.c:916

3337 #, c-format

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

3339 msgstr ""

3340

3219 -#: builtin/clone.c:874

3341 +#: builtin/clone.c:923

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

3343 msgstr ""

3344

@@ -3291,93 +3413,93 @@ msgid ""

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

3414 msgstr ""

3415

3294 -#: builtin/commit.c:258

3416 +#: builtin/commit.c:260

3417 msgid "failed to unpack HEAD tree object"

3418 msgstr ""

3419

3298 -#: builtin/commit.c:300

3420 +#: builtin/commit.c:302

3421 msgid "unable to create temporary index"

3422 msgstr ""

3423

3302 -#: builtin/commit.c:306

3424 +#: builtin/commit.c:308

3425 msgid "interactive add failed"

3426 msgstr ""

3427

3306 -#: builtin/commit.c:339 builtin/commit.c:360 builtin/commit.c:410

3428 +#: builtin/commit.c:341 builtin/commit.c:362 builtin/commit.c:412

3429 msgid "unable to write new_index file"

3430 msgstr ""

3431

3310 -#: builtin/commit.c:391

3432 +#: builtin/commit.c:393

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

3434 msgstr ""

3435

3314 -#: builtin/commit.c:393

3436 +#: builtin/commit.c:395

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

3438 msgstr ""

3439

3318 -#: builtin/commit.c:403

3440 +#: builtin/commit.c:405

3441 msgid "cannot read the index"

3442 msgstr ""

3443

3322 -#: builtin/commit.c:423

3444 +#: builtin/commit.c:425

3445 msgid "unable to write temporary index file"

3446 msgstr ""

3447

3326 -#: builtin/commit.c:511 builtin/commit.c:517

3448 +#: builtin/commit.c:513 builtin/commit.c:519

3449 #, c-format

3450 msgid "invalid commit: %s"

3451 msgstr ""

3452

3331 -#: builtin/commit.c:540

3453 +#: builtin/commit.c:542

3454 msgid "malformed --author parameter"

3455 msgstr ""

3456

3335 -#: builtin/commit.c:560

3457 +#: builtin/commit.c:562

3458 #, c-format

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

3460 msgstr ""

3461

3340 -#: builtin/commit.c:598 builtin/commit.c:631 builtin/commit.c:954

3462 +#: builtin/commit.c:600 builtin/commit.c:633 builtin/commit.c:956

3463 #, c-format

3464 msgid "could not lookup commit %s"

3465 msgstr ""

3466

3345 -#: builtin/commit.c:610 builtin/shortlog.c:272

3467 +#: builtin/commit.c:612 builtin/shortlog.c:272

3468 #, c-format

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

3470 msgstr ""

3471

3350 -#: builtin/commit.c:612

3472 +#: builtin/commit.c:614

3473 msgid "could not read log from standard input"

3474 msgstr ""

3475

3354 -#: builtin/commit.c:616

3476 +#: builtin/commit.c:618

3477 #, c-format

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

3479 msgstr ""

3480

3359 -#: builtin/commit.c:622

3481 +#: builtin/commit.c:624

3482 msgid "commit has empty message"

3483 msgstr ""

3484

3363 -#: builtin/commit.c:638

3485 +#: builtin/commit.c:640

3486 msgid "could not read MERGE_MSG"

3487 msgstr ""

3488

3367 -#: builtin/commit.c:642

3489 +#: builtin/commit.c:644

3490 msgid "could not read SQUASH_MSG"

3491 msgstr ""

3492

3371 -#: builtin/commit.c:646

3493 +#: builtin/commit.c:648

3494 #, c-format

3495 msgid "could not read '%s'"

3496 msgstr ""

3497

3376 -#: builtin/commit.c:707

3498 +#: builtin/commit.c:709

3499 msgid "could not write commit template"

3500 msgstr ""

3501

3380 -#: builtin/commit.c:718

3502 +#: builtin/commit.c:720

3503 #, c-format

3504 msgid ""

3505 "\n"

@@ -3387,7 +3509,7 @@ msgid ""

3509 "and try again.\n"

3510 msgstr ""

3511

3390 -#: builtin/commit.c:723

3512 +#: builtin/commit.c:725

3513 #, c-format

3514 msgid ""

3515 "\n"

@@ -3397,14 +3519,14 @@ msgid ""

3519 "and try again.\n"

3520 msgstr ""

3521

3400 -#: builtin/commit.c:735

3522 +#: builtin/commit.c:737

3523 #, c-format

3524 msgid ""

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

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

3527 msgstr ""

3528

3407 -#: builtin/commit.c:740

3529 +#: builtin/commit.c:742

3530 #, c-format

3531 msgid ""

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

@@ -3412,351 +3534,351 @@ msgid ""

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

3535 msgstr ""

3536

3415 -#: builtin/commit.c:753

3537 +#: builtin/commit.c:755

3538 #, c-format

3539 msgid "%sAuthor: %s"

3540 msgstr ""

3541

3420 -#: builtin/commit.c:760

3542 +#: builtin/commit.c:762

3543 #, c-format

3544 msgid "%sCommitter: %s"

3545 msgstr ""

3546

3425 -#: builtin/commit.c:780

3547 +#: builtin/commit.c:782

3548 msgid "Cannot read index"

3549 msgstr ""

3550

3429 -#: builtin/commit.c:817

3551 +#: builtin/commit.c:819

3552 msgid "Error building trees"

3553 msgstr ""

3554

3433 -#: builtin/commit.c:832 builtin/tag.c:359

3555 +#: builtin/commit.c:834 builtin/tag.c:359

3556 #, c-format

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

3558 msgstr ""

3559

3438 -#: builtin/commit.c:929

3560 +#: builtin/commit.c:931

3561 #, c-format

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

3563 msgstr ""

3564

3443 -#: builtin/commit.c:944 builtin/commit.c:1138

3565 +#: builtin/commit.c:946 builtin/commit.c:1140

3566 #, c-format

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

3568 msgstr ""

3569

3448 -#: builtin/commit.c:974

3570 +#: builtin/commit.c:976

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

3572 msgstr ""

3573

3452 -#: builtin/commit.c:985

3574 +#: builtin/commit.c:987

3575 msgid "You have nothing to amend."

3576 msgstr ""

3577

3456 -#: builtin/commit.c:988

3578 +#: builtin/commit.c:990

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

3580 msgstr ""

3581

3460 -#: builtin/commit.c:990

3582 +#: builtin/commit.c:992

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

3584 msgstr ""

3585

3464 -#: builtin/commit.c:993

3586 +#: builtin/commit.c:995

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

3588 msgstr ""

3589

3468 -#: builtin/commit.c:1003

3590 +#: builtin/commit.c:1005

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

3592 msgstr ""

3593

3472 -#: builtin/commit.c:1005

3594 +#: builtin/commit.c:1007

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

3596 msgstr ""

3597

3476 -#: builtin/commit.c:1013

3598 +#: builtin/commit.c:1015

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

3600 msgstr ""

3601

3480 -#: builtin/commit.c:1030

3602 +#: builtin/commit.c:1032

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

3604 msgstr ""

3605

3484 -#: builtin/commit.c:1032

3606 +#: builtin/commit.c:1034

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

3608 msgstr ""

3609

3488 -#: builtin/commit.c:1034

3610 +#: builtin/commit.c:1036

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

3612 msgstr ""

3613

3492 -#: builtin/commit.c:1036

3614 +#: builtin/commit.c:1038

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

3616 msgstr ""

3617

3496 -#: builtin/commit.c:1046 builtin/tag.c:575

3618 +#: builtin/commit.c:1048 builtin/tag.c:575

3619 #, c-format

3620 msgid "Invalid cleanup mode %s"

3621 msgstr ""

3622

3501 -#: builtin/commit.c:1051

3623 +#: builtin/commit.c:1053

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

3625 msgstr ""

3626

3505 -#: builtin/commit.c:1057 builtin/commit.c:1192

3627 +#: builtin/commit.c:1059 builtin/commit.c:1194

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

3629 msgstr ""

3630

3509 -#: builtin/commit.c:1152 builtin/commit.c:1388

3631 +#: builtin/commit.c:1154 builtin/commit.c:1390

3632 msgid "show status concisely"

3633 msgstr ""

3634

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

3635 +#: builtin/commit.c:1156 builtin/commit.c:1392

3636 msgid "show branch information"

3637 msgstr ""

3638

3517 -#: builtin/commit.c:1156 builtin/commit.c:1392 builtin/push.c:426

3639 +#: builtin/commit.c:1158 builtin/commit.c:1394 builtin/push.c:426

3640 msgid "machine-readable output"

3641 msgstr ""

3642

3521 -#: builtin/commit.c:1159 builtin/commit.c:1394

3643 +#: builtin/commit.c:1161 builtin/commit.c:1396

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

3645 msgstr ""

3646

3525 -#: builtin/commit.c:1162 builtin/commit.c:1397

3647 +#: builtin/commit.c:1164 builtin/commit.c:1399

3648 msgid "terminate entries with NUL"

3649 msgstr ""

3650

3529 -#: builtin/commit.c:1164 builtin/commit.c:1400 builtin/fast-export.c:647

3530 -#: builtin/fast-export.c:650 builtin/tag.c:459

3651 +#: builtin/commit.c:1166 builtin/commit.c:1402 builtin/fast-export.c:653

3652 +#: builtin/fast-export.c:656 builtin/tag.c:459

3653 msgid "mode"

3654 msgstr ""

3655

3534 -#: builtin/commit.c:1165 builtin/commit.c:1400

3656 +#: builtin/commit.c:1167 builtin/commit.c:1402

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

3658 msgstr ""

3659

3538 -#: builtin/commit.c:1168

3660 +#: builtin/commit.c:1170

3661 msgid "show ignored files"

3662 msgstr ""

3663

3542 -#: builtin/commit.c:1169 parse-options.h:151

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

3665 msgid "when"

3666 msgstr ""

3667

3546 -#: builtin/commit.c:1170

3668 +#: builtin/commit.c:1172

3669 msgid ""

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

3671 "(Default: all)"

3672 msgstr ""

3673

3552 -#: builtin/commit.c:1172

3674 +#: builtin/commit.c:1174

3675 msgid "list untracked files in columns"

3676 msgstr ""

3677

3556 -#: builtin/commit.c:1246

3678 +#: builtin/commit.c:1248

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

3680 msgstr ""

3681

3560 -#: builtin/commit.c:1248

3682 +#: builtin/commit.c:1250

3683 msgid "could not parse newly created commit"

3684 msgstr ""

3685

3564 -#: builtin/commit.c:1289

3686 +#: builtin/commit.c:1291

3687 msgid "detached HEAD"

3688 msgstr ""

3689

3568 -#: builtin/commit.c:1291

3690 +#: builtin/commit.c:1293

3691 msgid " (root-commit)"

3692 msgstr ""

3693

3572 -#: builtin/commit.c:1358

3694 +#: builtin/commit.c:1360

3695 msgid "suppress summary after successful commit"

3696 msgstr ""

3697

3576 -#: builtin/commit.c:1359

3698 +#: builtin/commit.c:1361

3699 msgid "show diff in commit message template"

3700 msgstr ""

3701

3580 -#: builtin/commit.c:1361

3702 +#: builtin/commit.c:1363

3703 msgid "Commit message options"

3704 msgstr ""

3705

3584 -#: builtin/commit.c:1362 builtin/tag.c:457

3706 +#: builtin/commit.c:1364 builtin/tag.c:457

3707 msgid "read message from file"

3708 msgstr ""

3709

3588 -#: builtin/commit.c:1363

3710 +#: builtin/commit.c:1365

3711 msgid "author"

3712 msgstr ""

3713

3592 -#: builtin/commit.c:1363

3714 +#: builtin/commit.c:1365

3715 msgid "override author for commit"

3716 msgstr ""

3717

3596 -#: builtin/commit.c:1364 builtin/gc.c:178

3718 +#: builtin/commit.c:1366 builtin/gc.c:178

3719 msgid "date"

3720 msgstr ""

3721

3600 -#: builtin/commit.c:1364

3722 +#: builtin/commit.c:1366

3723 msgid "override date for commit"

3724 msgstr ""

3725

3604 -#: builtin/commit.c:1365 builtin/merge.c:206 builtin/notes.c:533

3726 +#: builtin/commit.c:1367 builtin/merge.c:208 builtin/notes.c:533

3727 #: builtin/notes.c:690 builtin/tag.c:455

3728 msgid "message"

3729 msgstr ""

3730

3609 -#: builtin/commit.c:1365

3731 +#: builtin/commit.c:1367

3732 msgid "commit message"

3733 msgstr ""

3734

3613 -#: builtin/commit.c:1366

3735 +#: builtin/commit.c:1368

3736 msgid "reuse and edit message from specified commit"

3737 msgstr ""

3738

3617 -#: builtin/commit.c:1367

3739 +#: builtin/commit.c:1369

3740 msgid "reuse message from specified commit"

3741 msgstr ""

3742

3621 -#: builtin/commit.c:1368

3743 +#: builtin/commit.c:1370

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

3745 msgstr ""

3746

3625 -#: builtin/commit.c:1369

3747 +#: builtin/commit.c:1371

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

3749 msgstr ""

3750

3629 -#: builtin/commit.c:1370

3751 +#: builtin/commit.c:1372

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

3753 msgstr ""

3754

3633 -#: builtin/commit.c:1371 builtin/log.c:1102 builtin/revert.c:109

3755 +#: builtin/commit.c:1373 builtin/log.c:1104 builtin/revert.c:109

3756 msgid "add Signed-off-by:"

3757 msgstr ""

3758

3637 -#: builtin/commit.c:1372

3759 +#: builtin/commit.c:1374

3760 msgid "use specified template file"

3761 msgstr ""

3762

3641 -#: builtin/commit.c:1373

3763 +#: builtin/commit.c:1375

3764 msgid "force edit of commit"

3765 msgstr ""

3766

3645 -#: builtin/commit.c:1374

3767 +#: builtin/commit.c:1376

3768 msgid "default"

3769 msgstr ""

3770

3649 -#: builtin/commit.c:1374 builtin/tag.c:460

3771 +#: builtin/commit.c:1376 builtin/tag.c:460

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

3773 msgstr ""

3774

3653 -#: builtin/commit.c:1375

3775 +#: builtin/commit.c:1377

3776 msgid "include status in commit message template"

3777 msgstr ""

3778

3657 -#: builtin/commit.c:1376 builtin/merge.c:213 builtin/tag.c:461

3779 +#: builtin/commit.c:1378 builtin/merge.c:215 builtin/tag.c:461

3780 msgid "key id"

3781 msgstr ""

3782

3661 -#: builtin/commit.c:1377 builtin/merge.c:214

3783 +#: builtin/commit.c:1379 builtin/merge.c:216

3784 msgid "GPG sign commit"

3785 msgstr ""

3786

3787 #. end commit message options

3666 -#: builtin/commit.c:1380

3788 +#: builtin/commit.c:1382

3789 msgid "Commit contents options"

3790 msgstr ""

3791

3670 -#: builtin/commit.c:1381

3792 +#: builtin/commit.c:1383

3793 msgid "commit all changed files"

3794 msgstr ""

3795

3674 -#: builtin/commit.c:1382

3796 +#: builtin/commit.c:1384

3797 msgid "add specified files to index for commit"

3798 msgstr ""

3799

3678 -#: builtin/commit.c:1383

3800 +#: builtin/commit.c:1385

3801 msgid "interactively add files"

3802 msgstr ""

3803

3682 -#: builtin/commit.c:1384

3804 +#: builtin/commit.c:1386

3805 msgid "interactively add changes"

3806 msgstr ""

3807

3686 -#: builtin/commit.c:1385

3808 +#: builtin/commit.c:1387

3809 msgid "commit only specified files"

3810 msgstr ""

3811

3690 -#: builtin/commit.c:1386

3812 +#: builtin/commit.c:1388

3813 msgid "bypass pre-commit hook"

3814 msgstr ""

3815

3694 -#: builtin/commit.c:1387

3816 +#: builtin/commit.c:1389

3817 msgid "show what would be committed"

3818 msgstr ""

3819

3698 -#: builtin/commit.c:1398

3820 +#: builtin/commit.c:1400

3821 msgid "amend previous commit"

3822 msgstr ""

3823

3702 -#: builtin/commit.c:1399

3824 +#: builtin/commit.c:1401

3825 msgid "bypass post-rewrite hook"

3826 msgstr ""

3827

3706 -#: builtin/commit.c:1404

3828 +#: builtin/commit.c:1406

3829 msgid "ok to record an empty change"

3830 msgstr ""

3831

3710 -#: builtin/commit.c:1407

3832 +#: builtin/commit.c:1409

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

3834 msgstr ""

3835

3714 -#: builtin/commit.c:1439

3836 +#: builtin/commit.c:1441

3837 msgid "could not parse HEAD commit"

3838 msgstr ""

3839

3718 -#: builtin/commit.c:1477 builtin/merge.c:508

3840 +#: builtin/commit.c:1479 builtin/merge.c:510

3841 #, c-format

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

3843 msgstr ""

3844

3723 -#: builtin/commit.c:1484

3845 +#: builtin/commit.c:1486

3846 #, c-format

3847 msgid "Corrupt MERGE_HEAD file (%s)"

3848 msgstr ""

3849

3728 -#: builtin/commit.c:1491

3850 +#: builtin/commit.c:1493

3851 msgid "could not read MERGE_MODE"

3852 msgstr ""

3853

3732 -#: builtin/commit.c:1510

3854 +#: builtin/commit.c:1512

3855 #, c-format

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

3857 msgstr ""

3858

3737 -#: builtin/commit.c:1524

3859 +#: builtin/commit.c:1526

3860 #, c-format

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

3862 msgstr ""

3863

3742 -#: builtin/commit.c:1529

3864 +#: builtin/commit.c:1531

3865 #, c-format

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

3867 msgstr ""

3868

3747 -#: builtin/commit.c:1544 builtin/merge.c:832 builtin/merge.c:857

3869 +#: builtin/commit.c:1546 builtin/merge.c:847 builtin/merge.c:872

3870 msgid "failed to write commit object"

3871 msgstr ""

3872

3751 -#: builtin/commit.c:1565

3873 +#: builtin/commit.c:1567

3874 msgid "cannot lock HEAD ref"

3875 msgstr ""

3876

3755 -#: builtin/commit.c:1569

3877 +#: builtin/commit.c:1571

3878 msgid "cannot update HEAD ref"

3879 msgstr ""

3880

3759 -#: builtin/commit.c:1580

3881 +#: builtin/commit.c:1582

3882 msgid ""

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

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

@@ -3879,7 +4001,7 @@ msgstr ""

4001 msgid "respect include directives on lookup"

4002 msgstr ""

4003

3882 -#: builtin/count-objects.c:69

4004 +#: builtin/count-objects.c:82

4005 msgid "git count-objects [-v]"

4006 msgstr ""

4007

@@ -3891,125 +4013,125 @@ msgstr ""

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

4014 msgstr ""

4015

3894 -#: builtin/describe.c:234

4016 +#: builtin/describe.c:233

4017 #, c-format

4018 msgid "annotated tag %s not available"

4019 msgstr ""

4020

3899 -#: builtin/describe.c:238

4021 +#: builtin/describe.c:237

4022 #, c-format

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

4024 msgstr ""

4025

3904 -#: builtin/describe.c:240

4026 +#: builtin/describe.c:239

4027 #, c-format

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

4029 msgstr ""

4030

3909 -#: builtin/describe.c:267

4031 +#: builtin/describe.c:266

4032 #, c-format

4033 msgid "Not a valid object name %s"

4034 msgstr ""

4035

3914 -#: builtin/describe.c:270

4036 +#: builtin/describe.c:269

4037 #, c-format

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

4039 msgstr ""

4040

3919 -#: builtin/describe.c:287

4041 +#: builtin/describe.c:286

4042 #, c-format

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

4044 msgstr ""

4045

3924 -#: builtin/describe.c:289

4046 +#: builtin/describe.c:288

4047 #, c-format

4048 msgid "searching to describe %s\n"

4049 msgstr ""

4050

3929 -#: builtin/describe.c:329

4051 +#: builtin/describe.c:328

4052 #, c-format

4053 msgid "finished search at %s\n"

4054 msgstr ""

4055

3934 -#: builtin/describe.c:353

4056 +#: builtin/describe.c:352

4057 #, c-format

4058 msgid ""

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

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

4061 msgstr ""

4062

3941 -#: builtin/describe.c:357

4063 +#: builtin/describe.c:356

4064 #, c-format

4065 msgid ""

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

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

4068 msgstr ""

4069

3948 -#: builtin/describe.c:378

4070 +#: builtin/describe.c:377

4071 #, c-format

4072 msgid "traversed %lu commits\n"

4073 msgstr ""

4074

3953 -#: builtin/describe.c:381

4075 +#: builtin/describe.c:380

4076 #, c-format

4077 msgid ""

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

4079 "gave up search at %s\n"

4080 msgstr ""

4081

3960 -#: builtin/describe.c:403

4082 +#: builtin/describe.c:402

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

4084 msgstr ""

4085

3964 -#: builtin/describe.c:404

4086 +#: builtin/describe.c:403

4087 msgid "debug search strategy on stderr"

4088 msgstr ""

4089

3968 -#: builtin/describe.c:405

3969 -msgid "use any ref in .git/refs"

4090 +#: builtin/describe.c:404

4091 +msgid "use any ref"

4092 msgstr ""

4093

3972 -#: builtin/describe.c:406

3973 -msgid "use any tag in .git/refs/tags"

4094 +#: builtin/describe.c:405

4095 +msgid "use any tag, even unannotated"

4096 msgstr ""

4097

3976 -#: builtin/describe.c:407

4098 +#: builtin/describe.c:406

4099 msgid "always use long format"

4100 msgstr ""

4101

3980 -#: builtin/describe.c:410

4102 +#: builtin/describe.c:409

4103 msgid "only output exact matches"

4104 msgstr ""

4105

3984 -#: builtin/describe.c:412

4106 +#: builtin/describe.c:411

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

4108 msgstr ""

4109

3988 -#: builtin/describe.c:414

4110 +#: builtin/describe.c:413

4111 msgid "only consider tags matching <pattern>"

4112 msgstr ""

4113

3992 -#: builtin/describe.c:416 builtin/name-rev.c:238

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

4115 msgid "show abbreviated commit object as fallback"

4116 msgstr ""

4117

3996 -#: builtin/describe.c:417

4118 +#: builtin/describe.c:416

4119 msgid "mark"

4120 msgstr ""

4121

4000 -#: builtin/describe.c:418

4122 +#: builtin/describe.c:417

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

4124 msgstr ""

4125

4004 -#: builtin/describe.c:436

4126 +#: builtin/describe.c:435

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

4128 msgstr ""

4129

4008 -#: builtin/describe.c:462

4130 +#: builtin/describe.c:461

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

4132 msgstr ""

4133

4012 -#: builtin/describe.c:482

4134 +#: builtin/describe.c:481

4135 msgid "--dirty is incompatible with committishes"

4136 msgstr ""

4137

@@ -4051,39 +4173,39 @@ msgstr ""

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

4174 msgstr ""

4175

4054 -#: builtin/fast-export.c:646

4176 +#: builtin/fast-export.c:652

4177 msgid "show progress after <n> objects"

4178 msgstr ""

4179

4058 -#: builtin/fast-export.c:648

4180 +#: builtin/fast-export.c:654

4181 msgid "select handling of signed tags"

4182 msgstr ""

4183

4062 -#: builtin/fast-export.c:651

4184 +#: builtin/fast-export.c:657

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

4186 msgstr ""

4187

4066 -#: builtin/fast-export.c:654

4188 +#: builtin/fast-export.c:660

4189 msgid "Dump marks to this file"

4190 msgstr ""

4191

4070 -#: builtin/fast-export.c:656

4192 +#: builtin/fast-export.c:662

4193 msgid "Import marks from this file"

4194 msgstr ""

4195

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

4196 +#: builtin/fast-export.c:664

4197 msgid "Fake a tagger when tags lack one"

4198 msgstr ""

4199

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

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

4201 msgid "Output full tree for each commit"

4202 msgstr ""

4203

4082 -#: builtin/fast-export.c:662

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

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

4206 msgstr ""

4207

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

4208 +#: builtin/fast-export.c:669

4209 msgid "Skip output of blob data"

4210 msgstr ""

4211

@@ -4159,7 +4281,7 @@ msgstr ""

4281 msgid "convert to a complete repository"

4282 msgstr ""

4283

4162 -#: builtin/fetch.c:88 builtin/log.c:1119

4284 +#: builtin/fetch.c:88 builtin/log.c:1121

4285 msgid "dir"

4286 msgstr ""

4287

@@ -4688,28 +4810,23 @@ msgstr ""

4810 msgid "no pattern given."

4811 msgstr ""

4812

4691 -#: builtin/grep.c:825

4692 -#, c-format

4693 -msgid "bad object %s"

4694 -msgstr ""

4695 -

4696 -#: builtin/grep.c:868

4813 +#: builtin/grep.c:866

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

4815 msgstr ""

4816

4700 -#: builtin/grep.c:891

4817 +#: builtin/grep.c:889

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

4819 msgstr ""

4820

4704 -#: builtin/grep.c:896

4821 +#: builtin/grep.c:894

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

4823 msgstr ""

4824

4708 -#: builtin/grep.c:899

4825 +#: builtin/grep.c:897

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

4827 msgstr ""

4828

4712 -#: builtin/grep.c:907

4829 +#: builtin/grep.c:905

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

4831 msgstr ""

4832

@@ -4827,280 +4944,280 @@ msgstr ""

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

4945 msgstr ""

4946

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

4947 +#: builtin/index-pack.c:182

4948 #, c-format

4949 msgid "object type mismatch at %s"

4950 msgstr ""

4951

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

4952 +#: builtin/index-pack.c:202

4953 msgid "object of unexpected type"

4954 msgstr ""

4955

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

4956 +#: builtin/index-pack.c:239

4957 #, c-format

4958 msgid "cannot fill %d byte"

4959 msgid_plural "cannot fill %d bytes"

4960 msgstr[0] ""

4961 msgstr[1] ""

4962

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

4963 +#: builtin/index-pack.c:249

4964 msgid "early EOF"

4965 msgstr ""

4966

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

4967 +#: builtin/index-pack.c:250

4968 msgid "read error on input"

4969 msgstr ""

4970

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

4971 +#: builtin/index-pack.c:262

4972 msgid "used more bytes than were available"

4973 msgstr ""

4974

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

4975 +#: builtin/index-pack.c:269

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

4977 msgstr ""

4978

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

4979 +#: builtin/index-pack.c:285

4980 #, c-format

4981 msgid "unable to create '%s'"

4982 msgstr ""

4983

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

4984 +#: builtin/index-pack.c:290

4985 #, c-format

4986 msgid "cannot open packfile '%s'"

4987 msgstr ""

4988

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

4989 +#: builtin/index-pack.c:304

4990 msgid "pack signature mismatch"

4991 msgstr ""

4992

4876 -#: builtin/index-pack.c:294

4993 +#: builtin/index-pack.c:306

4994 #, c-format

4995 msgid "pack version %<PRIu32> unsupported"

4996 msgstr ""

4997

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

4998 +#: builtin/index-pack.c:324

4999 #, c-format

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

5001 msgstr ""

5002

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

5003 +#: builtin/index-pack.c:446

5004 #, c-format

5005 msgid "inflate returned %d"

5006 msgstr ""

5007

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

5008 +#: builtin/index-pack.c:495

5009 msgid "offset value overflow for delta base object"

5010 msgstr ""

5011

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

5012 +#: builtin/index-pack.c:503

5013 msgid "delta base offset is out of bound"

5014 msgstr ""

5015

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

5016 +#: builtin/index-pack.c:511

5017 #, c-format

5018 msgid "unknown object type %d"

5019 msgstr ""

5020

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

5021 +#: builtin/index-pack.c:542

5022 msgid "cannot pread pack file"

5023 msgstr ""

5024

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

5025 +#: builtin/index-pack.c:544

5026 #, c-format

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

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

5029 msgstr[0] ""

5030 msgstr[1] ""

5031

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

5032 +#: builtin/index-pack.c:570

5033 msgid "serious inflate inconsistency"

5034 msgstr ""

5035

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

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

5036 +#: builtin/index-pack.c:661 builtin/index-pack.c:667 builtin/index-pack.c:690

5037 +#: builtin/index-pack.c:724 builtin/index-pack.c:733

5038 #, c-format

5039 msgid "SHA1 COLLISION FOUND WITH %s !"

5040 msgstr ""

5041

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

5042 +#: builtin/index-pack.c:664 builtin/pack-objects.c:170

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

5044 #, c-format

5045 msgid "unable to read %s"

5046 msgstr ""

5047

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

5048 +#: builtin/index-pack.c:730

5049 #, c-format

5050 msgid "cannot read existing object %s"

5051 msgstr ""

5052

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

5053 +#: builtin/index-pack.c:744

5054 #, c-format

5055 msgid "invalid blob object %s"

5056 msgstr ""

5057

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

5058 +#: builtin/index-pack.c:759

5059 #, c-format

5060 msgid "invalid %s"

5061 msgstr ""

5062

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

5063 +#: builtin/index-pack.c:761

5064 msgid "Error in object"

5065 msgstr ""

5066

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

5067 +#: builtin/index-pack.c:763

5068 #, c-format

5069 msgid "Not all child objects of %s are reachable"

5070 msgstr ""

5071

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

5072 +#: builtin/index-pack.c:833 builtin/index-pack.c:863

5073 msgid "failed to apply delta"

5074 msgstr ""

5075

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

5076 +#: builtin/index-pack.c:1004

5077 msgid "Receiving objects"

5078 msgstr ""

5079

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

5080 +#: builtin/index-pack.c:1004

5081 msgid "Indexing objects"

5082 msgstr ""

5083

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

5084 +#: builtin/index-pack.c:1030

5085 msgid "pack is corrupted (SHA1 mismatch)"

5086 msgstr ""

5087

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

5088 +#: builtin/index-pack.c:1035

5089 msgid "cannot fstat packfile"

5090 msgstr ""

5091

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

5092 +#: builtin/index-pack.c:1038

5093 msgid "pack has junk at the end"

5094 msgstr ""

5095

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

5096 +#: builtin/index-pack.c:1049

5097 msgid "confusion beyond insanity in parse_pack_objects()"

5098 msgstr ""

5099

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

5100 +#: builtin/index-pack.c:1072

5101 msgid "Resolving deltas"

5102 msgstr ""

5103

4987 -#: builtin/index-pack.c:1064

5104 +#: builtin/index-pack.c:1082

5105 #, c-format

5106 msgid "unable to create thread: %s"

5107 msgstr ""

5108

4992 -#: builtin/index-pack.c:1106

5109 +#: builtin/index-pack.c:1124

5110 msgid "confusion beyond insanity"

5111 msgstr ""

5112

4996 -#: builtin/index-pack.c:1112

5113 +#: builtin/index-pack.c:1132

5114 #, c-format

5115 msgid "completed with %d local objects"

5116 msgstr ""

5117

5001 -#: builtin/index-pack.c:1121

5118 +#: builtin/index-pack.c:1142

5119 #, c-format

5120 msgid "Unexpected tail checksum for %s (disk corruption?)"

5121 msgstr ""

5122

5006 -#: builtin/index-pack.c:1125

5123 +#: builtin/index-pack.c:1146

5124 #, c-format

5125 msgid "pack has %d unresolved delta"

5126 msgid_plural "pack has %d unresolved deltas"

5127 msgstr[0] ""

5128 msgstr[1] ""

5129

5013 -#: builtin/index-pack.c:1150

5130 +#: builtin/index-pack.c:1171

5131 #, c-format

5132 msgid "unable to deflate appended object (%d)"

5133 msgstr ""

5134

5018 -#: builtin/index-pack.c:1229

5135 +#: builtin/index-pack.c:1250

5136 #, c-format

5137 msgid "local object %s is corrupt"

5138 msgstr ""

5139

5023 -#: builtin/index-pack.c:1253

5140 +#: builtin/index-pack.c:1274

5141 msgid "error while closing pack file"

5142 msgstr ""

5143

5027 -#: builtin/index-pack.c:1266

5144 +#: builtin/index-pack.c:1287

5145 #, c-format

5146 msgid "cannot write keep file '%s'"

5147 msgstr ""

5148

5032 -#: builtin/index-pack.c:1274

5149 +#: builtin/index-pack.c:1295

5150 #, c-format

5151 msgid "cannot close written keep file '%s'"

5152 msgstr ""

5153

5037 -#: builtin/index-pack.c:1287

5154 +#: builtin/index-pack.c:1308

5155 msgid "cannot store pack file"

5156 msgstr ""

5157

5041 -#: builtin/index-pack.c:1298

5158 +#: builtin/index-pack.c:1319

5159 msgid "cannot store index file"

5160 msgstr ""

5161

5045 -#: builtin/index-pack.c:1331

5162 +#: builtin/index-pack.c:1352

5163 #, c-format

5164 msgid "bad pack.indexversion=%<PRIu32>"

5165 msgstr ""

5166

5050 -#: builtin/index-pack.c:1337

5167 +#: builtin/index-pack.c:1358

5168 #, c-format

5169 msgid "invalid number of threads specified (%d)"

5170 msgstr ""

5171

5055 -#: builtin/index-pack.c:1341 builtin/index-pack.c:1514

5172 +#: builtin/index-pack.c:1362 builtin/index-pack.c:1535

5173 #, c-format

5174 msgid "no threads support, ignoring %s"

5175 msgstr ""

5176

5060 -#: builtin/index-pack.c:1399

5177 +#: builtin/index-pack.c:1420

5178 #, c-format

5179 msgid "Cannot open existing pack file '%s'"

5180 msgstr ""

5181

5065 -#: builtin/index-pack.c:1401

5182 +#: builtin/index-pack.c:1422

5183 #, c-format

5184 msgid "Cannot open existing pack idx file for '%s'"

5185 msgstr ""

5186

5070 -#: builtin/index-pack.c:1448

5187 +#: builtin/index-pack.c:1469

5188 #, c-format

5189 msgid "non delta: %d object"

5190 msgid_plural "non delta: %d objects"

5191 msgstr[0] ""

5192 msgstr[1] ""

5193

5077 -#: builtin/index-pack.c:1455

5194 +#: builtin/index-pack.c:1476

5195 #, c-format

5196 msgid "chain length = %d: %lu object"

5197 msgid_plural "chain length = %d: %lu objects"

5198 msgstr[0] ""

5199 msgstr[1] ""

5200

5084 -#: builtin/index-pack.c:1482

5201 +#: builtin/index-pack.c:1503

5202 msgid "Cannot come back to cwd"

5203 msgstr ""

5204

5088 -#: builtin/index-pack.c:1526 builtin/index-pack.c:1529

5089 -#: builtin/index-pack.c:1541 builtin/index-pack.c:1545

5205 +#: builtin/index-pack.c:1547 builtin/index-pack.c:1550

5206 +#: builtin/index-pack.c:1562 builtin/index-pack.c:1566

5207 #, c-format

5208 msgid "bad %s"

5209 msgstr ""

5210

5094 -#: builtin/index-pack.c:1559

5211 +#: builtin/index-pack.c:1580

5212 msgid "--fix-thin cannot be used without --stdin"

5213 msgstr ""

5214

5098 -#: builtin/index-pack.c:1563 builtin/index-pack.c:1573

5215 +#: builtin/index-pack.c:1584 builtin/index-pack.c:1594

5216 #, c-format

5217 msgid "packfile name '%s' does not end with '.pack'"

5218 msgstr ""

5219

5103 -#: builtin/index-pack.c:1582

5220 +#: builtin/index-pack.c:1603

5221 msgid "--verify with no packfile name given"

5222 msgstr ""

5223

@@ -5264,252 +5381,247 @@ msgstr ""

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

5382 msgstr ""

5383

5267 -#: builtin/log.c:39

5384 +#: builtin/log.c:40

5385 msgid "git log [<options>] [<since>..<until>] [[--] <path>...]\n"

5386 msgstr ""

5387

5271 -#: builtin/log.c:40

5388 +#: builtin/log.c:41

5389 msgid " or: git show [options] <object>..."

5390 msgstr ""

5391

5275 -#: builtin/log.c:102

5392 +#: builtin/log.c:103

5393 msgid "suppress diff output"

5394 msgstr ""

5395

5279 -#: builtin/log.c:103

5396 +#: builtin/log.c:104

5397 msgid "show source"

5398 msgstr ""

5399

5283 -#: builtin/log.c:104

5400 +#: builtin/log.c:105

5401 msgid "Use mail map file"

5402 msgstr ""

5403

5287 -#: builtin/log.c:105

5404 +#: builtin/log.c:106

5405 msgid "decorate options"

5406 msgstr ""

5407

5291 -#: builtin/log.c:198

5408 +#: builtin/log.c:199

5409 #, c-format

5410 msgid "Final output: %d %s\n"

5411 msgstr ""

5412

5296 -#: builtin/log.c:419 builtin/log.c:511

5413 +#: builtin/log.c:422 builtin/log.c:514

5414 #, c-format

5415 msgid "Could not read object %s"

5416 msgstr ""

5417

5301 -#: builtin/log.c:535

5418 +#: builtin/log.c:538

5419 #, c-format

5420 msgid "Unknown type: %d"

5421 msgstr ""

5422

5306 -#: builtin/log.c:627

5423 +#: builtin/log.c:630

5424 msgid "format.headers without value"

5425 msgstr ""

5426

5310 -#: builtin/log.c:701

5427 +#: builtin/log.c:704

5428 msgid "name of output directory is too long"

5429 msgstr ""

5430

5314 -#: builtin/log.c:717

5431 +#: builtin/log.c:720

5432 #, c-format

5433 msgid "Cannot open patch file %s"

5434 msgstr ""

5435

5319 -#: builtin/log.c:731

5436 +#: builtin/log.c:734

5437 msgid "Need exactly one range."

5438 msgstr ""

5439

5323 -#: builtin/log.c:739

5440 +#: builtin/log.c:742

5441 msgid "Not a range."

5442 msgstr ""

5443

5327 -#: builtin/log.c:812

5444 +#: builtin/log.c:815

5445 msgid "Cover letter needs email format"

5446 msgstr ""

5447

5331 -#: builtin/log.c:885

5448 +#: builtin/log.c:888

5449 #, c-format

5450 msgid "insane in-reply-to: %s"

5451 msgstr ""

5452

5336 -#: builtin/log.c:913

5453 +#: builtin/log.c:916

5454 msgid "git format-patch [options] [<since> | <revision range>]"

5455 msgstr ""

5456

5340 -#: builtin/log.c:958

5457 +#: builtin/log.c:961

5458 msgid "Two output directories?"

5459 msgstr ""

5460

5344 -#: builtin/log.c:1097

5461 +#: builtin/log.c:1099

5462 msgid "use [PATCH n/m] even with a single patch"

5463 msgstr ""

5464

5348 -#: builtin/log.c:1100

5465 +#: builtin/log.c:1102

5466 msgid "use [PATCH] even with multiple patches"

5467 msgstr ""

5468

5352 -#: builtin/log.c:1104

5469 +#: builtin/log.c:1106

5470 msgid "print patches to standard out"

5471 msgstr ""

5472

5356 -#: builtin/log.c:1106

5473 +#: builtin/log.c:1108

5474 msgid "generate a cover letter"

5475 msgstr ""

5476

5360 -#: builtin/log.c:1108

5477 +#: builtin/log.c:1110

5478 msgid "use simple number sequence for output file names"

5479 msgstr ""

5480

5364 -#: builtin/log.c:1109

5481 +#: builtin/log.c:1111

5482 msgid "sfx"

5483 msgstr ""

5484

5368 -#: builtin/log.c:1110

5485 +#: builtin/log.c:1112

5486 msgid "use <sfx> instead of '.patch'"

5487 msgstr ""

5488

5372 -#: builtin/log.c:1112

5489 +#: builtin/log.c:1114

5490 msgid "start numbering patches at <n> instead of 1"

5491 msgstr ""

5492

5376 -#: builtin/log.c:1114

5493 +#: builtin/log.c:1116

5494 msgid "mark the series as Nth re-roll"

5495 msgstr ""

5496

5380 -#: builtin/log.c:1116

5497 +#: builtin/log.c:1118

5498 msgid "Use [<prefix>] instead of [PATCH]"

5499 msgstr ""

5500

5384 -#: builtin/log.c:1119

5501 +#: builtin/log.c:1121

5502 msgid "store resulting files in <dir>"

5503 msgstr ""

5504

5388 -#: builtin/log.c:1122

5505 +#: builtin/log.c:1124

5506 msgid "don't strip/add [PATCH]"

5507 msgstr ""

5508

5392 -#: builtin/log.c:1125

5509 +#: builtin/log.c:1127

5510 msgid "don't output binary diffs"

5511 msgstr ""

5512

5396 -#: builtin/log.c:1127

5513 +#: builtin/log.c:1129

5514 msgid "don't include a patch matching a commit upstream"

5515 msgstr ""

5516

5400 -#: builtin/log.c:1129

5517 +#: builtin/log.c:1131

5518 msgid "show patch format instead of default (patch + stat)"

5519 msgstr ""

5520

5404 -#: builtin/log.c:1131

5521 +#: builtin/log.c:1133

5522 msgid "Messaging"

5523 msgstr ""

5524

5408 -#: builtin/log.c:1132

5525 +#: builtin/log.c:1134

5526 msgid "header"

5527 msgstr ""

5528

5412 -#: builtin/log.c:1133

5529 +#: builtin/log.c:1135

5530 msgid "add email header"

5531 msgstr ""

5532

5416 -#: builtin/log.c:1134 builtin/log.c:1136

5533 +#: builtin/log.c:1136 builtin/log.c:1138

5534 msgid "email"

5535 msgstr ""

5536

5420 -#: builtin/log.c:1134

5537 +#: builtin/log.c:1136

5538 msgid "add To: header"

5539 msgstr ""

5540

5424 -#: builtin/log.c:1136

5541 +#: builtin/log.c:1138

5542 msgid "add Cc: header"

5543 msgstr ""

5544

5428 -#: builtin/log.c:1138

5545 +#: builtin/log.c:1140

5546 msgid "message-id"

5547 msgstr ""

5548

5432 -#: builtin/log.c:1139

5549 +#: builtin/log.c:1141

5550 msgid "make first mail a reply to <message-id>"

5551 msgstr ""

5552

5436 -#: builtin/log.c:1140 builtin/log.c:1143

5553 +#: builtin/log.c:1142 builtin/log.c:1145

5554 msgid "boundary"

5555 msgstr ""

5556

5440 -#: builtin/log.c:1141

5557 +#: builtin/log.c:1143

5558 msgid "attach the patch"

5559 msgstr ""

5560

5444 -#: builtin/log.c:1144

5561 +#: builtin/log.c:1146

5562 msgid "inline the patch"

5563 msgstr ""

5564

5448 -#: builtin/log.c:1148

5565 +#: builtin/log.c:1150

5566 msgid "enable message threading, styles: shallow, deep"

5567 msgstr ""

5568

5452 -#: builtin/log.c:1150

5569 +#: builtin/log.c:1152

5570 msgid "signature"

5571 msgstr ""

5572

5456 -#: builtin/log.c:1151

5573 +#: builtin/log.c:1153

5574 msgid "add a signature"

5575 msgstr ""

5576

5460 -#: builtin/log.c:1153

5577 +#: builtin/log.c:1155

5578 msgid "don't print the patch filenames"

5579 msgstr ""

5580

5464 -#: builtin/log.c:1202

5465 -#, c-format

5466 -msgid "bogus committer info %s"

5467 -msgstr ""

5468 -

5469 -#: builtin/log.c:1247

5581 +#: builtin/log.c:1239

5582 msgid "-n and -k are mutually exclusive."

5583 msgstr ""

5584

5473 -#: builtin/log.c:1249

5585 +#: builtin/log.c:1241

5586 msgid "--subject-prefix and -k are mutually exclusive."

5587 msgstr ""

5588

5477 -#: builtin/log.c:1257

5589 +#: builtin/log.c:1249

5590 msgid "--name-only does not make sense"

5591 msgstr ""

5592

5481 -#: builtin/log.c:1259

5593 +#: builtin/log.c:1251

5594 msgid "--name-status does not make sense"

5595 msgstr ""

5596

5485 -#: builtin/log.c:1261

5597 +#: builtin/log.c:1253

5598 msgid "--check does not make sense"

5599 msgstr ""

5600

5489 -#: builtin/log.c:1284

5601 +#: builtin/log.c:1276

5602 msgid "standard output, or directory, which one?"

5603 msgstr ""

5604

5493 -#: builtin/log.c:1286

5605 +#: builtin/log.c:1278

5606 #, c-format

5607 msgid "Could not create directory '%s'"

5608 msgstr ""

5609

5498 -#: builtin/log.c:1439

5610 +#: builtin/log.c:1431

5611 msgid "Failed to create output files"

5612 msgstr ""

5613

5502 -#: builtin/log.c:1488

5614 +#: builtin/log.c:1480

5615 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"

5616 msgstr ""

5617

5506 -#: builtin/log.c:1543

5618 +#: builtin/log.c:1535

5619 #, c-format

5620 msgid ""

5621 "Could not find a tracked remote branch, please specify <upstream> manually.\n"

5622 msgstr ""

5623

5512 -#: builtin/log.c:1556 builtin/log.c:1558 builtin/log.c:1570

5624 +#: builtin/log.c:1548 builtin/log.c:1550 builtin/log.c:1562

5625 #, c-format

5626 msgid "Unknown commit %s"

5627 msgstr ""

@@ -5709,108 +5821,112 @@ msgstr ""

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

5822 msgstr ""

5823

5712 -#: builtin/merge.c:202 builtin/notes.c:866 builtin/revert.c:112

5824 +#: builtin/merge.c:203

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

5826 +msgstr ""

5827 +

5828 +#: builtin/merge.c:204 builtin/notes.c:866 builtin/revert.c:112

5829 msgid "strategy"

5830 msgstr ""

5831

5716 -#: builtin/merge.c:203

5832 +#: builtin/merge.c:205

5833 msgid "merge strategy to use"

5834 msgstr ""

5835

5720 -#: builtin/merge.c:204

5836 +#: builtin/merge.c:206

5837 msgid "option=value"

5838 msgstr ""

5839

5724 -#: builtin/merge.c:205

5840 +#: builtin/merge.c:207

5841 msgid "option for selected merge strategy"

5842 msgstr ""

5843

5728 -#: builtin/merge.c:207

5844 +#: builtin/merge.c:209

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

5846 msgstr ""

5847

5732 -#: builtin/merge.c:211

5848 +#: builtin/merge.c:213

5849 msgid "abort the current in-progress merge"

5850 msgstr ""

5851

5736 -#: builtin/merge.c:240

5852 +#: builtin/merge.c:242

5853 msgid "could not run stash."

5854 msgstr ""

5855

5740 -#: builtin/merge.c:245

5856 +#: builtin/merge.c:247

5857 msgid "stash failed"

5858 msgstr ""

5859

5744 -#: builtin/merge.c:250

5860 +#: builtin/merge.c:252

5861 #, c-format

5862 msgid "not a valid object: %s"

5863 msgstr ""

5864

5749 -#: builtin/merge.c:269 builtin/merge.c:286

5865 +#: builtin/merge.c:271 builtin/merge.c:288

5866 msgid "read-tree failed"

5867 msgstr ""

5868

5753 -#: builtin/merge.c:316

5869 +#: builtin/merge.c:318

5870 msgid " (nothing to squash)"

5871 msgstr ""

5872

5757 -#: builtin/merge.c:329

5873 +#: builtin/merge.c:331

5874 #, c-format

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

5876 msgstr ""

5877

5762 -#: builtin/merge.c:361

5878 +#: builtin/merge.c:363

5879 msgid "Writing SQUASH_MSG"

5880 msgstr ""

5881

5766 -#: builtin/merge.c:363

5882 +#: builtin/merge.c:365

5883 msgid "Finishing SQUASH_MSG"

5884 msgstr ""

5885

5770 -#: builtin/merge.c:386

5886 +#: builtin/merge.c:388

5887 #, c-format

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

5889 msgstr ""

5890

5775 -#: builtin/merge.c:436

5891 +#: builtin/merge.c:438

5892 #, c-format

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

5894 msgstr ""

5895

5780 -#: builtin/merge.c:535

5896 +#: builtin/merge.c:550

5897 #, c-format

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

5899 msgstr ""

5900

5785 -#: builtin/merge.c:628

5901 +#: builtin/merge.c:643

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

5903 msgstr ""

5904

5789 -#: builtin/merge.c:656

5905 +#: builtin/merge.c:671

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

5907 msgstr ""

5908

5793 -#: builtin/merge.c:670

5909 +#: builtin/merge.c:685

5910 #, c-format

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

5912 msgstr ""

5913

5798 -#: builtin/merge.c:684

5914 +#: builtin/merge.c:699

5915 #, c-format

5916 msgid "unable to write %s"

5917 msgstr ""

5918

5803 -#: builtin/merge.c:773

5919 +#: builtin/merge.c:788

5920 #, c-format

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

5922 msgstr ""

5923

5808 -#: builtin/merge.c:782

5924 +#: builtin/merge.c:797

5925 #, c-format

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

5927 msgstr ""

5928

5813 -#: builtin/merge.c:788

5929 +#: builtin/merge.c:803

5930 #, c-format

5931 msgid ""

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

@@ -5820,140 +5936,161 @@ msgid ""

5936 "the commit.\n"

5937 msgstr ""

5938

5823 -#: builtin/merge.c:812

5939 +#: builtin/merge.c:827

5940 msgid "Empty commit message."

5941 msgstr ""

5942

5827 -#: builtin/merge.c:824

5943 +#: builtin/merge.c:839

5944 #, c-format

5945 msgid "Wonderful.\n"

5946 msgstr ""

5947

5832 -#: builtin/merge.c:889

5948 +#: builtin/merge.c:904

5949 #, c-format

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

5951 msgstr ""

5952

5837 -#: builtin/merge.c:905

5953 +#: builtin/merge.c:920

5954 #, c-format

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

5956 msgstr ""

5957

5842 -#: builtin/merge.c:946

5958 +#: builtin/merge.c:961

5959 msgid "No current branch."

5960 msgstr ""

5961

5846 -#: builtin/merge.c:948

5962 +#: builtin/merge.c:963

5963 msgid "No remote for the current branch."

5964 msgstr ""

5965

5850 -#: builtin/merge.c:950

5966 +#: builtin/merge.c:965

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

5968 msgstr ""

5969

5854 -#: builtin/merge.c:955

5970 +#: builtin/merge.c:970

5971 #, c-format

5972 msgid "No remote tracking branch for %s from %s"

5973 msgstr ""

5974

5859 -#: builtin/merge.c:1042 builtin/merge.c:1199

5975 +#: builtin/merge.c:1057 builtin/merge.c:1214

5976 #, c-format

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

5978 msgstr ""

5979

5864 -#: builtin/merge.c:1110

5980 +#: builtin/merge.c:1125

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

5982 msgstr ""

5983

5868 -#: builtin/merge.c:1126 git-pull.sh:31

5984 +#: builtin/merge.c:1141 git-pull.sh:31

5985 msgid ""

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

5987 "Please, commit your changes before you can merge."

5988 msgstr ""

5989

5874 -#: builtin/merge.c:1129 git-pull.sh:34

5990 +#: builtin/merge.c:1144 git-pull.sh:34

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

5992 msgstr ""

5993

5878 -#: builtin/merge.c:1133

5994 +#: builtin/merge.c:1148

5995 msgid ""

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

5997 "Please, commit your changes before you can merge."

5998 msgstr ""

5999

5884 -#: builtin/merge.c:1136

6000 +#: builtin/merge.c:1151

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

6002 msgstr ""

6003

5888 -#: builtin/merge.c:1145

6004 +#: builtin/merge.c:1160

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

6006 msgstr ""

6007

5892 -#: builtin/merge.c:1150

6008 +#: builtin/merge.c:1165

6009 msgid "You cannot combine --no-ff with --ff-only."

6010 msgstr ""

6011

5896 -#: builtin/merge.c:1157

6012 +#: builtin/merge.c:1172

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

6014 msgstr ""

6015

5900 -#: builtin/merge.c:1189

6016 +#: builtin/merge.c:1204

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

6018 msgstr ""

6019

5904 -#: builtin/merge.c:1192

6020 +#: builtin/merge.c:1207

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

6022 msgstr ""

6023

5908 -#: builtin/merge.c:1194

6024 +#: builtin/merge.c:1209

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

6026 msgstr ""

6027

5912 -#: builtin/merge.c:1310

6028 +#: builtin/merge.c:1265

6029 +#, c-format

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

6031 +msgstr ""

6032 +

6033 +#: builtin/merge.c:1268

6034 +#, c-format

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

6036 +msgstr ""

6037 +

6038 +#. 'N'

6039 +#: builtin/merge.c:1271

6040 +#, c-format

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

6042 +msgstr ""

6043 +

6044 +#: builtin/merge.c:1274

6045 +#, c-format

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

6047 +msgstr ""

6048 +

6049 +#: builtin/merge.c:1358

6050 #, c-format

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

6052 msgstr ""

6053

5917 -#: builtin/merge.c:1349

6054 +#: builtin/merge.c:1397

6055 #, c-format

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

6057 msgstr ""

6058

5922 -#: builtin/merge.c:1356

6059 +#: builtin/merge.c:1404

6060 #, c-format

6061 msgid "Nope.\n"

6062 msgstr ""

6063

5927 -#: builtin/merge.c:1388

6064 +#: builtin/merge.c:1436

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

6066 msgstr ""

6067

5931 -#: builtin/merge.c:1411 builtin/merge.c:1490

6068 +#: builtin/merge.c:1459 builtin/merge.c:1538

6069 #, c-format

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

6071 msgstr ""

6072

5936 -#: builtin/merge.c:1415

6073 +#: builtin/merge.c:1463

6074 #, c-format

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

6076 msgstr ""

6077

5941 -#: builtin/merge.c:1481

6078 +#: builtin/merge.c:1529

6079 #, c-format

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

6081 msgstr ""

6082

5946 -#: builtin/merge.c:1483

6083 +#: builtin/merge.c:1531

6084 #, c-format

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

6086 msgstr ""

6087

5951 -#: builtin/merge.c:1492

6088 +#: builtin/merge.c:1540

6089 #, c-format

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

6091 msgstr ""

6092

5956 -#: builtin/merge.c:1504

6093 +#: builtin/merge.c:1552

6094 #, c-format

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

6096 msgstr ""

@@ -6902,11 +7039,15 @@ msgstr ""

7039 msgid "bypass pre-push hook"

7040 msgstr ""

7041

6905 -#: builtin/push.c:448

6906 -msgid "--delete is incompatible with --all, --mirror and --tags"

7042 +#: builtin/push.c:440

7043 +msgid "push missing but relevant tags"

7044 msgstr ""

7045

7046 #: builtin/push.c:450

7047 +msgid "--delete is incompatible with --all, --mirror and --tags"

7048 +msgstr ""

7049 +

7050 +#: builtin/push.c:452

7051 msgid "--delete doesn't make sense without any refs"

7052 msgstr ""

7053

@@ -8741,7 +8882,7 @@ msgstr ""

8882 msgid "Pull is not possible because you have unmerged files."

8883 msgstr ""

8884

8744 -#: git-pull.sh:197

8885 +#: git-pull.sh:203

8886 msgid "updating an unborn branch with changes added to the index"

8887 msgstr ""

8888

@@ -8749,7 +8890,7 @@ msgstr ""

8890 #. The working tree and the index file is still based on the

8891 #. $orig_head commit, but we are merging into $curr_head.

8892 #. First update the working tree to match $curr_head.

8752 -#: git-pull.sh:229

8893 +#: git-pull.sh:235

8894 #, sh-format

8895 msgid ""

8896 "Warning: fetch updated the current branch head.\n"

@@ -8757,11 +8898,11 @@ msgid ""

8898 "Warning: commit $orig_head."

8899 msgstr ""

8900

8760 -#: git-pull.sh:254

8901 +#: git-pull.sh:260

8902 msgid "Cannot merge multiple branches into empty head"

8903 msgstr ""

8904

8764 -#: git-pull.sh:258

8905 +#: git-pull.sh:264

8906 msgid "Cannot rebase onto multiple branches"

8907 msgstr ""

8908

@@ -9002,37 +9143,37 @@ msgstr ""

9143 msgid "(To restore them type \"git stash apply\")"

9144 msgstr ""

9145

9005 -#: git-submodule.sh:90

9146 +#: git-submodule.sh:91

9147 #, sh-format

9148 msgid "cannot strip one component off url '$remoteurl'"

9149 msgstr ""

9150

9010 -#: git-submodule.sh:195

9151 +#: git-submodule.sh:196

9152 #, sh-format

9153 msgid "No submodule mapping found in .gitmodules for path '$sm_path'"

9154 msgstr ""

9155

9015 -#: git-submodule.sh:238

9156 +#: git-submodule.sh:239

9157 #, sh-format

9158 msgid "Clone of '$url' into submodule path '$sm_path' failed"

9159 msgstr ""

9160

9020 -#: git-submodule.sh:250

9161 +#: git-submodule.sh:251

9162 #, sh-format

9163 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"

9164 msgstr ""

9165

9025 -#: git-submodule.sh:343

9166 +#: git-submodule.sh:349

9167 #, sh-format

9168 msgid "repo URL: '$repo' must be absolute or begin with ./|../"

9169 msgstr ""

9170

9030 -#: git-submodule.sh:360

9171 +#: git-submodule.sh:366

9172 #, sh-format

9173 msgid "'$sm_path' already exists in the index"

9174 msgstr ""

9175

9035 -#: git-submodule.sh:364

9176 +#: git-submodule.sh:370

9177 #, sh-format

9178 msgid ""

9179 "The following path is ignored by one of your .gitignore files:\n"

@@ -9040,180 +9181,233 @@ msgid ""

9181 "Use -f if you really want to add it."

9182 msgstr ""

9183

9043 -#: git-submodule.sh:382

9184 +#: git-submodule.sh:388

9185 #, sh-format

9186 msgid "Adding existing repo at '$sm_path' to the index"

9187 msgstr ""

9188

9048 -#: git-submodule.sh:384

9189 +#: git-submodule.sh:390

9190 #, sh-format

9191 msgid "'$sm_path' already exists and is not a valid git repo"

9192 msgstr ""

9193

9053 -#: git-submodule.sh:392

9194 +#: git-submodule.sh:398

9195 #, sh-format

9196 msgid "A git directory for '$sm_name' is found locally with remote(s):"

9197 msgstr ""

9198

9058 -#: git-submodule.sh:394

9199 +#: git-submodule.sh:400

9200 #, sh-format

9201 msgid ""

9202 "If you want to reuse this local git directory instead of cloning again from"

9203 msgstr ""

9204

9064 -#: git-submodule.sh:396

9205 +#: git-submodule.sh:402

9206 #, sh-format

9207 msgid ""

9208 "use the '--force' option. If the local git directory is not the correct repo"

9209 msgstr ""

9210

9070 -#: git-submodule.sh:397

9211 +#: git-submodule.sh:403

9212 #, sh-format

9213 msgid ""

9214 "or you are unsure what this means choose another name with the '--name' "

9215 "option."

9216 msgstr ""

9217

9077 -#: git-submodule.sh:399

9218 +#: git-submodule.sh:405

9219 #, sh-format

9220 msgid "Reactivating local git directory for submodule '$sm_name'."

9221 msgstr ""

9222

9082 -#: git-submodule.sh:411

9223 +#: git-submodule.sh:417

9224 #, sh-format

9225 msgid "Unable to checkout submodule '$sm_path'"

9226 msgstr ""

9227

9087 -#: git-submodule.sh:416

9228 +#: git-submodule.sh:422

9229 #, sh-format

9230 msgid "Failed to add submodule '$sm_path'"

9231 msgstr ""

9232

9092 -#: git-submodule.sh:425

9233 +#: git-submodule.sh:431

9234 #, sh-format

9235 msgid "Failed to register submodule '$sm_path'"

9236 msgstr ""

9237

9097 -#: git-submodule.sh:468

9238 +#: git-submodule.sh:474

9239 #, sh-format

9240 msgid "Entering '$prefix$sm_path'"

9241 msgstr ""

9242

9102 -#: git-submodule.sh:482

9243 +#: git-submodule.sh:488

9244 #, sh-format

9245 msgid "Stopping at '$sm_path'; script returned non-zero status."

9246 msgstr ""

9247

9107 -#: git-submodule.sh:526

9248 +#: git-submodule.sh:532

9249 #, sh-format

9250 msgid "No url found for submodule path '$sm_path' in .gitmodules"

9251 msgstr ""

9252

9112 -#: git-submodule.sh:535

9253 +#: git-submodule.sh:541

9254 #, sh-format

9255 msgid "Failed to register url for submodule path '$sm_path'"

9256 msgstr ""

9257

9117 -#: git-submodule.sh:537

9258 +#: git-submodule.sh:543

9259 #, sh-format

9260 msgid "Submodule '$name' ($url) registered for path '$sm_path'"

9261 msgstr ""

9262

9122 -#: git-submodule.sh:545

9263 +#: git-submodule.sh:551

9264 #, sh-format

9265 msgid "Failed to register update mode for submodule path '$sm_path'"

9266 msgstr ""

9267

9127 -#: git-submodule.sh:649

9268 +#: git-submodule.sh:588

9269 +#, sh-format

9270 +msgid "Use '.' if you really want to deinitialize all submodules"

9271 +msgstr ""

9272 +

9273 +#: git-submodule.sh:603

9274 +#, sh-format

9275 +msgid "Submodule work tree '$sm_path' contains a .git directory"

9276 +msgstr ""

9277 +

9278 +#: git-submodule.sh:604

9279 +#, sh-format

9280 +msgid ""

9281 +"(use 'rm -rf' if you really want to remove it including all of its history)"

9282 +msgstr ""

9283 +

9284 +#: git-submodule.sh:610

9285 #, sh-format

9286 msgid ""

9130 -"Submodule path '$sm_path' not initialized\n"

9287 +"Submodule work tree '$sm_path' contains local modifications; use '-f' to "

9288 +"discard them"

9289 +msgstr ""

9290 +

9291 +#: git-submodule.sh:613

9292 +#, sh-format

9293 +msgid "Cleared directory '$sm_path'"

9294 +msgstr ""

9295 +

9296 +#: git-submodule.sh:614

9297 +#, sh-format

9298 +msgid "Could not remove submodule work tree '$sm_path'"

9299 +msgstr ""

9300 +

9301 +#: git-submodule.sh:617

9302 +#, sh-format

9303 +msgid "Could not create empty submodule directory '$sm_path'"

9304 +msgstr ""

9305 +

9306 +#: git-submodule.sh:626

9307 +#, sh-format

9308 +msgid "Submodule '$name' ($url) unregistered for path '$sm_path'"

9309 +msgstr ""

9310 +

9311 +#: git-submodule.sh:731

9312 +#, sh-format

9313 +msgid ""

9314 +"Submodule path '$prefix$sm_path' not initialized\n"

9315 "Maybe you want to use 'update --init'?"

9316 msgstr ""

9317

9134 -#: git-submodule.sh:662

9318 +#: git-submodule.sh:744

9319 #, sh-format

9136 -msgid "Unable to find current revision in submodule path '$sm_path'"

9320 +msgid "Unable to find current revision in submodule path '$prefix$sm_path'"

9321 msgstr ""

9322

9139 -#: git-submodule.sh:671 git-submodule.sh:695

9323 +#: git-submodule.sh:753

9324 #, sh-format

9325 msgid "Unable to fetch in submodule path '$sm_path'"

9326 msgstr ""

9327

9144 -#: git-submodule.sh:709

9328 +#: git-submodule.sh:777

9329 #, sh-format

9146 -msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"

9330 +msgid "Unable to fetch in submodule path '$prefix$sm_path'"

9331 msgstr ""

9332

9149 -#: git-submodule.sh:710

9333 +#: git-submodule.sh:791

9334 #, sh-format

9151 -msgid "Submodule path '$sm_path': rebased into '$sha1'"

9335 +msgid "Unable to rebase '$sha1' in submodule path '$prefix$sm_path'"

9336 msgstr ""

9337

9154 -#: git-submodule.sh:715

9338 +#: git-submodule.sh:792

9339 #, sh-format

9156 -msgid "Unable to merge '$sha1' in submodule path '$sm_path'"

9340 +msgid "Submodule path '$prefix$sm_path': rebased into '$sha1'"

9341 msgstr ""

9342

9159 -#: git-submodule.sh:716

9343 +#: git-submodule.sh:797

9344 #, sh-format

9161 -msgid "Submodule path '$sm_path': merged in '$sha1'"

9345 +msgid "Unable to merge '$sha1' in submodule path '$prefix$sm_path'"

9346 msgstr ""

9347

9164 -#: git-submodule.sh:721

9348 +#: git-submodule.sh:798

9349 #, sh-format

9166 -msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"

9350 +msgid "Submodule path '$prefix$sm_path': merged in '$sha1'"

9351 msgstr ""

9352

9169 -#: git-submodule.sh:722

9353 +#: git-submodule.sh:803

9354 #, sh-format

9171 -msgid "Submodule path '$sm_path': checked out '$sha1'"

9355 +msgid "Unable to checkout '$sha1' in submodule path '$prefix$sm_path'"

9356 msgstr ""

9357

9174 -#: git-submodule.sh:744 git-submodule.sh:1066

9358 +#: git-submodule.sh:804

9359 #, sh-format

9176 -msgid "Failed to recurse into submodule path '$sm_path'"

9360 +msgid "Submodule path '$prefix$sm_path': checked out '$sha1'"

9361 msgstr ""

9362

9179 -#: git-submodule.sh:852

9363 +#: git-submodule.sh:831

9364 +#, sh-format

9365 +msgid "Failed to recurse into submodule path '$prefix$sm_path'"

9366 +msgstr ""

9367 +

9368 +#: git-submodule.sh:939

9369 msgid "The --cached option cannot be used with the --files option"

9370 msgstr ""

9371

9372 #. unexpected type

9184 -#: git-submodule.sh:892

9373 +#: git-submodule.sh:979

9374 #, sh-format

9375 msgid "unexpected mode $mod_dst"

9376 msgstr ""

9377

9189 -#: git-submodule.sh:910

9378 +#: git-submodule.sh:997

9379 #, sh-format

9380 msgid " Warn: $name doesn't contain commit $sha1_src"

9381 msgstr ""

9382

9194 -#: git-submodule.sh:913

9383 +#: git-submodule.sh:1000

9384 #, sh-format

9385 msgid " Warn: $name doesn't contain commit $sha1_dst"

9386 msgstr ""

9387

9199 -#: git-submodule.sh:916

9388 +#: git-submodule.sh:1003

9389 #, sh-format

9390 msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"

9391 msgstr ""

9392

9204 -#: git-submodule.sh:941

9393 +#: git-submodule.sh:1028

9394 msgid "blob"

9395 msgstr ""

9396

9208 -#: git-submodule.sh:979

9397 +#: git-submodule.sh:1066

9398 msgid "Submodules changed but not updated:"

9399 msgstr ""

9400

9212 -#: git-submodule.sh:981

9401 +#: git-submodule.sh:1068

9402 msgid "Submodule changes to be committed:"

9403 msgstr ""

9404

9216 -#: git-submodule.sh:1129

9405 +#: git-submodule.sh:1153

9406 +#, sh-format

9407 +msgid "Failed to recurse into submodule path '$sm_path'"

9408 +msgstr ""

9409 +

9410 +#: git-submodule.sh:1216

9411 #, sh-format

9412 msgid "Synchronizing submodule url for '$prefix$sm_path'"

9413 msgstr ""

l10n: git.pot: v1.8.3 round 1 (54 new, 15 removed)