f7fbc357f8 · matheusbsbs/matheus-bagliano

@@ -73,8 +73,8 @@ msgid ""

73 msgstr ""

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

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

76 -"POT-Creation-Date: 2014-04-19 12:50+0800\n"

77 -"PO-Revision-Date: 2014-04-22 21:28+0200\n"

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

77 +"PO-Revision-Date: 2014-08-05 19:23+0200\n"

78 "Last-Translator: Jean-Noël Avila <jn.avila@free.fr>\n"

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

80 "Language: fr\n"

@@ -88,15 +88,14 @@ msgstr ""

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

89 msgstr "astuce: %.*s\n"

90

91 -#: advice.c:85

91 +#: advice.c:88

92 msgid ""

93 -"Fix them up in the work tree,\n"

94 -"and then use 'git add/rm <file>' as\n"

95 -"appropriate to mark resolution and make a commit,\n"

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

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

94 +"as appropriate to mark resolution and make a commit, or use\n"

95 +"'git commit -a'."

96 msgstr ""

97 "Corrigez-les dans la copie de travail,\n"

99 -"et utilisez 'git add/rm <fichier>' si\n"

98 +"puis utilisez 'git add/rm <fichier>' si\n"

99 "nécessaire pour marquer la résolution et valider,\n"

100 "ou utilisez 'git commit -a'."

101

@@ -119,7 +118,7 @@ msgstr ""

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

119 msgstr "git archive --remote <dépôt> [--exec <commande>] --list"

120

122 -#: archive.c:243 builtin/add.c:136 builtin/add.c:428 builtin/rm.c:328

121 +#: archive.c:243 builtin/add.c:136 builtin/add.c:427 builtin/rm.c:328

122 #, c-format

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

124 msgstr "le chemin '%s' ne correspond à aucun fichier"

@@ -132,7 +131,7 @@ msgstr "fmt"

131 msgid "archive format"

132 msgstr "format d'archive"

133

135 -#: archive.c:329 builtin/log.c:1193

134 +#: archive.c:329 builtin/log.c:1201

135 msgid "prefix"

136 msgstr "préfixe"

137

@@ -140,9 +139,9 @@ msgstr "préfixe"

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

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

141

143 -#: archive.c:331 builtin/archive.c:88 builtin/blame.c:2258

144 -#: builtin/blame.c:2259 builtin/config.c:57 builtin/fast-export.c:680

145 -#: builtin/fast-export.c:682 builtin/grep.c:714 builtin/hash-object.c:77

142 +#: archive.c:331 builtin/archive.c:88 builtin/blame.c:2517

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

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

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

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

147 msgid "file"

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

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

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

337

339 -#: bundle.c:86 builtin/commit.c:706

338 +#: bundle.c:86 builtin/commit.c:755

339 #, c-format

340 msgid "could not open '%s'"

341 msgstr "impossible d'ouvrir '%s'"

@@ -345,8 +344,8 @@ msgstr "impossible d'ouvrir '%s'"

344 msgid "Repository lacks these prerequisite commits:"

345 msgstr "Le dépôt ne dispose pas des commits prérequis suivants :"

346

348 -#: bundle.c:162 sequencer.c:669 sequencer.c:1123 builtin/log.c:332

349 -#: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:357

347 +#: bundle.c:162 sequencer.c:630 sequencer.c:1085 builtin/log.c:330

348 +#: builtin/log.c:821 builtin/log.c:1428 builtin/log.c:1665 builtin/merge.c:357

349 #: builtin/shortlog.c:158

350 msgid "revision walk setup failed"

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

@@ -369,47 +368,47 @@ msgid_plural "The bundle requires these %d refs:"

368 msgstr[0] "Le colis exige cette référence :"

369 msgstr[1] "Le colis exige ces %d références :"

370

372 -#: bundle.c:293

371 +#: bundle.c:289

372 msgid "rev-list died"

373 msgstr "rev-list a disparu"

374

376 -#: bundle.c:299 builtin/log.c:1329 builtin/shortlog.c:261

375 +#: bundle.c:295 builtin/log.c:1339 builtin/shortlog.c:261

376 #, c-format

377 msgid "unrecognized argument: %s"

378 msgstr "argument non reconnu : %s"

379

381 -#: bundle.c:334

380 +#: bundle.c:330

381 #, c-format

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

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

384

386 -#: bundle.c:379

385 +#: bundle.c:375

386 msgid "Refusing to create empty bundle."

387 msgstr "Refus de créer un colis vide."

388

390 -#: bundle.c:395

389 +#: bundle.c:390

390 msgid "Could not spawn pack-objects"

391 msgstr "Impossible de créer des objets groupés"

392

394 -#: bundle.c:413

393 +#: bundle.c:408

394 msgid "pack-objects died"

395 msgstr "les objets groupés ont disparu"

396

398 -#: bundle.c:416

397 +#: bundle.c:411

398 #, c-format

399 msgid "cannot create '%s'"

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

401

403 -#: bundle.c:438

402 +#: bundle.c:433

403 msgid "index-pack died"

404 msgstr "l'index de groupe a disparu"

405

407 -#: commit.c:54

406 +#: commit.c:40

407 #, c-format

408 msgid "could not parse %s"

409 msgstr "impossible d'analyser %s"

410

412 -#: commit.c:56

411 +#: commit.c:42

412 #, c-format

413 msgid "%s %s is not a commit!"

414 msgstr "%s %s n'est pas un commit !"

@@ -505,28 +504,28 @@ msgstr[1] "il y a %lu ans"

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

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

506

508 -#: diffcore-rename.c:517

507 +#: diffcore-rename.c:514

508 msgid "Performing inexact rename detection"

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

510

512 -#: diff.c:113

511 +#: diff.c:114

512 #, c-format

513 msgid " Failed to parse dirstat cut-off percentage '%s'\n"

514 msgstr ""

515 " Impossible d'analyser le pourcentage de modification de dirstat '%s'\n"

516

518 -#: diff.c:118

517 +#: diff.c:119

518 #, c-format

519 msgid " Unknown dirstat parameter '%s'\n"

520 msgstr " Paramètre dirstat inconnu '%s'\n"

521

523 -#: diff.c:213

522 +#: diff.c:214

523 #, c-format

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

525 msgstr ""

526 "Valeur inconnue pour la variable de configuration 'diff.submodule' : '%s'"

527

529 -#: diff.c:263

528 +#: diff.c:267

529 #, c-format

530 msgid ""

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

@@ -535,7 +534,16 @@ msgstr ""

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

535 "%s"

536

538 -#: diff.c:3495

537 +#: diff.c:2934

538 +#, c-format

539 +msgid "external diff died, stopping at %s"

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

541 +

542 +#: diff.c:3329

543 +msgid "--follow requires exactly one pathspec"

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

545 +

546 +#: diff.c:3492

547 #, c-format

548 msgid ""

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

@@ -544,58 +552,58 @@ msgstr ""

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

553 "%s"

554

547 -#: diff.c:3509

555 +#: diff.c:3506

556 #, c-format

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

558 msgstr "Impossible d'analyser le paramètre de l'option --submodule : '%s'"

559

552 -#: gpg-interface.c:59 gpg-interface.c:131

560 +#: gpg-interface.c:73 gpg-interface.c:145

561 msgid "could not run gpg."

562 msgstr "impossible de lancer gpg."

563

556 -#: gpg-interface.c:71

564 +#: gpg-interface.c:85

565 msgid "gpg did not accept the data"

566 msgstr "gpg n'a pas accepté les données"

567

560 -#: gpg-interface.c:82

568 +#: gpg-interface.c:96

569 msgid "gpg failed to sign the data"

570 msgstr "gpg n'a pas pu signer les données"

571

564 -#: gpg-interface.c:115

572 +#: gpg-interface.c:129

573 #, c-format

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

575 msgstr "impossible de créer un fichier temporaire '%s' : %s"

576

569 -#: gpg-interface.c:118

577 +#: gpg-interface.c:132

578 #, c-format

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

580 msgstr "impossible d'écrire la signature détachée dans '%s' : %s"

581

574 -#: grep.c:1698

582 +#: grep.c:1703

583 #, c-format

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

585 msgstr "'%s' : lecture de %s impossible"

586

579 -#: grep.c:1715

587 +#: grep.c:1720

588 #, c-format

589 msgid "'%s': %s"

590 msgstr "'%s' : %s"

591

584 -#: grep.c:1726

592 +#: grep.c:1731

593 #, c-format

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

595 msgstr "'%s' : lecture tronquée %s"

596

589 -#: help.c:209

597 +#: help.c:207

598 #, c-format

599 msgid "available git commands in '%s'"

600 msgstr "commandes git disponibles dans '%s'"

601

594 -#: help.c:216

602 +#: help.c:214

603 msgid "git commands available from elsewhere on your $PATH"

604 msgstr "commandes git disponibles depuis un autre endroit de votre $PATH"

605

598 -#: help.c:232

606 +#: help.c:230

607 msgid "The most commonly used git commands are:"

608 msgstr "Les commandes git les plus utilisées sont :"

609

@@ -632,7 +640,7 @@ msgstr "dans %0.1f secondes automatiquement..."

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

641 msgstr "git : '%s' n'est pas une commande git. Voir 'git --help'."

642

635 -#: help.c:384 help.c:443

643 +#: help.c:384 help.c:444

644 msgid ""

645 "\n"

646 "Did you mean this?"

@@ -646,16 +654,16 @@ msgstr[1] ""

654 "\n"

655 "Vouliez-vous dire un de ceux-là ?"

656

649 -#: help.c:439

657 +#: help.c:440

658 #, c-format

659 msgid "%s: %s - %s"

660 msgstr "%s: %s - %s"

661

654 -#: merge.c:56

662 +#: merge.c:40

663 msgid "failed to read the cache"

664 msgstr "impossible de lire le cache"

665

658 -#: merge.c:110 builtin/checkout.c:357 builtin/checkout.c:558

666 +#: merge.c:93 builtin/checkout.c:356 builtin/checkout.c:556

667 #: builtin/clone.c:661

668 msgid "unable to write new index file"

669 msgstr "impossible d'écrire le nouveau fichier d'index"

@@ -665,7 +673,7 @@ msgstr "impossible d'écrire le nouveau fichier d'index"

673 msgid "(bad commit)\n"

674 msgstr "(mauvais commit)\n"

675

668 -#: merge-recursive.c:208

676 +#: merge-recursive.c:210

677 #, c-format

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

679 msgstr "échec de addinfo_cache pour le chemin '%s'"

@@ -674,64 +682,64 @@ msgstr "échec de addinfo_cache pour le chemin '%s'"

682 msgid "error building trees"

683 msgstr "erreur de construction des arbres"

684

677 -#: merge-recursive.c:675

685 +#: merge-recursive.c:692

686 #, c-format

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

688 msgstr "impossible de créer le chemin '%s' %s"

689

682 -#: merge-recursive.c:686

690 +#: merge-recursive.c:703

691 #, c-format

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

693 msgstr "Suppression de %s pour faire de la place pour le sous-répertoire\n"

694

687 -#: merge-recursive.c:700 merge-recursive.c:721

695 +#: merge-recursive.c:717 merge-recursive.c:738

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

697 msgstr ": peut-être un conflit D/F ?"

698

691 -#: merge-recursive.c:711

699 +#: merge-recursive.c:728

700 #, c-format

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

702 msgstr "refus de perdre le fichier non suivi '%s'"

703

696 -#: merge-recursive.c:751

704 +#: merge-recursive.c:768

705 #, c-format

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

707 msgstr "impossible de lire l'objet %s '%s'"

708

701 -#: merge-recursive.c:753

709 +#: merge-recursive.c:770

710 #, c-format

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

712 msgstr "blob attendu pour %s '%s'"

713

706 -#: merge-recursive.c:776 builtin/clone.c:317

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

715 #, c-format

716 msgid "failed to open '%s'"

717 msgstr "échec à l'ouverture de '%s'"

718

711 -#: merge-recursive.c:784

719 +#: merge-recursive.c:801

720 #, c-format

721 msgid "failed to symlink '%s'"

722 msgstr "échec à la création du lien symbolique '%s'"

723

716 -#: merge-recursive.c:787

724 +#: merge-recursive.c:804

725 #, c-format

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

727 msgstr "ne sait pas traiter %06o %s '%s'"

728

721 -#: merge-recursive.c:925

729 +#: merge-recursive.c:942

730 msgid "Failed to execute internal merge"

731 msgstr "Échec à l'exécution de la fusion interne"

732

725 -#: merge-recursive.c:929

733 +#: merge-recursive.c:946

734 #, c-format

735 msgid "Unable to add %s to database"

736 msgstr "Impossible d'ajouter %s à la base de données"

737

730 -#: merge-recursive.c:945

738 +#: merge-recursive.c:962

739 msgid "unsupported object type in the tree"

740 msgstr "type d'objet non supporté dans l'arbre"

741

734 -#: merge-recursive.c:1024 merge-recursive.c:1038

742 +#: merge-recursive.c:1037 merge-recursive.c:1051

743 #, c-format

744 msgid ""

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

@@ -740,7 +748,7 @@ msgstr ""

748 "CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de "

749 "%s laissée dans l'arbre."

750

743 -#: merge-recursive.c:1030 merge-recursive.c:1043

751 +#: merge-recursive.c:1043 merge-recursive.c:1056

752 #, c-format

753 msgid ""

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

@@ -749,20 +757,20 @@ msgstr ""

757 "CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de "

758 "%s laissée dans l'arbre dans le fichier %s."

759

752 -#: merge-recursive.c:1084

760 +#: merge-recursive.c:1097

761 msgid "rename"

762 msgstr "renommage"

763

756 -#: merge-recursive.c:1084

764 +#: merge-recursive.c:1097

765 msgid "renamed"

766 msgstr "renommé"

767

760 -#: merge-recursive.c:1140

768 +#: merge-recursive.c:1153

769 #, c-format

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

771 msgstr "%s est un répertoire dans %s ajouté plutôt comme %s"

772

765 -#: merge-recursive.c:1162

773 +#: merge-recursive.c:1175

774 #, c-format

775 msgid ""

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

@@ -771,197 +779,197 @@ msgstr ""

779 "CONFLIT (renommage/renommage) : Renommage de \"%s\"->\"%s\" dans la branche "

780 "\"%s\" et renommage \"%s\"->\"%s\" dans \"%s\"%s"

781

774 -#: merge-recursive.c:1167

782 +#: merge-recursive.c:1180

783 msgid " (left unresolved)"

784 msgstr " (laissé non résolu)"

785

778 -#: merge-recursive.c:1221

786 +#: merge-recursive.c:1234

787 #, c-format

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

789 msgstr ""

790 "CONFLIT (renommage/renommage) : renommage '%s'->'%s' dans %s. Renommage '%s'-"

791 ">'%s' dans %s"

792

785 -#: merge-recursive.c:1251

793 +#: merge-recursive.c:1264

794 #, c-format

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

796 msgstr "Renommage de %s en %s et de %s en %s à la place"

797

790 -#: merge-recursive.c:1450

798 +#: merge-recursive.c:1463

799 #, c-format

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

801 msgstr ""

802 "CONFLIT (renommage/ajout) : Renommage de %s->%s dans %s. %s ajouté dans %s"

803

796 -#: merge-recursive.c:1460

804 +#: merge-recursive.c:1473

805 #, c-format

806 msgid "Adding merged %s"

807 msgstr "Ajout de %s fusionné"

808

801 -#: merge-recursive.c:1465 merge-recursive.c:1663

809 +#: merge-recursive.c:1478 merge-recursive.c:1676

810 #, c-format

811 msgid "Adding as %s instead"

812 msgstr "Ajout plutôt comme %s"

813

806 -#: merge-recursive.c:1516

814 +#: merge-recursive.c:1529

815 #, c-format

816 msgid "cannot read object %s"

817 msgstr "impossible de lire l'objet %s"

818

811 -#: merge-recursive.c:1519

819 +#: merge-recursive.c:1532

820 #, c-format

821 msgid "object %s is not a blob"

822 msgstr "l'objet %s n'est pas un blob"

823

816 -#: merge-recursive.c:1567

824 +#: merge-recursive.c:1580

825 msgid "modify"

826 msgstr "modification"

827

820 -#: merge-recursive.c:1567

828 +#: merge-recursive.c:1580

829 msgid "modified"

830 msgstr "modifié"

831

824 -#: merge-recursive.c:1577

832 +#: merge-recursive.c:1590

833 msgid "content"

834 msgstr "contenu"

835

828 -#: merge-recursive.c:1584

836 +#: merge-recursive.c:1597

837 msgid "add/add"

838 msgstr "ajout/ajout"

839

832 -#: merge-recursive.c:1618

840 +#: merge-recursive.c:1631

841 #, c-format

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

843 msgstr "%s sauté (fusion identique à l'existant)"

844

837 -#: merge-recursive.c:1632

845 +#: merge-recursive.c:1645

846 #, c-format

847 msgid "Auto-merging %s"

848 msgstr "Fusion automatique de %s"

849

842 -#: merge-recursive.c:1636 git-submodule.sh:1149

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

851 msgid "submodule"

852 msgstr "sous-module"

853

846 -#: merge-recursive.c:1637

854 +#: merge-recursive.c:1650

855 #, c-format

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

857 msgstr "CONFLIT (%s) : Conflit de fusion dans %s"

858

851 -#: merge-recursive.c:1727

859 +#: merge-recursive.c:1740

860 #, c-format

861 msgid "Removing %s"

862 msgstr "Suppression de %s"

863

856 -#: merge-recursive.c:1752

864 +#: merge-recursive.c:1765

865 msgid "file/directory"

866 msgstr "fichier/répertoire"

867

860 -#: merge-recursive.c:1758

868 +#: merge-recursive.c:1771

869 msgid "directory/file"

870 msgstr "répertoire/fichier"

871

864 -#: merge-recursive.c:1763

872 +#: merge-recursive.c:1776

873 #, c-format

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

875 msgstr ""

876 "CONFLIT (%s) : Il y a un répertoire nommé %s dans %s. Ajout de %s comme %s"

877

870 -#: merge-recursive.c:1773

878 +#: merge-recursive.c:1786

879 #, c-format

880 msgid "Adding %s"

881 msgstr "Ajout de %s"

882

875 -#: merge-recursive.c:1790

883 +#: merge-recursive.c:1803

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

885 msgstr "Échec fatal de fusion, qui ne devrait jamais arriver."

886

879 -#: merge-recursive.c:1809

887 +#: merge-recursive.c:1822

888 msgid "Already up-to-date!"

889 msgstr "Déjà à jour !"

890

883 -#: merge-recursive.c:1818

891 +#: merge-recursive.c:1831

892 #, c-format

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

894 msgstr "échec de fusion des arbres %s et %s"

895

888 -#: merge-recursive.c:1848

896 +#: merge-recursive.c:1861

897 #, c-format

898 msgid "Unprocessed path??? %s"

899 msgstr "Chemin non traité ??? %s"

900

893 -#: merge-recursive.c:1893

901 +#: merge-recursive.c:1906

902 msgid "Merging:"

903 msgstr "Fusion :"

904

897 -#: merge-recursive.c:1906

905 +#: merge-recursive.c:1919

906 #, c-format

907 msgid "found %u common ancestor:"

908 msgid_plural "found %u common ancestors:"

909 msgstr[0] "%u ancêtre commun trouvé :"

910 msgstr[1] "%u ancêtres communs trouvés :"

911

904 -#: merge-recursive.c:1943

912 +#: merge-recursive.c:1956

913 msgid "merge returned no commit"

914 msgstr "la fusion n'a pas retourné de commit"

915

908 -#: merge-recursive.c:2000

916 +#: merge-recursive.c:2013

917 #, c-format

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

919 msgstr "Impossible d'analyser l'objet '%s'"

920

913 -#: merge-recursive.c:2012 builtin/merge.c:668

921 +#: merge-recursive.c:2024 builtin/merge.c:666

922 msgid "Unable to write index."

923 msgstr "Impossible d'écrire l'index."

924

917 -#: notes-utils.c:40

925 +#: notes-utils.c:41

926 msgid "Cannot commit uninitialized/unreferenced notes tree"

927 msgstr "Impossible de valider un arbre de notes non initialisé/référencé"

928

921 -#: notes-utils.c:81

929 +#: notes-utils.c:83

930 #, c-format

931 msgid "Bad notes.rewriteMode value: '%s'"

932 msgstr "Mauvaise valeur de notes.rewriteMode : '%s'"

933

926 -#: notes-utils.c:91

934 +#: notes-utils.c:93

935 #, c-format

936 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"

937 msgstr "Refus de réécrire des notes dans %s (hors de refs/notes/)"

938

939 #. TRANSLATORS: The first %s is the name of the

940 #. environment variable, the second %s is its value

933 -#: notes-utils.c:118

941 +#: notes-utils.c:120

942 #, c-format

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

944 msgstr "Mauvaise valeur de %s : '%s'"

945

938 -#: object.c:229

946 +#: object.c:234

947 #, c-format

948 msgid "unable to parse object: %s"

949 msgstr "impossible d'analyser l'objet : %s"

950

943 -#: parse-options.c:532

951 +#: parse-options.c:534

952 msgid "..."

953 msgstr "..."

954

947 -#: parse-options.c:550

955 +#: parse-options.c:552

956 #, c-format

957 msgid "usage: %s"

958 msgstr "usage : %s"

959

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

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

954 -#: parse-options.c:554

962 +#: parse-options.c:556

963 #, c-format

964 msgid " or: %s"

965 msgstr " ou : %s"

966

959 -#: parse-options.c:557

967 +#: parse-options.c:559

968 #, c-format

969 msgid " %s"

970 msgstr " %s"

971

964 -#: parse-options.c:591

972 +#: parse-options.c:593

973 msgid "-NUM"

974 msgstr "-NUM"

975

@@ -1020,12 +1028,12 @@ msgstr ""

1028 "%s : le spécificateur magique de chemin n'est pas supporté par cette "

1029 "commande : %s"

1030

1023 -#: pathspec.c:433

1031 +#: pathspec.c:432

1032 #, c-format

1033 msgid "pathspec '%s' is beyond a symbolic link"

1034 msgstr "le chemin '%s' est au-delà d'un lien symbolique"

1035

1028 -#: pathspec.c:442

1036 +#: pathspec.c:441

1037 msgid ""

1038 "There is nothing to exclude from by :(exclude) patterns.\n"

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

@@ -1033,11 +1041,11 @@ msgstr ""

1041 "Il n'y a rien dont il faut exclure par des motifs :(exclure).\n"

1042 "Peut-être avez-vous oublié d'ajouter ':/' ou '.' ?"

1043

1036 -#: progress.c:224

1044 +#: progress.c:225

1045 msgid "done"

1046 msgstr "fait"

1047

1040 -#: read-cache.c:1238

1048 +#: read-cache.c:1260

1049 #, c-format

1050 msgid ""

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

@@ -1046,7 +1054,7 @@ msgstr ""

1054 "version d'index renseignée, mais la valeur est invalide.\n"

1055 "Utilisation de la version %i"

1056

1049 -#: read-cache.c:1248

1057 +#: read-cache.c:1270

1058 #, c-format

1059 msgid ""

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

@@ -1055,51 +1063,51 @@ msgstr ""

