d07a63e47c · matheusbsbs/matheus-bagliano

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

8 msgstr ""

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

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

11 -"POT-Creation-Date: 2014-08-04 14:48+0800\n"

11 +"POT-Creation-Date: 2014-11-01 07:46+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"

@@ -26,101 +26,100 @@ msgstr ""

26 #: advice.c:88

27 msgid ""

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

29 -"as appropriate to mark resolution and make a commit, or use\n"

30 -"'git commit -a'."

29 +"as appropriate to mark resolution and make a commit."

30 msgstr ""

31

33 -#: archive.c:10

32 +#: archive.c:11

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

34 msgstr ""

35

37 -#: archive.c:11

36 +#: archive.c:12

37 msgid "git archive --list"

38 msgstr ""

39

41 -#: archive.c:12

40 +#: archive.c:13

41 msgid ""

42 "git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]"

43 msgstr ""

44

46 -#: archive.c:13

45 +#: archive.c:14

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

47 msgstr ""

48

50 -#: archive.c:243 builtin/add.c:136 builtin/add.c:427 builtin/rm.c:328

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

50 #, c-format

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

52 msgstr ""

53

55 -#: archive.c:328

54 +#: archive.c:419

55 msgid "fmt"

56 msgstr ""

57

59 -#: archive.c:328

58 +#: archive.c:419

59 msgid "archive format"

60 msgstr ""

61

63 -#: archive.c:329 builtin/log.c:1201

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

63 msgid "prefix"

64 msgstr ""

65

67 -#: archive.c:330

66 +#: archive.c:421

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

68 msgstr ""

69

71 -#: archive.c:331 builtin/archive.c:88 builtin/blame.c:2517

72 -#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:709

73 -#: builtin/fast-export.c:711 builtin/grep.c:712 builtin/hash-object.c:77

74 -#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:412

75 -#: builtin/notes.c:569 builtin/read-tree.c:108 parse-options.h:151

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

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

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

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

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

75 msgid "file"

76 msgstr ""

77

79 -#: archive.c:332 builtin/archive.c:89

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

79 msgid "write the archive to this file"

80 msgstr ""

81

83 -#: archive.c:334

82 +#: archive.c:425

83 msgid "read .gitattributes in working directory"

84 msgstr ""

85

87 -#: archive.c:335

86 +#: archive.c:426

87 msgid "report archived files on stderr"

88 msgstr ""

89

91 -#: archive.c:336

90 +#: archive.c:427

91 msgid "store only"

92 msgstr ""

93

95 -#: archive.c:337

94 +#: archive.c:428

95 msgid "compress faster"

96 msgstr ""

97

99 -#: archive.c:345

98 +#: archive.c:436

99 msgid "compress better"

100 msgstr ""

101

103 -#: archive.c:348

102 +#: archive.c:439

103 msgid "list supported archive formats"

104 msgstr ""

105

107 -#: archive.c:350 builtin/archive.c:90 builtin/clone.c:84

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

107 msgid "repo"

108 msgstr ""

109

111 -#: archive.c:351 builtin/archive.c:91

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

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

112 msgstr ""

113

115 -#: archive.c:352 builtin/archive.c:92 builtin/notes.c:491

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

115 msgid "command"

116 msgstr ""

117

119 -#: archive.c:353 builtin/archive.c:93

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

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

120 msgstr ""

121

123 -#: attr.c:259

122 +#: attr.c:258

123 msgid ""

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

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

@@ -176,31 +175,31 @@ msgstr ""

175 msgid "Not tracking: ambiguous information for ref %s"

176 msgstr ""

177

179 -#: branch.c:178

178 +#: branch.c:162

179 #, c-format

180 msgid "'%s' is not a valid branch name."

181 msgstr ""

182

184 -#: branch.c:183

183 +#: branch.c:167

184 #, c-format

185 msgid "A branch named '%s' already exists."

186 msgstr ""

187

189 -#: branch.c:191

188 +#: branch.c:175

189 msgid "Cannot force update the current branch."

190 msgstr ""

191

193 -#: branch.c:211

192 +#: branch.c:195

193 #, c-format

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

195 msgstr ""

196

198 -#: branch.c:213

197 +#: branch.c:197

198 #, c-format

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

200 msgstr ""

201

203 -#: branch.c:215

202 +#: branch.c:199

203 msgid ""

204 "\n"

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

@@ -212,107 +211,105 @@ msgid ""

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

212 msgstr ""

213

215 -#: branch.c:260

214 +#: branch.c:243

215 #, c-format

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

217 msgstr ""

218

220 -#: branch.c:280

219 +#: branch.c:263

220 #, c-format

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

222 msgstr ""

223

225 -#: branch.c:285

224 +#: branch.c:268

225 #, c-format

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

227 msgstr ""

228

230 -#: branch.c:291

231 -msgid "Failed to lock ref for update"

232 -msgstr ""

233 -

234 -#: branch.c:309

235 -msgid "Failed to write ref"

236 -msgstr ""

237 -

238 -#: bundle.c:33

229 +#: bundle.c:34

230 #, c-format

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

232 msgstr ""

233

243 -#: bundle.c:60

234 +#: bundle.c:61

235 #, c-format

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

237 msgstr ""

238

248 -#: bundle.c:86 builtin/commit.c:755

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

240 #, c-format

241 msgid "could not open '%s'"

242 msgstr ""

243

253 -#: bundle.c:138

244 +#: bundle.c:139

245 msgid "Repository lacks these prerequisite commits:"

246 msgstr ""

247

257 -#: bundle.c:162 sequencer.c:630 sequencer.c:1085 builtin/log.c:330

258 -#: builtin/log.c:821 builtin/log.c:1428 builtin/log.c:1665 builtin/merge.c:357

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

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

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

251 #: builtin/shortlog.c:158

252 msgid "revision walk setup failed"

253 msgstr ""

254

263 -#: bundle.c:184

255 +#: bundle.c:185

256 #, c-format

257 msgid "The bundle contains this ref:"

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

259 msgstr[0] ""

260 msgstr[1] ""

261

270 -#: bundle.c:191

262 +#: bundle.c:192

263 msgid "The bundle records a complete history."

264 msgstr ""

265

274 -#: bundle.c:193

266 +#: bundle.c:194

267 #, c-format

268 msgid "The bundle requires this ref:"

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

270 msgstr[0] ""

271 msgstr[1] ""

272

281 -#: bundle.c:289

273 +#: bundle.c:292

274 msgid "rev-list died"

275 msgstr ""

276

285 -#: bundle.c:295 builtin/log.c:1339 builtin/shortlog.c:261

277 +#: bundle.c:298 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261

278 #, c-format

279 msgid "unrecognized argument: %s"

280 msgstr ""

281

290 -#: bundle.c:330

282 +#: bundle.c:333

283 #, c-format

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

285 msgstr ""

286

295 -#: bundle.c:375

287 +#: bundle.c:378

288 msgid "Refusing to create empty bundle."

289 msgstr ""

290

299 -#: bundle.c:390

291 +#: bundle.c:393

292 msgid "Could not spawn pack-objects"

293 msgstr ""

294

303 -#: bundle.c:408

295 +#: bundle.c:411

296 msgid "pack-objects died"

297 msgstr ""

298

307 -#: bundle.c:411

299 +#: bundle.c:414

300 #, c-format

301 msgid "cannot create '%s'"

302 msgstr ""

303

312 -#: bundle.c:433

304 +#: bundle.c:435

305 msgid "index-pack died"

306 msgstr ""

307

308 +#: color.c:157

309 +#, c-format

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

311 +msgstr ""

312 +

313 #: commit.c:40

314 #, c-format

315 msgid "could not parse %s"

@@ -327,16 +324,69 @@ msgstr ""

324 msgid "memory exhausted"

325 msgstr ""

326

330 -#: connected.c:70

327 +#: config.c:469 config.c:471

328 +#, c-format

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

330 +msgstr ""

331 +

332 +#: config.c:587

333 +#, c-format

334 +msgid "bad numeric config value '%s' for '%s' in %s: %s"

335 +msgstr ""

336 +

337 +#: config.c:589

338 +#, c-format

339 +msgid "bad numeric config value '%s' for '%s': %s"

340 +msgstr ""

341 +

342 +#: config.c:674

343 +#, c-format

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

345 +msgstr ""

346 +

347 +#: config.c:752 config.c:763

348 +#, c-format

349 +msgid "bad zlib compression level %d"

350 +msgstr ""

351 +

352 +#: config.c:885

353 +#, c-format

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

355 +msgstr ""

356 +

357 +#: config.c:1201

358 +msgid "unable to parse command-line config"

359 +msgstr ""

360 +

361 +#: config.c:1262

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

363 +msgstr ""

364 +

365 +#: config.c:1586

366 +#, c-format

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

368 +msgstr ""

369 +

370 +#: config.c:1588

371 +#, c-format

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

373 +msgstr ""

374 +

375 +#: config.c:1647

376 +#, c-format

377 +msgid "%s has multiple values"

378 +msgstr ""

379 +

380 +#: connected.c:69

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

382 msgstr ""

383

334 -#: connected.c:90

384 +#: connected.c:89

385 #, c-format

386 msgid "failed write to rev-list: %s"

387 msgstr ""

388

339 -#: connected.c:98

389 +#: connected.c:97

390 #, c-format

391 msgid "failed to close rev-list's stdin: %s"

392 msgstr ""

@@ -414,7 +464,7 @@ msgstr[1] ""

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

465 msgstr ""

466

417 -#: diffcore-rename.c:514

467 +#: diffcore-rename.c:516

468 msgid "Performing inexact rename detection"

469 msgstr ""

470

@@ -433,67 +483,67 @@ msgstr ""

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

484 msgstr ""

485

436 -#: diff.c:267

486 +#: diff.c:266

487 #, c-format

488 msgid ""

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

490 "%s"

491 msgstr ""

492

443 -#: diff.c:2934

493 +#: diff.c:2957

494 #, c-format

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

496 msgstr ""

497

448 -#: diff.c:3329

498 +#: diff.c:3352

499 msgid "--follow requires exactly one pathspec"

500 msgstr ""

501

452 -#: diff.c:3492

502 +#: diff.c:3515

503 #, c-format

504 msgid ""

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

506 "%s"

507 msgstr ""

508

459 -#: diff.c:3506

509 +#: diff.c:3529

510 #, c-format

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

512 msgstr ""

513

464 -#: gpg-interface.c:73 gpg-interface.c:145

514 +#: gpg-interface.c:129 gpg-interface.c:200

515 msgid "could not run gpg."

516 msgstr ""

517

468 -#: gpg-interface.c:85

518 +#: gpg-interface.c:141

519 msgid "gpg did not accept the data"

520 msgstr ""

521

472 -#: gpg-interface.c:96

522 +#: gpg-interface.c:152

523 msgid "gpg failed to sign the data"

524 msgstr ""

525

476 -#: gpg-interface.c:129

526 +#: gpg-interface.c:185

527 #, c-format

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

529 msgstr ""

530

481 -#: gpg-interface.c:132

531 +#: gpg-interface.c:188

532 #, c-format

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

534 msgstr ""

535

486 -#: grep.c:1703

536 +#: grep.c:1718

537 #, c-format

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

539 msgstr ""

540

491 -#: grep.c:1720

541 +#: grep.c:1735

542 #, c-format

543 msgid "'%s': %s"

544 msgstr ""

545

496 -#: grep.c:1731

546 +#: grep.c:1746

547 #, c-format

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

549 msgstr ""

@@ -554,256 +604,264 @@ msgstr[1] ""

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

605 msgstr ""

606

557 -#: merge.c:40

607 +#: lockfile.c:275

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

609 +msgstr ""

610 +

611 +#: lockfile.c:277

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

613 +msgstr ""

614 +

615 +#: merge.c:41

616 msgid "failed to read the cache"

617 msgstr ""

618

561 -#: merge.c:93 builtin/checkout.c:356 builtin/checkout.c:556

562 -#: builtin/clone.c:661

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

620 +#: builtin/clone.c:659

621 msgid "unable to write new index file"

622 msgstr ""

623

566 -#: merge-recursive.c:190

624 +#: merge-recursive.c:189

625 #, c-format

626 msgid "(bad commit)\n"

627 msgstr ""

628

571 -#: merge-recursive.c:210

629 +#: merge-recursive.c:209

630 #, c-format

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

632 msgstr ""

633

576 -#: merge-recursive.c:271

634 +#: merge-recursive.c:270

635 msgid "error building trees"

636 msgstr ""

637

580 -#: merge-recursive.c:692

638 +#: merge-recursive.c:691

639 #, c-format

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

641 msgstr ""

642

585 -#: merge-recursive.c:703

643 +#: merge-recursive.c:702

644 #, c-format

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

646 msgstr ""

647

590 -#: merge-recursive.c:717 merge-recursive.c:738

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

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

650 msgstr ""

651

594 -#: merge-recursive.c:728

652 +#: merge-recursive.c:727

653 #, c-format

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

655 msgstr ""

656

599 -#: merge-recursive.c:768

657 +#: merge-recursive.c:767

658 #, c-format

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

660 msgstr ""

661

604 -#: merge-recursive.c:770

662 +#: merge-recursive.c:769

663 #, c-format

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

665 msgstr ""

666

609 -#: merge-recursive.c:793 builtin/clone.c:317

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

668 #, c-format

669 msgid "failed to open '%s'"

670 msgstr ""

671

614 -#: merge-recursive.c:801

672 +#: merge-recursive.c:800

673 #, c-format

674 msgid "failed to symlink '%s'"

675 msgstr ""

676

619 -#: merge-recursive.c:804

677 +#: merge-recursive.c:803

678 #, c-format

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

680 msgstr ""

681

624 -#: merge-recursive.c:942

682 +#: merge-recursive.c:941

683 msgid "Failed to execute internal merge"

684 msgstr ""

685

628 -#: merge-recursive.c:946

686 +#: merge-recursive.c:945

687 #, c-format

688 msgid "Unable to add %s to database"

689 msgstr ""

690

633 -#: merge-recursive.c:962

691 +#: merge-recursive.c:961

692 msgid "unsupported object type in the tree"

693 msgstr ""

694

637 -#: merge-recursive.c:1037 merge-recursive.c:1051

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

696 #, c-format

697 msgid ""

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

699 "in tree."

700 msgstr ""

701

644 -#: merge-recursive.c:1043 merge-recursive.c:1056

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

703 #, c-format

704 msgid ""

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

706 "in tree at %s."

707 msgstr ""

708

651 -#: merge-recursive.c:1097

709 +#: merge-recursive.c:1096

710 msgid "rename"

711 msgstr ""

712

655 -#: merge-recursive.c:1097

713 +#: merge-recursive.c:1096

714 msgid "renamed"

715 msgstr ""

716

659 -#: merge-recursive.c:1153

717 +#: merge-recursive.c:1152

718 #, c-format

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

720 msgstr ""

721

664 -#: merge-recursive.c:1175

722 +#: merge-recursive.c:1174

723 #, c-format

724 msgid ""

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

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

727 msgstr ""

728

671 -#: merge-recursive.c:1180

729 +#: merge-recursive.c:1179

730 msgid " (left unresolved)"

731 msgstr ""

732

675 -#: merge-recursive.c:1234

733 +#: merge-recursive.c:1233

734 #, c-format

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

736 msgstr ""

737

680 -#: merge-recursive.c:1264

738 +#: merge-recursive.c:1263

739 #, c-format

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

741 msgstr ""

742

685 -#: merge-recursive.c:1463

743 +#: merge-recursive.c:1462

744 #, c-format

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

746 msgstr ""

747

690 -#: merge-recursive.c:1473

748 +#: merge-recursive.c:1472

749 #, c-format

750 msgid "Adding merged %s"

751 msgstr ""

752

695 -#: merge-recursive.c:1478 merge-recursive.c:1676

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

754 #, c-format

755 msgid "Adding as %s instead"

756 msgstr ""

757

700 -#: merge-recursive.c:1529

758 +#: merge-recursive.c:1528

759 #, c-format

760 msgid "cannot read object %s"

761 msgstr ""

762

705 -#: merge-recursive.c:1532

763 +#: merge-recursive.c:1531

764 #, c-format

765 msgid "object %s is not a blob"

766 msgstr ""

767

710 -#: merge-recursive.c:1580

768 +#: merge-recursive.c:1579

769 msgid "modify"

770 msgstr ""

771

714 -#: merge-recursive.c:1580

772 +#: merge-recursive.c:1579

773 msgid "modified"

774 msgstr ""

775

718 -#: merge-recursive.c:1590

776 +#: merge-recursive.c:1589

777 msgid "content"

778 msgstr ""

779

722 -#: merge-recursive.c:1597

780 +#: merge-recursive.c:1596

781 msgid "add/add"

782 msgstr ""

783

726 -#: merge-recursive.c:1631

784 +#: merge-recursive.c:1630

785 #, c-format

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

787 msgstr ""

788

731 -#: merge-recursive.c:1645

789 +#: merge-recursive.c:1644

790 #, c-format

791 msgid "Auto-merging %s"

792 msgstr ""

793

736 -#: merge-recursive.c:1649 git-submodule.sh:1150

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

795 msgid "submodule"

