9fa976fffe · 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: 2016-05-24 23:42+0800\n"

11 +"POT-Creation-Date: 2016-08-15 22:43+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"

@@ -23,24 +23,69 @@ msgstr ""

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

24 msgstr ""

25

26 -#: advice.c:88

26 +#: advice.c:83

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

28 +msgstr ""

29 +

30 +#: advice.c:85

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

32 +msgstr ""

33 +

34 +#: advice.c:87

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

36 +msgstr ""

37 +

38 +#: advice.c:89

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

40 +msgstr ""

41 +

42 +#: advice.c:91

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

44 +msgstr ""

45 +

46 +#: advice.c:93

47 +#, c-format

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

49 +msgstr ""

50 +

51 +#: advice.c:101

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

32 -#: advice.c:101 builtin/merge.c:1238

57 +#: advice.c:109

58 +msgid "Exiting because of an unresolved conflict."

59 +msgstr ""

60 +

61 +#: advice.c:114 builtin/merge.c:1181

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

63 msgstr ""

64

36 -#: advice.c:103

65 +#: advice.c:116

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

67 msgstr ""

68

40 -#: advice.c:104

69 +#: advice.c:117

70 msgid "Exiting because of unfinished merge."

71 msgstr ""

72

73 +#: advice.c:123

74 +#, c-format

75 +msgid ""

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

77 +"\n"

78 +"You are in 'detached HEAD' state. You can look around, make experimental\n"

79 +"changes and commit them, and you can discard any commits you make in this\n"

80 +"state without impacting any branches by performing another checkout.\n"

81 +"\n"

82 +"If you want to create a new branch to retain commits you create, you may\n"

83 +"do so (now or later) by using -b with the checkout command again. Example:\n"

84 +"\n"

85 +" git checkout -b <new-branch-name>\n"

86 +"\n"

87 +msgstr ""

88 +

89 #: archive.c:12

90 msgid "git archive [<options>] <tree-ish> [<path>...]"

91 msgstr ""

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

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

104 msgstr ""

105

61 -#: archive.c:344 builtin/add.c:137 builtin/add.c:420 builtin/rm.c:327

106 +#: archive.c:344 builtin/add.c:139 builtin/add.c:435 builtin/rm.c:327

107 #, c-format

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

109 msgstr ""

@@ -71,7 +116,7 @@ msgstr ""

116 msgid "archive format"

117 msgstr ""

118

74 -#: archive.c:430 builtin/log.c:1395

119 +#: archive.c:430 builtin/log.c:1422

120 msgid "prefix"

121 msgstr ""

122

@@ -79,11 +124,11 @@ msgstr ""

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

125 msgstr ""

126

82 -#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548

83 -#: builtin/blame.c:2549 builtin/config.c:60 builtin/fast-export.c:987

127 +#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2553

128 +#: builtin/blame.c:2554 builtin/config.c:59 builtin/fast-export.c:987

129 #: builtin/fast-export.c:989 builtin/grep.c:722 builtin/hash-object.c:100

85 -#: builtin/ls-files.c:459 builtin/ls-files.c:462 builtin/notes.c:398

86 -#: builtin/notes.c:561 builtin/read-tree.c:109 parse-options.h:153

130 +#: builtin/ls-files.c:460 builtin/ls-files.c:463 builtin/notes.c:399

131 +#: builtin/notes.c:562 builtin/read-tree.c:109 parse-options.h:153

132 msgid "file"

133 msgstr ""

134

@@ -116,7 +161,7 @@ msgid "list supported archive formats"

161 msgstr ""

162

163 #: archive.c:451 builtin/archive.c:90 builtin/clone.c:82

119 -#: builtin/submodule--helper.c:776

164 +#: builtin/submodule--helper.c:832

165 msgid "repo"

166 msgstr ""

167

@@ -124,7 +169,7 @@ msgstr ""

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

170 msgstr ""

171

127 -#: archive.c:453 builtin/archive.c:92 builtin/notes.c:482

172 +#: archive.c:453 builtin/archive.c:92 builtin/notes.c:483

173 msgid "command"

174 msgstr ""

175

@@ -132,12 +177,143 @@ msgstr ""

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

178 msgstr ""

179

180 +#: archive.c:461

181 +msgid "Unexpected option --remote"

182 +msgstr ""

183 +

184 +#: archive.c:463

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

186 +msgstr ""

187 +

188 +#: archive.c:465

189 +msgid "Unexpected option --output"

190 +msgstr ""

191 +

192 +#: archive.c:487

193 +#, c-format

194 +msgid "Unknown archive format '%s'"

195 +msgstr ""

196 +

197 +#: archive.c:494

198 +#, c-format

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

200 +msgstr ""

201 +

202 #: attr.c:263

203 msgid ""

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

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

206 msgstr ""

207

208 +#: bisect.c:441

209 +#, c-format

210 +msgid "Could not open file '%s'"

211 +msgstr ""

212 +

213 +#: bisect.c:446

214 +#, c-format

215 +msgid "Badly quoted content in file '%s': %s"

216 +msgstr ""

217 +

218 +#: bisect.c:655

219 +#, c-format

220 +msgid "We cannot bisect more!\n"

221 +msgstr ""

222 +

223 +#: bisect.c:708

224 +#, c-format

225 +msgid "Not a valid commit name %s"

226 +msgstr ""

227 +

228 +#: bisect.c:732

229 +#, c-format

230 +msgid ""

231 +"The merge base %s is bad.\n"

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

233 +msgstr ""

234 +

235 +#: bisect.c:737

236 +#, c-format

237 +msgid ""

238 +"The merge base %s is new.\n"

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

240 +msgstr ""

241 +

242 +#: bisect.c:742

243 +#, c-format

244 +msgid ""

245 +"The merge base %s is %s.\n"

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

247 +msgstr ""

248 +

249 +#: bisect.c:750

250 +#, c-format

251 +msgid ""

252 +"Some %s revs are not ancestor of the %s rev.\n"

253 +"git bisect cannot work properly in this case.\n"

254 +"Maybe you mistook %s and %s revs?\n"

255 +msgstr ""

256 +

257 +#: bisect.c:763

258 +#, c-format

259 +msgid ""

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

261 +"So we cannot be sure the first %s commit is between %s and %s.\n"

262 +"We continue anyway."

263 +msgstr ""

264 +

265 +#: bisect.c:798

266 +#, c-format

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

268 +msgstr ""

269 +

270 +#: bisect.c:849

271 +#, c-format

272 +msgid "a %s revision is needed"

273 +msgstr ""

274 +

275 +#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248

276 +#, c-format

277 +msgid "could not create file '%s'"

278 +msgstr ""

279 +

280 +#: bisect.c:917

281 +#, c-format

282 +msgid "could not read file '%s'"

283 +msgstr ""

284 +

285 +#: bisect.c:947

286 +msgid "reading bisect refs failed"

287 +msgstr ""

288 +

289 +#: bisect.c:967

290 +#, c-format

291 +msgid "%s was both %s and %s\n"

292 +msgstr ""

293 +

294 +#: bisect.c:975

295 +#, c-format

296 +msgid ""

297 +"No testable commit found.\n"

298 +"Maybe you started with bad path parameters?\n"

299 +msgstr ""

300 +

301 +#: bisect.c:994

302 +#, c-format

303 +msgid "(roughly %d step)"

304 +msgid_plural "(roughly %d steps)"

305 +msgstr[0] ""

306 +msgstr[1] ""

307 +

308 +#. TRANSLATORS: the last %s will be replaced with

309 +#. "(roughly %d steps)" translation

310 +#: bisect.c:998

311 +#, c-format

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

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

314 +msgstr[0] ""

315 +msgstr[1] ""

316 +

317 #: branch.c:53

318 #, c-format

319 msgid ""

@@ -272,7 +448,7 @@ msgstr ""

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

449 msgstr ""

450

275 -#: bundle.c:87 builtin/commit.c:777

451 +#: bundle.c:87 builtin/commit.c:778

452 #, c-format

453 msgid "could not open '%s'"

454 msgstr ""

@@ -281,10 +457,10 @@ msgstr ""

457 msgid "Repository lacks these prerequisite commits:"

458 msgstr ""

459

284 -#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073

285 -#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340

286 -#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875

287 -#: builtin/merge.c:361 builtin/shortlog.c:170

460 +#: bundle.c:163 ref-filter.c:1462 sequencer.c:630 sequencer.c:1085

461 +#: builtin/blame.c:2763 builtin/commit.c:1057 builtin/log.c:348

462 +#: builtin/log.c:890 builtin/log.c:1336 builtin/log.c:1659 builtin/log.c:1901

463 +#: builtin/merge.c:356 builtin/shortlog.c:170

464 msgid "revision walk setup failed"

465 msgstr ""

466

@@ -323,7 +499,7 @@ msgstr ""

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

500 msgstr ""

501

326 -#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273

502 +#: bundle.c:443 builtin/log.c:165 builtin/log.c:1565 builtin/shortlog.c:273

503 #, c-format

504 msgid "unrecognized argument: %s"

505 msgstr ""

@@ -341,13 +517,13 @@ msgstr ""

517 msgid "index-pack died"

518 msgstr ""

519

344 -#: color.c:275

520 +#: color.c:290

521 #, c-format

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

523 msgstr ""

524

349 -#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504

350 -#: builtin/am.c:2134

525 +#: commit.c:40 builtin/am.c:433 builtin/am.c:469 builtin/am.c:1505

526 +#: builtin/am.c:2119

527 #, c-format

528 msgid "could not parse %s"

529 msgstr ""

@@ -361,128 +537,219 @@ msgstr ""

537 msgid "memory exhausted"

538 msgstr ""

539

364 -#: config.c:475 config.c:477

540 +#: config.c:516

541 +#, c-format

542 +msgid "bad config line %d in blob %s"

543 +msgstr ""

544 +

545 +#: config.c:520

546 +#, c-format

547 +msgid "bad config line %d in file %s"

548 +msgstr ""

549 +

550 +#: config.c:524

551 +#, c-format

552 +msgid "bad config line %d in standard input"

553 +msgstr ""

554 +

555 +#: config.c:528

556 +#, c-format

557 +msgid "bad config line %d in submodule-blob %s"

558 +msgstr ""

559 +

560 +#: config.c:532

561 +#, c-format

562 +msgid "bad config line %d in command line %s"

563 +msgstr ""

564 +

565 +#: config.c:536

566 +#, c-format

567 +msgid "bad config line %d in %s"

568 +msgstr ""

569 +

570 +#: config.c:660

571 +#, c-format

572 +msgid "bad numeric config value '%s' for '%s': out of range"

573 +msgstr ""

574 +

575 +#: config.c:661

576 +#, c-format

577 +msgid "bad numeric config value '%s' for '%s': invalid unit"

578 +msgstr ""

579 +

580 +#: config.c:667

581 +#, c-format

582 +msgid "bad numeric config value '%s' for '%s' in blob %s: out of range"

583 +msgstr ""

584 +

585 +#: config.c:668

586 +#, c-format

587 +msgid "bad numeric config value '%s' for '%s' in blob %s: invalid unit"

588 +msgstr ""

589 +

590 +#: config.c:672

591 +#, c-format

592 +msgid "bad numeric config value '%s' for '%s' in file %s: out of range"

593 +msgstr ""

594 +

595 +#: config.c:673

596 +#, c-format

597 +msgid "bad numeric config value '%s' for '%s' in file %s: invalid unit"

598 +msgstr ""

599 +

600 +#: config.c:677

601 +#, c-format

602 +msgid "bad numeric config value '%s' for '%s' in standard input: out of range"

603 +msgstr ""

604 +

605 +#: config.c:678

606 +#, c-format

607 +msgid "bad numeric config value '%s' for '%s' in standard input: invalid unit"

608 +msgstr ""

609 +

610 +#: config.c:682

611 +#, c-format

612 +msgid ""

613 +"bad numeric config value '%s' for '%s' in submodule-blob %s: out of range"

614 +msgstr ""

615 +

616 +#: config.c:683

617 +#, c-format

618 +msgid ""

619 +"bad numeric config value '%s' for '%s' in submodule-blob %s: invalid unit"

620 +msgstr ""

621 +

622 +#: config.c:687

623 +#, c-format

624 +msgid "bad numeric config value '%s' for '%s' in command line %s: out of range"

625 +msgstr ""

626 +

627 +#: config.c:688

628 #, c-format

366 -msgid "bad config line %d in %s %s"

629 +msgid "bad numeric config value '%s' for '%s' in command line %s: invalid unit"

630 msgstr ""

631

369 -#: config.c:593

632 +#: config.c:692

633 #, c-format

371 -msgid "bad numeric config value '%s' for '%s' in %s %s: %s"

634 +msgid "bad numeric config value '%s' for '%s' in %s: out of range"

635 msgstr ""

636

374 -#: config.c:595

637 +#: config.c:693

638 #, c-format

376 -msgid "bad numeric config value '%s' for '%s': %s"

639 +msgid "bad numeric config value '%s' for '%s' in %s: invalid unit"

640 msgstr ""

641

379 -#: config.c:680

642 +#: config.c:780

643 #, c-format

644 msgid "failed to expand user dir in: '%s'"

645 msgstr ""

646

384 -#: config.c:761 config.c:772

647 +#: config.c:861 config.c:872

648 #, c-format

649 msgid "bad zlib compression level %d"

650 msgstr ""

651

389 -#: config.c:890

652 +#: config.c:990

653 #, c-format

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

655 msgstr ""

656

394 -#: config.c:1228

657 +#: config.c:1324

658 msgid "unable to parse command-line config"

659 msgstr ""

660

398 -#: config.c:1284

399 -msgid "unknown error occured while reading the configuration files"

661 +#: config.c:1374

662 +msgid "unknown error occurred while reading the configuration files"

663 msgstr ""

664

402 -#: config.c:1629

665 +#: config.c:1728

666 #, c-format

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

668 msgstr ""

669

407 -#: config.c:1631

670 +#: config.c:1730

671 #, c-format

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

673 msgstr ""

674

412 -#: config.c:1690

675 +#: config.c:1789

676 #, c-format

677 msgid "%s has multiple values"

678 msgstr ""

679

417 -#: config.c:2224

680 +#: config.c:2323

681 #, c-format

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

683 msgstr ""

684

422 -#: config.c:2226

685 +#: config.c:2325

686 #, c-format

687 msgid "could not unset '%s'"

688 msgstr ""

689

427 -#: connected.c:69

690 +#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140

691 +msgid "Checking connectivity"

692 +msgstr ""

693 +

694 +#: connected.c:74

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

696 msgstr ""

697

431 -#: connected.c:89

698 +#: connected.c:94

699 msgid "failed write to rev-list"

700 msgstr ""

701

435 -#: connected.c:96

702 +#: connected.c:101

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

704 msgstr ""

705

439 -#: date.c:95

706 +#: date.c:97

707 msgid "in the future"

708 msgstr ""

709

443 -#: date.c:101

710 +#: date.c:103

711 #, c-format

712 msgid "%lu second ago"

713 msgid_plural "%lu seconds ago"

714 msgstr[0] ""

715 msgstr[1] ""

716

450 -#: date.c:108

717 +#: date.c:110

718 #, c-format

719 msgid "%lu minute ago"

720 msgid_plural "%lu minutes ago"

721 msgstr[0] ""

722 msgstr[1] ""

723

457 -#: date.c:115

724 +#: date.c:117

725 #, c-format

726 msgid "%lu hour ago"

727 msgid_plural "%lu hours ago"

728 msgstr[0] ""

729 msgstr[1] ""

730

464 -#: date.c:122

731 +#: date.c:124

732 #, c-format

733 msgid "%lu day ago"

734 msgid_plural "%lu days ago"

735 msgstr[0] ""

736 msgstr[1] ""

737

471 -#: date.c:128

738 +#: date.c:130

739 #, c-format

740 msgid "%lu week ago"

741 msgid_plural "%lu weeks ago"

742 msgstr[0] ""

743 msgstr[1] ""

744

478 -#: date.c:135

745 +#: date.c:137

746 #, c-format

747 msgid "%lu month ago"

748 msgid_plural "%lu months ago"

749 msgstr[0] ""

750 msgstr[1] ""

751

485 -#: date.c:146

752 +#: date.c:148

753 #, c-format

754 msgid "%lu year"

755 msgid_plural "%lu years"

@@ -490,14 +757,14 @@ msgstr[0] ""

757 msgstr[1] ""

758

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

493 -#: date.c:149

760 +#: date.c:151

761 #, c-format

762 msgid "%s, %lu month ago"

763 msgid_plural "%s, %lu months ago"

764 msgstr[0] ""

765 msgstr[1] ""

766

500 -#: date.c:154 date.c:159

767 +#: date.c:156 date.c:161

768 #, c-format

769 msgid "%lu year ago"

770 msgid_plural "%lu years ago"

@@ -509,7 +776,7 @@ msgstr[1] ""

776 msgid "failed to read orderfile '%s'"

777 msgstr ""

778

512 -#: diffcore-rename.c:538

779 +#: diffcore-rename.c:540

780 msgid "Performing inexact rename detection"

781 msgstr ""

782

@@ -535,23 +802,23 @@ msgid ""

802 "%s"

803 msgstr ""

804

538 -#: diff.c:3007

805 +#: diff.c:3017

806 #, c-format

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

808 msgstr ""

809

543 -#: diff.c:3405

810 +#: diff.c:3415

811 msgid "--follow requires exactly one pathspec"

812 msgstr ""

813

547 -#: diff.c:3568

814 +#: diff.c:3578

815 #, c-format

816 msgid ""

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

818 "%s"

819 msgstr ""

820

554 -#: diff.c:3582

821 +#: diff.c:3592

822 #, c-format

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

824 msgstr ""

@@ -564,39 +831,30 @@ msgstr ""

831 msgid "Untracked cache is disabled on this system or location."

832 msgstr ""

833

567 -#: gpg-interface.c:166 gpg-interface.c:235

568 -msgid "could not run gpg."

569 -msgstr ""

570 -

834 #: gpg-interface.c:178

572 -msgid "gpg did not accept the data"

573 -msgstr ""

574 -

575 -#: gpg-interface.c:189

835 msgid "gpg failed to sign the data"

836 msgstr ""

837

579 -#: gpg-interface.c:222

580 -#, c-format

581 -msgid "could not create temporary file '%s'"

838 +#: gpg-interface.c:208

839 +msgid "could not create temporary file"

840 msgstr ""

841

584 -#: gpg-interface.c:224

842 +#: gpg-interface.c:210

843 #, c-format

844 msgid "failed writing detached signature to '%s'"

845 msgstr ""

846

589 -#: grep.c:1718

847 +#: grep.c:1792

848 #, c-format

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

850 msgstr ""