1063 "GIT_INDEX_VERSION est renseigné, mais la valeur est invalide.\n"

1064 "Utilisation de la version %i"

1065

1058 -#: remote.c:758

1066 +#: remote.c:753

1067 #, c-format

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

1069 msgstr "Impossible de récupérer à la fois %s et %s pour %s"

1070

1063 -#: remote.c:762

1071 +#: remote.c:757

1072 #, c-format

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

1074 msgstr "%s suit habituellement %s, pas %s"

1075

1068 -#: remote.c:766

1076 +#: remote.c:761

1077 #, c-format

1078 msgid "%s tracks both %s and %s"

1079 msgstr "%s suit à la fois %s et %s"

1080

1073 -#: remote.c:774

1081 +#: remote.c:769

1082 msgid "Internal error"

1083 msgstr "Erreur interne"

1084

1077 -#: remote.c:1948

1085 +#: remote.c:1943

1086 #, c-format

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

1088 msgstr "Votre branche est basée sur '%s', mais la branche amont a disparu.\n"

1089

1082 -#: remote.c:1952

1090 +#: remote.c:1947

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

1092 msgstr " (utilisez \"git branch --unset-upstream\" pour corriger)\n"

1093

1086 -#: remote.c:1955

1094 +#: remote.c:1950

1095 #, c-format

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

1097 msgstr "Votre branche est à jour avec '%s'.\n"

1098

1091 -#: remote.c:1959

1099 +#: remote.c:1954

1100 #, c-format

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

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

1103 msgstr[0] "Votre branche est en avance sur '%s' de %d commit.\n"

1104 msgstr[1] "Votre branche est en avance sur '%s' de %d commits.\n"

1105

1098 -#: remote.c:1965

1106 +#: remote.c:1960

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

1108 msgstr " (utilisez \"git push\" pour publier vos commits locaux)\n"

1109

1102 -#: remote.c:1968

1110 +#: remote.c:1963

1111 #, c-format

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

1113 msgid_plural ""

@@ -1111,11 +1119,11 @@ msgstr[1] ""

1119 "Votre branche est en retard sur '%s' de %d commits, et peut être mise à jour "

1120 "en avance rapide.\n"

1121

1114 -#: remote.c:1976

1122 +#: remote.c:1971

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

1124 msgstr " (utilisez \"git pull\" pour mettre à jour votre branche locale)\n"

1125

1118 -#: remote.c:1979

1126 +#: remote.c:1974

1127 #, c-format

1128 msgid ""

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

@@ -1130,7 +1138,7 @@ msgstr[1] ""

1138 "Votre branche et '%s' ont divergé,\n"

1139 "et ont %d et %d commits différents chacune respectivement.\n"

1140

1133 -#: remote.c:1989

1141 +#: remote.c:1984

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

1143 msgstr ""

1144 " (utilisez \"git pull\" pour fusionner la branche distante dans la vôtre)\n"

@@ -1144,19 +1152,19 @@ msgstr "échec de l'ouverture de /dev/null"

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

1153 msgstr "échec de dup2(%d,%d)"

1154

1147 -#: sequencer.c:206 builtin/merge.c:786 builtin/merge.c:899

1148 -#: builtin/merge.c:1009 builtin/merge.c:1019

1155 +#: sequencer.c:171 builtin/merge.c:782 builtin/merge.c:893

1156 +#: builtin/merge.c:1003 builtin/merge.c:1013

1157 #, c-format

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

1159 msgstr "Impossible d'ouvrir '%s' en écriture"

1160

1153 -#: sequencer.c:208 builtin/merge.c:343 builtin/merge.c:789

1154 -#: builtin/merge.c:1011 builtin/merge.c:1024

1161 +#: sequencer.c:173 builtin/merge.c:343 builtin/merge.c:785

1162 +#: builtin/merge.c:1005 builtin/merge.c:1018

1163 #, c-format

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

1165 msgstr "Impossible d'écrire dans '%s'"

1166

1159 -#: sequencer.c:229

1167 +#: sequencer.c:194

1168 msgid ""

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

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

@@ -1164,7 +1172,7 @@ msgstr ""

1172 "après résolution des conflits, marquez les chemins corrigés\n"

1173 "avec 'git add <chemins>' ou 'git rm <chemins>'"

1174

1167 -#: sequencer.c:232

1175 +#: sequencer.c:197

1176 msgid ""

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

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

@@ -1174,67 +1182,71 @@ msgstr ""

1182 "avec 'git add <chemins>' ou 'git rm <chemins>'\n"

1183 "puis validez le résultat avec 'git commit'"

1184

1177 -#: sequencer.c:245 sequencer.c:879 sequencer.c:962

1185 +#: sequencer.c:210 sequencer.c:841 sequencer.c:924

1186 #, c-format

1187 msgid "Could not write to %s"

1188 msgstr "Impossible d'écrire dans %s"

1189

1182 -#: sequencer.c:248

1190 +#: sequencer.c:213

1191 #, c-format

1192 msgid "Error wrapping up %s"

1193 msgstr "Erreur à l'emballage de %s"

1194

1187 -#: sequencer.c:263

1195 +#: sequencer.c:228

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

1197 msgstr "Vos modifications locales seraient écrasées par cherry-pick."

1198

1191 -#: sequencer.c:265

1199 +#: sequencer.c:230

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

1201 msgstr "Vos modifications locales seraient écrasées par revert."

1202

1195 -#: sequencer.c:268

1203 +#: sequencer.c:233

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

1205 msgstr "Validez vos modifications ou les remiser pour continuer."

1206

1207 +#: sequencer.c:250

1208 +msgid "Failed to lock HEAD during fast_forward_to"

1209 +msgstr "Échec du verrouillage de HEAD pendant l'avance rapide"

1210 +

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

1200 -#: sequencer.c:325

1212 +#: sequencer.c:293

1213 #, c-format

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

1215 msgstr "%s: Impossible d'écrire le nouveau fichier index"

1216

1205 -#: sequencer.c:356

1217 +#: sequencer.c:324

1218 msgid "Could not resolve HEAD commit\n"

1219 msgstr "Impossible de résoudre le commit HEAD\n"

1220

1209 -#: sequencer.c:378

1221 +#: sequencer.c:344

1222 msgid "Unable to update cache tree\n"

1223 msgstr "Impossible de mettre à jour l'arbre de cache\n"

1224

1213 -#: sequencer.c:430

1225 +#: sequencer.c:391

1226 #, c-format

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

1228 msgstr "Impossible d'analyser le commit %s\n"

1229

1218 -#: sequencer.c:435

1230 +#: sequencer.c:396

1231 #, c-format

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

1233 msgstr "Impossible d'analyser le commit parent %s\n"

1234

1223 -#: sequencer.c:501

1235 +#: sequencer.c:462

1236 msgid "Your index file is unmerged."

1237 msgstr "Votre fichier d'index n'est pas fusionné."

1238

1227 -#: sequencer.c:520

1239 +#: sequencer.c:481

1240 #, c-format

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

1242 msgstr "Le commit %s est une fusion mais l'option -m n'a pas été spécifiée."

1243

1232 -#: sequencer.c:528

1244 +#: sequencer.c:489

1245 #, c-format

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

1247 msgstr "Le commit %s n'a pas le parent %d"

1248

1237 -#: sequencer.c:532

1249 +#: sequencer.c:493

1250 #, c-format

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

1252 msgstr ""

@@ -1243,153 +1255,153 @@ msgstr ""

1255

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

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

1246 -#: sequencer.c:545

1258 +#: sequencer.c:506

1259 #, c-format

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

1261 msgstr "%s : impossible d'analyser le commit parent %s"

1262

1251 -#: sequencer.c:549

1263 +#: sequencer.c:510

1264 #, c-format

1265 msgid "Cannot get commit message for %s"

1266 msgstr "Impossible d'obtenir un message de validation pour %s"

1267

1256 -#: sequencer.c:635

1268 +#: sequencer.c:596

1269 #, c-format

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

1271 msgstr "impossible d'annuler %s... %s"

1272

1261 -#: sequencer.c:636

1273 +#: sequencer.c:597

1274 #, c-format

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

1276 msgstr "impossible d'appliquer %s... %s"

1277

1266 -#: sequencer.c:672

1278 +#: sequencer.c:633

1279 msgid "empty commit set passed"

1280 msgstr "l'ensemble de commits spécifié est vide"

1281

1270 -#: sequencer.c:680

1282 +#: sequencer.c:641

1283 #, c-format

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

1285 msgstr "git %s : échec à la lecture de l'index"

1286

1275 -#: sequencer.c:685

1287 +#: sequencer.c:645

1288 #, c-format

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

1290 msgstr "git %s : échec du rafraîchissement de l'index"

1291

1280 -#: sequencer.c:743

1292 +#: sequencer.c:705

1293 #, c-format

1294 msgid "Cannot %s during a %s"

1295 msgstr "Impossible de %s pendant un %s"

1296

1285 -#: sequencer.c:765

1297 +#: sequencer.c:727

1298 #, c-format

1299 msgid "Could not parse line %d."

1300 msgstr "Impossible d'analyser la ligne %d."

1301

1290 -#: sequencer.c:770

1302 +#: sequencer.c:732

1303 msgid "No commits parsed."

1304 msgstr "Aucun commit analysé."

1305

1294 -#: sequencer.c:783

1306 +#: sequencer.c:745

1307 #, c-format

1308 msgid "Could not open %s"

1309 msgstr "Impossible d'ouvrir %s"

1310

1299 -#: sequencer.c:787

1311 +#: sequencer.c:749

1312 #, c-format

1313 msgid "Could not read %s."

1314 msgstr "Impossible de lire %s."

1315

1304 -#: sequencer.c:794

1316 +#: sequencer.c:756

1317 #, c-format

1318 msgid "Unusable instruction sheet: %s"

1319 msgstr "Feuille d'instruction inutilisable : %s"

1320

1309 -#: sequencer.c:824

1321 +#: sequencer.c:786

1322 #, c-format

1323 msgid "Invalid key: %s"

1324 msgstr "Clé invalide: %s"

1325

1314 -#: sequencer.c:827

1326 +#: sequencer.c:789

1327 #, c-format

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

1329 msgstr "Valeur invalide pour %s : %s"

1330

1319 -#: sequencer.c:839

1331 +#: sequencer.c:801

1332 #, c-format

1333 msgid "Malformed options sheet: %s"

1334 msgstr "Feuille d'options malformée : %s"

1335

1324 -#: sequencer.c:860

1336 +#: sequencer.c:822

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

1338 msgstr "un picorage ou un retour est déjà en cours"

1339

1328 -#: sequencer.c:861

1340 +#: sequencer.c:823

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

1342 msgstr "essayez \"git cherry-pick (--continue|--quit|-- abort)\""

1343

1332 -#: sequencer.c:865

1344 +#: sequencer.c:827

1345 #, c-format

1346 msgid "Could not create sequencer directory %s"

1347 msgstr "Impossible de créer le répertoire de séquenceur %s"

1348

1337 -#: sequencer.c:881 sequencer.c:966

1349 +#: sequencer.c:843 sequencer.c:928

1350 #, c-format

1351 msgid "Error wrapping up %s."

1352 msgstr "Erreur lors de l'emballage de %s."

1353

1342 -#: sequencer.c:900 sequencer.c:1036

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

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

1356 msgstr "aucun picorage ou retour en cours"

1357

1346 -#: sequencer.c:902

1358 +#: sequencer.c:864

1359 msgid "cannot resolve HEAD"

1360 msgstr "impossible de résoudre HEAD"

1361

1350 -#: sequencer.c:904

1362 +#: sequencer.c:866

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

1364 msgstr "impossible d'abandonner depuis une branche non encore créée"

1365

1354 -#: sequencer.c:926 builtin/apply.c:4061

1366 +#: sequencer.c:888 builtin/apply.c:4062

1367 #, c-format

1368 msgid "cannot open %s: %s"

1369 msgstr "impossible d'ouvrir %s : %s"

1370

1359 -#: sequencer.c:929

1371 +#: sequencer.c:891

1372 #, c-format

1373 msgid "cannot read %s: %s"

1374 msgstr "impossible de lire %s : %s"

1375

1364 -#: sequencer.c:930

1376 +#: sequencer.c:892

1377 msgid "unexpected end of file"

1378 msgstr "fin de fichier inattendue"

1379

1368 -#: sequencer.c:936

1380 +#: sequencer.c:898

1381 #, c-format

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

1383 msgstr "le fichier HEAD de préparation de picorage '%s' est corrompu"

1384

1373 -#: sequencer.c:959

1385 +#: sequencer.c:921

1386 #, c-format

1387 msgid "Could not format %s."

1388 msgstr "Impossible de formater %s."

1389

1378 -#: sequencer.c:1104

1390 +#: sequencer.c:1066

1391 #, c-format

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

1393 msgstr "%s : impossible de picorer un %s"

1394

1383 -#: sequencer.c:1107

1395 +#: sequencer.c:1069

1396 #, c-format

1397 msgid "%s: bad revision"

1398 msgstr "%s : mauvaise révision"

1399

1388 -#: sequencer.c:1141

1400 +#: sequencer.c:1103

1401 msgid "Can't revert as initial commit"

1402 msgstr "Impossible d'annuler en tant que commit initial"

1403

1392 -#: sequencer.c:1142

1404 +#: sequencer.c:1104

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

1406 msgstr "Impossible de picorer vers une HEAD vide"

1407

@@ -1418,21 +1430,21 @@ msgstr ""

1430 "message\n"

1431 "en lançant \"git config advice.objectNameWarning false\""

1432

1421 -#: sha1_name.c:1072

1433 +#: sha1_name.c:1060

1434 msgid "HEAD does not point to a branch"

1435 msgstr "HEAD ne pointe pas sur une branche"

1436

1425 -#: sha1_name.c:1075

1437 +#: sha1_name.c:1063

1438 #, c-format

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

1440 msgstr "Branche inconnue : '%s'"

1441

1430 -#: sha1_name.c:1077

1442 +#: sha1_name.c:1065

1443 #, c-format

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

1445 msgstr "Aucune branche amont configurée pour la branche '%s'"

1446

1435 -#: sha1_name.c:1081

1447 +#: sha1_name.c:1069

1448 #, c-format

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

1450 msgstr "La branche amont '%s' n'est pas stockée comme branche de suivi"

@@ -1463,17 +1475,17 @@ msgstr "Impossible de supprimer l'élément de .gitmodules pour %s"

1475 msgid "staging updated .gitmodules failed"

1476 msgstr "échec de la mise en index du .gitmodules mis à jour"

1477

1466 -#: submodule.c:1121 builtin/init-db.c:363

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

1479 #, c-format

1480 msgid "Could not create git link %s"

1481 msgstr "Impossible de créer le lien git %s"

1482

1471 -#: submodule.c:1132

1483 +#: submodule.c:1129

1484 #, c-format

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

1486 msgstr "Impossible de paramétrer core.worktree dans %s"

1487

1476 -#: unpack-trees.c:206

1488 +#: unpack-trees.c:202

1489 msgid "Checking out files"

1490 msgstr "Extraction des fichiers"

1491

@@ -1506,24 +1518,24 @@ msgstr "numéro de port invalide"

1518 msgid "invalid '..' path segment"

1519 msgstr "segment de chemin '..' invalide"

1520

1509 -#: wrapper.c:422

1521 +#: wrapper.c:460

1522 #, c-format

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

1524 msgstr "impossible d'accéder à '%s' : %s"

1525

1514 -#: wrapper.c:443

1526 +#: wrapper.c:481

1527 #, c-format

1528 msgid "unable to access '%s'"

1529 msgstr "impossible d'accéder à '%s'"

1530

1519 -#: wrapper.c:454

1531 +#: wrapper.c:492

1532 #, c-format

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

1534 msgstr ""

1535 "impossible de rechercher l'utilisateur actuel dans le fichier de mots de "

1536 "passe : %s"

1537

1526 -#: wrapper.c:455

1538 +#: wrapper.c:493

1539 msgid "no such user"

1540 msgstr "utilisateur inconnu"

1541

@@ -1673,15 +1685,15 @@ msgstr "contenu non suivi, "

1685 msgid "bug: unhandled diff status %c"

1686 msgstr "bogue : état de diff non géré %c"

1687

1676 -#: wt-status.c:765

1688 +#: wt-status.c:764

1689 msgid "Submodules changed but not updated:"

1690 msgstr "Sous-modules modifiés mais non mis à jour :"

1691

1680 -#: wt-status.c:767

1692 +#: wt-status.c:766

1693 msgid "Submodule changes to be committed:"

1694 msgstr "Changements du sous-module à valider :"

1695

1684 -#: wt-status.c:846

1696 +#: wt-status.c:845

1697 msgid ""

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

1699 "Everything below will be removed."

@@ -1689,68 +1701,68 @@ msgstr ""

1701 "Ne touchez pas à la ligne ci-dessus\n"

1702 "Tout se qui suit sera éliminé."

1703

1692 -#: wt-status.c:937

1704 +#: wt-status.c:936

1705 msgid "You have unmerged paths."

1706 msgstr "Vous avez des chemins non fusionnés."

1707

1696 -#: wt-status.c:940

1708 +#: wt-status.c:939

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

1710 msgstr " (réglez les conflits puis lancez \"git commit\")"

1711

1700 -#: wt-status.c:943

1712 +#: wt-status.c:942

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

1714 msgstr "Tous les conflits sont réglés mais la fusion n'est pas terminée."

1715

1704 -#: wt-status.c:946

1716 +#: wt-status.c:945

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

1718 msgstr " (utilisez \"git commit\" pour terminer la fusion)"

1719

1708 -#: wt-status.c:956

1720 +#: wt-status.c:955

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

1722 msgstr "Vous êtes au milieu d'une session am."

1723

1712 -#: wt-status.c:959

1724 +#: wt-status.c:958

1725 msgid "The current patch is empty."

1726 msgstr "Le patch actuel est vide."

1727

1716 -#: wt-status.c:963

1728 +#: wt-status.c:962

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

1730 msgstr " (réglez les conflits puis lancez \"git am --continue\")"

1731

1720 -#: wt-status.c:965

1732 +#: wt-status.c:964

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

1734 msgstr " (utilisez \"git am --skip\" pour sauter ce patch)"

1735

1724 -#: wt-status.c:967

1736 +#: wt-status.c:966

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

1738 msgstr " (utilisez \"git am --abort\" pour restaurer la branche d'origine)"

1739

1728 -#: wt-status.c:1027 wt-status.c:1044

1740 +#: wt-status.c:1026 wt-status.c:1043

1741 #, c-format

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

1743 msgstr "Vous êtes en train de rebaser la branche '%s' sur '%s'."

1744

1733 -#: wt-status.c:1032 wt-status.c:1049

1745 +#: wt-status.c:1031 wt-status.c:1048

1746 msgid "You are currently rebasing."

1747 msgstr "Vous êtes en train de rebaser."

1748

1737 -#: wt-status.c:1035

1749 +#: wt-status.c:1034

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

1751 msgstr " (réglez les conflits puis lancez \"git rebase --continue\")"

1752

1741 -#: wt-status.c:1037

1753 +#: wt-status.c:1036

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

1755 msgstr " (utilisez \"git rebase --skip\" pour sauter ce patch)"

1756

1745 -#: wt-status.c:1039

1757 +#: wt-status.c:1038

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

1759 msgstr " (utilisez \"git rebase --abort\" pour extraire la branche d'origine)"

1760

1749 -#: wt-status.c:1052

1761 +#: wt-status.c:1051

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

1763 msgstr " (tous les conflits sont réglés : lancez \"git rebase --continue\")"

1764

1753 -#: wt-status.c:1056

1765 +#: wt-status.c:1055

1766 #, c-format

1767 msgid ""

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

@@ -1758,120 +1770,120 @@ msgstr ""

1770 "Vous êtes actuellement en train de fractionner un commit pendant un rebasage "

1771 "de la branche '%s' sur '%s'."

1772

1761 -#: wt-status.c:1061

1773 +#: wt-status.c:1060

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

1775 msgstr ""

1776 "Vous êtes actuellement en train de fractionner un commit pendant un rebasage."

1777

1766 -#: wt-status.c:1064

1778 +#: wt-status.c:1063

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

1780 msgstr ""

1781 " (Une fois la copie de travail nettoyée, lancez \"git rebase --continue\")"

1782

1771 -#: wt-status.c:1068

1783 +#: wt-status.c:1067

1784 #, c-format

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

1786 msgstr ""

1787 "Vous êtes actuellement en train d'éditer un commit pendant un rebasage de la "

1788 "branche '%s' sur '%s'."

1789

1778 -#: wt-status.c:1073

1790 +#: wt-status.c:1072

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

1792 msgstr ""

1793 "Vous êtes actuellement en train d'éditer un commit pendant un rebasage."

1794

1783 -#: wt-status.c:1076

1795 +#: wt-status.c:1075

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

1797 msgstr " (utilisez \"git commit --amend\" pour corriger le commit actuel)"

1798

1787 -#: wt-status.c:1078

1799 +#: wt-status.c:1077

1800 msgid ""

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

1802 msgstr ""

1803 " (utilisez \"git rebase --continue\" quand vous êtes satisfait de vos "

1804 "modifications)"

1805

1794 -#: wt-status.c:1088

1806 +#: wt-status.c:1087

1807 #, c-format

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

1809 msgstr "Vous êtes actuellement en train de picorer le commit %s."

1810

1799 -#: wt-status.c:1093

1811 +#: wt-status.c:1092

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

1813 msgstr " (réglez les conflits puis lancez \"git cherry-pick --continue\")"

1814

1803 -#: wt-status.c:1096

1815 +#: wt-status.c:1095

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

1817 msgstr ""

1818 " (tous les conflits sont réglés : lancez \"git cherry-pick --continue\")"

1819

1808 -#: wt-status.c:1098

1820 +#: wt-status.c:1097

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

1822 msgstr " (utilisez \"git cherry-pick --abort\" pour annuler le picorage)"

1823

1812 -#: wt-status.c:1107

1824 +#: wt-status.c:1106

1825 #, c-format

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

1827 msgstr "Vous êtes actuellement en train de rétablir le commit %s."

1828

1817 -#: wt-status.c:1112

1829 +#: wt-status.c:1111

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

1831 msgstr " (réglez les conflits puis lancez \"git revert --continue\")"

1832

1821 -#: wt-status.c:1115

1833 +#: wt-status.c:1114

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

1835 msgstr " (tous les conflits sont réglés : lancez \"git revert --continue\")"

1836

1825 -#: wt-status.c:1117

1837 +#: wt-status.c:1116

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

1839 msgstr " (utilisez \"git revert --abort\" pour annuler le rétablissement)"

1840

1829 -#: wt-status.c:1128

1841 +#: wt-status.c:1127

1842 #, c-format

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

1844 msgstr "Vous êtes en cours de bissection, depuis la branche '%s'."

1845

1834 -#: wt-status.c:1132

1846 +#: wt-status.c:1131

1847 msgid "You are currently bisecting."

1848 msgstr "Vous êtes en cours de bissection."

1849

1838 -#: wt-status.c:1135

1850 +#: wt-status.c:1134

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

1852 msgstr " (utilisez \"git bisect reset\" pour revenir à la branche d'origine)"

