3d0a05b464 · 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: 2019-08-10 20:12+0800\n"

11 +"POT-Creation-Date: 2019-10-21 19:55+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"

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

58 msgid "Exiting because of an unresolved conflict."

59 msgstr ""

60

61 -#: advice.c:193 builtin/merge.c:1327

61 +#: advice.c:193 builtin/merge.c:1332

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

63 msgstr ""

64

@@ -176,17 +176,7 @@ msgstr ""

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

177 msgstr ""

178

179 -#: apply.c:1460

180 -#, c-format

181 -msgid "recount: unexpected line: %.*s"

182 -msgstr ""

183 -

184 -#: apply.c:1529

185 -#, c-format

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

187 -msgstr ""

188 -

189 -#: apply.c:1551

179 +#: apply.c:1372

180 #, c-format

181 msgid ""

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

@@ -197,527 +187,537 @@ msgid_plural ""

187 msgstr[0] ""

188 msgstr[1] ""

189

200 -#: apply.c:1564

190 +#: apply.c:1385

191 #, c-format

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

193 msgstr ""

194

205 -#: apply.c:1752

195 +#: apply.c:1481

196 +#, c-format

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

198 +msgstr ""

199 +

200 +#: apply.c:1550

201 +#, c-format

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

203 +msgstr ""

204 +

205 +#: apply.c:1753

206 msgid "new file depends on old contents"

207 msgstr ""

208

209 -#: apply.c:1754

209 +#: apply.c:1755

210 msgid "deleted file still has contents"

211 msgstr ""

212

213 -#: apply.c:1788

213 +#: apply.c:1789

214 #, c-format

215 msgid "corrupt patch at line %d"

216 msgstr ""

217

218 -#: apply.c:1825

218 +#: apply.c:1826

219 #, c-format

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

221 msgstr ""

222

223 -#: apply.c:1827

223 +#: apply.c:1828

224 #, c-format

225 msgid "deleted file %s still has contents"

226 msgstr ""

227

228 -#: apply.c:1830

228 +#: apply.c:1831

229 #, c-format

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

231 msgstr ""

232

233 -#: apply.c:1977

233 +#: apply.c:1978

234 #, c-format

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

236 msgstr ""

237

238 -#: apply.c:2014

238 +#: apply.c:2015

239 #, c-format

240 msgid "unrecognized binary patch at line %d"

241 msgstr ""

242

243 -#: apply.c:2176

243 +#: apply.c:2177

244 #, c-format

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

246 msgstr ""

247

248 -#: apply.c:2262

248 +#: apply.c:2263

249 #, c-format

250 msgid "unable to read symlink %s"

251 msgstr ""

252

253 -#: apply.c:2266

253 +#: apply.c:2267

254 #, c-format

255 msgid "unable to open or read %s"

256 msgstr ""

257

258 -#: apply.c:2925

258 +#: apply.c:2926

259 #, c-format

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

261 msgstr ""

262

263 -#: apply.c:3046

263 +#: apply.c:3047

264 #, c-format

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

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

267 msgstr[0] ""

268 msgstr[1] ""

269

270 -#: apply.c:3058

270 +#: apply.c:3059

271 #, c-format

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

273 msgstr ""

274

275 -#: apply.c:3064

275 +#: apply.c:3065

276 #, c-format

277 msgid ""

278 "while searching for:\n"

279 "%.*s"

280 msgstr ""

281

282 -#: apply.c:3086

282 +#: apply.c:3087

283 #, c-format

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

285 msgstr ""

286

287 -#: apply.c:3094

287 +#: apply.c:3095

288 #, c-format

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

290 msgstr ""

291

292 -#: apply.c:3141

292 +#: apply.c:3142

293 #, c-format

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

295 msgstr ""

296

297 -#: apply.c:3151

297 +#: apply.c:3152

298 #, c-format

299 msgid ""

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

301 msgstr ""

302

303 -#: apply.c:3159

303 +#: apply.c:3160

304 #, c-format

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

306 msgstr ""

307

308 -#: apply.c:3177

308 +#: apply.c:3178

309 #, c-format

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

311 msgstr ""

312

313 -#: apply.c:3190

313 +#: apply.c:3191

314 #, c-format

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

316 msgstr ""

317

318 -#: apply.c:3196

318 +#: apply.c:3197

319 #, c-format

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

321 msgstr ""

322

323 -#: apply.c:3217

323 +#: apply.c:3218

324 #, c-format

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

326 msgstr ""

327

328 -#: apply.c:3340

328 +#: apply.c:3341

329 #, c-format

330 msgid "cannot checkout %s"

331 msgstr ""

332

333 -#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279

333 +#: apply.c:3393 apply.c:3404 apply.c:3450 midx.c:61 setup.c:280

334 #, c-format

335 msgid "failed to read %s"

336 msgstr ""

337

338 -#: apply.c:3400

338 +#: apply.c:3401

339 #, c-format

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

341 msgstr ""

342

343 -#: apply.c:3429 apply.c:3672

343 +#: apply.c:3430 apply.c:3673

344 #, c-format

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

346 msgstr ""

347

348 -#: apply.c:3515 apply.c:3687

348 +#: apply.c:3516 apply.c:3688

349 #, c-format

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

351 msgstr ""

352

353 -#: apply.c:3524 apply.c:3695

353 +#: apply.c:3525 apply.c:3696

354 #, c-format

355 msgid "%s: does not match index"

356 msgstr ""

357

358 -#: apply.c:3559

358 +#: apply.c:3560

359 msgid "repository lacks the necessary blob to fall back on 3-way merge."

360 msgstr ""

361

362 -#: apply.c:3562

362 +#: apply.c:3563

363 #, c-format

364 msgid "Falling back to three-way merge...\n"

365 msgstr ""

366

367 -#: apply.c:3578 apply.c:3582

367 +#: apply.c:3579 apply.c:3583

368 #, c-format

369 msgid "cannot read the current contents of '%s'"

370 msgstr ""

371

372 -#: apply.c:3594

372 +#: apply.c:3595

373 #, c-format

374 msgid "Failed to fall back on three-way merge...\n"

375 msgstr ""

376

377 -#: apply.c:3608

377 +#: apply.c:3609

378 #, c-format

379 msgid "Applied patch to '%s' with conflicts.\n"

380 msgstr ""

381

382 -#: apply.c:3613

382 +#: apply.c:3614

383 #, c-format

384 msgid "Applied patch to '%s' cleanly.\n"

385 msgstr ""

386

387 -#: apply.c:3639

387 +#: apply.c:3640

388 msgid "removal patch leaves file contents"

389 msgstr ""

390

391 -#: apply.c:3712

391 +#: apply.c:3713

392 #, c-format

393 msgid "%s: wrong type"

394 msgstr ""

395

396 -#: apply.c:3714

396 +#: apply.c:3715

397 #, c-format

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

399 msgstr ""

400

401 -#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856

401 +#: apply.c:3866 apply.c:3868 read-cache.c:830 read-cache.c:856

402 #: read-cache.c:1309

403 #, c-format

404 msgid "invalid path '%s'"

405 msgstr ""

406

407 -#: apply.c:3923

407 +#: apply.c:3924

408 #, c-format

409 msgid "%s: already exists in index"

410 msgstr ""

411

412 -#: apply.c:3926

412 +#: apply.c:3927

413 #, c-format

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

415 msgstr ""

416

417 -#: apply.c:3946

417 +#: apply.c:3947

418 #, c-format

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

420 msgstr ""

421

422 -#: apply.c:3951

422 +#: apply.c:3952

423 #, c-format

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

425 msgstr ""

426

427 -#: apply.c:3971

427 +#: apply.c:3972

428 #, c-format

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

430 msgstr ""

431

432 -#: apply.c:3975

432 +#: apply.c:3976

433 #, c-format

434 msgid "%s: patch does not apply"

435 msgstr ""

436

437 -#: apply.c:3990

437 +#: apply.c:3991

438 #, c-format

439 msgid "Checking patch %s..."

440 msgstr ""

441

442 -#: apply.c:4082

442 +#: apply.c:4083

443 #, c-format

444 msgid "sha1 information is lacking or useless for submodule %s"

445 msgstr ""

446

447 -#: apply.c:4089

447 +#: apply.c:4090

448 #, c-format

449 msgid "mode change for %s, which is not in current HEAD"

450 msgstr ""

451

452 -#: apply.c:4092

452 +#: apply.c:4093

453 #, c-format

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

455 msgstr ""

456

457 -#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143

457 +#: apply.c:4098 builtin/checkout.c:279 builtin/reset.c:143

458 #, c-format

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

460 msgstr ""

461

462 -#: apply.c:4101

462 +#: apply.c:4102

463 #, c-format

464 msgid "could not add %s to temporary index"

465 msgstr ""

466

467 -#: apply.c:4111

467 +#: apply.c:4112

468 #, c-format

469 msgid "could not write temporary index to %s"

470 msgstr ""

471

472 -#: apply.c:4249

472 +#: apply.c:4250

473 #, c-format

474 msgid "unable to remove %s from index"

475 msgstr ""

476

477 -#: apply.c:4283

477 +#: apply.c:4284

478 #, c-format

479 msgid "corrupt patch for submodule %s"

480 msgstr ""

481

482 -#: apply.c:4289

482 +#: apply.c:4290

483 #, c-format

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

485 msgstr ""

486

487 -#: apply.c:4297

487 +#: apply.c:4298

488 #, c-format

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

490 msgstr ""

491

492 -#: apply.c:4303 apply.c:4448

492 +#: apply.c:4304 apply.c:4449

493 #, c-format

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

495 msgstr ""

496

497 -#: apply.c:4346

497 +#: apply.c:4347

498 #, c-format

499 msgid "failed to write to '%s'"

500 msgstr ""

501

502 -#: apply.c:4350

502 +#: apply.c:4351

503 #, c-format

504 msgid "closing file '%s'"

505 msgstr ""

506

507 -#: apply.c:4420

507 +#: apply.c:4421

508 #, c-format

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

510 msgstr ""

511

512 -#: apply.c:4518

512 +#: apply.c:4519

513 #, c-format

514 msgid "Applied patch %s cleanly."

515 msgstr ""

516

517 -#: apply.c:4526

517 +#: apply.c:4527

518 msgid "internal error"

519 msgstr ""

520

521 -#: apply.c:4529

521 +#: apply.c:4530

522 #, c-format

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

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

525 msgstr[0] ""

526 msgstr[1] ""

527

528 -#: apply.c:4540

528 +#: apply.c:4541

529 #, c-format

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

531 msgstr ""

532

533 -#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168

533 +#: apply.c:4549 builtin/fetch.c:898 builtin/fetch.c:1194

534 #, c-format

535 msgid "cannot open %s"

536 msgstr ""

537

538 -#: apply.c:4562

538 +#: apply.c:4563

539 #, c-format

540 msgid "Hunk #%d applied cleanly."

541 msgstr ""

542

543 -#: apply.c:4566

543 +#: apply.c:4567

544 #, c-format

545 msgid "Rejected hunk #%d."

546 msgstr ""

547

548 -#: apply.c:4676

548 +#: apply.c:4686

549 #, c-format

550 msgid "Skipped patch '%s'."

551 msgstr ""

552

553 -#: apply.c:4684

553 +#: apply.c:4694

554 msgid "unrecognized input"

555 msgstr ""

556

557 -#: apply.c:4704

557 +#: apply.c:4714

558 msgid "unable to read index file"

559 msgstr ""

560

561 -#: apply.c:4859

561 +#: apply.c:4871

562 #, c-format

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

564 msgstr ""

565

566 -#: apply.c:4886

566 +#: apply.c:4898

567 #, c-format

568 msgid "squelched %d whitespace error"

569 msgid_plural "squelched %d whitespace errors"

570 msgstr[0] ""

571 msgstr[1] ""

572

573 -#: apply.c:4892 apply.c:4907

573 +#: apply.c:4904 apply.c:4919

574 #, c-format

575 msgid "%d line adds whitespace errors."

576 msgid_plural "%d lines add whitespace errors."

577 msgstr[0] ""

578 msgstr[1] ""

579

580 -#: apply.c:4900

580 +#: apply.c:4912

581 #, c-format

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

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

584 msgstr[0] ""

585 msgstr[1] ""

586

587 -#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390

587 +#: apply.c:4928 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390

588 msgid "Unable to write new index file"

589 msgstr ""

590

591 -#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211

592 -#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273

593 -#: builtin/pull.c:208 builtin/submodule--helper.c:407

591 +#: apply.c:4955 apply.c:4958 builtin/am.c:2197 builtin/am.c:2200

592 +#: builtin/clone.c:122 builtin/fetch.c:143 builtin/merge.c:273

593 +#: builtin/pull.c:209 builtin/submodule--helper.c:407

594 #: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370

595 #: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853

596 #: builtin/submodule--helper.c:2092 git-add--interactive.perl:211

597 msgid "path"

598 msgstr ""

599

600 -#: apply.c:4944

600 +#: apply.c:4956

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

602 msgstr ""

603

604 -#: apply.c:4947

604 +#: apply.c:4959

605 msgid "apply changes matching the given path"

606 msgstr ""

607

608 -#: apply.c:4949 builtin/am.c:2217

608 +#: apply.c:4961 builtin/am.c:2206

609 msgid "num"

610 msgstr ""

611

612 -#: apply.c:4950

612 +#: apply.c:4962

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

614 msgstr ""

615

616 -#: apply.c:4953

616 +#: apply.c:4965

617 msgid "ignore additions made by the patch"

618 msgstr ""

619

620 -#: apply.c:4955

620 +#: apply.c:4967

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

622 msgstr ""

623

624 -#: apply.c:4959

624 +#: apply.c:4971

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

626 msgstr ""

627

628 -#: apply.c:4961

628 +#: apply.c:4973

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

630 msgstr ""

631

632 -#: apply.c:4963

632 +#: apply.c:4975

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

634 msgstr ""

635

636 -#: apply.c:4965

636 +#: apply.c:4977

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

638 msgstr ""

639

640 -#: apply.c:4967

640 +#: apply.c:4979

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

642 msgstr ""

643

644 -#: apply.c:4969

644 +#: apply.c:4981

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

646 msgstr ""

647

648 -#: apply.c:4971

648 +#: apply.c:4983

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

650 msgstr ""

651

652 -#: apply.c:4974

652 +#: apply.c:4986

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

654 msgstr ""

655

656 -#: apply.c:4976

656 +#: apply.c:4988

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

658 msgstr ""

659

660 -#: apply.c:4978

660 +#: apply.c:4990

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

662 msgstr ""

663

664 -#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524

664 +#: apply.c:4993 builtin/checkout-index.c:173 builtin/ls-files.c:524

665 msgid "paths are separated with NUL character"

666 msgstr ""

667

668 -#: apply.c:4983

668 +#: apply.c:4995

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

670 msgstr ""

671

672 -#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98

672 +#: apply.c:4996 builtin/am.c:2185 builtin/interpret-trailers.c:98

673 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102

674 -#: builtin/pack-objects.c:3330 builtin/rebase.c:1421

674 +#: builtin/pack-objects.c:3310 builtin/rebase.c:1445

675 msgid "action"

676 msgstr ""

677

678 -#: apply.c:4985

678 +#: apply.c:4997

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

680 msgstr ""

681

682 -#: apply.c:4988 apply.c:4991

682 +#: apply.c:5000 apply.c:5003

683 msgid "ignore changes in whitespace when finding context"

684 msgstr ""

685

686 -#: apply.c:4994

686 +#: apply.c:5006

687 msgid "apply the patch in reverse"

688 msgstr ""

689

690 -#: apply.c:4996

690 +#: apply.c:5008

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

692 msgstr ""

693

694 -#: apply.c:4998

694 +#: apply.c:5010

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

696 msgstr ""

697

698 -#: apply.c:5000

698 +#: apply.c:5012

699 msgid "allow overlapping hunks"

700 msgstr ""

701

702 -#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22

702 +#: apply.c:5013 builtin/add.c:291 builtin/check-ignore.c:22

703 #: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786

704 -#: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128

704 +#: builtin/log.c:2085 builtin/mv.c:123 builtin/read-tree.c:128

705 msgid "be verbose"

706 msgstr ""

707

708 -#: apply.c:5003

708 +#: apply.c:5015

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

710 msgstr ""

711

712 -#: apply.c:5006

712 +#: apply.c:5018

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

714 msgstr ""

715

716 -#: apply.c:5008 builtin/am.c:2205

716 +#: apply.c:5020 builtin/am.c:2194

717 msgid "root"

718 msgstr ""

719

720 -#: apply.c:5009

720 +#: apply.c:5021

721 msgid "prepend <root> to all filenames"

722 msgstr ""

723

@@ -770,7 +770,7 @@ msgstr ""

770 msgid "archive format"

771 msgstr ""

772

773 -#: archive.c:458 builtin/log.c:1580

773 +#: archive.c:458 builtin/log.c:1581

774 msgid "prefix"

775 msgstr ""

776

@@ -778,11 +778,12 @@ msgstr ""

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

779 msgstr ""

780

781 -#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875

782 -#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134

783 -#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105

784 -#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412

785 -#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177

781 +#: archive.c:460 builtin/blame.c:861 builtin/blame.c:873 builtin/blame.c:874

782 +#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1162

783 +#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:899

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

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

786 +#: parse-options.h:186

787 msgid "file"

788 msgstr ""

789

@@ -814,7 +815,7 @@ msgstr ""

815 msgid "list supported archive formats"

816 msgstr ""

817

817 -#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116

818 +#: archive.c:479 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115

819 #: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859

820 msgid "repo"

821 msgstr ""

@@ -823,7 +824,7 @@ msgstr ""

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

825 msgstr ""

826

826 -#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707

827 +#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715

828 #: builtin/notes.c:498

829 msgid "command"

830 msgstr ""