796 msgstr ""

797

740 -#: merge-recursive.c:1650

798 +#: merge-recursive.c:1649

799 #, c-format

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

801 msgstr ""

802

745 -#: merge-recursive.c:1740

803 +#: merge-recursive.c:1735

804 #, c-format

805 msgid "Removing %s"

806 msgstr ""

807

750 -#: merge-recursive.c:1765

808 +#: merge-recursive.c:1760

809 msgid "file/directory"

810 msgstr ""

811

754 -#: merge-recursive.c:1771

812 +#: merge-recursive.c:1766

813 msgid "directory/file"

814 msgstr ""

815

758 -#: merge-recursive.c:1776

816 +#: merge-recursive.c:1771

817 #, c-format

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

819 msgstr ""

820

763 -#: merge-recursive.c:1786

821 +#: merge-recursive.c:1781

822 #, c-format

823 msgid "Adding %s"

824 msgstr ""

825

768 -#: merge-recursive.c:1803

826 +#: merge-recursive.c:1798

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

828 msgstr ""

829

772 -#: merge-recursive.c:1822

830 +#: merge-recursive.c:1817

831 msgid "Already up-to-date!"

832 msgstr ""

833

776 -#: merge-recursive.c:1831

834 +#: merge-recursive.c:1826

835 #, c-format

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

837 msgstr ""

838

781 -#: merge-recursive.c:1861

839 +#: merge-recursive.c:1856

840 #, c-format

841 msgid "Unprocessed path??? %s"

842 msgstr ""

843

786 -#: merge-recursive.c:1906

844 +#: merge-recursive.c:1901

845 msgid "Merging:"

846 msgstr ""

847

790 -#: merge-recursive.c:1919

848 +#: merge-recursive.c:1914

849 #, c-format

850 msgid "found %u common ancestor:"

851 msgid_plural "found %u common ancestors:"

852 msgstr[0] ""

853 msgstr[1] ""

854

797 -#: merge-recursive.c:1956

855 +#: merge-recursive.c:1951

856 msgid "merge returned no commit"

857 msgstr ""

858

801 -#: merge-recursive.c:2013

859 +#: merge-recursive.c:2008

860 #, c-format

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

862 msgstr ""

863

806 -#: merge-recursive.c:2024 builtin/merge.c:666

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

865 msgid "Unable to write index."

866 msgstr ""

867

@@ -828,33 +886,33 @@ msgstr ""

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

887 msgstr ""

888

831 -#: object.c:234

889 +#: object.c:241

890 #, c-format

891 msgid "unable to parse object: %s"

892 msgstr ""

893

836 -#: parse-options.c:534

894 +#: parse-options.c:546

895 msgid "..."

896 msgstr ""

897

840 -#: parse-options.c:552

898 +#: parse-options.c:564

899 #, c-format

900 msgid "usage: %s"

901 msgstr ""

902

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

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

847 -#: parse-options.c:556

905 +#: parse-options.c:568

906 #, c-format

907 msgid " or: %s"

908 msgstr ""

909

852 -#: parse-options.c:559

910 +#: parse-options.c:571

911 #, c-format

912 msgid " %s"

913 msgstr ""

914

857 -#: parse-options.c:593

915 +#: parse-options.c:605

916 msgid "-NUM"

917 msgstr ""

918

@@ -918,69 +976,73 @@ msgid ""

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

977 msgstr ""

978

979 +#: pretty.c:968

980 +msgid "unable to parse --pretty format"

981 +msgstr ""

982 +

983 #: progress.c:225

984 msgid "done"

985 msgstr ""

986

925 -#: read-cache.c:1260

987 +#: read-cache.c:1261

988 #, c-format

989 msgid ""

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

991 "Using version %i"

992 msgstr ""

993

932 -#: read-cache.c:1270

994 +#: read-cache.c:1271

995 #, c-format

996 msgid ""

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

998 "Using version %i"

999 msgstr ""

1000

939 -#: remote.c:753

1001 +#: remote.c:782

1002 #, c-format

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

1004 msgstr ""

1005

944 -#: remote.c:757

1006 +#: remote.c:786

1007 #, c-format

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

1009 msgstr ""

1010

949 -#: remote.c:761

1011 +#: remote.c:790

1012 #, c-format

1013 msgid "%s tracks both %s and %s"

1014 msgstr ""

1015

954 -#: remote.c:769

1016 +#: remote.c:798

1017 msgid "Internal error"

1018 msgstr ""

1019

958 -#: remote.c:1943

1020 +#: remote.c:1968

1021 #, c-format

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

1023 msgstr ""

1024

963 -#: remote.c:1947

1025 +#: remote.c:1972

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

1027 msgstr ""

1028

967 -#: remote.c:1950

1029 +#: remote.c:1975

1030 #, c-format

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

1032 msgstr ""

1033

972 -#: remote.c:1954

1034 +#: remote.c:1979

1035 #, c-format

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

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

1038 msgstr[0] ""

1039 msgstr[1] ""

1040

979 -#: remote.c:1960

1041 +#: remote.c:1985

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

1043 msgstr ""

1044

983 -#: remote.c:1963

1045 +#: remote.c:1988

1046 #, c-format

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

1048 msgid_plural ""

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

1050 msgstr[0] ""

1051 msgstr[1] ""

1052

991 -#: remote.c:1971

1053 +#: remote.c:1996

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

1055 msgstr ""

1056

995 -#: remote.c:1974

1057 +#: remote.c:1999

1058 #, c-format

1059 msgid ""

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

@@ -1003,266 +1065,270 @@ msgid_plural ""

1065 msgstr[0] ""

1066 msgstr[1] ""

1067

1006 -#: remote.c:1984

1068 +#: remote.c:2009

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

1070 msgstr ""

1071

1010 -#: run-command.c:80

1072 +#: run-command.c:87

1073 msgid "open /dev/null failed"

1074 msgstr ""

1075

1014 -#: run-command.c:82

1076 +#: run-command.c:89

1077 #, c-format

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

1079 msgstr ""

1080

1019 -#: sequencer.c:171 builtin/merge.c:782 builtin/merge.c:893

1020 -#: builtin/merge.c:1003 builtin/merge.c:1013

1081 +#: send-pack.c:265

1082 +msgid "failed to sign the push certificate"

1083 +msgstr ""

1084 +

1085 +#: send-pack.c:322

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

1087 +msgstr ""

1088 +

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

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

1091 #, c-format

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

1093 msgstr ""

1094

1025 -#: sequencer.c:173 builtin/merge.c:343 builtin/merge.c:785

1026 -#: builtin/merge.c:1005 builtin/merge.c:1018

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

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

1097 #, c-format

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

1099 msgstr ""

1100

1031 -#: sequencer.c:194

1101 +#: sequencer.c:195

1102 msgid ""

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

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

1105 msgstr ""

1106

1037 -#: sequencer.c:197

1107 +#: sequencer.c:198

1108 msgid ""

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

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

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

1112 msgstr ""

1113

1044 -#: sequencer.c:210 sequencer.c:841 sequencer.c:924

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

1115 #, c-format

1116 msgid "Could not write to %s"

1117 msgstr ""

1118

1049 -#: sequencer.c:213

1119 +#: sequencer.c:214

1120 #, c-format

1121 msgid "Error wrapping up %s"

1122 msgstr ""

1123

1054 -#: sequencer.c:228

1124 +#: sequencer.c:229

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

1126 msgstr ""

1127

1058 -#: sequencer.c:230

1128 +#: sequencer.c:231

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

1130 msgstr ""

1131

1062 -#: sequencer.c:233

1132 +#: sequencer.c:234

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

1134 msgstr ""

1135

1066 -#: sequencer.c:250

1067 -msgid "Failed to lock HEAD during fast_forward_to"

1068 -msgstr ""

1069 -

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

1071 -#: sequencer.c:293

1137 +#: sequencer.c:304

1138 #, c-format

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

1140 msgstr ""

1141

1076 -#: sequencer.c:324

1142 +#: sequencer.c:335

1143 msgid "Could not resolve HEAD commit\n"

1144 msgstr ""

1145

1080 -#: sequencer.c:344

1146 +#: sequencer.c:355

1147 msgid "Unable to update cache tree\n"

1148 msgstr ""

1149

1084 -#: sequencer.c:391

1150 +#: sequencer.c:402

1151 #, c-format

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

1153 msgstr ""

1154

1089 -#: sequencer.c:396

1155 +#: sequencer.c:407

1156 #, c-format

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

1158 msgstr ""

1159

1094 -#: sequencer.c:462

1160 +#: sequencer.c:473

1161 msgid "Your index file is unmerged."

1162 msgstr ""

1163

1098 -#: sequencer.c:481

1164 +#: sequencer.c:492

1165 #, c-format

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

1167 msgstr ""

1168

1103 -#: sequencer.c:489

1169 +#: sequencer.c:500

1170 #, c-format

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

1172 msgstr ""

1173

1108 -#: sequencer.c:493

1174 +#: sequencer.c:504

1175 #, c-format

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

1177 msgstr ""

1178

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

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

1115 -#: sequencer.c:506

1181 +#: sequencer.c:517

1182 #, c-format

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

1184 msgstr ""

1185

1120 -#: sequencer.c:510

1186 +#: sequencer.c:521

1187 #, c-format

1188 msgid "Cannot get commit message for %s"

1189 msgstr ""

1190

1125 -#: sequencer.c:596

1191 +#: sequencer.c:607

1192 #, c-format

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

1194 msgstr ""

1195

1130 -#: sequencer.c:597

1196 +#: sequencer.c:608

1197 #, c-format

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

1199 msgstr ""

1200

1135 -#: sequencer.c:633

1201 +#: sequencer.c:644

1202 msgid "empty commit set passed"

1203 msgstr ""

1204

1139 -#: sequencer.c:641

1205 +#: sequencer.c:652

1206 #, c-format

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

1208 msgstr ""

1209

1144 -#: sequencer.c:645

1210 +#: sequencer.c:656

1211 #, c-format

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

1213 msgstr ""

1214

1149 -#: sequencer.c:705

1215 +#: sequencer.c:716

1216 #, c-format

1217 msgid "Cannot %s during a %s"

1218 msgstr ""

1219

1154 -#: sequencer.c:727

1220 +#: sequencer.c:738

1221 #, c-format

1222 msgid "Could not parse line %d."

1223 msgstr ""

1224

1159 -#: sequencer.c:732

1225 +#: sequencer.c:743

1226 msgid "No commits parsed."

1227 msgstr ""

1228

1163 -#: sequencer.c:745

1229 +#: sequencer.c:756

1230 #, c-format

1231 msgid "Could not open %s"

1232 msgstr ""

1233

1168 -#: sequencer.c:749

1234 +#: sequencer.c:760

1235 #, c-format

1236 msgid "Could not read %s."

1237 msgstr ""

1238

1173 -#: sequencer.c:756

1239 +#: sequencer.c:767

1240 #, c-format

1241 msgid "Unusable instruction sheet: %s"

1242 msgstr ""

1243

1178 -#: sequencer.c:786

1244 +#: sequencer.c:797

1245 #, c-format

1246 msgid "Invalid key: %s"

1247 msgstr ""

1248

1183 -#: sequencer.c:789

1249 +#: sequencer.c:800

1250 #, c-format

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

1252 msgstr ""

1253

1188 -#: sequencer.c:801

1254 +#: sequencer.c:812

1255 #, c-format

1256 msgid "Malformed options sheet: %s"

1257 msgstr ""

1258

1193 -#: sequencer.c:822

1259 +#: sequencer.c:833

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

1261 msgstr ""

1262

1197 -#: sequencer.c:823

1263 +#: sequencer.c:834

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

1265 msgstr ""

1266

1201 -#: sequencer.c:827

1267 +#: sequencer.c:838

1268 #, c-format

1269 msgid "Could not create sequencer directory %s"

1270 msgstr ""

1271

1206 -#: sequencer.c:843 sequencer.c:928

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

1273 #, c-format

1274 msgid "Error wrapping up %s."

1275 msgstr ""

1276

1211 -#: sequencer.c:862 sequencer.c:998

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

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

1279 msgstr ""

1280

1215 -#: sequencer.c:864

1281 +#: sequencer.c:875

1282 msgid "cannot resolve HEAD"

1283 msgstr ""

1284

1219 -#: sequencer.c:866

1285 +#: sequencer.c:877

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

1287 msgstr ""

1288

1223 -#: sequencer.c:888 builtin/apply.c:4062

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

1290 #, c-format

1291 msgid "cannot open %s: %s"

1292 msgstr ""

1293

1228 -#: sequencer.c:891

1294 +#: sequencer.c:902

1295 #, c-format

1296 msgid "cannot read %s: %s"

1297 msgstr ""

1298

1233 -#: sequencer.c:892

1299 +#: sequencer.c:903

1300 msgid "unexpected end of file"

1301 msgstr ""

1302

1237 -#: sequencer.c:898

1303 +#: sequencer.c:909

1304 #, c-format

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

1306 msgstr ""

1307

1242 -#: sequencer.c:921

1308 +#: sequencer.c:932

1309 #, c-format

1310 msgid "Could not format %s."

1311 msgstr ""

1312

1247 -#: sequencer.c:1066

1313 +#: sequencer.c:1077

1314 #, c-format

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

1316 msgstr ""

1317

1252 -#: sequencer.c:1069

1318 +#: sequencer.c:1080

1319 #, c-format

1320 msgid "%s: bad revision"

1321 msgstr ""

1322

1257 -#: sequencer.c:1103

1323 +#: sequencer.c:1114

1324 msgid "Can't revert as initial commit"

1325 msgstr ""

1326

1261 -#: sequencer.c:1104

1327 +#: sequencer.c:1115

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

1329 msgstr ""

1330

1265 -#: sha1_name.c:439

1331 +#: sha1_name.c:440

1332 msgid ""

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

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

@@ -1275,21 +1341,21 @@ msgid ""

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

1342 msgstr ""

1343

1278 -#: sha1_name.c:1060

1344 +#: sha1_name.c:1068

1345 msgid "HEAD does not point to a branch"

1346 msgstr ""

1347

1282 -#: sha1_name.c:1063

1348 +#: sha1_name.c:1071

1349 #, c-format

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

1351 msgstr ""

1352

1287 -#: sha1_name.c:1065

1353 +#: sha1_name.c:1073

1354 #, c-format

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

1356 msgstr ""

1357

1292 -#: sha1_name.c:1069

1358 +#: sha1_name.c:1077

1359 #, c-format

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

1361 msgstr ""

@@ -1317,16 +1383,41 @@ msgstr ""

1383 msgid "staging updated .gitmodules failed"

1384 msgstr ""

1385

1320 -#: submodule.c:1118 builtin/init-db.c:363

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

1387 #, c-format

1388 msgid "Could not create git link %s"

1389 msgstr ""

1390

1325 -#: submodule.c:1129

1391 +#: submodule.c:1122

1392 #, c-format

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

1394 msgstr ""

1395

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

1397 +#: trailer.c:570

1398 +#, c-format

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

1400 +msgstr ""

1401 +

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

1403 +#, c-format

1404 +msgid "more than one %s"

1405 +msgstr ""

1406 +

1407 +#: trailer.c:587

1408 +#, c-format

1409 +msgid "empty trailer token in trailer '%s'"

1410 +msgstr ""

1411 +

1412 +#: trailer.c:706

1413 +#, c-format

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

1415 +msgstr ""

1416 +

1417 +#: trailer.c:709

1418 +msgid "could not read from stdin"

1419 +msgstr ""

1420 +

1421 #: unpack-trees.c:202

1422 msgid "Checking out files"

1423 msgstr ""

@@ -1360,25 +1451,29 @@ msgstr ""

1451 msgid "invalid '..' path segment"

1452 msgstr ""

1453

1363 -#: wrapper.c:460

1454 +#: wrapper.c:509

1455 #, c-format

1456 msgid "unable to access '%s': %s"

1457 msgstr ""

1458

1368 -#: wrapper.c:481

1459 +#: wrapper.c:530

1460 #, c-format

1461 msgid "unable to access '%s'"

1462 msgstr ""

1463

1373 -#: wrapper.c:492

1464 +#: wrapper.c:541

1465 #, c-format

1466 msgid "unable to look up current user in the passwd file: %s"

1467 msgstr ""

1468

1378 -#: wrapper.c:493

1469 +#: wrapper.c:542

1470 msgid "no such user"

1471 msgstr ""

1472

1473 +#: wrapper.c:550

1474 +msgid "unable to get current working directory"

1475 +msgstr ""

1476 +

1477 #: wt-status.c:150

1478 msgid "Unmerged paths:"

1479 msgstr ""

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

1611 msgid "bug: unhandled diff status %c"

1612 msgstr ""

1613

1519 -#: wt-status.c:764

1614 +#: wt-status.c:761

1615 msgid "Submodules changed but not updated:"

1616 msgstr ""

1617

1523 -#: wt-status.c:766

1618 +#: wt-status.c:763

1619 msgid "Submodule changes to be committed:"

1620 msgstr ""

1621

1527 -#: wt-status.c:845

1622 +#: wt-status.c:842

1623 msgid ""

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

1625 "Everything below will be removed."

1626 msgstr ""

1627

