13bcea8c7f · matheusbsbs/matheus-bagliano

@@ -75,8 +75,8 @@ msgid ""

75 msgstr ""

76 "Project-Id-Version: git\n"

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

78 -"POT-Creation-Date: 2019-08-10 20:12+0800\n"

79 -"PO-Revision-Date: 2019-08-10 18:17+0200\n"

78 +"POT-Creation-Date: 2019-10-21 19:55+0800\n"

79 +"PO-Revision-Date: 2019-10-21 20:17+0200\n"

80 "Last-Translator: Cédric Malard <c.malard-git@valdun.net>\n"

81 "Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n"

82 "Language: fr\n"

@@ -128,7 +128,7 @@ msgstr ""

128 msgid "Exiting because of an unresolved conflict."

129 msgstr "Abandon à cause de conflit non résolu."

130

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

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

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

133 msgstr "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe)."

134

@@ -275,17 +275,7 @@ msgstr "mode invalide dans la ligne %d : %s"

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

276 msgstr "lignes d'entête inconsistantes %d et %d"

277

278 -#: apply.c:1460

279 -#, c-format

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

281 -msgstr "recomptage : ligne inattendue : %.*s"

282 -

283 -#: apply.c:1529

284 -#, c-format

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

286 -msgstr "fragment de patch sans en-tête à la ligne %d : %.*s"

287 -

288 -#: apply.c:1551

278 +#: apply.c:1372

279 #, c-format

280 msgid ""

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

@@ -300,83 +290,93 @@ msgstr[1] ""

290 "information de nom de fichier manquante dans l'en-tête de git diff lors de "

291 "la suppression de %d composants de préfixe de chemin (ligne %d)"

292

303 -#: apply.c:1564

293 +#: apply.c:1385

294 #, c-format

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

296 msgstr ""

297 "information de nom de fichier manquante dans l'en-tête de git diff (ligne %d)"

298

309 -#: apply.c:1752

299 +#: apply.c:1481

300 +#, c-format

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

302 +msgstr "recomptage : ligne inattendue : %.*s"

303 +

304 +#: apply.c:1550

305 +#, c-format

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

307 +msgstr "fragment de patch sans en-tête à la ligne %d : %.*s"

308 +

309 +#: apply.c:1753

310 msgid "new file depends on old contents"

311 msgstr "le nouveau fichier dépend de contenus anciens"

312

313 -#: apply.c:1754

313 +#: apply.c:1755

314 msgid "deleted file still has contents"

315 msgstr "le fichier supprimé a encore du contenu"

316

317 -#: apply.c:1788

317 +#: apply.c:1789

318 #, c-format

319 msgid "corrupt patch at line %d"

320 msgstr "patch corrompu à la ligne %d"

321

322 -#: apply.c:1825

322 +#: apply.c:1826

323 #, c-format

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

325 msgstr "le nouveau fichier %s dépend de contenus anciens"

326

327 -#: apply.c:1827

327 +#: apply.c:1828

328 #, c-format

329 msgid "deleted file %s still has contents"

330 msgstr "le fichier supprimé %s a encore du contenu"

331

332 -#: apply.c:1830

332 +#: apply.c:1831

333 #, c-format

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

335 msgstr "** attention : le fichier %s devient vide mais n'est pas supprimé"

336

337 -#: apply.c:1977

337 +#: apply.c:1978

338 #, c-format

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

340 msgstr "patch binaire corrompu à la ligne %d : %.*s"

341

342 -#: apply.c:2014

342 +#: apply.c:2015

343 #, c-format

344 msgid "unrecognized binary patch at line %d"

345 msgstr "patch binaire non reconnu à la ligne %d"

346

347 -#: apply.c:2176

347 +#: apply.c:2177

348 #, c-format

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

350 msgstr "patch totalement incompréhensible à la ligne %d"

351

352 -#: apply.c:2262

352 +#: apply.c:2263

353 #, c-format

354 msgid "unable to read symlink %s"

355 msgstr "lecture du lien symbolique %s impossible"

356

357 -#: apply.c:2266

357 +#: apply.c:2267

358 #, c-format

359 msgid "unable to open or read %s"

360 msgstr "ouverture ou lecture de %s impossible"

361

362 -#: apply.c:2925

362 +#: apply.c:2926

363 #, c-format

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

365 msgstr "début de ligne invalide : '%c'"

366

367 -#: apply.c:3046

367 +#: apply.c:3047

368 #, c-format

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

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

371 msgstr[0] "La section n°%d a réussi à la ligne %d (offset %d ligne)."

372 msgstr[1] "La section n°%d a réussi à la ligne %d (offset %d lignes)."

373

374 -#: apply.c:3058

374 +#: apply.c:3059

375 #, c-format

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

377 msgstr "Contexte réduit à (%ld/%ld) pour appliquer le fragment à la ligne %d"

378

379 -#: apply.c:3064

379 +#: apply.c:3065

380 #, c-format

381 msgid ""

382 "while searching for:\n"

@@ -385,463 +385,463 @@ msgstr ""

385 "pendant la recherche de :\n"

386 "%.*s"

387

388 -#: apply.c:3086

388 +#: apply.c:3087

389 #, c-format

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

391 msgstr "données de patch binaire manquantes pour '%s'"

392

393 -#: apply.c:3094

393 +#: apply.c:3095

394 #, c-format

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

396 msgstr ""

397 "impossible d'appliquer l'inverse d'un patch binaire à '%s' sans la section "

398 "inverse"

399

400 -#: apply.c:3141

400 +#: apply.c:3142

401 #, c-format

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

403 msgstr ""

404 "impossible d'appliquer un patch binaire à '%s' sans la ligne complète d'index"

405

406 -#: apply.c:3151

406 +#: apply.c:3152

407 #, c-format

408 msgid ""

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

410 msgstr ""

411 "le patch s'applique à '%s' (%s), ce qui ne correspond pas au contenu actuel."

412

413 -#: apply.c:3159

413 +#: apply.c:3160

414 #, c-format

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

416 msgstr "le patch s'applique à un '%s' vide mais ce n'est pas vide"

417

418 -#: apply.c:3177

418 +#: apply.c:3178

419 #, c-format

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

421 msgstr "l'image postérieure nécessaire %s pour '%s' ne peut pas être lue"

422

423 -#: apply.c:3190

423 +#: apply.c:3191

424 #, c-format

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

426 msgstr "le patch binaire ne s'applique par correctement à '%s'"

427

428 -#: apply.c:3196

428 +#: apply.c:3197

429 #, c-format

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

431 msgstr ""

432 "le patch binaire sur '%s' crée un résultat incorrect (%s attendu, mais %s "

433 "trouvé)"

434

435 -#: apply.c:3217

435 +#: apply.c:3218

436 #, c-format

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

438 msgstr "le patch a échoué : %s:%ld"

439

440 -#: apply.c:3340

440 +#: apply.c:3341

441 #, c-format

442 msgid "cannot checkout %s"

443 msgstr "extraction de %s impossible"

444

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

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

446 #, c-format

447 msgid "failed to read %s"

448 msgstr "échec de la lecture de %s"

449

450 -#: apply.c:3400

450 +#: apply.c:3401

451 #, c-format

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

453 msgstr "lecture depuis '%s' au-delà d'un lien symbolique"

454

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

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

456 #, c-format

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

458 msgstr "le chemin %s a été renommé/supprimé"

459

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

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

461 #, c-format

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

463 msgstr "%s : n'existe pas dans l'index"

464

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

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

466 #, c-format

467 msgid "%s: does not match index"

468 msgstr "%s : ne correspond pas à l'index"

469

470 -#: apply.c:3559

470 +#: apply.c:3560

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

472 msgstr ""

473 "le dépôt n'a pas les blobs nécessaires pour un retour à une fusion à 3 "

474 "points."

475

476 -#: apply.c:3562

476 +#: apply.c:3563

477 #, c-format

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

479 msgstr "Retour à une fusion à 3 points…\n"

480

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

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

482 #, c-format

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

484 msgstr "impossible de lire le contenu actuel de '%s'"

485

486 -#: apply.c:3594

486 +#: apply.c:3595

487 #, c-format

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

489 msgstr "Échec du retour à une fusion à 3 points…\n"

490

491 -#: apply.c:3608

491 +#: apply.c:3609

492 #, c-format

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

494 msgstr "Patch %s appliqué avec des conflits.\n"

495

496 -#: apply.c:3613

496 +#: apply.c:3614

497 #, c-format

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

499 msgstr "Patch %s appliqué proprement.\n"

500

501 -#: apply.c:3639

501 +#: apply.c:3640

502 msgid "removal patch leaves file contents"

503 msgstr "le patch de suppression laisse un contenu dans le fichier"

504

505 -#: apply.c:3712

505 +#: apply.c:3713

506 #, c-format

507 msgid "%s: wrong type"

508 msgstr "%s : type erroné"

509

510 -#: apply.c:3714

510 +#: apply.c:3715

511 #, c-format

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

513 msgstr "%s est de type %o, mais %o attendu"

514

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

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

516 #: read-cache.c:1309

517 #, c-format

518 msgid "invalid path '%s'"

519 msgstr "chemin invalide '%s'"

520

521 -#: apply.c:3923

521 +#: apply.c:3924

522 #, c-format

523 msgid "%s: already exists in index"

524 msgstr "%s : existe déjà dans l'index"

525

526 -#: apply.c:3926

526 +#: apply.c:3927

527 #, c-format

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

529 msgstr "%s : existe déjà dans la copie de travail"

530

531 -#: apply.c:3946

531 +#: apply.c:3947

532 #, c-format

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

534 msgstr "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o)"

535

536 -#: apply.c:3951

536 +#: apply.c:3952

537 #, c-format

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

539 msgstr ""

540 "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o) de %s"

541

542 -#: apply.c:3971

542 +#: apply.c:3972

543 #, c-format

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

545 msgstr "le fichier affecté '%s' est au-delà d'un lien symbolique"

546

547 -#: apply.c:3975

547 +#: apply.c:3976

548 #, c-format

549 msgid "%s: patch does not apply"

550 msgstr "%s : le patch ne s'applique pas"

551

552 -#: apply.c:3990

552 +#: apply.c:3991

553 #, c-format

554 msgid "Checking patch %s..."

555 msgstr "Vérification du patch %s..."

556

557 -#: apply.c:4082

557 +#: apply.c:4083

558 #, c-format

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

560 msgstr ""

561 "l'information sha1 est manquante ou inutilisable pour le sous-module %s"

562

563 -#: apply.c:4089

563 +#: apply.c:4090

564 #, c-format

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

566 msgstr "le mode change pour %s, qui n'est pas dans la HEAD actuelle"

567

568 -#: apply.c:4092

568 +#: apply.c:4093

569 #, c-format

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

571 msgstr "l'information de sha1 est manquante ou inutilisable (%s)."

572

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

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

574 #, c-format

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

576 msgstr "échec de make_cache_entry pour le chemin '%s'"

577

578 -#: apply.c:4101

578 +#: apply.c:4102

579 #, c-format

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

581 msgstr "impossible d'ajouter %s à l'index temporaire"

582

583 -#: apply.c:4111

583 +#: apply.c:4112

584 #, c-format

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

586 msgstr "impossible d'écrire l'index temporaire dans %s"

587

588 -#: apply.c:4249

588 +#: apply.c:4250

589 #, c-format

590 msgid "unable to remove %s from index"

591 msgstr "suppression de %s dans l'index impossible"

592

593 -#: apply.c:4283

593 +#: apply.c:4284

594 #, c-format

595 msgid "corrupt patch for submodule %s"

596 msgstr "patch corrompu pour le sous-module %s"

597

598 -#: apply.c:4289

598 +#: apply.c:4290

599 #, c-format

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

601 msgstr "stat du fichier nouvellement créé '%s' impossible"

602

603 -#: apply.c:4297

603 +#: apply.c:4298

604 #, c-format

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

606 msgstr ""

607 "création du magasin de stockage pour le fichier nouvellement créé %s "

608 "impossible"

609

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

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

611 #, c-format

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

613 msgstr "ajout de l'élément de cache %s impossible"

614

615 -#: apply.c:4346

615 +#: apply.c:4347

616 #, c-format

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

618 msgstr "échec de l'écriture dans '%s'"

619

620 -#: apply.c:4350

620 +#: apply.c:4351

621 #, c-format

622 msgid "closing file '%s'"

623 msgstr "fermeture du fichier '%s'"

624

625 -#: apply.c:4420

625 +#: apply.c:4421

626 #, c-format

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

628 msgstr "écriture du fichier '%s' mode %o impossible"

629

630 -#: apply.c:4518

630 +#: apply.c:4519

631 #, c-format

632 msgid "Applied patch %s cleanly."

633 msgstr "Patch %s appliqué proprement."

634

635 -#: apply.c:4526

635 +#: apply.c:4527

636 msgid "internal error"

637 msgstr "erreur interne"

638

639 -#: apply.c:4529

639 +#: apply.c:4530

640 #, c-format

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

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

643 msgstr[0] "Application du patch %%s avec %d rejet..."

644 msgstr[1] "Application du patch %%s avec %d rejets..."

645

646 -#: apply.c:4540

646 +#: apply.c:4541

647 #, c-format

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

649 msgstr "troncature du nom de fichier .rej en %.*s.rej"

650

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

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

652 #, c-format

653 msgid "cannot open %s"

654 msgstr "impossible d'ouvrir %s"

655

656 -#: apply.c:4562

656 +#: apply.c:4563

657 #, c-format

658 msgid "Hunk #%d applied cleanly."

659 msgstr "Section n°%d appliquée proprement."

660

661 -#: apply.c:4566

661 +#: apply.c:4567

662 #, c-format

663 msgid "Rejected hunk #%d."

664 msgstr "Section n°%d rejetée."

665

666 -#: apply.c:4676

666 +#: apply.c:4686

667 #, c-format

668 msgid "Skipped patch '%s'."

669 msgstr "Chemin '%s' non traité."

670

671 -#: apply.c:4684

671 +#: apply.c:4694

672 msgid "unrecognized input"

673 msgstr "entrée non reconnue"

674

675 -#: apply.c:4704

675 +#: apply.c:4714

676 msgid "unable to read index file"

677 msgstr "lecture du fichier d'index impossible"

678

679 -#: apply.c:4859

679 +#: apply.c:4871

680 #, c-format

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

682 msgstr "ouverture impossible du patch '%s' :%s"

683

684 -#: apply.c:4886

684 +#: apply.c:4898

685 #, c-format

686 msgid "squelched %d whitespace error"

687 msgid_plural "squelched %d whitespace errors"

688 msgstr[0] "%d erreur d'espace ignorée"

689 msgstr[1] "%d erreurs d'espace ignorées"

690

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

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

692 #, c-format

693 msgid "%d line adds whitespace errors."

694 msgid_plural "%d lines add whitespace errors."

695 msgstr[0] "%d ligne a ajouté des erreurs d'espace."

696 msgstr[1] "%d lignes ont ajouté des erreurs d'espace."

697

698 -#: apply.c:4900

698 +#: apply.c:4912

699 #, c-format

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

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

702 msgstr[0] "%d ligne ajoutée après correction des erreurs d'espace."

703 msgstr[1] "%d lignes ajoutées après correction des erreurs d'espace."

704

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

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

706 msgid "Unable to write new index file"

707 msgstr "Impossible d'écrire le nouveau fichier d'index"

708

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

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

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

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

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

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

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

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

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

715 msgid "path"

716 msgstr "chemin"

717

718 -#: apply.c:4944

718 +#: apply.c:4956

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

720 msgstr "ne pas appliquer les modifications qui correspondent au chemin donné"

721

722 -#: apply.c:4947

722 +#: apply.c:4959

723 msgid "apply changes matching the given path"

724 msgstr "appliquer les modifications qui correspondent au chemin donné"

725

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

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

727 msgid "num"

728 msgstr "num"

729

730 -#: apply.c:4950

730 +#: apply.c:4962

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

732 msgstr "supprimer <num> barres obliques des chemins traditionnels de diff"

733

734 -#: apply.c:4953

734 +#: apply.c:4965

735 msgid "ignore additions made by the patch"

736 msgstr "ignorer les additions réalisées par le patch"

737

738 -#: apply.c:4955

738 +#: apply.c:4967

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

740 msgstr "au lieu d'appliquer le patch, afficher le diffstat de l'entrée"

741

742 -#: apply.c:4959

742 +#: apply.c:4971

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

744 msgstr ""

745 "afficher le nombre de lignes ajoutées et supprimées en notation décimale"

746

747 -#: apply.c:4961

747 +#: apply.c:4973

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

749 msgstr "au lieu d'appliquer le patch, afficher un résumé de l'entrée"

750

751 -#: apply.c:4963

751 +#: apply.c:4975

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

753 msgstr "au lieu d'appliquer le patch, voir si le patch est applicable"

754

755 -#: apply.c:4965

755 +#: apply.c:4977

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

757 msgstr "s'assurer que le patch est applicable sur l'index actuel"

758

759 -#: apply.c:4967

759 +#: apply.c:4979

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

761 msgstr "marquer les nouveaux fichiers `git add --intent-to-add`"

762

763 -#: apply.c:4969

763 +#: apply.c:4981

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

765 msgstr "appliquer les patch sans toucher à la copie de travail"

766

767 -#: apply.c:4971

767 +#: apply.c:4983

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

769 msgstr "accepter un patch qui touche hors de la copie de travail"

770

771 -#: apply.c:4974

771 +#: apply.c:4986

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

773 msgstr "appliquer aussi le patch (à utiliser avec --stat/--summary/--check)"

774

775 -#: apply.c:4976

775 +#: apply.c:4988

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

777 msgstr "tenter une fusion à 3 points si le patch ne s'applique pas proprement"

778

779 -#: apply.c:4978

779 +#: apply.c:4990

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

781 msgstr ""

782 "construire un index temporaire fondé sur l'information de l'index embarqué"

783

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

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

785 msgid "paths are separated with NUL character"

786 msgstr "les chemins sont séparés par un caractère NUL"

787

788 -#: apply.c:4983

788 +#: apply.c:4995

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

790 msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte"

791

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

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

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

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

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

795 msgid "action"

796 msgstr "action"

797

798 -#: apply.c:4985

798 +#: apply.c:4997

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

800 msgstr ""

801 "détecter des lignes nouvelles ou modifiées qui contiennent des erreurs "

802 "d'espace"

803

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

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

805 msgid "ignore changes in whitespace when finding context"

806 msgstr "ignorer des modifications d'espace lors de la recherche de contexte"

807

808 -#: apply.c:4994

808 +#: apply.c:5006

809 msgid "apply the patch in reverse"

810 msgstr "appliquer le patch en sens inverse"

811

812 -#: apply.c:4996

812 +#: apply.c:5008

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

814 msgstr "ne pas s'attendre à au moins une ligne de contexte"

815

816 -#: apply.c:4998

816 +#: apply.c:5010

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

818 msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants"

819

820 -#: apply.c:5000

820 +#: apply.c:5012

821 msgid "allow overlapping hunks"

822 msgstr "accepter les recouvrements de sections"

823

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

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

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

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

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

827 msgid "be verbose"

828 msgstr "mode verbeux"

829

830 -#: apply.c:5003

830 +#: apply.c:5015

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

832 msgstr ""

833 "tolérer des erreurs de détection de retours chariot manquants en fin de "

834 "fichier"

835

836 -#: apply.c:5006

836 +#: apply.c:5018

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

838 msgstr "ne pas se fier au compte de lignes dans les en-têtes de section"

839

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

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

841 msgid "root"

842 msgstr "racine"

843

844 -#: apply.c:5009

844 +#: apply.c:5021

845 msgid "prepend <root> to all filenames"

846 msgstr "préfixer tous les noms de fichier avec <root>"

847