851

594 -#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155

852 +#: grep.c:1809 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155

853 #, c-format

854 msgid "failed to stat '%s'"

855 msgstr ""

856

599 -#: grep.c:1746

857 +#: grep.c:1820

858 #, c-format

859 msgid "'%s': short read"

860 msgstr ""

@@ -642,7 +900,7 @@ msgstr ""

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

901 msgstr ""

902

645 -#: help.c:404 help.c:464

903 +#: help.c:404 help.c:470

904 msgid ""

905 "\n"

906 "Did you mean this?"

@@ -652,7 +910,7 @@ msgid_plural ""

910 msgstr[0] ""

911 msgstr[1] ""

912

655 -#: help.c:460

913 +#: help.c:466

914 #, c-format

915 msgid "%s: %s - %s"

916 msgstr ""

@@ -678,252 +936,238 @@ msgstr ""

936 msgid "failed to read the cache"

937 msgstr ""

938

681 -#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375

682 -#: builtin/checkout.c:586 builtin/clone.c:732

939 +#: merge.c:94 builtin/am.c:1992 builtin/am.c:2027 builtin/checkout.c:375

940 +#: builtin/checkout.c:589 builtin/clone.c:732

941 msgid "unable to write new index file"

942 msgstr ""

943

686 -#: merge-recursive.c:189

687 -#, c-format

944 +#: merge-recursive.c:212

945 msgid "(bad commit)\n"

946 msgstr ""

947

691 -#: merge-recursive.c:209

948 +#: merge-recursive.c:234

949 #, c-format

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

951 msgstr ""

952

696 -#: merge-recursive.c:270

953 +#: merge-recursive.c:304

954 msgid "error building trees"

955 msgstr ""

956

700 -#: merge-recursive.c:689

957 +#: merge-recursive.c:723

958 #, c-format

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

960 msgstr ""

961

705 -#: merge-recursive.c:700

962 +#: merge-recursive.c:734

963 #, c-format

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

965 msgstr ""

966

710 -#: merge-recursive.c:714 merge-recursive.c:735

967 +#: merge-recursive.c:748 merge-recursive.c:767

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

969 msgstr ""

970

714 -#: merge-recursive.c:725

971 +#: merge-recursive.c:757

972 #, c-format

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

974 msgstr ""

975

719 -#: merge-recursive.c:765

976 +#: merge-recursive.c:799

977 #, c-format

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

979 msgstr ""

980

724 -#: merge-recursive.c:767

981 +#: merge-recursive.c:801

982 #, c-format

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

984 msgstr ""

985

729 -#: merge-recursive.c:790 builtin/clone.c:376

986 +#: merge-recursive.c:825

987 #, c-format

731 -msgid "failed to open '%s'"

988 +msgid "failed to open '%s': %s"

989 msgstr ""

990

734 -#: merge-recursive.c:798

991 +#: merge-recursive.c:836

992 #, c-format

736 -msgid "failed to symlink '%s'"

993 +msgid "failed to symlink '%s': %s"

994 msgstr ""

995

739 -#: merge-recursive.c:801

996 +#: merge-recursive.c:841

997 #, c-format

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

999 msgstr ""

1000

744 -#: merge-recursive.c:939

1001 +#: merge-recursive.c:981

1002 msgid "Failed to execute internal merge"

1003 msgstr ""

1004

748 -#: merge-recursive.c:943

1005 +#: merge-recursive.c:985

1006 #, c-format

1007 msgid "Unable to add %s to database"

1008 msgstr ""

1009

753 -#: merge-recursive.c:959

754 -msgid "unsupported object type in the tree"

755 -msgstr ""

756 -

757 -#: merge-recursive.c:1034 merge-recursive.c:1048

1010 +#: merge-recursive.c:1084 merge-recursive.c:1098

1011 #, c-format

1012 msgid ""

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

1014 "in tree."

1015 msgstr ""

1016

764 -#: merge-recursive.c:1040 merge-recursive.c:1053

1017 +#: merge-recursive.c:1090 merge-recursive.c:1103

1018 #, c-format

1019 msgid ""

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

1021 "in tree at %s."

1022 msgstr ""

1023

771 -#: merge-recursive.c:1094

1024 +#: merge-recursive.c:1146

1025 msgid "rename"

1026 msgstr ""

1027

775 -#: merge-recursive.c:1094

1028 +#: merge-recursive.c:1146

1029 msgid "renamed"

1030 msgstr ""

1031

779 -#: merge-recursive.c:1150

1032 +#: merge-recursive.c:1203

1033 #, c-format

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

1035 msgstr ""

1036

784 -#: merge-recursive.c:1172

1037 +#: merge-recursive.c:1228

1038 #, c-format

1039 msgid ""

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

1041 "\"->\"%s\" in \"%s\"%s"

1042 msgstr ""

1043

791 -#: merge-recursive.c:1177

1044 +#: merge-recursive.c:1233

1045 msgid " (left unresolved)"

1046 msgstr ""

1047

795 -#: merge-recursive.c:1231

1048 +#: merge-recursive.c:1295

1049 #, c-format

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

1051 msgstr ""

1052

800 -#: merge-recursive.c:1261

1053 +#: merge-recursive.c:1328

1054 #, c-format

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

1056 msgstr ""

1057

805 -#: merge-recursive.c:1460

1058 +#: merge-recursive.c:1534

1059 #, c-format

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

1061 msgstr ""

1062

810 -#: merge-recursive.c:1470

1063 +#: merge-recursive.c:1549

1064 #, c-format

1065 msgid "Adding merged %s"

1066 msgstr ""

1067

815 -#: merge-recursive.c:1475 merge-recursive.c:1677

1068 +#: merge-recursive.c:1556 merge-recursive.c:1769

1069 #, c-format

1070 msgid "Adding as %s instead"

1071 msgstr ""

1072

820 -#: merge-recursive.c:1526

1073 +#: merge-recursive.c:1613

1074 #, c-format

1075 msgid "cannot read object %s"

1076 msgstr ""

1077

825 -#: merge-recursive.c:1529

1078 +#: merge-recursive.c:1616

1079 #, c-format

1080 msgid "object %s is not a blob"

1081 msgstr ""

1082

830 -#: merge-recursive.c:1581

1083 +#: merge-recursive.c:1669

1084 msgid "modify"

1085 msgstr ""

1086

834 -#: merge-recursive.c:1581

1087 +#: merge-recursive.c:1669

1088 msgid "modified"

1089 msgstr ""

1090

838 -#: merge-recursive.c:1591

1091 +#: merge-recursive.c:1679

1092 msgid "content"

1093 msgstr ""

1094

842 -#: merge-recursive.c:1598

1095 +#: merge-recursive.c:1686

1096 msgid "add/add"

1097 msgstr ""

1098

846 -#: merge-recursive.c:1632

1099 +#: merge-recursive.c:1721

1100 #, c-format

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

1102 msgstr ""

1103

851 -#: merge-recursive.c:1646

1104 +#: merge-recursive.c:1735

1105 #, c-format

1106 msgid "Auto-merging %s"

1107 msgstr ""

1108

856 -#: merge-recursive.c:1650 git-submodule.sh:941

1109 +#: merge-recursive.c:1739 git-submodule.sh:919

1110 msgid "submodule"

1111 msgstr ""

1112

860 -#: merge-recursive.c:1651

1113 +#: merge-recursive.c:1740

1114 #, c-format

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

1116 msgstr ""

1117

865 -#: merge-recursive.c:1737

1118 +#: merge-recursive.c:1834

1119 #, c-format

1120 msgid "Removing %s"

1121 msgstr ""

1122

870 -#: merge-recursive.c:1762

1123 +#: merge-recursive.c:1860

1124 msgid "file/directory"

1125 msgstr ""

1126

874 -#: merge-recursive.c:1768

1127 +#: merge-recursive.c:1866

1128 msgid "directory/file"

1129 msgstr ""

1130

878 -#: merge-recursive.c:1773

1131 +#: merge-recursive.c:1871

1132 #, c-format

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

1134 msgstr ""

1135

883 -#: merge-recursive.c:1781

1136 +#: merge-recursive.c:1880

1137 #, c-format

1138 msgid "Adding %s"

1139 msgstr ""

1140

888 -#: merge-recursive.c:1798

889 -msgid "Fatal merge failure, shouldn't happen."

890 -msgstr ""

891 -

892 -#: merge-recursive.c:1817

1141 +#: merge-recursive.c:1917

1142 msgid "Already up-to-date!"

1143 msgstr ""

1144

896 -#: merge-recursive.c:1826

1145 +#: merge-recursive.c:1926

1146 #, c-format

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

1148 msgstr ""

1149

901 -#: merge-recursive.c:1856

902 -#, c-format

903 -msgid "Unprocessed path??? %s"

904 -msgstr ""

905 -

906 -#: merge-recursive.c:1904

1150 +#: merge-recursive.c:2009

1151 msgid "Merging:"

1152 msgstr ""

1153

910 -#: merge-recursive.c:1917

1154 +#: merge-recursive.c:2022

1155 #, c-format

1156 msgid "found %u common ancestor:"

1157 msgid_plural "found %u common ancestors:"

1158 msgstr[0] ""

1159 msgstr[1] ""

1160

917 -#: merge-recursive.c:1954

1161 +#: merge-recursive.c:2061

1162 msgid "merge returned no commit"

1163 msgstr ""

1164

921 -#: merge-recursive.c:2011

1165 +#: merge-recursive.c:2124

1166 #, c-format

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

1168 msgstr ""

1169

926 -#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831

1170 +#: merge-recursive.c:2138 builtin/merge.c:641 builtin/merge.c:788

1171 msgid "Unable to write index."

1172 msgstr ""

1173

@@ -1048,7 +1292,7 @@ msgid ""

1292 "Perhaps you forgot to add either ':/' or '.' ?"

1293 msgstr ""

1294

1051 -#: pretty.c:971

1295 +#: pretty.c:973

1296 msgid "unable to parse --pretty format"

1297 msgstr ""

1298

@@ -1070,23 +1314,22 @@ msgid ""

1314 "Using version %i"

1315 msgstr ""

1316

1073 -#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985

1074 -#: builtin/merge.c:995

1317 +#: refs.c:551 builtin/merge.c:840

1318 #, c-format

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

1320 msgstr ""

1321

1079 -#: refs/files-backend.c:2243

1322 +#: refs/files-backend.c:2534

1323 #, c-format

1324 msgid "could not delete reference %s: %s"

1325 msgstr ""

1326

1084 -#: refs/files-backend.c:2246

1327 +#: refs/files-backend.c:2537

1328 #, c-format

1329 msgid "could not delete references: %s"

1330 msgstr ""

1331

1089 -#: refs/files-backend.c:2255

1332 +#: refs/files-backend.c:2546

1333 #, c-format

1334 msgid "could not remove reference %s"

1335 msgstr ""

@@ -1244,74 +1487,74 @@ msgstr ""

1487 msgid "Internal error"

1488 msgstr ""

1489

1247 -#: remote.c:1678 remote.c:1721

1490 +#: remote.c:1677 remote.c:1720

1491 msgid "HEAD does not point to a branch"

1492 msgstr ""

1493

1251 -#: remote.c:1687

1494 +#: remote.c:1686

1495 #, c-format

1496 msgid "no such branch: '%s'"

1497 msgstr ""

1498

1256 -#: remote.c:1690

1499 +#: remote.c:1689

1500 #, c-format

1501 msgid "no upstream configured for branch '%s'"

1502 msgstr ""

1503

1261 -#: remote.c:1696

1504 +#: remote.c:1695

1505 #, c-format

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

1507 msgstr ""

1508

1266 -#: remote.c:1711

1509 +#: remote.c:1710

1510 #, c-format

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

1512 msgstr ""

1513

1271 -#: remote.c:1726

1514 +#: remote.c:1725

1515 #, c-format

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

1517 msgstr ""

1518

1276 -#: remote.c:1737

1519 +#: remote.c:1736

1520 #, c-format

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

1522 msgstr ""

1523

1281 -#: remote.c:1750

1524 +#: remote.c:1749

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

1526 msgstr ""

1527

1285 -#: remote.c:1772

1528 +#: remote.c:1771

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

1530 msgstr ""

1531

1289 -#: remote.c:2074

1532 +#: remote.c:2073

1533 #, c-format

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

1535 msgstr ""

1536

1294 -#: remote.c:2078

1537 +#: remote.c:2077

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

1539 msgstr ""

1540

1298 -#: remote.c:2081

1541 +#: remote.c:2080

1542 #, c-format

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

1544 msgstr ""

1545

1303 -#: remote.c:2085

1546 +#: remote.c:2084

1547 #, c-format

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

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

1550 msgstr[0] ""

1551 msgstr[1] ""

1552

1310 -#: remote.c:2091

1553 +#: remote.c:2090

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

1555 msgstr ""

1556

1314 -#: remote.c:2094

1557 +#: remote.c:2093

1558 #, c-format

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

1560 msgid_plural ""

@@ -1319,11 +1562,11 @@ msgid_plural ""

1562 msgstr[0] ""

1563 msgstr[1] ""

1564

1322 -#: remote.c:2102

1565 +#: remote.c:2101

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

1567 msgstr ""

1568

1326 -#: remote.c:2105

1569 +#: remote.c:2104

1570 #, c-format

1571 msgid ""

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

@@ -1334,20 +1577,20 @@ msgid_plural ""

1577 msgstr[0] ""

1578 msgstr[1] ""

1579

1337 -#: remote.c:2115

1580 +#: remote.c:2114

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

1582 msgstr ""

1583

1341 -#: revision.c:2142

1584 +#: revision.c:2132

1585 msgid "your current branch appears to be broken"

1586 msgstr ""

1587

1345 -#: revision.c:2145

1588 +#: revision.c:2135

1589 #, c-format

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

1591 msgstr ""

1592

1350 -#: revision.c:2339

1593 +#: revision.c:2329

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

1595 msgstr ""

1596

@@ -1360,24 +1603,28 @@ msgstr ""

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

1604 msgstr ""

1605

1363 -#: send-pack.c:295

1606 +#: send-pack.c:298

1607 msgid "failed to sign the push certificate"

1608 msgstr ""

1609

1367 -#: send-pack.c:404

1610 +#: send-pack.c:411

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

1612 msgstr ""

1613

1371 -#: send-pack.c:406

1614 +#: send-pack.c:413

1615 msgid ""

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

1617 "signed push"

1618 msgstr ""

1619

1377 -#: send-pack.c:418

1620 +#: send-pack.c:425

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

1622 msgstr ""

1623

1624 +#: send-pack.c:430

1625 +msgid "the receiving end does not support push options"

1626 +msgstr ""

1627 +

1628 #: sequencer.c:174

1629 msgid ""

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

@@ -1391,14 +1638,14 @@ msgid ""

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

1639 msgstr ""

1640

1394 -#: sequencer.c:190 sequencer.c:833 sequencer.c:912

1641 +#: sequencer.c:190 sequencer.c:841 sequencer.c:924

1642 #, c-format

1643 msgid "Could not write to %s"

1644 msgstr ""

1645

1399 -#: sequencer.c:193

1646 +#: sequencer.c:193 sequencer.c:843 sequencer.c:928

1647 #, c-format

1401 -msgid "Error wrapping up %s"

1648 +msgid "Error wrapping up %s."

1649 msgstr ""

1650

1651 #: sequencer.c:208

@@ -1413,202 +1660,232 @@ msgstr ""

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

1661 msgstr ""

1662

1663 +#: sequencer.c:228

1664 +#, c-format

1665 +msgid "%s: fast-forward"

1666 +msgstr ""

1667 +

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

1417 -#: sequencer.c:300

1669 +#: sequencer.c:303

1670 #, c-format

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

1672 msgstr ""

1673

1422 -#: sequencer.c:318

1674 +#: sequencer.c:321

1675 msgid "Could not resolve HEAD commit\n"

1676 msgstr ""

1677

1426 -#: sequencer.c:338

1678 +#: sequencer.c:341

1679 msgid "Unable to update cache tree\n"

1680 msgstr ""

1681

1430 -#: sequencer.c:390

1682 +#: sequencer.c:393

1683 #, c-format

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

1685 msgstr ""

1686

1435 -#: sequencer.c:395

1687 +#: sequencer.c:398

1688 #, c-format

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

1690 msgstr ""

1691

1440 -#: sequencer.c:460

1692 +#: sequencer.c:463

1693 msgid "Your index file is unmerged."

1694 msgstr ""

1695

1444 -#: sequencer.c:479

1696 +#: sequencer.c:482

1697 #, c-format

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

1699 msgstr ""

1700

1449 -#: sequencer.c:487

1701 +#: sequencer.c:490

1702 #, c-format

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

1704 msgstr ""

1705

1454 -#: sequencer.c:491

1706 +#: sequencer.c:494

1707 #, c-format

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

1709 msgstr ""

1710

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

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

1461 -#: sequencer.c:504

1713 +#: sequencer.c:507

1714 #, c-format

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

1716 msgstr ""

1717

1466 -#: sequencer.c:508

1718 +#: sequencer.c:511

1719 #, c-format

1720 msgid "Cannot get commit message for %s"

1721 msgstr ""

1722

1471 -#: sequencer.c:594

1723 +#: sequencer.c:597

1724 #, c-format

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

1726 msgstr ""

1727

1476 -#: sequencer.c:595

1728 +#: sequencer.c:598

1729 #, c-format

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

1731 msgstr ""

1732

1481 -#: sequencer.c:630

1733 +#: sequencer.c:633

1734 msgid "empty commit set passed"

1735 msgstr ""

1736

1485 -#: sequencer.c:638

1737 +#: sequencer.c:641

1738 #, c-format

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

1740 msgstr ""

1741

1490 -#: sequencer.c:642

1742 +#: sequencer.c:645

1743 #, c-format

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

1745 msgstr ""

1746

1495 -#: sequencer.c:702

1496 -#, c-format

1497 -msgid "Cannot %s during a %s"

1747 +#: sequencer.c:705

1748 +msgid "Cannot revert during a another revert."

1749 +msgstr ""

1750 +

1751 +#: sequencer.c:706

1752 +msgid "Cannot revert during a cherry-pick."

1753 +msgstr ""

1754 +

1755 +#: sequencer.c:709

1756 +msgid "Cannot cherry-pick during a revert."

1757 +msgstr ""

1758 +

1759 +#: sequencer.c:710

1760 +msgid "Cannot cherry-pick during another cherry-pick."

1761 msgstr ""

1762

1500 -#: sequencer.c:724

1763 +#: sequencer.c:732

1764 #, c-format

1765 msgid "Could not parse line %d."

1766 msgstr ""

1767

1505 -#: sequencer.c:729

1768 +#: sequencer.c:737

