94328ceff0 · 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: 2018-12-02 10:55+0800\n"

11 +"POT-Creation-Date: 2019-02-09 20:54+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,59 +18,59 @@ msgstr ""

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

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

20

21 -#: advice.c:99

21 +#: advice.c:101

22 #, c-format

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

24 msgstr ""

25

26 -#: advice.c:152

26 +#: advice.c:154

27 msgid "Cherry-picking is not possible because you have unmerged files."

28 msgstr ""

29

30 -#: advice.c:154

30 +#: advice.c:156

31 msgid "Committing is not possible because you have unmerged files."

32 msgstr ""

33

34 -#: advice.c:156

34 +#: advice.c:158

35 msgid "Merging is not possible because you have unmerged files."

36 msgstr ""

37

38 -#: advice.c:158

38 +#: advice.c:160

39 msgid "Pulling is not possible because you have unmerged files."

40 msgstr ""

41

42 -#: advice.c:160

42 +#: advice.c:162

43 msgid "Reverting is not possible because you have unmerged files."

44 msgstr ""

45

46 -#: advice.c:162

46 +#: advice.c:164

47 #, c-format

48 msgid "It is not possible to %s because you have unmerged files."

49 msgstr ""

50

51 -#: advice.c:170

51 +#: advice.c:172

52 msgid ""

53 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"

54 "as appropriate to mark resolution and make a commit."

55 msgstr ""

56

57 -#: advice.c:178

57 +#: advice.c:180

58 msgid "Exiting because of an unresolved conflict."

59 msgstr ""

60

61 -#: advice.c:183 builtin/merge.c:1289

61 +#: advice.c:185 builtin/merge.c:1290

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

63 msgstr ""

64

65 -#: advice.c:185

65 +#: advice.c:187

66 msgid "Please, commit your changes before merging."

67 msgstr ""

68

69 -#: advice.c:186

69 +#: advice.c:188

70 msgid "Exiting because of unfinished merge."

71 msgstr ""

72

73 -#: advice.c:192

73 +#: advice.c:194

74 #, c-format

75 msgid ""

76 "Note: checking out '%s'.\n"

@@ -86,6 +86,14 @@ msgid ""

86 "\n"

87 msgstr ""

88

89 +#: alias.c:50

90 +msgid "cmdline ends with \\"

91 +msgstr ""

92 +

93 +#: alias.c:51

94 +msgid "unclosed quote"

95 +msgstr ""

96 +

97 #: apply.c:59

98 #, c-format

99 msgid "unrecognized whitespace option '%s'"

@@ -116,62 +124,62 @@ msgstr ""

124 msgid "--cached outside a repository"

125 msgstr ""

126

119 -#: apply.c:826

127 +#: apply.c:825

128 #, c-format

129 msgid "Cannot prepare timestamp regexp %s"

130 msgstr ""

131

124 -#: apply.c:835

132 +#: apply.c:834

133 #, c-format

134 msgid "regexec returned %d for input: %s"

135 msgstr ""

136

129 -#: apply.c:909

137 +#: apply.c:908

138 #, c-format

139 msgid "unable to find filename in patch at line %d"

140 msgstr ""

141

134 -#: apply.c:947

142 +#: apply.c:946

143 #, c-format

144 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"

145 msgstr ""

146

139 -#: apply.c:953

147 +#: apply.c:952

148 #, c-format

149 msgid "git apply: bad git-diff - inconsistent new filename on line %d"

150 msgstr ""

151

144 -#: apply.c:954

152 +#: apply.c:953

153 #, c-format

154 msgid "git apply: bad git-diff - inconsistent old filename on line %d"

155 msgstr ""

156

149 -#: apply.c:959

157 +#: apply.c:958

158 #, c-format

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

160 msgstr ""

161

154 -#: apply.c:988

162 +#: apply.c:987

163 #, c-format

164 msgid "invalid mode on line %d: %s"

165 msgstr ""

166

159 -#: apply.c:1307

167 +#: apply.c:1306

168 #, c-format

169 msgid "inconsistent header lines %d and %d"

170 msgstr ""

171

164 -#: apply.c:1479

172 +#: apply.c:1478

173 #, c-format

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

175 msgstr ""

176

169 -#: apply.c:1548

177 +#: apply.c:1547

178 #, c-format

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

180 msgstr ""

181

174 -#: apply.c:1568

182 +#: apply.c:1567

183 #, c-format

184 msgid ""

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

@@ -182,130 +190,130 @@ msgid_plural ""

190 msgstr[0] ""

191 msgstr[1] ""

192

185 -#: apply.c:1581

193 +#: apply.c:1580

194 #, c-format

195 msgid "git diff header lacks filename information (line %d)"

196 msgstr ""

197

190 -#: apply.c:1769

198 +#: apply.c:1768

199 msgid "new file depends on old contents"

200 msgstr ""

201

194 -#: apply.c:1771

202 +#: apply.c:1770

203 msgid "deleted file still has contents"

204 msgstr ""

205

198 -#: apply.c:1805

206 +#: apply.c:1804

207 #, c-format

208 msgid "corrupt patch at line %d"

209 msgstr ""

210

203 -#: apply.c:1842

211 +#: apply.c:1841

212 #, c-format

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

214 msgstr ""

215

208 -#: apply.c:1844

216 +#: apply.c:1843

217 #, c-format

218 msgid "deleted file %s still has contents"

219 msgstr ""

220

213 -#: apply.c:1847

221 +#: apply.c:1846

222 #, c-format

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

224 msgstr ""

225

218 -#: apply.c:1994

226 +#: apply.c:1993

227 #, c-format

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

229 msgstr ""

230

223 -#: apply.c:2031

231 +#: apply.c:2030

232 #, c-format

233 msgid "unrecognized binary patch at line %d"

234 msgstr ""

235

228 -#: apply.c:2193

236 +#: apply.c:2192

237 #, c-format

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

239 msgstr ""

240

233 -#: apply.c:2279

241 +#: apply.c:2278

242 #, c-format

243 msgid "unable to read symlink %s"

244 msgstr ""

245

238 -#: apply.c:2283

246 +#: apply.c:2282

247 #, c-format

248 msgid "unable to open or read %s"

249 msgstr ""

250

243 -#: apply.c:2942

251 +#: apply.c:2941

252 #, c-format

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

254 msgstr ""

255

248 -#: apply.c:3063

256 +#: apply.c:3062

257 #, c-format

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

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

260 msgstr[0] ""

261 msgstr[1] ""

262

255 -#: apply.c:3075

263 +#: apply.c:3074

264 #, c-format

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

266 msgstr ""

267

260 -#: apply.c:3081

268 +#: apply.c:3080

269 #, c-format

270 msgid ""

271 "while searching for:\n"

272 "%.*s"

273 msgstr ""

274

267 -#: apply.c:3103

275 +#: apply.c:3102

276 #, c-format

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

278 msgstr ""

279

272 -#: apply.c:3111

280 +#: apply.c:3110

281 #, c-format

282 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"

283 msgstr ""

284

277 -#: apply.c:3158

285 +#: apply.c:3157

286 #, c-format

287 msgid "cannot apply binary patch to '%s' without full index line"

288 msgstr ""

289

282 -#: apply.c:3168

290 +#: apply.c:3167

291 #, c-format

292 msgid ""

293 "the patch applies to '%s' (%s), which does not match the current contents."

294 msgstr ""

295

288 -#: apply.c:3176

296 +#: apply.c:3175

297 #, c-format

298 msgid "the patch applies to an empty '%s' but it is not empty"

299 msgstr ""

300

293 -#: apply.c:3194

301 +#: apply.c:3193

302 #, c-format

303 msgid "the necessary postimage %s for '%s' cannot be read"

304 msgstr ""

305

298 -#: apply.c:3207

306 +#: apply.c:3206

307 #, c-format

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

309 msgstr ""

310

303 -#: apply.c:3213

311 +#: apply.c:3212

312 #, c-format

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

314 msgstr ""

315

308 -#: apply.c:3234

316 +#: apply.c:3233

317 #, c-format

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

319 msgstr ""

@@ -383,7 +391,8 @@ msgstr ""

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

392 msgstr ""

393

386 -#: apply.c:3881 apply.c:3883

394 +#: apply.c:3881 apply.c:3883 read-cache.c:820 read-cache.c:846

395 +#: read-cache.c:1299

396 #, c-format

397 msgid "invalid path '%s'"

398 msgstr ""

@@ -438,7 +447,7 @@ msgstr ""

447 msgid "sha1 information is lacking or useless (%s)."

448 msgstr ""

449

441 -#: apply.c:4113 builtin/checkout.c:244 builtin/reset.c:142

450 +#: apply.c:4113 builtin/checkout.c:248 builtin/reset.c:143

451 #, c-format

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

453 msgstr ""

@@ -514,7 +523,7 @@ msgstr[1] ""

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

524 msgstr ""

525

517 -#: apply.c:4564 builtin/fetch.c:843 builtin/fetch.c:1122

526 +#: apply.c:4564 builtin/fetch.c:837 builtin/fetch.c:1118

527 #, c-format

528 msgid "cannot open %s"

529 msgstr ""

@@ -538,171 +547,171 @@ msgstr ""

547 msgid "unrecognized input"

548 msgstr ""

549

541 -#: apply.c:4719

550 +#: apply.c:4720

551 msgid "unable to read index file"

552 msgstr ""

553

545 -#: apply.c:4874

554 +#: apply.c:4875

555 #, c-format

556 msgid "can't open patch '%s': %s"

557 msgstr ""

558

550 -#: apply.c:4901

559 +#: apply.c:4902

560 #, c-format

561 msgid "squelched %d whitespace error"

562 msgid_plural "squelched %d whitespace errors"

563 msgstr[0] ""

564 msgstr[1] ""

565

557 -#: apply.c:4907 apply.c:4922

566 +#: apply.c:4908 apply.c:4923

567 #, c-format

568 msgid "%d line adds whitespace errors."

569 msgid_plural "%d lines add whitespace errors."

570 msgstr[0] ""

571 msgstr[1] ""

572

564 -#: apply.c:4915

573 +#: apply.c:4916

574 #, c-format

575 msgid "%d line applied after fixing whitespace errors."

576 msgid_plural "%d lines applied after fixing whitespace errors."

577 msgstr[0] ""

578 msgstr[1] ""

579

571 -#: apply.c:4931 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389

580 +#: apply.c:4932 builtin/add.c:539 builtin/mv.c:301 builtin/rm.c:390

581 msgid "Unable to write new index file"

582 msgstr ""

583

575 -#: apply.c:4958 apply.c:4961 builtin/am.c:2209 builtin/am.c:2212

576 -#: builtin/clone.c:121 builtin/fetch.c:118 builtin/merge.c:262

577 -#: builtin/pull.c:199 builtin/submodule--helper.c:406

578 -#: builtin/submodule--helper.c:1362 builtin/submodule--helper.c:1365

579 -#: builtin/submodule--helper.c:1846 builtin/submodule--helper.c:1849

580 -#: builtin/submodule--helper.c:2088 git-add--interactive.perl:197

584 +#: apply.c:4959 apply.c:4962 builtin/am.c:2203 builtin/am.c:2206

585 +#: builtin/clone.c:122 builtin/fetch.c:118 builtin/merge.c:263

586 +#: builtin/pull.c:200 builtin/submodule--helper.c:407

587 +#: builtin/submodule--helper.c:1366 builtin/submodule--helper.c:1369

588 +#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853

589 +#: builtin/submodule--helper.c:2092 git-add--interactive.perl:197

590 msgid "path"

591 msgstr ""

592

584 -#: apply.c:4959

593 +#: apply.c:4960

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

595 msgstr ""

596

588 -#: apply.c:4962

597 +#: apply.c:4963

598 msgid "apply changes matching the given path"

599 msgstr ""

600

592 -#: apply.c:4964 builtin/am.c:2218

601 +#: apply.c:4965 builtin/am.c:2212

602 msgid "num"

603 msgstr ""

604

596 -#: apply.c:4965

605 +#: apply.c:4966

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

607 msgstr ""

608

600 -#: apply.c:4968

609 +#: apply.c:4969

610 msgid "ignore additions made by the patch"

611 msgstr ""

612

604 -#: apply.c:4970

613 +#: apply.c:4971

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

615 msgstr ""

616

608 -#: apply.c:4974

617 +#: apply.c:4975

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

619 msgstr ""

620

612 -#: apply.c:4976

621 +#: apply.c:4977

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

623 msgstr ""

624

616 -#: apply.c:4978

625 +#: apply.c:4979

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

627 msgstr ""

628

620 -#: apply.c:4980

629 +#: apply.c:4981

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

631 msgstr ""

632

624 -#: apply.c:4982

633 +#: apply.c:4983

634 msgid "mark new files with `git add --intent-to-add`"

635 msgstr ""

636

628 -#: apply.c:4984

637 +#: apply.c:4985

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

639 msgstr ""

640

632 -#: apply.c:4986

641 +#: apply.c:4987

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

643 msgstr ""

644

636 -#: apply.c:4989

645 +#: apply.c:4990

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

647 msgstr ""

648

640 -#: apply.c:4991

649 +#: apply.c:4992

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

651 msgstr ""

652

644 -#: apply.c:4993

653 +#: apply.c:4994

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

655 msgstr ""

656

648 -#: apply.c:4996 builtin/checkout-index.c:170 builtin/ls-files.c:523

657 +#: apply.c:4997 builtin/checkout-index.c:173 builtin/ls-files.c:524

658 msgid "paths are separated with NUL character"

659 msgstr ""

660

652 -#: apply.c:4998

661 +#: apply.c:4999

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

663 msgstr ""

664

656 -#: apply.c:4999 builtin/am.c:2197 builtin/interpret-trailers.c:97

665 +#: apply.c:5000 builtin/am.c:2191 builtin/interpret-trailers.c:97

666 #: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101

658 -#: builtin/pack-objects.c:3312 builtin/rebase.c:857

667 +#: builtin/pack-objects.c:3314 builtin/rebase.c:1065

668 msgid "action"

669 msgstr ""

670

662 -#: apply.c:5000

671 +#: apply.c:5001

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

673 msgstr ""

674

666 -#: apply.c:5003 apply.c:5006

675 +#: apply.c:5004 apply.c:5007

676 msgid "ignore changes in whitespace when finding context"

677 msgstr ""

678

670 -#: apply.c:5009

679 +#: apply.c:5010

680 msgid "apply the patch in reverse"

681 msgstr ""

682

674 -#: apply.c:5011

683 +#: apply.c:5012

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

685 msgstr ""

686

678 -#: apply.c:5013

687 +#: apply.c:5014

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

689 msgstr ""

690

682 -#: apply.c:5015

691 +#: apply.c:5016

692 msgid "allow overlapping hunks"

693 msgstr ""

694

686 -#: apply.c:5016 builtin/add.c:290 builtin/check-ignore.c:21

687 -#: builtin/commit.c:1309 builtin/count-objects.c:98 builtin/fsck.c:698

688 -#: builtin/log.c:2023 builtin/mv.c:122 builtin/read-tree.c:127

689 -#: builtin/rebase--interactive.c:157

695 +#: apply.c:5017 builtin/add.c:291 builtin/check-ignore.c:22

696 +#: builtin/commit.c:1312 builtin/count-objects.c:98 builtin/fsck.c:724

697 +#: builtin/log.c:2037 builtin/mv.c:123 builtin/read-tree.c:128

698 +#: builtin/rebase--interactive.c:159

699 msgid "be verbose"

700 msgstr ""

701

693 -#: apply.c:5018

702 +#: apply.c:5019

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

704 msgstr ""

705

697 -#: apply.c:5021

706 +#: apply.c:5022

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

708 msgstr ""

709

701 -#: apply.c:5023 builtin/am.c:2206

710 +#: apply.c:5024 builtin/am.c:2200

711 msgid "root"

712 msgstr ""

713

705 -#: apply.c:5024

714 +#: apply.c:5025

715 msgid "prepend <root> to all filenames"

716 msgstr ""

717

@@ -723,99 +732,118 @@ msgstr ""

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

733 msgstr ""

734

726 -#: archive.c:370 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298

735 +#: archive.c:372 builtin/add.c:177 builtin/add.c:515 builtin/rm.c:299

736 #, c-format

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

738 msgstr ""

739

731 -#: archive.c:453

740 +#: archive.c:396

741 +#, c-format

742 +msgid "no such ref: %.*s"

743 +msgstr ""

744 +

745 +#: archive.c:401

746 +#, c-format

747 +msgid "not a valid object name: %s"

748 +msgstr ""

749 +

750 +#: archive.c:414

751 +#, c-format

752 +msgid "not a tree object: %s"

753 +msgstr ""

754 +

755 +#: archive.c:424

756 +msgid "current working directory is untracked"

757 +msgstr ""

758 +

759 +#: archive.c:455

760 msgid "fmt"

761 msgstr ""

762

735 -#: archive.c:453

763 +#: archive.c:455

764 msgid "archive format"

765 msgstr ""

766

739 -#: archive.c:454 builtin/log.c:1536

767 +#: archive.c:456 builtin/log.c:1549

768 msgid "prefix"

769 msgstr ""

770

743 -#: archive.c:455

771 +#: archive.c:457

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

773 msgstr ""

774

747 -#: archive.c:456 builtin/blame.c:820 builtin/blame.c:821 builtin/config.c:129

748 -#: builtin/fast-export.c:1013 builtin/fast-export.c:1015 builtin/grep.c:884

749 -#: builtin/hash-object.c:104 builtin/ls-files.c:559 builtin/ls-files.c:562

750 -#: builtin/notes.c:412 builtin/notes.c:575 builtin/read-tree.c:122

775 +#: archive.c:458 builtin/blame.c:820 builtin/blame.c:821 builtin/config.c:129

776 +#: builtin/fast-export.c:1091 builtin/fast-export.c:1093 builtin/grep.c:895

777 +#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563

778 +#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123

779 #: parse-options.h:162

780 msgid "file"

781 msgstr ""

782

755 -#: archive.c:457 builtin/archive.c:89

783 +#: archive.c:459 builtin/archive.c:90

784 msgid "write the archive to this file"

785 msgstr ""

786

759 -#: archive.c:459

787 +#: archive.c:461

788 msgid "read .gitattributes in working directory"

789 msgstr ""

790

763 -#: archive.c:460

791 +#: archive.c:462

792 msgid "report archived files on stderr"

793 msgstr ""

794

767 -#: archive.c:461

795 +#: archive.c:463

796 msgid "store only"

797 msgstr ""

798

771 -#: archive.c:462

799 +#: archive.c:464

800 msgid "compress faster"

801 msgstr ""

802

775 -#: archive.c:470

803 +#: archive.c:472

804 msgid "compress better"

805 msgstr ""

806

779 -#: archive.c:473

807 +#: archive.c:475

808 msgid "list supported archive formats"

809 msgstr ""

810

783 -#: archive.c:475 builtin/archive.c:90 builtin/clone.c:111 builtin/clone.c:114

784 -#: builtin/submodule--helper.c:1374 builtin/submodule--helper.c:1855

811 +#: archive.c:477 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115

812 +#: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1859

813 msgid "repo"

814 msgstr ""

815

788 -#: archive.c:476 builtin/archive.c:91

816 +#: archive.c:478 builtin/archive.c:92

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

818 msgstr ""

819

792 -#: archive.c:477 builtin/archive.c:92 builtin/difftool.c:714

793 -#: builtin/notes.c:496

820 +#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:715

821 +#: builtin/notes.c:498

822 msgid "command"

823 msgstr ""

824

797 -#: archive.c:478 builtin/archive.c:93

825 +#: archive.c:480 builtin/archive.c:94

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

827 msgstr ""

828

801 -#: archive.c:485

829 +#: archive.c:487

830 msgid "Unexpected option --remote"

831 msgstr ""

832

805 -#: archive.c:487

833 +#: archive.c:489