@@ -896,7 +896,7 @@ msgstr "fmt"

896 msgid "archive format"

897 msgstr "format d'archive"

898

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

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

900 msgid "prefix"

901 msgstr "préfixe"

902

@@ -904,11 +904,12 @@ msgstr "préfixe"

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

905 msgstr "préfixer chaque chemin de fichier dans l'archive"

906

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

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

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

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

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

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

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

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

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

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

912 +#: parse-options.h:186

913 msgid "file"

914 msgstr "fichier"

915

@@ -940,7 +941,7 @@ msgstr "compression efficace"

941 msgid "list supported archive formats"

942 msgstr "afficher les formats d'archive supportés"

943

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

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

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

946 msgid "repo"

947 msgstr "dépôt"

@@ -949,7 +950,7 @@ msgstr "dépôt"

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

951 msgstr "récupérer l'archive depuis le dépôt distant <dépôt>"

952

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

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

954 #: builtin/notes.c:498

955 msgid "command"

956 msgstr "commande"

@@ -985,26 +986,26 @@ msgstr "Argument non supporté pour le format '%s' : -%d"

986 msgid "cannot stream blob %s"

987 msgstr "impossible de transmettre le blob %s en flux"

988

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

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

990 #, c-format

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

992 msgstr "mode de fichier non supporté :0%o (SHA1: %s)"

993

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

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

995 #, c-format

996 msgid "cannot read %s"

997 msgstr "impossible de lire %s"

998

998 -#: archive-tar.c:459

999 +#: archive-tar.c:465

1000 #, c-format

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

1002 msgstr "impossible de démarrer le filtre '%s'"

1003

1003 -#: archive-tar.c:462

1004 +#: archive-tar.c:468

1005 msgid "unable to redirect descriptor"

1006 msgstr "impossible de rediriger un descripteur"

1007

1007 -#: archive-tar.c:469

1008 +#: archive-tar.c:475

1009 #, c-format

1010 msgid "'%s' filter reported error"

1011 msgstr "le filtre '%s' a retourné une erreur"

@@ -1029,17 +1030,17 @@ msgstr "erreur de compression (%d)"

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

1031 msgstr "l'horodatage est trop grand pour ce système : %<PRIuMAX>"

1032

1032 -#: attr.c:211

1033 +#: attr.c:213

1034 #, c-format

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

1036 msgstr "%.*s n'est pas un nom valide d'attribut"

1037

1037 -#: attr.c:368

1038 +#: attr.c:370

1039 #, c-format

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

1041 msgstr "%s non permis : %s : %d"

1042

1042 -#: attr.c:408

1043 +#: attr.c:410

1044 msgid ""

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

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

@@ -1167,41 +1168,41 @@ msgid_plural "Bisecting: %d revisions left to test after this %s\n"

1168 msgstr[0] "Bissection : %d révision à tester après ceci %s\n"

1169 msgstr[1] "Bissection : %d révisions à tester après ceci %s\n"

1170

1170 -#: blame.c:2697

1171 +#: blame.c:2700

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

1173 msgstr "--contents et --reverse ne font pas bon ménage."

1174

1174 -#: blame.c:2711

1175 +#: blame.c:2714

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

1177 msgstr "on ne peut pas utiliser --contents avec un nom d'objet commit final"

1178

1178 -#: blame.c:2732

1179 +#: blame.c:2735

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

1181 msgstr ""

1182 "--reverse et --first-parent ensemble nécessitent la spécification d'un "

1183 "dernier commit"

1184

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

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

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

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

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

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

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

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

1189 #: builtin/shortlog.c:192

1190 msgid "revision walk setup failed"

1191 msgstr "échec de la préparation du parcours des révisions"

1192

1192 -#: blame.c:2759

1193 +#: blame.c:2762

1194 msgid ""

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

1196 msgstr ""

1197 "--reverse --first-parent ensemble nécessitent une portée avec la chaîne de "

1198 "premier parent"

1199

1199 -#: blame.c:2770

1200 +#: blame.c:2773

1201 #, c-format

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

1203 msgstr "pas de chemin %s dans %s"

1204

1204 -#: blame.c:2781

1205 +#: blame.c:2784

1206 #, c-format

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

1208 msgstr "impossible de lire le blob %s pour le chemin %s"

@@ -1364,7 +1365,7 @@ msgstr "'%s' ne semble pas être un fichier bundle v2"

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

1366 msgstr "en-tête non reconnu : %s%s (%d)"

1367

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

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

1369 #: builtin/commit.c:791

1370 #, c-format

1371 msgid "could not open '%s'"

@@ -1417,7 +1418,7 @@ msgstr "rev-list a disparu"

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

1419 msgstr "la référence '%s' est exclue par les options de rev-list"

1420

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

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

1422 #, c-format

1423 msgid "unrecognized argument: %s"

1424 msgstr "argument non reconnu : %s"

@@ -1440,8 +1441,8 @@ msgstr "l'index de groupe a disparu"

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

1442 msgstr "Valeur invalide de couleur : %.*s"

1443

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

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

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

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

1446 #, c-format

1447 msgid "could not parse %s"

1448 msgstr "impossible d'analyser %s"

@@ -1471,27 +1472,27 @@ msgstr ""

1472 "Supprimez ce message en lançant\n"

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

1474

1474 -#: commit.c:1127

1475 +#: commit.c:1128

1476 #, c-format

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

1478 msgstr "La validation %s a une signature GPG non fiable, prétendument par %s."

1479

1479 -#: commit.c:1130

1480 +#: commit.c:1131

1481 #, c-format

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

1483 msgstr "La validation %s a une mauvaise signature GPG prétendument par %s."

1484

1484 -#: commit.c:1133

1485 +#: commit.c:1134

1486 #, c-format

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

1488 msgstr "La validation %s n'a pas de signature GPG."

1489

1489 -#: commit.c:1136

1490 +#: commit.c:1137

1491 #, c-format

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

1493 msgstr "La validation %s a une signature GPG correcte par %s\n"

1494

1494 -#: commit.c:1390

1495 +#: commit.c:1391

1496 msgid ""

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

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

@@ -1559,189 +1560,204 @@ msgstr ""

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

1561 msgstr "impossible de trouver tous les fichiers du graphe de commit"

1562

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

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

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

1565 msgstr ""

1566 "position de commit invalide. Le graphe de commit est vraisemblablement "

1567 "corrompu"

1568

1568 -#: commit-graph.c:575

1569 +#: commit-graph.c:582

1570 #, c-format

1571 msgid "could not find commit %s"

1572 msgstr "impossible de trouver le commit %s"

1573

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

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

1575 +#, c-format

1576 +msgid "unable to parse commit %s"

1577 +msgstr "impossible d'analyser le commit %s"

1578 +

1579 +#: commit-graph.c:859

1580 +#, c-format

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

1582 +msgstr "impossible de récupérer l'arbre de %s"

1583 +

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

1585 #, c-format

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

1587 msgstr "impossible d'obtenir le type de l'objet %s"

1588

1578 -#: commit-graph.c:1034

1589 +#: commit-graph.c:1049

1590 msgid "Loading known commits in commit graph"

1591 msgstr "Lecture des commits connus dans un graphe de commit"

1592

1582 -#: commit-graph.c:1051

1593 +#: commit-graph.c:1066

1594 msgid "Expanding reachable commits in commit graph"

1595 msgstr "Expansion des commits joignables dans un graphe de commit"

1596

1586 -#: commit-graph.c:1070

1597 +#: commit-graph.c:1085

1598 msgid "Clearing commit marks in commit graph"

1599 msgstr "Suppression les marques de commit dans le graphe de commits"

1600

1590 -#: commit-graph.c:1089

1601 +#: commit-graph.c:1104

1602 msgid "Computing commit graph generation numbers"

1603 msgstr "Calcul des chiffres de génération du graphe de commits"

1604

1594 -#: commit-graph.c:1163

1605 +#: commit-graph.c:1179

1606 #, c-format

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

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

1609 msgstr[0] "Recherche de commits pour un graphe de commits dans %d paquet"

1610 msgstr[1] "Recherche de commits pour un graphe de commits dans %d paquets"

1611

1601 -#: commit-graph.c:1176

1612 +#: commit-graph.c:1192

1613 #, c-format

1614 msgid "error adding pack %s"

1615 msgstr "erreur à l'ajout du packet %s"

1616

1606 -#: commit-graph.c:1180

1617 +#: commit-graph.c:1196

1618 #, c-format

1619 msgid "error opening index for %s"

1620 msgstr "erreur à l'ouverture de l'index pour %s"

1621

1611 -#: commit-graph.c:1204

1622 +#: commit-graph.c:1220

1623 #, c-format

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

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

1626 msgstr[0] "Recherche de commits pour un graphe de commits depuis %d réf"

1627 msgstr[1] "Recherche de commits pour un graphe de commits depuis %d réfs"

1628

1618 -#: commit-graph.c:1238

1629 +#: commit-graph.c:1240

1630 +#, c-format

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

1632 +msgstr "identifiant d'objet commit invalide : %s"

1633 +

1634 +#: commit-graph.c:1255

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

1636 msgstr ""

1637 "Recherche de commits pour un graphe de commits parmi les objets empaquetés"

1638

1623 -#: commit-graph.c:1253

1639 +#: commit-graph.c:1270

1640 msgid "Counting distinct commits in commit graph"

1641 msgstr "Comptage des commits distincts dans un graphe de commit"

1642

1627 -#: commit-graph.c:1284

1643 +#: commit-graph.c:1300

1644 msgid "Finding extra edges in commit graph"

1645 msgstr "Recherche d'arêtes supplémentaires dans un graphe de commits"

1646

1631 -#: commit-graph.c:1332

1647 +#: commit-graph.c:1346

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

1649 msgstr "échec à l'écriture le nombre correct d'id de base de fusion"

1650

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

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

1652 #, c-format

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

1654 msgstr "impossible de créer les répertoires de premier niveau de %s"

1655

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

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

1657 #, c-format

1658 msgid "unable to create '%s'"

1659 msgstr "impossible de créer '%s'"

1660

1645 -#: commit-graph.c:1437

1661 +#: commit-graph.c:1451

1662 #, c-format

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

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

1665 msgstr[0] "Écriture le graphe de commits en %d passe"

1666 msgstr[1] "Écriture le graphe de commits en %d passes"

1667

1652 -#: commit-graph.c:1478

1668 +#: commit-graph.c:1492

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

1670 msgstr "impossible d'ouvrir le fichier de graphe de commit"

1671

1656 -#: commit-graph.c:1490

1672 +#: commit-graph.c:1504

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

1674 msgstr "échec du renommage du fichier de graphe de commits"

1675

1660 -#: commit-graph.c:1510

1676 +#: commit-graph.c:1524

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

1678 msgstr "impossible de renommer le fichier temporaire de graphe de commits"

1679

1664 -#: commit-graph.c:1621

1680 +#: commit-graph.c:1635

1681 msgid "Scanning merged commits"

1682 msgstr "Analyse des commits de fusion"

1683

1668 -#: commit-graph.c:1632

1684 +#: commit-graph.c:1646

1685 #, c-format

1686 msgid "unexpected duplicate commit id %s"

1687 msgstr "id de commit %s dupliqué inattendu"

1688

1673 -#: commit-graph.c:1657

1689 +#: commit-graph.c:1670

1690 msgid "Merging commit-graph"

1691 msgstr "fusion du graphe de commits"

1692

1677 -#: commit-graph.c:1844

1693 +#: commit-graph.c:1860

1694 #, c-format

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

1696 msgstr "le graphe de commits ne peut pas écrire %d commits"

1697

1682 -#: commit-graph.c:1855

1698 +#: commit-graph.c:1871

1699 msgid "too many commits to write graph"

1700 msgstr "trop de commits pour écrire un graphe"

1701

1686 -#: commit-graph.c:1945

1702 +#: commit-graph.c:1961

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

1704 msgstr ""

1705 "le graphe de commit a une somme de contrôle incorrecte et est "

1706 "vraisemblablement corrompu"

1707

1692 -#: commit-graph.c:1955

1708 +#: commit-graph.c:1971

1709 #, c-format

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

1711 msgstr "le graphe de commit a un ordre d'OID incorrect : %s puis %s"

1712

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

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

1714 #, c-format

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

1716 msgstr ""

1717 "le graphe de commit a une valeur de dispersion incorrecte : dispersion[%d] = "

1718 "%u != %u"

1719

1704 -#: commit-graph.c:1972

1720 +#: commit-graph.c:1988

1721 #, c-format

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

1723 msgstr "échec de l'analyse le commit %s depuis le graphe de commits"

1724

1709 -#: commit-graph.c:1989

1725 +#: commit-graph.c:2006

1726 msgid "Verifying commits in commit graph"

1727 msgstr "Verification des commits dans le graphe de commits"

1728

1713 -#: commit-graph.c:2002

1729 +#: commit-graph.c:2020

1730 #, c-format

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

1732 msgstr ""

1733 "échec de l'analyse du commit %s depuis la base de données d'objets pour le "

1734 "graphe de commit"

1735

1720 -#: commit-graph.c:2009

1736 +#: commit-graph.c:2027

1737 #, c-format

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

1739 msgstr ""

1740 "l'OID de l'arbre racine pour le commit %s dans le graphe de commit est %s != "

1741 "%s"

1742

1727 -#: commit-graph.c:2019

1743 +#: commit-graph.c:2037

1744 #, c-format

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

1746 msgstr ""

1747 "la liste des parents du graphe de commit pour le commit %s est trop longue"

1748

1733 -#: commit-graph.c:2028

1749 +#: commit-graph.c:2046

1750 #, c-format

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

1752 msgstr "le parent du graphe de commit pour %s est %s != %s"

1753

1738 -#: commit-graph.c:2041

1754 +#: commit-graph.c:2059

1755 #, c-format

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

1757 msgstr ""

1758 "la liste de parents du graphe de commit pour le commit %s se termine trop tôt"

1759

1744 -#: commit-graph.c:2046

1760 +#: commit-graph.c:2064

1761 #, c-format

1762 msgid ""

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

@@ -1749,7 +1765,7 @@ msgstr ""

1765 "le graphe de commit a un numéro de génération nul pour le commit %s, mais "

1766 "non-nul ailleurs"

1767

1752 -#: commit-graph.c:2050

1768 +#: commit-graph.c:2068

1769 #, c-format

1770 msgid ""

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

@@ -1757,12 +1773,12 @@ msgstr ""

1773 "le graphe de commit a un numéro de génération non-nul pour le commit %s, "

1774 "mais nul ailleurs"

1775

1760 -#: commit-graph.c:2065

1776 +#: commit-graph.c:2083

1777 #, c-format

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

1779 msgstr "la génération du graphe de commit pour le commit %s est %u != %u"

1780

1765 -#: commit-graph.c:2071

1781 +#: commit-graph.c:2089

1782 #, c-format

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

1784 msgstr ""

@@ -1813,7 +1829,7 @@ msgstr "la clé ne contient pas de section: %s"

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

1830 msgstr "la clé ne contient pas de nom de variable : %s"

1831

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

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

1833 #, c-format

1834 msgid "invalid key: %s"

1835 msgstr "clé invalide : %s"

@@ -1946,155 +1962,148 @@ msgstr "core.commentChar ne devrait être qu'un unique caractère"

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

1963 msgstr "mode invalide pour la création d'objet : %s"

1964

1949 -#: config.c:1430

1965 +#: config.c:1425

1966 #, c-format

1967 msgid "malformed value for %s"

1968 msgstr "valeur mal formée pour %s"

1969

1954 -#: config.c:1456

1970 +#: config.c:1451

1971 #, c-format

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

1973 msgstr "valeur mal formée pour %s : %s"

1974

1959 -#: config.c:1457

1975 +#: config.c:1452

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

1977 msgstr "doit être parmi nothing, matching, simple, upstream ou current"

1978

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

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

1980 #, c-format

1981 msgid "bad pack compression level %d"

1982 msgstr "niveau de compression du paquet %d"

1983

1968 -#: config.c:1639

1984 +#: config.c:1634

1985 #, c-format

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

1987 msgstr "impossible de charger l'objet blob de config '%s'"

1988

1973 -#: config.c:1642

1989 +#: config.c:1637

1990 #, c-format

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

1992 msgstr "la référence '%s' ne pointe pas sur un blob"

1993

1978 -#: config.c:1659

1994 +#: config.c:1654

1995 #, c-format

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

1997 msgstr "impossible de résoudre le blob de config '%s'"

1998

1983 -#: config.c:1689

1999 +#: config.c:1684

2000 #, c-format

2001 msgid "failed to parse %s"

2002 msgstr "échec de l'analyse de %s"

2003

1988 -#: config.c:1745

2004 +#: config.c:1740

2005 msgid "unable to parse command-line config"

2006 msgstr "lecture de la configuration de ligne de commande impossible"

2007

1992 -#: config.c:2094

2008 +#: config.c:2091

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

2010 msgstr "erreur inconnue pendant la lecture des fichiers de configuration"

2011

1996 -#: config.c:2264

2012 +#: config.c:2261

2013 #, c-format

2014 msgid "Invalid %s: '%s'"

2015 msgstr "%s invalide : '%s'"

2016

2001 -#: config.c:2307

2002 -#, c-format

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

2004 -msgstr ""

2005 -"valeur '%s' de core.untrackedCache inconnue ; utilisation de 'keep' par "

2006 -"défaut"

2007 -

2008 -#: config.c:2333

2017 +#: config.c:2306

2018 #, c-format

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

2020 msgstr ""

2021 "la valeur '%d' de splitIndex.maxPercentChange devrait se situer entre 0 et "

2022 "100"

2023

2015 -#: config.c:2379

2024 +#: config.c:2352

2025 #, c-format

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

2027 msgstr ""

2028 "impossible d'analyser '%s' depuis le configuration en ligne de commande"

2029

2021 -#: config.c:2381

2030 +#: config.c:2354

2031 #, c-format

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

2033 msgstr ""

2034 "variable de configuration '%s' incorrecte dans le fichier '%s' à la ligne %d"

2035

2027 -#: config.c:2462

2036 +#: config.c:2435

2037 #, c-format

2038 msgid "invalid section name '%s'"

2039 msgstr "nom de section invalide '%s'"

2040

2032 -#: config.c:2494

2041 +#: config.c:2467

2042 #, c-format

2043 msgid "%s has multiple values"

2044 msgstr "%s a des valeurs multiples"

2045

2037 -#: config.c:2523

2046 +#: config.c:2496

2047 #, c-format

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

2049 msgstr "impossible d'écrire le fichier de configuration %s"

2050

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

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

2052 #, c-format

2053 msgid "could not lock config file %s"

2054 msgstr "impossible de verrouiller le fichier de configuration %s"

2055

2047 -#: config.c:2786

2056 +#: config.c:2759

2057 #, c-format

2058 msgid "opening %s"

2059 msgstr "ouverture de %s"

2060

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

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

2062 #, c-format

2063 msgid "invalid pattern: %s"

2064 msgstr "motif invalide : %s"

2065

2057 -#: config.c:2846

2066 +#: config.c:2819

2067 #, c-format

2068 msgid "invalid config file %s"

2069 msgstr "fichier de configuration invalide %s"

2070

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

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

2072 #, c-format

2073 msgid "fstat on %s failed"

2074 msgstr "échec de fstat sur %s"

2075

2067 -#: config.c:2870

2076 +#: config.c:2843

2077 #, c-format

2078 msgid "unable to mmap '%s'"

2079 msgstr "impossible de réaliser un map de '%s'"

2080

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

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

2082 #, c-format

2083 msgid "chmod on %s failed"

2084 msgstr "échec de chmod sur %s"

2085

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

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

2087 #, c-format

2088 msgid "could not write config file %s"

2089 msgstr "impossible d'écrire le fichier de configuration %s"