1769 msgid "No commits parsed."

1770 msgstr ""

1771

1509 -#: sequencer.c:741

1772 +#: sequencer.c:749

1773 #, c-format

1774 msgid "Could not open %s"

1775 msgstr ""

1776

1514 -#: sequencer.c:745

1777 +#: sequencer.c:753

1778 #, c-format

1779 msgid "Could not read %s."

1780 msgstr ""

1781

1519 -#: sequencer.c:752

1782 +#: sequencer.c:760

1783 #, c-format

1784 msgid "Unusable instruction sheet: %s"

1785 msgstr ""

1786

1524 -#: sequencer.c:782

1787 +#: sequencer.c:790

1788 #, c-format

1789 msgid "Invalid key: %s"

1790 msgstr ""

1791

1529 -#: sequencer.c:785 builtin/pull.c:50 builtin/pull.c:52

1792 +#: sequencer.c:793 builtin/pull.c:50 builtin/pull.c:52

1793 #, c-format

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

1795 msgstr ""

1796

1534 -#: sequencer.c:795

1797 +#: sequencer.c:803

1798 #, c-format

1799 msgid "Malformed options sheet: %s"

1800 msgstr ""

1801

1539 -#: sequencer.c:814

1802 +#: sequencer.c:822

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

1804 msgstr ""

1805

1543 -#: sequencer.c:815

1806 +#: sequencer.c:823

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

1808 msgstr ""

1809

1547 -#: sequencer.c:819

1810 +#: sequencer.c:827

1811 #, c-format

1812 msgid "Could not create sequencer directory %s"

1813 msgstr ""

1814

1552 -#: sequencer.c:835 sequencer.c:916

1553 -#, c-format

1554 -msgid "Error wrapping up %s."

1555 -msgstr ""

1556 -

1557 -#: sequencer.c:854 sequencer.c:986

1815 +#: sequencer.c:862 sequencer.c:998

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

1817 msgstr ""

1818

1561 -#: sequencer.c:856

1819 +#: sequencer.c:864

1820 msgid "cannot resolve HEAD"

1821 msgstr ""

1822

1565 -#: sequencer.c:858

1823 +#: sequencer.c:866 sequencer.c:900

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

1825 msgstr ""

1826

1569 -#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851

1827 +#: sequencer.c:886 builtin/fetch.c:724 builtin/fetch.c:970

1828 #, c-format

1829 msgid "cannot open %s"

1830 msgstr ""

1831

1574 -#: sequencer.c:880

1832 +#: sequencer.c:888

1833 #, c-format

1834 msgid "cannot read %s: %s"

1835 msgstr ""

1836

1579 -#: sequencer.c:881

1837 +#: sequencer.c:889

1838 msgid "unexpected end of file"

1839 msgstr ""

1840

1583 -#: sequencer.c:887

1841 +#: sequencer.c:895

1842 #, c-format

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

1844 msgstr ""

1845

1588 -#: sequencer.c:909

1846 +#: sequencer.c:921

1847 #, c-format

1848 msgid "Could not format %s."

1849 msgstr ""

1850

1593 -#: sequencer.c:1054

1851 +#: sequencer.c:1066

1852 #, c-format

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

1854 msgstr ""

1855

1598 -#: sequencer.c:1057

1856 +#: sequencer.c:1069

1857 #, c-format

1858 msgid "%s: bad revision"

1859 msgstr ""

1860

1603 -#: sequencer.c:1091

1861 +#: sequencer.c:1102

1862 msgid "Can't revert as initial commit"

1863 msgstr ""

1864

1607 -#: sequencer.c:1092

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

1865 +#: setup.c:160

1866 +#, c-format

1867 +msgid ""

1868 +"%s: no such path in the working tree.\n"

1869 +"Use 'git <command> -- <path>...' to specify paths that do not exist locally."

1870 +msgstr ""

1871 +

1872 +#: setup.c:173

1873 +#, c-format

1874 +msgid ""

1875 +"ambiguous argument '%s': unknown revision or path not in the working tree.\n"

1876 +"Use '--' to separate paths from revisions, like this:\n"

1877 +"'git <command> [<revision>...] -- [<file>...]'"

1878 +msgstr ""

1879 +

1880 +#: setup.c:223

1881 +#, c-format

1882 +msgid ""

1883 +"ambiguous argument '%s': both revision and filename\n"

1884 +"Use '--' to separate paths from revisions, like this:\n"

1885 +"'git <command> [<revision>...] -- [<file>...]'"

1886 msgstr ""

1887

1611 -#: setup.c:248

1888 +#: setup.c:248 builtin/apply.c:3362 builtin/apply.c:3373 builtin/apply.c:3419

1889 #, c-format

1890 msgid "failed to read %s"

1891 msgstr ""

@@ -1622,16 +1899,48 @@ msgstr ""

1899 msgid "unknown repository extensions found:"

1900 msgstr ""

1901

1625 -#: sha1_file.c:1080

1902 +#: setup.c:762

1903 +#, c-format

1904 +msgid "Not a git repository (or any of the parent directories): %s"

1905 +msgstr ""

1906 +

1907 +#: setup.c:764 setup.c:915 builtin/index-pack.c:1641

1908 +msgid "Cannot come back to cwd"

1909 +msgstr ""

1910 +

1911 +#: setup.c:845

1912 +msgid "Unable to read current working directory"

1913 +msgstr ""

1914 +

1915 +#: setup.c:920

1916 +#, c-format

1917 +msgid ""

1918 +"Not a git repository (or any parent up to mount point %s)\n"

1919 +"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."

1920 +msgstr ""

1921 +

1922 +#: setup.c:927

1923 +#, c-format

1924 +msgid "Cannot change to '%s/..'"

1925 +msgstr ""

1926 +

1927 +#: setup.c:989

1928 +#, c-format

1929 +msgid ""

1930 +"Problem with core.sharedRepository filemode value (0%.3o).\n"

1931 +"The owner of files must always have read and write permissions."

1932 +msgstr ""

1933 +

1934 +#: sha1_file.c:1046

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

1936 msgstr ""

1937

1629 -#: sha1_file.c:2458

1938 +#: sha1_file.c:2434

1939 #, c-format

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

1941 msgstr ""

1942

1634 -#: sha1_file.c:2462

1943 +#: sha1_file.c:2438

1944 #, c-format

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

1946 msgstr ""

@@ -1676,7 +1985,7 @@ msgstr ""

1985 msgid "negative values not allowed for submodule.fetchJobs"

1986 msgstr ""

1987

1679 -#: submodule-config.c:355

1988 +#: submodule-config.c:358

1989 #, c-format

1990 msgid "invalid value for %s"

1991 msgstr ""

@@ -1735,6 +2044,43 @@ msgstr ""

2044 msgid "could not rename temporary file to %s"

2045 msgstr ""

2046

2047 +#: transport.c:62

2048 +#, c-format

2049 +msgid "Would set upstream of '%s' to '%s' of '%s'\n"

2050 +msgstr ""

2051 +

2052 +#: transport.c:151

2053 +#, c-format

2054 +msgid "transport: invalid depth option '%s'"

2055 +msgstr ""

2056 +

2057 +#: transport.c:771

2058 +#, c-format

2059 +msgid ""

2060 +"The following submodule paths contain changes that can\n"

2061 +"not be found on any remote:\n"

2062 +msgstr ""

2063 +

2064 +#: transport.c:775

2065 +#, c-format

2066 +msgid ""

2067 +"\n"

2068 +"Please try\n"

2069 +"\n"

2070 +"\tgit push --recurse-submodules=on-demand\n"

2071 +"\n"

2072 +"or cd to the path and use\n"

2073 +"\n"

2074 +"\tgit push\n"

2075 +"\n"

2076 +"to push them to a remote.\n"

2077 +"\n"

2078 +msgstr ""

2079 +

2080 +#: transport.c:783

2081 +msgid "Aborting."

2082 +msgstr ""

2083 +

2084 #: transport-helper.c:1041

2085 #, c-format

2086 msgid "Could not read ref %s"

@@ -1744,7 +2090,7 @@ msgstr ""

2090 #, c-format

2091 msgid ""

2092 "Your local changes to the following files would be overwritten by checkout:\n"

1747 -"%%sPlease commit your changes or stash them before you can switch branches."

2093 +"%%sPlease commit your changes or stash them before you switch branches."

2094 msgstr ""

2095

2096 #: unpack-trees.c:66

@@ -1758,7 +2104,7 @@ msgstr ""

2104 #, c-format

2105 msgid ""

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

1761 -"%%sPlease commit your changes or stash them before you can merge."

2107 +"%%sPlease commit your changes or stash them before you merge."

2108 msgstr ""

2109

2110 #: unpack-trees.c:71

@@ -1772,7 +2118,7 @@ msgstr ""

2118 #, c-format

2119 msgid ""

2120 "Your local changes to the following files would be overwritten by %s:\n"

1775 -"%%sPlease commit your changes or stash them before you can %s."

2121 +"%%sPlease commit your changes or stash them before you %s."

2122 msgstr ""

2123

2124 #: unpack-trees.c:76

@@ -1793,7 +2139,7 @@ msgstr ""

2139 #, c-format

2140 msgid ""

2141 "The following untracked working tree files would be removed by checkout:\n"

1796 -"%%sPlease move or remove them before you can switch branches."

2142 +"%%sPlease move or remove them before you switch branches."

2143 msgstr ""

2144

2145 #: unpack-trees.c:87

@@ -1807,7 +2153,7 @@ msgstr ""

2153 #, c-format

2154 msgid ""

2155 "The following untracked working tree files would be removed by merge:\n"

1810 -"%%sPlease move or remove them before you can merge."

2156 +"%%sPlease move or remove them before you merge."

2157 msgstr ""

2158

2159 #: unpack-trees.c:92

@@ -1821,7 +2167,7 @@ msgstr ""

2167 #, c-format

2168 msgid ""

2169 "The following untracked working tree files would be removed by %s:\n"

1824 -"%%sPlease move or remove them before you can %s."

2170 +"%%sPlease move or remove them before you %s."

2171 msgstr ""

2172

2173 #: unpack-trees.c:97

@@ -1836,7 +2182,7 @@ msgstr ""

2182 msgid ""

2183 "The following untracked working tree files would be overwritten by "

2184 "checkout:\n"

1839 -"%%sPlease move or remove them before you can switch branches."

2185 +"%%sPlease move or remove them before you switch branches."

2186 msgstr ""

2187

2188 #: unpack-trees.c:104

@@ -1851,7 +2197,7 @@ msgstr ""

2197 #, c-format

2198 msgid ""

2199 "The following untracked working tree files would be overwritten by merge:\n"

1854 -"%%sPlease move or remove them before you can merge."

2200 +"%%sPlease move or remove them before you merge."

2201 msgstr ""

2202

2203 #: unpack-trees.c:109

@@ -1865,7 +2211,7 @@ msgstr ""

2211 #, c-format

2212 msgid ""

2213 "The following untracked working tree files would be overwritten by %s:\n"

1868 -"%%sPlease move or remove them before you can %s."

2214 +"%%sPlease move or remove them before you %s."

2215 msgstr ""

2216

2217 #: unpack-trees.c:114

@@ -1941,43 +2287,43 @@ msgstr ""

2287 msgid "invalid '..' path segment"

2288 msgstr ""

2289

1944 -#: wrapper.c:222 wrapper.c:381

2290 +#: worktree.c:282

2291 +#, c-format

2292 +msgid "failed to read '%s'"

2293 +msgstr ""

2294 +

2295 +#: wrapper.c:222 wrapper.c:392

2296 #, c-format

2297 msgid "could not open '%s' for reading and writing"

2298 msgstr ""

2299

1949 -#: wrapper.c:224 wrapper.c:383 builtin/am.c:779

2300 +#: wrapper.c:224 wrapper.c:394 builtin/am.c:778

2301 #, c-format

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

2303 msgstr ""

2304

1954 -#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772

1955 -#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086

2305 +#: wrapper.c:226 wrapper.c:396 builtin/am.c:324 builtin/am.c:771

2306 +#: builtin/am.c:859 builtin/commit.c:1712 builtin/merge.c:1029

2307 #: builtin/pull.c:407

2308 #, c-format

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

2310 msgstr ""

2311

1961 -#: wrapper.c:594 wrapper.c:615

2312 +#: wrapper.c:605 wrapper.c:626

2313 #, c-format

2314 msgid "unable to access '%s'"

2315 msgstr ""

2316

1966 -#: wrapper.c:623

2317 +#: wrapper.c:634

2318 msgid "unable to get current working directory"

2319 msgstr ""

2320

1970 -#: wrapper.c:650

1971 -#, c-format

1972 -msgid "could not open %s for writing"

1973 -msgstr ""

1974 -

1975 -#: wrapper.c:661 builtin/am.c:410

2321 +#: wrapper.c:658

2322 #, c-format

2323 msgid "could not write to %s"

2324 msgstr ""

2325

1980 -#: wrapper.c:667

2326 +#: wrapper.c:660

2327 #, c-format

2328 msgid "could not close %s"

2329 msgstr ""

@@ -2007,11 +2353,11 @@ msgstr ""

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

2354 msgstr ""

2355

2010 -#: wt-status.c:198 wt-status.c:881

2356 +#: wt-status.c:198 wt-status.c:882

2357 msgid "Changes to be committed:"

2358 msgstr ""

2359

2014 -#: wt-status.c:216 wt-status.c:890

2360 +#: wt-status.c:216 wt-status.c:891

2361 msgid "Changes not staged for commit:"

2362 msgstr ""

2363

@@ -2065,11 +2411,6 @@ msgstr ""

2411 msgid "both modified:"

2412 msgstr ""

2413

2068 -#: wt-status.c:266

2069 -#, c-format

2070 -msgid "bug: unhandled unmerged status %x"

2071 -msgstr ""

2072 -

2414 #: wt-status.c:274

2415 msgid "new file:"

2416 msgstr ""

@@ -2114,233 +2455,232 @@ msgstr ""

2455 msgid "untracked content, "

2456 msgstr ""

2457

2117 -#: wt-status.c:391

2118 -#, c-format

2119 -msgid "bug: unhandled diff status %c"

2120 -msgstr ""

2121 -

2122 -#: wt-status.c:755

2458 +#: wt-status.c:756

2459 msgid "Submodules changed but not updated:"

2460 msgstr ""

2461

2126 -#: wt-status.c:757

2462 +#: wt-status.c:758

2463 msgid "Submodule changes to be committed:"

2464 msgstr ""

2465

2130 -#: wt-status.c:838

2466 +#: wt-status.c:839

2467 msgid ""

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

2469 "Everything below will be removed."

2470 msgstr ""

2471

2136 -#: wt-status.c:949

2472 +#: wt-status.c:950

2473 msgid "You have unmerged paths."

2474 msgstr ""

2475

2140 -#: wt-status.c:952

2476 +#: wt-status.c:953

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

2478 msgstr ""

2479

2144 -#: wt-status.c:956

2480 +#: wt-status.c:955

2481 +msgid " (use \"git merge --abort\" to abort the merge)"

2482 +msgstr ""

2483 +

2484 +#: wt-status.c:960

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

2486 msgstr ""

2487

2148 -#: wt-status.c:959

2488 +#: wt-status.c:963

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

2490 msgstr ""

2491

2152 -#: wt-status.c:969

2492 +#: wt-status.c:973

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

2494 msgstr ""

2495

2156 -#: wt-status.c:972

2496 +#: wt-status.c:976

2497 msgid "The current patch is empty."

2498 msgstr ""

2499

2160 -#: wt-status.c:976

2500 +#: wt-status.c:980

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

2502 msgstr ""

2503

2164 -#: wt-status.c:978

2504 +#: wt-status.c:982

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

2506 msgstr ""

2507

2168 -#: wt-status.c:980

2508 +#: wt-status.c:984

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

2510 msgstr ""

2511

2172 -#: wt-status.c:1105

2512 +#: wt-status.c:1109

2513 msgid "No commands done."

2514 msgstr ""

2515

2176 -#: wt-status.c:1108

2516 +#: wt-status.c:1112

2517 #, c-format

2518 msgid "Last command done (%d command done):"

2519 msgid_plural "Last commands done (%d commands done):"

2520 msgstr[0] ""

2521 msgstr[1] ""

2522

2183 -#: wt-status.c:1119

2523 +#: wt-status.c:1123

2524 #, c-format

2525 msgid " (see more in file %s)"

2526 msgstr ""

2527

2188 -#: wt-status.c:1124

2528 +#: wt-status.c:1128

2529 msgid "No commands remaining."

2530 msgstr ""

2531

2192 -#: wt-status.c:1127

2532 +#: wt-status.c:1131

2533 #, c-format

2534 msgid "Next command to do (%d remaining command):"

2535 msgid_plural "Next commands to do (%d remaining commands):"

2536 msgstr[0] ""

2537 msgstr[1] ""

2538

2199 -#: wt-status.c:1135

2539 +#: wt-status.c:1139

2540 msgid " (use \"git rebase --edit-todo\" to view and edit)"

2541 msgstr ""

2542

2203 -#: wt-status.c:1148

2543 +#: wt-status.c:1152

2544 #, c-format

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

2546 msgstr ""

2547

2208 -#: wt-status.c:1153

2548 +#: wt-status.c:1157

2549 msgid "You are currently rebasing."

2550 msgstr ""

2551

2212 -#: wt-status.c:1167

2552 +#: wt-status.c:1171

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

2554 msgstr ""

2555

2216 -#: wt-status.c:1169

2556 +#: wt-status.c:1173

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

2558 msgstr ""

2559

2220 -#: wt-status.c:1171

2560 +#: wt-status.c:1175

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

2562 msgstr ""

2563

2224 -#: wt-status.c:1177

2564 +#: wt-status.c:1181

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

2566 msgstr ""

2567

2228 -#: wt-status.c:1181

2568 +#: wt-status.c:1185

2569 #, c-format

2570 msgid ""

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

2572 msgstr ""

2573

2234 -#: wt-status.c:1186

2574 +#: wt-status.c:1190

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

2576 msgstr ""

2577

2238 -#: wt-status.c:1189

2578 +#: wt-status.c:1193

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

2580 msgstr ""

2581

2242 -#: wt-status.c:1193

2582 +#: wt-status.c:1197

2583 #, c-format

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

2585 msgstr ""

2586

2247 -#: wt-status.c:1198

2587 +#: wt-status.c:1202

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

2589 msgstr ""

2590

2251 -#: wt-status.c:1201

2591 +#: wt-status.c:1205

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

2593 msgstr ""

2594

2255 -#: wt-status.c:1203

2595 +#: wt-status.c:1207

2596 msgid ""

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

2598 msgstr ""

2599

2260 -#: wt-status.c:1213