834 msgid "Option --exec can only be used together with --remote"

835 msgstr ""

836

809 -#: archive.c:489

837 +#: archive.c:491

838 msgid "Unexpected option --output"

839 msgstr ""

840

813 -#: archive.c:511

841 +#: archive.c:513

842 #, c-format

843 msgid "Unknown archive format '%s'"

844 msgstr ""

845

818 -#: archive.c:518

846 +#: archive.c:520

847 #, c-format

848 msgid "Argument not supported for format '%s': -%d"

849 msgstr ""

@@ -859,7 +887,7 @@ msgstr ""

887 msgid "path too long (%d chars, SHA1: %s): %s"

888 msgstr ""

889

862 -#: archive-zip.c:474 builtin/pack-objects.c:224 builtin/pack-objects.c:227

890 +#: archive-zip.c:474 builtin/pack-objects.c:225 builtin/pack-objects.c:228

891 #, c-format

892 msgid "deflate error (%d)"

893 msgstr ""

@@ -869,12 +897,17 @@ msgstr ""

897 msgid "timestamp too large for this system: %<PRIuMAX>"

898 msgstr ""

899

872 -#: attr.c:212

900 +#: attr.c:211

901 #, c-format

902 msgid "%.*s is not a valid attribute name"

903 msgstr ""

904

877 -#: attr.c:409

905 +#: attr.c:368

906 +#, c-format

907 +msgid "%s not allowed: %s:%d"

908 +msgstr ""

909 +

910 +#: attr.c:408

911 msgid ""

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

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

@@ -885,38 +918,38 @@ msgstr ""

918 msgid "Badly quoted content in file '%s': %s"

919 msgstr ""

920

888 -#: bisect.c:676

921 +#: bisect.c:678

922 #, c-format

923 msgid "We cannot bisect more!\n"

924 msgstr ""

925

893 -#: bisect.c:730

926 +#: bisect.c:733

927 #, c-format

928 msgid "Not a valid commit name %s"

929 msgstr ""

930

898 -#: bisect.c:754

931 +#: bisect.c:758

932 #, c-format

933 msgid ""

934 "The merge base %s is bad.\n"

935 "This means the bug has been fixed between %s and [%s].\n"

936 msgstr ""

937

905 -#: bisect.c:759

938 +#: bisect.c:763

939 #, c-format

940 msgid ""

941 "The merge base %s is new.\n"

942 "The property has changed between %s and [%s].\n"

943 msgstr ""

944

912 -#: bisect.c:764

945 +#: bisect.c:768

946 #, c-format

947 msgid ""

948 "The merge base %s is %s.\n"

949 "This means the first '%s' commit is between %s and [%s].\n"

950 msgstr ""

951

919 -#: bisect.c:772

952 +#: bisect.c:776

953 #, c-format

954 msgid ""

955 "Some %s revs are not ancestors of the %s rev.\n"

@@ -924,7 +957,7 @@ msgid ""

957 "Maybe you mistook %s and %s revs?\n"

958 msgstr ""

959

927 -#: bisect.c:785

960 +#: bisect.c:789

961 #, c-format

962 msgid ""

963 "the merge base between %s and [%s] must be skipped.\n"

@@ -932,43 +965,43 @@ msgid ""

965 "We continue anyway."

966 msgstr ""

967

935 -#: bisect.c:818

968 +#: bisect.c:822

969 #, c-format

970 msgid "Bisecting: a merge base must be tested\n"

971 msgstr ""

972

940 -#: bisect.c:858

973 +#: bisect.c:865

974 #, c-format

975 msgid "a %s revision is needed"

976 msgstr ""

977

945 -#: bisect.c:877 builtin/notes.c:177 builtin/tag.c:237

978 +#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:237

979 #, c-format

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

981 msgstr ""

982

950 -#: bisect.c:928 builtin/merge.c:138

983 +#: bisect.c:937 builtin/merge.c:139

984 #, c-format

985 msgid "could not read file '%s'"

986 msgstr ""

987

955 -#: bisect.c:958

988 +#: bisect.c:967

989 msgid "reading bisect refs failed"

990 msgstr ""

991

959 -#: bisect.c:977

992 +#: bisect.c:986

993 #, c-format

994 msgid "%s was both %s and %s\n"

995 msgstr ""

996

964 -#: bisect.c:985

997 +#: bisect.c:994

998 #, c-format

999 msgid ""

1000 "No testable commit found.\n"

1001 "Maybe you started with bad path parameters?\n"

1002 msgstr ""

1003

971 -#: bisect.c:1004

1004 +#: bisect.c:1013

1005 #, c-format

1006 msgid "(roughly %d step)"

1007 msgid_plural "(roughly %d steps)"

@@ -978,44 +1011,44 @@ msgstr[1] ""

1011 #. TRANSLATORS: the last %s will be replaced with "(roughly %d

1012 #. steps)" translation.

1013 #.

981 -#: bisect.c:1010

1014 +#: bisect.c:1019

1015 #, c-format

1016 msgid "Bisecting: %d revision left to test after this %s\n"

1017 msgid_plural "Bisecting: %d revisions left to test after this %s\n"

1018 msgstr[0] ""

1019 msgstr[1] ""

1020

988 -#: blame.c:1787

1021 +#: blame.c:1792

1022 msgid "--contents and --reverse do not blend well."

1023 msgstr ""

1024

992 -#: blame.c:1801

1025 +#: blame.c:1806

1026 msgid "cannot use --contents with final commit object name"

1027 msgstr ""

1028

996 -#: blame.c:1822

1029 +#: blame.c:1827

1030 msgid "--reverse and --first-parent together require specified latest commit"

1031 msgstr ""

1032

1000 -#: blame.c:1831 bundle.c:162 ref-filter.c:2046 sequencer.c:1963

1001 -#: sequencer.c:4002 builtin/commit.c:1001 builtin/log.c:377 builtin/log.c:932

1002 -#: builtin/log.c:1407 builtin/log.c:1783 builtin/log.c:2072 builtin/merge.c:406

1033 +#: blame.c:1836 bundle.c:164 ref-filter.c:2071 remote.c:1948 sequencer.c:1993

1034 +#: sequencer.c:4064 builtin/commit.c:1004 builtin/log.c:378 builtin/log.c:936

1035 +#: builtin/log.c:1420 builtin/log.c:1796 builtin/log.c:2086 builtin/merge.c:407

1036 #: builtin/pack-objects.c:3137 builtin/pack-objects.c:3152

1037 #: builtin/shortlog.c:192

1038 msgid "revision walk setup failed"

1039 msgstr ""

1040

1008 -#: blame.c:1849

1041 +#: blame.c:1854

1042 msgid ""

1043 "--reverse --first-parent together require range along first-parent chain"

1044 msgstr ""

1045

1013 -#: blame.c:1860

1046 +#: blame.c:1865

1047 #, c-format

1048 msgid "no such path %s in %s"

1049 msgstr ""

1050

1018 -#: blame.c:1871

1051 +#: blame.c:1876

1052 #, c-format

1053 msgid "cannot read blob %s for path %s"

1054 msgstr ""

@@ -1119,27 +1152,27 @@ msgid ""

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

1153 msgstr ""

1154

1122 -#: branch.c:279

1155 +#: branch.c:280

1156 #, c-format

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

1158 msgstr ""

1159

1127 -#: branch.c:299

1160 +#: branch.c:300

1161 #, c-format

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

1163 msgstr ""

1164

1132 -#: branch.c:304

1165 +#: branch.c:305

1166 #, c-format

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

1168 msgstr ""

1169

1137 -#: branch.c:358

1170 +#: branch.c:359

1171 #, c-format

1172 msgid "'%s' is already checked out at '%s'"

1173 msgstr ""

1174

1142 -#: branch.c:381

1175 +#: branch.c:382

1176 #, c-format

1177 msgid "HEAD of working tree %s is not updated"

1178 msgstr ""

@@ -1154,70 +1187,70 @@ msgstr ""

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

1188 msgstr ""

1189

1157 -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2182 sequencer.c:2722

1158 -#: builtin/commit.c:774

1190 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2215 sequencer.c:2763

1191 +#: builtin/commit.c:776

1192 #, c-format

1193 msgid "could not open '%s'"

1194 msgstr ""

1195

1163 -#: bundle.c:141

1196 +#: bundle.c:143

1197 msgid "Repository lacks these prerequisite commits:"

1198 msgstr ""

1199

1167 -#: bundle.c:192

1200 +#: bundle.c:194

1201 #, c-format

1202 msgid "The bundle contains this ref:"

1203 msgid_plural "The bundle contains these %d refs:"

1204 msgstr[0] ""

1205 msgstr[1] ""

1206

1174 -#: bundle.c:199

1207 +#: bundle.c:201

1208 msgid "The bundle records a complete history."

1209 msgstr ""

1210

1178 -#: bundle.c:201

1211 +#: bundle.c:203

1212 #, c-format

1213 msgid "The bundle requires this ref:"

1214 msgid_plural "The bundle requires these %d refs:"

1215 msgstr[0] ""

1216 msgstr[1] ""

1217

1185 -#: bundle.c:267

1218 +#: bundle.c:269

1219 msgid "unable to dup bundle descriptor"

1220 msgstr ""

1221

1189 -#: bundle.c:274

1222 +#: bundle.c:276

1223 msgid "Could not spawn pack-objects"

1224 msgstr ""

1225

1193 -#: bundle.c:285

1226 +#: bundle.c:287

1227 msgid "pack-objects died"

1228 msgstr ""

1229

1197 -#: bundle.c:327

1230 +#: bundle.c:329

1231 msgid "rev-list died"

1232 msgstr ""

1233

1201 -#: bundle.c:376

1234 +#: bundle.c:378

1235 #, c-format

1236 msgid "ref '%s' is excluded by the rev-list options"

1237 msgstr ""

1238

1206 -#: bundle.c:456 builtin/log.c:192 builtin/log.c:1688 builtin/shortlog.c:304

1239 +#: bundle.c:457 builtin/log.c:193 builtin/log.c:1701 builtin/shortlog.c:306

1240 #, c-format

1241 msgid "unrecognized argument: %s"

1242 msgstr ""

1243

1211 -#: bundle.c:464

1244 +#: bundle.c:465

1245 msgid "Refusing to create empty bundle."

1246 msgstr ""

1247

1215 -#: bundle.c:474

1248 +#: bundle.c:475

1249 #, c-format

1250 msgid "cannot create '%s'"

1251 msgstr ""

1252

1220 -#: bundle.c:498

1253 +#: bundle.c:500

1254 msgid "index-pack died"

1255 msgstr ""

1256

@@ -1226,8 +1259,8 @@ msgstr ""

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

1260 msgstr ""

1261

1229 -#: commit.c:50 sequencer.c:2528 builtin/am.c:370 builtin/am.c:414

1230 -#: builtin/am.c:1390 builtin/am.c:2025 builtin/replace.c:376

1262 +#: commit.c:50 sequencer.c:2567 builtin/am.c:355 builtin/am.c:399

1263 +#: builtin/am.c:1375 builtin/am.c:2019 builtin/replace.c:376

1264 #: builtin/replace.c:448

1265 #, c-format

1266 msgid "could not parse %s"

@@ -1250,118 +1283,159 @@ msgid ""

1283 "\"git config advice.graftFileDeprecated false\""

1284 msgstr ""

1285

1253 -#: commit.c:1115

1286 +#: commit.c:1122

1287 #, c-format

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

1289 msgstr ""

1290

1258 -#: commit.c:1118

1291 +#: commit.c:1125

1292 #, c-format

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

1294 msgstr ""

1295

1263 -#: commit.c:1121

1296 +#: commit.c:1128

1297 #, c-format

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

1299 msgstr ""

1300

1268 -#: commit.c:1124

1301 +#: commit.c:1131

1302 #, c-format

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

1304 msgstr ""

1305

1273 -#: commit.c:1378

1306 +#: commit.c:1385

1307 msgid ""

1308 "Warning: commit message did not conform to UTF-8.\n"

1309 "You may want to amend it after fixing the message, or set the config\n"

1310 "variable i18n.commitencoding to the encoding your project uses.\n"

1311 msgstr ""

1312

1280 -#: commit-graph.c:108

1313 +#: commit-graph.c:101

1314 #, c-format

1315 msgid "graph file %s is too small"

1316 msgstr ""

1317

1285 -#: commit-graph.c:115

1318 +#: commit-graph.c:136

1319 #, c-format

1320 msgid "graph signature %X does not match signature %X"

1321 msgstr ""

1322

1290 -#: commit-graph.c:122

1323 +#: commit-graph.c:143

1324 #, c-format

1325 msgid "graph version %X does not match version %X"

1326 msgstr ""

1327

1295 -#: commit-graph.c:129

1328 +#: commit-graph.c:150

1329 #, c-format

1330 msgid "hash version %X does not match version %X"

1331 msgstr ""

1332

1300 -#: commit-graph.c:153

1333 +#: commit-graph.c:173

1334 +msgid "chunk lookup table entry missing; graph file may be incomplete"

1335 +msgstr ""

1336 +

1337 +#: commit-graph.c:184

1338 #, c-format

1339 msgid "improper chunk offset %08x%08x"

1340 msgstr ""

1341

1305 -#: commit-graph.c:189

1342 +#: commit-graph.c:221

1343 #, c-format

1344 msgid "chunk id %08x appears multiple times"

1345 msgstr ""

1346

1310 -#: commit-graph.c:308

1347 +#: commit-graph.c:334

1348 #, c-format

1349 msgid "could not find commit %s"

1350 msgstr ""

1351

1315 -#: commit-graph.c:617 builtin/pack-objects.c:2652

1352 +#: commit-graph.c:671 builtin/pack-objects.c:2646

1353 #, c-format

1354 msgid "unable to get type of object %s"

1355 msgstr ""

1356

1320 -#: commit-graph.c:651

1321 -msgid "Annotating commits in commit graph"

1357 +#: commit-graph.c:704

1358 +msgid "Loading known commits in commit graph"

1359 msgstr ""

1360

1324 -#: commit-graph.c:691

1325 -msgid "Computing commit graph generation numbers"

1361 +#: commit-graph.c:720

1362 +msgid "Expanding reachable commits in commit graph"

1363 +msgstr ""

1364 +

1365 +#: commit-graph.c:732

1366 +msgid "Clearing commit marks in commit graph"

1367 msgstr ""

1368

1328 -#: commit-graph.c:803 commit-graph.c:826 commit-graph.c:852

1329 -msgid "Finding commits for commit graph"

1369 +#: commit-graph.c:752

1370 +msgid "Computing commit graph generation numbers"

1371 msgstr ""

1372

1332 -#: commit-graph.c:812

1373 +#: commit-graph.c:869

1374 +#, c-format

1375 +msgid "Finding commits for commit graph in %d pack"

1376 +msgid_plural "Finding commits for commit graph in %d packs"

1377 +msgstr[0] ""

1378 +msgstr[1] ""

1379 +

1380 +#: commit-graph.c:882

1381 #, c-format

1382 msgid "error adding pack %s"

1383 msgstr ""

1384

1337 -#: commit-graph.c:814

1385 +#: commit-graph.c:884

1386 #, c-format

1387 msgid "error opening index for %s"

1388 msgstr ""

1389

1342 -#: commit-graph.c:868

1390 +#: commit-graph.c:898

1391 +#, c-format

1392 +msgid "Finding commits for commit graph from %d ref"

1393 +msgid_plural "Finding commits for commit graph from %d refs"

1394 +msgstr[0] ""

1395 +msgstr[1] ""

1396 +

1397 +#: commit-graph.c:930

1398 +msgid "Finding commits for commit graph among packed objects"

1399 +msgstr ""

1400 +

1401 +#: commit-graph.c:943

1402 +msgid "Counting distinct commits in commit graph"

1403 +msgstr ""

1404 +

1405 +#: commit-graph.c:956

1406 #, c-format

1407 msgid "the commit graph format cannot write %d commits"

1408 msgstr ""

1409

1347 -#: commit-graph.c:895

1410 +#: commit-graph.c:965

1411 +msgid "Finding extra edges in commit graph"

1412 +msgstr ""

1413 +

1414 +#: commit-graph.c:989

1415 msgid "too many commits to write graph"

1416 msgstr ""

1417

1351 -#: commit-graph.c:902 midx.c:769

1418 +#: commit-graph.c:996 midx.c:769

1419 #, c-format

1420 msgid "unable to create leading directories of %s"

1421 msgstr ""

1422

1356 -#: commit-graph.c:1002

1423 +#: commit-graph.c:1036

1424 +#, c-format

1425 +msgid "Writing out commit graph in %d pass"

1426 +msgid_plural "Writing out commit graph in %d passes"

1427 +msgstr[0] ""

1428 +msgstr[1] ""

1429 +

1430 +#: commit-graph.c:1109

1431 msgid "the commit-graph file has incorrect checksum and is likely corrupt"

1432 msgstr ""

1433

1360 -#: commit-graph.c:1046

1434 +#: commit-graph.c:1153

1435 msgid "Verifying commits in commit graph"

1436 msgstr ""

1437

1364 -#: compat/obstack.c:405 compat/obstack.c:407

1438 +#: compat/obstack.c:406 compat/obstack.c:408

1439 msgid "memory exhausted"

1440 msgstr ""

1441

@@ -1398,7 +1472,7 @@ msgstr ""

1472 msgid "key does not contain variable name: %s"

1473 msgstr ""

1474

1401 -#: config.c:378 sequencer.c:2296

1475 +#: config.c:378 sequencer.c:2330

1476 #, c-format

1477 msgid "invalid key: %s"

1478 msgstr ""

@@ -1534,7 +1608,7 @@ msgstr ""

1608 msgid "must be one of nothing, matching, simple, upstream or current"

1609 msgstr ""

1610

1537 -#: config.c:1481 builtin/pack-objects.c:3391

1611 +#: config.c:1481 builtin/pack-objects.c:3394

1612 #, c-format

1613 msgid "bad pack compression level %d"

1614 msgstr ""

@@ -1607,62 +1681,62 @@ msgstr ""

1681 msgid "failed to write new configuration file %s"

1682 msgstr ""

1683

1610 -#: config.c:2717 config.c:3041

1684 +#: config.c:2716 config.c:3040

1685 #, c-format

1686 msgid "could not lock config file %s"

1687 msgstr ""

1688

1615 -#: config.c:2728

1689 +#: config.c:2727

1690 #, c-format

1691 msgid "opening %s"

1692 msgstr ""

1693

1620 -#: config.c:2763 builtin/config.c:327

1694 +#: config.c:2762 builtin/config.c:328

1695 #, c-format

1696 msgid "invalid pattern: %s"

1697 msgstr ""

1698

1625 -#: config.c:2788

1699 +#: config.c:2787

1700 #, c-format

1701 msgid "invalid config file %s"

1702 msgstr ""

1703

1630 -#: config.c:2801 config.c:3054

1704 +#: config.c:2800 config.c:3053

1705 #, c-format

1706 msgid "fstat on %s failed"

1707 msgstr ""

1708

1635 -#: config.c:2812

1709 +#: config.c:2811

1710 #, c-format

1711 msgid "unable to mmap '%s'"

1712 msgstr ""

1713

1640 -#: config.c:2821 config.c:3059

1714 +#: config.c:2820 config.c:3058

1715 #, c-format

1716 msgid "chmod on %s failed"

1717 msgstr ""

1718

1645 -#: config.c:2906 config.c:3156

1719 +#: config.c:2905 config.c:3155

1720 #, c-format

1721 msgid "could not write config file %s"

1722 msgstr ""

1723

1650 -#: config.c:2940

1724 +#: config.c:2939

1725 #, c-format

1726 msgid "could not set '%s' to '%s'"

1727 msgstr ""

1728

1655 -#: config.c:2942 builtin/remote.c:782

1729 +#: config.c:2941 builtin/remote.c:782

1730 #, c-format

1731 msgid "could not unset '%s'"