2090

2082 -#: config.c:2998

2091 +#: config.c:2971

2092 #, c-format

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

2094 msgstr "impossible de régler '%s' à '%s'"

2095

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

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

2097 #, c-format

2098 msgid "could not unset '%s'"

2099 msgstr "impossible de désinitialiser '%s'"

2100

2092 -#: config.c:3090

2101 +#: config.c:3063

2102 #, c-format

2103 msgid "invalid section name: %s"

2104 msgstr "nom de section invalide : %s"

2105

2097 -#: config.c:3257

2106 +#: config.c:3230

2107 #, c-format

2108 msgid "missing value for '%s'"

2109 msgstr "valeur manquante pour '%s'"

@@ -2218,7 +2227,7 @@ msgstr "impossible de rechercher %s (%s)"

2227 msgid "unknown port %s"

2228 msgstr "port inconnu %s"

2229

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

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

2231 #, c-format

2232 msgid "strange hostname '%s' blocked"

2233 msgstr "nom d'hôte étrange '%s' bloqué"

@@ -2233,60 +2242,60 @@ msgstr "port étrange '%s' bloqué"

2242 msgid "cannot start proxy %s"

2243 msgstr "impossible de démarrer un proxy %s"

2244

2236 -#: connect.c:924

2245 +#: connect.c:928

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

2247 msgstr ""

2248 "aucun chemin spécifié ; référez-vous à 'git help pull' pour une syntaxe "

2249 "d'URL valide"

2250

2242 -#: connect.c:1119

2251 +#: connect.c:1123

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

2253 msgstr "la variante ssh 'simple' ne supporte pas -4"

2254

2246 -#: connect.c:1131

2255 +#: connect.c:1135

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

2257 msgstr "la variante ssh 'simple' ne supporte pas -6"

2258

2250 -#: connect.c:1148

2259 +#: connect.c:1152

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

2261 msgstr "la variante ssh 'simple' ne supporte pas de spécifier le port"

2262

2254 -#: connect.c:1260

2263 +#: connect.c:1264

2264 #, c-format

2265 msgid "strange pathname '%s' blocked"

2266 msgstr "chemin étrange '%s' bloqué"

2267

2259 -#: connect.c:1307

2268 +#: connect.c:1311

2269 msgid "unable to fork"

2270 msgstr "fork impossible"

2271

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

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

2273 msgid "Checking connectivity"

2274 msgstr "Vérification de la connectivité"

2275

2267 -#: connected.c:98

2276 +#: connected.c:100

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

2278 msgstr "Impossible de lancer 'git rev-list'"

2279

2271 -#: connected.c:118

2280 +#: connected.c:120

2281 msgid "failed write to rev-list"

2282 msgstr "impossible d'écrire dans la rev-list"

2283

2275 -#: connected.c:125

2284 +#: connected.c:127

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

2286 msgstr "impossible de fermer l'entrée standard du rev-list"

2287

2279 -#: convert.c:193

2288 +#: convert.c:194

2289 #, c-format

2290 msgid "illegal crlf_action %d"

2291 msgstr "crlf_action illégal %d"

2292

2284 -#: convert.c:206

2293 +#: convert.c:207

2294 #, c-format

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

2296 msgstr "Les CRLF seraient remplacés par des LF dans %s"

2297

2289 -#: convert.c:208

2298 +#: convert.c:209

2299 #, c-format

2300 msgid ""

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

@@ -2295,12 +2304,12 @@ msgstr ""

2304 "Les CRLF seront remplacés par des LF dans %s.\n"

2305 "Le fichier conservera ses fins de ligne d'origine dans votre copie de travail"

2306

2298 -#: convert.c:216

2307 +#: convert.c:217

2308 #, c-format

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

2310 msgstr "Les LF seraient remplacés par des CRLF dans %s"

2311

2303 -#: convert.c:218

2312 +#: convert.c:219

2313 #, c-format

2314 msgid ""

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

@@ -2309,12 +2318,12 @@ msgstr ""

2318 "Les LF seront remplacés par des CRLF dans %s.\n"

2319 "Le fichier conservera ses fins de ligne d'origine dans votre copie de travail"

2320

2312 -#: convert.c:279

2321 +#: convert.c:280

2322 #, c-format

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

2324 msgstr "Aucun BOM n'est permis dans '%s' s'il est encodé comme %s"

2325

2317 -#: convert.c:286

2326 +#: convert.c:287

2327 #, c-format

2328 msgid ""

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

@@ -2323,12 +2332,12 @@ msgstr ""

2332 "Le fichier '%s' contient un marqueur d'ordre d'octets (BOM). Veuillez "

2333 "utiliser UTF-%s comme encodage d'arbre de travail."

2334

2326 -#: convert.c:304

2335 +#: convert.c:305

2336 #, c-format

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

2338 msgstr "Un BOM est obligatoire dans '%s' s'il est encodé comme %s"

2339

2331 -#: convert.c:306

2340 +#: convert.c:307

2341 #, c-format

2342 msgid ""

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

@@ -2338,52 +2347,52 @@ msgstr ""

2347 "utiliser UTF-%sBE ou UTF-%sLE (selon l'ordre désiré) comme encodage d'arbre "

2348 "de travail."

2349

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

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

2351 #, c-format

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

2353 msgstr "échec de l'encodage de '%s' de %s vers %s"

2354

2346 -#: convert.c:467

2355 +#: convert.c:468

2356 #, c-format

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

2358 msgstr ""

2359 "encoder '%s' depuis %s vers %s puis inversement ne produit pas le même "

2360 "contenu"

2361

2353 -#: convert.c:673

2362 +#: convert.c:674

2363 #, c-format

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

2365 msgstr "impossible de forker pour lancer le filtre externe '%s'"

2366

2358 -#: convert.c:693

2367 +#: convert.c:694

2368 #, c-format

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

2370 msgstr "impossible de fournir l'entrée au filtre externe '%s'"

2371

2363 -#: convert.c:700

2372 +#: convert.c:701

2373 #, c-format

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

2375 msgstr "le filtre externe '%s' a échoué %d"

2376

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

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

2378 #, c-format

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

2380 msgstr "la lecture depuis le filtre externe '%s' a échoué"

2381

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

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

2383 #, c-format

2384 msgid "external filter '%s' failed"

2385 msgstr "le filtre externe '%s' a échoué"

2386

2378 -#: convert.c:844

2387 +#: convert.c:845

2388 msgid "unexpected filter type"

2389 msgstr "type de filtre inattendu"

2390

2382 -#: convert.c:855

2391 +#: convert.c:856

2392 msgid "path name too long for external filter"

2393 msgstr "nom de chemin trop long pour un filtre externe"

2394

2386 -#: convert.c:929

2395 +#: convert.c:930

2396 #, c-format

2397 msgid ""

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

@@ -2392,67 +2401,67 @@ msgstr ""

2401 "le filtre externe '%s' n'est plus disponible bien que tous les chemins "

2402 "n'aient pas été filtrés"

2403

2395 -#: convert.c:1228

2404 +#: convert.c:1229

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

2406 msgstr "true/false ne sont pas des encodages d'arbre de travail valides"

2407

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

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

2409 #, c-format

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

2411 msgstr "%s : le filtre clean '%s' a échoué"

2412

2404 -#: convert.c:1476

2413 +#: convert.c:1495

2414 #, c-format

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

2416 msgstr "%s : le filtre smudge '%s' a échoué"

2417

2409 -#: date.c:137

2418 +#: date.c:138

2419 msgid "in the future"

2420 msgstr "dans le futur"

2421

2413 -#: date.c:143

2422 +#: date.c:144

2423 #, c-format

2424 msgid "%<PRIuMAX> second ago"

2425 msgid_plural "%<PRIuMAX> seconds ago"

2426 msgstr[0] "il y a %<PRIuMAX> seconde"

2427 msgstr[1] "il y a %<PRIuMAX> secondes"

2428

2420 -#: date.c:150

2429 +#: date.c:151

2430 #, c-format

2431 msgid "%<PRIuMAX> minute ago"

2432 msgid_plural "%<PRIuMAX> minutes ago"

2433 msgstr[0] "il y a %<PRIuMAX> minute"

2434 msgstr[1] "il y a %<PRIuMAX> minutes"

2435

2427 -#: date.c:157

2436 +#: date.c:158

2437 #, c-format

2438 msgid "%<PRIuMAX> hour ago"

2439 msgid_plural "%<PRIuMAX> hours ago"

2440 msgstr[0] "il y a %<PRIuMAX> heure"

2441 msgstr[1] "il y a %<PRIuMAX> heures"

2442

2434 -#: date.c:164

2443 +#: date.c:165

2444 #, c-format

2445 msgid "%<PRIuMAX> day ago"

2446 msgid_plural "%<PRIuMAX> days ago"

2447 msgstr[0] "il y a %<PRIuMAX> jour"

2448 msgstr[1] "il y a %<PRIuMAX> jours"

2449

2441 -#: date.c:170

2450 +#: date.c:171

2451 #, c-format

2452 msgid "%<PRIuMAX> week ago"

2453 msgid_plural "%<PRIuMAX> weeks ago"

2454 msgstr[0] "il y a %<PRIuMAX> semaine"

2455 msgstr[1] "il y a %<PRIuMAX> semaines"

2456

2448 -#: date.c:177

2457 +#: date.c:178

2458 #, c-format

2459 msgid "%<PRIuMAX> month ago"

2460 msgid_plural "%<PRIuMAX> months ago"

2461 msgstr[0] "il y a %<PRIuMAX> mois"

2462 msgstr[1] "il y a %<PRIuMAX> mois"

2463

2455 -#: date.c:188

2464 +#: date.c:189

2465 #, c-format

2466 msgid "%<PRIuMAX> year"

2467 msgid_plural "%<PRIuMAX> years"

@@ -2460,14 +2469,14 @@ msgstr[0] "%<PRIuMAX> an"

2469 msgstr[1] "%<PRIuMAX> ans"

2470

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

2463 -#: date.c:191

2472 +#: date.c:192

2473 #, c-format

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

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

2476 msgstr[0] "il y a %s et %<PRIuMAX> mois"

2477 msgstr[1] "il y a %s et %<PRIuMAX> mois"

2478

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

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

2480 #, c-format

2481 msgid "%<PRIuMAX> year ago"

2482 msgid_plural "%<PRIuMAX> years ago"

@@ -2505,7 +2514,7 @@ msgstr "Marquage de %d îlots, fait.\n"

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

2515 msgstr "impossible de lire le fichier de commande '%s'"

2516

2508 -#: diffcore-rename.c:544

2517 +#: diffcore-rename.c:543

2518 msgid "Performing inexact rename detection"

2519 msgstr "Détection de renommage inexact en cours"

2520

@@ -2573,35 +2582,35 @@ msgstr ""

2582 "Erreurs dans la variable de configuration 'diff.dirstat' :\n"

2583 "%s"

2584

2576 -#: diff.c:4215

2585 +#: diff.c:4218

2586 #, c-format

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

2588 msgstr "l'application de diff externe a disparu, arrêt à %s"

2589

2581 -#: diff.c:4560

2590 +#: diff.c:4563

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

2592 msgstr "--name-only, --name-status, --check et -s sont mutuellement exclusifs"

2593

2585 -#: diff.c:4563

2594 +#: diff.c:4566

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

2596 msgstr "-G, -S et --find-object sont mutuellement exclusifs"

2597

2589 -#: diff.c:4641

2598 +#: diff.c:4644

2599 msgid "--follow requires exactly one pathspec"

2600 msgstr "--follow a besoin d'une spécification de chemin unique"

2601

2593 -#: diff.c:4689

2602 +#: diff.c:4692

2603 #, c-format

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

2605 msgstr "valeur invalide de --stat : %s"

2606

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

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

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

2609 #, c-format

2610 msgid "%s expects a numerical value"

2611 msgstr "%s attend une valeur numérique"

2612

2604 -#: diff.c:4726

2613 +#: diff.c:4729

2614 #, c-format

2615 msgid ""

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

@@ -2610,42 +2619,42 @@ msgstr ""

2619 "Impossible d'analyser le paramètre de l'option --dirstat/-X :\n"

2620 "%s"

2621

2613 -#: diff.c:4811

2622 +#: diff.c:4814

2623 #, c-format

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

2625 msgstr "classe de modification inconnue '%c' dans --diff-fileter=%s"

2626

2618 -#: diff.c:4835

2627 +#: diff.c:4838

2628 #, c-format

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

2630 msgstr "valeur inconnue après ws-error-highlight=%.*s"

2631

2623 -#: diff.c:4849

2632 +#: diff.c:4852

2633 #, c-format

2634 msgid "unable to resolve '%s'"

2635 msgstr "impossible de résoudre '%s'"

2636

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

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

2638 #, c-format

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

2640 msgstr "forme <n>/<m> attendue par %s"

2641

2633 -#: diff.c:4917

2642 +#: diff.c:4920

2643 #, c-format

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

2645 msgstr "caractère attendu par %s, '%s' trouvé"

2646

2638 -#: diff.c:4938

2647 +#: diff.c:4941

2648 #, c-format

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

2650 msgstr "mauvais argument --color-moved : %s"

2651

2643 -#: diff.c:4957

2652 +#: diff.c:4960

2653 #, c-format

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

2655 msgstr "mode invalide '%s' dans --color-moved-ws"

2656

2648 -#: diff.c:4997

2657 +#: diff.c:5000

2658 msgid ""

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

2660 "\"histogram\""

@@ -2653,155 +2662,155 @@ msgstr ""

2662 "l'option diff-algorithm accept \"myers\", \"minimal\", \"patience\" et "

2663 "\"histogram\""

2664

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

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

2666 #, c-format

2667 msgid "invalid argument to %s"

2668 msgstr "argument invalide pour %s"

2669

2661 -#: diff.c:5191

2670 +#: diff.c:5194

2671 #, c-format

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

2673 msgstr "échec de l'analyse du paramètre de l'option --submodule : '%s'"

2674

2666 -#: diff.c:5247

2675 +#: diff.c:5250

2676 #, c-format

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

2678 msgstr "mauvais argument pour --word-diff : %s"

2679

2671 -#: diff.c:5270

2680 +#: diff.c:5273

2681 msgid "Diff output format options"

2682 msgstr "Options de format de sortie de diff"

2683

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

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

2685 msgid "generate patch"

2686 msgstr "générer la rustine"

2687

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

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

2689 msgid "suppress diff output"

2690 msgstr "supprimer la sortie des différences"

2691

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

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

2693 msgid "<n>"

2694 msgstr "<n>"

2695

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

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

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

2698 msgstr "générer les diffs avec <n> lignes de contexte"

2699

2691 -#: diff.c:5286

2700 +#: diff.c:5289

2701 msgid "generate the diff in raw format"

2702 msgstr "générer le diff en format brut"

2703

2695 -#: diff.c:5289

2704 +#: diff.c:5292

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

2706 msgstr "synonyme de '-p --raw'"

2707

2699 -#: diff.c:5293

2708 +#: diff.c:5296

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

2710 msgstr "synonyme de '-p --stat'"

2711

2703 -#: diff.c:5297

2712 +#: diff.c:5300

2713 msgid "machine friendly --stat"

2714 msgstr "--stat pour traitement automatique"

2715

2707 -#: diff.c:5300

2716 +#: diff.c:5303

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

2718 msgstr "afficher seulement la dernière ligne de --stat"

2719

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

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

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

2722 msgstr "<param1,param2>..."

2723

2715 -#: diff.c:5303

2724 +#: diff.c:5306

2725 msgid ""

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

2727 msgstr ""

2728 "afficher la distribution des quantités de modifications relatives pour "

2729 "chaque sous-répertoire"

2730

2722 -#: diff.c:5307

2731 +#: diff.c:5310

2732 msgid "synonym for --dirstat=cumulative"

2733 msgstr "synonyme pour --dirstat=cumulative"

2734

2726 -#: diff.c:5311

2735 +#: diff.c:5314

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

2737 msgstr "synonyme pour --dirstat=files,param1,param2..."

2738

2730 -#: diff.c:5315

2739 +#: diff.c:5318

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

2741 msgstr ""

2742 "avertir si les modifications introduisent des marqueurs de conflit ou des "

2743 "erreurs d'espace"

2744

2736 -#: diff.c:5318

2745 +#: diff.c:5321

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

2747 msgstr ""

2748 "résumé succinct tel que les créations, les renommages et les modifications "

2749 "de mode"

2750

2742 -#: diff.c:5321

2751 +#: diff.c:5324

2752 msgid "show only names of changed files"

2753 msgstr "n'afficher que les noms de fichiers modifiés"

2754

2746 -#: diff.c:5324

2755 +#: diff.c:5327

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

2757 msgstr "n'afficher que les noms et les status des fichiers modifiés"

2758

2750 -#: diff.c:5326

2759 +#: diff.c:5329

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

2761 msgstr "<largeur>[,<largeur-de-nom>[,<compte>]]"

2762

2754 -#: diff.c:5327

2763 +#: diff.c:5330

2764 msgid "generate diffstat"

2765 msgstr "générer un diffstat"

2766

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

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

2768 msgid "<width>"

2769 msgstr "<largeur>"

2770

2762 -#: diff.c:5330

2771 +#: diff.c:5333

2772 msgid "generate diffstat with a given width"

2773 msgstr "générer un diffstat avec la largeur indiquée"

2774

2766 -#: diff.c:5333

2775 +#: diff.c:5336

2776 msgid "generate diffstat with a given name width"

2777 msgstr "génerer un diffstat avec la largeur de nom indiquée"

2778

2770 -#: diff.c:5336

2779 +#: diff.c:5339

2780 msgid "generate diffstat with a given graph width"

2781 msgstr "génerer un diffstat avec la largeur de graphe indiquée"

2782

2774 -#: diff.c:5338

2783 +#: diff.c:5341

2784 msgid "<count>"

2785 msgstr "<compte>"

2786

2778 -#: diff.c:5339

2787 +#: diff.c:5342

2788 msgid "generate diffstat with limited lines"

2789 msgstr "générer un diffstat avec des lignes limitées"

2790

2782 -#: diff.c:5342

2791 +#: diff.c:5345

2792 msgid "generate compact summary in diffstat"

2793 msgstr "générer une résumé compact dans le diffstat"

2794

2786 -#: diff.c:5345

2795 +#: diff.c:5348

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

2797 msgstr "produire un diff binaire qui peut être appliqué"

2798

2790 -#: diff.c:5348

2799 +#: diff.c:5351

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

2801 msgstr ""

2802 "afficher les noms complets des objets pre- et post-image sur les lignes "

2803 "\"index\""

2804

2796 -#: diff.c:5350

2805 +#: diff.c:5353

2806 msgid "show colored diff"

2807 msgstr "afficher un diff coloré"

2808

2800 -#: diff.c:5351

2809 +#: diff.c:5354

2810 msgid "<kind>"

2811 msgstr "<sorte>"

2812

2804 -#: diff.c:5352

2813 +#: diff.c:5355

2814 msgid ""

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

2816 "diff"

@@ -2809,7 +2818,7 @@ msgstr ""

2818 "surligner les erreurs d'espace dans les lignes 'contexte', 'ancien', "

2819 "'nouveau' dans le diff"

2820

2812 -#: diff.c:5355

2821 +#: diff.c:5358

2822 msgid ""

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

2824 "--numstat"

@@ -2817,93 +2826,93 @@ msgstr ""

2826 "ne pas compresser les chemins et utiliser des NULs comme terminateurs de "

2827 "champs dans --raw ou --numstat"

2828

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

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

2830 msgid "<prefix>"

2831 msgstr "<préfixe>"

2832

2824 -#: diff.c:5359

2833 +#: diff.c:5362

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

2835 msgstr "afficher le préfixe de source indiqué au lieu de \"a/\""