@@ -859,26 +860,26 @@ msgstr ""

860 msgid "cannot stream blob %s"

861 msgstr ""

862

862 -#: archive-tar.c:260 archive-zip.c:363

863 +#: archive-tar.c:266 archive-zip.c:363

864 #, c-format

865 msgid "unsupported file mode: 0%o (SHA1: %s)"

866 msgstr ""

867

867 -#: archive-tar.c:287 archive-zip.c:353

868 +#: archive-tar.c:293 archive-zip.c:353

869 #, c-format

870 msgid "cannot read %s"

871 msgstr ""

872

872 -#: archive-tar.c:459

873 +#: archive-tar.c:465

874 #, c-format

875 msgid "unable to start '%s' filter"

876 msgstr ""

877

877 -#: archive-tar.c:462

878 +#: archive-tar.c:468

879 msgid "unable to redirect descriptor"

880 msgstr ""

881

881 -#: archive-tar.c:469

882 +#: archive-tar.c:475

883 #, c-format

884 msgid "'%s' filter reported error"

885 msgstr ""

@@ -903,17 +904,17 @@ msgstr ""

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

905 msgstr ""

906

906 -#: attr.c:211

907 +#: attr.c:213

908 #, c-format

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

910 msgstr ""

911

911 -#: attr.c:368

912 +#: attr.c:370

913 #, c-format

914 msgid "%s not allowed: %s:%d"

915 msgstr ""

916

916 -#: attr.c:408

917 +#: attr.c:410

918 msgid ""

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

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

@@ -1024,37 +1025,37 @@ msgid_plural "Bisecting: %d revisions left to test after this %s\n"

1025 msgstr[0] ""

1026 msgstr[1] ""

1027

1027 -#: blame.c:2697

1028 +#: blame.c:2700

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

1030 msgstr ""

1031

1031 -#: blame.c:2711

1032 +#: blame.c:2714

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

1034 msgstr ""

1035

1035 -#: blame.c:2732

1036 +#: blame.c:2735

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

1038 msgstr ""

1039

1039 -#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033

1040 -#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963

1041 -#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411

1042 -#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163

1040 +#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:1971

1041 +#: sequencer.c:4305 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:964

1042 +#: builtin/log.c:1452 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411

1043 +#: builtin/pack-objects.c:3128 builtin/pack-objects.c:3143

1044 #: builtin/shortlog.c:192

1045 msgid "revision walk setup failed"

1046 msgstr ""

1047

1047 -#: blame.c:2759

1048 +#: blame.c:2762

1049 msgid ""

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

1051 msgstr ""

1052

1052 -#: blame.c:2770

1053 +#: blame.c:2773

1054 #, c-format

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

1056 msgstr ""

1057

1057 -#: blame.c:2781

1058 +#: blame.c:2784

1059 #, c-format

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

1061 msgstr ""

@@ -1193,7 +1194,7 @@ msgstr ""

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

1195 msgstr ""

1196

1196 -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024

1197 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2221 sequencer.c:2962

1198 #: builtin/commit.c:791

1199 #, c-format

1200 msgid "could not open '%s'"

@@ -1246,7 +1247,7 @@ msgstr ""

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

1248 msgstr ""

1249

1249 -#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306

1250 +#: bundle.c:460 builtin/log.c:202 builtin/log.c:1733 builtin/shortlog.c:306

1251 #, c-format

1252 msgid "unrecognized argument: %s"

1253 msgstr ""

@@ -1269,8 +1270,8 @@ msgstr ""

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

1271 msgstr ""

1272

1272 -#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399

1273 -#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455

1273 +#: commit.c:50 sequencer.c:2665 builtin/am.c:354 builtin/am.c:398

1274 +#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:456

1275 #, c-format

1276 msgid "could not parse %s"

1277 msgstr ""

@@ -1292,27 +1293,27 @@ msgid ""

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

1294 msgstr ""

1295

1295 -#: commit.c:1127

1296 +#: commit.c:1128

1297 #, c-format

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

1299 msgstr ""

1300

1300 -#: commit.c:1130

1301 +#: commit.c:1131

1302 #, c-format

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

1304 msgstr ""

1305

1305 -#: commit.c:1133

1306 +#: commit.c:1134

1307 #, c-format

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

1309 msgstr ""

1310

1310 -#: commit.c:1136

1311 +#: commit.c:1137

1312 #, c-format

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

1314 msgstr ""

1315

1315 -#: commit.c:1390

1316 +#: commit.c:1391

1317 msgid ""

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

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

@@ -1369,193 +1370,208 @@ msgstr ""

1370 msgid "unable to find all commit-graph files"

1371 msgstr ""

1372

1372 -#: commit-graph.c:554 commit-graph.c:614

1373 +#: commit-graph.c:561 commit-graph.c:621

1374 msgid "invalid commit position. commit-graph is likely corrupt"

1375 msgstr ""

1376

1376 -#: commit-graph.c:575

1377 +#: commit-graph.c:582

1378 #, c-format

1379 msgid "could not find commit %s"

1380 msgstr ""

1381

1381 -#: commit-graph.c:1002 builtin/pack-objects.c:2657

1382 +#: commit-graph.c:855 builtin/am.c:1287

1383 +#, c-format

1384 +msgid "unable to parse commit %s"

1385 +msgstr ""

1386 +

1387 +#: commit-graph.c:859

1388 +#, c-format

1389 +msgid "unable to get tree for %s"

1390 +msgstr ""

1391 +

1392 +#: commit-graph.c:1017 builtin/pack-objects.c:2641

1393 #, c-format

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

1395 msgstr ""

1396

1386 -#: commit-graph.c:1034

1397 +#: commit-graph.c:1049

1398 msgid "Loading known commits in commit graph"

1399 msgstr ""

1400

1390 -#: commit-graph.c:1051

1401 +#: commit-graph.c:1066

1402 msgid "Expanding reachable commits in commit graph"

1403 msgstr ""

1404

1394 -#: commit-graph.c:1070

1405 +#: commit-graph.c:1085

1406 msgid "Clearing commit marks in commit graph"

1407 msgstr ""

1408

1398 -#: commit-graph.c:1089

1409 +#: commit-graph.c:1104

1410 msgid "Computing commit graph generation numbers"

1411 msgstr ""

1412

1402 -#: commit-graph.c:1163

1413 +#: commit-graph.c:1179

1414 #, c-format

1415 msgid "Finding commits for commit graph in %d pack"

1416 msgid_plural "Finding commits for commit graph in %d packs"

1417 msgstr[0] ""

1418 msgstr[1] ""

1419

1409 -#: commit-graph.c:1176

1420 +#: commit-graph.c:1192

1421 #, c-format

1422 msgid "error adding pack %s"

1423 msgstr ""

1424

1414 -#: commit-graph.c:1180

1425 +#: commit-graph.c:1196

1426 #, c-format

1427 msgid "error opening index for %s"

1428 msgstr ""

1429

1419 -#: commit-graph.c:1204

1430 +#: commit-graph.c:1220

1431 #, c-format

1432 msgid "Finding commits for commit graph from %d ref"

1433 msgid_plural "Finding commits for commit graph from %d refs"

1434 msgstr[0] ""

1435 msgstr[1] ""

1436

1426 -#: commit-graph.c:1238

1437 +#: commit-graph.c:1240

1438 +#, c-format

1439 +msgid "invalid commit object id: %s"

1440 +msgstr ""

1441 +

1442 +#: commit-graph.c:1255

1443 msgid "Finding commits for commit graph among packed objects"

1444 msgstr ""

1445

1430 -#: commit-graph.c:1253

1446 +#: commit-graph.c:1270

1447 msgid "Counting distinct commits in commit graph"

1448 msgstr ""

1449

1434 -#: commit-graph.c:1284

1450 +#: commit-graph.c:1300

1451 msgid "Finding extra edges in commit graph"

1452 msgstr ""

1453

1438 -#: commit-graph.c:1332

1454 +#: commit-graph.c:1346

1455 msgid "failed to write correct number of base graph ids"

1456 msgstr ""

1457

1442 -#: commit-graph.c:1365 midx.c:811

1458 +#: commit-graph.c:1379 midx.c:810

1459 #, c-format

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

1461 msgstr ""

1462

1447 -#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240

1463 +#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:241

1464 #, c-format

1465 msgid "unable to create '%s'"

1466 msgstr ""

1467

1452 -#: commit-graph.c:1437

1468 +#: commit-graph.c:1451

1469 #, c-format

1470 msgid "Writing out commit graph in %d pass"

1471 msgid_plural "Writing out commit graph in %d passes"

1472 msgstr[0] ""

1473 msgstr[1] ""

1474

1459 -#: commit-graph.c:1478

1475 +#: commit-graph.c:1492

1476 msgid "unable to open commit-graph chain file"

1477 msgstr ""

1478

1463 -#: commit-graph.c:1490

1479 +#: commit-graph.c:1504

1480 msgid "failed to rename base commit-graph file"

1481 msgstr ""

1482

1467 -#: commit-graph.c:1510

1483 +#: commit-graph.c:1524

1484 msgid "failed to rename temporary commit-graph file"

1485 msgstr ""

1486

1471 -#: commit-graph.c:1621

1487 +#: commit-graph.c:1635

1488 msgid "Scanning merged commits"

1489 msgstr ""

1490

1475 -#: commit-graph.c:1632

1491 +#: commit-graph.c:1646

1492 #, c-format

1493 msgid "unexpected duplicate commit id %s"

1494 msgstr ""

1495

1480 -#: commit-graph.c:1657

1496 +#: commit-graph.c:1670

1497 msgid "Merging commit-graph"

1498 msgstr ""

1499

1484 -#: commit-graph.c:1844

1500 +#: commit-graph.c:1860

1501 #, c-format

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

1503 msgstr ""

1504

1489 -#: commit-graph.c:1855

1505 +#: commit-graph.c:1871

1506 msgid "too many commits to write graph"

1507 msgstr ""

1508

1493 -#: commit-graph.c:1945

1509 +#: commit-graph.c:1961

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

1511 msgstr ""

1512

1497 -#: commit-graph.c:1955

1513 +#: commit-graph.c:1971

1514 #, c-format

1515 msgid "commit-graph has incorrect OID order: %s then %s"

1516 msgstr ""

1517

1502 -#: commit-graph.c:1965 commit-graph.c:1980

1518 +#: commit-graph.c:1981 commit-graph.c:1996

1519 #, c-format

1520 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"

1521 msgstr ""

1522

1507 -#: commit-graph.c:1972

1523 +#: commit-graph.c:1988

1524 #, c-format

1525 msgid "failed to parse commit %s from commit-graph"

1526 msgstr ""

1527

1512 -#: commit-graph.c:1989

1528 +#: commit-graph.c:2006

1529 msgid "Verifying commits in commit graph"

1530 msgstr ""

1531

1516 -#: commit-graph.c:2002

1532 +#: commit-graph.c:2020

1533 #, c-format

1534 msgid "failed to parse commit %s from object database for commit-graph"

1535 msgstr ""

1536

1521 -#: commit-graph.c:2009

1537 +#: commit-graph.c:2027

1538 #, c-format

1539 msgid "root tree OID for commit %s in commit-graph is %s != %s"

1540 msgstr ""

1541

1526 -#: commit-graph.c:2019

1542 +#: commit-graph.c:2037

1543 #, c-format

1544 msgid "commit-graph parent list for commit %s is too long"

1545 msgstr ""

1546

1531 -#: commit-graph.c:2028

1547 +#: commit-graph.c:2046

1548 #, c-format

1549 msgid "commit-graph parent for %s is %s != %s"

1550 msgstr ""

1551

1536 -#: commit-graph.c:2041

1552 +#: commit-graph.c:2059

1553 #, c-format

1554 msgid "commit-graph parent list for commit %s terminates early"

1555 msgstr ""

1556

1541 -#: commit-graph.c:2046

1557 +#: commit-graph.c:2064

1558 #, c-format

1559 msgid ""

1560 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"

1561 msgstr ""

1562

1547 -#: commit-graph.c:2050

1563 +#: commit-graph.c:2068

1564 #, c-format

1565 msgid ""

1566 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"

1567 msgstr ""

1568

1553 -#: commit-graph.c:2065

1569 +#: commit-graph.c:2083

1570 #, c-format

1571 msgid "commit-graph generation for commit %s is %u != %u"

1572 msgstr ""

1573

1558 -#: commit-graph.c:2071

1574 +#: commit-graph.c:2089

1575 #, c-format

1576 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"

1577 msgstr ""

@@ -1597,7 +1613,7 @@ msgstr ""

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

1614 msgstr ""

1615

1600 -#: config.c:406 sequencer.c:2463

1616 +#: config.c:406 sequencer.c:2401

1617 #, c-format

1618 msgid "invalid key: %s"

1619 msgstr ""

@@ -1719,149 +1735,144 @@ msgstr ""

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

1736 msgstr ""

1737

1722 -#: config.c:1430

1738 +#: config.c:1425

1739 #, c-format

1740 msgid "malformed value for %s"

1741 msgstr ""

1742

1727 -#: config.c:1456

1743 +#: config.c:1451

1744 #, c-format

1745 msgid "malformed value for %s: %s"

1746 msgstr ""

1747

1732 -#: config.c:1457

1748 +#: config.c:1452

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

1750 msgstr ""

1751

1736 -#: config.c:1518 builtin/pack-objects.c:3410

1752 +#: config.c:1513 builtin/pack-objects.c:3394

1753 #, c-format

1754 msgid "bad pack compression level %d"

1755 msgstr ""

1756

1741 -#: config.c:1639

1757 +#: config.c:1634

1758 #, c-format

1759 msgid "unable to load config blob object '%s'"

1760 msgstr ""

1761

1746 -#: config.c:1642

1762 +#: config.c:1637

1763 #, c-format

1764 msgid "reference '%s' does not point to a blob"

1765 msgstr ""

1766

1751 -#: config.c:1659

1767 +#: config.c:1654

1768 #, c-format

1769 msgid "unable to resolve config blob '%s'"

1770 msgstr ""

1771

1756 -#: config.c:1689

1772 +#: config.c:1684

1773 #, c-format

1774 msgid "failed to parse %s"

1775 msgstr ""

1776

1761 -#: config.c:1745

1777 +#: config.c:1740

1778 msgid "unable to parse command-line config"

1779 msgstr ""

1780

1765 -#: config.c:2094

1781 +#: config.c:2091

1782 msgid "unknown error occurred while reading the configuration files"

1783 msgstr ""

1784

1769 -#: config.c:2264

1785 +#: config.c:2261

1786 #, c-format

1787 msgid "Invalid %s: '%s'"

1788 msgstr ""

1789

1774 -#: config.c:2307

1775 -#, c-format

1776 -msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"

1777 -msgstr ""

1778 -

1779 -#: config.c:2333

1790 +#: config.c:2306

1791 #, c-format

1792 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"

1793 msgstr ""

1794

1784 -#: config.c:2379

1795 +#: config.c:2352

1796 #, c-format

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

1798 msgstr ""

1799

1789 -#: config.c:2381

1800 +#: config.c:2354

1801 #, c-format

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

1803 msgstr ""

1804

1794 -#: config.c:2462

1805 +#: config.c:2435

1806 #, c-format

1807 msgid "invalid section name '%s'"

1808 msgstr ""

1809

1799 -#: config.c:2494

1810 +#: config.c:2467

1811 #, c-format

1812 msgid "%s has multiple values"

1813 msgstr ""

1814

1804 -#: config.c:2523

1815 +#: config.c:2496

1816 #, c-format

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

1818 msgstr ""

1819

1809 -#: config.c:2775 config.c:3099

1820 +#: config.c:2748 config.c:3072

1821 #, c-format

1822 msgid "could not lock config file %s"

1823 msgstr ""

1824

1814 -#: config.c:2786

1825 +#: config.c:2759

1826 #, c-format

1827 msgid "opening %s"

1828 msgstr ""

1829

1819 -#: config.c:2821 builtin/config.c:328

1830 +#: config.c:2794 builtin/config.c:328

1831 #, c-format

1832 msgid "invalid pattern: %s"

1833 msgstr ""

1834

1824 -#: config.c:2846

1835 +#: config.c:2819

1836 #, c-format

1837 msgid "invalid config file %s"

1838 msgstr ""

1839

1829 -#: config.c:2859 config.c:3112

1840 +#: config.c:2832 config.c:3085

1841 #, c-format

1842 msgid "fstat on %s failed"

1843 msgstr ""

1844

1834 -#: config.c:2870

1845 +#: config.c:2843

1846 #, c-format

1847 msgid "unable to mmap '%s'"

1848 msgstr ""

1849

1839 -#: config.c:2879 config.c:3117

1850 +#: config.c:2852 config.c:3090

1851 #, c-format

1852 msgid "chmod on %s failed"

1853 msgstr ""

1854

1844 -#: config.c:2964 config.c:3214

1855 +#: config.c:2937 config.c:3187

1856 #, c-format

1857 msgid "could not write config file %s"

1858 msgstr ""

1859

1849 -#: config.c:2998

1860 +#: config.c:2971

1861 #, c-format

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

1863 msgstr ""

1864

1854 -#: config.c:3000 builtin/remote.c:782

1865 +#: config.c:2973 builtin/remote.c:782

1866 #, c-format

1867 msgid "could not unset '%s'"

1868 msgstr ""

1869

1859 -#: config.c:3090

1870 +#: config.c:3063

1871 #, c-format

1872 msgid "invalid section name: %s"

1873 msgstr ""

1874

1864 -#: config.c:3257

1875 +#: config.c:3230

1876 #, c-format

1877 msgid "missing value for '%s'"

1878 msgstr ""

@@ -1977,7 +1988,7 @@ msgstr ""

1988 msgid "unknown port %s"

1989 msgstr ""

1990

