822e4a653d · 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: 2012-04-28 20:17+0800\n"

11 +"POT-Creation-Date: 2012-05-08 16:06+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"

@@ -35,6 +35,80 @@ msgid ""

35 "or use 'git commit -a'."

36 msgstr ""

37

38 +#: bundle.c:36

39 +#, c-format

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

41 +msgstr ""

42 +

43 +#: bundle.c:63

44 +#, c-format

45 +msgid "unrecognized header: %s%s (%d)"

46 +msgstr ""

47 +

48 +#: bundle.c:89 builtin/commit.c:753

49 +#, c-format

50 +msgid "could not open '%s'"

51 +msgstr ""

52 +

53 +#: bundle.c:140

54 +msgid "Repository lacks these prerequisite commits:"

55 +msgstr ""

56 +

57 +#: bundle.c:164 sequencer.c:533 sequencer.c:965 builtin/log.c:289

58 +#: builtin/log.c:719 builtin/log.c:1335 builtin/log.c:1554 builtin/merge.c:347

59 +#: builtin/shortlog.c:181

60 +msgid "revision walk setup failed"

61 +msgstr ""

62 +

63 +#: bundle.c:186

64 +#, c-format

65 +msgid "The bundle contains %d ref"

66 +msgid_plural "The bundle contains %d refs"

67 +msgstr[0] ""

68 +msgstr[1] ""

69 +

70 +#: bundle.c:192

71 +#, c-format

72 +msgid "The bundle requires this ref"

73 +msgid_plural "The bundle requires these %d refs"

74 +msgstr[0] ""

75 +msgstr[1] ""

76 +

77 +#: bundle.c:290

78 +msgid "rev-list died"

79 +msgstr ""

80 +

81 +#: bundle.c:296 builtin/log.c:1231 builtin/shortlog.c:284

82 +#, c-format

83 +msgid "unrecognized argument: %s"

84 +msgstr ""

85 +

86 +#: bundle.c:331

87 +#, c-format

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

89 +msgstr ""

90 +

91 +#: bundle.c:376

92 +msgid "Refusing to create empty bundle."

93 +msgstr ""

94 +

95 +#: bundle.c:394

96 +msgid "Could not spawn pack-objects"

97 +msgstr ""

98 +

99 +#: bundle.c:412

100 +msgid "pack-objects died"

101 +msgstr ""

102 +

103 +#: bundle.c:415

104 +#, c-format

105 +msgid "cannot create '%s'"

106 +msgstr ""

107 +

108 +#: bundle.c:437

109 +msgid "index-pack died"

110 +msgstr ""

111 +

112 #: commit.c:48

113 #, c-format

114 msgid "could not parse %s"

@@ -63,6 +137,73 @@ msgstr ""

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

138 msgstr ""

139

140 +#: date.c:95

141 +msgid "in the future"

142 +msgstr ""

143 +

144 +#: date.c:101

145 +#, c-format

146 +msgid "%lu second ago"

147 +msgid_plural "%lu seconds ago"

148 +msgstr[0] ""

149 +msgstr[1] ""

150 +

151 +#: date.c:108

152 +#, c-format

153 +msgid "%lu minute ago"

154 +msgid_plural "%lu minutes ago"

155 +msgstr[0] ""

156 +msgstr[1] ""

157 +

158 +#: date.c:115

159 +#, c-format

160 +msgid "%lu hour ago"

161 +msgid_plural "%lu hours ago"

162 +msgstr[0] ""

163 +msgstr[1] ""

164 +

165 +#: date.c:122

166 +#, c-format

167 +msgid "%lu day ago"

168 +msgid_plural "%lu days ago"

169 +msgstr[0] ""

170 +msgstr[1] ""

171 +

172 +#: date.c:128

173 +#, c-format

174 +msgid "%lu week ago"

175 +msgid_plural "%lu weeks ago"

176 +msgstr[0] ""

177 +msgstr[1] ""

178 +

179 +#: date.c:135

180 +#, c-format

181 +msgid "%lu month ago"

182 +msgid_plural "%lu months ago"

183 +msgstr[0] ""

184 +msgstr[1] ""

185 +

186 +#: date.c:146

187 +#, c-format

188 +msgid "%lu year"

189 +msgid_plural "%lu years"

190 +msgstr[0] ""

191 +msgstr[1] ""

192 +

193 +#: date.c:149

194 +#, c-format

195 +msgid "%s, %lu month ago"

196 +msgid_plural "%s, %lu months ago"

197 +msgstr[0] ""

198 +msgstr[1] ""

199 +

200 +#: date.c:154 date.c:159

201 +#, c-format

202 +msgid "%lu year ago"

203 +msgid_plural "%lu years ago"

204 +msgstr[0] ""

205 +msgstr[1] ""

206 +

207 #: diff.c:105

208 #, c-format

209 msgid " Failed to parse dirstat cut-off percentage '%.*s'\n"

@@ -105,7 +246,7 @@ msgid_plural ", %d deletions(-)"

246 msgstr[0] ""

247 msgstr[1] ""

248

108 -#: diff.c:3435

249 +#: diff.c:3478

250 #, c-format

251 msgid ""

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

@@ -139,13 +280,53 @@ msgstr ""

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

281 msgstr ""

282

142 -#: help.c:287

283 +#: help.c:207

284 +#, c-format

285 +msgid "available git commands in '%s'"

286 +msgstr ""

287 +

288 +#: help.c:214

289 +msgid "git commands available from elsewhere on your $PATH"

290 +msgstr ""

291 +

292 +#: help.c:270

293 #, c-format

294 msgid ""

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

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

297 msgstr ""

298

299 +#: help.c:327

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

301 +msgstr ""

302 +

303 +#: help.c:349

304 +#, c-format

305 +msgid ""

306 +"WARNING: You called a Git command named '%s', which does not exist.\n"

307 +"Continuing under the assumption that you meant '%s'"

308 +msgstr ""

309 +

310 +#: help.c:354

311 +#, c-format

312 +msgid "in %0.1f seconds automatically..."

313 +msgstr ""

314 +

315 +#: help.c:361

316 +#, c-format

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

318 +msgstr ""

319 +

320 +#: help.c:365

321 +msgid ""

322 +"\n"

323 +"Did you mean this?"

324 +msgid_plural ""

325 +"\n"

326 +"Did you mean one of these?"

327 +msgstr[0] ""

328 +msgstr[1] ""

329 +

330 #: remote.c:1607

331 #, c-format

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

@@ -172,227 +353,239 @@ msgid_plural ""

353 msgstr[0] ""

354 msgstr[1] ""

355

175 -#: sequencer.c:120 builtin/merge.c:865 builtin/merge.c:978

356 +#: sequencer.c:121 builtin/merge.c:865 builtin/merge.c:978

357 #: builtin/merge.c:1088 builtin/merge.c:1098

358 #, c-format

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

360 msgstr ""

361

181 -#: sequencer.c:122 builtin/merge.c:333 builtin/merge.c:868

362 +#: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:868

363 #: builtin/merge.c:1090 builtin/merge.c:1103

364 #, c-format

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

366 msgstr ""

367

187 -#: sequencer.c:143

368 +#: sequencer.c:144

369 msgid ""

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

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

372 msgstr ""

373

193 -#: sequencer.c:146

374 +#: sequencer.c:147

375 msgid ""

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

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

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

379 msgstr ""

380

200 -#: sequencer.c:159 sequencer.c:685 sequencer.c:768

381 +#: sequencer.c:160 sequencer.c:741 sequencer.c:824

382 #, c-format

383 msgid "Could not write to %s"

384 msgstr ""

385

205 -#: sequencer.c:162

386 +#: sequencer.c:163

387 #, c-format

388 msgid "Error wrapping up %s"

389 msgstr ""

390

210 -#: sequencer.c:177

391 +#: sequencer.c:178

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

393 msgstr ""

394

214 -#: sequencer.c:179

395 +#: sequencer.c:180

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

397 msgstr ""

398

218 -#: sequencer.c:182

399 +#: sequencer.c:183

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

401 msgstr ""

402

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

223 -#: sequencer.c:232

404 +#: sequencer.c:233

405 #, c-format

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

407 msgstr ""

408

228 -#: sequencer.c:298

409 +#: sequencer.c:261

410 +msgid "Could not resolve HEAD commit\n"

411 +msgstr ""

412 +

413 +#: sequencer.c:282

414 +msgid "Unable to update cache tree\n"

415 +msgstr ""

416 +

417 +#: sequencer.c:323

418 +#, c-format

419 +msgid "Could not parse commit %s\n"

420 +msgstr ""

421 +

422 +#: sequencer.c:328

423 +#, c-format

424 +msgid "Could not parse parent commit %s\n"

425 +msgstr ""

426 +

427 +#: sequencer.c:358

428 msgid "Your index file is unmerged."

429 msgstr ""

430

232 -#: sequencer.c:301

431 +#: sequencer.c:361

432 msgid "You do not have a valid HEAD"

433 msgstr ""

434

236 -#: sequencer.c:316

435 +#: sequencer.c:376

436 #, c-format

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

438 msgstr ""

439

241 -#: sequencer.c:324

440 +#: sequencer.c:384

441 #, c-format

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

443 msgstr ""

444

246 -#: sequencer.c:328

445 +#: sequencer.c:388

446 #, c-format

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

448 msgstr ""

449

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

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

253 -#: sequencer.c:339

452 +#: sequencer.c:399

453 #, c-format

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

455 msgstr ""

456

258 -#: sequencer.c:343

457 +#: sequencer.c:403

458 #, c-format

459 msgid "Cannot get commit message for %s"

460 msgstr ""

461

263 -#: sequencer.c:427

462 +#: sequencer.c:491

463 #, c-format

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

465 msgstr ""

466

268 -#: sequencer.c:428

467 +#: sequencer.c:492

468 #, c-format

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

470 msgstr ""

471

273 -#: sequencer.c:450 sequencer.c:909 builtin/log.c:289 builtin/log.c:719

274 -#: builtin/log.c:1335 builtin/log.c:1554 builtin/merge.c:347

275 -#: builtin/shortlog.c:181

276 -msgid "revision walk setup failed"

277 -msgstr ""

278 -

279 -#: sequencer.c:453

472 +#: sequencer.c:536

473 msgid "empty commit set passed"

474 msgstr ""

475

283 -#: sequencer.c:461

476 +#: sequencer.c:544

477 #, c-format

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

479 msgstr ""

480

288 -#: sequencer.c:466

481 +#: sequencer.c:549

482 #, c-format

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

484 msgstr ""

485

293 -#: sequencer.c:551

486 +#: sequencer.c:607

487 #, c-format

488 msgid "Cannot %s during a %s"

489 msgstr ""

490

298 -#: sequencer.c:573

491 +#: sequencer.c:629

492 #, c-format

493 msgid "Could not parse line %d."

494 msgstr ""

495

303 -#: sequencer.c:578

496 +#: sequencer.c:634

497 msgid "No commits parsed."

498 msgstr ""

499

307 -#: sequencer.c:591

500 +#: sequencer.c:647

501 #, c-format

502 msgid "Could not open %s"

503 msgstr ""

504

312 -#: sequencer.c:595

505 +#: sequencer.c:651

506 #, c-format

507 msgid "Could not read %s."

508 msgstr ""

509

317 -#: sequencer.c:602

510 +#: sequencer.c:658

511 #, c-format

512 msgid "Unusable instruction sheet: %s"

513 msgstr ""

514

322 -#: sequencer.c:630

515 +#: sequencer.c:686

516 #, c-format

517 msgid "Invalid key: %s"

518 msgstr ""

519

327 -#: sequencer.c:633

520 +#: sequencer.c:689

521 #, c-format

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

523 msgstr ""

524

332 -#: sequencer.c:645

525 +#: sequencer.c:701

526 #, c-format

527 msgid "Malformed options sheet: %s"

528 msgstr ""

529

337 -#: sequencer.c:666

530 +#: sequencer.c:722

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

532 msgstr ""

533

341 -#: sequencer.c:667

534 +#: sequencer.c:723

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

536 msgstr ""

537

345 -#: sequencer.c:671

538 +#: sequencer.c:727

539 #, c-format

540 msgid "Could not create sequencer directory %s"

541 msgstr ""

542

350 -#: sequencer.c:687 sequencer.c:772

543 +#: sequencer.c:743 sequencer.c:828

544 #, c-format

545 msgid "Error wrapping up %s."

546 msgstr ""

547

355 -#: sequencer.c:706 sequencer.c:840

548 +#: sequencer.c:762 sequencer.c:896

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

550 msgstr ""

551

359 -#: sequencer.c:708

552 +#: sequencer.c:764

553 msgid "cannot resolve HEAD"

554 msgstr ""

555

363 -#: sequencer.c:710

556 +#: sequencer.c:766

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

558 msgstr ""

559

367 -#: sequencer.c:732

560 +#: sequencer.c:788 builtin/apply.c:3682

561 #, c-format

562 msgid "cannot open %s: %s"

563 msgstr ""

564

372 -#: sequencer.c:735

565 +#: sequencer.c:791

566 #, c-format

567 msgid "cannot read %s: %s"

568 msgstr ""

569

377 -#: sequencer.c:736

570 +#: sequencer.c:792

571 msgid "unexpected end of file"

572 msgstr ""

573

381 -#: sequencer.c:742

574 +#: sequencer.c:798

575 #, c-format

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

577 msgstr ""

578

386 -#: sequencer.c:765

579 +#: sequencer.c:821

580 #, c-format

581 msgid "Could not format %s."

582 msgstr ""

583

391 -#: sequencer.c:927

584 +#: sequencer.c:983

585 msgid "Can't revert as initial commit"

586 msgstr ""

587

395 -#: sequencer.c:928

588 +#: sequencer.c:984

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

590 msgstr ""

591

@@ -415,232 +608,232 @@ msgstr ""

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

609 msgstr ""

610

418 -#: wt-status.c:134

611 +#: wt-status.c:135

612 msgid "Unmerged paths:"

613 msgstr ""

614

422 -#: wt-status.c:140 wt-status.c:157

615 +#: wt-status.c:141 wt-status.c:158

616 #, c-format

617 msgid " (use \"git reset %s <file>...\" to unstage)"

618 msgstr ""

619

427 -#: wt-status.c:142 wt-status.c:159

620 +#: wt-status.c:143 wt-status.c:160

621 msgid " (use \"git rm --cached <file>...\" to unstage)"

622 msgstr ""

623

431 -#: wt-status.c:143

624 +#: wt-status.c:144

625 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"

626 msgstr ""

627

435 -#: wt-status.c:151

628 +#: wt-status.c:152

629 msgid "Changes to be committed:"

630 msgstr ""

631

439 -#: wt-status.c:169

632 +#: wt-status.c:170

633 msgid "Changes not staged for commit:"

634 msgstr ""

635

443 -#: wt-status.c:173

636 +#: wt-status.c:174

637 msgid " (use \"git add <file>...\" to update what will be committed)"

638 msgstr ""

639

447 -#: wt-status.c:175

640 +#: wt-status.c:176

641 msgid " (use \"git add/rm <file>...\" to update what will be committed)"

642 msgstr ""

643

451 -#: wt-status.c:176

644 +#: wt-status.c:177

645 msgid ""

646 " (use \"git checkout -- <file>...\" to discard changes in working directory)"

647 msgstr ""

648

456 -#: wt-status.c:178

649 +#: wt-status.c:179

650 msgid " (commit or discard the untracked or modified content in submodules)"

651 msgstr ""

652

460 -#: wt-status.c:187

653 +#: wt-status.c:188

654 #, c-format

655 msgid "%s files:"

656 msgstr ""

657

465 -#: wt-status.c:190

658 +#: wt-status.c:191

659 #, c-format

660 msgid " (use \"git %s <file>...\" to include in what will be committed)"

661 msgstr ""

662

470 -#: wt-status.c:207

663 +#: wt-status.c:208

664 msgid "bug"

665 msgstr ""

666

474 -#: wt-status.c:212

667 +#: wt-status.c:213

668 msgid "both deleted:"

669 msgstr ""

670

478 -#: wt-status.c:213

671 +#: wt-status.c:214

672 msgid "added by us:"

673 msgstr ""

674

482 -#: wt-status.c:214

675 +#: wt-status.c:215

676 msgid "deleted by them:"

677 msgstr ""

678

486 -#: wt-status.c:215

679 +#: wt-status.c:216

680 msgid "added by them:"

681 msgstr ""

682

490 -#: wt-status.c:216

683 +#: wt-status.c:217

684 msgid "deleted by us:"

685 msgstr ""

686

494 -#: wt-status.c:217

687 +#: wt-status.c:218

688 msgid "both added:"

689 msgstr ""

690

498 -#: wt-status.c:218

691 +#: wt-status.c:219

692 msgid "both modified:"

693 msgstr ""

694

502 -#: wt-status.c:248

695 +#: wt-status.c:249

696 msgid "new commits, "

697 msgstr ""

698

506 -#: wt-status.c:250

699 +#: wt-status.c:251

700 msgid "modified content, "

701 msgstr ""

702

510 -#: wt-status.c:252

703 +#: wt-status.c:253

704 msgid "untracked content, "

705 msgstr ""

706

514 -#: wt-status.c:266

707 +#: wt-status.c:267

708 #, c-format

709 msgid "new file: %s"

710 msgstr ""

711

519 -#: wt-status.c:269

712 +#: wt-status.c:270

713 #, c-format

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

715 msgstr ""

716

524 -#: wt-status.c:272

717 +#: wt-status.c:273

718 #, c-format

719 msgid "deleted: %s"

720 msgstr ""

721

529 -#: wt-status.c:275

722 +#: wt-status.c:276

723 #, c-format

724 msgid "modified: %s"

725 msgstr ""

726

534 -#: wt-status.c:278

727 +#: wt-status.c:279

728 #, c-format

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

730 msgstr ""

731

539 -#: wt-status.c:281

732 +#: wt-status.c:282

733 #, c-format

734 msgid "typechange: %s"

735 msgstr ""

736

544 -#: wt-status.c:284

737 +#: wt-status.c:285

738 #, c-format

739 msgid "unknown: %s"

740 msgstr ""

741

549 -#: wt-status.c:287

742 +#: wt-status.c:288

743 #, c-format

744 msgid "unmerged: %s"

745 msgstr ""

746

554 -#: wt-status.c:290

747 +#: wt-status.c:291

748 #, c-format

749 msgid "bug: unhandled diff status %c"

750 msgstr ""

751

559 -#: wt-status.c:713

752 +#: wt-status.c:737

753 msgid "On branch "

754 msgstr ""

755

563 -#: wt-status.c:720

756 +#: wt-status.c:744

757 msgid "Not currently on any branch."

758 msgstr ""

759

567 -#: wt-status.c:731

760 +#: wt-status.c:755

761 msgid "Initial commit"

762 msgstr ""

763

571 -#: wt-status.c:745

764 +#: wt-status.c:769

765 msgid "Untracked"

766 msgstr ""

767

575 -#: wt-status.c:747

768 +#: wt-status.c:771

769 msgid "Ignored"

770 msgstr ""

771

579 -#: wt-status.c:749

772 +#: wt-status.c:773

773 #, c-format

774 msgid "Untracked files not listed%s"

775 msgstr ""

776

584 -#: wt-status.c:751

777 +#: wt-status.c:775

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

779 msgstr ""

780

588 -#: wt-status.c:757

781 +#: wt-status.c:781

782 msgid "No changes"

783 msgstr ""

784

592 -#: wt-status.c:761

785 +#: wt-status.c:785

786 #, c-format

787 msgid "no changes added to commit%s\n"

788 msgstr ""

789

597 -#: wt-status.c:763

790 +#: wt-status.c:787