1853

1842 -#: wt-status.c:1310

1854 +#: wt-status.c:1309

1855 msgid "On branch "

1856 msgstr "Sur la branche "

1857

1846 -#: wt-status.c:1317

1858 +#: wt-status.c:1316

1859 msgid "rebase in progress; onto "

1860 msgstr "rebasage en cours ; sur "

1861

1850 -#: wt-status.c:1324

1862 +#: wt-status.c:1323

1863 msgid "HEAD detached at "

1864 msgstr "HEAD détachée sur "

1865

1854 -#: wt-status.c:1326

1866 +#: wt-status.c:1325

1867 msgid "HEAD detached from "

1868 msgstr "HEAD détachée depuis "

1869

1858 -#: wt-status.c:1329

1870 +#: wt-status.c:1328

1871 msgid "Not currently on any branch."

1872 msgstr "Actuellement sur aucun branche."

1873

1862 -#: wt-status.c:1346

1874 +#: wt-status.c:1345

1875 msgid "Initial commit"

1876 msgstr "Validation initiale"

1877

1866 -#: wt-status.c:1360

1878 +#: wt-status.c:1359

1879 msgid "Untracked files"

1880 msgstr "Fichiers non suivis"

1881

1870 -#: wt-status.c:1362

1882 +#: wt-status.c:1361

1883 msgid "Ignored files"

1884 msgstr "Fichiers ignorés"

1885

1874 -#: wt-status.c:1366

1886 +#: wt-status.c:1365

1887 #, c-format

1888 msgid ""

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

@@ -1883,32 +1895,32 @@ msgstr ""

1895 "oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help "

1896 "status')."

1897

1886 -#: wt-status.c:1372

1898 +#: wt-status.c:1371

1899 #, c-format

1900 msgid "Untracked files not listed%s"

1901 msgstr "Fichiers non suivis non affichés%s"

1902

1891 -#: wt-status.c:1374

1903 +#: wt-status.c:1373

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

1905 msgstr " (utilisez -u pour afficher les fichiers non suivis)"

1906

1895 -#: wt-status.c:1380

1907 +#: wt-status.c:1379

1908 msgid "No changes"

1909 msgstr "Aucune modification"

1910

1899 -#: wt-status.c:1385

1911 +#: wt-status.c:1384

1912 #, c-format

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

1914 msgstr ""

1915 "aucune modification n'a été ajoutée à la validation (utilisez \"git add\" ou "

1916 "\"git commit -a\")\n"

1917

1906 -#: wt-status.c:1388

1918 +#: wt-status.c:1387

1919 #, c-format

1920 msgid "no changes added to commit\n"

1921 msgstr "aucune modification ajoutée à la validation\n"

1922

1911 -#: wt-status.c:1391

1923 +#: wt-status.c:1390

1924 #, c-format

1925 msgid ""

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

@@ -1917,49 +1929,49 @@ msgstr ""

1929 "aucune modification ajoutée à la validation mais des fichiers non suivis "

1930 "sont présents (utilisez \"git add\" pour les suivre)\n"

1931

1920 -#: wt-status.c:1394

1932 +#: wt-status.c:1393

1933 #, c-format

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

1935 msgstr ""

1936 "aucune modification ajoutée à la validation mais des fichiers non suivis "

1937 "sont présents\n"

1938

1927 -#: wt-status.c:1397

1939 +#: wt-status.c:1396

1940 #, c-format

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

1942 msgstr ""

1943 "rien à valider (créez/copiez des fichiers et utilisez \"git add\" pour les "

1944 "suivre)\n"

1945

1934 -#: wt-status.c:1400 wt-status.c:1405

1946 +#: wt-status.c:1399 wt-status.c:1404

1947 #, c-format

1948 msgid "nothing to commit\n"

1949 msgstr "rien à valider\n"

1950

1939 -#: wt-status.c:1403

1951 +#: wt-status.c:1402

1952 #, c-format

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

1954 msgstr "rien à valider (utilisez -u pour afficher les fichiers non suivis)\n"

1955

1944 -#: wt-status.c:1407

1956 +#: wt-status.c:1406

1957 #, c-format

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

1959 msgstr "rien à valider, la copie de travail est propre\n"

1960

1949 -#: wt-status.c:1516

1961 +#: wt-status.c:1515

1962 msgid "HEAD (no branch)"

1963 msgstr "HEAD (aucune branche)"

1964

1953 -#: wt-status.c:1522

1965 +#: wt-status.c:1521

1966 msgid "Initial commit on "

1967 msgstr "Validation initiale sur "

1968

1969 # à priori on parle d'une branche ici

1958 -#: wt-status.c:1554

1970 +#: wt-status.c:1553

1971 msgid "gone"

1972 msgstr "disparue"

1973

1962 -#: wt-status.c:1556 wt-status.c:1564

1974 +#: wt-status.c:1555 wt-status.c:1563

1975 msgid "behind "

1976 msgstr "derrière "

1977

@@ -1990,7 +2002,7 @@ msgstr "suppression de '%s'\n"

2002 msgid "Unstaged changes after refreshing the index:"

2003 msgstr "Modifications non indexées après rafraîchissement de l'index :"

2004

1993 -#: builtin/add.c:193

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

2006 msgid "Could not read the index"

2007 msgstr "Impossible de lire l'index"

2008

@@ -2022,15 +2034,15 @@ msgid "The following paths are ignored by one of your .gitignore files:\n"

2034 msgstr ""

2035 "Les chemins suivants sont ignorés par un de vos fichiers .gitignore :\n"

2036

2025 -#: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:93 builtin/mv.c:70

2026 -#: builtin/prune-packed.c:77 builtin/push.c:489 builtin/remote.c:1344

2037 +#: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:70

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

2039 #: builtin/rm.c:269

2040 msgid "dry run"

2041 msgstr "simuler l'action"

2042

2031 -#: builtin/add.c:249 builtin/apply.c:4410 builtin/check-ignore.c:19

2032 -#: builtin/commit.c:1256 builtin/count-objects.c:95 builtin/fsck.c:612

2033 -#: builtin/log.c:1592 builtin/mv.c:69 builtin/read-tree.c:113

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

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

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

2046 msgid "be verbose"

2047 msgstr "mode verbeux"

2048

@@ -2038,7 +2050,7 @@ msgstr "mode verbeux"

2050 msgid "interactive picking"

2051 msgstr "sélection interactive"

2052

2041 -#: builtin/add.c:252 builtin/checkout.c:1108 builtin/reset.c:283

2053 +#: builtin/add.c:252 builtin/checkout.c:1102 builtin/reset.c:285

2054 msgid "select hunks interactively"

2055 msgstr "sélection interactive des sections"

2056

@@ -2094,31 +2106,31 @@ msgstr "aucun fichier ajouté"

2106 msgid "adding files failed"

2107 msgstr "échec de l'ajout de fichiers"

2108

2097 -#: builtin/add.c:330

2109 +#: builtin/add.c:329

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

2111 msgstr "-A et -u sont mutuellement incompatibles"

2112

2101 -#: builtin/add.c:337

2113 +#: builtin/add.c:336

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

2115 msgstr ""

2116 "L'option --ignore-missing ne peut être utilisée qu'en complément de --dry-run"

2117

2106 -#: builtin/add.c:358

2118 +#: builtin/add.c:357

2119 #, c-format

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

2121 msgstr "Rien de spécifié, rien n'a été ajouté.\n"

2122

2111 -#: builtin/add.c:359

2123 +#: builtin/add.c:358

2124 #, c-format

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

2126 msgstr "Vous vouliez sûrement dire 'git add .' ?\n"

2127

2116 -#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:920

2117 -#: builtin/commit.c:320 builtin/mv.c:90 builtin/reset.c:234 builtin/rm.c:299

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

2129 +#: builtin/commit.c:319 builtin/mv.c:90 builtin/reset.c:234 builtin/rm.c:299

2130 msgid "index file corrupt"

2131 msgstr "fichier d'index corrompu"

2132

2121 -#: builtin/add.c:448 builtin/apply.c:4506 builtin/mv.c:280 builtin/rm.c:432

2133 +#: builtin/add.c:446 builtin/apply.c:4506 builtin/mv.c:280 builtin/rm.c:431

2134 msgid "Unable to write new index file"

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

2136

@@ -2136,43 +2148,43 @@ msgstr "option d'espace non reconnue '%s'"

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

2149 msgstr "option d'ignorance d'espace non reconnue '%s'"

2150

2139 -#: builtin/apply.c:823

2151 +#: builtin/apply.c:825

2152 #, c-format

2153 msgid "Cannot prepare timestamp regexp %s"

2154 msgstr "Impossible de préparer la regexp d'horodatage %s"

2155

2144 -#: builtin/apply.c:832

2156 +#: builtin/apply.c:834

2157 #, c-format

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

2159 msgstr "regexec a retourné %d pour l'entrée : %s"

2160

2149 -#: builtin/apply.c:913

2161 +#: builtin/apply.c:915

2162 #, c-format

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

2164 msgstr "nom de fichier du patch introuvable à la ligne %d"

2165

2154 -#: builtin/apply.c:945

2166 +#: builtin/apply.c:947

2167 #, c-format

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

2169 msgstr ""

2170 "git apply : mauvais format de git-diff - /dev/null attendu, %s trouvé à la "

2171 "ligne %d"

2172

2161 -#: builtin/apply.c:949

2173 +#: builtin/apply.c:951

2174 #, c-format

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

2176 msgstr ""

2177 "git apply : mauvais format de git-diff - nouveau nom de fichier inconsistant "

2178 "à la ligne %d"

2179

2168 -#: builtin/apply.c:950

2180 +#: builtin/apply.c:952

2181 #, c-format

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

2183 msgstr ""

2184 "git apply : mauvais format de git-diff - ancien nom de fichier inconsistant "

2185 "à la ligne %d"

2186

2175 -#: builtin/apply.c:957

2187 +#: builtin/apply.c:959

2188 #, c-format

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

2190 msgstr ""

@@ -2287,19 +2299,19 @@ msgstr ""

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

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

2301

2290 -#: builtin/apply.c:2946

2302 +#: builtin/apply.c:2944

2303 #, c-format

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

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

2306

2295 -#: builtin/apply.c:2952

2307 +#: builtin/apply.c:2950

2308 #, c-format

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

2310 msgstr ""

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

2312 "trouvé)"

2313

2302 -#: builtin/apply.c:2973

2314 +#: builtin/apply.c:2971

2315 #, c-format

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

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

@@ -2389,221 +2401,221 @@ msgstr "échec de make_cache_entry pour le chemin '%s'"

2401 msgid "unable to remove %s from index"

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

2403

2392 -#: builtin/apply.c:3851

2404 +#: builtin/apply.c:3852

2405 #, c-format

2406 msgid "corrupt patch for submodule %s"

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

2408

2397 -#: builtin/apply.c:3855

2409 +#: builtin/apply.c:3856

2410 #, c-format

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

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

2413

2402 -#: builtin/apply.c:3860

2414 +#: builtin/apply.c:3861

2415 #, c-format

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

2417 msgstr ""

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

2419 "impossible"

2420

2409 -#: builtin/apply.c:3863 builtin/apply.c:3971

2421 +#: builtin/apply.c:3864 builtin/apply.c:3972

2422 #, c-format

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

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

2425

2414 -#: builtin/apply.c:3896

2426 +#: builtin/apply.c:3897

2427 #, c-format

2428 msgid "closing file '%s'"

2429 msgstr "fermeture du fichier '%s'"

2430

2419 -#: builtin/apply.c:3945

2431 +#: builtin/apply.c:3946

2432 #, c-format

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

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

2435

2424 -#: builtin/apply.c:4032

2436 +#: builtin/apply.c:4033

2437 #, c-format

2438 msgid "Applied patch %s cleanly."

2439 msgstr "Patch %s appliqué proprement."

2440

2429 -#: builtin/apply.c:4040

2441 +#: builtin/apply.c:4041

2442 msgid "internal error"

2443 msgstr "erreur interne"

2444

2433 -#: builtin/apply.c:4043

2445 +#: builtin/apply.c:4044

2446 #, c-format

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

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

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

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

2451

2440 -#: builtin/apply.c:4053

2452 +#: builtin/apply.c:4054

2453 #, c-format

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

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

2456

2445 -#: builtin/apply.c:4074

2457 +#: builtin/apply.c:4075

2458 #, c-format

2459 msgid "Hunk #%d applied cleanly."

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

2461

2450 -#: builtin/apply.c:4077

2462 +#: builtin/apply.c:4078

2463 #, c-format

2464 msgid "Rejected hunk #%d."

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

2466

2455 -#: builtin/apply.c:4227

2467 +#: builtin/apply.c:4228

2468 msgid "unrecognized input"

2469 msgstr "entrée non reconnue"

2470

2459 -#: builtin/apply.c:4238

2471 +#: builtin/apply.c:4239

2472 msgid "unable to read index file"

2473 msgstr "lecture du fichier d'index impossible"

2474

2463 -#: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:90

2464 -#: builtin/fetch.c:78

2475 +#: builtin/apply.c:4358 builtin/apply.c:4361 builtin/clone.c:90

2476 +#: builtin/fetch.c:93

2477 msgid "path"

2478 msgstr "chemin"

2479

2468 -#: builtin/apply.c:4358

2480 +#: builtin/apply.c:4359

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

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

2483

2472 -#: builtin/apply.c:4361

2484 +#: builtin/apply.c:4362

2485 msgid "apply changes matching the given path"

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

2487

2476 -#: builtin/apply.c:4363

2488 +#: builtin/apply.c:4364

2489 msgid "num"

2490 msgstr "num"

2491

2480 -#: builtin/apply.c:4364

2492 +#: builtin/apply.c:4365

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

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

2495

2484 -#: builtin/apply.c:4367

2496 +#: builtin/apply.c:4368

2497 msgid "ignore additions made by the patch"

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

2499

2488 -#: builtin/apply.c:4369

2500 +#: builtin/apply.c:4370

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

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

2503

2492 -#: builtin/apply.c:4373

2504 +#: builtin/apply.c:4374

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

2506 msgstr ""

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

2508

2497 -#: builtin/apply.c:4375

2509 +#: builtin/apply.c:4376

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

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

2512

2501 -#: builtin/apply.c:4377

2513 +#: builtin/apply.c:4378

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

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

2516

2505 -#: builtin/apply.c:4379

2517 +#: builtin/apply.c:4380

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

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

2520

2509 -#: builtin/apply.c:4381

2521 +#: builtin/apply.c:4382

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

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

2524

2513 -#: builtin/apply.c:4383

2525 +#: builtin/apply.c:4384

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

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

2528

2517 -#: builtin/apply.c:4385

2529 +#: builtin/apply.c:4386

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

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

2532

2521 -#: builtin/apply.c:4387

2533 +#: builtin/apply.c:4388

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

2535 msgstr ""

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

2537

2526 -#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:455

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

2539 msgid "paths are separated with NUL character"

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

2541

2530 -#: builtin/apply.c:4392

2542 +#: builtin/apply.c:4393

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

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

2545

2534 -#: builtin/apply.c:4393

2546 +#: builtin/apply.c:4394

2547 msgid "action"

2548 msgstr "action"

2549

2538 -#: builtin/apply.c:4394

2550 +#: builtin/apply.c:4395

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

2552 msgstr ""

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

2554 "d'espace"

2555

2544 -#: builtin/apply.c:4397 builtin/apply.c:4400

2556 +#: builtin/apply.c:4398 builtin/apply.c:4401

2557 msgid "ignore changes in whitespace when finding context"

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

2559

2548 -#: builtin/apply.c:4403

2560 +#: builtin/apply.c:4404

2561 msgid "apply the patch in reverse"

2562 msgstr "appliquer le patch en sens inverse"

2563

2552 -#: builtin/apply.c:4405

2564 +#: builtin/apply.c:4406

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

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

2567

2556 -#: builtin/apply.c:4407

2568 +#: builtin/apply.c:4408

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

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

2571

2560 -#: builtin/apply.c:4409

2572 +#: builtin/apply.c:4410

2573 msgid "allow overlapping hunks"

2574 msgstr "accepter les recouvrements de sections"

2575

2564 -#: builtin/apply.c:4412

2576 +#: builtin/apply.c:4413

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

2578 msgstr ""

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

2580 "fichier"

2581

2570 -#: builtin/apply.c:4415

2582 +#: builtin/apply.c:4416

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

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

2585

2574 -#: builtin/apply.c:4417

2586 +#: builtin/apply.c:4418

2587 msgid "root"

2588 msgstr "racine"

2589

2578 -#: builtin/apply.c:4418

2590 +#: builtin/apply.c:4419

2591 msgid "prepend <root> to all filenames"

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

2593

2582 -#: builtin/apply.c:4440

2594 +#: builtin/apply.c:4441

2595 msgid "--3way outside a repository"

2596 msgstr "--3way hors d'un dépôt"

2597

2586 -#: builtin/apply.c:4448

2598 +#: builtin/apply.c:4449

2599 msgid "--index outside a repository"

2600 msgstr "--index hors d'un dépôt"

2601

2590 -#: builtin/apply.c:4451

2602 +#: builtin/apply.c:4452

2603 msgid "--cached outside a repository"

2604 msgstr "--cached hors d'un dépôt"

2605

2594 -#: builtin/apply.c:4467

2606 +#: builtin/apply.c:4468

2607 #, c-format

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

2609 msgstr "ouverture impossible du patch '%s'"

2610

2599 -#: builtin/apply.c:4481

2611 +#: builtin/apply.c:4482

2612 #, c-format

2613 msgid "squelched %d whitespace error"

2614 msgid_plural "squelched %d whitespace errors"

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

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

2617

2606 -#: builtin/apply.c:4487 builtin/apply.c:4497

2618 +#: builtin/apply.c:4488 builtin/apply.c:4498

2619 #, c-format

2620 msgid "%d line adds whitespace errors."

2621 msgid_plural "%d lines add whitespace errors."

@@ -2657,112 +2669,122 @@ msgstr "effectuer 'git bisect next'"

2669 msgid "update BISECT_HEAD instead of checking out the current commit"

2670 msgstr "mettre à jour BISECT_HEAD au lieu d'extraire le commit actuel"

2671

2660 -#: builtin/blame.c:27

2672 +#: builtin/blame.c:30

2673 msgid "git blame [options] [rev-opts] [rev] [--] file"

2674 msgstr "git blame [options] [options-de-révision] [rev] [--] fichier"

2675

2664 -#: builtin/blame.c:32

2676 +#: builtin/blame.c:35

2677 msgid "[rev-opts] are documented in git-rev-list(1)"

2678 msgstr "[options-de-révision] sont documentés dans git-rev-list(1)"

2679

2668 -#: builtin/blame.c:2242

2680 +#: builtin/blame.c:2501

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

2682 msgstr ""

2683 "Montrer les éléments de blâme au fur et à mesure de leur découverte, de "

2684 "manière incrémentale"

2685

2674 -#: builtin/blame.c:2243

2686 +#: builtin/blame.c:2502

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

2688 msgstr "Montrer un SHA-1 blanc pour les commits de limite (Défaut : désactivé)"

2689

2678 -#: builtin/blame.c:2244

2690 +#: builtin/blame.c:2503

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

2692 msgstr ""

2693 "Ne pas traiter les commits racine comme des limites (Défaut : désactivé)"

2694

2683 -#: builtin/blame.c:2245

2695 +#: builtin/blame.c:2504

2696 msgid "Show work cost statistics"

2697 msgstr "Montrer les statistiques de coût d'activité"

2698

2687 -#: builtin/blame.c:2246

2699 +#: builtin/blame.c:2505

2700 msgid "Show output score for blame entries"

2701 msgstr "Montrer le score de sortie pour les éléments de blâme"

2702

2691 -#: builtin/blame.c:2247

2703 +#: builtin/blame.c:2506

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

2705 msgstr "Montrer les noms de fichier originaux (Défaut : auto)"

2706

2695 -#: builtin/blame.c:2248

2707 +#: builtin/blame.c:2507

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

2709 msgstr "Montrer les numéros de lignes originaux (Défaut : désactivé)"

2710

2699 -#: builtin/blame.c:2249

2711 +#: builtin/blame.c:2508

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

2713 msgstr "Afficher dans un format propice à la consommation par machine"

2714

2703 -#: builtin/blame.c:2250

2715 +#: builtin/blame.c:2509

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

2717 msgstr "Afficher en format porcelaine avec l'information de commit par ligne"

2718

2707 -#: builtin/blame.c:2251

2719 +#: builtin/blame.c:2510

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

2721 msgstr "Utiliser le même mode de sortie que git-annotate (Défaut : désactivé)"

2722

2711 -#: builtin/blame.c:2252

2723 +#: builtin/blame.c:2511

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

2725 msgstr "Afficher les horodatages bruts (Défaut : désactivé)"

2726

2715 -#: builtin/blame.c:2253

2727 +#: builtin/blame.c:2512

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

2729 msgstr "Afficher les longs SHA1 de commits (Défaut : désactivé)"

2730

2719 -#: builtin/blame.c:2254

2731 +#: builtin/blame.c:2513

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

2733 msgstr "Supprimer le nom de l'auteur et l'horodatage (Défaut : désactivé)"

2734

2723 -#: builtin/blame.c:2255

2735 +#: builtin/blame.c:2514

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

2737 msgstr "Afficher l'e-mail de l'auteur au lieu du nom (Défaut : désactivé)"

2738

2727 -#: builtin/blame.c:2256

2739 +#: builtin/blame.c:2515

2740 msgid "Ignore whitespace differences"

2741 msgstr "Ignorer les différences d'espace"

2742

2731 -#: builtin/blame.c:2257

2743 +#: builtin/blame.c:2516

2744 msgid "Spend extra cycles to find better match"

2745 msgstr ""

2746 "Dépenser des cycles supplémentaires pour trouver une meilleure correspondance"

2747

2736 -#: builtin/blame.c:2258

2748 +#: builtin/blame.c:2517

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

2750 msgstr ""

2751 "Utiliser les révisions du fichier <fichier> au lieu d'appeler git-rev-list"

2752

2741 -#: builtin/blame.c:2259

2753 +#: builtin/blame.c:2518

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

2755 msgstr "Utiliser le contenu de <fichier> comme image finale"

2756

2745 -#: builtin/blame.c:2260 builtin/blame.c:2261

2757 +#: builtin/blame.c:2519 builtin/blame.c:2520

2758 msgid "score"

2759 msgstr "score"

2760

2749 -#: builtin/blame.c:2260

2761 +#: builtin/blame.c:2519

2762 msgid "Find line copies within and across files"

2763 msgstr "Trouver les copies de ligne dans et entre les fichiers"

2764

2753 -#: builtin/blame.c:2261

2765 +#: builtin/blame.c:2520

2766 msgid "Find line movements within and across files"

2767 msgstr "Trouver les mouvements de ligne dans et entre les fichiers"

2768

2757 -#: builtin/blame.c:2262

2769 +#: builtin/blame.c:2521

2770 msgid "n,m"

2771 msgstr "n,m"

2772

2761 -#: builtin/blame.c:2262

2773 +#: builtin/blame.c:2521

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

2775 msgstr ""

2776 "Traiter seulement l'intervalle de ligne n,m en commençant le compte à 1"

2777