1980 -#: connect.c:845 connect.c:1171

1991 +#: connect.c:845 connect.c:1175

1992 #, c-format

1993 msgid "strange hostname '%s' blocked"

1994 msgstr ""

@@ -1992,211 +2003,211 @@ msgstr ""

2003 msgid "cannot start proxy %s"

2004 msgstr ""

2005

1995 -#: connect.c:924

2006 +#: connect.c:928

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

2008 msgstr ""

2009

1999 -#: connect.c:1119

2010 +#: connect.c:1123

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

2012 msgstr ""

2013

2003 -#: connect.c:1131

2014 +#: connect.c:1135

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

2016 msgstr ""

2017

2007 -#: connect.c:1148

2018 +#: connect.c:1152

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

2020 msgstr ""

2021

2011 -#: connect.c:1260

2022 +#: connect.c:1264

2023 #, c-format

2024 msgid "strange pathname '%s' blocked"

2025 msgstr ""

2026

2016 -#: connect.c:1307

2027 +#: connect.c:1311

2028 msgid "unable to fork"

2029 msgstr ""

2030

2020 -#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43

2031 +#: connected.c:88 builtin/fsck.c:221 builtin/prune.c:43

2032 msgid "Checking connectivity"

2033 msgstr ""

2034

2024 -#: connected.c:98

2035 +#: connected.c:100

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

2037 msgstr ""

2038

2028 -#: connected.c:118

2039 +#: connected.c:120

2040 msgid "failed write to rev-list"

2041 msgstr ""

2042

2032 -#: connected.c:125

2043 +#: connected.c:127

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

2045 msgstr ""

2046

2036 -#: convert.c:193

2047 +#: convert.c:194

2048 #, c-format

2049 msgid "illegal crlf_action %d"

2050 msgstr ""

2051

2041 -#: convert.c:206

2052 +#: convert.c:207

2053 #, c-format

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

2055 msgstr ""

2056

2046 -#: convert.c:208

2057 +#: convert.c:209

2058 #, c-format

2059 msgid ""

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

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

2062 msgstr ""

2063

2053 -#: convert.c:216

2064 +#: convert.c:217

2065 #, c-format

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

2067 msgstr ""

2068

2058 -#: convert.c:218

2069 +#: convert.c:219

2070 #, c-format

2071 msgid ""

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

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

2074 msgstr ""

2075

2065 -#: convert.c:279

2076 +#: convert.c:280

2077 #, c-format

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

2079 msgstr ""

2080

2070 -#: convert.c:286

2081 +#: convert.c:287

2082 #, c-format

2083 msgid ""

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

2085 "tree-encoding."

2086 msgstr ""

2087

2077 -#: convert.c:304

2088 +#: convert.c:305

2089 #, c-format

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

2091 msgstr ""

2092

2082 -#: convert.c:306

2093 +#: convert.c:307

2094 #, c-format

2095 msgid ""

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

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

2098 msgstr ""

2099

2089 -#: convert.c:424 convert.c:495

2100 +#: convert.c:425 convert.c:496

2101 #, c-format

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

2103 msgstr ""

2104

2094 -#: convert.c:467

2105 +#: convert.c:468

2106 #, c-format

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

2108 msgstr ""

2109

2099 -#: convert.c:673

2110 +#: convert.c:674

2111 #, c-format

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

2113 msgstr ""

2114

2104 -#: convert.c:693

2115 +#: convert.c:694

2116 #, c-format

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

2118 msgstr ""

2119

2109 -#: convert.c:700

2120 +#: convert.c:701

2121 #, c-format

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

2123 msgstr ""

2124

2114 -#: convert.c:735 convert.c:738

2125 +#: convert.c:736 convert.c:739

2126 #, c-format

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

2128 msgstr ""

2129

2119 -#: convert.c:741 convert.c:796

2130 +#: convert.c:742 convert.c:797

2131 #, c-format

2132 msgid "external filter '%s' failed"

2133 msgstr ""

2134

2124 -#: convert.c:844

2135 +#: convert.c:845

2136 msgid "unexpected filter type"

2137 msgstr ""

2138

2128 -#: convert.c:855

2139 +#: convert.c:856

2140 msgid "path name too long for external filter"

2141 msgstr ""

2142

2132 -#: convert.c:929

2143 +#: convert.c:930

2144 #, c-format

2145 msgid ""

2146 "external filter '%s' is not available anymore although not all paths have "

2147 "been filtered"

2148 msgstr ""

2149

2139 -#: convert.c:1228

2150 +#: convert.c:1229

2151 msgid "true/false are no valid working-tree-encodings"

2152 msgstr ""

2153

2143 -#: convert.c:1398 convert.c:1432

2154 +#: convert.c:1417 convert.c:1451

2155 #, c-format

2156 msgid "%s: clean filter '%s' failed"

2157 msgstr ""

2158

2148 -#: convert.c:1476

2159 +#: convert.c:1495

2160 #, c-format

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

2162 msgstr ""

2163

2153 -#: date.c:137

2164 +#: date.c:138

2165 msgid "in the future"

2166 msgstr ""

2167

2157 -#: date.c:143

2168 +#: date.c:144

2169 #, c-format

2170 msgid "%<PRIuMAX> second ago"

2171 msgid_plural "%<PRIuMAX> seconds ago"

2172 msgstr[0] ""

2173 msgstr[1] ""

2174

2164 -#: date.c:150

2175 +#: date.c:151

2176 #, c-format

2177 msgid "%<PRIuMAX> minute ago"

2178 msgid_plural "%<PRIuMAX> minutes ago"

2179 msgstr[0] ""

2180 msgstr[1] ""

2181

2171 -#: date.c:157

2182 +#: date.c:158

2183 #, c-format

2184 msgid "%<PRIuMAX> hour ago"

2185 msgid_plural "%<PRIuMAX> hours ago"

2186 msgstr[0] ""

2187 msgstr[1] ""

2188

2178 -#: date.c:164

2189 +#: date.c:165

2190 #, c-format

2191 msgid "%<PRIuMAX> day ago"

2192 msgid_plural "%<PRIuMAX> days ago"

2193 msgstr[0] ""

2194 msgstr[1] ""

2195

2185 -#: date.c:170

2196 +#: date.c:171

2197 #, c-format

2198 msgid "%<PRIuMAX> week ago"

2199 msgid_plural "%<PRIuMAX> weeks ago"

2200 msgstr[0] ""

2201 msgstr[1] ""

2202

2192 -#: date.c:177

2203 +#: date.c:178

2204 #, c-format

2205 msgid "%<PRIuMAX> month ago"

2206 msgid_plural "%<PRIuMAX> months ago"

2207 msgstr[0] ""

2208 msgstr[1] ""

2209

2199 -#: date.c:188

2210 +#: date.c:189

2211 #, c-format

2212 msgid "%<PRIuMAX> year"

2213 msgid_plural "%<PRIuMAX> years"

@@ -2204,14 +2215,14 @@ msgstr[0] ""

2215 msgstr[1] ""

2216

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

2207 -#: date.c:191

2218 +#: date.c:192

2219 #, c-format

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

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

2222 msgstr[0] ""

2223 msgstr[1] ""

2224

2214 -#: date.c:196 date.c:201

2225 +#: date.c:197 date.c:202

2226 #, c-format

2227 msgid "%<PRIuMAX> year ago"

2228 msgid_plural "%<PRIuMAX> years ago"

@@ -2247,7 +2258,7 @@ msgstr ""

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

2259 msgstr ""

2260

2250 -#: diffcore-rename.c:544

2261 +#: diffcore-rename.c:543

2262 msgid "Performing inexact rename detection"

2263 msgstr ""

2264

@@ -2302,562 +2313,562 @@ msgid ""

2313 "%s"

2314 msgstr ""

2315

2305 -#: diff.c:4215

2316 +#: diff.c:4218

2317 #, c-format

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

2319 msgstr ""

2320

2310 -#: diff.c:4560

2321 +#: diff.c:4563

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

2323 msgstr ""

2324

2314 -#: diff.c:4563

2325 +#: diff.c:4566

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

2327 msgstr ""

2328

2318 -#: diff.c:4641

2329 +#: diff.c:4644

2330 msgid "--follow requires exactly one pathspec"

2331 msgstr ""

2332

2322 -#: diff.c:4689

2333 +#: diff.c:4692

2334 #, c-format

2335 msgid "invalid --stat value: %s"

2336 msgstr ""

2337

2327 -#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222

2338 +#: diff.c:4697 diff.c:4702 diff.c:4707 diff.c:4712 diff.c:5225

2339 #: parse-options.c:199 parse-options.c:203

2340 #, c-format

2341 msgid "%s expects a numerical value"

2342 msgstr ""

2343

2333 -#: diff.c:4726

2344 +#: diff.c:4729

2345 #, c-format

2346 msgid ""

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

2348 "%s"

2349 msgstr ""

2350

2340 -#: diff.c:4811

2351 +#: diff.c:4814

2352 #, c-format

2353 msgid "unknown change class '%c' in --diff-filter=%s"

2354 msgstr ""

2355

2345 -#: diff.c:4835

2356 +#: diff.c:4838

2357 #, c-format

2358 msgid "unknown value after ws-error-highlight=%.*s"

2359 msgstr ""

2360

2350 -#: diff.c:4849

2361 +#: diff.c:4852

2362 #, c-format

2363 msgid "unable to resolve '%s'"

2364 msgstr ""

2365

2355 -#: diff.c:4899 diff.c:4905

2366 +#: diff.c:4902 diff.c:4908

2367 #, c-format

2368 msgid "%s expects <n>/<m> form"

2369 msgstr ""

2370

2360 -#: diff.c:4917

2371 +#: diff.c:4920

2372 #, c-format

2373 msgid "%s expects a character, got '%s'"

2374 msgstr ""

2375

2365 -#: diff.c:4938

2376 +#: diff.c:4941

2377 #, c-format

2378 msgid "bad --color-moved argument: %s"

2379 msgstr ""

2380

2370 -#: diff.c:4957

2381 +#: diff.c:4960

2382 #, c-format

2383 msgid "invalid mode '%s' in --color-moved-ws"

2384 msgstr ""

2385

2375 -#: diff.c:4997

2386 +#: diff.c:5000

2387 msgid ""

2388 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "

2389 "\"histogram\""

2390 msgstr ""

2391

2381 -#: diff.c:5033 diff.c:5053

2392 +#: diff.c:5036 diff.c:5056

2393 #, c-format

2394 msgid "invalid argument to %s"

2395 msgstr ""

2396

2386 -#: diff.c:5191

2397 +#: diff.c:5194

2398 #, c-format

2399 msgid "failed to parse --submodule option parameter: '%s'"

2400 msgstr ""

2401

2391 -#: diff.c:5247

2402 +#: diff.c:5250

2403 #, c-format

2404 msgid "bad --word-diff argument: %s"

2405 msgstr ""

2406

2396 -#: diff.c:5270

2407 +#: diff.c:5273

2408 msgid "Diff output format options"

2409 msgstr ""

2410

2400 -#: diff.c:5272 diff.c:5278

2411 +#: diff.c:5275 diff.c:5281

2412 msgid "generate patch"

2413 msgstr ""

2414

2404 -#: diff.c:5275 builtin/log.c:172

2415 +#: diff.c:5278 builtin/log.c:172

2416 msgid "suppress diff output"

2417 msgstr ""

2418

2408 -#: diff.c:5280 diff.c:5394 diff.c:5401

2419 +#: diff.c:5283 diff.c:5397 diff.c:5404

2420 msgid "<n>"

2421 msgstr ""

2422

2412 -#: diff.c:5281 diff.c:5284

2423 +#: diff.c:5284 diff.c:5287

2424 msgid "generate diffs with <n> lines context"

2425 msgstr ""

2426

2416 -#: diff.c:5286

2427 +#: diff.c:5289

2428 msgid "generate the diff in raw format"

2429 msgstr ""

2430

2420 -#: diff.c:5289

2431 +#: diff.c:5292

2432 msgid "synonym for '-p --raw'"

2433 msgstr ""

2434

2424 -#: diff.c:5293

2435 +#: diff.c:5296

2436 msgid "synonym for '-p --stat'"

2437 msgstr ""

2438

2428 -#: diff.c:5297

2439 +#: diff.c:5300

2440 msgid "machine friendly --stat"

2441 msgstr ""

2442

2432 -#: diff.c:5300

2443 +#: diff.c:5303

2444 msgid "output only the last line of --stat"

2445 msgstr ""

2446

2436 -#: diff.c:5302 diff.c:5310

2447 +#: diff.c:5305 diff.c:5313

2448 msgid "<param1,param2>..."

2449 msgstr ""

2450

2440 -#: diff.c:5303

2451 +#: diff.c:5306

2452 msgid ""

2453 "output the distribution of relative amount of changes for each sub-directory"

2454 msgstr ""

2455

2445 -#: diff.c:5307

2456 +#: diff.c:5310

2457 msgid "synonym for --dirstat=cumulative"

2458 msgstr ""

2459

2449 -#: diff.c:5311

2460 +#: diff.c:5314

2461 msgid "synonym for --dirstat=files,param1,param2..."

2462 msgstr ""

2463

2453 -#: diff.c:5315

2464 +#: diff.c:5318

2465 msgid "warn if changes introduce conflict markers or whitespace errors"

2466 msgstr ""

2467

2457 -#: diff.c:5318

2468 +#: diff.c:5321

2469 msgid "condensed summary such as creations, renames and mode changes"

2470 msgstr ""

2471

2461 -#: diff.c:5321

2472 +#: diff.c:5324

2473 msgid "show only names of changed files"

2474 msgstr ""

2475

2465 -#: diff.c:5324

2476 +#: diff.c:5327

2477 msgid "show only names and status of changed files"

2478 msgstr ""

2479

2469 -#: diff.c:5326

2480 +#: diff.c:5329

2481 msgid "<width>[,<name-width>[,<count>]]"

2482 msgstr ""

2483

2473 -#: diff.c:5327

2484 +#: diff.c:5330

2485 msgid "generate diffstat"

2486 msgstr ""

2487

2477 -#: diff.c:5329 diff.c:5332 diff.c:5335

2488 +#: diff.c:5332 diff.c:5335 diff.c:5338

2489 msgid "<width>"

2490 msgstr ""

2491

2481 -#: diff.c:5330

2492 +#: diff.c:5333

2493 msgid "generate diffstat with a given width"

2494 msgstr ""

2495

2485 -#: diff.c:5333

2496 +#: diff.c:5336

2497 msgid "generate diffstat with a given name width"

2498 msgstr ""

2499

2489 -#: diff.c:5336

2500 +#: diff.c:5339

2501 msgid "generate diffstat with a given graph width"

2502 msgstr ""

2503

2493 -#: diff.c:5338

2504 +#: diff.c:5341

2505 msgid "<count>"

2506 msgstr ""

2507

2497 -#: diff.c:5339

2508 +#: diff.c:5342

2509 msgid "generate diffstat with limited lines"

2510 msgstr ""

2511

2501 -#: diff.c:5342

2512 +#: diff.c:5345

2513 msgid "generate compact summary in diffstat"

2514 msgstr ""

2515

2505 -#: diff.c:5345

2516 +#: diff.c:5348

2517 msgid "output a binary diff that can be applied"

2518 msgstr ""

2519

2509 -#: diff.c:5348

2520 +#: diff.c:5351

2521 msgid "show full pre- and post-image object names on the \"index\" lines"

2522 msgstr ""

2523

2513 -#: diff.c:5350

2524 +#: diff.c:5353

2525 msgid "show colored diff"

2526 msgstr ""

2527

2517 -#: diff.c:5351

2528 +#: diff.c:5354

2529 msgid "<kind>"

2530 msgstr ""

2531

2521 -#: diff.c:5352

2532 +#: diff.c:5355

2533 msgid ""

2534 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "

2535 "diff"

2536 msgstr ""

2537

2527 -#: diff.c:5355

2538 +#: diff.c:5358

2539 msgid ""

2540 "do not munge pathnames and use NULs as output field terminators in --raw or "

2541 "--numstat"

2542 msgstr ""

2543

2533 -#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470

2544 +#: diff.c:5361 diff.c:5364 diff.c:5367 diff.c:5473

2545 msgid "<prefix>"

2546 msgstr ""

2547

2537 -#: diff.c:5359

2548 +#: diff.c:5362

2549 msgid "show the given source prefix instead of \"a/\""

2550 msgstr ""

2551

2541 -#: diff.c:5362

2552 +#: diff.c:5365

2553 msgid "show the given destination prefix instead of \"b/\""

2554 msgstr ""

2555

2545 -#: diff.c:5365

2556 +#: diff.c:5368

2557 msgid "prepend an additional prefix to every line of output"

2558 msgstr ""

2559

2549 -#: diff.c:5368

2560 +#: diff.c:5371

2561 msgid "do not show any source or destination prefix"

2562 msgstr ""

2563

2553 -#: diff.c:5371

2564 +#: diff.c:5374

2565 msgid "show context between diff hunks up to the specified number of lines"

2566 msgstr ""

2567

2557 -#: diff.c:5375 diff.c:5380 diff.c:5385

2568 +#: diff.c:5378 diff.c:5383 diff.c:5388

2569 msgid "<char>"

2570 msgstr ""

2571

2561 -#: diff.c:5376

2572 +#: diff.c:5379

2573 msgid "specify the character to indicate a new line instead of '+'"

2574 msgstr ""

2575

2565 -#: diff.c:5381

2576 +#: diff.c:5384

2577 msgid "specify the character to indicate an old line instead of '-'"

2578 msgstr ""

2579

2569 -#: diff.c:5386

2580 +#: diff.c:5389

2581 msgid "specify the character to indicate a context instead of ' '"

2582 msgstr ""

2583

2573 -#: diff.c:5389

2584 +#: diff.c:5392