2836

2828 -#: diff.c:5362

2837 +#: diff.c:5365

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

2839 msgstr "afficher le préfixe de destination indiqué au lieu de \"b/\""

2840

2832 -#: diff.c:5365

2841 +#: diff.c:5368

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

2843 msgstr "préfixer toutes les lignes en sortie avec la chaîne indiquée"

2844

2836 -#: diff.c:5368

2845 +#: diff.c:5371

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

2847 msgstr "n'afficher aucun préfixe, ni de source, ni de destination"

2848

2840 -#: diff.c:5371

2849 +#: diff.c:5374

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

2851 msgstr ""

2852 "afficher le contexte entre les sections à concurrence du nombre de ligne "

2853 "indiqué"

2854

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

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

2856 msgid "<char>"

2857 msgstr "<caractère>"

2858

2850 -#: diff.c:5376

2859 +#: diff.c:5379

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

2861 msgstr "spécifier le caractère pour indiquer une nouvelle ligne au lieu de '+'"

2862

2854 -#: diff.c:5381

2863 +#: diff.c:5384

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

2865 msgstr "spécifier le caractère pour indiquer une ancienne ligne au lieu de '-'"

2866

2858 -#: diff.c:5386

2867 +#: diff.c:5389

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

2869 msgstr ""

2870 "spécifier le caractère pour indiquer une ligne de contexte au lieu de ' '"

2871

2863 -#: diff.c:5389

2872 +#: diff.c:5392

2873 msgid "Diff rename options"

2874 msgstr "Options de renommage de diff"

2875

2867 -#: diff.c:5390

2876 +#: diff.c:5393

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

2878 msgstr "<n>[/<m>]"

2879

2871 -#: diff.c:5391

2880 +#: diff.c:5394

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

2882 msgstr ""

2883 "casser les modifications d'une réécrire complète en paires de suppression et "

2884 "création"

2885

2877 -#: diff.c:5395

2886 +#: diff.c:5398

2887 msgid "detect renames"

2888 msgstr "détecter les renommages"

2889

2881 -#: diff.c:5399

2890 +#: diff.c:5402

2891 msgid "omit the preimage for deletes"

2892 msgstr "supprimer la pré-image pour les suppressions"

2893

2885 -#: diff.c:5402

2894 +#: diff.c:5405

2895 msgid "detect copies"

2896 msgstr "détecter les copies"

2897

2889 -#: diff.c:5406

2898 +#: diff.c:5409

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

2900 msgstr ""

2901 "utiliser les fichiers non-modifiés comme sources pour trouver des copies"

2902

2894 -#: diff.c:5408

2903 +#: diff.c:5411

2904 msgid "disable rename detection"

2905 msgstr "désactiver la détection de renommage"

2906

2898 -#: diff.c:5411

2907 +#: diff.c:5414

2908 msgid "use empty blobs as rename source"

2909 msgstr "utiliser des blobs vides comme source de renommage"

2910

2902 -#: diff.c:5413

2911 +#: diff.c:5416

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

2913 msgstr "continuer à afficher l'historique d'un fichier au delà des renommages"

2914

2906 -#: diff.c:5416

2915 +#: diff.c:5419

2916 msgid ""

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

2918 "given limit"

@@ -2911,161 +2920,161 @@ msgstr ""

2920 "empêcher la détection de renommage/copie si le nombre de cibles de renommage/"

2921 "copie excède la limite indiquée"

2922

2914 -#: diff.c:5418

2923 +#: diff.c:5421

2924 msgid "Diff algorithm options"

2925 msgstr "Options de l'algorithme de diff"

2926

2918 -#: diff.c:5420

2927 +#: diff.c:5423

2928 msgid "produce the smallest possible diff"

2929 msgstr "produire le diff le plus petit possible"

2930

2922 -#: diff.c:5423

2931 +#: diff.c:5426

2932 msgid "ignore whitespace when comparing lines"

2933 msgstr "ignorer les espaces lors de la comparaison de ligne"

2934

2926 -#: diff.c:5426

2935 +#: diff.c:5429

2936 msgid "ignore changes in amount of whitespace"

2937 msgstr "ignorer des modifications du nombre d'espaces"

2938

2930 -#: diff.c:5429

2939 +#: diff.c:5432

2940 msgid "ignore changes in whitespace at EOL"

2941 msgstr "ignorer des modifications d'espace en fin de ligne"

2942

2934 -#: diff.c:5432

2943 +#: diff.c:5435

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

2945 msgstr "ignore le retour chariot en fin de ligne"

2946

2938 -#: diff.c:5435

2947 +#: diff.c:5438

2948 msgid "ignore changes whose lines are all blank"

2949 msgstr "ignorer les modifications dont les lignes sont vides"

2950

2942 -#: diff.c:5438

2951 +#: diff.c:5441

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

2953 msgstr ""

2954 "heuristique qui déplace les limites de sections de diff pour faciliter la "

2955 "lecture"

2956

2948 -#: diff.c:5441

2957 +#: diff.c:5444

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

2959 msgstr "générer un diff en utilisant l'algorithme de différence \"patience\""

2960

2952 -#: diff.c:5445

2961 +#: diff.c:5448

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

2963 msgstr ""

2964 "générer un diff en utilisant l'algorithme de différence \"histogramme\""

2965

2957 -#: diff.c:5447

2966 +#: diff.c:5450

2967 msgid "<algorithm>"

2968 msgstr "<algorithme>"

2969

2961 -#: diff.c:5448

2970 +#: diff.c:5451

2971 msgid "choose a diff algorithm"

2972 msgstr "choisir un algorithme de différence"

2973

2965 -#: diff.c:5450

2974 +#: diff.c:5453

2975 msgid "<text>"

2976 msgstr "<texte>"

2977

2969 -#: diff.c:5451

2978 +#: diff.c:5454

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

2980 msgstr "générer un diff en utilisant l'algorithme de différence \"ancré\""

2981

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

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

2983 msgid "<mode>"

2984 msgstr "<mode>"

2985

2977 -#: diff.c:5454

2986 +#: diff.c:5457

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

2988 msgstr ""

2989 "afficher des différences par mot, en utilisant <mode> pour délimiter les "

2990 "mots modifiés"

2991

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

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

2993 msgid "<regex>"

2994 msgstr "<regex>"

2995

2987 -#: diff.c:5457

2996 +#: diff.c:5460

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

2998 msgstr "utiliser <regex> pour décider ce qu'est un mot"

2999

2991 -#: diff.c:5460

3000 +#: diff.c:5463

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

3002 msgstr "équivalent à --word-diff=color --word-diff-regex=<regex>"

3003

2995 -#: diff.c:5463

3004 +#: diff.c:5466

3005 msgid "moved lines of code are colored differently"

3006 msgstr "les lignes déplacées sont colorées différemment"

3007

2999 -#: diff.c:5466

3008 +#: diff.c:5469

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

3010 msgstr "comment les espaces sont ignorés dans --color-moved"

3011

3003 -#: diff.c:5469

3012 +#: diff.c:5472

3013 msgid "Other diff options"

3014 msgstr "Autres options diff"

3015

3007 -#: diff.c:5471

3016 +#: diff.c:5474

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

3018 msgstr ""

3019 "lancé depuis un sous-répertoire, exclure les modifications en dehors et "

3020 "afficher les chemins relatifs"

3021

3013 -#: diff.c:5475

3022 +#: diff.c:5478

3023 msgid "treat all files as text"

3024 msgstr "traiter les fichiers comme texte"

3025

3017 -#: diff.c:5477

3026 +#: diff.c:5480

3027 msgid "swap two inputs, reverse the diff"

3028 msgstr "échanger les entrées, inverser le diff"

3029

3021 -#: diff.c:5479

3030 +#: diff.c:5482

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

3032 msgstr "sortir un code d'erreur 1 s'il y avait de différences, 0 sinon"

3033

3025 -#: diff.c:5481

3034 +#: diff.c:5484

3035 msgid "disable all output of the program"

3036 msgstr "désactiver tous les affichages du programme"

3037

3029 -#: diff.c:5483

3038 +#: diff.c:5486

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

3040 msgstr "autoriser l'exécution d'un assistant externe de diff"

3041

3033 -#: diff.c:5485

3042 +#: diff.c:5488

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

3044 msgstr ""

3045 "lancer les filtres externes de conversion en texte lors de la comparaison de "

3046 "fichiers binaires"

3047

3039 -#: diff.c:5487

3048 +#: diff.c:5490

3049 msgid "<when>"

3050 msgstr "<quand>"

3051

3043 -#: diff.c:5488

3052 +#: diff.c:5491

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

3054 msgstr ""

3055 "ignorer les modifications dans les sous-modules lors de la génération de diff"

3056

3048 -#: diff.c:5491

3057 +#: diff.c:5494

3058 msgid "<format>"

3059 msgstr "<format>"

3060

3052 -#: diff.c:5492

3061 +#: diff.c:5495

3062 msgid "specify how differences in submodules are shown"

3063 msgstr "spécifier comment les différences dans les sous-modules sont affichées"

3064

3056 -#: diff.c:5496

3065 +#: diff.c:5499

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

3067 msgstr "masquer les entrées 'git add -N' de l'index"

3068

3060 -#: diff.c:5499

3069 +#: diff.c:5502

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

3071 msgstr "traiter les entrées 'git add -N' comme réelles dans l'index"

3072

3064 -#: diff.c:5501

3073 +#: diff.c:5504

3074 msgid "<string>"

3075 msgstr "<chaîne>"

3076

3068 -#: diff.c:5502

3077 +#: diff.c:5505

3078 msgid ""

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

3080 "string"

@@ -3073,7 +3082,7 @@ msgstr ""

3082 "rechercher les différences qui modifient le nombre d'occurrences de la "

3083 "chaîne spécifiée"

3084

3076 -#: diff.c:5505

3085 +#: diff.c:5508

3086 msgid ""

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

3088 "regex"

@@ -3081,26 +3090,26 @@ msgstr ""

3090 "rechercher les différences qui modifient le nombre d'occurrences de la regex "

3091 "spécifiée"

3092

3084 -#: diff.c:5508

3093 +#: diff.c:5511

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

3095 msgstr ""

3096 "afficher toutes les modifications dans l'ensemble de modifications avec -S "

3097 "ou -G"

3098

3090 -#: diff.c:5511

3099 +#: diff.c:5514

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

3101 msgstr ""

3102 "traiter <chaîne> dans -S comme une expression rationnelle POSIX étendue"

3103

3095 -#: diff.c:5514

3104 +#: diff.c:5517

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

3106 msgstr "contrôler l'ordre dans lequel les fichiers apparaissent dans la sortie"

3107

3099 -#: diff.c:5515

3108 +#: diff.c:5518

3109 msgid "<object-id>"

3110 msgstr "<id-objet>"

3111

3103 -#: diff.c:5516

3112 +#: diff.c:5519

3113 msgid ""

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

3115 "object"

@@ -3108,35 +3117,35 @@ msgstr ""

3117 "rechercher les différences qui modifient le nombre d'occurrences de l'objet "

3118 "indiqué"

3119

3111 -#: diff.c:5518

3120 +#: diff.c:5521

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

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

3123

3115 -#: diff.c:5519

3124 +#: diff.c:5522

3125 msgid "select files by diff type"

3126 msgstr "sélectionner les fichiers par types de diff"

3127

3119 -#: diff.c:5521

3128 +#: diff.c:5524

3129 msgid "<file>"

3130 msgstr "<fichier>"

3131

3123 -#: diff.c:5522

3132 +#: diff.c:5525

3133 msgid "Output to a specific file"

3134 msgstr "Sortie vers un fichier spécifié"

3135

3127 -#: diff.c:6177

3136 +#: diff.c:6180

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

3138 msgstr ""

3139 "détection de renommage inexact annulée à cause d'un trop grand nombre de "

3140 "fichiers."

3141

3133 -#: diff.c:6180

3142 +#: diff.c:6183

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

3144 msgstr ""

3145 "recherche uniquement des copies par modification de chemin à cause d'un trop "

3146 "grand nombre de fichiers."

3147

3139 -#: diff.c:6183

3148 +#: diff.c:6186

3149 #, c-format

3150 msgid ""

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

@@ -3144,41 +3153,41 @@ msgstr ""

3153 "vous souhaitez peut-être régler la variable %s à au moins %d et réessayer le "

3154 "commande."

3155

3147 -#: dir.c:537

3156 +#: dir.c:549

3157 #, c-format

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

3159 msgstr ""

3160 "le spécificateur de chemin '%s' ne correspond à aucun fichier connu de git"

3161

3153 -#: dir.c:926

3162 +#: dir.c:938

3163 #, c-format

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

3165 msgstr "impossible d'utiliser %s comme fichier d'exclusion"

3166

3158 -#: dir.c:1843

3167 +#: dir.c:1877

3168 #, c-format

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

3170 msgstr "impossible d'ouvrir le répertoire '%s'"

3171

3163 -#: dir.c:2085

3172 +#: dir.c:2128

3173 msgid "failed to get kernel name and information"

3174 msgstr "echec de l'obtention d'information de kernel"

3175

3167 -#: dir.c:2209

3176 +#: dir.c:2252

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

3178 msgstr "Le cache non suivi est désactivé sur ce système ou sur cet endroit"

3179

3171 -#: dir.c:3013

3180 +#: dir.c:3056

3181 #, c-format

3182 msgid "index file corrupt in repo %s"

3183 msgstr "fichier d'index corrompu dans le dépôt %s"

3184

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

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

3186 #, c-format

3187 msgid "could not create directories for %s"

3188 msgstr "impossible de créer les répertoires pour %s"

3189

3181 -#: dir.c:3092

3190 +#: dir.c:3135

3191 #, c-format

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

3193 msgstr "impossible de migrer le répertoire git de '%s' vers '%s'"

@@ -3199,12 +3208,12 @@ msgstr "Filtrage du contenu"

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

3209 msgstr "impossible de stat le fichier '%s'"

3210

3202 -#: environment.c:150

3211 +#: environment.c:148

3212 #, c-format

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

3214 msgstr "Espaces de nom de Git \"%s\""

3215

3207 -#: environment.c:332

3216 +#: environment.c:330

3217 #, c-format

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

3219 msgstr "impossible de régler GIT_DIR à '%s'"

@@ -3214,159 +3223,155 @@ msgstr "impossible de régler GIT_DIR à '%s'"

3223 msgid "too many args to run %s"

3224 msgstr "trop d'arguments pour lancer %s"

3225

3217 -#: fetch-object.c:17

3218 -msgid "Remote with no URL"

3219 -msgstr "Dépôt distant sans URL"

3220 -

3221 -#: fetch-pack.c:151

3226 +#: fetch-pack.c:150

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

3228 msgstr "git fetch-pack : liste superficielle attendue"

3229

3225 -#: fetch-pack.c:154

3230 +#: fetch-pack.c:153

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

3232 msgstr ""

3233 "git fetch-pack : paquet de vidage attendu après une liste superficielle"

3234

3230 -#: fetch-pack.c:165

3235 +#: fetch-pack.c:164

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

3237 msgstr "git fetch-pack : ACK/NACK attendu, paquet de nettoyage reçu"

3238

3234 -#: fetch-pack.c:185

3239 +#: fetch-pack.c:184

3240 #, c-format

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

3242 msgstr "git fetch-pack : ACK/NACK attendu, '%s' reçu"

3243

3239 -#: fetch-pack.c:196

3244 +#: fetch-pack.c:195

3245 msgid "unable to write to remote"

3246 msgstr "impossible d'écrire sur un distant"

3247

3243 -#: fetch-pack.c:258

3248 +#: fetch-pack.c:257

3249 msgid "--stateless-rpc requires multi_ack_detailed"

3250 msgstr "--stateless-rpc nécessite multi_ack_detailed"

3251

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

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

3253 #, c-format

3254 msgid "invalid shallow line: %s"

3255 msgstr "ligne de superficiel invalide : %s"

3256

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

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

3258 #, c-format

3259 msgid "invalid unshallow line: %s"

3260 msgstr "ligne de fin de superficiel invalide : %s"

3261

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

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

3263 #, c-format

3264 msgid "object not found: %s"

3265 msgstr "objet non trouvé : %s"

3266

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

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

3268 #, c-format

3269 msgid "error in object: %s"

3270 msgstr "Erreur dans l'objet : %s"

3271

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

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

3273 #, c-format

3274 msgid "no shallow found: %s"

3275 msgstr "Pas de superficiel trouvé : %s"

3276

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

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

3278 #, c-format

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

3280 msgstr "superficiel/non superficiel attendu, %s trouvé"

3281

3277 -#: fetch-pack.c:417

3282 +#: fetch-pack.c:414

3283 #, c-format

3284 msgid "got %s %d %s"

3285 msgstr "réponse %s %d %s"

3286

3282 -#: fetch-pack.c:434

3287 +#: fetch-pack.c:431

3288 #, c-format

3289 msgid "invalid commit %s"

3290 msgstr "commit invalide %s"

3291

3287 -#: fetch-pack.c:465

3292 +#: fetch-pack.c:462

3293 msgid "giving up"

3294 msgstr "abandon"

3295

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

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

3297 msgid "done"

3298 msgstr "fait"

3299

3295 -#: fetch-pack.c:489

3300 +#: fetch-pack.c:487

3301 #, c-format

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

3303 msgstr "%s trouvé (%d) %s"

3304

3300 -#: fetch-pack.c:535

3305 +#: fetch-pack.c:533

3306 #, c-format

3307 msgid "Marking %s as complete"

3308 msgstr "Marquage de %s comme terminé"

3309

3305 -#: fetch-pack.c:744

3310 +#: fetch-pack.c:742

3311 #, c-format

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

3313 msgstr "%s déjà possédé (%s)"

3314

3310 -#: fetch-pack.c:783

3315 +#: fetch-pack.c:781

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

3317 msgstr "fetch-pack : impossible de dupliquer le démultiplexeur latéral"

3318

3314 -#: fetch-pack.c:791

3319 +#: fetch-pack.c:789

3320 msgid "protocol error: bad pack header"

3321 msgstr "erreur de protocole : mauvais entête de paquet"

3322

3318 -#: fetch-pack.c:859

3323 +#: fetch-pack.c:857

3324 #, c-format

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

3326 msgstr "fetch-pack : impossible de dupliquer %s"

3327

3323 -#: fetch-pack.c:875

3328 +#: fetch-pack.c:873

3329 #, c-format

3330 msgid "%s failed"

3331 msgstr "échec de %s"

3332

3328 -#: fetch-pack.c:877

3333 +#: fetch-pack.c:875

3334 msgid "error in sideband demultiplexer"

3335 msgstr "erreur dans le démultiplexer latéral"

3336

3332 -#: fetch-pack.c:908

3337 +#: fetch-pack.c:907

3338 #, c-format

3339 msgid "Server version is %.*s"

3340 msgstr "La version du serveur est %.*s"

3341

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

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

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

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

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

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

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

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

3346 #, c-format

3347 msgid "Server supports %s"

3348 msgstr "Le serveur supporte %s"

3349

3345 -#: fetch-pack.c:915

3350 +#: fetch-pack.c:914

3351 msgid "Server does not support shallow clients"

3352 msgstr "Le serveur ne supporte les clients superficiels"

3353

3349 -#: fetch-pack.c:975

3354 +#: fetch-pack.c:974

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

3356 msgstr "Le receveur ne gère pas --shallow-since"

3357

3353 -#: fetch-pack.c:980

3358 +#: fetch-pack.c:979

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

3360 msgstr "Le receveur ne gère pas --shallow-exclude"

3361

3357 -#: fetch-pack.c:984

3362 +#: fetch-pack.c:983

3363 msgid "Server does not support --deepen"

3364 msgstr "Le receveur ne gère pas --deepen"

3365

3361 -#: fetch-pack.c:1001