1533 -#: wt-status.c:936

1628 +#: wt-status.c:933

1629 msgid "You have unmerged paths."

1630 msgstr ""

1631

1537 -#: wt-status.c:939

1632 +#: wt-status.c:936

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

1634 msgstr ""

1635

1541 -#: wt-status.c:942

1636 +#: wt-status.c:939

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

1638 msgstr ""

1639

1545 -#: wt-status.c:945

1640 +#: wt-status.c:942

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

1642 msgstr ""

1643

1549 -#: wt-status.c:955

1644 +#: wt-status.c:952

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

1646 msgstr ""

1647

1553 -#: wt-status.c:958

1648 +#: wt-status.c:955

1649 msgid "The current patch is empty."

1650 msgstr ""

1651

1557 -#: wt-status.c:962

1652 +#: wt-status.c:959

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

1654 msgstr ""

1655

1561 -#: wt-status.c:964

1656 +#: wt-status.c:961

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

1658 msgstr ""

1659

1565 -#: wt-status.c:966

1660 +#: wt-status.c:963

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

1662 msgstr ""

1663

1569 -#: wt-status.c:1026 wt-status.c:1043

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

1665 #, c-format

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

1667 msgstr ""

1668

1574 -#: wt-status.c:1031 wt-status.c:1048

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

1670 msgid "You are currently rebasing."

1671 msgstr ""

1672

1578 -#: wt-status.c:1034

1673 +#: wt-status.c:1031

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

1675 msgstr ""

1676

1582 -#: wt-status.c:1036

1677 +#: wt-status.c:1033

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

1679 msgstr ""

1680

1586 -#: wt-status.c:1038

1681 +#: wt-status.c:1035

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

1683 msgstr ""

1684

1590 -#: wt-status.c:1051

1685 +#: wt-status.c:1048

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

1687 msgstr ""

1688

1594 -#: wt-status.c:1055

1689 +#: wt-status.c:1052

1690 #, c-format

1691 msgid ""

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

1693 msgstr ""

1694

1600 -#: wt-status.c:1060

1695 +#: wt-status.c:1057

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

1697 msgstr ""

1698

1604 -#: wt-status.c:1063

1699 +#: wt-status.c:1060

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

1701 msgstr ""

1702

1608 -#: wt-status.c:1067

1703 +#: wt-status.c:1064

1704 #, c-format

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

1706 msgstr ""

1707

1613 -#: wt-status.c:1072

1708 +#: wt-status.c:1069

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

1710 msgstr ""

1711

1617 -#: wt-status.c:1075

1712 +#: wt-status.c:1072

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

1714 msgstr ""

1715

1621 -#: wt-status.c:1077

1716 +#: wt-status.c:1074

1717 msgid ""

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

1719 msgstr ""

1720

1626 -#: wt-status.c:1087

1721 +#: wt-status.c:1084

1722 #, c-format

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

1724 msgstr ""

1725

1631 -#: wt-status.c:1092

1726 +#: wt-status.c:1089

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

1728 msgstr ""

1729

1635 -#: wt-status.c:1095

1730 +#: wt-status.c:1092

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

1732 msgstr ""

1733

1639 -#: wt-status.c:1097

1734 +#: wt-status.c:1094

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

1736 msgstr ""

1737

1643 -#: wt-status.c:1106

1738 +#: wt-status.c:1103

1739 #, c-format

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

1741 msgstr ""

1742

1648 -#: wt-status.c:1111

1743 +#: wt-status.c:1108

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

1745 msgstr ""

1746

1652 -#: wt-status.c:1114

1747 +#: wt-status.c:1111

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

1749 msgstr ""

1750

1656 -#: wt-status.c:1116

1751 +#: wt-status.c:1113

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

1753 msgstr ""

1754

1660 -#: wt-status.c:1127

1755 +#: wt-status.c:1124

1756 #, c-format

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

1758 msgstr ""

1759

1665 -#: wt-status.c:1131

1760 +#: wt-status.c:1128

1761 msgid "You are currently bisecting."

1762 msgstr ""

1763

1669 -#: wt-status.c:1134

1764 +#: wt-status.c:1131

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

1766 msgstr ""

1767

1673 -#: wt-status.c:1309

1768 +#: wt-status.c:1306

1769 msgid "On branch "

1770 msgstr ""

1771

1677 -#: wt-status.c:1316

1772 +#: wt-status.c:1313

1773 msgid "rebase in progress; onto "

1774 msgstr ""

1775

1681 -#: wt-status.c:1323

1776 +#: wt-status.c:1320

1777 msgid "HEAD detached at "

1778 msgstr ""

1779

1685 -#: wt-status.c:1325

1780 +#: wt-status.c:1322

1781 msgid "HEAD detached from "

1782 msgstr ""

1783

1689 -#: wt-status.c:1328

1784 +#: wt-status.c:1325

1785 msgid "Not currently on any branch."

1786 msgstr ""

1787

1693 -#: wt-status.c:1345

1788 +#: wt-status.c:1342

1789 msgid "Initial commit"

1790 msgstr ""

1791

1697 -#: wt-status.c:1359

1792 +#: wt-status.c:1356

1793 msgid "Untracked files"

1794 msgstr ""

1795

1701 -#: wt-status.c:1361

1796 +#: wt-status.c:1358

1797 msgid "Ignored files"

1798 msgstr ""

1799

1705 -#: wt-status.c:1365

1800 +#: wt-status.c:1362

1801 #, c-format

1802 msgid ""

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

@@ -1710,123 +1805,123 @@ msgid ""

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

1806 msgstr ""

1807

1713 -#: wt-status.c:1371

1808 +#: wt-status.c:1368

1809 #, c-format

1810 msgid "Untracked files not listed%s"

1811 msgstr ""

1812

1718 -#: wt-status.c:1373

1813 +#: wt-status.c:1370

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

1815 msgstr ""

1816

1722 -#: wt-status.c:1379

1817 +#: wt-status.c:1376

1818 msgid "No changes"

1819 msgstr ""

1820

1726 -#: wt-status.c:1384

1821 +#: wt-status.c:1381

1822 #, c-format

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

1824 msgstr ""

1825

1731 -#: wt-status.c:1387

1826 +#: wt-status.c:1384

1827 #, c-format

1828 msgid "no changes added to commit\n"

1829 msgstr ""

1830

1736 -#: wt-status.c:1390

1831 +#: wt-status.c:1387

1832 #, c-format

1833 msgid ""

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

1835 "track)\n"

1836 msgstr ""

1837

1743 -#: wt-status.c:1393

1838 +#: wt-status.c:1390

1839 #, c-format

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

1841 msgstr ""

1842

1748 -#: wt-status.c:1396

1843 +#: wt-status.c:1393

1844 #, c-format

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

1846 msgstr ""

1847

1753 -#: wt-status.c:1399 wt-status.c:1404

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

1849 #, c-format

1850 msgid "nothing to commit\n"

1851 msgstr ""

1852

1758 -#: wt-status.c:1402

1853 +#: wt-status.c:1399

1854 #, c-format

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

1856 msgstr ""

1857

1763 -#: wt-status.c:1406

1858 +#: wt-status.c:1403

1859 #, c-format

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

1861 msgstr ""

1862

1768 -#: wt-status.c:1515

1863 +#: wt-status.c:1512

1864 msgid "HEAD (no branch)"

1865 msgstr ""

1866

1772 -#: wt-status.c:1521

1867 +#: wt-status.c:1518

1868 msgid "Initial commit on "

1869 msgstr ""

1870

1776 -#: wt-status.c:1553

1871 +#: wt-status.c:1550

1872 msgid "gone"

1873 msgstr ""

1874

1780 -#: wt-status.c:1555 wt-status.c:1563

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

1876 msgid "behind "

1877 msgstr ""

1878

1784 -#: compat/precompose_utf8.c:55 builtin/clone.c:356

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

1880 #, c-format

1881 msgid "failed to unlink '%s'"

1882 msgstr ""

1883

1789 -#: builtin/add.c:21

1884 +#: builtin/add.c:22

1885 msgid "git add [options] [--] <pathspec>..."

1886 msgstr ""

1887

1793 -#: builtin/add.c:64

1888 +#: builtin/add.c:65

1889 #, c-format

1890 msgid "unexpected diff status %c"

1891 msgstr ""

1892

1798 -#: builtin/add.c:69 builtin/commit.c:261

1893 +#: builtin/add.c:70 builtin/commit.c:275

1894 msgid "updating files failed"

1895 msgstr ""

1896

1802 -#: builtin/add.c:79

1897 +#: builtin/add.c:80

1898 #, c-format

1899 msgid "remove '%s'\n"

1900 msgstr ""

1901

1807 -#: builtin/add.c:133

1902 +#: builtin/add.c:134

1903 msgid "Unstaged changes after refreshing the index:"

1904 msgstr ""

1905

1811 -#: builtin/add.c:193 builtin/rev-parse.c:781

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

1907 msgid "Could not read the index"

1908 msgstr ""

1909

1815 -#: builtin/add.c:204

1910 +#: builtin/add.c:205

1911 #, c-format

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

1913 msgstr ""

1914

1820 -#: builtin/add.c:208

1915 +#: builtin/add.c:209

1916 msgid "Could not write patch"

1917 msgstr ""

1918

1824 -#: builtin/add.c:213

1919 +#: builtin/add.c:214

1920 #, c-format

1921 msgid "Could not stat '%s'"

1922 msgstr ""

1923

1829 -#: builtin/add.c:215

1924 +#: builtin/add.c:216

1925 msgid "Empty patch. Aborted."

1926 msgstr ""

1927

@@ -1839,15 +1934,15 @@ msgstr ""

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

1935 msgstr ""

1936

1842 -#: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:70

1843 -#: builtin/prune-packed.c:77 builtin/push.c:488 builtin/remote.c:1367

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

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

1939 #: builtin/rm.c:269

1940 msgid "dry run"

1941 msgstr ""

1942

1848 -#: builtin/add.c:249 builtin/apply.c:4411 builtin/check-ignore.c:19

1849 -#: builtin/commit.c:1328 builtin/count-objects.c:95 builtin/fsck.c:606

1850 -#: builtin/log.c:1613 builtin/mv.c:69 builtin/read-tree.c:113

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

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

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

1946 msgid "be verbose"

1947 msgstr ""

1948

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

1950 msgid "interactive picking"

1951 msgstr ""

1952

1858 -#: builtin/add.c:252 builtin/checkout.c:1102 builtin/reset.c:285

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

1954 msgid "select hunks interactively"

1955 msgstr ""

1956

@@ -1927,74 +2022,74 @@ msgid "Maybe you wanted to say 'git add .'?\n"

2022 msgstr ""

2023

2024 #: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:919

1930 -#: builtin/commit.c:319 builtin/mv.c:90 builtin/reset.c:234 builtin/rm.c:299

2025 +#: builtin/commit.c:333 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299

2026 msgid "index file corrupt"

2027 msgstr ""

2028

1934 -#: builtin/add.c:446 builtin/apply.c:4506 builtin/mv.c:280 builtin/rm.c:431

2029 +#: builtin/add.c:446 builtin/apply.c:4510 builtin/mv.c:279 builtin/rm.c:431

2030 msgid "Unable to write new index file"

2031 msgstr ""

2032

1938 -#: builtin/apply.c:57

2033 +#: builtin/apply.c:58

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

2035 msgstr ""

2036

1942 -#: builtin/apply.c:110

2037 +#: builtin/apply.c:111

2038 #, c-format

2039 msgid "unrecognized whitespace option '%s'"

2040 msgstr ""

2041

1947 -#: builtin/apply.c:125

2042 +#: builtin/apply.c:126

2043 #, c-format

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

2045 msgstr ""

2046

1952 -#: builtin/apply.c:825

2047 +#: builtin/apply.c:826

2048 #, c-format

2049 msgid "Cannot prepare timestamp regexp %s"

2050 msgstr ""

2051

1957 -#: builtin/apply.c:834

2052 +#: builtin/apply.c:835

2053 #, c-format

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

2055 msgstr ""

2056

1962 -#: builtin/apply.c:915

2057 +#: builtin/apply.c:916

2058 #, c-format

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

2060 msgstr ""

2061

1967 -#: builtin/apply.c:947

2062 +#: builtin/apply.c:948

2063 #, c-format

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

2065 msgstr ""

2066

1972 -#: builtin/apply.c:951

2067 +#: builtin/apply.c:952

2068 #, c-format

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

2070 msgstr ""

2071

1977 -#: builtin/apply.c:952

2072 +#: builtin/apply.c:953

2073 #, c-format

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

2075 msgstr ""

2076

1982 -#: builtin/apply.c:959

2077 +#: builtin/apply.c:960

2078 #, c-format

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

2080 msgstr ""

2081

1987 -#: builtin/apply.c:1422

2082 +#: builtin/apply.c:1423

2083 #, c-format

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

2085 msgstr ""

2086

1992 -#: builtin/apply.c:1479

2087 +#: builtin/apply.c:1480

2088 #, c-format

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

2090 msgstr ""

2091

1997 -#: builtin/apply.c:1496

2092 +#: builtin/apply.c:1497

2093 #, c-format

2094 msgid ""

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

@@ -2005,394 +2100,394 @@ msgid_plural ""

2100 msgstr[0] ""

2101 msgstr[1] ""

2102

2008 -#: builtin/apply.c:1656

2103 +#: builtin/apply.c:1657

2104 msgid "new file depends on old contents"

2105 msgstr ""

2106

2012 -#: builtin/apply.c:1658

2107 +#: builtin/apply.c:1659

2108 msgid "deleted file still has contents"

2109 msgstr ""

2110

2016 -#: builtin/apply.c:1684

2111 +#: builtin/apply.c:1685

2112 #, c-format

2113 msgid "corrupt patch at line %d"

2114 msgstr ""

2115

2021 -#: builtin/apply.c:1720

2116 +#: builtin/apply.c:1721

2117 #, c-format

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

2119 msgstr ""

2120

2026 -#: builtin/apply.c:1722

2121 +#: builtin/apply.c:1723

2122 #, c-format

2123 msgid "deleted file %s still has contents"

2124 msgstr ""

2125

2031 -#: builtin/apply.c:1725

2126 +#: builtin/apply.c:1726

2127 #, c-format

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

2129 msgstr ""

2130

2036 -#: builtin/apply.c:1871

2131 +#: builtin/apply.c:1872

2132 #, c-format

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

2134 msgstr ""

2135

2041 -#: builtin/apply.c:1900

2136 +#: builtin/apply.c:1901

2137 #, c-format

2138 msgid "unrecognized binary patch at line %d"

2139 msgstr ""

2140

2046 -#: builtin/apply.c:1986

2141 +#: builtin/apply.c:2052

2142 #, c-format

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

2144 msgstr ""

2145

2051 -#: builtin/apply.c:2076

2146 +#: builtin/apply.c:2142

2147 #, c-format

2148 msgid "unable to read symlink %s"

2149 msgstr ""

2150

2056 -#: builtin/apply.c:2080

2151 +#: builtin/apply.c:2146

2152 #, c-format

2153 msgid "unable to open or read %s"

2154 msgstr ""

2155

2061 -#: builtin/apply.c:2688

2156 +#: builtin/apply.c:2754

2157 #, c-format

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

2159 msgstr ""

2160

2066 -#: builtin/apply.c:2806

2161 +#: builtin/apply.c:2872

2162 #, c-format

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

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

2165 msgstr[0] ""

2166 msgstr[1] ""

2167

2073 -#: builtin/apply.c:2818

2168 +#: builtin/apply.c:2884

2169 #, c-format

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

2171 msgstr ""

2172

2078 -#: builtin/apply.c:2824

2173 +#: builtin/apply.c:2890

2174 #, c-format

2175 msgid ""

2176 "while searching for:\n"

2177 "%.*s"

2178 msgstr ""

2179

2085 -#: builtin/apply.c:2843

2180 +#: builtin/apply.c:2909

2181 #, c-format

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

2183 msgstr ""

2184

2090 -#: builtin/apply.c:2944

2185 +#: builtin/apply.c:3010

2186 #, c-format

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

2188 msgstr ""

2189

2095 -#: builtin/apply.c:2950

2190 +#: builtin/apply.c:3016

2191 #, c-format

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

2193 msgstr ""

2194

2100 -#: builtin/apply.c:2971

2195 +#: builtin/apply.c:3037

2196 #, c-format

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

2198 msgstr ""

2199

2105 -#: builtin/apply.c:3095

2200 +#: builtin/apply.c:3161

2201 #, c-format

2202 msgid "cannot checkout %s"

2203 msgstr ""

2204

2110 -#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3194

2205 +#: builtin/apply.c:3206 builtin/apply.c:3215 builtin/apply.c:3260

2206 #, c-format

2207 msgid "read of %s failed"

2208 msgstr ""

2209

2115 -#: builtin/apply.c:3174 builtin/apply.c:3396

2210 +#: builtin/apply.c:3240 builtin/apply.c:3462

2211 #, c-format

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

2213 msgstr ""

2214

2120 -#: builtin/apply.c:3255 builtin/apply.c:3410

2215 +#: builtin/apply.c:3321 builtin/apply.c:3476

2216 #, c-format

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

2218 msgstr ""