2585 msgid "Diff rename options"

2586 msgstr ""

2587

2577 -#: diff.c:5390

2588 +#: diff.c:5393

2589 msgid "<n>[/<m>]"

2590 msgstr ""

2591

2581 -#: diff.c:5391

2592 +#: diff.c:5394

2593 msgid "break complete rewrite changes into pairs of delete and create"

2594 msgstr ""

2595

2585 -#: diff.c:5395

2596 +#: diff.c:5398

2597 msgid "detect renames"

2598 msgstr ""

2599

2589 -#: diff.c:5399

2600 +#: diff.c:5402

2601 msgid "omit the preimage for deletes"

2602 msgstr ""

2603

2593 -#: diff.c:5402

2604 +#: diff.c:5405

2605 msgid "detect copies"

2606 msgstr ""

2607

2597 -#: diff.c:5406

2608 +#: diff.c:5409

2609 msgid "use unmodified files as source to find copies"

2610 msgstr ""

2611

2601 -#: diff.c:5408

2612 +#: diff.c:5411

2613 msgid "disable rename detection"

2614 msgstr ""

2615

2605 -#: diff.c:5411

2616 +#: diff.c:5414

2617 msgid "use empty blobs as rename source"

2618 msgstr ""

2619

2609 -#: diff.c:5413

2620 +#: diff.c:5416

2621 msgid "continue listing the history of a file beyond renames"

2622 msgstr ""

2623

2613 -#: diff.c:5416

2624 +#: diff.c:5419

2625 msgid ""

2626 "prevent rename/copy detection if the number of rename/copy targets exceeds "

2627 "given limit"

2628 msgstr ""

2629

2619 -#: diff.c:5418

2630 +#: diff.c:5421

2631 msgid "Diff algorithm options"

2632 msgstr ""

2633

2623 -#: diff.c:5420

2634 +#: diff.c:5423

2635 msgid "produce the smallest possible diff"

2636 msgstr ""

2637

2627 -#: diff.c:5423

2638 +#: diff.c:5426

2639 msgid "ignore whitespace when comparing lines"

2640 msgstr ""

2641

2631 -#: diff.c:5426

2642 +#: diff.c:5429

2643 msgid "ignore changes in amount of whitespace"

2644 msgstr ""

2645

2635 -#: diff.c:5429

2646 +#: diff.c:5432

2647 msgid "ignore changes in whitespace at EOL"

2648 msgstr ""

2649

2639 -#: diff.c:5432

2650 +#: diff.c:5435

2651 msgid "ignore carrier-return at the end of line"

2652 msgstr ""

2653

2643 -#: diff.c:5435

2654 +#: diff.c:5438

2655 msgid "ignore changes whose lines are all blank"

2656 msgstr ""

2657

2647 -#: diff.c:5438

2658 +#: diff.c:5441

2659 msgid "heuristic to shift diff hunk boundaries for easy reading"

2660 msgstr ""

2661

2651 -#: diff.c:5441

2662 +#: diff.c:5444

2663 msgid "generate diff using the \"patience diff\" algorithm"

2664 msgstr ""

2665

2655 -#: diff.c:5445

2666 +#: diff.c:5448

2667 msgid "generate diff using the \"histogram diff\" algorithm"

2668 msgstr ""

2669

2659 -#: diff.c:5447

2670 +#: diff.c:5450

2671 msgid "<algorithm>"

2672 msgstr ""

2673

2663 -#: diff.c:5448

2674 +#: diff.c:5451

2675 msgid "choose a diff algorithm"

2676 msgstr ""

2677

2667 -#: diff.c:5450

2678 +#: diff.c:5453

2679 msgid "<text>"

2680 msgstr ""

2681

2671 -#: diff.c:5451

2682 +#: diff.c:5454

2683 msgid "generate diff using the \"anchored diff\" algorithm"

2684 msgstr ""

2685

2675 -#: diff.c:5453 diff.c:5462 diff.c:5465

2686 +#: diff.c:5456 diff.c:5465 diff.c:5468

2687 msgid "<mode>"

2688 msgstr ""

2689

2679 -#: diff.c:5454

2690 +#: diff.c:5457

2691 msgid "show word diff, using <mode> to delimit changed words"

2692 msgstr ""

2693

2683 -#: diff.c:5456 diff.c:5459 diff.c:5504

2694 +#: diff.c:5459 diff.c:5462 diff.c:5507

2695 msgid "<regex>"

2696 msgstr ""

2697

2687 -#: diff.c:5457

2698 +#: diff.c:5460

2699 msgid "use <regex> to decide what a word is"

2700 msgstr ""

2701

2691 -#: diff.c:5460

2702 +#: diff.c:5463

2703 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"

2704 msgstr ""

2705

2695 -#: diff.c:5463

2706 +#: diff.c:5466

2707 msgid "moved lines of code are colored differently"

2708 msgstr ""

2709

2699 -#: diff.c:5466

2710 +#: diff.c:5469

2711 msgid "how white spaces are ignored in --color-moved"

2712 msgstr ""

2713

2703 -#: diff.c:5469

2714 +#: diff.c:5472

2715 msgid "Other diff options"

2716 msgstr ""

2717

2707 -#: diff.c:5471

2718 +#: diff.c:5474

2719 msgid "when run from subdir, exclude changes outside and show relative paths"

2720 msgstr ""

2721

2711 -#: diff.c:5475

2722 +#: diff.c:5478

2723 msgid "treat all files as text"

2724 msgstr ""

2725

2715 -#: diff.c:5477

2726 +#: diff.c:5480

2727 msgid "swap two inputs, reverse the diff"

2728 msgstr ""

2729

2719 -#: diff.c:5479

2730 +#: diff.c:5482

2731 msgid "exit with 1 if there were differences, 0 otherwise"

2732 msgstr ""

2733

2723 -#: diff.c:5481

2734 +#: diff.c:5484

2735 msgid "disable all output of the program"

2736 msgstr ""

2737

2727 -#: diff.c:5483

2738 +#: diff.c:5486

2739 msgid "allow an external diff helper to be executed"

2740 msgstr ""

2741

2731 -#: diff.c:5485

2742 +#: diff.c:5488

2743 msgid "run external text conversion filters when comparing binary files"

2744 msgstr ""

2745

2735 -#: diff.c:5487

2746 +#: diff.c:5490

2747 msgid "<when>"

2748 msgstr ""

2749

2739 -#: diff.c:5488

2750 +#: diff.c:5491

2751 msgid "ignore changes to submodules in the diff generation"

2752 msgstr ""

2753

2743 -#: diff.c:5491

2754 +#: diff.c:5494

2755 msgid "<format>"

2756 msgstr ""

2757

2747 -#: diff.c:5492

2758 +#: diff.c:5495

2759 msgid "specify how differences in submodules are shown"

2760 msgstr ""

2761

2751 -#: diff.c:5496

2762 +#: diff.c:5499

2763 msgid "hide 'git add -N' entries from the index"

2764 msgstr ""

2765

2755 -#: diff.c:5499

2766 +#: diff.c:5502

2767 msgid "treat 'git add -N' entries as real in the index"

2768 msgstr ""

2769

2759 -#: diff.c:5501

2770 +#: diff.c:5504

2771 msgid "<string>"

2772 msgstr ""

2773

2763 -#: diff.c:5502

2774 +#: diff.c:5505

2775 msgid ""

2776 "look for differences that change the number of occurrences of the specified "

2777 "string"

2778 msgstr ""

2779

2769 -#: diff.c:5505

2780 +#: diff.c:5508

2781 msgid ""

2782 "look for differences that change the number of occurrences of the specified "

2783 "regex"

2784 msgstr ""

2785

2775 -#: diff.c:5508

2786 +#: diff.c:5511

2787 msgid "show all changes in the changeset with -S or -G"

2788 msgstr ""

2789

2779 -#: diff.c:5511

2790 +#: diff.c:5514

2791 msgid "treat <string> in -S as extended POSIX regular expression"

2792 msgstr ""

2793

2783 -#: diff.c:5514

2794 +#: diff.c:5517

2795 msgid "control the order in which files appear in the output"

2796 msgstr ""

2797

2787 -#: diff.c:5515

2798 +#: diff.c:5518

2799 msgid "<object-id>"

2800 msgstr ""

2801

2791 -#: diff.c:5516

2802 +#: diff.c:5519

2803 msgid ""

2804 "look for differences that change the number of occurrences of the specified "

2805 "object"

2806 msgstr ""

2807

2797 -#: diff.c:5518

2808 +#: diff.c:5521

2809 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"

2810 msgstr ""

2811

2801 -#: diff.c:5519

2812 +#: diff.c:5522

2813 msgid "select files by diff type"

2814 msgstr ""

2815

2805 -#: diff.c:5521

2816 +#: diff.c:5524

2817 msgid "<file>"

2818 msgstr ""

2819

2809 -#: diff.c:5522

2820 +#: diff.c:5525

2821 msgid "Output to a specific file"

2822 msgstr ""

2823

2813 -#: diff.c:6177

2824 +#: diff.c:6180

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

2826 msgstr ""

2827

2817 -#: diff.c:6180

2828 +#: diff.c:6183

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

2830 msgstr ""

2831

2821 -#: diff.c:6183

2832 +#: diff.c:6186

2833 #, c-format

2834 msgid ""

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

2836 msgstr ""

2837

2827 -#: dir.c:537

2838 +#: dir.c:549

2839 #, c-format

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

2841 msgstr ""

2842

2832 -#: dir.c:926

2843 +#: dir.c:938

2844 #, c-format

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

2846 msgstr ""

2847

2837 -#: dir.c:1843

2848 +#: dir.c:1877

2849 #, c-format

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

2851 msgstr ""

2852

2842 -#: dir.c:2085

2853 +#: dir.c:2128

2854 msgid "failed to get kernel name and information"

2855 msgstr ""

2856

2846 -#: dir.c:2209

2857 +#: dir.c:2252

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

2859 msgstr ""

2860

2850 -#: dir.c:3013

2861 +#: dir.c:3056

2862 #, c-format

2863 msgid "index file corrupt in repo %s"

2864 msgstr ""

2865

2855 -#: dir.c:3058 dir.c:3063

2866 +#: dir.c:3101 dir.c:3106

2867 #, c-format

2868 msgid "could not create directories for %s"

2869 msgstr ""

2870

2860 -#: dir.c:3092

2871 +#: dir.c:3135

2872 #, c-format

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

2874 msgstr ""

@@ -2876,12 +2887,12 @@ msgstr ""

2887 msgid "could not stat file '%s'"

2888 msgstr ""

2889

2879 -#: environment.c:150

2890 +#: environment.c:148

2891 #, c-format

2892 msgid "bad git namespace path \"%s\""

2893 msgstr ""

2894

2884 -#: environment.c:332

2895 +#: environment.c:330

2896 #, c-format

2897 msgid "could not set GIT_DIR to '%s'"

2898 msgstr ""

@@ -2891,158 +2902,154 @@ msgstr ""

2902 msgid "too many args to run %s"

2903 msgstr ""

2904

2894 -#: fetch-object.c:17

2895 -msgid "Remote with no URL"

2896 -msgstr ""

2897 -

2898 -#: fetch-pack.c:151

2905 +#: fetch-pack.c:150

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

2907 msgstr ""

2908

2902 -#: fetch-pack.c:154

2909 +#: fetch-pack.c:153

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

2911 msgstr ""

2912

2906 -#: fetch-pack.c:165

2913 +#: fetch-pack.c:164

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

2915 msgstr ""

2916

2910 -#: fetch-pack.c:185

2917 +#: fetch-pack.c:184

2918 #, c-format

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

2920 msgstr ""

2921

2915 -#: fetch-pack.c:196

2922 +#: fetch-pack.c:195

2923 msgid "unable to write to remote"

2924 msgstr ""

2925

2919 -#: fetch-pack.c:258

2926 +#: fetch-pack.c:257

2927 msgid "--stateless-rpc requires multi_ack_detailed"

2928 msgstr ""

2929

2923 -#: fetch-pack.c:360 fetch-pack.c:1284

2930 +#: fetch-pack.c:356 fetch-pack.c:1280

2931 #, c-format

2932 msgid "invalid shallow line: %s"

2933 msgstr ""

2934

2928 -#: fetch-pack.c:366 fetch-pack.c:1290

2935 +#: fetch-pack.c:362 fetch-pack.c:1286

2936 #, c-format

2937 msgid "invalid unshallow line: %s"

2938 msgstr ""

2939

2933 -#: fetch-pack.c:368 fetch-pack.c:1292

2940 +#: fetch-pack.c:364 fetch-pack.c:1288

2941 #, c-format

2942 msgid "object not found: %s"

2943 msgstr ""

2944

2938 -#: fetch-pack.c:371 fetch-pack.c:1295

2945 +#: fetch-pack.c:367 fetch-pack.c:1291

2946 #, c-format

2947 msgid "error in object: %s"

2948 msgstr ""

2949

2943 -#: fetch-pack.c:373 fetch-pack.c:1297

2950 +#: fetch-pack.c:369 fetch-pack.c:1293

2951 #, c-format

2952 msgid "no shallow found: %s"

2953 msgstr ""

2954

2948 -#: fetch-pack.c:376 fetch-pack.c:1301

2955 +#: fetch-pack.c:372 fetch-pack.c:1297

2956 #, c-format

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

2958 msgstr ""

2959

2953 -#: fetch-pack.c:417

2960 +#: fetch-pack.c:414

2961 #, c-format

2962 msgid "got %s %d %s"

2963 msgstr ""

2964

2958 -#: fetch-pack.c:434

2965 +#: fetch-pack.c:431

2966 #, c-format

2967 msgid "invalid commit %s"

2968 msgstr ""

2969

2963 -#: fetch-pack.c:465

2970 +#: fetch-pack.c:462

2971 msgid "giving up"

2972 msgstr ""

2973

2967 -#: fetch-pack.c:477 progress.c:277

2974 +#: fetch-pack.c:475 progress.c:312

2975 msgid "done"

2976 msgstr ""

2977

2971 -#: fetch-pack.c:489

2978 +#: fetch-pack.c:487

2979 #, c-format

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

2981 msgstr ""

2982

2976 -#: fetch-pack.c:535

2983 +#: fetch-pack.c:533

2984 #, c-format

2985 msgid "Marking %s as complete"

2986 msgstr ""

2987

2981 -#: fetch-pack.c:744

2988 +#: fetch-pack.c:742

2989 #, c-format

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

2991 msgstr ""

2992

2986 -#: fetch-pack.c:783

2993 +#: fetch-pack.c:781

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

2995 msgstr ""

2996

2990 -#: fetch-pack.c:791

2997 +#: fetch-pack.c:789

2998 msgid "protocol error: bad pack header"

2999 msgstr ""

3000

2994 -#: fetch-pack.c:859

3001 +#: fetch-pack.c:857

3002 #, c-format

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

3004 msgstr ""

3005

2999 -#: fetch-pack.c:875

3006 +#: fetch-pack.c:873

3007 #, c-format

3008 msgid "%s failed"

3009 msgstr ""

3010

3004 -#: fetch-pack.c:877

3011 +#: fetch-pack.c:875

3012 msgid "error in sideband demultiplexer"

3013 msgstr ""

3014

3008 -#: fetch-pack.c:908

3015 +#: fetch-pack.c:907

3016 #, c-format

3017 msgid "Server version is %.*s"

3018 msgstr ""

3019

3013 -#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928

3014 -#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944

3015 -#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960

3016 -#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982

3020 +#: fetch-pack.c:912 fetch-pack.c:918 fetch-pack.c:921 fetch-pack.c:927

3021 +#: fetch-pack.c:931 fetch-pack.c:935 fetch-pack.c:939 fetch-pack.c:943

3022 +#: fetch-pack.c:947 fetch-pack.c:951 fetch-pack.c:955 fetch-pack.c:959

3023 +#: fetch-pack.c:965 fetch-pack.c:971 fetch-pack.c:976 fetch-pack.c:981

3024 #, c-format

3025 msgid "Server supports %s"

3026 msgstr ""

3027

3021 -#: fetch-pack.c:915

3028 +#: fetch-pack.c:914

3029 msgid "Server does not support shallow clients"

3030 msgstr ""

3031

3025 -#: fetch-pack.c:975

3032 +#: fetch-pack.c:974

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

3034 msgstr ""

3035

3029 -#: fetch-pack.c:980

3036 +#: fetch-pack.c:979

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

3038 msgstr ""

3039

3033 -#: fetch-pack.c:984

3040 +#: fetch-pack.c:983

3041 msgid "Server does not support --deepen"

3042 msgstr ""

3043

3037 -#: fetch-pack.c:1001

3044 +#: fetch-pack.c:1000

3045 msgid "no common commits"

3046 msgstr ""

3047

3041 -#: fetch-pack.c:1013 fetch-pack.c:1462

3048 +#: fetch-pack.c:1012 fetch-pack.c:1468

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

3050 msgstr ""

3051

3045 -#: fetch-pack.c:1151

3052 +#: fetch-pack.c:1150

3053 msgid "Server does not support shallow requests"

3054 msgstr ""

3055

@@ -3050,72 +3057,72 @@ msgstr ""

3057 msgid "Server supports filter"

3058 msgstr ""

3059

3053 -#: fetch-pack.c:1184

3060 +#: fetch-pack.c:1180

3061 msgid "unable to write request to remote"

3062 msgstr ""

3063

3057 -#: fetch-pack.c:1202

3064 +#: fetch-pack.c:1198

3065 #, c-format

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

3067 msgstr ""

3068

3062 -#: fetch-pack.c:1208

3069 +#: fetch-pack.c:1204

3070 #, c-format

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

3072 msgstr ""

3073

3067 -#: fetch-pack.c:1247

3074 +#: fetch-pack.c:1243

3075 #, c-format

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