791 msgid " (use \"git add\" and/or \"git commit -a\")"

792 msgstr ""

793

601 -#: wt-status.c:765

794 +#: wt-status.c:789

795 #, c-format

796 msgid "nothing added to commit but untracked files present%s\n"

797 msgstr ""

798

606 -#: wt-status.c:767

799 +#: wt-status.c:791

800 msgid " (use \"git add\" to track)"

801 msgstr ""

802

610 -#: wt-status.c:769 wt-status.c:772 wt-status.c:775

803 +#: wt-status.c:793 wt-status.c:796 wt-status.c:799

804 #, c-format

805 msgid "nothing to commit%s\n"

806 msgstr ""

807

615 -#: wt-status.c:770

808 +#: wt-status.c:794

809 msgid " (create/copy files and use \"git add\" to track)"

810 msgstr ""

811

619 -#: wt-status.c:773

812 +#: wt-status.c:797

813 msgid " (use -u to show untracked files)"

814 msgstr ""

815

623 -#: wt-status.c:776

816 +#: wt-status.c:800

817 msgid " (working directory clean)"

818 msgstr ""

819

627 -#: wt-status.c:884

820 +#: wt-status.c:908

821 msgid "HEAD (no branch)"

822 msgstr ""

823

631 -#: wt-status.c:890

824 +#: wt-status.c:914

825 msgid "Initial commit on "

826 msgstr ""

827

635 -#: wt-status.c:905

828 +#: wt-status.c:929

829 msgid "behind "

830 msgstr ""

831

639 -#: wt-status.c:908 wt-status.c:911

832 +#: wt-status.c:932 wt-status.c:935

833 msgid "ahead "

834 msgstr ""

835

643 -#: wt-status.c:913

836 +#: wt-status.c:937

837 msgid ", behind "

838 msgstr ""

839

@@ -649,7 +842,7 @@ msgstr ""

842 msgid "unexpected diff status %c"

843 msgstr ""

844

652 -#: builtin/add.c:67 builtin/commit.c:298

845 +#: builtin/add.c:67 builtin/commit.c:282

846 msgid "updating files failed"

847 msgstr ""

848

@@ -739,2102 +932,3108 @@ msgstr ""

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

933 msgstr ""

934

742 -#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:358 builtin/mv.c:82

935 +#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:342 builtin/mv.c:82

936 #: builtin/rm.c:162

937 msgid "index file corrupt"

938 msgstr ""

939

747 -#: builtin/add.c:476 builtin/mv.c:229 builtin/rm.c:260

940 +#: builtin/add.c:476 builtin/apply.c:4093 builtin/mv.c:229 builtin/rm.c:260

941 msgid "Unable to write new index file"

942 msgstr ""

943

751 -#: builtin/archive.c:17

944 +#: builtin/apply.c:106

945 #, c-format

753 -msgid "could not create archive file '%s'"

946 +msgid "unrecognized whitespace option '%s'"

947 msgstr ""

948

756 -#: builtin/archive.c:20

757 -msgid "could not redirect output"

949 +#: builtin/apply.c:121

950 +#, c-format

951 +msgid "unrecognized whitespace ignore option '%s'"

952 msgstr ""

953

760 -#: builtin/archive.c:37

761 -msgid "git archive: Remote with no URL"

954 +#: builtin/apply.c:815

955 +#, c-format

956 +msgid "Cannot prepare timestamp regexp %s"

957 msgstr ""

958

764 -#: builtin/archive.c:58

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

959 +#: builtin/apply.c:824

960 +#, c-format

961 +msgid "regexec returned %d for input: %s"

962 msgstr ""

963

768 -#: builtin/archive.c:63

964 +#: builtin/apply.c:905

965 #, c-format

770 -msgid "git archive: NACK %s"

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

967 msgstr ""

968

773 -#: builtin/archive.c:65

969 +#: builtin/apply.c:934

970 #, c-format

775 -msgid "remote error: %s"

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

972 msgstr ""

973

778 -#: builtin/archive.c:66

779 -msgid "git archive: protocol error"

974 +#: builtin/apply.c:937

975 +#, c-format

976 +msgid "git apply: bad git-diff - inconsistent %s filename on line %d"

977 msgstr ""

978

782 -#: builtin/archive.c:71

783 -msgid "git archive: expected a flush"

979 +#: builtin/apply.c:944

980 +#, c-format

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

982 msgstr ""

983

786 -#: builtin/branch.c:137

984 +#: builtin/apply.c:1387

985 #, c-format

788 -msgid ""

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

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

986 +msgid "recount: unexpected line: %.*s"

987 msgstr ""

988

793 -#: builtin/branch.c:141

989 +#: builtin/apply.c:1444

990 #, c-format

795 -msgid ""

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

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

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

992 msgstr ""

993

800 -#. TRANSLATORS: This is "remote " in "remote branch '%s' not found"

801 -#: builtin/branch.c:164

802 -msgid "remote "

803 -msgstr ""

994 +#: builtin/apply.c:1461

995 +#, c-format

996 +msgid ""

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

998 +"component (line %d)"

999 +msgid_plural ""

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

1001 +"components (line %d)"

1002 +msgstr[0] ""

1003 +msgstr[1] ""

1004

805 -#: builtin/branch.c:172

806 -msgid "cannot use -a with -d"

1005 +#: builtin/apply.c:1621

1006 +msgid "new file depends on old contents"

1007 msgstr ""

1008

809 -#: builtin/branch.c:178

810 -msgid "Couldn't look up commit object for HEAD"

1009 +#: builtin/apply.c:1623

1010 +msgid "deleted file still has contents"

1011 msgstr ""

1012

813 -#: builtin/branch.c:183

1013 +#: builtin/apply.c:1649

1014 #, c-format

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

1015 +msgid "corrupt patch at line %d"

1016 msgstr ""

1017

818 -#: builtin/branch.c:193

1018 +#: builtin/apply.c:1685

1019 #, c-format

820 -msgid "%sbranch '%s' not found."

1020 +msgid "new file %s depends on old contents"

1021 msgstr ""

1022

823 -#: builtin/branch.c:201

1023 +#: builtin/apply.c:1687

1024 #, c-format

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

1025 +msgid "deleted file %s still has contents"

1026 msgstr ""

1027

828 -#: builtin/branch.c:207

1028 +#: builtin/apply.c:1690

1029 #, c-format

830 -msgid ""

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

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

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

1031 msgstr ""

1032

835 -#: builtin/branch.c:215

1033 +#: builtin/apply.c:1836

1034 #, c-format

837 -msgid "Error deleting %sbranch '%s'"

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

1036 msgstr ""

1037

840 -#: builtin/branch.c:221

1038 +#. there has to be one hunk (forward hunk)

1039 +#: builtin/apply.c:1865

1040 #, c-format

842 -msgid "Deleted %sbranch %s (was %s).\n"

843 -msgstr ""

844 -

845 -#: builtin/branch.c:226

846 -msgid "Update of config-file failed"

1041 +msgid "unrecognized binary patch at line %d"

1042 msgstr ""

1043

849 -#: builtin/branch.c:324

1044 +#: builtin/apply.c:1951

1045 #, c-format

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

1046 +msgid "patch with only garbage at line %d"

1047 msgstr ""

1048

854 -#: builtin/branch.c:396

1049 +#: builtin/apply.c:2041

1050 #, c-format

856 -msgid "behind %d] "

1051 +msgid "unable to read symlink %s"

1052 msgstr ""

1053

859 -#: builtin/branch.c:398

1054 +#: builtin/apply.c:2045

1055 #, c-format

861 -msgid "ahead %d] "

1056 +msgid "unable to open or read %s"

1057 msgstr ""

1058

864 -#: builtin/branch.c:400

865 -#, c-format

866 -msgid "ahead %d, behind %d] "

1059 +#: builtin/apply.c:2116

1060 +msgid "oops"

1061 msgstr ""

1062

869 -#: builtin/branch.c:503

870 -msgid "(no branch)"

1063 +#: builtin/apply.c:2638

1064 +#, c-format

1065 +msgid "invalid start of line: '%c'"

1066 msgstr ""

1067

873 -#: builtin/branch.c:568

874 -msgid "some refs could not be read"

875 -msgstr ""

1068 +#: builtin/apply.c:2756

1069 +#, c-format

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

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

1072 +msgstr[0] ""

1073 +msgstr[1] ""

1074

877 -#: builtin/branch.c:581

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

1075 +#: builtin/apply.c:2768

1076 +#, c-format

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

1078 msgstr ""

1079

881 -#: builtin/branch.c:591

1080 +#: builtin/apply.c:2774

1081 #, c-format

883 -msgid "Invalid branch name: '%s'"

1082 +msgid ""

1083 +"while searching for:\n"

1084 +"%.*s"

1085 msgstr ""

1086

886 -#: builtin/branch.c:606

887 -msgid "Branch rename failed"

1087 +#: builtin/apply.c:2793

1088 +#, c-format

1089 +msgid "missing binary patch data for '%s'"

1090 msgstr ""

1091

890 -#: builtin/branch.c:610

1092 +#: builtin/apply.c:2896

1093 #, c-format

892 -msgid "Renamed a misnamed branch '%s' away"

1094 +msgid "binary patch does not apply to '%s'"

1095 msgstr ""

1096

895 -#: builtin/branch.c:614

1097 +#: builtin/apply.c:2902

1098 #, c-format

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

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

1100 msgstr ""

1101

900 -#: builtin/branch.c:621

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

1102 +#: builtin/apply.c:2923

1103 +#, c-format

1104 +msgid "patch failed: %s:%ld"

1105 msgstr ""

1106

904 -#: builtin/branch.c:636

1107 +#: builtin/apply.c:3038

1108 #, c-format

906 -msgid "malformed object name %s"

1109 +msgid "patch %s has been renamed/deleted"

1110 msgstr ""

1111

909 -#: builtin/branch.c:660

1112 +#: builtin/apply.c:3045 builtin/apply.c:3062

1113 #, c-format

911 -msgid "could not write branch description template: %s\n"

1114 +msgid "read of %s failed"

1115 msgstr ""

1116

914 -#: builtin/branch.c:750

915 -msgid "Failed to resolve HEAD as a valid ref."

1117 +#: builtin/apply.c:3077

1118 +msgid "removal patch leaves file contents"

1119 msgstr ""

1120

918 -#: builtin/branch.c:755 builtin/clone.c:558

919 -msgid "HEAD not found below refs/heads!"

1121 +#: builtin/apply.c:3098

1122 +#, c-format

1123 +msgid "%s: already exists in working directory"

1124 msgstr ""

1125

922 -#: builtin/branch.c:813

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

1126 +#: builtin/apply.c:3136

1127 +#, c-format

1128 +msgid "%s: has been deleted/renamed"

1129 msgstr ""

1130

926 -#: builtin/bundle.c:47

1131 +#: builtin/apply.c:3141 builtin/apply.c:3172

1132 #, c-format

928 -msgid "%s is okay\n"

1133 +msgid "%s: %s"

1134 msgstr ""

1135

931 -#: builtin/bundle.c:56

932 -msgid "Need a repository to create a bundle."

1136 +#: builtin/apply.c:3152

1137 +#, c-format

1138 +msgid "%s: does not exist in index"

1139 msgstr ""

1140

935 -#: builtin/bundle.c:60

936 -msgid "Need a repository to unbundle."

1141 +#: builtin/apply.c:3166

1142 +#, c-format

1143 +msgid "%s: does not match index"

1144 msgstr ""

1145

939 -#: builtin/checkout.c:113 builtin/checkout.c:146

1146 +#: builtin/apply.c:3183

1147 #, c-format

941 -msgid "path '%s' does not have our version"

1148 +msgid "%s: wrong type"

1149 msgstr ""

1150

944 -#: builtin/checkout.c:115 builtin/checkout.c:148

1151 +#: builtin/apply.c:3185

1152 #, c-format

946 -msgid "path '%s' does not have their version"

1153 +msgid "%s has type %o, expected %o"

1154 msgstr ""

1155

949 -#: builtin/checkout.c:131

1156 +#: builtin/apply.c:3240

1157 #, c-format

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

1158 +msgid "%s: already exists in index"

1159 msgstr ""

1160

954 -#: builtin/checkout.c:175

1161 +#: builtin/apply.c:3259

1162 #, c-format

956 -msgid "path '%s' does not have necessary versions"

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

1164 msgstr ""

1165

959 -#: builtin/checkout.c:192

1166 +#: builtin/apply.c:3265

1167 #, c-format

961 -msgid "path '%s': cannot merge"

1168 +msgid "%s: patch does not apply"

1169 msgstr ""

1170

964 -#: builtin/checkout.c:209

1171 +#: builtin/apply.c:3278

1172 #, c-format

966 -msgid "Unable to add merge result for '%s'"

1173 +msgid "Checking patch %s..."

1174 msgstr ""

1175

969 -#: builtin/checkout.c:212 builtin/reset.c:158

1176 +#: builtin/apply.c:3333 builtin/checkout.c:212 builtin/reset.c:158

1177 #, c-format

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

1179 msgstr ""

1180

974 -#: builtin/checkout.c:234 builtin/checkout.c:392

975 -msgid "corrupt index file"

1181 +#: builtin/apply.c:3476

1182 +#, c-format

1183 +msgid "unable to remove %s from index"

1184 msgstr ""

1185

978 -#: builtin/checkout.c:264 builtin/checkout.c:271

1186 +#: builtin/apply.c:3503

1187 #, c-format

980 -msgid "path '%s' is unmerged"

1188 +msgid "corrupt patch for subproject %s"

1189 msgstr ""

1190

983 -#: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583

984 -#: builtin/merge.c:812

985 -msgid "unable to write new index file"

1191 +#: builtin/apply.c:3507

1192 +#, c-format

1193 +msgid "unable to stat newly created file '%s'"

1194 msgstr ""

1195

988 -#: builtin/checkout.c:319 builtin/diff.c:302 builtin/merge.c:408

989 -msgid "diff_setup_done failed"

1196 +#: builtin/apply.c:3512

1197 +#, c-format

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

1199 msgstr ""

1200

992 -#: builtin/checkout.c:414

993 -msgid "you need to resolve your current index first"

1201 +#: builtin/apply.c:3515

1202 +#, c-format

1203 +msgid "unable to add cache entry for %s"

1204 msgstr ""

1205

996 -#: builtin/checkout.c:533

1206 +#: builtin/apply.c:3548

1207 #, c-format

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

1208 +msgid "closing file '%s'"

1209 msgstr ""

1210

1001 -#: builtin/checkout.c:566

1002 -msgid "HEAD is now at"

1211 +#: builtin/apply.c:3597

1212 +#, c-format

1213 +msgid "unable to write file '%s' mode %o"

1214 msgstr ""

1215

1005 -#: builtin/checkout.c:573

1216 +#: builtin/apply.c:3653

1217 #, c-format

1007 -msgid "Reset branch '%s'\n"

1218 +msgid "Applied patch %s cleanly."

1219 msgstr ""

1220

1010 -#: builtin/checkout.c:576

1011 -#, c-format

1012 -msgid "Already on '%s'\n"

1221 +#: builtin/apply.c:3661

1222 +msgid "internal error"

1223 msgstr ""

1224

1015 -#: builtin/checkout.c:580

1225 +#. Say this even without --verbose

1226 +#: builtin/apply.c:3664

1227 #, c-format

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

1018 -msgstr ""

1228 +msgid "Applying patch %%s with %d reject..."

1229 +msgid_plural "Applying patch %%s with %d rejects..."

1230 +msgstr[0] ""

1231 +msgstr[1] ""

1232

1020 -#: builtin/checkout.c:582

1233 +#: builtin/apply.c:3674

1234 #, c-format

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

1235 +msgid "truncating .rej filename to %.*s.rej"

1236 msgstr ""

1237

1025 -#: builtin/checkout.c:584

1238 +#: builtin/apply.c:3695

1239 #, c-format

1027 -msgid "Switched to branch '%s'\n"

1240 +msgid "Hunk #%d applied cleanly."

1241 msgstr ""

1242

1030 -#: builtin/checkout.c:640

1243 +#: builtin/apply.c:3698

1244 #, c-format

1032 -msgid " ... and %d more.\n"

1245 +msgid "Rejected hunk #%d."

1246 msgstr ""

1247

1035 -#. The singular version

1036 -#: builtin/checkout.c:646

1037 -#, c-format

1038 -msgid ""

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

1040 -"any of your branches:\n"

1041 -"\n"

1042 -"%s\n"

1043 -msgid_plural ""

1044 -"Warning: you are leaving %d commits behind, not connected to\n"

1045 -"any of your branches:\n"

1046 -"\n"

1047 -"%s\n"

1048 -msgstr[0] ""

1049 -msgstr[1] ""

1050 -

1051 -#: builtin/checkout.c:664

1052 -#, c-format

1053 -msgid ""

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

1055 -"to do so with:\n"

1056 -"\n"

1057 -" git branch new_branch_name %s\n"

1058 -"\n"

1248 +#: builtin/apply.c:3829

1249 +msgid "unrecognized input"

1250 msgstr ""

1251

1061 -#: builtin/checkout.c:693

1062 -msgid "internal error in revision walk"

1252 +#: builtin/apply.c:3840

1253 +msgid "unable to read index file"

1254 msgstr ""

1255

1065 -#: builtin/checkout.c:697

1066 -msgid "Previous HEAD position was"

1256 +#: builtin/apply.c:4035

1257 +msgid "--index outside a repository"

1258 msgstr ""

1259

1069 -#: builtin/checkout.c:723

1070 -msgid "You are on a branch yet to be born"

1260 +#: builtin/apply.c:4038

1261 +msgid "--cached outside a repository"

1262 msgstr ""

1263

1073 -#. case (1)

1074 -#: builtin/checkout.c:854

1264 +#: builtin/apply.c:4054

1265 #, c-format

1076 -msgid "invalid reference: %s"

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

1267 msgstr ""

1268

1079 -#. case (1): want a tree

1080 -#: builtin/checkout.c:893

1269 +#: builtin/apply.c:4068

1270 #, c-format

1082 -msgid "reference is not a tree: %s"

1083 -msgstr ""

1271 +msgid "squelched %d whitespace error"

1272 +msgid_plural "squelched %d whitespace errors"

1273 +msgstr[0] ""

1274 +msgstr[1] ""

1275

1085 -#: builtin/checkout.c:973

1086 -msgid "-B cannot be used with -b"

1087 -msgstr ""

1276 +#: builtin/apply.c:4074 builtin/apply.c:4084

1277 +#, c-format

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

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

1280 +msgstr[0] ""

1281 +msgstr[1] ""

1282

1089 -#: builtin/checkout.c:982

1090 -msgid "--patch is incompatible with all other options"

1283 +#: builtin/archive.c:17

1284 +#, c-format

1285 +msgid "could not create archive file '%s'"

1286 msgstr ""

1287

1093 -#: builtin/checkout.c:985

1094 -msgid "--detach cannot be used with -b/-B/--orphan"

1288 +#: builtin/archive.c:20

1289 +msgid "could not redirect output"

1290 msgstr ""

1291

1097 -#: builtin/checkout.c:987

1098 -msgid "--detach cannot be used with -t"

1292 +#: builtin/archive.c:37

1293 +msgid "git archive: Remote with no URL"

1294 msgstr ""

1295

1101 -#: builtin/checkout.c:993

1102 -msgid "--track needs a branch name"

1296 +#: builtin/archive.c:58

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

1298 msgstr ""

1299

1105 -#: builtin/checkout.c:1000

1106 -msgid "Missing branch name; try -b"

1300 +#: builtin/archive.c:63

1301 +#, c-format

1302 +msgid "git archive: NACK %s"

1303 msgstr ""