2219

2125 -#: builtin/apply.c:3259 builtin/apply.c:3402 builtin/apply.c:3424

2220 +#: builtin/apply.c:3325 builtin/apply.c:3468 builtin/apply.c:3490

2221 #, c-format

2222 msgid "%s: %s"

2223 msgstr ""

2224

2130 -#: builtin/apply.c:3264 builtin/apply.c:3418

2225 +#: builtin/apply.c:3330 builtin/apply.c:3484

2226 #, c-format

2227 msgid "%s: does not match index"

2228 msgstr ""

2229

2135 -#: builtin/apply.c:3366

2230 +#: builtin/apply.c:3432

2231 msgid "removal patch leaves file contents"

2232 msgstr ""

2233

2139 -#: builtin/apply.c:3435

2234 +#: builtin/apply.c:3501

2235 #, c-format

2236 msgid "%s: wrong type"

2237 msgstr ""

2238

2144 -#: builtin/apply.c:3437

2239 +#: builtin/apply.c:3503

2240 #, c-format

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

2242 msgstr ""

2243

2149 -#: builtin/apply.c:3538

2244 +#: builtin/apply.c:3604

2245 #, c-format

2246 msgid "%s: already exists in index"

2247 msgstr ""

2248

2154 -#: builtin/apply.c:3541

2249 +#: builtin/apply.c:3607

2250 #, c-format

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

2252 msgstr ""

2253

2159 -#: builtin/apply.c:3561

2254 +#: builtin/apply.c:3627

2255 #, c-format

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

2257 msgstr ""

2258

2164 -#: builtin/apply.c:3566

2259 +#: builtin/apply.c:3632

2260 #, c-format

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

2262 msgstr ""

2263

2169 -#: builtin/apply.c:3574

2264 +#: builtin/apply.c:3640

2265 #, c-format

2266 msgid "%s: patch does not apply"

2267 msgstr ""

2268

2174 -#: builtin/apply.c:3587

2269 +#: builtin/apply.c:3653

2270 #, c-format

2271 msgid "Checking patch %s..."

2272 msgstr ""

2273

2179 -#: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:134

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

2275 #, c-format

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

2277 msgstr ""

2278

2184 -#: builtin/apply.c:3823

2279 +#: builtin/apply.c:3889

2280 #, c-format

2281 msgid "unable to remove %s from index"

2282 msgstr ""

2283

2189 -#: builtin/apply.c:3852

2284 +#: builtin/apply.c:3918

2285 #, c-format

2286 msgid "corrupt patch for submodule %s"

2287 msgstr ""

2288

2194 -#: builtin/apply.c:3856

2289 +#: builtin/apply.c:3922

2290 #, c-format

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

2292 msgstr ""

2293

2199 -#: builtin/apply.c:3861

2294 +#: builtin/apply.c:3927

2295 #, c-format

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

2297 msgstr ""

2298

2204 -#: builtin/apply.c:3864 builtin/apply.c:3972

2299 +#: builtin/apply.c:3930 builtin/apply.c:4038

2300 #, c-format

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

2302 msgstr ""

2303

2209 -#: builtin/apply.c:3897

2304 +#: builtin/apply.c:3963

2305 #, c-format

2306 msgid "closing file '%s'"

2307 msgstr ""

2308

2214 -#: builtin/apply.c:3946

2309 +#: builtin/apply.c:4012

2310 #, c-format

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

2312 msgstr ""

2313

2219 -#: builtin/apply.c:4033

2314 +#: builtin/apply.c:4099

2315 #, c-format

2316 msgid "Applied patch %s cleanly."

2317 msgstr ""

2318

2224 -#: builtin/apply.c:4041

2319 +#: builtin/apply.c:4107

2320 msgid "internal error"

2321 msgstr ""

2322

2228 -#: builtin/apply.c:4044

2323 +#: builtin/apply.c:4110

2324 #, c-format

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

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

2327 msgstr[0] ""

2328 msgstr[1] ""

2329

2235 -#: builtin/apply.c:4054

2330 +#: builtin/apply.c:4120

2331 #, c-format

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

2333 msgstr ""

2334

2240 -#: builtin/apply.c:4075

2335 +#: builtin/apply.c:4141

2336 #, c-format

2337 msgid "Hunk #%d applied cleanly."

2338 msgstr ""

2339

2245 -#: builtin/apply.c:4078

2340 +#: builtin/apply.c:4144

2341 #, c-format

2342 msgid "Rejected hunk #%d."

2343 msgstr ""

2344

2250 -#: builtin/apply.c:4228

2345 +#: builtin/apply.c:4234

2346 msgid "unrecognized input"

2347 msgstr ""

2348

2254 -#: builtin/apply.c:4239

2349 +#: builtin/apply.c:4245

2350 msgid "unable to read index file"

2351 msgstr ""

2352

2258 -#: builtin/apply.c:4358 builtin/apply.c:4361 builtin/clone.c:90

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

2354 #: builtin/fetch.c:93

2355 msgid "path"

2356 msgstr ""

2357

2263 -#: builtin/apply.c:4359

2358 +#: builtin/apply.c:4363

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

2360 msgstr ""

2361

2267 -#: builtin/apply.c:4362

2362 +#: builtin/apply.c:4366

2363 msgid "apply changes matching the given path"

2364 msgstr ""

2365

2271 -#: builtin/apply.c:4364

2366 +#: builtin/apply.c:4368

2367 msgid "num"

2368 msgstr ""

2369

2275 -#: builtin/apply.c:4365

2370 +#: builtin/apply.c:4369

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

2372 msgstr ""

2373

2279 -#: builtin/apply.c:4368

2374 +#: builtin/apply.c:4372

2375 msgid "ignore additions made by the patch"

2376 msgstr ""

2377

2283 -#: builtin/apply.c:4370

2378 +#: builtin/apply.c:4374

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

2380 msgstr ""

2381

2287 -#: builtin/apply.c:4374

2382 +#: builtin/apply.c:4378

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

2384 msgstr ""

2385

2291 -#: builtin/apply.c:4376

2386 +#: builtin/apply.c:4380

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

2388 msgstr ""

2389

2295 -#: builtin/apply.c:4378

2390 +#: builtin/apply.c:4382

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

2392 msgstr ""

2393

2299 -#: builtin/apply.c:4380

2394 +#: builtin/apply.c:4384

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

2396 msgstr ""

2397

2303 -#: builtin/apply.c:4382

2398 +#: builtin/apply.c:4386

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

2400 msgstr ""

2401

2307 -#: builtin/apply.c:4384

2402 +#: builtin/apply.c:4388

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

2404 msgstr ""

2405

2311 -#: builtin/apply.c:4386

2406 +#: builtin/apply.c:4390

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

2408 msgstr ""

2409

2315 -#: builtin/apply.c:4388

2410 +#: builtin/apply.c:4392

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

2412 msgstr ""

2413

2319 -#: builtin/apply.c:4390 builtin/checkout-index.c:198 builtin/ls-files.c:455

2414 +#: builtin/apply.c:4394 builtin/checkout-index.c:198 builtin/ls-files.c:455

2415 msgid "paths are separated with NUL character"

2416 msgstr ""

2417

2323 -#: builtin/apply.c:4393

2418 +#: builtin/apply.c:4397

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

2420 msgstr ""

2421

2327 -#: builtin/apply.c:4394

2422 +#: builtin/apply.c:4398

2423 msgid "action"

2424 msgstr ""

2425

2331 -#: builtin/apply.c:4395

2426 +#: builtin/apply.c:4399

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

2428 msgstr ""

2429

2335 -#: builtin/apply.c:4398 builtin/apply.c:4401

2430 +#: builtin/apply.c:4402 builtin/apply.c:4405

2431 msgid "ignore changes in whitespace when finding context"

2432 msgstr ""

2433

2339 -#: builtin/apply.c:4404

2434 +#: builtin/apply.c:4408

2435 msgid "apply the patch in reverse"

2436 msgstr ""

2437

2343 -#: builtin/apply.c:4406

2438 +#: builtin/apply.c:4410

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

2440 msgstr ""

2441

2347 -#: builtin/apply.c:4408

2442 +#: builtin/apply.c:4412

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

2444 msgstr ""

2445

2351 -#: builtin/apply.c:4410

2446 +#: builtin/apply.c:4414

2447 msgid "allow overlapping hunks"

2448 msgstr ""

2449

2355 -#: builtin/apply.c:4413

2450 +#: builtin/apply.c:4417

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

2452 msgstr ""

2453

2359 -#: builtin/apply.c:4416

2454 +#: builtin/apply.c:4420

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

2456 msgstr ""

2457

2363 -#: builtin/apply.c:4418

2458 +#: builtin/apply.c:4422

2459 msgid "root"

2460 msgstr ""

2461

2367 -#: builtin/apply.c:4419

2462 +#: builtin/apply.c:4423

2463 msgid "prepend <root> to all filenames"

2464 msgstr ""

2465

2371 -#: builtin/apply.c:4441

2466 +#: builtin/apply.c:4445

2467 msgid "--3way outside a repository"

2468 msgstr ""

2469

2375 -#: builtin/apply.c:4449

2470 +#: builtin/apply.c:4453

2471 msgid "--index outside a repository"

2472 msgstr ""

2473

2379 -#: builtin/apply.c:4452

2474 +#: builtin/apply.c:4456

2475 msgid "--cached outside a repository"

2476 msgstr ""

2477

2383 -#: builtin/apply.c:4468

2478 +#: builtin/apply.c:4472

2479 #, c-format

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

2481 msgstr ""

2482

2388 -#: builtin/apply.c:4482

2483 +#: builtin/apply.c:4486

2484 #, c-format

2485 msgid "squelched %d whitespace error"

2486 msgid_plural "squelched %d whitespace errors"

2487 msgstr[0] ""

2488 msgstr[1] ""

2489

2395 -#: builtin/apply.c:4488 builtin/apply.c:4498

2490 +#: builtin/apply.c:4492 builtin/apply.c:4502

2491 #, c-format

2492 msgid "%d line adds whitespace errors."

2493 msgid_plural "%d lines add whitespace errors."

@@ -2552,7 +2647,7 @@ msgstr ""

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

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

2649 #. fewer display columns.

2555 -#: builtin/blame.c:2599

2650 +#: builtin/blame.c:2602

2651 msgid "4 years, 11 months ago"

2652 msgstr ""

2653

@@ -2572,371 +2667,371 @@ msgstr ""

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

2668 msgstr ""

2669

2575 -#: builtin/branch.c:150

2670 +#: builtin/branch.c:152

2671 #, c-format

2672 msgid ""

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

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

2675 msgstr ""

2676

2582 -#: builtin/branch.c:154

2677 +#: builtin/branch.c:156

2678 #, c-format

2679 msgid ""

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

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

2682 msgstr ""

2683

2589 -#: builtin/branch.c:168

2684 +#: builtin/branch.c:170

2685 #, c-format

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

2687 msgstr ""

2688

2594 -#: builtin/branch.c:172

2689 +#: builtin/branch.c:174

2690 #, c-format

2691 msgid ""

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

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

2694 msgstr ""

2695

2601 -#: builtin/branch.c:185

2696 +#: builtin/branch.c:187

2697 msgid "Update of config-file failed"

2698 msgstr ""

2699

2605 -#: builtin/branch.c:213

2700 +#: builtin/branch.c:215

2701 msgid "cannot use -a with -d"

2702 msgstr ""

2703

2609 -#: builtin/branch.c:219

2704 +#: builtin/branch.c:221

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

2706 msgstr ""

2707

2613 -#: builtin/branch.c:227

2708 +#: builtin/branch.c:229

2709 #, c-format

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

2711 msgstr ""

2712

2618 -#: builtin/branch.c:240

2713 +#: builtin/branch.c:245

2714 #, c-format

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

2716 msgstr ""

2717

2623 -#: builtin/branch.c:241

2718 +#: builtin/branch.c:246

2719 #, c-format

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

2721 msgstr ""

2722

2628 -#: builtin/branch.c:255

2723 +#: builtin/branch.c:260

2724 #, c-format

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

2726 msgstr ""

2727

2633 -#: builtin/branch.c:256

2728 +#: builtin/branch.c:261

2729 #, c-format

2730 msgid "Error deleting branch '%s'"

2731 msgstr ""

2732

2638 -#: builtin/branch.c:263

2733 +#: builtin/branch.c:268

2734 #, c-format

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

2736 msgstr ""

2737

2643 -#: builtin/branch.c:264

2738 +#: builtin/branch.c:269

2739 #, c-format

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

2741 msgstr ""

2742

2648 -#: builtin/branch.c:366

2743 +#: builtin/branch.c:370

2744 #, c-format

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

2746 msgstr ""

2747

2653 -#: builtin/branch.c:454

2748 +#: builtin/branch.c:459

2749 #, c-format

2750 msgid "[%s: gone]"

2751 msgstr ""

2752

2658 -#: builtin/branch.c:459

2753 +#: builtin/branch.c:464

2754 #, c-format

2755 msgid "[%s]"

2756 msgstr ""

2757

2663 -#: builtin/branch.c:464

2758 +#: builtin/branch.c:469

2759 #, c-format

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

2761 msgstr ""

2762

2668 -#: builtin/branch.c:466

2763 +#: builtin/branch.c:471

2764 #, c-format

2765 msgid "[behind %d]"

2766 msgstr ""

2767

2673 -#: builtin/branch.c:470

2768 +#: builtin/branch.c:475

2769 #, c-format

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

2771 msgstr ""

2772

2678 -#: builtin/branch.c:472

2773 +#: builtin/branch.c:477

2774 #, c-format

2775 msgid "[ahead %d]"

2776 msgstr ""

2777

2683 -#: builtin/branch.c:475

2778 +#: builtin/branch.c:480

2779 #, c-format

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

2781 msgstr ""

2782

2688 -#: builtin/branch.c:478

2783 +#: builtin/branch.c:483

2784 #, c-format

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

2786 msgstr ""

2787

2693 -#: builtin/branch.c:502

2788 +#: builtin/branch.c:496

2789 msgid " **** invalid ref ****"

2790 msgstr ""

2791

2697 -#: builtin/branch.c:594

2792 +#: builtin/branch.c:587

2793 #, c-format

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

2795 msgstr ""

2796

2702 -#: builtin/branch.c:597

2797 +#: builtin/branch.c:590

2798 #, c-format

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

2800 msgstr ""

2801

2707 -#: builtin/branch.c:600

2802 +#: builtin/branch.c:593

2803 #, c-format

2804 msgid "(detached from %s)"

2805 msgstr ""

2806

2712 -#: builtin/branch.c:603

2807 +#: builtin/branch.c:596

2808 msgid "(no branch)"

2809 msgstr ""

2810

2716 -#: builtin/branch.c:649

2811 +#: builtin/branch.c:643

2812 #, c-format

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

2814 msgstr ""

2815

2721 -#: builtin/branch.c:681

2816 +#: builtin/branch.c:691

2817 msgid "some refs could not be read"

2818 msgstr ""

2819

2725 -#: builtin/branch.c:694

2820 +#: builtin/branch.c:704

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

2822 msgstr ""

2823

2729 -#: builtin/branch.c:704

2824 +#: builtin/branch.c:714

2825 #, c-format

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

2827 msgstr ""

2828

2734 -#: builtin/branch.c:719

2829 +#: builtin/branch.c:729

2830 msgid "Branch rename failed"

2831 msgstr ""

2832

2738 -#: builtin/branch.c:723

2833 +#: builtin/branch.c:733

2834 #, c-format

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

2836 msgstr ""

2837

2743 -#: builtin/branch.c:727

2838 +#: builtin/branch.c:737

2839 #, c-format

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

2841 msgstr ""

2842

2748 -#: builtin/branch.c:734

2843 +#: builtin/branch.c:744

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

2845 msgstr ""

2846

2752 -#: builtin/branch.c:749

2847 +#: builtin/branch.c:759

2848 #, c-format

2849 msgid "malformed object name %s"

2850 msgstr ""

2851

2757 -#: builtin/branch.c:773

2852 +#: builtin/branch.c:783

2853 #, c-format

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

2855 msgstr ""

2856

2762 -#: builtin/branch.c:803

2857 +#: builtin/branch.c:813

2858 msgid "Generic options"

2859 msgstr ""

2860

2766 -#: builtin/branch.c:805

2861 +#: builtin/branch.c:815

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

2863 msgstr ""

2864

2770 -#: builtin/branch.c:806

2865 +#: builtin/branch.c:816

2866 msgid "suppress informational messages"

2867 msgstr ""

2868

2774 -#: builtin/branch.c:807

2869 +#: builtin/branch.c:817

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

2871 msgstr ""

2872

2778 -#: builtin/branch.c:809

2873 +#: builtin/branch.c:819

2874 msgid "change upstream info"

2875 msgstr ""

2876

2782 -#: builtin/branch.c:813

2877 +#: builtin/branch.c:823

2878 msgid "use colored output"

2879 msgstr ""

2880

2786 -#: builtin/branch.c:814

2881 +#: builtin/branch.c:824

2882 msgid "act on remote-tracking branches"

2883 msgstr ""

2884

2790 -#: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844