1732 msgstr ""

1733

1660 -#: config.c:3032

1734 +#: config.c:3031

1735 #, c-format

1736 msgid "invalid section name: %s"

1737 msgstr ""

1738

1665 -#: config.c:3199

1739 +#: config.c:3198

1740 #, c-format

1741 msgid "missing value for '%s'"

1742 msgstr ""

@@ -1711,57 +1785,52 @@ msgstr ""

1785 msgid "repository on the other end cannot be shallow"

1786 msgstr ""

1787

1714 -#: connect.c:310 fetch-pack.c:182 builtin/archive.c:63

1715 -#, c-format

1716 -msgid "remote error: %s"

1717 -msgstr ""

1718 -

1719 -#: connect.c:316

1788 +#: connect.c:313

1789 msgid "invalid packet"

1790 msgstr ""

1791

1723 -#: connect.c:336

1792 +#: connect.c:333

1793 #, c-format

1794 msgid "protocol error: unexpected '%s'"

1795 msgstr ""

1796

1728 -#: connect.c:444

1797 +#: connect.c:441

1798 #, c-format

1799 msgid "invalid ls-refs response: %s"

1800 msgstr ""

1801

1733 -#: connect.c:448

1802 +#: connect.c:445

1803 msgid "expected flush after ref listing"

1804 msgstr ""

1805

1737 -#: connect.c:547

1806 +#: connect.c:544

1807 #, c-format

1808 msgid "protocol '%s' is not supported"

1809 msgstr ""

1810

1742 -#: connect.c:598

1811 +#: connect.c:595

1812 msgid "unable to set SO_KEEPALIVE on socket"

1813 msgstr ""

1814

1746 -#: connect.c:638 connect.c:701

1815 +#: connect.c:635 connect.c:698

1816 #, c-format

1817 msgid "Looking up %s ... "

1818 msgstr ""

1819

1751 -#: connect.c:642

1820 +#: connect.c:639

1821 #, c-format

1822 msgid "unable to look up %s (port %s) (%s)"

1823 msgstr ""

1824

1825 #. TRANSLATORS: this is the end of "Looking up %s ... "

1757 -#: connect.c:646 connect.c:717

1826 +#: connect.c:643 connect.c:714

1827 #, c-format

1828 msgid ""

1829 "done.\n"

1830 "Connecting to %s (port %s) ... "

1831 msgstr ""

1832

1764 -#: connect.c:668 connect.c:745

1833 +#: connect.c:665 connect.c:742

1834 #, c-format

1835 msgid ""

1836 "unable to connect to %s:\n"

@@ -1769,61 +1838,61 @@ msgid ""

1838 msgstr ""

1839

1840 #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "

1772 -#: connect.c:674 connect.c:751

1841 +#: connect.c:671 connect.c:748

1842 msgid "done."

1843 msgstr ""

1844

1776 -#: connect.c:705

1845 +#: connect.c:702

1846 #, c-format

1847 msgid "unable to look up %s (%s)"

1848 msgstr ""

1849

1781 -#: connect.c:711

1850 +#: connect.c:708

1851 #, c-format

1852 msgid "unknown port %s"

1853 msgstr ""

1854

1786 -#: connect.c:848 connect.c:1174

1855 +#: connect.c:845 connect.c:1171

1856 #, c-format

1857 msgid "strange hostname '%s' blocked"

1858 msgstr ""

1859

1791 -#: connect.c:850

1860 +#: connect.c:847

1861 #, c-format

1862 msgid "strange port '%s' blocked"

1863 msgstr ""

1864

1796 -#: connect.c:860

1865 +#: connect.c:857

1866 #, c-format

1867 msgid "cannot start proxy %s"

1868 msgstr ""

1869

1801 -#: connect.c:927

1870 +#: connect.c:924

1871 msgid "no path specified; see 'git help pull' for valid url syntax"

1872 msgstr ""

1873

1805 -#: connect.c:1122

1874 +#: connect.c:1119

1875 msgid "ssh variant 'simple' does not support -4"

1876 msgstr ""

1877

1809 -#: connect.c:1134

1878 +#: connect.c:1131

1879 msgid "ssh variant 'simple' does not support -6"

1880 msgstr ""

1881

1813 -#: connect.c:1151

1882 +#: connect.c:1148

1883 msgid "ssh variant 'simple' does not support setting port"

1884 msgstr ""

1885

1817 -#: connect.c:1262

1886 +#: connect.c:1259

1887 #, c-format

1888 msgid "strange pathname '%s' blocked"

1889 msgstr ""

1890

1822 -#: connect.c:1307

1891 +#: connect.c:1304

1892 msgid "unable to fork"

1893 msgstr ""

1894

1826 -#: connected.c:68 builtin/fsck.c:202 builtin/prune.c:147

1895 +#: connected.c:68 builtin/fsck.c:221 builtin/prune.c:146

1896 msgid "Checking connectivity"

1897 msgstr ""

1898

@@ -1839,90 +1908,90 @@ msgstr ""

1908 msgid "failed to close rev-list's stdin"

1909 msgstr ""

1910

1842 -#: convert.c:194

1911 +#: convert.c:193

1912 #, c-format

1913 msgid "illegal crlf_action %d"

1914 msgstr ""

1915

1847 -#: convert.c:207

1916 +#: convert.c:206

1917 #, c-format

1918 msgid "CRLF would be replaced by LF in %s"

1919 msgstr ""

1920

1852 -#: convert.c:209

1921 +#: convert.c:208

1922 #, c-format

1923 msgid ""

1924 "CRLF will be replaced by LF in %s.\n"

1925 "The file will have its original line endings in your working directory"

1926 msgstr ""

1927

1859 -#: convert.c:217

1928 +#: convert.c:216

1929 #, c-format

1930 msgid "LF would be replaced by CRLF in %s"

1931 msgstr ""

1932

1864 -#: convert.c:219

1933 +#: convert.c:218

1934 #, c-format

1935 msgid ""

1936 "LF will be replaced by CRLF in %s.\n"

1937 "The file will have its original line endings in your working directory"

1938 msgstr ""

1939

1871 -#: convert.c:280

1940 +#: convert.c:279

1941 #, c-format

1942 msgid "BOM is prohibited in '%s' if encoded as %s"

1943 msgstr ""

1944

1876 -#: convert.c:287

1945 +#: convert.c:286

1946 #, c-format

1947 msgid ""

1948 "The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"

1949 "tree-encoding."

1950 msgstr ""

1951

1883 -#: convert.c:305

1952 +#: convert.c:304

1953 #, c-format

1954 msgid "BOM is required in '%s' if encoded as %s"

1955 msgstr ""

1956

1888 -#: convert.c:307

1957 +#: convert.c:306

1958 #, c-format

1959 msgid ""

1960 "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"

1961 "%sLE (depending on the byte order) as working-tree-encoding."

1962 msgstr ""

1963

1895 -#: convert.c:425 convert.c:496

1964 +#: convert.c:424 convert.c:495

1965 #, c-format

1966 msgid "failed to encode '%s' from %s to %s"

1967 msgstr ""

1968

1900 -#: convert.c:468

1969 +#: convert.c:467

1970 #, c-format

1971 msgid "encoding '%s' from %s to %s and back is not the same"

1972 msgstr ""

1973

1905 -#: convert.c:674

1974 +#: convert.c:673

1975 #, c-format

1976 msgid "cannot fork to run external filter '%s'"

1977 msgstr ""

1978

1910 -#: convert.c:694

1979 +#: convert.c:693

1980 #, c-format

1981 msgid "cannot feed the input to external filter '%s'"

1982 msgstr ""

1983

1915 -#: convert.c:701

1984 +#: convert.c:700

1985 #, c-format

1986 msgid "external filter '%s' failed %d"

1987 msgstr ""

1988

1920 -#: convert.c:736 convert.c:739

1989 +#: convert.c:735 convert.c:738

1990 #, c-format

1991 msgid "read from external filter '%s' failed"

1992 msgstr ""

1993

1925 -#: convert.c:742 convert.c:796

1994 +#: convert.c:741 convert.c:796

1995 #, c-format

1996 msgid "external filter '%s' failed"

1997 msgstr ""

@@ -1956,53 +2025,53 @@ msgstr ""

2025 msgid "%s: smudge filter %s failed"

2026 msgstr ""

2027

1959 -#: date.c:116

2028 +#: date.c:137

2029 msgid "in the future"

2030 msgstr ""

2031

1963 -#: date.c:122

2032 +#: date.c:143

2033 #, c-format

2034 msgid "%<PRIuMAX> second ago"

2035 msgid_plural "%<PRIuMAX> seconds ago"

2036 msgstr[0] ""

2037 msgstr[1] ""

2038

1970 -#: date.c:129

2039 +#: date.c:150

2040 #, c-format

2041 msgid "%<PRIuMAX> minute ago"

2042 msgid_plural "%<PRIuMAX> minutes ago"

2043 msgstr[0] ""

2044 msgstr[1] ""

2045

1977 -#: date.c:136

2046 +#: date.c:157

2047 #, c-format

2048 msgid "%<PRIuMAX> hour ago"

2049 msgid_plural "%<PRIuMAX> hours ago"

2050 msgstr[0] ""

2051 msgstr[1] ""

2052

1984 -#: date.c:143

2053 +#: date.c:164

2054 #, c-format

2055 msgid "%<PRIuMAX> day ago"

2056 msgid_plural "%<PRIuMAX> days ago"

2057 msgstr[0] ""

2058 msgstr[1] ""

2059

1991 -#: date.c:149

2060 +#: date.c:170

2061 #, c-format

2062 msgid "%<PRIuMAX> week ago"

2063 msgid_plural "%<PRIuMAX> weeks ago"

2064 msgstr[0] ""

2065 msgstr[1] ""

2066

1998 -#: date.c:156

2067 +#: date.c:177

2068 #, c-format

2069 msgid "%<PRIuMAX> month ago"

2070 msgid_plural "%<PRIuMAX> months ago"

2071 msgstr[0] ""

2072 msgstr[1] ""

2073

2005 -#: date.c:167

2074 +#: date.c:188

2075 #, c-format

2076 msgid "%<PRIuMAX> year"

2077 msgid_plural "%<PRIuMAX> years"

@@ -2010,40 +2079,40 @@ msgstr[0] ""

2079 msgstr[1] ""

2080

2081 #. TRANSLATORS: "%s" is "<n> years"

2013 -#: date.c:170

2082 +#: date.c:191

2083 #, c-format

2084 msgid "%s, %<PRIuMAX> month ago"

2085 msgid_plural "%s, %<PRIuMAX> months ago"

2086 msgstr[0] ""

2087 msgstr[1] ""

2088

2020 -#: date.c:175 date.c:180

2089 +#: date.c:196 date.c:201

2090 #, c-format

2091 msgid "%<PRIuMAX> year ago"

2092 msgid_plural "%<PRIuMAX> years ago"

2093 msgstr[0] ""

2094 msgstr[1] ""

2095

2027 -#: delta-islands.c:268

2096 +#: delta-islands.c:272

2097 msgid "Propagating island marks"

2098 msgstr ""

2099

2031 -#: delta-islands.c:286

2100 +#: delta-islands.c:290

2101 #, c-format

2102 msgid "bad tree object %s"

2103 msgstr ""

2104

2036 -#: delta-islands.c:330

2105 +#: delta-islands.c:334

2106 #, c-format

2107 msgid "failed to load island regex for '%s': %s"

2108 msgstr ""

2109

2041 -#: delta-islands.c:386

2110 +#: delta-islands.c:390

2111 #, c-format

2112 msgid "island regex from config has too many capture groups (max=%d)"

2113 msgstr ""

2114

2046 -#: delta-islands.c:462

2115 +#: delta-islands.c:466

2116 #, c-format

2117 msgid "Marked %d islands, done.\n"

2118 msgstr ""

@@ -2078,106 +2147,108 @@ msgid ""

2147 "'dimmed-zebra', 'plain'"

2148 msgstr ""

2149

2081 -#: diff.c:316

2150 +#: diff.c:319

2151 #, c-format

2083 -msgid "ignoring unknown color-moved-ws mode '%s'"

2152 +msgid ""

2153 +"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "

2154 +"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"

2155 msgstr ""

2156

2086 -#: diff.c:323

2157 +#: diff.c:327

2158 msgid ""

2088 -"color-moved-ws: allow-indentation-change cannot be combined with other white "

2089 -"space modes"

2159 +"color-moved-ws: allow-indentation-change cannot be combined with other "

2160 +"whitespace modes"

2161 msgstr ""

2162

2092 -#: diff.c:394

2163 +#: diff.c:400

2164 #, c-format

2165 msgid "Unknown value for 'diff.submodule' config variable: '%s'"

2166 msgstr ""

2167

2097 -#: diff.c:454

2168 +#: diff.c:460

2169 #, c-format

2170 msgid ""

2171 "Found errors in 'diff.dirstat' config variable:\n"

2172 "%s"

2173 msgstr ""

2174

2104 -#: diff.c:4140

2175 +#: diff.c:4211

2176 #, c-format

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

2178 msgstr ""

2179

2109 -#: diff.c:4482

2180 +#: diff.c:4553

2181 msgid "--name-only, --name-status, --check and -s are mutually exclusive"

2182 msgstr ""

2183

2113 -#: diff.c:4485

2184 +#: diff.c:4556

2185 msgid "-G, -S and --find-object are mutually exclusive"

2186 msgstr ""

2187

2117 -#: diff.c:4563

2188 +#: diff.c:4634

2189 msgid "--follow requires exactly one pathspec"

2190 msgstr ""

2191

2121 -#: diff.c:4729

2192 +#: diff.c:4800

2193 #, c-format

2194 msgid ""

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

2196 "%s"

2197 msgstr ""

2198

2128 -#: diff.c:4743

2199 +#: diff.c:4814

2200 #, c-format

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

2202 msgstr ""

2203

2133 -#: diff.c:5823

2204 +#: diff.c:5900

2205 msgid "inexact rename detection was skipped due to too many files."

2206 msgstr ""

2207

2137 -#: diff.c:5826

2208 +#: diff.c:5903

2209 msgid "only found copies from modified paths due to too many files."

2210 msgstr ""

2211

2141 -#: diff.c:5829

2212 +#: diff.c:5906

2213 #, c-format

2214 msgid ""

2215 "you may want to set your %s variable to at least %d and retry the command."

2216 msgstr ""

2217

2147 -#: dir.c:576

2218 +#: dir.c:538

2219 #, c-format

2220 msgid "pathspec '%s' did not match any file(s) known to git"

2221 msgstr ""

2222

2152 -#: dir.c:965

2223 +#: dir.c:927

2224 #, c-format

2225 msgid "cannot use %s as an exclude file"

2226 msgstr ""

2227

2157 -#: dir.c:1880

2228 +#: dir.c:1842

2229 #, c-format

2230 msgid "could not open directory '%s'"

2231 msgstr ""

2232

2162 -#: dir.c:2122

2233 +#: dir.c:2084

2234 msgid "failed to get kernel name and information"

2235 msgstr ""

2236

2166 -#: dir.c:2246

2237 +#: dir.c:2208

2238 msgid "untracked cache is disabled on this system or location"

2239 msgstr ""

2240

2170 -#: dir.c:3047

2241 +#: dir.c:3009

2242 #, c-format

2243 msgid "index file corrupt in repo %s"

2244 msgstr ""

2245

2175 -#: dir.c:3092 dir.c:3097

2246 +#: dir.c:3054 dir.c:3059

2247 #, c-format

2248 msgid "could not create directories for %s"

2249 msgstr ""

2250

2180 -#: dir.c:3126

2251 +#: dir.c:3088

2252 #, c-format

2253 msgid "could not migrate git directory from '%s' to '%s'"

2254 msgstr ""

@@ -2219,235 +2290,239 @@ msgstr ""

2290 msgid "git fetch-pack: expected shallow list"

2291 msgstr ""

2292

2222 -#: fetch-pack.c:163

2293 +#: fetch-pack.c:154

2294 +msgid "git fetch-pack: expected a flush packet after shallow list"

2295 +msgstr ""

2296 +

2297 +#: fetch-pack.c:165

2298 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"

2299 msgstr ""

2300

2226 -#: fetch-pack.c:183

2301 +#: fetch-pack.c:185

2302 #, c-format

2303 msgid "git fetch-pack: expected ACK/NAK, got '%s'"

2304 msgstr ""

2305

2231 -#: fetch-pack.c:253

2306 +#: fetch-pack.c:256

2307 msgid "--stateless-rpc requires multi_ack_detailed"

2308 msgstr ""

2309

2235 -#: fetch-pack.c:347 fetch-pack.c:1277

2310 +#: fetch-pack.c:358 fetch-pack.c:1264

2311 #, c-format

2312 msgid "invalid shallow line: %s"

2313 msgstr ""

2314

2240 -#: fetch-pack.c:353 fetch-pack.c:1283

2315 +#: fetch-pack.c:364 fetch-pack.c:1271

2316 #, c-format

2317 msgid "invalid unshallow line: %s"

2318 msgstr ""

2319

2245 -#: fetch-pack.c:355 fetch-pack.c:1285

2320 +#: fetch-pack.c:366 fetch-pack.c:1273

2321 #, c-format

2322 msgid "object not found: %s"

2323 msgstr ""

2324

2250 -#: fetch-pack.c:358 fetch-pack.c:1288

2325 +#: fetch-pack.c:369 fetch-pack.c:1276

2326 #, c-format

2327 msgid "error in object: %s"

2328 msgstr ""

2329

2255 -#: fetch-pack.c:360 fetch-pack.c:1290

2330 +#: fetch-pack.c:371 fetch-pack.c:1278

2331 #, c-format

2332 msgid "no shallow found: %s"

2333 msgstr ""

2334

2260 -#: fetch-pack.c:363 fetch-pack.c:1293

2335 +#: fetch-pack.c:374 fetch-pack.c:1282

2336 #, c-format

2337 msgid "expected shallow/unshallow, got %s"

2338 msgstr ""

2339

2265 -#: fetch-pack.c:404

2340 +#: fetch-pack.c:415

2341 #, c-format

2342 msgid "got %s %d %s"

2343 msgstr ""

2344

2270 -#: fetch-pack.c:421

2345 +#: fetch-pack.c:432

2346 #, c-format

2347 msgid "invalid commit %s"

2348 msgstr ""

2349

2275 -#: fetch-pack.c:452

2350 +#: fetch-pack.c:463

2351 msgid "giving up"

2352 msgstr ""

2353

2279 -#: fetch-pack.c:464 progress.c:229

2354 +#: fetch-pack.c:475 progress.c:229

2355 msgid "done"

2356 msgstr ""

2357

2283 -#: fetch-pack.c:476

2358 +#: fetch-pack.c:487

2359 #, c-format

2360 msgid "got %s (%d) %s"

2361 msgstr ""

2362

2288 -#: fetch-pack.c:522

2363 +#: fetch-pack.c:533

2364 #, c-format

2365 msgid "Marking %s as complete"

2366 msgstr ""

2367

2293 -#: fetch-pack.c:764

2368 +#: fetch-pack.c:740

2369 #, c-format

2370 msgid "already have %s (%s)"

2371 msgstr ""

2372

2298 -#: fetch-pack.c:803

2373 +#: fetch-pack.c:779

2374 msgid "fetch-pack: unable to fork off sideband demultiplexer"

2375 msgstr ""

2376

2302 -#: fetch-pack.c:811

2377 +#: fetch-pack.c:787

2378 msgid "protocol error: bad pack header"

2379 msgstr ""

2380

2306 -#: fetch-pack.c:879

2381 +#: fetch-pack.c:855

2382 #, c-format

2383 msgid "fetch-pack: unable to fork off %s"

2384 msgstr ""

2385

2311 -#: fetch-pack.c:895

2386 +#: fetch-pack.c:871

2387 #, c-format

2388 msgid "%s failed"

2389 msgstr ""