1304

1109 -#: builtin/checkout.c:1006

1110 -msgid "--orphan and -b|-B are mutually exclusive"

1305 +#: builtin/archive.c:65

1306 +#, c-format

1307 +msgid "remote error: %s"

1308 msgstr ""

1309

1113 -#: builtin/checkout.c:1008

1114 -msgid "--orphan cannot be used with -t"

1310 +#: builtin/archive.c:66

1311 +msgid "git archive: protocol error"

1312 msgstr ""

1313

1117 -#: builtin/checkout.c:1018

1118 -msgid "git checkout: -f and -m are incompatible"

1314 +#: builtin/archive.c:71

1315 +msgid "git archive: expected a flush"

1316 msgstr ""

1317

1121 -#: builtin/checkout.c:1052

1122 -msgid "invalid path specification"

1318 +#: builtin/branch.c:144

1319 +#, c-format

1320 +msgid ""

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

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

1323 msgstr ""

1324

1125 -#: builtin/checkout.c:1060

1325 +#: builtin/branch.c:148

1326 #, c-format

1327 msgid ""

1128 -"git checkout: updating paths is incompatible with switching branches.\n"

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

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

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

1330 msgstr ""

1331

1132 -#: builtin/checkout.c:1062

1133 -msgid "git checkout: updating paths is incompatible with switching branches."

1332 +#: builtin/branch.c:180

1333 +msgid "cannot use -a with -d"

1334 msgstr ""

1335

1136 -#: builtin/checkout.c:1067

1137 -msgid "git checkout: --detach does not take a path argument"

1336 +#: builtin/branch.c:186

1337 +msgid "Couldn't look up commit object for HEAD"

1338 msgstr ""

1339

1140 -#: builtin/checkout.c:1070

1141 -msgid ""

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

1143 -"checking out of the index."

1340 +#: builtin/branch.c:191

1341 +#, c-format

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

1343 msgstr ""

1344

1146 -#: builtin/checkout.c:1089

1147 -msgid "Cannot switch branch to a non-commit."

1345 +#: builtin/branch.c:202

1346 +#, c-format

1347 +msgid "remote branch '%s' not found."

1348 msgstr ""

1349

1150 -#: builtin/checkout.c:1092

1151 -msgid "--ours/--theirs is incompatible with switching branches."

1350 +#: builtin/branch.c:203

1351 +#, c-format

1352 +msgid "branch '%s' not found."

1353 msgstr ""

1354

1154 -#: builtin/clean.c:78

1155 -msgid "-x and -X cannot be used together"

1355 +#: builtin/branch.c:210

1356 +#, c-format

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

1358 msgstr ""

1359

1158 -#: builtin/clean.c:82

1360 +#: builtin/branch.c:216

1361 +#, c-format

1362 msgid ""

1160 -"clean.requireForce set to true and neither -n nor -f given; refusing to clean"

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

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

1365 msgstr ""

1366

1163 -#: builtin/clean.c:85

1164 -msgid ""

1165 -"clean.requireForce defaults to true and neither -n nor -f given; refusing to "

1166 -"clean"

1367 +#: builtin/branch.c:225

1368 +#, c-format

1369 +msgid "Error deleting remote branch '%s'"

1370 msgstr ""

1371

1169 -#: builtin/clean.c:155 builtin/clean.c:176

1372 +#: builtin/branch.c:226

1373 #, c-format

1171 -msgid "Would remove %s\n"

1374 +msgid "Error deleting branch '%s'"

1375 msgstr ""

1376

1174 -#: builtin/clean.c:159 builtin/clean.c:179

1377 +#: builtin/branch.c:233

1378 #, c-format

1176 -msgid "Removing %s\n"

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

1380 msgstr ""

1381

1179 -#: builtin/clean.c:162 builtin/clean.c:182

1382 +#: builtin/branch.c:234

1383 #, c-format

1181 -msgid "failed to remove %s"

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

1385 msgstr ""

1386

1184 -#: builtin/clean.c:166

1185 -#, c-format

1186 -msgid "Would not remove %s\n"

1387 +#: builtin/branch.c:239

1388 +msgid "Update of config-file failed"

1389 msgstr ""

1390

1189 -#: builtin/clean.c:168

1391 +#: builtin/branch.c:337

1392 #, c-format

1191 -msgid "Not removing %s\n"

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

1394 msgstr ""

1395

1194 -#: builtin/clone.c:243

1396 +#: builtin/branch.c:409

1397 #, c-format

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

1398 +msgid "behind %d] "

1399 msgstr ""

1400

1199 -#: builtin/clone.c:302

1401 +#: builtin/branch.c:411

1402 #, c-format

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

1403 +msgid "ahead %d] "

1404 msgstr ""

1405

1204 -#: builtin/clone.c:306

1406 +#: builtin/branch.c:413

1407 #, c-format

1206 -msgid "failed to create directory '%s'"

1408 +msgid "ahead %d, behind %d] "

1409 msgstr ""

1410

1209 -#: builtin/clone.c:308 builtin/diff.c:75

1210 -#, c-format

1211 -msgid "failed to stat '%s'"

1411 +#: builtin/branch.c:521

1412 +msgid "(no branch)"

1413 msgstr ""

1414

1214 -#: builtin/clone.c:310

1215 -#, c-format

1216 -msgid "%s exists and is not a directory"

1415 +#: builtin/branch.c:586

1416 +msgid "some refs could not be read"

1417 msgstr ""

1418

1219 -#: builtin/clone.c:324

1220 -#, c-format

1221 -msgid "failed to stat %s\n"

1419 +#: builtin/branch.c:599

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

1421 msgstr ""

1422

1224 -#: builtin/clone.c:341

1423 +#: builtin/branch.c:609

1424 #, c-format

1226 -msgid "failed to unlink '%s'"

1425 +msgid "Invalid branch name: '%s'"

1426 msgstr ""

1427

1229 -#: builtin/clone.c:346

1428 +#: builtin/branch.c:624

1429 +msgid "Branch rename failed"

1430 +msgstr ""

1431 +

1432 +#: builtin/branch.c:628

1433 #, c-format

1231 -msgid "failed to create link '%s'"

1434 +msgid "Renamed a misnamed branch '%s' away"

1435 msgstr ""

1436

1234 -#: builtin/clone.c:350

1437 +#: builtin/branch.c:632

1438 #, c-format

1236 -msgid "failed to copy file to '%s'"

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

1440 msgstr ""

1441

1239 -#: builtin/clone.c:373

1442 +#: builtin/branch.c:639

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

1444 +msgstr ""

1445 +

1446 +#: builtin/branch.c:654

1447 #, c-format

1241 -msgid "done.\n"

1448 +msgid "malformed object name %s"

1449 msgstr ""

1450

1244 -#: builtin/clone.c:440

1451 +#: builtin/branch.c:678

1452 #, c-format

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

1453 +msgid "could not write branch description template: %s"

1454 msgstr ""

1455

1249 -#: builtin/clone.c:549

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

1456 +#: builtin/branch.c:769

1457 +msgid "Failed to resolve HEAD as a valid ref."

1458 msgstr ""

1459

1253 -#: builtin/clone.c:639

1254 -msgid "Too many arguments."

1460 +#: builtin/branch.c:774 builtin/clone.c:558

1461 +msgid "HEAD not found below refs/heads!"

1462 msgstr ""

1463

1257 -#: builtin/clone.c:643

1258 -msgid "You must specify a repository to clone."

1464 +#: builtin/branch.c:794

1465 +msgid "--column and --verbose are incompatible"

1466 msgstr ""

1467

1261 -#: builtin/clone.c:654

1262 -#, c-format

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

1468 +#: builtin/branch.c:843

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

1470 msgstr ""

1471

1266 -#: builtin/clone.c:668

1472 +#: builtin/bundle.c:47

1473 #, c-format

1268 -msgid "repository '%s' does not exist"

1474 +msgid "%s is okay\n"

1475 msgstr ""

1476

1271 -#: builtin/clone.c:673

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

1477 +#: builtin/bundle.c:56

1478 +msgid "Need a repository to create a bundle."

1479 msgstr ""

1480

1275 -#: builtin/clone.c:683

1276 -#, c-format

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

1481 +#: builtin/bundle.c:60

1482 +msgid "Need a repository to unbundle."

1483 msgstr ""

1484

1280 -#: builtin/clone.c:693

1485 +#: builtin/checkout.c:113 builtin/checkout.c:146

1486 #, c-format

1282 -msgid "working tree '%s' already exists."

1487 +msgid "path '%s' does not have our version"

1488 msgstr ""

1489

1285 -#: builtin/clone.c:706 builtin/clone.c:720

1490 +#: builtin/checkout.c:115 builtin/checkout.c:148

1491 #, c-format

1287 -msgid "could not create leading directories of '%s'"

1492 +msgid "path '%s' does not have their version"

1493 msgstr ""

1494

1290 -#: builtin/clone.c:709

1495 +#: builtin/checkout.c:131

1496 #, c-format

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

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

1498 msgstr ""

1499

1295 -#: builtin/clone.c:728

1500 +#: builtin/checkout.c:175

1501 #, c-format

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

1502 +msgid "path '%s' does not have necessary versions"

1503 msgstr ""

1504

1300 -#: builtin/clone.c:730

1505 +#: builtin/checkout.c:192

1506 #, c-format

1302 -msgid "Cloning into '%s'...\n"

1507 +msgid "path '%s': cannot merge"

1508 msgstr ""

1509

1305 -#: builtin/clone.c:786

1510 +#: builtin/checkout.c:209

1511 #, c-format

1307 -msgid "Don't know how to clone %s"

1512 +msgid "Unable to add merge result for '%s'"

1513 msgstr ""

1514

1310 -#: builtin/clone.c:835

1515 +#: builtin/checkout.c:234 builtin/checkout.c:392

1516 +msgid "corrupt index file"

1517 +msgstr ""

1518 +

1519 +#: builtin/checkout.c:264 builtin/checkout.c:271

1520 #, c-format

1312 -msgid "Remote branch %s not found in upstream %s"

1521 +msgid "path '%s' is unmerged"

1522 msgstr ""

1523

1315 -#: builtin/clone.c:842

1316 -msgid "You appear to have cloned an empty repository."

1524 +#: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583

1525 +#: builtin/merge.c:812

1526 +msgid "unable to write new index file"

1527 msgstr ""

1528

1319 -#: builtin/commit.c:42

1320 -msgid ""

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

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

1323 -"You can suppress this message by setting them explicitly:\n"

1324 -"\n"

1325 -" git config --global user.name \"Your Name\"\n"

1326 -" git config --global user.email you@example.com\n"

1327 -"\n"

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

1329 -"\n"

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

1529 +#: builtin/checkout.c:319 builtin/diff.c:302 builtin/merge.c:408

1530 +msgid "diff_setup_done failed"

1531 msgstr ""

1532

1333 -#: builtin/commit.c:54

1334 -msgid ""

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

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

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

1533 +#: builtin/checkout.c:414

1534 +msgid "you need to resolve your current index first"

1535 msgstr ""

1536

1340 -#: builtin/commit.c:59

1341 -msgid ""

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

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

1344 -"\n"

1345 -" git commit --allow-empty\n"

1346 -"\n"

1347 -"Otherwise, please use 'git reset'\n"

1537 +#: builtin/checkout.c:533

1538 +#, c-format

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

1540 msgstr ""

1541

1350 -#: builtin/commit.c:205 builtin/reset.c:33

1351 -msgid "merge"

1542 +#: builtin/checkout.c:566

1543 +msgid "HEAD is now at"

1544 msgstr ""

1545

1354 -#: builtin/commit.c:208

1355 -msgid "cherry-pick"

1546 +#: builtin/checkout.c:573

1547 +#, c-format

1548 +msgid "Reset branch '%s'\n"

1549 msgstr ""

1550

1358 -#: builtin/commit.c:325

1359 -msgid "failed to unpack HEAD tree object"

1551 +#: builtin/checkout.c:576

1552 +#, c-format

1553 +msgid "Already on '%s'\n"

1554 msgstr ""

1555

1362 -#: builtin/commit.c:367

1363 -msgid "unable to create temporary index"

1556 +#: builtin/checkout.c:580

1557 +#, c-format

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

1559 msgstr ""

1560

1366 -#: builtin/commit.c:373

1367 -msgid "interactive add failed"

1561 +#: builtin/checkout.c:582

1562 +#, c-format

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

1564 msgstr ""

1565

1370 -#: builtin/commit.c:406 builtin/commit.c:427 builtin/commit.c:473

1371 -msgid "unable to write new_index file"

1566 +#: builtin/checkout.c:584

1567 +#, c-format

1568 +msgid "Switched to branch '%s'\n"

1569 msgstr ""

1570

1374 -#: builtin/commit.c:457

1571 +#: builtin/checkout.c:640

1572 #, c-format

1376 -msgid "cannot do a partial commit during a %s."

1573 +msgid " ... and %d more.\n"

1574 msgstr ""

1575

1379 -#: builtin/commit.c:466

1380 -msgid "cannot read the index"

1576 +#. The singular version

1577 +#: builtin/checkout.c:646

1578 +#, c-format

1579 +msgid ""

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

1581 +"any of your branches:\n"

1582 +"\n"

1583 +"%s\n"

1584 +msgid_plural ""

1585 +"Warning: you are leaving %d commits behind, not connected to\n"

1586 +"any of your branches:\n"

1587 +"\n"

1588 +"%s\n"

1589 +msgstr[0] ""

1590 +msgstr[1] ""

1591 +

1592 +#: builtin/checkout.c:664

1593 +#, c-format

1594 +msgid ""

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

1596 +"to do so with:\n"

1597 +"\n"

1598 +" git branch new_branch_name %s\n"

1599 +"\n"

1600 msgstr ""

1601

1383 -#: builtin/commit.c:486

1384 -msgid "unable to write temporary index file"

1602 +#: builtin/checkout.c:693

1603 +msgid "internal error in revision walk"

1604 msgstr ""

1605

1387 -#: builtin/commit.c:561 builtin/commit.c:567

1388 -#, c-format

1389 -msgid "invalid commit: %s"

1606 +#: builtin/checkout.c:697

1607 +msgid "Previous HEAD position was"

1608 msgstr ""

1609

1392 -#: builtin/commit.c:590

1393 -msgid "malformed --author parameter"

1610 +#: builtin/checkout.c:723

1611 +msgid "You are on a branch yet to be born"

1612 msgstr ""

1613

1396 -#: builtin/commit.c:651

1614 +#. case (1)

1615 +#: builtin/checkout.c:854

1616 #, c-format

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

1617 +msgid "invalid reference: %s"

1618 msgstr ""

1619

1401 -#: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1033

1620 +#. case (1): want a tree

1621 +#: builtin/checkout.c:893

1622 #, c-format

1403 -msgid "could not lookup commit %s"

1623 +msgid "reference is not a tree: %s"

1624 msgstr ""

1625

1406 -#: builtin/commit.c:701 builtin/shortlog.c:296

1407 -#, c-format

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

1626 +#: builtin/checkout.c:973

1627 +msgid "-B cannot be used with -b"

1628 msgstr ""

1629

1411 -#: builtin/commit.c:703

1412 -msgid "could not read log from standard input"

1630 +#: builtin/checkout.c:982

1631 +msgid "--patch is incompatible with all other options"

1632 msgstr ""

1633

1415 -#: builtin/commit.c:707

1416 -#, c-format

1417 -msgid "could not read log file '%s'"

1634 +#: builtin/checkout.c:985

1635 +msgid "--detach cannot be used with -b/-B/--orphan"

1636 msgstr ""

1637

1420 -#: builtin/commit.c:713

1421 -msgid "commit has empty message"

1638 +#: builtin/checkout.c:987

1639 +msgid "--detach cannot be used with -t"

1640 msgstr ""

1641

1424 -#: builtin/commit.c:729

1425 -msgid "could not read MERGE_MSG"

1642 +#: builtin/checkout.c:993

1643 +msgid "--track needs a branch name"

1644 msgstr ""

1645

1428 -#: builtin/commit.c:733

1429 -msgid "could not read SQUASH_MSG"

1646 +#: builtin/checkout.c:1000

1647 +msgid "Missing branch name; try -b"

1648 msgstr ""

1649

1432 -#: builtin/commit.c:737

1433 -#, c-format

1434 -msgid "could not read '%s'"

1650 +#: builtin/checkout.c:1006

1651 +msgid "--orphan and -b|-B are mutually exclusive"

1652 msgstr ""

1653

1437 -#: builtin/commit.c:765

1438 -#, c-format

1439 -msgid "could not open '%s'"

1654 +#: builtin/checkout.c:1008

1655 +msgid "--orphan cannot be used with -t"

1656 msgstr ""

1657

1442 -#: builtin/commit.c:789

1443 -msgid "could not write commit template"

1658 +#: builtin/checkout.c:1018

1659 +msgid "git checkout: -f and -m are incompatible"

1660 +msgstr ""

1661 +

1662 +#: builtin/checkout.c:1052

1663 +msgid "invalid path specification"

1664 msgstr ""

1665

1446 -#: builtin/commit.c:799

1666 +#: builtin/checkout.c:1060

1667 #, c-format

1668 msgid ""

1449 -"\n"

1450 -"It looks like you may be committing a %s.\n"

1451 -"If this is not correct, please remove the file\n"

1452 -"\t%s\n"

1453 -"and try again.\n"

1669 +"git checkout: updating paths is incompatible with switching branches.\n"

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

1671 msgstr ""

1672

1456 -#: builtin/commit.c:812

1457 -msgid "Please enter the commit message for your changes."

1673 +#: builtin/checkout.c:1062

1674 +msgid "git checkout: updating paths is incompatible with switching branches."

1675 msgstr ""

1676

1460 -#: builtin/commit.c:815

1461 -msgid ""

1462 -" Lines starting\n"

1463 -"with '#' will be ignored, and an empty message aborts the commit.\n"

1677 +#: builtin/checkout.c:1067

1678 +msgid "git checkout: --detach does not take a path argument"

1679 msgstr ""

1680

1466 -#: builtin/commit.c:820

1681 +#: builtin/checkout.c:1070

1682 msgid ""

1468 -" Lines starting\n"

1469 -"with '#' will be kept; you may remove them yourself if you want to.\n"

1470 -"An empty message aborts the commit.\n"

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

1684 +"checking out of the index."

1685 msgstr ""

1686

1473 -#: builtin/commit.c:832

1474 -#, c-format

1475 -msgid "%sAuthor: %s"

1687 +#: builtin/checkout.c:1089

1688 +msgid "Cannot switch branch to a non-commit."

1689 msgstr ""

1690

1478 -#: builtin/commit.c:839

1479 -#, c-format

1480 -msgid "%sCommitter: %s"

1691 +#: builtin/checkout.c:1092

1692 +msgid "--ours/--theirs is incompatible with switching branches."

1693 msgstr ""

1694

1483 -#: builtin/commit.c:859

1484 -msgid "Cannot read index"

1695 +#: builtin/clean.c:78

1696 +msgid "-x and -X cannot be used together"

1697 msgstr ""

1698

1487 -#: builtin/commit.c:896

1488 -msgid "Error building trees"

1699 +#: builtin/clean.c:82

1700 +msgid ""

1701 +"clean.requireForce set to true and neither -n nor -f given; refusing to clean"

1702 msgstr ""

1703

1491 -#: builtin/commit.c:911 builtin/tag.c:357

1492 -#, c-format

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

1704 +#: builtin/clean.c:85

1705 +msgid ""

1706 +"clean.requireForce defaults to true and neither -n nor -f given; refusing to "

1707 +"clean"

1708 msgstr ""

1709

1496 -#: builtin/commit.c:1008