2791 -#: builtin/branch.c:850 builtin/commit.c:1573 builtin/commit.c:1574

2792 -#: builtin/commit.c:1575 builtin/commit.c:1576 builtin/tag.c:615

2793 -#: builtin/tag.c:621

2885 +#: builtin/branch.c:827 builtin/branch.c:833 builtin/branch.c:854

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

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

2888 +#: builtin/tag.c:622

2889 msgid "commit"

2890 msgstr ""

2891

2797 -#: builtin/branch.c:818 builtin/branch.c:824

2892 +#: builtin/branch.c:828 builtin/branch.c:834

2893 msgid "print only branches that contain the commit"

2894 msgstr ""

2895

2801 -#: builtin/branch.c:830

2896 +#: builtin/branch.c:840

2897 msgid "Specific git-branch actions:"

2898 msgstr ""

2899

2805 -#: builtin/branch.c:831

2900 +#: builtin/branch.c:841

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

2902 msgstr ""

2903

2809 -#: builtin/branch.c:833

2904 +#: builtin/branch.c:843

2905 msgid "delete fully merged branch"

2906 msgstr ""

2907

2813 -#: builtin/branch.c:834

2908 +#: builtin/branch.c:844

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

2910 msgstr ""

2911

2817 -#: builtin/branch.c:835

2912 +#: builtin/branch.c:845

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

2914 msgstr ""

2915

2821 -#: builtin/branch.c:836

2916 +#: builtin/branch.c:846

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

2918 msgstr ""

2919

2825 -#: builtin/branch.c:837

2920 +#: builtin/branch.c:847

2921 msgid "list branch names"

2922 msgstr ""

2923

2829 -#: builtin/branch.c:838

2924 +#: builtin/branch.c:848

2925 msgid "create the branch's reflog"

2926 msgstr ""

2927

2833 -#: builtin/branch.c:840

2928 +#: builtin/branch.c:850

2929 msgid "edit the description for the branch"

2930 msgstr ""

2931

2837 -#: builtin/branch.c:841

2932 +#: builtin/branch.c:851

2933 msgid "force creation (when already exists)"

2934 msgstr ""

2935

2841 -#: builtin/branch.c:844

2936 +#: builtin/branch.c:854

2937 msgid "print only not merged branches"

2938 msgstr ""

2939

2845 -#: builtin/branch.c:850

2940 +#: builtin/branch.c:860

2941 msgid "print only merged branches"

2942 msgstr ""

2943

2849 -#: builtin/branch.c:854

2944 +#: builtin/branch.c:864

2945 msgid "list branches in columns"

2946 msgstr ""

2947

2853 -#: builtin/branch.c:867

2948 +#: builtin/branch.c:877

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

2950 msgstr ""

2951

2857 -#: builtin/branch.c:872 builtin/clone.c:636

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

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

2954 msgstr ""

2955

2861 -#: builtin/branch.c:896

2956 +#: builtin/branch.c:903

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

2958 msgstr ""

2959

2865 -#: builtin/branch.c:902 builtin/branch.c:941

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

2961 msgid "branch name required"

2962 msgstr ""

2963

2869 -#: builtin/branch.c:917

2964 +#: builtin/branch.c:924

2965 msgid "Cannot give description to detached HEAD"

2966 msgstr ""

2967

2873 -#: builtin/branch.c:922

2968 +#: builtin/branch.c:929

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

2970 msgstr ""

2971

2877 -#: builtin/branch.c:929

2972 +#: builtin/branch.c:936

2973 #, c-format

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

2975 msgstr ""

2976

2882 -#: builtin/branch.c:932

2977 +#: builtin/branch.c:939

2978 #, c-format

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

2980 msgstr ""

2981

2887 -#: builtin/branch.c:947

2982 +#: builtin/branch.c:954

2983 msgid "too many branches for a rename operation"

2984 msgstr ""

2985

2891 -#: builtin/branch.c:952

2986 +#: builtin/branch.c:959

2987 msgid "too many branches to set new upstream"

2988 msgstr ""

2989

2895 -#: builtin/branch.c:956

2990 +#: builtin/branch.c:963

2991 #, c-format

2992 msgid ""

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

2994 msgstr ""

2995

2901 -#: builtin/branch.c:959 builtin/branch.c:981 builtin/branch.c:1002

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

2997 #, c-format

2998 msgid "no such branch '%s'"

2999 msgstr ""

3000

2906 -#: builtin/branch.c:963

3001 +#: builtin/branch.c:970

3002 #, c-format

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

3004 msgstr ""

3005

2911 -#: builtin/branch.c:975

3006 +#: builtin/branch.c:982

3007 msgid "too many branches to unset upstream"

3008 msgstr ""

3009

2915 -#: builtin/branch.c:979

3010 +#: builtin/branch.c:986

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

3012 msgstr ""

3013

2919 -#: builtin/branch.c:985

3014 +#: builtin/branch.c:992

3015 #, c-format

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

3017 msgstr ""

3018

2924 -#: builtin/branch.c:999

3019 +#: builtin/branch.c:1006

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

3021 msgstr ""

3022

2928 -#: builtin/branch.c:1005

3023 +#: builtin/branch.c:1012

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

3025 msgstr ""

3026

2932 -#: builtin/branch.c:1008

3027 +#: builtin/branch.c:1015

3028 #, c-format

3029 msgid ""

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

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

3032 msgstr ""

3033

2939 -#: builtin/branch.c:1025

3034 +#: builtin/branch.c:1032

3035 #, c-format

3036 msgid ""

3037 "\n"

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

3039 "\n"

3040 msgstr ""

3041

2947 -#: builtin/branch.c:1026

3042 +#: builtin/branch.c:1033

3043 #, c-format

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

3045 msgstr ""

3046

2952 -#: builtin/branch.c:1027

3047 +#: builtin/branch.c:1034

3048 #, c-format

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

3050 msgstr ""

@@ -2967,43 +3062,43 @@ msgstr ""

3062 msgid "Need a repository to unbundle."

3063 msgstr ""

3064

2970 -#: builtin/cat-file.c:331

3065 +#: builtin/cat-file.c:332

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

3067 msgstr ""

3068

2974 -#: builtin/cat-file.c:332

3069 +#: builtin/cat-file.c:333

3070 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"

3071 msgstr ""

3072

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

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

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

3075 msgstr ""

3076

2982 -#: builtin/cat-file.c:370

3077 +#: builtin/cat-file.c:371

3078 msgid "show object type"

3079 msgstr ""

3080

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

3081 +#: builtin/cat-file.c:372

3082 msgid "show object size"

3083 msgstr ""

3084

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

3085 +#: builtin/cat-file.c:374

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

3087 msgstr ""

3088

2994 -#: builtin/cat-file.c:374

3089 +#: builtin/cat-file.c:375

3090 msgid "pretty-print object's content"

3091 msgstr ""

3092

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

3093 +#: builtin/cat-file.c:377

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

3095 msgstr ""

3096

3002 -#: builtin/cat-file.c:378

3097 +#: builtin/cat-file.c:379

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

3099 msgstr ""

3100

3006 -#: builtin/cat-file.c:381

3101 +#: builtin/cat-file.c:382

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

3103 msgstr ""

3104

@@ -3023,7 +3118,7 @@ msgstr ""

3118 msgid "use .gitattributes only from the index"

3119 msgstr ""

3120

3026 -#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75

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

3122 msgid "read file names from stdin"

3123 msgstr ""

3124

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

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

3127 msgstr ""

3128

3034 -#: builtin/check-ignore.c:18 builtin/checkout.c:1083 builtin/gc.c:285

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

3130 msgid "suppress progress reporting"

3131 msgstr ""

3132

@@ -3195,46 +3290,46 @@ msgstr ""

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

3291 msgstr ""

3292

3198 -#: builtin/checkout.c:591

3293 +#: builtin/checkout.c:597

3294 #, c-format

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

3296 msgstr ""

3297

3203 -#: builtin/checkout.c:629

3298 +#: builtin/checkout.c:635

3299 msgid "HEAD is now at"

3300 msgstr ""

3301

3207 -#: builtin/checkout.c:636

3302 +#: builtin/checkout.c:642

3303 #, c-format

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

3305 msgstr ""

3306

3212 -#: builtin/checkout.c:639

3307 +#: builtin/checkout.c:645

3308 #, c-format

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

3310 msgstr ""

3311

3217 -#: builtin/checkout.c:643

3312 +#: builtin/checkout.c:649

3313 #, c-format

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

3315 msgstr ""

3316

3222 -#: builtin/checkout.c:645 builtin/checkout.c:1026

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

3318 #, c-format

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

3320 msgstr ""

3321

3227 -#: builtin/checkout.c:647

3322 +#: builtin/checkout.c:653

3323 #, c-format

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

3325 msgstr ""

3326

3232 -#: builtin/checkout.c:699

3327 +#: builtin/checkout.c:705

3328 #, c-format

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

3330 msgstr ""

3331

3237 -#: builtin/checkout.c:705

3332 +#: builtin/checkout.c:711

3333 #, c-format

3334 msgid ""

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

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

3344 msgstr[0] ""

3345 msgstr[1] ""

3346

3252 -#: builtin/checkout.c:723

3347 +#: builtin/checkout.c:729

3348 #, c-format

3349 msgid ""

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

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

3354 "\n"

3355 msgstr ""

3356

3262 -#: builtin/checkout.c:753

3357 +#: builtin/checkout.c:759

3358 msgid "internal error in revision walk"

3359 msgstr ""

3360

3266 -#: builtin/checkout.c:757

3361 +#: builtin/checkout.c:763

3362 msgid "Previous HEAD position was"

3363 msgstr ""

3364

3270 -#: builtin/checkout.c:784 builtin/checkout.c:1021

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

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

3367 msgstr ""

3368

3274 -#: builtin/checkout.c:928

3369 +#: builtin/checkout.c:934

3370 #, c-format

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

3372 msgstr ""

3373

3279 -#: builtin/checkout.c:967

3374 +#: builtin/checkout.c:973

3375 #, c-format

3376 msgid "invalid reference: %s"

3377 msgstr ""

3378

3284 -#: builtin/checkout.c:996

3379 +#: builtin/checkout.c:1002

3380 #, c-format

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

3382 msgstr ""

3383

3289 -#: builtin/checkout.c:1035

3384 +#: builtin/checkout.c:1041

3385 msgid "paths cannot be used with switching branches"

3386 msgstr ""

3387

3293 -#: builtin/checkout.c:1038 builtin/checkout.c:1042

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

3389 #, c-format

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

3391 msgstr ""

3392

3298 -#: builtin/checkout.c:1046 builtin/checkout.c:1049 builtin/checkout.c:1054

3299 -#: builtin/checkout.c:1057

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

3394 +#: builtin/checkout.c:1063

3395 #, c-format

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

3397 msgstr ""

3398

3304 -#: builtin/checkout.c:1062

3399 +#: builtin/checkout.c:1068

3400 #, c-format

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

3402 msgstr ""

3403

3309 -#: builtin/checkout.c:1084 builtin/checkout.c:1086 builtin/clone.c:88

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

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

3406 msgid "branch"

3407 msgstr ""

3408

3314 -#: builtin/checkout.c:1085

3409 +#: builtin/checkout.c:1091

3410 msgid "create and checkout a new branch"

3411 msgstr ""

3412

3318 -#: builtin/checkout.c:1087

3413 +#: builtin/checkout.c:1093

3414 msgid "create/reset and checkout a branch"

3415 msgstr ""

3416

3322 -#: builtin/checkout.c:1088

3417 +#: builtin/checkout.c:1094

3418 msgid "create reflog for new branch"

3419 msgstr ""

3420

3326 -#: builtin/checkout.c:1089

3421 +#: builtin/checkout.c:1095

3422 msgid "detach the HEAD at named commit"

3423 msgstr ""

3424

3330 -#: builtin/checkout.c:1090

3425 +#: builtin/checkout.c:1096

3426 msgid "set upstream info for new branch"

3427 msgstr ""

3428

3334 -#: builtin/checkout.c:1092

3429 +#: builtin/checkout.c:1098

3430 msgid "new-branch"

3431 msgstr ""

3432

3338 -#: builtin/checkout.c:1092

3433 +#: builtin/checkout.c:1098

3434 msgid "new unparented branch"

3435 msgstr ""

3436

3342 -#: builtin/checkout.c:1093

3437 +#: builtin/checkout.c:1099

3438 msgid "checkout our version for unmerged files"

3439 msgstr ""

3440

3346 -#: builtin/checkout.c:1095

3441 +#: builtin/checkout.c:1101

3442 msgid "checkout their version for unmerged files"

3443 msgstr ""

3444

3350 -#: builtin/checkout.c:1097

3445 +#: builtin/checkout.c:1103

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

3447 msgstr ""

3448

3354 -#: builtin/checkout.c:1098

3449 +#: builtin/checkout.c:1104

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

3451 msgstr ""

3452

3358 -#: builtin/checkout.c:1099 builtin/merge.c:225

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

3454 msgid "update ignored files (default)"

3455 msgstr ""

3456

3362 -#: builtin/checkout.c:1100 builtin/log.c:1236 parse-options.h:245

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

3458 msgid "style"

3459 msgstr ""

3460

3366 -#: builtin/checkout.c:1101

3461 +#: builtin/checkout.c:1107

3462 msgid "conflict style (merge or diff3)"

3463 msgstr ""

3464

3370 -#: builtin/checkout.c:1104

3465 +#: builtin/checkout.c:1110

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

3467 msgstr ""

3468

3374 -#: builtin/checkout.c:1106

3469 +#: builtin/checkout.c:1112

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

3471 msgstr ""

3472

3378 -#: builtin/checkout.c:1129

3473 +#: builtin/checkout.c:1135

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

3475 msgstr ""

3476

3382 -#: builtin/checkout.c:1146

3477 +#: builtin/checkout.c:1152

3478 msgid "--track needs a branch name"

3479 msgstr ""

3480

3386 -#: builtin/checkout.c:1153

3481 +#: builtin/checkout.c:1157

3482 msgid "Missing branch name; try -b"

3483 msgstr ""

3484

3390 -#: builtin/checkout.c:1190

3485 +#: builtin/checkout.c:1194

3486 msgid "invalid path specification"

3487 msgstr ""

3488

3394 -#: builtin/checkout.c:1197

3489 +#: builtin/checkout.c:1201

3490 #, c-format

3491 msgid ""

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

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

3494 msgstr ""

3495

3401 -#: builtin/checkout.c:1202

3496 +#: builtin/checkout.c:1206

3497 #, c-format

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

3499 msgstr ""

3500

3406 -#: builtin/checkout.c:1206

3501 +#: builtin/checkout.c:1210

3502 msgid ""

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

3504 "checking out of the index."

@@ -3532,7 +3627,7 @@ msgstr ""

3627 msgid "remove whole directories"

3628 msgstr ""

3629

3535 -#: builtin/clean.c:880 builtin/describe.c:406 builtin/grep.c:714

3630 +#: builtin/clean.c:880 builtin/describe.c:407 builtin/grep.c:714

3631 #: builtin/ls-files.c:486 builtin/name-rev.c:311 builtin/show-ref.c:185

3632 msgid "pattern"

3633 msgstr ""

@@ -3565,145 +3660,145 @@ msgid ""

3660 "refusing to clean"

3661 msgstr ""

3662

3568 -#: builtin/clone.c:36

3663 +#: builtin/clone.c:37

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

3665 msgstr ""

3666

3572 -#: builtin/clone.c:64 builtin/fetch.c:112 builtin/merge.c:222

3573 -#: builtin/push.c:503

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

3668 +#: builtin/push.c:514

3669 msgid "force progress reporting"

3670 msgstr ""

3671

3577 -#: builtin/clone.c:66

3672 +#: builtin/clone.c:67

3673 msgid "don't create a checkout"

3674 msgstr ""

3675

3581 -#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:486

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

3677 msgid "create a bare repository"

3678 msgstr ""

3679

3585 -#: builtin/clone.c:71

3680 +#: builtin/clone.c:72

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

3682 msgstr ""

3683

3589 -#: builtin/clone.c:73

3684 +#: builtin/clone.c:74

3685 msgid "to clone from a local repository"

3686 msgstr ""

3687

3593 -#: builtin/clone.c:75

3688 +#: builtin/clone.c:76

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

3690 msgstr ""

3691

3597 -#: builtin/clone.c:77

3692 +#: builtin/clone.c:78

3693 msgid "setup as shared repository"

3694 msgstr ""

3695

3601 -#: builtin/clone.c:79 builtin/clone.c:81

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

3697 msgid "initialize submodules in the clone"

3698 msgstr ""

3699

3605 -#: builtin/clone.c:82 builtin/init-db.c:483

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

3701 msgid "template-directory"

3702 msgstr ""

3703

3609 -#: builtin/clone.c:83 builtin/init-db.c:484

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

3705 msgid "directory from which templates will be used"

3706 msgstr ""

3707

3613 -#: builtin/clone.c:85

3708 +#: builtin/clone.c:86

3709 msgid "reference repository"

3710 msgstr ""

3711

3617 -#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44

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

3713 msgid "name"

3714 msgstr ""

3715

3621 -#: builtin/clone.c:87

3716 +#: builtin/clone.c:88

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