2778 +#. TRANSLATORS: This string is used to tell us the maximum

2779 +#. display width for a relative timestamp in "git blame"

2780 +#. output. For C locale, "4 years, 11 months ago", which

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

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

2783 +#. fewer display columns.

2784 +#: builtin/blame.c:2599

2785 +msgid "4 years, 11 months ago"

2786 +msgstr "il y a 10 ans et 11 mois"

2787 +

2788 #: builtin/branch.c:24

2789 msgid "git branch [options] [-r | -a] [--merged | --no-merged]"

2790 msgstr "git branch [options] [-r | -a] [--merged | --no-merged]"

@@ -3004,9 +3026,9 @@ msgid "act on remote-tracking branches"

3026 msgstr "agir sur les branches de suivi distantes"

3027

3028 #: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844

3007 -#: builtin/branch.c:850 builtin/commit.c:1494 builtin/commit.c:1495

3008 -#: builtin/commit.c:1496 builtin/commit.c:1497 builtin/tag.c:527

3009 -#: builtin/tag.c:533

3029 +#: builtin/branch.c:850 builtin/commit.c:1573 builtin/commit.c:1574

3030 +#: builtin/commit.c:1575 builtin/commit.c:1576 builtin/tag.c:615

3031 +#: builtin/tag.c:621

3032 msgid "commit"

3033 msgstr "commit"

3034

@@ -3070,7 +3092,7 @@ msgstr "afficher les branches en colonnes"

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

3093 msgstr "Échec de résolution de HEAD comme référence valide."

3094

3073 -#: builtin/branch.c:872 builtin/clone.c:635

3095 +#: builtin/branch.c:872 builtin/clone.c:636

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

3097 msgstr "HEAD non trouvée sous refs/heads !"

3098

@@ -3260,7 +3282,7 @@ msgid "terminate input and output records by a NUL character"

3282 msgstr ""

3283 "terminer les enregistrements en entrée et en sortie par un caractère NUL"

3284

3263 -#: builtin/check-ignore.c:18 builtin/checkout.c:1089 builtin/gc.c:271

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

3286 msgid "suppress progress reporting"

3287 msgstr "supprimer l'état d'avancement"

3288

@@ -3317,45 +3339,45 @@ msgstr "aucun contact spécifié"

3339 msgid "git checkout-index [options] [--] [<file>...]"

3340 msgstr "git checkout-index [options] [--] [<fichier>...]"

3341

3320 -#: builtin/checkout-index.c:187

3342 +#: builtin/checkout-index.c:188

3343 msgid "check out all files in the index"

3344 msgstr "extraire tous les fichiers présents dans l'index"

3345

3324 -#: builtin/checkout-index.c:188

3346 +#: builtin/checkout-index.c:189

3347 msgid "force overwrite of existing files"

3348 msgstr "forcer l'écrasement des fichiers existants"

3349

3328 -#: builtin/checkout-index.c:190

3350 +#: builtin/checkout-index.c:191

3351 msgid "no warning for existing files and files not in index"

3352 msgstr ""

3353 "pas d'avertissement pour les fichiers existants et les fichiers absents de "

3354 "l'index"

3355

3334 -#: builtin/checkout-index.c:192

3356 +#: builtin/checkout-index.c:193

3357 msgid "don't checkout new files"

3358 msgstr "ne pas extraire les nouveaux fichiers"

3359

3338 -#: builtin/checkout-index.c:194

3360 +#: builtin/checkout-index.c:195

3361 msgid "update stat information in the index file"

3362 msgstr "mettre à jour l'information de stat dans le fichier d'index"

3363

3342 -#: builtin/checkout-index.c:200

3364 +#: builtin/checkout-index.c:201

3365 msgid "read list of paths from the standard input"

3366 msgstr "lire la liste des chemins depuis l'entrée standard"

3367

3346 -#: builtin/checkout-index.c:202

3368 +#: builtin/checkout-index.c:203

3369 msgid "write the content to temporary files"

3370 msgstr "écrire le contenu dans des fichiers temporaires"

3371

3350 -#: builtin/checkout-index.c:203 builtin/column.c:30

3372 +#: builtin/checkout-index.c:204 builtin/column.c:30

3373 msgid "string"

3374 msgstr "chaîne"

3375

3354 -#: builtin/checkout-index.c:204

3376 +#: builtin/checkout-index.c:205

3377 msgid "when creating files, prepend <string>"

3378 msgstr "lors de la création de fichiers, préfixer par <chaîne>"

3379

3358 -#: builtin/checkout-index.c:207

3380 +#: builtin/checkout-index.c:208

3381 msgid "copy out the files from named stage"

3382 msgstr "copier les fichiers depuis l'index nommé"

3383

@@ -3397,77 +3419,77 @@ msgstr "chemin '%s' : impossible de fusionner"

3419 msgid "Unable to add merge result for '%s'"

3420 msgstr "Impossible d'ajouter le résultat de fusion pour '%s'"

3421

3400 -#: builtin/checkout.c:232 builtin/checkout.c:235 builtin/checkout.c:238

3401 -#: builtin/checkout.c:241

3422 +#: builtin/checkout.c:231 builtin/checkout.c:234 builtin/checkout.c:237

3423 +#: builtin/checkout.c:240

3424 #, c-format

3425 msgid "'%s' cannot be used with updating paths"

3426 msgstr "'%s' ne peut pas être utilisé avec des mises à jour de chemins"

3427

3406 -#: builtin/checkout.c:244 builtin/checkout.c:247

3428 +#: builtin/checkout.c:243 builtin/checkout.c:246

3429 #, c-format

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

3431 msgstr "'%s' ne peut pas être utilisé avec %s"

3432

3411 -#: builtin/checkout.c:250

3433 +#: builtin/checkout.c:249

3434 #, c-format

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

3436 msgstr ""

3437 "Impossible de mettre à jour les chemins et basculer sur la branche '%s' en "

3438 "même temps."

3439

3418 -#: builtin/checkout.c:261 builtin/checkout.c:450

3440 +#: builtin/checkout.c:260 builtin/checkout.c:449

3441 msgid "corrupt index file"

3442 msgstr "fichier d'index corrompu"

3443

3422 -#: builtin/checkout.c:321 builtin/checkout.c:328

3444 +#: builtin/checkout.c:320 builtin/checkout.c:327

3445 #, c-format

3446 msgid "path '%s' is unmerged"

3447 msgstr "le chemin '%s' n'est pas fusionné"

3448

3427 -#: builtin/checkout.c:472

3449 +#: builtin/checkout.c:471

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

3451 msgstr "vous devez d'abord résoudre votre index courant"

3452

3431 -#: builtin/checkout.c:593

3453 +#: builtin/checkout.c:591

3454 #, c-format

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

3456 msgstr "Impossible de faire un reflog pour '%s'\n"

3457

3436 -#: builtin/checkout.c:631

3458 +#: builtin/checkout.c:629

3459 msgid "HEAD is now at"

3460 msgstr "HEAD est maintenant sur"

3461

3440 -#: builtin/checkout.c:638

3462 +#: builtin/checkout.c:636

3463 #, c-format

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

3465 msgstr "Remise à zéro de la branche '%s'\n"

3466

3445 -#: builtin/checkout.c:641

3467 +#: builtin/checkout.c:639

3468 #, c-format

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

3470 msgstr "Déjà sur '%s'\n"

3471

3450 -#: builtin/checkout.c:645

3472 +#: builtin/checkout.c:643

3473 #, c-format

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

3475 msgstr "Basculement et remise à zéro de la branche '%s'\n"

3476

3455 -#: builtin/checkout.c:647 builtin/checkout.c:1032

3477 +#: builtin/checkout.c:645 builtin/checkout.c:1026

3478 #, c-format

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

3480 msgstr "Basculement sur la nouvelle branche '%s'\n"

3481

3460 -#: builtin/checkout.c:649

3482 +#: builtin/checkout.c:647

3483 #, c-format

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

3485 msgstr "Basculement sur la branche '%s'\n"

3486

3465 -#: builtin/checkout.c:705

3487 +#: builtin/checkout.c:699

3488 #, c-format

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

3490 msgstr " ... et %d en plus.\n"

3491

3470 -#: builtin/checkout.c:711

3492 +#: builtin/checkout.c:705

3493 #, c-format

3494 msgid ""

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

@@ -3490,7 +3512,7 @@ msgstr[1] ""

3512 "\n"

3513 "%s\n"

3514

3493 -#: builtin/checkout.c:729

3515 +#: builtin/checkout.c:723

3516 #, c-format

3517 msgid ""

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

@@ -3506,139 +3528,139 @@ msgstr ""

3528 "git branch nouvelle_branche %s\n"

3529 "\n"

3530

3509 -#: builtin/checkout.c:759

3531 +#: builtin/checkout.c:753

3532 msgid "internal error in revision walk"

3533 msgstr "erreur interne lors du parcours des révisions"

3534

3513 -#: builtin/checkout.c:763

3535 +#: builtin/checkout.c:757

3536 msgid "Previous HEAD position was"

3537 msgstr "La position précédente de HEAD était"

3538

3517 -#: builtin/checkout.c:790 builtin/checkout.c:1027

3539 +#: builtin/checkout.c:784 builtin/checkout.c:1021

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

3541 msgstr "Vous êtes sur une branche qui doit encore naître"

3542

3521 -#: builtin/checkout.c:934

3543 +#: builtin/checkout.c:928

3544 #, c-format

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

3546 msgstr "une seule référence attendue, %d fournies."

3547

3526 -#: builtin/checkout.c:973

3548 +#: builtin/checkout.c:967

3549 #, c-format

3550 msgid "invalid reference: %s"

3551 msgstr "référence invalide : %s"

3552

3531 -#: builtin/checkout.c:1002

3553 +#: builtin/checkout.c:996

3554 #, c-format

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

3556 msgstr "la référence n'est pas un arbre : %s"

3557

3536 -#: builtin/checkout.c:1041

3558 +#: builtin/checkout.c:1035

3559 msgid "paths cannot be used with switching branches"

3560 msgstr "impossible d'utiliser des chemins avec un basculement de branches"

3561

3540 -#: builtin/checkout.c:1044 builtin/checkout.c:1048

3562 +#: builtin/checkout.c:1038 builtin/checkout.c:1042

3563 #, c-format

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

3565 msgstr "'%s' ne peut pas être utilisé avec un basculement de branches"

3566

3545 -#: builtin/checkout.c:1052 builtin/checkout.c:1055 builtin/checkout.c:1060

3546 -#: builtin/checkout.c:1063

3567 +#: builtin/checkout.c:1046 builtin/checkout.c:1049 builtin/checkout.c:1054

3568 +#: builtin/checkout.c:1057

3569 #, c-format

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

3571 msgstr "'%s' ne peut pas être utilisé avec '%s'"

3572

3551 -#: builtin/checkout.c:1068

3573 +#: builtin/checkout.c:1062

3574 #, c-format

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

3576 msgstr "Impossible de basculer de branche vers '%s' qui n'est pas un commit"

3577

3556 -#: builtin/checkout.c:1090 builtin/checkout.c:1092 builtin/clone.c:88

3578 +#: builtin/checkout.c:1084 builtin/checkout.c:1086 builtin/clone.c:88

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

3580 msgid "branch"

3581 msgstr "branche"

3582

3561 -#: builtin/checkout.c:1091

3583 +#: builtin/checkout.c:1085

3584 msgid "create and checkout a new branch"

3585 msgstr "créer et extraire une nouvelle branche"

3586

3565 -#: builtin/checkout.c:1093

3587 +#: builtin/checkout.c:1087

3588 msgid "create/reset and checkout a branch"

3589 msgstr "créer/réinitialiser et extraire une branche"

3590

3569 -#: builtin/checkout.c:1094

3591 +#: builtin/checkout.c:1088

3592 msgid "create reflog for new branch"

3593 msgstr "créer un reflog pour une nouvelle branche"

3594

3573 -#: builtin/checkout.c:1095

3595 +#: builtin/checkout.c:1089

3596 msgid "detach the HEAD at named commit"

3597 msgstr "détacher la HEAD à la validation nommée"

3598

3577 -#: builtin/checkout.c:1096

3599 +#: builtin/checkout.c:1090

3600 msgid "set upstream info for new branch"

3601 msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche"

3602

3581 -#: builtin/checkout.c:1098

3603 +#: builtin/checkout.c:1092

3604 msgid "new-branch"

3605 msgstr "nouvelle branche"

3606

3585 -#: builtin/checkout.c:1098

3607 +#: builtin/checkout.c:1092

3608 msgid "new unparented branch"

3609 msgstr "nouvelle branche sans parent"

3610

3589 -#: builtin/checkout.c:1099

3611 +#: builtin/checkout.c:1093

3612 msgid "checkout our version for unmerged files"

3613 msgstr "extraire notre version pour les fichiers non fusionnés"

3614

3593 -#: builtin/checkout.c:1101

3615 +#: builtin/checkout.c:1095

3616 msgid "checkout their version for unmerged files"

3617 msgstr "extraire leur version pour les fichiers non fusionnés"

3618

3597 -#: builtin/checkout.c:1103

3619 +#: builtin/checkout.c:1097

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

3621 msgstr "forcer l'extraction (laisser tomber les modifications locales)"

3622

3601 -#: builtin/checkout.c:1104

3623 +#: builtin/checkout.c:1098

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

3625 msgstr "effectuer une fusion à 3 points avec la nouvelle branche"

3626

3605 -#: builtin/checkout.c:1105 builtin/merge.c:225

3627 +#: builtin/checkout.c:1099 builtin/merge.c:225

3628 msgid "update ignored files (default)"

3629 msgstr "mettre à jour les fichiers ignorés (par défaut)"

3630

3609 -#: builtin/checkout.c:1106 builtin/log.c:1228 parse-options.h:245

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

3632 msgid "style"

3633 msgstr "style"

3634

3613 -#: builtin/checkout.c:1107

3635 +#: builtin/checkout.c:1101

3636 msgid "conflict style (merge or diff3)"

3637 msgstr "style de conflit (fusion ou diff3)"

3638

3617 -#: builtin/checkout.c:1110

3639 +#: builtin/checkout.c:1104

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

3641 msgstr "ne pas limiter les spécificateurs de chemins aux seuls éléments creux"

3642

3621 -#: builtin/checkout.c:1112

3643 +#: builtin/checkout.c:1106

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

3645 msgstr "deuxième chance 'git checkout branche-inexistante'"

3646

3625 -#: builtin/checkout.c:1135

3647 +#: builtin/checkout.c:1129

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

3649 msgstr "-b, -B et --orphan sont mutuellement exclusifs"

3650

3629 -#: builtin/checkout.c:1152

3651 +#: builtin/checkout.c:1146

3652 msgid "--track needs a branch name"

3653 msgstr "--track requiert un nom de branche"

3654

3633 -#: builtin/checkout.c:1159

3655 +#: builtin/checkout.c:1153

3656 msgid "Missing branch name; try -b"

3657 msgstr "Nom de branche manquant ; essayez -b"

3658

3637 -#: builtin/checkout.c:1196

3659 +#: builtin/checkout.c:1190

3660 msgid "invalid path specification"

3661 msgstr "spécification de chemin invalide"

3662

3641 -#: builtin/checkout.c:1203

3663 +#: builtin/checkout.c:1197

3664 #, c-format

3665 msgid ""

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

@@ -3648,12 +3670,12 @@ msgstr ""

3670 "en même temps.\n"

3671 "Souhaitiez-vous extraire '%s' qui ne peut être résolu comme commit ?"

3672

3651 -#: builtin/checkout.c:1208

3673 +#: builtin/checkout.c:1202

3674 #, c-format

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

3676 msgstr "git checkout: --detach n'accepte pas un argument de chemin '%s'"

3677

3656 -#: builtin/checkout.c:1212

3678 +#: builtin/checkout.c:1206

3679 msgid ""

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

3681 "checking out of the index."

@@ -3729,30 +3751,30 @@ msgstr ""

3751 msgid "Huh (%s)?"

3752 msgstr "Hein (%s) ?"

3753

3732 -#: builtin/clean.c:660

3754 +#: builtin/clean.c:659

3755 #, c-format

3756 msgid "Input ignore patterns>> "

3757 msgstr "Entrez les motifs à ignorer>> "

3758

3737 -#: builtin/clean.c:697

3759 +#: builtin/clean.c:696

3760 #, c-format

3761 msgid "WARNING: Cannot find items matched by: %s"

3762 msgstr "ATTENTION : Impossible de trouver les éléments correspondant à : %s"

3763

3742 -#: builtin/clean.c:718

3764 +#: builtin/clean.c:717

3765 msgid "Select items to delete"

3766 msgstr "Sélectionner les éléments à supprimer"

3767

3746 -#: builtin/clean.c:758

3768 +#: builtin/clean.c:757

3769 #, c-format

3770 msgid "remove %s? "

3771 msgstr "supprimer %s ? "

3772

3751 -#: builtin/clean.c:783

3773 +#: builtin/clean.c:782

3774 msgid "Bye."

3775 msgstr "Au revoir."

3776

3755 -#: builtin/clean.c:791

3777 +#: builtin/clean.c:790

3778 msgid ""

3779 "clean - start cleaning\n"

3780 "filter by pattern - exclude items from deletion\n"

@@ -3770,68 +3792,70 @@ msgstr ""

3792 "help - cet écran\n"

3793 "? - aide pour la sélection en ligne"

3794

3773 -#: builtin/clean.c:818

3795 +#: builtin/clean.c:817

3796 msgid "*** Commands ***"

3797 msgstr "*** Commandes ***"

3798

3777 -#: builtin/clean.c:819

3799 +#: builtin/clean.c:818

3800 msgid "What now"

3801 msgstr "Et maintenant ?"

3802

3781 -#: builtin/clean.c:827

3803 +#: builtin/clean.c:826

3804 msgid "Would remove the following item:"

3805 msgid_plural "Would remove the following items:"

3806 msgstr[0] "Supprimerait l'élément suivant :"

3807 msgstr[1] "Supprimerait les éléments suivants :"

3808

3787 -#: builtin/clean.c:844

3809 +#: builtin/clean.c:843

3810 msgid "No more files to clean, exiting."

3811 msgstr "Plus de fichier à nettoyer, sortie."

3812

3791 -#: builtin/clean.c:875

3813 +#: builtin/clean.c:874

3814 msgid "do not print names of files removed"

3815 msgstr "ne pas afficher les noms des fichiers supprimés"

3816

3795 -#: builtin/clean.c:877

3817 +#: builtin/clean.c:876

3818 msgid "force"

3819 msgstr "forcer"

3820

3799 -#: builtin/clean.c:878

3821 +#: builtin/clean.c:877

3822 msgid "interactive cleaning"

3823 msgstr "nettoyage interactif"

3824

3803 -#: builtin/clean.c:880

3825 +#: builtin/clean.c:879

3826 msgid "remove whole directories"

3827 msgstr "supprimer les répertoires entiers"

3828

3807 -#: builtin/clean.c:881 builtin/describe.c:415 builtin/grep.c:716

3808 -#: builtin/ls-files.c:486 builtin/name-rev.c:314 builtin/show-ref.c:185

3829 +#: builtin/clean.c:880 builtin/describe.c:406 builtin/grep.c:714

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

3831 msgid "pattern"

3832 msgstr "motif"

3833

3812 -#: builtin/clean.c:882

3834 +#: builtin/clean.c:881

3835 msgid "add <pattern> to ignore rules"

3836 msgstr "ajouter <motif> aux règles ignore"

3837

3816 -#: builtin/clean.c:883

3838 +#: builtin/clean.c:882

3839 msgid "remove ignored files, too"

3840 msgstr "supprimer les fichiers ignorés, aussi"

3841

3820 -#: builtin/clean.c:885

3842 +#: builtin/clean.c:884

3843 msgid "remove only ignored files"

3844 msgstr "supprimer seulement les fichiers ignorés"

3845

3824 -#: builtin/clean.c:903

3846 +#: builtin/clean.c:902

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

3848 msgstr "-x et -X ne peuvent pas être utilisés ensemble"

3849

3828 -#: builtin/clean.c:907

3850 +#: builtin/clean.c:906

3851 msgid ""

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

3853 "clean"

3832 -msgstr "clean.requireForce positionné à true et ni -i, -n ou -f fourni ; refus de nettoyer"

3854 +msgstr ""

3855 +"clean.requireForce positionné à true et ni -i, -n ou -f fourni ; refus de "

3856 +"nettoyer"

3857

3834 -#: builtin/clean.c:910

3858 +#: builtin/clean.c:909

3859 msgid ""

3860 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "

3861 "refusing to clean"

@@ -3843,8 +3867,8 @@ msgstr ""

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

3868 msgstr "git clone [options] [--] <dépôt> [<répertoire>]"

3869

3846 -#: builtin/clone.c:64 builtin/fetch.c:97 builtin/merge.c:222

3847 -#: builtin/push.c:504

3870 +#: builtin/clone.c:64 builtin/fetch.c:112 builtin/merge.c:222

3871 +#: builtin/push.c:503

3872 msgid "force progress reporting"

3873 msgstr "forcer l'affichage de l'état d'avancement"

3874

@@ -3904,7 +3928,7 @@ msgstr "extraire <branche> au lieu de la HEAD du répertoire distant"

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

3929 msgstr "chemin vers git-upload-pack sur le serveur distant"

3930

3907 -#: builtin/clone.c:92 builtin/fetch.c:98 builtin/grep.c:661

3931 +#: builtin/clone.c:92 builtin/fetch.c:113 builtin/grep.c:659

3932 msgid "depth"

3933 msgstr "profondeur"

3934

@@ -4006,98 +4030,98 @@ msgstr "Vérification de la connectivité... "

4030 msgid "remote did not send all necessary objects"

4031 msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires"

4032

4009 -#: builtin/clone.c:626

4033 +#: builtin/clone.c:627

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

4035 msgstr ""

4036 "la HEAD distante réfère à une référence non existante, impossible de "

4037 "l'extraire.\n"

4038

4015 -#: builtin/clone.c:657

4039 +#: builtin/clone.c:658

4040 msgid "unable to checkout working tree"

4041 msgstr "impossible d'extraire la copie de travail"

4042

4019 -#: builtin/clone.c:765

4043 +#: builtin/clone.c:768

4044 msgid "Too many arguments."

4045 msgstr "Trop d'arguments."

4046

4023 -#: builtin/clone.c:769

4047 +#: builtin/clone.c:772

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

4049 msgstr "Vous devez spécifier un dépôt à cloner."

4050

4027 -#: builtin/clone.c:780

4051 +#: builtin/clone.c:783

4052 #, c-format

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

4054 msgstr "les options --bare et --origin %s sont incompatibles."

4055

4032 -#: builtin/clone.c:783

4056 +#: builtin/clone.c:786

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

4058 msgstr "--bare et --separate-git-dir sont incompatibles."

4059

4036 -#: builtin/clone.c:796

4060 +#: builtin/clone.c:799

4061 #, c-format

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

4063 msgstr "le dépôt '%s' n'existe pas"

4064

4041 -#: builtin/clone.c:802

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

4043 -msgstr ""

4044 -"--depth est ignoré dans les clones locaux : utilisez plutôt \"file://\"."

4045 -