3366 +#: fetch-pack.c:1000

3367 msgid "no common commits"

3368 msgstr "pas de commit commun"

3369

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

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

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

3372 msgstr "git fetch-pack : échec de le récupération."

3373

3369 -#: fetch-pack.c:1151

3374 +#: fetch-pack.c:1150

3375 msgid "Server does not support shallow requests"

3376 msgstr "Le serveur ne supporte les requêtes superficielles"

3377

@@ -3374,72 +3379,72 @@ msgstr "Le serveur ne supporte les requêtes superficielles"

3379 msgid "Server supports filter"

3380 msgstr "Le serveur supporte filter"

3381

3377 -#: fetch-pack.c:1184

3382 +#: fetch-pack.c:1180

3383 msgid "unable to write request to remote"

3384 msgstr "impossible d'écrire la requête sur le distant"

3385

3381 -#: fetch-pack.c:1202

3386 +#: fetch-pack.c:1198

3387 #, c-format

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

3389 msgstr "erreur à la lecture de l'entête de section '%s'"

3390

3386 -#: fetch-pack.c:1208

3391 +#: fetch-pack.c:1204

3392 #, c-format

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

3394 msgstr "'%s' attendu, '%s' reçu"

3395

3391 -#: fetch-pack.c:1247

3396 +#: fetch-pack.c:1243

3397 #, c-format

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

3399 msgstr "ligne d'acquittement inattendue : '%s'"

3400

3396 -#: fetch-pack.c:1252

3401 +#: fetch-pack.c:1248

3402 #, c-format

3403 msgid "error processing acks: %d"

3404 msgstr "erreur lors du traitement des acquittements : %d"

3405

3401 -#: fetch-pack.c:1262

3406 +#: fetch-pack.c:1258

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

3408 msgstr "fichier paquet attendu à envoyer après 'ready'"

3409

3405 -#: fetch-pack.c:1264

3410 +#: fetch-pack.c:1260

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

3412 msgstr "aucune autre section attendue à envoyer après absence de 'ready'"

3413

3409 -#: fetch-pack.c:1306

3414 +#: fetch-pack.c:1302

3415 #, c-format

3416 msgid "error processing shallow info: %d"

3417 msgstr "erreur lors du traitement de l'information de superficialité : %d"

3418

3414 -#: fetch-pack.c:1353

3419 +#: fetch-pack.c:1349

3420 #, c-format

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

3422 msgstr "wanted-ref attendu, '%s' trouvé"

3423

3419 -#: fetch-pack.c:1358

3424 +#: fetch-pack.c:1354

3425 #, c-format

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

3427 msgstr "wanted-ref inattendu : '%s'"

3428

3424 -#: fetch-pack.c:1363

3429 +#: fetch-pack.c:1359

3430 #, c-format

3431 msgid "error processing wanted refs: %d"

3432 msgstr "erreur lors du traitement des références voulues : %d"

3433

3429 -#: fetch-pack.c:1689

3434 +#: fetch-pack.c:1693

3435 msgid "no matching remote head"

3436 msgstr "pas de HEAD distante correspondante"

3437

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

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

3439 msgid "remote did not send all necessary objects"

3440 msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires"

3441

3437 -#: fetch-pack.c:1739

3442 +#: fetch-pack.c:1743

3443 #, c-format

3444 msgid "no such remote ref %s"

3445 msgstr "référence distante inconnue %s"

3446

3442 -#: fetch-pack.c:1742

3447 +#: fetch-pack.c:1746

3448 #, c-format

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

3450 msgstr "Le serveur n'autorise pas de requête pour l'objet %s non annoncé"

@@ -3462,18 +3467,24 @@ msgstr "impossible d'écrire la signature détachée dans '%s'"

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

3468 msgstr "couleur invalide '%.*s' ignorée dans log.graphColors"

3469

3465 -#: grep.c:2117

3470 +#: grep.c:627

3471 +msgid ""

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

3473 +"with -P under PCRE v2"

3474 +msgstr "le motif fourni contient des octets NUL (via -f <fichier>). Ce n'est supporté qu'avec -P avec PCRE v2"

3475 +

3476 +#: grep.c:2083

3477 #, c-format

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

3479 msgstr "'%s' : lecture de %s impossible"

3480

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

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

3482 #: builtin/rm.c:135

3483 #, c-format

3484 msgid "failed to stat '%s'"

3485 msgstr "échec du stat de '%s'"

3486

3476 -#: grep.c:2145

3487 +#: grep.c:2111

3488 #, c-format

3489 msgid "'%s': short read"

3490 msgstr "'%s' : lecture tronquée"

@@ -3620,12 +3631,12 @@ msgstr[1] ""

3631 msgid "git version [<options>]"

3632 msgstr "git version [<options>]"

3633

3623 -#: help.c:782

3634 +#: help.c:783

3635 #, c-format

3636 msgid "%s: %s - %s"

3637 msgstr "%s: %s - %s"

3638

3628 -#: help.c:786

3639 +#: help.c:787

3640 msgid ""

3641 "\n"

3642 "Did you mean this?"

@@ -3698,43 +3709,58 @@ msgstr "le nom n'est constitué que de caractères interdits : %s"

3709 msgid "invalid date format: %s"

3710 msgstr "format de date invalide : %s"

3711

3701 -#: list-objects.c:129

3712 +#: list-objects.c:127

3713 #, c-format

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

3715 msgstr ""

3716 "l'entrée '%s' dans l'arbre %s a un mode d'arbre, mais n'est pas un arbre"

3717

3707 -#: list-objects.c:142

3718 +#: list-objects.c:140

3719 #, c-format

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

3721 msgstr ""

3722 "l'entrée '%s' dans l'arbre %s a un mode de blob, mais n'est pas un blob"

3723

3713 -#: list-objects.c:378

3724 +#: list-objects.c:375

3725 #, c-format

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

3727 msgstr "impossible de charger l'arbre racine pour le commit %s"

3728

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

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

3720 -msgstr "impossible de combiner des spécificateurs multiples de filtre"

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

3730 +#, c-format

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

3732 +msgstr "impossible d'accéder au blob clairsemé dans '%s'"

3733 +

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

3735 +#, c-format

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

3737 +msgstr "impossible d'analyser la donnée de filtre clairsemé dans %s"

3738

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

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

3741 msgstr "attendu : 'tree:<profondeur>'"

3742

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

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

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

3745 msgstr "sparse : le support des filtres de chemin a été abandonné"

3746

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

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

3748 #, c-format

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

3750 msgstr "spécificateur de filtre invalide '%s'"

3751

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

3736 -msgid "cannot change partial clone promisor remote"

3737 -msgstr "impossible de modifier le prometteur distant de clone partiel"

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

3753 +#, c-format

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

3755 +msgstr "le caractère doit être échappé dans le spécificateur de sous-filtre : '%c'"

3756 +

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

3758 +msgid "expected something after combine:"

3759 +msgstr "quelque chose attendu après combine :"

3760 +

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

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

3763 +msgstr "impossible de combiner des spécificateurs multiples de filtre"

3764

3765 #: lockfile.c:151

3766 #, c-format

@@ -3764,117 +3790,113 @@ msgstr "Impossible de créer '%s.lock' : %s"

3790 msgid "failed to read the cache"

3791 msgstr "impossible de lire le cache"

3792

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

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

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

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

3795 #: builtin/stash.c:264

3796 msgid "unable to write new index file"

3797 msgstr "impossible d'écrire le nouveau fichier d'index"

3798

3773 -#: merge-recursive.c:322

3799 +#: merge-recursive.c:367

3800 msgid "(bad commit)\n"

3801 msgstr "(mauvais commit)\n"

3802

3777 -#: merge-recursive.c:345

3803 +#: merge-recursive.c:390

3804 #, c-format

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

3806 msgstr "échec de addinfo_cache pour le chemin '%s' ; abandon de la fusion."

3807

3782 -#: merge-recursive.c:354

3808 +#: merge-recursive.c:399

3809 #, c-format

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

3811 msgstr "échec de addinfo_cache pour le chemin '%s' ; abandon de la fusion."

3812

3787 -#: merge-recursive.c:437

3788 -msgid "error building trees"

3789 -msgstr "erreur de construction des arbres"

3790 -

3791 -#: merge-recursive.c:863

3813 +#: merge-recursive.c:885

3814 #, c-format

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

3816 msgstr "impossible de créer le chemin '%s' %s"

3817

3796 -#: merge-recursive.c:874

3818 +#: merge-recursive.c:896

3819 #, c-format

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

3821 msgstr "Suppression de %s pour faire de la place pour le sous-répertoire\n"

3822

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

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

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

3825 msgstr ": peut-être un conflit D/F ?"

3826

3805 -#: merge-recursive.c:897

3827 +#: merge-recursive.c:919

3828 #, c-format

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

3830 msgstr "refus de perdre le fichier non suivi '%s'"

3831

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

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

3833 #, c-format

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

3835 msgstr "impossible de lire l'objet %s '%s'"

3836

3815 -#: merge-recursive.c:941

3837 +#: merge-recursive.c:965

3838 #, c-format

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

3840 msgstr "blob attendu pour %s '%s'"

3841

3820 -#: merge-recursive.c:965

3842 +#: merge-recursive.c:990

3843 #, c-format

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

3845 msgstr "échec à l'ouverture de '%s' : %s"

3846

3825 -#: merge-recursive.c:976

3847 +#: merge-recursive.c:1001

3848 #, c-format

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

3850 msgstr "échec à la création du lien symbolique '%s' : %s"

3851

3830 -#: merge-recursive.c:981

3852 +#: merge-recursive.c:1006

3853 #, c-format

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

3855 msgstr "ne sait pas traiter %06o %s '%s'"

3856

3835 -#: merge-recursive.c:1177

3857 +#: merge-recursive.c:1199

3858 #, c-format

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

3860 msgstr "Échec de la fusion du sous-module %s (non extrait)"

3861

3840 -#: merge-recursive.c:1184

3862 +#: merge-recursive.c:1206

3863 #, c-format

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

3865 msgstr "Échec de fusion du sous-module %s (commits non présents)"

3866

3845 -#: merge-recursive.c:1191

3867 +#: merge-recursive.c:1213

3868 #, c-format

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

3870 msgstr ""

3871 "Échec de la fusion du sous-module %s (les commits ne descendent pas de la "

3872 "base de fusion)"

3873

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

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

3875 #, c-format

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

3877 msgstr "Avance rapide du sous-module %s au commit suivant :"

3878

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

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

3880 #, c-format

3881 msgid "Fast-forwarding submodule %s"

3882 msgstr "Avance rapide du sous-module %s"

3883

3862 -#: merge-recursive.c:1237

3884 +#: merge-recursive.c:1259

3885 #, c-format

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

3887 msgstr ""

3888 "Échec de fusion du sous-module %s (fusion suivant les commits non trouvée)"

3889

3868 -#: merge-recursive.c:1241

3890 +#: merge-recursive.c:1263

3891 #, c-format

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

3893 msgstr "Échec de fusion du sous-module %s (pas en avance rapide)"

3894

3873 -#: merge-recursive.c:1242

3895 +#: merge-recursive.c:1264

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

3897 msgstr "Résolution possible de fusion trouvée pour le sous-module :\n"

3898

3877 -#: merge-recursive.c:1245

3899 +#: merge-recursive.c:1267

3900 #, c-format

3901 msgid ""

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

@@ -3891,33 +3913,33 @@ msgstr ""

3913 "\n"

3914 "qui acceptera cette suggestion.\n"

3915

3894 -#: merge-recursive.c:1254

3916 +#: merge-recursive.c:1276

3917 #, c-format

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

3919 msgstr "Échec de fusion du sous-module %s (plusieurs fusions trouvées)"

3920

3899 -#: merge-recursive.c:1327

3921 +#: merge-recursive.c:1349

3922 msgid "Failed to execute internal merge"

3923 msgstr "Échec à l'exécution de la fusion interne"

3924

3903 -#: merge-recursive.c:1332

3925 +#: merge-recursive.c:1354

3926 #, c-format

3927 msgid "Unable to add %s to database"

3928 msgstr "Impossible d'ajouter %s à la base de données"

3929

3908 -#: merge-recursive.c:1364

3930 +#: merge-recursive.c:1386

3931 #, c-format

3932 msgid "Auto-merging %s"

3933 msgstr "Fusion automatique de %s"

3934

3913 -#: merge-recursive.c:1387

3935 +#: merge-recursive.c:1410

3936 #, c-format

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

3938 msgstr ""

3939 "Erreur : refus de perdre le fichier non suivi %s ; écriture dans %s à la "

3940 "place."

3941

3920 -#: merge-recursive.c:1459

3942 +#: merge-recursive.c:1482

3943 #, c-format

3944 msgid ""

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

@@ -3926,7 +3948,7 @@ msgstr ""

3948 "CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de "

3949 "%s laissée dans l'arbre."

3950

3929 -#: merge-recursive.c:1464

3951 +#: merge-recursive.c:1487

3952 #, c-format

3953 msgid ""

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

@@ -3935,7 +3957,7 @@ msgstr ""

3957 "CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version "

3958 "%s de %s laissée dans l'arbre."

3959

3938 -#: merge-recursive.c:1471

3960 +#: merge-recursive.c:1494

3961 #, c-format

3962 msgid ""

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

@@ -3944,7 +3966,7 @@ msgstr ""

3966 "CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de "

3967 "%s laissée dans l'arbre dans le fichier %s."

3968

3947 -#: merge-recursive.c:1476

3969 +#: merge-recursive.c:1499

3970 #, c-format

3971 msgid ""

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

@@ -3953,41 +3975,41 @@ msgstr ""

3975 "CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version "

3976 "%s de %s laissée dans l'arbre dans le fichier %s."

3977

3956 -#: merge-recursive.c:1511

3978 +#: merge-recursive.c:1534

3979 msgid "rename"

3980 msgstr "renommage"

3981

3960 -#: merge-recursive.c:1511

3982 +#: merge-recursive.c:1534

3983 msgid "renamed"

3984 msgstr "renommé"

3985

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

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

3987 #, c-format

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

3989 msgstr "Refus de perdre le fichier modifié %s"

3990

3969 -#: merge-recursive.c:1601

3991 +#: merge-recursive.c:1624

3992 #, c-format

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

3994 msgstr "Refus de perdre le fichier non suivi %s, même s'il gêne."

3995

3974 -#: merge-recursive.c:1659

3996 +#: merge-recursive.c:1682

3997 #, c-format

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

3999 msgstr ""

4000 "CONFLIT (renommage/ajout) : Renommage de %s->%s dans %s. %s ajouté dans %s"

4001

3980 -#: merge-recursive.c:1690

4002 +#: merge-recursive.c:1713

4003 #, c-format

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

4005 msgstr "%s est un répertoire dans %s ajouté plutôt comme %s"

4006

3985 -#: merge-recursive.c:1695

4007 +#: merge-recursive.c:1718

4008 #, c-format

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

4010 msgstr "Refus de perdre le fichier non suivi %s ; ajout comme %s à la place"

4011

3990 -#: merge-recursive.c:1714

4012 +#: merge-recursive.c:1737

4013 #, c-format

4014 msgid ""

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

@@ -3996,18 +4018,18 @@ msgstr ""

4018 "CONFLIT (renommage/renommage) : Renommage de \"%s\"->\"%s\" dans la branche "

4019 "\"%s\" et renommage \"%s\"->\"%s\" dans \"%s\"%s"

4020

3999 -#: merge-recursive.c:1719

4021 +#: merge-recursive.c:1742

4022 msgid " (left unresolved)"

4023 msgstr " (laissé non résolu)"

4024

4003 -#: merge-recursive.c:1828

4025 +#: merge-recursive.c:1851

4026 #, c-format

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

4028 msgstr ""

4029 "CONFLIT (renommage/renommage) : renommage '%s'->'%s' dans %s. Renommage '%s'-"

4030 ">'%s' dans %s"

4031

4010 -#: merge-recursive.c:2035

4032 +#: merge-recursive.c:2056

4033 #, c-format

4034 msgid ""

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

@@ -4018,7 +4040,7 @@ msgstr ""

4040 "parce que le répertoire %s a été renommé en plusieurs autres répertoires, "

4041 "sans aucune destination récupérant la majorité des fichiers."

4042

4021 -#: merge-recursive.c:2067

4043 +#: merge-recursive.c:2088

4044 #, c-format

4045 msgid ""

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

@@ -4027,7 +4049,7 @@ msgstr ""

4049 "CONFLIT (renommage implicite de répertoire) : le répertoire/fichier %s gêne "

4050 "des renommages implicites de répertoire déplaçant les chemins suivants : %s."

4051

4030 -#: merge-recursive.c:2077

4052 +#: merge-recursive.c:2098

4053 #, c-format

4054 msgid ""

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

@@ -4036,7 +4058,7 @@ msgstr ""

4058 "CONFLIT (renommage implicite de répertoire) : impossible de transformer "

4059 "plusieurs chemins sur %s ; les chemins concernés sont : %s"

4060

4039 -#: merge-recursive.c:2169

4061 +#: merge-recursive.c:2190

4062 #, c-format

4063 msgid ""

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

@@ -4045,7 +4067,7 @@ msgstr ""

4067 "CONFLIT (renommage/renommage) : renommage du répertoire %s->%s dans %s. "

4068 "Renommage de répertoire %s->%s dans %s"

4069

4048 -#: merge-recursive.c:2413

4070 +#: merge-recursive.c:2435

4071 #, c-format

4072 msgid ""

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

@@ -4054,52 +4076,52 @@ msgstr ""

4076 "AVERTISSEMENT : ne renomme pas %s->%s dans %s, parce que %s lui-même a été "

4077 "renommé."

4078

4057 -#: merge-recursive.c:2938

4079 +#: merge-recursive.c:2961

4080 #, c-format

4081 msgid "cannot read object %s"

4082 msgstr "impossible de lire l'objet %s"

4083

4062 -#: merge-recursive.c:2941

4084 +#: merge-recursive.c:2964

4085 #, c-format

4086 msgid "object %s is not a blob"

4087 msgstr "l'objet %s n'est pas un blob"

4088

4067 -#: merge-recursive.c:3005

4089 +#: merge-recursive.c:3028

4090 msgid "modify"

4091 msgstr "modification"

4092

4071 -#: merge-recursive.c:3005

4093 +#: merge-recursive.c:3028

4094 msgid "modified"

4095 msgstr "modifié"

4096

4075 -#: merge-recursive.c:3017

4097 +#: merge-recursive.c:3040

4098 msgid "content"

4099 msgstr "contenu"

4100

4079 -#: merge-recursive.c:3021

4101 +#: merge-recursive.c:3044

4102 msgid "add/add"

4103 msgstr "ajout/ajout"

4104

4083 -#: merge-recursive.c:3044

4105 +#: merge-recursive.c:3067

4106 #, c-format

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

4108 msgstr "%s sauté (fusion identique à l'existant)"

4109

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

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

4111 msgid "submodule"

4112 msgstr "sous-module"

4113

4092 -#: merge-recursive.c:3067

4114 +#: merge-recursive.c:3090

4115 #, c-format

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

4117 msgstr "CONFLIT (%s) : Conflit de fusion dans %s"

4118

4097 -#: merge-recursive.c:3097

4119 +#: merge-recursive.c:3120

4120 #, c-format

4121 msgid "Adding as %s instead"

4122 msgstr "Ajout plutôt comme %s"

4123

4102 -#: merge-recursive.c:3179

4124 +#: merge-recursive.c:3203

4125 #, c-format

4126 msgid ""

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

@@ -4108,7 +4130,7 @@ msgstr ""

4130 "Chemin mis à jour : %s ajouté dans %s dans un répertoire qui a été renommé "

4131 "en %s ; déplacé dans %s."

4132