3077 msgstr ""

3078

3072 -#: fetch-pack.c:1252

3079 +#: fetch-pack.c:1248

3080 #, c-format

3081 msgid "error processing acks: %d"

3082 msgstr ""

3083

3077 -#: fetch-pack.c:1262

3084 +#: fetch-pack.c:1258

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

3086 msgstr ""

3087

3081 -#: fetch-pack.c:1264

3088 +#: fetch-pack.c:1260

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

3090 msgstr ""

3091

3085 -#: fetch-pack.c:1306

3092 +#: fetch-pack.c:1302

3093 #, c-format

3094 msgid "error processing shallow info: %d"

3095 msgstr ""

3096

3090 -#: fetch-pack.c:1353

3097 +#: fetch-pack.c:1349

3098 #, c-format

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

3100 msgstr ""

3101

3095 -#: fetch-pack.c:1358

3102 +#: fetch-pack.c:1354

3103 #, c-format

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

3105 msgstr ""

3106

3100 -#: fetch-pack.c:1363

3107 +#: fetch-pack.c:1359

3108 #, c-format

3109 msgid "error processing wanted refs: %d"

3110 msgstr ""

3111

3105 -#: fetch-pack.c:1689

3112 +#: fetch-pack.c:1693

3113 msgid "no matching remote head"

3114 msgstr ""

3115

3109 -#: fetch-pack.c:1712 builtin/clone.c:686

3116 +#: fetch-pack.c:1716 builtin/clone.c:685

3117 msgid "remote did not send all necessary objects"

3118 msgstr ""

3119

3113 -#: fetch-pack.c:1739

3120 +#: fetch-pack.c:1743

3121 #, c-format

3122 msgid "no such remote ref %s"

3123 msgstr ""

3124

3118 -#: fetch-pack.c:1742

3125 +#: fetch-pack.c:1746

3126 #, c-format

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

3128 msgstr ""

@@ -3138,18 +3145,24 @@ msgstr ""

3145 msgid "ignore invalid color '%.*s' in log.graphColors"

3146 msgstr ""

3147

3141 -#: grep.c:2117

3148 +#: grep.c:627

3149 +msgid ""

3150 +"given pattern contains NULL byte (via -f <file>). This is only supported "

3151 +"with -P under PCRE v2"

3152 +msgstr ""

3153 +

3154 +#: grep.c:2083

3155 #, c-format

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

3157 msgstr ""

3158

3146 -#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82

3159 +#: grep.c:2100 setup.c:165 builtin/clone.c:408 builtin/diff.c:82

3160 #: builtin/rm.c:135

3161 #, c-format

3162 msgid "failed to stat '%s'"

3163 msgstr ""

3164

3152 -#: grep.c:2145

3165 +#: grep.c:2111

3166 #, c-format

3167 msgid "'%s': short read"

3168 msgstr ""

@@ -3285,12 +3298,12 @@ msgstr[1] ""

3298 msgid "git version [<options>]"

3299 msgstr ""

3300

3288 -#: help.c:782

3301 +#: help.c:783

3302 #, c-format

3303 msgid "%s: %s - %s"

3304 msgstr ""

3305

3293 -#: help.c:786

3306 +#: help.c:787

3307 msgid ""

3308 "\n"

3309 "Did you mean this?"

@@ -3348,40 +3361,55 @@ msgstr ""

3361 msgid "invalid date format: %s"

3362 msgstr ""

3363

3351 -#: list-objects.c:129

3364 +#: list-objects.c:127

3365 #, c-format

3366 msgid "entry '%s' in tree %s has tree mode, but is not a tree"

3367 msgstr ""

3368

3356 -#: list-objects.c:142

3369 +#: list-objects.c:140

3370 #, c-format

3371 msgid "entry '%s' in tree %s has blob mode, but is not a blob"

3372 msgstr ""

3373

3361 -#: list-objects.c:378

3374 +#: list-objects.c:375

3375 #, c-format

3376 msgid "unable to load root tree for commit %s"

3377 msgstr ""

3378

3366 -#: list-objects-filter-options.c:36

3367 -msgid "multiple filter-specs cannot be combined"

3379 +#: list-objects-filter.c:492

3380 +#, c-format

3381 +msgid "unable to access sparse blob in '%s'"

3382 +msgstr ""

3383 +

3384 +#: list-objects-filter.c:495

3385 +#, c-format

3386 +msgid "unable to parse sparse filter data in %s"

3387 msgstr ""

3388

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

3390 msgid "expected 'tree:<depth>'"

3391 msgstr ""

3392

3374 -#: list-objects-filter-options.c:84

3393 +#: list-objects-filter-options.c:73

3394 msgid "sparse:path filters support has been dropped"

3395 msgstr ""

3396

3378 -#: list-objects-filter-options.c:94

3397 +#: list-objects-filter-options.c:86

3398 #, c-format

3399 msgid "invalid filter-spec '%s'"

3400 msgstr ""

3401

3383 -#: list-objects-filter-options.c:158

3384 -msgid "cannot change partial clone promisor remote"

3402 +#: list-objects-filter-options.c:102

3403 +#, c-format

3404 +msgid "must escape char in sub-filter-spec: '%c'"

3405 +msgstr ""

3406 +

3407 +#: list-objects-filter-options.c:144

3408 +msgid "expected something after combine:"

3409 +msgstr ""

3410 +

3411 +#: list-objects-filter-options.c:226

3412 +msgid "multiple filter-specs cannot be combined"

3413 msgstr ""

3414

3415 #: lockfile.c:151

@@ -3405,114 +3433,110 @@ msgstr ""

3433 msgid "failed to read the cache"

3434 msgstr ""

3435

3408 -#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919

3409 -#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786

3436 +#: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908

3437 +#: builtin/checkout.c:537 builtin/checkout.c:796 builtin/clone.c:785

3438 #: builtin/stash.c:264

3439 msgid "unable to write new index file"

3440 msgstr ""

3441

3414 -#: merge-recursive.c:322

3442 +#: merge-recursive.c:367

3443 msgid "(bad commit)\n"

3444 msgstr ""

3445

3418 -#: merge-recursive.c:345

3446 +#: merge-recursive.c:390

3447 #, c-format

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

3449 msgstr ""

3450

3423 -#: merge-recursive.c:354

3451 +#: merge-recursive.c:399

3452 #, c-format

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

3454 msgstr ""

3455

3428 -#: merge-recursive.c:437

3429 -msgid "error building trees"

3430 -msgstr ""

3431 -

3432 -#: merge-recursive.c:863

3456 +#: merge-recursive.c:885

3457 #, c-format

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

3459 msgstr ""

3460

3437 -#: merge-recursive.c:874

3461 +#: merge-recursive.c:896

3462 #, c-format

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

3464 msgstr ""

3465

3442 -#: merge-recursive.c:888 merge-recursive.c:907

3466 +#: merge-recursive.c:910 merge-recursive.c:929

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

3468 msgstr ""

3469

3446 -#: merge-recursive.c:897

3470 +#: merge-recursive.c:919

3471 #, c-format

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

3473 msgstr ""

3474

3451 -#: merge-recursive.c:938 builtin/cat-file.c:40

3475 +#: merge-recursive.c:960 builtin/cat-file.c:41

3476 #, c-format

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

3478 msgstr ""

3479

3456 -#: merge-recursive.c:941

3480 +#: merge-recursive.c:965

3481 #, c-format

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

3483 msgstr ""

3484

3461 -#: merge-recursive.c:965

3485 +#: merge-recursive.c:990

3486 #, c-format

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

3488 msgstr ""

3489

3466 -#: merge-recursive.c:976

3490 +#: merge-recursive.c:1001

3491 #, c-format

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

3493 msgstr ""

3494

3471 -#: merge-recursive.c:981

3495 +#: merge-recursive.c:1006

3496 #, c-format

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

3498 msgstr ""

3499

3476 -#: merge-recursive.c:1177

3500 +#: merge-recursive.c:1199

3501 #, c-format

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

3503 msgstr ""

3504

3481 -#: merge-recursive.c:1184

3505 +#: merge-recursive.c:1206

3506 #, c-format

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

3508 msgstr ""

3509

3486 -#: merge-recursive.c:1191

3510 +#: merge-recursive.c:1213

3511 #, c-format

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

3513 msgstr ""

3514

3491 -#: merge-recursive.c:1199 merge-recursive.c:1211

3515 +#: merge-recursive.c:1221 merge-recursive.c:1233

3516 #, c-format

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

3518 msgstr ""

3519

3496 -#: merge-recursive.c:1202 merge-recursive.c:1214

3520 +#: merge-recursive.c:1224 merge-recursive.c:1236

3521 #, c-format

3522 msgid "Fast-forwarding submodule %s"

3523 msgstr ""

3524

3501 -#: merge-recursive.c:1237

3525 +#: merge-recursive.c:1259

3526 #, c-format

3527 msgid "Failed to merge submodule %s (merge following commits not found)"

3528 msgstr ""

3529

3506 -#: merge-recursive.c:1241

3530 +#: merge-recursive.c:1263

3531 #, c-format

3532 msgid "Failed to merge submodule %s (not fast-forward)"

3533 msgstr ""

3534

3511 -#: merge-recursive.c:1242

3535 +#: merge-recursive.c:1264

3536 msgid "Found a possible merge resolution for the submodule:\n"

3537 msgstr ""

3538

3515 -#: merge-recursive.c:1245

3539 +#: merge-recursive.c:1267

3540 #, c-format

3541 msgid ""

3542 "If this is correct simply add it to the index for example\n"

@@ -3523,108 +3547,108 @@ msgid ""

3547 "which will accept this suggestion.\n"

3548 msgstr ""

3549

3526 -#: merge-recursive.c:1254

3550 +#: merge-recursive.c:1276

3551 #, c-format

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

3553 msgstr ""

3554

3531 -#: merge-recursive.c:1327

3555 +#: merge-recursive.c:1349

3556 msgid "Failed to execute internal merge"

3557 msgstr ""

3558

3535 -#: merge-recursive.c:1332

3559 +#: merge-recursive.c:1354

3560 #, c-format

3561 msgid "Unable to add %s to database"

3562 msgstr ""

3563

3540 -#: merge-recursive.c:1364

3564 +#: merge-recursive.c:1386

3565 #, c-format

3566 msgid "Auto-merging %s"

3567 msgstr ""

3568

3545 -#: merge-recursive.c:1387

3569 +#: merge-recursive.c:1410

3570 #, c-format

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

3572 msgstr ""

3573

3550 -#: merge-recursive.c:1459

3574 +#: merge-recursive.c:1482

3575 #, c-format

3576 msgid ""

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

3578 "in tree."

3579 msgstr ""

3580

3557 -#: merge-recursive.c:1464

3581 +#: merge-recursive.c:1487

3582 #, c-format

3583 msgid ""

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

3585 "left in tree."

3586 msgstr ""

3587

3564 -#: merge-recursive.c:1471

3588 +#: merge-recursive.c:1494

3589 #, c-format

3590 msgid ""

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

3592 "in tree at %s."

3593 msgstr ""

3594

3571 -#: merge-recursive.c:1476

3595 +#: merge-recursive.c:1499

3596 #, c-format

3597 msgid ""

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

3599 "left in tree at %s."

3600 msgstr ""

3601

3578 -#: merge-recursive.c:1511

3602 +#: merge-recursive.c:1534

3603 msgid "rename"

3604 msgstr ""

3605

3582 -#: merge-recursive.c:1511

3606 +#: merge-recursive.c:1534

3607 msgid "renamed"

3608 msgstr ""

3609

3586 -#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094

3610 +#: merge-recursive.c:1614 merge-recursive.c:2472 merge-recursive.c:3117

3611 #, c-format

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

3613 msgstr ""

3614

3591 -#: merge-recursive.c:1601

3615 +#: merge-recursive.c:1624

3616 #, c-format

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

3618 msgstr ""

3619

3596 -#: merge-recursive.c:1659

3620 +#: merge-recursive.c:1682

3621 #, c-format

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

3623 msgstr ""

3624

3601 -#: merge-recursive.c:1690

3625 +#: merge-recursive.c:1713

3626 #, c-format

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

3628 msgstr ""

3629

3606 -#: merge-recursive.c:1695

3630 +#: merge-recursive.c:1718

3631 #, c-format

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

3633 msgstr ""

3634

3611 -#: merge-recursive.c:1714

3635 +#: merge-recursive.c:1737

3636 #, c-format

3637 msgid ""

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

3639 "\"->\"%s\" in \"%s\"%s"

3640 msgstr ""

3641

3618 -#: merge-recursive.c:1719

3642 +#: merge-recursive.c:1742

3643 msgid " (left unresolved)"

3644 msgstr ""

3645

3622 -#: merge-recursive.c:1828

3646 +#: merge-recursive.c:1851

3647 #, c-format

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

3649 msgstr ""

3650

3627 -#: merge-recursive.c:2035

3651 +#: merge-recursive.c:2056

3652 #, c-format

3653 msgid ""

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

@@ -3632,323 +3656,323 @@ msgid ""

3656 "getting a majority of the files."

3657 msgstr ""

3658

3635 -#: merge-recursive.c:2067

3659 +#: merge-recursive.c:2088

3660 #, c-format

3661 msgid ""

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

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

3664 msgstr ""

3665

3642 -#: merge-recursive.c:2077

3666 +#: merge-recursive.c:2098

3667 #, c-format

3668 msgid ""

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

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

3671 msgstr ""

3672

3649 -#: merge-recursive.c:2169

3673 +#: merge-recursive.c:2190

3674 #, c-format

3675 msgid ""

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

3677 ">%s in %s"

3678 msgstr ""

3679

3656 -#: merge-recursive.c:2413

3680 +#: merge-recursive.c:2435

3681 #, c-format

3682 msgid ""

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

3684 "renamed."

3685 msgstr ""

3686

3663 -#: merge-recursive.c:2938

3687 +#: merge-recursive.c:2961

3688 #, c-format

3689 msgid "cannot read object %s"

3690 msgstr ""

3691

3668 -#: merge-recursive.c:2941

3692 +#: merge-recursive.c:2964

3693 #, c-format

3694 msgid "object %s is not a blob"

3695 msgstr ""

3696

3673 -#: merge-recursive.c:3005

3697 +#: merge-recursive.c:3028

3698 msgid "modify"

3699 msgstr ""

3700

3677 -#: merge-recursive.c:3005

3701 +#: merge-recursive.c:3028

3702 msgid "modified"

3703 msgstr ""

3704

3681 -#: merge-recursive.c:3017

3705 +#: merge-recursive.c:3040

3706 msgid "content"

3707 msgstr ""

3708

3685 -#: merge-recursive.c:3021

3709 +#: merge-recursive.c:3044

3710 msgid "add/add"

3711 msgstr ""

3712

3689 -#: merge-recursive.c:3044

3713 +#: merge-recursive.c:3067

3714 #, c-format

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

3716 msgstr ""

3717

3694 -#: merge-recursive.c:3066 git-submodule.sh:937

3718 +#: merge-recursive.c:3089 git-submodule.sh:937

3719 msgid "submodule"

3720 msgstr ""

3721

3698 -#: merge-recursive.c:3067

3722 +#: merge-recursive.c:3090

3723 #, c-format

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

3725 msgstr ""

3726

3703 -#: merge-recursive.c:3097

3727 +#: merge-recursive.c:3120

3728 #, c-format

3729 msgid "Adding as %s instead"

3730 msgstr ""

3731

3708 -#: merge-recursive.c:3179

3732 +#: merge-recursive.c:3203

3733 #, c-format

3734 msgid ""

3735 "Path updated: %s added in %s inside a directory that was renamed in %s; "

3736 "moving it to %s."

3737 msgstr ""

3738

3715 -#: merge-recursive.c:3182

3739 +#: merge-recursive.c:3206

3740 #, c-format

3741 msgid ""

3742 "CONFLICT (file location): %s added in %s inside a directory that was renamed "

3743 "in %s, suggesting it should perhaps be moved to %s."

3744 msgstr ""

3745

3722 -#: merge-recursive.c:3186

3746 +#: merge-recursive.c:3210

3747 #, c-format

3748 msgid ""

3749 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "

3750 "%s; moving it to %s."

3751 msgstr ""

3752

3729 -#: merge-recursive.c:3189

3753 +#: merge-recursive.c:3213

3754 #, c-format

3755 msgid ""

3756 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "

3757 "was renamed in %s, suggesting it should perhaps be moved to %s."

3758 msgstr ""

3759

3736 -#: merge-recursive.c:3303

3760 +#: merge-recursive.c:3327

3761 #, c-format

3762 msgid "Removing %s"

3763 msgstr ""

3764

3741 -#: merge-recursive.c:3326

3765 +#: merge-recursive.c:3350

3766 msgid "file/directory"

3767 msgstr ""

3768

3745 -#: merge-recursive.c:3331

3769 +#: merge-recursive.c:3355

3770 msgid "directory/file"

3771 msgstr ""

3772

3749 -#: merge-recursive.c:3338

3773 +#: merge-recursive.c:3362

3774 #, c-format

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

3776 msgstr ""

3777

3754 -#: merge-recursive.c:3347

3778 +#: merge-recursive.c:3371

3779 #, c-format

3780 msgid "Adding %s"

3781 msgstr ""

3782

3759 -#: merge-recursive.c:3356

3783 +#: merge-recursive.c:3380

3784 #, c-format

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

3786 msgstr ""

3787

3764 -#: merge-recursive.c:3394

3765 -#, c-format

3766 -msgid ""

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

3768 -" %s"

3769 -msgstr ""

3770 -

3771 -#: merge-recursive.c:3405

3788 +#: merge-recursive.c:3424

3789 msgid "Already up to date!"

3790 msgstr ""

3791

3775 -#: merge-recursive.c:3414

3792 +#: merge-recursive.c:3433