4046 -#: builtin/clone.c:805

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

4048 -msgstr "le dépôt source est superficiel, option --local ignorée"

4049 -

4050 -#: builtin/clone.c:810

4051 -msgid "--local is ignored"

4052 -msgstr "--local est ignoré"

4053 -

4054 -#: builtin/clone.c:814 builtin/fetch.c:1119

4065 +#: builtin/clone.c:805 builtin/fetch.c:1143

4066 #, c-format

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

4068 msgstr "la profondeur %s n'est pas un entier positif"

4069

4059 -#: builtin/clone.c:824

4070 +#: builtin/clone.c:815

4071 #, c-format

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

4073 msgstr ""

4074 "le chemin de destination '%s' existe déjà et n'est pas un répertoire vide."

4075

4065 -#: builtin/clone.c:834

4076 +#: builtin/clone.c:825

4077 #, c-format

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

4079 msgstr "la copie de travail '%s' existe déjà."

4080

4070 -#: builtin/clone.c:847 builtin/clone.c:859

4081 +#: builtin/clone.c:838 builtin/clone.c:850

4082 #, c-format

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

4084 msgstr "impossible de créer les répertoires de premier niveau dans '%s'"

4085

4075 -#: builtin/clone.c:850

4086 +#: builtin/clone.c:841

4087 #, c-format

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

4089 msgstr "impossible de créer le répertoire de la copie de travail '%s'."

4090

4080 -#: builtin/clone.c:869

4091 +#: builtin/clone.c:860

4092 #, c-format

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

4094 msgstr "Clonage dans le dépôt nu '%s'\n"

4095

4085 -#: builtin/clone.c:871

4096 +#: builtin/clone.c:862

4097 #, c-format

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

4099 msgstr "Clonage dans '%s'...\n"

4100

4101 +#: builtin/clone.c:898

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

4103 +msgstr ""

4104 +"--depth est ignoré dans les clones locaux : utilisez plutôt \"file://\"."

4105 +

4106 +#: builtin/clone.c:901

4107 +msgid "source repository is shallow, ignoring --local"

4108 +msgstr "le dépôt source est superficiel, option --local ignorée"

4109 +

4110 #: builtin/clone.c:906

4111 +msgid "--local is ignored"

4112 +msgstr "--local est ignoré"

4113 +

4114 +#: builtin/clone.c:910

4115 #, c-format

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

4117 msgstr "Je ne sais pas cloner %s"

4118

4095 -#: builtin/clone.c:957 builtin/clone.c:965

4119 +#: builtin/clone.c:961 builtin/clone.c:969

4120 #, c-format

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

4122 msgstr "La branche distante %s n'a pas été trouvée dans le dépôt amont %s"

4123

4100 -#: builtin/clone.c:968

4124 +#: builtin/clone.c:972

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

4126 msgstr "Vous semblez avoir cloné un dépôt vide."

4127

@@ -4217,89 +4241,98 @@ msgstr ""

4241 msgid "failed to unpack HEAD tree object"

4242 msgstr "échec du dépaquetage de l'objet arbre HEAD"

4243

4220 -#: builtin/commit.c:330

4244 +#: builtin/commit.c:328

4245 msgid "unable to create temporary index"

4246 msgstr "impossible de créer l'index temporaire"

4247

4224 -#: builtin/commit.c:336

4248 +#: builtin/commit.c:334

4249 msgid "interactive add failed"

4250 msgstr "échec de l'ajout interactif"

4251

4228 -#: builtin/commit.c:369 builtin/commit.c:390 builtin/commit.c:440

4252 +#: builtin/commit.c:366 builtin/commit.c:387 builtin/commit.c:435

4253 msgid "unable to write new_index file"

4254 msgstr "impossible d'écrire le fichier new_index"

4255

4232 -#: builtin/commit.c:421

4256 +#: builtin/commit.c:418

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

4258 msgstr "impossible de faire une validation partielle pendant une fusion."

4259

4236 -#: builtin/commit.c:423

4260 +#: builtin/commit.c:420

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

4262 msgstr "impossible de faire une validation partielle pendant un picorage."

4263

4240 -#: builtin/commit.c:433

4264 +#: builtin/commit.c:429

4265 msgid "cannot read the index"

4266 msgstr "impossible de lire l'index"

4267

4244 -#: builtin/commit.c:453

4268 +#: builtin/commit.c:447

4269 msgid "unable to write temporary index file"

4270 msgstr "impossible d'écrire le fichier d'index temporaire"

4271

4248 -#: builtin/commit.c:544 builtin/commit.c:550

4272 +#: builtin/commit.c:557 builtin/commit.c:563

4273 #, c-format

4274 msgid "invalid commit: %s"

4275 msgstr "commit invalide : %s"

4276

4253 -#: builtin/commit.c:572

4277 +#: builtin/commit.c:585

4278 msgid "malformed --author parameter"

4279 msgstr "paramètre --author mal formé"

4280

4281 #: builtin/commit.c:592

4282 #, c-format

4283 +msgid "invalid date format: %s"

4284 +msgstr "format de date invalide : %s"

4285 +

4286 +#: builtin/commit.c:609

4287 +#, c-format

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

4289 msgstr "Chaîne ident mal formée : '%s'"

4290

4262 -#: builtin/commit.c:629 builtin/commit.c:663 builtin/commit.c:1014

4291 +#: builtin/commit.c:642

4292 +msgid ""

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

4294 +"in the current commit message"

4295 +msgstr ""

4296 +"impossible de sélectionner un caractère de commentaire\n"

4297 +"qui n'est pas utilisé dans le message de validation actuel"

4298 +

4299 +#: builtin/commit.c:679 builtin/commit.c:712 builtin/commit.c:1086

4300 #, c-format

4301 msgid "could not lookup commit %s"

4302 msgstr "impossible de rechercher le commit %s"

4303

4267 -#: builtin/commit.c:641 builtin/shortlog.c:273

4304 +#: builtin/commit.c:691 builtin/shortlog.c:273

4305 #, c-format

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

4307 msgstr "(lecture du message de journal depuis l'entrée standard)\n"

4308

4272 -#: builtin/commit.c:643

4309 +#: builtin/commit.c:693

4310 msgid "could not read log from standard input"

4311 msgstr "impossible de lire le journal depuis l'entrée standard"

4312

4276 -#: builtin/commit.c:647

4313 +#: builtin/commit.c:697

4314 #, c-format

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

4316 msgstr "impossible de lire le fichier de journal '%s'"

4317

4281 -#: builtin/commit.c:654

4282 -msgid "commit has empty message"

4283 -msgstr "le commit a un message vide"

4284 -

4285 -#: builtin/commit.c:670

4318 +#: builtin/commit.c:719

4319 msgid "could not read MERGE_MSG"

4320 msgstr "impossible de lire MERGE_MSG"

4321

4289 -#: builtin/commit.c:674

4322 +#: builtin/commit.c:723

4323 msgid "could not read SQUASH_MSG"

4324 msgstr "impossible de lire SQUASH_MSG"

4325

4293 -#: builtin/commit.c:678

4326 +#: builtin/commit.c:727

4327 #, c-format

4328 msgid "could not read '%s'"

4329 msgstr "impossible de lire '%s'"

4330

4298 -#: builtin/commit.c:749

4331 +#: builtin/commit.c:798

4332 msgid "could not write commit template"

4333 msgstr "impossible d'écrire le modèle de commit"

4334

4302 -#: builtin/commit.c:764

4335 +#: builtin/commit.c:816

4336 #, c-format

4337 msgid ""

4338 "\n"

@@ -4314,7 +4347,7 @@ msgstr ""

4347 "\t%s\n"

4348 "et essayez à nouveau.\n"

4349

4317 -#: builtin/commit.c:769

4350 +#: builtin/commit.c:821

4351 #, c-format

4352 msgid ""

4353 "\n"

@@ -4329,7 +4362,7 @@ msgstr ""

4362 "\t%s\n"

4363 "et essayez à nouveau.\n"

4364

4332 -#: builtin/commit.c:782

4365 +#: builtin/commit.c:834

4366 #, c-format

4367 msgid ""

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

@@ -4339,7 +4372,7 @@ msgstr ""

4372 "commençant par '%c' seront ignorées, et un message vide abandonne la "

4373 "validation.\n"

4374

4342 -#: builtin/commit.c:789

4375 +#: builtin/commit.c:841

4376 #, c-format

4377 msgid ""

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

@@ -4350,142 +4383,147 @@ msgstr ""

4383 "commençant par '%c' seront conservées ; vous pouvez les supprimer vous-même\n"

4384 "si vous le souhaitez. Un message vide abandonne la validation.\n"

4385

4353 -#: builtin/commit.c:802

4386 +#: builtin/commit.c:855

4387 #, c-format

4355 -msgid "%sAuthor: %s"

4356 -msgstr "%sAuteur : %s"

4388 +msgid "%sAuthor: %.*s <%.*s>"

4389 +msgstr "%sAuteur : %.*s <%.*s>"

4390

4358 -#: builtin/commit.c:809

4391 +#: builtin/commit.c:863

4392 #, c-format

4360 -msgid "%sCommitter: %s"

4361 -msgstr "%sValidateur : %s"

4393 +msgid "%sDate: %s"

4394 +msgstr "%sDate : %s"

4395

4363 -#: builtin/commit.c:829

4396 +#: builtin/commit.c:870

4397 +#, c-format

4398 +msgid "%sCommitter: %.*s <%.*s>"

4399 +msgstr "%sValidateur : %.*s <%.*s>"

4400 +

4401 +#: builtin/commit.c:888

4402 msgid "Cannot read index"

4403 msgstr "Impossible de lire l'index"

4404

4367 -#: builtin/commit.c:872

4405 +#: builtin/commit.c:945

4406 msgid "Error building trees"

4407 msgstr "Erreur lors de la construction des arbres"

4408

4371 -#: builtin/commit.c:887 builtin/tag.c:391

4409 +#: builtin/commit.c:960 builtin/tag.c:495

4410 #, c-format

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

4412 msgstr "Veuillez fournir le message en utilisant l'option -m ou -F.\n"

4413

4376 -#: builtin/commit.c:989

4414 +#: builtin/commit.c:1061

4415 #, c-format

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

4417 msgstr "Aucun auteur existant trouvé avec '%s'"

4418

4381 -#: builtin/commit.c:1004 builtin/commit.c:1244

4419 +#: builtin/commit.c:1076 builtin/commit.c:1316

4420 #, c-format

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

4422 msgstr "Mode de fichier non suivi invalide '%s'"

4423

4386 -#: builtin/commit.c:1041

4424 +#: builtin/commit.c:1113

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

4426 msgstr "--long et -z sont incompatibles"

4427

4390 -#: builtin/commit.c:1071

4428 +#: builtin/commit.c:1143

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

4430 msgstr "L'utilisation simultanée de --reset-author et --author n'a pas de sens"

4431

4394 -#: builtin/commit.c:1080

4432 +#: builtin/commit.c:1152

4433 msgid "You have nothing to amend."

4434 msgstr "Il n'y a rien à corriger."

4435

4398 -#: builtin/commit.c:1083

4436 +#: builtin/commit.c:1155

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

4438 msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)."

4439

4402 -#: builtin/commit.c:1085

4440 +#: builtin/commit.c:1157

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

4442 msgstr "Vous êtes en plein picorage -- impossible de corriger (amend)."

4443

4406 -#: builtin/commit.c:1088

4444 +#: builtin/commit.c:1160

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

4446 msgstr "Les options --squash et --fixup ne peuvent pas être utilisées ensemble"

4447

4410 -#: builtin/commit.c:1098

4448 +#: builtin/commit.c:1170

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

4450 msgstr "Une seule option parmi -c/-C/-F/--fixup peut être utilisée."

4451

4414 -#: builtin/commit.c:1100

4452 +#: builtin/commit.c:1172

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

4454 msgstr "L'option -m ne peut pas être combinée avec -c/-C/-F/--fixup."

4455

4418 -#: builtin/commit.c:1108

4456 +#: builtin/commit.c:1180

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

4458 msgstr "--reset-author ne peut être utilisé qu'avec -C, -c ou --amend."

4459

4422 -#: builtin/commit.c:1125

4460 +#: builtin/commit.c:1197

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

4462 msgstr ""

4463 "Une seule option parmi --include/--only/--all/--interactive/--patch peut "

4464 "être utilisée."

4465

4428 -#: builtin/commit.c:1127

4466 +#: builtin/commit.c:1199

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

4468 msgstr "Aucun chemin avec les options --include/--only n'a pas de sens."

4469

4432 -#: builtin/commit.c:1129

4470 +#: builtin/commit.c:1201

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

4472 msgstr "Malin... correction du dernier avec un index sale."

4473

4436 -#: builtin/commit.c:1131

4474 +#: builtin/commit.c:1203

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

4476 msgstr "Chemins explicites spécifiés sans -i ni -o ; --only supposé..."

4477

4440 -#: builtin/commit.c:1143 builtin/tag.c:639

4478 +#: builtin/commit.c:1215 builtin/tag.c:727

4479 #, c-format

4480 msgid "Invalid cleanup mode %s"

4481 msgstr "Mode de nettoyage invalide %s"

4482

4445 -#: builtin/commit.c:1148

4483 +#: builtin/commit.c:1220

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

4485 msgstr "Spécifier des chemins avec l'option -a n'a pas de sens."

4486

4449 -#: builtin/commit.c:1258 builtin/commit.c:1516

4487 +#: builtin/commit.c:1330 builtin/commit.c:1595

4488 msgid "show status concisely"

4489 msgstr "afficher le statut avec concision"

4490

4453 -#: builtin/commit.c:1260 builtin/commit.c:1518

4491 +#: builtin/commit.c:1332 builtin/commit.c:1597

4492 msgid "show branch information"

4493 msgstr "afficher l'information de branche"

4494

4457 -#: builtin/commit.c:1262 builtin/commit.c:1520 builtin/push.c:490

4495 +#: builtin/commit.c:1334 builtin/commit.c:1599 builtin/push.c:489

4496 msgid "machine-readable output"

4497 msgstr "sortie pour traitement automatique"

4498

4461 -#: builtin/commit.c:1265 builtin/commit.c:1522

4499 +#: builtin/commit.c:1337 builtin/commit.c:1601

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

4501 msgstr "afficher le statut en format long (par défaut)"

4502

4465 -#: builtin/commit.c:1268 builtin/commit.c:1525

4503 +#: builtin/commit.c:1340 builtin/commit.c:1604

4504 msgid "terminate entries with NUL"

4505 msgstr "terminer les éléments par NUL"

4506

4469 -#: builtin/commit.c:1270 builtin/commit.c:1528 builtin/fast-export.c:674

4470 -#: builtin/fast-export.c:677 builtin/tag.c:514

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

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

4509 msgid "mode"

4510 msgstr "mode"

4511

4474 -#: builtin/commit.c:1271 builtin/commit.c:1528

4512 +#: builtin/commit.c:1343 builtin/commit.c:1607

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

4514 msgstr ""

4515 "afficher les fichiers non suivis, \"mode\" facultatif : all (tous), normal, "

4516 "no. (Défaut : all)"

4517

4480 -#: builtin/commit.c:1274

4518 +#: builtin/commit.c:1346

4519 msgid "show ignored files"

4520 msgstr "afficher les fichiers ignorés"

4521

4484 -#: builtin/commit.c:1275 parse-options.h:153

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

4523 msgid "when"

4524 msgstr "quand"

4525

4488 -#: builtin/commit.c:1276

4526 +#: builtin/commit.c:1348

4527 msgid ""

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

4529 "(Default: all)"

@@ -4493,217 +4531,217 @@ msgstr ""

4531 "ignorer les modifications dans les sous-modules, \"quand\" facultatif : all "

4532 "(tous), dirty (sale), untracked (non suivi). (Défaut : all)"

4533

4496 -#: builtin/commit.c:1278

4534 +#: builtin/commit.c:1350

4535 msgid "list untracked files in columns"

4536 msgstr "afficher les fichiers non suivis en colonnes"

4537

4500 -#: builtin/commit.c:1347

4538 +#: builtin/commit.c:1419

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

4540 msgstr "impossible de retrouver le commit nouvellement créé"

4541

4504 -#: builtin/commit.c:1349

4542 +#: builtin/commit.c:1421

4543 msgid "could not parse newly created commit"

4544 msgstr "impossible d'analyser le commit nouvellement créé"

4545

4508 -#: builtin/commit.c:1390

4546 +#: builtin/commit.c:1469

4547 msgid "detached HEAD"

4548 msgstr "HEAD détachée"

4549

4512 -#: builtin/commit.c:1392

4550 +#: builtin/commit.c:1471

4551 msgid " (root-commit)"

4552 msgstr " (commit racine)"

4553

4516 -#: builtin/commit.c:1486

4554 +#: builtin/commit.c:1565

4555 msgid "suppress summary after successful commit"

4556 msgstr "supprimer le résumé après une validation réussie"

4557

4520 -#: builtin/commit.c:1487

4558 +#: builtin/commit.c:1566

4559 msgid "show diff in commit message template"

4560 msgstr "afficher les diff dans le modèle de message de validation"

4561

4524 -#: builtin/commit.c:1489

4562 +#: builtin/commit.c:1568

4563 msgid "Commit message options"

4564 msgstr "Options du message de validation"

4565

4528 -#: builtin/commit.c:1490 builtin/tag.c:512

4566 +#: builtin/commit.c:1569 builtin/tag.c:600

4567 msgid "read message from file"

4568 msgstr "lire le message depuis un fichier"

4569

4532 -#: builtin/commit.c:1491

4570 +#: builtin/commit.c:1570

4571 msgid "author"

4572 msgstr "auteur"

4573

4536 -#: builtin/commit.c:1491

4574 +#: builtin/commit.c:1570

4575 msgid "override author for commit"

4576 msgstr "remplacer l'auteur pour la validation"

4577

4540 -#: builtin/commit.c:1492 builtin/gc.c:272

4578 +#: builtin/commit.c:1571 builtin/gc.c:286

4579 msgid "date"

4580 msgstr "date"

4581

4544 -#: builtin/commit.c:1492

4582 +#: builtin/commit.c:1571

4583 msgid "override date for commit"

4584 msgstr "remplacer la date pour la validation"

4585

4548 -#: builtin/commit.c:1493 builtin/merge.c:216 builtin/notes.c:409

4549 -#: builtin/notes.c:566 builtin/tag.c:510

4586 +#: builtin/commit.c:1572 builtin/merge.c:216 builtin/notes.c:409

4587 +#: builtin/notes.c:566 builtin/tag.c:598

4588 msgid "message"

4589 msgstr "message"

4590

4553 -#: builtin/commit.c:1493

4591 +#: builtin/commit.c:1572

4592 msgid "commit message"

4593 msgstr "message de validation"

4594

4557 -#: builtin/commit.c:1494

4595 +#: builtin/commit.c:1573

4596 msgid "reuse and edit message from specified commit"

4597 msgstr "réutiliser et éditer le message du commit spécifié"

4598

4561 -#: builtin/commit.c:1495

4599 +#: builtin/commit.c:1574

4600 msgid "reuse message from specified commit"

4601 msgstr "réutiliser le message du commit spécifié"

4602

4565 -#: builtin/commit.c:1496

4603 +#: builtin/commit.c:1575

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

4605 msgstr ""

4606 "utiliser un message au format autosquash pour corriger le commit spécifié"

4607

4570 -#: builtin/commit.c:1497

4608 +#: builtin/commit.c:1576

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

4610 msgstr ""

4611 "utiliser un message au format autosquash pour compresser le commit spécifié"

4612

4575 -#: builtin/commit.c:1498

4613 +#: builtin/commit.c:1577

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

4615 msgstr ""

4616 "à présent je suis l'auteur de la validation (utilisé avec -C/-c/--amend)"

4617

4580 -#: builtin/commit.c:1499 builtin/log.c:1180 builtin/revert.c:86

4618 +#: builtin/commit.c:1578 builtin/log.c:1188 builtin/revert.c:86

4619 msgid "add Signed-off-by:"

4620 msgstr "ajouter une entrée Signed-off-by :"

4621

4584 -#: builtin/commit.c:1500

4622 +#: builtin/commit.c:1579

4623 msgid "use specified template file"

4624 msgstr "utiliser le fichier de modèle spécifié"

4625

4588 -#: builtin/commit.c:1501

4626 +#: builtin/commit.c:1580

4627 msgid "force edit of commit"

4628 msgstr "forcer l'édition du commit"

4629

4592 -#: builtin/commit.c:1502

4630 +#: builtin/commit.c:1581

4631 msgid "default"

4632 msgstr "défaut"

4633

4596 -#: builtin/commit.c:1502 builtin/tag.c:515

4634 +#: builtin/commit.c:1581 builtin/tag.c:603

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

4636 msgstr "comment éliminer les espaces et les commentaires # du message"

4637

4600 -#: builtin/commit.c:1503

4638 +#: builtin/commit.c:1582

4639 msgid "include status in commit message template"

4640 msgstr "inclure le statut dans le modèle de message de validation"

4641

4604 -#: builtin/commit.c:1504 builtin/merge.c:223 builtin/revert.c:92

4605 -#: builtin/tag.c:516

4642 +#: builtin/commit.c:1583 builtin/merge.c:223 builtin/revert.c:92

4643 +#: builtin/tag.c:604

4644 msgid "key-id"

4645 msgstr "id de clé"

4646

4609 -#: builtin/commit.c:1505 builtin/merge.c:224 builtin/revert.c:93

4647 +#: builtin/commit.c:1584 builtin/merge.c:224 builtin/revert.c:93

4648 msgid "GPG sign commit"

4649 msgstr "signer la validation avec GPG"

4650

4613 -#: builtin/commit.c:1508

4651 +#: builtin/commit.c:1587

4652 msgid "Commit contents options"

4653 msgstr "Valider les options des contenus"

4654

4617 -#: builtin/commit.c:1509

4655 +#: builtin/commit.c:1588

4656 msgid "commit all changed files"

4657 msgstr "valider tous les fichiers modifiés"

4658

4621 -#: builtin/commit.c:1510

4659 +#: builtin/commit.c:1589

4660 msgid "add specified files to index for commit"

4661 msgstr "ajouter les fichiers spécifiés à l'index pour la validation"

4662

4625 -#: builtin/commit.c:1511

4663 +#: builtin/commit.c:1590

4664 msgid "interactively add files"

4665 msgstr "ajouter des fichiers en mode interactif"

4666

4629 -#: builtin/commit.c:1512

4667 +#: builtin/commit.c:1591

4668 msgid "interactively add changes"

4669 msgstr "ajouter les modifications en mode interactif"

4670

4633 -#: builtin/commit.c:1513

4671 +#: builtin/commit.c:1592

4672 msgid "commit only specified files"

4673 msgstr "valider seulement les fichiers spécifiés"

4674

4637 -#: builtin/commit.c:1514

4675 +#: builtin/commit.c:1593

4676 msgid "bypass pre-commit hook"

4677 msgstr "éviter d'utiliser le crochet pre-commit"

4678

4641 -#: builtin/commit.c:1515

4679 +#: builtin/commit.c:1594

4680 msgid "show what would be committed"

4681 msgstr "afficher ce qui serait validé"

4682

4645 -#: builtin/commit.c:1526