2390

2316 -#: fetch-pack.c:897

2391 +#: fetch-pack.c:873

2392 msgid "error in sideband demultiplexer"

2393 msgstr ""

2394

2320 -#: fetch-pack.c:926

2395 +#: fetch-pack.c:902

2396 msgid "Server does not support shallow clients"

2397 msgstr ""

2398

2324 -#: fetch-pack.c:930

2399 +#: fetch-pack.c:906

2400 msgid "Server supports multi_ack_detailed"

2401 msgstr ""

2402

2328 -#: fetch-pack.c:933

2403 +#: fetch-pack.c:909

2404 msgid "Server supports no-done"

2405 msgstr ""

2406

2332 -#: fetch-pack.c:939

2407 +#: fetch-pack.c:915

2408 msgid "Server supports multi_ack"

2409 msgstr ""

2410

2336 -#: fetch-pack.c:943

2411 +#: fetch-pack.c:919

2412 msgid "Server supports side-band-64k"

2413 msgstr ""

2414

2340 -#: fetch-pack.c:947

2415 +#: fetch-pack.c:923

2416 msgid "Server supports side-band"

2417 msgstr ""

2418

2344 -#: fetch-pack.c:951

2419 +#: fetch-pack.c:927

2420 msgid "Server supports allow-tip-sha1-in-want"

2421 msgstr ""

2422

2348 -#: fetch-pack.c:955

2423 +#: fetch-pack.c:931

2424 msgid "Server supports allow-reachable-sha1-in-want"

2425 msgstr ""

2426

2352 -#: fetch-pack.c:965

2427 +#: fetch-pack.c:941

2428 msgid "Server supports ofs-delta"

2429 msgstr ""

2430

2356 -#: fetch-pack.c:971 fetch-pack.c:1158

2431 +#: fetch-pack.c:947 fetch-pack.c:1140

2432 msgid "Server supports filter"

2433 msgstr ""

2434

2360 -#: fetch-pack.c:979

2435 +#: fetch-pack.c:955

2436 #, c-format

2437 msgid "Server version is %.*s"

2438 msgstr ""

2439

2365 -#: fetch-pack.c:985

2440 +#: fetch-pack.c:961

2441 msgid "Server does not support --shallow-since"

2442 msgstr ""

2443

2369 -#: fetch-pack.c:989

2444 +#: fetch-pack.c:965

2445 msgid "Server does not support --shallow-exclude"

2446 msgstr ""

2447

2373 -#: fetch-pack.c:991

2448 +#: fetch-pack.c:967

2449 msgid "Server does not support --deepen"

2450 msgstr ""

2451

2377 -#: fetch-pack.c:1008

2452 +#: fetch-pack.c:984

2453 msgid "no common commits"

2454 msgstr ""

2455

2381 -#: fetch-pack.c:1020 fetch-pack.c:1418

2456 +#: fetch-pack.c:996 fetch-pack.c:1419

2457 msgid "git fetch-pack: fetch failed."

2458 msgstr ""

2459

2385 -#: fetch-pack.c:1153

2460 +#: fetch-pack.c:1134

2461 msgid "Server does not support shallow requests"

2462 msgstr ""

2463

2389 -#: fetch-pack.c:1199

2464 +#: fetch-pack.c:1184

2465 #, c-format

2466 msgid "error reading section header '%s'"

2467 msgstr ""

2468

2394 -#: fetch-pack.c:1205

2469 +#: fetch-pack.c:1190

2470 #, c-format

2471 msgid "expected '%s', received '%s'"

2472 msgstr ""

2473

2399 -#: fetch-pack.c:1244

2474 +#: fetch-pack.c:1229

2475 #, c-format

2476 msgid "unexpected acknowledgment line: '%s'"

2477 msgstr ""

2478

2404 -#: fetch-pack.c:1249

2479 +#: fetch-pack.c:1234

2480 #, c-format

2481 msgid "error processing acks: %d"

2482 msgstr ""

2483

2409 -#: fetch-pack.c:1259

2484 +#: fetch-pack.c:1244

2485 msgid "expected packfile to be sent after 'ready'"

2486 msgstr ""

2487

2413 -#: fetch-pack.c:1261

2488 +#: fetch-pack.c:1246

2489 msgid "expected no other sections to be sent after no 'ready'"

2490 msgstr ""

2491

2417 -#: fetch-pack.c:1298

2492 +#: fetch-pack.c:1287

2493 #, c-format

2494 msgid "error processing shallow info: %d"

2495 msgstr ""

2496

2422 -#: fetch-pack.c:1314

2497 +#: fetch-pack.c:1308

2498 #, c-format

2499 msgid "expected wanted-ref, got '%s'"

2500 msgstr ""

2501

2427 -#: fetch-pack.c:1324

2502 +#: fetch-pack.c:1318

2503 #, c-format

2504 msgid "unexpected wanted-ref: '%s'"

2505 msgstr ""

2506

2432 -#: fetch-pack.c:1328

2507 +#: fetch-pack.c:1322

2508 #, c-format

2509 msgid "error processing wanted refs: %d"

2510 msgstr ""

2511

2437 -#: fetch-pack.c:1642

2512 +#: fetch-pack.c:1646

2513 msgid "no matching remote head"

2514 msgstr ""

2515

2441 -#: fetch-pack.c:1660 builtin/clone.c:664

2516 +#: fetch-pack.c:1664 builtin/clone.c:671

2517 msgid "remote did not send all necessary objects"

2518 msgstr ""

2519

2445 -#: fetch-pack.c:1686

2520 +#: fetch-pack.c:1690

2521 #, c-format

2522 msgid "no such remote ref %s"

2523 msgstr ""

2524

2450 -#: fetch-pack.c:1689

2525 +#: fetch-pack.c:1693

2526 #, c-format

2527 msgid "Server does not allow request for unadvertised object %s"

2528 msgstr ""

@@ -2475,8 +2550,8 @@ msgstr ""

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

2551 msgstr ""

2552

2478 -#: grep.c:2130 setup.c:164 builtin/clone.c:410 builtin/diff.c:81

2479 -#: builtin/rm.c:134

2553 +#: grep.c:2130 setup.c:164 builtin/clone.c:411 builtin/diff.c:82

2554 +#: builtin/rm.c:135

2555 #, c-format

2556 msgid "failed to stat '%s'"

2557 msgstr ""

@@ -2538,72 +2613,72 @@ msgstr ""

2613 msgid "Low-level Commands / Internal Helpers"

2614 msgstr ""

2615

2541 -#: help.c:296

2616 +#: help.c:298

2617 #, c-format

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

2619 msgstr ""

2620

2546 -#: help.c:303

2621 +#: help.c:305

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

2623 msgstr ""

2624

2550 -#: help.c:312

2625 +#: help.c:314

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

2627 msgstr ""

2628

2554 -#: help.c:361 git.c:90

2629 +#: help.c:363 git.c:90

2630 #, c-format

2631 msgid "unsupported command listing type '%s'"

2632 msgstr ""

2633

2559 -#: help.c:408

2634 +#: help.c:410

2635 msgid "The common Git guides are:"

2636 msgstr ""

2637

2563 -#: help.c:517

2638 +#: help.c:519

2639 msgid "See 'git help <command>' to read about a specific subcommand"

2640 msgstr ""

2641

2567 -#: help.c:522

2642 +#: help.c:524

2643 msgid "External commands"

2644 msgstr ""

2645

2571 -#: help.c:530

2646 +#: help.c:539

2647 msgid "Command aliases"

2648 msgstr ""

2649

2575 -#: help.c:594

2650 +#: help.c:603

2651 #, c-format

2652 msgid ""

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

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

2655 msgstr ""

2656

2582 -#: help.c:653

2657 +#: help.c:662

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

2659 msgstr ""

2660

2586 -#: help.c:675

2661 +#: help.c:684

2662 #, c-format

2663 msgid "WARNING: You called a Git command named '%s', which does not exist."

2664 msgstr ""

2665

2591 -#: help.c:680

2666 +#: help.c:689

2667 #, c-format

2668 msgid "Continuing under the assumption that you meant '%s'."

2669 msgstr ""

2670

2596 -#: help.c:685

2671 +#: help.c:694

2672 #, c-format

2673 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."

2674 msgstr ""

2675

2601 -#: help.c:693

2676 +#: help.c:702

2677 #, c-format

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

2679 msgstr ""

2680

2606 -#: help.c:697

2681 +#: help.c:706

2682 msgid ""

2683 "\n"

2684 "The most similar command is"

@@ -2613,16 +2688,16 @@ msgid_plural ""

2688 msgstr[0] ""

2689 msgstr[1] ""

2690

2616 -#: help.c:712

2691 +#: help.c:721

2692 msgid "git version [<options>]"

2693 msgstr ""

2694

2620 -#: help.c:780

2695 +#: help.c:789

2696 #, c-format

2697 msgid "%s: %s - %s"

2698 msgstr ""

2699

2625 -#: help.c:784

2700 +#: help.c:793

2701 msgid ""

2702 "\n"

2703 "Did you mean this?"

@@ -2675,20 +2750,20 @@ msgstr ""

2750 msgid "name consists only of disallowed characters: %s"

2751 msgstr ""

2752

2678 -#: ident.c:419 builtin/commit.c:606

2753 +#: ident.c:419 builtin/commit.c:608

2754 #, c-format

2755 msgid "invalid date format: %s"

2756 msgstr ""

2757

2683 -#: list-objects-filter-options.c:35

2758 +#: list-objects-filter-options.c:36

2759 msgid "multiple filter-specs cannot be combined"

2760 msgstr ""

2761

2762 #: list-objects-filter-options.c:58

2688 -msgid "only 'tree:0' is supported"

2763 +msgid "expected 'tree:<depth>'"

2764 msgstr ""

2765

2691 -#: list-objects-filter-options.c:137

2766 +#: list-objects-filter-options.c:152

2767 msgid "cannot change partial clone promisor remote"

2768 msgstr ""

2769

@@ -2713,94 +2788,94 @@ msgstr ""

2788 msgid "failed to read the cache"

2789 msgstr ""

2790

2716 -#: merge.c:107 rerere.c:720 builtin/am.c:1899 builtin/am.c:1933

2717 -#: builtin/checkout.c:387 builtin/checkout.c:708 builtin/clone.c:764

2791 +#: merge.c:107 rerere.c:720 builtin/am.c:1884 builtin/am.c:1918

2792 +#: builtin/checkout.c:416 builtin/checkout.c:745 builtin/clone.c:771

2793 msgid "unable to write new index file"

2794 msgstr ""

2795

2721 -#: merge-recursive.c:323

2796 +#: merge-recursive.c:332

2797 msgid "(bad commit)\n"

2798 msgstr ""

2799

2725 -#: merge-recursive.c:345

2800 +#: merge-recursive.c:355

2801 #, c-format

2802 msgid "add_cacheinfo failed for path '%s'; merge aborting."

2803 msgstr ""

2804

2730 -#: merge-recursive.c:353

2805 +#: merge-recursive.c:364

2806 #, c-format

2807 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."

2808 msgstr ""

2809

2735 -#: merge-recursive.c:435

2810 +#: merge-recursive.c:447

2811 msgid "error building trees"

2812 msgstr ""

2813

2739 -#: merge-recursive.c:906

2814 +#: merge-recursive.c:902

2815 #, c-format

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

2817 msgstr ""

2818

2744 -#: merge-recursive.c:917

2819 +#: merge-recursive.c:913

2820 #, c-format

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

2822 msgstr ""

2823

2749 -#: merge-recursive.c:931 merge-recursive.c:950

2824 +#: merge-recursive.c:927 merge-recursive.c:946

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

2826 msgstr ""

2827

2753 -#: merge-recursive.c:940

2828 +#: merge-recursive.c:936

2829 #, c-format

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

2831 msgstr ""

2832

2758 -#: merge-recursive.c:982 builtin/cat-file.c:39

2833 +#: merge-recursive.c:978 builtin/cat-file.c:40

2834 #, c-format

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

2836 msgstr ""

2837

2763 -#: merge-recursive.c:984

2838 +#: merge-recursive.c:980

2839 #, c-format

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

2841 msgstr ""

2842

2768 -#: merge-recursive.c:1008

2843 +#: merge-recursive.c:1004

2844 #, c-format

2845 msgid "failed to open '%s': %s"

2846 msgstr ""

2847

2773 -#: merge-recursive.c:1019

2848 +#: merge-recursive.c:1015

2849 #, c-format

2850 msgid "failed to symlink '%s': %s"

2851 msgstr ""

2852

2778 -#: merge-recursive.c:1024

2853 +#: merge-recursive.c:1020

2854 #, c-format

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

2856 msgstr ""

2857

2783 -#: merge-recursive.c:1212

2858 +#: merge-recursive.c:1211

2859 #, c-format

2860 msgid "Failed to merge submodule %s (not checked out)"

2861 msgstr ""

2862

2788 -#: merge-recursive.c:1219

2863 +#: merge-recursive.c:1218

2864 #, c-format

2865 msgid "Failed to merge submodule %s (commits not present)"

2866 msgstr ""

2867

2793 -#: merge-recursive.c:1226

2868 +#: merge-recursive.c:1225

2869 #, c-format

2870 msgid "Failed to merge submodule %s (commits don't follow merge-base)"

2871 msgstr ""

2872

2798 -#: merge-recursive.c:1234 merge-recursive.c:1246

2873 +#: merge-recursive.c:1233 merge-recursive.c:1245

2874 #, c-format

2875 msgid "Fast-forwarding submodule %s to the following commit:"

2876 msgstr ""

2877

2803 -#: merge-recursive.c:1237 merge-recursive.c:1249

2878 +#: merge-recursive.c:1236 merge-recursive.c:1248

2879 #, c-format

2880 msgid "Fast-forwarding submodule %s"

2881 msgstr ""

@@ -2835,104 +2910,103 @@ msgstr ""

2910 msgid "Failed to merge submodule %s (multiple merges found)"

2911 msgstr ""

2912

2838 -#: merge-recursive.c:1358

2913 +#: merge-recursive.c:1361

2914 msgid "Failed to execute internal merge"

2915 msgstr ""

2916

2842 -#: merge-recursive.c:1363

2917 +#: merge-recursive.c:1366

2918 #, c-format

2919 msgid "Unable to add %s to database"

2920 msgstr ""

2921

2847 -#: merge-recursive.c:1395

2922 +#: merge-recursive.c:1398

2923 #, c-format

2924 msgid "Auto-merging %s"

2925 msgstr ""

2926

2852 -#: merge-recursive.c:1416

2927 +#: merge-recursive.c:1419

2928 #, c-format

2929 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."

2930 msgstr ""

2931

2857 -#: merge-recursive.c:1483

2932 +#: merge-recursive.c:1486

2933 #, c-format

2934 msgid ""

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

2936 "in tree."

2937 msgstr ""

2938

2864 -#: merge-recursive.c:1488

2939 +#: merge-recursive.c:1491

2940 #, c-format

2941 msgid ""

2942 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

2943 "left in tree."

2944 msgstr ""

2945

2871 -#: merge-recursive.c:1495

2946 +#: merge-recursive.c:1498

2947 #, c-format

2948 msgid ""

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

2950 "in tree at %s."

2951 msgstr ""

2952

2878 -#: merge-recursive.c:1500

2953 +#: merge-recursive.c:1503

2954 #, c-format

2955 msgid ""

2956 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

2957 "left in tree at %s."

2958 msgstr ""

2959

2885 -#: merge-recursive.c:1534

2960 +#: merge-recursive.c:1537

2961 msgid "rename"

2962 msgstr ""

2963

2889 -#: merge-recursive.c:1534

2964 +#: merge-recursive.c:1537

2965 msgid "renamed"

2966 msgstr ""

2967

2893 -#: merge-recursive.c:1588 merge-recursive.c:1737 merge-recursive.c:2369

2894 -#: merge-recursive.c:3124

2968 +#: merge-recursive.c:1633 merge-recursive.c:2481 merge-recursive.c:3213

2969 #, c-format

2970 msgid "Refusing to lose dirty file at %s"

2971 msgstr ""

2972

2899 -#: merge-recursive.c:1602

2973 +#: merge-recursive.c:1643

2974 +#, c-format

2975 +msgid "Refusing to lose untracked file at %s, even though it's in the way."

2976 +msgstr ""

2977 +

2978 +#: merge-recursive.c:1706

2979 +#, c-format

2980 +msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"

2981 +msgstr ""

2982 +

2983 +#: merge-recursive.c:1734

2984 #, c-format

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

2986 msgstr ""

2987

2904 -#: merge-recursive.c:1607

2988 +#: merge-recursive.c:1739

2989 #, c-format

2990 msgid "Refusing to lose untracked file at %s; adding as %s instead"

2991 msgstr ""

2992

2909 -#: merge-recursive.c:1633

2993 +#: merge-recursive.c:1759

2994 #, c-format

2995 msgid ""

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

2997 "\"->\"%s\" in \"%s\"%s"

2998 msgstr ""

2999

2916 -#: merge-recursive.c:1638

3000 +#: merge-recursive.c:1764

3001 msgid " (left unresolved)"

3002 msgstr ""

3003

2920 -#: merge-recursive.c:1699

3004 +#: merge-recursive.c:1868

3005 #, c-format

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

3007 msgstr ""

3008

2925 -#: merge-recursive.c:1734

2926 -#, c-format

2927 -msgid "Renaming %s to %s and %s to %s instead"

2928 -msgstr ""

2929 -

2930 -#: merge-recursive.c:1746

2931 -#, c-format

2932 -msgid "Refusing to lose untracked file at %s, even though it's in the way."

2933 -msgstr ""

2934 -

2935 -#: merge-recursive.c:1952

3009 +#: merge-recursive.c:2064

3010 #, c-format

3011 msgid ""

3012 "CONFLICT (directory rename split): Unclear where to place %s because "

@@ -2940,149 +3014,144 @@ msgid ""

3014 "getting a majority of the files."

3015 msgstr ""

3016

2943 -#: merge-recursive.c:1984

3017 +#: merge-recursive.c:2096

3018 #, c-format

3019 msgid ""

3020 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "

3021 "implicit directory rename(s) putting the following path(s) there: %s."

3022 msgstr ""

3023

2950 -#: merge-recursive.c:1994

3024 +#: merge-recursive.c:2106

3025 #, c-format

3026 msgid ""

3027 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "

3028 "implicit directory renames tried to put these paths there: %s"

3029 msgstr ""

3030

2957 -#: merge-recursive.c:2086

3031 +#: merge-recursive.c:2198

3032 #, c-format

3033 msgid ""

3034 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"

3035 ">%s in %s"

3036 msgstr ""

3037

2964 -#: merge-recursive.c:2331

3038 +#: merge-recursive.c:2443

3039 #, c-format

3040 msgid ""

3041 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "

3042 "renamed."

3043 msgstr ""

3044

2971 -#: merge-recursive.c:2737

2972 -#, c-format

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

2974 -msgstr ""

2975 -

2976 -#: merge-recursive.c:2763

2977 -#, c-format

2978 -msgid "Adding merged %s"

2979 -msgstr ""

2980 -

2981 -#: merge-recursive.c:2770 merge-recursive.c:3127

2982 -#, c-format

2983 -msgid "Adding as %s instead"

2984 -msgstr ""

2985 -

2986 -#: merge-recursive.c:2934

3045 +#: merge-recursive.c:3022

3046 #, c-format

3047 msgid "cannot read object %s"

3048 msgstr ""

3049

2991 -#: merge-recursive.c:2937

3050 +#: merge-recursive.c:3025

3051 #, c-format

3052 msgid "object %s is not a blob"

3053 msgstr ""

3054

2996 -#: merge-recursive.c:3006

3055 +#: merge-recursive.c:3094

3056 msgid "modify"

3057 msgstr ""

3058

3000 -#: merge-recursive.c:3006

3059 +#: merge-recursive.c:3094