3793 #, c-format

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

3795 msgstr ""

3796

3780 -#: merge-recursive.c:3513

3797 +#: merge-recursive.c:3537

3798 msgid "Merging:"

3799 msgstr ""

3800

3784 -#: merge-recursive.c:3526

3801 +#: merge-recursive.c:3550

3802 #, c-format

3803 msgid "found %u common ancestor:"

3804 msgid_plural "found %u common ancestors:"

3805 msgstr[0] ""

3806 msgstr[1] ""

3807

3791 -#: merge-recursive.c:3565

3808 +#: merge-recursive.c:3600

3809 msgid "merge returned no commit"

3810 msgstr ""

3811

3795 -#: merge-recursive.c:3631

3812 +#: merge-recursive.c:3659

3813 +#, c-format

3814 +msgid ""

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

3816 +" %s"

3817 +msgstr ""

3818 +

3819 +#: merge-recursive.c:3756

3820 #, c-format

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

3822 msgstr ""

3823

3800 -#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869

3824 +#: merge-recursive.c:3774 builtin/merge.c:694 builtin/merge.c:874

3825 msgid "Unable to write index."

3826 msgstr ""

3827

3804 -#: midx.c:69

3828 +#: midx.c:68

3829 #, c-format

3830 msgid "multi-pack-index file %s is too small"

3831 msgstr ""

3832

3809 -#: midx.c:85

3833 +#: midx.c:84

3834 #, c-format

3835 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"

3836 msgstr ""

3837

3814 -#: midx.c:90

3838 +#: midx.c:89

3839 #, c-format

3840 msgid "multi-pack-index version %d not recognized"

3841 msgstr ""

3842

3819 -#: midx.c:95

3843 +#: midx.c:94

3844 #, c-format

3845 msgid "hash version %u does not match"

3846 msgstr ""

3847

3824 -#: midx.c:109

3848 +#: midx.c:108

3849 msgid "invalid chunk offset (too large)"

3850 msgstr ""

3851

3828 -#: midx.c:133

3852 +#: midx.c:132

3853 msgid "terminating multi-pack-index chunk id appears earlier than expected"

3854 msgstr ""

3855

3832 -#: midx.c:146

3856 +#: midx.c:145

3857 msgid "multi-pack-index missing required pack-name chunk"

3858 msgstr ""

3859

3836 -#: midx.c:148

3860 +#: midx.c:147

3861 msgid "multi-pack-index missing required OID fanout chunk"

3862 msgstr ""

3863

3840 -#: midx.c:150

3864 +#: midx.c:149

3865 msgid "multi-pack-index missing required OID lookup chunk"

3866 msgstr ""

3867

3844 -#: midx.c:152

3868 +#: midx.c:151

3869 msgid "multi-pack-index missing required object offsets chunk"

3870 msgstr ""

3871

3848 -#: midx.c:166

3872 +#: midx.c:165

3873 #, c-format

3874 msgid "multi-pack-index pack names out of order: '%s' before '%s'"

3875 msgstr ""

3876

3853 -#: midx.c:211

3877 +#: midx.c:210

3878 #, c-format

3879 msgid "bad pack-int-id: %u (%u total packs)"

3880 msgstr ""

3881

3858 -#: midx.c:261

3882 +#: midx.c:260

3883 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"

3884 msgstr ""

3885

3862 -#: midx.c:289

3886 +#: midx.c:288

3887 msgid "error preparing packfile from multi-pack-index"

3888 msgstr ""

3889

3866 -#: midx.c:470

3890 +#: midx.c:469

3891 #, c-format

3892 msgid "failed to add packfile '%s'"

3893 msgstr ""

3894

3871 -#: midx.c:476

3895 +#: midx.c:475

3896 #, c-format

3897 msgid "failed to open pack-index '%s'"

3898 msgstr ""

3899

3876 -#: midx.c:536

3900 +#: midx.c:535

3901 #, c-format

3902 msgid "failed to locate object %d in packfile"

3903 msgstr ""

3904

3881 -#: midx.c:865

3905 +#: midx.c:864

3906 #, c-format

3907 msgid "did not see pack-file %s to drop"

3908 msgstr ""

3909

3886 -#: midx.c:1036

3910 +#: midx.c:1035

3911 #, c-format

3912 msgid "failed to clear multi-pack-index at %s"

3913 msgstr ""

3914

3891 -#: midx.c:1091

3915 +#: midx.c:1090

3916 msgid "Looking for referenced packfiles"

3917 msgstr ""

3918

3895 -#: midx.c:1106

3919 +#: midx.c:1105

3920 #, c-format

3921 msgid ""

3922 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

3923 msgstr ""

3924

3901 -#: midx.c:1110

3925 +#: midx.c:1109

3926 msgid "Verifying OID order in MIDX"

3927 msgstr ""

3928

3905 -#: midx.c:1119

3929 +#: midx.c:1118

3930 #, c-format

3931 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"

3932 msgstr ""

3933

3910 -#: midx.c:1138

3934 +#: midx.c:1137

3935 msgid "Sorting objects by packfile"

3936 msgstr ""

3937

3914 -#: midx.c:1144

3938 +#: midx.c:1143

3939 msgid "Verifying object offsets"

3940 msgstr ""

3941

3918 -#: midx.c:1160

3942 +#: midx.c:1159

3943 #, c-format

3944 msgid "failed to load pack entry for oid[%d] = %s"

3945 msgstr ""

3946

3923 -#: midx.c:1166

3947 +#: midx.c:1165

3948 #, c-format

3949 msgid "failed to load pack-index for packfile %s"

3950 msgstr ""

3951

3928 -#: midx.c:1175

3952 +#: midx.c:1174

3953 #, c-format

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

3955 msgstr ""

3956

3933 -#: midx.c:1350

3957 +#: midx.c:1349

3958 msgid "could not start pack-objects"

3959 msgstr ""

3960

3937 -#: midx.c:1369

3961 +#: midx.c:1368

3962 msgid "could not finish pack-objects"

3963 msgstr ""

3964

3941 -#: name-hash.c:532

3965 +#: name-hash.c:537

3966 #, c-format

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

3968 msgstr ""

3969

3946 -#: name-hash.c:554

3970 +#: name-hash.c:559

3971 #, c-format

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

3973 msgstr ""

3974

3951 -#: name-hash.c:560

3975 +#: name-hash.c:565

3976 #, c-format

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

3978 msgstr ""

@@ -3989,41 +4013,41 @@ msgstr ""

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

4014 msgstr ""

4015

3992 -#: object.c:54

4016 +#: object.c:53

4017 #, c-format

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

4019 msgstr ""

4020

3997 -#: object.c:174

4021 +#: object.c:173

4022 #, c-format

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

4024 msgstr ""

4025

4002 -#: object.c:234

4026 +#: object.c:233

4027 #, c-format

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

4029 msgstr ""

4030

4007 -#: object.c:247

4031 +#: object.c:246

4032 #, c-format

4033 msgid "unable to parse object: %s"

4034 msgstr ""

4035

4012 -#: object.c:267 object.c:278

4036 +#: object.c:266 object.c:277

4037 #, c-format

4038 msgid "hash mismatch %s"

4039 msgstr ""

4040

4017 -#: packfile.c:648

4041 +#: packfile.c:641

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

4043 msgstr ""

4044

4021 -#: packfile.c:1899

4045 +#: packfile.c:1887

4046 #, c-format

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

4048 msgstr ""

4049

4026 -#: packfile.c:1903

4050 +#: packfile.c:1891

4051 #, c-format

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

4053 msgstr ""

@@ -4068,26 +4092,26 @@ msgstr ""

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

4093 msgstr ""

4094

4071 -#: parse-options.c:859

4095 +#: parse-options.c:860

4096 #, c-format

4097 msgid "unknown option `%s'"

4098 msgstr ""

4099

4076 -#: parse-options.c:861

4100 +#: parse-options.c:862

4101 #, c-format

4102 msgid "unknown switch `%c'"

4103 msgstr ""

4104

4081 -#: parse-options.c:863

4105 +#: parse-options.c:864

4106 #, c-format

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

4108 msgstr ""

4109

4086 -#: parse-options.c:887

4110 +#: parse-options.c:888

4111 msgid "..."

4112 msgstr ""

4113

4090 -#: parse-options.c:906

4114 +#: parse-options.c:907

4115 #, c-format

4116 msgid "usage: %s"

4117 msgstr ""

@@ -4095,21 +4119,21 @@ msgstr ""

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

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

4121 #.

4098 -#: parse-options.c:912

4122 +#: parse-options.c:913

4123 #, c-format

4124 msgid " or: %s"

4125 msgstr ""

4126

4103 -#: parse-options.c:915

4127 +#: parse-options.c:916

4128 #, c-format

4129 msgid " %s"

4130 msgstr ""

4131

4108 -#: parse-options.c:954

4132 +#: parse-options.c:955

4133 msgid "-NUM"

4134 msgstr ""

4135

4112 -#: parse-options.c:968

4136 +#: parse-options.c:969

4137 #, c-format

4138 msgid "alias of --%s"

4139 msgstr ""

@@ -4274,29 +4298,38 @@ msgstr ""

4298 msgid "unable to parse --pretty format"

4299 msgstr ""

4300

4277 -#: range-diff.c:70

4301 +#: promisor-remote.c:25

4302 +msgid "Remote with no URL"

4303 +msgstr ""

4304 +

4305 +#: promisor-remote.c:61

4306 +#, c-format

4307 +msgid "promisor remote name cannot begin with '/': %s"

4308 +msgstr ""

4309 +

4310 +#: range-diff.c:71

4311 msgid "could not start `log`"

4312 msgstr ""

4313

4281 -#: range-diff.c:72

4314 +#: range-diff.c:73

4315 msgid "could not read `log` output"

4316 msgstr ""

4317

4285 -#: range-diff.c:91 sequencer.c:5021

4318 +#: range-diff.c:92 sequencer.c:4985

4319 #, c-format

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

4321 msgstr ""

4322

4290 -#: range-diff.c:117

4323 +#: range-diff.c:118

4324 #, c-format

4325 msgid "could not parse git header '%.*s'"

4326 msgstr ""

4327

4295 -#: range-diff.c:274

4328 +#: range-diff.c:275

4329 msgid "failed to generate diff"

4330 msgstr ""

4331

4299 -#: range-diff.c:506 range-diff.c:508

4332 +#: range-diff.c:507 range-diff.c:509

4333 #, c-format

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

4335 msgstr ""

@@ -4340,156 +4373,156 @@ msgstr ""

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

4374 msgstr ""

4375

4343 -#: read-cache.c:1499

4376 +#: read-cache.c:1520

4377 msgid "Refresh index"

4378 msgstr ""

4379

4347 -#: read-cache.c:1613

4380 +#: read-cache.c:1635

4381 #, c-format

4382 msgid ""

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

4384 "Using version %i"

4385 msgstr ""

4386

4354 -#: read-cache.c:1623

4387 +#: read-cache.c:1645

4388 #, c-format

4389 msgid ""

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

4391 "Using version %i"

4392 msgstr ""

4393

4361 -#: read-cache.c:1679

4394 +#: read-cache.c:1701

4395 #, c-format

4396 msgid "bad signature 0x%08x"

4397 msgstr ""

4398

4366 -#: read-cache.c:1682

4399 +#: read-cache.c:1704

4400 #, c-format

4401 msgid "bad index version %d"

4402 msgstr ""

4403

4371 -#: read-cache.c:1691

4404 +#: read-cache.c:1713

4405 msgid "bad index file sha1 signature"

4406 msgstr ""

4407

4375 -#: read-cache.c:1721

4408 +#: read-cache.c:1743

4409 #, c-format

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

4411 msgstr ""

4412

4380 -#: read-cache.c:1723

4413 +#: read-cache.c:1745

4414 #, c-format

4415 msgid "ignoring %.4s extension"

4416 msgstr ""

4417

4385 -#: read-cache.c:1760

4418 +#: read-cache.c:1782

4419 #, c-format

4420 msgid "unknown index entry format 0x%08x"

4421 msgstr ""

4422

4390 -#: read-cache.c:1776

4423 +#: read-cache.c:1798

4424 #, c-format

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

4426 msgstr ""

4427

4395 -#: read-cache.c:1833

4428 +#: read-cache.c:1855

4429 msgid "unordered stage entries in index"

4430 msgstr ""

4431

4399 -#: read-cache.c:1836

4432 +#: read-cache.c:1858

4433 #, c-format

4434 msgid "multiple stage entries for merged file '%s'"

4435 msgstr ""

4436

4404 -#: read-cache.c:1839

4437 +#: read-cache.c:1861

4438 #, c-format

4439 msgid "unordered stage entries for '%s'"

4440 msgstr ""

4441

4409 -#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111

4410 -#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467

4411 -#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347

4442 +#: read-cache.c:1967 read-cache.c:2255 rerere.c:565 rerere.c:599 rerere.c:1111

4443 +#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:468

4444 +#: builtin/checkout.c:652 builtin/clean.c:967 builtin/commit.c:347

4445 #: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145

4446 #: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330

4447 msgid "index file corrupt"

4448 msgstr ""

4449

4417 -#: read-cache.c:2087

4450 +#: read-cache.c:2108

4451 #, c-format

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

4453 msgstr ""

4454

4422 -#: read-cache.c:2100

4455 +#: read-cache.c:2121

4456 #, c-format

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

4458 msgstr ""

4459

4427 -#: read-cache.c:2133

4460 +#: read-cache.c:2154

4461 #, c-format

4462 msgid "%s: index file open failed"

4463 msgstr ""

4464

4432 -#: read-cache.c:2137

4465 +#: read-cache.c:2158

4466 #, c-format

4467 msgid "%s: cannot stat the open index"

4468 msgstr ""

4469

4437 -#: read-cache.c:2141

4470 +#: read-cache.c:2162

4471 #, c-format

4472 msgid "%s: index file smaller than expected"

4473 msgstr ""

4474

4442 -#: read-cache.c:2145

4475 +#: read-cache.c:2166

4476 #, c-format

4477 msgid "%s: unable to map index file"

4478 msgstr ""

4479

4447 -#: read-cache.c:2187

4480 +#: read-cache.c:2208

4481 #, c-format

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

4483 msgstr ""

4484

4452 -#: read-cache.c:2214

4485 +#: read-cache.c:2235

4486 #, c-format

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

4488 msgstr ""

4489

4457 -#: read-cache.c:2246

4490 +#: read-cache.c:2267

4491 #, c-format

4492 msgid "could not freshen shared index '%s'"

4493 msgstr ""

4494

4462 -#: read-cache.c:2293

4495 +#: read-cache.c:2314

4496 #, c-format

4497 msgid "broken index, expect %s in %s, got %s"

4498 msgstr ""

4499

4467 -#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114

4500 +#: read-cache.c:3010 wrapper.c:622 builtin/merge.c:1119

4501 #, c-format

4502 msgid "could not close '%s'"

4503 msgstr ""

4504

4472 -#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928

4505 +#: read-cache.c:3113 sequencer.c:2296 sequencer.c:3917

4506 #, c-format

4507 msgid "could not stat '%s'"

4508 msgstr ""

4509

4477 -#: read-cache.c:3105

4510 +#: read-cache.c:3126

4511 #, c-format

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

4513 msgstr ""

4514

4482 -#: read-cache.c:3117

4515 +#: read-cache.c:3138

4516 #, c-format

4517 msgid "unable to unlink: %s"

4518 msgstr ""

4519

4487 -#: read-cache.c:3142

4520 +#: read-cache.c:3163

4521 #, c-format

4522 msgid "cannot fix permission bits on '%s'"

4523 msgstr ""

4524

4492 -#: read-cache.c:3291

4525 +#: read-cache.c:3312

4526 #, c-format

4527 msgid "%s: cannot drop to stage #0"

4528 msgstr ""

@@ -4561,8 +4594,8 @@ msgstr ""

4594 msgid "Note that empty commits are commented out"

4595 msgstr ""

4596

4564 -#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447

4565 -#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235

4597 +#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3388

4598 +#: sequencer.c:3414 sequencer.c:5084 builtin/fsck.c:356 builtin/rebase.c:235

4599 #, c-format

4600 msgid "could not write '%s'"

4601 msgstr ""

@@ -4600,7 +4633,7 @@ msgstr ""

4633 msgid "ignoring dangling symref %s"

4634 msgstr ""

4635

4603 -#: refs.c:669 ref-filter.c:2092

4636 +#: refs.c:669 ref-filter.c:2098

4637 #, c-format

4638 msgid "ignoring broken ref %s"

4639 msgstr ""

@@ -4625,14 +4658,14 @@ msgstr ""

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

4659 msgstr ""

4660

4628 -#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913

4629 -#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656

4661 +#: refs.c:833 sequencer.c:403 sequencer.c:2647 sequencer.c:2851

4662 +#: sequencer.c:2865 sequencer.c:3122 sequencer.c:5001 wrapper.c:620

4663 #, c-format

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

4665 msgstr ""

4666

4634 -#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715

4635 -#: builtin/rebase.c:1003

4667 +#: refs.c:860 wrapper.c:188 wrapper.c:358 builtin/am.c:714

4668 +#: builtin/rebase.c:1004

4669 #, c-format

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

4671 msgstr ""

@@ -4667,21 +4700,21 @@ msgstr ""

4700 msgid "update_ref failed for ref '%s': %s"

4701 msgstr ""

4702

4670 -#: refs.c:2012

4703 +#: refs.c:2023

4704 #, c-format

4705 msgid "multiple updates for ref '%s' not allowed"

4706 msgstr ""

4707

4675 -#: refs.c:2044

4708 +#: refs.c:2055

4709 msgid "ref updates forbidden inside quarantine environment"

4710 msgstr ""

4711

4679 -#: refs.c:2140 refs.c:2170