3718 msgstr ""

3719

3625 -#: builtin/clone.c:89

3720 +#: builtin/clone.c:90

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

3722 msgstr ""

3723

3629 -#: builtin/clone.c:91

3724 +#: builtin/clone.c:92

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

3726 msgstr ""

3727

3633 -#: builtin/clone.c:92 builtin/fetch.c:113 builtin/grep.c:659

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

3729 msgid "depth"

3730 msgstr ""

3731

3637 -#: builtin/clone.c:93

3732 +#: builtin/clone.c:94

3733 msgid "create a shallow clone of that depth"

3734 msgstr ""

3735

3641 -#: builtin/clone.c:95

3736 +#: builtin/clone.c:96

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

3738 msgstr ""

3739

3645 -#: builtin/clone.c:96 builtin/init-db.c:492

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

3741 msgid "gitdir"

3742 msgstr ""

3743

3649 -#: builtin/clone.c:97 builtin/init-db.c:493

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

3745 msgid "separate git dir from working tree"

3746 msgstr ""

3747

3653 -#: builtin/clone.c:98

3748 +#: builtin/clone.c:99

3749 msgid "key=value"

3750 msgstr ""

3751

3657 -#: builtin/clone.c:99

3752 +#: builtin/clone.c:100

3753 msgid "set config inside the new repository"

3754 msgstr ""

3755

3661 -#: builtin/clone.c:252

3756 +#: builtin/clone.c:253

3757 #, c-format

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

3759 msgstr ""

3760

3666 -#: builtin/clone.c:256

3761 +#: builtin/clone.c:257

3762 #, c-format

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

3764 msgstr ""

3765

3671 -#: builtin/clone.c:259

3766 +#: builtin/clone.c:260

3767 #, c-format

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

3769 msgstr ""

3770

3676 -#: builtin/clone.c:321

3771 +#: builtin/clone.c:322

3772 #, c-format

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

3774 msgstr ""

3775

3681 -#: builtin/clone.c:323 builtin/diff.c:83

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

3777 #, c-format

3778 msgid "failed to stat '%s'"

3779 msgstr ""

3780

3686 -#: builtin/clone.c:325

3781 +#: builtin/clone.c:326

3782 #, c-format

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

3784 msgstr ""

3785

3691 -#: builtin/clone.c:339

3786 +#: builtin/clone.c:340

3787 #, c-format

3788 msgid "failed to stat %s\n"

3789 msgstr ""

3790

3696 -#: builtin/clone.c:361

3791 +#: builtin/clone.c:362

3792 #, c-format

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

3794 msgstr ""

3795

3701 -#: builtin/clone.c:365

3796 +#: builtin/clone.c:366

3797 #, c-format

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

3799 msgstr ""

3800

3706 -#: builtin/clone.c:388 builtin/clone.c:565

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

3802 #, c-format

3803 msgid "done.\n"

3804 msgstr ""

@@ -3715,108 +3810,108 @@ msgid ""

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

3811 msgstr ""

3812

3718 -#: builtin/clone.c:480

3813 +#: builtin/clone.c:478

3814 #, c-format

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

3816 msgstr ""

3817

3723 -#: builtin/clone.c:560

3818 +#: builtin/clone.c:558

3819 #, c-format

3820 msgid "Checking connectivity... "

3821 msgstr ""

3822

3728 -#: builtin/clone.c:563

3823 +#: builtin/clone.c:561

3824 msgid "remote did not send all necessary objects"

3825 msgstr ""

3826

3732 -#: builtin/clone.c:627

3827 +#: builtin/clone.c:625

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

3829 msgstr ""

3830

3736 -#: builtin/clone.c:658

3831 +#: builtin/clone.c:656

3832 msgid "unable to checkout working tree"

3833 msgstr ""

3834

3740 -#: builtin/clone.c:768

3835 +#: builtin/clone.c:765

3836 msgid "Too many arguments."

3837 msgstr ""

3838

3744 -#: builtin/clone.c:772

3839 +#: builtin/clone.c:769

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

3841 msgstr ""

3842

3748 -#: builtin/clone.c:783

3843 +#: builtin/clone.c:780

3844 #, c-format

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

3846 msgstr ""

3847

3753 -#: builtin/clone.c:786

3848 +#: builtin/clone.c:783

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

3850 msgstr ""

3851

3757 -#: builtin/clone.c:799

3852 +#: builtin/clone.c:796

3853 #, c-format

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

3855 msgstr ""

3856

3762 -#: builtin/clone.c:805 builtin/fetch.c:1143

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

3858 #, c-format

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

3860 msgstr ""

3861

3767 -#: builtin/clone.c:815

3862 +#: builtin/clone.c:812

3863 #, c-format

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

3865 msgstr ""

3866

3772 -#: builtin/clone.c:825

3867 +#: builtin/clone.c:822

3868 #, c-format

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

3870 msgstr ""

3871

3777 -#: builtin/clone.c:838 builtin/clone.c:850

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

3873 #, c-format

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

3875 msgstr ""

3876

3782 -#: builtin/clone.c:841

3877 +#: builtin/clone.c:838

3878 #, c-format

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

3880 msgstr ""

3881

3787 -#: builtin/clone.c:860

3882 +#: builtin/clone.c:857

3883 #, c-format

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

3885 msgstr ""

3886

3792 -#: builtin/clone.c:862

3887 +#: builtin/clone.c:859

3888 #, c-format

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

3890 msgstr ""

3891

3797 -#: builtin/clone.c:898

3892 +#: builtin/clone.c:895

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

3894 msgstr ""

3895

3801 -#: builtin/clone.c:901

3896 +#: builtin/clone.c:898

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

3898 msgstr ""

3899

3805 -#: builtin/clone.c:906

3900 +#: builtin/clone.c:903

3901 msgid "--local is ignored"

3902 msgstr ""

3903

3809 -#: builtin/clone.c:910

3904 +#: builtin/clone.c:907

3905 #, c-format

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

3907 msgstr ""

3908

3814 -#: builtin/clone.c:961 builtin/clone.c:969

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

3910 #, c-format

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

3912 msgstr ""

3913

3819 -#: builtin/clone.c:972

3914 +#: builtin/clone.c:969

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

3916 msgstr ""

3917

@@ -3852,15 +3947,30 @@ msgstr ""

3947 msgid "--command must be the first argument"

3948 msgstr ""

3949

3855 -#: builtin/commit.c:36

3950 +#: builtin/commit.c:37

3951 msgid "git commit [options] [--] <pathspec>..."

3952 msgstr ""

3953

3859 -#: builtin/commit.c:41

3954 +#: builtin/commit.c:42

3955 msgid "git status [options] [--] <pathspec>..."

3956 msgstr ""

3957

3863 -#: builtin/commit.c:46

3958 +#: builtin/commit.c:47

3959 +msgid ""

3960 +"Your name and email address were configured automatically based\n"

3961 +"on your username and hostname. Please check that they are accurate.\n"

3962 +"You can suppress this message by setting them explicitly. Run the\n"

3963 +"following command and follow the instructions in your editor to edit\n"

3964 +"your configuration file:\n"

3965 +"\n"

3966 +" git config --global --edit\n"

3967 +"\n"

3968 +"After doing this, you may fix the identity used for this commit with:\n"

3969 +"\n"

3970 +" git commit --amend --reset-author\n"

3971 +msgstr ""

3972 +

3973 +#: builtin/commit.c:60

3974 msgid ""

3975 "Your name and email address were configured automatically based\n"

3976 "on your username and hostname. Please check that they are accurate.\n"

@@ -3874,14 +3984,14 @@ msgid ""

3984 " git commit --amend --reset-author\n"

3985 msgstr ""

3986

3877 -#: builtin/commit.c:58

3987 +#: builtin/commit.c:72

3988 msgid ""

3989 "You asked to amend the most recent commit, but doing so would make\n"

3990 "it empty. You can repeat your command with --allow-empty, or you can\n"

3991 "remove the commit entirely with \"git reset HEAD^\".\n"

3992 msgstr ""

3993

3884 -#: builtin/commit.c:63

3994 +#: builtin/commit.c:77

3995 msgid ""

3996 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"

3997 "If you wish to commit it anyway, use:\n"

@@ -3890,11 +4000,11 @@ msgid ""

4000 "\n"

4001 msgstr ""

4002

3893 -#: builtin/commit.c:70

4003 +#: builtin/commit.c:84

4004 msgid "Otherwise, please use 'git reset'\n"

4005 msgstr ""

4006

3897 -#: builtin/commit.c:73

4007 +#: builtin/commit.c:87

4008 msgid ""

4009 "If you wish to skip this commit, use:\n"

4010 "\n"

@@ -3904,100 +4014,117 @@ msgid ""

4014 "the remaining commits.\n"

4015 msgstr ""

4016

3907 -#: builtin/commit.c:288

4017 +#: builtin/commit.c:302

4018 msgid "failed to unpack HEAD tree object"

4019 msgstr ""

4020

3911 -#: builtin/commit.c:328

4021 +#: builtin/commit.c:342

4022 msgid "unable to create temporary index"

4023 msgstr ""

4024

3915 -#: builtin/commit.c:334

4025 +#: builtin/commit.c:348

4026 msgid "interactive add failed"

4027 msgstr ""

4028

3919 -#: builtin/commit.c:366 builtin/commit.c:387 builtin/commit.c:435

4029 +#: builtin/commit.c:359

4030 +msgid "unable to write index file"

4031 +msgstr ""

4032 +

4033 +#: builtin/commit.c:361

4034 +msgid "unable to update temporary index"

4035 +msgstr ""

4036 +

4037 +#: builtin/commit.c:363

4038 +msgid "Failed to update main cache tree"

4039 +msgstr ""

4040 +

4041 +#: builtin/commit.c:387 builtin/commit.c:412 builtin/commit.c:461

4042 msgid "unable to write new_index file"

4043 msgstr ""

4044

3923 -#: builtin/commit.c:418

4045 +#: builtin/commit.c:443

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

4047 msgstr ""

4048

3927 -#: builtin/commit.c:420

4049 +#: builtin/commit.c:445

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

4051 msgstr ""

4052

3931 -#: builtin/commit.c:429

4053 +#: builtin/commit.c:454

4054 msgid "cannot read the index"

4055 msgstr ""

4056

3935 -#: builtin/commit.c:447

4057 +#: builtin/commit.c:473

4058 msgid "unable to write temporary index file"

4059 msgstr ""

4060

3939 -#: builtin/commit.c:557 builtin/commit.c:563

4061 +#: builtin/commit.c:592

4062 +#, c-format

4063 +msgid "commit '%s' lacks author header"

4064 +msgstr ""

4065 +

4066 +#: builtin/commit.c:594

4067 #, c-format

3941 -msgid "invalid commit: %s"

4068 +msgid "commit '%s' has malformed author line"

4069 msgstr ""

4070

3944 -#: builtin/commit.c:585

4071 +#: builtin/commit.c:613

4072 msgid "malformed --author parameter"

4073 msgstr ""

4074

3948 -#: builtin/commit.c:592

4075 +#: builtin/commit.c:621

4076 #, c-format

4077 msgid "invalid date format: %s"

4078 msgstr ""

4079

3953 -#: builtin/commit.c:609

4080 +#: builtin/commit.c:642

4081 #, c-format

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

4083 msgstr ""

4084

3958 -#: builtin/commit.c:642

4085 +#: builtin/commit.c:675

4086 msgid ""

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

4088 "in the current commit message"

4089 msgstr ""

4090

3964 -#: builtin/commit.c:679 builtin/commit.c:712 builtin/commit.c:1086

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

4092 #, c-format

4093 msgid "could not lookup commit %s"

4094 msgstr ""

4095

3969 -#: builtin/commit.c:691 builtin/shortlog.c:273

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

4097 #, c-format

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

4099 msgstr ""

4100

3974 -#: builtin/commit.c:693

4101 +#: builtin/commit.c:726

4102 msgid "could not read log from standard input"

4103 msgstr ""

4104

3978 -#: builtin/commit.c:697

4105 +#: builtin/commit.c:730

4106 #, c-format

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

4108 msgstr ""

4109

3983 -#: builtin/commit.c:719

4110 +#: builtin/commit.c:752

4111 msgid "could not read MERGE_MSG"

4112 msgstr ""

4113

3987 -#: builtin/commit.c:723

4114 +#: builtin/commit.c:756

4115 msgid "could not read SQUASH_MSG"

4116 msgstr ""

4117

3991 -#: builtin/commit.c:727

4118 +#: builtin/commit.c:760

4119 #, c-format

4120 msgid "could not read '%s'"

4121 msgstr ""

4122

3996 -#: builtin/commit.c:798

4123 +#: builtin/commit.c:831

4124 msgid "could not write commit template"

4125 msgstr ""

4126

4000 -#: builtin/commit.c:816

4127 +#: builtin/commit.c:849

4128 #, c-format

4129 msgid ""

4130 "\n"

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

4134 "and try again.\n"

4135 msgstr ""

4136

4010 -#: builtin/commit.c:821

4137 +#: builtin/commit.c:854

4138 #, c-format

4139 msgid ""

4140 "\n"

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

4144 "and try again.\n"

4145 msgstr ""

4146

4020 -#: builtin/commit.c:834

4147 +#: builtin/commit.c:867

4148 #, c-format

4149 msgid ""

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

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

4152 msgstr ""

4153

4027 -#: builtin/commit.c:841

4154 +#: builtin/commit.c:874

4155 #, c-format

4156 msgid ""

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

@@ -4032,359 +4159,351 @@ msgid ""

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

4160 msgstr ""

4161

4035 -#: builtin/commit.c:855

4162 +#: builtin/commit.c:888

4163 #, c-format

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

4165 msgstr ""

4166

4040 -#: builtin/commit.c:863

4167 +#: builtin/commit.c:896

4168 #, c-format

4169 msgid "%sDate: %s"

4170 msgstr ""

4171

4045 -#: builtin/commit.c:870

4172 +#: builtin/commit.c:903

4173 #, c-format

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

4175 msgstr ""

4176

4050 -#: builtin/commit.c:888

4177 +#: builtin/commit.c:921

4178 msgid "Cannot read index"

4179 msgstr ""

4180

4054 -#: builtin/commit.c:945

4181 +#: builtin/commit.c:978

4182 msgid "Error building trees"

4183 msgstr ""

4184

4058 -#: builtin/commit.c:960 builtin/tag.c:495

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

4186 #, c-format

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

4188 msgstr ""

4189

4063 -#: builtin/commit.c:1061

4190 +#: builtin/commit.c:1095

4191 #, c-format

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

4193 msgstr ""

4194

4068 -#: builtin/commit.c:1076 builtin/commit.c:1316

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

4196 #, c-format

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

4198 msgstr ""

4199

4073 -#: builtin/commit.c:1113

4200 +#: builtin/commit.c:1147

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

4202 msgstr ""

4203

4077 -#: builtin/commit.c:1143

4204 +#: builtin/commit.c:1177

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

4206 msgstr ""

4207

4081 -#: builtin/commit.c:1152

4208 +#: builtin/commit.c:1186

4209 msgid "You have nothing to amend."

4210 msgstr ""

4211

4085 -#: builtin/commit.c:1155

4212 +#: builtin/commit.c:1189

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

4214 msgstr ""

4215

4089 -#: builtin/commit.c:1157

4216 +#: builtin/commit.c:1191

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

4218 msgstr ""

4219

4093 -#: builtin/commit.c:1160

4220 +#: builtin/commit.c:1194

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

4222 msgstr ""

4223

4097 -#: builtin/commit.c:1170

4224 +#: builtin/commit.c:1204

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

4226 msgstr ""

4227

4101 -#: builtin/commit.c:1172

4228 +#: builtin/commit.c:1206

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

4230 msgstr ""

4231

4105 -#: builtin/commit.c:1180

4232 +#: builtin/commit.c:1214

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

4234 msgstr ""

4235

4109 -#: builtin/commit.c:1197

4236 +#: builtin/commit.c:1231

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

4238 msgstr ""

4239

4113 -#: builtin/commit.c:1199

4240 +#: builtin/commit.c:1233

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

4242 msgstr ""

4243

4117 -#: builtin/commit.c:1201

4244 +#: builtin/commit.c:1235

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

4246 msgstr ""

4247

4121 -#: builtin/commit.c:1203

4248 +#: builtin/commit.c:1237

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

4250 msgstr ""

4251

4125 -#: builtin/commit.c:1215 builtin/tag.c:727

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

4253 #, c-format

4254 msgid "Invalid cleanup mode %s"

4255 msgstr ""

4256

4130 -#: builtin/commit.c:1220

4257 +#: builtin/commit.c:1254

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

4259 msgstr ""

4260

4134 -#: builtin/commit.c:1330 builtin/commit.c:1595

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

4262 msgid "show status concisely"

4263 msgstr ""

4264

4138 -#: builtin/commit.c:1332 builtin/commit.c:1597

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

4266 msgid "show branch information"

4267 msgstr ""

4268

4142 -#: builtin/commit.c:1334 builtin/commit.c:1599 builtin/push.c:489

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

4270 msgid "machine-readable output"

4271 msgstr ""

4272

4146 -#: builtin/commit.c:1337 builtin/commit.c:1601

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

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