2600 +#: wt-status.c:1217

2601 #, c-format

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

2603 msgstr ""

2604

2265 -#: wt-status.c:1218

2605 +#: wt-status.c:1222

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

2607 msgstr ""

2608

2269 -#: wt-status.c:1221

2609 +#: wt-status.c:1225

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

2611 msgstr ""

2612

2273 -#: wt-status.c:1223

2613 +#: wt-status.c:1227

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

2615 msgstr ""

2616

2277 -#: wt-status.c:1232

2617 +#: wt-status.c:1236

2618 #, c-format

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

2620 msgstr ""

2621

2282 -#: wt-status.c:1237

2622 +#: wt-status.c:1241

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

2624 msgstr ""

2625

2286 -#: wt-status.c:1240

2626 +#: wt-status.c:1244

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

2628 msgstr ""

2629

2290 -#: wt-status.c:1242

2630 +#: wt-status.c:1246

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

2632 msgstr ""

2633

2294 -#: wt-status.c:1253

2634 +#: wt-status.c:1257

2635 #, c-format

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

2637 msgstr ""

2638

2299 -#: wt-status.c:1257

2639 +#: wt-status.c:1261

2640 msgid "You are currently bisecting."

2641 msgstr ""

2642

2303 -#: wt-status.c:1260

2643 +#: wt-status.c:1264

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

2645 msgstr ""

2646

2307 -#: wt-status.c:1460

2647 +#: wt-status.c:1464

2648 msgid "On branch "

2649 msgstr ""

2650

2311 -#: wt-status.c:1466

2651 +#: wt-status.c:1470

2652 msgid "interactive rebase in progress; onto "

2653 msgstr ""

2654

2315 -#: wt-status.c:1468

2655 +#: wt-status.c:1472

2656 msgid "rebase in progress; onto "

2657 msgstr ""

2658

2319 -#: wt-status.c:1473

2659 +#: wt-status.c:1477

2660 msgid "HEAD detached at "

2661 msgstr ""

2662

2323 -#: wt-status.c:1475

2663 +#: wt-status.c:1479

2664 msgid "HEAD detached from "

2665 msgstr ""

2666

2327 -#: wt-status.c:1478

2667 +#: wt-status.c:1482

2668 msgid "Not currently on any branch."

2669 msgstr ""

2670

2331 -#: wt-status.c:1496

2671 +#: wt-status.c:1500

2672 msgid "Initial commit"

2673 msgstr ""

2674

2335 -#: wt-status.c:1510

2675 +#: wt-status.c:1514

2676 msgid "Untracked files"

2677 msgstr ""

2678

2339 -#: wt-status.c:1512

2679 +#: wt-status.c:1516

2680 msgid "Ignored files"

2681 msgstr ""

2682

2343 -#: wt-status.c:1516

2683 +#: wt-status.c:1520

2684 #, c-format

2685 msgid ""

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

@@ -2348,78 +2688,78 @@ msgid ""

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

2689 msgstr ""

2690

2351 -#: wt-status.c:1522

2691 +#: wt-status.c:1526

2692 #, c-format

2693 msgid "Untracked files not listed%s"

2694 msgstr ""

2695

2356 -#: wt-status.c:1524

2696 +#: wt-status.c:1528

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

2698 msgstr ""

2699

2360 -#: wt-status.c:1530

2700 +#: wt-status.c:1534

2701 msgid "No changes"

2702 msgstr ""

2703

2364 -#: wt-status.c:1535

2704 +#: wt-status.c:1539

2705 #, c-format

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

2707 msgstr ""

2708

2369 -#: wt-status.c:1538

2709 +#: wt-status.c:1542

2710 #, c-format

2711 msgid "no changes added to commit\n"

2712 msgstr ""

2713

2374 -#: wt-status.c:1541

2714 +#: wt-status.c:1545

2715 #, c-format

2716 msgid ""

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

2718 "track)\n"

2719 msgstr ""

2720

2381 -#: wt-status.c:1544

2721 +#: wt-status.c:1548

2722 #, c-format

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

2724 msgstr ""

2725

2386 -#: wt-status.c:1547

2726 +#: wt-status.c:1551

2727 #, c-format

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

2729 msgstr ""

2730

2391 -#: wt-status.c:1550 wt-status.c:1555

2731 +#: wt-status.c:1554 wt-status.c:1559

2732 #, c-format

2733 msgid "nothing to commit\n"

2734 msgstr ""

2735

2396 -#: wt-status.c:1553

2736 +#: wt-status.c:1557

2737 #, c-format

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

2739 msgstr ""

2740

2401 -#: wt-status.c:1557

2741 +#: wt-status.c:1561

2742 #, c-format

2403 -msgid "nothing to commit, working directory clean\n"

2743 +msgid "nothing to commit, working tree clean\n"

2744 msgstr ""

2745

2406 -#: wt-status.c:1664

2746 +#: wt-status.c:1668

2747 msgid "Initial commit on "

2748 msgstr ""

2749

2410 -#: wt-status.c:1668

2750 +#: wt-status.c:1672

2751 msgid "HEAD (no branch)"

2752 msgstr ""

2753

2414 -#: wt-status.c:1697

2754 +#: wt-status.c:1701

2755 msgid "gone"

2756 msgstr ""

2757

2418 -#: wt-status.c:1699 wt-status.c:1707

2758 +#: wt-status.c:1703 wt-status.c:1711

2759 msgid "behind "

2760 msgstr ""

2761

2422 -#: wt-status.c:1702 wt-status.c:1705

2762 +#: wt-status.c:1706 wt-status.c:1709

2763 msgid "ahead "

2764 msgstr ""

2765

@@ -2437,287 +2777,301 @@ msgstr ""

2777 msgid "unexpected diff status %c"

2778 msgstr ""

2779

2440 -#: builtin/add.c:70 builtin/commit.c:280

2780 +#: builtin/add.c:71 builtin/commit.c:281

2781 msgid "updating files failed"

2782 msgstr ""

2783

2444 -#: builtin/add.c:80

2784 +#: builtin/add.c:81

2785 #, c-format

2786 msgid "remove '%s'\n"

2787 msgstr ""

2788

2449 -#: builtin/add.c:134

2789 +#: builtin/add.c:136

2790 msgid "Unstaged changes after refreshing the index:"

2791 msgstr ""

2792

2453 -#: builtin/add.c:194 builtin/rev-parse.c:811

2793 +#: builtin/add.c:196 builtin/rev-parse.c:811

2794 msgid "Could not read the index"

2795 msgstr ""

2796

2457 -#: builtin/add.c:205

2797 +#: builtin/add.c:207

2798 #, c-format

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

2800 msgstr ""

2801

2462 -#: builtin/add.c:209

2802 +#: builtin/add.c:211

2803 msgid "Could not write patch"

2804 msgstr ""

2805

2466 -#: builtin/add.c:212

2806 +#: builtin/add.c:214

2807 msgid "editing patch failed"

2808 msgstr ""

2809

2470 -#: builtin/add.c:215

2810 +#: builtin/add.c:217

2811 #, c-format

2812 msgid "Could not stat '%s'"

2813 msgstr ""

2814

2475 -#: builtin/add.c:217

2815 +#: builtin/add.c:219

2816 msgid "Empty patch. Aborted."

2817 msgstr ""

2818

2479 -#: builtin/add.c:222

2819 +#: builtin/add.c:224

2820 #, c-format

2821 msgid "Could not apply '%s'"

2822 msgstr ""

2823

2484 -#: builtin/add.c:232

2824 +#: builtin/add.c:234

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

2826 msgstr ""

2827

2488 -#: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111

2489 -#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511

2490 -#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162

2828 +#: builtin/add.c:253 builtin/clean.c:870 builtin/fetch.c:113 builtin/mv.c:111

2829 +#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:521

2830 +#: builtin/remote.c:1327 builtin/rm.c:268 builtin/send-pack.c:162

2831 msgid "dry run"

2832 msgstr ""

2833

2494 -#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19

2495 -#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557

2496 -#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114

2834 +#: builtin/add.c:254 builtin/apply.c:4854 builtin/check-ignore.c:19

2835 +#: builtin/commit.c:1334 builtin/count-objects.c:85 builtin/fsck.c:593

2836 +#: builtin/log.c:1852 builtin/mv.c:110 builtin/read-tree.c:114

2837 msgid "be verbose"

2838 msgstr ""

2839

2500 -#: builtin/add.c:252

2840 +#: builtin/add.c:256

2841 msgid "interactive picking"

2842 msgstr ""

2843

2504 -#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286

2844 +#: builtin/add.c:257 builtin/checkout.c:1156 builtin/reset.c:286

2845 msgid "select hunks interactively"

2846 msgstr ""

2847

2508 -#: builtin/add.c:254

2848 +#: builtin/add.c:258

2849 msgid "edit current diff and apply"

2850 msgstr ""

2851

2512 -#: builtin/add.c:255

2852 +#: builtin/add.c:259

2853 msgid "allow adding otherwise ignored files"

2854 msgstr ""

2855

2516 -#: builtin/add.c:256

2856 +#: builtin/add.c:260

2857 msgid "update tracked files"

2858 msgstr ""

2859

2520 -#: builtin/add.c:257

2860 +#: builtin/add.c:261

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

2862 msgstr ""

2863

2524 -#: builtin/add.c:258

2864 +#: builtin/add.c:262

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

2866 msgstr ""

2867

2528 -#: builtin/add.c:261

2868 +#: builtin/add.c:265

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

2870 msgstr ""

2871

2532 -#: builtin/add.c:263

2872 +#: builtin/add.c:267

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

2874 msgstr ""

2875

2536 -#: builtin/add.c:264

2876 +#: builtin/add.c:268

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

2878 msgstr ""

2879

2540 -#: builtin/add.c:265

2880 +#: builtin/add.c:269

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

2882 msgstr ""

2883

2544 -#: builtin/add.c:287

2884 +#: builtin/add.c:270 builtin/update-index.c:958

2885 +msgid "(+/-)x"

2886 +msgstr ""

2887 +

2888 +#: builtin/add.c:270 builtin/update-index.c:959

2889 +msgid "override the executable bit of the listed files"

2890 +msgstr ""

2891 +

2892 +#: builtin/add.c:292

2893 #, c-format

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

2895 msgstr ""

2896

2549 -#: builtin/add.c:294

2897 +#: builtin/add.c:300

2898 msgid "adding files failed"

2899 msgstr ""

2900

2553 -#: builtin/add.c:330

2901 +#: builtin/add.c:336

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

2903 msgstr ""

2904

2557 -#: builtin/add.c:337

2905 +#: builtin/add.c:343

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

2907 msgstr ""

2908

2909 #: builtin/add.c:352

2910 #, c-format

2911 +msgid "--chmod param '%s' must be either -x or +x"

2912 +msgstr ""

2913 +

2914 +#: builtin/add.c:367

2915 +#, c-format

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

2917 msgstr ""

2918

2566 -#: builtin/add.c:353

2919 +#: builtin/add.c:368

2920 #, c-format

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

2922 msgstr ""

2923

2571 -#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914

2572 -#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298

2924 +#: builtin/add.c:373 builtin/check-ignore.c:172 builtin/checkout.c:279

2925 +#: builtin/checkout.c:473 builtin/clean.c:914 builtin/commit.c:340

2926 +#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298

2927 #: builtin/submodule--helper.c:240

2928 msgid "index file corrupt"

2929 msgstr ""

2930

2577 -#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430

2931 +#: builtin/add.c:454 builtin/apply.c:4784 builtin/mv.c:286 builtin/rm.c:431

2932 msgid "Unable to write new index file"

2933 msgstr ""

2934

2581 -#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089

2935 +#: builtin/am.c:257 builtin/commit.c:750 builtin/merge.c:1032

2936 #, c-format

2937 msgid "could not read '%s'"

2938 msgstr ""

2939

2586 -#: builtin/am.c:430

2940 +#: builtin/am.c:426

2941 msgid "could not parse author script"

2942 msgstr ""

2943

2590 -#: builtin/am.c:507

2944 +#: builtin/am.c:503

2945 #, c-format

2946 msgid "'%s' was deleted by the applypatch-msg hook"

2947 msgstr ""

2948

2595 -#: builtin/am.c:548 builtin/notes.c:300

2949 +#: builtin/am.c:544 builtin/notes.c:301

2950 #, c-format

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

2952 msgstr ""

2953

2600 -#: builtin/am.c:585 builtin/notes.c:315

2954 +#: builtin/am.c:581 builtin/notes.c:316

2955 #, c-format

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

2957 msgstr ""

2958

2605 -#: builtin/am.c:611

2959 +#: builtin/am.c:607

2960 msgid "fseek failed"

2961 msgstr ""

2962

2609 -#: builtin/am.c:788

2963 +#: builtin/am.c:787

2964 #, c-format

2965 msgid "could not parse patch '%s'"

2966 msgstr ""

2967

2614 -#: builtin/am.c:853

2968 +#: builtin/am.c:852

2969 msgid "Only one StGIT patch series can be applied at once"

2970 msgstr ""

2971

2618 -#: builtin/am.c:900

2972 +#: builtin/am.c:899

2973 msgid "invalid timestamp"

2974 msgstr ""

2975

2622 -#: builtin/am.c:903 builtin/am.c:911

2976 +#: builtin/am.c:902 builtin/am.c:910

2977 msgid "invalid Date line"

2978 msgstr ""

2979

2626 -#: builtin/am.c:908

2980 +#: builtin/am.c:907

2981 msgid "invalid timezone offset"

2982 msgstr ""

2983

2630 -#: builtin/am.c:995

2984 +#: builtin/am.c:996

2985 msgid "Patch format detection failed."

2986 msgstr ""

2987

2634 -#: builtin/am.c:1000 builtin/clone.c:380

2988 +#: builtin/am.c:1001 builtin/clone.c:380

2989 #, c-format

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

2991 msgstr ""

2992

2639 -#: builtin/am.c:1004

2993 +#: builtin/am.c:1005

2994 msgid "Failed to split patches."

2995 msgstr ""

2996

2643 -#: builtin/am.c:1136 builtin/commit.c:365

2997 +#: builtin/am.c:1137 builtin/commit.c:366

2998 msgid "unable to write index file"

2999 msgstr ""

3000

2647 -#: builtin/am.c:1187

3001 +#: builtin/am.c:1188

3002 #, c-format

3003 msgid "When you have resolved this problem, run \"%s --continue\"."

3004 msgstr ""

3005

2652 -#: builtin/am.c:1188

3006 +#: builtin/am.c:1189

3007 #, c-format

3008 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."

3009 msgstr ""

3010

2657 -#: builtin/am.c:1189

3011 +#: builtin/am.c:1190

3012 #, c-format

3013 msgid "To restore the original branch and stop patching, run \"%s --abort\"."

3014 msgstr ""

3015

2662 -#: builtin/am.c:1327

3016 +#: builtin/am.c:1328

3017 msgid "Patch is empty. Was it split wrong?"

3018 msgstr ""

3019

2666 -#: builtin/am.c:1401 builtin/log.c:1516

3020 +#: builtin/am.c:1402 builtin/log.c:1543

3021 #, c-format

3022 msgid "invalid ident line: %s"

3023 msgstr ""

3024

2671 -#: builtin/am.c:1428

3025 +#: builtin/am.c:1429

3026 #, c-format

3027 msgid "unable to parse commit %s"

3028 msgstr ""

3029

2676 -#: builtin/am.c:1630

3030 +#: builtin/am.c:1602

3031 msgid "Repository lacks necessary blobs to fall back on 3-way merge."

3032 msgstr ""

3033

2680 -#: builtin/am.c:1632

3034 +#: builtin/am.c:1604

3035 msgid "Using index info to reconstruct a base tree..."

3036 msgstr ""

3037

2684 -#: builtin/am.c:1651

3038 +#: builtin/am.c:1623

3039 msgid ""

3040 "Did you hand edit your patch?\n"

3041 "It does not apply to blobs recorded in its index."

3042 msgstr ""

3043

2690 -#: builtin/am.c:1657

3044 +#: builtin/am.c:1629

3045 msgid "Falling back to patching base and 3-way merge..."

3046 msgstr ""

3047

2694 -#: builtin/am.c:1672

3048 +#: builtin/am.c:1654

3049 msgid "Failed to merge in the changes."

3050 msgstr ""

3051

2698 -#: builtin/am.c:1696 builtin/merge.c:636

3052 +#: builtin/am.c:1679 builtin/merge.c:628

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

3054 msgstr ""

3055

2702 -#: builtin/am.c:1703

3056 +#: builtin/am.c:1686

3057 msgid "applying to an empty history"

3058 msgstr ""

3059

2706 -#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841

2707 -#: builtin/merge.c:866

3060 +#: builtin/am.c:1699 builtin/commit.c:1776 builtin/merge.c:798

3061 +#: builtin/merge.c:823

3062 msgid "failed to write commit object"

3063 msgstr ""

3064

2711 -#: builtin/am.c:1748 builtin/am.c:1752

3065 +#: builtin/am.c:1731 builtin/am.c:1735

3066 #, c-format

3067 msgid "cannot resume: %s does not exist."

3068 msgstr ""

3069

2716 -#: builtin/am.c:1768

3070 +#: builtin/am.c:1751

3071 msgid "cannot be interactive without stdin connected to a terminal."

3072 msgstr ""

3073

2720 -#: builtin/am.c:1773

3074 +#: builtin/am.c:1756

3075 msgid "Commit Body is:"

3076 msgstr ""

3077

@@ -2725,296 +3079,296 @@ msgstr ""

3079 #. in your translation. The program will only accept English

3080 #. input at this point.

3081 #.

2728 -#: builtin/am.c:1783

3082 +#: builtin/am.c:1766

3083 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "

3084 msgstr ""

3085

2732 -#: builtin/am.c:1833

3086 +#: builtin/am.c:1816

3087 #, c-format

3088 msgid "Dirty index: cannot apply patches (dirty: %s)"

3089 msgstr ""

3090

2737 -#: builtin/am.c:1868 builtin/am.c:1940

3091 +#: builtin/am.c:1853 builtin/am.c:1925

3092 #, c-format

3093 msgid "Applying: %.*s"

3094 msgstr ""

3095

2742 -#: builtin/am.c:1884

3096 +#: builtin/am.c:1869

3097 msgid "No changes -- Patch already applied."

3098 msgstr ""

3099

2746 -#: builtin/am.c:1892

3100 +#: builtin/am.c:1877

3101 #, c-format

3102 msgid "Patch failed at %s %.*s"

3103 msgstr ""

3104

2751 -#: builtin/am.c:1898

3105 +#: builtin/am.c:1883

3106 #, c-format

3107 msgid "The copy of the patch that failed is found in: %s"