4712 +#: refs.c:2151 refs.c:2181

4713 #, c-format

4714 msgid "'%s' exists; cannot create '%s'"

4715 msgstr ""

4716

4684 -#: refs.c:2146 refs.c:2181

4717 +#: refs.c:2157 refs.c:2192

4718 #, c-format

4719 msgid "cannot process '%s' and '%s' at the same time"

4720 msgstr ""

@@ -4691,13 +4724,13 @@ msgstr ""

4724 msgid "could not remove reference %s"

4725 msgstr ""

4726

4694 -#: refs/files-backend.c:1248 refs/packed-backend.c:1532

4695 -#: refs/packed-backend.c:1542

4727 +#: refs/files-backend.c:1248 refs/packed-backend.c:1541

4728 +#: refs/packed-backend.c:1551

4729 #, c-format

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

4731 msgstr ""

4732

4700 -#: refs/files-backend.c:1251 refs/packed-backend.c:1545

4733 +#: refs/files-backend.c:1251 refs/packed-backend.c:1554

4734 #, c-format

4735 msgid "could not delete references: %s"

4736 msgstr ""

@@ -4707,7 +4740,7 @@ msgstr ""

4740 msgid "invalid refspec '%s'"

4741 msgstr ""

4742

4710 -#: ref-filter.c:42 wt-status.c:1934

4743 +#: ref-filter.c:42 wt-status.c:1938

4744 msgid "gone"

4745 msgstr ""

4746

@@ -4726,280 +4759,280 @@ msgstr ""

4759 msgid "ahead %d, behind %d"

4760 msgstr ""

4761

4729 -#: ref-filter.c:162

4762 +#: ref-filter.c:165

4763 #, c-format

4764 msgid "expected format: %%(color:<color>)"

4765 msgstr ""

4766

4734 -#: ref-filter.c:164

4767 +#: ref-filter.c:167

4768 #, c-format

4769 msgid "unrecognized color: %%(color:%s)"

4770 msgstr ""

4771

4739 -#: ref-filter.c:186

4772 +#: ref-filter.c:189

4773 #, c-format

4774 msgid "Integer value expected refname:lstrip=%s"

4775 msgstr ""

4776

4744 -#: ref-filter.c:190

4777 +#: ref-filter.c:193

4778 #, c-format

4779 msgid "Integer value expected refname:rstrip=%s"

4780 msgstr ""

4781

4749 -#: ref-filter.c:192

4782 +#: ref-filter.c:195

4783 #, c-format

4784 msgid "unrecognized %%(%s) argument: %s"

4785 msgstr ""

4786

4754 -#: ref-filter.c:247

4787 +#: ref-filter.c:250

4788 #, c-format

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

4790 msgstr ""

4791

4759 -#: ref-filter.c:269

4792 +#: ref-filter.c:272

4793 #, c-format

4794 msgid "unrecognized %%(objectsize) argument: %s"

4795 msgstr ""

4796

4764 -#: ref-filter.c:277

4797 +#: ref-filter.c:280

4798 #, c-format

4799 msgid "%%(deltabase) does not take arguments"

4800 msgstr ""

4801

4769 -#: ref-filter.c:289

4802 +#: ref-filter.c:292

4803 #, c-format

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

4805 msgstr ""

4806

4774 -#: ref-filter.c:298

4807 +#: ref-filter.c:301

4808 #, c-format

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

4810 msgstr ""

4811

4779 -#: ref-filter.c:320

4812 +#: ref-filter.c:323

4813 #, c-format

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

4815 msgstr ""

4816

4784 -#: ref-filter.c:349

4817 +#: ref-filter.c:352

4818 #, c-format

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

4820 msgstr ""

4821

4789 -#: ref-filter.c:351

4822 +#: ref-filter.c:354

4823 #, c-format

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

4825 msgstr ""

4826

4794 -#: ref-filter.c:366

4827 +#: ref-filter.c:369

4828 #, c-format

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

4830 msgstr ""

4831

4799 -#: ref-filter.c:370

4832 +#: ref-filter.c:373

4833 #, c-format

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

4835 msgstr ""

4836

4804 -#: ref-filter.c:400

4837 +#: ref-filter.c:403

4838 #, c-format

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

4840 msgstr ""

4841

4809 -#: ref-filter.c:412

4842 +#: ref-filter.c:415

4843 #, c-format

4844 msgid "unrecognized position:%s"

4845 msgstr ""

4846

4814 -#: ref-filter.c:419

4847 +#: ref-filter.c:422

4848 #, c-format

4849 msgid "unrecognized width:%s"

4850 msgstr ""

4851

4819 -#: ref-filter.c:428

4852 +#: ref-filter.c:431

4853 #, c-format

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

4855 msgstr ""

4856

4824 -#: ref-filter.c:436

4857 +#: ref-filter.c:439

4858 #, c-format

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

4860 msgstr ""

4861

4829 -#: ref-filter.c:454

4862 +#: ref-filter.c:457

4863 #, c-format

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

4865 msgstr ""

4866

4834 -#: ref-filter.c:556

4867 +#: ref-filter.c:559

4868 #, c-format

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

4870 msgstr ""

4871

4839 -#: ref-filter.c:583

4872 +#: ref-filter.c:586

4873 #, c-format

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

4875 msgstr ""

4876

4844 -#: ref-filter.c:587

4877 +#: ref-filter.c:590

4878 #, c-format

4879 msgid ""

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

4881 msgstr ""

4882

4850 -#: ref-filter.c:711

4883 +#: ref-filter.c:714

4884 #, c-format

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

4886 msgstr ""

4887

4855 -#: ref-filter.c:774

4888 +#: ref-filter.c:777

4889 #, c-format

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

4891 msgstr ""

4892

4860 -#: ref-filter.c:776

4893 +#: ref-filter.c:779

4894 #, c-format

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

4896 msgstr ""

4897

4865 -#: ref-filter.c:778

4898 +#: ref-filter.c:781

4899 #, c-format

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

4901 msgstr ""

4902

4870 -#: ref-filter.c:806

4903 +#: ref-filter.c:809

4904 #, c-format

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

4906 msgstr ""

4907

4875 -#: ref-filter.c:808

4908 +#: ref-filter.c:811

4909 #, c-format

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

4911 msgstr ""

4912

4880 -#: ref-filter.c:810

4913 +#: ref-filter.c:813

4914 #, c-format

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

4916 msgstr ""

4917

4885 -#: ref-filter.c:825

4918 +#: ref-filter.c:828

4919 #, c-format

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

4921 msgstr ""

4922

4890 -#: ref-filter.c:882

4923 +#: ref-filter.c:885

4924 #, c-format

4925 msgid "malformed format string %s"

4926 msgstr ""

4927

4895 -#: ref-filter.c:1485

4928 +#: ref-filter.c:1488

4929 #, c-format

4930 msgid "no branch, rebasing %s"

4931 msgstr ""

4932

4900 -#: ref-filter.c:1488

4933 +#: ref-filter.c:1491

4934 #, c-format

4935 msgid "no branch, rebasing detached HEAD %s"

4936 msgstr ""

4937

4905 -#: ref-filter.c:1491

4938 +#: ref-filter.c:1494

4939 #, c-format

4940 msgid "no branch, bisect started on %s"

4941 msgstr ""

4942

4910 -#: ref-filter.c:1501

4943 +#: ref-filter.c:1504

4944 msgid "no branch"

4945 msgstr ""

4946

4914 -#: ref-filter.c:1537 ref-filter.c:1743

4947 +#: ref-filter.c:1540 ref-filter.c:1749

4948 #, c-format

4949 msgid "missing object %s for %s"

4950 msgstr ""

4951

4919 -#: ref-filter.c:1547

4952 +#: ref-filter.c:1550

4953 #, c-format

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

4955 msgstr ""

4956

4924 -#: ref-filter.c:1998

4957 +#: ref-filter.c:2004

4958 #, c-format

4959 msgid "malformed object at '%s'"

4960 msgstr ""

4961

4929 -#: ref-filter.c:2087

4962 +#: ref-filter.c:2093

4963 #, c-format

4964 msgid "ignoring ref with broken name %s"

4965 msgstr ""

4966

4934 -#: ref-filter.c:2382

4967 +#: ref-filter.c:2389

4968 #, c-format

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

4970 msgstr ""

4971

4939 -#: ref-filter.c:2482

4972 +#: ref-filter.c:2489

4973 #, c-format

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

4975 msgstr ""

4976

4944 -#: ref-filter.c:2485

4977 +#: ref-filter.c:2492

4978 #, c-format

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

4980 msgstr ""

4981

4949 -#: ref-filter.c:2495

4982 +#: ref-filter.c:2502

4983 #, c-format

4984 msgid "malformed object name %s"

4985 msgstr ""

4986

4954 -#: ref-filter.c:2500

4987 +#: ref-filter.c:2507

4988 #, c-format

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

4990 msgstr ""

4991

4959 -#: remote.c:363

4992 +#: remote.c:366

4993 #, c-format

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

4995 msgstr ""

4996

4964 -#: remote.c:410

4997 +#: remote.c:413

4998 msgid "more than one receivepack given, using the first"

4999 msgstr ""

5000

4968 -#: remote.c:418

5001 +#: remote.c:421

5002 msgid "more than one uploadpack given, using the first"

5003 msgstr ""

5004

4972 -#: remote.c:608

5005 +#: remote.c:611

5006 #, c-format

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

5008 msgstr ""

5009

4977 -#: remote.c:612

5010 +#: remote.c:615

5011 #, c-format

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

5013 msgstr ""

5014

4982 -#: remote.c:616

5015 +#: remote.c:619

5016 #, c-format

5017 msgid "%s tracks both %s and %s"

5018 msgstr ""

5019

4987 -#: remote.c:684

5020 +#: remote.c:687

5021 #, c-format

5022 msgid "key '%s' of pattern had no '*'"

5023 msgstr ""

5024

4992 -#: remote.c:694

5025 +#: remote.c:697

5026 #, c-format

5027 msgid "value '%s' of pattern has no '*'"

5028 msgstr ""

5029

4997 -#: remote.c:1000

5030 +#: remote.c:1003

5031 #, c-format

5032 msgid "src refspec %s does not match any"

5033 msgstr ""

5034

5002 -#: remote.c:1005

5035 +#: remote.c:1008

5036 #, c-format

5037 msgid "src refspec %s matches more than one"

5038 msgstr ""

@@ -5008,7 +5041,7 @@ msgstr ""

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

5042 #. the <src>.

5043 #.

5011 -#: remote.c:1020

5044 +#: remote.c:1023

5045 #, c-format

5046 msgid ""

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

@@ -5022,7 +5055,7 @@ msgid ""

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

5056 msgstr ""

5057

5025 -#: remote.c:1040

5058 +#: remote.c:1043

5059 #, c-format

5060 msgid ""

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

@@ -5030,7 +5063,7 @@ msgid ""

5063 "'%s:refs/heads/%s'?"

5064 msgstr ""

5065

5033 -#: remote.c:1045

5066 +#: remote.c:1048

5067 #, c-format

5068 msgid ""

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

@@ -5038,7 +5071,7 @@ msgid ""

5071 "'%s:refs/tags/%s'?"

5072 msgstr ""

5073

5041 -#: remote.c:1050

5074 +#: remote.c:1053

5075 #, c-format

5076 msgid ""

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

@@ -5046,7 +5079,7 @@ msgid ""

5079 "'%s:refs/tags/%s'?"

5080 msgstr ""

5081

5049 -#: remote.c:1055

5082 +#: remote.c:1058

5083 #, c-format

5084 msgid ""

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

@@ -5054,114 +5087,114 @@ msgid ""

5087 "'%s:refs/tags/%s'?"

5088 msgstr ""

5089

5057 -#: remote.c:1091

5090 +#: remote.c:1094

5091 #, c-format

5092 msgid "%s cannot be resolved to branch"

5093 msgstr ""

5094

5062 -#: remote.c:1102

5095 +#: remote.c:1105

5096 #, c-format

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

5098 msgstr ""

5099

5067 -#: remote.c:1114

5100 +#: remote.c:1117

5101 #, c-format

5102 msgid "dst refspec %s matches more than one"

5103 msgstr ""

5104

5072 -#: remote.c:1121

5105 +#: remote.c:1124

5106 #, c-format

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

5108 msgstr ""

5109

5077 -#: remote.c:1624 remote.c:1725

5110 +#: remote.c:1627 remote.c:1728

5111 msgid "HEAD does not point to a branch"

5112 msgstr ""

5113

5081 -#: remote.c:1633

5114 +#: remote.c:1636

5115 #, c-format

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

5117 msgstr ""

5118

5086 -#: remote.c:1636

5119 +#: remote.c:1639

5120 #, c-format

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

5122 msgstr ""

5123

5091 -#: remote.c:1642

5124 +#: remote.c:1645

5125 #, c-format

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

5127 msgstr ""

5128

5096 -#: remote.c:1657

5129 +#: remote.c:1660

5130 #, c-format

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

5132 msgstr ""

5133

5101 -#: remote.c:1669

5134 +#: remote.c:1672

5135 #, c-format

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

5137 msgstr ""

5138

5106 -#: remote.c:1679

5139 +#: remote.c:1682

5140 #, c-format

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

5142 msgstr ""

5143

5111 -#: remote.c:1692

5144 +#: remote.c:1695

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

5146 msgstr ""

5147

5115 -#: remote.c:1714

5148 +#: remote.c:1717

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

5150 msgstr ""

5151

5119 -#: remote.c:1840

5152 +#: remote.c:1843

5153 #, c-format

5154 msgid "couldn't find remote ref %s"

5155 msgstr ""

5156

5124 -#: remote.c:1853

5157 +#: remote.c:1856

5158 #, c-format

5159 msgid "* Ignoring funny ref '%s' locally"

5160 msgstr ""

5161

5129 -#: remote.c:2016

5162 +#: remote.c:2019

5163 #, c-format

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

5165 msgstr ""

5166

5134 -#: remote.c:2020

5167 +#: remote.c:2023

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

5169 msgstr ""

5170

5138 -#: remote.c:2023

5171 +#: remote.c:2026

5172 #, c-format

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

5174 msgstr ""

5175

5143 -#: remote.c:2027

5176 +#: remote.c:2030

5177 #, c-format

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

5179 msgstr ""

5180

5148 -#: remote.c:2030

5181 +#: remote.c:2033

5182 #, c-format

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

5184 msgstr ""

5185

5153 -#: remote.c:2034

5186 +#: remote.c:2037

5187 #, c-format

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

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

5190 msgstr[0] ""

5191 msgstr[1] ""

5192

5160 -#: remote.c:2040

5193 +#: remote.c:2043

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

5195 msgstr ""

5196

5164 -#: remote.c:2043

5197 +#: remote.c:2046

5198 #, c-format

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

5200 msgid_plural ""

@@ -5169,11 +5202,11 @@ msgid_plural ""

5202 msgstr[0] ""

5203 msgstr[1] ""

5204

5172 -#: remote.c:2051

5205 +#: remote.c:2054

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

5207 msgstr ""

5208

5176 -#: remote.c:2054

5209 +#: remote.c:2057

5210 #, c-format

5211 msgid ""

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

@@ -5184,11 +5217,11 @@ msgid_plural ""

5217 msgstr[0] ""

5218 msgstr[1] ""

5219

5187 -#: remote.c:2064

5220 +#: remote.c:2067

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

5222 msgstr ""

5223

5191 -#: remote.c:2247

5224 +#: remote.c:2250

5225 #, c-format

5226 msgid "cannot parse expected object name '%s'"

5227 msgstr ""

@@ -5266,7 +5299,7 @@ msgstr ""

5299 msgid "Recorded preimage for '%s'"

5300 msgstr ""

5301

5269 -#: rerere.c:881 submodule.c:2023 builtin/log.c:1773

5302 +#: rerere.c:881 submodule.c:2023 builtin/log.c:1790

5303 #: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428

5304 #, c-format

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

@@ -5301,20 +5334,20 @@ msgstr ""

5334 msgid "unable to open rr-cache directory"

5335 msgstr ""

5336

5304 -#: revision.c:2507

5337 +#: revision.c:2509

5338 msgid "your current branch appears to be broken"

5339 msgstr ""

5340

5308 -#: revision.c:2510

5341 +#: revision.c:2512

5342 #, c-format

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

5344 msgstr ""

5345

5313 -#: revision.c:2710

5346 +#: revision.c:2720

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

5348 msgstr ""

5349

5317 -#: revision.c:2714

5350 +#: revision.c:2724

5351 msgid "-L does not yet support diff formats besides -p and -s"

5352 msgstr ""

5353

@@ -5334,39 +5367,39 @@ msgid ""

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

5368 msgstr ""

5369

5337 -#: send-pack.c:141

5370 +#: send-pack.c:142

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

5372 msgstr ""

5373

5341 -#: send-pack.c:143

5374 +#: send-pack.c:144

5375 #, c-format

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

5377 msgstr ""

5378

5346 -#: send-pack.c:145

5379 +#: send-pack.c:146

5380 #, c-format

5381 msgid "remote unpack failed: %s"

5382 msgstr ""

5383

5351 -#: send-pack.c:306

5384 +#: send-pack.c:307

5385 msgid "failed to sign the push certificate"

5386 msgstr ""

5387

5355 -#: send-pack.c:420

5388 +#: send-pack.c:421

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

5390 msgstr ""

5391

5359 -#: send-pack.c:422

5392 +#: send-pack.c:423

5393 msgid ""

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

5395 "signed push"

5396 msgstr ""

5397

5365 -#: send-pack.c:434

5398 +#: send-pack.c:435

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

5400 msgstr ""

5401

5369 -#: send-pack.c:439

5402 +#: send-pack.c:440

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

5404 msgstr ""

5405

@@ -5380,7 +5413,7 @@ msgstr ""