4111 -#: merge-recursive.c:3182

4133 +#: merge-recursive.c:3206

4134 #, c-format

4135 msgid ""

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

@@ -4118,7 +4140,7 @@ msgstr ""

4140 "a été renommé dans %s, ce qui suggère qu'il devrait peut-être être déplacé "

4141 "vers %s."

4142

4121 -#: merge-recursive.c:3186

4143 +#: merge-recursive.c:3210

4144 #, c-format

4145 msgid ""

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

@@ -4127,7 +4149,7 @@ msgstr ""

4149 "Chemin mis à jour : %s renommé en %s dans %s, dans un répertoire qui a été "

4150 "renommé en %s ; déplacé dans %s."

4151

4130 -#: merge-recursive.c:3189

4152 +#: merge-recursive.c:3213

4153 #, c-format

4154 msgid ""

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

@@ -4137,176 +4159,176 @@ msgstr ""

4159 "répertoire qui a été renommé dans %s, ce qui suggère qu'il devrait peut-être "

4160 "être déplacé vers %s."

4161

4140 -#: merge-recursive.c:3303

4162 +#: merge-recursive.c:3327

4163 #, c-format

4164 msgid "Removing %s"

4165 msgstr "Suppression de %s"

4166

4145 -#: merge-recursive.c:3326

4167 +#: merge-recursive.c:3350

4168 msgid "file/directory"

4169 msgstr "fichier/répertoire"

4170

4149 -#: merge-recursive.c:3331

4171 +#: merge-recursive.c:3355

4172 msgid "directory/file"

4173 msgstr "répertoire/fichier"

4174

4153 -#: merge-recursive.c:3338

4175 +#: merge-recursive.c:3362

4176 #, c-format

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

4178 msgstr ""

4179 "CONFLIT (%s) : Il y a un répertoire nommé %s dans %s. Ajout de %s comme %s"

4180

4159 -#: merge-recursive.c:3347

4181 +#: merge-recursive.c:3371

4182 #, c-format

4183 msgid "Adding %s"

4184 msgstr "Ajout de %s"

4185

4164 -#: merge-recursive.c:3356

4186 +#: merge-recursive.c:3380

4187 #, c-format

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

4189 msgstr "CONFLIT (ajout/ajout) : Conflit de fusion dans %s"

4190

4169 -#: merge-recursive.c:3394

4170 -#, c-format

4171 -msgid ""

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

4173 -" %s"

4174 -msgstr ""

4175 -"Vos modifications locales aux fichiers suivants seraient écrasées par la "

4176 -"fusion :\n"

4177 -" %s"

4178 -

4179 -#: merge-recursive.c:3405

4191 +#: merge-recursive.c:3424

4192 msgid "Already up to date!"

4193 msgstr "Déjà à jour !"

4194

4183 -#: merge-recursive.c:3414

4195 +#: merge-recursive.c:3433

4196 #, c-format

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

4198 msgstr "échec de fusion des arbres %s et %s"

4199

4188 -#: merge-recursive.c:3513

4200 +#: merge-recursive.c:3537

4201 msgid "Merging:"

4202 msgstr "Fusion :"

4203

4192 -#: merge-recursive.c:3526

4204 +#: merge-recursive.c:3550

4205 #, c-format

4206 msgid "found %u common ancestor:"

4207 msgid_plural "found %u common ancestors:"

4208 msgstr[0] "%u ancêtre commun trouvé :"

4209 msgstr[1] "%u ancêtres communs trouvés :"

4210

4199 -#: merge-recursive.c:3565

4211 +#: merge-recursive.c:3600

4212 msgid "merge returned no commit"

4213 msgstr "la fusion n'a pas retourné de commit"

4214

4203 -#: merge-recursive.c:3631

4215 +#: merge-recursive.c:3659

4216 +#, c-format

4217 +msgid ""

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

4219 +" %s"

4220 +msgstr ""

4221 +"Vos modifications locales aux fichiers suivants seraient écrasées par la "

4222 +"fusion :\n"

4223 +" %s"

4224 +

4225 +#: merge-recursive.c:3756

4226 #, c-format

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

4228 msgstr "Impossible d'analyser l'objet '%s'"

4229

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

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

4231 msgid "Unable to write index."

4232 msgstr "Impossible d'écrire l'index."

4233

4212 -#: midx.c:69

4234 +#: midx.c:68

4235 #, c-format

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

4237 msgstr "le fichier d'index multi-paquet %s est trop petit"

4238

4217 -#: midx.c:85

4239 +#: midx.c:84

4240 #, c-format

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

4242 msgstr ""

4243 "la signature de l'index multi-paquet 0x%08x ne correspond pas à la signature "

4244 "0x%08x"

4245

4224 -#: midx.c:90

4246 +#: midx.c:89

4247 #, c-format

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

4249 msgstr "la version d'index multi-paquet %d n'est pas reconnue"

4250

4229 -#: midx.c:95

4251 +#: midx.c:94

4252 #, c-format

4253 msgid "hash version %u does not match"

4254 msgstr "la version %u du condensé ne correspond pas"

4255

4234 -#: midx.c:109

4256 +#: midx.c:108

4257 msgid "invalid chunk offset (too large)"

4258 msgstr "décalage de section invalide (trop grand)"

4259

4238 -#: midx.c:133

4260 +#: midx.c:132

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

4262 msgstr ""

4263 "identifiant de terminaison de tronçon d'index multi-paquet terminant "

4264 "apparaît plus tôt qu'attendu"

4265

4244 -#: midx.c:146

4266 +#: midx.c:145

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

4268 msgstr "index multi-paquet manque de tronçon de nom de paquet"

4269

4248 -#: midx.c:148

4270 +#: midx.c:147

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

4272 msgstr "index multi-paquet manque de tronçon de d'étalement OID requis"

4273

4252 -#: midx.c:150

4274 +#: midx.c:149

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

4276 msgstr "index multi-paquet manque de tronçon de recherche OID"

4277

4256 -#: midx.c:152

4278 +#: midx.c:151

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

4280 msgstr "index multi-paquet manque de tronçon de décalage d'objet"

4281

4260 -#: midx.c:166

4282 +#: midx.c:165

4283 #, c-format

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

4285 msgstr ""

4286 "index multi-paquet les noms de paquets sont en désordre : '%s' avant '%s'"

4287

4266 -#: midx.c:211

4288 +#: midx.c:210

4289 #, c-format

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

4291 msgstr "mauvais pack-int-id : %u (%u paquets au total)"

4292

4271 -#: midx.c:261

4293 +#: midx.c:260

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

4295 msgstr ""

4296 "multi-pack-index stock un décalage en 64-bit, mais off_t est trop petit"

4297

4276 -#: midx.c:289

4298 +#: midx.c:288

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

4300 msgstr "erreur à la préparation du fichier paquet depuis un index multi-paquet"

4301

4280 -#: midx.c:470

4302 +#: midx.c:469

4303 #, c-format

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

4305 msgstr "échec de l'ajout du fichier paquet '%s'"

4306

4285 -#: midx.c:476

4307 +#: midx.c:475

4308 #, c-format

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

4310 msgstr "échec à l'ouverture du fichier paquet '%s'"

4311

4290 -#: midx.c:536

4312 +#: midx.c:535

4313 #, c-format

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

4315 msgstr "échec de localisation de l'objet %d dans le fichier paquet"

4316

4295 -#: midx.c:865

4317 +#: midx.c:864

4318 #, c-format

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

4320 msgstr "fichier paquet à éliminer %s non trouvé"

4321

4300 -#: midx.c:1036

4322 +#: midx.c:1035

4323 #, c-format

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

4325 msgstr "échec du nettoyage de l'index de multi-paquet à %s"

4326

4305 -#: midx.c:1091

4327 +#: midx.c:1090

4328 msgid "Looking for referenced packfiles"

4329 msgstr "Recherche de fichiers paquets référencés"

4330

4309 -#: midx.c:1106

4331 +#: midx.c:1105

4332 #, c-format

4333 msgid ""

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

@@ -4314,57 +4336,57 @@ msgstr ""

4336 "étalement oid en désordre : étalement[%d] = %<PRIx32> > %<PRIx32> = "

4337 "étalement[%d]"

4338

4317 -#: midx.c:1110

4339 +#: midx.c:1109

4340 msgid "Verifying OID order in MIDX"

4341 msgstr "Vérification de l'ordre des OID dans MIDX"

4342

4321 -#: midx.c:1119

4343 +#: midx.c:1118

4344 #, c-format

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

4346 msgstr "recherche d'oid en désordre : oid[%d] = %s >= %s = oid[%d]"

4347

4326 -#: midx.c:1138

4348 +#: midx.c:1137

4349 msgid "Sorting objects by packfile"

4350 msgstr "Classement des objets par fichier paquet"

4351

4330 -#: midx.c:1144

4352 +#: midx.c:1143

4353 msgid "Verifying object offsets"

4354 msgstr "Vérification des décalages des objets"

4355

4334 -#: midx.c:1160

4356 +#: midx.c:1159

4357 #, c-format

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

4359 msgstr "échec de la lecture de l'élément de cache pour oid[%d] = %s"

4360

4339 -#: midx.c:1166

4361 +#: midx.c:1165

4362 #, c-format

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

4364 msgstr "impossible de lire le fichier paquet %s"

4365

4344 -#: midx.c:1175

4366 +#: midx.c:1174

4367 #, c-format

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

4369 msgstr "décalage d'objet incorrect pour oid[%d] = %s : %<PRIx64> != %<PRIx64>"

4370

4349 -#: midx.c:1350

4371 +#: midx.c:1349

4372 msgid "could not start pack-objects"

4373 msgstr "Impossible de démarrer le groupement d'objets"

4374

4353 -#: midx.c:1369

4375 +#: midx.c:1368

4376 msgid "could not finish pack-objects"

4377 msgstr "Impossible de finir le groupement d'objets"

4378

4357 -#: name-hash.c:532

4379 +#: name-hash.c:537

4380 #, c-format

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

4382 msgstr "impossible de créer le fil lazy_dir : %s"

4383

4362 -#: name-hash.c:554

4384 +#: name-hash.c:559

4385 #, c-format

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

4387 msgstr "impossible de créer le fil lazy_name : %s"

4388

4367 -#: name-hash.c:560

4389 +#: name-hash.c:565

4390 #, c-format

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

4392 msgstr "impossible de joindre le fil lazy_name : %s"

@@ -4408,41 +4430,41 @@ msgstr "Refus de réécrire des notes dans %s (hors de refs/notes/)"

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

4431 msgstr "Mauvaise valeur de %s : '%s'"

4432

4411 -#: object.c:54

4433 +#: object.c:53

4434 #, c-format

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

4436 msgstr "type d'objet invalide \"%s\""

4437

4416 -#: object.c:174

4438 +#: object.c:173

4439 #, c-format

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

4441 msgstr "l'objet %s est de type %s, pas de type %s"

4442

4421 -#: object.c:234

4443 +#: object.c:233

4444 #, c-format

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

4446 msgstr "l'objet %s a un id de type inconnu %d"

4447

4426 -#: object.c:247

4448 +#: object.c:246

4449 #, c-format

4450 msgid "unable to parse object: %s"

4451 msgstr "impossible d'analyser l'objet : %s"

4452

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

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

4454 #, c-format

4455 msgid "hash mismatch %s"

4456 msgstr "incohérence de hachage %s"

4457

4436 -#: packfile.c:648

4458 +#: packfile.c:641

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

4460 msgstr "offset avant la fin du fichier paquet (.idx cassé ?)"

4461

4440 -#: packfile.c:1899

4462 +#: packfile.c:1887

4463 #, c-format

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

4465 msgstr "offset avant le début de l'index de paquet pour %s (index corrompu ?)"

4466

4445 -#: packfile.c:1903

4467 +#: packfile.c:1891

4468 #, c-format

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

4470 msgstr ""

@@ -4488,26 +4510,26 @@ msgstr "option ambigüe : %s (devrait être --%s%s ou --%s%s)"

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

4511 msgstr "vouliez-vous dire `--%s` (avec deux signes moins)?"

4512

4491 -#: parse-options.c:859

4513 +#: parse-options.c:860

4514 #, c-format

4515 msgid "unknown option `%s'"

4516 msgstr "option inconnue « %s »"

4517

4496 -#: parse-options.c:861

4518 +#: parse-options.c:862

4519 #, c-format

4520 msgid "unknown switch `%c'"

4521 msgstr "bascule inconnue « %c »"

4522

4501 -#: parse-options.c:863

4523 +#: parse-options.c:864

4524 #, c-format

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

4526 msgstr "option non-ascii inconnue dans la chaîne : '%s'"

4527

4506 -#: parse-options.c:887

4528 +#: parse-options.c:888

4529 msgid "..."

4530 msgstr "..."

4531

4510 -#: parse-options.c:906

4532 +#: parse-options.c:907

4533 #, c-format

4534 msgid "usage: %s"

4535 msgstr "usage : %s"

@@ -4515,21 +4537,21 @@ msgstr "usage : %s"

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

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

4539 #.

4518 -#: parse-options.c:912

4540 +#: parse-options.c:913

4541 #, c-format

4542 msgid " or: %s"

4543 msgstr " ou : %s"

4544

4523 -#: parse-options.c:915

4545 +#: parse-options.c:916

4546 #, c-format

4547 msgid " %s"

4548 msgstr " %s"

4549

4528 -#: parse-options.c:954

4550 +#: parse-options.c:955

4551 msgid "-NUM"

4552 msgstr "-NUM"

4553

4532 -#: parse-options.c:968

4554 +#: parse-options.c:969

4555 #, c-format

4556 msgid "alias of --%s"

4557 msgstr "alias pour --%s"

@@ -4704,29 +4726,38 @@ msgstr "impossible de créer le lstat en fil : %s"

4726 msgid "unable to parse --pretty format"

4727 msgstr "impossible d'analyser le format --pretty"

4728

4707 -#: range-diff.c:70

4729 +#: promisor-remote.c:25

4730 +msgid "Remote with no URL"

4731 +msgstr "Dépôt distant sans URL"

4732 +

4733 +#: promisor-remote.c:61

4734 +#, c-format

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

4736 +msgstr "un nom de prometteur distant ne peut pas commencer par '/' : %s"

4737 +

4738 +#: range-diff.c:71

4739 msgid "could not start `log`"

4740 msgstr "impossible de démarrer `log`"

4741

4711 -#: range-diff.c:72

4742 +#: range-diff.c:73

4743 msgid "could not read `log` output"

4744 msgstr "impossible de lire la sortie de `log`"

4745

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

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

4747 #, c-format

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

4749 msgstr "impossible d'analyser le commit '%s'"

4750

4720 -#: range-diff.c:117

4751 +#: range-diff.c:118

4752 #, c-format

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

4754 msgstr "impossible d'analyser l'entête git '%.*s'"

4755

4725 -#: range-diff.c:274

4756 +#: range-diff.c:275

4757 msgid "failed to generate diff"

4758 msgstr "échec de la génération de diff"

4759

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

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

4761 #, c-format

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

4763 msgstr "impossible d'analyser le journal pour '%s'"

@@ -4772,11 +4803,11 @@ msgstr "fstat de '%s' impossible"

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

4804 msgstr "'%s' existe à la fois comme un fichier et un répertoire"

4805

4775 -#: read-cache.c:1499

4806 +#: read-cache.c:1520

4807 msgid "Refresh index"

4808 msgstr "Rafraîchir l'index"

4809

4779 -#: read-cache.c:1613

4810 +#: read-cache.c:1635

4811 #, c-format

4812 msgid ""

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

@@ -4785,7 +4816,7 @@ msgstr ""

4816 "version d'index renseignée, mais la valeur est invalide.\n"

4817 "Utilisation de la version %i"

4818

4788 -#: read-cache.c:1623

4819 +#: read-cache.c:1645

4820 #, c-format

4821 msgid ""

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

@@ -4794,138 +4825,138 @@ msgstr ""

4825 "GIT_INDEX_VERSION est renseigné, mais la valeur est invalide.\n"

4826 "Utilisation de la version %i"

4827

4797 -#: read-cache.c:1679

4828 +#: read-cache.c:1701

4829 #, c-format

4830 msgid "bad signature 0x%08x"

4831 msgstr "signature incorrecte 0x%08x"

4832

4802 -#: read-cache.c:1682

4833 +#: read-cache.c:1704

4834 #, c-format

4835 msgid "bad index version %d"

4836 msgstr "mauvaise version d'index %d"

4837

4807 -#: read-cache.c:1691

4838 +#: read-cache.c:1713

4839 msgid "bad index file sha1 signature"

4840 msgstr "mauvaise signature sha1 d'index"

4841

4811 -#: read-cache.c:1721

4842 +#: read-cache.c:1743

4843 #, c-format

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

4845 msgstr "l'index utilise l'extension %.4s qui n'est pas comprise"

4846

4816 -#: read-cache.c:1723

4847 +#: read-cache.c:1745

4848 #, c-format

4849 msgid "ignoring %.4s extension"

4850 msgstr "extension %.4s ignorée"

4851

4821 -#: read-cache.c:1760

4852 +#: read-cache.c:1782

4853 #, c-format

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

4855 msgstr "format d'entrée d'index inconnu 0x%08x"

4856

4826 -#: read-cache.c:1776

4857 +#: read-cache.c:1798

4858 #, c-format

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

4860 msgstr "champ de nom malformé dans l'index, près du chemin '%s'"

4861

4831 -#: read-cache.c:1833

4862 +#: read-cache.c:1855

4863 msgid "unordered stage entries in index"

4864 msgstr "entrées de préparation non ordonnées dans l'index"

4865

4835 -#: read-cache.c:1836

4866 +#: read-cache.c:1858

4867 #, c-format

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

4869 msgstr "entrées multiples de préparation pour le fichier fusionné '%s'"

4870

4840 -#: read-cache.c:1839

4871 +#: read-cache.c:1861

4872 #, c-format

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

4874 msgstr "entrées de préparation non ordonnées pour '%s'"

4875

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

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

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

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

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

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

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

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

4881 msgid "index file corrupt"

4882 msgstr "fichier d'index corrompu"

4883

4853 -#: read-cache.c:2087

4884 +#: read-cache.c:2108

4885 #, c-format

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

4887 msgstr "impossible de créer le fil load_cache_entries : %s"

4888

4858 -#: read-cache.c:2100

4889 +#: read-cache.c:2121

4890 #, c-format

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

4892 msgstr "impossible de joindre le fil load_cach_entries : %s"

4893

4863 -#: read-cache.c:2133

4894 +#: read-cache.c:2154

4895 #, c-format

4896 msgid "%s: index file open failed"

4897 msgstr "%s : l'ouverture du fichier d'index a échoué"

4898

4868 -#: read-cache.c:2137

4899 +#: read-cache.c:2158

4900 #, c-format

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

4902 msgstr "%s : impossible de faire un stat sur l'index ouvert"

4903

4873 -#: read-cache.c:2141

4904 +#: read-cache.c:2162

4905 #, c-format

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

4907 msgstr "%s : fichier d'index plus petit qu'attendu"

4908

4878 -#: read-cache.c:2145

4909 +#: read-cache.c:2166

4910 #, c-format

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

4912 msgstr "%s : impossible de mapper le fichier d'index"

4913

4883 -#: read-cache.c:2187

4914 +#: read-cache.c:2208

4915 #, c-format

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

4917 msgstr "impossible de créer le fil load_index_extensions : %s"

4918

4888 -#: read-cache.c:2214

4919 +#: read-cache.c:2235

4920 #, c-format

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

4922 msgstr "impossible de joindre le fil load_index_extensions : %s"

4923

4893 -#: read-cache.c:2246

4924 +#: read-cache.c:2267

4925 #, c-format

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

4927 msgstr "impossible de rafraîchir l'index partagé '%s'"