3060 msgid "modified"

3061 msgstr ""

3062

3004 -#: merge-recursive.c:3017

3063 +#: merge-recursive.c:3105

3064 msgid "content"

3065 msgstr ""

3066

3008 -#: merge-recursive.c:3024

3067 +#: merge-recursive.c:3112

3068 msgid "add/add"

3069 msgstr ""

3070

3012 -#: merge-recursive.c:3071

3071 +#: merge-recursive.c:3160

3072 #, c-format

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

3074 msgstr ""

3075

3017 -#: merge-recursive.c:3093 git-submodule.sh:858

3076 +#: merge-recursive.c:3182 git-submodule.sh:861

3077 msgid "submodule"

3078 msgstr ""

3079

3021 -#: merge-recursive.c:3094

3080 +#: merge-recursive.c:3183

3081 #, c-format

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

3083 msgstr ""

3084

3085 #: merge-recursive.c:3216

3086 #, c-format

3087 +msgid "Adding as %s instead"

3088 +msgstr ""

3089 +

3090 +#: merge-recursive.c:3319

3091 +#, c-format

3092 msgid "Removing %s"

3093 msgstr ""

3094

3031 -#: merge-recursive.c:3242

3095 +#: merge-recursive.c:3345

3096 msgid "file/directory"

3097 msgstr ""

3098

3035 -#: merge-recursive.c:3248

3099 +#: merge-recursive.c:3351

3100 msgid "directory/file"

3101 msgstr ""

3102

3039 -#: merge-recursive.c:3255

3103 +#: merge-recursive.c:3358

3104 #, c-format

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

3106 msgstr ""

3107

3044 -#: merge-recursive.c:3264

3108 +#: merge-recursive.c:3367

3109 #, c-format

3110 msgid "Adding %s"

3111 msgstr ""

3112

3049 -#: merge-recursive.c:3300

3113 +#: merge-recursive.c:3376

3114 +#, c-format

3115 +msgid "CONFLICT (add/add): Merge conflict in %s"

3116 +msgstr ""

3117 +

3118 +#: merge-recursive.c:3417

3119 #, c-format

3120 msgid ""

3121 "Your local changes to the following files would be overwritten by merge:\n"

3122 " %s"

3123 msgstr ""

3124

3056 -#: merge-recursive.c:3311

3125 +#: merge-recursive.c:3428

3126 msgid "Already up to date!"

3127 msgstr ""

3128

3060 -#: merge-recursive.c:3320

3129 +#: merge-recursive.c:3437

3130 #, c-format

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

3132 msgstr ""

3133

3065 -#: merge-recursive.c:3419

3134 +#: merge-recursive.c:3536

3135 msgid "Merging:"

3136 msgstr ""

3137

3069 -#: merge-recursive.c:3432

3138 +#: merge-recursive.c:3549

3139 #, c-format

3140 msgid "found %u common ancestor:"

3141 msgid_plural "found %u common ancestors:"

3142 msgstr[0] ""

3143 msgstr[1] ""

3144

3076 -#: merge-recursive.c:3471

3145 +#: merge-recursive.c:3588

3146 msgid "merge returned no commit"

3147 msgstr ""

3148

3080 -#: merge-recursive.c:3537

3149 +#: merge-recursive.c:3654

3150 #, c-format

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

3152 msgstr ""

3153

3085 -#: merge-recursive.c:3553 builtin/merge.c:691 builtin/merge.c:849

3154 +#: merge-recursive.c:3670 builtin/merge.c:692 builtin/merge.c:850

3155 msgid "Unable to write index."

3156 msgstr ""

3157

@@ -3198,22 +3267,22 @@ msgstr ""

3267 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"

3268 msgstr ""

3269

3201 -#: name-hash.c:532

3270 +#: name-hash.c:531

3271 #, c-format

3272 msgid "unable to create lazy_dir thread: %s"

3273 msgstr ""

3274

3206 -#: name-hash.c:554

3275 +#: name-hash.c:553

3276 #, c-format

3277 msgid "unable to create lazy_name thread: %s"

3278 msgstr ""

3279

3211 -#: name-hash.c:560

3280 +#: name-hash.c:559

3281 #, c-format

3282 msgid "unable to join lazy_name thread: %s"

3283 msgstr ""

3284

3216 -#: notes-merge.c:275

3285 +#: notes-merge.c:277

3286 #, c-format

3287 msgid ""

3288 "You have not concluded your previous notes merge (%s exists).\n"

@@ -3221,21 +3290,21 @@ msgid ""

3290 "commit/abort the previous merge before you start a new notes merge."

3291 msgstr ""

3292

3224 -#: notes-merge.c:282

3293 +#: notes-merge.c:284

3294 #, c-format

3295 msgid "You have not concluded your notes merge (%s exists)."

3296 msgstr ""

3297

3229 -#: notes-utils.c:45

3298 +#: notes-utils.c:46

3299 msgid "Cannot commit uninitialized/unreferenced notes tree"

3300 msgstr ""

3301

3233 -#: notes-utils.c:104

3302 +#: notes-utils.c:105

3303 #, c-format

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

3305 msgstr ""

3306

3238 -#: notes-utils.c:114

3307 +#: notes-utils.c:115

3308 #, c-format

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

3310 msgstr ""

@@ -3244,7 +3313,7 @@ msgstr ""

3313 #. the environment variable, the second %s is

3314 #. its value.

3315 #.

3247 -#: notes-utils.c:144

3316 +#: notes-utils.c:145

3317 #, c-format

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

3319 msgstr ""

@@ -3254,45 +3323,105 @@ msgstr ""

3323 msgid "invalid object type \"%s\""

3324 msgstr ""

3325

3257 -#: object.c:173

3326 +#: object.c:174

3327 #, c-format

3328 msgid "object %s is a %s, not a %s"

3329 msgstr ""

3330

3262 -#: object.c:233

3331 +#: object.c:234

3332 #, c-format

3333 msgid "object %s has unknown type id %d"

3334 msgstr ""

3335

3267 -#: object.c:246

3336 +#: object.c:247

3337 #, c-format

3338 msgid "unable to parse object: %s"

3339 msgstr ""

3340

3272 -#: object.c:266 object.c:277

3341 +#: object.c:267 object.c:278

3342 #, c-format

3274 -msgid "sha1 mismatch %s"

3343 +msgid "hash mismatch %s"

3344 msgstr ""

3345

3346 #: packfile.c:607

3347 msgid "offset before end of packfile (broken .idx?)"

3348 msgstr ""

3349

3281 -#: packfile.c:1864

3350 +#: packfile.c:1870

3351 #, c-format

3352 msgid "offset before start of pack index for %s (corrupt index?)"

3353 msgstr ""

3354

3286 -#: packfile.c:1868

3355 +#: packfile.c:1874

3356 #, c-format

3357 msgid "offset beyond end of pack index for %s (truncated index?)"

3358 msgstr ""

3359

3291 -#: parse-options.c:672

3360 +#: parse-options.c:35

3361 +#, c-format

3362 +msgid "%s requires a value"

3363 +msgstr ""

3364 +

3365 +#: parse-options.c:69

3366 +#, c-format

3367 +msgid "%s is incompatible with %s"

3368 +msgstr ""

3369 +

3370 +#: parse-options.c:74

3371 +#, c-format

3372 +msgid "%s : incompatible with something else"

3373 +msgstr ""

3374 +

3375 +#: parse-options.c:88 parse-options.c:92 parse-options.c:260

3376 +#, c-format

3377 +msgid "%s takes no value"

3378 +msgstr ""

3379 +

3380 +#: parse-options.c:90

3381 +#, c-format

3382 +msgid "%s isn't available"

3383 +msgstr ""

3384 +

3385 +#: parse-options.c:178

3386 +#, c-format

3387 +msgid "%s expects a numerical value"

3388 +msgstr ""

3389 +

3390 +#: parse-options.c:194

3391 +#, c-format

3392 +msgid "%s expects a non-negative integer value with an optional k/m/g suffix"

3393 +msgstr ""

3394 +

3395 +#: parse-options.c:322

3396 +#, c-format

3397 +msgid "ambiguous option: %s (could be --%s%s or --%s%s)"

3398 +msgstr ""

3399 +

3400 +#: parse-options.c:356 parse-options.c:364

3401 +#, c-format

3402 +msgid "did you mean `--%s` (with two dashes ?)"

3403 +msgstr ""

3404 +

3405 +#: parse-options.c:649

3406 +#, c-format

3407 +msgid "unknown option `%s'"

3408 +msgstr ""

3409 +

3410 +#: parse-options.c:651

3411 +#, c-format

3412 +msgid "unknown switch `%c'"

3413 +msgstr ""

3414 +

3415 +#: parse-options.c:653

3416 +#, c-format

3417 +msgid "unknown non-ascii option in string: `%s'"

3418 +msgstr ""

3419 +

3420 +#: parse-options.c:675

3421 msgid "..."

3422 msgstr ""

3423

3295 -#: parse-options.c:691

3424 +#: parse-options.c:694

3425 #, c-format

3426 msgid "usage: %s"

3427 msgstr ""

@@ -3300,26 +3429,36 @@ msgstr ""

3429 #. TRANSLATORS: the colon here should align with the

3430 #. one in "usage: %s" translation.

3431 #.

3303 -#: parse-options.c:697

3432 +#: parse-options.c:700

3433 #, c-format

3434 msgid " or: %s"

3435 msgstr ""

3436

3308 -#: parse-options.c:700

3437 +#: parse-options.c:703

3438 #, c-format

3439 msgid " %s"

3440 msgstr ""

3441

3313 -#: parse-options.c:739

3442 +#: parse-options.c:742

3443 msgid "-NUM"

3444 msgstr ""

3445

3317 -#: parse-options-cb.c:37

3446 +#: parse-options-cb.c:21

3447 +#, c-format

3448 +msgid "option `%s' expects a numerical value"

3449 +msgstr ""

3450 +

3451 +#: parse-options-cb.c:38

3452 #, c-format

3453 msgid "malformed expiration date '%s'"

3454 msgstr ""

3455

3322 -#: parse-options-cb.c:109

3456 +#: parse-options-cb.c:51

3457 +#, c-format

3458 +msgid "option `%s' expects \"always\", \"auto\", or \"never\""

3459 +msgstr ""

3460 +

3461 +#: parse-options-cb.c:110

3462 #, c-format

3463 msgid "malformed object name '%s'"

3464 msgstr ""

@@ -3329,73 +3468,73 @@ msgstr ""

3468 msgid "Could not make %s writable by group"

3469 msgstr ""

3470

3332 -#: pathspec.c:129

3471 +#: pathspec.c:128

3472 msgid "Escape character '\\' not allowed as last character in attr value"

3473 msgstr ""

3474

3336 -#: pathspec.c:147

3475 +#: pathspec.c:146

3476 msgid "Only one 'attr:' specification is allowed."

3477 msgstr ""

3478

3340 -#: pathspec.c:150

3479 +#: pathspec.c:149

3480 msgid "attr spec must not be empty"

3481 msgstr ""

3482

3344 -#: pathspec.c:193

3483 +#: pathspec.c:192

3484 #, c-format

3485 msgid "invalid attribute name %s"

3486 msgstr ""

3487

3349 -#: pathspec.c:258

3488 +#: pathspec.c:257

3489 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"

3490 msgstr ""

3491

3353 -#: pathspec.c:265

3492 +#: pathspec.c:264

3493 msgid ""

3494 "global 'literal' pathspec setting is incompatible with all other global "

3495 "pathspec settings"

3496 msgstr ""

3497

3359 -#: pathspec.c:305

3498 +#: pathspec.c:304

3499 msgid "invalid parameter for pathspec magic 'prefix'"

3500 msgstr ""

3501

3363 -#: pathspec.c:326

3502 +#: pathspec.c:325

3503 #, c-format

3504 msgid "Invalid pathspec magic '%.*s' in '%s'"

3505 msgstr ""

3506

3368 -#: pathspec.c:331

3507 +#: pathspec.c:330

3508 #, c-format

3509 msgid "Missing ')' at the end of pathspec magic in '%s'"

3510 msgstr ""

3511

3373 -#: pathspec.c:369

3512 +#: pathspec.c:368

3513 #, c-format

3514 msgid "Unimplemented pathspec magic '%c' in '%s'"

3515 msgstr ""

3516

3378 -#: pathspec.c:428

3517 +#: pathspec.c:427

3518 #, c-format

3519 msgid "%s: 'literal' and 'glob' are incompatible"

3520 msgstr ""

3521

3383 -#: pathspec.c:441

3522 +#: pathspec.c:440

3523 #, c-format

3524 msgid "%s: '%s' is outside repository"

3525 msgstr ""

3526

3388 -#: pathspec.c:515

3527 +#: pathspec.c:514

3528 #, c-format

3529 msgid "'%s' (mnemonic: '%c')"

3530 msgstr ""

3531

3393 -#: pathspec.c:525

3532 +#: pathspec.c:524

3533 #, c-format

3534 msgid "%s: pathspec magic not supported by this command: %s"

3535 msgstr ""

3536

3398 -#: pathspec.c:592

3537 +#: pathspec.c:591

3538 #, c-format

3539 msgid "pathspec '%s' is beyond a symbolic link"

3540 msgstr ""

@@ -3404,50 +3543,55 @@ msgstr ""

3543 msgid "flush packet write failed"

3544 msgstr ""

3545

3407 -#: pkt-line.c:142 pkt-line.c:228

3546 +#: pkt-line.c:144 pkt-line.c:230

3547 msgid "protocol error: impossibly long line"

3548 msgstr ""

3549

3411 -#: pkt-line.c:158 pkt-line.c:160

3550 +#: pkt-line.c:160 pkt-line.c:162

3551 msgid "packet write with format failed"

3552 msgstr ""

3553

3415 -#: pkt-line.c:192

3554 +#: pkt-line.c:194

3555 msgid "packet write failed - data exceeds max packet size"

3556 msgstr ""

3557

3419 -#: pkt-line.c:199 pkt-line.c:206

3558 +#: pkt-line.c:201 pkt-line.c:208

3559 msgid "packet write failed"

3560 msgstr ""

3561

3423 -#: pkt-line.c:291

3562 +#: pkt-line.c:293

3563 msgid "read error"

3564 msgstr ""

3565

3427 -#: pkt-line.c:299

3566 +#: pkt-line.c:301

3567 msgid "the remote end hung up unexpectedly"

3568 msgstr ""

3569

3431 -#: pkt-line.c:327

3570 +#: pkt-line.c:329

3571 #, c-format

3572 msgid "protocol error: bad line length character: %.4s"

3573 msgstr ""

3574

3436 -#: pkt-line.c:337 pkt-line.c:342

3575 +#: pkt-line.c:339 pkt-line.c:344

3576 #, c-format

3577 msgid "protocol error: bad line length %d"

3578 msgstr ""

3579

3441 -#: preload-index.c:118

3580 +#: pkt-line.c:353

3581 +#, c-format

3582 +msgid "remote error: %s"

3583 +msgstr ""

3584 +

3585 +#: preload-index.c:119

3586 msgid "Refreshing index"

3587 msgstr ""

3588

3445 -#: preload-index.c:137

3589 +#: preload-index.c:138

3590 #, c-format

3591 msgid "unable to create threaded lstat: %s"

3592 msgstr ""

3593

3450 -#: pretty.c:962

3594 +#: pretty.c:963

3595 msgid "unable to parse --pretty format"

3596 msgstr ""

3597

@@ -3459,7 +3603,7 @@ msgstr ""

3603 msgid "could not read `log` output"

3604 msgstr ""

3605

3462 -#: range-diff.c:74 sequencer.c:4764

3606 +#: range-diff.c:74 sequencer.c:4828

3607 #, c-format

3608 msgid "could not parse commit '%s'"

3609 msgstr ""

@@ -3473,77 +3617,195 @@ msgstr ""

3617 msgid "could not parse log for '%s'"

3618 msgstr ""

3619

3476 -#: read-cache.c:1490

3620 +#: read-cache.c:673

3621 +#, c-format

3622 +msgid "will not add file alias '%s' ('%s' already exists in index)"

3623 +msgstr ""

3624 +

3625 +#: read-cache.c:689

3626 +msgid "cannot create an empty blob in the object database"

3627 +msgstr ""

3628 +

3629 +#: read-cache.c:710

3630 +#, c-format

3631 +msgid "%s: can only add regular files, symbolic links or git-directories"

3632 +msgstr ""

3633 +

3634 +#: read-cache.c:765

3635 +#, c-format

3636 +msgid "unable to index file '%s'"

3637 +msgstr ""

3638 +

3639 +#: read-cache.c:784

3640 +#, c-format

3641 +msgid "unable to add '%s' to index"

3642 +msgstr ""

3643 +

3644 +#: read-cache.c:795

3645 +#, c-format

3646 +msgid "unable to stat '%s'"

3647 +msgstr ""

3648 +

3649 +#: read-cache.c:1304

3650 +#, c-format

3651 +msgid "'%s' appears as both a file and as a directory"

3652 +msgstr ""

3653 +

3654 +#: read-cache.c:1489

3655 msgid "Refresh index"

3656 msgstr ""

3657

3480 -#: read-cache.c:1604

3658 +#: read-cache.c:1603

3659 #, c-format

3660 msgid ""

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

3662 "Using version %i"

3663 msgstr ""

3664

3487 -#: read-cache.c:1614

3665 +#: read-cache.c:1613

3666 #, c-format

3667 msgid ""

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

3669 "Using version %i"

3670 msgstr ""

3671

3494 -#: read-cache.c:1792

3672 +#: read-cache.c:1684

3673 +#, c-format

3674 +msgid "bad signature 0x%08x"

3675 +msgstr ""

3676 +

3677 +#: read-cache.c:1687

3678 +#, c-format

3679 +msgid "bad index version %d"

3680 +msgstr ""

3681 +

3682 +#: read-cache.c:1696

3683 +msgid "bad index file sha1 signature"

3684 +msgstr ""

3685 +

3686 +#: read-cache.c:1726

3687 +#, c-format

3688 +msgid "index uses %.4s extension, which we do not understand"

3689 +msgstr ""

3690 +

3691 +#: read-cache.c:1728

3692 +#, c-format

3693 +msgid "ignoring %.4s extension"

3694 +msgstr ""

3695 +

3696 +#: read-cache.c:1765

3697 +#, c-format

3698 +msgid "unknown index entry format 0x%08x"

3699 +msgstr ""

3700 +

3701 +#: read-cache.c:1781

3702 #, c-format

3703 msgid "malformed name field in the index, near path '%s'"

3704 msgstr ""

3705

3499 -#: read-cache.c:1960 rerere.c:565 rerere.c:599 rerere.c:1111 builtin/add.c:458

3500 -#: builtin/check-ignore.c:177 builtin/checkout.c:289 builtin/checkout.c:585

3501 -#: builtin/checkout.c:953 builtin/clean.c:954 builtin/commit.c:343

3502 -#: builtin/diff-tree.c:115 builtin/grep.c:489 builtin/mv.c:144

3503 -#: builtin/reset.c:244 builtin/rm.c:270 builtin/submodule--helper.c:329

3706 +#: read-cache.c:1836

3707 +msgid "unordered stage entries in index"

3708 +msgstr ""

3709 +

3710 +#: read-cache.c:1839

3711 +#, c-format

3712 +msgid "multiple stage entries for merged file '%s'"

3713 +msgstr ""

3714 +

3715 +#: read-cache.c:1842

3716 +#, c-format

3717 +msgid "unordered stage entries for '%s'"

3718 +msgstr ""

3719 +

3720 +#: read-cache.c:1949 read-cache.c:2227 rerere.c:565 rerere.c:599 rerere.c:1111

3721 +#: builtin/add.c:459 builtin/check-ignore.c:178 builtin/checkout.c:294

3722 +#: builtin/checkout.c:622 builtin/checkout.c:991 builtin/clean.c:955