3108 msgstr ""

3109

2756 -#: builtin/am.c:1943

3110 +#: builtin/am.c:1928

3111 msgid ""

3112 "No changes - did you forget to use 'git add'?\n"

3113 "If there is nothing left to stage, chances are that something else\n"

3114 "already introduced the same changes; you might want to skip this patch."

3115 msgstr ""

3116

2763 -#: builtin/am.c:1950

3117 +#: builtin/am.c:1935

3118 msgid ""

3119 "You still have unmerged paths in your index.\n"

3120 "Did you forget to use 'git add'?"

3121 msgstr ""

3122

2769 -#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308

3123 +#: builtin/am.c:2043 builtin/am.c:2047 builtin/am.c:2059 builtin/reset.c:308

3124 #: builtin/reset.c:316

3125 #, c-format

3126 msgid "Could not parse object '%s'."

3127 msgstr ""

3128

2775 -#: builtin/am.c:2110

3129 +#: builtin/am.c:2095

3130 msgid "failed to clean index"

3131 msgstr ""

3132

2779 -#: builtin/am.c:2144

3133 +#: builtin/am.c:2129

3134 msgid ""

3135 "You seem to have moved HEAD since the last 'am' failure.\n"

3136 "Not rewinding to ORIG_HEAD"

3137 msgstr ""

3138

2785 -#: builtin/am.c:2205

3139 +#: builtin/am.c:2192

3140 #, c-format

3141 msgid "Invalid value for --patch-format: %s"

3142 msgstr ""

3143

2790 -#: builtin/am.c:2238

3144 +#: builtin/am.c:2225

3145 msgid "git am [<options>] [(<mbox>|<Maildir>)...]"

3146 msgstr ""

3147

2794 -#: builtin/am.c:2239

3148 +#: builtin/am.c:2226

3149 msgid "git am [<options>] (--continue | --skip | --abort)"

3150 msgstr ""

3151

2798 -#: builtin/am.c:2245

3152 +#: builtin/am.c:2232

3153 msgid "run interactively"

3154 msgstr ""

3155

2802 -#: builtin/am.c:2247

3156 +#: builtin/am.c:2234

3157 msgid "historical option -- no-op"

3158 msgstr ""

3159

2806 -#: builtin/am.c:2249

3160 +#: builtin/am.c:2236

3161 msgid "allow fall back on 3way merging if needed"

3162 msgstr ""

3163

2810 -#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57

2811 -#: builtin/repack.c:171

3164 +#: builtin/am.c:2237 builtin/init-db.c:481 builtin/prune-packed.c:57

3165 +#: builtin/repack.c:172

3166 msgid "be quiet"

3167 msgstr ""

3168

2815 -#: builtin/am.c:2252

3169 +#: builtin/am.c:2239

3170 msgid "add a Signed-off-by line to the commit message"

3171 msgstr ""

3172

2819 -#: builtin/am.c:2255

3173 +#: builtin/am.c:2242

3174 msgid "recode into utf8 (default)"

3175 msgstr ""

3176

2823 -#: builtin/am.c:2257

3177 +#: builtin/am.c:2244

3178 msgid "pass -k flag to git-mailinfo"

3179 msgstr ""

3180

2827 -#: builtin/am.c:2259

3181 +#: builtin/am.c:2246

3182 msgid "pass -b flag to git-mailinfo"

3183 msgstr ""

3184

2831 -#: builtin/am.c:2261

3185 +#: builtin/am.c:2248

3186 msgid "pass -m flag to git-mailinfo"

3187 msgstr ""

3188

2835 -#: builtin/am.c:2263

3189 +#: builtin/am.c:2250

3190 msgid "pass --keep-cr flag to git-mailsplit for mbox format"

3191 msgstr ""

3192

2839 -#: builtin/am.c:2266

3193 +#: builtin/am.c:2253

3194 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"

3195 msgstr ""

3196

2843 -#: builtin/am.c:2269

3197 +#: builtin/am.c:2256

3198 msgid "strip everything before a scissors line"

3199 msgstr ""

3200

2847 -#: builtin/am.c:2270 builtin/apply.c:4546

3201 +#: builtin/am.c:2257 builtin/apply.c:4837

3202 msgid "action"

3203 msgstr ""

3204

2851 -#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280

2852 -#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292

2853 -#: builtin/am.c:2298

3205 +#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267

3206 +#: builtin/am.c:2270 builtin/am.c:2273 builtin/am.c:2276 builtin/am.c:2279

3207 +#: builtin/am.c:2285

3208 msgid "pass it through git-apply"

3209 msgstr ""

3210

2857 -#: builtin/am.c:2279 builtin/apply.c:4570

3211 +#: builtin/am.c:2266 builtin/apply.c:4861

3212 msgid "root"

3213 msgstr ""

3214

2861 -#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508

2862 -#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95

3215 +#: builtin/am.c:2269 builtin/am.c:2272 builtin/apply.c:4799

3216 +#: builtin/apply.c:4802 builtin/clone.c:90 builtin/fetch.c:96

3217 #: builtin/pull.c:179 builtin/submodule--helper.c:277

2864 -#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485

2865 -#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767

2866 -#: builtin/submodule--helper.c:770

3218 +#: builtin/submodule--helper.c:402 builtin/submodule--helper.c:482

3219 +#: builtin/submodule--helper.c:485 builtin/submodule--helper.c:823

3220 +#: builtin/submodule--helper.c:826

3221 msgid "path"

3222 msgstr ""

3223

2870 -#: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669

2871 -#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134

2872 -#: builtin/pull.c:193 builtin/repack.c:178 builtin/repack.c:182

3224 +#: builtin/am.c:2275 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669

3225 +#: builtin/grep.c:706 builtin/merge.c:200 builtin/pull.c:134

3226 +#: builtin/pull.c:193 builtin/repack.c:181 builtin/repack.c:185

3227 #: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340

3228 #: parse-options.h:132 parse-options.h:134 parse-options.h:244

3229 msgid "n"

3230 msgstr ""

3231

2878 -#: builtin/am.c:2291 builtin/apply.c:4514

3232 +#: builtin/am.c:2278 builtin/apply.c:4805

3233 msgid "num"

3234 msgstr ""

3235

2882 -#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438

3236 +#: builtin/am.c:2281 builtin/for-each-ref.c:37 builtin/replace.c:438

3237 #: builtin/tag.c:372

3238 msgid "format"

3239 msgstr ""

3240

2887 -#: builtin/am.c:2295

3241 +#: builtin/am.c:2282

3242 msgid "format the patch(es) are in"

3243 msgstr ""

3244

2891 -#: builtin/am.c:2301

3245 +#: builtin/am.c:2288

3246 msgid "override error message when patch failure occurs"

3247 msgstr ""

3248

2895 -#: builtin/am.c:2303

3249 +#: builtin/am.c:2290

3250 msgid "continue applying patches after resolving a conflict"

3251 msgstr ""

3252

2899 -#: builtin/am.c:2306

3253 +#: builtin/am.c:2293

3254 msgid "synonyms for --continue"

3255 msgstr ""

3256

2903 -#: builtin/am.c:2309

3257 +#: builtin/am.c:2296

3258 msgid "skip the current patch"

3259 msgstr ""

3260

2907 -#: builtin/am.c:2312

3261 +#: builtin/am.c:2299

3262 msgid "restore the original branch and abort the patching operation."

3263 msgstr ""

3264

2911 -#: builtin/am.c:2316

3265 +#: builtin/am.c:2303

3266 msgid "lie about committer date"

3267 msgstr ""

3268

2915 -#: builtin/am.c:2318

3269 +#: builtin/am.c:2305

3270 msgid "use current timestamp for author date"

3271 msgstr ""

3272

2919 -#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228

3273 +#: builtin/am.c:2307 builtin/commit.c:1610 builtin/merge.c:229

3274 #: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355

3275 msgid "key-id"

3276 msgstr ""

3277

2924 -#: builtin/am.c:2321

3278 +#: builtin/am.c:2308

3279 msgid "GPG-sign commits"

3280 msgstr ""

3281

2928 -#: builtin/am.c:2324

3282 +#: builtin/am.c:2311

3283 msgid "(internal use for git-rebase)"

3284 msgstr ""

3285

2932 -#: builtin/am.c:2339

3286 +#: builtin/am.c:2326

3287 msgid ""

3288 "The -b/--binary option has been a no-op for long time, and\n"

3289 "it will be removed. Please do not use it anymore."

3290 msgstr ""

3291

2938 -#: builtin/am.c:2346

3292 +#: builtin/am.c:2333

3293 msgid "failed to read the index"

3294 msgstr ""

3295

2942 -#: builtin/am.c:2361

3296 +#: builtin/am.c:2348

3297 #, c-format

3298 msgid "previous rebase directory %s still exists but mbox given."

3299 msgstr ""

3300

2947 -#: builtin/am.c:2385

3301 +#: builtin/am.c:2372

3302 #, c-format

3303 msgid ""

3304 "Stray %s directory found.\n"

3305 "Use \"git am --abort\" to remove it."

3306 msgstr ""

3307

2954 -#: builtin/am.c:2391

3308 +#: builtin/am.c:2378

3309 msgid "Resolve operation not in progress, we are not resuming."

3310 msgstr ""

3311

2958 -#: builtin/apply.c:59

3312 +#: builtin/apply.c:122

3313 msgid "git apply [<options>] [<patch>...]"

3314 msgstr ""

3315

2962 -#: builtin/apply.c:111

3316 +#: builtin/apply.c:153

3317 #, c-format

3318 msgid "unrecognized whitespace option '%s'"

3319 msgstr ""

3320

2967 -#: builtin/apply.c:126

3321 +#: builtin/apply.c:169

3322 #, c-format

3323 msgid "unrecognized whitespace ignore option '%s'"

3324 msgstr ""

3325

2972 -#: builtin/apply.c:818

3326 +#: builtin/apply.c:854

3327 #, c-format

3328 msgid "Cannot prepare timestamp regexp %s"

3329 msgstr ""

3330

2977 -#: builtin/apply.c:827

3331 +#: builtin/apply.c:863

3332 #, c-format

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

3334 msgstr ""

3335

2982 -#: builtin/apply.c:908

3336 +#: builtin/apply.c:947

3337 #, c-format

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

3339 msgstr ""

3340

2987 -#: builtin/apply.c:937

3341 +#: builtin/apply.c:984

3342 #, c-format

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

3344 msgstr ""

3345

2992 -#: builtin/apply.c:942

3346 +#: builtin/apply.c:989

3347 #, c-format

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

3349 msgstr ""

3350

2997 -#: builtin/apply.c:943

3351 +#: builtin/apply.c:990

3352 #, c-format

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

3354 msgstr ""

3355

3002 -#: builtin/apply.c:949

3356 +#: builtin/apply.c:995

3357 #, c-format

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

3359 msgstr ""

3360

3007 -#: builtin/apply.c:1406

3361 +#: builtin/apply.c:1489

3362 #, c-format

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

3364 msgstr ""

3365

3012 -#: builtin/apply.c:1463

3366 +#: builtin/apply.c:1550

3367 #, c-format

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

3369 msgstr ""

3370

3017 -#: builtin/apply.c:1480

3371 +#: builtin/apply.c:1567

3372 #, c-format

3373 msgid ""

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

@@ -3025,412 +3379,407 @@ msgid_plural ""

3379 msgstr[0] ""

3380 msgstr[1] ""

3381

3028 -#: builtin/apply.c:1646

3382 +#: builtin/apply.c:1743

3383 msgid "new file depends on old contents"

3384 msgstr ""

3385

3032 -#: builtin/apply.c:1648

3386 +#: builtin/apply.c:1745

3387 msgid "deleted file still has contents"

3388 msgstr ""

3389

3036 -#: builtin/apply.c:1674

3390 +#: builtin/apply.c:1774

3391 #, c-format

3392 msgid "corrupt patch at line %d"

3393 msgstr ""

3394

3041 -#: builtin/apply.c:1710

3395 +#: builtin/apply.c:1810

3396 #, c-format

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

3398 msgstr ""

3399

3046 -#: builtin/apply.c:1712

3400 +#: builtin/apply.c:1812

3401 #, c-format

3402 msgid "deleted file %s still has contents"

3403 msgstr ""

3404

3051 -#: builtin/apply.c:1715

3405 +#: builtin/apply.c:1815

3406 #, c-format

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

3408 msgstr ""

3409

3056 -#: builtin/apply.c:1861

3410 +#: builtin/apply.c:1962

3411 #, c-format

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

3413 msgstr ""

3414

3061 -#: builtin/apply.c:1895

3415 +#: builtin/apply.c:1999

3416 #, c-format

3417 msgid "unrecognized binary patch at line %d"

3418 msgstr ""

3419

3066 -#: builtin/apply.c:2048

3420 +#: builtin/apply.c:2154

3421 #, c-format

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

3423 msgstr ""

3424

3071 -#: builtin/apply.c:2138

3425 +#: builtin/apply.c:2244

3426 #, c-format

3427 msgid "unable to read symlink %s"

3428 msgstr ""

3429

3076 -#: builtin/apply.c:2142

3430 +#: builtin/apply.c:2248

3431 #, c-format

3432 msgid "unable to open or read %s"

3433 msgstr ""

3434

3081 -#: builtin/apply.c:2775

3435 +#: builtin/apply.c:2901

3436 #, c-format

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

3438 msgstr ""

3439

3086 -#: builtin/apply.c:2894

3440 +#: builtin/apply.c:3020

3441 #, c-format

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

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

3444 msgstr[0] ""

3445 msgstr[1] ""

3446

3093 -#: builtin/apply.c:2906

3447 +#: builtin/apply.c:3032

3448 #, c-format

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

3450 msgstr ""

3451

3098 -#: builtin/apply.c:2912

3452 +#: builtin/apply.c:3038

3453 #, c-format

3454 msgid ""

3455 "while searching for:\n"

3456 "%.*s"

3457 msgstr ""

3458

3105 -#: builtin/apply.c:2932

3459 +#: builtin/apply.c:3060

3460 #, c-format

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

3462 msgstr ""

3463

3110 -#: builtin/apply.c:3033

3464 +#: builtin/apply.c:3163

3465 #, c-format

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

3467 msgstr ""

3468

3115 -#: builtin/apply.c:3039

3469 +#: builtin/apply.c:3169

3470 #, c-format

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

3472 msgstr ""

3473

3120 -#: builtin/apply.c:3060

3474 +#: builtin/apply.c:3190

3475 #, c-format

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

3477 msgstr ""

3478

3125 -#: builtin/apply.c:3184

3479 +#: builtin/apply.c:3314

3480 #, c-format

3481 msgid "cannot checkout %s"

3482 msgstr ""

3483

3130 -#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285

3131 -#, c-format

3132 -msgid "read of %s failed"

3133 -msgstr ""

3134 -

3135 -#: builtin/apply.c:3237

3484 +#: builtin/apply.c:3370

3485 #, c-format

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

3487 msgstr ""

3488

3140 -#: builtin/apply.c:3265 builtin/apply.c:3487

3489 +#: builtin/apply.c:3399 builtin/apply.c:3630

3490 #, c-format

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

3492 msgstr ""

3493

3145 -#: builtin/apply.c:3346 builtin/apply.c:3501

3494 +#: builtin/apply.c:3482 builtin/apply.c:3644

3495 #, c-format

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

3497 msgstr ""

3498

3150 -#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515

3499 +#: builtin/apply.c:3486 builtin/apply.c:3636 builtin/apply.c:3658

3500 #, c-format

3501 msgid "%s: %s"

3502 msgstr ""

3503

3155 -#: builtin/apply.c:3355 builtin/apply.c:3509

3504 +#: builtin/apply.c:3491 builtin/apply.c:3652

3505 #, c-format

3506 msgid "%s: does not match index"

3507 msgstr ""

3508

3160 -#: builtin/apply.c:3457

3509 +#: builtin/apply.c:3597

3510 msgid "removal patch leaves file contents"

3511 msgstr ""

3512

3164 -#: builtin/apply.c:3526

3513 +#: builtin/apply.c:3669

3514 #, c-format

3515 msgid "%s: wrong type"

3516 msgstr ""

3517

3169 -#: builtin/apply.c:3528

3518 +#: builtin/apply.c:3671

3519 #, c-format

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

3521 msgstr ""

3522

3174 -#: builtin/apply.c:3687 builtin/apply.c:3689

3523 +#: builtin/apply.c:3822 builtin/apply.c:3824

3524 #, c-format

3525 msgid "invalid path '%s'"

3526 msgstr ""

3527

3179 -#: builtin/apply.c:3744

3528 +#: builtin/apply.c:3879

3529 #, c-format

3530 msgid "%s: already exists in index"

3531 msgstr ""

3532

3184 -#: builtin/apply.c:3747

3533 +#: builtin/apply.c:3882

3534 #, c-format

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

3536 msgstr ""

3537

3189 -#: builtin/apply.c:3767

3538 +#: builtin/apply.c:3902

3539 #, c-format

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

3541 msgstr ""

3542

3194 -#: builtin/apply.c:3772

3543 +#: builtin/apply.c:3907

3544 #, c-format

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

3546 msgstr ""

3547

3199 -#: builtin/apply.c:3792

3548 +#: builtin/apply.c:3927

3549 #, c-format

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

3551 msgstr ""

3552

3204 -#: builtin/apply.c:3796

3553 +#: builtin/apply.c:3931

3554 #, c-format

3555 msgid "%s: patch does not apply"

3556 msgstr ""

3557

3209 -#: builtin/apply.c:3810

3558 +#: builtin/apply.c:3945

3559 #, c-format

3560 msgid "Checking patch %s..."

3561 msgstr ""

3562

3214 -#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135

3563 +#: builtin/apply.c:4038 builtin/checkout.c:233 builtin/reset.c:135

3564 #, c-format

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

3566 msgstr ""

3567

3219 -#: builtin/apply.c:4046

3568 +#: builtin/apply.c:4182

3569 #, c-format

3570 msgid "unable to remove %s from index"

3571 msgstr ""

3572

3224 -#: builtin/apply.c:4075

3573 +#: builtin/apply.c:4215

3574 #, c-format

3575 msgid "corrupt patch for submodule %s"

3576 msgstr ""

3577

3229 -#: builtin/apply.c:4079

3578 +#: builtin/apply.c:4219

3579 #, c-format

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

3581 msgstr ""

3582

3234 -#: builtin/apply.c:4084

3583 +#: builtin/apply.c:4224

3584 #, c-format

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

3586 msgstr ""

3587

3239 -#: builtin/apply.c:4087 builtin/apply.c:4195

3588 +#: builtin/apply.c:4227 builtin/apply.c:4340

3589 #, c-format

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

3591 msgstr ""

3592