1710 +#: builtin/clean.c:155 builtin/clean.c:176

1711 #, c-format

1498 -msgid "No existing author found with '%s'"

1712 +msgid "Would remove %s\n"

1713 msgstr ""

1714

1501 -#: builtin/commit.c:1023 builtin/commit.c:1217

1715 +#: builtin/clean.c:159 builtin/clean.c:179

1716 #, c-format

1503 -msgid "Invalid untracked files mode '%s'"

1504 -msgstr ""

1505 -

1506 -#: builtin/commit.c:1063

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

1717 +msgid "Removing %s\n"

1718 msgstr ""

1719

1510 -#: builtin/commit.c:1074

1511 -msgid "You have nothing to amend."

1720 +#: builtin/clean.c:162 builtin/clean.c:182

1721 +#, c-format

1722 +msgid "failed to remove %s"

1723 msgstr ""

1724

1514 -#: builtin/commit.c:1076

1725 +#: builtin/clean.c:166

1726 #, c-format

1516 -msgid "You are in the middle of a %s -- cannot amend."

1727 +msgid "Would not remove %s\n"

1728 msgstr ""

1729

1519 -#: builtin/commit.c:1078

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

1730 +#: builtin/clean.c:168

1731 +#, c-format

1732 +msgid "Not removing %s\n"

1733 msgstr ""

1734

1523 -#: builtin/commit.c:1088

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

1735 +#: builtin/clone.c:243

1736 +#, c-format

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

1738 msgstr ""

1739

1527 -#: builtin/commit.c:1090

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

1740 +#: builtin/clone.c:302

1741 +#, c-format

1742 +msgid "failed to open '%s'"

1743 msgstr ""

1744

1531 -#: builtin/commit.c:1098

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

1745 +#: builtin/clone.c:306

1746 +#, c-format

1747 +msgid "failed to create directory '%s'"

1748 msgstr ""

1749

1535 -#: builtin/commit.c:1115

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

1750 +#: builtin/clone.c:308 builtin/diff.c:75

1751 +#, c-format

1752 +msgid "failed to stat '%s'"

1753 msgstr ""

1754

1539 -#: builtin/commit.c:1117

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

1755 +#: builtin/clone.c:310

1756 +#, c-format

1757 +msgid "%s exists and is not a directory"

1758 msgstr ""

1759

1543 -#: builtin/commit.c:1119

1544 -msgid "Clever... amending the last one with dirty index."

1760 +#: builtin/clone.c:324

1761 +#, c-format

1762 +msgid "failed to stat %s\n"

1763 msgstr ""

1764

1547 -#: builtin/commit.c:1121

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

1765 +#: builtin/clone.c:341

1766 +#, c-format

1767 +msgid "failed to unlink '%s'"

1768 msgstr ""

1769

1551 -#: builtin/commit.c:1131 builtin/tag.c:556

1770 +#: builtin/clone.c:346

1771 #, c-format

1553 -msgid "Invalid cleanup mode %s"

1772 +msgid "failed to create link '%s'"

1773 msgstr ""

1774

1556 -#: builtin/commit.c:1136

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

1775 +#: builtin/clone.c:350

1776 +#, c-format

1777 +msgid "failed to copy file to '%s'"

1778 msgstr ""

1779

1560 -#: builtin/commit.c:1315

1561 -msgid "couldn't look up newly created commit"

1780 +#: builtin/clone.c:373

1781 +#, c-format

1782 +msgid "done.\n"

1783 msgstr ""

1784

1564 -#: builtin/commit.c:1317

1565 -msgid "could not parse newly created commit"

1785 +#: builtin/clone.c:440

1786 +#, c-format

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

1788 msgstr ""

1789

1568 -#: builtin/commit.c:1358

1569 -msgid "detached HEAD"

1790 +#: builtin/clone.c:549

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

1792 msgstr ""

1793

1572 -#: builtin/commit.c:1360

1573 -msgid " (root-commit)"

1794 +#: builtin/clone.c:639

1795 +msgid "Too many arguments."

1796 msgstr ""

1797

1576 -#: builtin/commit.c:1450

1577 -msgid "could not parse HEAD commit"

1798 +#: builtin/clone.c:643

1799 +msgid "You must specify a repository to clone."

1800 msgstr ""

1801

1580 -#: builtin/commit.c:1487 builtin/merge.c:509

1802 +#: builtin/clone.c:654

1803 #, c-format

1582 -msgid "could not open '%s' for reading"

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

1805 msgstr ""

1806

1585 -#: builtin/commit.c:1494

1807 +#: builtin/clone.c:668

1808 #, c-format

1587 -msgid "Corrupt MERGE_HEAD file (%s)"

1809 +msgid "repository '%s' does not exist"

1810 msgstr ""

1811

1590 -#: builtin/commit.c:1501

1591 -msgid "could not read MERGE_MODE"

1812 +#: builtin/clone.c:673

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

1814 msgstr ""

1815

1594 -#: builtin/commit.c:1520

1816 +#: builtin/clone.c:683

1817 #, c-format

1596 -msgid "could not read commit message: %s"

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

1819 msgstr ""

1820

1599 -#: builtin/commit.c:1534

1821 +#: builtin/clone.c:693

1822 #, c-format

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

1823 +msgid "working tree '%s' already exists."

1824 msgstr ""

1825

1604 -#: builtin/commit.c:1539

1826 +#: builtin/clone.c:706 builtin/clone.c:720

1827 #, c-format

1606 -msgid "Aborting commit due to empty commit message.\n"

1607 -msgstr ""

1608 -

1609 -#: builtin/commit.c:1554 builtin/merge.c:936 builtin/merge.c:961

1610 -msgid "failed to write commit object"

1611 -msgstr ""

1612 -

1613 -#: builtin/commit.c:1575

1614 -msgid "cannot lock HEAD ref"

1615 -msgstr ""

1616 -

1617 -#: builtin/commit.c:1579

1618 -msgid "cannot update HEAD ref"

1619 -msgstr ""

1620 -

1621 -#: builtin/commit.c:1590

1622 -msgid ""

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

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

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

1828 +msgid "could not create leading directories of '%s'"

1829 msgstr ""

1830

1628 -#: builtin/describe.c:234

1831 +#: builtin/clone.c:709

1832 #, c-format

1630 -msgid "annotated tag %s not available"

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

1834 msgstr ""

1835

1633 -#: builtin/describe.c:238

1836 +#: builtin/clone.c:728

1837 #, c-format

1635 -msgid "annotated tag %s has no embedded name"

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

1839 msgstr ""

1840

1638 -#: builtin/describe.c:240

1841 +#: builtin/clone.c:730

1842 #, c-format

1640 -msgid "tag '%s' is really '%s' here"

1843 +msgid "Cloning into '%s'...\n"

1844 msgstr ""

1845

1643 -#: builtin/describe.c:267

1846 +#: builtin/clone.c:786

1847 #, c-format

1645 -msgid "Not a valid object name %s"

1848 +msgid "Don't know how to clone %s"

1849 msgstr ""

1850

1648 -#: builtin/describe.c:270

1851 +#: builtin/clone.c:835

1852 #, c-format

1650 -msgid "%s is not a valid '%s' object"

1853 +msgid "Remote branch %s not found in upstream %s"

1854 msgstr ""

1855

1653 -#: builtin/describe.c:287

1654 -#, c-format

1655 -msgid "no tag exactly matches '%s'"

1856 +#: builtin/clone.c:842

1857 +msgid "You appear to have cloned an empty repository."

1858 msgstr ""

1859

1658 -#: builtin/describe.c:289

1659 -#, c-format

1660 -msgid "searching to describe %s\n"

1860 +#: builtin/column.c:51

1861 +msgid "--command must be the first argument"

1862 msgstr ""

1863

1663 -#: builtin/describe.c:329

1664 -#, c-format

1665 -msgid "finished search at %s\n"

1864 +#: builtin/commit.c:43

1865 +msgid ""

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

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

1868 +"You can suppress this message by setting them explicitly:\n"

1869 +"\n"

1870 +" git config --global user.name \"Your Name\"\n"

1871 +" git config --global user.email you@example.com\n"

1872 +"\n"

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

1874 +"\n"

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

1876 msgstr ""

1877

1668 -#: builtin/describe.c:353

1669 -#, c-format

1878 +#: builtin/commit.c:55

1879 msgid ""

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

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

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

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

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

1883 msgstr ""

1884

1675 -#: builtin/describe.c:357

1676 -#, c-format

1885 +#: builtin/commit.c:60

1886 msgid ""

1678 -"No tags can describe '%s'.\n"

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

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

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

1889 +"\n"

1890 +" git commit --allow-empty\n"

1891 +"\n"

1892 +"Otherwise, please use 'git reset'\n"

1893 msgstr ""

1894

1682 -#: builtin/describe.c:378

1683 -#, c-format

1684 -msgid "traversed %lu commits\n"

1895 +#: builtin/commit.c:309

1896 +msgid "failed to unpack HEAD tree object"

1897 msgstr ""

1898

1687 -#: builtin/describe.c:381

1688 -#, c-format

1689 -msgid ""

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

1691 -"gave up search at %s\n"

1899 +#: builtin/commit.c:351

1900 +msgid "unable to create temporary index"

1901 msgstr ""

1902

1694 -#: builtin/describe.c:436

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

1903 +#: builtin/commit.c:357

1904 +msgid "interactive add failed"

1905 msgstr ""

1906

1698 -#: builtin/describe.c:462

1699 -msgid "No names found, cannot describe anything."

1907 +#: builtin/commit.c:390 builtin/commit.c:411 builtin/commit.c:461

1908 +msgid "unable to write new_index file"

1909 msgstr ""

1910

1702 -#: builtin/describe.c:482

1703 -msgid "--dirty is incompatible with committishes"

1911 +#: builtin/commit.c:442

1912 +msgid "cannot do a partial commit during a merge."

1913 msgstr ""

1914

1706 -#: builtin/diff.c:77

1707 -#, c-format

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

1915 +#: builtin/commit.c:444

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

1917 msgstr ""

1918

1711 -#: builtin/diff.c:220

1712 -#, c-format

1713 -msgid "invalid option: %s"

1919 +#: builtin/commit.c:454

1920 +msgid "cannot read the index"

1921 msgstr ""

1922

1716 -#: builtin/diff.c:297

1717 -msgid "Not a git repository"

1923 +#: builtin/commit.c:474

1924 +msgid "unable to write temporary index file"

1925 msgstr ""

1926

1720 -#: builtin/diff.c:347

1927 +#: builtin/commit.c:549 builtin/commit.c:555

1928 #, c-format

1722 -msgid "invalid object '%s' given."

1929 +msgid "invalid commit: %s"

1930 msgstr ""

1931

1725 -#: builtin/diff.c:352

1726 -#, c-format

1727 -msgid "more than %d trees given: '%s'"

1932 +#: builtin/commit.c:578

1933 +msgid "malformed --author parameter"

1934 msgstr ""

1935

1730 -#: builtin/diff.c:362

1936 +#: builtin/commit.c:639

1937 #, c-format

1732 -msgid "more than two blobs given: '%s'"

1938 +msgid "Malformed ident string: '%s'"

1939 msgstr ""

1940

1735 -#: builtin/diff.c:370

1941 +#: builtin/commit.c:677 builtin/commit.c:710 builtin/commit.c:1024

1942 #, c-format

1737 -msgid "unhandled object '%s' given."

1738 -msgstr ""

1739 -

1740 -#: builtin/fetch.c:200

1741 -msgid "Couldn't find remote ref HEAD"

1943 +msgid "could not lookup commit %s"

1944 msgstr ""

1945

1744 -#: builtin/fetch.c:253

1946 +#: builtin/commit.c:689 builtin/shortlog.c:296

1947 #, c-format

1746 -msgid "object %s not found"

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

1949 msgstr ""

1950

1749 -#: builtin/fetch.c:259

1750 -msgid "[up to date]"

1951 +#: builtin/commit.c:691

1952 +msgid "could not read log from standard input"

1953 msgstr ""

1954

1753 -#: builtin/fetch.c:273

1955 +#: builtin/commit.c:695

1956 #, c-format

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

1957 +msgid "could not read log file '%s'"

1958 msgstr ""

1959

1758 -#: builtin/fetch.c:274 builtin/fetch.c:360

1759 -msgid "[rejected]"

1960 +#: builtin/commit.c:701

1961 +msgid "commit has empty message"

1962 msgstr ""

1963

1762 -#: builtin/fetch.c:285

1763 -msgid "[tag update]"

1964 +#: builtin/commit.c:717

1965 +msgid "could not read MERGE_MSG"

1966 msgstr ""

1967

1766 -#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340

1767 -msgid " (unable to update local ref)"

1968 +#: builtin/commit.c:721

1969 +msgid "could not read SQUASH_MSG"

1970 msgstr ""

1971

1770 -#: builtin/fetch.c:305

1771 -msgid "[new tag]"

1972 +#: builtin/commit.c:725

1973 +#, c-format

1974 +msgid "could not read '%s'"

1975 msgstr ""

1976

1774 -#: builtin/fetch.c:308

1775 -msgid "[new branch]"

1977 +#: builtin/commit.c:777

1978 +msgid "could not write commit template"

1979 msgstr ""

1980

1778 -#: builtin/fetch.c:311

1779 -msgid "[new ref]"

1981 +#: builtin/commit.c:788

1982 +#, c-format

1983 +msgid ""

1984 +"\n"

1985 +"It looks like you may be committing a merge.\n"

1986 +"If this is not correct, please remove the file\n"

1987 +"\t%s\n"

1988 +"and try again.\n"

1989 msgstr ""

1990

1782 -#: builtin/fetch.c:356

1783 -msgid "unable to update local ref"

1991 +#: builtin/commit.c:793

1992 +#, c-format

1993 +msgid ""

1994 +"\n"

1995 +"It looks like you may be committing a cherry-pick.\n"

1996 +"If this is not correct, please remove the file\n"

1997 +"\t%s\n"

1998 +"and try again.\n"

1999 msgstr ""

2000

1786 -#: builtin/fetch.c:356

1787 -msgid "forced update"

2001 +#: builtin/commit.c:805

2002 +msgid ""

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

2004 +"with '#' will be ignored, and an empty message aborts the commit.\n"

2005 msgstr ""

2006

1790 -#: builtin/fetch.c:362

1791 -msgid "(non-fast-forward)"

2007 +#: builtin/commit.c:810

2008 +msgid ""

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

2010 +"with '#' will be kept; you may remove them yourself if you want to.\n"

2011 +"An empty message aborts the commit.\n"

2012 msgstr ""

2013

1794 -#: builtin/fetch.c:393 builtin/fetch.c:685

2014 +#: builtin/commit.c:823

2015 #, c-format

1796 -msgid "cannot open %s: %s\n"

2016 +msgid "%sAuthor: %s"

2017 msgstr ""

2018

1799 -#: builtin/fetch.c:402

2019 +#: builtin/commit.c:830

2020 #, c-format

1801 -msgid "%s did not send all necessary objects\n"

2021 +msgid "%sCommitter: %s"

2022 msgstr ""

2023

1804 -#: builtin/fetch.c:488

1805 -#, c-format

1806 -msgid "From %.*s\n"

2024 +#: builtin/commit.c:850

2025 +msgid "Cannot read index"

2026 msgstr ""

2027

1809 -#: builtin/fetch.c:499

2028 +#: builtin/commit.c:887

2029 +msgid "Error building trees"

2030 +msgstr ""

2031 +

2032 +#: builtin/commit.c:902 builtin/tag.c:361

2033 #, c-format

1811 -msgid ""

1812 -"some local refs could not be updated; try running\n"

1813 -" 'git remote prune %s' to remove any old, conflicting branches"

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

2035 msgstr ""

2036

1816 -#: builtin/fetch.c:549

2037 +#: builtin/commit.c:999

2038 #, c-format

1818 -msgid " (%s will become dangling)\n"

2039 +msgid "No existing author found with '%s'"

2040 msgstr ""

2041

1821 -#: builtin/fetch.c:550

2042 +#: builtin/commit.c:1014 builtin/commit.c:1214

2043 #, c-format

1823 -msgid " (%s has become dangling)\n"

2044 +msgid "Invalid untracked files mode '%s'"

2045 msgstr ""

2046

1826 -#: builtin/fetch.c:557

1827 -msgid "[deleted]"

2047 +#: builtin/commit.c:1054

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

2049 msgstr ""

2050

1830 -#: builtin/fetch.c:558

1831 -msgid "(none)"

2051 +#: builtin/commit.c:1065

2052 +msgid "You have nothing to amend."

2053 msgstr ""

2054

1834 -#: builtin/fetch.c:675

1835 -#, c-format

1836 -msgid "Refusing to fetch into current branch %s of non-bare repository"

2055 +#: builtin/commit.c:1068

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

2057 msgstr ""

2058

1839 -#: builtin/fetch.c:709

1840 -#, c-format

1841 -msgid "Don't know how to fetch from %s"

2059 +#: builtin/commit.c:1070

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

2061 msgstr ""

2062

1844 -#: builtin/fetch.c:786

1845 -#, c-format

1846 -msgid "Option \"%s\" value \"%s\" is not valid for %s"

2063 +#: builtin/commit.c:1073

2064 +msgid "Options --squash and --fixup cannot be used together"

2065 msgstr ""

2066

1849 -#: builtin/fetch.c:789

1850 -#, c-format

1851 -msgid "Option \"%s\" is ignored for %s\n"

2067 +#: builtin/commit.c:1083

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

2069 msgstr ""

2070

1854 -#: builtin/fetch.c:888

1855 -#, c-format

1856 -msgid "Fetching %s\n"

2071 +#: builtin/commit.c:1085

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

2073 msgstr ""

2074

1859 -#: builtin/fetch.c:890

1860 -#, c-format

1861 -msgid "Could not fetch %s"

2075 +#: builtin/commit.c:1093

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

2077 msgstr ""

2078

1864 -#: builtin/fetch.c:907

1865 -msgid ""

1866 -"No remote repository specified. Please, specify either a URL or a\n"

1867 -"remote name from which new revisions should be fetched."

2079 +#: builtin/commit.c:1110

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

2081 msgstr ""

2082

1870 -#: builtin/fetch.c:927

1871 -msgid "You need to specify a tag name."

2083 +#: builtin/commit.c:1112

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

2085 msgstr ""

2086

1874 -#: builtin/fetch.c:979

1875 -msgid "fetch --all does not take a repository argument"

2087 +#: builtin/commit.c:1114

2088 +msgid "Clever... amending the last one with dirty index."

2089 msgstr ""

2090

1878 -#: builtin/fetch.c:981

1879 -msgid "fetch --all does not make sense with refspecs"

2091 +#: builtin/commit.c:1116

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

2093 msgstr ""

2094

1882 -#: builtin/fetch.c:992

2095 +#: builtin/commit.c:1126 builtin/tag.c:577

2096 #, c-format

1884 -msgid "No such remote or remote group: %s"

2097 +msgid "Invalid cleanup mode %s"

2098 msgstr ""

2099

1887 -#: builtin/fetch.c:1000

1888 -msgid "Fetching a group and specifying refspecs does not make sense"

2100 +#: builtin/commit.c:1131

2101 +msgid "Paths with -a does not make sense."

2102 msgstr ""

2103

1891 -#: builtin/gc.c:63

1892 -#, c-format

1893 -msgid "Invalid %s: '%s'"

2104 +#: builtin/commit.c:1315

2105 +msgid "couldn't look up newly created commit"

2106 msgstr ""

2107

1896 -#: builtin/gc.c:78

1897 -msgid "Too many options specified"

2108 +#: builtin/commit.c:1317

2109 +msgid "could not parse newly created commit"

2110 msgstr ""