4683 +#: builtin/commit.c:1605

4684 msgid "amend previous commit"

4685 msgstr "corriger la validation précédente"

4686

4649 -#: builtin/commit.c:1527

4687 +#: builtin/commit.c:1606

4688 msgid "bypass post-rewrite hook"

4689 msgstr "éviter d'utiliser le crochet post-rewrite"

4690

4653 -#: builtin/commit.c:1532

4691 +#: builtin/commit.c:1611

4692 msgid "ok to record an empty change"

4693 msgstr "accepter d'enregistrer une modification vide"

4694

4657 -#: builtin/commit.c:1534

4695 +#: builtin/commit.c:1613

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

4697 msgstr "accepter d'enregistrer une modification avec un message vide"

4698

4661 -#: builtin/commit.c:1562

4699 +#: builtin/commit.c:1641

4700 msgid "could not parse HEAD commit"

4701 msgstr "impossible d'analyser le commit HEAD"

4702

4665 -#: builtin/commit.c:1601 builtin/merge.c:518

4703 +#: builtin/commit.c:1680 builtin/merge.c:518

4704 #, c-format

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

4706 msgstr "impossible d'ouvrir '%s' en lecture"

4707

4670 -#: builtin/commit.c:1608

4708 +#: builtin/commit.c:1687

4709 #, c-format

4710 msgid "Corrupt MERGE_HEAD file (%s)"

4711 msgstr "Fichier MERGE_HEAD corrompu (%s)"

4712

4675 -#: builtin/commit.c:1615

4713 +#: builtin/commit.c:1694

4714 msgid "could not read MERGE_MODE"

4715 msgstr "impossible de lire MERGE_MODE"

4716

4679 -#: builtin/commit.c:1634

4717 +#: builtin/commit.c:1713

4718 #, c-format

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

4720 msgstr "impossible de lire le message de validation : %s"

4721

4684 -#: builtin/commit.c:1645

4722 +#: builtin/commit.c:1724

4723 #, c-format

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

4725 msgstr "Abandon de la validation ; vous n'avez pas édité le message\n"

4726

4689 -#: builtin/commit.c:1650

4727 +#: builtin/commit.c:1729

4728 #, c-format

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

4730 msgstr "Abandon de la validation du à un message de validation vide\n"

4731

4694 -#: builtin/commit.c:1665 builtin/merge.c:857 builtin/merge.c:882

4732 +#: builtin/commit.c:1744 builtin/merge.c:851 builtin/merge.c:876

4733 msgid "failed to write commit object"

4734 msgstr "échec de l'écriture de l'objet commit"

4735

4698 -#: builtin/commit.c:1686

4736 +#: builtin/commit.c:1756

4737 msgid "cannot lock HEAD ref"

4738 msgstr "impossible de verrouiller la référence HEAD"

4739

4702 -#: builtin/commit.c:1690

4740 +#: builtin/commit.c:1769

4741 msgid "cannot update HEAD ref"

4742 msgstr "impossible de mettre à jour la référence HEAD"

4743

4706 -#: builtin/commit.c:1701

4744 +#: builtin/commit.c:1780

4745 msgid ""

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

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

@@ -4858,47 +4896,47 @@ msgstr "git describe [options] <commit ou apparenté>*"

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

4897 msgstr "git describe [options] --dirty"

4898

4861 -#: builtin/describe.c:225

4899 +#: builtin/describe.c:216

4900 #, c-format

4901 msgid "annotated tag %s not available"

4902 msgstr "l'étiquette annotée %s n'est pas disponible"

4903

4866 -#: builtin/describe.c:229

4904 +#: builtin/describe.c:220

4905 #, c-format

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

4907 msgstr "l'étiquette annotée %s n'a pas de nom embarqué"

4908

4871 -#: builtin/describe.c:231

4909 +#: builtin/describe.c:222

4910 #, c-format

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

4912 msgstr "l'étiquette '%s' est en fait '%s'"

4913

4876 -#: builtin/describe.c:258

4914 +#: builtin/describe.c:249

4915 #, c-format

4916 msgid "Not a valid object name %s"

4917 msgstr "%s n'est pas un nom d'objet valide"

4918

4881 -#: builtin/describe.c:261

4919 +#: builtin/describe.c:252

4920 #, c-format

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

4922 msgstr "%s n'est pas un objet '%s' valide"

4923

4886 -#: builtin/describe.c:278

4924 +#: builtin/describe.c:269

4925 #, c-format

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

4927 msgstr "aucune étiquette ne correspond parfaitement à '%s'"

4928

4891 -#: builtin/describe.c:280

4929 +#: builtin/describe.c:271

4930 #, c-format

4931 msgid "searching to describe %s\n"

4932 msgstr "recherche de la description de %s\n"

4933

4896 -#: builtin/describe.c:327

4934 +#: builtin/describe.c:318

4935 #, c-format

4936 msgid "finished search at %s\n"

4937 msgstr "recherche terminée à %s\n"

4938

4901 -#: builtin/describe.c:354

4939 +#: builtin/describe.c:345

4940 #, c-format

4941 msgid ""

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

@@ -4907,7 +4945,7 @@ msgstr ""

4945 "Aucune étiquette annotée ne peut décrire '%s'.\n"

4946 "Cependant, il existe des étiquettes non-annotées : essayez avec --tags."

4947

4910 -#: builtin/describe.c:358

4948 +#: builtin/describe.c:349

4949 #, c-format

4950 msgid ""

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

@@ -4916,12 +4954,12 @@ msgstr ""

4954 "Aucune étiquette ne peut décrire '%s'.\n"

4955 "Essayez --always, ou créez des étiquettes."

4956

4919 -#: builtin/describe.c:379

4957 +#: builtin/describe.c:370

4958 #, c-format

4959 msgid "traversed %lu commits\n"

4960 msgstr "%lu commits parcourus\n"

4961

4924 -#: builtin/describe.c:382

4962 +#: builtin/describe.c:373

4963 #, c-format

4964 msgid ""

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

@@ -4931,64 +4969,64 @@ msgstr ""

4969 "affichées\n"

4970 "abandon de la recherche à %s\n"

4971

4934 -#: builtin/describe.c:404

4972 +#: builtin/describe.c:395

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

4974 msgstr "rechercher l'étiquette qui suit le commit"

4975

4938 -#: builtin/describe.c:405

4976 +#: builtin/describe.c:396

4977 msgid "debug search strategy on stderr"

4978 msgstr "déboguer la stratégie de recherche sur stderr"

4979

4942 -#: builtin/describe.c:406

4980 +#: builtin/describe.c:397

4981 msgid "use any ref"

4982 msgstr "utiliser n'importe quelle référence"

4983

4946 -#: builtin/describe.c:407

4984 +#: builtin/describe.c:398

4985 msgid "use any tag, even unannotated"

4986 msgstr "utiliser n'importe quelle étiquette, même non-annotée"

4987

4950 -#: builtin/describe.c:408

4988 +#: builtin/describe.c:399

4989 msgid "always use long format"

4990 msgstr "toujours utiliser le format long"

4991

4954 -#: builtin/describe.c:409

4992 +#: builtin/describe.c:400

4993 msgid "only follow first parent"

4994 msgstr "ne suivre que le premier parent"

4995

4958 -#: builtin/describe.c:412

4996 +#: builtin/describe.c:403

4997 msgid "only output exact matches"

4998 msgstr "n'afficher que les correspondances exactes"

4999

4962 -#: builtin/describe.c:414

5000 +#: builtin/describe.c:405

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

5002 msgstr ""

5003 "considérer uniquement les <n> étiquettes le plus récentes (défaut : 10)"

5004

4967 -#: builtin/describe.c:416

5005 +#: builtin/describe.c:407

5006 msgid "only consider tags matching <pattern>"

5007 msgstr "ne considérer que les étiquettes correspondant à <motif>"

5008

4971 -#: builtin/describe.c:418 builtin/name-rev.c:321

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

5010 msgid "show abbreviated commit object as fallback"

5011 msgstr "afficher les objets commits abrégés en dernier recours"

5012

4975 -#: builtin/describe.c:419

5013 +#: builtin/describe.c:410

5014 msgid "mark"

5015 msgstr "marque"

5016

4979 -#: builtin/describe.c:420

5017 +#: builtin/describe.c:411

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

5019 msgstr "ajouter <marque> si la copie de travail est sale (défaut : \"-dirty\")"

5020

4983 -#: builtin/describe.c:438

5021 +#: builtin/describe.c:429

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

5023 msgstr "--long et --abbrev=0 sont incompatibles"

5024

4987 -#: builtin/describe.c:464

5025 +#: builtin/describe.c:455

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

5027 msgstr "aucun nom trouvé, impossible de décrire quoi que ce soit."

5028

4991 -#: builtin/describe.c:484

5029 +#: builtin/describe.c:475

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

5031 msgstr "--dirty est incompatible avec la spécification de commits ou assimilés"

5032

@@ -5021,47 +5059,55 @@ msgstr "plus de deux blobs spécifiés : '%s'"

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

5060 msgstr "objet non géré '%s' spécifié."

5061

5024 -#: builtin/fast-export.c:22

5062 +#: builtin/fast-export.c:23

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

5064 msgstr "git fast-export [options-de-liste-de-révisions]"

5065

5028 -#: builtin/fast-export.c:673

5066 +#: builtin/fast-export.c:702

5067 msgid "show progress after <n> objects"

5068 msgstr "afficher la progression après <n> objets"

5069

5032 -#: builtin/fast-export.c:675

5070 +#: builtin/fast-export.c:704

5071 msgid "select handling of signed tags"

5072 msgstr "sélectionner la gestion des étiquettes signées"

5073

5036 -#: builtin/fast-export.c:678

5074 +#: builtin/fast-export.c:707

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

5076 msgstr ""

5077 "sélectionner la gestion des étiquettes qui pointent sur des objets filtrés"

5078

5041 -#: builtin/fast-export.c:681

5079 +#: builtin/fast-export.c:710

5080 msgid "Dump marks to this file"

5081 msgstr "Enregistrer les marques dans ce fichier"

5082

5045 -#: builtin/fast-export.c:683

5083 +#: builtin/fast-export.c:712

5084 msgid "Import marks from this file"

5085 msgstr "importer les marques depuis ce fichier"

5086

5049 -#: builtin/fast-export.c:685

5087 +#: builtin/fast-export.c:714

5088 msgid "Fake a tagger when tags lack one"

5089 msgstr "falsifier un auteur d'étiquette si l'étiquette n'en présente pas"

5090

5053 -#: builtin/fast-export.c:687

5091 +#: builtin/fast-export.c:716

5092 msgid "Output full tree for each commit"

5093 msgstr "Afficher l'arbre complet pour chaque commit"

5094

5057 -#: builtin/fast-export.c:689

5095 +#: builtin/fast-export.c:718

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

5097 msgstr "Utiliser la fonction \"done\" pour terminer le flux"

5098

5061 -#: builtin/fast-export.c:690

5099 +#: builtin/fast-export.c:719

5100 msgid "Skip output of blob data"

5101 msgstr "Sauter l'affichage de données de blob"

5102

5103 +#: builtin/fast-export.c:720

5104 +msgid "refspec"

5105 +msgstr "spécificateur de référence"

5106 +

5107 +#: builtin/fast-export.c:721

5108 +msgid "Apply refspec to exported refs"

5109 +msgstr "Appliquer le spécificateur de référence aux références exportées"

5110 +

5111 #: builtin/fetch.c:20

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

5113 msgstr "git fetch [<options>] [<dépôt> [<spécification-de-référence>...]]"

@@ -5078,156 +5124,164 @@ msgstr "git fetch --multiple [<options>] [(<dépôt> | <groupe>)...]"

5124 msgid "git fetch --all [<options>]"

5125 msgstr "git fetch --all [<options>]"

5126

5081 -#: builtin/fetch.c:75

5127 +#: builtin/fetch.c:90

5128 msgid "fetch from all remotes"

5129 msgstr "récupérer depuis tous le dépôts distants"

5130

5085 -#: builtin/fetch.c:77

5131 +#: builtin/fetch.c:92

5132 msgid "append to .git/FETCH_HEAD instead of overwriting"

5133 msgstr "ajouter à .git/FETCH_HEAD au lieu de l'écraser"

5134

5089 -#: builtin/fetch.c:79

5135 +#: builtin/fetch.c:94

5136 msgid "path to upload pack on remote end"

5137 msgstr "chemin vers lequel télécharger le paquet sur le poste distant"

5138

5093 -#: builtin/fetch.c:80

5139 +#: builtin/fetch.c:95

5140 msgid "force overwrite of local branch"

5141 msgstr "forcer l'écrasement de la branche locale"

5142

5097 -#: builtin/fetch.c:82

5143 +#: builtin/fetch.c:97

5144 msgid "fetch from multiple remotes"

5145 msgstr "récupérer depuis plusieurs dépôts distants"

5146

5101 -#: builtin/fetch.c:84

5147 +#: builtin/fetch.c:99

5148 msgid "fetch all tags and associated objects"

5149 msgstr "récupérer toutes les étiquettes et leurs objets associés"

5150

5105 -#: builtin/fetch.c:86

5151 +#: builtin/fetch.c:101

5152 msgid "do not fetch all tags (--no-tags)"

5153 msgstr "ne pas récupérer toutes les étiquettes (--no-tags)"

5154

5109 -#: builtin/fetch.c:88

5155 +#: builtin/fetch.c:103

5156 msgid "prune remote-tracking branches no longer on remote"

5157 msgstr ""

5158 "éliminer les branches de suivi distant si la branche n'existe plus dans le "

5159 "dépôt distant"

5160

5115 -#: builtin/fetch.c:89

5161 +#: builtin/fetch.c:104

5162 msgid "on-demand"

5163 msgstr "à la demande"

5164

5119 -#: builtin/fetch.c:90

5165 +#: builtin/fetch.c:105

5166 msgid "control recursive fetching of submodules"

5167 msgstr "contrôler la récupération récursive dans les sous-modules"

5168

5123 -#: builtin/fetch.c:94

5169 +#: builtin/fetch.c:109

5170 msgid "keep downloaded pack"

5171 msgstr "conserver le paquet téléchargé"

5172

5127 -#: builtin/fetch.c:96

5173 +#: builtin/fetch.c:111

5174 msgid "allow updating of HEAD ref"

5175 msgstr "permettre la mise à jour de la référence HEAD"

5176

5131 -#: builtin/fetch.c:99

5177 +#: builtin/fetch.c:114

5178 msgid "deepen history of shallow clone"

5179 msgstr "approfondir l'historique d'un clone superficiel"

5180

5135 -#: builtin/fetch.c:101

5181 +#: builtin/fetch.c:116

5182 msgid "convert to a complete repository"

5183 msgstr "convertir en un dépôt complet"

5184

5139 -#: builtin/fetch.c:103 builtin/log.c:1197

5185 +#: builtin/fetch.c:118 builtin/log.c:1205

5186 msgid "dir"

5187 msgstr "dir"

5188

5143 -#: builtin/fetch.c:104

5189 +#: builtin/fetch.c:119

5190 msgid "prepend this to submodule path output"

5191 msgstr "préfixer ceci à la sortie du chemin du sous-module"

5192

5147 -#: builtin/fetch.c:107

5193 +#: builtin/fetch.c:122

5194 msgid "default mode for recursion"

5195 msgstr "mode par défaut pour la récursion"

5196

5151 -#: builtin/fetch.c:109

5197 +#: builtin/fetch.c:124

5198 msgid "accept refs that update .git/shallow"

5199 msgstr "accepter les références qui mettent à jour .git/shallow"

5200

5155 -#: builtin/fetch.c:347

5201 +#: builtin/fetch.c:125

5202 +msgid "refmap"

5203 +msgstr "correspondance de référence"

5204 +

5205 +#: builtin/fetch.c:126

5206 +msgid "specify fetch refmap"

5207 +msgstr "spécifier une correspondance de référence pour la récupération"

5208 +

5209 +#: builtin/fetch.c:376

5210 msgid "Couldn't find remote ref HEAD"

5211 msgstr "impossible de trouver la référence HEAD distante"

5212

5159 -#: builtin/fetch.c:411

5213 +#: builtin/fetch.c:440

5214 #, c-format

5215 msgid "object %s not found"

5216 msgstr "objet %s non trouvé"

5217

5164 -#: builtin/fetch.c:416

5218 +#: builtin/fetch.c:445

5219 msgid "[up to date]"

5220 msgstr "[à jour]"

5221

5168 -#: builtin/fetch.c:430

5222 +#: builtin/fetch.c:459

5223 #, c-format

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

5225 msgstr "! %-*s %-*s -> %s (impossible de récupérer la branche actuelle)"

5226

5173 -#: builtin/fetch.c:431 builtin/fetch.c:517

5227 +#: builtin/fetch.c:460 builtin/fetch.c:546

5228 msgid "[rejected]"

5229 msgstr "[rejeté]"

5230

5177 -#: builtin/fetch.c:442

5231 +#: builtin/fetch.c:471

5232 msgid "[tag update]"

5233 msgstr "[mise à jour de l'étiquette]"

5234

5181 -#: builtin/fetch.c:444 builtin/fetch.c:479 builtin/fetch.c:497

5235 +#: builtin/fetch.c:473 builtin/fetch.c:508 builtin/fetch.c:526

5236 msgid " (unable to update local ref)"

5237 msgstr " (impossible de mettre à jour la référence locale)"

5238

5185 -#: builtin/fetch.c:462

5239 +#: builtin/fetch.c:491

5240 msgid "[new tag]"

5241 msgstr "[nouvelle étiquette]"

5242

5189 -#: builtin/fetch.c:465

5243 +#: builtin/fetch.c:494

5244 msgid "[new branch]"

5245 msgstr "[nouvelle branche]"

5246

5193 -#: builtin/fetch.c:468

5247 +#: builtin/fetch.c:497

5248 msgid "[new ref]"

5249 msgstr "[nouvelle référence]"

5250

5197 -#: builtin/fetch.c:513

5251 +#: builtin/fetch.c:542

5252 msgid "unable to update local ref"

5253 msgstr "impossible de mettre à jour la référence locale"

5254

5201 -#: builtin/fetch.c:513

5255 +#: builtin/fetch.c:542

5256 msgid "forced update"

5257 msgstr "mise à jour forcée"

5258

5205 -#: builtin/fetch.c:519

5259 +#: builtin/fetch.c:548

5260 msgid "(non-fast-forward)"

5261 msgstr "(pas d'avance rapide)"

5262

5209 -#: builtin/fetch.c:552 builtin/fetch.c:785

5263 +#: builtin/fetch.c:581 builtin/fetch.c:814

5264 #, c-format

5265 msgid "cannot open %s: %s\n"

5266 msgstr "impossible d'ouvrir %s : %s\n"

5267

5214 -#: builtin/fetch.c:561

5268 +#: builtin/fetch.c:590

5269 #, c-format

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

5271 msgstr "%s n'a pas envoyé tous les objets nécessaires\n"

5272

5219 -#: builtin/fetch.c:579

5273 +#: builtin/fetch.c:608

5274 #, c-format

5275 msgid "reject %s because shallow roots are not allowed to be updated"

5276 msgstr ""

5277 "%s rejeté parce que les racines superficielles ne sont pas mises à jour"

5278

5225 -#: builtin/fetch.c:667 builtin/fetch.c:750

5279 +#: builtin/fetch.c:696 builtin/fetch.c:779

5280 #, c-format

5281 msgid "From %.*s\n"

5282 msgstr "Depuis %.*s\n"

5283

5230 -#: builtin/fetch.c:678

5284 +#: builtin/fetch.c:707

5285 #, c-format

5286 msgid ""

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

@@ -5236,55 +5290,55 @@ msgstr ""

5290 "des références locales n'ont pas pu être mises à jour ; essayez de lancer\n"

5291 " 'git remote prune %s' pour supprimer des branches anciennes en conflit"

5292

5239 -#: builtin/fetch.c:730

5293 +#: builtin/fetch.c:759

5294 #, c-format

5295 msgid " (%s will become dangling)"

5296 msgstr " (%s sera en suspens)"

5297

5244 -#: builtin/fetch.c:731

5298 +#: builtin/fetch.c:760

5299 #, c-format

5300 msgid " (%s has become dangling)"

5301 msgstr " (%s est devenu en suspens)"

5302

5249 -#: builtin/fetch.c:755

5303 +#: builtin/fetch.c:784

5304 msgid "[deleted]"

5305 msgstr "[supprimé]"

5306

5253 -#: builtin/fetch.c:756 builtin/remote.c:1050

5307 +#: builtin/fetch.c:785 builtin/remote.c:1059

5308 msgid "(none)"

5309 msgstr "(aucun(e))"

5310

5257 -#: builtin/fetch.c:775

5311 +#: builtin/fetch.c:804

5312 #, c-format

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

5314 msgstr "Refus de récupérer dans la branche courant %s d'un dépôt non nu"

5315

5262 -#: builtin/fetch.c:794

5316 +#: builtin/fetch.c:823

5317 #, c-format

5318 msgid "Option \"%s\" value \"%s\" is not valid for %s"

5319 msgstr "La valeur \"%2$s\" de l'option \"%1$s\" est invalide pour %3$s"

5320

5267 -#: builtin/fetch.c:797

5321 +#: builtin/fetch.c:826

5322 #, c-format

5323 msgid "Option \"%s\" is ignored for %s\n"

5324 msgstr "L'option \"%s\" est ignorée pour %s\n"

5325

5272 -#: builtin/fetch.c:853

5326 +#: builtin/fetch.c:882

5327 #, c-format

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

5329 msgstr "Je ne sais pas récupérer depuis %s"

5330

5277 -#: builtin/fetch.c:1015

5331 +#: builtin/fetch.c:1044

5332 #, c-format

5333 msgid "Fetching %s\n"

5334 msgstr "Récupération de %s\n"

5335

5282 -#: builtin/fetch.c:1017 builtin/remote.c:90

5336 +#: builtin/fetch.c:1046 builtin/remote.c:90

5337 #, c-format

5338 msgid "Could not fetch %s"

5339 msgstr "Impossible de récupérer %s"

5340

5287 -#: builtin/fetch.c:1035

5341 +#: builtin/fetch.c:1064

5342 msgid ""

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

5344 "remote name from which new revisions should be fetched."

@@ -5292,32 +5346,32 @@ msgstr ""

5346 "Aucun dépôt distant spécifié. Veuillez spécifier une URL ou un nom\n"

5347 "distant depuis lesquels les nouvelles révisions devraient être récupérées."

5348

5295 -#: builtin/fetch.c:1059

5349 +#: builtin/fetch.c:1087

5350 msgid "You need to specify a tag name."

5351 msgstr "Vous devez spécifier un nom d'étiquette."

5352

5299 -#: builtin/fetch.c:1107

5353 +#: builtin/fetch.c:1131

5354 msgid "--depth and --unshallow cannot be used together"

5355 msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble"

5356

5303 -#: builtin/fetch.c:1109

5357 +#: builtin/fetch.c:1133

5358 msgid "--unshallow on a complete repository does not make sense"

5359 msgstr "--unshallow sur un dépôt complet n'a pas de sens"

5360

5307 -#: builtin/fetch.c:1132

5361 +#: builtin/fetch.c:1156

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