3244 -#: builtin/apply.c:4120

3593 +#: builtin/apply.c:4260

3594 #, c-format

3595 msgid "closing file '%s'"

3596 msgstr ""

3597

3249 -#: builtin/apply.c:4169

3598 +#: builtin/apply.c:4313

3599 #, c-format

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

3601 msgstr ""

3602

3254 -#: builtin/apply.c:4256

3603 +#: builtin/apply.c:4403

3604 #, c-format

3605 msgid "Applied patch %s cleanly."

3606 msgstr ""

3607

3259 -#: builtin/apply.c:4264

3608 +#: builtin/apply.c:4411

3609 msgid "internal error"

3610 msgstr ""

3611

3263 -#: builtin/apply.c:4267

3612 +#: builtin/apply.c:4414

3613 #, c-format

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

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

3616 msgstr[0] ""

3617 msgstr[1] ""

3618

3270 -#: builtin/apply.c:4277

3619 +#: builtin/apply.c:4424

3620 #, c-format

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

3622 msgstr ""

3623

3275 -#: builtin/apply.c:4285

3624 +#: builtin/apply.c:4432

3625 #, c-format

3626 msgid "cannot open %s: %s"

3627 msgstr ""

3628

3280 -#: builtin/apply.c:4298

3629 +#: builtin/apply.c:4445

3630 #, c-format

3631 msgid "Hunk #%d applied cleanly."

3632 msgstr ""

3633

3285 -#: builtin/apply.c:4301

3634 +#: builtin/apply.c:4448

3635 #, c-format

3636 msgid "Rejected hunk #%d."

3637 msgstr ""

3638

3290 -#: builtin/apply.c:4387

3639 +#: builtin/apply.c:4537

3640 #, c-format

3641 msgid "Skipped patch '%s'."

3642 msgstr ""

3643

3295 -#: builtin/apply.c:4395

3644 +#: builtin/apply.c:4545

3645 msgid "unrecognized input"

3646 msgstr ""

3647

3299 -#: builtin/apply.c:4406

3648 +#: builtin/apply.c:4556

3649 msgid "unable to read index file"

3650 msgstr ""

3651

3303 -#: builtin/apply.c:4509

3652 +#: builtin/apply.c:4701

3653 +msgid "--3way outside a repository"

3654 +msgstr ""

3655 +

3656 +#: builtin/apply.c:4709

3657 +msgid "--index outside a repository"

3658 +msgstr ""

3659 +

3660 +#: builtin/apply.c:4712

3661 +msgid "--cached outside a repository"

3662 +msgstr ""

3663 +

3664 +#: builtin/apply.c:4745

3665 +#, c-format

3666 +msgid "can't open patch '%s'"

3667 +msgstr ""

3668 +

3669 +#: builtin/apply.c:4760

3670 +#, c-format

3671 +msgid "squelched %d whitespace error"

3672 +msgid_plural "squelched %d whitespace errors"

3673 +msgstr[0] ""

3674 +msgstr[1] ""

3675 +

3676 +#: builtin/apply.c:4766 builtin/apply.c:4776

3677 +#, c-format

3678 +msgid "%d line adds whitespace errors."

3679 +msgid_plural "%d lines add whitespace errors."

3680 +msgstr[0] ""

3681 +msgstr[1] ""

3682 +

3683 +#: builtin/apply.c:4800

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

3685 msgstr ""

3686

3307 -#: builtin/apply.c:4512

3687 +#: builtin/apply.c:4803

3688 msgid "apply changes matching the given path"

3689 msgstr ""

3690

3311 -#: builtin/apply.c:4515

3691 +#: builtin/apply.c:4806

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

3693 msgstr ""

3694

3315 -#: builtin/apply.c:4518

3695 +#: builtin/apply.c:4809

3696 msgid "ignore additions made by the patch"

3697 msgstr ""

3698

3319 -#: builtin/apply.c:4520

3699 +#: builtin/apply.c:4811

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

3701 msgstr ""

3702

3323 -#: builtin/apply.c:4524

3703 +#: builtin/apply.c:4815

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

3705 msgstr ""

3706

3327 -#: builtin/apply.c:4526

3707 +#: builtin/apply.c:4817

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

3709 msgstr ""

3710

3331 -#: builtin/apply.c:4528

3711 +#: builtin/apply.c:4819

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

3713 msgstr ""

3714

3335 -#: builtin/apply.c:4530

3715 +#: builtin/apply.c:4821

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

3717 msgstr ""

3718

3339 -#: builtin/apply.c:4532

3719 +#: builtin/apply.c:4823

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

3721 msgstr ""

3722

3343 -#: builtin/apply.c:4534

3723 +#: builtin/apply.c:4825

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

3725 msgstr ""

3726

3347 -#: builtin/apply.c:4536

3727 +#: builtin/apply.c:4827

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

3729 msgstr ""

3730

3351 -#: builtin/apply.c:4538

3731 +#: builtin/apply.c:4829

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

3733 msgstr ""

3734

3355 -#: builtin/apply.c:4540

3735 +#: builtin/apply.c:4831

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

3737 msgstr ""

3738

3359 -#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425

3739 +#: builtin/apply.c:4834 builtin/checkout-index.c:169 builtin/ls-files.c:426

3740 msgid "paths are separated with NUL character"

3741 msgstr ""

3742

3363 -#: builtin/apply.c:4545

3743 +#: builtin/apply.c:4836

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

3745 msgstr ""

3746

3367 -#: builtin/apply.c:4547

3747 +#: builtin/apply.c:4838

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

3749 msgstr ""

3750

3371 -#: builtin/apply.c:4550 builtin/apply.c:4553

3751 +#: builtin/apply.c:4841 builtin/apply.c:4844

3752 msgid "ignore changes in whitespace when finding context"

3753 msgstr ""

3754

3375 -#: builtin/apply.c:4556

3755 +#: builtin/apply.c:4847

3756 msgid "apply the patch in reverse"

3757 msgstr ""

3758

3379 -#: builtin/apply.c:4558

3759 +#: builtin/apply.c:4849

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

3761 msgstr ""

3762

3383 -#: builtin/apply.c:4560

3763 +#: builtin/apply.c:4851

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

3765 msgstr ""

3766

3387 -#: builtin/apply.c:4562

3767 +#: builtin/apply.c:4853

3768 msgid "allow overlapping hunks"

3769 msgstr ""

3770

3391 -#: builtin/apply.c:4565

3771 +#: builtin/apply.c:4856

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

3773 msgstr ""

3774

3395 -#: builtin/apply.c:4568

3775 +#: builtin/apply.c:4859

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

3777 msgstr ""

3778

3399 -#: builtin/apply.c:4571

3779 +#: builtin/apply.c:4862

3780 msgid "prepend <root> to all filenames"

3781 msgstr ""

3782

3403 -#: builtin/apply.c:4593

3404 -msgid "--3way outside a repository"

3405 -msgstr ""

3406 -

3407 -#: builtin/apply.c:4601

3408 -msgid "--index outside a repository"

3409 -msgstr ""

3410 -

3411 -#: builtin/apply.c:4604

3412 -msgid "--cached outside a repository"

3413 -msgstr ""

3414 -

3415 -#: builtin/apply.c:4623

3416 -#, c-format

3417 -msgid "can't open patch '%s'"

3418 -msgstr ""

3419 -

3420 -#: builtin/apply.c:4637

3421 -#, c-format

3422 -msgid "squelched %d whitespace error"

3423 -msgid_plural "squelched %d whitespace errors"

3424 -msgstr[0] ""

3425 -msgstr[1] ""

3426 -

3427 -#: builtin/apply.c:4643 builtin/apply.c:4653

3428 -#, c-format

3429 -msgid "%d line adds whitespace errors."

3430 -msgid_plural "%d lines add whitespace errors."

3431 -msgstr[0] ""

3432 -msgstr[1] ""

3433 -

3783 #: builtin/archive.c:17

3784 #, c-format

3785 msgid "could not create archive file '%s'"

@@ -3486,103 +3835,103 @@ msgstr ""

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

3836 msgstr ""

3837

3489 -#: builtin/blame.c:1782

3838 +#: builtin/blame.c:1781

3839 msgid "Blaming lines"

3840 msgstr ""

3841

3493 -#: builtin/blame.c:2531

3842 +#: builtin/blame.c:2536

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

3844 msgstr ""

3845

3497 -#: builtin/blame.c:2532

3846 +#: builtin/blame.c:2537

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

3848 msgstr ""

3849

3501 -#: builtin/blame.c:2533

3850 +#: builtin/blame.c:2538

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

3852 msgstr ""

3853

3505 -#: builtin/blame.c:2534

3854 +#: builtin/blame.c:2539

3855 msgid "Show work cost statistics"

3856 msgstr ""

3857

3509 -#: builtin/blame.c:2535

3858 +#: builtin/blame.c:2540

3859 msgid "Force progress reporting"

3860 msgstr ""

3861

3513 -#: builtin/blame.c:2536

3862 +#: builtin/blame.c:2541

3863 msgid "Show output score for blame entries"

3864 msgstr ""

3865

3517 -#: builtin/blame.c:2537

3866 +#: builtin/blame.c:2542

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

3868 msgstr ""

3869

3521 -#: builtin/blame.c:2538

3870 +#: builtin/blame.c:2543

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

3872 msgstr ""

3873

3525 -#: builtin/blame.c:2539

3874 +#: builtin/blame.c:2544

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

3876 msgstr ""

3877

3529 -#: builtin/blame.c:2540

3878 +#: builtin/blame.c:2545

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

3880 msgstr ""

3881

3533 -#: builtin/blame.c:2541

3882 +#: builtin/blame.c:2546

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

3884 msgstr ""

3885

3537 -#: builtin/blame.c:2542

3886 +#: builtin/blame.c:2547

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

3888 msgstr ""

3889

3541 -#: builtin/blame.c:2543

3890 +#: builtin/blame.c:2548

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

3892 msgstr ""

3893

3545 -#: builtin/blame.c:2544

3894 +#: builtin/blame.c:2549

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

3896 msgstr ""

3897

3549 -#: builtin/blame.c:2545

3898 +#: builtin/blame.c:2550

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

3900 msgstr ""

3901

3553 -#: builtin/blame.c:2546

3902 +#: builtin/blame.c:2551

3903 msgid "Ignore whitespace differences"

3904 msgstr ""

3905

3557 -#: builtin/blame.c:2547

3906 +#: builtin/blame.c:2552

3907 msgid "Spend extra cycles to find better match"

3908 msgstr ""

3909

3561 -#: builtin/blame.c:2548

3910 +#: builtin/blame.c:2553

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

3912 msgstr ""

3913

3565 -#: builtin/blame.c:2549

3914 +#: builtin/blame.c:2554

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

3916 msgstr ""

3917

3569 -#: builtin/blame.c:2550 builtin/blame.c:2551

3918 +#: builtin/blame.c:2555 builtin/blame.c:2556

3919 msgid "score"

3920 msgstr ""

3921

3573 -#: builtin/blame.c:2550

3922 +#: builtin/blame.c:2555

3923 msgid "Find line copies within and across files"

3924 msgstr ""

3925

3577 -#: builtin/blame.c:2551

3926 +#: builtin/blame.c:2556

3927 msgid "Find line movements within and across files"

3928 msgstr ""

3929

3581 -#: builtin/blame.c:2552

3930 +#: builtin/blame.c:2557

3931 msgid "n,m"

3932 msgstr ""

3933

3585 -#: builtin/blame.c:2552

3934 +#: builtin/blame.c:2557

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

3936 msgstr ""

3937

@@ -3592,7 +3941,7 @@ msgstr ""

3941 #. takes 22 places, is the longest among various forms of

3942 #. relative timestamps, but your language may need more or

3943 #. fewer display columns.

3595 -#: builtin/blame.c:2641

3944 +#: builtin/blame.c:2649

3945 msgid "4 years, 11 months ago"

3946 msgstr ""

3947

@@ -3689,117 +4038,121 @@ msgstr ""

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

4039 msgstr ""

4040

3692 -#: builtin/branch.c:309

4041 +#: builtin/branch.c:312

4042 #, c-format

4043 msgid "[%s: gone]"

4044 msgstr ""

4045

3697 -#: builtin/branch.c:314

4046 +#: builtin/branch.c:317

4047 #, c-format

4048 msgid "[%s]"

4049 msgstr ""

4050

3702 -#: builtin/branch.c:319

4051 +#: builtin/branch.c:322

4052 #, c-format

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

4054 msgstr ""

4055

3707 -#: builtin/branch.c:321

4056 +#: builtin/branch.c:324

4057 #, c-format

4058 msgid "[behind %d]"

4059 msgstr ""

4060

3712 -#: builtin/branch.c:325

4061 +#: builtin/branch.c:328

4062 #, c-format

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

4064 msgstr ""

4065

3717 -#: builtin/branch.c:327

4066 +#: builtin/branch.c:330

4067 #, c-format

4068 msgid "[ahead %d]"

4069 msgstr ""

4070

3722 -#: builtin/branch.c:330

4071 +#: builtin/branch.c:333

4072 #, c-format

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

4074 msgstr ""

4075

3727 -#: builtin/branch.c:333

4076 +#: builtin/branch.c:336

4077 #, c-format

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

4079 msgstr ""

4080

3732 -#: builtin/branch.c:346

4081 +#: builtin/branch.c:349

4082 msgid " **** invalid ref ****"

4083 msgstr ""

4084

3736 -#: builtin/branch.c:372

4085 +#: builtin/branch.c:375

4086 #, c-format

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

4088 msgstr ""

4089

3741 -#: builtin/branch.c:375

4090 +#: builtin/branch.c:378

4091 #, c-format

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

4093 msgstr ""

4094

4095 #. TRANSLATORS: make sure this matches

4096 #. "HEAD detached at " in wt-status.c

3748 -#: builtin/branch.c:381

4097 +#: builtin/branch.c:384

4098 #, c-format

4099 msgid "(HEAD detached at %s)"

4100 msgstr ""

4101

4102 #. TRANSLATORS: make sure this matches

4103 #. "HEAD detached from " in wt-status.c

3755 -#: builtin/branch.c:386

4104 +#: builtin/branch.c:389

4105 #, c-format

4106 msgid "(HEAD detached from %s)"

4107 msgstr ""

4108

3760 -#: builtin/branch.c:390

4109 +#: builtin/branch.c:393

4110 msgid "(no branch)"

4111 msgstr ""

4112

3764 -#: builtin/branch.c:541

4113 +#: builtin/branch.c:544

4114 #, c-format

4115 msgid "Branch %s is being rebased at %s"

4116 msgstr ""

4117

3769 -#: builtin/branch.c:545

4118 +#: builtin/branch.c:548

4119 #, c-format

4120 msgid "Branch %s is being bisected at %s"

4121 msgstr ""

4122

3774 -#: builtin/branch.c:560

4123 +#: builtin/branch.c:563

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

4125 msgstr ""

4126

3778 -#: builtin/branch.c:570

4127 +#: builtin/branch.c:573

4128 #, c-format

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

4130 msgstr ""

4131

3783 -#: builtin/branch.c:587

4132 +#: builtin/branch.c:590

4133 msgid "Branch rename failed"

4134 msgstr ""

4135

3787 -#: builtin/branch.c:591

4136 +#: builtin/branch.c:594

4137 #, c-format

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

4139 msgstr ""

4140

3792 -#: builtin/branch.c:594

4141 +#: builtin/branch.c:597

4142 #, c-format

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

4144 msgstr ""

4145

3797 -#: builtin/branch.c:601

4146 +#: builtin/branch.c:604

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

4148 msgstr ""

4149

3801 -#: builtin/branch.c:623

3802 -msgid "could not write branch description template"

4150 +#: builtin/branch.c:620

4151 +#, c-format

4152 +msgid ""

4153 +"Please edit the description for the branch\n"

4154 +" %s\n"

4155 +"Lines starting with '%c' will be stripped.\n"

4156 msgstr ""

4157

4158 #: builtin/branch.c:651

@@ -3902,8 +4255,8 @@ msgstr ""

4255 msgid "field name to sort on"

4256 msgstr ""

4257

3905 -#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401

3906 -#: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567

4258 +#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:402

4259 +#: builtin/notes.c:405 builtin/notes.c:565 builtin/notes.c:568

4260 #: builtin/tag.c:369

4261 msgid "object"

4262 msgstr ""

@@ -4019,61 +4372,61 @@ msgstr ""

4372 msgid "Need a repository to unbundle."

4373 msgstr ""

4374

4022 -#: builtin/cat-file.c:428

4375 +#: builtin/cat-file.c:443

4376 msgid ""

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

4378 "<type>|--textconv) <object>"

4379 msgstr ""

4380

4028 -#: builtin/cat-file.c:429

4381 +#: builtin/cat-file.c:444

4382 msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"

4383 msgstr ""

4384

4032 -#: builtin/cat-file.c:466

4385 +#: builtin/cat-file.c:481

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

4387 msgstr ""

4388

4036 -#: builtin/cat-file.c:467

4389 +#: builtin/cat-file.c:482

4390 msgid "show object type"

4391 msgstr ""

4392

4040 -#: builtin/cat-file.c:468

4393 +#: builtin/cat-file.c:483

4394 msgid "show object size"

4395 msgstr ""

4396

4044 -#: builtin/cat-file.c:470

4397 +#: builtin/cat-file.c:485

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

4399 msgstr ""

4400

4048 -#: builtin/cat-file.c:471

4401 +#: builtin/cat-file.c:486

4402 msgid "pretty-print object's content"

4403 msgstr ""

4404

4052 -#: builtin/cat-file.c:473

4405 +#: builtin/cat-file.c:488

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

4407 msgstr ""

4408

4056 -#: builtin/cat-file.c:475

4409 +#: builtin/cat-file.c:490

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

4411 msgstr ""

4412

4060 -#: builtin/cat-file.c:476

4413 +#: builtin/cat-file.c:491

4414 msgid "buffer --batch output"

4415 msgstr ""

4416

4064 -#: builtin/cat-file.c:478

4417 +#: builtin/cat-file.c:493

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

4419 msgstr ""

4420

4068 -#: builtin/cat-file.c:481

4421 +#: builtin/cat-file.c:496

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

4423 msgstr ""

4424

4072 -#: builtin/cat-file.c:484

4425 +#: builtin/cat-file.c:499

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

4427 msgstr ""

4428

4076 -#: builtin/cat-file.c:486

4429 +#: builtin/cat-file.c:501

4430 msgid "show all objects with --batch or --batch-check"

4431 msgstr ""

4432

@@ -4101,7 +4454,7 @@ msgstr ""

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

4455 msgstr ""

4456

4104 -#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325

4457 +#: builtin/check-ignore.c:18 builtin/checkout.c:1137 builtin/gc.c:325