2111

1900 -#: builtin/gc.c:103

1901 -#, c-format

1902 -msgid "insanely long object directory %.*s"

1903 -msgstr ""

1904 -

1905 -#: builtin/gc.c:223

1906 -#, c-format

1907 -msgid "Auto packing the repository for optimum performance.\n"

2112 +#: builtin/commit.c:1358

2113 +msgid "detached HEAD"

2114 msgstr ""

2115

1910 -#: builtin/gc.c:226

1911 -#, c-format

1912 -msgid ""

1913 -"Auto packing the repository for optimum performance. You may also\n"

1914 -"run \"git gc\" manually. See \"git help gc\" for more information.\n"

2116 +#: builtin/commit.c:1360

2117 +msgid " (root-commit)"

2118 msgstr ""

2119

1917 -#: builtin/gc.c:256

1918 -msgid ""

1919 -"There are too many unreachable loose objects; run 'git prune' to remove them."

2120 +#: builtin/commit.c:1450

2121 +msgid "could not parse HEAD commit"

2122 msgstr ""

2123

1922 -#: builtin/grep.c:216

2124 +#: builtin/commit.c:1487 builtin/merge.c:509

2125 #, c-format

1924 -msgid "grep: failed to create thread: %s"

2126 +msgid "could not open '%s' for reading"

2127 msgstr ""

2128

1927 -#: builtin/grep.c:402

2129 +#: builtin/commit.c:1494

2130 #, c-format

1929 -msgid "Failed to chdir: %s"

2131 +msgid "Corrupt MERGE_HEAD file (%s)"

2132 msgstr ""

2133

1932 -#: builtin/grep.c:478 builtin/grep.c:512

1933 -#, c-format

1934 -msgid "unable to read tree (%s)"

2134 +#: builtin/commit.c:1501

2135 +msgid "could not read MERGE_MODE"

2136 msgstr ""

2137

1937 -#: builtin/grep.c:526

2138 +#: builtin/commit.c:1520

2139 #, c-format

1939 -msgid "unable to grep from object of type %s"

2140 +msgid "could not read commit message: %s"

2141 msgstr ""

2142

1942 -#: builtin/grep.c:584

2143 +#: builtin/commit.c:1534

2144 #, c-format

1944 -msgid "switch `%c' expects a numerical value"

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

2146 msgstr ""

2147

1947 -#: builtin/grep.c:601

2148 +#: builtin/commit.c:1539

2149 #, c-format

1949 -msgid "cannot open '%s'"

2150 +msgid "Aborting commit due to empty commit message.\n"

2151 msgstr ""

2152

1952 -#: builtin/grep.c:888

1953 -msgid "no pattern given."

2153 +#: builtin/commit.c:1554 builtin/merge.c:936 builtin/merge.c:961

2154 +msgid "failed to write commit object"

2155 msgstr ""

2156

1956 -#: builtin/grep.c:902

1957 -#, c-format

1958 -msgid "bad object %s"

2157 +#: builtin/commit.c:1575

2158 +msgid "cannot lock HEAD ref"

2159 msgstr ""

2160

1961 -#: builtin/grep.c:943

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

2161 +#: builtin/commit.c:1579

2162 +msgid "cannot update HEAD ref"

2163 msgstr ""

2164

1965 -#: builtin/grep.c:966

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

2165 +#: builtin/commit.c:1590

2166 +msgid ""

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

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

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

2170 msgstr ""

2171

1969 -#: builtin/grep.c:971

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

2172 +#: builtin/describe.c:234

2173 +#, c-format

2174 +msgid "annotated tag %s not available"

2175 msgstr ""

2176

1973 -#: builtin/grep.c:974

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

2177 +#: builtin/describe.c:238

2178 +#, c-format

2179 +msgid "annotated tag %s has no embedded name"

2180 msgstr ""

2181

1977 -#: builtin/grep.c:982

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

2182 +#: builtin/describe.c:240

2183 +#, c-format

2184 +msgid "tag '%s' is really '%s' here"

2185 msgstr ""

2186

1981 -#: builtin/init-db.c:35

2187 +#: builtin/describe.c:267

2188 #, c-format

1983 -msgid "Could not make %s writable by group"

2189 +msgid "Not a valid object name %s"

2190 msgstr ""

2191

1986 -#: builtin/init-db.c:62

2192 +#: builtin/describe.c:270

2193 #, c-format

1988 -msgid "insanely long template name %s"

2194 +msgid "%s is not a valid '%s' object"

2195 msgstr ""

2196

1991 -#: builtin/init-db.c:67

2197 +#: builtin/describe.c:287

2198 #, c-format

1993 -msgid "cannot stat '%s'"

2199 +msgid "no tag exactly matches '%s'"

2200 msgstr ""

2201

1996 -#: builtin/init-db.c:73

2202 +#: builtin/describe.c:289

2203 #, c-format

1998 -msgid "cannot stat template '%s'"

2204 +msgid "searching to describe %s\n"

2205 msgstr ""

2206

2001 -#: builtin/init-db.c:80

2207 +#: builtin/describe.c:329

2208 #, c-format

2003 -msgid "cannot opendir '%s'"

2209 +msgid "finished search at %s\n"

2210 msgstr ""

2211

2006 -#: builtin/init-db.c:97

2212 +#: builtin/describe.c:353

2213 #, c-format

2008 -msgid "cannot readlink '%s'"

2214 +msgid ""

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

2216 +"However, there were unannotated tags: try --tags."

2217 msgstr ""

2218

2011 -#: builtin/init-db.c:99

2219 +#: builtin/describe.c:357

2220 #, c-format

2013 -msgid "insanely long symlink %s"

2221 +msgid ""

2222 +"No tags can describe '%s'.\n"

2223 +"Try --always, or create some tags."

2224 msgstr ""

2225

2016 -#: builtin/init-db.c:102

2226 +#: builtin/describe.c:378

2227 #, c-format

2018 -msgid "cannot symlink '%s' '%s'"

2228 +msgid "traversed %lu commits\n"

2229 msgstr ""

2230

2021 -#: builtin/init-db.c:106

2231 +#: builtin/describe.c:381

2232 #, c-format

2023 -msgid "cannot copy '%s' to '%s'"

2233 +msgid ""

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

2235 +"gave up search at %s\n"

2236 msgstr ""

2237

2026 -#: builtin/init-db.c:110

2027 -#, c-format

2028 -msgid "ignoring template %s"

2238 +#: builtin/describe.c:436

2239 +msgid "--long is incompatible with --abbrev=0"

2240 msgstr ""

2241

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

2032 -#, c-format

2033 -msgid "insanely long template path %s"

2242 +#: builtin/describe.c:462

2243 +msgid "No names found, cannot describe anything."

2244 msgstr ""

2245

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

2246 +#: builtin/describe.c:482

2247 +msgid "--dirty is incompatible with committishes"

2248 +msgstr ""

2249 +

2250 +#: builtin/diff.c:77

2251 #, c-format

2038 -msgid "templates not found %s"

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

2253 msgstr ""

2254

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

2255 +#: builtin/diff.c:220

2256 #, c-format

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

2257 +msgid "invalid option: %s"

2258 msgstr ""

2259

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

2260 +#: builtin/diff.c:297

2261 +msgid "Not a git repository"

2262 +msgstr ""

2263 +

2264 +#: builtin/diff.c:347

2265 #, c-format

2048 -msgid "insane git directory %s"

2266 +msgid "invalid object '%s' given."

2267 msgstr ""

2268

2051 -#: builtin/init-db.c:322 builtin/init-db.c:325

2269 +#: builtin/diff.c:352

2270 #, c-format

2053 -msgid "%s already exists"

2271 +msgid "more than %d trees given: '%s'"

2272 msgstr ""

2273

2056 -#: builtin/init-db.c:354

2274 +#: builtin/diff.c:362

2275 #, c-format

2058 -msgid "unable to handle file type %d"

2276 +msgid "more than two blobs given: '%s'"

2277 msgstr ""

2278

2061 -#: builtin/init-db.c:357

2279 +#: builtin/diff.c:370

2280 #, c-format

2063 -msgid "unable to move %s to %s"

2281 +msgid "unhandled object '%s' given."

2282 msgstr ""

2283

2066 -#: builtin/init-db.c:362

2284 +#: builtin/fetch.c:200

2285 +msgid "Couldn't find remote ref HEAD"

2286 +msgstr ""

2287 +

2288 +#: builtin/fetch.c:253

2289 #, c-format

2068 -msgid "Could not create git link %s"

2290 +msgid "object %s not found"

2291 msgstr ""

2292

2071 -#.

2072 -#. * TRANSLATORS: The first '%s' is either "Reinitialized

2073 -#. * existing" or "Initialized empty", the second " shared" or

2074 -#. * "", and the last '%s%s' is the verbatim directory name.

2075 -#.

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

2293 +#: builtin/fetch.c:259

2294 +msgid "[up to date]"

2295 +msgstr ""

2296 +

2297 +#: builtin/fetch.c:273

2298 #, c-format

2078 -msgid "%s%s Git repository in %s%s\n"

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

2300 msgstr ""

2301

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

2082 -msgid "Reinitialized existing"

2302 +#: builtin/fetch.c:274 builtin/fetch.c:360

2303 +msgid "[rejected]"

2304 msgstr ""

2305

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

2086 -msgid "Initialized empty"

2306 +#: builtin/fetch.c:285

2307 +msgid "[tag update]"

2308 msgstr ""

2309

2089 -#: builtin/init-db.c:421

2090 -msgid " shared"

2310 +#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340

2311 +msgid " (unable to update local ref)"

2312 msgstr ""

2313

2093 -#: builtin/init-db.c:440

2094 -msgid "cannot tell cwd"

2314 +#: builtin/fetch.c:305

2315 +msgid "[new tag]"

2316 msgstr ""

2317

2097 -#: builtin/init-db.c:521 builtin/init-db.c:528

2098 -#, c-format

2099 -msgid "cannot mkdir %s"

2318 +#: builtin/fetch.c:308

2319 +msgid "[new branch]"

2320 msgstr ""

2321

2102 -#: builtin/init-db.c:532

2103 -#, c-format

2104 -msgid "cannot chdir to %s"

2322 +#: builtin/fetch.c:311

2323 +msgid "[new ref]"

2324 msgstr ""

2325

2107 -#: builtin/init-db.c:554

2108 -#, c-format

2109 -msgid ""

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

2111 -"dir=<directory>)"

2326 +#: builtin/fetch.c:356

2327 +msgid "unable to update local ref"

2328 msgstr ""

2329

2114 -#: builtin/init-db.c:578

2115 -msgid "Cannot access current working directory"

2330 +#: builtin/fetch.c:356

2331 +msgid "forced update"

2332 msgstr ""

2333

2118 -#: builtin/init-db.c:585

2119 -#, c-format

2120 -msgid "Cannot access work tree '%s'"

2334 +#: builtin/fetch.c:362

2335 +msgid "(non-fast-forward)"

2336 msgstr ""

2337

2123 -#: builtin/log.c:188

2338 +#: builtin/fetch.c:393 builtin/fetch.c:685

2339 #, c-format

2125 -msgid "Final output: %d %s\n"

2340 +msgid "cannot open %s: %s\n"

2341 msgstr ""

2342

2128 -#: builtin/log.c:401 builtin/log.c:489

2343 +#: builtin/fetch.c:402

2344 #, c-format

2130 -msgid "Could not read object %s"

2345 +msgid "%s did not send all necessary objects\n"

2346 msgstr ""

2347

2133 -#: builtin/log.c:513

2348 +#: builtin/fetch.c:488

2349 #, c-format

2135 -msgid "Unknown type: %d"

2350 +msgid "From %.*s\n"

2351 msgstr ""

2352

2138 -#: builtin/log.c:602

2139 -msgid "format.headers without value"

2353 +#: builtin/fetch.c:499

2354 +#, c-format

2355 +msgid ""

2356 +"some local refs could not be updated; try running\n"

2357 +" 'git remote prune %s' to remove any old, conflicting branches"

2358 msgstr ""

2359

2142 -#: builtin/log.c:675

2143 -msgid "name of output directory is too long"

2360 +#: builtin/fetch.c:549

2361 +#, c-format

2362 +msgid " (%s will become dangling)"

2363 msgstr ""

2364

2146 -#: builtin/log.c:686

2365 +#: builtin/fetch.c:550

2366 #, c-format

2148 -msgid "Cannot open patch file %s"

2367 +msgid " (%s has become dangling)"

2368 msgstr ""

2369

2151 -#: builtin/log.c:700

2152 -msgid "Need exactly one range."

2370 +#: builtin/fetch.c:557

2371 +msgid "[deleted]"

2372 msgstr ""

2373

2155 -#: builtin/log.c:708

2156 -msgid "Not a range."

2374 +#: builtin/fetch.c:558 builtin/remote.c:1055

2375 +msgid "(none)"

2376 msgstr ""

2377

2159 -#: builtin/log.c:745

2160 -msgid "Could not extract email from committer identity."

2378 +#: builtin/fetch.c:675

2379 +#, c-format

2380 +msgid "Refusing to fetch into current branch %s of non-bare repository"

2381 msgstr ""

2382

2163 -#: builtin/log.c:791

2164 -msgid "Cover letter needs email format"

2383 +#: builtin/fetch.c:709

2384 +#, c-format

2385 +msgid "Don't know how to fetch from %s"

2386 msgstr ""

2387

2167 -#: builtin/log.c:885

2388 +#: builtin/fetch.c:786

2389 #, c-format

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

2390 +msgid "Option \"%s\" value \"%s\" is not valid for %s"

2391 msgstr ""

2392

2172 -#: builtin/log.c:958

2173 -msgid "Two output directories?"

2393 +#: builtin/fetch.c:789

2394 +#, c-format

2395 +msgid "Option \"%s\" is ignored for %s\n"

2396 msgstr ""

2397

2176 -#: builtin/log.c:1179

2398 +#: builtin/fetch.c:888

2399 #, c-format

2178 -msgid "bogus committer info %s"

2400 +msgid "Fetching %s\n"

2401 msgstr ""

2402

2181 -#: builtin/log.c:1224

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

2403 +#: builtin/fetch.c:890 builtin/remote.c:100

2404 +#, c-format

2405 +msgid "Could not fetch %s"

2406 msgstr ""

2407

2185 -#: builtin/log.c:1226

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

2408 +#: builtin/fetch.c:907

2409 +msgid ""

2410 +"No remote repository specified. Please, specify either a URL or a\n"

2411 +"remote name from which new revisions should be fetched."

2412 msgstr ""

2413

2189 -#: builtin/log.c:1231 builtin/shortlog.c:284

2190 -#, c-format

2191 -msgid "unrecognized argument: %s"

2414 +#: builtin/fetch.c:927

2415 +msgid "You need to specify a tag name."

2416 msgstr ""

2417

2194 -#: builtin/log.c:1234

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

2418 +#: builtin/fetch.c:979

2419 +msgid "fetch --all does not take a repository argument"

2420 msgstr ""

2421

2198 -#: builtin/log.c:1236

2199 -msgid "--name-status does not make sense"

2422 +#: builtin/fetch.c:981

2423 +msgid "fetch --all does not make sense with refspecs"

2424 msgstr ""

2425

2202 -#: builtin/log.c:1238

2203 -msgid "--check does not make sense"

2426 +#: builtin/fetch.c:992

2427 +#, c-format

2428 +msgid "No such remote or remote group: %s"

2429 msgstr ""

2430

2206 -#: builtin/log.c:1261

2207 -msgid "standard output, or directory, which one?"

2431 +#: builtin/fetch.c:1000

2432 +msgid "Fetching a group and specifying refspecs does not make sense"

2433 msgstr ""

2434

2210 -#: builtin/log.c:1263

2435 +#: builtin/gc.c:63

2436 #, c-format

2212 -msgid "Could not create directory '%s'"

2437 +msgid "Invalid %s: '%s'"

2438 msgstr ""

2439

2215 -#: builtin/log.c:1416

2216 -msgid "Failed to create output files"

2440 +#: builtin/gc.c:90

2441 +#, c-format

2442 +msgid "insanely long object directory %.*s"

2443 msgstr ""

2444

2219 -#: builtin/log.c:1520

2445 +#: builtin/gc.c:221

2446 +#, c-format

2447 +msgid "Auto packing the repository for optimum performance.\n"

2448 +msgstr ""

2449 +

2450 +#: builtin/gc.c:224

2451 #, c-format

2452 msgid ""

2222 -"Could not find a tracked remote branch, please specify <upstream> manually.\n"

2453 +"Auto packing the repository for optimum performance. You may also\n"

2454 +"run \"git gc\" manually. See \"git help gc\" for more information.\n"

2455 msgstr ""

2456

2225 -#: builtin/log.c:1536 builtin/log.c:1538 builtin/log.c:1550

2457 +#: builtin/gc.c:251

2458 +msgid ""

2459 +"There are too many unreachable loose objects; run 'git prune' to remove them."

2460 +msgstr ""

2461 +

2462 +#: builtin/grep.c:216

2463 #, c-format

2227 -msgid "Unknown commit %s"

2464 +msgid "grep: failed to create thread: %s"

2465 msgstr ""

2466

2230 -#: builtin/merge.c:90

2231 -msgid "switch `m' requires a value"

2467 +#: builtin/grep.c:402

2468 +#, c-format

2469 +msgid "Failed to chdir: %s"

2470 msgstr ""

2471

2234 -#: builtin/merge.c:127

2472 +#: builtin/grep.c:478 builtin/grep.c:512

2473 #, c-format

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

2474 +msgid "unable to read tree (%s)"

2475 msgstr ""

2476

2239 -#: builtin/merge.c:128

2477 +#: builtin/grep.c:526

2478 #, c-format

2241 -msgid "Available strategies are:"

2479 +msgid "unable to grep from object of type %s"

2480 msgstr ""

2481

2244 -#: builtin/merge.c:133

2482 +#: builtin/grep.c:584

2483 #, c-format

2246 -msgid "Available custom strategies are:"

2484 +msgid "switch `%c' expects a numerical value"

2485 msgstr ""

2486

2249 -#: builtin/merge.c:240

2250 -msgid "could not run stash."

2487 +#: builtin/grep.c:601

2488 +#, c-format

2489 +msgid "cannot open '%s'"

2490 msgstr ""

2491

2253 -#: builtin/merge.c:245

2254 -msgid "stash failed"

2492 +#: builtin/grep.c:888

2493 +msgid "no pattern given."

2494 msgstr ""

2495

2257 -#: builtin/merge.c:250

2496 +#: builtin/grep.c:902

2497 #, c-format

2259 -msgid "not a valid object: %s"

2498 +msgid "bad object %s"

2499 msgstr ""

2500

2262 -#: builtin/merge.c:269 builtin/merge.c:286

2263 -msgid "read-tree failed"

2501 +#: builtin/grep.c:943

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

2503 msgstr ""

2504

2266 -#: builtin/merge.c:316

2267 -msgid " (nothing to squash)"

2505 +#: builtin/grep.c:966

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

2507 msgstr ""

2508

2270 -#: builtin/merge.c:329

2509 +#: builtin/grep.c:971

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

2511 +msgstr ""

2512 +

2513 +#: builtin/grep.c:974

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

2515 +msgstr ""

2516 +

2517 +#: builtin/grep.c:982

2518 +msgid "both --cached and trees are given."

2519 +msgstr ""

2520 +

2521 +#: builtin/help.c:59

2522 #, c-format

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

2523 +msgid "unrecognized help format '%s'"

2524 msgstr ""

2525

2275 -#: builtin/merge.c:361

2276 -msgid "Writing SQUASH_MSG"

2526 +#: builtin/help.c:87

2527 +msgid "Failed to start emacsclient."