4275 msgstr ""

4276

4150 -#: builtin/commit.c:1340 builtin/commit.c:1604

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

4278 msgid "terminate entries with NUL"

4279 msgstr ""

4280

4154 -#: builtin/commit.c:1342 builtin/commit.c:1607 builtin/fast-export.c:703

4155 -#: builtin/fast-export.c:706 builtin/tag.c:602

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

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

4283 msgid "mode"

4284 msgstr ""

4285

4159 -#: builtin/commit.c:1343 builtin/commit.c:1607

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

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

4288 msgstr ""

4289

4163 -#: builtin/commit.c:1346

4290 +#: builtin/commit.c:1380

4291 msgid "show ignored files"

4292 msgstr ""

4293

4167 -#: builtin/commit.c:1347 parse-options.h:153

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

4295 msgid "when"

4296 msgstr ""

4297

4171 -#: builtin/commit.c:1348

4298 +#: builtin/commit.c:1382

4299 msgid ""

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

4301 "(Default: all)"

4302 msgstr ""

4303

4177 -#: builtin/commit.c:1350

4304 +#: builtin/commit.c:1384

4305 msgid "list untracked files in columns"

4306 msgstr ""

4307

4181 -#: builtin/commit.c:1419

4308 +#: builtin/commit.c:1471

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

4310 msgstr ""

4311

4185 -#: builtin/commit.c:1421

4312 +#: builtin/commit.c:1473

4313 msgid "could not parse newly created commit"

4314 msgstr ""

4315

4189 -#: builtin/commit.c:1469

4316 +#: builtin/commit.c:1518

4317 msgid "detached HEAD"

4318 msgstr ""

4319

4193 -#: builtin/commit.c:1471

4320 +#: builtin/commit.c:1521

4321 msgid " (root-commit)"

4322 msgstr ""

4323

4197 -#: builtin/commit.c:1565

4324 +#: builtin/commit.c:1614

4325 msgid "suppress summary after successful commit"

4326 msgstr ""

4327

4201 -#: builtin/commit.c:1566

4328 +#: builtin/commit.c:1615

4329 msgid "show diff in commit message template"

4330 msgstr ""

4331

4205 -#: builtin/commit.c:1568

4332 +#: builtin/commit.c:1617

4333 msgid "Commit message options"

4334 msgstr ""

4335

4209 -#: builtin/commit.c:1569 builtin/tag.c:600

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

4337 msgid "read message from file"

4338 msgstr ""

4339

4213 -#: builtin/commit.c:1570

4340 +#: builtin/commit.c:1619

4341 msgid "author"

4342 msgstr ""

4343

4217 -#: builtin/commit.c:1570

4344 +#: builtin/commit.c:1619

4345 msgid "override author for commit"

4346 msgstr ""

4347

4221 -#: builtin/commit.c:1571 builtin/gc.c:286

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

4349 msgid "date"

4350 msgstr ""

4351

4225 -#: builtin/commit.c:1571

4352 +#: builtin/commit.c:1620

4353 msgid "override date for commit"

4354 msgstr ""

4355

4229 -#: builtin/commit.c:1572 builtin/merge.c:216 builtin/notes.c:409

4230 -#: builtin/notes.c:566 builtin/tag.c:598

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

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

4358 msgid "message"

4359 msgstr ""

4360

4234 -#: builtin/commit.c:1572

4361 +#: builtin/commit.c:1621

4362 msgid "commit message"

4363 msgstr ""

4364

4238 -#: builtin/commit.c:1573

4365 +#: builtin/commit.c:1622

4366 msgid "reuse and edit message from specified commit"

4367 msgstr ""

4368

4242 -#: builtin/commit.c:1574

4369 +#: builtin/commit.c:1623

4370 msgid "reuse message from specified commit"

4371 msgstr ""

4372

4246 -#: builtin/commit.c:1575

4373 +#: builtin/commit.c:1624

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

4375 msgstr ""

4376

4250 -#: builtin/commit.c:1576

4377 +#: builtin/commit.c:1625

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

4379 msgstr ""

4380

4254 -#: builtin/commit.c:1577

4381 +#: builtin/commit.c:1626

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

4383 msgstr ""

4384

4258 -#: builtin/commit.c:1578 builtin/log.c:1188 builtin/revert.c:86

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

4386 msgid "add Signed-off-by:"

4387 msgstr ""

4388

4262 -#: builtin/commit.c:1579

4389 +#: builtin/commit.c:1628

4390 msgid "use specified template file"

4391 msgstr ""

4392

4266 -#: builtin/commit.c:1580

4393 +#: builtin/commit.c:1629

4394 msgid "force edit of commit"

4395 msgstr ""

4396

4270 -#: builtin/commit.c:1581

4397 +#: builtin/commit.c:1630

4398 msgid "default"

4399 msgstr ""

4400

4274 -#: builtin/commit.c:1581 builtin/tag.c:603

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

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

4403 msgstr ""

4404

4278 -#: builtin/commit.c:1582

4405 +#: builtin/commit.c:1631

4406 msgid "include status in commit message template"

4407 msgstr ""

4408

4282 -#: builtin/commit.c:1583 builtin/merge.c:223 builtin/revert.c:92

4283 -#: builtin/tag.c:604

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

4410 +#: builtin/tag.c:605

4411 msgid "key-id"

4412 msgstr ""

4413

4287 -#: builtin/commit.c:1584 builtin/merge.c:224 builtin/revert.c:93

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

4415 msgid "GPG sign commit"

4416 msgstr ""

4417

4291 -#: builtin/commit.c:1587

4418 +#: builtin/commit.c:1636

4419 msgid "Commit contents options"

4420 msgstr ""

4421

4295 -#: builtin/commit.c:1588

4422 +#: builtin/commit.c:1637

4423 msgid "commit all changed files"

4424 msgstr ""

4425

4299 -#: builtin/commit.c:1589

4426 +#: builtin/commit.c:1638

4427 msgid "add specified files to index for commit"

4428 msgstr ""

4429

4303 -#: builtin/commit.c:1590

4430 +#: builtin/commit.c:1639

4431 msgid "interactively add files"

4432 msgstr ""

4433

4307 -#: builtin/commit.c:1591

4434 +#: builtin/commit.c:1640

4435 msgid "interactively add changes"

4436 msgstr ""

4437

4311 -#: builtin/commit.c:1592

4438 +#: builtin/commit.c:1641

4439 msgid "commit only specified files"

4440 msgstr ""

4441

4315 -#: builtin/commit.c:1593

4442 +#: builtin/commit.c:1642

4443 msgid "bypass pre-commit hook"

4444 msgstr ""

4445

4319 -#: builtin/commit.c:1594

4446 +#: builtin/commit.c:1643

4447 msgid "show what would be committed"

4448 msgstr ""

4449

4323 -#: builtin/commit.c:1605

4450 +#: builtin/commit.c:1654

4451 msgid "amend previous commit"

4452 msgstr ""

4453

4327 -#: builtin/commit.c:1606

4454 +#: builtin/commit.c:1655

4455 msgid "bypass post-rewrite hook"

4456 msgstr ""

4457

4331 -#: builtin/commit.c:1611

4458 +#: builtin/commit.c:1660

4459 msgid "ok to record an empty change"

4460 msgstr ""

4461

4335 -#: builtin/commit.c:1613

4462 +#: builtin/commit.c:1662

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

4464 msgstr ""

4465

4339 -#: builtin/commit.c:1641

4466 +#: builtin/commit.c:1691

4467 msgid "could not parse HEAD commit"

4468 msgstr ""

4469

4343 -#: builtin/commit.c:1680 builtin/merge.c:518

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

4471 #, c-format

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

4473 msgstr ""

4474

4348 -#: builtin/commit.c:1687

4475 +#: builtin/commit.c:1737

4476 #, c-format

4477 msgid "Corrupt MERGE_HEAD file (%s)"

4478 msgstr ""

4479

4353 -#: builtin/commit.c:1694

4480 +#: builtin/commit.c:1744

4481 msgid "could not read MERGE_MODE"

4482 msgstr ""

4483

4357 -#: builtin/commit.c:1713

4484 +#: builtin/commit.c:1763

4485 #, c-format

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

4487 msgstr ""

4488

4362 -#: builtin/commit.c:1724

4489 +#: builtin/commit.c:1774

4490 #, c-format

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

4492 msgstr ""

4493

4367 -#: builtin/commit.c:1729

4494 +#: builtin/commit.c:1779

4495 #, c-format

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

4497 msgstr ""

4498

4372 -#: builtin/commit.c:1744 builtin/merge.c:851 builtin/merge.c:876

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

4500 msgid "failed to write commit object"

4501 msgstr ""

4502

4376 -#: builtin/commit.c:1756

4377 -msgid "cannot lock HEAD ref"

4378 -msgstr ""

4379 -

4380 -#: builtin/commit.c:1769

4381 -msgid "cannot update HEAD ref"

4382 -msgstr ""

4383 -

4384 -#: builtin/commit.c:1780

4503 +#: builtin/commit.c:1827

4504 msgid ""

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

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

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

4507 "not exceeded, and then \"git reset HEAD\" to recover."

4508 msgstr ""

4509

@@ -4516,225 +4635,248 @@ msgstr ""

4635 msgid "respect include directives on lookup"

4636 msgstr ""

4637

4519 -#: builtin/count-objects.c:82

4638 +#: builtin/config.c:315

4639 +msgid "unable to parse default color value"

4640 +msgstr ""

4641 +

4642 +#: builtin/config.c:455

4643 +#, c-format

4644 +msgid ""

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

4646 +"[core]\n"

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

4648 +"#\tuser = %s\n"

4649 +"#\temail = %s\n"

4650 +msgstr ""

4651 +

4652 +#: builtin/config.c:590

4653 +#, c-format

4654 +msgid "cannot create configuration file %s"

4655 +msgstr ""

4656 +

4657 +#: builtin/count-objects.c:55

4658 msgid "git count-objects [-v] [-H | --human-readable]"

4659 msgstr ""

4660

4523 -#: builtin/count-objects.c:97

4661 +#: builtin/count-objects.c:65

4662 msgid "print sizes in human readable format"

4663 msgstr ""

4664

4527 -#: builtin/describe.c:16

4665 +#: builtin/describe.c:17

4666 msgid "git describe [options] <commit-ish>*"

4667 msgstr ""

4668

4531 -#: builtin/describe.c:17

4669 +#: builtin/describe.c:18

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

4671 msgstr ""

4672

4535 -#: builtin/describe.c:216

4673 +#: builtin/describe.c:217

4674 #, c-format

4675 msgid "annotated tag %s not available"

4676 msgstr ""

4677

4540 -#: builtin/describe.c:220

4678 +#: builtin/describe.c:221

4679 #, c-format

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

4681 msgstr ""

4682

4545 -#: builtin/describe.c:222

4683 +#: builtin/describe.c:223

4684 #, c-format

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

4686 msgstr ""

4687

4550 -#: builtin/describe.c:249

4688 +#: builtin/describe.c:250 builtin/log.c:452

4689 #, c-format

4690 msgid "Not a valid object name %s"

4691 msgstr ""

4692

4555 -#: builtin/describe.c:252

4693 +#: builtin/describe.c:253

4694 #, c-format

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

4696 msgstr ""

4697

4560 -#: builtin/describe.c:269

4698 +#: builtin/describe.c:270

4699 #, c-format

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

4701 msgstr ""

4702

4565 -#: builtin/describe.c:271

4703 +#: builtin/describe.c:272

4704 #, c-format

4705 msgid "searching to describe %s\n"

4706 msgstr ""

4707

4570 -#: builtin/describe.c:318

4708 +#: builtin/describe.c:319

4709 #, c-format

4710 msgid "finished search at %s\n"

4711 msgstr ""

4712

4575 -#: builtin/describe.c:345

4713 +#: builtin/describe.c:346

4714 #, c-format

4715 msgid ""

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

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

4718 msgstr ""

4719

4582 -#: builtin/describe.c:349

4720 +#: builtin/describe.c:350

4721 #, c-format

4722 msgid ""

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

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

4725 msgstr ""

4726

4589 -#: builtin/describe.c:370

4727 +#: builtin/describe.c:371

4728 #, c-format

4729 msgid "traversed %lu commits\n"

4730 msgstr ""

4731

4594 -#: builtin/describe.c:373

4732 +#: builtin/describe.c:374

4733 #, c-format

4734 msgid ""

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

4736 "gave up search at %s\n"

4737 msgstr ""

4738

4601 -#: builtin/describe.c:395

4739 +#: builtin/describe.c:396

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

4741 msgstr ""

4742

4605 -#: builtin/describe.c:396

4743 +#: builtin/describe.c:397

4744 msgid "debug search strategy on stderr"

4745 msgstr ""

4746

4609 -#: builtin/describe.c:397

4747 +#: builtin/describe.c:398

4748 msgid "use any ref"

4749 msgstr ""

4750

4613 -#: builtin/describe.c:398

4751 +#: builtin/describe.c:399

4752 msgid "use any tag, even unannotated"

4753 msgstr ""

4754

4617 -#: builtin/describe.c:399

4755 +#: builtin/describe.c:400

4756 msgid "always use long format"

4757 msgstr ""

4758

4621 -#: builtin/describe.c:400

4759 +#: builtin/describe.c:401

4760 msgid "only follow first parent"

4761 msgstr ""

4762

4625 -#: builtin/describe.c:403

4763 +#: builtin/describe.c:404

4764 msgid "only output exact matches"

4765 msgstr ""

4766

4629 -#: builtin/describe.c:405

4767 +#: builtin/describe.c:406

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

4769 msgstr ""

4770

4633 -#: builtin/describe.c:407

4771 +#: builtin/describe.c:408

4772 msgid "only consider tags matching <pattern>"

4773 msgstr ""

4774

4637 -#: builtin/describe.c:409 builtin/name-rev.c:318

4775 +#: builtin/describe.c:410 builtin/name-rev.c:318

4776 msgid "show abbreviated commit object as fallback"

4777 msgstr ""

4778

4641 -#: builtin/describe.c:410

4779 +#: builtin/describe.c:411

4780 msgid "mark"

4781 msgstr ""

4782

4645 -#: builtin/describe.c:411

4783 +#: builtin/describe.c:412

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

4785 msgstr ""

4786

4649 -#: builtin/describe.c:429

4787 +#: builtin/describe.c:430

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

4789 msgstr ""

4790

4653 -#: builtin/describe.c:455

4791 +#: builtin/describe.c:456

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

4793 msgstr ""

4794

4657 -#: builtin/describe.c:475

4795 +#: builtin/describe.c:476

4796 msgid "--dirty is incompatible with commit-ishes"

4797 msgstr ""

4798

4661 -#: builtin/diff.c:85

4799 +#: builtin/diff.c:86

4800 #, c-format

4801 msgid "'%s': not a regular file or symlink"

4802 msgstr ""

4803

4666 -#: builtin/diff.c:236

4804 +#: builtin/diff.c:237

4805 #, c-format

4806 msgid "invalid option: %s"

4807 msgstr ""

4808

4671 -#: builtin/diff.c:357

4809 +#: builtin/diff.c:358

4810 msgid "Not a git repository"

4811 msgstr ""

4812

4675 -#: builtin/diff.c:400

4813 +#: builtin/diff.c:401

4814 #, c-format

4815 msgid "invalid object '%s' given."

4816 msgstr ""

4817

4680 -#: builtin/diff.c:409

4818 +#: builtin/diff.c:410

4819 #, c-format

4820 msgid "more than two blobs given: '%s'"

4821 msgstr ""

4822

4685 -#: builtin/diff.c:416

4823 +#: builtin/diff.c:417

4824 #, c-format

4825 msgid "unhandled object '%s' given."

4826 msgstr ""

4827

4690 -#: builtin/fast-export.c:23

4828 +#: builtin/fast-export.c:24

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

4830 msgstr ""

4831

4694 -#: builtin/fast-export.c:702

4832 +#: builtin/fast-export.c:979

4833 msgid "show progress after <n> objects"

4834 msgstr ""

4835

4698 -#: builtin/fast-export.c:704

4836 +#: builtin/fast-export.c:981

4837 msgid "select handling of signed tags"

4838 msgstr ""

4839

4702 -#: builtin/fast-export.c:707

4840 +#: builtin/fast-export.c:984

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

4842 msgstr ""

4843

4706 -#: builtin/fast-export.c:710

4844 +#: builtin/fast-export.c:987

4845 msgid "Dump marks to this file"

4846 msgstr ""

4847

4710 -#: builtin/fast-export.c:712

4848 +#: builtin/fast-export.c:989

4849 msgid "Import marks from this file"

4850 msgstr ""

4851

4714 -#: builtin/fast-export.c:714

4852 +#: builtin/fast-export.c:991

4853 msgid "Fake a tagger when tags lack one"

4854 msgstr ""

4855

4718 -#: builtin/fast-export.c:716

4856 +#: builtin/fast-export.c:993

4857 msgid "Output full tree for each commit"

4858 msgstr ""

4859

4722 -#: builtin/fast-export.c:718

4860 +#: builtin/fast-export.c:995

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

4862 msgstr ""

4863

4726 -#: builtin/fast-export.c:719