4458 msgid "suppress progress reporting"

4459 msgstr ""

4460

@@ -4191,9 +4544,9 @@ msgid "write the content to temporary files"

4544 msgstr ""

4545

4546 #: builtin/checkout-index.c:174 builtin/column.c:30

4194 -#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494

4195 -#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500

4196 -#: builtin/submodule--helper.c:774

4547 +#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:491

4548 +#: builtin/submodule--helper.c:494 builtin/submodule--helper.c:497

4549 +#: builtin/submodule--helper.c:830 builtin/worktree.c:469

4550 msgid "string"

4551 msgstr ""

4552

@@ -4259,10 +4612,6 @@ msgstr ""

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

4613 msgstr ""

4614

4262 -#: builtin/checkout.c:279 builtin/checkout.c:473

4263 -msgid "corrupt index file"

4264 -msgstr ""

4265 -

4615 #: builtin/checkout.c:339 builtin/checkout.c:346

4616 #, c-format

4617 msgid "path '%s' is unmerged"

@@ -4272,50 +4621,50 @@ msgstr ""

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

4622 msgstr ""

4623

4275 -#: builtin/checkout.c:622

4624 +#: builtin/checkout.c:625

4625 #, c-format

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

4627 msgstr ""

4628

4280 -#: builtin/checkout.c:660

4629 +#: builtin/checkout.c:663

4630 msgid "HEAD is now at"

4631 msgstr ""

4632

4284 -#: builtin/checkout.c:664 builtin/clone.c:661

4633 +#: builtin/checkout.c:667 builtin/clone.c:661

4634 msgid "unable to update HEAD"

4635 msgstr ""

4636

4288 -#: builtin/checkout.c:668

4637 +#: builtin/checkout.c:671

4638 #, c-format

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

4640 msgstr ""

4641

4293 -#: builtin/checkout.c:671

4642 +#: builtin/checkout.c:674

4643 #, c-format

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

4645 msgstr ""

4646

4298 -#: builtin/checkout.c:675

4647 +#: builtin/checkout.c:678

4648 #, c-format

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

4650 msgstr ""

4651

4303 -#: builtin/checkout.c:677 builtin/checkout.c:1067

4652 +#: builtin/checkout.c:680 builtin/checkout.c:1069

4653 #, c-format

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

4655 msgstr ""

4656

4308 -#: builtin/checkout.c:679

4657 +#: builtin/checkout.c:682

4658 #, c-format

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

4660 msgstr ""

4661

4313 -#: builtin/checkout.c:731

4662 +#: builtin/checkout.c:733

4663 #, c-format

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

4665 msgstr ""

4666

4318 -#: builtin/checkout.c:737

4667 +#: builtin/checkout.c:739

4668 #, c-format

4669 msgid ""

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

@@ -4330,7 +4679,7 @@ msgid_plural ""

4679 msgstr[0] ""

4680 msgstr[1] ""

4681

4333 -#: builtin/checkout.c:756

4682 +#: builtin/checkout.c:758

4683 #, c-format

4684 msgid ""

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

@@ -4347,162 +4696,162 @@ msgid_plural ""

4696 msgstr[0] ""

4697 msgstr[1] ""

4698

4350 -#: builtin/checkout.c:792

4699 +#: builtin/checkout.c:794

4700 msgid "internal error in revision walk"

4701 msgstr ""

4702

4354 -#: builtin/checkout.c:796

4703 +#: builtin/checkout.c:798

4704 msgid "Previous HEAD position was"

4705 msgstr ""

4706

4358 -#: builtin/checkout.c:823 builtin/checkout.c:1062

4707 +#: builtin/checkout.c:825 builtin/checkout.c:1064

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

4709 msgstr ""

4710

4362 -#: builtin/checkout.c:968

4711 +#: builtin/checkout.c:970

4712 #, c-format

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

4714 msgstr ""

4715

4367 -#: builtin/checkout.c:1008 builtin/worktree.c:212

4716 +#: builtin/checkout.c:1010 builtin/worktree.c:214

4717 #, c-format

4718 msgid "invalid reference: %s"

4719 msgstr ""

4720

4372 -#: builtin/checkout.c:1037

4721 +#: builtin/checkout.c:1039

4722 #, c-format

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

4724 msgstr ""

4725

4377 -#: builtin/checkout.c:1076

4726 +#: builtin/checkout.c:1078

4727 msgid "paths cannot be used with switching branches"

4728 msgstr ""

4729

4381 -#: builtin/checkout.c:1079 builtin/checkout.c:1083

4730 +#: builtin/checkout.c:1081 builtin/checkout.c:1085

4731 #, c-format

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

4733 msgstr ""

4734

4386 -#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095

4387 -#: builtin/checkout.c:1098

4735 +#: builtin/checkout.c:1089 builtin/checkout.c:1092 builtin/checkout.c:1097

4736 +#: builtin/checkout.c:1100

4737 #, c-format

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

4739 msgstr ""

4740

4392 -#: builtin/checkout.c:1103

4741 +#: builtin/checkout.c:1105

4742 #, c-format

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

4744 msgstr ""

4745

4397 -#: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88

4398 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323

4399 -#: builtin/worktree.c:325

4746 +#: builtin/checkout.c:1138 builtin/checkout.c:1140 builtin/clone.c:88

4747 +#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324

4748 +#: builtin/worktree.c:326

4749 msgid "branch"

4750 msgstr ""

4751

4403 -#: builtin/checkout.c:1137

4752 +#: builtin/checkout.c:1139

4753 msgid "create and checkout a new branch"

4754 msgstr ""

4755

4407 -#: builtin/checkout.c:1139

4756 +#: builtin/checkout.c:1141

4757 msgid "create/reset and checkout a branch"

4758 msgstr ""

4759

4411 -#: builtin/checkout.c:1140

4760 +#: builtin/checkout.c:1142

4761 msgid "create reflog for new branch"

4762 msgstr ""

4763

4415 -#: builtin/checkout.c:1141

4416 -msgid "detach the HEAD at named commit"

4764 +#: builtin/checkout.c:1143 builtin/worktree.c:328

4765 +msgid "detach HEAD at named commit"

4766 msgstr ""

4767

4419 -#: builtin/checkout.c:1142

4768 +#: builtin/checkout.c:1144

4769 msgid "set upstream info for new branch"

4770 msgstr ""

4771

4423 -#: builtin/checkout.c:1144

4772 +#: builtin/checkout.c:1146

4773 msgid "new-branch"

4774 msgstr ""

4775

4427 -#: builtin/checkout.c:1144

4776 +#: builtin/checkout.c:1146

4777 msgid "new unparented branch"

4778 msgstr ""

4779

4431 -#: builtin/checkout.c:1145

4780 +#: builtin/checkout.c:1147

4781 msgid "checkout our version for unmerged files"

4782 msgstr ""

4783

4435 -#: builtin/checkout.c:1147

4784 +#: builtin/checkout.c:1149

4785 msgid "checkout their version for unmerged files"

4786 msgstr ""

4787

4439 -#: builtin/checkout.c:1149

4788 +#: builtin/checkout.c:1151

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

4790 msgstr ""

4791

4443 -#: builtin/checkout.c:1150

4792 +#: builtin/checkout.c:1152

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

4794 msgstr ""

4795

4447 -#: builtin/checkout.c:1151 builtin/merge.c:230

4796 +#: builtin/checkout.c:1153 builtin/merge.c:231

4797 msgid "update ignored files (default)"

4798 msgstr ""

4799

4451 -#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250

4800 +#: builtin/checkout.c:1154 builtin/log.c:1459 parse-options.h:250

4801 msgid "style"

4802 msgstr ""

4803

4455 -#: builtin/checkout.c:1153

4804 +#: builtin/checkout.c:1155

4805 msgid "conflict style (merge or diff3)"

4806 msgstr ""

4807

4459 -#: builtin/checkout.c:1156

4808 +#: builtin/checkout.c:1158

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

4810 msgstr ""

4811

4463 -#: builtin/checkout.c:1158

4812 +#: builtin/checkout.c:1160

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

4814 msgstr ""

4815

4467 -#: builtin/checkout.c:1160

4816 +#: builtin/checkout.c:1162

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

4818 msgstr ""

4819

4471 -#: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116

4472 -#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526

4820 +#: builtin/checkout.c:1163 builtin/clone.c:60 builtin/fetch.c:117

4821 +#: builtin/merge.c:228 builtin/pull.c:116 builtin/push.c:536

4822 #: builtin/send-pack.c:168

4823 msgid "force progress reporting"

4824 msgstr ""

4825

4477 -#: builtin/checkout.c:1192

4826 +#: builtin/checkout.c:1194

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

4828 msgstr ""

4829

4481 -#: builtin/checkout.c:1209

4830 +#: builtin/checkout.c:1211

4831 msgid "--track needs a branch name"

4832 msgstr ""

4833

4485 -#: builtin/checkout.c:1214

4834 +#: builtin/checkout.c:1216

4835 msgid "Missing branch name; try -b"

4836 msgstr ""

4837

4489 -#: builtin/checkout.c:1250

4838 +#: builtin/checkout.c:1252

4839 msgid "invalid path specification"

4840 msgstr ""

4841

4493 -#: builtin/checkout.c:1257

4842 +#: builtin/checkout.c:1259

4843 #, c-format

4844 msgid ""

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

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

4847 msgstr ""

4848

4500 -#: builtin/checkout.c:1262

4849 +#: builtin/checkout.c:1264

4850 #, c-format

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

4852 msgstr ""

4853

4505 -#: builtin/checkout.c:1266

4854 +#: builtin/checkout.c:1268

4855 msgid ""

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

4857 "checking out of the index."

@@ -4633,7 +4982,7 @@ msgid "remove whole directories"

4982 msgstr ""

4983

4984 #: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724

4636 -#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182

4985 +#: builtin/ls-files.c:457 builtin/name-rev.c:314 builtin/show-ref.c:182

4986 msgid "pattern"

4987 msgstr ""

4988

@@ -4673,7 +5022,7 @@ msgstr ""

5022 msgid "don't create a checkout"

5023 msgstr ""

5024

4676 -#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473

5025 +#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:476

5026 msgid "create a bare repository"

5027 msgstr ""

5028

@@ -4701,16 +5050,16 @@ msgstr ""

5050 msgid "number of submodules cloned in parallel"

5051 msgstr ""

5052

4704 -#: builtin/clone.c:80 builtin/init-db.c:470

5053 +#: builtin/clone.c:80 builtin/init-db.c:473

5054 msgid "template-directory"

5055 msgstr ""

5056

4708 -#: builtin/clone.c:81 builtin/init-db.c:471

5057 +#: builtin/clone.c:81 builtin/init-db.c:474

5058 msgid "directory from which templates will be used"

5059 msgstr ""

5060

4712 -#: builtin/clone.c:83 builtin/submodule--helper.c:498

4713 -#: builtin/submodule--helper.c:777

5061 +#: builtin/clone.c:83 builtin/submodule--helper.c:495

5062 +#: builtin/submodule--helper.c:833

5063 msgid "reference repository"

5064 msgstr ""

5065

@@ -4734,7 +5083,7 @@ msgstr ""

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

5084 msgstr ""

5085

4737 -#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667

5086 +#: builtin/clone.c:92 builtin/fetch.c:118 builtin/grep.c:667

5087 #: builtin/pull.c:201

5088 msgid "depth"

5089 msgstr ""

@@ -4751,11 +5100,11 @@ msgstr ""

5100 msgid "any cloned submodules will be shallow"

5101 msgstr ""

5102

4754 -#: builtin/clone.c:98 builtin/init-db.c:479

5103 +#: builtin/clone.c:98 builtin/init-db.c:482

5104 msgid "gitdir"

5105 msgstr ""

5106

4758 -#: builtin/clone.c:99 builtin/init-db.c:480

5107 +#: builtin/clone.c:99 builtin/init-db.c:483

5108 msgid "separate git dir from working tree"

5109 msgstr ""

5110

@@ -4767,11 +5116,11 @@ msgstr ""

5116 msgid "set config inside the new repository"

5117 msgstr ""

5118

4770 -#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536

5119 +#: builtin/clone.c:102 builtin/fetch.c:132 builtin/push.c:547

5120 msgid "use IPv4 addresses only"

5121 msgstr ""

5122

4774 -#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538

5123 +#: builtin/clone.c:104 builtin/fetch.c:134 builtin/push.c:549

5124 msgid "use IPv6 addresses only"

5125 msgstr ""

5126

@@ -4801,6 +5150,11 @@ msgstr ""

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

5151 msgstr ""

5152

5153 +#: builtin/clone.c:376

5154 +#, c-format

5155 +msgid "failed to open '%s'"

5156 +msgstr ""

5157 +

5158 #: builtin/clone.c:384

5159 #, c-format

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

@@ -4821,7 +5175,7 @@ msgstr ""

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

5176 msgstr ""

5177

4824 -#: builtin/clone.c:449 builtin/clone.c:633

5178 +#: builtin/clone.c:449

5179 #, c-format

5180 msgid "done.\n"

5181 msgstr ""

@@ -4838,12 +5192,7 @@ msgstr ""

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

5193 msgstr ""

5194

4841 -#: builtin/clone.c:628

4842 -#, c-format

4843 -msgid "Checking connectivity... "

4844 -msgstr ""

4845 -

4846 -#: builtin/clone.c:631

5195 +#: builtin/clone.c:633

5196 msgid "remote did not send all necessary objects"

5197 msgstr ""

5198

@@ -4860,99 +5209,99 @@ msgstr ""

5209 msgid "unable to checkout working tree"

5210 msgstr ""

5211

4863 -#: builtin/clone.c:767

5212 +#: builtin/clone.c:766

5213 msgid "unable to write parameters to config file"

5214 msgstr ""

5215

4867 -#: builtin/clone.c:830

5216 +#: builtin/clone.c:829

5217 msgid "cannot repack to clean up"

5218 msgstr ""

5219

4871 -#: builtin/clone.c:832

5220 +#: builtin/clone.c:831

5221 msgid "cannot unlink temporary alternates file"

5222 msgstr ""

5223

4875 -#: builtin/clone.c:864 builtin/receive-pack.c:1731

5224 +#: builtin/clone.c:863 builtin/receive-pack.c:1857

5225 msgid "Too many arguments."

5226 msgstr ""

5227

4879 -#: builtin/clone.c:868

5228 +#: builtin/clone.c:867

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

5230 msgstr ""

5231

4883 -#: builtin/clone.c:879

5232 +#: builtin/clone.c:878

5233 #, c-format

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

5235 msgstr ""

5236

4888 -#: builtin/clone.c:882

5237 +#: builtin/clone.c:881

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

5239 msgstr ""

5240

4892 -#: builtin/clone.c:895

5241 +#: builtin/clone.c:894

5242 #, c-format

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

5244 msgstr ""

5245

4897 -#: builtin/clone.c:901 builtin/fetch.c:1174

5246 +#: builtin/clone.c:900 builtin/fetch.c:1293

5247 #, c-format

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

5249 msgstr ""

5250

4902 -#: builtin/clone.c:911

5251 +#: builtin/clone.c:910

5252 #, c-format

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

5254 msgstr ""

5255

4907 -#: builtin/clone.c:921

5256 +#: builtin/clone.c:920

5257 #, c-format

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

5259 msgstr ""

5260

4912 -#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547

4913 -#: builtin/worktree.c:220 builtin/worktree.c:247

5261 +#: builtin/clone.c:935 builtin/clone.c:946 builtin/submodule--helper.c:544

5262 +#: builtin/worktree.c:222 builtin/worktree.c:249

5263 #, c-format

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

5265 msgstr ""

5266

4918 -#: builtin/clone.c:939

5267 +#: builtin/clone.c:938

5268 #, c-format

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

5270 msgstr ""

5271

4923 -#: builtin/clone.c:957

5272 +#: builtin/clone.c:956

5273 #, c-format

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

5275 msgstr ""

5276

4928 -#: builtin/clone.c:959

5277 +#: builtin/clone.c:958

5278 #, c-format

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

5280 msgstr ""

5281

4933 -#: builtin/clone.c:998

5282 +#: builtin/clone.c:997

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

5284 msgstr ""

5285

4937 -#: builtin/clone.c:1001

5286 +#: builtin/clone.c:1000

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

5288 msgstr ""

5289

4941 -#: builtin/clone.c:1006

5290 +#: builtin/clone.c:1005

5291 msgid "--local is ignored"

5292 msgstr ""

5293

4945 -#: builtin/clone.c:1010

5294 +#: builtin/clone.c:1009

5295 #, c-format

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

5297 msgstr ""

5298

4950 -#: builtin/clone.c:1059 builtin/clone.c:1067

5299 +#: builtin/clone.c:1058 builtin/clone.c:1066

5300 #, c-format

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

5302 msgstr ""

5303

4955 -#: builtin/clone.c:1070

5304 +#: builtin/clone.c:1069

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

5306 msgstr ""

5307

@@ -5055,103 +5404,103 @@ msgid ""

5404 "the remaining commits.\n"

5405 msgstr ""

5406

5058 -#: builtin/commit.c:307

5407 +#: builtin/commit.c:308

5408 msgid "failed to unpack HEAD tree object"

5409 msgstr ""

5410

5062 -#: builtin/commit.c:348

5411 +#: builtin/commit.c:349

5412 msgid "unable to create temporary index"

5413 msgstr ""

5414

5066 -#: builtin/commit.c:354

5415 +#: builtin/commit.c:355

5416 msgid "interactive add failed"

5417 msgstr ""

5418

5070 -#: builtin/commit.c:367

5419 +#: builtin/commit.c:368

5420 msgid "unable to update temporary index"

5421 msgstr ""

5422

5074 -#: builtin/commit.c:369

5423 +#: builtin/commit.c:370

5424 msgid "Failed to update main cache tree"

5425 msgstr ""

5426

5078 -#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465

5427 +#: builtin/commit.c:394 builtin/commit.c:417 builtin/commit.c:466

5428 msgid "unable to write new_index file"

5429 msgstr ""

5430

5082 -#: builtin/commit.c:447

5431 +#: builtin/commit.c:448

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

5433 msgstr ""

5434

5086 -#: builtin/commit.c:449

5435 +#: builtin/commit.c:450

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

5437 msgstr ""

5438

5090 -#: builtin/commit.c:458

5439 +#: builtin/commit.c:459

5440 msgid "cannot read the index"

5441 msgstr ""

5442

5094 -#: builtin/commit.c:477

5443 +#: builtin/commit.c:478

5444 msgid "unable to write temporary index file"

5445 msgstr ""

5446

5098 -#: builtin/commit.c:582

5447 +#: builtin/commit.c:583

5448 #, c-format

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