2528 msgstr ""

2529

2279 -#: builtin/merge.c:363

2280 -msgid "Finishing SQUASH_MSG"

2530 +#: builtin/help.c:100

2531 +msgid "Failed to parse emacsclient version."

2532 msgstr ""

2533

2283 -#: builtin/merge.c:386

2534 +#: builtin/help.c:108

2535 #, c-format

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

2536 +msgid "emacsclient version '%d' too old (< 22)."

2537 msgstr ""

2538

2288 -#: builtin/merge.c:437

2539 +#: builtin/help.c:126 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171

2540 #, c-format

2290 -msgid "'%s' does not point to a commit"

2541 +msgid "failed to exec '%s': %s"

2542 msgstr ""

2543

2293 -#: builtin/merge.c:536

2544 +#: builtin/help.c:211

2545 #, c-format

2295 -msgid "Bad branch.%s.mergeoptions string: %s"

2546 +msgid ""

2547 +"'%s': path for unsupported man viewer.\n"

2548 +"Please consider using 'man.<tool>.cmd' instead."

2549 msgstr ""

2550

2298 -#: builtin/merge.c:629

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

2551 +#: builtin/help.c:223

2552 +#, c-format

2553 +msgid ""

2554 +"'%s': cmd for supported man viewer.\n"

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

2556 msgstr ""

2557

2302 -#: builtin/merge.c:679

2303 -msgid "failed to read the cache"

2558 +#: builtin/help.c:287

2559 +msgid "The most commonly used git commands are:"

2560 msgstr ""

2561

2306 -#: builtin/merge.c:697

2307 -msgid "Unable to write index."

2562 +#: builtin/help.c:355

2563 +#, c-format

2564 +msgid "'%s': unknown man viewer."

2565 msgstr ""

2566

2310 -#: builtin/merge.c:710

2311 -msgid "Not handling anything other than two heads merge."

2567 +#: builtin/help.c:372

2568 +msgid "no man viewer handled the request"

2569 msgstr ""

2570

2314 -#: builtin/merge.c:724

2571 +#: builtin/help.c:380

2572 +msgid "no info viewer handled the request"

2573 +msgstr ""

2574 +

2575 +#: builtin/help.c:391

2576 #, c-format

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

2577 +msgid "'%s': not a documentation directory."

2578 msgstr ""

2579

2319 -#: builtin/merge.c:738

2580 +#: builtin/help.c:432 builtin/help.c:439

2581 #, c-format

2321 -msgid "unable to write %s"

2582 +msgid "usage: %s%s"

2583 msgstr ""

2584

2324 -#: builtin/merge.c:877

2585 +#: builtin/help.c:453

2586 #, c-format

2326 -msgid "Could not read from '%s'"

2587 +msgid "`git %s' is aliased to `%s'"

2588 msgstr ""

2589

2329 -#: builtin/merge.c:886

2590 +#: builtin/index-pack.c:84

2591 #, c-format

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

2592 +msgid "object type mismatch at %s"

2593 msgstr ""

2594

2334 -#: builtin/merge.c:892

2335 -msgid ""

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

2337 -"especially if it merges an updated upstream into a topic branch.\n"

2338 -"\n"

2339 -"Lines starting with '#' will be ignored, and an empty message aborts\n"

2340 -"the commit.\n"

2595 +#: builtin/index-pack.c:104

2596 +msgid "object of unexpected type"

2597 msgstr ""

2598

2343 -#: builtin/merge.c:916

2344 -msgid "Empty commit message."

2599 +#: builtin/index-pack.c:141

2600 +#, c-format

2601 +msgid "cannot fill %d byte"

2602 +msgid_plural "cannot fill %d bytes"

2603 +msgstr[0] ""

2604 +msgstr[1] ""

2605 +

2606 +#: builtin/index-pack.c:151

2607 +msgid "early EOF"

2608 msgstr ""

2609

2347 -#: builtin/merge.c:928

2610 +#: builtin/index-pack.c:152

2611 +msgid "read error on input"

2612 +msgstr ""

2613 +

2614 +#: builtin/index-pack.c:164

2615 +msgid "used more bytes than were available"

2616 +msgstr ""

2617 +

2618 +#: builtin/index-pack.c:171

2619 +msgid "pack too large for current definition of off_t"

2620 +msgstr ""

2621 +

2622 +#: builtin/index-pack.c:187

2623 #, c-format

2349 -msgid "Wonderful.\n"

2624 +msgid "unable to create '%s'"

2625 msgstr ""

2626

2352 -#: builtin/merge.c:993

2627 +#: builtin/index-pack.c:192

2628 #, c-format

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

2629 +msgid "cannot open packfile '%s'"

2630 msgstr ""

2631

2357 -#: builtin/merge.c:1009

2632 +#: builtin/index-pack.c:206

2633 +msgid "pack signature mismatch"

2634 +msgstr ""

2635 +

2636 +#: builtin/index-pack.c:226

2637 #, c-format

2359 -msgid "'%s' is not a commit"

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

2639 msgstr ""

2640

2362 -#: builtin/merge.c:1050

2363 -msgid "No current branch."

2641 +#: builtin/index-pack.c:300

2642 +#, c-format

2643 +msgid "inflate returned %d"

2644 msgstr ""

2645

2366 -#: builtin/merge.c:1052

2367 -msgid "No remote for the current branch."

2646 +#: builtin/index-pack.c:345

2647 +msgid "offset value overflow for delta base object"

2648 msgstr ""

2649

2370 -#: builtin/merge.c:1054

2371 -msgid "No default upstream defined for the current branch."

2650 +#: builtin/index-pack.c:353

2651 +msgid "delta base offset is out of bound"

2652 msgstr ""

2653

2374 -#: builtin/merge.c:1059

2654 +#: builtin/index-pack.c:361

2655 #, c-format

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

2656 +msgid "unknown object type %d"

2657 msgstr ""

2658

2379 -#: builtin/merge.c:1146 builtin/merge.c:1303

2659 +#: builtin/index-pack.c:390

2660 +msgid "cannot pread pack file"

2661 +msgstr ""

2662 +

2663 +#: builtin/index-pack.c:392

2664 #, c-format

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

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

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

2667 +msgstr[0] ""

2668 +msgstr[1] ""

2669 +

2670 +#: builtin/index-pack.c:405

2671 +msgid "serious inflate inconsistency"

2672 msgstr ""

2673

2384 -#: builtin/merge.c:1214

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

2674 +#: builtin/index-pack.c:476

2675 +#, c-format

2676 +msgid "cannot read existing object %s"

2677 msgstr ""

2678

2388 -#: builtin/merge.c:1230 git-pull.sh:31

2389 -msgid ""

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

2391 -"Please, commit your changes before you can merge."

2679 +#: builtin/index-pack.c:479

2680 +#, c-format

2681 +msgid "SHA1 COLLISION FOUND WITH %s !"

2682 msgstr ""

2683

2394 -#: builtin/merge.c:1233 git-pull.sh:34

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

2684 +#: builtin/index-pack.c:488

2685 +#, c-format

2686 +msgid "invalid blob object %s"

2687 msgstr ""

2688

2398 -#: builtin/merge.c:1237

2399 -msgid ""

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

2401 -"Please, commit your changes before you can merge."

2689 +#: builtin/index-pack.c:500

2690 +#, c-format

2691 +msgid "invalid %s"

2692 msgstr ""

2693

2404 -#: builtin/merge.c:1240

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

2694 +#: builtin/index-pack.c:502

2695 +msgid "Error in object"

2696 msgstr ""

2697

2408 -#: builtin/merge.c:1249

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

2698 +#: builtin/index-pack.c:504

2699 +#, c-format

2700 +msgid "Not all child objects of %s are reachable"

2701 msgstr ""

2702

2412 -#: builtin/merge.c:1254

2413 -msgid "You cannot combine --no-ff with --ff-only."

2703 +#: builtin/index-pack.c:576 builtin/index-pack.c:602

2704 +msgid "failed to apply delta"

2705 msgstr ""

2706

2416 -#: builtin/merge.c:1261

2417 -msgid "No commit specified and merge.defaultToUpstream not set."

2707 +#: builtin/index-pack.c:706

2708 +msgid "Receiving objects"

2709 msgstr ""

2710

2420 -#: builtin/merge.c:1293

2421 -msgid "Can merge only exactly one commit into empty head"

2711 +#: builtin/index-pack.c:706

2712 +msgid "Indexing objects"

2713 msgstr ""

2714

2424 -#: builtin/merge.c:1296

2425 -msgid "Squash commit into empty head not supported yet"

2715 +#: builtin/index-pack.c:728

2716 +msgid "pack is corrupted (SHA1 mismatch)"

2717 msgstr ""

2718

2428 -#: builtin/merge.c:1298

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

2719 +#: builtin/index-pack.c:733

2720 +msgid "cannot fstat packfile"

2721 msgstr ""

2722

2432 -#: builtin/merge.c:1413

2433 -#, c-format

2434 -msgid "Updating %s..%s\n"

2723 +#: builtin/index-pack.c:736

2724 +msgid "pack has junk at the end"

2725 msgstr ""

2726

2437 -#: builtin/merge.c:1451

2727 +#: builtin/index-pack.c:754

2728 +msgid "Resolving deltas"

2729 +msgstr ""

2730 +

2731 +#: builtin/index-pack.c:787

2732 #, c-format

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

2733 +msgid "unable to deflate appended object (%d)"

2734 msgstr ""

2735

2442 -#: builtin/merge.c:1458

2736 +#: builtin/index-pack.c:866

2737 #, c-format

2444 -msgid "Nope.\n"

2738 +msgid "local object %s is corrupt"

2739 msgstr ""

2740

2447 -#: builtin/merge.c:1490

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

2741 +#: builtin/index-pack.c:890

2742 +msgid "error while closing pack file"

2743 msgstr ""

2744

2451 -#: builtin/merge.c:1513 builtin/merge.c:1592

2745 +#: builtin/index-pack.c:903

2746 #, c-format

2453 -msgid "Rewinding the tree to pristine...\n"

2747 +msgid "cannot write keep file '%s'"

2748 msgstr ""

2749

2456 -#: builtin/merge.c:1517

2750 +#: builtin/index-pack.c:911

2751 #, c-format

2458 -msgid "Trying merge strategy %s...\n"

2752 +msgid "cannot close written keep file '%s'"

2753 msgstr ""

2754

2461 -#: builtin/merge.c:1583

2462 -#, c-format

2463 -msgid "No merge strategy handled the merge.\n"

2755 +#: builtin/index-pack.c:924

2756 +msgid "cannot store pack file"

2757 +msgstr ""

2758 +

2759 +#: builtin/index-pack.c:935

2760 +msgid "cannot store index file"

2761 +msgstr ""

2762 +

2763 +#: builtin/index-pack.c:1024

2764 +#, c-format

2765 +msgid "Cannot open existing pack file '%s'"

2766 +msgstr ""

2767 +

2768 +#: builtin/index-pack.c:1026

2769 +#, c-format

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

2771 +msgstr ""

2772 +

2773 +#: builtin/index-pack.c:1073

2774 +#, c-format

2775 +msgid "non delta: %d object"

2776 +msgid_plural "non delta: %d objects"

2777 +msgstr[0] ""

2778 +msgstr[1] ""

2779 +

2780 +#: builtin/index-pack.c:1080

2781 +#, c-format

2782 +msgid "chain length = %d: %lu object"

2783 +msgid_plural "chain length = %d: %lu objects"

2784 +msgstr[0] ""

2785 +msgstr[1] ""

2786 +

2787 +#: builtin/index-pack.c:1107

2788 +msgid "Cannot come back to cwd"

2789 +msgstr ""

2790 +

2791 +#: builtin/index-pack.c:1140 builtin/index-pack.c:1143

2792 +#: builtin/index-pack.c:1155 builtin/index-pack.c:1159

2793 +#, c-format

2794 +msgid "bad %s"

2795 +msgstr ""

2796 +

2797 +#: builtin/index-pack.c:1173

2798 +msgid "--fix-thin cannot be used without --stdin"

2799 +msgstr ""

2800 +

2801 +#: builtin/index-pack.c:1177 builtin/index-pack.c:1187

2802 +#, c-format

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

2804 +msgstr ""

2805 +

2806 +#: builtin/index-pack.c:1196

2807 +msgid "--verify with no packfile name given"

2808 +msgstr ""

2809 +

2810 +#: builtin/index-pack.c:1220

2811 +msgid "confusion beyond insanity"

2812 +msgstr ""

2813 +

2814 +#: builtin/index-pack.c:1239

2815 +#, c-format

2816 +msgid "pack has %d unresolved delta"

2817 +msgid_plural "pack has %d unresolved deltas"

2818 +msgstr[0] ""

2819 +msgstr[1] ""

2820 +

2821 +#: builtin/init-db.c:35

2822 +#, c-format

2823 +msgid "Could not make %s writable by group"

2824 +msgstr ""

2825 +

2826 +#: builtin/init-db.c:62

2827 +#, c-format

2828 +msgid "insanely long template name %s"

2829 +msgstr ""

2830 +

2831 +#: builtin/init-db.c:67

2832 +#, c-format

2833 +msgid "cannot stat '%s'"

2834 +msgstr ""

2835 +

2836 +#: builtin/init-db.c:73

2837 +#, c-format

2838 +msgid "cannot stat template '%s'"

2839 +msgstr ""

2840 +

2841 +#: builtin/init-db.c:80

2842 +#, c-format

2843 +msgid "cannot opendir '%s'"

2844 +msgstr ""

2845 +

2846 +#: builtin/init-db.c:97

2847 +#, c-format

2848 +msgid "cannot readlink '%s'"

2849 +msgstr ""

2850 +

2851 +#: builtin/init-db.c:99

2852 +#, c-format

2853 +msgid "insanely long symlink %s"

2854 +msgstr ""

2855 +

2856 +#: builtin/init-db.c:102

2857 +#, c-format

2858 +msgid "cannot symlink '%s' '%s'"

2859 +msgstr ""

2860 +

2861 +#: builtin/init-db.c:106

2862 +#, c-format

2863 +msgid "cannot copy '%s' to '%s'"

2864 +msgstr ""

2865 +

2866 +#: builtin/init-db.c:110

2867 +#, c-format

2868 +msgid "ignoring template %s"

2869 +msgstr ""

2870 +

2871 +#: builtin/init-db.c:133

2872 +#, c-format

2873 +msgid "insanely long template path %s"

2874 +msgstr ""

2875 +

2876 +#: builtin/init-db.c:141

2877 +#, c-format

2878 +msgid "templates not found %s"

2879 +msgstr ""

2880 +

2881 +#: builtin/init-db.c:154

2882 +#, c-format

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

2884 +msgstr ""

2885 +

2886 +#: builtin/init-db.c:192

2887 +#, c-format

2888 +msgid "insane git directory %s"

2889 +msgstr ""

2890 +

2891 +#: builtin/init-db.c:322 builtin/init-db.c:325

2892 +#, c-format

2893 +msgid "%s already exists"

2894 +msgstr ""

2895 +

2896 +#: builtin/init-db.c:354

2897 +#, c-format

2898 +msgid "unable to handle file type %d"

2899 +msgstr ""

2900 +

2901 +#: builtin/init-db.c:357

2902 +#, c-format

2903 +msgid "unable to move %s to %s"

2904 +msgstr ""

2905 +

2906 +#: builtin/init-db.c:362

2907 +#, c-format

2908 +msgid "Could not create git link %s"

2909 +msgstr ""

2910 +

2911 +#.

2912 +#. * TRANSLATORS: The first '%s' is either "Reinitialized

2913 +#. * existing" or "Initialized empty", the second " shared" or

2914 +#. * "", and the last '%s%s' is the verbatim directory name.

2915 +#.

2916 +#: builtin/init-db.c:419

2917 +#, c-format

2918 +msgid "%s%s Git repository in %s%s\n"

2919 +msgstr ""

2920 +

2921 +#: builtin/init-db.c:420

2922 +msgid "Reinitialized existing"

2923 +msgstr ""

2924 +

2925 +#: builtin/init-db.c:420

2926 +msgid "Initialized empty"

2927 +msgstr ""

2928 +

2929 +#: builtin/init-db.c:421

2930 +msgid " shared"

2931 +msgstr ""

2932 +

2933 +#: builtin/init-db.c:440

2934 +msgid "cannot tell cwd"

2935 +msgstr ""

2936 +

2937 +#: builtin/init-db.c:521 builtin/init-db.c:528

2938 +#, c-format

2939 +msgid "cannot mkdir %s"

2940 +msgstr ""

2941 +

2942 +#: builtin/init-db.c:532

2943 +#, c-format

2944 +msgid "cannot chdir to %s"

2945 +msgstr ""

2946 +

2947 +#: builtin/init-db.c:554

2948 +#, c-format

2949 +msgid ""

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

2951 +"dir=<directory>)"

2952 +msgstr ""

2953 +

2954 +#: builtin/init-db.c:578

2955 +msgid "Cannot access current working directory"

2956 +msgstr ""

2957 +

2958 +#: builtin/init-db.c:585

2959 +#, c-format

2960 +msgid "Cannot access work tree '%s'"

2961 +msgstr ""

2962 +

2963 +#: builtin/log.c:188

2964 +#, c-format

2965 +msgid "Final output: %d %s\n"

2966 +msgstr ""

2967 +

2968 +#: builtin/log.c:401 builtin/log.c:489

2969 +#, c-format

2970 +msgid "Could not read object %s"

2971 +msgstr ""

2972 +

2973 +#: builtin/log.c:513

2974 +#, c-format

2975 +msgid "Unknown type: %d"

2976 +msgstr ""

2977 +

2978 +#: builtin/log.c:602

2979 +msgid "format.headers without value"

2980 +msgstr ""

2981 +

2982 +#: builtin/log.c:675

2983 +msgid "name of output directory is too long"

2984 +msgstr ""

2985 +

2986 +#: builtin/log.c:686

2987 +#, c-format

2988 +msgid "Cannot open patch file %s"

2989 +msgstr ""

2990 +

2991 +#: builtin/log.c:700

2992 +msgid "Need exactly one range."

2993 +msgstr ""

2994 +

2995 +#: builtin/log.c:708

2996 +msgid "Not a range."

2997 +msgstr ""

2998 +

2999 +#: builtin/log.c:745

3000 +msgid "Could not extract email from committer identity."

3001 +msgstr ""

3002 +

3003 +#: builtin/log.c:791

3004 +msgid "Cover letter needs email format"

3005 +msgstr ""

3006 +

3007 +#: builtin/log.c:885

3008 +#, c-format

3009 +msgid "insane in-reply-to: %s"

3010 +msgstr ""

3011 +

3012 +#: builtin/log.c:958

3013 +msgid "Two output directories?"

3014 +msgstr ""

3015 +

3016 +#: builtin/log.c:1179

3017 +#, c-format

3018 +msgid "bogus committer info %s"

3019 +msgstr ""

3020 +

3021 +#: builtin/log.c:1224

3022 +msgid "-n and -k are mutually exclusive."

3023 +msgstr ""

3024 +

3025 +#: builtin/log.c:1226

3026 +msgid "--subject-prefix and -k are mutually exclusive."

3027 +msgstr ""

3028 +

3029 +#: builtin/log.c:1234

3030 +msgid "--name-only does not make sense"

3031 +msgstr ""

3032 +

3033 +#: builtin/log.c:1236

3034 +msgid "--name-status does not make sense"

3035 +msgstr ""

3036 +

3037 +#: builtin/log.c:1238

3038 +msgid "--check does not make sense"

3039 +msgstr ""

3040 +

3041 +#: builtin/log.c:1261

3042 +msgid "standard output, or directory, which one?"