4864 +#: builtin/fast-export.c:996

4865 msgid "Skip output of blob data"

4866 msgstr ""

4867

4730 -#: builtin/fast-export.c:720

4868 +#: builtin/fast-export.c:997

4869 msgid "refspec"

4870 msgstr ""

4871

4734 -#: builtin/fast-export.c:721

4872 +#: builtin/fast-export.c:998

4873 msgid "Apply refspec to exported refs"

4874 msgstr ""

4875

4876 +#: builtin/fast-export.c:999

4877 +msgid "anonymize output"

4878 +msgstr ""

4879 +

4880 #: builtin/fetch.c:20

4881 msgid "git fetch [<options>] [<repository> [<refspec>...]]"

4882 msgstr ""

@@ -4807,7 +4949,7 @@ msgstr ""

4949 msgid "convert to a complete repository"

4950 msgstr ""

4951

4810 -#: builtin/fetch.c:118 builtin/log.c:1205

4952 +#: builtin/fetch.c:118 builtin/log.c:1208

4953 msgid "dir"

4954 msgstr ""

4955

@@ -4835,163 +4977,163 @@ msgstr ""

4977 msgid "Couldn't find remote ref HEAD"

4978 msgstr ""

4979

4838 -#: builtin/fetch.c:440

4980 +#: builtin/fetch.c:454

4981 #, c-format

4982 msgid "object %s not found"

4983 msgstr ""

4984

4843 -#: builtin/fetch.c:445

4985 +#: builtin/fetch.c:459

4986 msgid "[up to date]"

4987 msgstr ""

4988

4847 -#: builtin/fetch.c:459

4989 +#: builtin/fetch.c:473

4990 #, c-format

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

4992 msgstr ""

4993

4852 -#: builtin/fetch.c:460 builtin/fetch.c:546

4994 +#: builtin/fetch.c:474 builtin/fetch.c:560

4995 msgid "[rejected]"

4996 msgstr ""

4997

4856 -#: builtin/fetch.c:471

4998 +#: builtin/fetch.c:485

4999 msgid "[tag update]"

5000 msgstr ""

5001

4860 -#: builtin/fetch.c:473 builtin/fetch.c:508 builtin/fetch.c:526

5002 +#: builtin/fetch.c:487 builtin/fetch.c:522 builtin/fetch.c:540

5003 msgid " (unable to update local ref)"

5004 msgstr ""

5005

4864 -#: builtin/fetch.c:491

5006 +#: builtin/fetch.c:505

5007 msgid "[new tag]"

5008 msgstr ""

5009

4868 -#: builtin/fetch.c:494

5010 +#: builtin/fetch.c:508

5011 msgid "[new branch]"

5012 msgstr ""

5013

4872 -#: builtin/fetch.c:497

5014 +#: builtin/fetch.c:511

5015 msgid "[new ref]"

5016 msgstr ""

5017

4876 -#: builtin/fetch.c:542

5018 +#: builtin/fetch.c:556

5019 msgid "unable to update local ref"

5020 msgstr ""

5021

4880 -#: builtin/fetch.c:542

5022 +#: builtin/fetch.c:556

5023 msgid "forced update"

5024 msgstr ""

5025

4884 -#: builtin/fetch.c:548

5026 +#: builtin/fetch.c:562

5027 msgid "(non-fast-forward)"

5028 msgstr ""

5029

4888 -#: builtin/fetch.c:581 builtin/fetch.c:814

5030 +#: builtin/fetch.c:595 builtin/fetch.c:828

5031 #, c-format

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

5033 msgstr ""

5034

4893 -#: builtin/fetch.c:590

5035 +#: builtin/fetch.c:604

5036 #, c-format

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

5038 msgstr ""

5039

4898 -#: builtin/fetch.c:608

5040 +#: builtin/fetch.c:622

5041 #, c-format

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

5043 msgstr ""

5044

4903 -#: builtin/fetch.c:696 builtin/fetch.c:779

5045 +#: builtin/fetch.c:710 builtin/fetch.c:793

5046 #, c-format

5047 msgid "From %.*s\n"

5048 msgstr ""

5049

4908 -#: builtin/fetch.c:707

5050 +#: builtin/fetch.c:721

5051 #, c-format

5052 msgid ""

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

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

5055 msgstr ""

5056

4915 -#: builtin/fetch.c:759

5057 +#: builtin/fetch.c:773

5058 #, c-format

5059 msgid " (%s will become dangling)"

5060 msgstr ""

5061

4920 -#: builtin/fetch.c:760

5062 +#: builtin/fetch.c:774

5063 #, c-format

5064 msgid " (%s has become dangling)"

5065 msgstr ""

5066

4925 -#: builtin/fetch.c:784

5067 +#: builtin/fetch.c:798

5068 msgid "[deleted]"

5069 msgstr ""

5070

4929 -#: builtin/fetch.c:785 builtin/remote.c:1059

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

5072 msgid "(none)"

5073 msgstr ""

5074

4933 -#: builtin/fetch.c:804

5075 +#: builtin/fetch.c:818

5076 #, c-format

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

5078 msgstr ""

5079

4938 -#: builtin/fetch.c:823

5080 +#: builtin/fetch.c:837

5081 #, c-format

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

5083 msgstr ""

5084

4943 -#: builtin/fetch.c:826

5085 +#: builtin/fetch.c:840

5086 #, c-format

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

5088 msgstr ""

5089

4948 -#: builtin/fetch.c:882

5090 +#: builtin/fetch.c:896

5091 #, c-format

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

5093 msgstr ""

5094

4953 -#: builtin/fetch.c:1044

5095 +#: builtin/fetch.c:1058

5096 #, c-format

5097 msgid "Fetching %s\n"

5098 msgstr ""

5099

4958 -#: builtin/fetch.c:1046 builtin/remote.c:90

5100 +#: builtin/fetch.c:1060 builtin/remote.c:90

5101 #, c-format

5102 msgid "Could not fetch %s"

5103 msgstr ""

5104

4963 -#: builtin/fetch.c:1064

5105 +#: builtin/fetch.c:1078

5106 msgid ""

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

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

5109 msgstr ""

5110

4969 -#: builtin/fetch.c:1087

5111 +#: builtin/fetch.c:1101

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

5113 msgstr ""

5114

4973 -#: builtin/fetch.c:1131

5115 +#: builtin/fetch.c:1143

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

5117 msgstr ""

5118

4977 -#: builtin/fetch.c:1133

5119 +#: builtin/fetch.c:1145

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

5121 msgstr ""

5122

4981 -#: builtin/fetch.c:1156

5123 +#: builtin/fetch.c:1168

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

5125 msgstr ""

5126

4985 -#: builtin/fetch.c:1158

5127 +#: builtin/fetch.c:1170

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

5129 msgstr ""

5130

4989 -#: builtin/fetch.c:1169

5131 +#: builtin/fetch.c:1181

5132 #, c-format

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

5134 msgstr ""

5135

4994 -#: builtin/fetch.c:1177

5136 +#: builtin/fetch.c:1189

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

5138 msgstr ""

5139

@@ -5000,8 +5142,8 @@ msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"

5142 msgstr ""

5143

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

5003 -#: builtin/merge.c:196 builtin/repack.c:179 builtin/repack.c:183

5004 -#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:589

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

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

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

5148 msgid "n"

5149 msgstr ""

@@ -5026,99 +5168,103 @@ msgstr ""

5168 msgid "file to read from"

5169 msgstr ""

5170

5029 -#: builtin/for-each-ref.c:1051

5171 +#: builtin/for-each-ref.c:676

5172 +msgid "unable to parse format"

5173 +msgstr ""

5174 +

5175 +#: builtin/for-each-ref.c:1057

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

5177 msgstr ""

5178

5033 -#: builtin/for-each-ref.c:1066

5179 +#: builtin/for-each-ref.c:1072

5180 msgid "quote placeholders suitably for shells"

5181 msgstr ""

5182

5037 -#: builtin/for-each-ref.c:1068

5183 +#: builtin/for-each-ref.c:1074

5184 msgid "quote placeholders suitably for perl"

5185 msgstr ""

5186

5041 -#: builtin/for-each-ref.c:1070

5187 +#: builtin/for-each-ref.c:1076

5188 msgid "quote placeholders suitably for python"

5189 msgstr ""

5190

5045 -#: builtin/for-each-ref.c:1072

5191 +#: builtin/for-each-ref.c:1078

5192 msgid "quote placeholders suitably for tcl"

5193 msgstr ""

5194

5049 -#: builtin/for-each-ref.c:1075

5195 +#: builtin/for-each-ref.c:1081

5196 msgid "show only <n> matched refs"

5197 msgstr ""

5198

5053 -#: builtin/for-each-ref.c:1076 builtin/replace.c:435

5199 +#: builtin/for-each-ref.c:1082 builtin/replace.c:438

5200 msgid "format"

5201 msgstr ""

5202

5057 -#: builtin/for-each-ref.c:1076

5203 +#: builtin/for-each-ref.c:1082

5204 msgid "format to use for the output"

5205 msgstr ""

5206

5061 -#: builtin/for-each-ref.c:1077

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

5208 msgid "key"

5209 msgstr ""

5210

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

5211 +#: builtin/for-each-ref.c:1084

5212 msgid "field name to sort on"

5213 msgstr ""

5214

5069 -#: builtin/fsck.c:147 builtin/prune.c:172

5215 +#: builtin/fsck.c:147 builtin/prune.c:136

5216 msgid "Checking connectivity"

5217 msgstr ""

5218

5073 -#: builtin/fsck.c:538

5219 +#: builtin/fsck.c:540

5220 msgid "Checking object directories"

5221 msgstr ""

5222

5077 -#: builtin/fsck.c:601

5223 +#: builtin/fsck.c:603

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

5225 msgstr ""

5226

5081 -#: builtin/fsck.c:607

5227 +#: builtin/fsck.c:609

5228 msgid "show unreachable objects"

5229 msgstr ""

5230

5085 -#: builtin/fsck.c:608

5231 +#: builtin/fsck.c:610

5232 msgid "show dangling objects"

5233 msgstr ""

5234

5089 -#: builtin/fsck.c:609

5235 +#: builtin/fsck.c:611

5236 msgid "report tags"

5237 msgstr ""

5238

5093 -#: builtin/fsck.c:610

5239 +#: builtin/fsck.c:612

5240 msgid "report root nodes"

5241 msgstr ""

5242

5097 -#: builtin/fsck.c:611

5243 +#: builtin/fsck.c:613

5244 msgid "make index objects head nodes"

5245 msgstr ""

5246

5101 -#: builtin/fsck.c:612

5247 +#: builtin/fsck.c:614

5248 msgid "make reflogs head nodes (default)"

5249 msgstr ""

5250

5105 -#: builtin/fsck.c:613

5251 +#: builtin/fsck.c:615

5252 msgid "also consider packs and alternate objects"

5253 msgstr ""

5254

5109 -#: builtin/fsck.c:614

5255 +#: builtin/fsck.c:616

5256 msgid "enable more strict checking"

5257 msgstr ""

5258

5113 -#: builtin/fsck.c:616

5259 +#: builtin/fsck.c:618

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

5261 msgstr ""

5262

5117 -#: builtin/fsck.c:617 builtin/prune.c:144

5263 +#: builtin/fsck.c:619 builtin/prune.c:108

5264 msgid "show progress"

5265 msgstr ""

5266

5121 -#: builtin/fsck.c:667

5267 +#: builtin/fsck.c:669

5268 msgid "Checking objects"

5269 msgstr ""

5270

@@ -5126,54 +5272,54 @@ msgstr ""

5272 msgid "git gc [options]"

5273 msgstr ""

5274

5129 -#: builtin/gc.c:91

5275 +#: builtin/gc.c:79

5276 #, c-format

5131 -msgid "Invalid %s: '%s'"

5277 +msgid "Invalid gc.pruneexpire: '%s'"

5278 msgstr ""

5279

5134 -#: builtin/gc.c:118

5280 +#: builtin/gc.c:107

5281 #, c-format

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

5283 msgstr ""

5284

5139 -#: builtin/gc.c:287

5285 +#: builtin/gc.c:276

5286 msgid "prune unreferenced objects"

5287 msgstr ""

5288

5143 -#: builtin/gc.c:289

5289 +#: builtin/gc.c:278

5290 msgid "be more thorough (increased runtime)"

5291 msgstr ""

5292

5147 -#: builtin/gc.c:290

5293 +#: builtin/gc.c:279

5294 msgid "enable auto-gc mode"

5295 msgstr ""

5296

5151 -#: builtin/gc.c:291

5297 +#: builtin/gc.c:280

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

5299 msgstr ""

5300

5155 -#: builtin/gc.c:332

5301 +#: builtin/gc.c:321

5302 #, c-format

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

5304 msgstr ""

5305

5160 -#: builtin/gc.c:334

5306 +#: builtin/gc.c:323

5307 #, c-format

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

5309 msgstr ""

5310

5165 -#: builtin/gc.c:335

5311 +#: builtin/gc.c:324

5312 #, c-format

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

5314 msgstr ""

5315

5170 -#: builtin/gc.c:353

5316 +#: builtin/gc.c:342

5317 #, c-format

5318 msgid ""

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

5320 msgstr ""

5321

5176 -#: builtin/gc.c:375

5322 +#: builtin/gc.c:364

5323 msgid ""

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

5325 msgstr ""

@@ -5403,37 +5549,42 @@ msgstr ""

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

5550 msgstr ""

5551

5406 -#: builtin/hash-object.c:60

5552 +#: builtin/hash-object.c:82

5553 msgid ""

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

5555 "<file>..."

5556 msgstr ""

5557

5412 -#: builtin/hash-object.c:61

5558 +#: builtin/hash-object.c:83

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

5560 msgstr ""

5561

5416 -#: builtin/hash-object.c:72 builtin/tag.c:609

5562 +#: builtin/hash-object.c:94 builtin/tag.c:610

5563 msgid "type"

5564 msgstr ""

5565

5420 -#: builtin/hash-object.c:72

5566 +#: builtin/hash-object.c:94

5567 msgid "object type"

5568 msgstr ""

5569

5424 -#: builtin/hash-object.c:73

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

5571 msgid "write the object into the object database"

5572 msgstr ""

5573

5428 -#: builtin/hash-object.c:74

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

5575 msgid "read the object from stdin"

5576 msgstr ""

5577

5432 -#: builtin/hash-object.c:76

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

5579 msgid "store file as is without filters"

5580 msgstr ""

5581

5436 -#: builtin/hash-object.c:77

5582 +#: builtin/hash-object.c:100

5583 +msgid ""

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

5585 +msgstr ""

5586 +

5587 +#: builtin/hash-object.c:101

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

5589 msgstr ""

5590

@@ -5466,55 +5617,59 @@ msgstr ""

5617 msgid "unrecognized help format '%s'"

5618 msgstr ""

5619

5469 -#: builtin/help.c:92

5620 +#: builtin/help.c:91

5621 msgid "Failed to start emacsclient."

5622 msgstr ""

5623

5473 -#: builtin/help.c:105

5624 +#: builtin/help.c:104

5625 msgid "Failed to parse emacsclient version."

5626 msgstr ""

5627

5477 -#: builtin/help.c:113

5628 +#: builtin/help.c:112

5629 #, c-format

5630 msgid "emacsclient version '%d' too old (< 22)."

5631 msgstr ""

5632

5482 -#: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176

5633 +#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175

5634 #, c-format

5635 msgid "failed to exec '%s': %s"

5636 msgstr ""

5637

5487 -#: builtin/help.c:216

5638 +#: builtin/help.c:215

5639 #, c-format

5640 msgid ""

5641 "'%s': path for unsupported man viewer.\n"

5642 "Please consider using 'man.<tool>.cmd' instead."

5643 msgstr ""

5644

5494 -#: builtin/help.c:228

5645 +#: builtin/help.c:227

5646 #, c-format

5647 msgid ""

5648 "'%s': cmd for supported man viewer.\n"

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

5650 msgstr ""

5651

5501 -#: builtin/help.c:353

5652 +#: builtin/help.c:352

5653 #, c-format

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

5655 msgstr ""

5656

5506 -#: builtin/help.c:370

5657 +#: builtin/help.c:369

5658 msgid "no man viewer handled the request"

5659 msgstr ""

5660

5510 -#: builtin/help.c:378

5661 +#: builtin/help.c:377

5662 msgid "no info viewer handled the request"

5663 msgstr ""

5664

5514 -#: builtin/help.c:424

5665 +#: builtin/help.c:423

5666 msgid "Defining attributes per path"

5667 msgstr ""

5668

5669 +#: builtin/help.c:424

5670 +msgid "Everyday Git With 20 Commands Or So"

5671 +msgstr ""

5672 +

5673 #: builtin/help.c:425

5674 msgid "A Git glossary"

5675 msgstr ""

@@ -5553,291 +5708,291 @@ msgstr ""

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

5709 msgstr ""

5710

5556 -#: builtin/index-pack.c:145

5711 +#: builtin/index-pack.c:150

5712 #, c-format

5713 msgid "unable to open %s"

5714 msgstr ""

5715

l10n: git.pot: v2.2.0 round 1 (62 new, 23 removed)