5450 msgstr ""

5451

5103 -#: builtin/commit.c:584

5452 +#: builtin/commit.c:585

5453 #, c-format

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

5455 msgstr ""

5456

5108 -#: builtin/commit.c:603

5457 +#: builtin/commit.c:604

5458 msgid "malformed --author parameter"

5459 msgstr ""

5460

5112 -#: builtin/commit.c:611

5461 +#: builtin/commit.c:612

5462 #, c-format

5463 msgid "invalid date format: %s"

5464 msgstr ""

5465

5117 -#: builtin/commit.c:655

5466 +#: builtin/commit.c:656

5467 msgid ""

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

5469 "in the current commit message"

5470 msgstr ""

5471

5123 -#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091

5472 +#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1092

5473 #, c-format

5474 msgid "could not lookup commit %s"

5475 msgstr ""

5476

5128 -#: builtin/commit.c:704 builtin/shortlog.c:285

5477 +#: builtin/commit.c:705 builtin/shortlog.c:286

5478 #, c-format

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

5480 msgstr ""

5481

5133 -#: builtin/commit.c:706

5482 +#: builtin/commit.c:707

5483 msgid "could not read log from standard input"

5484 msgstr ""

5485

5137 -#: builtin/commit.c:710

5486 +#: builtin/commit.c:711

5487 #, c-format

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

5489 msgstr ""

5490

5142 -#: builtin/commit.c:737 builtin/commit.c:745

5491 +#: builtin/commit.c:738 builtin/commit.c:746

5492 msgid "could not read SQUASH_MSG"

5493 msgstr ""

5494

5146 -#: builtin/commit.c:742

5495 +#: builtin/commit.c:743

5496 msgid "could not read MERGE_MSG"

5497 msgstr ""

5498

5150 -#: builtin/commit.c:796

5499 +#: builtin/commit.c:797

5500 msgid "could not write commit template"

5501 msgstr ""

5502

5154 -#: builtin/commit.c:814

5503 +#: builtin/commit.c:815

5504 #, c-format

5505 msgid ""

5506 "\n"

@@ -5161,7 +5510,7 @@ msgid ""

5510 "and try again.\n"

5511 msgstr ""

5512

5164 -#: builtin/commit.c:819

5513 +#: builtin/commit.c:820

5514 #, c-format

5515 msgid ""

5516 "\n"

@@ -5171,14 +5520,14 @@ msgid ""

5520 "and try again.\n"

5521 msgstr ""

5522

5174 -#: builtin/commit.c:832

5523 +#: builtin/commit.c:833

5524 #, c-format

5525 msgid ""

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

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

5528 msgstr ""

5529

5181 -#: builtin/commit.c:839

5530 +#: builtin/commit.c:840

5531 #, c-format

5532 msgid ""

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

@@ -5186,341 +5535,341 @@ msgid ""

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

5536 msgstr ""

5537

5189 -#: builtin/commit.c:859

5538 +#: builtin/commit.c:860

5539 #, c-format

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

5541 msgstr ""

5542

5194 -#: builtin/commit.c:867

5543 +#: builtin/commit.c:868

5544 #, c-format

5545 msgid "%sDate: %s"

5546 msgstr ""

5547

5199 -#: builtin/commit.c:874

5548 +#: builtin/commit.c:875

5549 #, c-format

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

5551 msgstr ""

5552

5204 -#: builtin/commit.c:892

5553 +#: builtin/commit.c:893

5554 msgid "Cannot read index"

5555 msgstr ""

5556

5208 -#: builtin/commit.c:949

5557 +#: builtin/commit.c:950

5558 msgid "Error building trees"

5559 msgstr ""

5560

5212 -#: builtin/commit.c:964 builtin/tag.c:266

5561 +#: builtin/commit.c:965 builtin/tag.c:266

5562 #, c-format

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

5564 msgstr ""

5565

5217 -#: builtin/commit.c:1066

5566 +#: builtin/commit.c:1067

5567 #, c-format

5568 msgid "--author '%s' is not 'Name <email>' and matches no existing author"

5569 msgstr ""

5570

5222 -#: builtin/commit.c:1081 builtin/commit.c:1321

5571 +#: builtin/commit.c:1082 builtin/commit.c:1322

5572 #, c-format

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

5574 msgstr ""

5575

5227 -#: builtin/commit.c:1118

5576 +#: builtin/commit.c:1119

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

5578 msgstr ""

5579

5231 -#: builtin/commit.c:1148

5580 +#: builtin/commit.c:1149

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

5582 msgstr ""

5583

5235 -#: builtin/commit.c:1157

5584 +#: builtin/commit.c:1158

5585 msgid "You have nothing to amend."

5586 msgstr ""

5587

5239 -#: builtin/commit.c:1160

5588 +#: builtin/commit.c:1161

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

5590 msgstr ""

5591

5243 -#: builtin/commit.c:1162

5592 +#: builtin/commit.c:1163

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

5594 msgstr ""

5595

5247 -#: builtin/commit.c:1165

5596 +#: builtin/commit.c:1166

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

5598 msgstr ""

5599

5251 -#: builtin/commit.c:1175

5600 +#: builtin/commit.c:1176

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

5602 msgstr ""

5603

5255 -#: builtin/commit.c:1177

5604 +#: builtin/commit.c:1178

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

5606 msgstr ""

5607

5259 -#: builtin/commit.c:1185

5608 +#: builtin/commit.c:1186

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

5610 msgstr ""

5611

5263 -#: builtin/commit.c:1202

5612 +#: builtin/commit.c:1203

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

5614 msgstr ""

5615

5267 -#: builtin/commit.c:1204

5616 +#: builtin/commit.c:1205

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

5618 msgstr ""

5619

5271 -#: builtin/commit.c:1206

5620 +#: builtin/commit.c:1207

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

5622 msgstr ""

5623

5275 -#: builtin/commit.c:1208

5624 +#: builtin/commit.c:1209

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

5626 msgstr ""

5627

5279 -#: builtin/commit.c:1220 builtin/tag.c:474

5628 +#: builtin/commit.c:1221 builtin/tag.c:474

5629 #, c-format

5630 msgid "Invalid cleanup mode %s"

5631 msgstr ""

5632

5284 -#: builtin/commit.c:1225

5633 +#: builtin/commit.c:1226

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

5635 msgstr ""

5636

5288 -#: builtin/commit.c:1335 builtin/commit.c:1621

5637 +#: builtin/commit.c:1336 builtin/commit.c:1622

5638 msgid "show status concisely"

5639 msgstr ""

5640

5292 -#: builtin/commit.c:1337 builtin/commit.c:1623

5641 +#: builtin/commit.c:1338 builtin/commit.c:1624

5642 msgid "show branch information"

5643 msgstr ""

5644

5296 -#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512

5297 -#: builtin/worktree.c:437

5645 +#: builtin/commit.c:1340 builtin/commit.c:1626 builtin/push.c:522

5646 +#: builtin/worktree.c:440

5647 msgid "machine-readable output"

5648 msgstr ""

5649

5301 -#: builtin/commit.c:1342 builtin/commit.c:1627

5650 +#: builtin/commit.c:1343 builtin/commit.c:1628

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

5652 msgstr ""

5653

5305 -#: builtin/commit.c:1345 builtin/commit.c:1630

5654 +#: builtin/commit.c:1346 builtin/commit.c:1631

5655 msgid "terminate entries with NUL"

5656 msgstr ""

5657

5309 -#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981

5658 +#: builtin/commit.c:1348 builtin/commit.c:1634 builtin/fast-export.c:981

5659 #: builtin/fast-export.c:984 builtin/tag.c:353

5660 msgid "mode"

5661 msgstr ""

5662

5314 -#: builtin/commit.c:1348 builtin/commit.c:1633

5663 +#: builtin/commit.c:1349 builtin/commit.c:1634

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

5665 msgstr ""

5666

5318 -#: builtin/commit.c:1351

5667 +#: builtin/commit.c:1352

5668 msgid "show ignored files"

5669 msgstr ""

5670

5322 -#: builtin/commit.c:1352 parse-options.h:155

5671 +#: builtin/commit.c:1353 parse-options.h:155

5672 msgid "when"

5673 msgstr ""

5674

5326 -#: builtin/commit.c:1353

5675 +#: builtin/commit.c:1354

5676 msgid ""

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

5678 "(Default: all)"

5679 msgstr ""

5680

5332 -#: builtin/commit.c:1355

5681 +#: builtin/commit.c:1356

5682 msgid "list untracked files in columns"

5683 msgstr ""

5684

5336 -#: builtin/commit.c:1441

5685 +#: builtin/commit.c:1442

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

5687 msgstr ""

5688

5340 -#: builtin/commit.c:1443

5689 +#: builtin/commit.c:1444

5690 msgid "could not parse newly created commit"

5691 msgstr ""

5692

5344 -#: builtin/commit.c:1488

5693 +#: builtin/commit.c:1489

5694 msgid "detached HEAD"

5695 msgstr ""

5696

5348 -#: builtin/commit.c:1491

5697 +#: builtin/commit.c:1492

5698 msgid " (root-commit)"

5699 msgstr ""

5700

5352 -#: builtin/commit.c:1591

5701 +#: builtin/commit.c:1592

5702 msgid "suppress summary after successful commit"

5703 msgstr ""

5704

5356 -#: builtin/commit.c:1592

5705 +#: builtin/commit.c:1593

5706 msgid "show diff in commit message template"

5707 msgstr ""

5708

5360 -#: builtin/commit.c:1594

5709 +#: builtin/commit.c:1595

5710 msgid "Commit message options"

5711 msgstr ""

5712

5364 -#: builtin/commit.c:1595 builtin/tag.c:351

5713 +#: builtin/commit.c:1596 builtin/tag.c:351

5714 msgid "read message from file"

5715 msgstr ""

5716

5368 -#: builtin/commit.c:1596

5717 +#: builtin/commit.c:1597

5718 msgid "author"

5719 msgstr ""

5720

5372 -#: builtin/commit.c:1596

5721 +#: builtin/commit.c:1597

5722 msgid "override author for commit"

5723 msgstr ""

5724

5376 -#: builtin/commit.c:1597 builtin/gc.c:326

5725 +#: builtin/commit.c:1598 builtin/gc.c:326

5726 msgid "date"

5727 msgstr ""

5728

5380 -#: builtin/commit.c:1597

5729 +#: builtin/commit.c:1598

5730 msgid "override date for commit"

5731 msgstr ""

5732

5384 -#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395

5385 -#: builtin/notes.c:558 builtin/tag.c:349

5733 +#: builtin/commit.c:1599 builtin/merge.c:220 builtin/notes.c:396

5734 +#: builtin/notes.c:559 builtin/tag.c:349

5735 msgid "message"

5736 msgstr ""

5737

5389 -#: builtin/commit.c:1598

5738 +#: builtin/commit.c:1599

5739 msgid "commit message"

5740 msgstr ""

5741

5393 -#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601

5394 -#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79

5742 +#: builtin/commit.c:1600 builtin/commit.c:1601 builtin/commit.c:1602

5743 +#: builtin/commit.c:1603 parse-options.h:256 ref-filter.h:79

5744 msgid "commit"

5745 msgstr ""

5746

5398 -#: builtin/commit.c:1599

5747 +#: builtin/commit.c:1600

5748 msgid "reuse and edit message from specified commit"

5749 msgstr ""

5750

5402 -#: builtin/commit.c:1600

5751 +#: builtin/commit.c:1601

5752 msgid "reuse message from specified commit"

5753 msgstr ""

5754

5406 -#: builtin/commit.c:1601

5755 +#: builtin/commit.c:1602

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

5757 msgstr ""

5758

5410 -#: builtin/commit.c:1602

5759 +#: builtin/commit.c:1603

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

5761 msgstr ""

5762

5414 -#: builtin/commit.c:1603

5763 +#: builtin/commit.c:1604

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

5765 msgstr ""

5766

5418 -#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86

5767 +#: builtin/commit.c:1605 builtin/log.c:1409 builtin/revert.c:86

5768 msgid "add Signed-off-by:"

5769 msgstr ""

5770

5422 -#: builtin/commit.c:1605

5771 +#: builtin/commit.c:1606

5772 msgid "use specified template file"

5773 msgstr ""

5774

5426 -#: builtin/commit.c:1606

5775 +#: builtin/commit.c:1607

5776 msgid "force edit of commit"

5777 msgstr ""

5778

5430 -#: builtin/commit.c:1607

5779 +#: builtin/commit.c:1608

5780 msgid "default"

5781 msgstr ""

5782

5434 -#: builtin/commit.c:1607 builtin/tag.c:354

5783 +#: builtin/commit.c:1608 builtin/tag.c:354

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

5785 msgstr ""

5786

5438 -#: builtin/commit.c:1608

5787 +#: builtin/commit.c:1609

5788 msgid "include status in commit message template"

5789 msgstr ""

5790

5442 -#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165

5791 +#: builtin/commit.c:1611 builtin/merge.c:230 builtin/pull.c:165

5792 #: builtin/revert.c:93

5793 msgid "GPG sign commit"

5794 msgstr ""

5795

5447 -#: builtin/commit.c:1613

5796 +#: builtin/commit.c:1614

5797 msgid "Commit contents options"

5798 msgstr ""

5799

5451 -#: builtin/commit.c:1614

5800 +#: builtin/commit.c:1615

5801 msgid "commit all changed files"

5802 msgstr ""

5803

5455 -#: builtin/commit.c:1615

5804 +#: builtin/commit.c:1616

5805 msgid "add specified files to index for commit"

5806 msgstr ""

5807

5459 -#: builtin/commit.c:1616

5808 +#: builtin/commit.c:1617

5809 msgid "interactively add files"

5810 msgstr ""

5811

5463 -#: builtin/commit.c:1617

5812 +#: builtin/commit.c:1618

5813 msgid "interactively add changes"

5814 msgstr ""

5815

5467 -#: builtin/commit.c:1618

5816 +#: builtin/commit.c:1619

5817 msgid "commit only specified files"

5818 msgstr ""

5819

5471 -#: builtin/commit.c:1619

5472 -msgid "bypass pre-commit hook"

5820 +#: builtin/commit.c:1620

5821 +msgid "bypass pre-commit and commit-msg hooks"

5822 msgstr ""

5823

5475 -#: builtin/commit.c:1620

5824 +#: builtin/commit.c:1621

5825 msgid "show what would be committed"

5826 msgstr ""

5827

5479 -#: builtin/commit.c:1631

5828 +#: builtin/commit.c:1632

5829 msgid "amend previous commit"

5830 msgstr ""

5831

5483 -#: builtin/commit.c:1632

5832 +#: builtin/commit.c:1633

5833 msgid "bypass post-rewrite hook"

5834 msgstr ""

5835

5487 -#: builtin/commit.c:1637

5836 +#: builtin/commit.c:1638

5837 msgid "ok to record an empty change"

5838 msgstr ""

5839

5491 -#: builtin/commit.c:1639

5840 +#: builtin/commit.c:1640

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

5842 msgstr ""

5843

5495 -#: builtin/commit.c:1668

5844 +#: builtin/commit.c:1669

5845 msgid "could not parse HEAD commit"

5846 msgstr ""

5847

5499 -#: builtin/commit.c:1718

5848 +#: builtin/commit.c:1719

5849 #, c-format

5850 msgid "Corrupt MERGE_HEAD file (%s)"

5851 msgstr ""

5852

5504 -#: builtin/commit.c:1725

5853 +#: builtin/commit.c:1726

5854 msgid "could not read MERGE_MODE"

5855 msgstr ""

5856

5508 -#: builtin/commit.c:1744

5857 +#: builtin/commit.c:1745

5858 #, c-format

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

5860 msgstr ""

5861

5513 -#: builtin/commit.c:1755

5862 +#: builtin/commit.c:1756

5863 #, c-format

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

5865 msgstr ""

5866

5518 -#: builtin/commit.c:1760

5867 +#: builtin/commit.c:1761

5868 #, c-format

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

5870 msgstr ""

5871

5523 -#: builtin/commit.c:1808

5872 +#: builtin/commit.c:1809

5873 msgid ""

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

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

@@ -5531,139 +5880,139 @@ msgstr ""

5880 msgid "git config [<options>]"

5881 msgstr ""

5882

5534 -#: builtin/config.c:56

5883 +#: builtin/config.c:55

5884 msgid "Config file location"

5885 msgstr ""

5886

5538 -#: builtin/config.c:57

5887 +#: builtin/config.c:56

5888 msgid "use global config file"

5889 msgstr ""

5890

5542 -#: builtin/config.c:58

5891 +#: builtin/config.c:57

5892 msgid "use system config file"

5893 msgstr ""

5894

5546 -#: builtin/config.c:59

5895 +#: builtin/config.c:58

5896 msgid "use repository config file"

5897 msgstr ""

5898

5550 -#: builtin/config.c:60

5899 +#: builtin/config.c:59

5900 msgid "use given config file"

5901 msgstr ""

5902

5554 -#: builtin/config.c:61

5903 +#: builtin/config.c:60

5904 msgid "blob-id"

5905 msgstr ""

5906

5558 -#: builtin/config.c:61

5907 +#: builtin/config.c:60

5908 msgid "read config from given blob object"

5909 msgstr ""

5910

5562 -#: builtin/config.c:62

5911 +#: builtin/config.c:61

5912 msgid "Action"

5913 msgstr ""

5914

5566 -#: builtin/config.c:63

5915 +#: builtin/config.c:62

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

5917 msgstr ""

5918

5570 -#: builtin/config.c:64

5919 +#: builtin/config.c:63

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

5921 msgstr ""

5922

5574 -#: builtin/config.c:65

5923 +#: builtin/config.c:64

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

5925 msgstr ""

5926

5578 -#: builtin/config.c:66

5927 +#: builtin/config.c:65

5928 msgid "get value specific for the URL: section[.var] URL"

5929 msgstr ""

5930

5582 -#: builtin/config.c:67

5931 +#: builtin/config.c:66

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

5933 msgstr ""

5934

5586 -#: builtin/config.c:68

5935 +#: builtin/config.c:67

5936 msgid "add a new variable: name value"

5937 msgstr ""

5938

5590 -#: builtin/config.c:69

5939 +#: builtin/config.c:68

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

5941 msgstr ""

5942

5594 -#: builtin/config.c:70

5943 +#: builtin/config.c:69

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

5945 msgstr ""

5946

5598 -#: builtin/config.c:71

5947 +#: builtin/config.c:70

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

5949 msgstr ""

5950

5602 -#: builtin/config.c:72

5951 +#: builtin/config.c:71

5952 msgid "remove a section: name"

5953 msgstr ""

5954

l10n: git.pot: v2.10.0 round 1 (248 new, 56 removed)