5363 msgstr "fetch --all n'accepte pas d'argument de dépôt"

5364

5311 -#: builtin/fetch.c:1134

5365 +#: builtin/fetch.c:1158

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

5367 msgstr "fetch --all n'a pas de sens avec des spécifications de référence"

5368

5315 -#: builtin/fetch.c:1145

5369 +#: builtin/fetch.c:1169

5370 #, c-format

5371 msgid "No such remote or remote group: %s"

5372 msgstr "distant ou groupe distant inexistant : %s"

5373

5320 -#: builtin/fetch.c:1153

5374 +#: builtin/fetch.c:1177

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

5376 msgstr ""

5377 "La récupération d'un groupe et les spécifications de référence n'ont pas de "

@@ -5328,9 +5382,9 @@ msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"

5382 msgstr ""

5383 "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <fichier>]"

5384

5331 -#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:700

5332 -#: builtin/merge.c:196 builtin/repack.c:175 builtin/repack.c:179

5333 -#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:501

5385 +#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:698

5386 +#: builtin/merge.c:196 builtin/repack.c:179 builtin/repack.c:183

5387 +#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:589

5388 #: parse-options.h:132 parse-options.h:239

5389 msgid "n"

5390 msgstr "n"

@@ -5355,43 +5409,43 @@ msgstr "utiliser <texte> comme début de message"

5409 msgid "file to read from"

5410 msgstr "fichier d'où lire"

5411

5358 -#: builtin/for-each-ref.c:1063

5412 +#: builtin/for-each-ref.c:1051

5413 msgid "git for-each-ref [options] [<pattern>]"

5414 msgstr "git for-each-ref [options] [<motif>]"

5415

5362 -#: builtin/for-each-ref.c:1078

5416 +#: builtin/for-each-ref.c:1066

5417 msgid "quote placeholders suitably for shells"

5418 msgstr "échapper les champs réservés pour les interpréteurs de commandes"

5419

5366 -#: builtin/for-each-ref.c:1080

5420 +#: builtin/for-each-ref.c:1068

5421 msgid "quote placeholders suitably for perl"

5422 msgstr "échapper les champs réservés pour perl"

5423

5370 -#: builtin/for-each-ref.c:1082

5424 +#: builtin/for-each-ref.c:1070

5425 msgid "quote placeholders suitably for python"

5426 msgstr "échapper les champs réservés pour python"

5427

5374 -#: builtin/for-each-ref.c:1084

5428 +#: builtin/for-each-ref.c:1072

5429 msgid "quote placeholders suitably for tcl"

5430 msgstr "échapper les champs réservés pour tcl"

5431

5378 -#: builtin/for-each-ref.c:1087

5432 +#: builtin/for-each-ref.c:1075

5433 msgid "show only <n> matched refs"

5434 msgstr "n'afficher que <n> références correspondant"

5435

5382 -#: builtin/for-each-ref.c:1088 builtin/replace.c:177

5436 +#: builtin/for-each-ref.c:1076 builtin/replace.c:435

5437 msgid "format"

5438 msgstr "format"

5439

5386 -#: builtin/for-each-ref.c:1088

5440 +#: builtin/for-each-ref.c:1076

5441 msgid "format to use for the output"

5442 msgstr "format à utiliser pour la sortie"

5443

5390 -#: builtin/for-each-ref.c:1089

5444 +#: builtin/for-each-ref.c:1077

5445 msgid "key"

5446 msgstr "clé"

5447

5394 -#: builtin/for-each-ref.c:1090

5448 +#: builtin/for-each-ref.c:1078

5449 msgid "field name to sort on"

5450 msgstr "nom du champ servant à trier"

5451

@@ -5399,56 +5453,56 @@ msgstr "nom du champ servant à trier"

5453 msgid "Checking connectivity"

5454 msgstr "Vérification de la connectivité"

5455

5402 -#: builtin/fsck.c:544

5456 +#: builtin/fsck.c:538

5457 msgid "Checking object directories"

5458 msgstr "Vérification des répertoires d'objet"

5459

5406 -#: builtin/fsck.c:607

5460 +#: builtin/fsck.c:601

5461 msgid "git fsck [options] [<object>...]"

5462 msgstr "git fsck [options] [<objet>...]"

5463

5410 -#: builtin/fsck.c:613

5464 +#: builtin/fsck.c:607

5465 msgid "show unreachable objects"

5466 msgstr "afficher les objets inaccessibles"

5467

5414 -#: builtin/fsck.c:614

5468 +#: builtin/fsck.c:608

5469 msgid "show dangling objects"

5470 msgstr "afficher les objets en suspens"

5471

5418 -#: builtin/fsck.c:615

5472 +#: builtin/fsck.c:609

5473 msgid "report tags"

5474 msgstr "afficher les étiquettes"

5475

5422 -#: builtin/fsck.c:616

5476 +#: builtin/fsck.c:610

5477 msgid "report root nodes"

5478 msgstr "signaler les nœuds racines"

5479

5426 -#: builtin/fsck.c:617

5480 +#: builtin/fsck.c:611

5481 msgid "make index objects head nodes"

5482 msgstr "considérer les objets de l'index comme nœuds tête"

5483

5484 # translated from man page

5431 -#: builtin/fsck.c:618

5485 +#: builtin/fsck.c:612

5486 msgid "make reflogs head nodes (default)"

5487 msgstr "considérer les reflogs comme nœuds tête (par défaut)"

5488

5435 -#: builtin/fsck.c:619

5489 +#: builtin/fsck.c:613

5490 msgid "also consider packs and alternate objects"

5491 msgstr "inspecter aussi les objets pack et alternatifs"

5492

5439 -#: builtin/fsck.c:620

5493 +#: builtin/fsck.c:614

5494 msgid "enable more strict checking"

5495 msgstr "activer une vérification plus strict"

5496

5443 -#: builtin/fsck.c:622

5497 +#: builtin/fsck.c:616

5498 msgid "write dangling objects in .git/lost-found"

5499 msgstr "écrire les objets en suspens dans .git/lost-found"

5500

5447 -#: builtin/fsck.c:623 builtin/prune.c:144

5501 +#: builtin/fsck.c:617 builtin/prune.c:144

5502 msgid "show progress"

5503 msgstr "afficher la progression"

5504

5451 -#: builtin/fsck.c:673

5505 +#: builtin/fsck.c:667

5506 msgid "Checking objects"

5507 msgstr "Vérification des objets"

5508

@@ -5456,50 +5510,52 @@ msgstr "Vérification des objets"

5510 msgid "git gc [options]"

5511 msgstr "git gc [options]"

5512

5459 -#: builtin/gc.c:90

5513 +#: builtin/gc.c:91

5514 #, c-format

5515 msgid "Invalid %s: '%s'"

5516 msgstr "%s invalide : '%s'"

5517

5464 -#: builtin/gc.c:117

5518 +#: builtin/gc.c:118

5519 #, c-format

5520 msgid "insanely long object directory %.*s"

5521 msgstr "objet répertoire démentiellement long %.*s"

5522

5469 -#: builtin/gc.c:273

5523 +#: builtin/gc.c:287

5524 msgid "prune unreferenced objects"

5525 msgstr "éliminer les objets non référencés"

5526

5473 -#: builtin/gc.c:275

5527 +#: builtin/gc.c:289

5528 msgid "be more thorough (increased runtime)"

5529 msgstr "être plus consciencieux (durée de traitement allongée)"

5530

5477 -#: builtin/gc.c:276

5531 +#: builtin/gc.c:290

5532 msgid "enable auto-gc mode"

5533 msgstr "activer le mode auto-gc"

5534

5481 -#: builtin/gc.c:277

5535 +#: builtin/gc.c:291

5536 msgid "force running gc even if there may be another gc running"

5537 msgstr ""

5538 "forcer le lancement du ramasse-miettes même si un autre ramasse-miettes "

5539 "tourne déjà"

5540

5487 -#: builtin/gc.c:318

5541 +#: builtin/gc.c:332

5542 #, c-format

5543 msgid "Auto packing the repository in background for optimum performance.\n"

5490 -msgstr "Compression automatique du dépôt en tâche de fond pour optimiser les performances.\n"

5544 +msgstr ""

5545 +"Compression automatique du dépôt en tâche de fond pour optimiser les "

5546 +"performances.\n"

5547

5492 -#: builtin/gc.c:320

5548 +#: builtin/gc.c:334

5549 #, c-format

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

5551 msgstr "Compression du dépôt pour optimiser les performances.\n"

5552

5497 -#: builtin/gc.c:321

5553 +#: builtin/gc.c:335

5554 #, c-format

5555 msgid "See \"git help gc\" for manual housekeeping.\n"

5556 msgstr "Voir \"git help gc\" pour toute information sur le nettoyage manuel.\n"

5557

5502 -#: builtin/gc.c:336

5558 +#: builtin/gc.c:353

5559 #, c-format

5560 msgid ""

5561 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"

@@ -5507,7 +5563,7 @@ msgstr ""

5563 "un ramasse-miettes est déjà en cours sur la machine '%s' pid %<PRIuMAX> "

5564 "(utilisez --force si ce n'est pas le cas)"

5565

5510 -#: builtin/gc.c:361

5566 +#: builtin/gc.c:375

5567 msgid ""

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

5569 msgstr ""

@@ -5523,233 +5579,228 @@ msgstr "git grep [options] [-e] <motif> [<révision>...] [[--] <chemin>...]"

5579 msgid "grep: failed to create thread: %s"

5580 msgstr "grep : échec de création du fil: %s"

5581

5526 -#: builtin/grep.c:365

5527 -#, c-format

5528 -msgid "Failed to chdir: %s"

5529 -msgstr "Échec de chdir: %s"

5530 -

5531 -#: builtin/grep.c:443 builtin/grep.c:478

5582 +#: builtin/grep.c:441 builtin/grep.c:476

5583 #, c-format

5584 msgid "unable to read tree (%s)"

5585 msgstr "impossible de lire l'arbre (%s)"

5586

5536 -#: builtin/grep.c:493

5587 +#: builtin/grep.c:491

5588 #, c-format

5589 msgid "unable to grep from object of type %s"

5590 msgstr "impossible de faire un grep sur un objet de type %s"

5591

5541 -#: builtin/grep.c:549

5592 +#: builtin/grep.c:547

5593 #, c-format

5594 msgid "switch `%c' expects a numerical value"

5595 msgstr "l'option '%c' attend un valeur numérique"

5596

5546 -#: builtin/grep.c:566

5597 +#: builtin/grep.c:564

5598 #, c-format

5599 msgid "cannot open '%s'"

5600 msgstr "impossible d'ouvrir '%s'"

5601

5551 -#: builtin/grep.c:640

5602 +#: builtin/grep.c:638

5603 msgid "search in index instead of in the work tree"

5604 msgstr "rechercher dans l'index plutôt que dans la copie de travail"

5605

5555 -#: builtin/grep.c:642

5606 +#: builtin/grep.c:640

5607 msgid "find in contents not managed by git"

5608 msgstr "rechercher dans les contenus non gérés par git"

5609

5559 -#: builtin/grep.c:644

5610 +#: builtin/grep.c:642

5611 msgid "search in both tracked and untracked files"

5612 msgstr "rechercher dans les fichiers suivis et non-suivis"

5613

5563 -#: builtin/grep.c:646

5614 +#: builtin/grep.c:644

5615 msgid "search also in ignored files"

5616 msgstr "rechercher aussi dans les fichiers ignorés"

5617

5567 -#: builtin/grep.c:649

5618 +#: builtin/grep.c:647

5619 msgid "show non-matching lines"

5620 msgstr "afficher les lignes qui ne correspondent pas"

5621

5571 -#: builtin/grep.c:651

5622 +#: builtin/grep.c:649

5623 msgid "case insensitive matching"

5624 msgstr "correspondance insensible à la casse"

5625

5575 -#: builtin/grep.c:653

5626 +#: builtin/grep.c:651

5627 msgid "match patterns only at word boundaries"

5628 msgstr "rechercher les motifs aux séparateurs de mots"

5629

5579 -#: builtin/grep.c:655

5630 +#: builtin/grep.c:653

5631 msgid "process binary files as text"

5632 msgstr "traiter les fichiers binaires comme texte"

5633

5583 -#: builtin/grep.c:657

5634 +#: builtin/grep.c:655

5635 msgid "don't match patterns in binary files"

5636 msgstr "ne pas chercher les motifs dans les fichiers binaires"

5637

5587 -#: builtin/grep.c:660

5638 +#: builtin/grep.c:658

5639 msgid "process binary files with textconv filters"

5640 msgstr "traiter les fichiers binaires avec les filtres textconv"

5641

5591 -#: builtin/grep.c:662

5642 +#: builtin/grep.c:660

5643 msgid "descend at most <depth> levels"

5644 msgstr "descendre au plus de <profondeur> dans l'arborescence"

5645

5595 -#: builtin/grep.c:666

5646 +#: builtin/grep.c:664

5647 msgid "use extended POSIX regular expressions"

5648 msgstr "utiliser des expressions régulières étendues POSIX"

5649

5599 -#: builtin/grep.c:669

5650 +#: builtin/grep.c:667

5651 msgid "use basic POSIX regular expressions (default)"

5652 msgstr "utiliser des expressions régulières basiques POSIX (par défaut)"

5653

5603 -#: builtin/grep.c:672

5654 +#: builtin/grep.c:670

5655 msgid "interpret patterns as fixed strings"

5656 msgstr "interpréter les motifs comme de chaînes fixes"

5657

5607 -#: builtin/grep.c:675

5658 +#: builtin/grep.c:673

5659 msgid "use Perl-compatible regular expressions"

5660 msgstr "utiliser des expressions régulières compatibles avec Perl"

5661

5611 -#: builtin/grep.c:678

5662 +#: builtin/grep.c:676

5663 msgid "show line numbers"

5664 msgstr "afficher les numéros de ligne"

5665

5615 -#: builtin/grep.c:679

5666 +#: builtin/grep.c:677

5667 msgid "don't show filenames"

5668 msgstr "ne pas pas afficher les noms de fichier"

5669

5619 -#: builtin/grep.c:680

5670 +#: builtin/grep.c:678

5671 msgid "show filenames"

5672 msgstr "afficher les noms de fichier"

5673

5623 -#: builtin/grep.c:682

5674 +#: builtin/grep.c:680

5675 msgid "show filenames relative to top directory"

5676 msgstr "afficher les noms de fichiers relativement au répertoire de base"

5677

5627 -#: builtin/grep.c:684

5678 +#: builtin/grep.c:682

5679 msgid "show only filenames instead of matching lines"

5680 msgstr "n'afficher que les noms de fichiers au lieu des lignes correspondant"

5681

5631 -#: builtin/grep.c:686

5682 +#: builtin/grep.c:684

5683 msgid "synonym for --files-with-matches"

5684 msgstr "synonyme pour --files-with-matches"

5685

5635 -#: builtin/grep.c:689

5686 +#: builtin/grep.c:687

5687 msgid "show only the names of files without match"

5688 msgstr "n'afficher que les noms des fichiers sans correspondance"

5689

5639 -#: builtin/grep.c:691

5690 +#: builtin/grep.c:689

5691 msgid "print NUL after filenames"

5692 msgstr "imprimer une caractère NUL après le noms de fichier"

5693

5643 -#: builtin/grep.c:693

5694 +#: builtin/grep.c:691

5695 msgid "show the number of matches instead of matching lines"

5696 msgstr "afficher le nombre de correspondances au lieu des lignes correspondant"

5697

5647 -#: builtin/grep.c:694

5698 +#: builtin/grep.c:692

5699 msgid "highlight matches"

5700 msgstr "mettre en évidence les correspondances"

5701

5651 -#: builtin/grep.c:696

5702 +#: builtin/grep.c:694

5703 msgid "print empty line between matches from different files"

5704 msgstr ""

5705 "imprimer une ligne vide entre les correspondances de fichiers différents"

5706

5656 -#: builtin/grep.c:698

5707 +#: builtin/grep.c:696

5708 msgid "show filename only once above matches from same file"

5709 msgstr ""

5710 "afficher le nom de fichier une fois au dessus des correspondances du même "

5711 "fichier"

5712

5662 -#: builtin/grep.c:701

5713 +#: builtin/grep.c:699

5714 msgid "show <n> context lines before and after matches"

5715 msgstr "afficher <n> lignes de contexte avant et après les correspondances"

5716

5666 -#: builtin/grep.c:704

5717 +#: builtin/grep.c:702

5718 msgid "show <n> context lines before matches"

5719 msgstr "afficher <n> lignes de contexte avant les correspondances"

5720

5670 -#: builtin/grep.c:706

5721 +#: builtin/grep.c:704

5722 msgid "show <n> context lines after matches"

5723 msgstr "afficher <n> lignes de contexte après les correspondances"

5724

5674 -#: builtin/grep.c:707

5725 +#: builtin/grep.c:705

5726 msgid "shortcut for -C NUM"

5727 msgstr "raccourci pour -C NUM"

5728

5678 -#: builtin/grep.c:710

5729 +#: builtin/grep.c:708

5730 msgid "show a line with the function name before matches"

5731 msgstr ""

5732 "afficher une ligne avec le nom de la fonction avant les correspondances"

5733

5683 -#: builtin/grep.c:712

5734 +#: builtin/grep.c:710

5735 msgid "show the surrounding function"

5736 msgstr "afficher la fonction contenante"

5737

5687 -#: builtin/grep.c:715

5738 +#: builtin/grep.c:713

5739 msgid "read patterns from file"

5740 msgstr "lire les motifs depuis fichier"

5741

5691 -#: builtin/grep.c:717

5742 +#: builtin/grep.c:715

5743 msgid "match <pattern>"

5744 msgstr "rechercher <motif>"

5745

5695 -#: builtin/grep.c:719

5746 +#: builtin/grep.c:717

5747 msgid "combine patterns specified with -e"

5748 msgstr "combiner les motifs spécifiés par -e"

5749

5699 -#: builtin/grep.c:731

5750 +#: builtin/grep.c:729

5751 msgid "indicate hit with exit status without output"

5752 msgstr ""

5753 "indiquer des correspondances avec le code de sortie mais sans rien afficher"

5754

5704 -#: builtin/grep.c:733

5755 +#: builtin/grep.c:731

5756 msgid "show only matches from files that match all patterns"

5757 msgstr ""

5758 "n'afficher que les correspondances de fichiers qui correspondent à tous les "

5759 "motifs"

5760

5710 -#: builtin/grep.c:735

5761 +#: builtin/grep.c:733

5762 msgid "show parse tree for grep expression"

5763 msgstr "afficher l'arbre d'analyse pour le motif grep"

5764

5714 -#: builtin/grep.c:739

5765 +#: builtin/grep.c:737

5766 msgid "pager"

5767 msgstr "pagineur"

5768

5718 -#: builtin/grep.c:739

5769 +#: builtin/grep.c:737

5770 msgid "show matching files in the pager"

5771 msgstr "afficher les fichiers correspondant dans le pagineur"

5772

5722 -#: builtin/grep.c:742

5773 +#: builtin/grep.c:740

5774 msgid "allow calling of grep(1) (ignored by this build)"

5775 msgstr "permettre l'appel de grep(1) (ignoré par ce build)"

5776

5726 -#: builtin/grep.c:743 builtin/show-ref.c:187

5777 +#: builtin/grep.c:741 builtin/show-ref.c:187

5778 msgid "show usage"

5779 msgstr "afficher l'usage"

5780

5730 -#: builtin/grep.c:810

5781 +#: builtin/grep.c:808

5782 msgid "no pattern given."

5783 msgstr "aucun motif fourni."

5784

5734 -#: builtin/grep.c:868

5785 +#: builtin/grep.c:866

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

5787 msgstr "--open-files-in-pager ne fonctionne que sur la copie de travail"

5788

5738 -#: builtin/grep.c:891

5789 +#: builtin/grep.c:892

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

5791 msgstr "--cached ou --untracked ne peuvent pas être utilisés avec --no-index."

5792

5742 -#: builtin/grep.c:896

5793 +#: builtin/grep.c:897

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

5795 msgstr ""

5796 "--no-index ou --untracked ne peuvent pas être utilisés avec des révisions."

5797

5747 -#: builtin/grep.c:899

5798 +#: builtin/grep.c:900

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

5800 msgstr ""

5801 "--[no-]exclude-standard ne peut pas être utilisé avec du contenu suivi."

5802

5752 -#: builtin/grep.c:907

5803 +#: builtin/grep.c:908

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

5805 msgstr "--cached et des arbres sont fournis en même temps."

5806

@@ -5765,7 +5816,7 @@ msgstr ""

5816 msgid "git hash-object --stdin-paths < <list-of-paths>"

5817 msgstr "git hash-object --stdin-paths < <liste-de-chemins>"

5818

5768 -#: builtin/hash-object.c:72 builtin/tag.c:521

5819 +#: builtin/hash-object.c:72 builtin/tag.c:609

5820 msgid "type"

5821 msgstr "type"

5822

@@ -5910,281 +5961,292 @@ msgstr "usage : %s%s"

5961 msgid "`git %s' is aliased to `%s'"

5962 msgstr "`git %s\" est un alias de `%s'"

5963

5913 -#: builtin/index-pack.c:184

5964 +#: builtin/index-pack.c:145

5965 +#, c-format

5966 +msgid "unable to open %s"

5967 +msgstr "impossible d'ouvrir %s"

5968 +

5969 +#: builtin/index-pack.c:191

5970 #, c-format

5971 msgid "object type mismatch at %s"

5972 msgstr "type d'objet non correspondant à %s"

5973

5918 -#: builtin/index-pack.c:204

5919 -msgid "object of unexpected type"

5920 -msgstr "objet de type inattendu"

5974 +#: builtin/index-pack.c:211

5975 +#, c-format

5976 +msgid "did not receive expected object %s"

5977 +msgstr "objet attendu non reçu %s"

5978 +

5979 +#: builtin/index-pack.c:214

5980 +#, c-format

5981 +msgid "object %s: expected type %s, found %s"

5982 +msgstr "objet %s : type attendu %s, reçu %s"

5983

5922 -#: builtin/index-pack.c:244

5984 +#: builtin/index-pack.c:256

5985 #, c-format

5986 msgid "cannot fill %d byte"

5987 msgid_plural "cannot fill %d bytes"

5988 msgstr[0] "impossible de remplir %d octet"

5989 msgstr[1] "impossible de remplir %d octets"

5990

5929 -#: builtin/index-pack.c:254

5991 +#: builtin/index-pack.c:266

5992 msgid "early EOF"

5993 msgstr "fin de fichier prématurée"

5994

5933 -#: builtin/index-pack.c:255

5995 +#: builtin/index-pack.c:267

5996 msgid "read error on input"

5997 msgstr "erreur de lecture sur l'entrée"

5998

5937 -#: builtin/index-pack.c:267

5999 +#: builtin/index-pack.c:279

6000 msgid "used more bytes than were available"

6001 msgstr "plus d'octets utilisés que disponibles"

6002

5941 -#: builtin/index-pack.c:274

6003 +#: builtin/index-pack.c:286

6004 msgid "pack too large for current definition of off_t"

6005 msgstr "le paquet est trop grand pour la définition actuelle de off_t"

6006