4928

4898 -#: read-cache.c:2293

4929 +#: read-cache.c:2314

4930 #, c-format

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

4932 msgstr "index cassé, %s attendu dans %s, %s obtenu"

4933

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

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

4935 #, c-format

4936 msgid "could not close '%s'"

4937 msgstr "impossible de fermer '%s'"

4938

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

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

4940 #, c-format

4941 msgid "could not stat '%s'"

4942 msgstr "stat impossible de '%s'"

4943

4913 -#: read-cache.c:3105

4944 +#: read-cache.c:3126

4945 #, c-format

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

4947 msgstr "impossible d'ouvrir le répertoire git : %s"

4948

4918 -#: read-cache.c:3117

4949 +#: read-cache.c:3138

4950 #, c-format

4951 msgid "unable to unlink: %s"

4952 msgstr "échec lors de l'unlink : %s"

4953

4923 -#: read-cache.c:3142

4954 +#: read-cache.c:3163

4955 #, c-format

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

4957 msgstr "impossible de régler les bits de droit de '%s'"

4958

4928 -#: read-cache.c:3291

4959 +#: read-cache.c:3312

4960 #, c-format

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

4962 msgstr "%s : impossible de revenir à l'étape 0"

@@ -5032,8 +5063,8 @@ msgstr ""

5063 msgid "Note that empty commits are commented out"

5064 msgstr "Veuillez noter que les commits vides sont en commentaire"

5065

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

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

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

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

5068 #, c-format

5069 msgid "could not write '%s'"

5070 msgstr "impossible d'écrire '%s'"

@@ -5080,7 +5111,7 @@ msgstr "%s ne pointe pas sur un objet valide!"

5111 msgid "ignoring dangling symref %s"

5112 msgstr "symref pendant %s ignoré"

5113

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

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

5115 #, c-format

5116 msgid "ignoring broken ref %s"

5117 msgstr "réf cassé %s ignoré"

@@ -5105,14 +5136,14 @@ msgstr "la référence '%s' existe déjà"

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

5137 msgstr "id d'objet inattendu pendant l'écriture de '%s'"

5138

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

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

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

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

5141 #, c-format

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

5143 msgstr "impossible d'écrire dans '%s'"

5144

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

5115 -#: builtin/rebase.c:1003

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

5146 +#: builtin/rebase.c:1004

5147 #, c-format

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

5149 msgstr "impossible d'ouvrir '%s' en écriture"

@@ -5147,21 +5178,21 @@ msgstr "refus de mettre à jour une réf avec un nom cassé '%s'"

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

5179 msgstr "échec de update_ref pour la réf '%s' : %s"

5180

5150 -#: refs.c:2012

5181 +#: refs.c:2023

5182 #, c-format

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

5184 msgstr "mises à jour multiples pour la réf '%s' non permises"

5185

5155 -#: refs.c:2044

5186 +#: refs.c:2055

5187 msgid "ref updates forbidden inside quarantine environment"

5188 msgstr "mises à jour des références interdites en environnement de quarantaine"

5189

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

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

5191 #, c-format

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

5193 msgstr "'%s' existe ; impossible de créer '%s'"

5194

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

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

5196 #, c-format

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

5198 msgstr "impossible de traiter '%s' et '%s' en même temps"

@@ -5171,13 +5202,13 @@ msgstr "impossible de traiter '%s' et '%s' en même temps"

5202 msgid "could not remove reference %s"

5203 msgstr "impossible de supprimer la référence %s"

5204

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

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

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

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

5207 #, c-format

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

5209 msgstr "Impossible de supprimer la référence %s : %s"

5210

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

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

5212 #, c-format

5213 msgid "could not delete references: %s"

5214 msgstr "impossible de supprimer les références : %s"

@@ -5188,7 +5219,7 @@ msgid "invalid refspec '%s'"

5219 msgstr "spécificateur de réference invalide : '%s'"

5220

5221 # à priori on parle d'une branche ici

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

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

5223 msgid "gone"

5224 msgstr "disparue"

5225

@@ -5207,283 +5238,283 @@ msgstr "en retard de %d"

5238 msgid "ahead %d, behind %d"

5239 msgstr "en avance de %d, en retard de %d"

5240

5210 -#: ref-filter.c:162

5241 +#: ref-filter.c:165

5242 #, c-format

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

5244 msgstr "format attendu : %%(color:<couleur>)"

5245

5215 -#: ref-filter.c:164

5246 +#: ref-filter.c:167

5247 #, c-format

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

5249 msgstr "couleur non reconnue : %%(color:%s)"

5250

5220 -#: ref-filter.c:186

5251 +#: ref-filter.c:189

5252 #, c-format

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

5254 msgstr "Valeur entière attendue refname:lstrip=%s"

5255

5225 -#: ref-filter.c:190

5256 +#: ref-filter.c:193

5257 #, c-format

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

5259 msgstr "Valeur entière attendue refname:rstrip=%s"

5260

5230 -#: ref-filter.c:192

5261 +#: ref-filter.c:195

5262 #, c-format

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

5264 msgstr "argument %%(%s) non reconnu : %s"

5265

5235 -#: ref-filter.c:247

5266 +#: ref-filter.c:250

5267 #, c-format

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

5269 msgstr "%%(objecttype) n'accepte pas d'argument"

5270

5240 -#: ref-filter.c:269

5271 +#: ref-filter.c:272

5272 #, c-format

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

5274 msgstr "argument %%(objectsize) non reconnu : %s"

5275

5245 -#: ref-filter.c:277

5276 +#: ref-filter.c:280

5277 #, c-format

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

5279 msgstr "%%(deltabase) n'accepte pas d'argument"

5280

5250 -#: ref-filter.c:289

5281 +#: ref-filter.c:292

5282 #, c-format

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

5284 msgstr "%%(body) n'accepte pas d'argument"

5285

5255 -#: ref-filter.c:298

5286 +#: ref-filter.c:301

5287 #, c-format

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

5289 msgstr "%%(subject) n'accepte pas d'argument"

5290

5260 -#: ref-filter.c:320

5291 +#: ref-filter.c:323

5292 #, c-format

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

5294 msgstr "argument %%(trailers) inconnu : %s"

5295

5265 -#: ref-filter.c:349

5296 +#: ref-filter.c:352

5297 #, c-format

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

5299 msgstr "valeur positive attendue contents:lines=%s"

5300

5270 -#: ref-filter.c:351

5301 +#: ref-filter.c:354

5302 #, c-format

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

5304 msgstr "argument %%(contents) non reconnu : %s"

5305

5275 -#: ref-filter.c:366

5306 +#: ref-filter.c:369

5307 #, c-format

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

5309 msgstr "valeur positive attendue objectname:short=%s"

5310

5280 -#: ref-filter.c:370

5311 +#: ref-filter.c:373

5312 #, c-format

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

5314 msgstr "argument %%(objectname) non reconnu : %s"

5315

5285 -#: ref-filter.c:400

5316 +#: ref-filter.c:403

5317 #, c-format

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

5319 msgstr "format attendu : %%(align:<largeur>,<position>)"

5320

5290 -#: ref-filter.c:412

5321 +#: ref-filter.c:415

5322 #, c-format

5323 msgid "unrecognized position:%s"

5324 msgstr "position non reconnue : %s"

5325

5295 -#: ref-filter.c:419

5326 +#: ref-filter.c:422

5327 #, c-format

5328 msgid "unrecognized width:%s"

5329 msgstr "largeur non reconnue : %s"

5330

5300 -#: ref-filter.c:428

5331 +#: ref-filter.c:431

5332 #, c-format

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

5334 msgstr "argument %%(align) non reconnu : %s"

5335

5305 -#: ref-filter.c:436

5336 +#: ref-filter.c:439

5337 #, c-format

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

5339 msgstr "valeur positive attendue avec l'atome %%(align)"

5340

5310 -#: ref-filter.c:454

5341 +#: ref-filter.c:457

5342 #, c-format

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

5344 msgstr "argument %%(if) non reconnu : %s"

5345

5315 -#: ref-filter.c:556

5346 +#: ref-filter.c:559

5347 #, c-format

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

5349 msgstr "nom de champ malformé %.*s"

5350

5320 -#: ref-filter.c:583

5351 +#: ref-filter.c:586

5352 #, c-format

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

5354 msgstr "nom de champ inconnu : %.*s"

5355

5325 -#: ref-filter.c:587

5356 +#: ref-filter.c:590

5357 #, c-format

5358 msgid ""

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

5360 msgstr ""

5361 "pas un dépôt git, mais le champ '%.*s' nécessite l'accès aux données d'objet"

5362

5332 -#: ref-filter.c:711

5363 +#: ref-filter.c:714

5364 #, c-format

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

5366 msgstr "format : atome %%(if) utilisé sans un atome %%(then)"

5367

5337 -#: ref-filter.c:774

5368 +#: ref-filter.c:777

5369 #, c-format

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

5371 msgstr "format : atome %%(then) utilisé sans un atome %%(if)"

5372

5342 -#: ref-filter.c:776

5373 +#: ref-filter.c:779

5374 #, c-format

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

5376 msgstr "format : atome %%(then) utilisé plus d'une fois"

5377

5347 -#: ref-filter.c:778

5378 +#: ref-filter.c:781

5379 #, c-format

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

5381 msgstr "format: atome %%(then) utilisé après %%(else)"

5382

5352 -#: ref-filter.c:806

5383 +#: ref-filter.c:809

5384 #, c-format

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

5386 msgstr "format : atome %%(else) utilisé sans un atome %%(if)"

5387

5357 -#: ref-filter.c:808

5388 +#: ref-filter.c:811

5389 #, c-format

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

5391 msgstr "format : atome %%(else) utilisé sans un atome %%(then)"

5392

5362 -#: ref-filter.c:810

5393 +#: ref-filter.c:813

5394 #, c-format

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

5396 msgstr "format : atome %%(else) utilisé plus d'une fois"

5397

5367 -#: ref-filter.c:825

5398 +#: ref-filter.c:828

5399 #, c-format

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

5401 msgstr "format : atome %%(end) utilisé sans atome correspondant"

5402

5372 -#: ref-filter.c:882

5403 +#: ref-filter.c:885

5404 #, c-format

5405 msgid "malformed format string %s"

5406 msgstr "Chaîne de formatage mal formée %s"

5407

5377 -#: ref-filter.c:1485

5408 +#: ref-filter.c:1488

5409 #, c-format

5410 msgid "no branch, rebasing %s"

5411 msgstr "aucune branche, rebasage de %s"

5412

5382 -#: ref-filter.c:1488

5413 +#: ref-filter.c:1491

5414 #, c-format

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

5416 msgstr "aucune branche, rebasage de la HEAD détachée %s"

5417

5387 -#: ref-filter.c:1491

5418 +#: ref-filter.c:1494

5419 #, c-format

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

5421 msgstr "aucune branche, bisect a démarré sur %s"

5422

5392 -#: ref-filter.c:1501

5423 +#: ref-filter.c:1504

5424 msgid "no branch"

5425 msgstr "aucune branche"

5426

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

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

5428 #, c-format

5429 msgid "missing object %s for %s"

5430 msgstr "objet manquant %s pour %s"

5431

5401 -#: ref-filter.c:1547

5432 +#: ref-filter.c:1550

5433 #, c-format

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

5435 msgstr "échec de parse_object_buffer sur %s pour %s"

5436

5406 -#: ref-filter.c:1998

5437 +#: ref-filter.c:2004

5438 #, c-format

5439 msgid "malformed object at '%s'"

5440 msgstr "objet malformé à '%s'"

5441

5411 -#: ref-filter.c:2087

5442 +#: ref-filter.c:2093

5443 #, c-format

5444 msgid "ignoring ref with broken name %s"

5445 msgstr "réf avec un nom cassé %s ignoré"

5446

5416 -#: ref-filter.c:2382

5447 +#: ref-filter.c:2389

5448 #, c-format

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

5450 msgstr "format: atome %%(end) manquant"

5451

5421 -#: ref-filter.c:2482

5452 +#: ref-filter.c:2489

5453 #, c-format

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

5455 msgstr "l'option « %s » est incompatible avec --merged"

5456

5426 -#: ref-filter.c:2485

5457 +#: ref-filter.c:2492

5458 #, c-format

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

5460 msgstr "l'option « %s » est incompatible avec --no-merged"

5461

5431 -#: ref-filter.c:2495

5462 +#: ref-filter.c:2502

5463 #, c-format

5464 msgid "malformed object name %s"

5465 msgstr "nom d'objet malformé %s"

5466

5436 -#: ref-filter.c:2500

5467 +#: ref-filter.c:2507

5468 #, c-format

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

5470 msgstr "l'option '%s' doit pointer sur un commit"

5471

5441 -#: remote.c:363

5472 +#: remote.c:366

5473 #, c-format

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

5475 msgstr ""

5476 "un raccourci de configuration de distant ne peut pas commencer par '/' : %s"

5477

5447 -#: remote.c:410

5478 +#: remote.c:413

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

5480 msgstr "plus d'un receivepack fournis, utilisation du premier"

5481

5451 -#: remote.c:418

5482 +#: remote.c:421

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

5484 msgstr "plus d'un uploadpack fournis, utilisation du premier"

5485

5455 -#: remote.c:608

5486 +#: remote.c:611

5487 #, c-format

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

5489 msgstr "Impossible de récupérer à la fois %s et %s pour %s"

5490

5460 -#: remote.c:612

5491 +#: remote.c:615

5492 #, c-format

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

5494 msgstr "%s suit habituellement %s, pas %s"

5495

5465 -#: remote.c:616

5496 +#: remote.c:619

5497 #, c-format

5498 msgid "%s tracks both %s and %s"

5499 msgstr "%s suit à la fois %s et %s"

5500

5470 -#: remote.c:684

5501 +#: remote.c:687

5502 #, c-format

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

5504 msgstr "la clé '%s' du modèle n'a pas de '*'"

5505

5475 -#: remote.c:694

5506 +#: remote.c:697

5507 #, c-format

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

5509 msgstr "la valeur '%s' du modèle n'a pas de '*'"

5510

5480 -#: remote.c:1000

5511 +#: remote.c:1003

5512 #, c-format

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

5514 msgstr ""

5515 "le spécificateur de référence source %s ne correspond à aucune référence"

5516

5486 -#: remote.c:1005

5517 +#: remote.c:1008

5518 #, c-format

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

5520 msgstr ""

@@ -5493,7 +5524,7 @@ msgstr ""

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

5525 #. the <src>.

5526 #.

5496 -#: remote.c:1020

5527 +#: remote.c:1023

5528 #, c-format

5529 msgid ""

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

@@ -5517,7 +5548,7 @@ msgstr ""

5548 "Aucune n'a fonctionné, donc abandon. Veuillez spécifier une référence "

5549 "totalement qualifiée."

5550

5520 -#: remote.c:1040

5551 +#: remote.c:1043

5552 #, c-format

5553 msgid ""

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

@@ -5528,7 +5559,7 @@ msgstr ""

5559 "Souhaitiez-vous créer une nouvelle branche en poussant sur\n"

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

5561

5531 -#: remote.c:1045

5562 +#: remote.c:1048

5563 #, c-format

5564 msgid ""

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

@@ -5539,7 +5570,7 @@ msgstr ""

5570 "Souhaitiez-vous créer une nouvelle étiquette en poussant sur\n"

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

5572

5542 -#: remote.c:1050

5573 +#: remote.c:1053

5574 #, c-format

5575 msgid ""

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

@@ -5550,7 +5581,7 @@ msgstr ""

5581 "Souhaitiez-vous créer un nouvel arbre en poussant sur\n"

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

5583

5553 -#: remote.c:1055

5584 +#: remote.c:1058

5585 #, c-format

5586 msgid ""

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

@@ -5561,119 +5592,119 @@ msgstr ""

5592 "Souhaitiez-vous créer un nouveau blob en poussant sur\n"

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

5594

5564 -#: remote.c:1091

5595 +#: remote.c:1094

5596 #, c-format

5597 msgid "%s cannot be resolved to branch"

5598 msgstr "'%s' ne peut pas être résolue comme une branche"

5599

5569 -#: remote.c:1102

5600 +#: remote.c:1105

5601 #, c-format

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

5603 msgstr "suppression d '%s' impossible : la référence distante n'existe pas"

5604

5574 -#: remote.c:1114

5605 +#: remote.c:1117

5606 #, c-format

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

5608 msgstr ""

5609 "le spécificateur de référence dst %s correspond à plus d'un spécificateur de "

5610 "références"

5611

5581 -#: remote.c:1121

5612 +#: remote.c:1124

5613 #, c-format

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

5615 msgstr "le spécificateur de référence dst %s reçoit depuis plus d'une source"

5616

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

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

5618 msgid "HEAD does not point to a branch"

5619 msgstr "HEAD ne pointe pas sur une branche"

5620

5590 -#: remote.c:1633

5621 +#: remote.c:1636

5622 #, c-format

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

5624 msgstr "pas de branche '%s'"

5625

5595 -#: remote.c:1636

5626 +#: remote.c:1639

5627 #, c-format

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

5629 msgstr "aucune branche amont configurée pour la branche '%s'"

5630

5600 -#: remote.c:1642

5631 +#: remote.c:1645

5632 #, c-format

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

5634 msgstr "la branche amont '%s' n'est pas stockée comme branche de suivi"

5635

5605 -#: remote.c:1657

5636 +#: remote.c:1660

5637 #, c-format

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

5639 msgstr ""

5640 "la destination de poussée '%s' sur le serveur distant '%s' n'a pas de "

5641 "branche locale de suivi"

5642

5612 -#: remote.c:1669

5643 +#: remote.c:1672

5644 #, c-format

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

5646 msgstr "la branche '%s' n'a aucune branche distante de poussée"

5647

5617 -#: remote.c:1679

5648 +#: remote.c:1682

5649 #, c-format

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

5651 msgstr "les références de spec pour '%s' n'incluent pas '%s'"

5652

5622 -#: remote.c:1692

5653 +#: remote.c:1695

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

5655 msgstr "la poussée n'a pas de destination (push.default vaut 'nothing')"

5656

5626 -#: remote.c:1714

5657 +#: remote.c:1717

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

5659 msgstr ""

5660 "impossible de résoudre une poussée 'simple' pour une destination unique"

5661

5631 -#: remote.c:1840

5662 +#: remote.c:1843

5663 #, c-format

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

5665 msgstr "impossible de trouver la référence distante %s"

5666

5636 -#: remote.c:1853

5667 +#: remote.c:1856

5668 #, c-format

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

5670 msgstr "* Référence bizarre '%s' ignorée localement"

5671

5641 -#: remote.c:2016

5672 +#: remote.c:2019

5673 #, c-format

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

5675 msgstr "Votre branche est basée sur '%s', mais la branche amont a disparu.\n"

5676

5646 -#: remote.c:2020

5677 +#: remote.c:2023

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

5679 msgstr " (utilisez \"git branch --unset-upstream\" pour corriger)\n"

5680

5650 -#: remote.c:2023

5681 +#: remote.c:2026

5682 #, c-format

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

5684 msgstr "Votre branche est à jour avec '%s'.\n"

5685

5655 -#: remote.c:2027

5686 +#: remote.c:2030

5687 #, c-format

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

5689 msgstr "Votre branche et '%s' font référence à des commits différents.\n"

5690

5660 -#: remote.c:2030

5691 +#: remote.c:2033

5692 #, c-format

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

5694 msgstr " (utilisez \"%s\" pour plus de détails)\n"

5695

5665 -#: remote.c:2034

5696 +#: remote.c:2037

5697 #, c-format

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

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

5700 msgstr[0] "Votre branche est en avance sur '%s' de %d commit.\n"

5701 msgstr[1] "Votre branche est en avance sur '%s' de %d commits.\n"