3723 +#: builtin/commit.c:344 builtin/diff-tree.c:116 builtin/grep.c:498

3724 +#: builtin/mv.c:145 builtin/reset.c:245 builtin/rm.c:271

3725 +#: builtin/submodule--helper.c:330

3726 msgid "index file corrupt"

3727 msgstr ""

3728

3507 -#: read-cache.c:2101

3729 +#: read-cache.c:2090

3730 #, c-format

3731 msgid "unable to create load_cache_entries thread: %s"

3732 msgstr ""

3733

3512 -#: read-cache.c:2114

3734 +#: read-cache.c:2103

3735 #, c-format

3736 msgid "unable to join load_cache_entries thread: %s"

3737 msgstr ""

3738

3517 -#: read-cache.c:2201

3739 +#: read-cache.c:2136

3740 +#, c-format

3741 +msgid "%s: index file open failed"

3742 +msgstr ""

3743 +

3744 +#: read-cache.c:2140

3745 +#, c-format

3746 +msgid "%s: cannot stat the open index"

3747 +msgstr ""

3748 +

3749 +#: read-cache.c:2144

3750 +#, c-format

3751 +msgid "%s: index file smaller than expected"

3752 +msgstr ""

3753 +

3754 +#: read-cache.c:2148

3755 +#, c-format

3756 +msgid "%s: unable to map index file"

3757 +msgstr ""

3758 +

3759 +#: read-cache.c:2190

3760 #, c-format

3761 msgid "unable to create load_index_extensions thread: %s"

3762 msgstr ""

3763

3522 -#: read-cache.c:2228

3764 +#: read-cache.c:2217

3765 #, c-format

3766 msgid "unable to join load_index_extensions thread: %s"

3767 msgstr ""

3768

3527 -#: read-cache.c:2982 sequencer.c:4727 wrapper.c:658 builtin/merge.c:1086

3769 +#: read-cache.c:2239

3770 +#, c-format

3771 +msgid "could not freshen shared index '%s'"

3772 +msgstr ""

3773 +

3774 +#: read-cache.c:2274

3775 +#, c-format

3776 +msgid "broken index, expect %s in %s, got %s"

3777 +msgstr ""

3778 +

3779 +#: read-cache.c:2971 sequencer.c:4791 wrapper.c:658 builtin/merge.c:1087

3780 #, c-format

3781 msgid "could not close '%s'"

3782 msgstr ""

3783

3532 -#: read-cache.c:3055 sequencer.c:2203 sequencer.c:3592

3784 +#: read-cache.c:3044 sequencer.c:2237 sequencer.c:3647

3785 #, c-format

3786 msgid "could not stat '%s'"

3787 msgstr ""

3788

3537 -#: read-cache.c:3068

3789 +#: read-cache.c:3057

3790 #, c-format

3791 msgid "unable to open git dir: %s"

3792 msgstr ""

3793

3542 -#: read-cache.c:3080

3794 +#: read-cache.c:3069

3795 #, c-format

3796 msgid "unable to unlink: %s"

3797 msgstr ""

3798

3799 +#: read-cache.c:3088

3800 +#, c-format

3801 +msgid "cannot fix permission bits on '%s'"

3802 +msgstr ""

3803 +

3804 +#: read-cache.c:3237

3805 +#, c-format

3806 +msgid "%s: cannot drop to stage #0"

3807 +msgstr ""

3808 +

3809 #: rebase-interactive.c:10

3810 msgid ""

3811 "\n"

@@ -3598,8 +3860,8 @@ msgstr ""

3860 msgid "Note that empty commits are commented out"

3861 msgstr ""

3862

3601 -#: rebase-interactive.c:62 rebase-interactive.c:75 sequencer.c:2186

3602 -#: sequencer.c:4505 sequencer.c:4561 sequencer.c:4836

3863 +#: rebase-interactive.c:62 rebase-interactive.c:75 sequencer.c:2219

3864 +#: sequencer.c:4569 sequencer.c:4625 sequencer.c:4900

3865 #, c-format

3866 msgid "could not read '%s'."

3867 msgstr ""

@@ -3614,7 +3876,7 @@ msgstr ""

3876 msgid "ignoring dangling symref %s"

3877 msgstr ""

3878

3617 -#: refs.c:585 ref-filter.c:1951

3879 +#: refs.c:585 ref-filter.c:1976

3880 #, c-format

3881 msgid "ignoring broken ref %s"

3882 msgstr ""

@@ -3639,15 +3901,15 @@ msgstr ""

3901 msgid "unexpected object ID when writing '%s'"

3902 msgstr ""

3903

3642 -#: refs.c:740 sequencer.c:394 sequencer.c:2510 sequencer.c:2636

3643 -#: sequencer.c:2650 sequencer.c:2877 sequencer.c:4725 sequencer.c:4788

3904 +#: refs.c:740 sequencer.c:396 sequencer.c:2549 sequencer.c:2675

3905 +#: sequencer.c:2689 sequencer.c:2923 sequencer.c:4789 sequencer.c:4852

3906 #: wrapper.c:656

3907 #, c-format

3908 msgid "could not write to '%s'"

3909 msgstr ""

3910

3649 -#: refs.c:767 sequencer.c:4723 sequencer.c:4782 wrapper.c:225 wrapper.c:395

3650 -#: builtin/am.c:728

3911 +#: refs.c:767 sequencer.c:4787 sequencer.c:4846 wrapper.c:225 wrapper.c:395

3912 +#: builtin/am.c:713 builtin/rebase.c:575

3913 #, c-format

3914 msgid "could not open '%s' for writing"

3915 msgstr ""

@@ -3722,7 +3984,7 @@ msgstr ""

3984 msgid "invalid refspec '%s'"

3985 msgstr ""

3986

3725 -#: ref-filter.c:39 wt-status.c:1855

3987 +#: ref-filter.c:39 wt-status.c:1861

3988 msgid "gone"

3989 msgstr ""

3990

@@ -3771,148 +4033,153 @@ msgstr ""

4033 msgid "%%(objecttype) does not take arguments"

4034 msgstr ""

4035

3774 -#: ref-filter.c:235

4036 +#: ref-filter.c:245

4037 +#, c-format

4038 +msgid "unrecognized %%(objectsize) argument: %s"

4039 +msgstr ""

4040 +

4041 +#: ref-filter.c:253

4042 #, c-format

3776 -msgid "%%(objectsize) does not take arguments"

4043 +msgid "%%(deltabase) does not take arguments"

4044 msgstr ""

4045

3779 -#: ref-filter.c:247

4046 +#: ref-filter.c:265

4047 #, c-format

4048 msgid "%%(body) does not take arguments"

4049 msgstr ""

4050

3784 -#: ref-filter.c:256

4051 +#: ref-filter.c:274

4052 #, c-format

4053 msgid "%%(subject) does not take arguments"

4054 msgstr ""

4055

3789 -#: ref-filter.c:278

4056 +#: ref-filter.c:296

4057 #, c-format

4058 msgid "unknown %%(trailers) argument: %s"

4059 msgstr ""

4060

3794 -#: ref-filter.c:307

4061 +#: ref-filter.c:325

4062 #, c-format

4063 msgid "positive value expected contents:lines=%s"

4064 msgstr ""

4065

3799 -#: ref-filter.c:309

4066 +#: ref-filter.c:327

4067 #, c-format

4068 msgid "unrecognized %%(contents) argument: %s"

4069 msgstr ""

4070

3804 -#: ref-filter.c:324

4071 +#: ref-filter.c:342

4072 #, c-format

4073 msgid "positive value expected objectname:short=%s"

4074 msgstr ""

4075

3809 -#: ref-filter.c:328

4076 +#: ref-filter.c:346

4077 #, c-format

4078 msgid "unrecognized %%(objectname) argument: %s"

4079 msgstr ""

4080

3814 -#: ref-filter.c:358

4081 +#: ref-filter.c:376

4082 #, c-format

4083 msgid "expected format: %%(align:<width>,<position>)"

4084 msgstr ""

4085

3819 -#: ref-filter.c:370

4086 +#: ref-filter.c:388

4087 #, c-format

4088 msgid "unrecognized position:%s"

4089 msgstr ""

4090

3824 -#: ref-filter.c:377

4091 +#: ref-filter.c:395

4092 #, c-format

4093 msgid "unrecognized width:%s"

4094 msgstr ""

4095

3829 -#: ref-filter.c:386

4096 +#: ref-filter.c:404

4097 #, c-format

4098 msgid "unrecognized %%(align) argument: %s"

4099 msgstr ""

4100

3834 -#: ref-filter.c:394

4101 +#: ref-filter.c:412

4102 #, c-format

4103 msgid "positive width expected with the %%(align) atom"

4104 msgstr ""

4105

3839 -#: ref-filter.c:412

4106 +#: ref-filter.c:430

4107 #, c-format

4108 msgid "unrecognized %%(if) argument: %s"

4109 msgstr ""

4110

3844 -#: ref-filter.c:508

4111 +#: ref-filter.c:527

4112 #, c-format

4113 msgid "malformed field name: %.*s"

4114 msgstr ""

4115

3849 -#: ref-filter.c:535

4116 +#: ref-filter.c:554

4117 #, c-format

4118 msgid "unknown field name: %.*s"

4119 msgstr ""

4120

3854 -#: ref-filter.c:539

4121 +#: ref-filter.c:558

4122 #, c-format

4123 msgid ""

4124 "not a git repository, but the field '%.*s' requires access to object data"

4125 msgstr ""

4126

3860 -#: ref-filter.c:663

4127 +#: ref-filter.c:682

4128 #, c-format

4129 msgid "format: %%(if) atom used without a %%(then) atom"

4130 msgstr ""

4131

3865 -#: ref-filter.c:726

4132 +#: ref-filter.c:745

4133 #, c-format

4134 msgid "format: %%(then) atom used without an %%(if) atom"

4135 msgstr ""

4136

3870 -#: ref-filter.c:728

4137 +#: ref-filter.c:747

4138 #, c-format

4139 msgid "format: %%(then) atom used more than once"

4140 msgstr ""

4141

3875 -#: ref-filter.c:730

4142 +#: ref-filter.c:749

4143 #, c-format

4144 msgid "format: %%(then) atom used after %%(else)"

4145 msgstr ""

4146

3880 -#: ref-filter.c:758

4147 +#: ref-filter.c:777

4148 #, c-format

4149 msgid "format: %%(else) atom used without an %%(if) atom"

4150 msgstr ""

4151

3885 -#: ref-filter.c:760

4152 +#: ref-filter.c:779

4153 #, c-format

4154 msgid "format: %%(else) atom used without a %%(then) atom"

4155 msgstr ""

4156

3890 -#: ref-filter.c:762

4157 +#: ref-filter.c:781

4158 #, c-format

4159 msgid "format: %%(else) atom used more than once"

4160 msgstr ""

4161

3895 -#: ref-filter.c:777

4162 +#: ref-filter.c:796

4163 #, c-format

4164 msgid "format: %%(end) atom used without corresponding atom"

4165 msgstr ""

4166

3900 -#: ref-filter.c:834

4167 +#: ref-filter.c:853

4168 #, c-format

4169 msgid "malformed format string %s"

4170 msgstr ""

4171

3905 -#: ref-filter.c:1424

4172 +#: ref-filter.c:1447

4173 #, c-format

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

4175 msgstr ""

4176

3910 -#: ref-filter.c:1427

4177 +#: ref-filter.c:1450

4178 #, c-format

4179 msgid "(no branch, rebasing detached HEAD %s)"

4180 msgstr ""

4181

3915 -#: ref-filter.c:1430

4182 +#: ref-filter.c:1453

4183 #, c-format

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

4185 msgstr ""

@@ -3920,7 +4187,7 @@ msgstr ""

4187 #. TRANSLATORS: make sure this matches "HEAD

4188 #. detached at " in wt-status.c

4189 #.

3923 -#: ref-filter.c:1438

4190 +#: ref-filter.c:1461

4191 #, c-format

4192 msgid "(HEAD detached at %s)"

4193 msgstr ""

@@ -3928,142 +4195,266 @@ msgstr ""

4195 #. TRANSLATORS: make sure this matches "HEAD

4196 #. detached from " in wt-status.c

4197 #.

3931 -#: ref-filter.c:1445

4198 +#: ref-filter.c:1468

4199 #, c-format

4200 msgid "(HEAD detached from %s)"

4201 msgstr ""

4202

3936 -#: ref-filter.c:1449

4203 +#: ref-filter.c:1472

4204 msgid "(no branch)"

4205 msgstr ""

4206

3940 -#: ref-filter.c:1483 ref-filter.c:1638

4207 +#: ref-filter.c:1506 ref-filter.c:1663

4208 #, c-format

4209 msgid "missing object %s for %s"

4210 msgstr ""

4211

3945 -#: ref-filter.c:1491

4212 +#: ref-filter.c:1516

4213 #, c-format

4214 msgid "parse_object_buffer failed on %s for %s"

4215 msgstr ""

4216

3950 -#: ref-filter.c:1857

4217 +#: ref-filter.c:1882

4218 #, c-format

4219 msgid "malformed object at '%s'"

4220 msgstr ""

4221

3955 -#: ref-filter.c:1946

4222 +#: ref-filter.c:1971

4223 #, c-format

4224 msgid "ignoring ref with broken name %s"

4225 msgstr ""

4226

3960 -#: ref-filter.c:2232

4227 +#: ref-filter.c:2257

4228 #, c-format

4229 msgid "format: %%(end) atom missing"

4230 msgstr ""

4231

3965 -#: ref-filter.c:2338

4232 +#: ref-filter.c:2352

4233 #, c-format

3967 -msgid "malformed object name %s"

4234 +msgid "option `%s' is incompatible with --merged"

4235 msgstr ""

4236

3970 -#: remote.c:607

4237 +#: ref-filter.c:2355

4238 #, c-format

3972 -msgid "Cannot fetch both %s and %s to %s"

4239 +msgid "option `%s' is incompatible with --no-merged"

4240 msgstr ""

4241

3975 -#: remote.c:611

4242 +#: ref-filter.c:2365

4243 #, c-format

3977 -msgid "%s usually tracks %s, not %s"

4244 +msgid "malformed object name %s"

4245 msgstr ""

4246

3980 -#: remote.c:615

4247 +#: ref-filter.c:2370

4248 #, c-format

3982 -msgid "%s tracks both %s and %s"

4249 +msgid "option `%s' must point to a commit"

4250 msgstr ""

4251

3985 -#: remote.c:623

3986 -msgid "Internal error"

4252 +#: remote.c:363

4253 +#, c-format

4254 +msgid "config remote shorthand cannot begin with '/': %s"

4255 msgstr ""

4256

3989 -#: remote.c:1569 remote.c:1670

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

4257 +#: remote.c:410

4258 +msgid "more than one receivepack given, using the first"

4259 msgstr ""

4260

3993 -#: remote.c:1578

3994 -#, c-format

3995 -msgid "no such branch: '%s'"

4261 +#: remote.c:418

4262 +msgid "more than one uploadpack given, using the first"

4263 msgstr ""

4264

3998 -#: remote.c:1581

4265 +#: remote.c:608

4266 #, c-format

4000 -msgid "no upstream configured for branch '%s'"

4267 +msgid "Cannot fetch both %s and %s to %s"

4268 msgstr ""

4269

4003 -#: remote.c:1587

4270 +#: remote.c:612

4271 +#, c-format

4272 +msgid "%s usually tracks %s, not %s"

4273 +msgstr ""

4274 +

4275 +#: remote.c:616

4276 +#, c-format

4277 +msgid "%s tracks both %s and %s"

4278 +msgstr ""

4279 +

4280 +#: remote.c:684

4281 +#, c-format

4282 +msgid "key '%s' of pattern had no '*'"

4283 +msgstr ""

4284 +

4285 +#: remote.c:694

4286 +#, c-format

4287 +msgid "value '%s' of pattern has no '*'"

4288 +msgstr ""

4289 +

4290 +#: remote.c:1000

4291 +#, c-format

4292 +msgid "src refspec %s does not match any"

4293 +msgstr ""

4294 +

4295 +#: remote.c:1005

4296 +#, c-format

4297 +msgid "src refspec %s matches more than one"

4298 +msgstr ""

4299 +

4300 +#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push

4301 +#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is

4302 +#. the <src>.

4303 +#.

4304 +#: remote.c:1020

4305 +#, c-format

4306 +msgid ""

4307 +"The destination you provided is not a full refname (i.e.,\n"

4308 +"starting with \"refs/\"). We tried to guess what you meant by:\n"

4309 +"\n"

4310 +"- Looking for a ref that matches '%s' on the remote side.\n"

4311 +"- Checking if the <src> being pushed ('%s')\n"

4312 +" is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"

4313 +" refs/{heads,tags}/ prefix on the remote side.\n"

4314 +"\n"

4315 +"Neither worked, so we gave up. You must fully qualify the ref."

4316 +msgstr ""

4317 +

4318 +#: remote.c:1040

4319 +#, c-format

4320 +msgid ""

4321 +"The <src> part of the refspec is a commit object.\n"

4322 +"Did you mean to create a new branch by pushing to\n"

4323 +"'%s:refs/heads/%s'?"

4324 +msgstr ""

4325 +

4326 +#: remote.c:1045

4327 +#, c-format

4328 +msgid ""

4329 +"The <src> part of the refspec is a tag object.\n"

4330 +"Did you mean to create a new tag by pushing to\n"

4331 +"'%s:refs/tags/%s'?"

4332 +msgstr ""

4333 +

4334 +#: remote.c:1050

4335 +#, c-format

4336 +msgid ""

4337 +"The <src> part of the refspec is a tree object.\n"

4338 +"Did you mean to tag a new tree by pushing to\n"

4339 +"'%s:refs/tags/%s'?"

4340 +msgstr ""

4341 +

4342 +#: remote.c:1055

4343 +#, c-format

4344 +msgid ""

4345 +"The <src> part of the refspec is a blob object.\n"

4346 +"Did you mean to tag a new blob by pushing to\n"

4347 +"'%s:refs/tags/%s'?"

4348 +msgstr ""

4349 +

4350 +#: remote.c:1091

4351 +#, c-format

4352 +msgid "%s cannot be resolved to branch"

4353 +msgstr ""

4354 +

4355 +#: remote.c:1102

4356 +#, c-format

4357 +msgid "unable to delete '%s': remote ref does not exist"

4358 +msgstr ""

4359 +

4360 +#: remote.c:1114

4361 +#, c-format

4362 +msgid "dst refspec %s matches more than one"

4363 +msgstr ""

4364 +

4365 +#: remote.c:1121

4366 +#, c-format

4367 +msgid "dst ref %s receives from more than one src"

4368 +msgstr ""

4369 +

4370 +#: remote.c:1624 remote.c:1725

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

4372 +msgstr ""

4373 +

4374 +#: remote.c:1633

4375 +#, c-format

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

4377 +msgstr ""

4378 +

4379 +#: remote.c:1636

4380 +#, c-format

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

4382 +msgstr ""

4383 +

4384 +#: remote.c:1642

4385 #, c-format

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

4387 msgstr ""

4388

4008 -#: remote.c:1602

4389 +#: remote.c:1657

4390 #, c-format

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

4392 msgstr ""

4393

4013 -#: remote.c:1614

4394 +#: remote.c:1669

4395 #, c-format

4396 msgid "branch '%s' has no remote for pushing"

4397 msgstr ""

4398

4018 -#: remote.c:1624

4399 +#: remote.c:1679

4400 #, c-format

4401 msgid "push refspecs for '%s' do not include '%s'"

4402 msgstr ""

4403

4023 -#: remote.c:1637

4404 +#: remote.c:1692

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

4406 msgstr ""

4407

4027 -#: remote.c:1659

4408 +#: remote.c:1714

4409 msgid "cannot resolve 'simple' push to a single destination"

4410 msgstr ""

4411

4031 -#: remote.c:1935