5413 msgid "could not delete '%s'"

5414 msgstr ""

5415

5383 -#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369

5416 +#: sequencer.c:311 builtin/rebase.c:760 builtin/rebase.c:1676 builtin/rm.c:369

5417 #, c-format

5418 msgid "could not remove '%s'"

5419 msgstr ""

@@ -5415,7 +5448,7 @@ msgid ""

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

5449 msgstr ""

5450

5418 -#: sequencer.c:401 sequencer.c:2909

5451 +#: sequencer.c:401 sequencer.c:2847

5452 #, c-format

5453 msgid "could not lock '%s'"

5454 msgstr ""

@@ -5425,15 +5458,15 @@ msgstr ""

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

5459 msgstr ""

5460

5428 -#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929

5429 -#: sequencer.c:3192

5461 +#: sequencer.c:413 sequencer.c:2652 sequencer.c:2853 sequencer.c:2867

5462 +#: sequencer.c:3130

5463 #, c-format

5464 msgid "failed to finalize '%s'"

5465 msgstr ""

5466

5434 -#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734

5435 -#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763

5436 -#: builtin/merge.c:1112 builtin/rebase.c:567

5467 +#: sequencer.c:436 sequencer.c:1585 sequencer.c:2672 sequencer.c:3112

5468 +#: sequencer.c:3221 builtin/am.c:244 builtin/commit.c:763 builtin/merge.c:1117

5469 +#: builtin/rebase.c:568

5470 #, c-format

5471 msgid "could not read '%s'"

5472 msgstr ""

@@ -5460,70 +5493,65 @@ msgstr ""

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

5494 #. "rebase -i".

5495 #.

5463 -#: sequencer.c:632

5496 +#: sequencer.c:631

5497 #, c-format

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

5499 msgstr ""

5500

5468 -#: sequencer.c:649

5501 +#: sequencer.c:648

5502 msgid "unable to update cache tree"

5503 msgstr ""

5504

5472 -#: sequencer.c:663

5505 +#: sequencer.c:662

5506 msgid "could not resolve HEAD commit"

5507 msgstr ""

5508

5476 -#: sequencer.c:743

5509 +#: sequencer.c:742

5510 #, c-format

5511 msgid "no key present in '%.*s'"

5512 msgstr ""

5513

5481 -#: sequencer.c:754

5514 +#: sequencer.c:753

5515 #, c-format

5516 msgid "unable to dequote value of '%s'"

5517 msgstr ""

5518

5486 -#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706

5487 -#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045

5519 +#: sequencer.c:790 wrapper.c:190 wrapper.c:360 builtin/am.c:705

5520 +#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1046

5521 #, c-format

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

5523 msgstr ""

5524

5492 -#: sequencer.c:801

5525 +#: sequencer.c:800

5526 msgid "'GIT_AUTHOR_NAME' already given"

5527 msgstr ""

5528

5496 -#: sequencer.c:806

5529 +#: sequencer.c:805

5530 msgid "'GIT_AUTHOR_EMAIL' already given"

5531 msgstr ""

5532

5500 -#: sequencer.c:811

5533 +#: sequencer.c:810

5534 msgid "'GIT_AUTHOR_DATE' already given"

5535 msgstr ""

5536

5504 -#: sequencer.c:815

5537 +#: sequencer.c:814

5538 #, c-format

5539 msgid "unknown variable '%s'"

5540 msgstr ""

5541

5509 -#: sequencer.c:820

5542 +#: sequencer.c:819

5543 msgid "missing 'GIT_AUTHOR_NAME'"

5544 msgstr ""

5545

5513 -#: sequencer.c:822

5546 +#: sequencer.c:821

5547 msgid "missing 'GIT_AUTHOR_EMAIL'"

5548 msgstr ""

5549

5517 -#: sequencer.c:824

5550 +#: sequencer.c:823

5551 msgid "missing 'GIT_AUTHOR_DATE'"

5552 msgstr ""

5553

5521 -#: sequencer.c:884

5522 -#, c-format

5523 -msgid "invalid date format '%s' in '%s'"

5524 -msgstr ""

5525 -

5526 -#: sequencer.c:901

5554 +#: sequencer.c:872

5555 #, c-format

5556 msgid ""

5557 "you have staged changes in your working tree\n"

@@ -5540,15 +5568,11 @@ msgid ""

5568 " git rebase --continue\n"

5569 msgstr ""

5570

5543 -#: sequencer.c:995

5544 -msgid "writing root commit"

5545 -msgstr ""

5546 -

5547 -#: sequencer.c:1216

5571 +#: sequencer.c:1146

5572 msgid "'prepare-commit-msg' hook failed"

5573 msgstr ""

5574

5551 -#: sequencer.c:1223

5575 +#: sequencer.c:1153

5576 msgid ""

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

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

@@ -5563,7 +5587,7 @@ msgid ""

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

5588 msgstr ""

5589

5566 -#: sequencer.c:1236

5590 +#: sequencer.c:1166

5591 msgid ""

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

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

@@ -5577,346 +5601,346 @@ msgid ""

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

5602 msgstr ""

5603

5580 -#: sequencer.c:1278

5604 +#: sequencer.c:1208

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

5606 msgstr ""

5607

5584 -#: sequencer.c:1280

5608 +#: sequencer.c:1210

5609 msgid "could not parse newly created commit"

5610 msgstr ""

5611

5588 -#: sequencer.c:1326

5612 +#: sequencer.c:1256

5613 msgid "unable to resolve HEAD after creating commit"

5614 msgstr ""

5615

5592 -#: sequencer.c:1328

5616 +#: sequencer.c:1258

5617 msgid "detached HEAD"

5618 msgstr ""

5619

5596 -#: sequencer.c:1332

5620 +#: sequencer.c:1262

5621 msgid " (root-commit)"

5622 msgstr ""

5623

5600 -#: sequencer.c:1353

5624 +#: sequencer.c:1283

5625 msgid "could not parse HEAD"

5626 msgstr ""

5627

5604 -#: sequencer.c:1355

5628 +#: sequencer.c:1285

5629 #, c-format

5630 msgid "HEAD %s is not a commit!"

5631 msgstr ""

5632

5609 -#: sequencer.c:1359 builtin/commit.c:1571

5633 +#: sequencer.c:1289 builtin/commit.c:1571

5634 msgid "could not parse HEAD commit"

5635 msgstr ""

5636

5613 -#: sequencer.c:1411 sequencer.c:2004

5637 +#: sequencer.c:1341 sequencer.c:1933

5638 msgid "unable to parse commit author"

5639 msgstr ""

5640

5617 -#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684

5641 +#: sequencer.c:1352 builtin/am.c:1561 builtin/merge.c:684

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

5643 msgstr ""

5644

5621 -#: sequencer.c:1438 sequencer.c:1499

5645 +#: sequencer.c:1369 sequencer.c:1429

5646 #, c-format

5647 msgid "unable to read commit message from '%s'"

5648 msgstr ""

5649

5626 -#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878

5627 -#: builtin/merge.c:903

5650 +#: sequencer.c:1396 builtin/am.c:1583 builtin/commit.c:1670 builtin/merge.c:883

5651 +#: builtin/merge.c:908

5652 msgid "failed to write commit object"

5653 msgstr ""

5654

5631 -#: sequencer.c:1526

5655 +#: sequencer.c:1456

5656 #, c-format

5657 msgid "could not parse commit %s"

5658 msgstr ""

5659

5636 -#: sequencer.c:1531

5660 +#: sequencer.c:1461

5661 #, c-format

5662 msgid "could not parse parent commit %s"

5663 msgstr ""

5664

5641 -#: sequencer.c:1605 sequencer.c:1715

5665 +#: sequencer.c:1535 sequencer.c:1645

5666 #, c-format

5667 msgid "unknown command: %d"

5668 msgstr ""

5669

5646 -#: sequencer.c:1662 sequencer.c:1687

5670 +#: sequencer.c:1592 sequencer.c:1617

5671 #, c-format

5672 msgid "This is a combination of %d commits."

5673 msgstr ""

5674

5651 -#: sequencer.c:1672

5675 +#: sequencer.c:1602

5676 msgid "need a HEAD to fixup"

5677 msgstr ""

5678

5655 -#: sequencer.c:1674 sequencer.c:3219

5679 +#: sequencer.c:1604 sequencer.c:3157

5680 msgid "could not read HEAD"

5681 msgstr ""

5682

5659 -#: sequencer.c:1676

5683 +#: sequencer.c:1606

5684 msgid "could not read HEAD's commit message"

5685 msgstr ""

5686

5663 -#: sequencer.c:1682

5687 +#: sequencer.c:1612

5688 #, c-format

5689 msgid "cannot write '%s'"

5690 msgstr ""

5691

5668 -#: sequencer.c:1689 git-rebase--preserve-merges.sh:496

5692 +#: sequencer.c:1619 git-rebase--preserve-merges.sh:496

5693 msgid "This is the 1st commit message:"

5694 msgstr ""

5695

5672 -#: sequencer.c:1697

5696 +#: sequencer.c:1627

5697 #, c-format

5698 msgid "could not read commit message of %s"

5699 msgstr ""

5700

5677 -#: sequencer.c:1704

5701 +#: sequencer.c:1634

5702 #, c-format

5703 msgid "This is the commit message #%d:"

5704 msgstr ""

5705

5682 -#: sequencer.c:1710

5706 +#: sequencer.c:1640

5707 #, c-format

5708 msgid "The commit message #%d will be skipped:"

5709 msgstr ""

5710

5687 -#: sequencer.c:1798

5711 +#: sequencer.c:1728

5712 msgid "your index file is unmerged."

5713 msgstr ""

5714

5691 -#: sequencer.c:1805

5715 +#: sequencer.c:1735

5716 msgid "cannot fixup root commit"

5717 msgstr ""

5718

5695 -#: sequencer.c:1824

5719 +#: sequencer.c:1754

5720 #, c-format

5721 msgid "commit %s is a merge but no -m option was given."

5722 msgstr ""

5723

5700 -#: sequencer.c:1832 sequencer.c:1840

5724 +#: sequencer.c:1762 sequencer.c:1770

5725 #, c-format

5726 msgid "commit %s does not have parent %d"

5727 msgstr ""

5728

5705 -#: sequencer.c:1846

5729 +#: sequencer.c:1776

5730 #, c-format

5731 msgid "cannot get commit message for %s"

5732 msgstr ""

5733

5734 #. TRANSLATORS: The first %s will be a "todo" command like

5735 #. "revert" or "pick", the second %s a SHA1.

5712 -#: sequencer.c:1865

5736 +#: sequencer.c:1795

5737 #, c-format

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

5739 msgstr ""

5740

5717 -#: sequencer.c:1930

5741 +#: sequencer.c:1860

5742 #, c-format

5743 msgid "could not rename '%s' to '%s'"

5744 msgstr ""

5745

5722 -#: sequencer.c:1985

5746 +#: sequencer.c:1915

5747 #, c-format

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

5749 msgstr ""

5750

5727 -#: sequencer.c:1986

5751 +#: sequencer.c:1916

5752 #, c-format

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

5754 msgstr ""

5755

5732 -#: sequencer.c:2045

5756 +#: sequencer.c:1983

5757 #, c-format

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

5759 msgstr ""

5760

5737 -#: sequencer.c:2052

5761 +#: sequencer.c:1990

5762 #, c-format

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

5764 msgstr ""

5765

5742 -#: sequencer.c:2128

5766 +#: sequencer.c:2066

5767 #, c-format

5768 msgid "%s does not accept arguments: '%s'"

5769 msgstr ""

5770

5747 -#: sequencer.c:2137

5771 +#: sequencer.c:2075

5772 #, c-format

5773 msgid "missing arguments for %s"

5774 msgstr ""

5775

5752 -#: sequencer.c:2174

5776 +#: sequencer.c:2112

5777 #, c-format

5778 msgid "could not parse '%.*s'"

5779 msgstr ""

5780

5757 -#: sequencer.c:2228

5781 +#: sequencer.c:2166

5782 #, c-format

5783 msgid "invalid line %d: %.*s"

5784 msgstr ""

5785

5762 -#: sequencer.c:2239

5786 +#: sequencer.c:2177

5787 #, c-format

5788 msgid "cannot '%s' without a previous commit"

5789 msgstr ""

5790

5767 -#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178

5791 +#: sequencer.c:2225 builtin/rebase.c:153 builtin/rebase.c:178

5792 #: builtin/rebase.c:204 builtin/rebase.c:229

5793 #, c-format

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

5795 msgstr ""

5796

5773 -#: sequencer.c:2323

5797 +#: sequencer.c:2261

5798 msgid "cancelling a cherry picking in progress"

5799 msgstr ""

5800

5777 -#: sequencer.c:2330

5801 +#: sequencer.c:2268

5802 msgid "cancelling a revert in progress"

5803 msgstr ""

5804

5781 -#: sequencer.c:2364

5805 +#: sequencer.c:2302

5806 msgid "please fix this using 'git rebase --edit-todo'."

5807 msgstr ""

5808

5785 -#: sequencer.c:2366

5809 +#: sequencer.c:2304

5810 #, c-format

5811 msgid "unusable instruction sheet: '%s'"

5812 msgstr ""

5813

5790 -#: sequencer.c:2371

5814 +#: sequencer.c:2309

5815 msgid "no commits parsed."

5816 msgstr ""

5817

5794 -#: sequencer.c:2382

5818 +#: sequencer.c:2320

5819 msgid "cannot cherry-pick during a revert."

5820 msgstr ""

5821

5798 -#: sequencer.c:2384

5822 +#: sequencer.c:2322

5823 msgid "cannot revert during a cherry-pick."

5824 msgstr ""

5825

5802 -#: sequencer.c:2466

5826 +#: sequencer.c:2404

5827 #, c-format

5828 msgid "invalid value for %s: %s"

5829 msgstr ""

5830

5807 -#: sequencer.c:2553

5831 +#: sequencer.c:2491

5832 msgid "unusable squash-onto"

5833 msgstr ""

5834

5811 -#: sequencer.c:2569

5835 +#: sequencer.c:2507

5836 #, c-format

5837 msgid "malformed options sheet: '%s'"

5838 msgstr ""

5839

5816 -#: sequencer.c:2652 sequencer.c:4351

5840 +#: sequencer.c:2590 sequencer.c:4308

5841 msgid "empty commit set passed"

5842 msgstr ""

5843

5820 -#: sequencer.c:2668

5844 +#: sequencer.c:2606

5845 msgid "revert is already in progress"

5846 msgstr ""

5847

5824 -#: sequencer.c:2670

5848 +#: sequencer.c:2608

5849 #, c-format

5850 msgid "try \"git revert (--continue | %s--abort | --quit)\""

5851 msgstr ""

5852

5829 -#: sequencer.c:2673

5853 +#: sequencer.c:2611

5854 msgid "cherry-pick is already in progress"

5855 msgstr ""

5856

5833 -#: sequencer.c:2675

5857 +#: sequencer.c:2613

5858 #, c-format

5859 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""

5860 msgstr ""

5861

5838 -#: sequencer.c:2689

5862 +#: sequencer.c:2627

5863 #, c-format

5864 msgid "could not create sequencer directory '%s'"

5865 msgstr ""

5866

5843 -#: sequencer.c:2704

5867 +#: sequencer.c:2642

5868 msgid "could not lock HEAD"

5869 msgstr ""

5870

5847 -#: sequencer.c:2764 sequencer.c:4103

5871 +#: sequencer.c:2702 sequencer.c:4057

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

5873 msgstr ""

5874

5851 -#: sequencer.c:2766 sequencer.c:2777

5875 +#: sequencer.c:2704 sequencer.c:2715

5876 msgid "cannot resolve HEAD"

5877 msgstr ""

5878

5855 -#: sequencer.c:2768 sequencer.c:2812

5879 +#: sequencer.c:2706 sequencer.c:2750

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

5881 msgstr ""

5882

5859 -#: sequencer.c:2798 builtin/grep.c:734

5883 +#: sequencer.c:2736 builtin/grep.c:736

5884 #, c-format

5885 msgid "cannot open '%s'"

5886 msgstr ""

5887

5864 -#: sequencer.c:2800

5888 +#: sequencer.c:2738

5889 #, c-format

5890 msgid "cannot read '%s': %s"

5891 msgstr ""

5892

5869 -#: sequencer.c:2801

5893 +#: sequencer.c:2739

5894 msgid "unexpected end of file"

5895 msgstr ""

5896

5873 -#: sequencer.c:2807

5897 +#: sequencer.c:2745

5898 #, c-format

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

5900 msgstr ""

5901

5878 -#: sequencer.c:2818

5902 +#: sequencer.c:2756

5903 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

5904 msgstr ""

5905

5882 -#: sequencer.c:2859

5906 +#: sequencer.c:2797

5907 msgid "no revert in progress"

5908 msgstr ""

5909

5886 -#: sequencer.c:2867

5910 +#: sequencer.c:2805

5911 msgid "no cherry-pick in progress"

5912 msgstr ""

5913

5890 -#: sequencer.c:2877

5914 +#: sequencer.c:2815

5915 msgid "failed to skip the commit"

5916 msgstr ""

5917

5894 -#: sequencer.c:2884

5918 +#: sequencer.c:2822

5919 msgid "there is nothing to skip"

5920 msgstr ""

5921

5898 -#: sequencer.c:2887

5922 +#: sequencer.c:2825

5923 #, c-format

5924 msgid ""

5925 "have you committed already?\n"

5926 "try \"git %s --continue\""

5927 msgstr ""

5928

5905 -#: sequencer.c:3011 sequencer.c:4015

5929 +#: sequencer.c:2949 sequencer.c:3969

5930 #, c-format

5931 msgid "could not update %s"

l10n: git.pot: v2.24.0 round 1 (35 new, 16 removed)