5702

5672 -#: remote.c:2040

5703 +#: remote.c:2043

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

5705 msgstr " (utilisez \"git push\" pour publier vos commits locaux)\n"

5706

5676 -#: remote.c:2043

5707 +#: remote.c:2046

5708 #, c-format

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

5710 msgid_plural ""

@@ -5685,11 +5716,11 @@ msgstr[1] ""

5716 "Votre branche est en retard sur '%s' de %d commits, et peut être mise à jour "

5717 "en avance rapide.\n"

5718

5688 -#: remote.c:2051

5719 +#: remote.c:2054

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

5721 msgstr " (utilisez \"git pull\" pour mettre à jour votre branche locale)\n"

5722

5692 -#: remote.c:2054

5723 +#: remote.c:2057

5724 #, c-format

5725 msgid ""

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

@@ -5704,12 +5735,12 @@ msgstr[1] ""

5735 "Votre branche et '%s' ont divergé,\n"

5736 "et ont %d et %d commits différents chacune respectivement.\n"

5737

5707 -#: remote.c:2064

5738 +#: remote.c:2067

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

5740 msgstr ""

5741 " (utilisez \"git pull\" pour fusionner la branche distante dans la vôtre)\n"

5742

5712 -#: remote.c:2247

5743 +#: remote.c:2250

5744 #, c-format

5745 msgid "cannot parse expected object name '%s'"

5746 msgstr "impossible d'analyser le nom attendu d'objet '%s'"

@@ -5787,7 +5818,7 @@ msgstr "impossible de délier '%s' qui est errant"

5818 msgid "Recorded preimage for '%s'"

5819 msgstr "Pré-image enregistrée pour '%s'"

5820

5790 -#: rerere.c:881 submodule.c:2023 builtin/log.c:1773

5821 +#: rerere.c:881 submodule.c:2023 builtin/log.c:1790

5822 #: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428

5823 #, c-format

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

@@ -5822,20 +5853,20 @@ msgstr "Résolution pour '%s' oubliée\n"

5853 msgid "unable to open rr-cache directory"

5854 msgstr "impossible d'ouvrir le répertoire rr-cache"

5855

5825 -#: revision.c:2507

5856 +#: revision.c:2509

5857 msgid "your current branch appears to be broken"

5858 msgstr "votre branche actuelle semble cassée"

5859

5829 -#: revision.c:2510

5860 +#: revision.c:2512

5861 #, c-format

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

5863 msgstr "votre branche actuelle '%s' ne contient encore aucun commit"

5864

5834 -#: revision.c:2710

5865 +#: revision.c:2720

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

5867 msgstr "--first-parent est incompatible avec --bisect"

5868

5838 -#: revision.c:2714

5869 +#: revision.c:2724

5870 msgid "-L does not yet support diff formats besides -p and -s"

5871 msgstr "-L ne supporte pas encore les formats de diff autres que -p et -s"

5872

@@ -5858,31 +5889,31 @@ msgstr ""

5889 "Vous pouvez désactiver cet avertissement avec `git config advice.ignoredHook "

5890 "false`."

5891

5861 -#: send-pack.c:141

5892 +#: send-pack.c:142

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

5894 msgstr ""

5895 "paquet de nettoyage inattendu pendant la lecture de l'état de dépaquetage "

5896 "distant"

5897

5867 -#: send-pack.c:143

5898 +#: send-pack.c:144

5899 #, c-format

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

5901 msgstr "impossible d'analyser l'état de dépaquetage distant : %s"

5902

5872 -#: send-pack.c:145

5903 +#: send-pack.c:146

5904 #, c-format

5905 msgid "remote unpack failed: %s"

5906 msgstr "le dépaquetage a échoué : %s"

5907

5877 -#: send-pack.c:306

5908 +#: send-pack.c:307

5909 msgid "failed to sign the push certificate"

5910 msgstr "impossible de signer le certificat de poussée"

5911

5881 -#: send-pack.c:420

5912 +#: send-pack.c:421

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

5914 msgstr "Le receveur ne gère pas les poussées avec --signed"

5915

5885 -#: send-pack.c:422

5916 +#: send-pack.c:423

5917 msgid ""

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

5919 "signed push"

@@ -5890,11 +5921,11 @@ msgstr ""

5921 "pas d'envoi de certificat de poussée car le receveur ne gère pas les "

5922 "poussées avec --signed"

5923

5893 -#: send-pack.c:434

5924 +#: send-pack.c:435

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

5926 msgstr "Le receveur ne gère pas les poussées avec --atomic"

5927

5897 -#: send-pack.c:439

5928 +#: send-pack.c:440

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

5930 msgstr "Le receveur ne gère pas les options de poussées"

5931

@@ -5908,7 +5939,7 @@ msgstr "mode de nettoyage invalide de message de validation '%s'"

5939 msgid "could not delete '%s'"

5940 msgstr "Impossible de supprimer '%s'"

5941

5911 -#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369

5942 +#: sequencer.c:311 builtin/rebase.c:760 builtin/rebase.c:1676 builtin/rm.c:369

5943 #, c-format

5944 msgid "could not remove '%s'"

5945 msgstr "impossible de supprimer '%s'"

@@ -5948,7 +5979,7 @@ msgstr ""

5979 "avec 'git add <chemins>' ou 'git rm <chemins>'\n"

5980 "puis validez le résultat avec 'git commit'"

5981

5951 -#: sequencer.c:401 sequencer.c:2909

5982 +#: sequencer.c:401 sequencer.c:2847

5983 #, c-format

5984 msgid "could not lock '%s'"

5985 msgstr "impossible de verrouiller '%s'"

@@ -5958,15 +5989,15 @@ msgstr "impossible de verrouiller '%s'"

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

5990 msgstr "impossible d'écrire la fin de ligne dans '%s'"

5991

5961 -#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929

5962 -#: sequencer.c:3192

5992 +#: sequencer.c:413 sequencer.c:2652 sequencer.c:2853 sequencer.c:2867

5993 +#: sequencer.c:3130

5994 #, c-format

5995 msgid "failed to finalize '%s'"

5996 msgstr "échec lors de la finalisation de '%s'"

5997

5967 -#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734

5968 -#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763

5969 -#: builtin/merge.c:1112 builtin/rebase.c:567

5998 +#: sequencer.c:436 sequencer.c:1585 sequencer.c:2672 sequencer.c:3112

5999 +#: sequencer.c:3221 builtin/am.c:244 builtin/commit.c:763 builtin/merge.c:1117

6000 +#: builtin/rebase.c:568

6001 #, c-format

6002 msgid "could not read '%s'"

6003 msgstr "impossible de lire '%s'"

@@ -5993,70 +6024,65 @@ msgstr "Mode de nettoyage invalide %s"

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

6025 #. "rebase -i".

6026 #.

5996 -#: sequencer.c:632

6027 +#: sequencer.c:631

6028 #, c-format

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

6030 msgstr "%s: Impossible d'écrire le nouveau fichier index"

6031

6001 -#: sequencer.c:649

6032 +#: sequencer.c:648

6033 msgid "unable to update cache tree"

6034 msgstr "impossible de mettre à jour l'arbre de cache"

6035

6005 -#: sequencer.c:663

6036 +#: sequencer.c:662

6037 msgid "could not resolve HEAD commit"

6038 msgstr "impossible de résoudre le commit HEAD"

6039

6009 -#: sequencer.c:743

6040 +#: sequencer.c:742

6041 #, c-format

6042 msgid "no key present in '%.*s'"

6043 msgstr "aucune clé présente dans '%.*s'"

6044

6014 -#: sequencer.c:754

6045 +#: sequencer.c:753

6046 #, c-format

6047 msgid "unable to dequote value of '%s'"

6048 msgstr "Impossible de décoter la valeur de '%s'"

6049

6019 -#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706

6020 -#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045

6050 +#: sequencer.c:790 wrapper.c:190 wrapper.c:360 builtin/am.c:705

6051 +#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1046

6052 #, c-format

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

6054 msgstr "impossible d'ouvrir '%s' en lecture"

6055

6025 -#: sequencer.c:801

6056 +#: sequencer.c:800

6057 msgid "'GIT_AUTHOR_NAME' already given"

6058 msgstr "'GIT_AUTHOR_NAME' déjà fourni"

6059

6029 -#: sequencer.c:806

6060 +#: sequencer.c:805

6061 msgid "'GIT_AUTHOR_EMAIL' already given"

6062 msgstr "'GIT_AUTHOR_EMAIL' déjà fourni"

6063

6033 -#: sequencer.c:811

6064 +#: sequencer.c:810

6065 msgid "'GIT_AUTHOR_DATE' already given"

6066 msgstr "'GIT_AUTHOR_DATE' déjà fourni"

6067

6037 -#: sequencer.c:815

6068 +#: sequencer.c:814

6069 #, c-format

6070 msgid "unknown variable '%s'"

6071 msgstr "variable inconnue '%s'"

6072

6042 -#: sequencer.c:820

6073 +#: sequencer.c:819

6074 msgid "missing 'GIT_AUTHOR_NAME'"

6075 msgstr "'GIT_AUTHOR_NAME' manquant"

6076

6046 -#: sequencer.c:822

6077 +#: sequencer.c:821

6078 msgid "missing 'GIT_AUTHOR_EMAIL'"

6079 msgstr "'GIT_AUTHOR_EMAIL' manquant"

6080

6050 -#: sequencer.c:824

6081 +#: sequencer.c:823

6082 msgid "missing 'GIT_AUTHOR_DATE'"

6083 msgstr "'GIT_AUTHOR_DATE' manquant"

6084

6054 -#: sequencer.c:884

6055 -#, c-format

6056 -msgid "invalid date format '%s' in '%s'"

6057 -msgstr "format de date invalide '%s' dans '%s'"

6058 -

6059 -#: sequencer.c:901

6085 +#: sequencer.c:872

6086 #, c-format

6087 msgid ""

6088 "you have staged changes in your working tree\n"

@@ -6085,15 +6111,11 @@ msgstr ""

6111 "\n"

6112 " git rebase --continue\n"

6113

6088 -#: sequencer.c:995

6089 -msgid "writing root commit"

6090 -msgstr "écriture du commit racine"

6091 -

6092 -#: sequencer.c:1216

6114 +#: sequencer.c:1146

6115 msgid "'prepare-commit-msg' hook failed"

6116 msgstr "échec du crochet 'prepare-commit-msg'"

6117

6096 -#: sequencer.c:1223

6118 +#: sequencer.c:1153

6119 msgid ""

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

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

@@ -6122,7 +6144,7 @@ msgstr ""

6144 "\n"

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

6146

6125 -#: sequencer.c:1236

6147 +#: sequencer.c:1166

6148 msgid ""

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

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

@@ -6148,326 +6170,326 @@ msgstr ""

6170 "\n"

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

6172

6151 -#: sequencer.c:1278

6173 +#: sequencer.c:1208

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

6175 msgstr "impossible de retrouver le commit nouvellement créé"

6176

6155 -#: sequencer.c:1280

6177 +#: sequencer.c:1210

6178 msgid "could not parse newly created commit"

6179 msgstr "impossible d'analyser le commit nouvellement créé"

6180

6159 -#: sequencer.c:1326

6181 +#: sequencer.c:1256

6182 msgid "unable to resolve HEAD after creating commit"

6183 msgstr "impossible de résoudre HEAD après création du commit"

6184

6163 -#: sequencer.c:1328

6185 +#: sequencer.c:1258

6186 msgid "detached HEAD"

6187 msgstr "HEAD détachée"

6188

6167 -#: sequencer.c:1332

6189 +#: sequencer.c:1262

6190 msgid " (root-commit)"

6191 msgstr " (commit racine)"

6192

6171 -#: sequencer.c:1353

6193 +#: sequencer.c:1283

6194 msgid "could not parse HEAD"

6195 msgstr "impossible de lire HEAD"

6196

6175 -#: sequencer.c:1355

6197 +#: sequencer.c:1285

6198 #, c-format

6199 msgid "HEAD %s is not a commit!"

6200 msgstr "HEAD %s n'est pas un commit !"

6201

6180 -#: sequencer.c:1359 builtin/commit.c:1571

6202 +#: sequencer.c:1289 builtin/commit.c:1571

6203 msgid "could not parse HEAD commit"

6204 msgstr "impossible d'analyser le commit HEAD"

6205

6184 -#: sequencer.c:1411 sequencer.c:2004

6206 +#: sequencer.c:1341 sequencer.c:1933

6207 msgid "unable to parse commit author"

6208 msgstr "impossible d'analyser l'auteur du commit"

6209

6188 -#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684

6210 +#: sequencer.c:1352 builtin/am.c:1561 builtin/merge.c:684

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

6212 msgstr "git write-tree a échoué à écrire un arbre"

6213

6192 -#: sequencer.c:1438 sequencer.c:1499

6214 +#: sequencer.c:1369 sequencer.c:1429

6215 #, c-format

6216 msgid "unable to read commit message from '%s'"

6217 msgstr "impossible de lire le message de validation de '%s'"

6218

6197 -#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878

6198 -#: builtin/merge.c:903

6219 +#: sequencer.c:1396 builtin/am.c:1583 builtin/commit.c:1670 builtin/merge.c:883

6220 +#: builtin/merge.c:908

6221 msgid "failed to write commit object"

6222 msgstr "échec de l'écriture de l'objet commit"

6223

6202 -#: sequencer.c:1526

6224 +#: sequencer.c:1456

6225 #, c-format

6226 msgid "could not parse commit %s"

6227 msgstr "impossible d'analyser le commit %s"

6228

6207 -#: sequencer.c:1531

6229 +#: sequencer.c:1461

6230 #, c-format

6231 msgid "could not parse parent commit %s"

6232 msgstr "impossible d'analyser le commit parent %s"

6233

6212 -#: sequencer.c:1605 sequencer.c:1715

6234 +#: sequencer.c:1535 sequencer.c:1645

6235 #, c-format

6236 msgid "unknown command: %d"

6237 msgstr "commande inconnue : %d"

6238

6217 -#: sequencer.c:1662 sequencer.c:1687

6239 +#: sequencer.c:1592 sequencer.c:1617

6240 #, c-format

6241 msgid "This is a combination of %d commits."

6242 msgstr "Ceci est la combinaison de %d commits."

6243

6222 -#: sequencer.c:1672

6244 +#: sequencer.c:1602

6245 msgid "need a HEAD to fixup"

6246 msgstr "une HEAD est nécessaire à la correction"

6247

6226 -#: sequencer.c:1674 sequencer.c:3219

6248 +#: sequencer.c:1604 sequencer.c:3157

6249 msgid "could not read HEAD"

6250 msgstr "Impossible de lire HEAD"

6251

6230 -#: sequencer.c:1676

6252 +#: sequencer.c:1606

6253 msgid "could not read HEAD's commit message"

6254 msgstr "impossible de lire le message de validation de HEAD"

6255

6234 -#: sequencer.c:1682

6256 +#: sequencer.c:1612

6257 #, c-format

6258 msgid "cannot write '%s'"

6259 msgstr "impossible d'écrire '%s'"

6260

6239 -#: sequencer.c:1689 git-rebase--preserve-merges.sh:496

6261 +#: sequencer.c:1619 git-rebase--preserve-merges.sh:496

6262 msgid "This is the 1st commit message:"

6263 msgstr "Ceci est le premier message de validation :"

6264

6243 -#: sequencer.c:1697

6265 +#: sequencer.c:1627

6266 #, c-format

6267 msgid "could not read commit message of %s"

6268 msgstr "impossible de lire le message de validation de %s"

6269

6248 -#: sequencer.c:1704

6270 +#: sequencer.c:1634

6271 #, c-format

6272 msgid "This is the commit message #%d:"

6273 msgstr "Ceci est le message de validation numéro %d :"

6274

6253 -#: sequencer.c:1710

6275 +#: sequencer.c:1640

6276 #, c-format

6277 msgid "The commit message #%d will be skipped:"

6278 msgstr "Le message de validation %d sera ignoré :"

6279

6258 -#: sequencer.c:1798

6280 +#: sequencer.c:1728

6281 msgid "your index file is unmerged."

6282 msgstr "votre fichier d'index n'est pas fusionné."

6283

6262 -#: sequencer.c:1805

6284 +#: sequencer.c:1735

6285 msgid "cannot fixup root commit"

6286 msgstr "impossible de réparer le commit racine"

6287

6266 -#: sequencer.c:1824

6288 +#: sequencer.c:1754

6289 #, c-format

6290 msgid "commit %s is a merge but no -m option was given."

6291 msgstr "le commit %s est une fusion mais l'option -m n'a pas été spécifiée."

6292

6271 -#: sequencer.c:1832 sequencer.c:1840

6293 +#: sequencer.c:1762 sequencer.c:1770

6294 #, c-format

6295 msgid "commit %s does not have parent %d"

6296 msgstr "le commit %s n'a pas de parent %d"

6297

6276 -#: sequencer.c:1846

6298 +#: sequencer.c:1776

6299 #, c-format

6300 msgid "cannot get commit message for %s"

6301 msgstr "impossible d'obtenir un message de validation pour %s"

6302

6303 #. TRANSLATORS: The first %s will be a "todo" command like

6304 #. "revert" or "pick", the second %s a SHA1.

6283 -#: sequencer.c:1865

6305 +#: sequencer.c:1795

6306 #, c-format

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

6308 msgstr "%s : impossible d'analyser le commit parent %s"

6309

6288 -#: sequencer.c:1930

6310 +#: sequencer.c:1860

6311 #, c-format

6312 msgid "could not rename '%s' to '%s'"

6313 msgstr "impossible de renommer '%s' en '%s'"

6314

6293 -#: sequencer.c:1985

6315 +#: sequencer.c:1915

6316 #, c-format

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

6318 msgstr "impossible d'annuler %s... %s"

6319

6298 -#: sequencer.c:1986

6320 +#: sequencer.c:1916

6321 #, c-format

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

6323 msgstr "impossible d'appliquer %s... %s"

6324

6303 -#: sequencer.c:2045

6325 +#: sequencer.c:1983

6326 #, c-format

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

6328 msgstr "git %s : échec à la lecture de l'index"

6329

6308 -#: sequencer.c:2052

6330 +#: sequencer.c:1990

6331 #, c-format

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

6333 msgstr "git %s : échec du rafraîchissement de l'index"

6334

6313 -#: sequencer.c:2128

6335 +#: sequencer.c:2066

6336 #, c-format

6337 msgid "%s does not accept arguments: '%s'"

6338 msgstr "%s n'accepte pas d'argument : '%s'"

6339

6318 -#: sequencer.c:2137

6340 +#: sequencer.c:2075

6341 #, c-format

6342 msgid "missing arguments for %s"

6343 msgstr "argument manquant pour %s"

6344

6323 -#: sequencer.c:2174

6345 +#: sequencer.c:2112

6346 #, c-format

6347 msgid "could not parse '%.*s'"

6348 msgstr "impossible d'analyser '%.*s'"

6349

6328 -#: sequencer.c:2228

6350 +#: sequencer.c:2166

6351 #, c-format

6352 msgid "invalid line %d: %.*s"

6353 msgstr "ligne %d invalide : %.*s"

6354

6333 -#: sequencer.c:2239

6355 +#: sequencer.c:2177

6356 #, c-format

6357 msgid "cannot '%s' without a previous commit"

6358 msgstr "'%s' impossible avec le commit précédent"

6359

6338 -#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178

6360 +#: sequencer.c:2225 builtin/rebase.c:153 builtin/rebase.c:178

6361 #: builtin/rebase.c:204 builtin/rebase.c:229

6362 #, c-format

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

6364 msgstr "impossible de lire '%s'."

6365

6344 -#: sequencer.c:2323

6366 +#: sequencer.c:2261

l10n: fr 2.24.0 rnd 1