3043 +msgstr ""

3044 +

3045 +#: builtin/log.c:1263

3046 +#, c-format

3047 +msgid "Could not create directory '%s'"

3048 +msgstr ""

3049 +

3050 +#: builtin/log.c:1416

3051 +msgid "Failed to create output files"

3052 +msgstr ""

3053 +

3054 +#: builtin/log.c:1520

3055 +#, c-format

3056 +msgid ""

3057 +"Could not find a tracked remote branch, please specify <upstream> manually.\n"

3058 +msgstr ""

3059 +

3060 +#: builtin/log.c:1536 builtin/log.c:1538 builtin/log.c:1550

3061 +#, c-format

3062 +msgid "Unknown commit %s"

3063 +msgstr ""

3064 +

3065 +#: builtin/merge.c:90

3066 +msgid "switch `m' requires a value"

3067 +msgstr ""

3068 +

3069 +#: builtin/merge.c:127

3070 +#, c-format

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

3072 +msgstr ""

3073 +

3074 +#: builtin/merge.c:128

3075 +#, c-format

3076 +msgid "Available strategies are:"

3077 +msgstr ""

3078 +

3079 +#: builtin/merge.c:133

3080 +#, c-format

3081 +msgid "Available custom strategies are:"

3082 +msgstr ""

3083 +

3084 +#: builtin/merge.c:240

3085 +msgid "could not run stash."

3086 +msgstr ""

3087 +

3088 +#: builtin/merge.c:245

3089 +msgid "stash failed"

3090 +msgstr ""

3091 +

3092 +#: builtin/merge.c:250

3093 +#, c-format

3094 +msgid "not a valid object: %s"

3095 +msgstr ""

3096 +

3097 +#: builtin/merge.c:269 builtin/merge.c:286

3098 +msgid "read-tree failed"

3099 +msgstr ""

3100 +

3101 +#: builtin/merge.c:316

3102 +msgid " (nothing to squash)"

3103 +msgstr ""

3104 +

3105 +#: builtin/merge.c:329

3106 +#, c-format

3107 +msgid "Squash commit -- not updating HEAD\n"

3108 +msgstr ""

3109 +

3110 +#: builtin/merge.c:361

3111 +msgid "Writing SQUASH_MSG"

3112 +msgstr ""

3113 +

3114 +#: builtin/merge.c:363

3115 +msgid "Finishing SQUASH_MSG"

3116 +msgstr ""

3117 +

3118 +#: builtin/merge.c:386

3119 +#, c-format

3120 +msgid "No merge message -- not updating HEAD\n"

3121 +msgstr ""

3122 +

3123 +#: builtin/merge.c:437

3124 +#, c-format

3125 +msgid "'%s' does not point to a commit"

3126 +msgstr ""

3127 +

3128 +#: builtin/merge.c:536

3129 +#, c-format

3130 +msgid "Bad branch.%s.mergeoptions string: %s"

3131 +msgstr ""

3132 +

3133 +#: builtin/merge.c:629

3134 +msgid "git write-tree failed to write a tree"

3135 +msgstr ""

3136 +

3137 +#: builtin/merge.c:679

3138 +msgid "failed to read the cache"

3139 +msgstr ""

3140 +

3141 +#: builtin/merge.c:697

3142 +msgid "Unable to write index."

3143 +msgstr ""

3144 +

3145 +#: builtin/merge.c:710

3146 +msgid "Not handling anything other than two heads merge."

3147 +msgstr ""

3148 +

3149 +#: builtin/merge.c:724

3150 +#, c-format

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

3152 +msgstr ""

3153 +

3154 +#: builtin/merge.c:738

3155 +#, c-format

3156 +msgid "unable to write %s"

3157 +msgstr ""

3158 +

3159 +#: builtin/merge.c:877

3160 +#, c-format

3161 +msgid "Could not read from '%s'"

3162 +msgstr ""

3163 +

3164 +#: builtin/merge.c:886

3165 +#, c-format

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

3167 +msgstr ""

3168 +

3169 +#: builtin/merge.c:892

3170 +msgid ""

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

3172 +"especially if it merges an updated upstream into a topic branch.\n"

3173 +"\n"

3174 +"Lines starting with '#' will be ignored, and an empty message aborts\n"

3175 +"the commit.\n"

3176 +msgstr ""

3177 +

3178 +#: builtin/merge.c:916

3179 +msgid "Empty commit message."

3180 +msgstr ""

3181 +

3182 +#: builtin/merge.c:928

3183 +#, c-format

3184 +msgid "Wonderful.\n"

3185 +msgstr ""

3186 +

3187 +#: builtin/merge.c:993

3188 +#, c-format

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

3190 +msgstr ""

3191 +

3192 +#: builtin/merge.c:1009

3193 +#, c-format

3194 +msgid "'%s' is not a commit"

3195 +msgstr ""

3196 +

3197 +#: builtin/merge.c:1050

3198 +msgid "No current branch."

3199 +msgstr ""

3200 +

3201 +#: builtin/merge.c:1052

3202 +msgid "No remote for the current branch."

3203 +msgstr ""

3204 +

3205 +#: builtin/merge.c:1054

3206 +msgid "No default upstream defined for the current branch."

3207 +msgstr ""

3208 +

3209 +#: builtin/merge.c:1059

3210 +#, c-format

3211 +msgid "No remote tracking branch for %s from %s"

3212 +msgstr ""

3213 +

3214 +#: builtin/merge.c:1146 builtin/merge.c:1303

3215 +#, c-format

3216 +msgid "%s - not something we can merge"

3217 +msgstr ""

3218 +

3219 +#: builtin/merge.c:1214

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

3221 +msgstr ""

3222 +

3223 +#: builtin/merge.c:1230 git-pull.sh:31

3224 +msgid ""

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

3226 +"Please, commit your changes before you can merge."

3227 +msgstr ""

3228 +

3229 +#: builtin/merge.c:1233 git-pull.sh:34

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

3231 +msgstr ""

3232 +

3233 +#: builtin/merge.c:1237

3234 +msgid ""

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

3236 +"Please, commit your changes before you can merge."

3237 +msgstr ""

3238 +

3239 +#: builtin/merge.c:1240

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

3241 +msgstr ""

3242 +

3243 +#: builtin/merge.c:1249

3244 +msgid "You cannot combine --squash with --no-ff."

3245 +msgstr ""

3246 +

3247 +#: builtin/merge.c:1254

3248 +msgid "You cannot combine --no-ff with --ff-only."

3249 +msgstr ""

3250 +

3251 +#: builtin/merge.c:1261

3252 +msgid "No commit specified and merge.defaultToUpstream not set."

3253 +msgstr ""

3254 +

3255 +#: builtin/merge.c:1293

3256 +msgid "Can merge only exactly one commit into empty head"

3257 +msgstr ""

3258 +

3259 +#: builtin/merge.c:1296

3260 +msgid "Squash commit into empty head not supported yet"

3261 +msgstr ""

3262 +

3263 +#: builtin/merge.c:1298

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

3265 +msgstr ""

3266 +

3267 +#: builtin/merge.c:1413

3268 +#, c-format

3269 +msgid "Updating %s..%s\n"

3270 +msgstr ""

3271 +

3272 +#: builtin/merge.c:1451

3273 +#, c-format

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

3275 +msgstr ""

3276 +

3277 +#: builtin/merge.c:1458

3278 +#, c-format

3279 +msgid "Nope.\n"

3280 +msgstr ""

3281 +

3282 +#: builtin/merge.c:1490

3283 +msgid "Not possible to fast-forward, aborting."

3284 +msgstr ""

3285 +

3286 +#: builtin/merge.c:1513 builtin/merge.c:1592

3287 +#, c-format

3288 +msgid "Rewinding the tree to pristine...\n"

3289 +msgstr ""

3290 +

3291 +#: builtin/merge.c:1517

3292 +#, c-format

3293 +msgid "Trying merge strategy %s...\n"

3294 +msgstr ""

3295 +

3296 +#: builtin/merge.c:1583

3297 +#, c-format

3298 +msgid "No merge strategy handled the merge.\n"

3299 msgstr ""

3300

3301 #: builtin/merge.c:1585

3302 #, c-format

2468 -msgid "Merge with strategy %s failed.\n"

3303 +msgid "Merge with strategy %s failed.\n"

3304 +msgstr ""

3305 +

3306 +#: builtin/merge.c:1594

3307 +#, c-format

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

3309 +msgstr ""

3310 +

3311 +#: builtin/merge.c:1606

3312 +#, c-format

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

3314 +msgstr ""

3315 +

3316 +#: builtin/mv.c:108

3317 +#, c-format

3318 +msgid "Checking rename of '%s' to '%s'\n"

3319 +msgstr ""

3320 +

3321 +#: builtin/mv.c:112

3322 +msgid "bad source"

3323 +msgstr ""

3324 +

3325 +#: builtin/mv.c:115

3326 +msgid "can not move directory into itself"

3327 +msgstr ""

3328 +

3329 +#: builtin/mv.c:118

3330 +msgid "cannot move directory over file"

3331 +msgstr ""

3332 +

3333 +#: builtin/mv.c:128

3334 +#, c-format

3335 +msgid "Huh? %.*s is in index?"

3336 +msgstr ""

3337 +

3338 +#: builtin/mv.c:140

3339 +msgid "source directory is empty"

3340 +msgstr ""

3341 +

3342 +#: builtin/mv.c:171

3343 +msgid "not under version control"

3344 +msgstr ""

3345 +

3346 +#: builtin/mv.c:173

3347 +msgid "destination exists"

3348 +msgstr ""

3349 +

3350 +#: builtin/mv.c:181

3351 +#, c-format

3352 +msgid "overwriting '%s'"

3353 +msgstr ""

3354 +

3355 +#: builtin/mv.c:184

3356 +msgid "Cannot overwrite"

3357 +msgstr ""

3358 +

3359 +#: builtin/mv.c:187

3360 +msgid "multiple sources for the same target"

3361 +msgstr ""

3362 +

3363 +#: builtin/mv.c:202

3364 +#, c-format

3365 +msgid "%s, source=%s, destination=%s"

3366 +msgstr ""

3367 +

3368 +#: builtin/mv.c:212

3369 +#, c-format

3370 +msgid "Renaming %s to %s\n"

3371 +msgstr ""

3372 +

3373 +#: builtin/mv.c:215 builtin/remote.c:731

3374 +#, c-format

3375 +msgid "renaming '%s' failed"

3376 +msgstr ""

3377 +

3378 +#: builtin/notes.c:139

3379 +#, c-format

3380 +msgid "unable to start 'show' for object '%s'"

3381 +msgstr ""

3382 +

3383 +#: builtin/notes.c:145

3384 +msgid "can't fdopen 'show' output fd"

3385 +msgstr ""

3386 +

3387 +#: builtin/notes.c:155

3388 +#, c-format

3389 +msgid "failed to close pipe to 'show' for object '%s'"

3390 msgstr ""

3391

2471 -#: builtin/merge.c:1594

3392 +#: builtin/notes.c:158

3393 #, c-format

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

3394 +msgid "failed to finish 'show' for object '%s'"

3395 msgstr ""

3396

2476 -#: builtin/merge.c:1606

3397 +#: builtin/notes.c:175 builtin/tag.c:347

3398 #, c-format

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

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

3400 msgstr ""

3401

2481 -#: builtin/mv.c:108

3402 +#: builtin/notes.c:189

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

3404 +msgstr ""

3405 +

3406 +#: builtin/notes.c:210 builtin/notes.c:973

3407 #, c-format

2483 -msgid "Checking rename of '%s' to '%s'\n"

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

3409 +msgstr ""

3410 +

3411 +#: builtin/notes.c:215

3412 +msgid "unable to write note object"

3413 +msgstr ""

3414 +

3415 +#: builtin/notes.c:217

3416 +#, c-format

3417 +msgid "The note contents has been left in %s"

3418 +msgstr ""

3419 +

3420 +#: builtin/notes.c:251 builtin/tag.c:542

3421 +#, c-format

3422 +msgid "cannot read '%s'"

3423 +msgstr ""

3424 +

3425 +#: builtin/notes.c:253 builtin/tag.c:545

3426 +#, c-format

3427 +msgid "could not open or read '%s'"

3428 +msgstr ""

3429 +

3430 +#: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447

3431 +#: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644

3432 +#: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766

3433 +#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:558

3434 +#, c-format

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

3436 +msgstr ""

3437 +

3438 +#: builtin/notes.c:275

3439 +#, c-format

3440 +msgid "Failed to read object '%s'."

3441 +msgstr ""

3442 +

3443 +#: builtin/notes.c:299

3444 +msgid "Cannot commit uninitialized/unreferenced notes tree"

3445 +msgstr ""

3446 +

3447 +#: builtin/notes.c:340

3448 +#, c-format

3449 +msgid "Bad notes.rewriteMode value: '%s'"

3450 +msgstr ""

3451 +

3452 +#: builtin/notes.c:350

3453 +#, c-format

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

3455 +msgstr ""

3456 +

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

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

3459 +#: builtin/notes.c:377

3460 +#, c-format

3461 +msgid "Bad %s value: '%s'"

3462 +msgstr ""

3463 +

3464 +#: builtin/notes.c:441

3465 +#, c-format

3466 +msgid "Malformed input line: '%s'."

3467 +msgstr ""

3468 +

3469 +#: builtin/notes.c:456

3470 +#, c-format

3471 +msgid "Failed to copy notes from '%s' to '%s'"

3472 +msgstr ""

3473 +

3474 +#: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627

3475 +#: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759

3476 +#: builtin/notes.c:1033

3477 +msgid "too many parameters"

3478 +msgstr ""

3479 +

3480 +#: builtin/notes.c:513 builtin/notes.c:772

3481 +#, c-format

3482 +msgid "No note found for object %s."

3483 +msgstr ""

3484 +

3485 +#: builtin/notes.c:580

3486 +#, c-format

3487 +msgid ""

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

3489 +"existing notes"

3490 +msgstr ""

3491 +

3492 +#: builtin/notes.c:585 builtin/notes.c:662

3493 +#, c-format

3494 +msgid "Overwriting existing notes for object %s\n"

3495 +msgstr ""

3496 +

3497 +#: builtin/notes.c:635

3498 +msgid "too few parameters"

3499 +msgstr ""

3500 +

3501 +#: builtin/notes.c:656

3502 +#, c-format

3503 +msgid ""

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

3505 +"existing notes"

3506 +msgstr ""

3507 +

3508 +#: builtin/notes.c:668

3509 +#, c-format

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

3511 +msgstr ""

3512 +

3513 +#: builtin/notes.c:717

3514 +#, c-format

3515 +msgid ""

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

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

3518 +msgstr ""

3519 +

3520 +#: builtin/notes.c:971

3521 +#, c-format

3522 +msgid "Object %s has no note\n"

3523 +msgstr ""

3524 +

3525 +#: builtin/notes.c:1103 builtin/remote.c:1598

3526 +#, c-format

3527 +msgid "Unknown subcommand: %s"

3528 +msgstr ""

3529 +

3530 +#: builtin/pack-objects.c:2315

3531 +#, c-format

3532 +msgid "unsupported index version %s"

3533 +msgstr ""

3534 +

3535 +#: builtin/pack-objects.c:2319

3536 +#, c-format

3537 +msgid "bad index version '%s'"

3538 +msgstr ""

3539 +

3540 +#: builtin/pack-objects.c:2342

3541 +#, c-format

3542 +msgid "option %s does not accept negative form"

3543 +msgstr ""

3544 +

3545 +#: builtin/pack-objects.c:2346

3546 +#, c-format

3547 +msgid "unable to parse value '%s' for option %s"

3548 +msgstr ""

3549 +

3550 +#: builtin/push.c:45

3551 +msgid "tag shorthand without <tag>"

3552 +msgstr ""

3553 +

3554 +#: builtin/push.c:64

3555 +msgid "--delete only accepts plain target ref names"

3556 +msgstr ""

3557 +

3558 +#: builtin/push.c:99

3559 +msgid ""

3560 +"\n"

3561 +"To choose either option permanently, see push.default in 'git help config'."

3562 +msgstr ""

3563 +

3564 +#: builtin/push.c:102

3565 +#, c-format

3566 +msgid ""

3567 +"The upstream branch of your current branch does not match\n"

3568 +"the name of your current branch. To push to the upstream branch\n"

3569 +"on the remote, use\n"

3570 +"\n"

3571 +" git push %s HEAD:%s\n"

3572 +"\n"

3573 +"To push to the branch of the same name on the remote, use\n"

3574 +"\n"

3575 +" git push %s %s\n"

3576 +"%s"

3577 +msgstr ""

3578 +

3579 +#: builtin/push.c:121

3580 +#, c-format

3581 +msgid ""

3582 +"You are not currently on a branch.\n"

3583 +"To push the history leading to the current (detached HEAD)\n"

3584 +"state now, use\n"

3585 +"\n"

3586 +" git push %s HEAD:<name-of-remote-branch>\n"

3587 +msgstr ""

3588 +

3589 +#: builtin/push.c:128

3590 +#, c-format

3591 +msgid ""

3592 +"The current branch %s has no upstream branch.\n"

3593 +"To push the current branch and set the remote as upstream, use\n"

3594 +"\n"

3595 +" git push --set-upstream %s %s\n"

3596 +msgstr ""

3597 +

3598 +#: builtin/push.c:136

3599 +#, c-format

3600 +msgid "The current branch %s has multiple upstream branches, refusing to push."

3601 +msgstr ""

3602 +

3603 +#: builtin/push.c:139

3604 +#, c-format

3605 +msgid ""

3606 +"You are pushing to remote '%s', which is not the upstream of\n"

3607 +"your current branch '%s', without telling me what to push\n"

3608 +"to update which remote branch."

3609 +msgstr ""

3610 +

3611 +#: builtin/push.c:174

3612 +msgid ""

3613 +"You didn't specify any refspecs to push, and push.default is \"nothing\"."

3614 +msgstr ""

3615 +

3616 +#: builtin/push.c:181

3617 +msgid ""

3618 +"Updates were rejected because the tip of your current branch is behind\n"

3619 +"its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"

3620 +"before pushing again.\n"

3621 +"See the 'Note about fast-forwards' in 'git push --help' for details."

3622 +msgstr ""

3623 +

3624 +#: builtin/push.c:187

3625 +msgid ""

3626 +"Updates were rejected because a pushed branch tip is behind its remote\n"

3627 +"counterpart. If you did not intend to push that branch, you may want to\n"

3628 +"specify branches to push or set the 'push.default' configuration\n"

3629 +"variable to 'current' or 'upstream' to push only the current branch."

3630 +msgstr ""

3631 +

3632 +#: builtin/push.c:193

3633 +msgid ""

3634 +"Updates were rejected because a pushed branch tip is behind its remote\n"

3635 +"counterpart. Check out this branch and merge the remote changes\n"

3636 +"(e.g. 'git pull') before pushing again.\n"

3637 +"See the 'Note about fast-forwards' in 'git push --help' for details."

3638 +msgstr ""

3639 +

3640 +#: builtin/push.c:233

3641 +#, c-format

3642 +msgid "Pushing to %s\n"

3643 +msgstr ""

3644 +

3645 +#: builtin/push.c:237

3646 +#, c-format

3647 +msgid "failed to push some refs to '%s'"

3648 +msgstr ""

3649 +

3650 +#: builtin/push.c:269

3651 +#, c-format

3652 +msgid "bad repository '%s'"

3653 +msgstr ""

3654 +

3655 +#: builtin/push.c:270

3656 +msgid ""

3657 +"No configured push destination.\n"

3658 +"Either specify the URL from the command-line or configure a remote "

3659 +"repository using\n"

3660 +"\n"