4412 +#: remote.c:1840

4413 +#, c-format

4414 +msgid "couldn't find remote ref %s"

4415 +msgstr ""

4416 +

4417 +#: remote.c:1853

4418 +#, c-format

4419 +msgid "* Ignoring funny ref '%s' locally"

4420 +msgstr ""

4421 +

4422 +#: remote.c:1990

4423 #, c-format

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

4425 msgstr ""

4426

4036 -#: remote.c:1939

4427 +#: remote.c:1994

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

4429 msgstr ""

4430

4040 -#: remote.c:1942

4431 +#: remote.c:1997

4432 #, c-format

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

4434 msgstr ""

4435

4045 -#: remote.c:1946

4436 +#: remote.c:2001

4437 #, c-format

4438 msgid "Your branch and '%s' refer to different commits.\n"

4439 msgstr ""

4440

4050 -#: remote.c:1949

4441 +#: remote.c:2004

4442 #, c-format

4443 msgid " (use \"%s\" for details)\n"

4444 msgstr ""

4445

4055 -#: remote.c:1953

4446 +#: remote.c:2008

4447 #, c-format

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

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

4450 msgstr[0] ""

4451 msgstr[1] ""

4452

4062 -#: remote.c:1959

4453 +#: remote.c:2014

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

4455 msgstr ""

4456

4066 -#: remote.c:1962

4457 +#: remote.c:2017

4458 #, c-format

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

4460 msgid_plural ""

@@ -4071,11 +4462,11 @@ msgid_plural ""

4462 msgstr[0] ""

4463 msgstr[1] ""

4464

4074 -#: remote.c:1970

4465 +#: remote.c:2025

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

4467 msgstr ""

4468

4078 -#: remote.c:1973

4469 +#: remote.c:2028

4470 #, c-format

4471 msgid ""

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

@@ -4086,10 +4477,15 @@ msgid_plural ""

4477 msgstr[0] ""

4478 msgstr[1] ""

4479

4089 -#: remote.c:1983

4480 +#: remote.c:2038

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

4482 msgstr ""

4483

4484 +#: remote.c:2221

4485 +#, c-format

4486 +msgid "cannot parse expected object name '%s'"

4487 +msgstr ""

4488 +

4489 #: replace-object.c:21

4490 #, c-format

4491 msgid "bad replace ref name: %s"

@@ -4113,7 +4509,8 @@ msgstr ""

4509 msgid "unable to write rerere record"

4510 msgstr ""

4511

4116 -#: rerere.c:485 rerere.c:692 sequencer.c:3136 sequencer.c:3162

4512 +#: rerere.c:485 rerere.c:692 sequencer.c:3186 sequencer.c:3212

4513 +#: builtin/fsck.c:314

4514 #, c-format

4515 msgid "could not write '%s'"

4516 msgstr ""

@@ -4168,8 +4565,8 @@ msgstr ""

4565 msgid "Recorded preimage for '%s'"

4566 msgstr ""

4567

4171 -#: rerere.c:881 submodule.c:1763 builtin/submodule--helper.c:1413

4172 -#: builtin/submodule--helper.c:1423

4568 +#: rerere.c:881 submodule.c:2012 builtin/submodule--helper.c:1417

4569 +#: builtin/submodule--helper.c:1427

4570 #, c-format

4571 msgid "could not create directory '%s'"

4572 msgstr ""

@@ -4203,144 +4600,144 @@ msgstr ""

4600 msgid "unable to open rr-cache directory"

4601 msgstr ""

4602

4206 -#: revision.c:2324

4603 +#: revision.c:2484

4604 msgid "your current branch appears to be broken"

4605 msgstr ""

4606

4210 -#: revision.c:2327

4607 +#: revision.c:2487

4608 #, c-format

4609 msgid "your current branch '%s' does not have any commits yet"

4610 msgstr ""

4611

4215 -#: revision.c:2523

4612 +#: revision.c:2684

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

4614 msgstr ""

4615

4219 -#: run-command.c:740

4616 +#: run-command.c:742

4617 msgid "open /dev/null failed"

4618 msgstr ""

4619

4223 -#: run-command.c:1229

4620 +#: run-command.c:1231

4621 #, c-format

4622 msgid "cannot create async thread: %s"

4623 msgstr ""

4624

4228 -#: run-command.c:1293

4625 +#: run-command.c:1295

4626 #, c-format

4627 msgid ""

4628 "The '%s' hook was ignored because it's not set as executable.\n"

4629 "You can disable this warning with `git config advice.ignoredHook false`."

4630 msgstr ""

4631

4235 -#: send-pack.c:142

4632 +#: send-pack.c:141

4633 msgid "unexpected flush packet while reading remote unpack status"

4634 msgstr ""

4635

4239 -#: send-pack.c:144

4636 +#: send-pack.c:143

4637 #, c-format

4638 msgid "unable to parse remote unpack status: %s"

4639 msgstr ""

4640

4244 -#: send-pack.c:146

4641 +#: send-pack.c:145

4642 #, c-format

4643 msgid "remote unpack failed: %s"

4644 msgstr ""

4645

4249 -#: send-pack.c:308

4646 +#: send-pack.c:306

4647 msgid "failed to sign the push certificate"

4648 msgstr ""

4649

4253 -#: send-pack.c:421

4650 +#: send-pack.c:420

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

4652 msgstr ""

4653

4257 -#: send-pack.c:423

4654 +#: send-pack.c:422

4655 msgid ""

4656 "not sending a push certificate since the receiving end does not support --"

4657 "signed push"

4658 msgstr ""

4659

4263 -#: send-pack.c:435

4660 +#: send-pack.c:434

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

4662 msgstr ""

4663

4267 -#: send-pack.c:440

4664 +#: send-pack.c:439

4665 msgid "the receiving end does not support push options"

4666 msgstr ""

4667

4271 -#: sequencer.c:183

4668 +#: sequencer.c:184

4669 #, c-format

4670 msgid "invalid commit message cleanup mode '%s'"

4671 msgstr ""

4672

4276 -#: sequencer.c:287

4673 +#: sequencer.c:288

4674 #, c-format

4675 msgid "could not delete '%s'"

4676 msgstr ""

4677

4281 -#: sequencer.c:313

4678 +#: sequencer.c:314

4679 msgid "revert"

4680 msgstr ""

4681

4285 -#: sequencer.c:315

4682 +#: sequencer.c:316

4683 msgid "cherry-pick"

4684 msgstr ""

4685

4289 -#: sequencer.c:317

4686 +#: sequencer.c:318

4687 msgid "rebase -i"

4688 msgstr ""

4689

4293 -#: sequencer.c:319

4690 +#: sequencer.c:320

4691 #, c-format

4692 msgid "unknown action: %d"

4693 msgstr ""

4694

4298 -#: sequencer.c:376

4695 +#: sequencer.c:378

4696 msgid ""

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

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

4699 msgstr ""

4700

4304 -#: sequencer.c:379

4701 +#: sequencer.c:381

4702 msgid ""

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

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

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

4706 msgstr ""

4707

4311 -#: sequencer.c:392 sequencer.c:2632

4708 +#: sequencer.c:394 sequencer.c:2671

4709 #, c-format

4710 msgid "could not lock '%s'"

4711 msgstr ""

4712

4316 -#: sequencer.c:399

4713 +#: sequencer.c:401

4714 #, c-format

4715 msgid "could not write eol to '%s'"

4716 msgstr ""

4717

4321 -#: sequencer.c:404 sequencer.c:2515 sequencer.c:2638 sequencer.c:2652

4322 -#: sequencer.c:2885

4718 +#: sequencer.c:406 sequencer.c:2554 sequencer.c:2677 sequencer.c:2691

4719 +#: sequencer.c:2931

4720 #, c-format

4721 msgid "failed to finalize '%s'"

4722 msgstr ""

4723

4327 -#: sequencer.c:427 sequencer.c:921 sequencer.c:1594 sequencer.c:2535

4328 -#: sequencer.c:2867 sequencer.c:2974 builtin/am.c:260 builtin/commit.c:746

4329 -#: builtin/merge.c:1084 builtin/rebase.c:152

4724 +#: sequencer.c:429 sequencer.c:931 sequencer.c:1615 sequencer.c:2574

4725 +#: sequencer.c:2913 sequencer.c:3022 builtin/am.c:245 builtin/commit.c:748

4726 +#: builtin/merge.c:1085 builtin/rebase.c:154

4727 #, c-format

4728 msgid "could not read '%s'"

4729 msgstr ""

4730

4334 -#: sequencer.c:453

4731 +#: sequencer.c:455

4732 #, c-format

4733 msgid "your local changes would be overwritten by %s."

4734 msgstr ""

4735

4339 -#: sequencer.c:457

4736 +#: sequencer.c:459

4737 msgid "commit your changes or stash them to proceed."

4738 msgstr ""

4739

4343 -#: sequencer.c:486

4740 +#: sequencer.c:491

4741 #, c-format

4742 msgid "%s: fast-forward"

4743 msgstr ""

@@ -4348,70 +4745,70 @@ msgstr ""

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

4746 #. "rebase -i".

4747 #.

4351 -#: sequencer.c:575

4748 +#: sequencer.c:582

4749 #, c-format

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

4751 msgstr ""

4752

4356 -#: sequencer.c:591

4753 +#: sequencer.c:598

4754 msgid "unable to update cache tree"

4755 msgstr ""

4756

4360 -#: sequencer.c:604

4757 +#: sequencer.c:612

4758 msgid "could not resolve HEAD commit"

4759 msgstr ""

4760

4364 -#: sequencer.c:684

4761 +#: sequencer.c:692

4762 #, c-format

4763 msgid "no key present in '%.*s'"

4764 msgstr ""

4765

4369 -#: sequencer.c:695

4766 +#: sequencer.c:703

4767 #, c-format

4768 msgid "unable to dequote value of '%s'"

4769 msgstr ""

4770

4374 -#: sequencer.c:732 wrapper.c:227 wrapper.c:397 builtin/am.c:719

4375 -#: builtin/am.c:811 builtin/merge.c:1081

4771 +#: sequencer.c:740 wrapper.c:227 wrapper.c:397 builtin/am.c:704

4772 +#: builtin/am.c:796 builtin/merge.c:1082 builtin/rebase.c:617

4773 #, c-format

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

4775 msgstr ""

4776

4380 -#: sequencer.c:742

4777 +#: sequencer.c:750

4778 msgid "'GIT_AUTHOR_NAME' already given"

4779 msgstr ""

4780

4384 -#: sequencer.c:747

4781 +#: sequencer.c:755

4782 msgid "'GIT_AUTHOR_EMAIL' already given"

4783 msgstr ""

4784

4388 -#: sequencer.c:752

4785 +#: sequencer.c:760

4786 msgid "'GIT_AUTHOR_DATE' already given"

4787 msgstr ""

4788

4392 -#: sequencer.c:756

4789 +#: sequencer.c:764

4790 #, c-format

4791 msgid "unknown variable '%s'"

4792 msgstr ""

4793

4397 -#: sequencer.c:761

4794 +#: sequencer.c:769

4795 msgid "missing 'GIT_AUTHOR_NAME'"

4796 msgstr ""

4797

4401 -#: sequencer.c:763

4798 +#: sequencer.c:771

4799 msgid "missing 'GIT_AUTHOR_EMAIL'"

4800 msgstr ""

4801

4405 -#: sequencer.c:765

4802 +#: sequencer.c:773

4803 msgid "missing 'GIT_AUTHOR_DATE'"

4804 msgstr ""

4805

4409 -#: sequencer.c:825

4806 +#: sequencer.c:833

4807 #, c-format

4808 msgid "invalid date format '%s' in '%s'"

4809 msgstr ""

4810

4414 -#: sequencer.c:842

4811 +#: sequencer.c:850

4812 #, c-format

4813 msgid ""

4814 "you have staged changes in your working tree\n"

@@ -4428,15 +4825,15 @@ msgid ""

4825 " git rebase --continue\n"

4826 msgstr ""

4827

4431 -#: sequencer.c:935

4828 +#: sequencer.c:945

4829 msgid "writing root commit"

4830 msgstr ""

4831

4435 -#: sequencer.c:1142

4832 +#: sequencer.c:1155

4833 msgid "'prepare-commit-msg' hook failed"

4834 msgstr ""

4835

4439 -#: sequencer.c:1149

4836 +#: sequencer.c:1162

4837 msgid ""

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

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

@@ -4451,7 +4848,7 @@ msgid ""

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

4849 msgstr ""

4850

4454 -#: sequencer.c:1162

4851 +#: sequencer.c:1175

4852 msgid ""

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

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

@@ -4465,299 +4862,294 @@ msgid ""

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

4863 msgstr ""

4864

4468 -#: sequencer.c:1202

4865 +#: sequencer.c:1217

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

4867 msgstr ""

4868

4472 -#: sequencer.c:1204

4869 +#: sequencer.c:1219

4870 msgid "could not parse newly created commit"

4871 msgstr ""

4872

4476 -#: sequencer.c:1250

4873 +#: sequencer.c:1265

4874 msgid "unable to resolve HEAD after creating commit"

4875 msgstr ""

4876

4480 -#: sequencer.c:1252

4877 +#: sequencer.c:1267

4878 msgid "detached HEAD"

4879 msgstr ""

4880

4484 -#: sequencer.c:1256

4881 +#: sequencer.c:1271

4882 msgid " (root-commit)"

4883 msgstr ""

4884

4488 -#: sequencer.c:1277

4885 +#: sequencer.c:1292

4886 msgid "could not parse HEAD"

4887 msgstr ""

4888

4492 -#: sequencer.c:1279

4889 +#: sequencer.c:1294

4890 #, c-format

4891 msgid "HEAD %s is not a commit!"

4892 msgstr ""

4893

4497 -#: sequencer.c:1283 builtin/commit.c:1543

4894 +#: sequencer.c:1298 builtin/commit.c:1546

4895 msgid "could not parse HEAD commit"

4896 msgstr ""

4897

4501 -#: sequencer.c:1334 sequencer.c:1934

4898 +#: sequencer.c:1350 sequencer.c:1964

4899 msgid "unable to parse commit author"

4900 msgstr ""

4901

4505 -#: sequencer.c:1344 builtin/am.c:1585 builtin/merge.c:677

4902 +#: sequencer.c:1360 builtin/am.c:1570 builtin/merge.c:678

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

4904 msgstr ""

4905

4509 -#: sequencer.c:1361 sequencer.c:1416

4906 +#: sequencer.c:1377 sequencer.c:1433

4907 #, c-format

4908 msgid "unable to read commit message from '%s'"

4909 msgstr ""

4910

4514 -#: sequencer.c:1383 builtin/am.c:1606 builtin/commit.c:1646 builtin/merge.c:858

4515 -#: builtin/merge.c:883

4911 +#: sequencer.c:1399 builtin/am.c:1591 builtin/commit.c:1649 builtin/merge.c:859

4912 +#: builtin/merge.c:884

4913 msgid "failed to write commit object"

4914 msgstr ""

4915

4519 -#: sequencer.c:1443

4916 +#: sequencer.c:1460

4917 #, c-format

4918 msgid "could not parse commit %s"

4919 msgstr ""

4920

4524 -#: sequencer.c:1448

4921 +#: sequencer.c:1465

4922 #, c-format

4923 msgid "could not parse parent commit %s"

4924 msgstr ""

4925

4529 -#: sequencer.c:1546 sequencer.c:1654

4926 +#: sequencer.c:1565 sequencer.c:1675

4927 #, c-format

4928 msgid "unknown command: %d"

4929 msgstr ""

4930

4534 -#: sequencer.c:1601 sequencer.c:1626

4931 +#: sequencer.c:1622 sequencer.c:1647

4932 #, c-format

4933 msgid "This is a combination of %d commits."

4934 msgstr ""

4935

4539 -#: sequencer.c:1611 sequencer.c:4744

4936 +#: sequencer.c:1632 sequencer.c:4808

4937 msgid "need a HEAD to fixup"

4938 msgstr ""

4939

4543 -#: sequencer.c:1613 sequencer.c:2912

4940 +#: sequencer.c:1634 sequencer.c:2958

4941 msgid "could not read HEAD"

4942 msgstr ""

4943

4547 -#: sequencer.c:1615

4944 +#: sequencer.c:1636

4945 msgid "could not read HEAD's commit message"

4946 msgstr ""

4947

4551 -#: sequencer.c:1621

4948 +#: sequencer.c:1642

4949 #, c-format

4950 msgid "cannot write '%s'"

4951 msgstr ""

4952

4556 -#: sequencer.c:1628 git-rebase--preserve-merges.sh:441

4953 +#: sequencer.c:1649 git-rebase--preserve-merges.sh:441

4954 msgid "This is the 1st commit message:"

4955 msgstr ""

4956

4560 -#: sequencer.c:1636

4957 +#: sequencer.c:1657

4958 #, c-format

4959 msgid "could not read commit message of %s"

4960 msgstr ""

4961

4565 -#: sequencer.c:1643

4962 +#: sequencer.c:1664

4963 #, c-format

4964 msgid "This is the commit message #%d:"

4965 msgstr ""

4966

4570 -#: sequencer.c:1649

4967 +#: sequencer.c:1670

4968 #, c-format

4969 msgid "The commit message #%d will be skipped:"

4970 msgstr ""

4971

4575 -#: sequencer.c:1732

4972 +#: sequencer.c:1758

4973 msgid "your index file is unmerged."

4974 msgstr ""

4975

4579 -#: sequencer.c:1739

4976 +#: sequencer.c:1765

4977 msgid "cannot fixup root commit"

4978 msgstr ""

4979

4583 -#: sequencer.c:1758

4980 +#: sequencer.c:1784

4981 #, c-format

4982 msgid "commit %s is a merge but no -m option was given."

4983 msgstr ""

4984

4588 -#: sequencer.c:1766

4985 +#: sequencer.c:1792 sequencer.c:1800

4986 #, c-format

4987 msgid "commit %s does not have parent %d"

4988 msgstr ""

4989

4593 -#: sequencer.c:1770

4594 -#, c-format

4595 -msgid "mainline was specified but commit %s is not a merge."

4596 -msgstr ""

4597 -

4598 -#: sequencer.c:1776

4990 +#: sequencer.c:1806

4991 #, c-format

4992 msgid "cannot get commit message for %s"

4993 msgstr ""

4994

4995 #. TRANSLATORS: The first %s will be a "todo" command like

4996 #. "revert" or "pick", the second %s a SHA1.

4605 -#: sequencer.c:1795

4997 +#: sequencer.c:1825

4998 #, c-format

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

5000 msgstr ""

5001

4610 -#: sequencer.c:1860

5002 +#: sequencer.c:1890

5003 #, c-format

5004 msgid "could not rename '%s' to '%s'"

5005 msgstr ""

5006

4615 -#: sequencer.c:1915

5007 +#: sequencer.c:1945

5008 #, c-format

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

5010 msgstr ""

5011

4620 -#: sequencer.c:1916

5012 +#: sequencer.c:1946

5013 #, c-format

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

5015 msgstr ""

5016

4625 -#: sequencer.c:1974

5017 +#: sequencer.c:2005

5018 #, c-format

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

5020 msgstr ""

5021

4630 -#: sequencer.c:1981

5022 +#: sequencer.c:2012

5023 #, c-format

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

5025 msgstr ""

5026

4635 -#: sequencer.c:2062

5027 +#: sequencer.c:2094

5028 #, c-format

5029 msgid "%s does not accept arguments: '%s'"

5030 msgstr ""

5031

4640 -#: sequencer.c:2071

5032 +#: sequencer.c:2103

5033 #, c-format

5034 msgid "missing arguments for %s"

5035 msgstr ""

5036

4645 -#: sequencer.c:2130

5037 +#: sequencer.c:2163

5038 #, c-format

5039 msgid "invalid line %d: %.*s"

5040 msgstr ""

5041

4650 -#: sequencer.c:2138