5945 -#: builtin/index-pack.c:290

6007 +#: builtin/index-pack.c:302

6008 #, c-format

6009 msgid "unable to create '%s'"

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

6011

5950 -#: builtin/index-pack.c:295

6012 +#: builtin/index-pack.c:307

6013 #, c-format

6014 msgid "cannot open packfile '%s'"

6015 msgstr "impossible d'ouvrir le fichier paquet '%s'"

6016

5955 -#: builtin/index-pack.c:309

6017 +#: builtin/index-pack.c:321

6018 msgid "pack signature mismatch"

6019 msgstr "la signature du paquet ne correspond pas"

6020

5959 -#: builtin/index-pack.c:311

6021 +#: builtin/index-pack.c:323

6022 #, c-format

6023 msgid "pack version %<PRIu32> unsupported"

6024 msgstr "la version de paquet %<PRIu32> non supportée"

6025

5964 -#: builtin/index-pack.c:329

6026 +#: builtin/index-pack.c:341

6027 #, c-format

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

6029 msgstr "le paquet a un mauvais objet à l'offset %lu: %s"

6030

5969 -#: builtin/index-pack.c:451

6031 +#: builtin/index-pack.c:462

6032 #, c-format

6033 msgid "inflate returned %d"

6034 msgstr "la décompression (inflate) a retourné %d"

6035

5974 -#: builtin/index-pack.c:500

6036 +#: builtin/index-pack.c:511

6037 msgid "offset value overflow for delta base object"

6038 msgstr "dépassement de la valeur d'offset pour l'objet delta de base"

6039

5978 -#: builtin/index-pack.c:508

6040 +#: builtin/index-pack.c:519

6041 msgid "delta base offset is out of bound"

6042 msgstr "l'objet delta de base est hors limite"

6043

5982 -#: builtin/index-pack.c:516

6044 +#: builtin/index-pack.c:527

6045 #, c-format

6046 msgid "unknown object type %d"

6047 msgstr "type d'objet inconnu %d"

6048

5987 -#: builtin/index-pack.c:547

6049 +#: builtin/index-pack.c:558

6050 msgid "cannot pread pack file"

6051 msgstr "impossible de lire (pread) le fichier paquet"

6052

5991 -#: builtin/index-pack.c:549

6053 +#: builtin/index-pack.c:560

6054 #, c-format

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

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

6057 msgstr[0] "fin prématurée du fichier paquet, %lu octet lu"

6058 msgstr[1] "fin prématurée du fichier paquet, %lu octets lus"

6059

5998 -#: builtin/index-pack.c:575

6060 +#: builtin/index-pack.c:586

6061 msgid "serious inflate inconsistency"

6062 msgstr "grave incohérence dans la décompression (inflate)"

6063

6002 -#: builtin/index-pack.c:666 builtin/index-pack.c:672 builtin/index-pack.c:695

6003 -#: builtin/index-pack.c:729 builtin/index-pack.c:738

6064 +#: builtin/index-pack.c:677 builtin/index-pack.c:683 builtin/index-pack.c:706

6065 +#: builtin/index-pack.c:740 builtin/index-pack.c:749

6066 #, c-format

6067 msgid "SHA1 COLLISION FOUND WITH %s !"

6068 msgstr "COLLISION SHA1 TROUVÉE AVEC %s !"

6069

6008 -#: builtin/index-pack.c:669 builtin/pack-objects.c:162

6070 +#: builtin/index-pack.c:680 builtin/pack-objects.c:162

6071 #: builtin/pack-objects.c:254

6072 #, c-format

6073 msgid "unable to read %s"

6074 msgstr "impossible de lire %s"

6075

6014 -#: builtin/index-pack.c:735

6076 +#: builtin/index-pack.c:746

6077 #, c-format

6078 msgid "cannot read existing object %s"

6079 msgstr "impossible de lire l'objet existant %s"

6080

6019 -#: builtin/index-pack.c:749

6081 +#: builtin/index-pack.c:760

6082 #, c-format

6083 msgid "invalid blob object %s"

6084 msgstr "objet blob invalide %s"

6085

6024 -#: builtin/index-pack.c:763

6086 +#: builtin/index-pack.c:774

6087 #, c-format

6088 msgid "invalid %s"

6089 msgstr "%s invalide"

6090

6029 -#: builtin/index-pack.c:766

6091 +#: builtin/index-pack.c:777

6092 msgid "Error in object"

6093 msgstr "Erreur dans l'objet"

6094

6033 -#: builtin/index-pack.c:768

6095 +#: builtin/index-pack.c:779

6096 #, c-format

6097 msgid "Not all child objects of %s are reachable"

6098 msgstr "Tous les objets enfants de %s ne sont pas accessibles"

6099

6038 -#: builtin/index-pack.c:839 builtin/index-pack.c:869

6100 +#: builtin/index-pack.c:851 builtin/index-pack.c:881

6101 msgid "failed to apply delta"

6102 msgstr "échec d'application du delta"

6103

6042 -#: builtin/index-pack.c:1010

6104 +#: builtin/index-pack.c:1022

6105 msgid "Receiving objects"

6106 msgstr "Réception d'objets"

6107

6046 -#: builtin/index-pack.c:1010

6108 +#: builtin/index-pack.c:1022

6109 msgid "Indexing objects"

6110 msgstr "Indexation d'objets"

6111

6050 -#: builtin/index-pack.c:1036

6112 +#: builtin/index-pack.c:1048

6113 msgid "pack is corrupted (SHA1 mismatch)"

6114 msgstr "le paquet est corrompu (SHA1 ne correspond pas)"

6115

6054 -#: builtin/index-pack.c:1041

6116 +#: builtin/index-pack.c:1053

6117 msgid "cannot fstat packfile"

6118 msgstr "impossible d'obtenir le statut (fstat) du fichier paquet"

6119

6058 -#: builtin/index-pack.c:1044

6120 +#: builtin/index-pack.c:1056

6121 msgid "pack has junk at the end"

6122 msgstr "le paquet est invalide à la fin"

6123

6062 -#: builtin/index-pack.c:1055

6124 +#: builtin/index-pack.c:1067

6125 msgid "confusion beyond insanity in parse_pack_objects()"

6126 msgstr "confusion extrême dans parse_pack_objects()"

6127

6066 -#: builtin/index-pack.c:1078

6128 +#: builtin/index-pack.c:1090

6129 msgid "Resolving deltas"

6130 msgstr "Résolution des deltas"

6131

6070 -#: builtin/index-pack.c:1088

6132 +#: builtin/index-pack.c:1100

6133 #, c-format

6134 msgid "unable to create thread: %s"

6135 msgstr "impossible de créer le fil : %s"

6136

6075 -#: builtin/index-pack.c:1130

6137 +#: builtin/index-pack.c:1142

6138 msgid "confusion beyond insanity"

6139 msgstr "confusion extrême"

6140

6079 -#: builtin/index-pack.c:1138

6141 +#: builtin/index-pack.c:1150

6142 #, c-format

6143 msgid "completed with %d local objects"

6144 msgstr "complété avec %d objets locaux"

6145

6084 -#: builtin/index-pack.c:1148

6146 +#: builtin/index-pack.c:1160

6147 #, c-format

6148 msgid "Unexpected tail checksum for %s (disk corruption?)"

6149 msgstr ""

6150 "Somme de contrôle de fin inattendue pour %s (corruption sur le disque ?)"

6151

6090 -#: builtin/index-pack.c:1152

6152 +#: builtin/index-pack.c:1164

6153 #, c-format

6154 msgid "pack has %d unresolved delta"

6155 msgid_plural "pack has %d unresolved deltas"

6156 msgstr[0] "le paquet a %d delta non résolu"

6157 msgstr[1] "le paquet a %d deltas non résolus"

6158

6097 -#: builtin/index-pack.c:1177

6159 +#: builtin/index-pack.c:1189

6160 #, c-format

6161 msgid "unable to deflate appended object (%d)"

6162 msgstr "impossible de compresser l'objet ajouté (%d)"

6163

6102 -#: builtin/index-pack.c:1256

6164 +#: builtin/index-pack.c:1268

6165 #, c-format

6166 msgid "local object %s is corrupt"

6167 msgstr "l'objet local %s est corrompu"

6168

6107 -#: builtin/index-pack.c:1280

6169 +#: builtin/index-pack.c:1292

6170 msgid "error while closing pack file"

6171 msgstr "erreur en fermeture du fichier paquet"

6172

6111 -#: builtin/index-pack.c:1293

6173 +#: builtin/index-pack.c:1305

6174 #, c-format

6175 msgid "cannot write keep file '%s'"

6176 msgstr "impossible d'écrire le fichier \"keep\" '%s'"

6177

6116 -#: builtin/index-pack.c:1301

6178 +#: builtin/index-pack.c:1313

6179 #, c-format

6180 msgid "cannot close written keep file '%s'"

6181 msgstr "impossible de fermer le fichier \"keep\" '%s'"

6182

6121 -#: builtin/index-pack.c:1314

6183 +#: builtin/index-pack.c:1326

6184 msgid "cannot store pack file"

6185 msgstr "impossible de stocker le fichier paquet"

6186

6125 -#: builtin/index-pack.c:1325

6187 +#: builtin/index-pack.c:1337

6188 msgid "cannot store index file"

6189 msgstr "impossible de stocker le fichier d'index"

6190

6129 -#: builtin/index-pack.c:1358

6191 +#: builtin/index-pack.c:1370

6192 #, c-format

6193 msgid "bad pack.indexversion=%<PRIu32>"

6194 msgstr "mauvais pack.indexversion=%<PRIu32>"

6195

6134 -#: builtin/index-pack.c:1364

6196 +#: builtin/index-pack.c:1376

6197 #, c-format

6198 msgid "invalid number of threads specified (%d)"

6199 msgstr "nombre de fils spécifié invalide (%d)"

6200

6139 -#: builtin/index-pack.c:1368 builtin/index-pack.c:1546

6201 +#: builtin/index-pack.c:1380 builtin/index-pack.c:1559

6202 #, c-format

6203 msgid "no threads support, ignoring %s"

6204 msgstr "pas de support des fils, ignore %s"

6205

6144 -#: builtin/index-pack.c:1426

6206 +#: builtin/index-pack.c:1438

6207 #, c-format

6208 msgid "Cannot open existing pack file '%s'"

6209 msgstr "Impossible d'ouvrir le fichier paquet existant '%s'"

6210

6149 -#: builtin/index-pack.c:1428

6211 +#: builtin/index-pack.c:1440

6212 #, c-format

6213 msgid "Cannot open existing pack idx file for '%s'"

6214 msgstr "Impossible d'ouvrir le fichier paquet d'index existant pour '%s'"

6215

6154 -#: builtin/index-pack.c:1475

6216 +#: builtin/index-pack.c:1487

6217 #, c-format

6218 msgid "non delta: %d object"

6219 msgid_plural "non delta: %d objects"

6220 msgstr[0] "pas un delta : %d objet"

6221 msgstr[1] "pas un delta : %d objets"

6222

6161 -#: builtin/index-pack.c:1482

6223 +#: builtin/index-pack.c:1494

6224 #, c-format

6225 msgid "chain length = %d: %lu object"

6226 msgid_plural "chain length = %d: %lu objects"

6227 msgstr[0] "longueur chaînée = %d : %lu objet"

6228 msgstr[1] "longueur chaînée = %d : %lu objets"

6229

6168 -#: builtin/index-pack.c:1510

6230 +#: builtin/index-pack.c:1523

6231 msgid "Cannot come back to cwd"

6232 msgstr "Impossible de revenir au répertoire de travail courant"

6233

6172 -#: builtin/index-pack.c:1558 builtin/index-pack.c:1561

6173 -#: builtin/index-pack.c:1573 builtin/index-pack.c:1577

6234 +#: builtin/index-pack.c:1571 builtin/index-pack.c:1574

6235 +#: builtin/index-pack.c:1586 builtin/index-pack.c:1590

6236 #, c-format

6237 msgid "bad %s"

6238 msgstr "mauvais %s"

6239

6178 -#: builtin/index-pack.c:1591

6240 +#: builtin/index-pack.c:1604

6241 msgid "--fix-thin cannot be used without --stdin"

6242 msgstr "--fix-thin ne peut pas être utilisé sans --stdin"

6243

6182 -#: builtin/index-pack.c:1595 builtin/index-pack.c:1605

6244 +#: builtin/index-pack.c:1608 builtin/index-pack.c:1617

6245 #, c-format

6246 msgid "packfile name '%s' does not end with '.pack'"

6247 msgstr "le nom de fichier paquet '%s' ne se termine pas par '.pack'"

6248

6187 -#: builtin/index-pack.c:1614

6249 +#: builtin/index-pack.c:1625

6250 msgid "--verify with no packfile name given"

6251 msgstr "--verify sans nom de fichier paquet donné"

6252

@@ -6314,7 +6376,7 @@ msgstr "permissions"

6376 msgid "specify that the git repository is to be shared amongst several users"

6377 msgstr "spécifier que le dépôt git sera partagé entre plusieurs utilisateurs"

6378

6317 -#: builtin/init-db.c:491 builtin/prune-packed.c:79 builtin/repack.c:168

6379 +#: builtin/init-db.c:491 builtin/prune-packed.c:79 builtin/repack.c:172

6380 msgid "be quiet"

6381 msgstr "être silencieux"

6382

@@ -6354,38 +6416,38 @@ msgstr "git log [<options>] [<page de révisions>] [[--] <chemin>...]\n"

6416 msgid " or: git show [options] <object>..."

6417 msgstr " ou : git show [options] <objet>..."

6418

6357 -#: builtin/log.c:125

6419 +#: builtin/log.c:127

6420 msgid "suppress diff output"

6421 msgstr "supprimer la sortie des différences"

6422

6361 -#: builtin/log.c:126

6423 +#: builtin/log.c:128

6424 msgid "show source"

6425 msgstr "afficher la source"

6426

6365 -#: builtin/log.c:127

6427 +#: builtin/log.c:129

6428 msgid "Use mail map file"

6429 msgstr "Utiliser le fichier de correspondance de mail"

6430

6369 -#: builtin/log.c:128

6431 +#: builtin/log.c:130

6432 msgid "decorate options"

6433 msgstr "décorer les options"

6434

6373 -#: builtin/log.c:231

6435 +#: builtin/log.c:229

6436 #, c-format

6437 msgid "Final output: %d %s\n"

6438 msgstr "Sortie finale : %d %s\n"

6439

6378 -#: builtin/log.c:473 builtin/log.c:565

6440 +#: builtin/log.c:470 builtin/log.c:562

6441 #, c-format

6442 msgid "Could not read object %s"

6443 msgstr "Impossible de lire l'objet %s"

6444

6383 -#: builtin/log.c:589

6445 +#: builtin/log.c:586

6446 #, c-format

6447 msgid "Unknown type: %d"

6448 msgstr "Type inconnu : %d"

6449

6388 -#: builtin/log.c:689

6450 +#: builtin/log.c:687

6451 msgid "format.headers without value"

6452 msgstr "format.headers sans valeur"

6453

@@ -6406,197 +6468,206 @@ msgstr "Exactement une plage nécessaire."

6468 msgid "Not a range."

6469 msgstr "Ceci n'est pas une plage."

6470

6409 -#: builtin/log.c:911

6471 +#: builtin/log.c:916

6472 msgid "Cover letter needs email format"

6473 msgstr "La lettre de motivation doit être au format e-mail"

6474

6413 -#: builtin/log.c:987

6475 +#: builtin/log.c:995

6476 #, c-format

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

6478 msgstr "in-reply-to aberrant : %s"

6479

6418 -#: builtin/log.c:1015

6480 +#: builtin/log.c:1023

6481 msgid "git format-patch [options] [<since> | <revision range>]"

6482 msgstr "git format-patch [options] [<depuis> | <plage de révisions>]"

6483

6422 -#: builtin/log.c:1060

6484 +#: builtin/log.c:1068

6485 msgid "Two output directories?"

6486 msgstr "Deux répertoires de sortie ?"

6487

6426 -#: builtin/log.c:1175

6488 +#: builtin/log.c:1183

6489 msgid "use [PATCH n/m] even with a single patch"

6490 msgstr "utiliser [PATCH n/m] même avec un patch unique"

6491

6430 -#: builtin/log.c:1178

6492 +#: builtin/log.c:1186

6493 msgid "use [PATCH] even with multiple patches"

6494 msgstr "utiliser [PATCH] même avec des patchs multiples"

6495

6434 -#: builtin/log.c:1182

6496 +#: builtin/log.c:1190

6497 msgid "print patches to standard out"

6498 msgstr "afficher les patchs sur la sortie standard"

6499

6438 -#: builtin/log.c:1184

6500 +#: builtin/log.c:1192

6501 msgid "generate a cover letter"

6502 msgstr "générer une lettre de motivation"

6503

6442 -#: builtin/log.c:1186

6504 +#: builtin/log.c:1194

6505 msgid "use simple number sequence for output file names"

6506 msgstr ""

6507 "utiliser une séquence simple de nombres pour les nom des fichiers de sortie"

6508

6447 -#: builtin/log.c:1187

6509 +#: builtin/log.c:1195

6510 msgid "sfx"

6511 msgstr "sfx"

6512

6451 -#: builtin/log.c:1188

6513 +#: builtin/log.c:1196

6514 msgid "use <sfx> instead of '.patch'"

6515 msgstr "utiliser <sfx> au lieu de '.patch'"

6516

6455 -#: builtin/log.c:1190

6517 +#: builtin/log.c:1198

6518 msgid "start numbering patches at <n> instead of 1"

6519 msgstr "démarrer la numérotation des patchs à <n> au lieu de 1"

6520

6459 -#: builtin/log.c:1192

6521 +#: builtin/log.c:1200

6522 msgid "mark the series as Nth re-roll"

6523 msgstr "marquer la série comme une Nième réédition"

6524

6463 -#: builtin/log.c:1194

6525 +#: builtin/log.c:1202

6526 msgid "Use [<prefix>] instead of [PATCH]"

6527 msgstr "utiliser [<préfixe>] au lieu de [PATCH]"

6528

6467 -#: builtin/log.c:1197

6529 +#: builtin/log.c:1205

6530 msgid "store resulting files in <dir>"

6531 msgstr "stocker les fichiers résultats dans <répertoire>"

6532

6471 -#: builtin/log.c:1200

6533 +#: builtin/log.c:1208

6534 msgid "don't strip/add [PATCH]"

6535 msgstr "ne pas retirer/ajouter [PATCH]"

6536

6475 -#: builtin/log.c:1203

6537 +#: builtin/log.c:1211

6538 msgid "don't output binary diffs"

6539 msgstr "ne pas imprimer les diffs binaires"

6540

6479 -#: builtin/log.c:1205

6541 +#: builtin/log.c:1213

6542 msgid "don't include a patch matching a commit upstream"

6543 msgstr "ne pas inclure un patch correspondant à un commit amont"

6544

6483 -#: builtin/log.c:1207

6545 +#: builtin/log.c:1215

6546 msgid "show patch format instead of default (patch + stat)"

6547 msgstr "afficher le format du patch au lieu du défaut (patch + stat)"

6548

6487 -#: builtin/log.c:1209

6549 +#: builtin/log.c:1217

6550 msgid "Messaging"

6551 msgstr "Communication"

6552

6491 -#: builtin/log.c:1210

6553 +#: builtin/log.c:1218

6554 msgid "header"

6555 msgstr "en-tête"

6556

6495 -#: builtin/log.c:1211

6557 +#: builtin/log.c:1219

6558 msgid "add email header"

6559 msgstr "ajouter l'en-tête d'e-mail"

6560

6499 -#: builtin/log.c:1212 builtin/log.c:1214

6561 +#: builtin/log.c:1220 builtin/log.c:1222

6562 msgid "email"

6563 msgstr "e-mail"

6564

6503 -#: builtin/log.c:1212

6565 +#: builtin/log.c:1220

6566 msgid "add To: header"

6567 msgstr "ajouter l'en-tête \"To:\""

6568

6507 -#: builtin/log.c:1214

6569 +#: builtin/log.c:1222

6570 msgid "add Cc: header"

6571 msgstr "ajouter l'en-tête \"Cc:\""

6572

6511 -#: builtin/log.c:1216

6573 +#: builtin/log.c:1224

6574 msgid "ident"

6575 msgstr "ident"

6576

6515 -#: builtin/log.c:1217

6577 +#: builtin/log.c:1225

6578 msgid "set From address to <ident> (or committer ident if absent)"

6579 msgstr ""

6580 "renseigner l'adresse From à <ident> (ou à l'ident du validateur si absent)"

6581

6520 -#: builtin/log.c:1219

6582 +#: builtin/log.c:1227

6583 msgid "message-id"

6584 msgstr "id-message"

6585

6524 -#: builtin/log.c:1220

6586 +#: builtin/log.c:1228

6587 msgid "make first mail a reply to <message-id>"

6588 msgstr "répondre dans le premier message à <id-message>"

6589

6528 -#: builtin/log.c:1221 builtin/log.c:1224

6590 +#: builtin/log.c:1229 builtin/log.c:1232

6591 msgid "boundary"

6592 msgstr "limite"

6593

6532 -#: builtin/log.c:1222

6594 +#: builtin/log.c:1230

6595 msgid "attach the patch"

6596 msgstr "attacher le patch"

6597

6536 -#: builtin/log.c:1225

6598 +#: builtin/log.c:1233

6599 msgid "inline the patch"

6600 msgstr "patch à l'intérieur"

6601

6540 -#: builtin/log.c:1229

6602 +#: builtin/log.c:1237

6603 msgid "enable message threading, styles: shallow, deep"

6604 msgstr ""

6605 "activer l'enfilage de message, styles : shallow (superficiel), deep (profond)"

6606

6545 -#: builtin/log.c:1231

6607 +#: builtin/log.c:1239

6608 msgid "signature"

6609 msgstr "signature"

6610

6549 -#: builtin/log.c:1232

6611 +#: builtin/log.c:1240

6612 msgid "add a signature"

6613 msgstr "ajouter une signature"

6614

6553 -#: builtin/log.c:1233

6615 +#: builtin/log.c:1242

6616 +msgid "add a signature from a file"

6617 +msgstr "ajouter une signature depuis un fichier"

6618 +

6619 +#: builtin/log.c:1243

6620 msgid "don't print the patch filenames"

6621 msgstr "ne pas afficher les noms de fichiers des patchs"

6622

6557 -#: builtin/log.c:1307

6623 +#: builtin/log.c:1317

6624 #, c-format

6625 msgid "invalid ident line: %s"

6626 msgstr "ligne d'identification invalide : %s"

6627

6562 -#: builtin/log.c:1322

6628 +#: builtin/log.c:1332

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

6630 msgstr "-n et -k sont mutuellement exclusifs."

6631

6566 -#: builtin/log.c:1324

6632 +#: builtin/log.c:1334

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

6634 msgstr "--subject-prefix et -k sont mutuellement exclusifs."

6635

6570 -#: builtin/log.c:1332

6636 +#: builtin/log.c:1342

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

6638 msgstr "--name-only n'a pas de sens"

6639

6574 -#: builtin/log.c:1334

6640 +#: builtin/log.c:1344

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

l10n: fr.po (2257t) update for version 2.1.0