3661 +" git remote add <name> <url>\n"

3662 +"\n"

3663 +"and then push using the remote name\n"

3664 +"\n"

3665 +" git push <name>\n"

3666 +msgstr ""

3667 +

3668 +#: builtin/push.c:285

3669 +msgid "--all and --tags are incompatible"

3670 +msgstr ""

3671 +

3672 +#: builtin/push.c:286

3673 +msgid "--all can't be combined with refspecs"

3674 +msgstr ""

3675 +

3676 +#: builtin/push.c:291

3677 +msgid "--mirror and --tags are incompatible"

3678 msgstr ""

3679

2486 -#: builtin/mv.c:112

2487 -msgid "bad source"

3680 +#: builtin/push.c:292

3681 +msgid "--mirror can't be combined with refspecs"

3682 msgstr ""

3683

2490 -#: builtin/mv.c:115

2491 -msgid "can not move directory into itself"

3684 +#: builtin/push.c:297

3685 +msgid "--all and --mirror are incompatible"

3686 msgstr ""

3687

2494 -#: builtin/mv.c:118

2495 -msgid "cannot move directory over file"

3688 +#: builtin/push.c:385

3689 +msgid "--delete is incompatible with --all, --mirror and --tags"

3690 msgstr ""

3691

2498 -#: builtin/mv.c:128

2499 -#, c-format

2500 -msgid "Huh? %.*s is in index?"

3692 +#: builtin/push.c:387

3693 +msgid "--delete doesn't make sense without any refs"

3694 msgstr ""

3695

2503 -#: builtin/mv.c:140

2504 -msgid "source directory is empty"

3696 +#: builtin/remote.c:98

3697 +#, c-format

3698 +msgid "Updating %s"

3699 msgstr ""

3700

2507 -#: builtin/mv.c:171

2508 -msgid "not under version control"

3701 +#: builtin/remote.c:130

3702 +msgid ""

3703 +"--mirror is dangerous and deprecated; please\n"

3704 +"\t use --mirror=fetch or --mirror=push instead"

3705 msgstr ""

3706

2511 -#: builtin/mv.c:173

2512 -msgid "destination exists"

3707 +#: builtin/remote.c:147

3708 +#, c-format

3709 +msgid "unknown mirror argument: %s"

3710 msgstr ""

3711

2515 -#: builtin/mv.c:181

2516 -#, c-format

2517 -msgid "overwriting '%s'"

3712 +#: builtin/remote.c:185

3713 +msgid "specifying a master branch makes no sense with --mirror"

3714 msgstr ""

3715

2520 -#: builtin/mv.c:184

2521 -msgid "Cannot overwrite"

3716 +#: builtin/remote.c:187

3717 +msgid "specifying branches to track makes sense only with fetch mirrors"

3718 msgstr ""

3719

2524 -#: builtin/mv.c:187

2525 -msgid "multiple sources for the same target"

3720 +#: builtin/remote.c:195 builtin/remote.c:646

3721 +#, c-format

3722 +msgid "remote %s already exists."

3723 msgstr ""

3724

2528 -#: builtin/mv.c:202

3725 +#: builtin/remote.c:199 builtin/remote.c:650

3726 #, c-format

2530 -msgid "%s, source=%s, destination=%s"

3727 +msgid "'%s' is not a valid remote name"

3728 msgstr ""

3729

2533 -#: builtin/mv.c:212

3730 +#: builtin/remote.c:243

3731 #, c-format

2535 -msgid "Renaming %s to %s\n"

3732 +msgid "Could not setup master '%s'"

3733 msgstr ""

3734

2538 -#: builtin/mv.c:215

3735 +#: builtin/remote.c:299

3736 #, c-format

2540 -msgid "renaming '%s' failed"

3737 +msgid "more than one %s"

3738 msgstr ""

3739

2543 -#: builtin/notes.c:139

3740 +#: builtin/remote.c:339

3741 #, c-format

2545 -msgid "unable to start 'show' for object '%s'"

3742 +msgid "Could not get fetch map for refspec %s"

3743 msgstr ""

3744

2548 -#: builtin/notes.c:145

2549 -msgid "can't fdopen 'show' output fd"

3745 +#: builtin/remote.c:440 builtin/remote.c:448

3746 +msgid "(matching)"

3747 msgstr ""

3748

2552 -#: builtin/notes.c:155

3749 +#: builtin/remote.c:452

3750 +msgid "(delete)"

3751 +msgstr ""

3752 +

3753 +#: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607

3754 #, c-format

2554 -msgid "failed to close pipe to 'show' for object '%s'"

3755 +msgid "Could not append '%s' to '%s'"

3756 msgstr ""

3757

2557 -#: builtin/notes.c:158

3758 +#: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890

3759 #, c-format

2559 -msgid "failed to finish 'show' for object '%s'"

3760 +msgid "No such remote: %s"

3761 msgstr ""

3762

2562 -#: builtin/notes.c:175 builtin/tag.c:343

3763 +#: builtin/remote.c:656

3764 #, c-format

2564 -msgid "could not create file '%s'"

3765 +msgid "Could not rename config section '%s' to '%s'"

3766 msgstr ""

3767

2567 -#: builtin/notes.c:189

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

3768 +#: builtin/remote.c:662 builtin/remote.c:799

3769 +#, c-format

3770 +msgid "Could not remove config section '%s'"

3771 msgstr ""

3772

2571 -#: builtin/notes.c:210 builtin/notes.c:973

3773 +#: builtin/remote.c:677

3774 #, c-format

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

3775 +msgid ""

3776 +"Not updating non-default fetch respec\n"

3777 +"\t%s\n"

3778 +"\tPlease update the configuration manually if necessary."

3779 msgstr ""

3780

2576 -#: builtin/notes.c:215

2577 -msgid "unable to write note object"

3781 +#: builtin/remote.c:683

3782 +#, c-format

3783 +msgid "Could not append '%s'"

3784 msgstr ""

3785

2580 -#: builtin/notes.c:217

3786 +#: builtin/remote.c:694

3787 #, c-format

2582 -msgid "The note contents has been left in %s"

3788 +msgid "Could not set '%s'"

3789 msgstr ""

3790

2585 -#: builtin/notes.c:251 builtin/tag.c:521

3791 +#: builtin/remote.c:716

3792 #, c-format

2587 -msgid "cannot read '%s'"

3793 +msgid "deleting '%s' failed"

3794 msgstr ""

3795

2590 -#: builtin/notes.c:253 builtin/tag.c:524

3796 +#: builtin/remote.c:750

3797 #, c-format

2592 -msgid "could not open or read '%s'"

3798 +msgid "creating '%s' failed"

3799 msgstr ""

3800

2595 -#: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447

2596 -#: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644

2597 -#: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766

2598 -#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:537

3801 +#: builtin/remote.c:764

3802 #, c-format

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

3803 +msgid "Could not remove branch %s"

3804 msgstr ""

3805

2603 -#: builtin/notes.c:275

3806 +#: builtin/remote.c:834

3807 +msgid ""

3808 +"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"

3809 +"to delete it, use:"

3810 +msgid_plural ""

3811 +"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"

3812 +"to delete them, use:"

3813 +msgstr[0] ""

3814 +msgstr[1] ""

3815 +

3816 +#: builtin/remote.c:943

3817 #, c-format

2605 -msgid "Failed to read object '%s'."

3818 +msgid " new (next fetch will store in remotes/%s)"

3819 msgstr ""

3820

2608 -#: builtin/notes.c:299

2609 -msgid "Cannot commit uninitialized/unreferenced notes tree"

3821 +#: builtin/remote.c:946

3822 +msgid " tracked"

3823 msgstr ""

3824

2612 -#: builtin/notes.c:340

2613 -#, c-format

2614 -msgid "Bad notes.rewriteMode value: '%s'"

3825 +#: builtin/remote.c:948

3826 +msgid " stale (use 'git remote prune' to remove)"

3827 msgstr ""

3828

2617 -#: builtin/notes.c:350

2618 -#, c-format

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

3829 +#: builtin/remote.c:950

3830 +msgid " ???"

3831 msgstr ""

3832

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

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

2624 -#: builtin/notes.c:377

3833 +#: builtin/remote.c:991

3834 #, c-format

2626 -msgid "Bad %s value: '%s'"

3835 +msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"

3836 msgstr ""

3837

2629 -#: builtin/notes.c:441

3838 +#: builtin/remote.c:998

3839 #, c-format

2631 -msgid "Malformed input line: '%s'."

3840 +msgid "rebases onto remote %s"

3841 msgstr ""

3842

2634 -#: builtin/notes.c:456

3843 +#: builtin/remote.c:1001

3844 #, c-format

2636 -msgid "Failed to copy notes from '%s' to '%s'"

3845 +msgid " merges with remote %s"

3846 msgstr ""

3847

2639 -#: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627

2640 -#: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759

2641 -#: builtin/notes.c:1033

2642 -msgid "too many parameters"

3848 +#: builtin/remote.c:1002

3849 +msgid " and with remote"

3850 msgstr ""

3851

2645 -#: builtin/notes.c:513 builtin/notes.c:772

3852 +#: builtin/remote.c:1004

3853 #, c-format

2647 -msgid "No note found for object %s."

3854 +msgid "merges with remote %s"

3855 msgstr ""

3856

2650 -#: builtin/notes.c:580

2651 -#, c-format

2652 -msgid ""

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

2654 -"existing notes"

3857 +#: builtin/remote.c:1005

3858 +msgid " and with remote"

3859 msgstr ""

3860

2657 -#: builtin/notes.c:585 builtin/notes.c:662

2658 -#, c-format

2659 -msgid "Overwriting existing notes for object %s\n"

3861 +#: builtin/remote.c:1051

3862 +msgid "create"

3863 msgstr ""

3864

2662 -#: builtin/notes.c:635

2663 -msgid "too few parameters"

3865 +#: builtin/remote.c:1054

3866 +msgid "delete"

3867 msgstr ""

3868

2666 -#: builtin/notes.c:656

2667 -#, c-format

2668 -msgid ""

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

2670 -"existing notes"

3869 +#: builtin/remote.c:1058

3870 +msgid "up to date"

3871 msgstr ""

3872

2673 -#: builtin/notes.c:668

2674 -#, c-format

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

3873 +#: builtin/remote.c:1061

3874 +msgid "fast-forwardable"

3875 msgstr ""

3876

2678 -#: builtin/notes.c:717

2679 -#, c-format

2680 -msgid ""

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

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

3877 +#: builtin/remote.c:1064

3878 +msgid "local out of date"

3879 msgstr ""

3880

2685 -#: builtin/notes.c:971

3881 +#: builtin/remote.c:1071

3882 #, c-format

2687 -msgid "Object %s has no note\n"

3883 +msgid " %-*s forces to %-*s (%s)"

3884 msgstr ""

3885

2690 -#: builtin/notes.c:1103

3886 +#: builtin/remote.c:1074

3887 #, c-format

2692 -msgid "Unknown subcommand: %s"

3888 +msgid " %-*s pushes to %-*s (%s)"

3889 msgstr ""

3890

2695 -#: builtin/pack-objects.c:2310

3891 +#: builtin/remote.c:1078

3892 #, c-format

2697 -msgid "unsupported index version %s"

3893 +msgid " %-*s forces to %s"

3894 msgstr ""

3895

2700 -#: builtin/pack-objects.c:2314

3896 +#: builtin/remote.c:1081

3897 #, c-format

2702 -msgid "bad index version '%s'"

3898 +msgid " %-*s pushes to %s"

3899 msgstr ""

3900

2705 -#: builtin/pack-objects.c:2322

3901 +#: builtin/remote.c:1118

3902 #, c-format

2707 -msgid "option %s does not accept negative form"

3903 +msgid "* remote %s"

3904 msgstr ""

3905

2710 -#: builtin/pack-objects.c:2326

3906 +#: builtin/remote.c:1119

3907 #, c-format

2712 -msgid "unable to parse value '%s' for option %s"

3908 +msgid " Fetch URL: %s"

3909 msgstr ""

3910

2715 -#: builtin/push.c:45

2716 -msgid "tag shorthand without <tag>"

3911 +#: builtin/remote.c:1120 builtin/remote.c:1285

3912 +msgid "(no URL)"

3913 msgstr ""

3914

2719 -#: builtin/push.c:64

2720 -msgid "--delete only accepts plain target ref names"

3915 +#: builtin/remote.c:1129 builtin/remote.c:1131

3916 +#, c-format

3917 +msgid " Push URL: %s"

3918 msgstr ""

3919

2723 -#: builtin/push.c:84

3920 +#: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137

3921 #, c-format

2725 -msgid ""

2726 -"You are not currently on a branch.\n"

2727 -"To push the history leading to the current (detached HEAD)\n"

2728 -"state now, use\n"

2729 -"\n"

2730 -" git push %s HEAD:<name-of-remote-branch>\n"

3922 +msgid " HEAD branch: %s"

3923 msgstr ""

3924

2733 -#: builtin/push.c:91

3925 +#: builtin/remote.c:1139

3926 #, c-format

3927 msgid ""

2736 -"The current branch %s has no upstream branch.\n"

2737 -"To push the current branch and set the remote as upstream, use\n"

2738 -"\n"

2739 -" git push --set-upstream %s %s\n"

3928 +" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"

3929 msgstr ""

3930

2742 -#: builtin/push.c:99

3931 +#: builtin/remote.c:1151

3932 #, c-format

2744 -msgid "The current branch %s has multiple upstream branches, refusing to push."

3933 +msgid " Remote branch:%s"

3934 +msgid_plural " Remote branches:%s"

3935 +msgstr[0] ""

3936 +msgstr[1] ""

3937 +

3938 +#: builtin/remote.c:1154 builtin/remote.c:1181

3939 +msgid " (status not queried)"

3940 msgstr ""

3941

2747 -#: builtin/push.c:102

3942 +#: builtin/remote.c:1163

3943 +msgid " Local branch configured for 'git pull':"

3944 +msgid_plural " Local branches configured for 'git pull':"

3945 +msgstr[0] ""

3946 +msgstr[1] ""

3947 +

3948 +#: builtin/remote.c:1171

3949 +msgid " Local refs will be mirrored by 'git push'"

3950 +msgstr ""

3951 +

3952 +#: builtin/remote.c:1178

3953 #, c-format

2749 -msgid ""

2750 -"You are pushing to remote '%s', which is not the upstream of\n"

2751 -"your current branch '%s', without telling me what to push\n"

2752 -"to update which remote branch."

3954 +msgid " Local ref configured for 'git push'%s:"

3955 +msgid_plural " Local refs configured for 'git push'%s:"

3956 +msgstr[0] ""

3957 +msgstr[1] ""

3958 +

3959 +#: builtin/remote.c:1216

3960 +msgid "Cannot determine remote HEAD"

3961 msgstr ""

3962

2755 -#: builtin/push.c:131

2756 -msgid ""

2757 -"You didn't specify any refspecs to push, and push.default is \"nothing\"."

3963 +#: builtin/remote.c:1218

3964 +msgid "Multiple remote HEAD branches. Please choose one explicitly with:"

3965 msgstr ""

3966

2760 -#: builtin/push.c:138

2761 -msgid ""

2762 -"Updates were rejected because the tip of your current branch is behind\n"

2763 -"its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"

2764 -"before pushing again.\n"

2765 -"See the 'Note about fast-forwards' in 'git push --help' for details."

3967 +#: builtin/remote.c:1228

3968 +#, c-format

3969 +msgid "Could not delete %s"

3970 msgstr ""

3971

2768 -#: builtin/push.c:144

2769 -msgid ""

2770 -"Updates were rejected because a pushed branch tip is behind its remote\n"

2771 -"counterpart. If you did not intend to push that branch, you may want to\n"

2772 -"specify branches to push or set the 'push.default' configuration\n"

2773 -"variable to 'current' or 'upstream' to push only the current branch."

3972 +#: builtin/remote.c:1236

3973 +#, c-format

3974 +msgid "Not a valid ref: %s"

3975 msgstr ""

3976

2776 -#: builtin/push.c:150

2777 -msgid ""

2778 -"Updates were rejected because a pushed branch tip is behind its remote\n"

2779 -"counterpart. Check out this branch and merge the remote changes\n"

2780 -"(e.g. 'git pull') before pushing again.\n"

2781 -"See the 'Note about fast-forwards' in 'git push --help' for details."

3977 +#: builtin/remote.c:1238

3978 +#, c-format

3979 +msgid "Could not setup %s"

3980 msgstr ""

3981

2784 -#: builtin/push.c:190

3982 +#: builtin/remote.c:1274

3983 #, c-format

2786 -msgid "Pushing to %s\n"

3984 +msgid " %s will become dangling!"

3985 msgstr ""

3986

2789 -#: builtin/push.c:194

3987 +#: builtin/remote.c:1275

3988 #, c-format

2791 -msgid "failed to push some refs to '%s'"

3989 +msgid " %s has become dangling!"

3990 msgstr ""

3991

2794 -#: builtin/push.c:226

3992 +#: builtin/remote.c:1281

3993 #, c-format

2796 -msgid "bad repository '%s'"

3994 +msgid "Pruning %s"

3995 msgstr ""

3996

2799 -#: builtin/push.c:227

2800 -msgid ""

2801 -"No configured push destination.\n"

2802 -"Either specify the URL from the command-line or configure a remote "

2803 -"repository using\n"

2804 -"\n"

2805 -" git remote add <name> <url>\n"

2806 -"\n"

2807 -"and then push using the remote name\n"

2808 -"\n"

2809 -" git push <name>\n"

3997 +#: builtin/remote.c:1282

3998 +#, c-format

3999 +msgid "URL: %s"

4000 msgstr ""

4001

2812 -#: builtin/push.c:242

2813 -msgid "--all and --tags are incompatible"

4002 +#: builtin/remote.c:1295

4003 +#, c-format

4004 +msgid " * [would prune] %s"

4005 msgstr ""

4006

2816 -#: builtin/push.c:243

2817 -msgid "--all can't be combined with refspecs"

4007 +#: builtin/remote.c:1298

4008 +#, c-format

4009 +msgid " * [pruned] %s"

4010 msgstr ""

4011

2820 -#: builtin/push.c:248

2821 -msgid "--mirror and --tags are incompatible"

4012 +#: builtin/remote.c:1387 builtin/remote.c:1461

4013 +#, c-format

4014 +msgid "No such remote '%s'"

4015 msgstr ""

4016

2824 -#: builtin/push.c:249

2825 -msgid "--mirror can't be combined with refspecs"

4017 +#: builtin/remote.c:1414

4018 +msgid "no remote specified"

4019 msgstr ""

4020

2828 -#: builtin/push.c:254

2829 -msgid "--all and --mirror are incompatible"

4021 +#: builtin/remote.c:1447

4022 +msgid "--add --delete doesn't make sense"

4023 msgstr ""

4024

2832 -#: builtin/push.c:342

2833 -msgid "--delete is incompatible with --all, --mirror and --tags"

4025 +#: builtin/remote.c:1487

4026 +#, c-format

4027 +msgid "Invalid old URL pattern: %s"

4028 msgstr ""

4029

2836 -#: builtin/push.c:344

2837 -msgid "--delete doesn't make sense without any refs"

4030 +#: builtin/remote.c:1495

4031 +#, c-format

4032 +msgid "No such URL found: %s"

4033 +msgstr ""

4034 +

4035 +#: builtin/remote.c:1497

4036 +msgid "Will not delete all non-push URLs"

4037 msgstr ""

4038

4039 #: builtin/reset.c:33

@@ -2849,6 +4048,10 @@ msgstr ""

4048 msgid "hard"

4049 msgstr ""

l10n: Update git.pot (275 new, 15 removed messages)