5042 +#: sequencer.c:2171

5043 #, c-format

5044 msgid "cannot '%s' without a previous commit"

5045 msgstr ""

5046

4655 -#: sequencer.c:2209

5047 +#: sequencer.c:2243

5048 msgid "please fix this using 'git rebase --edit-todo'."

5049 msgstr ""

5050

4659 -#: sequencer.c:2211

5051 +#: sequencer.c:2245

5052 #, c-format

5053 msgid "unusable instruction sheet: '%s'"

5054 msgstr ""

5055

4664 -#: sequencer.c:2216

5056 +#: sequencer.c:2250

5057 msgid "no commits parsed."

5058 msgstr ""

5059

4668 -#: sequencer.c:2227

5060 +#: sequencer.c:2261

5061 msgid "cannot cherry-pick during a revert."

5062 msgstr ""

5063

4672 -#: sequencer.c:2229

5064 +#: sequencer.c:2263

5065 msgid "cannot revert during a cherry-pick."

5066 msgstr ""

5067

4676 -#: sequencer.c:2299

5068 +#: sequencer.c:2333

5069 #, c-format

5070 msgid "invalid value for %s: %s"

5071 msgstr ""

5072

4681 -#: sequencer.c:2380

5073 +#: sequencer.c:2420

5074 msgid "unusable squash-onto"

5075 msgstr ""

5076

4685 -#: sequencer.c:2396

5077 +#: sequencer.c:2436

5078 #, c-format

5079 msgid "malformed options sheet: '%s'"

5080 msgstr ""

5081

4690 -#: sequencer.c:2479 sequencer.c:4005

5082 +#: sequencer.c:2518 sequencer.c:4067

5083 msgid "empty commit set passed"

5084 msgstr ""

5085

4694 -#: sequencer.c:2487

5086 +#: sequencer.c:2526

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

5088 msgstr ""

5089

4698 -#: sequencer.c:2488

5090 +#: sequencer.c:2527

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

5092 msgstr ""

5093

4702 -#: sequencer.c:2491

5094 +#: sequencer.c:2530

5095 #, c-format

5096 msgid "could not create sequencer directory '%s'"

5097 msgstr ""

5098

4707 -#: sequencer.c:2505

5099 +#: sequencer.c:2544

5100 msgid "could not lock HEAD"

5101 msgstr ""

5102

4711 -#: sequencer.c:2560 sequencer.c:3761

5103 +#: sequencer.c:2599 sequencer.c:3819

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

5105 msgstr ""

5106

4715 -#: sequencer.c:2562

5107 +#: sequencer.c:2601

5108 msgid "cannot resolve HEAD"

5109 msgstr ""

5110

4719 -#: sequencer.c:2564 sequencer.c:2599

5111 +#: sequencer.c:2603 sequencer.c:2638

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

5113 msgstr ""

5114

4723 -#: sequencer.c:2585 builtin/grep.c:721

5115 +#: sequencer.c:2624 builtin/grep.c:732

5116 #, c-format

5117 msgid "cannot open '%s'"

5118 msgstr ""

5119

4728 -#: sequencer.c:2587

5120 +#: sequencer.c:2626

5121 #, c-format

5122 msgid "cannot read '%s': %s"

5123 msgstr ""

5124

4733 -#: sequencer.c:2588

5125 +#: sequencer.c:2627

5126 msgid "unexpected end of file"

5127 msgstr ""

5128

4737 -#: sequencer.c:2594

5129 +#: sequencer.c:2633

5130 #, c-format

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

5132 msgstr ""

5133

4742 -#: sequencer.c:2605

5134 +#: sequencer.c:2644

5135 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

5136 msgstr ""

5137

4746 -#: sequencer.c:2709 sequencer.c:3679

5138 +#: sequencer.c:2750 sequencer.c:3735

5139 #, c-format

5140 msgid "could not update %s"

5141 msgstr ""

5142

4751 -#: sequencer.c:2747 sequencer.c:3659

5143 +#: sequencer.c:2788 sequencer.c:3715

5144 msgid "cannot read HEAD"

5145 msgstr ""

5146

4755 -#: sequencer.c:2762

5147 +#: sequencer.c:2805

5148 #, c-format

5149 msgid "unable to copy '%s' to '%s'"

5150 msgstr ""

5151

4760 -#: sequencer.c:2770

5152 +#: sequencer.c:2813

5153 #, c-format

5154 msgid ""

5155 "You can amend the commit now, with\n"

@@ -4769,27 +5161,27 @@ msgid ""

5161 " git rebase --continue\n"

5162 msgstr ""

5163

4772 -#: sequencer.c:2780

5164 +#: sequencer.c:2823

5165 #, c-format

5166 msgid "Could not apply %s... %.*s"

5167 msgstr ""

5168

4777 -#: sequencer.c:2787

5169 +#: sequencer.c:2830

5170 #, c-format

5171 msgid "Could not merge %.*s"

5172 msgstr ""

5173

4782 -#: sequencer.c:2798 sequencer.c:2802 builtin/difftool.c:640

5174 +#: sequencer.c:2844 sequencer.c:2848 builtin/difftool.c:641

5175 #, c-format

5176 msgid "could not copy '%s' to '%s'"

5177 msgstr ""

5178

4787 -#: sequencer.c:2824 sequencer.c:3242 builtin/rebase.c:580 builtin/rebase.c:1019

4788 -#: builtin/rebase.c:1372 builtin/rebase.c:1426

5179 +#: sequencer.c:2870 sequencer.c:3293 builtin/rebase.c:424 builtin/rebase.c:1230

5180 +#: builtin/rebase.c:1591 builtin/rebase.c:1646

5181 msgid "could not read index"

5182 msgstr ""

5183

4792 -#: sequencer.c:2829

5184 +#: sequencer.c:2875

5185 #, c-format

5186 msgid ""

5187 "execution failed: %s\n"

@@ -4799,11 +5191,11 @@ msgid ""

5191 "\n"

5192 msgstr ""

5193

4802 -#: sequencer.c:2835

5194 +#: sequencer.c:2881

5195 msgid "and made changes to the index and/or the working tree\n"

5196 msgstr ""

5197

4806 -#: sequencer.c:2841

5198 +#: sequencer.c:2887

5199 #, c-format

5200 msgid ""

5201 "execution succeeded: %s\n"

@@ -4814,76 +5206,76 @@ msgid ""

5206 "\n"

5207 msgstr ""

5208

4817 -#: sequencer.c:2902

5209 +#: sequencer.c:2948

5210 #, c-format

5211 msgid "illegal label name: '%.*s'"

5212 msgstr ""

5213

4822 -#: sequencer.c:2954

5214 +#: sequencer.c:3002

5215 msgid "writing fake root commit"

5216 msgstr ""

5217

4826 -#: sequencer.c:2959

5218 +#: sequencer.c:3007

5219 msgid "writing squash-onto"

5220 msgstr ""

5221

4830 -#: sequencer.c:2997 builtin/rebase.c:585 builtin/rebase.c:591

5222 +#: sequencer.c:3045 builtin/rebase.c:429 builtin/rebase.c:435

5223 #, c-format

5224 msgid "failed to find tree of %s"

5225 msgstr ""

5226

4835 -#: sequencer.c:3015 builtin/rebase.c:604

5227 +#: sequencer.c:3063 builtin/rebase.c:448

5228 msgid "could not write index"

5229 msgstr ""

5230

4839 -#: sequencer.c:3042

5231 +#: sequencer.c:3090

5232 #, c-format

5233 msgid "could not resolve '%s'"

5234 msgstr ""

5235

4844 -#: sequencer.c:3068

5236 +#: sequencer.c:3118

5237 msgid "cannot merge without a current revision"

5238 msgstr ""

5239

4848 -#: sequencer.c:3090

5240 +#: sequencer.c:3140

5241 #, c-format

5242 msgid "unable to parse '%.*s'"

5243 msgstr ""

5244

4853 -#: sequencer.c:3099

5245 +#: sequencer.c:3149

5246 #, c-format

5247 msgid "nothing to merge: '%.*s'"

5248 msgstr ""

5249

4858 -#: sequencer.c:3111

5250 +#: sequencer.c:3161

5251 msgid "octopus merge cannot be executed on top of a [new root]"

5252 msgstr ""

5253

4862 -#: sequencer.c:3126

5254 +#: sequencer.c:3176

5255 #, c-format

5256 msgid "could not get commit message of '%s'"

5257 msgstr ""

5258

4867 -#: sequencer.c:3274

5259 +#: sequencer.c:3325

5260 #, c-format

5261 msgid "could not even attempt to merge '%.*s'"

5262 msgstr ""

5263

4872 -#: sequencer.c:3290

5264 +#: sequencer.c:3341

5265 msgid "merge: Unable to write new index file"

5266 msgstr ""

5267

4876 -#: sequencer.c:3358 builtin/rebase.c:268

5268 +#: sequencer.c:3409 builtin/rebase.c:298

5269 #, c-format

5270 msgid "Applied autostash.\n"

5271 msgstr ""

5272

4881 -#: sequencer.c:3370

5273 +#: sequencer.c:3421

5274 #, c-format

5275 msgid "cannot store %s"

5276 msgstr ""

5277

4886 -#: sequencer.c:3373 builtin/rebase.c:284

5278 +#: sequencer.c:3424 builtin/rebase.c:314

5279 #, c-format

5280 msgid ""

5281 "Applying autostash resulted in conflicts.\n"

@@ -4891,31 +5283,31 @@ msgid ""

5283 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"

5284 msgstr ""

5285

4894 -#: sequencer.c:3427

5286 +#: sequencer.c:3478

5287 #, c-format

5288 msgid "could not checkout %s"

5289 msgstr ""

5290

4899 -#: sequencer.c:3441

5291 +#: sequencer.c:3492

5292 #, c-format

5293 msgid "%s: not a valid OID"

5294 msgstr ""

5295

4904 -#: sequencer.c:3446 git-rebase--preserve-merges.sh:724

5296 +#: sequencer.c:3497 git-rebase--preserve-merges.sh:724

5297 msgid "could not detach HEAD"

5298 msgstr ""

5299

4908 -#: sequencer.c:3461

5300 +#: sequencer.c:3512

5301 #, c-format

5302 msgid "Stopped at HEAD\n"

5303 msgstr ""

5304

4913 -#: sequencer.c:3463

5305 +#: sequencer.c:3514

5306 #, c-format

5307 msgid "Stopped at %s\n"

5308 msgstr ""

5309

4918 -#: sequencer.c:3471

5310 +#: sequencer.c:3522

5311 #, c-format

5312 msgid ""

5313 "Could not execute the todo command\n"

@@ -4928,108 +5320,108 @@ msgid ""

5320 " git rebase --continue\n"

5321 msgstr ""

5322

4931 -#: sequencer.c:3543

5323 +#: sequencer.c:3597

5324 #, c-format

5325 msgid "Stopped at %s... %.*s\n"

5326 msgstr ""

5327

4936 -#: sequencer.c:3622

5328 +#: sequencer.c:3677

5329 #, c-format

5330 msgid "unknown command %d"

5331 msgstr ""

5332

4941 -#: sequencer.c:3667

5333 +#: sequencer.c:3723

5334 msgid "could not read orig-head"

5335 msgstr ""

5336

4945 -#: sequencer.c:3672 sequencer.c:4741

5337 +#: sequencer.c:3728 sequencer.c:4805

5338 msgid "could not read 'onto'"

5339 msgstr ""

5340

4949 -#: sequencer.c:3686

5341 +#: sequencer.c:3742

5342 #, c-format

5343 msgid "could not update HEAD to %s"

5344 msgstr ""

5345

4954 -#: sequencer.c:3772

5346 +#: sequencer.c:3831

5347 msgid "cannot rebase: You have unstaged changes."

5348 msgstr ""

5349

4958 -#: sequencer.c:3781

5350 +#: sequencer.c:3840

5351 msgid "cannot amend non-existing commit"

5352 msgstr ""

5353

4962 -#: sequencer.c:3783

5354 +#: sequencer.c:3842

5355 #, c-format

5356 msgid "invalid file: '%s'"

5357 msgstr ""

5358

4967 -#: sequencer.c:3785

5359 +#: sequencer.c:3844

5360 #, c-format

5361 msgid "invalid contents: '%s'"

5362 msgstr ""

5363

4972 -#: sequencer.c:3788

5364 +#: sequencer.c:3847

5365 msgid ""

5366 "\n"

5367 "You have uncommitted changes in your working tree. Please, commit them\n"

5368 "first and then run 'git rebase --continue' again."

5369 msgstr ""

5370

4979 -#: sequencer.c:3824 sequencer.c:3862

5371 +#: sequencer.c:3883 sequencer.c:3921

5372 #, c-format

5373 msgid "could not write file: '%s'"

5374 msgstr ""

5375

4984 -#: sequencer.c:3877

5376 +#: sequencer.c:3936

5377 msgid "could not remove CHERRY_PICK_HEAD"

5378 msgstr ""

5379

4988 -#: sequencer.c:3884

5380 +#: sequencer.c:3943

5381 msgid "could not commit staged changes."

5382 msgstr ""

5383

4992 -#: sequencer.c:3982

5384 +#: sequencer.c:4044

5385 #, c-format

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

5387 msgstr ""

5388

4997 -#: sequencer.c:3986

5389 +#: sequencer.c:4048

5390 #, c-format

5391 msgid "%s: bad revision"

5392 msgstr ""

5393

5002 -#: sequencer.c:4021

5394 +#: sequencer.c:4083

5395 msgid "can't revert as initial commit"

5396 msgstr ""

5397

5006 -#: sequencer.c:4466

5398 +#: sequencer.c:4529

5399 msgid "make_script: unhandled options"

5400 msgstr ""

5401

5010 -#: sequencer.c:4469

5402 +#: sequencer.c:4532

5403 msgid "make_script: error preparing revisions"

5404 msgstr ""

5405

5014 -#: sequencer.c:4509 sequencer.c:4565 sequencer.c:4840

5406 +#: sequencer.c:4573 sequencer.c:4629 sequencer.c:4904

5407 #, c-format

5408 msgid "unusable todo list: '%s'"

5409 msgstr ""

5410

5019 -#: sequencer.c:4620

5411 +#: sequencer.c:4684

5412 #, c-format

5413 msgid ""

5414 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."

5415 msgstr ""

5416

5025 -#: sequencer.c:4690

5417 +#: sequencer.c:4754

5418 #, c-format

5419 msgid ""

5420 "Warning: some commits may have been dropped accidentally.\n"

5421 "Dropped commits (newer to older):\n"

5422 msgstr ""

5423

5032 -#: sequencer.c:4697

5424 +#: sequencer.c:4761

5425 #, c-format

5426 msgid ""

5427 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"

@@ -5040,7 +5432,7 @@ msgid ""

5432 "\n"

5433 msgstr ""

5434

5043 -#: sequencer.c:4710

5435 +#: sequencer.c:4774

5436 #, c-format

5437 msgid ""

5438 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"

@@ -5048,31 +5440,31 @@ msgid ""

5440 "Or you can abort the rebase with 'git rebase --abort'.\n"

5441 msgstr ""

5442

5051 -#: sequencer.c:4848 sequencer.c:4886

5443 +#: sequencer.c:4912 sequencer.c:4950

5444 msgid "nothing to do"

5445 msgstr ""

5446

5055 -#: sequencer.c:4852

5447 +#: sequencer.c:4916

5448 #, c-format

5449 msgid "Rebase %s onto %s (%d command)"

5450 msgid_plural "Rebase %s onto %s (%d commands)"

5451 msgstr[0] ""

5452 msgstr[1] ""

5453

5062 -#: sequencer.c:4864

5454 +#: sequencer.c:4928

5455 #, c-format

5456 msgid "could not copy '%s' to '%s'."

5457 msgstr ""

5458

5067 -#: sequencer.c:4868 sequencer.c:4897

5459 +#: sequencer.c:4932 sequencer.c:4961

5460 msgid "could not transform the todo list"

5461 msgstr ""

5462

5071 -#: sequencer.c:4900

5463 +#: sequencer.c:4964

5464 msgid "could not skip unnecessary pick commands"

5465 msgstr ""

5466

5075 -#: sequencer.c:4983

5467 +#: sequencer.c:5047

5468 msgid "the script was already rearranged."

5469 msgstr ""

5470

@@ -5171,314 +5563,314 @@ msgstr ""

5563 msgid "cannot chdir to '%s'"

5564 msgstr ""

5565

5174 -#: setup.c:711 setup.c:767 setup.c:777 setup.c:816 setup.c:824 setup.c:839

5566 +#: setup.c:711 setup.c:767 setup.c:777 setup.c:816 setup.c:824

5567 msgid "cannot come back to cwd"

5568 msgstr ""

5569

5178 -#: setup.c:837

5179 -#, c-format

5180 -msgid "not a git repository (or any of the parent directories): %s"

5181 -msgstr ""

5182 -

5183 -#: setup.c:848

5570 +#: setup.c:838

5571 #, c-format

5572 msgid "failed to stat '%*s%s%s'"

5573 msgstr ""

5574

5188 -#: setup.c:1078

5575 +#: setup.c:1068

5576 msgid "Unable to read current working directory"

5577 msgstr ""

5578

5192 -#: setup.c:1090 setup.c:1096

5579 +#: setup.c:1077 setup.c:1083

5580 #, c-format

5581 msgid "cannot change to '%s'"

5582 msgstr ""

5583

5197 -#: setup.c:1109

5584 +#: setup.c:1088

5585 +#, c-format

5586 +msgid "not a git repository (or any of the parent directories): %s"

5587 +msgstr ""

5588 +

5589 +#: setup.c:1094

5590 #, c-format

5591 msgid ""

5592 "not a git repository (or any parent up to mount point %s)\n"

5593 "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."

5594 msgstr ""

5595

5204 -#: setup.c:1192

5596 +#: setup.c:1204

5597 #, c-format

5598 msgid ""

5599 "problem with core.sharedRepository filemode value (0%.3o).\n"

5600 "The owner of files must always have read and write permissions."

5601 msgstr ""

5602

5211 -#: setup.c:1235

5603 +#: setup.c:1247

5604 msgid "open /dev/null or dup failed"

5605 msgstr ""

5606

5215 -#: setup.c:1250

5607 +#: setup.c:1262

5608 msgid "fork failed"

5609 msgstr ""

5610

5219 -#: setup.c:1255

5611 +#: setup.c:1267

5612 msgid "setsid failed"

5613 msgstr ""

5614

5223 -#: sha1-file.c:381

5615 +#: sha1-file.c:445

5616 #, c-format

5617 msgid "object directory %s does not exist; check .git/objects/info/alternates"

5618 msgstr ""

5619

5228 -#: sha1-file.c:432

5620 +#: sha1-file.c:496

5621 #, c-format

5622 msgid "unable to normalize alternate object path: %s"

5623 msgstr ""

5624

5233 -#: sha1-file.c:503

5625 +#: sha1-file.c:568

5626 #, c-format

5627 msgid "%s: ignoring alternate object stores, nesting too deep"

5628 msgstr ""

5629

5238 -#: sha1-file.c:510

5630 +#: sha1-file.c:575

5631 #, c-format

5632 msgid "unable to normalize object directory: %s"

5633 msgstr ""

5634

5243 -#: sha1-file.c:565

5635 +#: sha1-file.c:618

5636 msgid "unable to fdopen alternates lockfile"

5637 msgstr ""

5638

5247 -#: sha1-file.c:583

5639 +#: sha1-file.c:636

5640 msgid "unable to read alternates file"

5641 msgstr ""

5642

5251 -#: sha1-file.c:590

5643 +#: sha1-file.c:643

5644 msgid "unable to move new alternates file into place"

5645 msgstr ""

5646

5255 -#: sha1-file.c:625

5647 +#: sha1-file.c:678

5648 #, c-format

l10n: git.pot: v2.21.0 round 1 (214 new, 38 removed)